Merge branch 'main' of github.com:koush/scrypted

koush · Jul 31, 2024 · 782c993 · 782c993
2 parents d0b46c3 + 6c7671d
commit 782c993
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/plugins/reolink/package-lock.json b/plugins/reolink/package-lock.json
diff --git a/plugins/reolink/package.json b/plugins/reolink/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/reolink",
-   "version": "0.0.88",
+   "version": "0.0.90",
    "description": "Reolink Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

diff --git a/plugins/reolink/src/reolink-api.ts b/plugins/reolink/src/reolink-api.ts
@@ -260,7 +260,7 @@ export class ReolinkCameraClient {
             op += 'Up';
 
         if (op) {
-            await this.ptzOp(op, Math.round((command.speed?.pan || command.speed?.tilt || 1) * 10));
+            await this.ptzOp(op, Math.round((command?.pan || command?.tilt || 1) * 10));
         }
 
         if (command.zoom < 0)
@@ -269,7 +269,7 @@ export class ReolinkCameraClient {
             op = 'ZoomInc';
 
         if (op) {
-            await this.ptzOp(op, Math.round((command.speed?.zoom || 1) * 10));
+            await this.ptzOp(op, Math.round((command?.zoom || 1) * 10));
         }
     }
 

diff --git a/server/src/scrypted-plugin-main.ts b/server/src/scrypted-plugin-main.ts
@@ -8,10 +8,10 @@ import { RpcMessage } from "./rpc";
 
 function start(mainFilename: string) {
     const pluginId = process.argv[3];
-    console.log('starting plugin', pluginId);
     module.paths.push(getPluginNodePath(pluginId));
 
     if (process.argv[2] === 'child-thread') {
+        console.log('starting thread', pluginId);
         const { port } = worker_threads.workerData as { port: worker_threads.MessagePort };
         const peer = startPluginRemote(mainFilename, pluginId, (message, reject) => {
             try {
@@ -34,6 +34,7 @@ function start(mainFilename: string) {
         });
     }
     else {
+        console.log('starting plugin', pluginId);
         const peer = startPluginRemote(mainFilename, process.argv[3], (message, reject, serializationContext) => process.send(message, serializationContext?.sendHandle, {
             swallowErrors: !reject,
         }, e => {