server: guard entire plugin load block

server: log plugin load failure
common: listenZeroSingleClient configurable timeout
2026-02-03 14:13:28 +00:00 · 2024-06-01 13:07:55 -07:00 · 2024-06-01 13:05:56 -07:00 · 2024-06-01 09:44:51 -07:00 · 2024-06-01 09:19:32 -07:00 · 2024-06-01 08:49:37 -07:00
16 changed files with 94 additions and 69 deletions
--- a/plugins/coreml/package-lock.json
+++ b/plugins/coreml/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/coreml",
-   "version": "0.1.53",
+   "version": "0.1.54",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/coreml",
-         "version": "0.1.53",
+         "version": "0.1.54",
         "devDependencies": {
            "@scrypted/sdk": "file:../../sdk"
         }
--- a/plugins/coreml/package.json
+++ b/plugins/coreml/package.json
@@ -42,5 +42,5 @@
   "devDependencies": {
      "@scrypted/sdk": "file:../../sdk"
   },
-   "version": "0.1.53"
+   "version": "0.1.54"
 }
--- a/plugins/coreml/src/coreml/init.py
+++ b/plugins/coreml/src/coreml/init.py
@@ -26,17 +26,13 @@ predictExecutor = concurrent.futures.ThreadPoolExecutor(1, "CoreML-Predict")

 availableModels = [
    "Default",
+    "scrypted_yolov10m_320",
    "scrypted_yolov10n_320",
-    "scrypted_yolov10n",
    "scrypted_yolo_nas_s_320",
    "scrypted_yolov9c_320",
-    "scrypted_yolov9c",
    "scrypted_yolov6n_320",
-    "scrypted_yolov6n",
    "scrypted_yolov6s_320",
-    "scrypted_yolov6s",
    "scrypted_yolov8n_320",
-    "scrypted_yolov8n",
    "ssdlite_mobilenet_v2",
    "yolov4-tiny",
 ]
@@ -80,7 +76,7 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.Settings, scrypted_sdk.DeviceProv
                self.storage.setItem("model", "Default")
            model = "scrypted_yolov9c_320"
        self.yolo = "yolo" in model
-        self.scrypted_yolov10n = "scrypted_yolov10n" in model
+        self.scrypted_yolov10n = "scrypted_yolov10" in model
        self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
        self.scrypted_yolo = "scrypted_yolo" in model
        self.scrypted_model = "scrypted" in model
--- a/plugins/onnx/package-lock.json
+++ b/plugins/onnx/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/openvino",
-   "version": "0.1.92",
+   "version": "0.1.93",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/openvino",
-         "version": "0.1.92",
+         "version": "0.1.93",
         "devDependencies": {
            "@scrypted/sdk": "file:../../sdk"
         }
--- a/plugins/onnx/package.json
+++ b/plugins/onnx/package.json
@@ -42,5 +42,5 @@
   "devDependencies": {
      "@scrypted/sdk": "file:../../sdk"
   },
-   "version": "0.1.92"
+   "version": "0.1.93"
 }
--- a/plugins/onnx/src/ort/init.py
+++ b/plugins/onnx/src/ort/init.py
@@ -29,17 +29,13 @@ except:

 availableModels = [
    "Default",
+    "scrypted_yolov10m_320",
    "scrypted_yolov10n_320",
-    "scrypted_yolov10n",
    "scrypted_yolo_nas_s_320",
    "scrypted_yolov6n_320",
-    "scrypted_yolov6n",
    "scrypted_yolov6s_320",
-    "scrypted_yolov6s",
    "scrypted_yolov9c_320",
-    "scrypted_yolov9c",
    "scrypted_yolov8n_320",
-    "scrypted_yolov8n",
 ]

 def parse_labels(names):
--- a/plugins/openvino/package-lock.json
+++ b/plugins/openvino/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/openvino",
-   "version": "0.1.88",
+   "version": "0.1.89",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/openvino",
-         "version": "0.1.88",
+         "version": "0.1.89",
         "devDependencies": {
            "@scrypted/sdk": "file:../../sdk"
         }
