@scrypted/server 0.7.58 → 0.7.60

package/package.json

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

package/python/plugin_remote.py

@@ -224,6 +224,7 @@ class PluginRemote:
     mediaManager: MediaManager
     loop: AbstractEventLoop
     consoles: Mapping[str, Future[Tuple[StreamReader, StreamWriter]]] = {}
+    ptimeSum = 0
 
     def __init__(self, peer: rpc.RpcPeer, api, pluginId, hostInfo, loop: AbstractEventLoop):
         self.allMemoryStats = {}
@@ -309,7 +310,7 @@ class PluginRemote:
         clusterPeers: Mapping[int, asyncio.Future[rpc.RpcPeer]] = {}
         async def connectRPCObject(value):
             clusterObject = getattr(value, '__cluster')
-            if not clusterObject:
+            if type(clusterObject) is not dict:
                 return value
 
             if clusterObject.get('id', None) != clusterId:
@@ -522,6 +523,7 @@ class PluginRemote:
                     forkPeer.peerName = 'thread'
 
                     async def updateStats(stats):
+                        self.ptimeSum += stats['cpu']['user']
                         self.allMemoryStats[forkPeer] = stats
                     forkPeer.params['updateStats'] = updateStats
 
@@ -535,6 +537,7 @@ class PluginRemote:
                             self.allMemoryStats.pop(forkPeer)
                             parent_conn.close()
                             rpcTransport.executor.shutdown()
+                            pluginFork.worker.kill()
                     asyncio.run_coroutine_threadsafe(forkReadLoop(), loop=self.loop)
                     getRemote = await forkPeer.getParam('getRemote')
                     remote: PluginRemote = await getRemote(self.api, self.pluginId, self.hostInfo)
@@ -614,7 +617,7 @@ class PluginRemote:
         pass
 
     async def start_stats_runner(self):
-        update_stats = await self.peer.getParam('updateStats')
+        update_stats = await self.peer.getParam('updateStats') + self.ptimeSum
         if not update_stats:
             print('host did not provide update_stats')
             return
@@ -634,7 +637,6 @@ class PluginRemote:
                     heapTotal = 0
 
             for _, stats in self.allMemoryStats.items():
-                ptime += stats['cpu']['user']
                 heapTotal += stats['memoryUsage']['heapTotal']
 
             stats = {

package/src/media-helpers.ts

@@ -17,6 +17,13 @@ export function safeKillFFmpeg(cp: ChildProcess) {
     catch (e) {
     }
     setTimeout(() => {
+        for (const f of cp.stdio) {
+            try {
+                f?.destroy();
+            }
+            catch (e) {
+            }
+        }
         cp.kill();
         setTimeout(() => {
             cp.kill('SIGKILL');

package/src/plugin/media.ts

@@ -9,27 +9,8 @@ import Graph from 'node-dijkstra';
 import os from 'os';
 import path from 'path';
 import MimeType from 'whatwg-mimetype';
-import { RpcPeer } from "../rpc";
 import { MediaObjectRemote } from "./plugin-api";
-
-class MediaObject implements MediaObjectRemote {
-    __proxy_props: any;
-
-    constructor(public mimeType: string, public data: any, options: MediaObjectOptions) {
-        this.__proxy_props = {}
-        options ||= {};
-        options.mimeType = mimeType;
-        for (const [key, value] of Object.entries(options)) {
-            if (RpcPeer.isTransportSafe(value))
-                this.__proxy_props[key] = value;
-            (this as any)[key] = value;
-        }
-    }
-
-    async getData(): Promise<Buffer | string> {
-        return Promise.resolve(this.data);
-    }
-}
+import { MediaObject } from "./mediaobject";
 
 function typeMatches(target: string, candidate: string): boolean {
     // candidate will accept anything

package/src/plugin/mediaobject.ts

@@ -0,0 +1,22 @@
+import { MediaObjectOptions } from "@scrypted/types";
+import { RpcPeer } from "../rpc";
+import { MediaObjectRemote } from "./plugin-api";
+
+export class MediaObject implements MediaObjectRemote {
+    __proxy_props: any;
+
+    constructor(public mimeType: string, public data: any, options: MediaObjectOptions) {
+        this.__proxy_props = {}
+        options ||= {};
+        options.mimeType = mimeType;
+        for (const [key, value] of Object.entries(options)) {
+            if (RpcPeer.isTransportSafe(value))
+                this.__proxy_props[key] = value;
+            (this as any)[key] = value;
+        }
+    }
+
+    async getData(): Promise<Buffer | string> {
+        return Promise.resolve(this.data);
+    }
+}

package/src/plugin/system.ts

@@ -1,7 +1,7 @@
 import { EventListener, EventListenerOptions, EventListenerRegister, Logger, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, ScryptedInterfaceDescriptor, ScryptedInterfaceDescriptors, ScryptedInterfaceProperty, SystemDeviceState, SystemManager } from "@scrypted/types";
 import { EventRegistry } from "../event-registry";
 import { PrimitiveProxyHandler, RpcPeer } from '../rpc';
-import type { PluginComponent } from "../services/plugin";
+// import type { PluginComponent } from "../services/plugin";
 import { getInterfaceMethods, getInterfaceProperties, getPropertyInterfaces, isValidInterfaceMethod, propertyInterfaces } from "./descriptor";
 import { PluginAPI } from "./plugin-api";
 
@@ -122,7 +122,7 @@ class DeviceProxyHandler implements PrimitiveProxyHandler<any>, ScryptedDevice {
     }
 
     async setMixins(mixins: string[]) {
-        const plugins = await this.systemManager.getComponent('plugins') as PluginComponent;
+        const plugins = await this.systemManager.getComponent('plugins');// as PluginComponent;
         await plugins.setMixins(this.id, mixins);
     }