Update package.json

client: Fix cors credentials
server: update lockfile
2026-02-06 23:42:19 +00:00 · 2024-01-12 16:37:55 -08:00 · 2024-01-12 15:51:06 -08:00 · 2024-01-12 15:39:29 -08:00 · 2024-01-12 15:13:29 -08:00 · 2024-01-12 09:27:04 -08:00
64 changed files with 1811 additions and 1070 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "plugins/tensorflow/face-api.js"]
 	path = external/face-api.js
 	url = ../../koush/face-api.js
-[submodule "external/axios-digest-auth"]
-	path = external/axios-digest-auth
-	url = ../../koush/axios-digest-auth
 [submodule "external/scrypted-ffmpeg"]
 	path = external/scrypted-ffmpeg
 	url = ../../koush/scrypted-ffmpeg
--- a/common/package-lock.json
+++ b/common/package-lock.json
@@ -11,12 +11,11 @@
      "dependencies": {
        "@scrypted/sdk": "file:../sdk",
        "@scrypted/server": "file:../server",
-        "http-auth-utils": "^3.0.2",
-        "node-fetch-commonjs": "^3.1.1",
+        "http-auth-utils": "^5.0.1",
        "typescript": "^5.3.3"
      },
      "devDependencies": {
-        "@types/node": "^20.10.8",
+        "@types/node": "^20.11.0",
        "ts-node": "^10.9.2"
      }
    },
@@ -80,7 +79,7 @@
      "dependencies": {
        "@babel/preset-typescript": "^7.18.6",
        "adm-zip": "^0.4.13",
-        "axios": "^0.21.4",
+        "axios": "^1.6.5",
        "babel-loader": "^9.1.0",
        "babel-plugin-const-enum": "^1.1.0",
        "esbuild": "^0.15.9",
@@ -112,7 +111,7 @@
    },
    "../server": {
      "name": "@scrypted/server",
-      "version": "0.81.0",
+      "version": "0.82.0",
      "license": "ISC",
      "dependencies": {
        "@mapbox/node-pre-gyp": "^1.0.11",
@@ -242,9 +241,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "20.10.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz",
-      "integrity": "sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==",
+      "version": "20.11.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
+      "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
      "dev": true,
      "dependencies": {
        "undici-types": "~5.26.4"
@@ -292,48 +291,15 @@
        "node": ">=0.3.1"
      }
    },
-    "node_modules/fetch-blob": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.4.tgz",
-      "integrity": "sha512-Eq5Xv5+VlSrYWEqKrusxY1C3Hm/hjeAsCGVG3ft7pZahlUAChpGZT/Ms1WmSLnEAisEXszjzu/s+ce6HZB2VHA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "dependencies": {
-        "node-domexception": "^1.0.0",
-        "web-streams-polyfill": "^3.0.3"
-      },
-      "engines": {
-        "node": "^12.20 || >= 14.13"
-      }
-    },
-    "node_modules/formdata-polyfill": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
-      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-      "dependencies": {
-        "fetch-blob": "^3.1.2"
-      },
-      "engines": {
-        "node": ">=12.20.0"
-      }
-    },
    "node_modules/http-auth-utils": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-3.0.2.tgz",
-      "integrity": "sha512-cQ8957aiUX0lgV1620uIGKGJc0sEuD/QK4ueZ0hb60MGbO0f6ahcuIgPjamAD98D/AUGizKVm+dNvUVHs0f4Ow==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-5.0.1.tgz",
+      "integrity": "sha512-YPiLVYdwpBEWB85iWYg7V/ZW3mBfPLCTFQWEiPAA5CKXHJOAPbnJ0xDHLiE6KbPRvrYCwLuWqTG0fLfXVjMUcQ==",
      "dependencies": {
-        "yerror": "^6.0.0"
+        "yerror": "^8.0.0"
      },
      "engines": {
-        "node": ">=12.19.0"
+        "node": ">=18.16.0"
      }
    },
    "node_modules/make-error": {
@@ -342,40 +308,6 @@
      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
      "dev": true
    },
-    "node_modules/node-domexception": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "github",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "engines": {
-        "node": ">=10.5.0"
-      }
-    },
-    "node_modules/node-fetch-commonjs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/node-fetch-commonjs/-/node-fetch-commonjs-3.1.1.tgz",
-      "integrity": "sha512-TgkdVJdiEaauzWwB9NoD4TvHZFtG6KKEffvotWf9WNIyoRZHsCFjGfb3bhkIXrMt3YFgFi8ZApbwWoe1h3XTpA==",
-      "dependencies": {
-        "formdata-polyfill": "^4.0.10",
-        "web-streams-polyfill": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/node-fetch"
-      }
-    },
    "node_modules/ts-node": {
      "version": "10.9.2",
      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
@@ -443,20 +375,12 @@
      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
      "dev": true
    },
-    "node_modules/web-streams-polyfill": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz",
-      "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
    "node_modules/yerror": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/yerror/-/yerror-6.2.1.tgz",
-      "integrity": "sha512-WPZgybhCBzsMSSqGYBnj20NZo4FiFKQG0+i/21cYGVd4B7eYtvYDOpjk/0e8UM1eVHJ+4Ja6bZ7TAjHH6mk+ew==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/yerror/-/yerror-8.0.0.tgz",
+      "integrity": "sha512-FemWD5/UqNm8ffj8oZIbjWXIF2KE0mZssggYpdaQkWDDgXBQ/35PNIxEuz6/YLn9o0kOxDBNJe8x8k9ljD7k/g==",
      "engines": {
-        "node": ">=12.19.0"
+        "node": ">=18.16.0"
      }
    },
    "node_modules/yn": {
@@ -508,7 +432,7 @@
        "@types/node": "^18.11.18",
        "@types/stringify-object": "^4.0.0",
        "adm-zip": "^0.4.13",
-        "axios": "^0.21.4",
+        "axios": "^1.6.5",
        "babel-loader": "^9.1.0",
        "babel-plugin-const-enum": "^1.1.0",
        "esbuild": "^0.15.9",
@@ -603,9 +527,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "20.10.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz",
-      "integrity": "sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==",
+      "version": "20.11.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
+      "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
      "dev": true,
      "requires": {
        "undici-types": "~5.26.4"
@@ -641,29 +565,12 @@
      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
      "dev": true
    },
-    "fetch-blob": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.4.tgz",
-      "integrity": "sha512-Eq5Xv5+VlSrYWEqKrusxY1C3Hm/hjeAsCGVG3ft7pZahlUAChpGZT/Ms1WmSLnEAisEXszjzu/s+ce6HZB2VHA==",
-      "requires": {
-        "node-domexception": "^1.0.0",
-        "web-streams-polyfill": "^3.0.3"
-      }
-    },
-    "formdata-polyfill": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
-      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-      "requires": {
-        "fetch-blob": "^3.1.2"
-      }
-    },
    "http-auth-utils": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-3.0.2.tgz",
-      "integrity": "sha512-cQ8957aiUX0lgV1620uIGKGJc0sEuD/QK4ueZ0hb60MGbO0f6ahcuIgPjamAD98D/AUGizKVm+dNvUVHs0f4Ow==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-5.0.1.tgz",
+      "integrity": "sha512-YPiLVYdwpBEWB85iWYg7V/ZW3mBfPLCTFQWEiPAA5CKXHJOAPbnJ0xDHLiE6KbPRvrYCwLuWqTG0fLfXVjMUcQ==",
      "requires": {
-        "yerror": "^6.0.0"
+        "yerror": "^8.0.0"
      }
    },
    "make-error": {
@@ -672,20 +579,6 @@
      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
      "dev": true
    },
-    "node-domexception": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
-    },
-    "node-fetch-commonjs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/node-fetch-commonjs/-/node-fetch-commonjs-3.1.1.tgz",
-      "integrity": "sha512-TgkdVJdiEaauzWwB9NoD4TvHZFtG6KKEffvotWf9WNIyoRZHsCFjGfb3bhkIXrMt3YFgFi8ZApbwWoe1h3XTpA==",
-      "requires": {
-        "formdata-polyfill": "^4.0.10",
-        "web-streams-polyfill": "^3.1.1"
-      }
-    },
    "ts-node": {
      "version": "10.9.2",
      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
@@ -724,15 +617,10 @@
      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
      "dev": true
    },
-    "web-streams-polyfill": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz",
-      "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA=="
-    },
    "yerror": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/yerror/-/yerror-6.2.1.tgz",
-      "integrity": "sha512-WPZgybhCBzsMSSqGYBnj20NZo4FiFKQG0+i/21cYGVd4B7eYtvYDOpjk/0e8UM1eVHJ+4Ja6bZ7TAjHH6mk+ew=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/yerror/-/yerror-8.0.0.tgz",
+      "integrity": "sha512-FemWD5/UqNm8ffj8oZIbjWXIF2KE0mZssggYpdaQkWDDgXBQ/35PNIxEuz6/YLn9o0kOxDBNJe8x8k9ljD7k/g=="
    },
    "yn": {
      "version": "3.1.1",
--- a/common/package.json
+++ b/common/package.json
@@ -13,12 +13,11 @@
  "dependencies": {
    "@scrypted/sdk": "file:../sdk",
    "@scrypted/server": "file:../server",
-    "http-auth-utils": "^3.0.2",
-    "node-fetch-commonjs": "^3.1.1",
+    "http-auth-utils": "^5.0.1",
    "typescript": "^5.3.3"
  },
  "devDependencies": {
-    "@types/node": "^20.10.8",
+    "@types/node": "^20.11.0",
    "ts-node": "^10.9.2"
  }
 }
--- a/common/src/eval/scrypted-eval.ts
+++ b/common/src/eval/scrypted-eval.ts
@@ -1,12 +1,8 @@
-import type { TranspileOptions } from "typescript";
-import sdk, { ScryptedDeviceBase, MixinDeviceBase, ScryptedInterface, ScryptedDeviceType } from "@scrypted/sdk";
-import vm from "vm";
+import sdk, { MixinDeviceBase, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedInterfaceDescriptors } from "@scrypted/sdk";
 import fs from 'fs';
+import type { TranspileOptions } from "typescript";
+import vm from "vm";
 import { ScriptDevice } from "./monaco/script-device";
-import { ScryptedInterfaceDescriptors } from "@scrypted/sdk";
-import fetch from 'node-fetch-commonjs';
-import { PluginAPIProxy } from '../../../server/src/plugin/plugin-api';
-import { SystemManagerImpl } from '../../../server/src/plugin/system';

 const { systemManager, deviceManager, mediaManager, endpointManager } = sdk;

@@ -61,7 +57,6 @@ export async function scryptedEval(device: ScryptedDeviceBase, script: string, e
    const allParams = Object.assign({}, params, {
        sdk,
        fs: require('realfs'),
-        fetch,
        ScryptedDeviceBase,
        MixinDeviceBase,
        systemManager,
--- a/common/src/http-auth-fetch.ts
+++ b/common/src/http-auth-fetch.ts
@@ -1,117 +1,12 @@
-import { HttpFetchOptions, HttpFetchResponseType, checkStatus, getHttpFetchParser, httpFetch } from '@scrypted/server/src/http-fetch-helpers';
-import crypto from 'crypto';
-import { IncomingMessage } from 'http';
-import { BASIC, DIGEST, buildAuthorizationHeader, parseWWWAuthenticateHeader } from 'http-auth-utils/src/index';
+import { httpFetch, httpFetchParseIncomingMessage } from '../../server/src/fetch/http-fetch';
+import type { IncomingMessage } from 'http';
+import type { Readable } from 'stream';
+import { createAuthFetch } from '../../packages/auth-fetch/src/auth-fetch';

-export interface AuthFetchCredentialState {
-    username: string;
-    password: string;
-    count?: number;
-    digest?: ReturnType<typeof parseWWWAuthenticateHeader<typeof DIGEST>>;
-    basic?: ReturnType<typeof parseWWWAuthenticateHeader<typeof BASIC>>;
-}
+export type { HttpFetchOptions, HttpFetchResponseType } from '../../server/src/fetch/http-fetch';
+export type { AuthFetchCredentialState, AuthFetchOptions } from '../../packages/auth-fetch/src/auth-fetch';

-export interface AuthFetchOptions<T extends HttpFetchResponseType> extends HttpFetchOptions<T> {
-    credential: AuthFetchCredentialState;
-}
-
-function getAuth(options: AuthFetchOptions<any>, method: string) {
-    if (!options.credential)
-        return;
-    const { digest, basic } = options.credential;
-    if (digest) {
-        options.credential.count ||= 0;
-        ++options.credential.count;
-        const nc = ('00000000' + options.credential.count).slice(-8);
-        const cnonce = crypto.randomBytes(24).toString('hex');
-        const uri = new URL(options.url).pathname;
-
-        const response = DIGEST.computeHash({
-            username: options.credential.username,
-            password: options.credential.password,
-            method,
-            uri,
-            nc,
-            cnonce,
-            algorithm: 'MD5',
-            qop: digest.data.qop!,
-            ...digest.data,
-        });
-
-        const header = buildAuthorizationHeader(DIGEST, {
-            username: options.credential.username,
-            uri,
-            nc,
-            cnonce,
-            algorithm: digest.data.algorithm!,
-            qop: digest.data.qop!,
-            response,
-            ...digest.data,
-        });
-
-        return header;
-    }
-    else if (basic) {
-        const header = buildAuthorizationHeader(BASIC, {
-            username: options.credential.username,
-            password: options.credential.password,
-        });
-
-        return header;
-    }
-}
-
-export async function authHttpFetch<T extends HttpFetchResponseType>(options: AuthFetchOptions<T>): ReturnType<typeof httpFetch<AuthFetchOptions<T>>> {
-    const method = options.method || 'GET';
-    const headers = new Headers(options.headers);
-    options.headers = headers;
-
-    const initialHeader = getAuth(options, method);
-    if (initialHeader)
-        headers.set('Authorization', initialHeader);
-
-    const initialResponse = await httpFetch({
-        ...options,
-        ignoreStatusCode: true,
-        responseType: 'readable',
-    });
-
-    const parser = getHttpFetchParser(options.responseType);
-
-    if (initialResponse.statusCode !== 401 || !options.credential) {
-        if (!options?.ignoreStatusCode)
-            checkStatus(initialResponse.statusCode);
-        return {
-            ...initialResponse,
-            body: await parser.parse(initialResponse.body),
-        };
-    }
-
-    let authenticateHeaders: string | string[] = initialResponse.headers['www-authenticate'];
-    if (!authenticateHeaders)
-        throw new Error('Did not find WWW-Authenticate header.');
-
-
-    if (typeof authenticateHeaders === 'string')
-        authenticateHeaders = [authenticateHeaders];
-
-    const parsedHeaders = authenticateHeaders.map(h => parseWWWAuthenticateHeader(h));
-
-    const digest = parsedHeaders.find(p => p.type === 'Digest') as ReturnType<typeof parseWWWAuthenticateHeader<typeof DIGEST>>;
-    const basic = parsedHeaders.find(p => p.type === 'Basic') as ReturnType<typeof parseWWWAuthenticateHeader<typeof BASIC>>;
-
-    options.credential.digest = digest;
-    options.credential.basic = basic;
-
-    if (!digest && !basic)
-        throw new Error(`Unknown WWW-Authenticate type: ${parsedHeaders[0]?.type}`);
-
-    const header = getAuth(options, method);
-    if (header)
-        headers.set('Authorization', header);
-
-    return httpFetch(options);
-}
+export const authHttpFetch = createAuthFetch<Readable, IncomingMessage>(httpFetch, httpFetchParseIncomingMessage);

 function ensureType<T>(v: T) {
 }
@@ -144,5 +39,12 @@ async function test() {
        responseType: 'buffer',
    });
    ensureType<Buffer>(d.body);
+
+    const e = await authHttpFetch({
+        credential: undefined,
+        url: 'http://example.com',
+        responseType: 'text',
+    });
+    ensureType<string>(e.body);
 }

--- a/common/src/rtsp-server.ts
+++ b/common/src/rtsp-server.ts
@@ -1,8 +1,6 @@
 import crypto, { randomBytes } from 'crypto';
 import dgram from 'dgram';
 import { once } from 'events';
-import { BASIC } from 'http-auth-utils/dist/index';
-import { parseHTTPHeadersQuotedKeyValueSet } from 'http-auth-utils/dist/utils';
 import net from 'net';
 import { Duplex, Readable, Writable } from 'stream';
 import tls from 'tls';
@@ -363,7 +361,7 @@ export class RtspClient extends RtspBase {
        }
    }