--- a/plugins/openvino/package.json
+++ b/plugins/openvino/package.json
@@ -42,5 +42,5 @@
   "devDependencies": {
      "@scrypted/sdk": "file:../../sdk"
   },
-   "version": "0.1.88"
+   "version": "0.1.89"
 }
--- a/plugins/openvino/src/ov/init.py
+++ b/plugins/openvino/src/ov/init.py
@@ -30,17 +30,13 @@ prepareExecutor = concurrent.futures.ThreadPoolExecutor(1, "OpenVINO-Prepare")

 availableModels = [
    "Default",
+    "scrypted_yolov10m_320",
    "scrypted_yolov10n_320",
-    "scrypted_yolov10n",
    "scrypted_yolo_nas_s_320",
    "scrypted_yolov6n_320",
-    "scrypted_yolov6n",
    "scrypted_yolov6s_320",
-    "scrypted_yolov6s",
    "scrypted_yolov9c_320",
-    "scrypted_yolov9c",
    "scrypted_yolov8n_320",
-    "scrypted_yolov8n",
    "ssd_mobilenet_v1_coco",
    "ssdlite_mobilenet_v2",
    "yolo-v3-tiny-tf",
--- a/plugins/unifi-protect/package-lock.json
+++ b/plugins/unifi-protect/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/unifi-protect",
-   "version": "0.0.146",
+   "version": "0.0.149",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/unifi-protect",
-         "version": "0.0.146",
+         "version": "0.0.149",
         "license": "Apache",
         "dependencies": {
            "@koush/unifi-protect": "file:../../external/unifi-protect",
@@ -27,12 +27,12 @@
         "dependencies": {
            "@scrypted/sdk": "file:../sdk",
            "@scrypted/server": "file:../server",
-            "http-auth-utils": "^3.0.2",
-            "node-fetch-commonjs": "^3.1.1",
-            "typescript": "^4.4.3"
+            "http-auth-utils": "^5.0.1",
+            "typescript": "^5.3.3"
         },
         "devDependencies": {
-            "@types/node": "^16.9.0"
+            "@types/node": "^20.11.0",
+            "ts-node": "^10.9.2"
         }
      },
      "../../external/unifi-protect": {
@@ -61,12 +61,12 @@
      },
      "../../sdk": {
         "name": "@scrypted/sdk",
-         "version": "0.2.103",
+         "version": "0.3.31",
         "license": "ISC",
         "dependencies": {
            "@babel/preset-typescript": "^7.18.6",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -260,10 +260,10 @@
         "requires": {
            "@scrypted/sdk": "file:../sdk",
            "@scrypted/server": "file:../server",
-            "@types/node": "^16.9.0",
-            "http-auth-utils": "^3.0.2",
-            "node-fetch-commonjs": "^3.1.1",
-            "typescript": "^4.4.3"
+            "@types/node": "^20.11.0",
+            "http-auth-utils": "^5.0.1",
+            "ts-node": "^10.9.2",
+            "typescript": "^5.3.3"
         }
      },
      "@scrypted/sdk": {
@@ -273,7 +273,7 @@
            "@types/node": "^18.11.18",
            "@types/stringify-object": "^4.0.0",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
--- a/plugins/unifi-protect/package.json
+++ b/plugins/unifi-protect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/unifi-protect",
-   "version": "0.0.146",
+   "version": "0.0.149",
   "description": "Unifi Protect Plugin for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
--- a/plugins/unifi-protect/src/main.ts
+++ b/plugins/unifi-protect/src/main.ts
@@ -157,10 +157,11 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device
                const payload = updatePacket.payload as ProtectNvrUpdatePayloadEventAdd;
                if (!payload.camera)
                    return;
-                const unifiCamera = this.cameras.get(payload.camera);
+                const nativeId = this.getNativeId({ id: payload.camera }, false);
+                const unifiCamera = this.cameras.get(nativeId);

                if (!unifiCamera) {
-                    this.console.log('unknown device event, sync needed?', payload.camera);
+                    this.console.log('unknown device event, sync needed?', payload);
                    return;
                }

@@ -195,7 +196,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device
                //     id: '661d86bf03e69c03e408d62a',
                //     modelKey: 'event'
                // }
-                  
+
                if (payload.type === 'smartDetectZone' || payload.type === 'smartDetectLine') {
                    unifiCamera.resetDetectionTimeout();

@@ -602,7 +603,7 @@ export class UnifiProtect extends ScryptedDeviceBase implements Settings, Device
        return this.storageSettings.values.idMaps.nativeId?.[nativeId] || nativeId;
    }

-    getNativeId(device: any, update: boolean) {
+    getNativeId(device: { id?: string, mac?: string; anonymousDeviceId?: string }, update: boolean) {
        const { id, mac, anonymousDeviceId } = device;
        const idMaps = this.storageSettings.values.idMaps;

--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,18 +1,17 @@
 {
  "name": "@scrypted/server",
-  "version": "0.106.0",
+  "version": "0.108.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@scrypted/server",
-      "version": "0.106.0",
+      "version": "0.108.0",
      "hasInstallScript": true,
      "license": "ISC",
      "dependencies": {
        "@mapbox/node-pre-gyp": "^1.0.11",
        "@scrypted/ffmpeg-static": "^6.1.0-build1",
-        "@scrypted/node-pty": "^1.0.11",
        "@scrypted/types": "^0.3.30",
        "adm-zip": "^0.5.12",
        "body-parser": "^1.20.2",
@@ -57,6 +56,9 @@
        "@types/source-map-support": "^0.5.10",
        "@types/whatwg-mimetype": "^3.0.2",
        "@types/ws": "^8.5.10"
+      },
+      "optionalDependencies": {
+        "@scrypted/node-pty": "^1.0.11"
      }
    },
    "node_modules/@emnapi/runtime": {
@@ -706,6 +708,7 @@
      "resolved": "https://registry.npmjs.org/@scrypted/node-pty/-/node-pty-1.0.11.tgz",
      "integrity": "sha512-zCw8cFAz0Pd5P42sLeMpSyIO/n93OUjTpEajdd547rXDaZr1tWYF1D7LutO5+FiGI24w6Blplb2Sq1Tw7AWzmA==",
      "hasInstallScript": true,
+      "optional": true,
      "dependencies": {
        "@scrypted/prebuild-install": "^7.1.2"
      }
@@ -714,6 +717,7 @@
      "version": "7.1.3",
      "resolved": "https://registry.npmjs.org/@scrypted/prebuild-install/-/prebuild-install-7.1.3.tgz",
      "integrity": "sha512-scL9zHWbAcenhyx8fAv2U+mxrIWCL22VqL1ENOZpCQ7ByWOQERvOpgS4qlSNgXuuDfu+XBoyRvLMZcWIOSI74w==",
+      "optional": true,
      "dependencies": {
        "detect-libc": "^2.0.0",
        "expand-template": "^2.0.3",
@@ -1107,6 +1111,7 @@
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "optional": true,
      "dependencies": {
        "buffer": "^5.5.0",
        "inherits": "^2.0.4",
@@ -1131,6 +1136,7 @@
          "url": "https://feross.org/support"
        }
      ],
+      "optional": true,
      "dependencies": {
        "base64-js": "^1.3.1",
        "ieee754": "^1.1.13"
@@ -1584,6 +1590,7 @@
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "optional": true,
      "dependencies": {
        "mimic-response": "^3.1.0"
      },
@@ -1598,6 +1605,7 @@
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "optional": true,
      "engines": {
        "node": ">=4.0.0"
      }
@@ -1691,6 +1699,7 @@
      "version": "1.4.4",
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "optional": true,
      "dependencies": {
        "once": "^1.4.0"
      }
@@ -1773,6 +1782,7 @@
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "optional": true,
      "engines": {
        "node": ">=6"
      }
@@ -1938,7 +1948,8 @@
    "node_modules/fs-constants": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "optional": true
    },
    "node_modules/fs-minipass": {
      "version": "2.1.0",
@@ -2008,7 +2019,8 @@
    "node_modules/github-from-package": {
      "version": "0.0.0",
      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+      "optional": true
    },
    "node_modules/glob": {
      "version": "7.2.3",
@@ -2204,7 +2216,8 @@
    "node_modules/ini": {
      "version": "1.3.8",
      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "optional": true
    },
    "node_modules/ip": {
      "version": "2.0.1",
@@ -2421,6 +2434,7 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "optional": true,
      "engines": {
        "node": ">=10"
      },
@@ -2443,6 +2457,7 @@
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "optional": true,
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -2599,7 +2614,8 @@
    "node_modules/mkdirp-classic": {
      "version": "0.5.3",
      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "optional": true
    },
    "node_modules/module-error": {
      "version": "1.0.2",
@@ -2622,7 +2638,8 @@
    "node_modules/napi-build-utils": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+      "optional": true
    },
    "node_modules/napi-macros": {
      "version": "2.2.2",
@@ -2641,6 +2658,7 @@
      "version": "3.63.0",
      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.63.0.tgz",
      "integrity": "sha512-vAszCsOUrUxjGAmdnM/pq7gUgie0IRteCQMX6d4A534fQCR93EJU5qgzBvU6EkFfK27s0T3HEV3BOyJIr7OMYw==",
+      "optional": true,
      "dependencies": {
        "semver": "^7.3.5"
      },
@@ -2975,6 +2993,7 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "optional": true,
      "dependencies": {
        "end-of-stream": "^1.1.0",
        "once": "^1.3.1"
@@ -3048,6 +3067,7 @@
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "optional": true,
      "dependencies": {
        "deep-extend": "^0.6.0",
        "ini": "~1.3.0",
@@ -3354,7 +3374,8 @@
          "type": "consulting",
          "url": "https://feross.org/support"
        }
-      ]
+      ],
+      "optional": true
    },
    "node_modules/simple-get": {
      "version": "4.0.1",
@@ -3374,6 +3395,7 @@
          "url": "https://feross.org/support"
        }
      ],
+      "optional": true,
      "dependencies": {
        "decompress-response": "^6.0.0",
        "once": "^1.3.1",
@@ -3532,6 +3554,7 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "optional": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -3556,6 +3579,7 @@
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "optional": true,
      "dependencies": {
        "chownr": "^1.1.1",
        "mkdirp-classic": "^0.5.2",
@@ -3566,12 +3590,14 @@
    "node_modules/tar-fs/node_modules/chownr": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "optional": true
    },
    "node_modules/tar-stream": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "optional": true,
      "dependencies": {
        "bl": "^4.0.3",
        "end-of-stream": "^1.4.1",
@@ -3685,6 +3711,7 @@
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "optional": true,
      "dependencies": {
        "safe-buffer": "^5.0.1"
      },
--- a/server/package.json
+++ b/server/package.json
@@ -1,11 +1,10 @@
 {
  "name": "@scrypted/server",
-  "version": "0.107.0",
+  "version": "0.108.0",
  "description": "",
  "dependencies": {
    "@mapbox/node-pre-gyp": "^1.0.11",
    "@scrypted/ffmpeg-static": "^6.1.0-build1",
-    "@scrypted/node-pty": "^1.0.11",
    "@scrypted/types": "^0.3.30",
    "adm-zip": "^0.5.12",
    "body-parser": "^1.20.2",
@@ -48,6 +47,9 @@
    "@types/whatwg-mimetype": "^3.0.2",
    "@types/ws": "^8.5.10"
  },
+  "optionalDependencies": {
+    "@scrypted/node-pty": "^1.0.11"
+  },
  "bin": {
    "scrypted-serve": "bin/scrypted-serve"
  },
--- a/server/src/listen-zero.ts
+++ b/server/src/listen-zero.ts
@@ -13,7 +13,7 @@ export async function listenZero(server: net.Server, hostname?: string) {
    return (server.address() as net.AddressInfo).port;
 }

-export async function listenZeroSingleClient(hostname?: string, options?: net.ServerOpts) {
+export async function listenZeroSingleClient(hostname?: string, options?: net.ServerOpts, listenTimeout = 30000) {
    const server = new net.Server(options);
    const port = await listenZero(server, hostname);

@@ -22,7 +22,7 @@ export async function listenZeroSingleClient(hostname?: string, options?: net.Se
        const timeout = setTimeout(() => {
            server.close();
            reject(new ListenZeroSingleClientTimeoutError());
-        }, 30000);
+        }, listenTimeout);
        cancel = () => {
            clearTimeout(timeout);
            server.close();
--- a/server/src/runtime.ts
+++ b/server/src/runtime.ts
@@ -12,7 +12,6 @@ import net from 'net';
 import path from 'path';
 import { ParsedQs } from 'qs';
 import semver from 'semver';
-import { PassThrough } from 'stream';
 import { Parser as TarParser } from 'tar';
 import { URL } from "url";
 import WebSocket, { Server as WebSocketServer } from "ws";
@@ -33,6 +32,7 @@ import { PluginHost } from './plugin/plugin-host';
 import { isConnectionUpgrade, PluginHttp } from './plugin/plugin-http';
 import { WebSocketConnection } from './plugin/plugin-remote-websocket';
 import { getPluginVolume } from './plugin/plugin-volume';
+import { CustomRuntimeWorker } from './plugin/runtime/custom-worker';
 import { NodeForkWorker } from './plugin/runtime/node-fork-worker';
 import { PythonRuntimeWorker } from './plugin/runtime/python-worker';
 import { RuntimeWorker, RuntimeWorkerOptions } from './plugin/runtime/runtime-worker';
@@ -46,7 +46,6 @@ import { getNpmPackageInfo, PluginComponent } from './services/plugin';
 import { ServiceControl } from './services/service-control';
 import { UsersService } from './services/users';
 import { getState, ScryptedStateManager, setState } from './state';
-import { CustomRuntimeWorker } from './plugin/runtime/custom-worker';

 interface DeviceProxyPair {
    handler: PluginDeviceProxyHandler;
@@ -675,18 +674,26 @@ export class ScryptedRuntime extends PluginHttp<HttpPluginData> {

    loadPlugin(plugin: Plugin, pluginDebug?: PluginDebug) {
        const pluginId = plugin._id;
-        this.killPlugin(pluginId);
+        try {
+            this.killPlugin(pluginId);

-        const pluginDevices = this.findPluginDevices(pluginId);
-        for (const pluginDevice of pluginDevices) {
-            this.invalidatePluginDevice(pluginDevice._id);
+            const pluginDevices = this.findPluginDevices(pluginId);
+            for (const pluginDevice of pluginDevices) {
+                this.invalidatePluginDevice(pluginDevice._id);
+            }
+
+            const pluginHost = new PluginHost(this, plugin, pluginDebug);
+            this.setupPluginHostAutoRestart(pluginHost);
+            this.plugins[pluginId] = pluginHost;
+
+            return pluginHost;
+        }
+        catch (e) {
+            const logger = this.getDeviceLogger(this.findPluginDevice(pluginId));
+            logger.log('e', 'error loading plugin');
+            logger.log('e', e.toString());
+            throw e;
        }
-
-        const pluginHost = new PluginHost(this, plugin, pluginDebug);
-        this.setupPluginHostAutoRestart(pluginHost);
-        this.plugins[pluginId] = pluginHost;
-
-        return pluginHost;
    }

    probePluginDevices(plugin: Plugin) {
Author	SHA1	Message	Date
Koushik Dutta	f9f597ef01	server: guard entire plugin load block	2024-06-01 13:07:55 -07:00
Koushik Dutta	2e07788c0c	server: log plugin load failure	2024-06-01 13:05:56 -07:00
Koushik Dutta	9c0fbc1cb6	common: listenZeroSingleClient configurable timeout	2024-06-01 09:44:51 -07:00
Koushik Dutta	239d49899d	unifi-protect: fix id remapping	2024-06-01 09:19:32 -07:00
Koushik Dutta	2d3589b5a3	unifi-protect: fix id remapping	2024-06-01 08:49:37 -07:00
Koushik Dutta	96ec465a38	unifi: more logging	2024-06-01 08:07:24 -07:00
Koushik Dutta	5bb6b87c7d	predict: yolov10m	2024-05-31 15:17:24 -07:00
Koushik Dutta	fcfedccaf8	postrelease	2024-05-31 14:01:24 -07:00