ha: publish

* set rtp marker

* set marker if last packet was recevied 1s+ ago

* fix after merge

* reorder

* set marker if last packet was recevied 1s+ ago

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. The issue tracker is only for reporting bugs in Scrypted, for general support check Discord. Hardrware support requests or assistance requests will be immediately closed.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/docker.yml

@@ -19,7 +19,14 @@ jobs:
 #     runs-on: ubuntu-latest
     strategy:
       matrix:
-        BASE: ["18-jammy-full", "18-jammy-lite", "18-jammy-thin", "20-jammy-full", "20-jammy-lite", "20-jammy-thin"]
+        BASE: [
+          "18-jammy-full",
+          "18-jammy-lite",
+          # "18-jammy-thin",
+          # "20-jammy-full",
+          # "20-jammy-lite",
+          # "20-jammy-thin",
+        ]
         SUPERVISOR: ["", ".s6"]
     steps:
       - name: Check out the repo

common/src/async-queue.ts

@@ -23,6 +23,17 @@ export function createAsyncQueue<T>() {
         return deferred.promise;
     }
 
+    const take = () => {
+        if (queued.length) {
+            const { item, dequeued: enqueue } = queued.shift()!;
+            enqueue?.resolve();
+            return item;
+        }
+
+        if (ended)
+            throw ended;
+    }
+
     const submit = (item: T, dequeued?: Deferred<void>, signal?: AbortSignal) => {
         if (ended)
             return false;
@@ -34,36 +45,64 @@ export function createAsyncQueue<T>() {
             return true;
         }
 
+        if (signal)
+            dequeued ||= new Deferred();
+
         const qi = {
             item,
             dequeued,
         };
         queued!.push(qi);
 
-        signal?.addEventListener('abort', () => {
+        if (!signal)
+            return true;
+
+        const h = () => {
             const index = queued.indexOf(qi);
             if (index === -1)
                 return;
             queued.splice(index, 1);
             dequeued?.reject(new Error('abort'));
-        });
+        };
 
+        dequeued.promise.catch(() => {}).finally(() => signal.removeEventListener('abort', h));
+        signal.addEventListener('abort', h);
+
+        return true;
+    }
+
+    function end(e?: Error) {
+        if (ended)
+            return false;
+        // catch to prevent unhandled rejection.
+        ended = e || new EndError()
+        while (waiting.length) {
+            waiting.shift().reject(ended);
+        }
         return true;
     }
 
     function queue() {
         return (async function* () {
-            while (true) {
-                try {
-                    const item = await dequeue();
-                    yield item;
-                }
-                catch (e) {
-                    if (e instanceof EndError)
-                        return;
-                    throw e;
+            try {
+                while (true) {
+                    try {
+                        const item = await dequeue();
+                        yield item;
+                    }
+                    catch (e) {
+                        // the yield above may raise an error, and the queue should be ended.
+                        end(e);
+                        if (e instanceof EndError)
+                            return;
+                        throw e;
+                    }
                 }
             }
+            finally {
+                // the yield above may cause an iterator return, and the queue should be ended.
+                end();
+            }
         })();
     }
 
@@ -82,6 +121,10 @@ export function createAsyncQueue<T>() {
     }
 
     return {
+        get ended() {
+            return ended;
+        },
+        take,
         clear() {
             return clear();
         },
@@ -94,14 +137,7 @@ export function createAsyncQueue<T>() {
         submit(item: T, signal?: AbortSignal) {
             return submit(item, undefined, signal);
         },
-        end(e?: Error) {
-            if (ended)
-                return false;
-            // catch to prevent unhandled rejection.
-            ended = e || new EndError()
-            clear(e);
-            return true;
-        },
+        end,
         async enqueue(item: T, signal?: AbortSignal) {
             const dequeued = new Deferred<void>();
             if (!submit(item, dequeued, signal))

common/src/read-stream.ts

@@ -19,7 +19,7 @@ export async function read16BELengthLoop(readable: Readable, options: {
   let length: number;
   let skipCount = 0;
   let readCount = 0;
-  
+
   const resumeRead = () => {
     readCount++;
     read();
@@ -109,17 +109,26 @@ export async function readLength(readable: Readable, length: number): Promise<Bu
 const CHARCODE_NEWLINE = '\n'.charCodeAt(0);
 
 export async function readUntil(readable: Readable, charCode: number) {
-  const data = [];
-  let count = 0;
+  const queued: Buffer[] = [];
   while (true) {
-    const buffer = await readLength(readable, 1);
-    if (!buffer)
-      throw new Error("end of stream");
-    if (buffer[0] === charCode)
-      break;
-    data[count++] = buffer[0];
+    const available: Buffer = readable.read();
+    if (!available) {
+      await once(readable, 'readable');
+      continue;
+    }
+    const index = available.findIndex(b => b === charCode);
+    if (index === -1) {
+      queued.push(available);
+      continue;
+    }
+
+    const before = available.subarray(0, index);
+    queued.push(before);
+
+    const after = available.subarray(index + 1);
+    readable.unshift(after);
+    return Buffer.concat(queued).toString();
   }
-  return Buffer.from(data).toString();
 }
 
 export async function readLine(readable: Readable) {

common/src/sdp-utils.ts

@@ -149,7 +149,7 @@ export function parseFmtp(msection: string[]) {
             const paramLine = fmtpLine.substring(firstSpace + 1);
             const payloadType = parseInt(fmtp.split(':')[1]);
 
-            if (!fmtp || !paramLine || Number.isNaN( payloadType )) {
+            if (!fmtp || !paramLine || Number.isNaN(payloadType)) {
                 return;
             }
 
@@ -170,28 +170,43 @@ export function parseFmtp(msection: string[]) {
 }
 
 export type MSection = ReturnType<typeof parseMSection>;
+export type RTPMap = ReturnType<typeof parseRtpMap>;
 
 export function parseRtpMap(mlineType: string, rtpmap: string) {
-    const match = rtpmap?.match(/a=rtpmap:([\d]+) (.*?)\/([\d]+)/);
+    const match = rtpmap?.match(/a=rtpmap:([\d]+) (.*?)\/([\d]+)(\/([\d]+))?/);
 
     rtpmap = rtpmap?.toLowerCase();
 
     let codec: string;
+    let ffmpegEncoder: string;
     if (rtpmap?.includes('mpeg4')) {
         codec = 'aac';
+        ffmpegEncoder = 'aac';
     }
     else if (rtpmap?.includes('opus')) {
         codec = 'opus';
+        ffmpegEncoder = 'libopus';
     }
     else if (rtpmap?.includes('pcma')) {
         codec = 'pcm_alaw';
+        ffmpegEncoder = 'pcm_alaw';
     }
     else if (rtpmap?.includes('pcmu')) {
-        codec = 'pcm_ulaw';
+        codec = 'pcm_mulaw';
+        ffmpegEncoder = 'pcm_mulaw';
+    }
+    else if (rtpmap?.includes('g726')) {
+        codec = 'g726';
+        // disabled since it 48000 is non compliant in ffmpeg and fails.
+        // ffmpegEncoder = 'g726';
     }
     else if (rtpmap?.includes('pcm')) {
         codec = 'pcm';
     }
+    else if (rtpmap?.includes('l16')) {
+        codec = 'pcm_s16be';
+        ffmpegEncoder = 'pcm_s16be';
+    }
     else if (rtpmap?.includes('h264')) {
         codec = 'h264';
     }
@@ -207,8 +222,10 @@ export function parseRtpMap(mlineType: string, rtpmap: string) {
     return {
         line: rtpmap,
         codec,
+        ffmpegEncoder,
         rawCodec: match?.[2],
         clock: parseInt(match?.[3]),
+        channels: parseInt(match?.[5]) || undefined,
         payloadType: parseInt(match?.[1]),
     }
 }
@@ -220,9 +237,11 @@ export function parseMSection(msection: string[]) {
     const mline = parseMLine(msection[0]);
     const rawRtpmaps = msection.filter(line => line.startsWith(artpmap));
     const rtpmaps = rawRtpmaps.map(line => parseRtpMap(mline.type, line));
-    const codec = parseRtpMap(mline.type, rawRtpmaps[0]).codec;
+    // if no rtp map is specified, pcm_alaw is used. parsing a null rtpmap is valid.
+    const rtpmap = parseRtpMap(mline.type, rawRtpmaps[0]);
+    const { codec } = rtpmap;
     let direction: string;
-    
+
     for (const checkDirection of ['sendonly', 'sendrecv', 'recvonly', 'inactive']) {
         const found = msection.find(line => line === 'a=' + checkDirection);
         if (found) {
@@ -239,6 +258,7 @@ export function parseMSection(msection: string[]) {
         contents: msection.join('\r\n'),
         control,
         codec,
+        rtpmap,
         direction,
         toSdp: () => {
             return ret.lines.join('\r\n');

common/src/zygote.ts

@@ -0,0 +1,77 @@
+import sdk, { PluginFork } from '@scrypted/sdk';
+import worker_threads from 'worker_threads';
+import { createAsyncQueue } from './async-queue';
+import os from 'os';
+
+export type Zygote<T> = () => PluginFork<T>;
+
+export function createZygote<T>(): Zygote<T> {
+    if (!worker_threads.isMainThread)
+        return;
+
+    let zygote = sdk.fork<T>();
+    function* next() {
+        while (true) {
+            const cur = zygote;
+            zygote = sdk.fork<T>();
+            yield cur;
+        }
+    }
+
+    const gen = next();
+    return () => gen.next().value as PluginFork<T>;
+}
+
+
+export function createZygoteWorkQueue<T>(maxWorkers: number = os.cpus().length >> 1) {
+    const queue = createAsyncQueue<(doWork: (fork: PluginFork<T>) => Promise<any>) => Promise<any>>();
+    let forks = 0;
+
+    return async <R>(doWork: (fork: PluginFork<T>) => Promise<R>): Promise<R> => {
+        const check = queue.take();
+        if (check)
+            return check(doWork);
+
+        if (maxWorkers && forks < maxWorkers) {
+            let exited = false;
+            const controller = new AbortController();
+            // necessary to prevent unhandledrejection errors
+            controller.signal.addEventListener('abort', () => { });
+            const fork = sdk.fork<T>();
+            forks++;
+            fork.worker.on('exit', () => {
+                forks--;
+                exited = true;
+                controller.abort();
+            });
+
+            let timeout: NodeJS.Timeout;
+            const queueFork = () => {
+                clearTimeout(timeout);
+                timeout = setTimeout(() => {
+                    // keep one alive.
+                    if (forks === 1)
+                        return;
+                    fork.worker.terminate();
+                }, 30000);
+
+                queue.submit(async v2 => {
+                    clearTimeout(timeout);
+                    try {
+                        return await v2(fork);
+                    }
+                    finally {
+                        if (!exited) {
+                            queueFork();
+                        }
+                    }
+                }, controller.signal);
+            }
+
+            queueFork();
+        }
+
+        const d = await queue.dequeue();
+        return d(doWork);
+    };
+}

install/config.yaml

@@ -1,6 +1,6 @@
 # Home Assistant Addon Configuration
 name: Scrypted
-version: "18-jammy-full.s6-v0.50.0"
+version: "18-jammy-full.s6-v0.66.0"
 slug: scrypted
 description: Scrypted is a high performance home video integration and automation platform
 url: "https://github.com/koush/scrypted"

install/local/install-scrypted-dependencies-mac.sh

@@ -45,26 +45,11 @@ RUN brew install libvips
 # dlib
 RUN brew install cmake
 
-### HACK WORKAROUND
-### https://github.com/koush/scrypted/issues/544
-
-brew unpin gstreamer
-brew unpin gst-plugins-base
-brew unpin gst-plugins-good
-brew unpin gst-plugins-bad
-brew unpin gst-plugins-ugly
-brew unpin gst-libav
-brew unpin gst-python
-
-### END HACK WORKAROUND
-
 # seems to be necessary for python-codecs' pycairo dependency or something?
 RUN_IGNORE gobject-introspection libffi pkg-config
 
 # gstreamer plugins
-RUN_IGNORE brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav
-# gst python bindings
-RUN_IGNORE brew install gst-python
+RUN_IGNORE brew install gstreamer
 
 ARCH=$(arch)
 if [ "$ARCH" = "arm64" ]

packages/cli/.vscode/launch.json

@@ -21,9 +21,7 @@
             ],
             "preLaunchTask": "npm: build",
             "args": [
-                "ffplay",
-                "Baby Camera@192.168.2.109",
-                "getVideoStream",
+                "shell",
             ],
             "sourceMaps": true,
             "resolveSourceMapLocations": [

packages/cli/package-lock.json

@@ -1,37 +1,32 @@
 {
   "name": "scrypted",
-  "version": "1.0.69",
+  "version": "1.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "scrypted",
-      "version": "1.0.69",
+      "version": "1.3.0",
       "license": "ISC",
       "dependencies": {
-        "@scrypted/client": "^1.1.43",
-        "@scrypted/types": "^0.2.66",
-        "adm-zip": "^0.5.10",
-        "axios": "^0.21.4",
-        "engine.io-client": "^5.2.0",
-        "ip": "^1.1.8",
-        "mkdirp": "^1.0.4",
+        "@scrypted/client": "^1.3.2",
+        "@scrypted/types": "^0.2.99",
+        "axios": "^0.25.0",
+        "engine.io-client": "^6.5.3",
         "readline-sync": "^1.4.10",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.8",
-        "tslib": "^2.5.0"
+        "semver": "^7.5.4",
+        "tslib": "^2.6.2"
       },
       "bin": {
-        "scrypted": "dist/main.js"
+        "scrypted": "dist/packages/cli/src/main.js"
       },
       "devDependencies": {
-        "@types/mkdirp": "^1.0.2",
-        "@types/node": "^18.14.2",
-        "@types/readline-sync": "^1.4.4",
-        "@types/rimraf": "^3.0.2",
-        "@types/semver": "^7.3.13",
+        "@types/node": "^20.9.4",
+        "@types/readline-sync": "^1.4.8",
+        "@types/semver": "^7.5.6",
+        "rimraf": "^5.0.5",
         "ts-node": "^10.9.1",
-        "typescript": "^4.9.5"
+        "typescript": "^5.3.2"
       }
     },
     "node_modules/@cspotcode/source-map-support": {
@@ -46,6 +41,22 @@
         "node": ">=12"
       }
     },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
@@ -71,69 +82,30 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@scrypted/client": {
-      "version": "1.1.43",
-      "resolved": "https://registry.npmjs.org/@scrypted/client/-/client-1.1.43.tgz",
-      "integrity": "sha512-qpeGdqFga/Fx51MoF3E0iBPCjE/SDEIVdGh8Ws5dqw38bxUJD264c9NsNyCguLKyYguErKTAWnQkzqhO0bUbaA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@scrypted/client/-/client-1.3.2.tgz",
+      "integrity": "sha512-PZwjfKUYIMxBYm7V2o0/vAMlQmznKLN/d4rpshb5vV086mnhh578ik3h39awkwoPyWzNGDcYeoBY0BchhwtdOQ==",
       "dependencies": {
-        "@scrypted/types": "^0.2.66",
+        "@scrypted/types": "^0.2.99",
         "axios": "^0.25.0",
-        "engine.io-client": "^6.4.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "node_modules/@scrypted/client/node_modules/axios": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
-      "dependencies": {
-        "follow-redirects": "^1.14.7"
-      }
-    },
-    "node_modules/@scrypted/client/node_modules/engine.io-client": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
-      "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0",
-        "xmlhttprequest-ssl": "~2.0.0"
-      }
-    },
-    "node_modules/@scrypted/client/node_modules/engine.io-parser": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
-      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@scrypted/client/node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+        "engine.io-client": "^6.5.3",
+        "rimraf": "^5.0.5"
       }
     },
     "node_modules/@scrypted/types": {
-      "version": "0.2.66",
-      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.66.tgz",
-      "integrity": "sha512-AL2iD7OmpqZlQMlpZKUBHpzL7H1IHhwKOi9uhRbVwG7EIDwenTspqtziH2Hyu0+XeCLf+gN69uQB6Qlz+QPf9A=="
+      "version": "0.2.99",
+      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.99.tgz",
+      "integrity": "sha512-2J1FH7tpAW5X3rgA70gJ+z0HFM90c/tBA+JXdP1vI1d/0yVmh9TSxnHoCuADN4R2NQXHmoZ6Nbds9kKAQ/25XQ=="
     },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.0",
@@ -164,57 +136,25 @@
       "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
       "dev": true
     },
-    "node_modules/@types/glob": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "^5.1.2",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
-    },
-    "node_modules/@types/mkdirp": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.2.tgz",
-      "integrity": "sha512-o0K1tSO0Dx5X6xlU5F1D6625FawhC3dU3iqr25lluNv/+/QIVH8RLNEiVokgIZo+mz+87w/3Mkg/VvQS+J51fQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/node": {
-      "version": "18.14.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz",
-      "integrity": "sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==",
-      "dev": true
+      "version": "20.9.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.4.tgz",
+      "integrity": "sha512-wmyg8HUhcn6ACjsn8oKYjkN/zUzQeNtMy44weTJSM6p4MMzEOuKbA3OjJ267uPCOW7Xex9dyrNTful8XTQYoDA==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
     "node_modules/@types/readline-sync": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/@types/readline-sync/-/readline-sync-1.4.4.tgz",
-      "integrity": "sha512-cFjVIoiamX7U6zkO2VPvXyTxbFDdiRo902IarJuPVxBhpDnXhwSaVE86ip+SCuyWBbEioKCkT4C88RNTxBM1Dw==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/@types/readline-sync/-/readline-sync-1.4.8.tgz",
+      "integrity": "sha512-BL7xOf0yKLA6baAX6MMOnYkoflUyj/c7y3pqMRfU0va7XlwHAOTOIo4x55P/qLfMsuaYdJJKubToLqRVmRtRZA==",
       "dev": true
     },
-    "node_modules/@types/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "*",
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "version": "7.5.6",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
+      "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
     "node_modules/acorn": {
@@ -238,12 +178,26 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/adm-zip": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
-      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
+    "node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "engines": {
-        "node": ">=6.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/arg": {
@@ -253,11 +207,11 @@
       "dev": true
     },
     "node_modules/axios": {
-      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
       "dependencies": {
-        "follow-redirects": "^1.14.0"
+        "follow-redirects": "^1.14.7"
       }
     },
     "node_modules/balanced-match": {
@@ -265,32 +219,29 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
-    "node_modules/base64-arraybuffer": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
-      "integrity": "sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/create-require": {
       "version": "1.1.1",
@@ -298,6 +249,19 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "dev": true
     },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -323,32 +287,34 @@
         "node": ">=0.3.1"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    },
     "node_modules/engine.io-client": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-5.2.0.tgz",
-      "integrity": "sha512-BcIBXGBkT7wKecwnfrSV79G2X5lSUSgeAGgoo60plXf8UsQEvCQww/KMwXSMhVjb98fFYNq20CC5eo8IOAPqsg==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz",
+      "integrity": "sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==",
       "dependencies": {
-        "base64-arraybuffer": "0.1.4",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
-        "engine.io-parser": "~4.0.1",
-        "has-cors": "1.1.0",
-        "parseqs": "0.0.6",
-        "parseuri": "0.0.6",
-        "ws": "~7.4.2",
-        "xmlhttprequest-ssl": "~2.0.0",
-        "yeast": "0.1.2"
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.11.0",
+        "xmlhttprequest-ssl": "~2.0.0"
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.3.tgz",
-      "integrity": "sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==",
-      "dependencies": {
-        "base64-arraybuffer": "0.1.4"
-      },
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
+      "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==",
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/follow-redirects": {
@@ -370,53 +336,71 @@
         }
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/has-cors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+    "node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/ip": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
     },
     "node_modules/lru-cache": {
       "version": "6.0.0",
@@ -436,25 +420,25 @@
       "dev": true
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
+    "node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
       "engines": {
-        "node": ">=10"
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/ms": {
@@ -462,30 +446,35 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/parseqs": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz",
-      "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="
-    },
-    "node_modules/parseuri": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz",
-      "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+    "node_modules/path-scurry": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+      "dependencies": {
+        "lru-cache": "^9.1.1 || ^10.0.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.3.tgz",
+      "integrity": "sha512-B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg==",
+      "engines": {
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/readline-sync": {
@@ -497,23 +486,26 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
+      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
       "dependencies": {
-        "glob": "^7.1.3"
+        "glob": "^10.3.7"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -524,6 +516,124 @@
         "node": ">=10"
       }
     },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ts-node": {
       "version": "10.9.1",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
@@ -568,40 +678,139 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
+      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
       "dev": true
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
     "node_modules/ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
@@ -629,11 +838,6 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
-    "node_modules/yeast": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
-      "integrity": "sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="
-    },
     "node_modules/yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",

packages/cli/package.json

@@ -1,10 +1,10 @@
 {
   "name": "scrypted",
-  "version": "1.0.69",
+  "version": "1.3.3",
   "description": "",
-  "main": "./dist/main.js",
+  "main": "./dist/packages/cli/src/main.js",
   "bin": {
-    "scrypted": "./dist/main.js"
+    "scrypted": "./dist/packages/cli/src/main.js"
   },
   "scripts": {
     "prebuild": "rimraf dist",
@@ -16,25 +16,20 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@scrypted/client": "^1.1.43",
-    "@scrypted/types": "^0.2.66",
-    "adm-zip": "^0.5.10",
-    "axios": "^0.21.4",
-    "engine.io-client": "^5.2.0",
-    "ip": "^1.1.8",
-    "mkdirp": "^1.0.4",
+    "@scrypted/client": "^1.3.2",
+    "@scrypted/types": "^0.2.99",
+    "axios": "^0.25.0",
+    "engine.io-client": "^6.5.3",
     "readline-sync": "^1.4.10",
-    "rimraf": "^3.0.2",
-    "semver": "^7.3.8",
-    "tslib": "^2.5.0"
+    "semver": "^7.5.4",
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@types/mkdirp": "^1.0.2",
-    "@types/node": "^18.14.2",
-    "@types/readline-sync": "^1.4.4",
-    "@types/rimraf": "^3.0.2",
-    "@types/semver": "^7.3.13",
+    "rimraf": "^5.0.5",
+    "@types/node": "^20.9.4",
+    "@types/readline-sync": "^1.4.8",
+    "@types/semver": "^7.5.6",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5"
+    "typescript": "^5.3.2"
   }
 }

packages/cli/src/main.ts

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 
-import fs from 'fs';
-import path from 'path';
-import axios, { AxiosRequestConfig } from 'axios';
-import readline from 'readline-sync';
-import https from 'https';
-import mkdirp from 'mkdirp';
-import { installServe, serveMain } from './service';
 import { connectScryptedClient } from '@scrypted/client';
-import { ScryptedMimeTypes, FFmpegInput } from '@scrypted/types';
-import semver from 'semver';
+import { FFmpegInput, ScryptedMimeTypes } from '@scrypted/types';
+import axios, { AxiosRequestConfig } from 'axios';
 import child_process from 'child_process';
+import fs from 'fs';
+import https from 'https';
+import path from 'path';
+import readline from 'readline-sync';
+import semver from 'semver';
+import { installServe, serveMain } from './service';
+import { connectShell } from './shell';
 
 const httpsAgent = new https.Agent({
     rejectUnauthorized: false,
@@ -64,7 +64,9 @@ async function doLogin(host: string) {
         httpsAgent,
     }, axiosConfig));
 
-    mkdirp.sync(scryptedHome);
+    fs.mkdirSync(scryptedHome, {
+        recursive: true,
+    });
     let login: LoginFile;
     try {
         login = JSON.parse(fs.readFileSync(loginPath).toString());
@@ -220,6 +222,25 @@ async function main() {
 
         console.log('install successful. id:', response.data.id);
     }
+    else if (process.argv[2] === 'shell') {
+        console.log = () => { };
+
+        const host = toIpAndPort(process.argv[3] || '127.0.0.1');
+        const login = await getOrDoLogin(host);
+        const sdk = await connectScryptedClient({
+            baseUrl: `https://${host}`,
+            pluginId: '@scrypted/core',
+            username: login.username,
+            password: login.token,
+            axiosConfig: {
+                httpsAgent,
+            }
+        });
+
+        const separator = process.argv.indexOf("--");
+        const cmd = separator != -1 ? process.argv.slice(separator + 1) : [];
+        await connectShell(sdk, ...cmd);
+    }
     else {
         console.log('usage:');
         console.log('   npx scrypted install npm-package-name [127.0.0.1[:10443]]');
@@ -231,6 +252,7 @@ async function main() {
         console.log('   npx scrypted command name-or-id[@127.0.0.1[:10443]] method-name [...method-arguments]');
         console.log('   npx scrypted ffplay name-or-id[@127.0.0.1[:10443]] method-name [...method-arguments]');
         console.log('   npx scrypted create-cert-json /path/to/key.pem /path/to/cert.pem');
+        console.log('   npx scrypted shell [127.0.0.1[:10443]] [-- cmd [...cmd-args]]');
         console.log();
         console.log('examples:');
         console.log('   npx scrypted install @scrypted/rtsp');

packages/cli/src/service.ts

@@ -2,10 +2,8 @@
 import child_process from 'child_process';
 import { once } from 'events';
 import fs from 'fs';
-import rimraf from 'rimraf';
 import path from 'path';
 import os from 'os';
-import mkdirp from 'mkdirp';
 import semver from 'semver';
 
 async function sleep(ms: number) {
@@ -57,17 +55,26 @@ export function getInstallDir() {
 export function cwdInstallDir(): { volume: string, installDir: string } {
     const installDir = getInstallDir();
     const volume = path.join(installDir, 'volume');
-    mkdirp.sync(volume);
+    fs.mkdirSync(volume, {
+        recursive: true,
+    });
     process.chdir(installDir);
     return { volume, installDir };
 }
 
+function rimrafSync(p: string) {
+    fs.rmSync(p, {
+        recursive: true,
+        force: true,
+    });
+}
+
 export async function installServe(installVersion: string, ignoreError?: boolean) {
     const { installDir } = cwdInstallDir();
     const packageLockJson = path.join(installDir, 'package-lock.json');
     // apparently corrupted or old version of package-lock.json prevents upgrades, so
     // nuke it before installing.
-    rimraf.sync(packageLockJson);
+    rimrafSync(packageLockJson);
 
     const installJson = path.join(installDir, 'install.json');
     try {
@@ -78,7 +85,7 @@ export async function installServe(installVersion: string, ignoreError?: boolean
     catch (e) {
         const nodeModules = path.join(installDir, 'node_modules');
         console.log('Node version mismatch, missing, or corrupt. Clearing node_modules.');
-        rimraf.sync(nodeModules);
+        rimrafSync(nodeModules);
     }
     fs.writeFileSync(installJson, JSON.stringify({
         version: process.version,
@@ -112,8 +119,8 @@ export async function serveMain(installVersion?: string) {
     console.log('cwd', process.cwd());
 
     while (true) {
-        rimraf.sync(EXIT_FILE);
-        rimraf.sync(UPDATE_FILE);
+        rimrafSync(EXIT_FILE);
+        rimrafSync(UPDATE_FILE);
 
         await startServer(installDir);
 

packages/cli/src/shell.ts

@@ -0,0 +1,90 @@
+import { DeviceProvider, ScryptedStatic, StreamService } from "@scrypted/types";
+import { createAsyncQueue } from '../../../common/src/async-queue';
+
+export async function connectShell(sdk: ScryptedStatic, ...cmd: string[]) {
+    const termSvc = await sdk.systemManager.getDeviceByName<DeviceProvider>("@scrypted/core").getDevice("terminalservice");
+    if (!termSvc) {
+        throw Error("@scrypted/core does not provide a Terminal Service");
+    }
+
+    const termSvcDirect = await sdk.connectRPCObject<StreamService>(termSvc);
+    const dataQueue = createAsyncQueue<Buffer>();
+    const ctrlQueue = createAsyncQueue<any>();
+
+    if (process.stdin.isTTY) {
+        process.stdin.setRawMode(true);
+    } else {
+        process.stdin.on("end", () => {
+            ctrlQueue.enqueue({ eof: true });
+            dataQueue.enqueue(Buffer.alloc(0));
+        });
+    }
+    ctrlQueue.enqueue({ interactive: Boolean(process.stdin.isTTY), cmd: cmd });
+
+    const dim = { cols: process.stdout.columns, rows: process.stdout.rows };
+    ctrlQueue.enqueue({ dim });
+
+    let bufferedLength = 0;
+    const MAX_BUFFERED_LENGTH = 64000;
+    process.stdin.on('data', async data => {
+        bufferedLength += data.length;
+        const promise = dataQueue.enqueue(data).then(() => bufferedLength -= data.length);
+        if (bufferedLength >= MAX_BUFFERED_LENGTH) {
+            process.stdin.pause();
+            await promise;
+            if (bufferedLength < MAX_BUFFERED_LENGTH)
+                process.stdin.resume();
+        }
+    });
+
+    async function* generator() {
+        while (true) {
+            const ctrlBuffers = ctrlQueue.clear();
+            if (ctrlBuffers.length) {
+                for (const ctrl of ctrlBuffers) {
+                    if (ctrl.eof) {
+                        // flush the buffer before sending eof
+                        const dataBuffers = dataQueue.clear();
+                        const concat = Buffer.concat(dataBuffers);
+                        if (concat.length) {
+                            yield concat;
+                        }
+                    }
+                    yield JSON.stringify(ctrl);
+                }
+                continue;
+            }
+
+            const dataBuffers = dataQueue.clear();
+            if (dataBuffers.length === 0) {
+                const buf = await dataQueue.dequeue();
+                if (buf.length)
+                    yield buf;
+                continue;
+            }
+
+            const concat = Buffer.concat(dataBuffers);
+            if (concat.length)
+                yield concat;
+        }
+    }
+
+    process.stdout.on('resize', () => {
+        const dim = { cols: process.stdout.columns, rows: process.stdout.rows };
+        ctrlQueue.enqueue({ dim });
+        dataQueue.enqueue(Buffer.alloc(0));
+    });
+
+    try {
+        for await (const message of await termSvcDirect.connectStream(generator())) {
+            if (!message) {
+                process.exit();
+            }
+            process.stdout.write(new Uint8Array(Buffer.from(message)));
+        }
+    } catch {
+        // ignore
+    } finally {
+        process.exit();
+    }
+}

packages/client/.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "ts-node",
+            "type": "node",
+            "request": "launch",
+            "args": [
+                "${relativeFile}"
+            ],
+            "runtimeArgs": [
+                "-r",
+                "ts-node/register"
+            ],
+            "env": {
+                "SCRYPTED_USERNAME": "koush",
+                "SCRYPTED_PASSWORD": "k9copUSA",
+            },
+            "cwd": "${workspaceRoot}",
+            "protocol": "inspector",
+            "internalConsoleOptions": "openOnSessionStart"
+        }
+    ]
+}

packages/client/examples/connectRPCObject.ts

@@ -0,0 +1,34 @@
+import { Camera, VideoCamera, VideoFrameGenerator } from '@scrypted/types';
+import { connectScryptedClient } from '../dist/packages/client/src';
+
+import https from 'https';
+
+const httpsAgent = new https.Agent({
+    rejectUnauthorized: false,
+})
+
+async function example() {
+    const sdk = await connectScryptedClient({
+        baseUrl: 'https://localhost:10443',
+        pluginId: "@scrypted/core",
+        username: process.env.SCRYPTED_USERNAME || 'admin',
+        password: process.env.SCRYPTED_PASSWORD || 'swordfish',
+        axiosConfig: {
+            httpsAgent,
+        }
+    });
+    console.log('server version', sdk.serverVersion);
+
+    const office = sdk.systemManager.getDeviceByName<VideoCamera & Camera>("Office");
+    const libav = sdk.systemManager.getDeviceByName<VideoFrameGenerator>("Libav");
+    const mo = await office.getVideoStream();
+
+    const generator = await libav.generateVideoFrames(mo);
+    const remote = await sdk.connectRPCObject!(generator);
+
+    for await (const frame of remote) {
+        console.log(frame);
+    }
+}
+
+example();

packages/client/package-lock.json

@@ -1,29 +1,54 @@
 {
   "name": "@scrypted/client",
-  "version": "1.1.55",
+  "version": "1.3.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/client",
-      "version": "1.1.55",
+      "version": "1.3.1",
       "license": "ISC",
       "dependencies": {
-        "@scrypted/types": "^0.2.94",
+        "@scrypted/types": "^0.2.99",
         "axios": "^0.25.0",
-        "engine.io-client": "^6.4.0",
-        "rimraf": "^3.0.2"
+        "engine.io-client": "^6.5.3",
+        "rimraf": "^5.0.5"
       },
       "devDependencies": {
-        "@types/ip": "^1.1.0",
-        "@types/node": "^18.14.2",
-        "typescript": "^4.9.5"
+        "@types/ip": "^1.1.3",
+        "@types/node": "^20.9.4",
+        "typescript": "^5.3.2"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
       }
     },
     "node_modules/@scrypted/types": {
-      "version": "0.2.94",
-      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.94.tgz",
-      "integrity": "sha512-615C6lLnJGk0qhp+Y72B3xeD2CS9p/h8JUmFDjKh4H4IjL6zlV10tZVAXWQt3Q5rmy1WAaS3nScR6NgxZ5woOA=="
+      "version": "0.2.99",
+      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.99.tgz",
+      "integrity": "sha512-2J1FH7tpAW5X3rgA70gJ+z0HFM90c/tBA+JXdP1vI1d/0yVmh9TSxnHoCuADN4R2NQXHmoZ6Nbds9kKAQ/25XQ=="
     },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.0",
@@ -31,19 +56,44 @@
       "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
     },
     "node_modules/@types/ip": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@types/ip/-/ip-1.1.0.tgz",
-      "integrity": "sha512-dwNe8gOoF70VdL6WJBwVHtQmAX4RMd62M+mAB9HQFjG1/qiCLM/meRy95Pd14FYBbEDwCq7jgJs89cHpLBu4HQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@types/ip/-/ip-1.1.3.tgz",
+      "integrity": "sha512-64waoJgkXFTYnCYDUWgSATJ/dXEBanVkaP5d4Sbk7P6U7cTTMhxVyROTckc6JKdwCrgnAjZMn0k3177aQxtDEA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "18.14.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz",
-      "integrity": "sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==",
-      "dev": true
+      "version": "20.9.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.4.tgz",
+      "integrity": "sha512-wmyg8HUhcn6ACjsn8oKYjkN/zUzQeNtMy44weTJSM6p4MMzEOuKbA3OjJ267uPCOW7Xex9dyrNTful8XTQYoDA==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
     },
     "node_modules/axios": {
       "version": "0.25.0",
@@ -59,18 +109,41 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
     },
     "node_modules/debug": {
       "version": "4.3.4",
@@ -88,22 +161,32 @@
         }
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    },
     "node_modules/engine.io-client": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
-      "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz",
+      "integrity": "sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
+        "engine.io-parser": "~5.2.1",
         "ws": "~8.11.0",
         "xmlhttprequest-ssl": "~2.0.0"
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
-      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
+      "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -127,53 +210,100 @@
         }
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+    "node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/ms": {
@@ -181,53 +311,280 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+    "node_modules/path-scurry": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
       "dependencies": {
-        "glob": "^7.1.3"
+        "lru-cache": "^9.1.1 || ^10.0.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
-      "bin": {
-        "rimraf": "bin.js"
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/rimraf": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
+      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
+      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
     "node_modules/ws": {
       "version": "8.11.0",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/client",
-  "version": "1.1.55",
+  "version": "1.3.2",
   "description": "",
   "main": "dist/packages/client/src/index.js",
   "scripts": {
@@ -12,14 +12,14 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@types/ip": "^1.1.0",
-    "@types/node": "^18.14.2",
-    "typescript": "^4.9.5"
+    "@types/ip": "^1.1.3",
+    "@types/node": "^20.9.4",
+    "typescript": "^5.3.2"
   },
   "dependencies": {
-    "@scrypted/types": "^0.2.94",
+    "@scrypted/types": "^0.2.99",
     "axios": "^0.25.0",
-    "engine.io-client": "^6.4.0",
-    "rimraf": "^3.0.2"
+    "engine.io-client": "^6.5.3",
+    "rimraf": "^5.0.5"
   }
 }

packages/client/src/index.ts

@@ -9,11 +9,14 @@ import { DataChannelDebouncer } from "../../../plugins/webrtc/src/datachannel-de
 import type { IOSocket } from '../../../server/src/io';
 import { MediaObject } from '../../../server/src/plugin/mediaobject';
 import { attachPluginRemote } from '../../../server/src/plugin/plugin-remote';
+import type { ClusterObject, ConnectRPCObject } from '../../../server/src/cluster/connect-rpc-object';
 import { RpcPeer } from '../../../server/src/rpc';
 import { createRpcDuplexSerializer, createRpcSerializer } from '../../../server/src/rpc-serializer';
 import packageJson from '../package.json';
 import { isIPAddress } from "./ip";
 
+const sourcePeerId = RpcPeer.generateId();
+
 type IOClientSocket = eio.Socket & IOSocket;
 
 function once(socket: IOClientSocket, event: 'open' | 'message') {
@@ -132,39 +135,39 @@ export async function loginScryptedClient(options: ScryptedLoginOptions) {
     if (response.status !== 200)
         throw new Error('status ' + response.status);
 
-    const addresses = response.data.addresses as string[] || [];
-    // the cloud plugin will include this header.
-    // should maybe move this into the cloud server itself.
-    const scryptedCloud = response.headers['x-scrypted-cloud'] === 'true';
-    const directAddress = response.headers['x-scrypted-direct-address'];
-    const cloudAddress = response.headers['x-scrypted-cloud-address'];
-
     return {
         error: response.data.error as string,
         authorization: response.data.authorization as string,
         queryToken: response.data.queryToken as any,
         token: response.data.token as string,
-        addresses,
-        scryptedCloud,
-        directAddress,
-        cloudAddress,
+        addresses: response.data.addresses as string[],
+        externalAddresses: response.data.externalAddresses as string[],
+        // the cloud plugin will include this header.
+        // should maybe move this into the cloud server itself.
+        scryptedCloud: response.headers['x-scrypted-cloud'] === 'true',
+        directAddress: response.headers['x-scrypted-direct-address'],
+        cloudAddress: response.headers['x-scrypted-cloud-address'],
     };
 }
 
 export async function checkScryptedClientLogin(options?: ScryptedConnectionOptions) {
     let { baseUrl } = options || {};
-    const url = combineBaseUrl(baseUrl, 'login');
+    let url = combineBaseUrl(baseUrl, 'login');
     const headers: AxiosRequestHeaders = {};
-    if (options?.previousLoginResult?.authorization)
-        headers.Authorization = options?.previousLoginResult?.authorization;
+    if (options?.previousLoginResult?.queryToken) {
+        // headers.Authorization = options?.previousLoginResult?.authorization;
+        // const search = new URLSearchParams(options.previousLoginResult.queryToken);
+        // url += '?' + search.toString();
+        const token = options?.previousLoginResult.username + ":" + options.previousLoginResult.token;
+        const hash = Buffer.from(token).toString('base64');
+
+        headers.Authorization = `Basic ${hash}`;
+    }
     const response = await axios.get(url, {
         withCredentials: true,
         headers,
         ...options?.axiosConfig,
     });
-    const scryptedCloud = response.headers['x-scrypted-cloud'] === 'true';
-    const directAddress = response.headers['x-scrypted-direct-address'];
-    const cloudAddress = response.headers['x-scrypted-cloud-address'];
 
     return {
         baseUrl,
@@ -178,16 +181,22 @@ export async function checkScryptedClientLogin(options?: ScryptedConnectionOptio
         queryToken: response.data.queryToken as any,
         token: response.data.token as string,
         addresses: response.data.addresses as string[],
-        scryptedCloud,
-        directAddress,
-        cloudAddress,
+        externalAddresses: response.data.externalAddresses as string[],
+        // the cloud plugin will include this header.
+        // should maybe move this into the cloud server itself.
+        scryptedCloud: response.headers['x-scrypted-cloud'] === 'true',
+        directAddress: response.headers['x-scrypted-direct-address'],
+        cloudAddress: response.headers['x-scrypted-cloud-address'],
     };
 }
 
 export interface ScryptedClientLoginResult {
+    username: string;
+    token: string;
     authorization: string;
     queryToken: { [parameter: string]: string };
     localAddresses: string[];
+    externalAddresses: string[];
     scryptedCloud: boolean;
     directAddress: string;
     cloudAddress: string;
@@ -232,35 +241,54 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
     let authorization: string;
     let queryToken: any;
     let localAddresses: string[];
+    let externalAddresses: string[];
     let scryptedCloud: boolean;
     let directAddress: string;
     let cloudAddress: string;
+    let token: string;
 
     console.log('@scrypted/client', packageJson.version);
 
     const extraHeaders: { [header: string]: string } = {};
 
+    // Chrome will complain about websites making xhr requests to self signed https sites, even
+    // if the cert has been accepted. Other browsers seem fine.
+    // So the default is not to connect to IP addresses on Chrome, but do so on other browsers.
+    const isChrome = globalThis.navigator?.userAgent.includes('Chrome');
+    const isNotChromeOrIsInstalledApp = !isChrome || isInstalledApp();
+    let tryAlternateAddresses = false;
+
     if (username && password) {
         const loginResult = await loginScryptedClient(options as ScryptedLoginOptions);
         if (loginResult.authorization)
             extraHeaders['Authorization'] = loginResult.authorization;
         localAddresses = loginResult.addresses;
+        externalAddresses = loginResult.externalAddresses;
         scryptedCloud = loginResult.scryptedCloud;
         directAddress = loginResult.directAddress;
         cloudAddress = loginResult.cloudAddress;
         authorization = loginResult.authorization;
         queryToken = loginResult.queryToken;
+        token = loginResult.token;
         console.log('login result', Date.now() - start, loginResult);
     }
     else {
         const urlsToCheck = new Set<string>();
-        for (const u of [
-            ...options?.previousLoginResult?.localAddresses || [],
-            options?.previousLoginResult?.directAddress,
-            options?.previousLoginResult?.cloudAddress,
-        ]) {
-            if (u)
-                urlsToCheck.add(u);
+        if (options?.previousLoginResult?.token) {
+            for (const u of [
+                ...options?.previousLoginResult?.localAddresses || [],
+                options?.previousLoginResult?.directAddress,
+            ]) {
+                if (u && (isNotChromeOrIsInstalledApp || options.direct))
+                    urlsToCheck.add(u);
+            }
+            for (const u of [
+                ...options?.previousLoginResult?.externalAddresses || [],
+                options?.previousLoginResult?.cloudAddress,
+            ]) {
+                if (u)
+                    urlsToCheck.add(u);
+            }
         }
 
         // the alternate urls must have a valid response.
@@ -289,28 +317,39 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
         let loginCheck: Awaited<ReturnType<typeof checkScryptedClientLogin>>;
         try {
             loginCheck = await Promise.any(loginCheckPromises);
+            tryAlternateAddresses ||= loginCheck.baseUrl !== baseUrl;
         }
         catch (e) {
             loginCheck = await baseUrlCheck;
         }
 
+        if (tryAlternateAddresses)
+            console.log('Found direct login. Allowing alternate addresses.')
+
         if (loginCheck.error || loginCheck.redirect)
             throw new ScryptedClientLoginError(loginCheck);
         localAddresses = loginCheck.addresses;
+        externalAddresses = loginCheck.externalAddresses;
         scryptedCloud = loginCheck.scryptedCloud;
         directAddress = loginCheck.directAddress;
         cloudAddress = loginCheck.cloudAddress;
         username = loginCheck.username;
         authorization = loginCheck.authorization;
         queryToken = loginCheck.queryToken;
+        token = loginCheck.token;
         console.log('login checked', Date.now() - start, loginCheck);
     }
 
     let socket: IOClientSocket;
     const eioPath = `endpoint/${pluginId}/engine.io/api`;
     const eioEndpoint = baseUrl ? new URL(eioPath, baseUrl).pathname : '/' + eioPath;
+    // https://github.com/socketio/engine.io/issues/690
+    const cacehBust = Math.random().toString(36).substring(3, 10);
     const eioOptions: Partial<SocketOptions> = {
         path: eioEndpoint,
+        query: {
+            cacehBust,
+        },
         withCredentials: true,
         extraHeaders,
         rejectUnauthorized: false,
@@ -323,25 +362,26 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
     // watch for this flush.
     const flush = new Deferred<void>();
 
-    // Chrome will complain about websites making xhr requests to self signed https sites, even
-    // if the cert has been accepted. Other browsers seem fine.
-    // So the default is not to connect to IP addresses on Chrome, but do so on other browsers.
-    const isChrome = globalThis.navigator?.userAgent.includes('Chrome');
-    const isNotChromeOrIsInstalledApp = !isChrome || isInstalledApp();
-
     const addresses: string[] = [];
     const localAddressDefault = isNotChromeOrIsInstalledApp;
-    if (((scryptedCloud && options.local === undefined && localAddressDefault) || options.local) && localAddresses) {
+
+    tryAlternateAddresses ||= scryptedCloud;
+
+    if (((tryAlternateAddresses && options.local === undefined && localAddressDefault) || options.local) && localAddresses) {
         addresses.push(...localAddresses);
     }
 
     const directAddressDefault = directAddress && (isNotChromeOrIsInstalledApp || !isIPAddress(directAddress));
-    if (((scryptedCloud && options.direct === undefined && directAddressDefault) || options.direct) && directAddress) {
+    if (((tryAlternateAddresses && options.direct === undefined && directAddressDefault) || options.direct) && directAddress) {
         addresses.push(directAddress);
     }
 
-    if (((scryptedCloud && options.direct === undefined) || options.direct) && cloudAddress) {
-        addresses.push(cloudAddress);
+    if ((tryAlternateAddresses && options.direct === undefined) || options.direct) {
+        if (cloudAddress)
+            addresses.push(cloudAddress);
+        for (const externalAddress of externalAddresses || []) {
+            addresses.push(externalAddress);
+        }
     }
 
     const tryAddresses = !!addresses.length;
@@ -388,7 +428,7 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
         // It is probably better to simply prompt and redirect to the LAN address
         // if it is reacahble.
 
-        for (const address of addresses) {
+        for (const address of new Set(addresses)) {
             console.log('trying', address);
             const check = new eio.Socket(address, localEioOptions);
             sockets.push(check);
@@ -407,6 +447,9 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
         console.log('trying webrtc');
         const webrtcEioOptions: Partial<SocketOptions> = {
             path: '/endpoint/@scrypted/webrtc/engine.io/',
+            query: {
+                cacehBust,
+            },
             withCredentials: true,
             extraHeaders,
             rejectUnauthorized: false,
@@ -557,6 +600,7 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
         await once(check, 'open');
         return {
             ready: check,
+            address: explicitBaseUrl,
             connectionType: 'http',
         };
     })());
@@ -666,6 +710,105 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
             .map(id => systemManager.getDeviceById(id))
             .find(device => device.pluginId === '@scrypted/core' && device.nativeId === `user:${username}`);
 
+        const clusterPeers = new Map<number, Promise<RpcPeer>>();
+        const ensureClusterPeer = (clusterObject: ClusterObject) => {
+            let clusterPeerPromise = clusterPeers.get(clusterObject.port);
+            if (!clusterPeerPromise) {
+                clusterPeerPromise = (async () => {
+                    const eioPath = 'engine.io/connectRPCObject';
+                    const eioEndpoint = baseUrl ? new URL(eioPath, baseUrl).pathname : '/' + eioPath;
+                    const clusterPeerOptions = {
+                        path: eioEndpoint,
+                        query: {
+                            cacehBust,
+                            clusterObject: JSON.stringify(clusterObject),
+                        },
+                        withCredentials: true,
+                        extraHeaders,
+                        rejectUnauthorized: false,
+                        transports: options?.transports,
+                    };
+
+                    const clusterPeerSocket = new eio.Socket(explicitBaseUrl, clusterPeerOptions);
+                    let peerReady = false;
+                    clusterPeerSocket.on('close', () => {
+                        clusterPeers.delete(clusterObject.port);
+                        if (!peerReady) {
+                            throw new Error("peer disconnected before setup completed");
+                        }
+                    });
+
+                    try {
+                        await once(clusterPeerSocket, 'open');
+
+                        const serializer = createRpcDuplexSerializer({
+                            write: data => clusterPeerSocket.send(data),
+                        });
+                        clusterPeerSocket.on('message', data => serializer.onData(Buffer.from(data)));
+
+                        const clusterPeer = new RpcPeer(clientName || 'engine.io-client', "cluster-proxy", (message, reject, serializationContext) => {
+                            try {
+                                serializer.sendMessage(message, reject, serializationContext);
+                            }
+                            catch (e) {
+                                reject?.(e);
+                            }
+                        });
+                        serializer.setupRpcPeer(clusterPeer);
+                        clusterPeer.tags.localPort = sourcePeerId;
+                        peerReady = true;
+                        return clusterPeer;
+                    }
+                    catch (e) {
+                        console.error('failure ipc connect', e);
+                        clusterPeerSocket.close();
+                        throw e;
+                    }
+                })();
+                clusterPeers.set(clusterObject.port, clusterPeerPromise);
+            }
+            return clusterPeerPromise;
+        };
+
+        const resolveObject = async (proxyId: string, sourcePeerPort: number) => {
+            const sourcePeer = await clusterPeers.get(sourcePeerPort);
+            if (sourcePeer?.remoteWeakProxies) {
+                return Object.values(sourcePeer.remoteWeakProxies).find(
+                    v => v.deref()?.__cluster?.proxyId == proxyId
+                )?.deref();
+            }
+            return null;
+        }
+
+        const connectRPCObject = async (value: any) => {
+            const clusterObject: ClusterObject = value?.__cluster;
+            if (!clusterObject) {
+                return value;
+            }
+
+            const { port, proxyId  } = clusterObject;
+
+            // check if object is already connected
+            const resolved = await resolveObject(proxyId, port);
+            if (resolved) {
+                return resolved;
+            }
+
+            try {
+                const clusterPeerPromise = ensureClusterPeer(clusterObject);
+                const clusterPeer = await clusterPeerPromise;
+                const connectRPCObject: ConnectRPCObject = await clusterPeer.getParam('connectRPCObject');
+                const newValue = await connectRPCObject(clusterObject);
+                if (!newValue)
+                    throw new Error('ipc object not found?');
+                return newValue;
+            }
+            catch (e) {
+                console.error('failure ipc', e);
+                return value;
+            }
+        }
+
         const ret: ScryptedClientStatic = {
             userId: userDevice?.id,
             serverVersion,
@@ -686,13 +829,17 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
             browserSignalingSession,
             rpcPeer,
             loginResult: {
+                username,
+                token,
                 directAddress,
                 localAddresses,
+                externalAddresses,
                 scryptedCloud,
                 queryToken,
                 authorization,
                 cloudAddress,
-            }
+            },
+            connectRPCObject,
         }
 
         socket.on('close', () => {

plugins/amcrest/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.127",
+   "version": "0.0.130",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/amcrest",
-         "version": "0.0.127",
+         "version": "0.0.130",
          "license": "Apache",
          "dependencies": {
             "@koush/axios-digest-auth": "^0.8.5",

plugins/amcrest/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.127",
+   "version": "0.0.130",
    "description": "Amcrest Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

plugins/amcrest/src/main.ts

@@ -401,7 +401,7 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
                         else if (audioCodec?.includes('g711a'))
                             audioCodec = 'pcm_alaw';
                         else if (audioCodec?.includes('g711u'))
-                            audioCodec = 'pcm_ulaw';
+                            audioCodec = 'pcm_mulaw';
                         else if (audioCodec?.includes('g711'))
                             audioCodec = 'pcm';
 

plugins/arlo/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-out/
-node_modules/
-dist/
-.venv

plugins/arlo/.npmignore

@@ -1,10 +0,0 @@
-.DS_Store
-out/
-node_modules/
-*.map
-fs
-src
-.vscode
-dist/*.js
-dist/*.txt
-__pycache__

plugins/arlo/.vscode/launch.json

@@ -1,30 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Scrypted Debugger",
-            "type": "python",
-            "request": "attach",
-            "connect": {
-                "host": "${config:scrypted.debugHost}",
-                "port": 10081
-            },
-            "justMyCode": false,
-            "preLaunchTask": "scrypted: deploy+debug",
-            "pathMappings": [
-                {
-                    "localRoot": "${workspaceFolder}/../../server/python/",
-                    "remoteRoot": "${config:scrypted.serverRoot}/python",
-                },
-                {
-                    "localRoot": "${workspaceFolder}/src",
-                    "remoteRoot": "${config:scrypted.volumeRoot}/plugin.zip"
-                },
-
-            ]
-        }
-    ]
-}

plugins/arlo/.vscode/settings.json

@@ -1,27 +0,0 @@
-
-{
-    // specify the following paths on the target scrypted server:
-    // 1) where @scrypted/server node module resides: this may either be a checkout or a install.
-    // 2) where the scrypted "volume" data is located on the server. ie, the docker volume.
-    // the following default examples are provided for local and docker installations,
-    // only modifying the debugHost should be necessary:
-
-    // local installation
-    // "scrypted.debugHost": "192.168.2.119",
-    // "scrypted.serverRoot": "/home/pi/.scrypted/node_modules/@scrypted/server",
-    // "scrypted.volumeRoot": "/home/pi/.scrypted/volume",
-
-    // docker installation
-    // "scrypted.debugHost": "192.168.2.109",
-    "scrypted.serverRoot": "/server/node_modules/@scrypted/server",
-    "scrypted.volumeRoot": "/server/volume",
-
-    // local checkout
-    "scrypted.debugHost": "127.0.0.1",
-    //"scrypted.serverRoot": "/Volumes/Dev/scrypted/server",
-    //"scrypted.volumeRoot": "${config:scrypted.serverRoot}/volume",
-
-    "python.analysis.extraPaths": [
-        "./node_modules/@scrypted/sdk/types/scrypted_python"
-    ]
-}

plugins/arlo/.vscode/tasks.json

@@ -1,20 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "scrypted: deploy+debug",
-            "type": "shell",
-            "presentation": {
-                "echo": true,
-                "reveal": "silent",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": true,
-                "clear": false
-            },
-            "command": "npm run scrypted-vscode-launch ${config:scrypted.debugHost}",
-        },
-    ]
-}

plugins/arlo/README.md

@@ -1,43 +0,0 @@
-# Arlo Plugin for Scrypted
-
-The Arlo Plugin connects Scrypted to Arlo Cloud, allowing you to access all of your Arlo cameras in Scrypted.
-
-It is highly recommended to create a dedicated Arlo account for use with this plugin and share your cameras from your main account, as Arlo only permits one active login to their servers per account. Using a separate account allows you to use the Arlo app or website simultaneously with this plugin, otherwise logging in from one place will log you out from all other devices.
-
-The account you use for this plugin must have either SMS or email set as the default 2FA option. Once you enter your username and password on the plugin settings page, you should receive a 2FA code through your default 2FA option. Enter that code into the provided box, and your cameras will appear in Scrypted. Or, see below for configuring IMAP to auto-login with 2FA.
-
-If you experience any trouble logging in, clear the username and password boxes, reload the plugin, and try again.
-
-If you are unable to see shared cameras in your separate Arlo account, ensure that both your primary and secondary accounts are upgraded according to this [forum post](https://web.archive.org/web/20230710141914/https://community.arlo.com/t5/Arlo-Secure/Invited-friend-cannot-see-devices-on-their-dashboard-Arlo-Pro-2/m-p/1889396#M1813). Verify the sharing worked by logging in via the Arlo web dashboard.
-
-**If you add or remove cameras from your main Arlo account, or share/un-share/re-share cameras with the Arlo account used with this plugin, ensure that you reload this plugin to get the updated camera state from Arlo Cloud.**
-
-## General Setup Notes
-
-* Ensure that your Arlo account's default 2FA option is set to either SMS or email.
-* Motion events notifications should be turned on in the Arlo app. If you are receiving motion push notifications, Scrypted will also receive motion events.
-* Disable smart detection and any cloud/local recording in the Arlo app. Arlo Cloud only permits one active stream per camera, so any smart detection or recording features may prevent downstream plugins (e.g. Homekit) from successfully pulling the video feed after a motion event.
-* It is highly recommended to enable the Rebroadcast plugin to allow multiple downstream plugins to pull the video feed within Scrypted.
-* If there is no audio on your camera, switch to the `FFmpeg (TCP)` parser under the `Cloud RTSP` settings.
-* Prebuffering should only be enabled if the camera is wired to a persistent power source, such as a wall outlet. Prebuffering will only work if your camera does not have a battery or `Plugged In to External Power` is selected.
-* The plugin supports pulling RTSP or DASH streams from Arlo Cloud. It is recommended to use RTSP for the lowest latency streams. DASH is inconsistent in reliability, and may return finicky codecs that require additional FFmpeg output arguments, e.g. `-vcodec h264`. *Note that both RTSP and DASH will ultimately pull the same video stream feed from your camera, and they cannot both be used at the same time due to the single stream limitation.*
-
-Note that streaming cameras uses extra Internet bandwidth, since video and audio packets will need to travel from the camera through your network, out to Arlo Cloud, and then back to your network and into Scrypted.
-
-## IMAP 2FA
-
-The Arlo Plugin supports using the IMAP protocol to check an email mailbox for Arlo 2FA codes. This requires you to specify an email 2FA option as the default in your Arlo account settings.
-
-The plugin should work with any mailbox that supports IMAP, but so far has been tested with Gmail. To configure a Gmail mailbox, see [here](https://support.google.com/mail/answer/7126229?hl=en) to see the Gmail IMAP settings, and [here](https://support.google.com/accounts/answer/185833?hl=en) to create an App Password. Enter the App Password in place of your normal Gmail password.
-
-The plugin searches for emails sent by Arlo's `do_not_reply@arlo.com` address when looking for 2FA codes. If you are using a service to forward emails to the mailbox registered with this plugin (e.g. a service like iCloud's Hide My Email), it is possible that Arlo's email sender address has been overwritten by the mail forwarder. Check the email registered with this plugin to see what address the mail forwarder uses to replace Arlo's sender address, and update that in the IMAP 2FA settings.
-
-## Virtual Security System for Arlo Sirens
-
-In external integrations like Homekit, sirens are exposed as simple on-off switches. This makes it easy to accidentally hit the switch when using the Home app. The Arlo Plugin creates a "virtual" security system device per siren to allow Scrypted to arm or disarm the siren switch to protect against accidental triggers. This fake security system device will be synced into Homekit as a separate accessory from the camera, with the siren itself merged into the security system accessory.
-
-Note that the virtual security system is NOT tied to your Arlo account at all, and will not make any changes such as switching your device's motion alert armed/disarmed modes. For more information, please see the README on the virtual security system device in Scrypted.
-
-## Video Clips
-
-The Arlo Plugin will show video clips available in Arlo Cloud for cameras with cloud recording enabled. These clips are not downloaded onto your Scrypted server, but rather streamed on-demand. Deleting clips is not available in Scrypted and should be done through the Arlo app or the Arlo web dashboard.

plugins/arlo/package-lock.json

@@ -1,84 +0,0 @@
-{
-   "name": "@scrypted/arlo",
-   "version": "0.8.26",
-   "lockfileVersion": 2,
-   "requires": true,
-   "packages": {
-      "": {
-         "name": "@scrypted/arlo",
-         "version": "0.8.26",
-         "license": "Apache",
-         "devDependencies": {
-            "@scrypted/sdk": "file:../../sdk"
-         }
-      },
-      "../../sdk": {
-         "name": "@scrypted/sdk",
-         "version": "0.2.104",
-         "dev": true,
-         "license": "ISC",
-         "dependencies": {
-            "@babel/preset-typescript": "^7.18.6",
-            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
-            "babel-loader": "^9.1.0",
-            "babel-plugin-const-enum": "^1.1.0",
-            "esbuild": "^0.15.9",
-            "ncp": "^2.0.0",
-            "raw-loader": "^4.0.2",
-            "rimraf": "^3.0.2",
-            "tmp": "^0.2.1",
-            "ts-loader": "^9.4.2",
-            "typescript": "^4.9.4",
-            "webpack": "^5.75.0",
-            "webpack-bundle-analyzer": "^4.5.0"
-         },
-         "bin": {
-            "scrypted-changelog": "bin/scrypted-changelog.js",
-            "scrypted-debug": "bin/scrypted-debug.js",
-            "scrypted-deploy": "bin/scrypted-deploy.js",
-            "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js",
-            "scrypted-package-json": "bin/scrypted-package-json.js",
-            "scrypted-setup-project": "bin/scrypted-setup-project.js",
-            "scrypted-webpack": "bin/scrypted-webpack.js"
-         },
-         "devDependencies": {
-            "@types/node": "^18.11.18",
-            "@types/stringify-object": "^4.0.0",
-            "stringify-object": "^3.3.0",
-            "ts-node": "^10.4.0",
-            "typedoc": "^0.23.21"
-         }
-      },
-      "node_modules/@scrypted/sdk": {
-         "resolved": "../../sdk",
-         "link": true
-      }
-   },
-   "dependencies": {
-      "@scrypted/sdk": {
-         "version": "file:../../sdk",
-         "requires": {
-            "@babel/preset-typescript": "^7.18.6",
-            "@types/node": "^18.11.18",
-            "@types/stringify-object": "^4.0.0",
-            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
-            "babel-loader": "^9.1.0",
-            "babel-plugin-const-enum": "^1.1.0",
-            "esbuild": "^0.15.9",
-            "ncp": "^2.0.0",
-            "raw-loader": "^4.0.2",
-            "rimraf": "^3.0.2",
-            "stringify-object": "^3.3.0",
-            "tmp": "^0.2.1",
-            "ts-loader": "^9.4.2",
-            "ts-node": "^10.4.0",
-            "typedoc": "^0.23.21",
-            "typescript": "^4.9.4",
-            "webpack": "^5.75.0",
-            "webpack-bundle-analyzer": "^4.5.0"
-         }
-      }
-   }
-}

plugins/arlo/package.json

@@ -1,41 +0,0 @@
-{
-   "name": "@scrypted/arlo",
-   "version": "0.8.26",
-   "description": "Arlo Plugin for Scrypted",
-   "license": "Apache",
-   "keywords": [
-      "scrypted",
-      "plugin",
-      "arlo",
-      "camera"
-   ],
-   "scripts": {
-      "scrypted-setup-project": "scrypted-setup-project",
-      "prescrypted-setup-project": "scrypted-package-json",
-      "build": "scrypted-webpack",
-      "prepublishOnly": "NODE_ENV=production scrypted-webpack",
-      "prescrypted-vscode-launch": "scrypted-webpack",
-      "scrypted-vscode-launch": "scrypted-deploy-debug",
-      "scrypted-deploy-debug": "scrypted-deploy-debug",
-      "scrypted-debug": "scrypted-debug",
-      "scrypted-deploy": "scrypted-deploy",
-      "scrypted-readme": "scrypted-readme",
-      "scrypted-package-json": "scrypted-package-json"
-   },
-   "scrypted": {
-      "name": "Arlo Camera Plugin",
-      "runtime": "python",
-      "type": "DeviceProvider",
-      "interfaces": [
-         "Settings",
-         "DeviceProvider"
-      ],
-      "pluginDependencies": [
-         "@scrypted/snapshot",
-         "@scrypted/prebuffer-mixin"
-      ]
-   },
-   "devDependencies": {
-      "@scrypted/sdk": "file:../../sdk"
-   }
-}

plugins/arlo/src/arlo_plugin/__init__.py

@@ -1 +0,0 @@
-from .provider import ArloProvider

plugins/arlo/src/arlo_plugin/arlo/__init__.py

@@ -1 +0,0 @@
-from .arlo_async import Arlo

plugins/arlo/src/arlo_plugin/arlo/host_picker.py

@@ -1,31 +0,0 @@
-import ssl
-from socket import setdefaulttimeout
-import requests
-from requests_toolbelt.adapters import host_header_ssl
-import scrypted_arlo_go
-
-from .logging import logger
-
-
-setdefaulttimeout(15)
-
-
-def pick_host(hosts, hostname_to_match, endpoint_to_test):
-    setdefaulttimeout(5)
-
-    try:
-        session = requests.Session()
-        session.mount('https://', host_header_ssl.HostHeaderSSLAdapter())
-
-        for host in hosts:
-            try:
-                c = ssl.get_server_certificate((host, 443))
-                scrypted_arlo_go.VerifyCertHostname(c, hostname_to_match)
-                r = session.post(f"https://{host}{endpoint_to_test}", headers={"Host": hostname_to_match})
-                r.raise_for_status()
-                return host
-            except Exception as e:
-                logger.warning(f"{host} is invalid: {e}")
-        raise Exception("no valid hosts found!")
-    finally:
-        setdefaulttimeout(15)

plugins/arlo/src/arlo_plugin/arlo/logging.py

@@ -1,16 +0,0 @@
-import logging
-import sys
-
-# construct logger instance to be used by package arlo
-logger = logging.getLogger("lib")
-logger.setLevel(logging.INFO)
-
-# output logger to stdout
-ch = logging.StreamHandler(sys.stdout)
-
-# log formatting
-fmt = logging.Formatter("[Arlo]: %(message)s")
-ch.setFormatter(fmt)
-
-# configure handler to logger
-logger.addHandler(ch)

plugins/arlo/src/arlo_plugin/arlo/mqtt_stream_async.py

@@ -1,85 +0,0 @@
-import asyncio
-import json
-import random
-import paho.mqtt.client as mqtt
-
-from .stream_async import Stream 
-from .logging import logger
-
-class MQTTStream(Stream):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.cached_topics = []
-
-    def _gen_client_number(self):
-        return random.randint(1000000000, 9999999999)
-
-    async def start(self):
-        if self.event_stream is not None:
-            return
-
-        def on_connect(client, userdata, flags, rc):
-            self.connected = True
-            self.initializing = False
-
-            logger.info(f"MQTT {id(client)} connected")
-
-            client.subscribe([
-                (f"u/{self.arlo.user_id}/in/userSession/connect", 0),
-                (f"u/{self.arlo.user_id}/in/userSession/disconnect", 0),
-            ])
-
-        def on_disconnect(client, *args, **kwargs):
-            logger.info(f"MQTT {id(client)} disconnected")
-
-        def on_message(client, userdata, msg):
-            payload = msg.payload.decode()
-            logger.debug(f"Received event: {payload}")
-
-            try:
-                response = json.loads(payload.strip())
-            except json.JSONDecodeError:
-                return
-
-            if response.get('resource') is not None:
-                self.event_loop.call_soon_threadsafe(self._queue_response, response)
-
-        self.event_stream = mqtt.Client(client_id=f"user_{self.arlo.user_id}_{self._gen_client_number()}", transport="websockets", clean_session=False)
-        self.event_stream.username_pw_set(self.arlo.user_id, password=self.arlo.request.session.headers.get('Authorization'))
-        self.event_stream.ws_set_options(path="/mqtt", headers={"Origin": "https://my.arlo.com"})
-        self.event_stream.on_connect = on_connect
-        self.event_stream.on_disconnect = on_disconnect
-        self.event_stream.on_message = on_message
-        self.event_stream.tls_set()
-        self.event_stream.connect_async("mqtt-cluster.arloxcld.com", port=443)
-        self.event_stream.loop_start()
-
-        while not self.connected and not self.event_stream_stop_event.is_set():
-            await asyncio.sleep(0.5)
-        if not self.event_stream_stop_event.is_set():
-            self.resubscribe()
-
-    async def restart(self):
-        self.reconnecting = True
-        self.connected = False
-        self.event_stream.disconnect()
-        self.event_stream = None
-        await self.start()
-        # give it an extra sleep to ensure any previous connections have disconnected properly
-        # this is so we can mark reconnecting to False properly
-        await asyncio.sleep(1)
-        self.reconnecting = False
-
-    def subscribe(self, topics):
-        if topics:
-            new_subscriptions = [(topic, 0) for topic in topics]
-            self.event_stream.subscribe(new_subscriptions)
-            self.cached_topics.extend(new_subscriptions)
-
-    def resubscribe(self):
-        if self.cached_topics:
-            self.event_stream.subscribe(self.cached_topics)
-
-    def disconnect(self):
-        super().disconnect()
-        self.event_stream.disconnect()

plugins/arlo/src/arlo_plugin/arlo/request.py

@@ -1,114 +0,0 @@
-##
-# Copyright 2016 Jeffrey D. Walter
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-from functools import partialmethod
-import requests
-from requests.exceptions import HTTPError
-from requests_toolbelt.adapters import host_header_ssl
-import cloudscraper
-from curl_cffi import requests as curl_cffi_requests
-import time
-import uuid
-
-from .logging import logger
-
-
-
-#from requests_toolbelt.utils import dump
-#def print_raw_http(response):
-#    data = dump.dump_all(response, request_prefix=b'', response_prefix=b'')
-#    print('\n' * 2 + data.decode('utf-8'))
-
-class Request(object):
-    """HTTP helper class"""
-
-    def __init__(self, timeout=5, mode="curl"):
-        if mode == "curl":
-            logger.debug("HTTP helper using curl_cffi")
-            self.session = curl_cffi_requests.Session(impersonate="chrome110")
-        elif mode == "cloudscraper":
-            logger.debug("HTTP helper using cloudscraper")
-            from .arlo_async import USER_AGENTS
-            self.session = cloudscraper.CloudScraper(browser={"custom": USER_AGENTS["android"]})
-        elif mode == "ip":
-            logger.debug("HTTP helper using requests with HostHeaderSSLAdapter")
-            self.session = requests.Session()
-            self.session.mount('https://', host_header_ssl.HostHeaderSSLAdapter())
-        else:
-            logger.debug("HTTP helper using requests")
-            self.session = requests.Session()
-        self.timeout = timeout
-
-    def gen_event_id(self):
-        return f'FE!{str(uuid.uuid4())}'
-
-    def get_time(self):
-        return int(time.time_ns() / 1_000_000)
-
-    def _request(self, url, method='GET', params={}, headers={}, raw=False, skip_event_id=False):
-
-        ## uncomment for debug logging
-        """
-        import logging
-        import http.client
-        http.client.HTTPConnection.debuglevel = 1
-        #logging.basicConfig()
-        logging.getLogger().setLevel(logging.DEBUG)
-        req_log = logging.getLogger('requests.packages.urllib3')
-        req_log.setLevel(logging.DEBUG)
-        req_log.propagate = True
-        #"""
-
-        if not skip_event_id:
-            url = f'{url}?eventId={self.gen_event_id()}&time={self.get_time()}'
-
-        if method == 'GET':
-            #print('COOKIES: ', self.session.cookies.get_dict())
-            r = self.session.get(url, params=params, headers=headers, timeout=self.timeout)
-            r.raise_for_status()
-        elif method == 'PUT':
-            r = self.session.put(url, json=params, headers=headers, timeout=self.timeout)
-            r.raise_for_status()
-        elif method == 'POST':
-            r = self.session.post(url, json=params, headers=headers, timeout=self.timeout)
-            r.raise_for_status()
-        elif method == 'OPTIONS':
-            r = self.session.options(url, headers=headers, timeout=self.timeout)
-            r.raise_for_status()
-            return
-
-        body = r.json()
-
-        if raw:
-            return body
-        else:
-            if ('success' in body and body['success'] == True) or ('meta' in body and body['meta']['code'] == 200):
-                if 'data' in body:
-                    return body['data']
-            else:
-                raise HTTPError('Request ({0} {1}) failed: {2}'.format(method, url, r.json()), response=r)
-
-    def get(self, url, **kwargs):
-        return self._request(url, 'GET', **kwargs)
-
-    def put(self, url, **kwargs):
-        return self._request(url, 'PUT', **kwargs)
-
-    def post(self, url, **kwargs):
-        return self._request(url, 'POST', **kwargs)
-
-    def options(self, url, **kwargs):
-        return self._request(url, 'OPTIONS', **kwargs)

plugins/arlo/src/arlo_plugin/arlo/sse_stream_async.py

@@ -1,82 +0,0 @@
-import asyncio
-import json
-import threading
-
-import scrypted_arlo_go
-
-from .stream_async import Stream
-from .logging import logger
-
-
-class EventStream(Stream):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.shutting_down_stream = None  # record the eventstream that is currently shutting down
-
-    async def start(self):
-        if self.event_stream is not None:
-            return
-
-        def thread_main(self):
-            event_stream = self.event_stream
-            while True:
-                try:
-                    event = event_stream.Next()
-                except:
-                    logger.info(f"SSE {event_stream.UUID} exited")
-                    if self.shutting_down_stream is event_stream:
-                        self.shutting_down_stream = None
-                    return None
-
-                logger.debug(f"Received event: {event}")
-
-                if event.strip() == "":
-                    continue
-
-                try:
-                    response = json.loads(event.strip())
-                except json.JSONDecodeError:
-                    continue
-
-                if response.get('action') == 'logout':
-                    if self.event_stream_stop_event.is_set() or \
-                        self.shutting_down_stream is event_stream:
-                        logger.info(f"SSE {event_stream.UUID} disconnected")
-                        self.shutting_down_stream = None
-                        event_stream.Close()
-                        return None
-                elif response.get('status') == 'connected':
-                    if not self.connected:
-                        logger.info(f"SSE {event_stream.UUID} connected")
-                        self.initializing = False
-                        self.connected = True
-                else:
-                    self.event_loop.call_soon_threadsafe(self._queue_response, response)
-
-        self.event_stream = scrypted_arlo_go.NewSSEClient(
-            'https://myapi.arlo.com/hmsweb/client/subscribe?token='+self.arlo.request.session.headers.get('Authorization'),
-            scrypted_arlo_go.HeadersMap(self.arlo.request.session.headers)
-        )
-        self.event_stream.Start()
-        self.event_stream_thread = threading.Thread(name="EventStream", target=thread_main, args=(self, ))
-        self.event_stream_thread.setDaemon(True)
-        self.event_stream_thread.start()
-
-        while not self.connected and not self.event_stream_stop_event.is_set():
-            await asyncio.sleep(0.5)
-
-    async def restart(self):
-        self.reconnecting = True
-        self.connected = False
-        self.shutting_down_stream = self.event_stream
-        self.shutting_down_stream.Close()
-        self.event_stream = None
-        await self.start()
-        while self.shutting_down_stream is not None:
-            # ensure any previous connections have disconnected properly
-            # this is so we can mark reconnecting to False properly
-            await asyncio.sleep(1)
-        self.reconnecting = False
-
-    def subscribe(self, topics):
-        pass

plugins/arlo/src/arlo_plugin/arlo/stream_async.py

@@ -1,238 +0,0 @@
-# This file has been modified to support async semantics and better
-# integration with scrypted.
-# Original: https://github.com/jeffreydwalter/arlo
-
-##
-# Copyright 2016 Jeffrey D. Walter
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-import asyncio
-import random
-import threading
-import time
-import uuid
-
-from .logging import logger
-
-class Stream:
-    """This class provides a queue-based EventStream object."""
-    def __init__(self, arlo, expire=5):
-        self.event_stream = None
-        self.initializing = True
-        self.connected = False
-        self.reconnecting = False
-        self.queues = {}
-        self.expire = expire
-        self.refresh = 0
-        self.refresh_loop_signal = asyncio.Queue()
-        self.event_stream_stop_event = threading.Event()
-        self.event_stream_thread = None
-        self.arlo = arlo
-        self.event_loop = asyncio.get_event_loop()
-        self.event_loop.create_task(self._clean_queues())
-        self.event_loop.create_task(self._refresh_interval())
-
-    def __del__(self):
-        self.disconnect()
-
-    @property
-    def active(self):
-        """Represents if this stream is connected or in the process of reconnecting."""
-        return self.connected or self.reconnecting
-
-    async def _refresh_interval(self):
-        while not self.event_stream_stop_event.is_set():
-            if self.refresh == 0:
-                # to avoid spinning, wait until an interval is set
-                signal = await self.refresh_loop_signal.get()
-                if signal is None:
-                    # exit signal received from disconnect()
-                    return
-                continue
-
-            interval = self.refresh * 60  # interval in seconds from refresh in minutes
-            signal_task = asyncio.create_task(self.refresh_loop_signal.get())
-
-            # wait until either we receive a signal or the refresh interval expires
-            done, pending = await asyncio.wait([signal_task, asyncio.sleep(interval)], return_when=asyncio.FIRST_COMPLETED)
-            for task in pending:
-                task.cancel()
-
-            done_task = done.pop()
-            if done_task is signal_task and done_task.result() is None:
-                # exit signal received from disconnect()
-                return
-
-            logger.info("Refreshing event stream")
-            await self.restart()
-
-    def set_refresh_interval(self, interval):
-        self.refresh = interval
-        self.refresh_loop_signal.put_nowait(object())
-
-    async def _clean_queues(self):
-        interval = self.expire * 4
-
-        await asyncio.sleep(interval)
-        while not self.event_stream_stop_event.is_set():
-            # since we interrupt the cleanup loop after every queue, there's
-            # a chance the self.queues dict is modified during iteration.
-            # so, we first make a copy of all the items of the dict and any
-            # new queues will be processed on the next loop through
-            queue_items = [i for i in self.queues.items()]
-            for key, q in queue_items:
-                if q.empty():
-                    continue
-
-                items = []
-                num_dropped = 0
-
-                while not q.empty():
-                    item = q.get_nowait()
-                    q.task_done()
-
-                    if not item:
-                        # exit signal received
-                        return
-
-                    if item.expired:
-                        num_dropped += 1
-                        continue
-
-                    items.append(item)
-
-                for item in items:
-                    q.put_nowait(item)
-
-                if num_dropped > 0:
-                    logger.debug(f"Cleaned {num_dropped} events from queue {key}")
-
-                # cleanup is not urgent, so give other tasks a chance
-                await asyncio.sleep(0.1)
-
-            await asyncio.sleep(interval)
-
-    async def get(self, resource, action, property=None, skip_uuids={}):
-        if not property:
-            key = f"{resource}/{action}"
-        else:
-            key = f"{resource}/{action}/{property}"
-
-        if key not in self.queues:
-            q = self.queues[key] = asyncio.Queue()
-        else:
-            q = self.queues[key]
-
-        first_requeued = None
-        while True:
-            event = await q.get()
-            q.task_done()
-
-            if not event:
-                # exit signal received
-                return None, action
-
-            if first_requeued is not None and first_requeued is event:
-                # if we reach here, we've cycled through the whole queue
-                # and found nothing for us, so sleep and give the next
-                # subscriber a chance
-                q.put_nowait(event)
-                await asyncio.sleep(random.uniform(0, 0.01))
-                continue
-
-            if event.expired:
-                continue
-            elif event.uuid in skip_uuids:
-                q.put_nowait(event)
-                if first_requeued is None:
-                    first_requeued = event
-            else:
-                return event, action
-
-    async def start(self):
-        raise NotImplementedError()
-
-    async def restart(self):
-        raise NotImplementedError()
-
-    def subscribe(self, topics):
-        raise NotImplementedError()
-
-    def _queue_response(self, response):
-        resource = response.get('resource')
-        action = response.get('action')
-        key = f"{resource}/{action}"
-
-        now = time.time()
-        event = StreamEvent(response, now, now + self.expire)
-        self._queue_impl(key, event)
-
-        # specialized setup for error responses
-        if 'error' in response:
-            key = f"{resource}/error"
-            self._queue_impl(key, event)
-
-        # for optimized lookups, notify listeners of individual properties
-        properties = response.get('properties', {})
-        for property in properties.keys():
-            key = f"{resource}/{action}/{property}"
-            self._queue_impl(key, event)
-
-    def _queue_impl(self, key, event):
-        if key not in self.queues:
-            q = self.queues[key] = asyncio.Queue()
-        else:
-            q = self.queues[key]
-        q.put_nowait(event)
-
-    def requeue(self, event, resource, action, property=None):
-        if not property:
-            key = f"{resource}/{action}"
-        else:
-            key = f"{resource}/{action}/{property}"
-        self.queues[key].put_nowait(event)
-
-    def disconnect(self):
-        if self.reconnecting:
-            # disconnect may be called when an old stream is being refreshed/restarted,
-            # so don't completely shut down if we are reconnecting
-            return
-
-        self.connected = False
-
-        def exit_queues(self):
-            for q in self.queues.values():
-                q.put_nowait(None)
-            self.refresh_loop_signal.put_nowait(None)
-        self.event_loop.call_soon_threadsafe(exit_queues, self)
-
-        self.event_stream_stop_event.set()
-
-
-class StreamEvent:
-    item = None
-    timestamp = None
-    expiration = None
-    uuid = None
-
-    def __init__(self, item, timestamp, expiration):
-        self.item = item
-        self.timestamp = timestamp
-        self.expiration = expiration
-        self.uuid = str(uuid.uuid4())
-
-    @property
-    def expired(self):
-        return time.time() > self.expiration

plugins/arlo/src/arlo_plugin/base.py

@@ -1,79 +0,0 @@
-from __future__ import annotations
-
-import traceback
-from typing import List, TYPE_CHECKING
-
-from scrypted_sdk import ScryptedDeviceBase
-from scrypted_sdk.types import Device
-
-from .logging import ScryptedDeviceLoggerMixin
-from .util import BackgroundTaskMixin
-
-if TYPE_CHECKING:
-    # https://adamj.eu/tech/2021/05/13/python-type-hints-how-to-fix-circular-imports/
-    from .provider import ArloProvider
-
-
-class ArloDeviceBase(ScryptedDeviceBase, ScryptedDeviceLoggerMixin, BackgroundTaskMixin):
-    nativeId: str = None
-    arlo_device: dict = None
-    arlo_basestation: dict = None
-    arlo_capabilities: dict = None
-    provider: ArloProvider = None
-    stop_subscriptions: bool = False
-
-    def __init__(self, nativeId: str, arlo_device: dict, arlo_basestation: dict, provider: ArloProvider) -> None:
-        super().__init__(nativeId=nativeId)
-
-        self.logger_name = nativeId
-
-        self.nativeId = nativeId
-        self.arlo_device = arlo_device
-        self.arlo_basestation = arlo_basestation
-        self.provider = provider
-        self.logger.setLevel(self.provider.get_current_log_level())
-
-        try:
-            self.arlo_capabilities = self.provider.arlo.GetDeviceCapabilities(self.arlo_device)
-        except Exception as e:
-            self.logger.warning(f"Could not load device capabilities: {e}")
-            self.arlo_capabilities = {}
-
-    def __del__(self) -> None:
-        self.stop_subscriptions = True
-        self.cancel_pending_tasks()
-
-    def get_applicable_interfaces(self) -> List[str]:
-        """Returns the list of Scrypted interfaces that applies to this device."""
-        return []
-
-    def get_device_type(self) -> str:
-        """Returns the Scrypted device type that applies to this device."""
-        return ""
-
-    def get_device_manifest(self) -> Device:
-        """Returns the Scrypted device manifest representing this device."""
-        parent = None
-        if self.arlo_device.get("parentId") and self.arlo_device["parentId"] != self.arlo_device["deviceId"]:
-            parent = self.arlo_device["parentId"]
-
-        if parent in self.provider.hidden_device_ids:
-            parent = None
-
-        return {
-            "info": {
-                "model": f"{self.arlo_device['modelId']} {self.arlo_device['properties'].get('hwVersion', '')}".strip(),
-                "manufacturer": "Arlo",
-                "firmware": self.arlo_device.get("firmwareVersion"),
-                "serialNumber": self.arlo_device["deviceId"],
-            },
-            "nativeId": self.arlo_device["deviceId"],
-            "name": self.arlo_device["deviceName"],
-            "interfaces": self.get_applicable_interfaces(),
-            "type": self.get_device_type(),
-            "providerNativeId": parent,
-        }
-
-    def get_builtin_child_device_manifests(self) -> List[Device]:
-        """Returns the list of child device manifests representing hardware features built into this device."""
-        return []

plugins/arlo/src/arlo_plugin/basestation.py

@@ -1,90 +0,0 @@
-from __future__ import annotations
-
-from typing import List, TYPE_CHECKING
-
-from scrypted_sdk import ScryptedDeviceBase
-from scrypted_sdk.types import Device, DeviceProvider, Setting, SettingValue, Settings, ScryptedInterface, ScryptedDeviceType
-
-from .base import ArloDeviceBase
-from .vss import ArloSirenVirtualSecuritySystem
-
-if TYPE_CHECKING:
-    # https://adamj.eu/tech/2021/05/13/python-type-hints-how-to-fix-circular-imports/
-    from .provider import ArloProvider
-
-
-class ArloBasestation(ArloDeviceBase, DeviceProvider, Settings):
-    MODELS_WITH_SIRENS = [
-        "vmb4000",
-        "vmb4500"
-    ]
-
-    vss: ArloSirenVirtualSecuritySystem = None
-
-    def __init__(self, nativeId: str, arlo_basestation: dict, provider: ArloProvider) -> None:
-        super().__init__(nativeId=nativeId, arlo_device=arlo_basestation, arlo_basestation=arlo_basestation, provider=provider)
-
-    @property
-    def has_siren(self) -> bool:
-        return any([self.arlo_device["modelId"].lower().startswith(model) for model in ArloBasestation.MODELS_WITH_SIRENS])
-
-    def get_applicable_interfaces(self) -> List[str]:
-        return [
-            ScryptedInterface.DeviceProvider.value,
-            ScryptedInterface.Settings.value,
-        ]
-
-    def get_device_type(self) -> str:
-        return ScryptedDeviceType.DeviceProvider.value
-
-    def get_builtin_child_device_manifests(self) -> List[Device]:
-        if not self.has_siren:
-            # this basestation has no builtin siren, so no manifests to return
-            return []
-
-        vss = self.get_or_create_vss()
-        return [
-            {
-                "info": {
-                    "model": f"{self.arlo_device['modelId']} {self.arlo_device['properties'].get('hwVersion', '')}".strip(),
-                    "manufacturer": "Arlo",
-                    "firmware": self.arlo_device.get("firmwareVersion"),
-                    "serialNumber": self.arlo_device["deviceId"],
-                },
-                "nativeId": vss.nativeId,
-                "name": f'{self.arlo_device["deviceName"]} Siren Virtual Security System',
-                "interfaces": vss.get_applicable_interfaces(),
-                "type": vss.get_device_type(),
-                "providerNativeId": self.nativeId,
-            },
-        ] + vss.get_builtin_child_device_manifests()
-
-    async def getDevice(self, nativeId: str) -> ScryptedDeviceBase:
-        if not nativeId.startswith(self.nativeId):
-            # must be a camera, so get it from the provider
-            return await self.provider.getDevice(nativeId)
-        if not nativeId.endswith("vss"):
-            return None
-        return self.get_or_create_vss()
-
-    def get_or_create_vss(self) -> ArloSirenVirtualSecuritySystem:
-        vss_id = f'{self.arlo_device["deviceId"]}.vss'
-        if not self.vss:
-            self.vss = ArloSirenVirtualSecuritySystem(vss_id, self.arlo_device, self.arlo_basestation, self.provider, self)
-        return self.vss
-
-    async def getSettings(self) -> List[Setting]:
-        return [
-            {
-                "group": "General",
-                "key": "print_debug",
-                "title": "Debug Info",
-                "description": "Prints information about this device to console.",
-                "type": "button",
-            }
-        ]
-
-    async def putSetting(self, key: str, value: SettingValue) -> None:
-        if key == "print_debug":
-            self.logger.info(f"Device Capabilities: {self.arlo_capabilities}")
-        await self.onDeviceEvent(ScryptedInterface.Settings.value, None)

plugins/arlo/src/arlo_plugin/child_process.py

@@ -1,93 +0,0 @@
-import multiprocessing
-import subprocess
-import time
-import threading
-
-import scrypted_arlo_go
-
-
-HEARTBEAT_INTERVAL = 5
-
-
-def multiprocess_main(name, logger_port, child_conn, exe, args):
-    logger = scrypted_arlo_go.NewTCPLogger(logger_port, "HeartbeatChildProcess")
-
-    logger.Send(f"{name} starting\n")
-    sp = subprocess.Popen([exe, *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-    # pull stdout and stderr from the subprocess and forward it over to
-    # our tcp logger
-    def logging_thread(stdstream):
-        while True:
-            line = stdstream.readline()
-            if not line:
-                break
-            line = str(line, 'utf-8')
-            logger.Send(line)
-    stdout_t = threading.Thread(target=logging_thread, args=(sp.stdout,))
-    stderr_t = threading.Thread(target=logging_thread, args=(sp.stderr,))
-    stdout_t.start()
-    stderr_t.start()
-
-    while True:
-        has_data = child_conn.poll(HEARTBEAT_INTERVAL * 3)
-        if not has_data:
-            break
-
-        # check if the subprocess is still alive, if not then exit
-        if sp.poll() is not None:
-            break
-
-        keep_alive = child_conn.recv()
-        if not keep_alive:
-            break
-
-    logger.Send(f"{name} exiting\n")
-
-    sp.terminate()
-    sp.wait()
-
-    stdout_t.join()
-    stderr_t.join()
-
-    logger.Send(f"{name} exited\n")
-    logger.Close()
-
-
-class HeartbeatChildProcess:
-    """Class to manage running a child process that gets cleaned up if the parent exits.
-
-    When spawining subprocesses in Python, if the parent is forcibly killed (as is the case
-    when Scrypted restarts plugins), subprocesses get orphaned. This approach uses parent-child
-    heartbeats for the child to ensure that the parent process is still alive, and to cleanly
-    exit the child if the parent has terminated.
-    """
-
-    def __init__(self, name, logger_port, exe, *args):
-        self.name = name
-        self.logger_port = logger_port
-        self.exe = exe
-        self.args = args
-
-        self.parent_conn, self.child_conn = multiprocessing.Pipe()
-        self.process = multiprocessing.Process(target=multiprocess_main, args=(name, logger_port, self.child_conn, exe, args))
-        self.process.daemon = True
-        self._stop = False
-
-        self.thread = threading.Thread(target=self.heartbeat)
-
-    def start(self):
-        self.process.start()
-        self.thread.start()
-
-    def stop(self):
-        self._stop = True
-        self.parent_conn.send(False)
-
-    def heartbeat(self):
-        while not self._stop:
-            time.sleep(HEARTBEAT_INTERVAL)
-            if not self.process.is_alive():
-                self.stop()
-                break
-            self.parent_conn.send(True)

plugins/arlo/src/arlo_plugin/doorbell.py

@@ -1,34 +0,0 @@
-from __future__ import annotations
-
-from typing import List, TYPE_CHECKING
-
-from scrypted_sdk.types import BinarySensor, ScryptedInterface, ScryptedDeviceType
-
-from .camera import ArloCamera
-
-if TYPE_CHECKING:
-    # https://adamj.eu/tech/2021/05/13/python-type-hints-how-to-fix-circular-imports/
-    from .provider import ArloProvider
-
-
-class ArloDoorbell(ArloCamera, BinarySensor):
-    def __init__(self, nativeId: str, arlo_device: dict, arlo_basestation: dict, provider: ArloProvider) -> None:
-        super().__init__(nativeId=nativeId, arlo_device=arlo_device, arlo_basestation=arlo_basestation, provider=provider)
-        self.start_doorbell_subscription()
-
-    def start_doorbell_subscription(self) -> None:
-        def callback(doorbellPressed):
-            self.binaryState = doorbellPressed
-            return self.stop_subscriptions
-
-        self.register_task(
-            self.provider.arlo.SubscribeToDoorbellEvents(self.arlo_basestation, self.arlo_device, callback)
-        )
-
-    def get_device_type(self) -> str:
-        return ScryptedDeviceType.Doorbell.value
-
-    def get_applicable_interfaces(self) -> List[str]:
-        camera_interfaces = super().get_applicable_interfaces()
-        camera_interfaces.append(ScryptedInterface.BinarySensor.value)
-        return camera_interfaces

plugins/arlo/src/arlo_plugin/experimental.py

@@ -1,3 +0,0 @@
-import os
-
-EXPERIMENTAL = os.environ.get("SCRYPTED_ARLO_EXPERIMENTAL", "0") not in ["", "0"]

plugins/arlo/src/arlo_plugin/logging.py

@@ -1,43 +0,0 @@
-import logging
-
-
-class ScryptedDeviceLoggingWrapper(logging.Handler):
-    scrypted_device = None
-
-    def __init__(self, scrypted_device):
-        super().__init__()
-        self.scrypted_device = scrypted_device
-
-    def emit(self, record):
-        self.scrypted_device.print(self.format(record))
-
-
-def createScryptedLogger(scrypted_device, name):
-    logger = logging.getLogger(name)
-    if logger.hasHandlers():
-        return logger
-
-    logger.setLevel(logging.INFO)
-
-    # configure logger to output to scrypted's log stream
-    sh = ScryptedDeviceLoggingWrapper(scrypted_device)
-
-    # log formatting
-    fmt = logging.Formatter("[Arlo %(name)s]: %(message)s")
-    sh.setFormatter(fmt)
-
-    # configure handler to logger
-    logger.addHandler(sh)
-
-    return logger
-
-
-class ScryptedDeviceLoggerMixin:
-    _logger = None
-    logger_name = None
-
-    @property
-    def logger(self):
-        if self._logger is None:
-            self._logger = createScryptedLogger(self, self.logger_name)
-        return self._logger

plugins/arlo/src/arlo_plugin/provider.py

@@ -1,814 +0,0 @@
-import asyncio
-from bs4 import BeautifulSoup
-import email
-import functools
-import imaplib
-import json
-import logging
-import re
-import requests
-from typing import List
-
-import scrypted_sdk
-from scrypted_sdk import ScryptedDeviceBase
-from scrypted_sdk.types import Setting, SettingValue, Settings, DeviceProvider, ScryptedInterface
-
-from .arlo import Arlo
-from .arlo.arlo_async import change_stream_class
-from .arlo.logging import logger as arlo_lib_logger
-from .logging import ScryptedDeviceLoggerMixin
-from .util import BackgroundTaskMixin, async_print_exception_guard
-from .camera import ArloCamera
-from .doorbell import ArloDoorbell
-from .basestation import ArloBasestation
-from .base import ArloDeviceBase
-
-
-class ArloProvider(ScryptedDeviceBase, Settings, DeviceProvider, ScryptedDeviceLoggerMixin, BackgroundTaskMixin):
-    arlo_cameras = None
-    arlo_basestations = None
-    all_device_ids: set = set()
-    _arlo_mfa_code = None
-    scrypted_devices = None
-    _arlo: Arlo = None
-    _arlo_mfa_complete_auth = None
-    device_discovery_lock: asyncio.Lock = None
-
-    plugin_verbosity_choices = {
-        "Normal": logging.INFO,
-        "Verbose": logging.DEBUG
-    }
-
-    arlo_transport_choices = ["MQTT", "SSE"]
-
-    mfa_strategy_choices = ["Manual", "IMAP"]
-
-    def __init__(self, nativeId: str = None) -> None:
-        super().__init__(nativeId=nativeId)
-        self.logger_name = "Provider"
-
-        self.arlo_cameras = {}
-        self.arlo_basestations = {}
-        self.scrypted_devices = {}
-        self.imap = None
-        self.imap_signal = None
-        self.imap_skip_emails = None
-        self.device_discovery_lock = asyncio.Lock()
-
-        self.propagate_verbosity()
-        self.propagate_transport()
-
-        def load(self):
-            if self.mfa_strategy == "IMAP":
-                self.initialize_imap()
-            else:
-                _ = self.arlo
-
-        asyncio.get_event_loop().call_soon(load, self)
-        self.create_task(self.onDeviceEvent(ScryptedInterface.Settings.value, None))
-
-    def print(self, *args, **kwargs) -> None:
-        """Overrides the print() from ScryptedDeviceBase to avoid double-printing in the main plugin console."""
-        print(*args, **kwargs)
-
-    @property
-    def arlo_username(self) -> str:
-        return self.storage.getItem("arlo_username")
-
-    @property
-    def arlo_password(self) -> str:
-        return self.storage.getItem("arlo_password")
-
-    @property
-    def arlo_auth_headers(self) -> str:
-        return self.storage.getItem("arlo_auth_headers")
-
-    @property
-    def arlo_user_id(self) -> str:
-        return self.storage.getItem("arlo_user_id")
-
-    @property
-    def arlo_transport(self) -> str:
-        return "SSE"
-        # This code is here for posterity, however it looks that as of 06/01/2023
-        # Arlo has disabled the MQTT backend
-        transport = self.storage.getItem("arlo_transport")
-        if transport is None or transport not in ArloProvider.arlo_transport_choices:
-            transport = "SSE"
-            self.storage.setItem("arlo_transport", transport)
-        return transport
-
-    @property
-    def plugin_verbosity(self) -> str:
-        verbosity = self.storage.getItem("plugin_verbosity")
-        if verbosity is None or verbosity not in ArloProvider.plugin_verbosity_choices:
-            verbosity = "Normal"
-            self.storage.setItem("plugin_verbosity", verbosity)
-        return verbosity
-
-    @property
-    def mfa_strategy(self) -> str:
-        strategy = self.storage.getItem("mfa_strategy")
-        if strategy is None or strategy not in ArloProvider.mfa_strategy_choices:
-            strategy = "Manual"
-            self.storage.setItem("mfa_strategy", strategy)
-        return strategy
-
-    @property
-    def refresh_interval(self) -> int:
-        interval = self.storage.getItem("refresh_interval")
-        if interval is None:
-            interval = 90
-            self.storage.setItem("refresh_interval", interval)
-        return int(interval)
-
-    @property
-    def imap_mfa_host(self) -> str:
-        return self.storage.getItem("imap_mfa_host")
-
-    @property
-    def imap_mfa_port(self) -> int:
-        port = self.storage.getItem("imap_mfa_port")
-        if port is None:
-            port = 993
-            self.storage.setItem("imap_mfa_port", port)
-        return int(port)
-
-    @property
-    def imap_mfa_username(self) -> str:
-        return self.storage.getItem("imap_mfa_username")
-
-    @property
-    def imap_mfa_password(self) -> str:
-        return self.storage.getItem("imap_mfa_password")
-
-    @property
-    def imap_mfa_sender(self) -> str:
-        sender = self.storage.getItem("imap_mfa_sender")
-        if sender is None or sender == "":
-            sender = "do_not_reply@arlo.com"
-            self.storage.setItem("imap_mfa_sender", sender)
-        return sender
-
-    @property
-    def imap_mfa_interval(self) -> int:
-        interval = self.storage.getItem("imap_mfa_interval")
-        if interval is None:
-            interval = 7
-            self.storage.setItem("imap_mfa_interval", interval)
-        return int(interval)
-
-    @property
-    def hidden_devices(self) -> List[str]:
-        hidden = self.storage.getItem("hidden_devices")
-        if hidden is None:
-            hidden = []
-            self.storage.setItem("hidden_devices", hidden)
-        return hidden
-
-    @property
-    def hidden_device_ids(self) -> List[str]:
-        ids = []
-        for id in self.hidden_devices:
-            m = re.match(r".*\((.*)\)$", id)
-            if m is not None:
-                ids.append(m.group(1))
-        return ids
-
-    @property
-    def arlo(self) -> Arlo:
-        if self._arlo is not None:
-            if self._arlo_mfa_complete_auth is not None:
-                if not self._arlo_mfa_code:
-                    return None
-
-                self.logger.info("Completing Arlo MFA...")
-                try:
-                    self._arlo_mfa_complete_auth(self._arlo_mfa_code)
-                finally:
-                    self._arlo_mfa_complete_auth = None
-                    self._arlo_mfa_code = None
-                self.logger.info("Arlo MFA done")
-
-                self.storage.setItem("arlo_auth_headers", json.dumps(dict(self._arlo.request.session.headers.items())))
-                self.storage.setItem("arlo_user_id", self._arlo.user_id)
-
-                self.create_task(self.do_arlo_setup())
-
-            return self._arlo
-
-        if not self.arlo_username or not self.arlo_password:
-            return None
-
-        self.logger.info("Trying to initialize Arlo client...")
-        try:
-            self._arlo = Arlo(self.arlo_username, self.arlo_password)
-            headers = self.arlo_auth_headers
-            if headers:
-                self._arlo.UseExistingAuth(self.arlo_user_id, json.loads(headers))
-                self.logger.info(f"Initialized Arlo client, reusing stored auth headers")
-                self.create_task(self.do_arlo_setup())
-                return self._arlo
-            else:
-                self._arlo_mfa_complete_auth = self._arlo.LoginMFA()
-                self.logger.info(f"Initialized Arlo client, waiting for MFA code")
-                return None
-        except Exception:
-            self.logger.exception("Error initializing Arlo client")
-            self._arlo = None
-            self._arlo_mfa_complete_auth = None
-            self._arlo_mfa_code = None
-            raise
-
-    async def do_arlo_setup(self) -> None:
-        try:
-            await self.discover_devices()
-            await self.arlo.Subscribe([
-                (self.arlo_basestations[camera["parentId"]], camera) for camera in self.arlo_cameras.values()
-            ])
-
-            self.arlo.event_stream.set_refresh_interval(self.refresh_interval)
-        except requests.exceptions.HTTPError:
-            self.logger.exception("Error logging in")
-            self.logger.error("Will retry with fresh login")
-            self._arlo = None
-            self._arlo_mfa_code = None
-            self.storage.setItem("arlo_auth_headers", None)
-            _ = self.arlo
-        except Exception:
-            self.logger.exception("Error logging in")
-
-    def invalidate_arlo_client(self) -> None:
-        if self._arlo is not None:
-            self._arlo.Unsubscribe()
-        self._arlo = None
-        self._arlo_mfa_code = None
-        self._arlo_mfa_complete_auth = None
-        self.storage.setItem("arlo_auth_headers", "")
-        self.storage.setItem("arlo_user_id", "")
-
-    def get_current_log_level(self) -> int:
-        return ArloProvider.plugin_verbosity_choices[self.plugin_verbosity]
-
-    def propagate_verbosity(self) -> None:
-        self.print(f"Setting plugin verbosity to {self.plugin_verbosity}")
-        log_level = self.get_current_log_level()
-        self.logger.setLevel(log_level)
-        for _, device in self.scrypted_devices.items():
-            device.logger.setLevel(log_level)
-        arlo_lib_logger.setLevel(log_level)
-
-    def propagate_transport(self) -> None:
-        self.print(f"Setting plugin transport to {self.arlo_transport}")
-        change_stream_class(self.arlo_transport)
-
-    def initialize_imap(self, try_count=1) -> None:
-        if not self.imap_mfa_host or not self.imap_mfa_port or \
-            not self.imap_mfa_username or not self.imap_mfa_password or \
-            not self.imap_mfa_interval:
-            return
-
-        self.exit_imap()
-        try:
-            self.logger.info(f"Trying connect to IMAP (attempt {try_count})")
-            self.imap = imaplib.IMAP4_SSL(self.imap_mfa_host, port=self.imap_mfa_port)
-
-            res, _ = self.imap.login(self.imap_mfa_username, self.imap_mfa_password)
-            if res.lower() != "ok":
-                raise Exception(f"IMAP login failed: {res}")
-            res, _ = self.imap.select(mailbox="INBOX", readonly=True)
-            if res.lower() != "ok":
-                raise Exception(f"IMAP failed to fetch INBOX: {res}")
-
-            # fetch existing arlo emails so we skip them going forward
-            res, self.imap_skip_emails = self.imap.search(None, "FROM", "do_not_reply@arlo.com")
-            if res.lower() != "ok":
-                raise Exception(f"IMAP failed to fetch old Arlo emails: {res}")
-        except Exception:
-            self.logger.exception("IMAP initialization error")
-
-            if try_count >= 10:
-                self.logger.error("Tried to connect to IMAP too many times. Will request a plugin restart.")
-                self.create_task(scrypted_sdk.deviceManager.requestRestart())
-
-            asyncio.get_event_loop().call_later(try_count*try_count, functools.partial(self.initialize_imap, try_count=try_count+1))
-        else:
-            self.logger.info("Connected to IMAP")
-            self.imap_signal = asyncio.Queue()
-            self.create_task(self.imap_relogin_loop())
-
-    def exit_imap(self) -> None:
-        if self.imap_signal:
-            self.imap_signal.put_nowait(None)
-        self.imap_signal = None
-        self.imap_skip_emails = None
-        self.imap = None
-
-    async def imap_relogin_loop(self) -> None:
-        imap_signal = self.imap_signal
-        self.logger.info(f"Starting IMAP refresh loop {id(imap_signal)}")
-        while True:
-            self.logger.info("Performing IMAP login flow")
-
-            # save old client and details in case of error
-            old_arlo = self._arlo
-            old_headers = self.storage.getItem("arlo_auth_headers")
-            old_user_id = self.storage.getItem("arlo_user_id")
-
-            # clear everything
-            self._arlo = None
-            self._arlo_mfa_code = None
-            self._arlo_mfa_complete_auth = None
-            self.storage.setItem("arlo_auth_headers", "")
-            self.storage.setItem("arlo_user_id", "")
-
-            # initialize login and prompt for MFA
-            try:
-                _ = self.arlo
-            except Exception:
-                self.logger.exception("Unrecoverable login error")
-                self.logger.error("Will request a plugin restart")
-                await scrypted_sdk.deviceManager.requestRestart()
-                return
-
-            # do imap lookup
-            # adapted from https://github.com/twrecked/pyaarlo/blob/77c202b6f789c7104a024f855a12a3df4fc8df38/pyaarlo/tfa.py
-            try:
-                try_count = 0
-                while True:
-                    try_count += 1
-
-                    sleep_duration = 1
-                    if try_count > 5:
-                        sleep_duration = 2
-                    elif try_count > 10:
-                        sleep_duration = 5
-                    elif try_count > 20:
-                        sleep_duration = 10
-
-                    self.logger.info(f"Checking IMAP for MFA codes (attempt {try_count})")
-
-                    self.imap.check()
-                    res, emails = self.imap.search(None, "FROM", self.imap_mfa_sender)
-                    if res.lower() != "ok":
-                        raise Exception("IMAP error: {res}")
-
-                    if emails == self.imap_skip_emails:
-                        self.logger.info("No new emails found, will sleep and retry")
-                        await asyncio.sleep(sleep_duration)
-                        continue
-
-                    skip_emails = self.imap_skip_emails[0].split()
-                    def search_email(msg_id):
-                        if msg_id in skip_emails:
-                            return None
-
-                        res, msg = self.imap.fetch(msg_id, "(BODY.PEEK[])")
-                        if res.lower() != "ok":
-                            raise Exception("IMAP error: {res}")
-
-                        if isinstance(msg[0][1], bytes):
-                            for part in email.message_from_bytes(msg[0][1]).walk():
-                                if part.get_content_type() != "text/html":
-                                    continue
-                                try:
-                                    soup = BeautifulSoup(part.get_payload(decode=True), 'html.parser')
-                                    for line in soup.get_text().splitlines():
-                                        code = re.match(r"^\W*(\d{6})\W*$", line)
-                                        if code is not None:
-                                            return code.group(1)
-                                except:
-                                    continue
-                        return None
-
-                    for msg_id in emails[0].split():
-                        res = search_email(msg_id)
-                        if res is not None:
-                            self._arlo_mfa_code = res
-                            break
-
-                    # update previously seen emails list
-                    self.imap_skip_emails = emails
-
-                    if self._arlo_mfa_code is not None:
-                        self.logger.info("Found MFA code")
-                        break
-
-                    self.logger.info("No MFA code found, will sleep and retry")
-                    await asyncio.sleep(sleep_duration)
-            except Exception:
-                self.logger.exception("Error while checking for MFA codes")
-
-                self._arlo = old_arlo
-                self.storage.setItem("arlo_auth_headers", old_headers)
-                self.storage.setItem("arlo_user_id", old_user_id)
-                self._arlo_mfa_code = None
-                self._arlo_mfa_complete_auth = None
-
-                self.logger.error("Will reload IMAP connection")
-                asyncio.get_event_loop().call_soon(self.initialize_imap)
-            else:
-                # finish login
-                if old_arlo:
-                    old_arlo.Unsubscribe()
-
-                try:
-                    _ = self.arlo
-                except Exception:
-                    self.logger.exception("Unrecoverable login error")
-                    self.logger.error("Will request a plugin restart")
-                    await scrypted_sdk.deviceManager.requestRestart()
-                    return
-
-            # continue by sleeping/waiting for a signal
-            interval = self.imap_mfa_interval * 24 * 60 * 60  # convert interval days to seconds
-            signal_task = asyncio.create_task(imap_signal.get())
-
-            # wait until either we receive a signal or the refresh interval expires
-            done, pending = await asyncio.wait([signal_task, asyncio.sleep(interval)], return_when=asyncio.FIRST_COMPLETED)
-            for task in pending:
-                task.cancel()
-
-            done_task = done.pop()
-            if done_task is signal_task and done_task.result() is None:
-                # exit signal received
-                self.logger.info(f"Exiting IMAP refresh loop {id(imap_signal)}")
-                return
-
-    async def getSettings(self) -> List[Setting]:
-        results = [
-            {
-                "group": "General",
-                "key": "arlo_username",
-                "title": "Arlo Username",
-                "value": self.arlo_username,
-            },
-            {
-                "group": "General",
-                "key": "arlo_password",
-                "title": "Arlo Password",
-                "type": "password",
-                "value": self.arlo_password,
-            },
-            {
-                "group": "General",
-                "key": "mfa_strategy",
-                "title": "Two Factor Strategy",
-                "description": "Mechanism to fetch the two factor code for Arlo login. Save after changing this field for more settings.",
-                "value": self.mfa_strategy,
-                "choices": self.mfa_strategy_choices,
-            },
-        ]
-
-        if self.mfa_strategy == "Manual":
-            results.extend([
-                {
-                    "group": "General",
-                    "key": "arlo_mfa_code",
-                    "title": "Two Factor Code",
-                    "description": "Enter the code sent by Arlo to your email or phone number.",
-                },
-                {
-                    "group": "General",
-                    "key": "force_reauth",
-                    "title": "Force Re-Authentication",
-                    "description": "Resets the authentication flow of the plugin. Will also re-do 2FA.",
-                    "value": False,
-                    "type": "boolean",
-                },
-            ])
-        else:
-            results.extend([
-                {
-                    "group": "IMAP 2FA",
-                    "key": "imap_mfa_host",
-                    "title": "IMAP Hostname",
-                    "value": self.imap_mfa_host,
-                },
-                {
-                    "group": "IMAP 2FA",
-                    "key": "imap_mfa_port",
-                    "title": "IMAP Port",
-                    "value": self.imap_mfa_port,
-                },
-                {
-                    "group": "IMAP 2FA",
-                    "key": "imap_mfa_username",
-                    "title": "IMAP Username",
-                    "value": self.imap_mfa_username,
-                },
-                {
-                    "group": "IMAP 2FA",
-                    "key": "imap_mfa_password",
-                    "title": "IMAP Password",
-                    "type": "password",
-                    "value": self.imap_mfa_password,
-                },
-                {
-                    "group": "IMAP 2FA",
-                    "key": "imap_mfa_sender",
-                    "title": "IMAP Email Sender",
-                    "value": self.imap_mfa_sender,
-                    "description": "The sender email address to search for when loading 2FA codes. See plugin README for more details.",
-                },
-                {
-                    "group": "IMAP 2FA",
-                    "key": "imap_mfa_interval",
-                    "title": "Refresh Login Interval",
-                    "description": "Interval, in days, to refresh the login session to Arlo Cloud. "
-                                   "Must be a value greater than 0.",
-                    "type": "number",
-                    "value": self.imap_mfa_interval,
-                }
-            ])
-
-        results.extend([
-            {
-                "group": "General",
-                "key": "arlo_transport",
-                "title": "Underlying Transport Protocol",
-                "description": "Arlo Cloud currently only supports the SSE protocol.",
-                "value": self.arlo_transport,
-                "readonly": True,
-            },
-            {
-                "group": "General",
-                "key": "refresh_interval",
-                "title": "Refresh Event Stream Interval",
-                "description": "Interval, in minutes, to refresh the underlying event stream connection to Arlo Cloud. "
-                               "A value of 0 disables this feature.",
-                "type": "number",
-                "value": self.refresh_interval,
-            },
-            {
-                "group": "General",
-                "key": "plugin_verbosity",
-                "title": "Verbose Logging",
-                "description": "Enable this option to show debug messages, including events received from connected Arlo cameras.",
-                "value": self.plugin_verbosity == "Verbose",
-                "type": "boolean",
-            },
-            {
-                "group": "General",
-                "key": "hidden_devices",
-                "title": "Hidden Devices",
-                "description": "Select the Arlo devices to hide in this plugin. Hidden devices will be removed from Scrypted and will "
-                               "not be re-added when the plugin reloads.",
-                "value": self.hidden_devices,
-                "multiple": True,
-                "choices": [id for id in self.all_device_ids],
-            },
-        ])
-
-        return results
-
-    @async_print_exception_guard
-    async def putSetting(self, key: str, value: SettingValue) -> None:
-        if not self.validate_setting(key, value):
-            await self.onDeviceEvent(ScryptedInterface.Settings.value, None)
-            return
-
-        skip_arlo_client = False
-        if key == "arlo_mfa_code":
-            self._arlo_mfa_code = value
-        elif key == "force_reauth":
-            # force arlo client to be invalidated and reloaded
-            self.invalidate_arlo_client()
-        elif key == "plugin_verbosity":
-            self.storage.setItem(key, "Verbose" if value == "true" or value == True else "Normal")
-            self.propagate_verbosity()
-            skip_arlo_client = True
-        else:
-            self.storage.setItem(key, value)
-
-            if key == "arlo_transport":
-                self.propagate_transport()
-                # force arlo client to be invalidated and reloaded, but
-                # keep any mfa codes
-                if self._arlo is not None:
-                    self._arlo.Unsubscribe()
-                    self._arlo = None
-            elif key == "mfa_strategy":
-                if value == "IMAP":
-                    self.initialize_imap()
-                else:
-                    self.exit_imap()
-                skip_arlo_client = True
-            elif key == "refresh_interval":
-                if self._arlo is not None and self._arlo.event_stream:
-                    self._arlo.event_stream.set_refresh_interval(self.refresh_interval)
-                skip_arlo_client = True
-            elif key.startswith("imap_mfa"):
-                self.initialize_imap()
-                skip_arlo_client = True
-            elif key == "hidden_devices":
-                if self._arlo is not None and self._arlo.logged_in:
-                    self._arlo.Unsubscribe()
-                    await self.do_arlo_setup()
-                skip_arlo_client = True
-            else:
-                # force arlo client to be invalidated and reloaded
-                self.invalidate_arlo_client()
-
-        if not skip_arlo_client:
-            # initialize Arlo client or continue MFA
-            _ = self.arlo
-        await self.onDeviceEvent(ScryptedInterface.Settings.value, None)
-
-    def validate_setting(self, key: str, val: SettingValue) -> bool:
-        if key == "refresh_interval":
-            try:
-                val = int(val)
-            except ValueError:
-                self.logger.error(f"Invalid refresh interval '{val}' - must be an integer")
-                return False
-            if val < 0:
-                self.logger.error(f"Invalid refresh interval '{val}' - must be nonnegative")
-                return False
-        elif key == "imap_mfa_port":
-            try:
-                val = int(val)
-            except ValueError:
-                self.logger.error(f"Invalid IMAP port '{val}' - must be an integer")
-                return False
-            if val < 0:
-                self.logger.error(f"Invalid IMAP port '{val}' - must be nonnegative")
-                return False
-        elif key == "imap_mfa_interval":
-            try:
-                val = int(val)
-            except ValueError:
-                self.logger.error(f"Invalid IMAP interval '{val}' - must be an integer")
-                return False
-            if val < 1:
-                self.logger.error(f"Invalid IMAP interval '{val}' - must be positive")
-                return False
-        return True
-
-    @async_print_exception_guard
-    async def discover_devices(self) -> None:
-        async with self.device_discovery_lock:
-            return await self.discover_devices_impl()
-
-    async def discover_devices_impl(self) -> None:
-        if not self._arlo or not self._arlo.logged_in:
-            raise Exception("Arlo client not connected, cannot discover devices")
-
-        self.logger.info("Discovering devices...")
-        self.arlo_cameras = {}
-        self.arlo_basestations = {}
-        self.all_device_ids = set()
-        self.scrypted_devices = {}
-
-        camera_devices = []
-        provider_to_device_map = {None: []}
-
-        basestations = self.arlo.GetDevices(['basestation', 'siren'])
-        for basestation in basestations:
-            nativeId = basestation["deviceId"]
-            self.all_device_ids.add(f"{basestation['deviceName']} ({nativeId})")
-
-            self.logger.debug(f"Adding {nativeId}")
-
-            if nativeId in self.arlo_basestations:
-                self.logger.info(f"Skipping basestation {nativeId} ({basestation['modelId']}) as it has already been added")
-                continue
-
-            self.arlo_basestations[nativeId] = basestation
-
-            if nativeId in self.hidden_device_ids:
-                self.logger.info(f"Skipping manifest for basestation {nativeId} ({basestation['modelId']}) as it is hidden")
-                continue
-
-            device = await self.getDevice_impl(nativeId)
-            scrypted_interfaces = device.get_applicable_interfaces()
-            manifest = device.get_device_manifest()
-            self.logger.debug(f"Interfaces for {nativeId} ({basestation['modelId']}): {scrypted_interfaces}")
-
-            # for basestations, we want to add them to the top level DeviceProvider
-            provider_to_device_map.setdefault(None, []).append(manifest)
-
-            # we want to trickle discover them so they are added without deleting all existing
-            # root level devices - this is for backward compatibility
-            await scrypted_sdk.deviceManager.onDeviceDiscovered(manifest)
-
-            # add any builtin child devices and trickle discover them
-            child_manifests = device.get_builtin_child_device_manifests()
-            for child_manifest in child_manifests:
-                await scrypted_sdk.deviceManager.onDeviceDiscovered(child_manifest)
-                provider_to_device_map.setdefault(child_manifest["providerNativeId"], []).append(child_manifest)
-
-        self.logger.info(f"Discovered {len(self.arlo_basestations)} basestations")
-
-        cameras = self.arlo.GetDevices(['camera', "arloq", "arloqs", "doorbell"])
-        for camera in cameras:
-            nativeId = camera["deviceId"]
-            self.all_device_ids.add(f"{camera['deviceName']} ({nativeId})")
-
-            self.logger.debug(f"Adding {nativeId}")
-
-            if camera["deviceId"] != camera["parentId"] and camera["parentId"] not in self.arlo_basestations:
-                self.logger.info(f"Skipping camera {camera['deviceId']} ({camera['modelId']}) because its basestation was not found")
-                continue
-
-            if nativeId in self.arlo_cameras:
-                self.logger.info(f"Skipping camera {nativeId} ({camera['modelId']}) as it has already been added")
-                continue
-
-            if nativeId in self.hidden_device_ids:
-                self.logger.info(f"Skipping camera {camera['deviceId']} ({camera['modelId']}) because it is hidden")
-                continue
- 
-            self.arlo_cameras[nativeId] = camera
-
-            if camera["deviceId"] == camera["parentId"]:
-                # these are standalone cameras with no basestation, so they act as their
-                # own basestation
-                self.arlo_basestations[camera["deviceId"]] = camera
-
-            device = await self.getDevice_impl(nativeId)
-            scrypted_interfaces = device.get_applicable_interfaces()
-            manifest = device.get_device_manifest()
-            self.logger.debug(f"Interfaces for {nativeId} ({camera['modelId']} parent {camera['parentId']}): {scrypted_interfaces}")
-
-            if camera["deviceId"] == camera["parentId"] or camera["parentId"] in self.hidden_device_ids:
-                provider_to_device_map.setdefault(None, []).append(manifest)
-            else:
-                provider_to_device_map.setdefault(camera["parentId"], []).append(manifest)
-
-            # trickle discover this camera so it exists for later steps
-            await scrypted_sdk.deviceManager.onDeviceDiscovered(manifest)
-
-            # add any builtin child devices and trickle discover them
-            child_manifests = device.get_builtin_child_device_manifests()
-            for child_manifest in child_manifests:
-                await scrypted_sdk.deviceManager.onDeviceDiscovered(child_manifest)
-                provider_to_device_map.setdefault(child_manifest["providerNativeId"], []).append(child_manifest)
-
-            camera_devices.append(manifest)
-
-        if len(cameras) != len(camera_devices):
-            self.logger.info(f"Discovered {len(cameras)} cameras, but only {len(camera_devices)} are usable")
-            self.logger.info("This could be because some cameras are hidden.")
-            self.logger.info("If a camera is not hidden but is still missing, ensure all cameras shared with "
-                             "admin permissions in the Arlo app.")
-        else:
-            self.logger.info(f"Discovered {len(cameras)} cameras")
-
-        for provider_id in provider_to_device_map.keys():
-            if provider_id is None:
-                continue
-
-            if len(provider_to_device_map[provider_id]) > 0:
-                self.logger.debug(f"Sending {provider_id} and children to scrypted server")
-            else:
-                self.logger.debug(f"Sending {provider_id} to scrypted server")
-
-            await scrypted_sdk.deviceManager.onDevicesChanged({
-                "devices": provider_to_device_map[provider_id],
-                "providerNativeId": provider_id,
-            })
-
-        # ensure devices at the root match all that was discovered
-        self.logger.debug("Sending top level devices to scrypted server")
-        await scrypted_sdk.deviceManager.onDevicesChanged({
-            "devices": provider_to_device_map[None]
-        })
-        self.logger.debug("Done discovering devices")
-
-        # force a settings refresh so the hidden devices list can be updated
-        await self.onDeviceEvent(ScryptedInterface.Settings.value, None)
-
-    async def getDevice(self, nativeId: str) -> ArloDeviceBase:
-        self.logger.debug(f"Scrypted requested to load device {nativeId}")
-        async with self.device_discovery_lock:
-            return await self.getDevice_impl(nativeId)
-
-    async def getDevice_impl(self, nativeId: str) -> ArloDeviceBase:
-        ret = self.scrypted_devices.get(nativeId)
-        if ret is None:
-            ret = self.create_device(nativeId)
-            if ret is not None:
-                self.scrypted_devices[nativeId] = ret
-        return ret
-
-    def create_device(self, nativeId: str) -> ArloDeviceBase:
-        if nativeId not in self.arlo_cameras and nativeId not in self.arlo_basestations:
-            self.logger.warning(f"Cannot create device for nativeId {nativeId}, maybe it hasn't been loaded yet?")
-            return None
-
-        arlo_device = self.arlo_cameras.get(nativeId)
-        if not arlo_device:
-            # this is a basestation, so build the basestation object
-            arlo_device = self.arlo_basestations[nativeId]
-            return ArloBasestation(nativeId, arlo_device, self)
-
-        if arlo_device["parentId"] not in self.arlo_basestations:
-            self.logger.warning(f"Cannot create camera with nativeId {nativeId} when {arlo_device['parentId']} is not a valid basestation")
-            return None
-        arlo_basestation = self.arlo_basestations[arlo_device["parentId"]]
-
-        if arlo_device["deviceType"] == "doorbell":
-            return ArloDoorbell(nativeId, arlo_device, arlo_basestation, self)
-        else:
-            return ArloCamera(nativeId, arlo_device, arlo_basestation, self)

plugins/arlo/src/arlo_plugin/rtcpeerconnection.py

@@ -1,107 +0,0 @@
-from aiortc import RTCPeerConnection
-from aiortc.contrib.media import MediaPlayer
-import asyncio
-import threading
-import queue
-
-
-class BackgroundRTCPeerConnection:
-    """Proxy class to use RTCPeerConnection in a background thread.
-
-    The purpose of this proxy is to ensure that RTCPeerConnection operations
-    do not block the main asyncio thread. From testing, it seems that the
-    close() function blocks until the source RTSP server exits, which we
-    have no control over. Additionally, since asyncio coroutines are tied
-    to the event loop they were constructed from, it is not possible to only
-    run close() in a separate thread. Therefore, each instance of RTCPeerConnection
-    is launched within its own ephemeral thread, which cleans itself up once
-    close() completes.
-    """
-
-    def __init__(self, logger):
-        self.main_loop = asyncio.get_event_loop()
-        self.background_loop = asyncio.new_event_loop()
-        self.logger = logger
-
-        self.thread_started = queue.Queue(1)
-        self.thread = threading.Thread(target=self.__background_main)
-        self.thread.start()
-        self.thread_started.get()
-
-    def __background_main(self):
-        self.logger.info(f"Background RTC loop {self.thread.name} starting")
-        self.pc = RTCPeerConnection()
-
-        asyncio.set_event_loop(self.background_loop)
-        self.thread_started.put(True)
-        self.background_loop.run_forever()
-
-        self.logger.info(f"Background RTC loop {self.thread.name} exiting")
-
-    async def __run_background(self, coroutine, await_result=True, stop_loop=False):
-        fut = self.main_loop.create_future()
-
-        def background_callback():
-            # callback to run on main_loop.
-            def to_main(result, is_error):
-                if is_error:
-                    fut.set_exception(result)
-                else:
-                    fut.set_result(result)
-
-            # callback to run on background_loop., after the coroutine completes
-            def callback(task):
-                is_error = False
-                if task.exception():
-                    result = task.exception()
-                    is_error = True
-                else:
-                    result = task.result()
-
-                # send results to the main loop
-                self.main_loop.call_soon_threadsafe(to_main, result, is_error)
-
-                # stopping the loop here ensures that the coroutine completed
-                # and doesn't raise any "task not awaited" exceptions
-                if stop_loop:
-                    self.background_loop.stop()
-
-            task = self.background_loop.create_task(coroutine)
-            task.add_done_callback(callback)
-
-        # start the callback in the background loop
-        self.background_loop.call_soon_threadsafe(background_callback)
-
-        if not await_result:
-            return None
-        return await fut
-
-    async def createOffer(self):
-        return await self.__run_background(self.pc.createOffer())
-
-    async def setLocalDescription(self, sdp):
-        return await self.__run_background(self.pc.setLocalDescription(sdp))
-
-    async def setRemoteDescription(self, sdp):
-        return await self.__run_background(self.pc.setRemoteDescription(sdp))
-
-    async def addIceCandidate(self, candidate):
-        return await self.__run_background(self.pc.addIceCandidate(candidate))
-
-    async def close(self):
-        await self.__run_background(self.pc.close(), await_result=False, stop_loop=True)
-
-    def add_rtsp_audio(self, rtsp_url):
-        """Adds an audio track to the RTCPeerConnection given a source RTSP url.
-
-        This constructs a MediaPlayer in the background thread's asyncio loop,
-        since MediaPlayer also utilizes coroutines and asyncio.
-
-        Note that this may block the background thread's event loop if the RTSP
-        server is not yet ready.
-        """
-        def add_rtsp_audio_background():
-            media_player = MediaPlayer(rtsp_url, format="rtsp")
-            self.pc.addTrack(media_player.audio)
-
-        self.background_loop.call_soon_threadsafe(add_rtsp_audio_background)

plugins/arlo/src/arlo_plugin/siren.py

@@ -1,72 +0,0 @@
-from __future__ import annotations
-
-from typing import List, TYPE_CHECKING
-
-from scrypted_sdk.types import OnOff, SecuritySystemMode, ScryptedInterface, ScryptedDeviceType
-
-from .base import ArloDeviceBase
-from .util import async_print_exception_guard
-
-if TYPE_CHECKING:
-    # https://adamj.eu/tech/2021/05/13/python-type-hints-how-to-fix-circular-imports/
-    from .provider import ArloProvider
-    from .vss import ArloSirenVirtualSecuritySystem
-
-
-class ArloSiren(ArloDeviceBase, OnOff):
-    vss: ArloSirenVirtualSecuritySystem = None
-
-    def __init__(self, nativeId: str, arlo_device: dict, arlo_basestation: dict, provider: ArloProvider, vss: ArloSirenVirtualSecuritySystem) -> None:
-        super().__init__(nativeId=nativeId, arlo_device=arlo_device, arlo_basestation=arlo_basestation, provider=provider)
-        self.vss = vss
-
-    def get_applicable_interfaces(self) -> List[str]:
-        return [ScryptedInterface.OnOff.value]
-
-    def get_device_type(self) -> str:
-        return ScryptedDeviceType.Siren.value
-
-    @async_print_exception_guard
-    async def turnOn(self) -> None:
-        from .basestation import ArloBasestation
-        self.logger.info("Turning on")
-
-        if self.vss.securitySystemState["mode"] == SecuritySystemMode.Disarmed.value:
-            self.logger.info("Virtual security system is disarmed, ignoring trigger")
-
-            # set and unset this property to force homekit to display the
-            # switch as off
-            self.on = True
-            self.on = False
-            self.vss.securitySystemState = {
-                **self.vss.securitySystemState,
-                "triggered": False,
-            }
-            return
-
-        if isinstance(self.vss.parent, ArloBasestation):
-            self.logger.debug("Parent device is a basestation")
-            self.provider.arlo.SirenOn(self.arlo_basestation)
-        else:
-            self.logger.debug("Parent device is a camera")
-            self.provider.arlo.SirenOn(self.arlo_basestation, self.arlo_device)
-
-        self.on = True
-        self.vss.securitySystemState = {
-            **self.vss.securitySystemState,
-            "triggered": True,
-         }
-
-    @async_print_exception_guard
-    async def turnOff(self) -> None:
-        from .basestation import ArloBasestation
-        self.logger.info("Turning off")
-        if isinstance(self.vss.parent, ArloBasestation):
-            self.provider.arlo.SirenOff(self.arlo_basestation)
-        else:
-            self.provider.arlo.SirenOff(self.arlo_basestation, self.arlo_device)
-        self.on = False
-        self.vss.securitySystemState = {
-            **self.vss.securitySystemState,
-            "triggered": False,
-         }

plugins/arlo/src/arlo_plugin/spotlight.py

@@ -1,72 +0,0 @@
-from __future__ import annotations
-
-from typing import List, TYPE_CHECKING
-
-from scrypted_sdk.types import OnOff, ScryptedInterface, ScryptedDeviceType
-
-from .base import ArloDeviceBase
-from .util import async_print_exception_guard
-
-if TYPE_CHECKING:
-    # https://adamj.eu/tech/2021/05/13/python-type-hints-how-to-fix-circular-imports/
-    from .provider import ArloProvider
-    from .camera import ArloCamera
-
-
-class ArloSpotlight(ArloDeviceBase, OnOff):
-    camera: ArloCamera = None
-
-    def __init__(self, nativeId: str, arlo_device: dict, arlo_basestation: dict, provider: ArloProvider, camera: ArloCamera) -> None:
-        super().__init__(nativeId=nativeId, arlo_device=arlo_device, arlo_basestation=arlo_basestation, provider=provider)
-        self.camera = camera
-
-    def get_applicable_interfaces(self) -> List[str]:
-        return [ScryptedInterface.OnOff.value]
-
-    def get_device_type(self) -> str:
-        return ScryptedDeviceType.Light.value
-
-    @async_print_exception_guard
-    async def turnOn(self) -> None:
-        self.logger.info("Turning on")
-        self.provider.arlo.SpotlightOn(self.arlo_basestation, self.arlo_device)
-        self.on = True
-
-    @async_print_exception_guard
-    async def turnOff(self) -> None:
-        self.logger.info("Turning off")
-        self.provider.arlo.SpotlightOff(self.arlo_basestation, self.arlo_device)
-        self.on = False
-
-
-class ArloFloodlight(ArloSpotlight):
-
-    @async_print_exception_guard
-    async def turnOn(self) -> None:
-        self.logger.info("Turning on")
-        self.provider.arlo.FloodlightOn(self.arlo_basestation, self.arlo_device)
-        self.on = True
-
-    @async_print_exception_guard
-    async def turnOff(self) -> None:
-        self.logger.info("Turning off")
-        self.provider.arlo.FloodlightOff(self.arlo_basestation, self.arlo_device)
-        self.on = False
-
-
-class ArloNightlight(ArloSpotlight):
-
-    def __init__(self, nativeId: str, arlo_device: dict, provider: ArloProvider, camera: ArloCamera) -> None:
-        super().__init__(nativeId=nativeId, arlo_device=arlo_device, arlo_basestation=arlo_device, provider=provider, camera=camera)
-
-    @async_print_exception_guard
-    async def turnOn(self) -> None:
-        self.logger.info("Turning on")
-        self.provider.arlo.NightlightOn(self.arlo_device)
-        self.on = True
-
-    @async_print_exception_guard
-    async def turnOff(self) -> None:
-        self.logger.info("Turning off")
-        self.provider.arlo.NightlightOff(self.arlo_device)
-        self.on = False

plugins/arlo/src/arlo_plugin/util.py

@@ -1,44 +0,0 @@
-import asyncio
-import traceback
-
-
-class BackgroundTaskMixin:
-    def create_task(self, coroutine) -> asyncio.Task:
-        task = asyncio.get_event_loop().create_task(coroutine)
-        self.register_task(task)
-        return task
-
-    def register_task(self, task) -> None:
-        if not hasattr(self, "background_tasks"):
-            self.background_tasks = set()
-
-        assert task is not None
-
-        def print_exception(task):
-            if task.exception():
-                self.logger.error(f"task exception: {task.exception()}")
-
-        self.background_tasks.add(task)
-        task.add_done_callback(print_exception)
-        task.add_done_callback(self.background_tasks.discard)
-
-    def cancel_pending_tasks(self) -> None:
-        if not hasattr(self, "background_tasks"):
-            return
-        for task in self.background_tasks:
-            task.cancel()
-
-def async_print_exception_guard(fn):
-    """Decorator to print an exception's stack trace before re-raising the exception."""
-    async def wrapped(*args, **kwargs):
-        try:
-            return await fn(*args, **kwargs)
-        except Exception:
-            # hack to detect if the applied function is actually a method
-            # on a scrypted object
-            if len(args) > 0 and hasattr(args[0], "logger"):
-                getattr(args[0], "logger").exception(f"{fn.__qualname__} raised an exception")
-            else:
-                traceback.print_exc()
-            raise
-    return wrapped

plugins/arlo/src/arlo_plugin/vss.py

@@ -1,156 +0,0 @@
-from __future__ import annotations
-
-import asyncio
-from typing import List, TYPE_CHECKING
-
-from scrypted_sdk.types import Device, DeviceProvider, Setting, Settings, SettingValue, SecuritySystem, SecuritySystemMode, Readme, ScryptedInterface, ScryptedDeviceType
-
-from .base import ArloDeviceBase
-from .siren import ArloSiren
-from .util import async_print_exception_guard
-
-if TYPE_CHECKING:
-    # https://adamj.eu/tech/2021/05/13/python-type-hints-how-to-fix-circular-imports/
-    from .provider import ArloProvider
-    from .basestation import ArloBasestation
-    from .camera import ArloCamera
-
-
-class ArloSirenVirtualSecuritySystem(ArloDeviceBase, SecuritySystem, Settings, Readme, DeviceProvider):
-    """A virtual, emulated security system that controls when scrypted events can trip the real physical siren."""
-
-    SUPPORTED_MODES = [SecuritySystemMode.AwayArmed.value, SecuritySystemMode.HomeArmed.value, SecuritySystemMode.Disarmed.value]
-
-    siren: ArloSiren = None
-    parent: ArloBasestation | ArloCamera = None
-
-    def __init__(self, nativeId: str, arlo_device: dict, arlo_basestation: dict, provider: ArloProvider, parent: ArloBasestation | ArloCamera) -> None:
-        super().__init__(nativeId=nativeId, arlo_device=arlo_device, arlo_basestation=arlo_basestation, provider=provider)
-        self.parent = parent
-        self.create_task(self.delayed_init())
-
-    @property
-    def mode(self) -> str:
-        mode = self.storage.getItem("mode")
-        if mode is None or mode not in ArloSirenVirtualSecuritySystem.SUPPORTED_MODES:
-            mode = SecuritySystemMode.Disarmed.value
-        return mode
-
-    @mode.setter
-    def mode(self, mode: str) -> None:
-        if mode not in ArloSirenVirtualSecuritySystem.SUPPORTED_MODES:
-            raise ValueError(f"invalid mode {mode}")
-        self.storage.setItem("mode", mode)
-        self.securitySystemState = {
-            **self.securitySystemState,
-            "mode": mode,
-        }
-        self.create_task(self.onDeviceEvent(ScryptedInterface.Settings.value, None))
-
-    async def delayed_init(self) -> None:
-        iterations = 1
-        while not self.stop_subscriptions:
-            if iterations > 100:
-                self.logger.error("Delayed init exceeded iteration limit, giving up")
-                return
-
-            try:
-                self.securitySystemState = {
-                    "supportedModes": ArloSirenVirtualSecuritySystem.SUPPORTED_MODES,
-                    "mode": self.mode,
-                }
-                return
-            except Exception as e:
-                self.logger.debug(f"Delayed init failed, will try again: {e}")
-                await asyncio.sleep(0.1)
-            iterations += 1
-
-    def get_applicable_interfaces(self) -> List[str]:
-        return [
-            ScryptedInterface.SecuritySystem.value,
-            ScryptedInterface.DeviceProvider.value,
-            ScryptedInterface.Settings.value,
-            ScryptedInterface.Readme.value,
-        ]
-
-    def get_device_type(self) -> str:
-        return ScryptedDeviceType.SecuritySystem.value
-
-    def get_builtin_child_device_manifests(self) -> List[Device]:
-        siren = self.get_or_create_siren()
-        return [
-            {
-                "info": {
-                    "model": f"{self.arlo_device['modelId']} {self.arlo_device['properties'].get('hwVersion', '')}".strip(),
-                    "manufacturer": "Arlo",
-                    "firmware": self.arlo_device.get("firmwareVersion"),
-                    "serialNumber": self.arlo_device["deviceId"],
-                },
-                "nativeId": siren.nativeId,
-                "name": f'{self.arlo_device["deviceName"]} Siren',
-                "interfaces": siren.get_applicable_interfaces(),
-                "type": siren.get_device_type(),
-                "providerNativeId": self.nativeId,
-            }
-        ]
-
-    async def getSettings(self) -> List[Setting]:
-        return [
-            {
-                "key": "mode",
-                "title": "Arm Mode",
-                "description": "If disarmed, the associated siren will not be physically triggered even if toggled.",
-                "value": self.mode,
-                "choices": ArloSirenVirtualSecuritySystem.SUPPORTED_MODES,
-            },
-        ]
-
-    async def putSetting(self, key: str, value: SettingValue) -> None:
-        if key != "mode":
-            raise ValueError(f"invalid setting {key}")
-        self.mode = value
-        if self.mode == SecuritySystemMode.Disarmed.value:
-            await self.get_or_create_siren().turnOff()
-
-    async def getReadmeMarkdown(self) -> str:
-        return """
-# Virtual Security System for Arlo Sirens
-
-This security system device is not a real physical device, but a virtual, emulated device provided by the Arlo Scrypted plugin. Its purpose is to grant security system semantics of Arm/Disarm to avoid the accidental, unwanted triggering of the real physical siren through integrations such as Homekit.
-
-To allow the siren to trigger, set the Arm Mode to any of the Armed options. When Disarmed, any triggers of the siren will be ignored. Switching modes will not perform any changes to Arlo cloud or your Arlo account, but rather only to this Scrypted device.
-
-If this virtual security system is synced to Homekit, the siren device will be merged into the same security system accessory as a switch. The siren device will not be added as a separate accessory. To access the siren as a switch without the security system, disable syncing of the virtual security system and enable syncing of the siren, then ensure that the virtual security system is armed manually in its settings in Scrypted.
-""".strip()
-
-    async def getDevice(self, nativeId: str) -> ArloDeviceBase:
-        if not nativeId.endswith("siren"):
-            return None
-        return self.get_or_create_siren()
-
-    def get_or_create_siren(self) -> ArloSiren:
-        siren_id = f'{self.arlo_device["deviceId"]}.siren'
-        if not self.siren:
-            self.siren = ArloSiren(siren_id, self.arlo_device, self.arlo_basestation, self.provider, self)
-        return self.siren
-
-    @async_print_exception_guard
-    async def armSecuritySystem(self, mode: SecuritySystemMode) -> None:
-        self.logger.info(f"Arming {mode}")
-        self.mode = mode
-        self.securitySystemState = {
-            **self.securitySystemState,
-            "mode": mode,
-        }
-        if mode == SecuritySystemMode.Disarmed.value:
-            await self.get_or_create_siren().turnOff()
-
-    @async_print_exception_guard
-    async def disarmSecuritySystem(self) -> None:
-        self.logger.info(f"Disarming")
-        self.mode = SecuritySystemMode.Disarmed.value
-        self.securitySystemState = {
-            **self.securitySystemState,
-            "mode": SecuritySystemMode.Disarmed.value,
-        }
-        await self.get_or_create_siren().turnOff()

plugins/arlo/src/main.py

@@ -1,4 +0,0 @@
-from arlo_plugin import ArloProvider 
-
-def create_scrypted_plugin():
-    return ArloProvider()

plugins/arlo/src/requirements.txt

@@ -1,14 +0,0 @@
-paho-mqtt==1.6.1
-aiohttp==3.8.4
-requests==2.28.2
-cachetools==5.3.0
-scrypted-arlo-go==0.5.2
-cloudscraper==1.2.71
-curl-cffi==0.5.7
-async-timeout==4.0.2
-beautifulsoup4==4.12.2
-aiortc==1.5.0
-av==9.2.0
---extra-index-url=https://bjia56.github.io/armv7l-wheels/
---extra-index-url=https://bjia56.github.io/scrypted-arlo-go/
---prefer-binary

plugins/arlo/tsconfig.json

@@ -1,13 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "ES2021",
-        "resolveJsonModule": true,
-        "moduleResolution": "Node16",
-        "esModuleInterop": true,
-        "sourceMap": true
-    },
-    "include": [
-        "src/**/*"
-    ]
-}

plugins/cloud/README.md

@@ -6,11 +6,39 @@
 See below for additional recommendations.
 
 ## Port Forwarding
+**Important Note**: Ports 10443 and 10444 are already being used by Scrypted itself. So, please choose a different port number, like 11443.
 
-1. Open the Firewall and Port Forwarding Settings on the network's router.
-2. Use the ports shown in Settings to configure a Port Forwarding rule on the router.
+### What You'll Need
+- Access to your router's settings (usually through a web browser).
+- Ability to change settings on your host machine's firewall (like ufw for Linux or Windows Firewall for Windows).
 
-Use the `Test Port Forward` buttin in `Advanced` Settings tab to verify the configuration is correct.
+### Step-by-Step Instructions
+
+1. **Port Configuration**
+   - For simplicity, use the same port number (e.g 11443) for both "From Port" and "Forward Port" fields in the Scrypted Cloud plugin settings General tab.
+   
+2. **Access Your Router Settings**  
+   - Open your web browser and go to your router's login page. You may need the router's IP address, username, and password.  
+     > If you're not sure how to do this, [find the guide specific to your router here](https://portforward.com/router.htm).
+
+3. **Navigate to Firewall or Port Forwarding Section**  
+   - Once logged in, find the section that deals with "Firewall" or "Port Forwarding". It could be under tabs like "Advanced," "NAT," or "Security."
+  
+4. **Set Up Port Forwarding Rule**
+   - Use the port number you chose in Step 1 (e.g 11443) to set up a new Port Forwarding rule on your router.
+
+5. **Change Port Forwarding Mode in Scrypted**
+   - Go back to Scrypted and navigate to the "General" tab in the Cloud plugin.
+   - Select "Router Forward" from the "Port Forwarding Mode" dropdown menu.
+  
+6. **Test Your Setup**
+   - In the Scrypted Cloud plugin settings, find and click the `Test Port Forward` button under the `Advanced` Settings tab. This will confirm if you've set everything up correctly.
+
+7. **Save Your Settings**
+   - Don't forget to save your changes in both your router and in Scrypted.
+
+### Firewall Configuration
+Make sure your host machine’s firewall isn't blocking the port you've chosen. You may need to create an 'allow' rule for this port in your host's firewall settings.
 
 ## Custom Domains
 
@@ -26,7 +54,7 @@ Scrypted Cloud automatically creates a login free tunnel for remote access.
 The following steps are only necessary if you want to associate the tunnel with your existing Cloudflare account to manage it remotely.
 
 1. Create the Tunnel in the [Cloudflare Zero Trust Dashboard](https://one.dash.cloudflare.com).
-2. Copy the token shown for the tunnel shown in the `install [token]` command. E.g. `cloudflared service install eyJhI344aA...`.
+2. Copy the token shown for the tunnel shown in the `install [token]` command. For example, if you see `cloudflared service install eyJhI344aA...`, then `eyJhI344aA...` is the token you need to copy.
 3. Paste the token into the Cloud Plugin Advanced Settings.
 4. Add a `Public Hostname` to the tunnel.
     * Choose a (sub)domain.
@@ -34,4 +62,4 @@ The following steps are only necessary if you want to associate the tunnel with
     * Expand `Additional Application Settings` -> `TLS` menus and enable `No TLS Verify`.
 
 5. Reload Cloud Plugin.
-6. Verify Cloudflare successfully connected by observing the `Console` Logs.
+6. Verify Cloudflare successfully connected by observing the `Console` Logs.

plugins/cloud/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/cloud",
-   "version": "0.1.41",
+   "version": "0.2.3",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/cloud",
-         "version": "0.1.41",
+         "version": "0.2.3",
          "dependencies": {
             "@eneris/push-receiver": "^3.1.4",
             "@scrypted/common": "file:../../common",

plugins/cloud/package.json

@@ -54,5 +54,5 @@
       "@types/nat-upnp": "^1.1.2",
       "@types/node": "^20.4.5"
    },
-   "version": "0.1.41"
+   "version": "0.2.3"
 }

plugins/cloud/src/main.ts

@@ -151,6 +151,14 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
             hide: true,
             json: true,
         },
+        cloudflareEnabled: {
+            group: 'Advanced',
+            title: 'Cloudflare',
+            type: 'boolean',
+            description: 'Optional: Create a Cloudflare Tunnel to this server at a random domain name. Providing a Cloudflare token will allow usage of a custom domain name.',
+            defaultValue: true,
+            onPut: () => deviceManager.requestRestart(),
+        },
         cloudflaredTunnelToken: {
             group: 'Advanced',
             title: 'Cloudflare Tunnel Token',
@@ -164,7 +172,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
             title: 'Cloudflare Tunnel URL',
             description: 'Cloudflare Tunnel URL is a randomized cloud connection, unless a Cloudflare Tunnel Token is provided.',
             readonly: true,
-            mapGet: () =>  this.cloudflareTunnel || 'Unavailable',
+            mapGet: () => this.cloudflareTunnel || 'Unavailable',
         },
         register: {
             group: 'Advanced',
@@ -198,6 +206,12 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
     randomBytes = crypto.randomBytes(16).toString('base64');
     reverseConnections = new Set<Duplex>();
 
+    get cloudflareTunnelHost() {
+        if (!this.cloudflareTunnel)
+            return;
+        return new URL(this.cloudflareTunnel).host;
+    }
+
     constructor() {
         super();
 
@@ -254,6 +268,13 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
         //     }
         // };
 
+        this.storageSettings.settings.cloudflaredTunnelToken.onGet =
+            this.storageSettings.settings.cloudflaredTunnelUrl.onGet = async () => {
+                return {
+                    hide: !this.storageSettings.values.cloudflareEnabled,
+                }
+            };
+
         this.log.clearAlerts();
 
         this.storageSettings.settings.securePort.onPut = (ov, nv) => {
@@ -340,11 +361,14 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
 
             ip = this.storageSettings.values.duckDnsHostname;
         }
+        else if (this.cloudflareTunnelHost) {
+            ip = this.cloudflareTunnelHost;
+        }
         else {
             ip = (await axios(`https://${SCRYPTED_SERVER}/_punch/ip`)).data.ip;
         }
 
-        if (this.storageSettings.values.forwardingMode === 'Custom Domain')
+        if (this.storageSettings.values.forwardingMode === 'Custom Domain' || this.cloudflareTunnelHost)
             upnpPort = 443;
 
         this.console.log(`Scrypted Cloud mapped https://${ip}:${upnpPort} to https://127.0.0.1:${this.securePort}`);
@@ -355,7 +379,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
 
             const registrationId = await this.manager.registrationId;
             const data = await this.sendRegistrationId(registrationId);
-            if (ip !== 'localhost' && ip !== data.ip_address) {
+            if (ip !== 'localhost' && ip !== data.ip_address && ip !== this.cloudflareTunnelHost) {
                 this.log.a(`Scrypted Cloud could not verify the IP Address of your custom domain ${this.storageSettings.values.hostname}.`);
             }
             this.storageSettings.values.lastPersistedIp = ip;
@@ -364,6 +388,9 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
 
     async testPortForward() {
         try {
+            if (this.storageSettings.values.forwardingMode === 'Disabled')
+                throw new Error('Port forwarding is disabled.');
+
             const pluginPath = await endpointManager.getPath(undefined, {
                 public: true,
             });
@@ -388,15 +415,16 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
     }
 
     async refreshPortForward() {
-        if (this.storageSettings.values.forwardingMode === 'Disabled') {
-            this.updatePortForward(0);
-            return;
-        }
-
         let { upnpPort } = this.storageSettings.values;
+
         if (!upnpPort)
             upnpPort = Math.round(Math.random() * 30000 + 20000);
 
+        if (this.storageSettings.values.forwardingMode === 'Disabled') {
+            this.updatePortForward(upnpPort);
+            return;
+        }
+
         if (upnpPort === 443) {
             this.upnpStatus = 'Error: Port 443 Not Allowed';
             const err = 'Scrypted Cloud does not allow usage of port 443. Use a custom domain with a SSL terminating reverse proxy.';
@@ -410,7 +438,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
             return this.updatePortForward(upnpPort);
 
         if (this.storageSettings.values.forwardingMode === 'Custom Domain')
-            return this.updatePortForward(upnpPort);
+            return this.updatePortForward(this.storageSettings.values.upnpPort);
 
         const [localAddress] = await endpointManager.getLocalAddresses() || [];
         if (!localAddress) {
@@ -500,6 +528,19 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
         }
     }
 
+    async updateExternalAddresses() {
+        const addresses = await systemManager.getComponent('addresses');
+        const cloudAddresses: string[] = [];
+        if (this.storageSettings.values.hostname)
+            cloudAddresses.push(`https://${this.storageSettings.values.hostname}`);
+        if (this.cloudflareTunnel)
+            cloudAddresses.push(this.cloudflareTunnel);
+
+        await addresses.setExternalAddresses('@scrypted/cloud', cloudAddresses);
+
+        await this.updatePortForward(this.storageSettings.values.upnpPort);
+    }
+
     getAuthority() {
         const upnp_port = this.storageSettings.values.forwardingMode === 'Custom Domain' ? 443 : this.storageSettings.values.upnpPort;
         const hostname = this.storageSettings.values.forwardingMode === 'Custom Domain'
@@ -592,6 +633,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
 
     getSSLHostname() {
         const validDomain = (this.storageSettings.values.forwardingMode === 'Custom Domain' && this.storageSettings.values.hostname)
+            || (this.storageSettings.values.cloudflaredTunnelToken && this.cloudflareTunnelHost)
             || (this.storageSettings.values.duckDnsCertValid && this.storageSettings.values.duckDnsHostname && this.storageSettings.values.upnpPort && `${this.storageSettings.values.duckDnsHostname}:${this.storageSettings.values.upnpPort}`);
         return validDomain;
     }
@@ -812,6 +854,11 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
     }
 
     async startCloudflared() {
+        if (!this.storageSettings.values.cloudflareEnabled) {
+            this.console.log('cloudflared is disabled.');
+            return;
+        }
+
         while (true) {
             try {
                 this.console.log('starting cloudflared');
@@ -895,6 +942,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
                     cloudflareTunnel.child.on('exit', () => deferred.resolve(undefined));
                     try {
                         this.cloudflareTunnel = await Promise.any([deferred.promise, cloudflareTunnel.url]);
+                        this.updateExternalAddresses();
                         if (!this.cloudflareTunnel)
                             throw new Error('cloudflared exited, the provided cloudflare tunnel token may be invalid.')
                     }
@@ -921,6 +969,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
             finally {
                 this.cloudflared = undefined;
                 this.cloudflareTunnel = undefined;
+                this.updateExternalAddresses();
             }
         }
     }

plugins/core/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/core",
-   "version": "0.1.142",
+   "version": "0.1.149",
    "description": "Scrypted Core plugin. Provides the UI, websocket, and engine.io APIs.",
    "author": "Scrypted",
    "license": "Apache-2.0",
@@ -42,11 +42,12 @@
       "@scrypted/common": "file:../../common",
       "@scrypted/sdk": "file:../../sdk",
       "mime": "^3.0.0",
-      "router": "^1.3.6",
-      "typescript": "^4.5.5"
+      "node-pty-prebuilt-multiarch": "^0.10.1-pre.5",
+      "router": "^1.3.8",
+      "typescript": "^5.2.2"
    },
    "devDependencies": {
-      "@types/mime": "^2.0.3",
-      "@types/node": "^16.9.0"
+      "@types/mime": "^3.0.4",
+      "@types/node": "^20.9.2"
    }
 }

plugins/core/src/main.ts

@@ -11,6 +11,7 @@ import { LauncherMixin } from './launcher-mixin';
 import { MediaCore } from './media-core';
 import { ScriptCore, ScriptCoreNativeId } from './script-core';
 import { UsersCore, UsersNativeId } from './user';
+import { TerminalService, TerminalServiceNativeId } from './terminal-service';
 
 const { systemManager, deviceManager, endpointManager } = sdk;
 
@@ -39,6 +40,7 @@ class ScryptedCore extends ScryptedDeviceBase implements HttpRequestHandler, Eng
     aggregateCore: AggregateCore;
     automationCore: AutomationCore;
     users: UsersCore;
+    terminalService: TerminalService;
     localAddresses: string[];
     storageSettings = new StorageSettings(this, {
         localAddresses: {
@@ -83,6 +85,16 @@ class ScryptedCore extends ScryptedDeviceBase implements HttpRequestHandler, Eng
                 },
             );
         })();
+        (async () => {
+            await deviceManager.onDeviceDiscovered(
+                {
+                    name: 'Terminal Service',
+                    nativeId: TerminalServiceNativeId,
+                    interfaces: [ScryptedInterface.StreamService],
+                    type: ScryptedDeviceType.Builtin,
+                },
+            );
+        })();
 
         (async () => {
             await deviceManager.onDeviceDiscovered(
@@ -157,6 +169,8 @@ class ScryptedCore extends ScryptedDeviceBase implements HttpRequestHandler, Eng
             return this.aggregateCore ||= new AggregateCore();
         if (nativeId === UsersNativeId)
             return this.users ||= new UsersCore();
+        if (nativeId === TerminalServiceNativeId)
+            return this.terminalService ||= new TerminalService();
     }
 
     async releaseDevice(id: string, nativeId: string): Promise<void> {
@@ -198,7 +212,7 @@ class ScryptedCore extends ScryptedDeviceBase implements HttpRequestHandler, Eng
         ws.close();
     }
 
-    handlePublicFinal(request: HttpRequest, response: HttpResponse) {
+    async handlePublicFinal(request: HttpRequest, response: HttpResponse) {
         // need to strip off the query.
         const incomingPathname = request.url.split('?')[0];
         if (request.url !== '/index.html') {
@@ -208,24 +222,24 @@ class ScryptedCore extends ScryptedDeviceBase implements HttpRequestHandler, Eng
 
         // the rel hrefs (manifest, icons) are pulled in a web worker which does not
         // have cookies. need to attach auth info to them.
-        endpointManager.getPublicCloudEndpoint()
-            .then(endpoint => {
-                const u = new URL(endpoint);
+        try {
+            const endpoint = await endpointManager.getPublicCloudEndpoint();
+            const u = new URL(endpoint);
 
-                const rewritten = indexHtml
-                    .replace('href="manifest.json"', `href="manifest.json${u.search}"`)
-                    .replace('href="img/icons/apple-touch-icon-152x152.png"', `href="img/icons/apple-touch-icon-152x152.png${u.search}"`)
-                    .replace('href="img/icons/safari-pinned-tab.svg"', `href="img/icons/safari-pinned-tab.svg${u.search}"`)
-                    ;
-                response.send(rewritten, {
-                    headers: {
-                        'Content-Type': 'text/html',
-                    }
-                });
-            })
-            .catch(() => {
-                response.sendFile("dist" + incomingPathname);
+            const rewritten = indexHtml
+                .replace('href="manifest.json"', `href="manifest.json${u.search}"`)
+                .replace('href="img/icons/apple-touch-icon-152x152.png"', `href="img/icons/apple-touch-icon-152x152.png${u.search}"`)
+                .replace('href="img/icons/safari-pinned-tab.svg"', `href="img/icons/safari-pinned-tab.svg${u.search}"`)
+                ;
+            response.send(rewritten, {
+                headers: {
+                    'Content-Type': 'text/html',
+                }
             });
+        }
+        catch (e) {
+            response.sendFile("dist" + incomingPathname);
+        }
     }
 
     async onRequest(request: HttpRequest, response: HttpResponse) {
@@ -238,13 +252,13 @@ class ScryptedCore extends ScryptedDeviceBase implements HttpRequestHandler, Eng
         }
 
         if (request.isPublicEndpoint) {
-            this.publicRouter(normalizedRequest, response, () => this.handlePublicFinal(normalizedRequest, response));
+            await new Promise(resolve => this.publicRouter(normalizedRequest, response, resolve));
+            await this.handlePublicFinal(normalizedRequest, response);
         }
         else {
-            this.router(normalizedRequest, response, () => {
-                response.send('Not Found', {
-                    code: 404,
-                });
+            await new Promise(resolve => this.router(normalizedRequest, response, resolve));
+            response.send('Not Found', {
+                code: 404,
             });
         }
     }

plugins/core/src/terminal-service.ts

@@ -0,0 +1,201 @@
+import { ScryptedDeviceBase, ScryptedNativeId, StreamService } from "@scrypted/sdk";
+import { IPty, spawn as ptySpawn } from 'node-pty-prebuilt-multiarch';
+import { createAsyncQueue } from '@scrypted/common/src/async-queue'
+import { ChildProcess, spawn as childSpawn } from "child_process";
+
+export const TerminalServiceNativeId = 'terminalservice';
+
+
+class InteractiveTerminal {
+    cp: IPty
+
+    constructor(cmd: string[]) {
+        const spawn = require('node-pty-prebuilt-multiarch').spawn as typeof ptySpawn;
+        if (cmd?.length) {
+            this.cp = spawn(cmd[0], cmd.slice(1), {});
+        } else {
+            this.cp = spawn(process.env.SHELL as string, [], {});
+        }
+    }
+
+    onExit(fn: (e: { exitCode: number; signal?: number; }) => any) {
+        this.cp.onExit(fn)
+    };
+
+    onData(fn: (e: string) => any) {
+        this.cp.onData(fn);
+    }
+
+    pause() {
+        this.cp.pause();
+    }
+
+    resume() {
+        this.cp.resume();
+    }
+
+    write(data: Buffer) {
+        this.cp.write(data.toString());
+    }
+
+    sendEOF() {
+        // not supported
+    }
+
+    kill(signal?: string) {
+        this.cp.kill(signal);
+    }
+
+    resize(columns: number, rows: number) {
+        if (columns > 0 && rows > 0)
+            this.cp.resize(columns, rows);
+    }
+}
+
+class NoninteractiveTerminal {
+    cp: ChildProcess
+
+    constructor(cmd: string[]) {
+        if (cmd?.length) {
+            this.cp = childSpawn(cmd[0], cmd.slice(1));
+        } else {
+            this.cp = childSpawn(process.env.SHELL as string);
+        }
+    }
+
+    onExit(fn: (code: number, signal: NodeJS.Signals) => void) {
+        return this.cp.on("close", fn);
+    }
+
+    onData(fn: { (chunk: any): void; (chunk: any): void; }) {
+        this.cp.stdout.on("data", fn);
+        this.cp.stderr.on("data", fn);
+    }
+
+    pause() {
+        this.cp.stdout.pause();
+        this.cp.stderr.pause();
+    }
+
+    resume() {
+        this.cp.stdout.resume();
+        this.cp.stderr.resume();
+    }
+
+    write(data: Buffer) {
+        this.cp.stdin.write(data);
+    }
+
+    sendEOF() {
+        this.cp.stdin.end();
+    }
+
+    kill(signal?: number | NodeJS.Signals) {
+        this.cp.kill(signal);
+    }
+
+    resize(columns: number, rows: number) {
+        // not supported
+    }
+}
+
+
+export class TerminalService extends ScryptedDeviceBase implements StreamService {
+    constructor(nativeId?: ScryptedNativeId) {
+        super(TerminalServiceNativeId);
+    }
+
+    /*
+     * The input to this stream can send buffers for normal terminal data and strings
+     * for control messages. Control messages are JSON-formatted.
+     *
+     * The current implemented control messages:
+     *
+     *   Start: { "interactive": boolean, "cmd": string[] }
+     *   Resize: { "dim": { "cols": number, "rows": number } }
+     *   EOF: { "eof": true }
+     */
+    async connectStream(input: AsyncGenerator<Buffer | string, void>): Promise<AsyncGenerator<Buffer, void>> {
+        let cp: InteractiveTerminal | NoninteractiveTerminal = null;
+        const queue = createAsyncQueue<Buffer>();
+
+        function registerChildListeners() {
+            cp.onExit(() => queue.end());
+
+            let bufferedLength = 0;
+            const MAX_BUFFERED_LENGTH = 64000;
+            cp.onData(async data => {
+                const buffer = Buffer.from(data);
+                bufferedLength += buffer.length;
+                const promise = queue.enqueue(buffer).then(() => bufferedLength -= buffer.length);
+                if (bufferedLength >= MAX_BUFFERED_LENGTH) {
+                    cp.pause();
+                    await promise;
+                    if (bufferedLength < MAX_BUFFERED_LENGTH)
+                        cp.resume();
+                }
+            });
+        }
+
+        async function* generator() {
+            try {
+                while (true) {
+                    const buffers = queue.clear();
+                    if (buffers.length) {
+                        yield Buffer.concat(buffers);
+                        continue;
+                    }
+
+                    yield await queue.dequeue();
+                }
+            }
+            finally {
+                if (cp)
+                    cp.kill();
+            }
+        }
+
+        (async () => {
+            try {
+                for await (const message of input) {
+                    if (!message)
+                        continue;
+
+                    if (Buffer.isBuffer(message)) {
+                        if (cp)
+                            cp.write(message);
+                        continue;
+                    }
+
+                    try {
+                        const parsed = JSON.parse(message.toString());
+                        if (parsed.dim) {
+                            if (cp)
+                                cp.resize(parsed.dim.cols, parsed.dim.rows);
+                        } else if (parsed.eof) {
+                            if (cp)
+                                cp.sendEOF();
+                        } else if ("interactive" in parsed && !cp) {
+                            if (parsed.interactive) {
+                                cp = new InteractiveTerminal(parsed.cmd);
+                            } else {
+                                cp = new NoninteractiveTerminal(parsed.cmd);
+                            }
+                            registerChildListeners();
+                        }
+                    } catch {
+                        if (cp)
+                            cp.write(Buffer.from(message));
+                    }
+                }
+            }
+            catch (e) {
+                this.console.log(e);
+                if (cp)
+                    cp.kill();
+            }
+        })();
+
+        return generator();
+    }
+}

plugins/core/ui/package-lock.json

@@ -19,7 +19,7 @@
         "apexcharts": "^3.28.3",
         "axios": "^0.19.2",
         "bn.js": "^5.2.1",
-        "core-js": "^2.6.12",
+        "core-js": "^3.33.3",
         "draggabilly": "^2.3.0",
         "engine.io-client": "^5.2.0",
         "feather-icons": "^4.28.0",
@@ -96,7 +96,7 @@
         "sass-loader": "^10.2.0",
         "stylus": "^0.54.8",
         "stylus-loader": "^3.0.1",
-        "typescript": "^4.8.2",
+        "typescript": "^5.2.2",
         "vue-cli-plugin-vuetify": "^2.4.2",
         "vue-cli-plugin-webpack-bundle-analyzer": "~4.0.0",
         "vue-template-compiler": "^2.7.14",
@@ -121,7 +121,7 @@
     },
     "../../../sdk": {
       "name": "@scrypted/sdk",
-      "version": "0.2.103",
+      "version": "0.2.108",
       "license": "ISC",
       "dependencies": {
         "@babel/preset-typescript": "^7.18.6",
@@ -158,7 +158,7 @@
     },
     "../../../sdk/types": {
       "name": "@scrypted/types",
-      "version": "0.2.94",
+      "version": "0.2.99",
       "license": "ISC",
       "devDependencies": {
         "@types/rimraf": "^3.0.2",
@@ -3230,17 +3230,6 @@
         }
       }
     },
-    "node_modules/@vue/babel-preset-app/node_modules/core-js": {
-      "version": "3.32.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
-      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/@vue/babel-preset-jsx": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
@@ -5498,6 +5487,14 @@
         "regenerator-runtime": "^0.11.0"
       }
     },
+    "node_modules/babel-runtime/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
     "node_modules/babel-runtime/node_modules/regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
@@ -7181,11 +7178,14 @@
       }
     },
     "node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
+      "version": "3.33.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.3.tgz",
+      "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
     },
     "node_modules/core-js-compat": {
       "version": "3.32.1",
@@ -9480,16 +9480,6 @@
         "core-js": "^3.1.3"
       }
     },
-    "node_modules/feather-icons/node_modules/core-js": {
-      "version": "3.32.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
-      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/figgy-pudding": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
@@ -17704,16 +17694,16 @@
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
     },
     "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
     "node_modules/uc.micro": {
@@ -18178,16 +18168,6 @@
         "vue": "^2.5.18"
       }
     },
-    "node_modules/v-calendar/node_modules/core-js": {
-      "version": "3.32.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
-      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/v8-compile-cache": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
@@ -18801,16 +18781,6 @@
         "vue-property-decorator": "^8.0.0"
       }
     },
-    "node_modules/vue-slider-component/node_modules/core-js": {
-      "version": "3.32.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
-      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",

plugins/core/ui/package.json

@@ -22,7 +22,7 @@
     "apexcharts": "^3.28.3",
     "axios": "^0.19.2",
     "bn.js": "^5.2.1",
-    "core-js": "^2.6.12",
+    "core-js": "^3.33.3",
     "draggabilly": "^2.3.0",
     "engine.io-client": "^5.2.0",
     "feather-icons": "^4.28.0",
@@ -99,7 +99,7 @@
     "sass-loader": "^10.2.0",
     "stylus": "^0.54.8",
     "stylus-loader": "^3.0.1",
-    "typescript": "^4.8.2",
+    "typescript": "^5.2.2",
     "vue-cli-plugin-vuetify": "^2.4.2",
     "vue-cli-plugin-webpack-bundle-analyzer": "~4.0.0",
     "vue-template-compiler": "^2.7.14",

plugins/core/ui/src/Login.vue

@@ -112,6 +112,16 @@ export default {
         try {
           const redirect_uri = new URL(window.location).searchParams.get('redirect_uri');
           if (redirect_uri) {
+            try {
+              const parsed = new URL(redirect_uri);
+              // allow everything but javascript evaluation within this browser (ie, custom uri handlers, https, etc are all valid)
+              if (parsed.protocol === 'javascript:') {
+                window.location = '/';
+                return;
+              }
+            }
+            catch (e) {
+            }
             window.location = redirect_uri;
             return;
           }

plugins/core/ui/src/components/builtin/ShellComponent.vue

@@ -7,11 +7,9 @@
 <script>
 import { Terminal } from "xterm";
 import { FitAddon } from "xterm-addon-fit";
-import eio from "engine.io-client";
-import { getCurrentBaseUrl } from "../../../../../../packages/client/src";
+import { createAsyncQueue } from "@scrypted/common/src/async-queue";
 
 export default {
-  socket: null,
   mounted() {
     const term = new Terminal({
       theme: this.$vuetify.theme.dark
@@ -28,29 +26,32 @@ export default {
     term.open(this.$refs.terminal);
     fitAddon.fit();
 
-    const baseUrl = getCurrentBaseUrl();
-    const eioPath = `engine.io/shell`;
-    const eioEndpoint = baseUrl ? new URL(eioPath, baseUrl).pathname : '/' + eioPath;
-    const options = {
-      path: eioEndpoint,
-    };
-    const rootLocation = `${window.location.protocol}//${window.location.host}`;
-    this.socket = eio(rootLocation, options);
-
-    this.socket.on("message", (data) => {
-      term.write(new Uint8Array(Buffer.from(data)));
-    });
-
-    term.onData((data) => {
-      this.socket.send(data);
-    });
-
-    term.onBinary((data) => {
-      this.socket.send(data);
-    });
+    this.setupShell(term);
   },
-  destroyed() {
-    this.socket?.close();
+  methods: {
+    async setupShell(term) {
+      const termSvcRaw = this.$scrypted.systemManager.getDeviceByName("@scrypted/core");
+      const termSvc = await termSvcRaw.getDevice("terminalservice");
+      const termSvcDirect = await this.$scrypted.connectRPCObject(termSvc);
+      const queue = createAsyncQueue();
+
+      queue.enqueue(JSON.stringify({ interactive: true }));
+      queue.enqueue(JSON.stringify({ dim: { cols: term.cols, rows: term.rows } }));
+
+      term.onData(data => queue.enqueue(Buffer.from(data, 'utf8')));
+      term.onBinary(data => queue.enqueue(Buffer.from(data, 'binary')));
+      term.onResize(dim => queue.enqueue(JSON.stringify({ dim })));
+
+      const localGenerator = queue.queue;
+      const remoteGenerator = await termSvcDirect.connectStream(localGenerator);
+
+      for await (const message of remoteGenerator) {
+        if (!message) {
+          break;
+        }
+        term.write(new Uint8Array(Buffer.from(message)));
+      }
+    }
   },
 };
 </script>

plugins/ffmpeg-camera/src/common.ts

@@ -15,7 +15,6 @@ export interface UrlMediaStreamOptions extends ResponseMediaStreamOptions {
 
 export abstract class CameraBase<T extends ResponseMediaStreamOptions> extends ScryptedDeviceBase implements Camera, VideoCamera, Settings {
     snapshotAuth: AxiosDigestAuth;
-    pendingPicture: Promise<MediaObject>;
 
     constructor(nativeId: string, public provider: CameraProviderBase<T>) {
         super(nativeId);
@@ -38,16 +37,7 @@ export abstract class CameraBase<T extends ResponseMediaStreamOptions> extends S
         return mediaManager.createMediaObject(Buffer.from(response.data), response.headers['Content-Type'] || 'image/jpeg');
     }
 
-    async takePicture(option?: PictureOptions): Promise<MediaObject> {
-        if (!this.pendingPicture) {
-            this.pendingPicture = this.takePictureThrottled(option);
-            this.pendingPicture.finally(() => this.pendingPicture = undefined);
-        }
-
-        return this.pendingPicture;
-    }
-
-    abstract takePictureThrottled(option?: PictureOptions): Promise<MediaObject>;
+    abstract takePicture(option?: PictureOptions): Promise<MediaObject>;
 
     async getPictureOptions(): Promise<PictureOptions[]> {
         return;

plugins/hikvision/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.129",
+   "version": "0.0.132",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/hikvision",
-         "version": "0.0.129",
+         "version": "0.0.132",
          "license": "Apache",
          "dependencies": {
             "@koush/axios-digest-auth": "^0.8.5",

plugins/hikvision/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.129",
+   "version": "0.0.132",
    "description": "Hikvision Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

plugins/homekit/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.29",
+   "version": "1.2.31",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/homekit",
-         "version": "1.2.29",
+         "version": "1.2.31",
          "dependencies": {
             "@koush/werift-src": "file:../../external/werift",
             "check-disk-space": "^3.3.1",

plugins/homekit/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.29",
+   "version": "1.2.31",
    "description": "HomeKit Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",

plugins/homekit/src/camera-mixin.ts

@@ -136,42 +136,6 @@ The latest troubleshooting guide for all known streaming or recording issues can
             });
         }
 
-        if (this.interfaces.includes(ScryptedInterface.ObjectDetector)) {
-            try {
-                const types = await realDevice.getObjectTypes();
-                const classes = types?.classes?.filter(c => c !== 'motion');
-                if (classes?.length) {
-                    const value: string[] = [];
-                    try {
-                        value.push(...JSON.parse(this.storage.getItem('objectDetectionContactSensors')));
-                    }
-                    catch (e) {
-                    }
-
-                    settings.push({
-                        title: 'Object Detection Sensors',
-                        type: 'string',
-                        choices: classes,
-                        multiple: true,
-                        key: 'objectDetectionContactSensors',
-                        description: 'Create HomeKit occupancy sensors that detect specific people or objects.',
-                        value,
-                    });
-
-                    settings.push({
-                        title: 'Object Detection Timeout',
-                        type: 'number',
-                        key: 'objectDetectionContactSensorTimeout',
-                        description: 'Duration in seconds the sensor will report as occupied, before resetting.',
-                        value: this.storage.getItem('objectDetectionContactSensorTimeout') || defaultObjectDetectionContactSensorTimeout,
-                    });
-                }
-
-            }
-            catch (e) {
-            }
-        }
-
         if (this.interfaces.includes(ScryptedInterface.OnOff)) {
             settings.push({
                 title: 'Camera Status Indicator',
@@ -190,14 +154,14 @@ The latest troubleshooting guide for all known streaming or recording issues can
             return super.putMixinSetting(key, value);
         }
 
-        if (key === 'objectDetectionContactSensors' || key === 'debugMode') {
+        if (key === 'debugMode') {
             this.storage.setItem(key, JSON.stringify(value));
         }
         else {
             this.storage.setItem(key, value?.toString() || '');
         }
 
-        if (key === 'detectAudio' || key === 'linkedMotionSensor' || key === 'objectDetectionContactSensors') {
+        if (key === 'detectAudio' || key === 'linkedMotionSensor') {
             super.alertReload();
         }
 

plugins/homekit/src/types/camera.ts

@@ -1,8 +1,7 @@
 import { Deferred } from '@scrypted/common/src/deferred';
-import sdk, { AudioSensor, Camera, Intercom, MotionSensor, ObjectsDetected, OnOff, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, DeviceProvider, VideoCamera, VideoCameraConfiguration } from '@scrypted/sdk';
-import { defaultObjectDetectionContactSensorTimeout } from '../camera-mixin';
-import { addSupportedType, bindCharacteristic, DummyDevice } from '../common';
-import { AudioRecordingCodec, AudioRecordingCodecType, AudioRecordingSamplerate, AudioStreamingCodec, AudioStreamingCodecType, AudioStreamingSamplerate, CameraController, CameraRecordingConfiguration, CameraRecordingDelegate, CameraRecordingOptions, CameraStreamingOptions, Characteristic, CharacteristicEventTypes, H264Level, H264Profile, MediaContainerType, OccupancySensor, RecordingPacket, Service, SRTPCryptoSuites, VideoCodecType, WithUUID } from '../hap';
+import sdk, { AudioSensor, Camera, DeviceProvider, Intercom, MotionSensor, OnOff, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, VideoCamera, VideoCameraConfiguration } from '@scrypted/sdk';
+import { DummyDevice, addSupportedType, bindCharacteristic } from '../common';
+import { AudioRecordingCodec, AudioRecordingCodecType, AudioRecordingSamplerate, AudioStreamingCodec, AudioStreamingCodecType, AudioStreamingSamplerate, CameraController, CameraRecordingConfiguration, CameraRecordingDelegate, CameraRecordingOptions, CameraStreamingOptions, Characteristic, CharacteristicEventTypes, H264Level, H264Profile, MediaContainerType, RecordingPacket, SRTPCryptoSuites, Service, VideoCodecType, WithUUID } from '../hap';
 import type { HomeKitPlugin } from '../main';
 import { handleFragmentsRequests, iframeIntervalSeconds } from './camera/camera-recording';
 import { createCameraStreamingDelegate } from './camera/camera-streaming';
@@ -259,50 +258,6 @@ addSupportedType({
             }
         }
 
-
-        if (device.interfaces.includes(ScryptedInterface.ObjectDetector)) {
-            const objectDetectionContactSensorsValue = storage.getItem('objectDetectionContactSensors');
-            const objectDetectionContactSensors: string[] = [];
-            try {
-                objectDetectionContactSensors.push(...JSON.parse(objectDetectionContactSensorsValue));
-            }
-            catch (e) {
-            }
-
-            for (const ojs of new Set(objectDetectionContactSensors)) {
-                const sensor = new OccupancySensor(`${device.name}: ` + ojs, ojs);
-                accessory.addService(sensor);
-
-                let contactState = Characteristic.OccupancyDetected.OCCUPANCY_NOT_DETECTED;
-                let timeout: NodeJS.Timeout;
-
-                const resetSensorTimeout = () => {
-                    clearTimeout(timeout);
-                    timeout = setTimeout(() => {
-                        contactState = Characteristic.OccupancyDetected.OCCUPANCY_NOT_DETECTED;
-                        sensor.updateCharacteristic(Characteristic.OccupancyDetected, contactState);
-                    }, (parseInt(storage.getItem('objectDetectionContactSensorTimeout')) || defaultObjectDetectionContactSensorTimeout) * 1000)
-                }
-
-                bindCharacteristic(device, ScryptedInterface.ObjectDetector, sensor, Characteristic.OccupancyDetected, (source, details, data) => {
-                    if (!source)
-                        return contactState;
-
-                    const ed: ObjectsDetected = data;
-                    if (!ed.detections)
-                        return contactState;
-
-                    const objects = ed.detections.map(d => d.className);
-                    if (objects.includes(ojs)) {
-                        contactState = Characteristic.OccupancyDetected.OCCUPANCY_DETECTED;
-                        resetSensorTimeout();
-                    }
-
-                    return contactState;
-                }, true);
-            }
-        }
-
         // if the camera is a device provider, merge in child devices and 
         // ensure the devices are skipped by the rest of homekit by
         // reporting that they've been merged

plugins/homekit/src/types/camera/camera-streaming-srtp-sender.ts

@@ -119,8 +119,8 @@ export function createCameraStreamSender(console: Console, config: Config, sende
             firstTimestamp = rtp.header.timestamp;
 
         if (audioOptions) {
-            rtp = opusPacketizer.repacketize(rtp);
-            if (!rtp)
+            const packets = opusPacketizer.repacketize(rtp);
+            if (!packets)
                 return;
 
             // from HAP spec:
@@ -138,8 +138,10 @@ export function createCameraStreamSender(console: Console, config: Config, sende
             // audio will work so long as the rtp timestamps are created properly: which is a construct of the sample rate
             // HAP requests, and the packet time is respected,
             // opus 48khz will work just fine.
-            rtp.header.timestamp = (firstTimestamp + packetCount * 160 * audioIntervalScale) % 0xFFFFFFFF;
-            sendPacket(rtp);
+            for (const rtp of packets) {
+                rtp.header.timestamp = (firstTimestamp + packetCount * 160 * audioIntervalScale) % 0xFFFFFFFF;
+                sendPacket(rtp);
+            }
             return;
         }
 

plugins/homekit/src/types/camera/h264-packetizer.ts

@@ -63,6 +63,16 @@ export function splitH264NaluStartCode(data: Buffer) {
 export interface H264CodecInfo {
     sps: Buffer;
     pps: Buffer;
+    // Per ChatGPT excerpt below, resending the SEI may not the correct behavior when resending codec info,
+    // as SEI payloads MAY only apply to a number or time range of frames.
+    // I suspect that any encoders that send SEI messages that apply to a time range will send them regularly with SPS/PPS anyways.
+    // The Supplemental Enhancement Information (SEI) payload in H.264 video compression typically applies to all following frames within a specific context. The SEI information is not frame-specific but rather context-specific. Here's how it works:
+    //     1. **Context-Specific Information**: The SEI payload data often provides information that is valid for a range of frames or a portion of the video stream. For example, SEI messages may contain information about display orientation, buffering instructions, timing cues, or other metadata that applies to the video content as a whole or a specific segment of it.
+    //     2. **Duration of Applicability**: SEI messages often include information about the "duration of applicability" or the time period for which the conveyed information is relevant. This duration information helps video decoders understand how long the SEI data should be applied to the frames.
+    //     3. **Multiple SEI Messages**: The video stream can include multiple SEI messages, each with its own payload data and duration of applicability. As SEI messages are parsed, the decoder processes and applies the information according to the specified time range.
+    //     4. **Continuous Application**: SEI information, once applied, typically remains in effect until a subsequent SEI message with different or canceling information is received. The decoder continues to use the information conveyed by the SEI message within its defined duration of applicability.
+    //     5. **Dynamic Changes**: SEI messages can convey information about dynamic changes in the video stream, such as a change in display orientation or closed caption content. The decoder adjusts the display or handling of frames accordingly based on the SEI information received.
+    //     In summary, SEI payload data is context-specific and often applies to multiple frames within a specified time range. It is not frame-specific but provides supplemental information that helps maintain synchronization, enhance accessibility, or optimize video playback over a period of time within the video stream. The specific behavior may vary depending on the type of SEI message and the video codec being used.
     sei?: Buffer;
 }
 
@@ -351,7 +361,8 @@ export class H264Repacketizer {
             this.console.error('expected only 1 packet for sps/pps stapa');
             return;
         }
-        this.createRtpPackets(packet, aggregates, ret);
+        // this stapa only contains sps and pps (and no frame data), thus the marker bit should not be set.
+        this.createRtpPackets(packet, aggregates, ret, false);
         this.extraPackets++;
     }
 
@@ -476,8 +487,8 @@ export class H264Repacketizer {
             let hasPps = false;
 
             // break the aggregated packet up to update codec information.
-            depacketizeStapA(packet.payload)
-                .forEach(payload => {
+            const depacketized = depacketizeStapA(packet.payload);
+            depacketized.forEach(payload => {
                     const nalType = payload[0] & 0x1F;
                     if (nalType === NAL_TYPE_SPS) {
                         hasSps = true;
@@ -510,7 +521,9 @@ export class H264Repacketizer {
             if (hasSps && hasPps)
                 this.stapa = packet;
 
-            const stapa = this.packetizeStapA(depacketizeStapA(packet.payload));
+            const stapa = this.packetizeStapA(depacketized);
+            if (stapa.length !== 1)
+                this.console.warn('Expected single stapa packet. Please report this to @koush on Discord.')
             this.createRtpPackets(packet, stapa, ret);
         }
         else if (nalType >= 1 && nalType < 24) {

plugins/homekit/src/types/camera/opus-repacketizer.ts

@@ -63,18 +63,22 @@ import type { RtpPacket } from "@koush/werift-src/packages/rtp/src/rtp/rtp";
 
 export class OpusRepacketizer {
     depacketized: Buffer[] = [];
+    extraPackets = 0;
 
+    // framesPerPacket argument is buggy in that it assumes that the frame durations are always 20.
+    // the frame duration can be determined from the config in the opus header above.
+    // however, frames of duration 20 seems to always be the case from the various test devices.
     constructor(public framesPerPacket: number) {
     }
 
     // repacketize a packet with a single frame into a packet with multiple frames.
-    repacketize(packet: RtpPacket): RtpPacket | undefined {
+    repacketize(packet: RtpPacket): RtpPacket[] | undefined {
         const code = packet.payload[0] & 0b00000011;
         let offset: number;
 
         // see Frame Length Coding in RFC
         const decodeFrameLength = () => {
-            let frameLength = packet.payload.readUInt8(offset);
+            let frameLength = packet.payload.readUInt8(offset++);
             if (frameLength >= 252) {
                 offset++;
                 frameLength += packet.payload.readUInt8(offset) * 4;
@@ -88,13 +92,13 @@ export class OpusRepacketizer {
 
         if (code === 0) {
             if (this.framesPerPacket === 1 && !this.depacketized.length)
-                return packet;
+                return [packet];
             // depacketize by stripping off the config byte
             this.depacketized.push(packet.payload.subarray(1));
         }
         else if (code === 1) {
             if (this.framesPerPacket === 2 && !this.depacketized.length)
-                return packet;
+                return [packet];
             // depacketize by dividing the remaining payload into two equal sized frames
             const remaining = packet.payload.length - 1;
             if (remaining % 2)
@@ -105,7 +109,7 @@ export class OpusRepacketizer {
         }
         else if (code === 2) {
             if (this.framesPerPacket === 2 && !this.depacketized.length)
-                return packet;
+                return [packet];
             offset = 1;
             // depacketize by dividing the remaining payload into two inequal sized frames
             const frameLength = decodeFrameLength();
@@ -119,7 +123,7 @@ export class OpusRepacketizer {
             const packetFrameCount = frameCountByte & 0b00111111;
             const vbr = frameCountByte & 0b10000000;
             if (this.framesPerPacket === packetFrameCount && !this.depacketized.length)
-                return packet;
+                return [packet];
             const paddingIndicator = frameCountByte & 0b01000000;
             offset = 2;
             let padding = 0;
@@ -145,40 +149,52 @@ export class OpusRepacketizer {
             }
             else {
                 const frameLengths: number[] = [];
-                for (let i = 0; i < packetFrameCount; i++) {
+                for (let i = 0; i < packetFrameCount - 1; i++) {
                     const frameLength = decodeFrameLength();
                     frameLengths.push(frameLength);
                 }
-                for (let i = 0; i < packetFrameCount; i++) {
+                for (let i = 0; i < frameLengths.length; i++) {
                     const frameLength = frameLengths[i];
                     const start = offset;
                     offset += frameLength;
                     this.depacketized.push(packet.payload.subarray(start, offset));
                 }
+                const lastFrameLength = (packet.payload.length - padding) - offset;
+                this.depacketized.push(packet.payload.subarray(offset, offset + lastFrameLength));
             }
         }
 
         if (this.depacketized.length < this.framesPerPacket)
-            return;
+            return [];
 
-        const depacketized = this.depacketized.slice(0, this.framesPerPacket);
-        this.depacketized = this.depacketized.slice(this.framesPerPacket);
+        const ret: RtpPacket[] = [];
+        while (true) {
+            if (this.depacketized.length < this.framesPerPacket)
+                return ret;
 
-        // reuse the config and stereo indicator, but change the code to 3.
-        let toc = packet.payload[0];
-        toc = toc | 0b00000011;
-        // vbr | padding indicator | packet count
-        let frameCountByte = 0b10000000 | this.framesPerPacket;
+            const depacketized = this.depacketized.slice(0, this.framesPerPacket);
+            this.depacketized = this.depacketized.slice(this.framesPerPacket);
 
-        const newHeader: number[] = [toc, frameCountByte];
+            // reuse the config and stereo indicator, but change the code to 3.
+            let toc = packet.payload[0];
+            toc = toc | 0b00000011;  
+            // vbr | padding indicator | packet count
+            let frameCountByte = 0b10000000 | this.framesPerPacket;
 
-        // M-1 length bytes
-        newHeader.push(...depacketized.slice(0, -1).map(data => data.length));
+            const newHeader: number[] = [toc, frameCountByte];
 
-        const headerBuffer = Buffer.from(newHeader);
-        const payload = Buffer.concat([headerBuffer, ...depacketized]);
+            // M-1 length bytes
+            newHeader.push(...depacketized.slice(0, -1).map(data => data.length));
 
-        packet.payload = payload;
-        return packet;
+            const headerBuffer = Buffer.from(newHeader);
+            const payload = Buffer.concat([headerBuffer, ...depacketized]);
+
+            const newPacket = packet.clone();
+            if (ret.length)
+                this.extraPackets++;
+            newPacket.header.sequenceNumber = (packet.header.sequenceNumber + this.extraPackets + 0x10000) % 0x10000;
+            newPacket.payload = payload;
+            ret.push(newPacket);
+        }
     }
 }

plugins/objectdetector/README.md

@@ -6,4 +6,8 @@ Motion Detection should only be used if your camera does not have a plugin and d
 events via email or webhooks.
 
 The Object Detection Plugin should only be used if you are a Scrypted NVR user. It will provide no
-benefits to HomeKit, which does its own detection processing.
+benefits to HomeKit, which does its own detection processing.
+
+## Smart Motion Sensors
+
+This plugin can be used to create smart motion sensors that trigger when a specific type of object (car, person, dog, etc) triggers movement on a camera. Created sensors can then be synced to other platforms such as HomeKit, Google Home, Alexa, or Home Assistant for use in automations. This feature requires cameras with hardware or software object detection capability.

plugins/objectdetector/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/objectdetector",
-   "version": "0.1.1",
+   "version": "0.1.8",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/objectdetector",
-         "version": "0.1.1",
+         "version": "0.1.8",
          "license": "Apache-2.0",
          "dependencies": {
             "@scrypted/common": "file:../../common",
@@ -19,11 +19,7 @@
          "devDependencies": {
             "@types/lodash": "^4.14.175",
             "@types/node": "^14.17.11",
-            "@types/semver": "^7.3.13",
-            "@types/sharp": "^0.31.1"
-         },
-         "optionalDependencies": {
-            "sharp": "^0.31.3"
+            "@types/semver": "^7.3.13"
          }
       },
       "../../common": {
@@ -43,7 +39,7 @@
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.2.85",
+         "version": "0.2.107",
          "license": "ISC",
          "dependencies": {
             "@babel/preset-typescript": "^7.18.6",
@@ -104,218 +100,6 @@
          "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
          "dev": true
       },
-      "node_modules/@types/sharp": {
-         "version": "0.31.1",
-         "resolved": "https://registry.npmjs.org/@types/sharp/-/sharp-0.31.1.tgz",
-         "integrity": "sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==",
-         "dev": true,
-         "dependencies": {
-            "@types/node": "*"
-         }
-      },
-      "node_modules/base64-js": {
-         "version": "1.5.1",
-         "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-         "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ],
-         "optional": true
-      },
-      "node_modules/bl": {
-         "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",
-            "readable-stream": "^3.4.0"
-         }
-      },
-      "node_modules/buffer": {
-         "version": "5.7.1",
-         "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-         "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ],
-         "optional": true,
-         "dependencies": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-         }
-      },
-      "node_modules/chownr": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-         "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-         "optional": true
-      },
-      "node_modules/color": {
-         "version": "4.2.3",
-         "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-         "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-         "optional": true,
-         "dependencies": {
-            "color-convert": "^2.0.1",
-            "color-string": "^1.9.0"
-         },
-         "engines": {
-            "node": ">=12.5.0"
-         }
-      },
-      "node_modules/color-convert": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-         "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-         "optional": true,
-         "dependencies": {
-            "color-name": "~1.1.4"
-         },
-         "engines": {
-            "node": ">=7.0.0"
-         }
-      },
-      "node_modules/color-name": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-         "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-         "optional": true
-      },
-      "node_modules/color-string": {
-         "version": "1.9.1",
-         "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-         "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-         "optional": true,
-         "dependencies": {
-            "color-name": "^1.0.0",
-            "simple-swizzle": "^0.2.2"
-         }
-      },
-      "node_modules/decompress-response": {
-         "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"
-         },
-         "engines": {
-            "node": ">=10"
-         },
-         "funding": {
-            "url": "https://github.com/sponsors/sindresorhus"
-         }
-      },
-      "node_modules/deep-extend": {
-         "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"
-         }
-      },
-      "node_modules/detect-libc": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-         "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-         "optional": true,
-         "engines": {
-            "node": ">=8"
-         }
-      },
-      "node_modules/end-of-stream": {
-         "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"
-         }
-      },
-      "node_modules/expand-template": {
-         "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"
-         }
-      },
-      "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==",
-         "optional": true
-      },
-      "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==",
-         "optional": true
-      },
-      "node_modules/ieee754": {
-         "version": "1.2.1",
-         "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-         "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ],
-         "optional": true
-      },
-      "node_modules/inherits": {
-         "version": "2.0.4",
-         "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-         "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-         "optional": true
-      },
-      "node_modules/ini": {
-         "version": "1.3.8",
-         "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-         "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-         "optional": true
-      },
-      "node_modules/is-arrayish": {
-         "version": "0.3.2",
-         "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-         "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-         "optional": true
-      },
       "node_modules/lines-intersect": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/lines-intersect/-/lines-intersect-1.0.0.tgz",
@@ -337,66 +121,6 @@
             "node": ">=10"
          }
       },
-      "node_modules/mimic-response": {
-         "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"
-         },
-         "funding": {
-            "url": "https://github.com/sponsors/sindresorhus"
-         }
-      },
-      "node_modules/minimist": {
-         "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"
-         }
-      },
-      "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==",
-         "optional": true
-      },
-      "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==",
-         "optional": true
-      },
-      "node_modules/node-abi": {
-         "version": "3.33.0",
-         "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz",
-         "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==",
-         "optional": true,
-         "dependencies": {
-            "semver": "^7.3.5"
-         },
-         "engines": {
-            "node": ">=10"
-         }
-      },
-      "node_modules/node-addon-api": {
-         "version": "5.1.0",
-         "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
-         "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
-         "optional": true
-      },
-      "node_modules/once": {
-         "version": "1.4.0",
-         "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-         "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-         "optional": true,
-         "dependencies": {
-            "wrappy": "1"
-         }
-      },
       "node_modules/point-inside-polygon": {
          "version": "1.0.3",
          "resolved": "https://registry.npmjs.org/point-inside-polygon/-/point-inside-polygon-1.0.3.tgz",
@@ -416,95 +140,10 @@
          "resolved": "https://registry.npmjs.org/point-inside-polygon/-/point-inside-polygon-1.0.1.tgz",
          "integrity": "sha512-qceSGPZXGaELiy5p9f+8DXTnL35qxWhpLSubufeXlVltWKkT9IB0PJcM6mNJ7Nxj0z443qyQrXbWzERheWfC7w=="
       },
-      "node_modules/prebuild-install": {
-         "version": "7.1.1",
-         "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
-         "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-         "optional": true,
-         "dependencies": {
-            "detect-libc": "^2.0.0",
-            "expand-template": "^2.0.3",
-            "github-from-package": "0.0.0",
-            "minimist": "^1.2.3",
-            "mkdirp-classic": "^0.5.3",
-            "napi-build-utils": "^1.0.1",
-            "node-abi": "^3.3.0",
-            "pump": "^3.0.0",
-            "rc": "^1.2.7",
-            "simple-get": "^4.0.0",
-            "tar-fs": "^2.0.0",
-            "tunnel-agent": "^0.6.0"
-         },
-         "bin": {
-            "prebuild-install": "bin.js"
-         },
-         "engines": {
-            "node": ">=10"
-         }
-      },
-      "node_modules/pump": {
-         "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"
-         }
-      },
-      "node_modules/rc": {
-         "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",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-         },
-         "bin": {
-            "rc": "cli.js"
-         }
-      },
-      "node_modules/readable-stream": {
-         "version": "3.6.2",
-         "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-         "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-         "optional": true,
-         "dependencies": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-         },
-         "engines": {
-            "node": ">= 6"
-         }
-      },
-      "node_modules/safe-buffer": {
-         "version": "5.2.1",
-         "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-         "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ],
-         "optional": true
-      },
       "node_modules/semver": {
-         "version": "7.3.8",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-         "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+         "version": "7.5.4",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+         "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
          "dependencies": {
             "lru-cache": "^6.0.0"
          },
@@ -515,153 +154,6 @@
             "node": ">=10"
          }
       },
-      "node_modules/sharp": {
-         "version": "0.31.3",
-         "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
-         "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
-         "hasInstallScript": true,
-         "optional": true,
-         "dependencies": {
-            "color": "^4.2.3",
-            "detect-libc": "^2.0.1",
-            "node-addon-api": "^5.0.0",
-            "prebuild-install": "^7.1.1",
-            "semver": "^7.3.8",
-            "simple-get": "^4.0.1",
-            "tar-fs": "^2.1.1",
-            "tunnel-agent": "^0.6.0"
-         },
-         "engines": {
-            "node": ">=14.15.0"
-         },
-         "funding": {
-            "url": "https://opencollective.com/libvips"
-         }
-      },
-      "node_modules/simple-concat": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-         "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ],
-         "optional": true
-      },
-      "node_modules/simple-get": {
-         "version": "4.0.1",
-         "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-         "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ],
-         "optional": true,
-         "dependencies": {
-            "decompress-response": "^6.0.0",
-            "once": "^1.3.1",
-            "simple-concat": "^1.0.0"
-         }
-      },
-      "node_modules/simple-swizzle": {
-         "version": "0.2.2",
-         "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-         "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-         "optional": true,
-         "dependencies": {
-            "is-arrayish": "^0.3.1"
-         }
-      },
-      "node_modules/string_decoder": {
-         "version": "1.3.0",
-         "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-         "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-         "optional": true,
-         "dependencies": {
-            "safe-buffer": "~5.2.0"
-         }
-      },
-      "node_modules/strip-json-comments": {
-         "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"
-         }
-      },
-      "node_modules/tar-fs": {
-         "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",
-            "pump": "^3.0.0",
-            "tar-stream": "^2.1.4"
-         }
-      },
-      "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",
-            "fs-constants": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.1.1"
-         },
-         "engines": {
-            "node": ">=6"
-         }
-      },
-      "node_modules/tunnel-agent": {
-         "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"
-         },
-         "engines": {
-            "node": "*"
-         }
-      },
-      "node_modules/util-deprecate": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-         "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-         "optional": true
-      },
-      "node_modules/wrappy": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-         "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-         "optional": true
-      },
       "node_modules/yallist": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -739,155 +231,6 @@
          "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
          "dev": true
       },
-      "@types/sharp": {
-         "version": "0.31.1",
-         "resolved": "https://registry.npmjs.org/@types/sharp/-/sharp-0.31.1.tgz",
-         "integrity": "sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==",
-         "dev": true,
-         "requires": {
-            "@types/node": "*"
-         }
-      },
-      "base64-js": {
-         "version": "1.5.1",
-         "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-         "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-         "optional": true
-      },
-      "bl": {
-         "version": "4.1.0",
-         "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-         "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-         "optional": true,
-         "requires": {
-            "buffer": "^5.5.0",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0"
-         }
-      },
-      "buffer": {
-         "version": "5.7.1",
-         "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-         "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-         "optional": true,
-         "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-         }
-      },
-      "chownr": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-         "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-         "optional": true
-      },
-      "color": {
-         "version": "4.2.3",
-         "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-         "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-         "optional": true,
-         "requires": {
-            "color-convert": "^2.0.1",
-            "color-string": "^1.9.0"
-         }
-      },
-      "color-convert": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-         "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-         "optional": true,
-         "requires": {
-            "color-name": "~1.1.4"
-         }
-      },
-      "color-name": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-         "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-         "optional": true
-      },
-      "color-string": {
-         "version": "1.9.1",
-         "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-         "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-         "optional": true,
-         "requires": {
-            "color-name": "^1.0.0",
-            "simple-swizzle": "^0.2.2"
-         }
-      },
-      "decompress-response": {
-         "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,
-         "requires": {
-            "mimic-response": "^3.1.0"
-         }
-      },
-      "deep-extend": {
-         "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
-      },
-      "detect-libc": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-         "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-         "optional": true
-      },
-      "end-of-stream": {
-         "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,
-         "requires": {
-            "once": "^1.4.0"
-         }
-      },
-      "expand-template": {
-         "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
-      },
-      "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==",
-         "optional": true
-      },
-      "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==",
-         "optional": true
-      },
-      "ieee754": {
-         "version": "1.2.1",
-         "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-         "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-         "optional": true
-      },
-      "inherits": {
-         "version": "2.0.4",
-         "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-         "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-         "optional": true
-      },
-      "ini": {
-         "version": "1.3.8",
-         "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-         "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-         "optional": true
-      },
-      "is-arrayish": {
-         "version": "0.3.2",
-         "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-         "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-         "optional": true
-      },
       "lines-intersect": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/lines-intersect/-/lines-intersect-1.0.0.tgz",
@@ -906,54 +249,6 @@
             "yallist": "^4.0.0"
          }
       },
-      "mimic-response": {
-         "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
-      },
-      "minimist": {
-         "version": "1.2.8",
-         "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-         "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-         "optional": true
-      },
-      "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==",
-         "optional": true
-      },
-      "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==",
-         "optional": true
-      },
-      "node-abi": {
-         "version": "3.33.0",
-         "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz",
-         "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==",
-         "optional": true,
-         "requires": {
-            "semver": "^7.3.5"
-         }
-      },
-      "node-addon-api": {
-         "version": "5.1.0",
-         "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
-         "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
-         "optional": true
-      },
-      "once": {
-         "version": "1.4.0",
-         "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-         "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-         "optional": true,
-         "requires": {
-            "wrappy": "1"
-         }
-      },
       "point-inside-polygon": {
          "version": "1.0.3",
          "resolved": "https://registry.npmjs.org/point-inside-polygon/-/point-inside-polygon-1.0.3.tgz",
@@ -975,176 +270,14 @@
             }
          }
       },
-      "prebuild-install": {
-         "version": "7.1.1",
-         "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
-         "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-         "optional": true,
-         "requires": {
-            "detect-libc": "^2.0.0",
-            "expand-template": "^2.0.3",
-            "github-from-package": "0.0.0",
-            "minimist": "^1.2.3",
-            "mkdirp-classic": "^0.5.3",
-            "napi-build-utils": "^1.0.1",
-            "node-abi": "^3.3.0",
-            "pump": "^3.0.0",
-            "rc": "^1.2.7",
-            "simple-get": "^4.0.0",
-            "tar-fs": "^2.0.0",
-            "tunnel-agent": "^0.6.0"
-         }
-      },
-      "pump": {
-         "version": "3.0.0",
-         "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-         "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-         "optional": true,
-         "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-         }
-      },
-      "rc": {
-         "version": "1.2.8",
-         "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-         "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-         "optional": true,
-         "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-         }
-      },
-      "readable-stream": {
-         "version": "3.6.2",
-         "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-         "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-         "optional": true,
-         "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-         }
-      },
-      "safe-buffer": {
-         "version": "5.2.1",
-         "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-         "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-         "optional": true
-      },
       "semver": {
-         "version": "7.3.8",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-         "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+         "version": "7.5.4",
+         "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+         "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
          "requires": {
             "lru-cache": "^6.0.0"
          }
       },
-      "sharp": {
-         "version": "0.31.3",
-         "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
-         "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
-         "optional": true,
-         "requires": {
-            "color": "^4.2.3",
-            "detect-libc": "^2.0.1",
-            "node-addon-api": "^5.0.0",
-            "prebuild-install": "^7.1.1",
-            "semver": "^7.3.8",
-            "simple-get": "^4.0.1",
-            "tar-fs": "^2.1.1",
-            "tunnel-agent": "^0.6.0"
-         }
-      },
-      "simple-concat": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-         "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-         "optional": true
-      },
-      "simple-get": {
-         "version": "4.0.1",
-         "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-         "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-         "optional": true,
-         "requires": {
-            "decompress-response": "^6.0.0",
-            "once": "^1.3.1",
-            "simple-concat": "^1.0.0"
-         }
-      },
-      "simple-swizzle": {
-         "version": "0.2.2",
-         "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-         "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-         "optional": true,
-         "requires": {
-            "is-arrayish": "^0.3.1"
-         }
-      },
-      "string_decoder": {
-         "version": "1.3.0",
-         "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-         "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-         "optional": true,
-         "requires": {
-            "safe-buffer": "~5.2.0"
-         }
-      },
-      "strip-json-comments": {
-         "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
-      },
-      "tar-fs": {
-         "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,
-         "requires": {
-            "chownr": "^1.1.1",
-            "mkdirp-classic": "^0.5.2",
-            "pump": "^3.0.0",
-            "tar-stream": "^2.1.4"
-         }
-      },
-      "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,
-         "requires": {
-            "bl": "^4.0.3",
-            "end-of-stream": "^1.4.1",
-            "fs-constants": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.1.1"
-         }
-      },
-      "tunnel-agent": {
-         "version": "0.6.0",
-         "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-         "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-         "optional": true,
-         "requires": {
-            "safe-buffer": "^5.0.1"
-         }
-      },
-      "util-deprecate": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-         "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-         "optional": true
-      },
-      "wrappy": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-         "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-         "optional": true
-      },
       "yallist": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",

plugins/objectdetector/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/objectdetector",
-   "version": "0.1.1",
+   "version": "0.1.8",
    "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
    "author": "Scrypted",
    "license": "Apache-2.0",
@@ -35,6 +35,7 @@
       "name": "Video Analysis Plugin",
       "type": "API",
       "interfaces": [
+         "DeviceCreator",
          "DeviceProvider",
          "Settings",
          "MixinProvider"

plugins/objectdetector/src/ffmpeg-videoframes-no-sharp.ts

@@ -1,177 +0,0 @@
-import { Deferred } from "@scrypted/common/src/deferred";
-import { ffmpegLogInitialOutput, safeKillFFmpeg, safePrintFFmpegArguments } from "@scrypted/common/src/media-helpers";
-import { readLength, readLine } from "@scrypted/common/src/read-stream";
-import sdk, { FFmpegInput, Image, ImageFormat, ImageOptions, MediaObject, ScryptedDeviceBase, ScryptedMimeTypes, VideoFrame, VideoFrameGenerator, VideoFrameGeneratorOptions } from "@scrypted/sdk";
-import child_process from 'child_process';
-import { Readable } from 'stream';
-
-
-interface RawFrame {
-    width: number;
-    height: number;
-    data: Buffer;
-}
-
-async function createRawImageMediaObject(image: RawImage): Promise<Image & MediaObject> {
-    const ret = await sdk.mediaManager.createMediaObject(image, ScryptedMimeTypes.Image, {
-        format: null,
-        width: image.width,
-        height: image.height,
-        toBuffer: (options: ImageOptions) => image.toBuffer(options),
-        toImage: (options: ImageOptions) => image.toImage(options),
-        close: () => image.close(),
-    });
-
-    return ret;
-}
-
-class RawImage implements Image, RawFrame {
-    constructor(public data: Buffer, public width: number, public height: number, public format: ImageFormat) {
-    }
-
-    async close(): Promise<void> {
-        this.data = undefined;
-    }
-
-    checkOptions(options: ImageOptions) {
-        if (options?.resize || options?.crop || (options?.format && options?.format !== this.format))
-            throw new Error('resize, crop, and color conversion are not supported. Install the Python Codecs plugin if it is missing, and ensure FFmpeg Frame Generator is not selected.');
-    }
-
-    async toBuffer(options: ImageOptions) {
-        this.checkOptions(options);
-        return this.data;
-    }
-
-    async toImage(options: ImageOptions) {
-        this.checkOptions(options);
-        return createRawImageMediaObject(this);
-    }
-}
-
-export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements VideoFrameGenerator {
-    async *generateVideoFramesInternal(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions, filter?: (videoFrame: VideoFrame) => Promise<boolean>): AsyncGenerator<VideoFrame, any, unknown> {
-        const ffmpegInput = await sdk.mediaManager.convertMediaObjectToJSON<FFmpegInput>(mediaObject, ScryptedMimeTypes.FFmpegInput);
-        const gray = options?.format === 'gray';
-        const format = options?.format || 'rgb';
-        const channels = gray ? 1 : (format === 'rgb' ? 3 : 4);
-        const vf: string[] = [];
-        if (options?.fps)
-            vf.push(`fps=${options.fps}`);
-        if (options.resize)
-            vf.push(`scale=${options.resize.width}:${options.resize.height}`);
-        const args = [
-            '-hide_banner',
-            //'-hwaccel', 'auto',
-            ...ffmpegInput.inputArguments,
-            '-vcodec', 'pam',
-            '-pix_fmt', gray ? 'gray' : (format === 'rgb' ? 'rgb24' : 'rgba'),
-            ...vf.length ? [
-                '-vf',
-                vf.join(','),
-            ] : [],
-            '-f', 'image2pipe',
-            'pipe:3',
-        ];
-
-        // this seems to reduce latency.
-        // addVideoFilterArguments(args, 'fps=10', 'fps');
-
-        const cp = child_process.spawn(await sdk.mediaManager.getFFmpegPath(), args, {
-            stdio: ['pipe', 'pipe', 'pipe', 'pipe'],
-        });
-        const console = mediaObject?.sourceId ? sdk.deviceManager.getMixinConsole(mediaObject.sourceId) : this.console;
-        safePrintFFmpegArguments(console, args);
-        ffmpegLogInitialOutput(console, cp);
-
-        let finished = false;
-        let frameDeferred: Deferred<RawFrame>;
-
-        const reader = async () => {
-            try {
-
-                const readable = cp.stdio[3] as Readable;
-                const headers = new Map<string, string>();
-                while (!finished) {
-                    const line = await readLine(readable);
-                    if (line !== 'ENDHDR') {
-                        const [key, value] = line.split(' ');
-                        headers[key] = value;
-                        continue;
-                    }
-
-
-                    if (headers['TUPLTYPE'] !== 'RGB' && headers['TUPLTYPE'] !== 'RGB_ALPHA' && headers['TUPLTYPE'] !== 'GRAYSCALE')
-                        throw new Error(`Unexpected TUPLTYPE in PAM stream: ${headers['TUPLTYPE']}`);
-
-                    const width = parseInt(headers['WIDTH']);
-                    const height = parseInt(headers['HEIGHT']);
-                    if (!width || !height)
-                        throw new Error('Invalid dimensions in PAM stream');
-
-                    const length = width * height * channels;
-                    headers.clear();
-                    const data = await readLength(readable, length);
-
-                    if (frameDeferred) {
-                        const f = frameDeferred;
-                        frameDeferred = undefined;
-                        f.resolve({
-                            width,
-                            height,
-                            data,
-                        });
-                    }
-                    else {
-                        // this.console.warn('skipped frame');
-                    }
-                }
-            }
-            catch (e) {
-            }
-            finally {
-                console.log('finished reader');
-                finished = true;
-                frameDeferred?.reject(new Error('frame generator finished'));
-            }
-        }
-
-        try {
-            reader();
-            const flush = async () => { };
-
-            while (!finished) {
-                frameDeferred = new Deferred();
-                const raw = await frameDeferred.promise;
-                const { width, height, data } = raw;
-
-                const rawImage = new RawImage(data, width, height, format);
-                try {
-                    const image = await createRawImageMediaObject(rawImage);
-                    yield {
-                        __json_copy_serialize_children: true,
-                        timestamp: 0,
-                        queued: 0,
-                        image,
-                        flush,
-                    };
-                }
-                finally {
-                    rawImage.data = undefined;
-                }
-            }
-        }
-        catch (e) {
-        }
-        finally {
-            console.log('finished generator');
-            finished = true;
-            safeKillFFmpeg(cp);
-        }
-    }
-
-
-    async generateVideoFrames(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions, filter?: (videoFrame: VideoFrame & MediaObject) => Promise<boolean>): Promise<AsyncGenerator<VideoFrame, any, unknown>> {
-        return this.generateVideoFramesInternal(mediaObject, options, filter);
-    }
-}

plugins/objectdetector/src/ffmpeg-videoframes.ts

@@ -1,47 +1,10 @@
 import { Deferred } from "@scrypted/common/src/deferred";
-import { addVideoFilterArguments } from "@scrypted/common/src/ffmpeg-helpers";
 import { ffmpegLogInitialOutput, safeKillFFmpeg, safePrintFFmpegArguments } from "@scrypted/common/src/media-helpers";
 import { readLength, readLine } from "@scrypted/common/src/read-stream";
-import sdk, { FFmpegInput, Image, ImageOptions, MediaObject, ScryptedDeviceBase, ScryptedMimeTypes, VideoFrame, VideoFrameGenerator, VideoFrameGeneratorOptions } from "@scrypted/sdk";
+import sdk, { FFmpegInput, Image, ImageFormat, ImageOptions, MediaObject, ScryptedDeviceBase, ScryptedMimeTypes, VideoFrame, VideoFrameGenerator, VideoFrameGeneratorOptions } from "@scrypted/sdk";
 import child_process from 'child_process';
-import type sharp from 'sharp';
 import { Readable } from 'stream';
 
-export let sharpLib: (input?:
-    | Buffer
-    | Uint8Array
-    | Uint8ClampedArray
-    | Int8Array
-    | Uint16Array
-    | Int16Array
-    | Uint32Array
-    | Int32Array
-    | Float32Array
-    | Float64Array
-    | string,
-    options?: sharp.SharpOptions) => sharp.Sharp;
-try {
-    sharpLib = require('sharp');
-}
-catch (e) {
-    console.warn('Sharp failed to load. FFmpeg Frame Generator will not function properly.')
-}
-
-async function createVipsMediaObject(image: VipsImage): Promise<Image & MediaObject> {
-    const ret = await sdk.mediaManager.createMediaObject(image, ScryptedMimeTypes.Image, {
-        format: null,
-        width: image.width,
-        height: image.height,
-        toBuffer: (options: ImageOptions) => image.toBuffer(options),
-        toImage: async (options: ImageOptions) => {
-            const newImage = await image.toVipsImage(options);
-            return createVipsMediaObject(newImage);
-        },
-        close: () => image.close(),
-    });
-
-    return ret;
-}
 
 interface RawFrame {
     width: number;
@@ -49,105 +12,70 @@ interface RawFrame {
     data: Buffer;
 }
 
-class VipsImage implements Image {
-    constructor(public image: sharp.Sharp, public width: number, public height: number, public channels: number) {
+async function createRawImageMediaObject(image: RawImage): Promise<Image & MediaObject> {
+    const ret = await sdk.mediaManager.createMediaObject(image, ScryptedMimeTypes.Image, {
+        format: null,
+        width: image.width,
+        height: image.height,
+        toBuffer: (options: ImageOptions) => image.toBuffer(options),
+        toImage: (options: ImageOptions) => image.toImage(options),
+        close: () => image.close(),
+    });
+
+    return ret;
+}
+
+class RawImage implements Image, RawFrame {
+    constructor(public data: Buffer, public width: number, public height: number, public format: ImageFormat) {
     }
 
     async close(): Promise<void> {
-        this.image?.destroy();
-        this.image = undefined;
+        this.data = undefined;
     }
 
-    toImageInternal(options: ImageOptions) {
-        const transformed = this.image.clone();
-        if (options?.crop) {
-            transformed.extract({
-                left: Math.floor(options.crop.left),
-                top: Math.floor(options.crop.top),
-                width: Math.floor(options.crop.width),
-                height: Math.floor(options.crop.height),
-            });
-        }
-        if (options?.resize) {
-            transformed.resize(typeof options.resize.width === 'number' ? Math.floor(options.resize.width) : undefined, typeof options.resize.height === 'number' ? Math.floor(options.resize.height) : undefined, {
-                fit: "fill",
-                kernel: 'cubic',
-            });
-        }
-
-        return transformed;
+    checkOptions(options: ImageOptions) {
+        if (options?.resize || options?.crop || (options?.format && options?.format !== this.format))
+            throw new Error('resize, crop, and color conversion are not supported. Install the Python Codecs plugin if it is missing, and ensure FFmpeg Frame Generator is not selected.');
     }
 
     async toBuffer(options: ImageOptions) {
-        const transformed = this.toImageInternal(options);
-        if (options?.format === 'jpg') {
-            transformed.toFormat('jpg');
-        }
-        else {
-            if (this.channels === 1 && (options?.format === 'gray' || !options.format))
-                transformed.extractChannel(0);
-            else if (options?.format === 'gray')
-                transformed.toColorspace('b-w');
-            else if (options?.format === 'rgb')
-                transformed.removeAlpha()
-            transformed.raw();
-        }
-        return transformed.toBuffer();
-    }
-
-    async toVipsImage(options: ImageOptions) {
-        const transformed = this.toImageInternal(options);
-        const { info, data } = await transformed.raw().toBuffer({
-            resolveWithObject: true,
-        });
-
-        const sharpLib = require('sharp') as (input?:
-            | Buffer
-            | Uint8Array
-            | Uint8ClampedArray
-            | Int8Array
-            | Uint16Array
-            | Int16Array
-            | Uint32Array
-            | Int32Array
-            | Float32Array
-            | Float64Array
-            | string,
-            options?) => sharp.Sharp;
-        const newImage = sharpLib(data, {
-            raw: info,
-        });
-
-        const newMetadata = await newImage.metadata();
-        const newVipsImage = new VipsImage(newImage, newMetadata.width, newMetadata.height, newMetadata.channels);
-        return newVipsImage;
+        this.checkOptions(options);
+        return this.data;
     }
 
     async toImage(options: ImageOptions) {
-        if (options.format)
-            throw new Error('format can only be used with toBuffer');
-        const newVipsImage = await this.toVipsImage(options);
-        return createVipsMediaObject(newVipsImage);
+        this.checkOptions(options);
+        return createRawImageMediaObject(this);
     }
 }
 
 export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements VideoFrameGenerator {
-    async *generateVideoFramesInternal(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions, filter?: (videoFrame: VideoFrame) => Promise<boolean>): AsyncGenerator<VideoFrame, any, unknown> {
+    async *generateVideoFramesInternal(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions): AsyncGenerator<VideoFrame, any, unknown> {
         const ffmpegInput = await sdk.mediaManager.convertMediaObjectToJSON<FFmpegInput>(mediaObject, ScryptedMimeTypes.FFmpegInput);
         const gray = options?.format === 'gray';
-        const channels = gray ? 1 : 3;
+        const format = options?.format || 'rgb';
+        const channels = gray ? 1 : (format === 'rgb' ? 3 : 4);
+        const vf: string[] = [];
+        if (options?.fps)
+            vf.push(`fps=${options.fps}`);
+        if (options.resize)
+            vf.push(`scale=${options.resize.width}:${options.resize.height}`);
         const args = [
             '-hide_banner',
             //'-hwaccel', 'auto',
             ...ffmpegInput.inputArguments,
             '-vcodec', 'pam',
-            '-pix_fmt', gray ? 'gray' : 'rgb24',
+            '-pix_fmt', gray ? 'gray' : (format === 'rgb' ? 'rgb24' : 'rgba'),
+            ...vf.length ? [
+                '-vf',
+                vf.join(','),
+            ] : [],
             '-f', 'image2pipe',
             'pipe:3',
         ];
 
         // this seems to reduce latency.
-        addVideoFilterArguments(args, 'fps=10', 'fps');
+        // addVideoFilterArguments(args, 'fps=10', 'fps');
 
         const cp = child_process.spawn(await sdk.mediaManager.getFFmpegPath(), args, {
             stdio: ['pipe', 'pipe', 'pipe', 'pipe'],
@@ -173,7 +101,7 @@ export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements Vid
                     }
 
 
-                    if (headers['TUPLTYPE'] !== 'RGB' && headers['TUPLTYPE'] !== 'GRAYSCALE')
+                    if (headers['TUPLTYPE'] !== 'RGB' && headers['TUPLTYPE'] !== 'RGB_ALPHA' && headers['TUPLTYPE'] !== 'GRAYSCALE')
                         throw new Error(`Unexpected TUPLTYPE in PAM stream: ${headers['TUPLTYPE']}`);
 
                     const width = parseInt(headers['WIDTH']);
@@ -211,21 +139,15 @@ export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements Vid
         try {
             reader();
             const flush = async () => { };
+
             while (!finished) {
                 frameDeferred = new Deferred();
                 const raw = await frameDeferred.promise;
                 const { width, height, data } = raw;
 
-                const image = sharpLib(data, {
-                    raw: {
-                        width,
-                        height,
-                        channels,
-                    }
-                });
-                const vipsImage = new VipsImage(image, width, height, channels);
+                const rawImage = new RawImage(data, width, height, format);
                 try {
-                    const image = await createVipsMediaObject(vipsImage);
+                    const image = await createRawImageMediaObject(rawImage);
                     yield {
                         __json_copy_serialize_children: true,
                         timestamp: 0,
@@ -235,8 +157,7 @@ export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements Vid
                     };
                 }
                 finally {
-                    vipsImage.image = undefined;
-                    image.destroy();
+                    rawImage.data = undefined;
                 }
             }
         }
@@ -250,7 +171,7 @@ export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements Vid
     }
 
 
-    async generateVideoFrames(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions, filter?: (videoFrame: VideoFrame) => Promise<boolean>): Promise<AsyncGenerator<VideoFrame, any, unknown>> {
-        return this.generateVideoFramesInternal(mediaObject, options, filter);
+    async generateVideoFrames(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions): Promise<AsyncGenerator<VideoFrame, any, unknown>> {
+        return this.generateVideoFramesInternal(mediaObject, options);
     }
 }

plugins/objectdetector/src/main.ts

@@ -1,15 +1,16 @@
 import { Deferred } from '@scrypted/common/src/deferred';
 import { sleep } from '@scrypted/common/src/sleep';
-import sdk, { Camera, DeviceProvider, DeviceState, EventListenerRegister, Image, MediaObject, MediaStreamDestination, MixinDeviceBase, MixinProvider, MotionSensor, ObjectDetection, ObjectDetectionModel, ObjectDetectionTypes, ObjectDetectionZone, ObjectDetector, ObjectsDetected, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, ScryptedNativeId, Setting, Settings, SettingValue, VideoCamera, VideoFrame, VideoFrameGenerator } from '@scrypted/sdk';
+import sdk, { Camera, DeviceCreator, DeviceCreatorSettings, DeviceProvider, DeviceState, EventListenerRegister, Image, MediaObject, MediaStreamDestination, MixinDeviceBase, MixinProvider, MotionSensor, ObjectDetection, ObjectDetectionModel, ObjectDetectionTypes, ObjectDetectionZone, ObjectDetector, ObjectsDetected, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, ScryptedNativeId, Setting, Settings, SettingValue, VideoCamera, VideoFrame, VideoFrameGenerator } from '@scrypted/sdk';
 import { StorageSettings } from '@scrypted/sdk/storage-settings';
 import crypto from 'crypto';
 import os from 'os';
 import { AutoenableMixinProvider } from "../../../common/src/autoenable-mixin-provider";
 import { SettingsMixinDeviceBase } from "../../../common/src/settings-mixin";
-import { FFmpegVideoFrameGenerator } from './ffmpeg-videoframes-no-sharp';
+import { FFmpegVideoFrameGenerator } from './ffmpeg-videoframes';
 import { getMaxConcurrentObjectDetectionSessions } from './performance-profile';
 import { serverSupportsMixinEventMasking } from './server-version';
 import { getAllDevices, safeParseJson } from './util';
+import { createObjectDetectorStorageSetting, SMART_MOTIONSENSOR_PREFIX, SmartMotionSensor } from './smart-motionsensor';
 
 const polygonOverlap = require('polygon-overlap');
 const insidePolygon = require('point-inside-polygon');
@@ -49,8 +50,6 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
           'Default',
           ...getAllDevices().filter(d => d.interfaces.includes(ScryptedInterface.VideoFrameGenerator)).map(d => d.name),
         ];
-        if (!this.hasMotionType)
-          choices.push('Snapshot');
         return {
           choices,
         }
@@ -243,9 +242,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
     if (!this.hasMotionType)
       this.plugin.objectDetectionStarted(this.name, this.console);
 
-    const options = {
-      snapshotPipeline: this.plugin.shouldUseSnapshotPipeline(),
-    };
+    const options = {};
 
     const session = crypto.randomBytes(4).toString('hex');
     const typeName = this.hasMotionType ? 'motion' : 'object';
@@ -256,14 +253,13 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
         this.console.error('Video Analysis ended with error', e);
       }).finally(() => {
         if (!this.hasMotionType)
-          this.plugin.objectDetectionEnded(this.console, options.snapshotPipeline);
+          this.plugin.objectDetectionEnded(this.console);
         this.console.log(`Video Analysis ${typeName} detection session ${session} ended.`);
         signal.resolve();
       });
   }
 
   async runPipelineAnalysisLoop(signal: Deferred<void>, options: {
-    snapshotPipeline: boolean,
     suppress?: boolean,
   }) {
     while (!signal.finished) {
@@ -282,106 +278,51 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
     }
   }
 
-  getCurrentFrameGenerator(snapshotPipeline: boolean) {
+  getCurrentFrameGenerator() {
     let frameGenerator: string = this.frameGenerator;
-    if (!this.hasMotionType && snapshotPipeline) {
-      frameGenerator = 'Snapshot';
-      this.console.warn(`Due to limited performance, Snapshot mode is being used with ${this.plugin.statsSnapshotConcurrent} actively detecting cameras.`);
-    }
     return frameGenerator;
   }
 
   async createFrameGenerator(signal: Deferred<void>,
     frameGenerator: string,
     options: {
-      snapshotPipeline: boolean,
       suppress?: boolean,
     }, updatePipelineStatus: (status: string) => void): Promise<AsyncGenerator<VideoFrame, any, unknown>> {
-    if (frameGenerator === 'Snapshot' && !this.hasMotionType) {
 
-      options.snapshotPipeline = true;
-      this.console.log('Snapshot', '+', this.objectDetection.name);
-      const self = this;
-      return (async function* gen() {
-        try {
-          const flush = async () => { };
-          while (!signal.finished) {
-            const now = Date.now();
-            const sleeper = async () => {
-              const diff = now + 1100 - Date.now();
-              if (diff > 0)
-                await sleep(diff);
-            };
-            let image: Image & MediaObject;
-            try {
-              updatePipelineStatus('takePicture');
-              const mo = await self.cameraDevice.takePicture({
-                reason: 'event',
-              });
-              updatePipelineStatus('converting image');
-              image = await sdk.mediaManager.convertMediaObject(mo, ScryptedMimeTypes.Image);
-            }
-            catch (e) {
-              self.console.error('Video analysis snapshot failed. Will retry in a moment.');
-              await sleeper();
-              continue;
-            }
+    const destination: MediaStreamDestination = this.hasMotionType ? 'low-resolution' : 'local-recorder';
+    const videoFrameGenerator = systemManager.getDeviceById<VideoFrameGenerator>(frameGenerator);
+    if (!videoFrameGenerator)
+      throw new Error('invalid VideoFrameGenerator');
+    if (!options?.suppress)
+      this.console.log(videoFrameGenerator.name, '+', this.objectDetection.name);
+    updatePipelineStatus('getVideoStream');
+    const stream = await this.cameraDevice.getVideoStream({
+      prebuffer: this.model.prebuffer,
+      destination,
+      // ask rebroadcast to mute audio, not needed.
+      audio: null,
+    });
+    updatePipelineStatus('generateVideoFrames');
 
-            // self.console.log('yield')
-            updatePipelineStatus('processing image');
-            yield {
-              __json_copy_serialize_children: true,
-              timestamp: now,
-              queued: 0,
-              flush,
-              image,
-            };
-            // self.console.log('done yield')
-            await sleeper();
-          }
-        }
-        finally {
-          self.console.log('Snapshot generation finished.');
-        }
-      })();
-    }
-    else {
-      const destination: MediaStreamDestination = this.hasMotionType ? 'low-resolution' : 'local-recorder';
-      const videoFrameGenerator = systemManager.getDeviceById<VideoFrameGenerator>(frameGenerator);
-      if (!videoFrameGenerator)
-        throw new Error('invalid VideoFrameGenerator');
-      if (!options?.suppress)
-        this.console.log(videoFrameGenerator.name, '+', this.objectDetection.name);
-      updatePipelineStatus('getVideoStream');
-      const stream = await this.cameraDevice.getVideoStream({
-        prebuffer: this.model.prebuffer,
-        destination,
-        // ask rebroadcast to mute audio, not needed.
-        audio: null,
+    try {
+      return await videoFrameGenerator.generateVideoFrames(stream, {
+        queue: 0,
+        fps: this.hasMotionType ? 4 : undefined,
+        // this seems to be unused now?
+        resize: this.model?.inputSize ? {
+          width: this.model.inputSize[0],
+          height: this.model.inputSize[1],
+        } : undefined,
+        // this seems to be unused now?
+        format: this.model?.inputFormat,
       });
-      updatePipelineStatus('generateVideoFrames');
-
-      try {
-        return await videoFrameGenerator.generateVideoFrames(stream, {
-          queue: 0,
-          fps: this.hasMotionType ? 4 : undefined,
-          // this seems to be unused now?
-          resize: this.model?.inputSize ? {
-            width: this.model.inputSize[0],
-            height: this.model.inputSize[1],
-          } : undefined,
-          // this seems to be unused now?
-          format: this.model?.inputFormat,
-        });
-      }
-      finally {
-        updatePipelineStatus('waiting first result');
-      }
+    }
+    finally {
+      updatePipelineStatus('waiting first result');
     }
   }
 
   async runPipelineAnalysis(signal: Deferred<void>, options: {
-    snapshotPipeline: boolean,
     suppress?: boolean,
   }) {
     const start = Date.now();
@@ -428,7 +369,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
 
     let longObjectDetectionWarning = false;
 
-    const frameGenerator = this.getCurrentFrameGenerator(options.snapshotPipeline);
+    const frameGenerator = this.getCurrentFrameGenerator();
     for await (const detected of
       await sdk.connectRPCObject(
         await this.objectDetection.generateObjectDetections(
@@ -687,21 +628,17 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
   }
 
   get frameGenerator() {
-    const frameGenerator = this.storageSettings.values.newPipeline as string || 'Default';
-    if (frameGenerator === 'Snapshot')
-      return frameGenerator;
-
-    if (frameGenerator === 'Default' && !this.hasMotionType && os.cpus().length < 4) {
-      this.console.log('Less than 4 processors detected. Defaulting to snapshot mode.');
-      return 'Snapshot';
-    }
+    let frameGenerator = this.storageSettings.values.newPipeline as string;
+    if (frameGenerator === 'Default')
+      frameGenerator = this.plugin.storageSettings.values.defaultDecoder || 'Default';
 
     const pipelines = getAllDevices().filter(d => d.interfaces.includes(ScryptedInterface.VideoFrameGenerator));
-    const webcodec = process.env.SCRYPTED_INSTALL_ENVIRONMENT === 'electron' ? pipelines.find(p => p.nativeId === 'webcodec') : undefined;
-    const gstreamer = pipelines.find(p => p.nativeId === 'gstreamer');
-    const libav = pipelines.find(p => p.nativeId === 'libav');
-    const ffmpeg = pipelines.find(p => p.nativeId === 'ffmpeg');
-    const use = pipelines.find(p => p.name === frameGenerator) || webcodec || gstreamer || libav || ffmpeg;
+    const webcodec = process.env.SCRYPTED_INSTALL_ENVIRONMENT === 'electron' ? sdk.systemManager.getDeviceById('@scrypted/electron-core', 'webcodec') : undefined;
+    const webassembly = sdk.systemManager.getDeviceById('@scrypted/nvr', 'decoder') || undefined;
+    const gstreamer = sdk.systemManager.getDeviceById('@scrypted/python-codecs', 'gstreamer') || undefined;
+    const libav = sdk.systemManager.getDeviceById('@scrypted/python-codecs', 'libav') || undefined;
+    const ffmpeg = sdk.systemManager.getDeviceById('@scrypted/objectdetector', 'ffmpeg') || undefined;
+    const use = pipelines.find(p => p.name === frameGenerator) || webcodec || webassembly || gstreamer || libav || ffmpeg;
     return use.id;
   }
 
@@ -860,7 +797,6 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
     }
 
     if (key === 'analyzeButton') {
-      // await this.snapshotDetection();
       this.startPipelineAnalysis();
       this.analyzeStop = Date.now() + 60000;
     }
@@ -960,7 +896,7 @@ interface ObjectDetectionStatistics {
   sampleTime: number;
 }
 
-class ObjectDetectionPlugin extends AutoenableMixinProvider implements Settings, DeviceProvider {
+class ObjectDetectionPlugin extends AutoenableMixinProvider implements Settings, DeviceProvider, DeviceCreator {
   currentMixins = new Set<ObjectDetectorMixin>();
   objectDetectionStatistics = new Map<number, ObjectDetectionStatistics>();
   statsSnapshotTime: number;
@@ -1022,38 +958,27 @@ class ObjectDetectionPlugin extends AutoenableMixinProvider implements Settings,
         return value;
       },
     },
+    defaultDecoder: {
+      group: 'Advanced',
+      onGet: async () => {
+        const choices = [
+          'Default',
+          ...getAllDevices().filter(d => d.interfaces.includes(ScryptedInterface.VideoFrameGenerator)).map(d => d.name),
+        ];
+        return {
+          choices,
+        }
+      },
+      defaultValue: 'Default',
+    },
     developerMode: {
       group: 'Advanced',
       title: 'Developer Mode',
       description: 'Developer mode enables usage of the raw detector object detectors. Using raw object detectors (ie, outside of Scrypted NVR) can cause severe performance degradation.',
       type: 'boolean',
-    }
+    },
   });
-
-  shouldUseSnapshotPipeline() {
-    this.pruneOldStatistics();
-
-    // deprecated in favor of object detection session eviction.
-    return false;
-
-    // never use snapshot mode if its a single camera.
-    if (this.statsSnapshotConcurrent < 2)
-      return false;
-
-    // find any concurrent cameras with as many or more that had passable results
-    for (const [k, v] of this.objectDetectionStatistics.entries()) {
-      if (v.dps > 2 && k >= this.statsSnapshotConcurrent)
-        return false;
-    }
-
-    // find any concurrent camera with less or as many that had struggle bus
-    for (const [k, v] of this.objectDetectionStatistics.entries()) {
-      if (v.dps < 2 && k <= this.statsSnapshotConcurrent)
-        return true;
-    }
-
-    return false;
-  }
+  devices = new Map<string, any>();
 
   pruneOldStatistics() {
     const now = Date.now();
@@ -1119,8 +1044,8 @@ class ObjectDetectionPlugin extends AutoenableMixinProvider implements Settings,
     }
   }
 
-  objectDetectionEnded(console: Console, snapshotPipeline: boolean) {
-    this.resetStats(console, snapshotPipeline);
+  objectDetectionEnded(console: Console) {
+    this.resetStats(console);
 
     this.statsSnapshotConcurrent--;
 
@@ -1133,7 +1058,7 @@ class ObjectDetectionPlugin extends AutoenableMixinProvider implements Settings,
     }
   }
 
-  resetStats(console: Console, snapshotPipeline?: boolean) {
+  resetStats(console: Console) {
     const now = Date.now();
     const concurrentSessions = this.statsSnapshotConcurrent;
     if (concurrentSessions) {
@@ -1144,9 +1069,7 @@ class ObjectDetectionPlugin extends AutoenableMixinProvider implements Settings,
       };
 
       // ignore short sessions and sessions with no detections (busted?).
-      // also ignore snapshot sessions because that will skew/throttle the stats used
-      // to determine system dps capabilities.
-      if (duration > 10000 && this.statsSnapshotDetections && !snapshotPipeline)
+      if (duration > 10000 && this.statsSnapshotDetections)
         this.objectDetectionStatistics.set(concurrentSessions, stats);
 
       this.pruneOldStatistics();
@@ -1164,27 +1087,34 @@ class ObjectDetectionPlugin extends AutoenableMixinProvider implements Settings,
     super(nativeId, 'v5');
 
     process.nextTick(() => {
-      sdk.deviceManager.onDevicesChanged({
-        devices: [
-          {
-            name: 'FFmpeg Frame Generator',
-            type: ScryptedDeviceType.Builtin,
-            interfaces: [
-              ScryptedInterface.VideoFrameGenerator,
-            ],
-            nativeId: 'ffmpeg',
-          }
-        ]
+      sdk.deviceManager.onDeviceDiscovered({
+        name: 'FFmpeg Frame Generator',
+        type: ScryptedDeviceType.Builtin,
+        interfaces: [
+          ScryptedInterface.VideoFrameGenerator,
+        ],
+        nativeId: 'ffmpeg',
       })
     })
   }
 
   async getDevice(nativeId: string): Promise<any> {
+    let ret: any;
     if (nativeId === 'ffmpeg')
-      return new FFmpegVideoFrameGenerator('ffmpeg');
+      ret = this.devices.get(nativeId) || new FFmpegVideoFrameGenerator('ffmpeg');
+    if (nativeId?.startsWith(SMART_MOTIONSENSOR_PREFIX))
+      ret = this.devices.get(nativeId) || new SmartMotionSensor(nativeId);
+
+    if (ret)
+      this.devices.set(nativeId, ret);
+    return ret;
   }
 
   async releaseDevice(id: string, nativeId: string): Promise<void> {
+    if (nativeId?.startsWith(SMART_MOTIONSENSOR_PREFIX)) {
+      const smart = this.devices.get(nativeId) as SmartMotionSensor;
+      smart?.listener?.removeListener();
+    }
   }
 
   getSettings(): Promise<Setting[]> {
@@ -1216,6 +1146,35 @@ class ObjectDetectionPlugin extends AutoenableMixinProvider implements Settings,
     this.currentMixins.delete(mixinDevice);
     return mixinDevice.release();
   }
+
+  async getCreateDeviceSettings(): Promise<Setting[]> {
+    return [
+      createObjectDetectorStorageSetting(),
+    ];
+  }
+
+  async createDevice(settings: DeviceCreatorSettings): Promise<string> {
+    const nativeId = SMART_MOTIONSENSOR_PREFIX + crypto.randomBytes(8).toString('hex');
+    const objectDetector = sdk.systemManager.getDeviceById(settings.objectDetector as string);
+    let name = objectDetector.name || 'New';
+    name += ' Smart Motion Sensor'
+
+    const id = await sdk.deviceManager.onDeviceDiscovered({
+      nativeId,
+      name,
+      type: ScryptedDeviceType.Sensor,
+      interfaces: [
+        ScryptedInterface.MotionSensor,
+        ScryptedInterface.Settings,
+        ScryptedInterface.Readme,
+      ]
+    });
+
+    const sensor = new SmartMotionSensor(nativeId);
+    sensor.storageSettings.values.objectDetector = objectDetector?.id;
+
+    return id;
+  }
 }
 
 export default ObjectDetectionPlugin;

plugins/objectdetector/src/performance-profile.ts

@@ -28,5 +28,5 @@ export function getMaxConcurrentObjectDetectionSessions() {
     // the total mhz would be 10000 in this case.
     // observed idle per cpu speed is 800.
     // not sure how hyperthreading plays into this.
-    return Math.max(2, totalGigahertz / 4000);
+    return Math.max(2, Math.round(totalGigahertz / 4000));
 }

plugins/objectdetector/src/smart-motionsensor.ts

@@ -0,0 +1,117 @@
+import sdk, { EventListenerRegister, MotionSensor, ObjectDetector, ObjectsDetected, Readme, ScryptedDevice, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedNativeId, Setting, SettingValue, Settings } from "@scrypted/sdk";
+import { StorageSetting, StorageSettings } from "@scrypted/sdk/storage-settings";
+
+export const SMART_MOTIONSENSOR_PREFIX = 'smart-motionsensor-';
+
+export function createObjectDetectorStorageSetting(): StorageSetting {
+    return {
+        key: 'objectDetector',
+        title: 'Object Detector',
+        description: 'Select the camera or doorbell that provides smart detection event.',
+        type: 'device',
+        deviceFilter: `(type === '${ScryptedDeviceType.Doorbell}' || type === '${ScryptedDeviceType.Camera}') && interfaces.includes('${ScryptedInterface.ObjectDetector}')`,
+    };
+}
+
+export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, Readme, MotionSensor {
+    storageSettings = new StorageSettings(this, {
+        objectDetector: createObjectDetectorStorageSetting(),
+        detections: {
+            title: 'Detections',
+            description: 'The detections that will trigger this smart motion sensor.',
+            multiple: true,
+            choices: [],
+        },
+        detectionTimeout: {
+            title: 'Object Detection Timeout',
+            description: 'Duration in seconds the sensor will report motion, before resetting.',
+            type: 'number',
+            defaultValue: 60,
+        },
+    });
+    listener: EventListenerRegister;
+    timeout: NodeJS.Timeout;
+
+    constructor(nativeId?: ScryptedNativeId) {
+        super(nativeId);
+
+        this.storageSettings.settings.detections.onGet = async () => {
+            const objectDetector: ObjectDetector = this.storageSettings.values.objectDetector;
+            const choices = (await objectDetector?.getObjectTypes())?.classes || [];
+            return {
+                hide: !objectDetector,
+                choices,
+            };
+        };
+
+        this.storageSettings.settings.detections.onPut = () => this.rebind();
+
+        this.storageSettings.settings.objectDetector.onPut = () => this.rebind();
+
+        this.rebind();
+    }
+
+    resetTrigger() {
+        clearTimeout(this.timeout);
+        this.timeout = undefined;
+    }
+
+    trigger() {
+        this.resetTrigger();
+        const duration: number = this.storageSettings.values.detectionTimeout;
+        this.motionDetected = true;
+        this.timeout = setTimeout(() => {
+            this.motionDetected = false;
+        }, duration * 1000);
+    }
+
+    rebind() {
+        this.motionDetected = false;
+        this.listener?.removeListener();
+        this.listener = undefined;
+        this.resetTrigger();
+
+
+        const objectDetector: ObjectDetector & ScryptedDevice = this.storageSettings.values.objectDetector;
+        if (!objectDetector)
+            return;
+
+        const detections: string[] = this.storageSettings.values.detections;
+        if (!detections?.length)
+            return;
+
+
+        const console = sdk.deviceManager.getMixinConsole(objectDetector.id, this.nativeId);
+
+        this.listener = objectDetector.listen(ScryptedInterface.ObjectDetector, (source, details, data) => {
+            const detected: ObjectsDetected = data;
+            const match = detected.detections?.find(d => {
+                if (!detections.includes(d.className))
+                    return false;
+                if (!d.movement)
+                    return true;
+                return d.movement.moving;
+            })
+            if (match) {
+                if (!this.motionDetected)
+                    console.log('Smart Motion Sensor triggered on', match);
+                this.trigger();
+            }
+        });
+    }
+
+    async getSettings(): Promise<Setting[]> {
+        return this.storageSettings.getSettings();
+    }
+
+    putSetting(key: string, value: SettingValue): Promise<void> {
+        return this.storageSettings.putSetting(key, value);
+    }
+
+    async getReadmeMarkdown(): Promise<string> {
+        return `
+## Smart Motion Sensor
+
+This Smart Motion Sensor can trigger when a specific type of object (car, person, dog, etc) triggers movement on a camera. The sensor can then be synced to other platforms such as HomeKit, Google Home, Alexa, or Home Assistant for use in automations. This Sensor requires a camera with hardware or software object detection capability.`;
+    }
+}

plugins/onvif/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/onvif",
-   "version": "0.0.124",
+   "version": "0.0.127",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/onvif",
-         "version": "0.0.124",
+         "version": "0.0.127",
          "license": "Apache",
          "dependencies": {
             "@koush/axios-digest-auth": "^0.8.5",

plugins/onvif/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/onvif",
-   "version": "0.0.124",
+   "version": "0.0.127",
    "description": "ONVIF Camera Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

plugins/onvif/src/onvif-intercom.ts

@@ -8,65 +8,8 @@ import { nextSequenceNumber } from "../../homekit/src/types/camera/jitter-buffer
 import { RtspSmartCamera } from "../../rtsp/src/rtsp";
 import { startRtpForwarderProcess } from '../../webrtc/src/rtp-forwarders';
 
-
 const { mediaManager } = sdk;
 
-interface SupportedCodec {
-    ffmpegCodec: string;
-    sdpName: string;
-}
-
-const supportedCodecs: SupportedCodec[] = [];
-function addSupportedCodec(ffmpegCodec: string, sdpName: string) {
-    supportedCodecs.push({
-        ffmpegCodec,
-        sdpName,
-    });
-}
-
-// a=rtpmap:97 L16/8000
-// a=rtpmap:100 L16/16000
-// a=rtpmap:101 L16/48000
-// a=rtpmap:8 PCMA/8000
-// a=rtpmap:102 PCMA/16000
-// a=rtpmap:103 PCMA/48000
-// a=rtpmap:0 PCMU/8000
-// a=rtpmap:104 PCMU/16000
-// a=rtpmap:105 PCMU/48000
-// a=rtpmap:106 /0
-// a=rtpmap:107 /0
-// a=rtpmap:108 /0
-// a=rtpmap:109 MPEG4-GENERIC/8000
-// a=rtpmap:110 MPEG4-GENERIC/16000
-// a=rtpmap:111 MPEG4-GENERIC/48000
-
-// this order is irrelevant, the order of preference is the sdp.
-addSupportedCodec('pcm_mulaw', 'PCMU');
-addSupportedCodec('pcm_alaw', 'PCMA');
-addSupportedCodec('pcm_s16be', 'L16');
-addSupportedCodec('adpcm_g726', 'G726');
-addSupportedCodec('aac', 'MPEG4-GENERIC');
-
-interface CodecMatch {
-    payloadType: string;
-    sdpName: string;
-    sampleRate: string;
-    channels: string;
-}
-
-const codecRegex = /a=rtpmap:\s*(\d+) (.*?)\/(\d+)/g
-function* parseCodecs(audioSection: string): Generator<CodecMatch> {
-    for (const match of audioSection.matchAll(codecRegex)) {
-        const [_, payloadType, sdpName, sampleRate, _skip, channels] = match;
-        yield {
-            payloadType,
-            sdpName,
-            sampleRate,
-            channels,
-        }
-    }
-}
-
 const Require = 'www.onvif.org/ver20/backchannel';
 
 export class OnvifIntercom implements Intercom {
@@ -153,18 +96,10 @@ export class OnvifIntercom implements Intercom {
         }
         this.camera.console.log('backchannel transport', transportDict);
 
-        const availableCodecs = [...parseCodecs(audioBackchannel.contents)];
-        let match: CodecMatch;
-        let codec: SupportedCodec;
-        for (const supported of availableCodecs) {
-            codec = supportedCodecs.find(check => check.sdpName?.toLowerCase() === supported.sdpName.toLowerCase());
-            if (codec) {
-                match = supported;
-                break;
-            }
-        }
+        const availableMatches = audioBackchannel.rtpmaps.filter(rtpmap => rtpmap.ffmpegEncoder);
+        const defaultMatch = audioBackchannel.rtpmaps.find(rtpmap => rtpmap.ffmpegEncoder);
 
-        if (!match)
+        if (!defaultMatch)
             throw new Error('no supported codec was found for back channel');
 
         let ssrcBuffer: Buffer;
@@ -178,7 +113,7 @@ export class OnvifIntercom implements Intercom {
         const ssrc = ssrcBuffer.readInt32BE(0);
         const ssrcUnsigned = ssrcBuffer.readUint32BE(0);
 
-        const payloadType = parseInt(match.payloadType);
+        let { payloadType } = defaultMatch;
 
         await intercomClient.play({
             Require,
@@ -189,16 +124,25 @@ export class OnvifIntercom implements Intercom {
 
         const forwarder = await startRtpForwarderProcess(this.camera.console, ffmpegInput, {
             audio: {
-                onRtp: (rtp) => {
-                    // if (true) {
-                    //     const p = RtpPacket.deSerialize(rtp);
-                    //     p.header.payloadType = payloadType;
-                    //     p.header.ssrc = ssrcUnsigned;
-                    //     p.header.marker = true;
-                    //     rtpServer.server.send(p.serialize(), serverRtp, ip);
-                    //     return;
-                    // }
+                negotiate: async msection => {
+                    const check = msection.rtpmap;
+                    const channels = check.channels || 1;
 
+                    return !!availableMatches.find(rtpmap => {
+                        if (check.codec !== rtpmap.codec)
+                            return false;
+                        if (channels !== (rtpmap.channels || 1))
+                            return false;
+                        if (check.clock !== rtpmap.clock)
+                            return false;
+                        payloadType = check.payloadType;
+                        // this default check should maybe be in sdp-utils.ts.
+                        if (payloadType === undefined)
+                            payloadType = 8;
+                        return true;
+                    });
+                },
+                onRtp: rtp => {
                     const p = RtpPacket.deSerialize(rtp);
 
                     if (!pending) {
@@ -206,7 +150,8 @@ export class OnvifIntercom implements Intercom {
                         return;
                     }
 
-                    if (pending.payload.length + p.payload.length < 1024) {
+                    const elapsedRtpTimeMs = Math.abs(pending.header.timestamp - p.header.timestamp) / 8000 * 1000;
+                    if (elapsedRtpTimeMs <= 60) {
                         pending.payload = Buffer.concat([pending.payload, p.payload]);
                         return;
                     }
@@ -224,26 +169,26 @@ export class OnvifIntercom implements Intercom {
 
                     pending = p;
                 },
-                codecCopy: codec.ffmpegCodec,
+                codecCopy: 'ffmpeg',
                 payloadType,
                 ssrc,
                 packetSize: 1024,
                 encoderArguments: [
-                    '-acodec', codec.ffmpegCodec,
-                    '-ar', match.sampleRate,
-                    '-ac', match.channels || '1',
+                    '-acodec', defaultMatch.ffmpegEncoder,
+                    '-ar', defaultMatch.clock.toString(),
+                    '-ac', defaultMatch.channels?.toString() || '1',
                 ],
             }
         });
 
         intercomClient.client.on('close', () => forwarder.kill());
-        forwarder.killPromise.finally(() => intercomClient?.client.destroy());
+        forwarder.killPromise.finally(() => intercomClient.safeTeardown());
 
         this.camera.console.log('intercom playing');
     }
 
     async stopIntercom() {
-        this.intercomClient?.client?.destroy();
+        this.intercomClient?.safeTeardown();
         this.intercomClient = undefined;
     }
 }

plugins/openvino/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/openvino",
-   "version": "0.1.42",
+   "version": "0.1.45",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/openvino",
-         "version": "0.1.42",
+         "version": "0.1.45",
          "devDependencies": {
             "@scrypted/sdk": "file:../../sdk"
          }

plugins/openvino/package.json

@@ -42,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.42"
+   "version": "0.1.45"
 }

plugins/openvino/src/ov/__init__.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import asyncio
-import concurrent.futures
 import json
 import re
 from typing import Any, Tuple
@@ -96,6 +94,7 @@ class OpenVINOPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.S
 
         try:
             self.compiled_model = self.core.compile_model(xmlFile, mode)
+            print("EXECUTION_DEVICES", self.compiled_model.get_property("EXECUTION_DEVICES"))
         except:
             import traceback
             traceback.print_exc()
@@ -114,8 +113,6 @@ class OpenVINOPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.S
         labels_contents = open(labelsFile, 'r').read()
         self.labels = parse_label_contents(labels_contents)
 
-        self.executor = concurrent.futures.ThreadPoolExecutor(max_workers=1, thread_name_prefix="openvino", )
-
     async def getSettings(self) -> list[Setting]:
         mode = self.storage.getItem('mode') or 'Default'
         model = self.storage.getItem('model') or 'Default'
@@ -154,6 +151,7 @@ class OpenVINOPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.S
                     'GPU',
                 ],
                 'value': mode,
+                'combobox': True,
             },
             {
                 'key': 'precision',
@@ -181,7 +179,7 @@ class OpenVINOPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.S
         return [self.model_dim, self.model_dim]
 
     async def detect_once(self, input: Image.Image, settings: Any, src_size, cvss):
-        def predict():
+        async def predict():
             infer_request = self.compiled_model.create_infer_request()
             # the input_tensor can be created with the shared_memory=True parameter,
             # but that seems to cause issues on some platforms.
@@ -259,7 +257,7 @@ class OpenVINOPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.S
             return objs
 
         try:
-            objs = await asyncio.get_event_loop().run_in_executor(self.executor, predict)
+            objs = await predict()
         except:
             import traceback
             traceback.print_exc()

plugins/openvino/src/requirements.txt

@@ -1,4 +1,4 @@
-openvino==2023.0.1
+openvino==2023.0.2
 
 # pillow for anything not intel linux, pillow-simd is available on x64 linux
 Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'

plugins/prebuffer-mixin/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/prebuffer-mixin",
-   "version": "0.9.99",
+   "version": "0.9.101",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/prebuffer-mixin",
-         "version": "0.9.99",
+         "version": "0.9.101",
          "license": "Apache-2.0",
          "dependencies": {
             "@scrypted/common": "file:../../common",

plugins/prebuffer-mixin/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/prebuffer-mixin",
-   "version": "0.9.99",
+   "version": "0.9.101",
    "description": "Video Stream Rebroadcast, Prebuffer, and Management Plugin for Scrypted.",
    "author": "Scrypted",
    "license": "Apache-2.0",

plugins/prebuffer-mixin/src/file-rtsp-server.ts

@@ -5,6 +5,7 @@ import path from 'path';
 import { Duplex } from "stream";
 
 const highWaterMark = 1024 * 1024;
+const bufferOverflow = 100 * 1024 * 1024;
 
 // non standard extension that dumps the rtp payload to a file.
 export class FileRtspServer extends RtspServer {
@@ -99,6 +100,12 @@ export class FileRtspServer extends RtspServer {
             return super.writeRtpPayload(header, rtp);
 
         this.segmentBytesWritten += header.length + rtp.length;
+        if (this.writeStream.writableLength > bufferOverflow) {
+            this.writeConsole?.error('RTSP WRITE overflowed.');
+            this.cleanup();
+            this.client?.destroy();
+            return;
+        }
         this.writeStream.write(header);
         return this.writeStream.write(rtp);
     }

plugins/python-codecs/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.85",
+   "version": "0.1.92",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/python-codecs",
-         "version": "0.1.85",
+         "version": "0.1.92",
          "devDependencies": {
             "@scrypted/sdk": "file:../../sdk"
          }

plugins/python-codecs/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.85",
+   "version": "0.1.92",
    "description": "Python Codecs for Scrypted",
    "keywords": [
       "scrypted",