-    writeRequest(method: string, headers?: Headers, path?: string, body?: Buffer) {
+    async writeRequest(method: string, headers?: Headers, path?: string, body?: Buffer) {
        headers = headers || {};

        let fullUrl = this.url;
@@ -390,7 +388,7 @@ export class RtspClient extends RtspBase {
        headers['User-Agent'] = 'Scrypted';

        if (this.wwwAuthenticate)
-            headers['Authorization'] = this.createAuthorizationHeader(method, new URL(fullUrl));
+            headers['Authorization'] = await this.createAuthorizationHeader(method, new URL(fullUrl));

        if (this.session)
            headers['Session'] = this.session;
@@ -531,10 +529,13 @@ export class RtspClient extends RtspBase {
        }
    }

-    createAuthorizationHeader(method: string, url: URL) {
+    async createAuthorizationHeader(method: string, url: URL) {
        if (!this.wwwAuthenticate)
            throw new Error('no WWW-Authenticate found');

+        const { BASIC } = await import('http-auth-utils');
+        const { parseHTTPHeadersQuotedKeyValueSet } = await import('http-auth-utils/dist/utils');
+
        if (this.wwwAuthenticate.includes('Basic')) {
            const hash = BASIC.computeHash(url);
            return `Basic ${hash}`;
@@ -586,7 +587,7 @@ export class RtspClient extends RtspBase {
    }

    async request(method: string, headers?: Headers, path?: string, body?: Buffer, authenticating?: boolean): Promise<RtspServerResponse> {
-        this.writeRequest(method, headers, path, body);
+        await this.writeRequest(method, headers, path, body);

        const message = this.requestTimeout ? await timeoutPromise(this.requestTimeout, this.readMessage()) : await this.readMessage();
        const statusLine = message[0];
--- a/external/axios-digest-auth
+++ b/external/axios-digest-auth
--- a/install/local/install-scrypted-proxmox.sh
+++ b/install/local/install-scrypted-proxmox.sh
@@ -51,6 +51,15 @@ then
    exit 1
 fi

+pct set $VMID -net0 name=eth0,bridge=vmbr0,ip=dhcp,ip6=auto
+if [ "$?" != "0" ]
+then
+    echo ""
+    echo "pct set network failed"
+    echo ""
+    echo "Ignoring... Please verify your container's network settings."
+fi
+
 CONF=/etc/pve/lxc/$VMID.conf
 if [ -f "$CONF" ]
 then
--- a/packages/auth-fetch/.gitignore
+++ b/packages/auth-fetch/.gitignore
@@ -0,0 +1,11 @@
+node_modules
+.DS_Store
+.gcloud/
+dist/
+volume
+scrypted.db
+out
+scrypted.db.bak
+.exit
+.update
+.venv
--- a/packages/auth-fetch/package-lock.json
+++ b/packages/auth-fetch/package-lock.json
@@ -0,0 +1,580 @@
+{
+  "name": "@scrypted/auth-fetch",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@scrypted/auth-fetch",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "follow-redirects": "^1.15.4",
+        "http-auth-utils": "^5.0.1"
+      },
+      "devDependencies": {
+        "@types/node": "^20.9.4",
+        "rimraf": "^5.0.5",
+        "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.10.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz",
+      "integrity": "sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==",
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.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==",
+      "dev": 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==",
+      "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==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "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==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "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==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "dev": true,
+      "dependencies": {
+        "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/http-auth-utils": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-5.0.1.tgz",
+      "integrity": "sha512-YPiLVYdwpBEWB85iWYg7V/ZW3mBfPLCTFQWEiPAA5CKXHJOAPbnJ0xDHLiE6KbPRvrYCwLuWqTG0fLfXVjMUcQ==",
+      "dependencies": {
+        "yerror": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=18.16.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "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==",
+      "dev": true
+    },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dev": true,
+      "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.1.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz",
+      "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "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==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^9.1.1 || ^10.0.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true
+    },
+    "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "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/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true
+    },
+    "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yerror": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/yerror/-/yerror-8.0.0.tgz",
+      "integrity": "sha512-FemWD5/UqNm8ffj8oZIbjWXIF2KE0mZssggYpdaQkWDDgXBQ/35PNIxEuz6/YLn9o0kOxDBNJe8x8k9ljD7k/g==",
+      "engines": {
+        "node": ">=18.16.0"
+      }
+    }
+  }
+}
--- a/packages/auth-fetch/package.json
+++ b/packages/auth-fetch/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "@scrypted/auth-fetch",
+  "version": "1.0.0",
+  "description": "",
+  "main": "dist/index.js",
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "tsc --outDir dist",
+    "prepublishOnly": "npm run build",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "devDependencies": {
+    "@types/node": "^20.9.4",
+    "rimraf": "^5.0.5",
+    "typescript": "^5.3.2"
+  },
+  "dependencies": {
+    "follow-redirects": "^1.15.4",
+    "http-auth-utils": "^5.0.1"
+  },
+  "author": "",
+  "license": "ISC"
+}
--- a/packages/auth-fetch/src/auth-fetch.ts
+++ b/packages/auth-fetch/src/auth-fetch.ts
@@ -0,0 +1,135 @@
+import { HttpFetchOptions, HttpFetchResponseType, checkStatus, fetcher, getFetchMethod, setDefaultHttpFetchAccept } from '../../../server/src/fetch';
+
+export interface AuthFetchCredentialState {
+    username: string;
+    password: string;
+}
+
+export interface AuthFetchOptions {
+    credential?: AuthFetchCredentialState;
+}
+
+async function getAuth(options: AuthFetchOptions, url: string | URL, method: string) {
+    if (!options.credential)
+        return;
+
+    const { BASIC, DIGEST, parseWWWAuthenticateHeader } = await import('http-auth-utils');
+
+    const credential = options.credential as AuthFetchCredentialState & {
+        count?: number;
+        digest?: ReturnType<typeof parseWWWAuthenticateHeader<typeof DIGEST>>;
+        basic?: ReturnType<typeof parseWWWAuthenticateHeader<typeof BASIC>>;
+    };
+    const { digest, basic } = credential;
+
+    if (digest) {
+        credential.count ||= 0;
+        ++credential.count;
+        const nc = ('00000000' + credential.count).slice(-8);
+        const cnonce = [...Array(24)].map(() => Math.floor(Math.random() * 16).toString(16)).join('');
+        const uri = new URL(url).pathname;
+
+        const { DIGEST, buildAuthorizationHeader } = await import('http-auth-utils');
+
+        const response = DIGEST.computeHash({
+            username: options.credential.username,
+            password: options.credential.password,
+            method,
+            uri,
+            nc,
+            cnonce,
+            algorithm: 'MD5',
+            qop: digest.data.qop!,
+            ...digest.data,
+        });
+
+        const header = buildAuthorizationHeader(DIGEST, {
+            username: options.credential.username,
+            uri,
+            nc,
+            cnonce,
+            algorithm: digest.data.algorithm!,
+            qop: digest.data.qop!,
+            response,
+            ...digest.data,
+        });
+
+        return header;
+    }
+    else if (basic) {
+        const { BASIC, buildAuthorizationHeader } = await import('http-auth-utils');
+
+        const header = buildAuthorizationHeader(BASIC, {
+            username: options.credential.username,
+            password: options.credential.password,
+        });
+
+        return header;
+    }
+}
+
+export function createAuthFetch<B, M>(
+    h: fetcher<B, M>,
+    parser: (body: M, responseType: HttpFetchResponseType) => Promise<any>
+) {
+    const authHttpFetch = async <T extends HttpFetchOptions<B>>(options: T & AuthFetchOptions): ReturnType<typeof h<T>> => {
+        const method = getFetchMethod(options);
+        const headers = new Headers(options.headers);
+        options.headers = headers;
+        setDefaultHttpFetchAccept(headers, options.responseType);
+
+        const initialHeader = await getAuth(options, options.url, method);
+        // try to provide an authorization if a session exists, but don't override Authorization if provided already.
+        // 401 will trigger a proper auth.
+        if (initialHeader && !headers.has('Authorization'))
+            headers.set('Authorization', initialHeader);
+
+        const initialResponse = await h({
+            ...options,
+            ignoreStatusCode: true,
+            responseType: 'readable',
+        });
+
+        if (initialResponse.statusCode !== 401 || !options.credential) {
+            if (!options?.ignoreStatusCode)
+                checkStatus(initialResponse.statusCode);
+            return {
+                ...initialResponse,
+                body: await parser(initialResponse.body, options.responseType),
+            };
+        }
+
+        let authenticateHeaders: string | string[] = initialResponse.headers.get('www-authenticate');
+        if (!authenticateHeaders)
+            throw new Error('Did not find WWW-Authenticate header.');
+
+
+        if (typeof authenticateHeaders === 'string')
+            authenticateHeaders = [authenticateHeaders];
+
+        const { BASIC, DIGEST, parseWWWAuthenticateHeader } = await import('http-auth-utils');
+        const parsedHeaders = authenticateHeaders.map(h => parseWWWAuthenticateHeader(h));
+
+        const digest = parsedHeaders.find(p => p.type === 'Digest') as ReturnType<typeof parseWWWAuthenticateHeader<typeof DIGEST>>;
+        const basic = parsedHeaders.find(p => p.type === 'Basic') as ReturnType<typeof parseWWWAuthenticateHeader<typeof BASIC>>;
+        const credential = options.credential as AuthFetchCredentialState & {
+            count?: number;
+            digest?: ReturnType<typeof parseWWWAuthenticateHeader<typeof DIGEST>>;
+            basic?: ReturnType<typeof parseWWWAuthenticateHeader<typeof BASIC>>;
+        };
+
+        credential.digest = digest;
+        credential.basic = basic;
+
+        if (!digest && !basic)
+            throw new Error(`Unknown WWW-Authenticate type: ${parsedHeaders[0]?.type}`);
+
+        const header = await getAuth(options, options.url, method);
+        if (header)
+            headers.set('Authorization', header);
+
+        return h(options);
+    }
+
+    return authHttpFetch;
+}
--- a/packages/auth-fetch/src/index.ts
+++ b/packages/auth-fetch/src/index.ts
@@ -0,0 +1,19 @@
+import { createAuthFetch } from "./auth-fetch";
+import { httpFetch, httpFetchParseIncomingMessage } from '../../../server/src/fetch/http-fetch';
+import type { Readable } from "stream";
+import type { IncomingMessage } from "http";
+import { domFetch, domFetchParseIncomingMessage } from "../../../server/src/fetch";
+
+function init() {
+    try {
+        require('net');
+        require('events');
+        return createAuthFetch<Readable, IncomingMessage>(httpFetch, httpFetchParseIncomingMessage);
+    }
+    catch (e) {
+    }
+
+    return createAuthFetch<BodyInit, Response>(domFetch, domFetchParseIncomingMessage);
+}
+
+export const authFetch = init();
--- a/packages/auth-fetch/tsconfig.json
+++ b/packages/auth-fetch/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "esnext",
+        "noImplicitAny": true,
+        "outDir": "./dist",
+        "esModuleInterop": true,
+        "sourceMap": true,
+        "inlineSources": true,
+        "declaration": true,
+        "resolveJsonModule": true,
+    },
+    "include": [
+        "src/**/*"
+    ],
+}
--- a/packages/cli/package-lock.json
+++ b/packages/cli/package-lock.json
@@ -1,17 +1,16 @@
 {
  "name": "scrypted",
-  "version": "1.3.4",
+  "version": "1.3.6",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "scrypted",
-      "version": "1.3.4",
+      "version": "1.3.6",
      "license": "ISC",
      "dependencies": {
-        "@scrypted/client": "^1.3.2",
+        "@scrypted/client": "^1.3.3",
        "@scrypted/types": "^0.2.99",
-        "axios": "^0.25.0",
        "engine.io-client": "^6.5.3",
        "readline-sync": "^1.4.10",
        "semver": "^7.5.4",
@@ -92,16 +91,21 @@
      }
    },
    "node_modules/@scrypted/client": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@scrypted/client/-/client-1.3.2.tgz",
-      "integrity": "sha512-PZwjfKUYIMxBYm7V2o0/vAMlQmznKLN/d4rpshb5vV086mnhh578ik3h39awkwoPyWzNGDcYeoBY0BchhwtdOQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@scrypted/client/-/client-1.3.3.tgz",
+      "integrity": "sha512-Wuy7x02TCRy1buaDNX8NOIaL1j4ZXu4dqTTJsKHlPe3+umsBvpwbylD+YyyU8ghQJC6a40Bs5UMsvnCvNa/1fg==",
      "dependencies": {
-        "@scrypted/types": "^0.2.99",
-        "axios": "^0.25.0",
+        "@scrypted/types": "^0.3.4",
        "engine.io-client": "^6.5.3",
+        "follow-redirects": "^1.15.4",
        "rimraf": "^5.0.5"
      }
    },
+    "node_modules/@scrypted/client/node_modules/@scrypted/types": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.3.4.tgz",
+      "integrity": "sha512-k/YMx8lIWOkePgXfKW9POr12mb+erFU2JKxO7TW92GyW8ojUWw9VOc0PK6O9bybi0vhsEnvMFkO6pO6bAonsVA=="
+    },
    "node_modules/@scrypted/types": {
      "version": "0.2.99",
      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.99.tgz",
@@ -206,14 +210,6 @@
      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
      "dev": true
    },
-    "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/balanced-match": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -318,9 +314,9 @@
      }
    },
    "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
      "funding": [
        {
          "type": "individual",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "scrypted",
-  "version": "1.3.5",
+  "version": "1.3.6",
  "description": "",
  "main": "./dist/packages/cli/src/main.js",
  "bin": {
@@ -16,19 +16,18 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "@scrypted/client": "^1.3.2",
+    "@scrypted/client": "^1.3.3",
    "@scrypted/types": "^0.2.99",
-    "axios": "^0.25.0",
    "engine.io-client": "^6.5.3",
    "readline-sync": "^1.4.10",
    "semver": "^7.5.4",
    "tslib": "^2.6.2"
  },
  "devDependencies": {
-    "rimraf": "^5.0.5",
    "@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": "^5.3.2"
  }
--- a/packages/cli/src/main.ts
+++ b/packages/cli/src/main.ts
@@ -2,13 +2,13 @@

 import { connectScryptedClient } from '@scrypted/client';
 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 { authHttpFetch } from '../../../common/src/http-auth-fetch';
 import { installServe, serveMain } from './service';
 import { connectShell } from './shell';

@@ -54,15 +54,16 @@ async function doLogin(host: string) {
    });

    const url = `https://${host}/login`;
-    const response = await axios(Object.assign({
+    const response = await authHttpFetch({
        method: 'GET',
-        auth: {
+        credential: {
            username,
            password,
        },
        url,
-        httpsAgent,
-    }, axiosConfig));
+        rejectUnauthorized: false,
+        responseType: 'json',
+    });

    fs.mkdirSync(scryptedHome, {
        recursive: true,
@@ -78,7 +79,7 @@ async function doLogin(host: string) {
        login = {};
    login = login || {};

-    login[host] = response.data;
+    login[host] = response.body;
    fs.writeFileSync(loginPath, JSON.stringify(login));
    return login;
 }
@@ -102,12 +103,6 @@ async function getOrDoLogin(host: string): Promise<{
    return login[host];
 }

-const axiosConfig: AxiosRequestConfig = {
-    httpsAgent: new https.Agent({
-        rejectUnauthorized: false
-    })
-}
-
 async function runCommand() {
    const [idOrName, optionalHost] = process.argv[3].split('@');
    const host = toIpAndPort(optionalHost || '127.0.0.1');
@@ -119,9 +114,6 @@ async function runCommand() {
        pluginId: '@scrypted/core',
        username: login.username,
        password: login.token,
-        axiosConfig: {
-            httpsAgent,
-        }
    });

    const device: any = sdk.systemManager.getDeviceById(idOrName) || sdk.systemManager.getDeviceByName(idOrName);
@@ -211,16 +203,18 @@ async function main() {

        const login = await getOrDoLogin(ip);
        const url = `https://${ip}/web/component/script/install/${pkg}`;
-        const response = await axios(Object.assign({
+        const response = await authHttpFetch({
            method: 'POST',
-            auth: {
+            credential: {
                username: login.username,
                password: login.token,
            },
            url,
-        }, axiosConfig));
+            rejectUnauthorized: false,
+            responseType: 'json',
+        });

-        console.log('install successful. id:', response.data.id);
+        console.log('install successful. id:', response.body.id);
    }
    else if (process.argv[2] === 'shell') {
        console.log = () => { };
@@ -232,9 +226,6 @@ async function main() {
            pluginId: '@scrypted/core',
            username: login.username,
            password: login.token,
-            axiosConfig: {
-                httpsAgent,
-            }
        });

        const separator = process.argv.indexOf("--");
--- a/packages/client/.gitignore
+++ b/packages/client/.gitignore
@@ -9,3 +9,4 @@ scrypted.db.bak
 .exit
 .update
 .venv
+.vscode/launch.json
--- a/packages/client/.vscode/launch.json
+++ b/packages/client/.vscode/launch.json
@@ -1,27 +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": "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"
-        }
-    ]
-}
--- a/packages/client/examples/connectRPCObject.ts
+++ b/packages/client/examples/connectRPCObject.ts
@@ -1,21 +1,12 @@
 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);

--- a/packages/client/examples/detection.ts
+++ b/packages/client/examples/detection.ts
@@ -1,25 +1,16 @@
 import { ObjectDetector, ObjectsDetected, ScryptedInterface } 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 backyard = sdk.systemManager.getDeviceByName<ObjectDetector>("Hikvision Test");
+    const backyard = sdk.systemManager.getDeviceByName<ObjectDetector>("IP CAMERA");
    if (!backyard)
        throw new Error('Device not found');

--- a/packages/client/examples/light.ts
+++ b/packages/client/examples/light.ts
@@ -1,21 +1,12 @@
 import { connectScryptedClient } from '../dist/packages/client/src';
 import { OnOff } from '@scrypted/types';

-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);

