Drop now-unnecessary uuid dep for modern randomUUID global

Author: pimterry

package.json

@@ -110,7 +110,6 @@
     "@types/semver": "7.5.0",
     "@types/shelljs": "0.8.9",
     "@types/source-map-support": "0.4.2",
-    "@types/uuid": "8.3.4",
     "@types/ws": " 8.5.3",
     "assert": "^2.0.0",
     "brotli-wasm": "^1.0.0",
@@ -200,7 +199,6 @@
     "socks-proxy-agent": "^7.0.0",
     "typed-error": "^3.0.2",
     "urlpattern-polyfill": "^8.0.0",
-    "uuid": "^8.3.2",
     "ws": "^8.8.0"
   }
 }

src/admin/admin-server.ts

@@ -8,7 +8,6 @@ import * as cors from 'cors';
 import corsGate = require('cors-gate');
 import * as bodyParser from 'body-parser';
 import * as Ws from 'ws';
-import { v4 as uuid } from "uuid";
 
 import { createHandler as createGraphQLHandler } from 'graphql-http/lib/use/express';
 import { execute, GraphQLScalarType, subscribe } from 'graphql';
@@ -210,7 +209,7 @@ export class AdminServer<Plugins extends { [key: string]: AdminPlugin<any, any>
                     )
                 );
 
-                const sessionId = uuid();
+                const sessionId = crypto.randomUUID();
                 await this.startSessionManagementAPI(sessionId, sessionPlugins);
 
                 res.json({

src/rules/requests/request-rule.ts

@@ -1,7 +1,6 @@
 import { Buffer } from 'buffer';
 
 import * as _ from 'lodash';
-import { v4 as uuid } from "uuid";
 
 import { OngoingRequest, CompletedRequest, OngoingResponse, Explainable, RulePriority } from "../../types";
 import { buildBodyReader, buildInitiatedRequest, waitForCompletedRequest } from '../../util/request-utils';
@@ -48,7 +47,7 @@ export class RequestRule implements RequestRule {
     constructor(data: RequestRuleData) {
         validateMockRuleData(data);
 
-        this.id = data.id || uuid();
+        this.id = data.id || crypto.randomUUID();
         this.priority = data.priority ?? RulePriority.DEFAULT;
         this.matchers = data.matchers;
         this.completionChecker = data.completionChecker;

src/rules/websockets/websocket-rule.ts

@@ -1,8 +1,7 @@
-import * as _ from 'lodash';
-import { v4 as uuid } from "uuid";
 import * as net from 'net';
 import * as http from 'http';
 
+import * as _ from 'lodash';
 import {
     OngoingRequest,
     CompletedRequest,
@@ -59,7 +58,7 @@ export class WebSocketRule implements WebSocketRule {
     constructor(data: WebSocketRuleData) {
         validateMockRuleData(data);
 
-        this.id = data.id || uuid();
+        this.id = data.id || crypto.randomUUID();
         this.priority = data.priority ?? RulePriority.DEFAULT;
         this.matchers = data.matchers;
         this.completionChecker = data.completionChecker;

src/serialization/serialization.ts

@@ -2,7 +2,6 @@ import { Buffer } from 'buffer';
 import { Duplex } from 'stream';
 
 import * as _ from 'lodash';
-import { v4 as uuid } from "uuid";
 
 import { MaybePromise } from '@httptoolkit/util';
 import {
@@ -125,7 +124,7 @@ export class ClientServerChannel extends Duplex {
     ) {
         super({ objectMode: true });
 
-        this.topicId = topicId || uuid();
+        this.topicId = topicId || crypto.randomUUID();
         this.rawStream.on('error', this._onRawStreamError);
         this.rawStream.on('finish', this._onRawStreamFinish);
     }
@@ -192,7 +191,7 @@ export class ClientServerChannel extends Duplex {
             data = actionOrData;
         }
 
-        const requestId = uuid();
+        const requestId = crypto.randomUUID();
 
         return new Promise<R>((resolve, reject) => {
             const responseListener = (response: RequestMessage<R>) => {
@@ -324,7 +323,7 @@ export function serializeProxyConfig(
     channel: ClientServerChannel
 ): SerializedProxyConfig {
     if (_.isFunction(proxyConfig)) {
-        const callbackId = `proxyConfig-callback-${uuid()}`;
+        const callbackId = `proxyConfig-callback-${crypto.randomUUID()}`;
 
         channel.onRequest<
             ProxySettingCallbackParams,

src/server/mockttp-server.ts

@@ -9,7 +9,6 @@ import * as _ from "lodash";
 import { EventEmitter } from 'events';
 import portfinder = require("portfinder");
 import connect = require("connect");
-import { v4 as uuid } from "uuid";
 import cors = require("cors");
 import now = require("performance-now");
 import WebSocket = require("ws");
@@ -687,7 +686,7 @@ export class MockttpServer extends AbstractMockttp implements Mockttp {
             });
         }
 
-        const id = uuid();
+        const id = crypto.randomUUID();
 
         const tags: string[] = getSocketMetadataTags(socketMetadata);
 
@@ -1050,7 +1049,7 @@ ${await this.suggestRule(request)}`
             const isHeaderOverflow = errorCode === "HPE_HEADER_OVERFLOW";
 
             const commonParams = {
-                id: uuid(),
+                id: crypto.randomUUID(),
                 tags: [
                     `client-error:${error.code || 'UNKNOWN'}`,
                     ...getSocketMetadataTags(socket[SocketMetadata])
@@ -1142,7 +1141,7 @@ ${await this.suggestRule(request)}`
         this.announceClientErrorAsync(session.initialSocket, {
             errorCode: error.code,
             request: {
-                id: uuid(),
+                id: crypto.randomUUID(),
                 tags: [
                     `client-error:${error.code || 'UNKNOWN'}`,
                     ...(isBadPreface ? ['client-error:bad-preface'] : []),
@@ -1192,7 +1191,7 @@ ${await this.suggestRule(request)}`
                 ? buildRawSocketEventData(socket)
                 : buildTlsSocketEventData(socket as tls.TLSSocket),
             {
-                id: uuid(),
+                id: crypto.randomUUID(),
                 hostname: hostname, // Deprecated, but kept here for backward compat
                 destination: { hostname, port: targetPort }
             }

src/util/tls.ts

@@ -2,7 +2,6 @@ import { Buffer } from 'buffer';
 import * as fs from 'fs/promises';
 
 import * as _ from 'lodash';
-import { v4 as uuid } from "uuid";
 
 import * as x509 from '@peculiar/x509';
 import * as asn1X509 from '@peculiar/asn1-x509';
@@ -220,7 +219,7 @@ export async function generateSPKIFingerprint(certPem: string): Promise<string>
 
 // Generates a unique serial number for a certificate as a hex string:
 function generateSerialNumber() {
-    return 'A' + uuid().replace(/-/g, '');
+    return 'A' + crypto.randomUUID().replace(/-/g, '');
     // We add a leading 'A' to ensure it's always positive (not 'F') and always
     // valid (e.g. leading 000 is bad padding, and would be unparseable).
 }