Replace uuid package with built-in crypto.randomUUID()

versatica · Aug 11, 2023 · fd8968f · fd8968f
1 parent be98f0f
commit fd8968f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 69 deletions.
diff --git a/node/src/PipeTransport.ts b/node/src/PipeTransport.ts
@@ -1,4 +1,5 @@
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
+
 import { Logger } from './Logger';
 import * as ortc from './ortc';
 import {
@@ -322,7 +323,7 @@ export class PipeTransport<PipeTransportAppData extends AppData = AppData>
 
 		const reqData =
 		{
-			consumerId             : uuidv4(),
+			consumerId             : randomUUID(),
 			producerId,
 			kind                   : producer.kind,
 			rtpParameters,

diff --git a/node/src/Router.ts b/node/src/Router.ts
@@ -1,4 +1,5 @@
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
+
 import { Logger } from './Logger';
 import { EnhancedEventEmitter } from './EnhancedEventEmitter';
 import * as ortc from './ortc';
@@ -413,7 +414,7 @@ export class Router<RouterAppData extends AppData = AppData>
 
 		const reqData =
 		{
-			transportId    : uuidv4(),
+			transportId    : randomUUID(),
 			webRtcServerId : webRtcServer ? webRtcServer.id : undefined,
 			listenIps,
 			port,
@@ -525,7 +526,7 @@ export class Router<RouterAppData extends AppData = AppData>
 
 		const reqData =
 		{
-			transportId   : uuidv4(),
+			transportId   : randomUUID(),
 			listenIp,
 			port,
 			rtcpMux,
@@ -627,7 +628,7 @@ export class Router<RouterAppData extends AppData = AppData>
 
 		const reqData =
 		{
-			transportId   : uuidv4(),
+			transportId   : randomUUID(),
 			listenIp,
 			port,
 			enableSctp,
@@ -697,7 +698,7 @@ export class Router<RouterAppData extends AppData = AppData>
 
 		const reqData =
 		{
-			transportId : uuidv4(),
+			transportId : randomUUID(),
 			direct      : true,
 			maxMessageSize
 		};
@@ -1083,7 +1084,7 @@ export class Router<RouterAppData extends AppData = AppData>
 
 		const reqData =
 		{
-			rtpObserverId : uuidv4(),
+			rtpObserverId : randomUUID(),
 			interval
 		};
 
@@ -1137,7 +1138,7 @@ export class Router<RouterAppData extends AppData = AppData>
 
 		const reqData =
 		{
-			rtpObserverId : uuidv4(),
+			rtpObserverId : randomUUID(),
 			maxEntries,
 			threshold,
 			interval

diff --git a/node/src/Transport.ts b/node/src/Transport.ts
@@ -1,4 +1,4 @@
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 import { Logger } from './Logger';
 import { EnhancedEventEmitter } from './EnhancedEventEmitter';
 import * as utils from './utils';
@@ -595,7 +595,7 @@ export class Transport
 			// do not include CNAME, create a random one.
 			else if (!this.#cnameForProducers)
 			{
-				this.#cnameForProducers = uuidv4().substr(0, 8);
+				this.#cnameForProducers = randomUUID().substring(0, 8);
 			}
 
 			// Override Producer's CNAME.
@@ -615,7 +615,7 @@ export class Transport
 
 		const reqData =
 		{
-			producerId : id || uuidv4(),
+			producerId : id ?? randomUUID(),
 			kind,
 			rtpParameters,
 			rtpMapping,
@@ -747,7 +747,7 @@ export class Transport
 
 		const reqData =
 		{
-			consumerId             : uuidv4(),
+			consumerId             : randomUUID(),
 			producerId,
 			kind                   : producer.kind,
 			rtpParameters,
@@ -844,7 +844,7 @@ export class Transport
 
 		const reqData =
 		{
-			dataProducerId : id || uuidv4(),
+			dataProducerId : id ?? randomUUID(),
 			type,
 			sctpStreamParameters,
 			label,
@@ -967,7 +967,7 @@ export class Transport
 
 		const reqData =
 		{
-			dataConsumerId : uuidv4(),
+			dataConsumerId : randomUUID(),
 			dataProducerId,
 			type,
 			sctpStreamParameters,

diff --git a/node/src/Worker.ts b/node/src/Worker.ts
@@ -1,7 +1,8 @@
 import * as process from 'process';
 import * as path from 'path';
 import { spawn, ChildProcess } from 'child_process';
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
+
 import { Logger } from './Logger';
 import { EnhancedEventEmitter } from './EnhancedEventEmitter';
 import * as ortc from './ortc';
@@ -635,7 +636,7 @@ export class Worker<WorkerAppData extends AppData = AppData>
 
 		const reqData =
 		{
-			webRtcServerId : uuidv4(),
+			webRtcServerId : randomUUID(),
 			listenInfos
 		};
 
@@ -676,7 +677,7 @@ export class Worker<WorkerAppData extends AppData = AppData>
 		// This may throw.
 		const rtpCapabilities = ortc.generateRouterRtpCapabilities(mediaCodecs);
 
-		const reqData = { routerId: uuidv4() };
+		const reqData = { routerId: randomUUID() };
 
 		await this.#channel.request('worker.createRouter', undefined, reqData);
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -91,15 +91,13 @@
     "h264-profile-level-id": "^1.0.1",
     "node-fetch": "^3.3.2",
     "supports-color": "^9.4.0",
-    "tar": "^6.1.15",
-    "uuid": "^9.0.0"
+    "tar": "^6.1.15"
   },
   "devDependencies": {
     "@octokit/rest": "^20.0.1",
     "@types/debug": "^4.1.8",
     "@types/jest": "^29.5.3",
     "@types/node": "^20.4.9",
-    "@types/uuid": "^9.0.2",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
     "eslint": "^8.46.0",

diff --git a/worker/scripts/package-lock.json b/worker/scripts/package-lock.json