--- a/packages/client/package-lock.json
+++ b/packages/client/package-lock.json
@@ -1,23 +1,36 @@
 {
  "name": "@scrypted/client",
-  "version": "1.3.1",
+  "version": "1.3.4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@scrypted/client",
-      "version": "1.3.1",
+      "version": "1.3.4",
      "license": "ISC",
      "dependencies": {
-        "@scrypted/types": "^0.2.99",
-        "axios": "^0.25.0",
+        "@scrypted/types": "^0.3.4",
        "engine.io-client": "^6.5.3",
+        "follow-redirects": "^1.15.4",
        "rimraf": "^5.0.5"
      },
      "devDependencies": {
        "@types/ip": "^1.1.3",
-        "@types/node": "^20.9.4",
-        "typescript": "^5.3.2"
+        "@types/node": "^20.10.8",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.3.3"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
      }
    },
    "node_modules/@isaacs/cliui": {
@@ -36,6 +49,31 @@
        "node": ">=12"
      }
    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@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",
@@ -46,15 +84,39 @@
      }
    },
    "node_modules/@scrypted/types": {
-      "version": "0.2.99",
-      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.99.tgz",
-      "integrity": "sha512-2J1FH7tpAW5X3rgA70gJ+z0HFM90c/tBA+JXdP1vI1d/0yVmh9TSxnHoCuADN4R2NQXHmoZ6Nbds9kKAQ/25XQ=="
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.3.4.tgz",
+      "integrity": "sha512-k/YMx8lIWOkePgXfKW9POr12mb+erFU2JKxO7TW92GyW8ojUWw9VOc0PK6O9bybi0vhsEnvMFkO6pO6bAonsVA=="
    },
    "node_modules/@socket.io/component-emitter": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true
+    },
    "node_modules/@types/ip": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/@types/ip/-/ip-1.1.3.tgz",
@@ -65,14 +127,35 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "20.9.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.4.tgz",
-      "integrity": "sha512-wmyg8HUhcn6ACjsn8oKYjkN/zUzQeNtMy44weTJSM6p4MMzEOuKbA3OjJ267uPCOW7Xex9dyrNTful8XTQYoDA==",
+      "version": "20.10.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz",
+      "integrity": "sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==",
      "dev": true,
      "dependencies": {
        "undici-types": "~5.26.4"
      }
    },
+    "node_modules/acorn": {
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz",
+      "integrity": "sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
    "node_modules/ansi-regex": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -95,13 +178,11 @@
        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
      }
    },
-    "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/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
    },
    "node_modules/balanced-match": {
      "version": "1.0.2",
@@ -132,6 +213,12 @@
      "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",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "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",
@@ -161,6 +248,15 @@
        }
      }
    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
    "node_modules/eastasianwidth": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -192,9 +288,9 @@
      }
    },
    "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
      "funding": [
        {
          "type": "individual",
@@ -284,6 +380,12 @@
        "node": "14 || >=16.14"
      }
    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
    "node_modules/minimatch": {
      "version": "9.0.3",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
@@ -469,10 +571,53 @@
        "node": ">=8"
      }
    },
+    "node_modules/ts-node": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/typescript": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
-      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
@@ -488,6 +633,12 @@
      "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/which": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -613,6 +764,15 @@
      "engines": {
        "node": ">=0.4.0"
      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
    }
  }
 }
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@scrypted/client",
-  "version": "1.3.2",
+  "version": "1.3.4",
  "description": "",
  "main": "dist/packages/client/src/index.js",
  "scripts": {
@@ -13,13 +13,14 @@
  "license": "ISC",
  "devDependencies": {
    "@types/ip": "^1.1.3",
-    "@types/node": "^20.9.4",
-    "typescript": "^5.3.2"
+    "@types/node": "^20.10.8",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
  },
  "dependencies": {
-    "@scrypted/types": "^0.2.99",
-    "axios": "^0.25.0",
+    "@scrypted/types": "^0.3.4",
    "engine.io-client": "^6.5.3",
+    "follow-redirects": "^1.15.4",
    "rimraf": "^5.0.5"
  }
 }
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,20 +1,32 @@
 import { MediaObjectOptions, RTCConnectionManagement, RTCSignalingSession, ScryptedStatic } from "@scrypted/types";
-import axios, { AxiosRequestConfig, AxiosRequestHeaders } from 'axios';
 import * as eio from 'engine.io-client';
 import { SocketOptions } from 'engine.io-client';
 import { Deferred } from "../../../common/src/deferred";
 import { timeoutPromise } from "../../../common/src/promise-utils";
 import { BrowserSignalingSession, waitPeerConnectionIceConnected, waitPeerIceConnectionClosed } from "../../../common/src/rtc-signaling";
 import { DataChannelDebouncer } from "../../../plugins/webrtc/src/datachannel-debouncer";
+import type { ClusterObject, ConnectRPCObject } from '../../../server/src/cluster/connect-rpc-object';
 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";

+import { domFetch } from "../../../server/src/fetch";
+import { httpFetch } from '../../../server/src/fetch/http-fetch';
+
+let fetcher: typeof httpFetch | typeof domFetch;
+try {
+    require('net');
+    require('events');
+    fetcher = httpFetch;
+}
+catch (e) {
+    fetcher = domFetch;
+}
+
 const sourcePeerId = RpcPeer.generateId();

 type IOClientSocket = eio.Socket & IOSocket;
@@ -59,7 +71,6 @@ export interface ScryptedConnectionOptions {
    local?: boolean;
    webrtc?: boolean;
    baseUrl?: string;
-    axiosConfig?: AxiosRequestConfig;
    previousLoginResult?: ScryptedClientLoginResult;
 }

@@ -90,10 +101,13 @@ function isRunningStandalone() {

 export async function logoutScryptedClient(baseUrl?: string) {
    const url = combineBaseUrl(baseUrl, 'logout');
-    const response = await axios(url, {
+    const response = await fetcher({
+        url,
        withCredentials: true,
+        responseType: 'json',
+        rejectUnauthorized: false,
    });
-    return response.data;
+    return response.body;
 }

 export function getCurrentBaseUrl() {
@@ -122,38 +136,43 @@ export async function loginScryptedClient(options: ScryptedLoginOptions) {
        maxAge = 365 * 24 * 60 * 60 * 1000;

    const url = combineBaseUrl(baseUrl, 'login');
-    const response = await axios.post(url, {
-        username,
-        password,
-        change_password,
-        maxAge,
-    }, {
+    const response = await fetcher({
+        url,
+        body: {
+            username,
+            password,
+            change_password,
+            maxAge,
+        },
+        rejectUnauthorized: false,
        withCredentials: true,
-        ...options.axiosConfig,
+        responseType: 'json',
    });

-    if (response.status !== 200)
-        throw new Error('status ' + response.status);
+    if (response.statusCode !== 200)
+        throw new Error('status ' + response.statusCode);
+
+    const { body } = response;

    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: response.data.addresses as string[],
-        externalAddresses: response.data.externalAddresses as string[],
+        error: body.error as string,
+        authorization: body.authorization as string,
+        queryToken: body.queryToken as any,
+        token: body.token as string,
+        addresses: body.addresses as string[],
+        externalAddresses: body.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'],
+        scryptedCloud: response.headers.get('x-scrypted-cloud') === 'true',
+        directAddress: response.headers.get('x-scrypted-direct-address'),
+        cloudAddress: response.headers.get('x-scrypted-cloud-address'),
    };
 }

 export async function checkScryptedClientLogin(options?: ScryptedConnectionOptions) {
    let { baseUrl } = options || {};
    let url = combineBaseUrl(baseUrl, 'login');
-    const headers: AxiosRequestHeaders = {};
+    const headers = new Headers();
    if (options?.previousLoginResult?.queryToken) {
        // headers.Authorization = options?.previousLoginResult?.authorization;
        // const search = new URLSearchParams(options.previousLoginResult.queryToken);
@@ -161,32 +180,36 @@ export async function checkScryptedClientLogin(options?: ScryptedConnectionOptio
        const token = options?.previousLoginResult.username + ":" + options.previousLoginResult.token;
        const hash = Buffer.from(token).toString('base64');

-        headers.Authorization = `Basic ${hash}`;
+        headers.set('Authorization', `Basic ${hash}`);
    }
-    const response = await axios.get(url, {
+    const response = await fetcher({
+        url,
        withCredentials: true,
        headers,
-        ...options?.axiosConfig,
+        rejectUnauthorized: false,
+        responseType: 'json',
    });

+    const { body } = response;
+
    return {
        baseUrl,
-        hostname: response.data.hostname as string,
-        redirect: response.data.redirect as string,
-        username: response.data.username as string,
-        expiration: response.data.expiration as number,
-        hasLogin: !!response.data.hasLogin,
-        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: response.data.addresses as string[],
-        externalAddresses: response.data.externalAddresses as string[],
+        hostname: body.hostname as string,
+        redirect: body.redirect as string,
+        username: body.username as string,
+        expiration: body.expiration as number,
+        hasLogin: !!body.hasLogin,
+        error: body.error as string,
+        authorization: body.authorization as string,
+        queryToken: body.queryToken as any,
+        token: body.token as string,
+        addresses: body.addresses as string[],
+        externalAddresses: body.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'],
+        scryptedCloud: response.headers.get('x-scrypted-cloud') === 'true',
+        directAddress: response.headers.get('x-scrypted-direct-address'),
+        cloudAddress: response.headers.get('x-scrypted-cloud-address'),
    };
 }

@@ -786,7 +809,7 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
                return value;
            }

-            const { port, proxyId  } = clusterObject;
+            const { port, proxyId } = clusterObject;

            // check if object is already connected
            const resolved = await resolveObject(proxyId, port);
--- a/plugins/amcrest/src/amcrest-api.ts
+++ b/plugins/amcrest/src/amcrest-api.ts
@@ -1,6 +1,5 @@
-import { AuthFetchCredentialState, AuthFetchOptions, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
+import { AuthFetchCredentialState, HttpFetchOptions, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
 import { Readable } from 'stream';
-import { HttpFetchOptions, HttpFetchResponseType } from '../../../server/src/http-fetch-helpers';
 import { getDeviceInfo } from './probe';

 export enum AmcrestEvent {
@@ -31,17 +30,15 @@ export class AmcrestCameraClient {
        };
    }

-    async request<T extends HttpFetchResponseType>(urlOrOptions: string | URL | HttpFetchOptions<T>, body?: Readable) {
-        const options: AuthFetchOptions<T> = {
+    async request(urlOrOptions: string | URL | HttpFetchOptions<Readable>, body?: Readable) {
+        const response = await authHttpFetch({
            ...typeof urlOrOptions !== 'string' && !(urlOrOptions instanceof URL) ? urlOrOptions : {
                url: urlOrOptions,
            },
            rejectUnauthorized: false,
            credential: this.credential,
            body,
-        };
-
-        const response = await authHttpFetch(options);
+        });
        return response;
    }

--- a/plugins/core/src/builtins/scheduler.ts
+++ b/plugins/core/src/builtins/scheduler.ts
@@ -47,37 +47,45 @@ export class Scheduler {
                        const day = future.getDay();
                        if (!days[day])
                            continue;
-        
+
                        source.log.i(`event will fire at ${future.toLocaleString()}`);
                        return future;
                    }
                    source.log.w('event will never fire');
                }

-                const when = reschedule();
-                if (!when) {
-                    return {
-                        removeListener() {
-                        }
-                    }
-                }
-
-                const delay = when.getTime() - Date.now();
-                source.log.i(`event will fire in ${Math.round(delay / 60 / 1000)} minutes.`);
-
-                let timeout = setTimeout(() => {
-                    reschedule();
+                let timeout: NodeJS.Timeout = null;
+                let when: Date = null;

+                function timerCb() {
+                    timeout = null;
+                    const prevWhen = when;
+                    setupTimer();
                    callback(ret, {
                        eventId: undefined,
                        eventInterface: 'Scheduler',
                        eventTime: Date.now(),
-                    }, when)
-                }, delay);
+                    }, prevWhen)
+                }
+
+                function setupTimer() {
+                    when = reschedule();
+                    if (when) {
+                        const delay = when.getTime() - Date.now();
+                        source.log.i(`event will fire in ${Math.round(delay / 60 / 1000)} minutes.`);
+                        timeout = setTimeout(timerCb, delay);
+                    }
+                }
+
+                setupTimer();

                return {
                    removeListener() {
-                        clearTimeout(timeout);
+                        if (timeout) {
+                            clearTimeout(timeout);
+                        }
+                        timeout = null;
+                        when = null;
                    }
                }
            }
--- a/plugins/doorbird/package-lock.json
+++ b/plugins/doorbird/package-lock.json
@@ -8,7 +8,6 @@
         "name": "@scrypted/doorbird",
         "version": "0.0.2",
         "dependencies": {
-            "@koush/axios-digest-auth": "^0.8.5",
            "doorbird": "^2.1.2"
         },
         "devDependencies": {
@@ -26,23 +25,24 @@
         "dependencies": {
            "@scrypted/sdk": "file:../sdk",
            "@scrypted/server": "file:../server",
-            "http-auth-utils": "^3.0.2",
+            "http-auth-utils": "^5.0.1",
            "node-fetch-commonjs": "^3.1.1",
-            "typescript": "^4.4.3"
+            "typescript": "^5.3.3"
         },
         "devDependencies": {
-            "@types/node": "^16.9.0"
+            "@types/node": "^20.10.8",
+            "ts-node": "^10.9.2"
         }
      },
      "../../sdk": {
         "name": "@scrypted/sdk",
-         "version": "0.2.103",
+         "version": "0.3.4",
         "dev": true,
         "license": "ISC",
         "dependencies": {
            "@babel/preset-typescript": "^7.18.6",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -72,23 +72,6 @@
            "typedoc": "^0.23.21"
         }
      },
-      "node_modules/@koush/axios-digest-auth": {
-         "version": "0.8.5",
-         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.5.tgz",
-         "integrity": "sha512-EZMM0gMJ3hMUD4EuUqSwP6UGt5Vmw2TZtY7Ypec55AnxkExSXM0ySgPtqkAcnL43g1R27yAg/dQL7dRTLMqO3Q==",
-         "dependencies": {
-            "auth-header": "^1.0.0",
-            "axios": "^0.21.4"
-         }
-      },
-      "node_modules/@koush/axios-digest-auth/node_modules/axios": {
-         "version": "0.21.4",
-         "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-         "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-         "dependencies": {
-            "follow-redirects": "^1.14.0"
-         }
-      },
      "node_modules/@scrypted/common": {
         "resolved": "../../common",
         "link": true
@@ -108,17 +91,12 @@
         "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
         "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
      },
-      "node_modules/auth-header": {
-         "version": "1.0.0",
-         "resolved": "https://registry.npmjs.org/auth-header/-/auth-header-1.0.0.tgz",
-         "integrity": "sha512-CPPazq09YVDUNNVWo4oSPTQmtwIzHusZhQmahCKvIsk0/xH6U3QsMAv3sM+7+Q0B1K2KJ/Q38OND317uXs4NHA=="
-      },
      "node_modules/axios": {
-         "version": "1.3.5",
-         "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.5.tgz",
-         "integrity": "sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==",
+         "version": "1.6.5",
+         "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
+         "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
         "dependencies": {
-            "follow-redirects": "^1.15.0",
+            "follow-redirects": "^1.15.4",
            "form-data": "^4.0.0",
            "proxy-from-env": "^1.1.0"
         }
@@ -199,9 +177,9 @@
         }
      },
      "node_modules/follow-redirects": {
-         "version": "1.15.2",
-         "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-         "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+         "version": "1.15.4",
+         "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+         "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
         "funding": [
            {
               "type": "individual",
--- a/plugins/doorbird/package.json
+++ b/plugins/doorbird/package.json
@@ -33,7 +33,6 @@
      ]
   },
   "dependencies": {
-      "@koush/axios-digest-auth": "^0.8.5",
      "doorbird": "^2.1.2"
   },
   "devDependencies": {
--- a/plugins/doorbird/src/main.ts
+++ b/plugins/doorbird/src/main.ts
@@ -5,8 +5,8 @@ import { ffmpegLogInitialOutput, safePrintFFmpegArguments } from "@scrypted/comm
 import net from 'net';
 import { randomBytes } from 'crypto';
 import { PassThrough, Readable } from "stream";
-import AxiosDigestAuth from '@koush/axios-digest-auth';
 import { readLength } from "@scrypted/common/src/read-stream";
+import { authHttpFetch } from "@scrypted/common/src/http-auth-fetch";
 import { ApiRingEvent, ApiMotionEvent, DoorbirdAPI } from "./doorbird-api";

 const { deviceManager, mediaManager } = sdk;
@@ -27,7 +27,7 @@ class DoorbirdCamera extends ScryptedDeviceBase implements Intercom, Camera, Vid
        this.binaryState = false;
        this.doorbellAudioActive = false;

-        this.updateDeviceInfo();        
+        this.updateDeviceInfo();
    }

    getDoorbirdApi() {
@@ -49,8 +49,8 @@ class DoorbirdCamera extends ScryptedDeviceBase implements Intercom, Camera, Vid
                this.console?.log("Time:", event.timestamp);
                this.triggerMotionSensor();
            });
-            this.getDoorbirdApi()?.startEventSocket();        
-        }    
+            this.getDoorbirdApi()?.startEventSocket();
+        }
        return this.doorbirdApi;
    }

@@ -157,7 +157,7 @@ class DoorbirdCamera extends ScryptedDeviceBase implements Intercom, Camera, Vid
        this.stopAudioTransmitter();
        this.stopAudioReceiver();
    }
-    
+
    async startAudioTransmitter(media: MediaObject): Promise<void> {
        const ffmpegInput: FFmpegInput = JSON.parse((await mediaManager.convertMediaObjectToBuffer(media, ScryptedMimeTypes.FFmpegInput)).toString());

@@ -194,13 +194,13 @@ class DoorbirdCamera extends ScryptedDeviceBase implements Intercom, Camera, Vid
            this.console.log('Doorbird: audio transmitter started.');

            const passthrough = new PassThrough();
-            const digestAuth = new AxiosDigestAuth({
-                username,
-                password
-            });
-            digestAuth.request({
+            authHttpFetch({
                method: 'POST',
                url: audioTxUrl,
+                credential: {
+                    username,
+                    password,
+                },
                headers: {
                    'Content-Type': 'audio/basic',
                    'Content-Length': '9999999'
@@ -293,7 +293,8 @@ class DoorbirdCamera extends ScryptedDeviceBase implements Intercom, Camera, Vid
                // this is a hint to let homekit, et al, know that it's OPUS audio and does not need transcoding.
                codec: 'pcm_mulaw',
            }
-        }];    }
+        }];
+    }

    async getVideoStream(options?: ResponseMediaStreamOptions): Promise<MediaObject> {

@@ -327,7 +328,7 @@ class DoorbirdCamera extends ScryptedDeviceBase implements Intercom, Camera, Vid
        if (this.audioSilenceProcess)
            return;

-        this.console.log('Doorbird: starting audio silence generator...')            
+        this.console.log('Doorbird: starting audio silence generator...')

        const ffmpegPath = await mediaManager.getFFmpegPath();
        const ffmpegArgs = [
@@ -552,10 +553,10 @@ export class DoorbirdCamProvider extends ScryptedDeviceBase implements DevicePro
    }

    async releaseDevice(id: string, nativeId: string): Promise<void> {
-        if( this.devices.delete( nativeId ) ) {
-            this.console.log("Doorbird: Removed device from list: " + id + " / " + nativeId )   
+        if (this.devices.delete(nativeId)) {
+            this.console.log("Doorbird: Removed device from list: " + id + " / " + nativeId)
        }
-    }    
+    }

    createCamera(nativeId: string): DoorbirdCamera {
        return new DoorbirdCamera(nativeId, this);
--- a/plugins/hikvision/package-lock.json
+++ b/plugins/hikvision/package-lock.json
@@ -12,7 +12,6 @@
            "@scrypted/common": "file:../../common",
            "@scrypted/sdk": "file:../../sdk",
            "@types/xml2js": "^0.4.11",
-            "http-auth-utils": "^3.0.2",
            "lodash": "^4.17.21",
            "xml2js": "^0.6.0"
         },
@@ -27,7 +26,7 @@
         "dependencies": {
            "@scrypted/sdk": "file:../sdk",
            "@scrypted/server": "file:../server",
-            "http-auth-utils": "^3.0.2",
+            "http-auth-utils": "^5.0.1",
            "node-fetch-commonjs": "^3.1.1",
            "typescript": "^5.3.3"
         },
@@ -43,7 +42,7 @@
         "dependencies": {
            "@babel/preset-typescript": "^7.18.6",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -97,17 +96,6 @@
            "@types/node": "*"
         }
      },
