From b0557704b2fa0be7898be41c583044da5e73d596 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 12 Nov 2024 12:19:09 -0800
Subject: [PATCH] cleanup

---
 server/src/plugin/plugin-console.ts       | 11 ++++++++++-
 server/src/plugin/plugin-remote-worker.ts | 14 ++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/server/src/plugin/plugin-console.ts b/server/src/plugin/plugin-console.ts
index ed412fc5c..6f0bc1a00 100644
--- a/server/src/plugin/plugin-console.ts
+++ b/server/src/plugin/plugin-console.ts
@@ -334,7 +334,7 @@ export function pipeWorkerConsole(nativeWorker: { stdout: Readable, stderr: Read
     });
 }
 
-export async function iterateWorkerConsole(asyncIterator: AsyncGenerator<Buffer>, useConsole = console) {
+export async function iterateWorkerConsoleLog(asyncIterator: AsyncGenerator<Buffer>, useConsole = console) {
     try {
         for await (const data of asyncIterator) {
             useConsole.log(data.toString());
@@ -343,3 +343,12 @@ export async function iterateWorkerConsole(asyncIterator: AsyncGenerator<Buffer>
     catch (e) {
     }
 }
+export async function iterateWorkerConsoleError(asyncIterator: AsyncGenerator<Buffer>, useConsole = console) {
+    try {
+        for await (const data of asyncIterator) {
+            useConsole.error(data.toString());
+        }
+    }
+    catch (e) {
+    }
+}
diff --git a/server/src/plugin/plugin-remote-worker.ts b/server/src/plugin/plugin-remote-worker.ts
index 34dc8e135..d0791ab55 100644
--- a/server/src/plugin/plugin-remote-worker.ts
+++ b/server/src/plugin/plugin-remote-worker.ts
@@ -7,18 +7,17 @@ import path from 'path';
 import { install as installSourceMapSupport } from 'source-map-support';
 import { EventEmitter } from 'stream';
 import worker_threads from 'worker_threads';
-import { computeClusterObjectHash } from '../cluster/cluster-hash';
 import { ClusterObject, ConnectRPCObject } from '../cluster/connect-rpc-object';
 import { Deferred } from '../deferred';
-import { listenZero } from '../listen-zero';
 import { RpcMessage, RpcPeer } from '../rpc';
 import { evalLocal } from '../rpc-peer-eval';
 import { createDuplexRpcPeer } from '../rpc-serializer';
-import { getClusterLabels, InitializeCluster, matchesClusterLabels, PeerLiveness } from '../scrypted-cluster';
+import { getClusterLabels, matchesClusterLabels, PeerLiveness } from '../scrypted-cluster';
+import { getClusterPeerKey, prepareClusterPeer } from '../scrypted-cluster-common';
 import type { ClusterFork } from '../services/cluster-fork';
 import { MediaManagerImpl } from './media';
 import { PluginAPI, PluginAPIProxy, PluginRemote, PluginRemoteLoadZipOptions, PluginZipAPI } from './plugin-api';
-import { iterateWorkerConsole, pipeWorkerConsole, prepareConsoles } from './plugin-console';
+import { iterateWorkerConsoleError, iterateWorkerConsoleLog, pipeWorkerConsole, prepareConsoles } from './plugin-console';
 import { getPluginNodePath, installOptionalDependencies } from './plugin-npm-dependencies';
 import { attachPluginRemote, DeviceManagerImpl, setupPluginRemote } from './plugin-remote';
 import { PluginStats, startStatsUpdater } from './plugin-remote-stats';
@@ -29,7 +28,6 @@ import { NodeThreadWorker } from './runtime/node-thread-worker';
 import { prepareZip } from './runtime/node-worker-common';
 import { getBuiltinRuntimeHosts } from './runtime/runtime-host';
 import { RuntimeWorker } from './runtime/runtime-worker';
-import { getClusterPeerKey, prepareClusterPeer } from '../scrypted-cluster-common';
 
 const serverVersion = require('../../package.json').version;
 
@@ -468,7 +466,7 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
                         });
 
                         try {
-                            const clusterGetRemote = await clusterForkResult.getResult();
+                            const clusterGetRemote = await scrypted.connectRPCObject(await clusterForkResult.getResult());
                             const {
                                 stdout,
                                 stderr,
@@ -476,8 +474,8 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
                             } = await clusterGetRemote();
 
                             const console = options?.id ? getMixinConsole(options.id, options.nativeId) : undefined;
-                            iterateWorkerConsole(stdout, console).catch(() => {});
-                            iterateWorkerConsole(stderr, console).catch(() => {});
+                            iterateWorkerConsoleLog(stdout, console).catch(() => {});
+                            iterateWorkerConsoleError(stderr, console).catch(() => {});
 
                             const directGetRemote = await scrypted.connectRPCObject(getRemote);
                             if (directGetRemote === getRemote)