@scrypted/server 0.123.23 → 0.123.24

package/src/scrypted-cluster-main.ts

@@ -1,3 +1,4 @@
+import os from 'os';
 import type { ForkOptions } from '@scrypted/types';
 import { once } from 'events';
 import net from 'net';
@@ -39,7 +40,7 @@ function peerLifecycle(serializer: ReturnType<typeof createRpcDuplexSerializer>,
     socket.on('close', () => {
         peer.kill(`cluster ${type} closed`);
     });
-    peer.killed.then(() => {
+    peer.killedSafe.finally(() => {
         socket.destroy();
     });
 }
@@ -121,7 +122,7 @@ export function startClusterClient(mainFilename: string) {
             try {
                 await once(rawSocket, 'connect');
             }
-            catch( e) {
+            catch (e) {
                 continue;
             }
 
@@ -155,7 +156,7 @@ export function startClusterClient(mainFilename: string) {
                 const auth: ClusterObject = {
                     address: socket.localAddress,
                     port: socket.localPort,
-                    id: undefined,
+                    id: process.env.SCRYPTED_CLUSTER_ID || os.hostname(),
                     proxyId: undefined,
                     sourceKey: undefined,
                     sha256: undefined,
@@ -209,17 +210,19 @@ export function startClusterClient(mainFilename: string) {
                     runtimeWorker.on('error', e => {
                         threadPeer.kill('worker error ' + e);
                     });
-                    threadPeer.killed.catch(() => { }).finally(() => {
+                    threadPeer.killedSafe.finally(() => {
                         runtimeWorker.kill();
                     });
                     peerLiveness.waitKilled().catch(() => { }).finally(() => {
                         threadPeer.kill('peer killed');
                     });
                     let getRemote: any;
+                    let ping: any;
                     try {
                         const initializeCluster: InitializeCluster = await threadPeer.getParam('initializeCluster');
                         await initializeCluster({ clusterId, clusterSecret });
                         getRemote = await threadPeer.getParam('getRemote');
+                        ping = await threadPeer.getParam('ping');
                     }
                     catch (e) {
                         threadPeer.kill('cluster fork failed');
@@ -242,6 +245,7 @@ export function startClusterClient(mainFilename: string) {
                             stdout: readStream(runtimeWorker.stdout),
                             stderr: readStream(runtimeWorker.stderr),
                             getRemote,
+                            ping,
                         };
                     };
 
@@ -255,9 +259,12 @@ export function startClusterClient(mainFilename: string) {
             }
             catch (e) {
                 peer.kill(e.message);
-                socket.destroy();
                 console.warn('Cluster client error:', localAddress, localPort, e);
             }
+            finally {
+                peer.kill();
+                socket.destroy();
+            }
         }
     })();
 }
@@ -279,6 +286,9 @@ export function createClusterServer(runtime: ScryptedRuntime, certificate: Retur
                 const sha256 = computeClusterObjectHash(auth, runtime.clusterSecret);
                 if (sha256 !== auth.sha256)
                     throw new Error('cluster object hash mismatch');
+
+                peer.peerName = auth.id || `${socket.remoteAddress}`;
+
                 // the remote address may be ipv6 prefixed so use a fuzzy match.
                 // eg ::ffff:192.168.2.124
                 if (!process.env.SCRYPTED_DISABLE_CLUSTER_SERVER_TRUST) {
@@ -291,7 +301,7 @@ export function createClusterServer(runtime: ScryptedRuntime, certificate: Retur
                     forks: new Set(),
                 };
                 runtime.clusterWorkers.add(worker);
-                peer.killed.then(() => {
+                peer.killedSafe.finally(() => {
                     runtime.clusterWorkers.delete(worker);
                 });
                 socket.on('close', () => {