-      "node_modules/http-auth-utils": {
-         "version": "3.0.2",
-         "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-3.0.2.tgz",
-         "integrity": "sha512-cQ8957aiUX0lgV1620uIGKGJc0sEuD/QK4ueZ0hb60MGbO0f6ahcuIgPjamAD98D/AUGizKVm+dNvUVHs0f4Ow==",
-         "dependencies": {
-            "yerror": "^6.0.0"
-         },
-         "engines": {
-            "node": ">=12.19.0"
-         }
-      },
      "node_modules/lodash": {
         "version": "4.17.21",
         "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -137,14 +125,6 @@
         "engines": {
            "node": ">=4.0"
         }
-      },
-      "node_modules/yerror": {
-         "version": "6.2.1",
-         "resolved": "https://registry.npmjs.org/yerror/-/yerror-6.2.1.tgz",
-         "integrity": "sha512-WPZgybhCBzsMSSqGYBnj20NZo4FiFKQG0+i/21cYGVd4B7eYtvYDOpjk/0e8UM1eVHJ+4Ja6bZ7TAjHH6mk+ew==",
-         "engines": {
-            "node": ">=12.19.0"
-         }
      }
   },
   "dependencies": {
@@ -154,7 +134,7 @@
            "@scrypted/sdk": "file:../sdk",
            "@scrypted/server": "file:../server",
            "@types/node": "^20.10.8",
-            "http-auth-utils": "^3.0.2",
+            "http-auth-utils": "^5.0.1",
            "node-fetch-commonjs": "^3.1.1",
            "ts-node": "^10.9.2",
            "typescript": "^5.3.3"
@@ -167,7 +147,7 @@
            "@types/node": "^18.11.18",
            "@types/stringify-object": "^4.0.0",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -197,14 +177,6 @@
            "@types/node": "*"
         }
      },
-      "http-auth-utils": {
-         "version": "3.0.2",
-         "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-3.0.2.tgz",
-         "integrity": "sha512-cQ8957aiUX0lgV1620uIGKGJc0sEuD/QK4ueZ0hb60MGbO0f6ahcuIgPjamAD98D/AUGizKVm+dNvUVHs0f4Ow==",
-         "requires": {
-            "yerror": "^6.0.0"
-         }
-      },
      "lodash": {
         "version": "4.17.21",
         "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -228,11 +200,6 @@
         "version": "11.0.1",
         "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
         "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
-      },
-      "yerror": {
-         "version": "6.2.1",
-         "resolved": "https://registry.npmjs.org/yerror/-/yerror-6.2.1.tgz",
-         "integrity": "sha512-WPZgybhCBzsMSSqGYBnj20NZo4FiFKQG0+i/21cYGVd4B7eYtvYDOpjk/0e8UM1eVHJ+4Ja6bZ7TAjHH6mk+ew=="
      }
   }
 }
--- a/plugins/hikvision/package.json
+++ b/plugins/hikvision/package.json
@@ -38,7 +38,6 @@
      "@scrypted/common": "file:../../common",
      "@scrypted/sdk": "file:../../sdk",
      "@types/xml2js": "^0.4.11",
-      "http-auth-utils": "^3.0.2",
      "lodash": "^4.17.21",
      "xml2js": "^0.6.0"
   },
