Gently tidy up Node imports & avoid Buffer global

Author: pimterry

src/admin/admin-plugin-types.ts

@@ -1,4 +1,4 @@
-import { Duplex } from "stream";
+import { Duplex } from 'stream';
 import { DocumentNode } from "graphql";
 import { IResolvers } from "@graphql-tools/utils";
 import { MaybePromise } from "@httptoolkit/util";

src/admin/admin-server.ts

@@ -1,9 +1,11 @@
+import { Buffer } from 'buffer';
+import * as http from 'http';
+import * as net from 'net';
+
 import * as _ from 'lodash';
 import * as express from 'express';
 import * as cors from 'cors';
 import corsGate = require('cors-gate');
-import * as http from 'http';
-import * as net from 'net';
 import * as bodyParser from 'body-parser';
 import * as Ws from 'ws';
 import { v4 as uuid } from "uuid";

src/admin/mockttp-admin-model.ts

@@ -1,5 +1,5 @@
 import * as _ from "lodash";
-import { Duplex } from "stream";
+import { Duplex } from 'stream';
 
 import { PubSub } from "graphql-subscriptions";
 import type { IResolvers } from "@graphql-tools/utils";

src/client/mockttp-admin-request-builder.ts

@@ -1,5 +1,7 @@
-import _ = require('lodash');
+import { Buffer } from 'buffer';
 import * as stream from 'stream';
+
+import _ = require('lodash');
 import gql from 'graphql-tag';
 
 import { MockedEndpoint, MockedEndpointData } from "../types";

src/rules/matchers.ts

@@ -1,5 +1,7 @@
-import * as _ from 'lodash';
+import { Buffer } from 'buffer';
 import * as url from 'url';
+
+import * as _ from 'lodash';
 import { oneLine } from 'common-tags';
 import * as multipart from 'parse-multipart-data';
 import { MaybePromise } from '@httptoolkit/util';

src/rules/passthrough-handling.ts

@@ -1,7 +1,9 @@
-import * as _ from 'lodash';
+import { Buffer } from 'buffer';
 import * as fs from 'fs/promises';
 import * as tls from 'tls';
-import url = require('url');
+import * as url from 'url';
+
+import * as _ from 'lodash';
 import { oneLine } from 'common-tags';
 import CacheableLookup from 'cacheable-lookup';
 import * as semver from 'semver';

src/rules/requests/request-rule-builder.ts

@@ -1,5 +1,5 @@
 import { merge, isString, isBuffer } from "lodash";
-import { Readable } from "stream";
+import { Readable } from 'stream';
 import * as url from 'url';
 import { MaybePromise } from '@httptoolkit/util';
 

src/rules/requests/request-rule.ts

@@ -1,3 +1,5 @@
+import { Buffer } from 'buffer';
+
 import * as _ from 'lodash';
 import { v4 as uuid } from "uuid";
 

src/rules/requests/request-step-impls.ts

@@ -1,10 +1,11 @@
-import _ = require('lodash');
-import url = require('url');
+import { Buffer } from 'buffer';
 import type dns = require('dns');
+import url = require('url');
 import net = require('net');
-import tls = require('tls');
 import http = require('http');
 import https = require('https');
+
+import * as _ from 'lodash';
 import * as fs from 'fs/promises';
 import * as h2Client from 'http2-wrapper';
 import { decode as decodeBase64 } from 'base64-arraybuffer';

src/rules/rule-deserialization.ts

@@ -1,4 +1,4 @@
-import { Duplex } from "stream";
+import { Duplex } from 'stream';
 
 import { Serialized, SerializedValue, deserialize } from "../serialization/serialization";