@scrypted/server 0.123.21 → 0.123.23

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

@@ -12,7 +12,6 @@ import { PluginAPI, PluginAPIProxy, PluginRemote, PluginRemoteLoadZipOptions, Pl
 import { 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';
 import { createREPLServer } from './plugin-repl';
 import { getPluginVolume } from './plugin-volume';
 import { ChildProcessWorker } from './runtime/child-process-worker';
@@ -196,12 +195,6 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
 
             await installOptionalDependencies(getPluginConsole(), packageJson);
 
-            // process.cpuUsage is for the entire process.
-            // process.memoryUsage is per thread.
-            const allMemoryStats = new Map<RuntimeWorker, NodeJS.MemoryUsage>();
-            // start the stats updater/watchdog after installation has finished, as that may take some time.
-            startStatsUpdater(allMemoryStats, zipAPI.updateStats);
-
             peer.params.ping = async (time: number, pong: (time: number) => Promise<void>) => {
                 await pong(time);
             };
@@ -315,13 +308,11 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
                         threadPeer.kill('worker exited');
                         forkApi.removeListeners();
                         forks.delete(remote);
-                        allMemoryStats.delete(runtimeWorker);
                     });
                     runtimeWorker.on('error', e => {
                         threadPeer.kill('worker error ' + e);
                         forkApi.removeListeners();
                         forks.delete(remote);
-                        allMemoryStats.delete(runtimeWorker);
                     });
 
                     for (const [nativeId, dmd] of deviceManager.nativeIds.entries()) {
@@ -331,9 +322,7 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
                     const forkOptions = Object.assign({}, zipOptions);
                     forkOptions.fork = true;
                     forkOptions.main = options?.filename;
-                    const forkZipAPI = new PluginZipAPI(() => zipAPI.getZip(), async (stats: PluginStats) => {
-                        allMemoryStats.set(runtimeWorker, stats.memoryUsage);
-                    });
+                    const forkZipAPI = new PluginZipAPI(() => zipAPI.getZip());
                     return remote.loadZip(packageJson, forkZipAPI, forkOptions)
                 })();
 

package/src/scrypted-cluster-main.ts

@@ -1,5 +1,6 @@
 import type { ForkOptions } from '@scrypted/types';
 import { once } from 'events';
+import net from 'net';
 import { install as installSourceMapSupport } from 'source-map-support';
 import type { Readable } from 'stream';
 import tls from 'tls';
