@scrypted/server 0.7.68 → 0.7.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.7.68",
+  "version": "0.7.70",
   "description": "",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.10",

package/python/plugin_remote.py

@@ -318,6 +318,11 @@ class PluginRemote:
             
             port = clusterObject['port']
             proxyId = clusterObject['proxyId']
+            if port == clusterPort:
+                newValue = self.peer.localProxyMap.get(id, None)
+                if not newValue:
+                    raise Exception('ipc object not found?')
+                return newValue
 
             clusterPeerPromise = clusterPeers.get(port)
             if not clusterPeerPromise:
@@ -355,11 +360,12 @@ class PluginRemote:
 
         def onProxySerialization(value: Any, proxyId: str):
             properties: dict = rpc.RpcPeer.prepareProxyProperties(value) or {}
-            properties['__cluster'] = {
-                'id': clusterId,
-                'proxyId': proxyId,
-                'port': clusterPort,
-            }
+            if not properties.get('__cluster', None):
+                properties['__cluster'] = {
+                    'id': clusterId,
+                    'proxyId': proxyId,
+                    'port': clusterPort,
+                }
             return properties
 
         self.peer.onProxySerialization = onProxySerialization

package/src/plugin/plugin-remote-worker.ts

@@ -96,9 +96,11 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
 
             peer.onProxySerialization = (value, proxyId) => {
                 const properties = RpcPeer.prepareProxyProperties(value) || {};
-                properties.__cluster = {
-                    ...clusterEntry,
-                    proxyId,
+                if (!properties.__cluster) {
+                    properties.__cluster = {
+                        ...clusterEntry,
+                        proxyId,
+                    }
                 }
                 return properties;
             }
@@ -109,6 +111,13 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
                 if (clusterObject?.id !== clusterId)
                     return value;
                 const { port, proxyId } = clusterObject;
+                if (port === clusterPort) {
+                    // this is a local object.
+                    const newValue = peer.localProxyMap.get(proxyId);
+                    if (!newValue)
+                        throw new Error('ipc object not found?');
+                    return newValue;
+                }
 
                 let clusterPeerPromise = clusterPeers.get(port);
                 if (!clusterPeerPromise) {
@@ -136,6 +145,12 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
                     const newValue = await connectRPCObject(proxyId, portSecret);
                     if (!newValue)
                         throw new Error('ipc object not found?');
+                    // reassign the cluster identity in case this object gets passed back into the cluster.
+                    newValue.__cluster = {
+                        id: clusterId,
+                        port,
+                        proxyId,
+                    };
                     return newValue;
                 }
                 catch (e) {