--- a/plugins/hikvision/src/hikvision-camera-api.ts
+++ b/plugins/hikvision/src/hikvision-camera-api.ts
@@ -1,7 +1,6 @@
-import { AuthFetchCredentialState, AuthFetchOptions, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
-import { IncomingMessage, RequestOptions } from 'http';
+import { AuthFetchCredentialState, HttpFetchOptions, HttpFetchResponseType, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
+import { IncomingMessage } from 'http';
 import { Readable } from 'stream';
-import { HttpFetchOptions, HttpFetchResponseType } from '../../../server/src/http-fetch-helpers';
 import { getDeviceInfo } from './probe';

 export function getChannel(channel: string) {
@@ -41,17 +40,15 @@ export class HikvisionCameraAPI {
        };
    }

-    async request<T extends HttpFetchResponseType>(urlOrOptions: string | URL | HttpFetchOptions<T>, body?: Readable) {
-        const options: AuthFetchOptions<T> = {
+    async request(urlOrOptions: string | URL | HttpFetchOptions<Readable>, body?: Readable) {
+        const response = await authHttpFetch({
            ...typeof urlOrOptions !== 'string' && !(urlOrOptions instanceof URL) ? urlOrOptions : {
                url: urlOrOptions,
            },
            rejectUnauthorized: false,
            credential: this.credential,
            body,
-        };
-
-        const response = await authHttpFetch(options);
+        });
        return response;
    }

--- a/plugins/hikvision/src/probe.ts
+++ b/plugins/hikvision/src/probe.ts
@@ -1,6 +1,5 @@
 import { AuthFetchCredentialState, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
-import { checkStatus } from '../../../server/src/http-fetch-helpers';
-
+import { checkStatus } from '../../../server/src/fetch';

 export async function getDeviceInfo(credential: AuthFetchCredentialState, address: string) {
    const response = await authHttpFetch({
--- a/plugins/homekit/package-lock.json
+++ b/plugins/homekit/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/homekit",
-   "version": "1.2.33",
+   "version": "1.2.34",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/homekit",
-         "version": "1.2.33",
+         "version": "1.2.34",
         "dependencies": {
            "@koush/werift-src": "file:../../external/werift",
            "check-disk-space": "^3.3.1",
--- a/plugins/homekit/package.json
+++ b/plugins/homekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/homekit",
-   "version": "1.2.33",
+   "version": "1.2.34",
   "description": "HomeKit Plugin for Scrypted",
   "scripts": {
      "scrypted-setup-project": "scrypted-setup-project",
--- a/plugins/homekit/src/types/camera/camera-snapshot.ts
+++ b/plugins/homekit/src/types/camera/camera-snapshot.ts
@@ -1,7 +1,7 @@
 import { sleep } from "@scrypted/common/src/sleep";
 import sdk, { AudioSensor, Camera, Intercom, Logger, MotionSensor, ScryptedDevice, ScryptedInterface, VideoCamera } from "@scrypted/sdk";
 import throttle from "lodash/throttle";
-import { SnapshotRequest, SnapshotRequestCallback } from "../../hap";
+import { ResourceRequestReason, SnapshotRequest, SnapshotRequestCallback } from "../../hap";
 import type { HomeKitPlugin } from "../../main";

 const { systemManager, mediaManager } = sdk;
@@ -14,41 +14,18 @@ function recommendSnapshotPlugin(console: Console, log: Logger, message: string)
 }

 export function createSnapshotHandler(device: ScryptedDevice & VideoCamera & Camera & MotionSensor & AudioSensor & Intercom, storage: Storage, homekitPlugin: HomeKitPlugin, console: Console) {
-    let pendingPicture: Promise<Buffer>;
+    const takePicture = async (request: SnapshotRequest) => {
+        if (!device.interfaces.includes(ScryptedInterface.Camera))
+            throw new Error('Camera does not provide native snapshots. Please install the Snapshot Plugin.');

-    const takePicture = (request: SnapshotRequest) => {
-        if (pendingPicture)
-            return pendingPicture;
-
-        if (device.interfaces.includes(ScryptedInterface.Camera)) {
-            pendingPicture = device.takePicture({
-                picture: {
-                    width: request.width,
-                    height: request.height,
-                }
-            })
-                .then(media => mediaManager.convertMediaObjectToBuffer(media, 'image/jpeg'));
-        }
-        else {
-            pendingPicture = Promise.reject(new Error('Camera does not provide native snapshots. Please install the Snapshot Plugin.'));
-        }
-
-        pendingPicture
-            .finally(() => {
-                pendingPicture = undefined;
-            })
-
-        return pendingPicture;
-    }
-
-    const throttledTakePicture = throttle(takePicture, 9000, {
-        leading: true,
-        trailing: true,
-    });
-    function snapshotAll(request: SnapshotRequest) {
-        for (const snapshotThrottle of homekitPlugin.snapshotThrottles.values()) {
-            snapshotThrottle(request);
-        }
+        const media = await device.takePicture({
+            reason: request.reason === ResourceRequestReason.EVENT ? 'event' : 'periodic',
+            picture: {
+                width: request.width,
+                height: request.height,
+            }
+        })
+        return await mediaManager.convertMediaObjectToBuffer(media, 'image/jpeg');
    }

    homekitPlugin.snapshotThrottles.set(device.id, takePicture);
@@ -72,11 +49,7 @@ export function createSnapshotHandler(device: ScryptedDevice & VideoCamera & Cam
            // this call is not a bug, to force lodash to take a picture on the trailing edge,
            // throttle must be called twice.

-            // no longer necessary in accessory mode?
-            snapshotAll(request);
-            snapshotAll(request);
-
-            callback(null, await throttledTakePicture(request));
+            callback(null, await takePicture(request));
        }
        catch (e) {
            console.error('snapshot error', e);
--- a/plugins/objectdetector/package-lock.json
+++ b/plugins/objectdetector/package-lock.json
@@ -1,24 +1,22 @@
 {
   "name": "@scrypted/objectdetector",
-   "version": "0.1.19",
+   "version": "0.1.20",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/objectdetector",
-         "version": "0.1.19",
+         "version": "0.1.20",
         "license": "Apache-2.0",
         "dependencies": {
            "@scrypted/common": "file:../../common",
            "@scrypted/sdk": "file:../../sdk",
-            "lodash": "^4.17.21",
-            "polygon-clipping": "^0.15.3",
-            "semver": "^7.3.8"
+            "polygon-clipping": "^0.15.7",
+            "semver": "^7.5.4"
         },
         "devDependencies": {
-            "@types/lodash": "^4.14.175",
-            "@types/node": "^14.17.11",
-            "@types/semver": "^7.3.13"
+            "@types/node": "^20.11.0",
+            "@types/semver": "^7.5.6"
         }
      },
      "../../common": {
@@ -28,22 +26,22 @@
         "dependencies": {
            "@scrypted/sdk": "file:../sdk",
            "@scrypted/server": "file:../server",
-            "http-auth-utils": "^3.0.2",
-            "node-fetch-commonjs": "^3.1.1",
-            "typescript": "^4.4.3"
+            "http-auth-utils": "^5.0.1",
+            "typescript": "^5.3.3"
         },
         "devDependencies": {
-            "@types/node": "^16.9.0"
+            "@types/node": "^20.11.0",
+            "ts-node": "^10.9.2"
         }
      },
      "../../sdk": {
         "name": "@scrypted/sdk",
-         "version": "0.3.2",
+         "version": "0.3.4",
         "license": "ISC",
         "dependencies": {
            "@babel/preset-typescript": "^7.18.6",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -81,29 +79,21 @@
         "resolved": "../../sdk",
         "link": true
      },
-      "node_modules/@types/lodash": {
-         "version": "4.14.177",
-         "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-         "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
-         "dev": true
-      },
      "node_modules/@types/node": {
-         "version": "14.17.33",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.33.tgz",
-         "integrity": "sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g==",
-         "dev": true
+         "version": "20.11.0",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
+         "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
+         "dev": true,
+         "dependencies": {
+            "undici-types": "~5.26.4"
+         }
      },
      "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/lodash": {
-         "version": "4.17.21",
-         "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-         "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-      },
      "node_modules/lru-cache": {
         "version": "6.0.0",
         "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -116,13 +106,19 @@
         }
      },
      "node_modules/polygon-clipping": {
-         "version": "0.15.3",
-         "resolved": "https://registry.npmjs.org/polygon-clipping/-/polygon-clipping-0.15.3.tgz",
-         "integrity": "sha512-ho0Xx5DLkgxRx/+n4O74XyJ67DcyN3Tu9bGYKsnTukGAW6ssnuak6Mwcyb1wHy9MZc9xsUWqIoiazkZB5weECg==",
+         "version": "0.15.7",
+         "resolved": "https://registry.npmjs.org/polygon-clipping/-/polygon-clipping-0.15.7.tgz",
+         "integrity": "sha512-nhfdr83ECBg6xtqOAJab1tbksbBAOMUltN60bU+llHVOL0e5Onm1WpAXXWXVB39L8AJFssoIhEVuy/S90MmotA==",
         "dependencies": {
+            "robust-predicates": "^3.0.2",
            "splaytree": "^3.1.0"
         }
      },
+      "node_modules/robust-predicates": {
+         "version": "3.0.2",
+         "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
+         "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+      },
      "node_modules/semver": {
         "version": "7.5.4",
         "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@@ -142,6 +138,12 @@
         "resolved": "https://registry.npmjs.org/splaytree/-/splaytree-3.1.2.tgz",
         "integrity": "sha512-4OM2BJgC5UzrhVnnJA4BkHKGtjXNzzUfpQjCO8I05xYPsfS/VuQDwjCGGMi8rYQilHEV4j8NBqTFbls/PZEE7A=="
      },
+      "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/yallist": {
         "version": "4.0.0",
         "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -171,10 +173,10 @@
         "requires": {
            "@scrypted/sdk": "file:../sdk",
            "@scrypted/server": "file:../server",
-            "@types/node": "^16.9.0",
-            "http-auth-utils": "^3.0.2",
-            "node-fetch-commonjs": "^3.1.1",
-            "typescript": "^4.4.3"
+            "@types/node": "^20.11.0",
+            "http-auth-utils": "^5.0.1",
+            "ts-node": "^10.9.2",
+            "typescript": "^5.3.3"
         }
      },
      "@scrypted/sdk": {
@@ -184,7 +186,7 @@
            "@types/node": "^18.11.18",
            "@types/stringify-object": "^4.0.0",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -201,29 +203,21 @@
            "webpack-bundle-analyzer": "^4.5.0"
         }
      },
-      "@types/lodash": {
-         "version": "4.14.177",
-         "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-         "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
-         "dev": true
-      },
      "@types/node": {
-         "version": "14.17.33",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.33.tgz",
-         "integrity": "sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g==",
-         "dev": true
+         "version": "20.11.0",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
+         "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
+         "dev": true,
+         "requires": {
+            "undici-types": "~5.26.4"
+         }
      },
      "@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
      },
-      "lodash": {
-         "version": "4.17.21",
-         "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-         "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-      },
      "lru-cache": {
         "version": "6.0.0",
         "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -233,13 +227,19 @@
         }
      },
      "polygon-clipping": {
-         "version": "0.15.3",
-         "resolved": "https://registry.npmjs.org/polygon-clipping/-/polygon-clipping-0.15.3.tgz",
-         "integrity": "sha512-ho0Xx5DLkgxRx/+n4O74XyJ67DcyN3Tu9bGYKsnTukGAW6ssnuak6Mwcyb1wHy9MZc9xsUWqIoiazkZB5weECg==",
+         "version": "0.15.7",
+         "resolved": "https://registry.npmjs.org/polygon-clipping/-/polygon-clipping-0.15.7.tgz",
+         "integrity": "sha512-nhfdr83ECBg6xtqOAJab1tbksbBAOMUltN60bU+llHVOL0e5Onm1WpAXXWXVB39L8AJFssoIhEVuy/S90MmotA==",
         "requires": {
+            "robust-predicates": "^3.0.2",
            "splaytree": "^3.1.0"
         }
      },
+      "robust-predicates": {
+         "version": "3.0.2",
+         "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
+         "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+      },
      "semver": {
         "version": "7.5.4",
         "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@@ -253,6 +253,12 @@
         "resolved": "https://registry.npmjs.org/splaytree/-/splaytree-3.1.2.tgz",
         "integrity": "sha512-4OM2BJgC5UzrhVnnJA4BkHKGtjXNzzUfpQjCO8I05xYPsfS/VuQDwjCGGMi8rYQilHEV4j8NBqTFbls/PZEE7A=="
      },
+      "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
+      },
      "yallist": {
         "version": "4.0.0",
         "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
--- a/plugins/objectdetector/package.json
+++ b/plugins/objectdetector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/objectdetector",
-   "version": "0.1.19",
+   "version": "0.1.20",
   "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
   "author": "Scrypted",
   "license": "Apache-2.0",
@@ -45,13 +45,11 @@
   "dependencies": {
      "@scrypted/common": "file:../../common",
      "@scrypted/sdk": "file:../../sdk",
-      "lodash": "^4.17.21",
-      "polygon-clipping": "^0.15.3",
-      "semver": "^7.3.8"
+      "polygon-clipping": "^0.15.7",
+      "semver": "^7.5.4"
   },
   "devDependencies": {
-      "@types/lodash": "^4.14.175",
-      "@types/node": "^14.17.11",
-      "@types/semver": "^7.3.13"
+      "@types/node": "^20.11.0",
+      "@types/semver": "^7.5.6"
   }
 }
--- a/plugins/objectdetector/src/cpu-timer.ts
+++ b/plugins/objectdetector/src/cpu-timer.ts
@@ -0,0 +1,36 @@
+import { CpuInfo, cpus } from 'os';
+
+function getIdleTotal(cpu: CpuInfo) {
+    const t = cpu.times;
+    const total = t.user + t.nice + t.sys + t.idle + t.irq;
+    const idle = t.idle;
+    return {
+        idle,
+        total,
+    }
+}
+
+export class CpuTimer {
+    previousSample: ReturnType<typeof cpus>;
+
+    sample(): number {
+        const sample = cpus();
+        const previousSample = this.previousSample;
+        this.previousSample = sample;
+
+        // can cpu count change at runtime, who knows
+        if (!previousSample || previousSample.length !== sample.length)
+            return 0;
+
+        const times = sample.map((v, i) => {
+            const c = getIdleTotal(v);
+            const p = getIdleTotal(previousSample[i]);
+            const total = c.total - p.total;
+            const idle = c.idle - p.idle;
+            return 1 - idle / total;
+        });
+
+        const total = times.reduce((p, c) => p + c, 0);
+        return total / sample.length;
+    }
+}
--- a/plugins/objectdetector/src/main.ts
+++ b/plugins/objectdetector/src/main.ts
@@ -5,10 +5,9 @@ import { StorageSettings } from '@scrypted/sdk/storage-settings';
 import crypto from 'crypto';
 import { AutoenableMixinProvider } from "../../../common/src/autoenable-mixin-provider";
 import { SettingsMixinDeviceBase } from "../../../common/src/settings-mixin";
+import { CpuTimer } from './cpu-timer';
 import { FFmpegVideoFrameGenerator } from './ffmpeg-videoframes';
-import { getMaxConcurrentObjectDetectionSessions } from './performance-profile';
 import { insidePolygon, normalizeBox, polygonOverlap } from './polygon';
-import { serverSupportsMixinEventMasking } from './server-version';
 import { SMART_MOTIONSENSOR_PREFIX, SmartMotionSensor, createObjectDetectorStorageSetting } from './smart-motionsensor';
 import { getAllDevices, safeParseJson } from './util';

@@ -125,11 +124,14 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
    this.bindObjectDetection();
    this.register();

-    this.detectionIntervalTimeout = setInterval(async () => {
-      if (this.released)
-        return;
-      this.maybeStartDetection();
-    }, 60000);
+    // ensure motion sensors stay alive. plugin will manage object detection throttling.
+    if (this.hasMotionType) {
+      this.detectionIntervalTimeout = setInterval(async () => {
+        if (this.released)
+          return;
+        this.maybeStartDetection();
+      }, 60000);
+    }

    this.storageSettings.settings.zones.mapGet = () => Object.keys(this.zones);
    this.storageSettings.settings.zones.onGet = async () => {
@@ -187,8 +189,10 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
  maybeStartDetection() {
    if (!this.hasMotionType) {
      // object detection may be restarted if there are slots available.
-      if (this.cameraDevice.motionDetected && this.plugin.canStartObjectDetection(this))
+      if (this.cameraDevice.motionDetected && this.plugin.canStartObjectDetection(this)) {
        this.startPipelineAnalysis();
+        return true;
+      }
      return;
    }

@@ -238,7 +242,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
          return;
        }

-        this.startPipelineAnalysis();
+        this.maybeStartDetection();
      });

      return;
@@ -627,7 +631,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
  }

  get motionSensorSupplementation() {
-    if (!serverSupportsMixinEventMasking() || !this.interfaces.includes(ScryptedInterface.MotionSensor))
+    if (!this.interfaces.includes(ScryptedInterface.MotionSensor))
      return BUILTIN_MOTION_SENSOR_REPLACE;

    const supp = this.storage.getItem('motionSensorSupplementation');
@@ -934,19 +938,6 @@ export class ObjectDetectionPlugin extends AutoenableMixinProvider implements Se
  statsSnapshotDetections: number;
  statsSnapshotConcurrent = 0;
  storageSettings = new StorageSettings(this, {
-    maxConcurrentDetections: {
-      title: 'Max Concurrent Detections',
-      description: `The max number concurrent cameras that will perform object detection while their motion sensor is triggered. Older sessions will be terminated when the limit is reached. The default value is ${getMaxConcurrentObjectDetectionSessions()}.`,
-      defaultValue: 'Default',
-      combobox: true,
-      choices: [
-        'Default',
-        ...[2, 3, 4, 5, 6, 7, 8, 9, 10].map(i => i.toString()),
-      ],
-      mapPut: (o, v) => {
-        return parseInt(v) || 'Default';
-      }
-    },
    activeMotionDetections: {
      title: 'Active Motion Detection Sessions',
      multiple: true,
@@ -1010,6 +1001,8 @@ export class ObjectDetectionPlugin extends AutoenableMixinProvider implements Se
    },
  });
  devices = new Map<string, any>();
+  cpuTimer = new CpuTimer();
+  cpuUsage = 0;

  pruneOldStatistics() {
    const now = Date.now();
@@ -1024,69 +1017,53 @@ export class ObjectDetectionPlugin extends AutoenableMixinProvider implements Se
    this.statsSnapshotDetections++;
  }

-  get maxConcurrent() {
-    let maxConcurrent = this.storageSettings.values.maxConcurrentDetections || 'Default';
-    maxConcurrent = Math.max(parseInt(maxConcurrent)) || getMaxConcurrentObjectDetectionSessions();
-    return maxConcurrent;
-  }
-
  canStartObjectDetection(mixin: ObjectDetectionMixin) {
-    const maxConcurrent = this.maxConcurrent;
-
-    const runningDetections = [...this.currentMixins.values()]
-      .map(d => [...d.currentMixins.values()].filter(dd => !dd.hasMotionType)).flat()
-      .filter(c => c.detectorRunning)
-      .sort((a, b) => a.detectionStartTime - b.detectionStartTime);
+    const runningDetections = this.runningObjectDetections;

    // already running
    if (runningDetections.find(o => o.id === mixin.id))
      return false;

-    if (runningDetections.length < maxConcurrent)
+    if (!runningDetections.length)
      return true;

-    const [first] = runningDetections;
-    if (Date.now() - first.detectionStartTime > 30000)
-      return true;
+    const cpuPerDetector = this.cpuUsage / runningDetections.length;
+    const cpuPercent = Math.round(this.cpuUsage * 100);
+    if (cpuPerDetector * (runningDetections.length + 1) > .9) {
+      const [first] = runningDetections;
+      if (Date.now() - first.detectionStartTime > 30000) {
+        first.console.warn(`CPU is at capacity: ${cpuPercent} with ${runningDetections.length} cameras. Ending object detection to process activity on ${mixin.name}.`);
+        first.endObjectDetection();
+        mixin.console.warn(`CPU is at capacity: ${cpuPercent} with ${runningDetections.length} cameras. Ending object detection on ${first.name} to process activity.`);
+        return true;
+      }

-    mixin.console.log(`Not starting object detection to continue processing recent activity on ${first.name}.`);
-    return false;
+      mixin.console.warn(`CPU is at capacity: ${cpuPercent} with ${runningDetections.length} cameras. Not starting object detection to continue processing recent activity on ${first.name}.`);
+      return false;
+    }
+
+    // CPU capacity is fine
+    return true;
+  }
+
+  get runningObjectDetections() {
+    const runningDetections = [...this.currentMixins.values()]
+      .map(d => [...d.currentMixins.values()].filter(dd => !dd.hasMotionType)).flat()
+      .filter(c => c.detectorRunning)
+      .sort((a, b) => a.detectionStartTime - b.detectionStartTime);
+    return runningDetections;
  }

  objectDetectionStarted(name: string, console: Console) {
    this.resetStats(console);

    this.statsSnapshotConcurrent++;
-
-    const maxConcurrent = this.maxConcurrent;
-
-    const objectDetections = [...this.currentMixins.values()]
-      .map(d => [...d.currentMixins.values()].filter(dd => !dd.hasMotionType)).flat()
-      .filter(c => c.detectorRunning)
-      .sort((a, b) => a.detectionStartTime - b.detectionStartTime);
-
-    while (objectDetections.length > maxConcurrent) {
-      const old = objectDetections.shift();
-      // allow exceeding the concurrency limit if user interaction triggered analyze.
-      if (old.analyzeStop)
-        continue;
-      old.console.log(`Ending object detection to process activity on ${name}.`);
-      old.endObjectDetection();
-    }
  }

  objectDetectionEnded(console: Console) {
    this.resetStats(console);

    this.statsSnapshotConcurrent--;
-
-    const objectDetections = [...this.currentMixins.values()]
-      .map(d => [...d.currentMixins.values()].filter(dd => !dd.hasMotionType)).flat()
-      .filter(c => !c.detectorRunning);
-
-    for (const notRunning of objectDetections) {
-      notRunning.maybeStartDetection();
-    }
  }

  resetStats(console: Console) {
@@ -1126,7 +1103,34 @@ export class ObjectDetectionPlugin extends AutoenableMixinProvider implements Se
        ],
        nativeId: 'ffmpeg',
      })
-    })
+    });
+
+    setInterval(() => {
+      this.cpuUsage = this.cpuTimer.sample();
+      // this.console.log('cpu usage', Math.round(this.cpuUsage * 100));
+
+      const runningDetections = this.runningObjectDetections;
+
+      let allowStart = 1;
+      if (runningDetections.length) {
+        const cpuPerDetector = this.cpuUsage / runningDetections.length;
+        allowStart = Math.ceil(1 / cpuPerDetector) - runningDetections.length;
+        if (allowStart <= 0)
+          return;
+      }
+
+      const idleDetectors = [...this.currentMixins.values()]
+        .map(d => [...d.currentMixins.values()].filter(dd => !dd.hasMotionType)).flat()
+        .filter(c => !c.detectorRunning);
+
+      for (const notRunning of idleDetectors) {
+        if (notRunning.maybeStartDetection()) {
+          allowStart--;
+          if (allowStart <= 0)
+            return;
+        }
+      }
+    }, 10000)
  }

  async getDevice(nativeId: string): Promise<any> {
--- a/plugins/objectdetector/src/performance-profile.ts
+++ b/plugins/objectdetector/src/performance-profile.ts
@@ -1,32 +0,0 @@
-import os from 'os';
-
-let totalGigahertz = 0;
-
-export function getMaxConcurrentObjectDetectionSessions() {
-    const cpus = os.cpus();
-
-    // apple silicon cpu.speed is incorrect, and can handle quite a bit due to
-    // gpu decode and neural core usage.
-    // .5 detect per cpu is a conservative guess. so an m1 ultra would handle 10
-    // simultaneous camera detections.
-    // apple silicon also reports cpu speed as 24 mhz, so the following code would
-    // fail anyways.
-    if (process.platform === 'darwin' && process.arch === 'arm64')
-        return cpus.length * .5;
-
-    let speed = 0;
-    for (const cpu of cpus) {
-        // can cpu speed be zero? is that a thing?
-        speed += cpu.speed || 600;
-    }
-
-    totalGigahertz = Math.max(speed, totalGigahertz);
-
-    // a wyse 5070 self reports in description as 1.5ghz and has 4 cores and can comfortably handle
-    // two 2k detections at the same time.
-    // the speed reported while detecting caps at 2500, presumably due to burst?
-    // 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, Math.round(totalGigahertz / 4000));
-}
--- a/plugins/objectdetector/src/server-version.ts
+++ b/plugins/objectdetector/src/server-version.ts
@@ -1,13 +0,0 @@
-import semver from 'semver';
-import sdk from '@scrypted/sdk';
-
-export function serverSupportsMixinEventMasking() {
-    try {
-        if (!sdk.serverVersion)
-            return false;
-        return semver.gte(sdk.serverVersion, '0.5.0');
-    }
-    catch (e) {
-    }
-    return false;
-}
--- a/plugins/onvif/package-lock.json
+++ b/plugins/onvif/package-lock.json
@@ -1,26 +1,25 @@
 {
   "name": "@scrypted/onvif",
-   "version": "0.1.5",
+   "version": "0.1.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/onvif",
-         "version": "0.1.5",
+         "version": "0.1.7",
         "license": "Apache",
         "dependencies": {
            "@scrypted/common": "file:../../common",
            "@scrypted/sdk": "file:../../sdk",
            "base-64": "^1.0.0",
-            "http-auth-utils": "^4.0.0",
            "md5": "^2.3.0",
            "onvif": "file:./onvif",
-            "xml2js": "^0.6.0"
+            "xml2js": "^0.6.2"
         },
         "devDependencies": {
-            "@types/md5": "^2.3.2",
-            "@types/node": "^20.3.2",
-            "@types/xml2js": "^0.4.11"
+            "@types/md5": "^2.3.5",
+            "@types/node": "^20.11.0",
+            "@types/xml2js": "^0.4.14"
         }
      },
      "../../common": {
@@ -30,7 +29,7 @@
         "dependencies": {
            "@scrypted/sdk": "file:../sdk",
            "@scrypted/server": "file:../server",
-            "http-auth-utils": "^3.0.2",
+            "http-auth-utils": "^5.0.1",
            "node-fetch-commonjs": "^3.1.1",
            "typescript": "^5.3.3"
         },
@@ -46,7 +45,7 @@
         "dependencies": {
            "@babel/preset-typescript": "^7.18.6",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -828,24 +827,24 @@
         "link": true
      },
      "node_modules/@types/md5": {
-         "version": "2.3.2",
-         "resolved": "https://registry.npmjs.org/@types/md5/-/md5-2.3.2.tgz",
-         "integrity": "sha512-v+JFDu96+UYJ3/UWzB0mEglIS//MZXgRaJ4ubUPwOM0gvLc/kcQ3TWNYwENEK7/EcXGQVrW8h/XqednSjBd/Og==",
+         "version": "2.3.5",
+         "resolved": "https://registry.npmjs.org/@types/md5/-/md5-2.3.5.tgz",
+         "integrity": "sha512-/i42wjYNgE6wf0j2bcTX6kuowmdL/6PE4IVitMpm2eYKBUuYCprdcWVK+xEF0gcV6ufMCRhtxmReGfc6hIK7Jw==",
         "dev": true
      },
      "node_modules/@types/node": {
-         "version": "20.10.6",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz",
-         "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==",
+         "version": "20.11.0",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
+         "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
         "dev": true,
         "dependencies": {
            "undici-types": "~5.26.4"
         }
      },
      "node_modules/@types/xml2js": {
-         "version": "0.4.11",
-         "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.11.tgz",
-         "integrity": "sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==",
+         "version": "0.4.14",
+         "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.14.tgz",
+         "integrity": "sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==",
         "dev": true,
         "dependencies": {
            "@types/node": "*"
@@ -2123,17 +2122,6 @@
         "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
         "dev": true
      },
-      "node_modules/http-auth-utils": {
-         "version": "4.0.0",
-         "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-4.0.0.tgz",
-         "integrity": "sha512-jdX1sda7HuAOmCqHJ4FoYFEO6P3x9PQosEyZMqpi3EUsB/HxnoqauRThLelBTeOs+osAu8Y3VTdo4G4fdXk2Ig==",
-         "dependencies": {
-            "yerror": "^6.2.1"
-         },
-         "engines": {
-            "node": ">=16.15.0"
-         }
-      },
      "node_modules/http-signature": {
         "version": "1.2.0",
         "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -4119,14 +4107,6 @@
            "url": "https://github.com/sponsors/sindresorhus"
         }
      },
-      "node_modules/yerror": {
-         "version": "6.2.1",
-         "resolved": "https://registry.npmjs.org/yerror/-/yerror-6.2.1.tgz",
-         "integrity": "sha512-WPZgybhCBzsMSSqGYBnj20NZo4FiFKQG0+i/21cYGVd4B7eYtvYDOpjk/0e8UM1eVHJ+4Ja6bZ7TAjHH6mk+ew==",
-         "engines": {
-            "node": ">=12.19.0"
-         }
-      },
      "node_modules/yocto-queue": {
         "version": "0.1.0",
         "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
--- a/plugins/onvif/package.json
+++ b/plugins/onvif/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/onvif",
-   "version": "0.1.5",
+   "version": "0.1.7",
   "description": "ONVIF Camera Plugin for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
@@ -39,14 +39,13 @@
      "@scrypted/common": "file:../../common",
      "@scrypted/sdk": "file:../../sdk",
      "base-64": "^1.0.0",
-      "http-auth-utils": "^4.0.0",
      "md5": "^2.3.0",
      "onvif": "file:./onvif",
-      "xml2js": "^0.6.0"
+      "xml2js": "^0.6.2"
   },
   "devDependencies": {
-      "@types/md5": "^2.3.2",
-      "@types/node": "^20.3.2",
-      "@types/xml2js": "^0.4.11"
+      "@types/md5": "^2.3.5",
+      "@types/node": "^20.11.0",
+      "@types/xml2js": "^0.4.14"
   }
 }
--- a/plugins/onvif/src/onvif-api.ts
+++ b/plugins/onvif/src/onvif-api.ts
@@ -1,12 +1,7 @@
-import { AuthFetchCredentialState, AuthFetchOptions, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
+import { HttpFetchOptions, HttpFetchResponseType, AuthFetchCredentialState, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
 import { EventEmitter } from 'events';
-import https, { RequestOptions } from 'https';
+import https from 'https';
 import { Readable } from 'stream';
-import { FetchParser, HttpFetchOptions, HttpFetchResponseType } from '../../../server/src/http-fetch-helpers';
-
-const httpsAgent = new https.Agent({
-    rejectUnauthorized: false,
-})

 const onvif = require('onvif');
 const { Cam } = onvif;
@@ -71,17 +66,15 @@ export class OnvifCameraAPI {
        };
    }

-    async request<T extends HttpFetchResponseType>(urlOrOptions: string | URL | HttpFetchOptions<T>, body?: Readable) {
-        const options: AuthFetchOptions<T> = {
+    async request(urlOrOptions: string | URL | HttpFetchOptions<Readable>, body?: Readable) {
+        const response = await authHttpFetch({
            ...typeof urlOrOptions !== 'string' && !(urlOrOptions instanceof URL) ? urlOrOptions : {
                url: urlOrOptions,
            },
            rejectUnauthorized: false,
            credential: this.credential,
            body,
-        };
-
-        const response = await authHttpFetch(options);
+        });
        return response;
    }

--- a/plugins/reolink/.vscode/launch.json
+++ b/plugins/reolink/.vscode/launch.json
@@ -10,7 +10,7 @@
            "port": 10081,
            "request": "attach",
            "skipFiles": [
-                "**/plugin-remote-worker.*",
+                "**/plugin-console.*",
                "<node_internals>/**"
            ],
            "preLaunchTask": "scrypted: deploy+debug",
--- a/plugins/reolink/src/reolink-api.ts
+++ b/plugins/reolink/src/reolink-api.ts
@@ -2,7 +2,7 @@ import { AuthFetchCredentialState, AuthFetchOptions, authHttpFetch } from '@scry
 import { EventEmitter } from 'events';
 import https, { RequestOptions } from 'https';
 import { PassThrough, Readable } from 'stream';
-import {  HttpFetchOptions, HttpFetchResponseType } from '../../../server/src/http-fetch-helpers';
+import { HttpFetchOptions, HttpFetchResponseType } from '../../../server/src/fetch/http-fetch';

 import { getMotionState, reolinkHttpsAgent } from './probe';
 import { PanTiltZoomCommand } from "@scrypted/sdk";
@@ -69,17 +69,15 @@ export class ReolinkCameraClient {
        };
    }

-    async request<T extends HttpFetchResponseType>(urlOrOptions: string | URL | HttpFetchOptions<T>, body?: Readable) {
-        const options: AuthFetchOptions<T> = {
+    async request(urlOrOptions: string | URL | HttpFetchOptions<Readable>, body?: Readable) {
+        const response = await authHttpFetch({
            ...typeof urlOrOptions !== 'string' && !(urlOrOptions instanceof URL) ? urlOrOptions : {
                url: urlOrOptions,
            },
            rejectUnauthorized: false,
            credential: this.credential,
            body,
-        };
-
-        const response = await authHttpFetch(options);
+        });
        return response;
    }

--- a/plugins/snapshot/package-lock.json
+++ b/plugins/snapshot/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/snapshot",
-   "version": "0.2.31",
+   "version": "0.2.33",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/snapshot",
-         "version": "0.2.31",
+         "version": "0.2.33",
         "dependencies": {
            "@types/node": "^20.10.6",
            "sharp": "^0.33.1",
--- a/plugins/snapshot/package.json
+++ b/plugins/snapshot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/snapshot",
-   "version": "0.2.31",
+   "version": "0.2.33",
   "description": "Snapshot Plugin for Scrypted",
   "scripts": {
      "scrypted-setup-project": "scrypted-setup-project",
--- a/plugins/snapshot/src/main.ts
+++ b/plugins/snapshot/src/main.ts
@@ -8,7 +8,6 @@ import https from 'https';
 import os from 'os';
 import path from 'path';
 import url from 'url';
-import { BufferParser } from "../../../server/src/http-fetch-helpers";
 import { ffmpegFilterImage, ffmpegFilterImageBuffer } from './ffmpeg-image-filter';
 import { ImageConverter, ImageConverterNativeId } from './image-converter';
 import { ImageReader, ImageReaderNativeId, loadSharp, loadVipsImage } from './image-reader';
@@ -220,22 +219,21 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
            let credential: AuthFetchCredentialState;
            if (username && password) {
                credential = {
-                    username, 
+                    username,
                    password,
                };
            }

            try {
                const response = await authHttpFetch({
-                    httpsAgent,
+                    rejectUnauthorized: false,
                    url: this.storageSettings.values.snapshotUrl,
                    credential,
-                }, {
                    timeout: 60000,
                    headers: {
                        'Accept': 'image/*',
-                    }
-                }, BufferParser);
+                    },
+                });

                return response.body;
            }
@@ -271,9 +269,10 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
    async takePictureRaw(options?: RequestPictureOptions): Promise<Buffer> {
        let picture: Buffer;
        const eventSnapshot = options?.reason === 'event';
+        const periodicSnapshot = options?.reason === 'periodic';

        try {
-            picture = await this.snapshotDebouncer({
+            const debounced = this.snapshotDebouncer({
                id: options?.id,
                reason: options?.reason,
            }, eventSnapshot ? 0 : 2000, async () => {
@@ -285,6 +284,16 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
                this.lastAvailablePicture = picture;
                return picture;
            });
+
+            // periodic snapshot should get the immediately available picture.
+            // the debounce has already triggered a refresh for the next go around.
+            if (periodicSnapshot && this.currentPicture) {
+                debounced.catch(() => {});
+                picture = this.currentPicture;
+            }
+            else {
+                picture = await debounced;
+            }
        }
        catch (e) {
            // use the fallback cached picture if it is somewhat recent.
@@ -664,6 +673,7 @@ export class SnapshotPlugin extends AutoenableMixinProvider implements MixinProv
            const mixin = this.mixinDevices.get(id);
            let buffer: Buffer;
            const rpo: RequestPictureOptions = {
+                reason: search.get('reason') as 'event' | 'periodic',
                picture: {
                    width: parseInt(search.get('width')) || undefined,
                    height: parseInt(search.get('height')) || undefined,
--- a/sdk/bin/scrypted-webpack.js
+++ b/sdk/bin/scrypted-webpack.js
@@ -223,11 +223,16 @@ else {
                    // create a zip that has a main.js in the root, and an fs folder containing a read only virtual file system.
                    // todo: read write file system? seems like a potential sandbox and backup nightmare to do a real fs. scripts should
                    // use localStorage, etc?
-                    zip.addLocalFile(path.join(out, runtime.output));
-                    const sourcemap = path.join(out, runtime.output + '.map');
-                    if (fs.existsSync(sourcemap))
-                        zip.addLocalFile(sourcemap);
-                    console.log(runtime.output);
+                    const jsFiles = fs.readdirSync(out, {
+                        withFileTypes: true
+                    }).filter(ft => ft.isFile() && ft.name.endsWith('.js')).map(ft => ft.name);
+                    for (const js of jsFiles) {
+                        zip.addLocalFile(path.join(out, js));
+                        const sourcemap = path.join(out, js + '.map');
+                        if (fs.existsSync(sourcemap))
+                            zip.addLocalFile(sourcemap);
+                        console.log(js);
+                    }
                    resolve();
                })
            });
--- a/sdk/src/index.ts
+++ b/sdk/src/index.ts
@@ -198,7 +198,7 @@ export interface MixinDeviceOptions<T> {
 })();


-let sdk: ScryptedStatic = {} as any;
+export const sdk: ScryptedStatic = {} as any;
 declare const deviceManager: DeviceManager;
 declare const endpointManager: EndpointManager;
 declare const mediaManager: MediaManager;
@@ -214,7 +214,7 @@ try {
  catch (e) {
  }

-  sdk = Object.assign(sdk, {
+  Object.assign(sdk, {
    log: deviceManager.getDeviceLogger(undefined),
    deviceManager,
    endpointManager,
--- a/sdk/types/scrypted_python/scrypted_sdk/types.py
+++ b/sdk/types/scrypted_python/scrypted_sdk/types.py
@@ -698,7 +698,7 @@ class RequestPictureOptions(TypedDict):
    id: str
    periodicRequest: bool  # Flag that hints whether this user request is happening due to a periodic refresh.
    picture: PictureDimensions  # The native dimensions of the camera.
-    reason: Any | Any
+    reason: Any | Any  # periodic: The requestor will request the snapshot periodically so a recent cached image may be returned. event: The requestor needs an image for event processing or thumbnail. Cached or error images will not be returned.

 class RequestRecordingStreamOptions(TypedDict):
    """Options passed to VideoCamera.getVideoStream to request specific media formats. The audio/video properties may be omitted to indicate no audio/video is available when calling getVideoStreamOptions or no audio/video is requested when calling getVideoStream."""
--- a/sdk/types/src/types.input.ts
+++ b/sdk/types/src/types.input.ts
@@ -440,7 +440,11 @@ export interface ResponsePictureOptions extends PictureOptions {
  staleDuration?: number;
 }
 export interface RequestPictureOptions extends PictureOptions {
-  reason?: 'user' | 'event';
+  /**
+   * periodic: The requestor will request the snapshot periodically so a recent cached image may be returned.
+   * event: The requestor needs an image for event processing or thumbnail. Cached or error images will not be returned.
+   */
+  reason?: 'periodic' | 'event';
  /**
   * Flag that hints whether this user request is happening due to a periodic refresh.
   */
--- a/sdk/webpack.nodejs.config.js
+++ b/sdk/webpack.nodejs.config.js
@@ -34,6 +34,9 @@ const plugins = [
    new webpack.DefinePlugin({
        'process.env.SSDP_COV': false,
    }),
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1,
+    }),
 ];

 if (process.env.WEBPACK_ANALYZER) {
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@scrypted/server",
-  "version": "0.81.0",
+  "version": "0.83.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@scrypted/server",
-      "version": "0.81.0",
+      "version": "0.83.0",
      "license": "ISC",
      "dependencies": {
        "@mapbox/node-pre-gyp": "^1.0.11",
@@ -18,21 +18,21 @@
        "engine.io": "^6.5.4",
        "express": "^4.18.2",
        "ffmpeg-static": "^5.2.0",
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.5",
        "http-auth": "^4.2.0",
        "ip": "^1.1.8",
        "level": "^8.0.0",
        "linkfs": "^2.1.0",
        "lodash": "^4.17.21",
        "memfs": "^4.6.0",
-        "mime": "^3.0.0",
+        "mime": "^4.0.1",
        "nan": "^2.18.0",
        "node-dijkstra": "^2.5.0",
        "node-forge": "^1.3.1",
        "node-gyp": "^10.0.1",
        "router": "^1.3.8",
        "semver": "^7.5.4",
-        "sharp": "^0.33.1",
+        "sharp": "^0.33.2",
        "source-map-support": "^0.5.21",
        "tar": "^6.2.0",
        "tslib": "^2.6.2",
@@ -54,7 +54,7 @@
        "@types/lodash": "^4.14.202",
        "@types/mime": "^3.0.4",
        "@types/node-dijkstra": "^2.5.6",
-        "@types/node-forge": "^1.3.10",
+        "@types/node-forge": "^1.3.11",
        "@types/pem": "^1.14.4",
        "@types/semver": "^7.5.6",
        "@types/source-map-support": "^0.5.10",
@@ -81,18 +81,18 @@
      }
    },
    "node_modules/@emnapi/runtime": {
-      "version": "0.44.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.44.0.tgz",
-      "integrity": "sha512-ZX/etZEZw8DR7zAB1eVQT40lNo0jeqpb6dCgOvctB6FIQ5PoXfMuNY8+ayQfu8tNQbAB8gQWSSJupR8NxeiZXw==",
+      "version": "0.45.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.45.0.tgz",
+      "integrity": "sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w==",
      "optional": true,
      "dependencies": {
        "tslib": "^2.4.0"
      }
    },
    "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.1.tgz",
-      "integrity": "sha512-esr2BZ1x0bo+wl7Gx2hjssYhjrhUsD88VQulI0FrG8/otRQUOxLWHMBd1Y1qo2Gfg2KUvXNpT0ASnV9BzJCexw==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.2.tgz",
+      "integrity": "sha512-itHBs1rPmsmGF9p4qRe++CzCgd+kFYktnsoR1sbIAfsRMrJZau0Tt1AH9KVnufc2/tU02Gf6Ibujx+15qRE03w==",
      "cpu": [
        "arm64"
      ],
@@ -111,13 +111,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.0.0"
+        "@img/sharp-libvips-darwin-arm64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.1.tgz",
-      "integrity": "sha512-YrnuB3bXuWdG+hJlXtq7C73lF8ampkhU3tMxg5Hh+E7ikxbUVOU9nlNtVTloDXz6pRHt2y2oKJq7DY/yt+UXYw==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.2.tgz",
+      "integrity": "sha512-/rK/69Rrp9x5kaWBjVN07KixZanRr+W1OiyKdXcbjQD6KbW+obaTeBBtLUAtbBsnlTTmWthw99xqoOS7SsySDg==",
      "cpu": [
        "x64"
      ],
@@ -136,13 +136,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.0.0"
+        "@img/sharp-libvips-darwin-x64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.0.tgz",
-      "integrity": "sha512-VzYd6OwnUR81sInf3alj1wiokY50DjsHz5bvfnsFpxs5tqQxESoHtJO6xyksDs3RIkyhMWq2FufXo6GNSU9BMw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.1.tgz",
+      "integrity": "sha512-kQyrSNd6lmBV7O0BUiyu/OEw9yeNGFbQhbxswS1i6rMDwBBSX+e+rPzu3S+MwAiGU3HdLze3PanQ4Xkfemgzcw==",
      "cpu": [
        "arm64"
      ],
@@ -161,9 +161,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.0.tgz",
-      "integrity": "sha512-dD9OznTlHD6aovRswaPNEy8dKtSAmNo4++tO7uuR4o5VxbVAOoEQ1uSmN4iFAdQneTHws1lkTZeiXPrcCkh6IA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.1.tgz",
+      "integrity": "sha512-eVU/JYLPVjhhrd8Tk6gosl5pVlvsqiFlt50wotCvdkFGf+mDNBJxMh+bvav+Wt3EBnNZWq8Sp2I7XfSjm8siog==",
      "cpu": [
        "x64"
      ],
@@ -182,9 +182,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.0.tgz",
-      "integrity": "sha512-VwgD2eEikDJUk09Mn9Dzi1OW2OJFRQK+XlBTkUNmAWPrtj8Ly0yq05DFgu1VCMx2/DqCGQVi5A1dM9hTmxf3uw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.1.tgz",
+      "integrity": "sha512-FtdMvR4R99FTsD53IA3LxYGghQ82t3yt0ZQ93WMZ2xV3dqrb0E8zq4VHaTOuLEAuA83oDawHV3fd+BsAPadHIQ==",
      "cpu": [
        "arm"
      ],
@@ -203,9 +203,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.0.tgz",
-      "integrity": "sha512-xTYThiqEZEZc0PRU90yVtM3KE7lw1bKdnDQ9kCTHWbqWyHOe4NpPOtMGy27YnN51q0J5dqRrvicfPbALIOeAZA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.1.tgz",
+      "integrity": "sha512-bnGG+MJjdX70mAQcSLxgeJco11G+MxTz+ebxlz8Y3dxyeb3Nkl7LgLI0mXupoO+u1wRNx/iRj5yHtzA4sde1yA==",
      "cpu": [
        "arm64"
      ],
@@ -224,9 +224,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linux-s390x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.0.tgz",
-      "integrity": "sha512-o9E46WWBC6JsBlwU4QyU9578G77HBDT1NInd+aERfxeOPbk0qBZHgoDsQmA2v9TbqJRWzoBPx1aLOhprBMgPjw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.1.tgz",
+      "integrity": "sha512-3+rzfAR1YpMOeA2zZNp+aYEzGNWK4zF3+sdMxuCS3ey9HhDbJ66w6hDSHDMoap32DueFwhhs3vwooAB2MaK4XQ==",
      "cpu": [
        "s390x"
      ],
@@ -245,9 +245,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.0.tgz",
-      "integrity": "sha512-naldaJy4hSVhWBgEjfdBY85CAa4UO+W1nx6a1sWStHZ7EUfNiuBTTN2KUYT5dH1+p/xij1t2QSXfCiFJoC5S/Q==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.1.tgz",
+      "integrity": "sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw==",
      "cpu": [
        "x64"
      ],
@@ -266,9 +266,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.0.tgz",
-      "integrity": "sha512-OdorplCyvmSAPsoJLldtLh3nLxRrkAAAOHsGWGDYfN0kh730gifK+UZb3dWORRa6EusNqCTjfXV4GxvgJ/nPDQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.1.tgz",
+      "integrity": "sha512-5aBRcjHDG/T6jwC3Edl3lP8nl9U2Yo8+oTl5drd1dh9Z1EBfzUKAJFUDTDisDjUwc7N4AjnPGfCA3jl3hY8uDg==",
      "cpu": [
        "arm64"
      ],
@@ -287,9 +287,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.0.tgz",
-      "integrity": "sha512-FW8iK6rJrg+X2jKD0Ajhjv6y74lToIBEvkZhl42nZt563FfxkCYacrXZtd+q/sRQDypQLzY5WdLkVTbJoPyqNg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.1.tgz",
+      "integrity": "sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw==",
      "cpu": [
        "x64"
      ],
@@ -308,9 +308,9 @@
      }
    },
    "node_modules/@img/sharp-linux-arm": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.1.tgz",
-      "integrity": "sha512-Ii4X1vnzzI4j0+cucsrYA5ctrzU9ciXERfJR633S2r39CiD8npqH2GMj63uFZRCFt3E687IenAdbwIpQOJ5BNA==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.2.tgz",
+      "integrity": "sha512-Fndk/4Zq3vAc4G/qyfXASbS3HBZbKrlnKZLEJzPLrXoJuipFNNwTes71+Ki1hwYW5lch26niRYoZFAtZVf3EGA==",
      "cpu": [
        "arm"
      ],
@@ -329,13 +329,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.0.0"
+        "@img/sharp-libvips-linux-arm": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.1.tgz",
-      "integrity": "sha512-59B5GRO2d5N3tIfeGHAbJps7cLpuWEQv/8ySd9109ohQ3kzyCACENkFVAnGPX00HwPTQcaBNF7HQYEfZyZUFfw==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.2.tgz",
+      "integrity": "sha512-pz0NNo882vVfqJ0yNInuG9YH71smP4gRSdeL09ukC2YLE6ZyZePAlWKEHgAzJGTiOh8Qkaov6mMIMlEhmLdKew==",
      "cpu": [
        "arm64"
      ],
@@ -354,13 +354,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.0.0"
+        "@img/sharp-libvips-linux-arm64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linux-s390x": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.1.tgz",
-      "integrity": "sha512-tRGrb2pHnFUXpOAj84orYNxHADBDIr0J7rrjwQrTNMQMWA4zy3StKmMvwsI7u3dEZcgwuMMooIIGWEWOjnmG8A==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.2.tgz",
+      "integrity": "sha512-MBoInDXDppMfhSzbMmOQtGfloVAflS2rP1qPcUIiITMi36Mm5YR7r0ASND99razjQUpHTzjrU1flO76hKvP5RA==",
      "cpu": [
        "s390x"
      ],
@@ -379,13 +379,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linux-s390x": "1.0.0"
+        "@img/sharp-libvips-linux-s390x": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linux-x64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.1.tgz",
-      "integrity": "sha512-4y8osC0cAc1TRpy02yn5omBeloZZwS62fPZ0WUAYQiLhSFSpWJfY/gMrzKzLcHB9ulUV6ExFiu2elMaixKDbeg==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.2.tgz",
+      "integrity": "sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A==",
      "cpu": [
        "x64"
      ],
@@ -404,13 +404,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.0.0"
+        "@img/sharp-libvips-linux-x64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.1.tgz",
-      "integrity": "sha512-D3lV6clkqIKUizNS8K6pkuCKNGmWoKlBGh5p0sLO2jQERzbakhu4bVX1Gz+RS4vTZBprKlWaf+/Rdp3ni2jLfA==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.2.tgz",
+      "integrity": "sha512-F+0z8JCu/UnMzg8IYW1TMeiViIWBVg7IWP6nE0p5S5EPQxlLd76c8jYemG21X99UzFwgkRo5yz2DS+zbrnxZeA==",
      "cpu": [
        "arm64"
      ],
@@ -429,13 +429,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.0.0"
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.1.tgz",
-      "integrity": "sha512-LOGKNu5w8uu1evVqUAUKTix2sQu1XDRIYbsi5Q0c/SrXhvJ4QyOx+GaajxmOg5PZSsSnCYPSmhjHHsRBx06/wQ==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.2.tgz",
+      "integrity": "sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A==",
      "cpu": [
        "x64"
      ],
@@ -454,19 +454,19 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.0.0"
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-wasm32": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.1.tgz",
-      "integrity": "sha512-vWI/sA+0p+92DLkpAMb5T6I8dg4z2vzCUnp8yvxHlwBpzN8CIcO3xlSXrLltSvK6iMsVMNswAv+ub77rsf25lA==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.2.tgz",
+      "integrity": "sha512-fLbTaESVKuQcpm8ffgBD7jLb/CQLcATju/jxtTXR1XCLwbOQt+OL5zPHSDMmp2JZIeq82e18yE0Vv7zh6+6BfQ==",
      "cpu": [
        "wasm32"
      ],
      "optional": true,
      "dependencies": {
-        "@emnapi/runtime": "^0.44.0"
+        "@emnapi/runtime": "^0.45.0"
      },
      "engines": {
        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
@@ -479,9 +479,9 @@
      }
    },
    "node_modules/@img/sharp-win32-ia32": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.1.tgz",
-      "integrity": "sha512-/xhYkylsKL05R+NXGJc9xr2Tuw6WIVl2lubFJaFYfW4/MQ4J+dgjIo/T4qjNRizrqs/szF/lC9a5+updmY9jaQ==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.2.tgz",
+      "integrity": "sha512-okBpql96hIGuZ4lN3+nsAjGeggxKm7hIRu9zyec0lnfB8E7Z6p95BuRZzDDXZOl2e8UmR4RhYt631i7mfmKU8g==",
      "cpu": [
        "ia32"
      ],
@@ -500,9 +500,9 @@
      }
    },
    "node_modules/@img/sharp-win32-x64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.1.tgz",
-      "integrity": "sha512-XaM69X0n6kTEsp9tVYYLhXdg7Qj32vYJlAKRutxUsm1UlgQNx6BOhHwZPwukCGXBU2+tH87ip2eV1I/E8MQnZg==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.2.tgz",
+      "integrity": "sha512-E4magOks77DK47FwHUIGH0RYWSgRBfGdK56kIHSVeB9uIS4pPFr4N2kIVsXdQQo4LzOsENKV5KAhRlRL7eMAdg==",
      "cpu": [
        "x64"
      ],
@@ -804,9 +804,9 @@
      "dev": true
    },
    "node_modules/@types/node-forge": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.10.tgz",
-      "integrity": "sha512-y6PJDYN4xYBxwd22l+OVH35N+1fCYWiuC3aiP2SlXVE6Lo7SS+rSx9r89hLxrP4pn6n1lBGhHJ12pj3F3Mpttw==",
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
      "dev": true,
      "dependencies": {
        "@types/node": "*"
@@ -1865,9 +1865,9 @@
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
    },
    "node_modules/follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
      "funding": [
        {
          "type": "individual",
@@ -2491,14 +2491,17 @@
      }
    },
    "node_modules/mime": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
-      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.1.tgz",
+      "integrity": "sha512-5lZ5tyrIfliMXzFtkYyekWbtRXObT9OWa8IwQ5uxTBDHucNNwniRqo0yInflj+iYi5CBa6qxadGzGarDfuEOxA==",
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
      "bin": {
-        "mime": "cli.js"
+        "mime": "bin/cli.js"
      },
      "engines": {
-        "node": ">=10.0.0"
+        "node": ">=16"
      }
    },
    "node_modules/mime-db": {
@@ -3584,9 +3587,9 @@
      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
    },
    "node_modules/sharp": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.1.tgz",
-      "integrity": "sha512-iAYUnOdTqqZDb3QjMneBKINTllCJDZ3em6WaWy7NPECM4aHncvqHRm0v0bN9nqJxMiwamv5KIdauJ6lUzKDpTQ==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.2.tgz",
+      "integrity": "sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ==",
      "hasInstallScript": true,
      "dependencies": {
        "color": "^4.2.3",
@@ -3594,32 +3597,32 @@
        "semver": "^7.5.4"
      },
      "engines": {
-        "libvips": ">=8.15.0",
+        "libvips": ">=8.15.1",
        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
      },
      "funding": {
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "0.33.1",
-        "@img/sharp-darwin-x64": "0.33.1",
-        "@img/sharp-libvips-darwin-arm64": "1.0.0",
-        "@img/sharp-libvips-darwin-x64": "1.0.0",
-        "@img/sharp-libvips-linux-arm": "1.0.0",
-        "@img/sharp-libvips-linux-arm64": "1.0.0",
-        "@img/sharp-libvips-linux-s390x": "1.0.0",
-        "@img/sharp-libvips-linux-x64": "1.0.0",
-        "@img/sharp-libvips-linuxmusl-arm64": "1.0.0",
-        "@img/sharp-libvips-linuxmusl-x64": "1.0.0",
-        "@img/sharp-linux-arm": "0.33.1",
-        "@img/sharp-linux-arm64": "0.33.1",
-        "@img/sharp-linux-s390x": "0.33.1",
-        "@img/sharp-linux-x64": "0.33.1",
-        "@img/sharp-linuxmusl-arm64": "0.33.1",
-        "@img/sharp-linuxmusl-x64": "0.33.1",
-        "@img/sharp-wasm32": "0.33.1",
-        "@img/sharp-win32-ia32": "0.33.1",
-        "@img/sharp-win32-x64": "0.33.1"
+        "@img/sharp-darwin-arm64": "0.33.2",
+        "@img/sharp-darwin-x64": "0.33.2",
+        "@img/sharp-libvips-darwin-arm64": "1.0.1",
+        "@img/sharp-libvips-darwin-x64": "1.0.1",
+        "@img/sharp-libvips-linux-arm": "1.0.1",
+        "@img/sharp-libvips-linux-arm64": "1.0.1",
+        "@img/sharp-libvips-linux-s390x": "1.0.1",
+        "@img/sharp-libvips-linux-x64": "1.0.1",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.1",
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.1",
+        "@img/sharp-linux-arm": "0.33.2",
+        "@img/sharp-linux-arm64": "0.33.2",
+        "@img/sharp-linux-s390x": "0.33.2",
+        "@img/sharp-linux-x64": "0.33.2",
+        "@img/sharp-linuxmusl-arm64": "0.33.2",
+        "@img/sharp-linuxmusl-x64": "0.33.2",
+        "@img/sharp-wasm32": "0.33.2",
+        "@img/sharp-win32-ia32": "0.33.2",
+        "@img/sharp-win32-x64": "0.33.2"
      }
    },
    "node_modules/shebang-command": {
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@scrypted/server",
-  "version": "0.81.0",
+  "version": "0.83.0",
  "description": "",
  "dependencies": {
    "@mapbox/node-pre-gyp": "^1.0.11",
@@ -12,7 +12,7 @@
    "engine.io": "^6.5.4",
    "express": "^4.18.2",
    "ffmpeg-static": "^5.2.0",
-    "follow-redirects": "^1.15.4",
+    "follow-redirects": "^1.15.5",
    "http-auth": "^4.2.0",
    "ip": "^1.1.8",
    "level": "^8.0.0",
@@ -26,7 +26,7 @@
    "node-gyp": "^10.0.1",
    "router": "^1.3.8",
    "semver": "^7.5.4",
-    "sharp": "^0.33.1",
+    "sharp": "^0.33.2",
    "source-map-support": "^0.5.21",
    "tar": "^6.2.0",
    "tslib": "^2.6.2",
@@ -45,7 +45,7 @@
    "@types/lodash": "^4.14.202",
    "@types/mime": "^3.0.4",
    "@types/node-dijkstra": "^2.5.6",
-    "@types/node-forge": "^1.3.10",
+    "@types/node-forge": "^1.3.11",
    "@types/pem": "^1.14.4",
    "@types/semver": "^7.5.6",
    "@types/source-map-support": "^0.5.10",
--- a/server/src/http-fetch-helpers.ts
+++ b/server/src/http-fetch-helpers.ts
@@ -1,109 +1,46 @@
-import { once } from 'events';
-import { http, https } from 'follow-redirects';
-import { IncomingMessage } from 'http';
+import type events from 'events';
+import type stream from 'stream';
+import type followRedirects from 'follow-redirects';
+import type { IncomingMessage } from 'http';
 import type { Readable } from 'stream';
-
-export type HttpFetchResponseType = 'json' | 'text' | 'buffer' | 'readable';
-export interface HttpFetchOptions<T extends HttpFetchResponseType> {
-    url: string | URL;
-    family?: 4 | 6;
-    method?: string;
-    headers?: HeadersInit;
-    timeout?: number;
-    rejectUnauthorized?: boolean;
-    ignoreStatusCode?: boolean;
-    body?: Readable;
-    responseType?: T;
-}
-
-export interface HttpFetchJsonOptions extends HttpFetchOptions<'json'> {
-}
-
-export interface HttpFetchBufferOptions extends HttpFetchOptions<'buffer'> {
-}
-
-export interface HttpFetchTextOptions extends HttpFetchOptions<'text'> {
-}
-export interface HttpFetchReadableOptions extends HttpFetchOptions<'readable'> {
-}
+import { HttpFetchBufferOptions, HttpFetchJsonOptions, HttpFetchOptions, HttpFetchReadableOptions, HttpFetchResponse, HttpFetchResponseType, HttpFetchTextOptions, checkStatus, createStringOrBufferBody, getFetchMethod, setDefaultHttpFetchAccept } from '.';
+export type { HttpFetchBufferOptions, HttpFetchJsonOptions, HttpFetchOptions, HttpFetchReadableOptions, HttpFetchResponse, HttpFetchResponseType, HttpFetchTextOptions, checkStatus, setDefaultHttpFetchAccept } from '.';

 async function readMessageBuffer(response: IncomingMessage) {
    const buffers: Buffer[] = [];
    response.on('data', buffer => buffers.push(buffer));
+    const { once } = require('events') as typeof events;
    await once(response, 'end');
    return Buffer.concat(buffers);
 }

 export interface FetchParser<T> {
-    accept: string;
    parse(message: IncomingMessage): Promise<T>;
 }

 const TextParser: FetchParser<string> = {
-    accept: 'text/plain',
    async parse(message: IncomingMessage) {
        return (await readMessageBuffer(message)).toString();
    }
 }
 const JSONParser: FetchParser<any> = {
-    accept: 'application/json',
    async parse(message: IncomingMessage) {
        return JSON.parse((await readMessageBuffer(message)).toString());
    }
 }

 const BufferParser: FetchParser<Buffer> = {
-    accept: undefined as string,
    async parse(message: IncomingMessage) {
        return readMessageBuffer(message);
    }
 }

 const StreamParser: FetchParser<IncomingMessage> = {
-    accept: undefined as string,
    async parse(message: IncomingMessage) {
        return message;
    }
 }

-export async function getNpmPackageInfo(pkg: string) {
-    const { body } = await httpFetch({
-        url: `https://registry.npmjs.org/${pkg}`,
-        // force ipv4 in case of busted ipv6.
-        family: 4,
-        responseType: 'json',
-    });
-    return body;
-}
-
-export function getHttpFetchAccept(responseType: HttpFetchResponseType) {
-    const { accept } = getHttpFetchParser(responseType);
-    return accept;
-}
-
-export function setDefaultHttpFetchAccept(headers: Headers, responseType: HttpFetchResponseType) {
-    if (headers.has('Accept'))
-        return;
-    const { accept } = getHttpFetchParser(responseType);
-    if (accept)
-        headers.set('Accept', accept);
-}
-
-export function fetchStatusCodeOk(statusCode: number) {
-    return statusCode >= 200 && statusCode <= 299;
-}
-
-export function checkStatus(statusCode: number) {
-    if (!fetchStatusCodeOk(statusCode))
-        throw new Error(`http response statusCode ${statusCode}`);
-}
-
-export interface HttpFetchResponse<T> {
-    statusCode: number;
-    headers: Headers;
-    body: T;
-}
-
 export function getHttpFetchParser(responseType: HttpFetchResponseType) {
    switch (responseType) {
        case 'json':
@@ -116,26 +53,36 @@ export function getHttpFetchParser(responseType: HttpFetchResponseType) {
    return BufferParser;
 }

-export function parseResponseType(readable: IncomingMessage, responseType: HttpFetchResponseType) {
+export function httpFetchParseIncomingMessage(readable: IncomingMessage, responseType: HttpFetchResponseType) {
    return getHttpFetchParser(responseType).parse(readable);
 }

-export async function httpFetch<T extends HttpFetchOptions<HttpFetchResponseType>>(options: T): Promise<HttpFetchResponse<
+export async function httpFetch<T extends HttpFetchOptions<Readable>>(options: T): Promise<HttpFetchResponse<
    // first one serves as default.
-    T extends HttpFetchBufferOptions ? Buffer
-    : T extends HttpFetchTextOptions ? string
-    : T extends HttpFetchReadableOptions ? IncomingMessage
-    : T extends HttpFetchJsonOptions ? any : Buffer
+    T extends HttpFetchBufferOptions<Readable> ? Buffer
+    : T extends HttpFetchTextOptions<Readable> ? string
+    : T extends HttpFetchReadableOptions<Readable> ? IncomingMessage
+    : T extends HttpFetchJsonOptions<Readable> ? any : Buffer
 >> {
    const headers = new Headers(options.headers);
    setDefaultHttpFetchAccept(headers, options.responseType);

-    const parser = getHttpFetchParser(options.responseType);
+    const { once } = require('events') as typeof events;
+    const { PassThrough, Readable } = require('stream') as typeof stream;
+    const { http, https } = require('follow-redirects') as typeof followRedirects;

    const { url } = options;
    const isSecure = url.toString().startsWith('https:');
    const proto = isSecure ? https : http;

+    let { body } = options;
+    if (body && !(body instanceof Readable)) {
+        const newBody = new PassThrough();
+        newBody.write(Buffer.from(createStringOrBufferBody(headers, body)));
+        newBody.end();
+        body = newBody;
+    }
+
    const nodeHeaders: Record<string, string[]> = {};
    for (const [k, v] of headers) {
        if (nodeHeaders[k]) {
@@ -147,14 +94,15 @@ export async function httpFetch<T extends HttpFetchOptions<HttpFetchResponseType
    }

    const request = proto.request(url, {
-        method: options.method,
+        method: getFetchMethod(options),
        rejectUnauthorized: options.rejectUnauthorized,
        family: options.family,
        headers: nodeHeaders,
        timeout: options.timeout,
    });
-    if (options.body)
-        options.body.pipe(request);
+
+    if (body)
+        body.pipe(request);
    else
        request.end();
    const [response] = await once(request, 'response') as [IncomingMessage];
@@ -179,7 +127,7 @@ export async function httpFetch<T extends HttpFetchOptions<HttpFetchResponseType
    return {
        statusCode: response.statusCode,
        headers: incomingHeaders,
-        body: await parser.parse(response),
+        body: await httpFetchParseIncomingMessage(response, options.responseType),
    };
 }

--- a/server/src/fetch/index.ts
+++ b/server/src/fetch/index.ts
@@ -0,0 +1,179 @@
+
+export type HttpFetchResponseType = 'json' | 'text' | 'buffer' | 'readable';
+export interface HttpFetchOptionsBase<B> {
+    url: string | URL;
+    family?: 4 | 6;
+    method?: string;
+    headers?: HeadersInit;
+    timeout?: number;
+    rejectUnauthorized?: boolean;
+    ignoreStatusCode?: boolean;
+    body?: B | string | ArrayBufferView | any;
+    withCredentials?: boolean;
+}
+
+export interface HttpFetchJsonOptions<B> extends HttpFetchOptionsBase<B> {
+    responseType: 'json';
+}
+
+export interface HttpFetchBufferOptions<B> extends HttpFetchOptionsBase<B> {
+    responseType: 'buffer';
+}
+
+export interface HttpFetchDefaultOptions<B> extends HttpFetchOptionsBase<B> {
+    responseType?: undefined;
+}
+
+export interface HttpFetchTextOptions<B> extends HttpFetchOptionsBase<B> {
+    responseType: 'text';
+}
+export interface HttpFetchReadableOptions<B> extends HttpFetchOptionsBase<B> {
+    responseType: 'readable';
+}
+
+export type HttpFetchOptions<B> = HttpFetchJsonOptions<B> | HttpFetchBufferOptions<B> | HttpFetchDefaultOptions<B> | HttpFetchTextOptions<B> | HttpFetchReadableOptions<B>;
+
+export function fetchStatusCodeOk(statusCode: number) {
+    return statusCode >= 200 && statusCode <= 299;
+}
+
+export function checkStatus(statusCode: number) {
+    if (!fetchStatusCodeOk(statusCode))
+        throw new Error(`http response statusCode ${statusCode}`);
+}
+
+export function getFetchMethod(options: HttpFetchOptions<any>) {
+    const method = options.method || (options.body ? 'POST' : 'GET');
+    return method;
+}
+
+export interface HttpFetchResponse<T> {
+    statusCode: number;
+    headers: Headers;
+    body: T;
+}
+
+export type fetcher<B, M> = <T extends HttpFetchOptions<B>>(options: T) => Promise<HttpFetchResponse<
+    // first one serves as default.
+    T extends HttpFetchBufferOptions<B> ? Buffer
+    : T extends HttpFetchTextOptions<B> ? string
+    : T extends HttpFetchReadableOptions<B> ? M
+    : T extends HttpFetchJsonOptions<B> ? any : Buffer
+>>;
+
+
+export function getHttpFetchAccept(responseType: HttpFetchResponseType) {
+    switch (responseType) {
+        case 'json':
+            return 'application/json';
+        case 'text':
+            return 'text/plain';
+    }
+    return;
+}
+
+export function setDefaultHttpFetchAccept(headers: Headers, responseType: HttpFetchResponseType) {
+    if (headers.has('Accept'))
+        return;
+    const accept = getHttpFetchAccept(responseType);
+    if (accept)
+        headers.set('Accept', accept);
+}
+
+export function createStringOrBufferBody(headers: Headers, body: any) {
+    let contentType: string;
+    if (typeof body === 'object') {
+        body = JSON.stringify(body);
+        contentType = 'application/json';
+    }
+    else if (typeof body === 'string') {
+        contentType = 'text/plain';
+    }
+
+    if (!headers.has('Content-Type'))
+        headers.set('Content-Type', contentType);
+
+    return body;
+}
+
+export async function domFetchParseIncomingMessage(response: Response, responseType: HttpFetchResponseType) {
+    switch (responseType) {
+        case 'json':
+            return response.json();
+        case 'text':
+            return response.text();
+        case 'readable':
+            return response;
+    }
+    return new Uint8Array(await response.arrayBuffer());
+}
+
+export async function domFetch<T extends HttpFetchOptions<BodyInit>>(options: T): Promise<HttpFetchResponse<
+    // first one serves as default.
+    T extends HttpFetchBufferOptions<BodyInit> ? Buffer
+    : T extends HttpFetchTextOptions<BodyInit> ? string
+    : T extends HttpFetchReadableOptions<BodyInit> ? Response
+    : T extends HttpFetchJsonOptions<BodyInit> ? any : Buffer
+>> {
+    const headers = new Headers(options.headers);
+    setDefaultHttpFetchAccept(headers, options.responseType);
+
+    let { body } = options;
+    if (body && !(body instanceof ReadableStream)) {
+        body = createStringOrBufferBody(headers, body);
+    }
+
+    const { url } = options;
+    const response = await fetch(url, {
+        method: getFetchMethod(options),
+        credentials: options.withCredentials ? 'include' : undefined,
+        headers,
+        signal: options.timeout ? AbortSignal.timeout(options.timeout) : undefined,
+        body,
+    });
+
+    if (!options?.ignoreStatusCode) {
+        try {
+            checkStatus(response.status);
+        }
+        catch (e) {
+            response.arrayBuffer().catch(() => { });
+            throw e;
+        }
+    }
+
+    return {
+        statusCode: response.status,
+        headers: response.headers,
+        body: await domFetchParseIncomingMessage(response, options.responseType),
+    };
+}
+
+function ensureType<T>(v: T) {
+}
+
+async function test() {
+    const a = await domFetch({
+        url: 'http://example.com',
+    });
+
+    ensureType<Buffer>(a.body);
+
+    const b = await domFetch({
+        url: 'http://example.com',
+        responseType: 'json',
+    });
+    ensureType<any>(b.body);
+
+    const c = await domFetch({
+        url: 'http://example.com',
+        responseType: 'readable',
+    });
+    ensureType<Response>(c.body);
+
+    const d = await domFetch({
+        url: 'http://example.com',
+        responseType: 'buffer',
+    });
+    ensureType<Buffer>(d.body);
+}
--- a/server/src/runtime.ts
+++ b/server/src/runtime.ts
@@ -20,7 +20,7 @@ import WebSocket, { Server as WebSocketServer } from "ws";
 import { computeClusterObjectHash } from './cluster/cluster-hash';
 import { ClusterObject } from './cluster/connect-rpc-object';
 import { Plugin, PluginDevice, ScryptedAlert, ScryptedUser } from './db-types';
-import { getNpmPackageInfo, httpFetch } from './http-fetch-helpers';
+import { httpFetch } from './fetch/http-fetch';
 import { createResponseInterface } from './http-interfaces';
 import { getDisplayName, getDisplayRoom, getDisplayType, getProvidedNameOrDefault, getProvidedRoomOrDefault, getProvidedTypeOrDefault } from './infer-defaults';
 import { IOServer } from './io';
@@ -42,7 +42,7 @@ import { AddressSettings } from './services/addresses';
 import { Alerts } from './services/alerts';
 import { CORSControl } from './services/cors';
 import { Info } from './services/info';
-import { PluginComponent } from './services/plugin';
+import { getNpmPackageInfo, PluginComponent } from './services/plugin';
 import { ServiceControl } from './services/service-control';
 import { UsersService } from './services/users';
 import { getState, ScryptedStateManager, setState } from './state';
--- a/server/src/scrypted-server-main.ts
+++ b/server/src/scrypted-server-main.ts
@@ -16,13 +16,13 @@ import semver from 'semver';
 import { install as installSourceMapSupport } from 'source-map-support';
 import { createSelfSignedCertificate, CURRENT_SELF_SIGNED_CERTIFICATE_VERSION } from './cert';
 import { Plugin, ScryptedUser, Settings } from './db-types';
-import { getNpmPackageInfo } from './http-fetch-helpers';
 import Level from './level';
 import { PluginError } from './plugin/plugin-error';
 import { getScryptedVolume } from './plugin/plugin-volume';
 import { RPCResultError } from './rpc';
 import { ScryptedRuntime } from './runtime';
 import { getHostAddresses, SCRYPTED_DEBUG_PORT, SCRYPTED_INSECURE_PORT, SCRYPTED_SECURE_PORT } from './server-settings';
+import { getNpmPackageInfo } from './services/plugin';
 import { setScryptedUserPassword, UsersService } from './services/users';
 import { sleep } from './sleep';
 import { ONE_DAY_MILLISECONDS, UserToken } from './usertoken';
--- a/server/src/services/plugin.ts
+++ b/server/src/services/plugin.ts
@@ -1,11 +1,22 @@
 import { ScryptedInterfaceProperty, ScryptedNativeId } from "@scrypted/types";
 import semver from 'semver';
 import { Plugin } from '../db-types';
-import { getNpmPackageInfo } from "../http-fetch-helpers";
 import { hasMixinCycle } from "../mixin/mixin-cycle";
 import { ScryptedRuntime } from "../runtime";
 import { sleep } from "../sleep";
 import { getState } from "../state";
+import { httpFetch } from "../fetch/http-fetch";
+
+
+export async function getNpmPackageInfo(pkg: string) {
+    const { body } = await httpFetch({
+        url: `https://registry.npmjs.org/${pkg}`,
+        // force ipv4 in case of busted ipv6.
+        family: 4,
+        responseType: 'json',
+    });
+    return body;
+}

 export class PluginComponent {
    scrypted: ScryptedRuntime;
--- a/server/src/services/service-control.ts
+++ b/server/src/services/service-control.ts
@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { httpFetch } from "../http-fetch-helpers";
+import { httpFetch } from "../fetch/http-fetch";
 import { ScryptedRuntime } from "../runtime";

 export class ServiceControl {
Author	SHA1	Message	Date
Koushik Dutta	bd7c7de8a5	Update package.json	2024-01-12 16:37:55 -08:00
Koushik Dutta	a06e786d19	client: Fix cors credentials	2024-01-12 15:51:06 -08:00
Koushik Dutta	dff05e733e	server: update lockfile	2024-01-12 15:39:29 -08:00
Koushik Dutta	76e34af149	postrelease	2024-01-12 15:13:29 -08:00
Koushik Dutta	4f2e9e88e1	Merge branch 'main' of github.com:koush/scrypted	2024-01-12 09:27:04 -08:00
Koushik Dutta	2761b0745a	client: remove http-auth-utils dependency	2024-01-12 09:26:09 -08:00
Brett Jia	ea78b7f59e	core: fix scheduler (#1259 )	2024-01-12 09:10:31 -08:00
Koushik Dutta	b8d233f08d	videoanalysis: cpu usage wip	2024-01-11 20:08:57 -08:00
Koushik Dutta	f4e93c82a2	onvif: publish with latest http-auth-utils	2024-01-11 20:08:39 -08:00
Koushik Dutta	c72c34f954	common: remove node-fetch	2024-01-11 20:06:51 -08:00
Koushik Dutta	baec4e71da	remove axios-digest-auth	2024-01-11 19:31:18 -08:00
Koushik Dutta	245c6e3006	doorbird: remove axios digest auth	2024-01-11 19:29:15 -08:00
Koushik Dutta	566c18251c	snapshot: add support for periodic snapshots via http	2024-01-11 13:15:18 -08:00
Koushik Dutta	f18e58a108	sdk/homekit/snapshot: simplify periodic snapshot requests. remove homekit debouncer.	2024-01-11 11:29:03 -08:00
Koushik Dutta	5c6ea09d3e	videoanalysis: implement dynamic cpu performance profiling	2024-01-11 11:04:41 -08:00
Koushik Dutta	646a9f214a	snapshot: Update url fetcher	2024-01-11 09:58:23 -08:00
Koushik Dutta	6506c4236f	various: fixup http lib	2024-01-11 00:37:21 -08:00
Koushik Dutta	a3e27ce8f8	Merge branch 'main' of github.com:koush/scrypted	2024-01-11 00:35:26 -08:00
Koushik Dutta	a54d5a5f59	cli: remove axios	2024-01-11 00:35:21 -08:00
Koushik Dutta	7136759f8f	Update install-scrypted-proxmox.sh	2024-01-11 00:32:48 -08:00
Koushik Dutta	049d9898b3	http/auth: simplify	2024-01-10 20:45:50 -08:00
Koushik Dutta	6d9e21b7b8	server: Fix import	2024-01-10 16:27:10 -08:00
Koushik Dutta	bfd1aef5d1	client: fixup	2024-01-10 16:23:51 -08:00
Koushik Dutta	5f02e6a272	various: more http refactoring	2024-01-10 16:08:38 -08:00
Koushik Dutta	56bbf00edc	various: update http auth utils usage	2024-01-10 13:16:00 -08:00
Koushik Dutta	0c66456a87	sdk: limit chunks to 1. add support for multiple chunks.	2024-01-10 13:06:04 -08:00
Koushik Dutta	6b589b8d5a	postrelease	2024-01-10 12:56:02 -08:00