@@ -67,6 +68,7 @@ export interface ClusterWorkerProperties {
 
 export interface ClusterWorker extends ClusterWorkerProperties {
     peer: RpcPeer;
+    forks: Set<ClusterForkOptions>;
 }
 
 export class PeerLiveness {
@@ -109,9 +111,22 @@ export function startClusterClient(mainFilename: string) {
             // to hang the app since no window is created yet.
             await sleep(1000);
 
-            const socket = tls.connect({
+            const rawSocket = net.connect({
                 host,
                 port,
+                // require ipv4 to normalize cluster address.
+                family: 4,
+            });
+
+            try {
+                await once(rawSocket, 'connect');
+            }
+            catch( e) {
+                continue;
+            }
+
+            const socket = tls.connect({
+                socket: rawSocket,
                 rejectUnauthorized: false,
             });
 
@@ -273,6 +288,7 @@ export function createClusterServer(runtime: ScryptedRuntime, certificate: Retur
                 const worker: ClusterWorker = {
                     ...properties,
                     peer,
+                    forks: new Set(),
                 };
                 runtime.clusterWorkers.add(worker);
                 peer.killed.then(() => {

package/src/services/cluster-fork.ts

@@ -18,7 +18,12 @@ export class ClusterFork {
             throw new Error(`no worker found for cluster labels ${JSON.stringify(options.labels)}`);
 
         const fork: ClusterForkParam = await worker.peer.getParam('fork');
-        return fork(peerLiveness, options.runtime, packageJson, zipHash, getZip);
+        const forkResult = await fork(peerLiveness, options.runtime, packageJson, zipHash, getZip);
+        worker.forks.add(options);
+        forkResult.waitKilled().catch(() => {}).finally(() => {
+            worker.forks.delete(options);
+        });
+        return forkResult;
     }
 
     async getClusterWorkers() {
@@ -26,6 +31,7 @@ export class ClusterFork {
         for (const worker of this.runtime.clusterWorkers) {
             ret[worker.peer.peerName] = {
                 labels: worker.labels,
+                forks: [...worker.forks],
             };
         }
         return ret;

package/src/services/plugin.ts

@@ -115,7 +115,6 @@ export class PluginComponent {
         return {
             pid: host?.worker?.pid,
             clientsCount: host?.io?.clientsCount,
-            stats: host?.stats,
             rpcObjects,
             packageJson,
             pendingResults,

package/dist/plugin/plugin-remote-stats.d.ts

@@ -1,7 +0,0 @@
-import { RuntimeWorker } from "./runtime/runtime-worker";
-export interface PluginStats {
-    type: 'stats';
-    cpuUsage: NodeJS.CpuUsage;
-    memoryUsage: NodeJS.MemoryUsage;
-}
-export declare function startStatsUpdater(allMemoryStats: Map<RuntimeWorker, NodeJS.MemoryUsage>, updateStats: (stats: PluginStats) => Promise<void>): void;

package/dist/plugin/plugin-remote-stats.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.startStatsUpdater = startStatsUpdater;
-function startStatsUpdater(allMemoryStats, updateStats) {
-    if (!updateStats)
-        console.warn('wtf');
-    setInterval(() => {
-        let cpuUsage;
-        let memoryUsage;
-        if (process.cpuUsage)
-            cpuUsage = process.cpuUsage();
-        allMemoryStats.set(undefined, process.memoryUsage());
-        memoryUsage = {
-            rss: 0,
-            heapTotal: 0,
-            heapUsed: 0,
-            external: 0,
-            arrayBuffers: 0,
-        };
-        for (const mu of allMemoryStats.values()) {
-            if (!mu)
-                continue;
-            memoryUsage.rss += mu.rss;
-            memoryUsage.heapTotal += mu.heapTotal;
-            memoryUsage.heapUsed += mu.heapUsed;
-            memoryUsage.external += mu.external;
-            memoryUsage.arrayBuffers += mu.arrayBuffers;
-        }
-        updateStats({
-            type: 'stats',
-            cpuUsage,
-            memoryUsage,
-        }).catch(() => { });
-    }, 10000);
-}
-//# sourceMappingURL=plugin-remote-stats.js.map

package/dist/plugin/plugin-remote-stats.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-remote-stats.js","sourceRoot":"","sources":["../../src/plugin/plugin-remote-stats.ts"],"names":[],"mappings":";;AAQA,8CAmCC;AAnCD,SAAgB,iBAAiB,CAAC,cAAsD,EAAE,WAAkD;IACxI,IAAI,CAAC,WAAW;QACZ,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACvB,WAAW,CAAC,GAAG,EAAE;QACb,IAAI,QAAyB,CAAC;QAC9B,IAAI,WAA+B,CAAC;QACpC,IAAI,OAAO,CAAC,QAAQ;YAChB,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QAElC,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAErD,WAAW,GAAG;YACV,GAAG,EAAE,CAAC;YACN,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC;YACX,YAAY,EAAE,CAAC;SAClB,CAAA;QAED,KAAK,MAAM,EAAE,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC,EAAE;gBACH,SAAS;YACb,WAAW,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC;YAC1B,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,SAAS,CAAC;YACtC,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,CAAC;YACpC,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,CAAC;YACpC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,YAAY,CAAC;QAChD,CAAC;QAED,WAAW,CAAC;YACR,IAAI,EAAE,OAAO;YACb,QAAQ;YACR,WAAW;SACd,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACvB,CAAC,EAAE,KAAK,CAAC,CAAC;AACd,CAAC"}

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

@@ -1,44 +0,0 @@
-import { RuntimeWorker } from "./runtime/runtime-worker";
-
-export interface PluginStats {
-    type: 'stats',
-    cpuUsage: NodeJS.CpuUsage;
-    memoryUsage: NodeJS.MemoryUsage;
-}
-
-export function startStatsUpdater(allMemoryStats: Map<RuntimeWorker, NodeJS.MemoryUsage>, updateStats: (stats: PluginStats) => Promise<void>) {
-    if (!updateStats)
-        console.warn('wtf')
-    setInterval(() => {
-        let cpuUsage: NodeJS.CpuUsage;
-        let memoryUsage: NodeJS.MemoryUsage;
-        if (process.cpuUsage)
-            cpuUsage = process.cpuUsage();
-
-        allMemoryStats.set(undefined, process.memoryUsage());
-
-        memoryUsage = {
-            rss: 0,
-            heapTotal: 0,
-            heapUsed: 0,
-            external: 0,
-            arrayBuffers: 0,
-        }
-
-        for (const mu of allMemoryStats.values()) {
-            if (!mu)
-                continue;
-            memoryUsage.rss += mu.rss;
-            memoryUsage.heapTotal += mu.heapTotal;
-            memoryUsage.heapUsed += mu.heapUsed;
-            memoryUsage.external += mu.external;
-            memoryUsage.arrayBuffers += mu.arrayBuffers;
-        }
-
-        updateStats({
-            type: 'stats',
-            cpuUsage,
-            memoryUsage,
-        }).catch(() => {});
-    }, 10000);
-}