server/sdk: forks can be associated with specific device/mixin

koush · Aug 27, 2024 · df7deef · df7deef
1 parent e94cea0
commit df7deef
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
diff --git a/sdk/package.json b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/sdk",
-  "version": "0.3.57",
+  "version": "0.3.60",
   "description": "",
   "main": "dist/src/index.js",
   "exports": {

diff --git a/sdk/types/package-lock.json b/sdk/types/package-lock.json
diff --git a/sdk/types/package.json b/sdk/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/types",
-  "version": "0.3.53",
+  "version": "0.3.56",
   "description": "",
   "main": "dist/index.js",
   "author": "",

diff --git a/sdk/types/src/types.input.ts b/sdk/types/src/types.input.ts
@@ -2583,6 +2583,8 @@ export interface ForkOptions {
   name?: string;
   filename?: string;
   runtime?: string;
+  id?: string;
+  nativeId?: ScryptedNativeId;
 }
 
 export interface ScryptedStatic {

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@scrypted/ffmpeg-static": "^6.1.0-build1",
     "@scrypted/node-pty": "^1.0.18",
-    "@scrypted/types": "^0.3.53",
+    "@scrypted/types": "^0.3.56",
     "adm-zip": "^0.5.15",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",

diff --git a/server/src/plugin/plugin-remote-worker.ts b/server/src/plugin/plugin-remote-worker.ts
@@ -32,6 +32,7 @@ const serverVersion = require('../../package.json').version;
 export interface StartPluginRemoteOptions {
     onClusterPeer?(peer: RpcPeer): void;
     sourceURL?(filename: string): string;
+    consoleId?: string;
 }
 
 export function startPluginRemote(mainFilename: string, pluginId: string, peerSend: (message: RpcMessage, reject?: (e: Error) => void, serializationContext?: any) => void, startPluginRemoteOptions?: StartPluginRemoteOptions) {
@@ -540,7 +541,8 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
 
                     if (runtimeWorker instanceof ChildProcessWorker) {
                         nativeWorker = runtimeWorker.childProcess;
-                        pipeWorkerConsole(nativeWorker);
+                        const console = options?.id ? getMixinConsole(options.id, options.nativeId) : undefined;
+                        pipeWorkerConsole(nativeWorker, console);
                     }
                 }
                 else {