webrtc: update deps, update zygote invocation.

koush · Aug 5, 2024 · aa5c4d5 · aa5c4d5
1 parent 40ff2a8
commit aa5c4d5
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 65 deletions.
diff --git a/external/werift b/external/werift
diff --git a/plugins/webrtc/package-lock.json b/plugins/webrtc/package-lock.json
diff --git a/plugins/webrtc/package.json b/plugins/webrtc/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/webrtc",
-   "version": "0.2.33",
+   "version": "0.2.37",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
       "prescrypted-setup-project": "scrypted-package-json",
@@ -33,10 +33,10 @@
    "dependencies": {
       "@scrypted/common": "file:../../common",
       "@scrypted/sdk": "file:../../sdk",
-      "ip": "^1.1.5"
+      "ip": "^2.0.1"
    },
    "devDependencies": {
-      "@types/ip": "^1.1.0",
-      "@types/node": "^18.11.18"
+      "@types/ip": "^1.1.3",
+      "@types/node": "^22.1.0"
    }
 }
diff --git a/plugins/webrtc/src/main.ts b/plugins/webrtc/src/main.ts
@@ -20,6 +20,7 @@ import { WebRTCCamera } from "./webrtc-camera";
 import { MediaStreamTrack, PeerConfig, RTCPeerConnection, defaultPeerConfig } from './werift';
 import { WeriftSignalingSession } from './werift-signaling-session';
 import { RTCPeerConnectionPipe, createRTCPeerConnectionSource, getRTCMediaStreamOptions } from './wrtc-to-rtsp';
+import worker_threads from 'worker_threads';
 
 const { mediaManager, systemManager, deviceManager } = sdk;
 
@@ -29,7 +30,7 @@ defaultPeerConfig.headerExtensions = {
     audio: [],
 };
 
-const zygote = createZygote<ReturnType<typeof fork>>();
+const zygote = worker_threads.isMainThread ? createZygote<ReturnType<typeof fork>>() : undefined;
 
 class WebRTCMixin extends SettingsMixinDeviceBase<RTCSignalingClient & VideoCamera & RTCSignalingChannel & Intercom> implements RTCSignalingChannel, VideoCamera, Intercom {
     storageSettings = new StorageSettings(this, {});

diff --git a/plugins/webrtc/tsconfig.json b/plugins/webrtc/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
+        "module": "Node16",
         "target": "ES2021",
         "resolveJsonModule": true,
         "moduleResolution": "Node16",