From bd451e71ecec5eb0ccb10b9114fd0cdaf3a0ac63 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Fri, 11 Sep 2026 11:52:15 -0700 Subject: [PATCH] auth: update http-auth-utils, convert plugins to rollup build --- common/package-lock.json | 28 ++- common/package.json | 2 +- packages/auth-fetch/package-lock.json | 30 ++- packages/auth-fetch/package.json | 2 +- packages/auth-fetch/src/auth-fetch.ts | 45 ++-- plugins/amcrest/package-lock.json | 32 +-- plugins/amcrest/package.json | 1 + plugins/amcrest/tsconfig.json | 29 ++- plugins/hikvision/package-lock.json | 43 ++-- plugins/hikvision/package.json | 1 + plugins/hikvision/tsconfig.json | 29 ++- plugins/onvif/package-lock.json | 77 ++++--- plugins/onvif/package.json | 3 +- plugins/onvif/src/onvif-api.ts | 2 +- plugins/onvif/tsconfig.json | 28 ++- plugins/reolink/package-lock.json | 108 ++++++---- plugins/reolink/package.json | 3 +- plugins/reolink/tsconfig.json | 28 ++- plugins/snapshot/package-lock.json | 93 +++++---- plugins/snapshot/package.json | 1 + plugins/snapshot/tsconfig.json | 23 +- plugins/unifi-protect/package-lock.json | 265 ++---------------------- server/package-lock.json | 4 +- 23 files changed, 425 insertions(+), 452 deletions(-) diff --git a/common/package-lock.json b/common/package-lock.json index ce8c37fad..0c1a72bd2 100644 --- a/common/package-lock.json +++ b/common/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "typescript": "^5.5.3" }, "devDependencies": { @@ -25,7 +25,6 @@ } }, "../external/werift": { - "name": "werift", "version": "0.0.1", "license": "MIT", "workspaces": [ @@ -63,7 +62,7 @@ "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", "@scrypted/auth-fetch": "^1.0.5", - "adm-zip": "^0.5.16", + "adm-zip": "0.6.0", "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", @@ -88,7 +87,6 @@ "scrypted-webpack": "bin/cli.js" }, "devDependencies": { - "@types/adm-zip": "^0.5.8", "@types/ncp": "^2.0.8", "@types/node": "^24.9.2", "@types/tmp": "^0.2.6", @@ -3362,13 +3360,19 @@ } }, "node_modules/http-auth-utils": { - "version": "5.0.1", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-7.1.0.tgz", + "integrity": "sha512-UNhpGj9/LHVBP+byBj8z46X+aZikPTZ4VvuByrUjhbJTnyvhiKdvKDpb1WjQYWnejQu22lp/3fBRklgKSqYMPQ==", "license": "MIT", "dependencies": { - "yerror": "^8.0.0" + "yerror": "^11.0.0" }, "engines": { - "node": ">=18.16.0" + "node": ">=24.14.0" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/nfroidure" } }, "node_modules/make-error": { @@ -3476,10 +3480,16 @@ "license": "MIT" }, "node_modules/yerror": { - "version": "8.0.0", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yerror/-/yerror-11.0.0.tgz", + "integrity": "sha512-ZarH0yAHBjfiRJMC2eL8Fhv/l5GqnS2c1wo5V6vH7k4ehfHcKd6R1ahcyBZYORMH1cqPmOT1dANkoRjR2/pzrw==", "license": "MIT", "engines": { - "node": ">=18.16.0" + "node": ">=24.14.0" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/nfroidure" } }, "node_modules/yn": { diff --git a/common/package.json b/common/package.json index 6628f869e..bc30c8dd2 100644 --- a/common/package.json +++ b/common/package.json @@ -16,7 +16,7 @@ "dependencies": { "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "typescript": "^5.5.3" }, "devDependencies": { diff --git a/packages/auth-fetch/package-lock.json b/packages/auth-fetch/package-lock.json index c772545f2..06e3b6264 100644 --- a/packages/auth-fetch/package-lock.json +++ b/packages/auth-fetch/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "follow-redirects": "^1.15.4", - "http-auth-utils": "^5.0.1" + "http-auth-utils": "^7.1.0" }, "devDependencies": { "@types/node": "^20.9.4", @@ -195,14 +195,19 @@ } }, "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==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-7.1.0.tgz", + "integrity": "sha512-UNhpGj9/LHVBP+byBj8z46X+aZikPTZ4VvuByrUjhbJTnyvhiKdvKDpb1WjQYWnejQu22lp/3fBRklgKSqYMPQ==", + "license": "MIT", "dependencies": { - "yerror": "^8.0.0" + "yerror": "^11.0.0" }, "engines": { - "node": ">=18.16.0" + "node": ">=24.14.0" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/nfroidure" } }, "node_modules/is-fullwidth-code-point": { @@ -569,11 +574,16 @@ } }, "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==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yerror/-/yerror-11.0.0.tgz", + "integrity": "sha512-ZarH0yAHBjfiRJMC2eL8Fhv/l5GqnS2c1wo5V6vH7k4ehfHcKd6R1ahcyBZYORMH1cqPmOT1dANkoRjR2/pzrw==", + "license": "MIT", "engines": { - "node": ">=18.16.0" + "node": ">=24.14.0" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/nfroidure" } } } diff --git a/packages/auth-fetch/package.json b/packages/auth-fetch/package.json index 65a62f162..200036eea 100644 --- a/packages/auth-fetch/package.json +++ b/packages/auth-fetch/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "follow-redirects": "^1.15.4", - "http-auth-utils": "^5.0.1" + "http-auth-utils": "^7.1.0" }, "author": "", "license": "ISC" diff --git a/packages/auth-fetch/src/auth-fetch.ts b/packages/auth-fetch/src/auth-fetch.ts index 9cc13cd1a..42fc38e38 100644 --- a/packages/auth-fetch/src/auth-fetch.ts +++ b/packages/auth-fetch/src/auth-fetch.ts @@ -1,4 +1,7 @@ import { HttpFetchOptions, HttpFetchResponseType, checkStatus, createHeadersArray, fetcher, getFetchMethod, hasHeader, setDefaultHttpFetchAccept, setHeader } from '../../../server/src/fetch'; +import type { Mechanism } from 'http-auth-utils'; +import type { DigestWWWAuthenticateData } from 'http-auth-utils/dist/mechanisms/digest'; +import type { BasicWWWAuthenticateData } from 'http-auth-utils/dist/mechanisms/basic'; export interface AuthFetchCredentialState { username: string; @@ -9,17 +12,27 @@ export interface AuthFetchOptions { credential?: AuthFetchCredentialState; } +interface DigestHeader { + type: string; + data: DigestWWWAuthenticateData; +} + +interface BasicHeader { + type: string; + data: BasicWWWAuthenticateData; +} + +type AuthenticatedCredentialState = AuthFetchCredentialState & { + count?: number; + digest?: DigestHeader; + basic?: BasicHeader; +}; + 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>; - basic?: ReturnType>; - }; + const credential = options.credential as AuthenticatedCredentialState; const { digest, basic } = credential; if (digest) { @@ -44,7 +57,7 @@ async function getAuth(options: AuthFetchOptions, url: string | URL, method: str ...digest.data, }); - const header = buildAuthorizationHeader(DIGEST, { + const header = buildAuthorizationHeader(DIGEST as unknown as Mechanism, { username: options.credential.username, uri, nc, @@ -60,7 +73,7 @@ async function getAuth(options: AuthFetchOptions, url: string | URL, method: str else if (basic) { const { BASIC, buildAuthorizationHeader } = await import('http-auth-utils'); - const header = buildAuthorizationHeader(BASIC, { + const header = buildAuthorizationHeader(BASIC as unknown as Mechanism, { username: options.credential.username, password: options.credential.password, }); @@ -126,16 +139,12 @@ export function createAuthFetch( if (typeof authenticateHeaders === 'string') authenticateHeaders = [authenticateHeaders]; - const { BASIC, DIGEST, parseWWWAuthenticateHeader } = await import('http-auth-utils'); - const parsedHeaders = authenticateHeaders.map(h => parseWWWAuthenticateHeader(h)); +const { BASIC, DIGEST, parseWWWAuthenticateHeader } = await import('http-auth-utils'); + const parsedHeaders: DigestHeader[] = authenticateHeaders.map(h => parseWWWAuthenticateHeader(h) as unknown as DigestHeader); - const digest = parsedHeaders.find(p => p.type === 'Digest') as ReturnType>; - const basic = parsedHeaders.find(p => p.type === 'Basic') as ReturnType>; - const credential = options.credential as AuthFetchCredentialState & { - count?: number; - digest?: ReturnType>; - basic?: ReturnType>; - }; + const digest = parsedHeaders.find(p => p.type === 'Digest'); + const basic = parsedHeaders.find(p => p.type === 'Basic'); + const credential = options.credential as AuthenticatedCredentialState; credential.digest = digest; credential.basic = basic; diff --git a/plugins/amcrest/package-lock.json b/plugins/amcrest/package-lock.json index 7107ddb48..230982b84 100644 --- a/plugins/amcrest/package-lock.json +++ b/plugins/amcrest/package-lock.json @@ -25,20 +25,24 @@ "version": "1.0.1", "license": "ISC", "dependencies": { + "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.27", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "typescript": "^5.5.3" }, "devDependencies": { "@types/node": "^20.19.11", "monaco-editor": "^0.50.0", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "tslib": "^2.8.1" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.5.55", + "version": "0.5.59", "license": "ISC", "dependencies": { "@babel/preset-typescript": "^7.27.1", @@ -48,8 +52,8 @@ "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", - "adm-zip": "^0.5.16", - "axios": "^1.10.0", + "@scrypted/auth-fetch": "^1.0.5", + "adm-zip": "0.6.0", "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", @@ -65,16 +69,18 @@ "webpack-bundle-analyzer": "^4.10.2" }, "bin": { - "scrypted-changelog": "bin/scrypted-changelog.js", - "scrypted-debug": "bin/scrypted-debug.js", - "scrypted-deploy": "bin/scrypted-deploy.js", - "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js", - "scrypted-package-json": "bin/scrypted-package-json.js", - "scrypted-setup-project": "bin/scrypted-setup-project.js", - "scrypted-webpack": "bin/scrypted-webpack.js" + "scrypted-changelog": "bin/cli.js", + "scrypted-debug": "bin/cli.js", + "scrypted-deploy": "bin/cli.js", + "scrypted-deploy-debug": "bin/cli.js", + "scrypted-package-json": "bin/cli.js", + "scrypted-setup-project": "bin/cli.js", + "scrypted-webpack": "bin/cli.js" }, "devDependencies": { + "@types/ncp": "^2.0.8", "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "ts-node": "^10.9.2", "typedoc": "^0.28.14" } diff --git a/plugins/amcrest/package.json b/plugins/amcrest/package.json index e899d4e7e..825548a0e 100644 --- a/plugins/amcrest/package.json +++ b/plugins/amcrest/package.json @@ -24,6 +24,7 @@ "camera" ], "scrypted": { + "rollup": true, "name": "Amcrest Plugin", "type": "DeviceProvider", "interfaces": [ diff --git a/plugins/amcrest/tsconfig.json b/plugins/amcrest/tsconfig.json index ba9b4d395..11add8764 100644 --- a/plugins/amcrest/tsconfig.json +++ b/plugins/amcrest/tsconfig.json @@ -1,13 +1,34 @@ { "compilerOptions": { - "module": "Node16", + "module": "es2022", "target": "ES2021", "resolveJsonModule": true, - "moduleResolution": "Node16", + "moduleResolution": "bundler", "esModuleInterop": true, - "sourceMap": true + "sourceMap": true, + "strict": false, + "lib": [ + "ES2022", + "DOM", + "DOM.Iterable" + ] }, "include": [ - "src/**/*" + "src/**/*", + "../../common/src/**/*", + "../../packages/auth-fetch/src/**/*", + "../../external/werift/packages/common/src/**/*", + "../../external/werift/packages/rtp/src/rtp/**/*", + "../../server/src/fetch/**/*", + "../../plugins/ffmpeg-camera/src/common.ts", + "../../plugins/homekit/src/types/camera/jitter-buffer.ts", + "../../plugins/onvif/src/onvif-intercom.ts", + "../../plugins/rtsp/src/rtsp.ts", + "../../plugins/webrtc/src/rtp-forwarders.ts", + "../../server/src/deferred.ts", + "../../server/src/promise-utils.ts", + "../../server/src/sleep.ts", + "../../server/src/listen-zero.ts", + "../../server/src/media-helpers.ts" ] } \ No newline at end of file diff --git a/plugins/hikvision/package-lock.json b/plugins/hikvision/package-lock.json index 1e65c5f14..4c2fbfb43 100644 --- a/plugins/hikvision/package-lock.json +++ b/plugins/hikvision/package-lock.json @@ -25,20 +25,24 @@ "version": "1.0.1", "license": "ISC", "dependencies": { + "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.27", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "typescript": "^5.5.3" }, "devDependencies": { "@types/node": "^20.19.11", "monaco-editor": "^0.50.0", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "tslib": "^2.8.1" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.5.52", + "version": "0.5.59", "license": "ISC", "dependencies": { "@babel/preset-typescript": "^7.27.1", @@ -48,8 +52,8 @@ "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", - "adm-zip": "^0.5.16", - "axios": "^1.10.0", + "@scrypted/auth-fetch": "^1.0.5", + "adm-zip": "0.6.0", "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", @@ -65,16 +69,18 @@ "webpack-bundle-analyzer": "^4.10.2" }, "bin": { - "scrypted-changelog": "bin/scrypted-changelog.js", - "scrypted-debug": "bin/scrypted-debug.js", - "scrypted-deploy": "bin/scrypted-deploy.js", - "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js", - "scrypted-package-json": "bin/scrypted-package-json.js", - "scrypted-setup-project": "bin/scrypted-setup-project.js", - "scrypted-webpack": "bin/scrypted-webpack.js" + "scrypted-changelog": "bin/cli.js", + "scrypted-debug": "bin/cli.js", + "scrypted-deploy": "bin/cli.js", + "scrypted-deploy-debug": "bin/cli.js", + "scrypted-package-json": "bin/cli.js", + "scrypted-setup-project": "bin/cli.js", + "scrypted-webpack": "bin/cli.js" }, "devDependencies": { + "@types/ncp": "^2.0.8", "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "ts-node": "^10.9.2", "typedoc": "^0.28.14" } @@ -157,12 +163,13 @@ "@scrypted/common": { "version": "file:../../common", "requires": { + "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.27", "@types/node": "^20.19.11", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "monaco-editor": "^0.50.0", "ts-node": "^10.9.2", + "tslib": "^2.8.1", "typescript": "^5.5.3" } }, @@ -176,9 +183,11 @@ "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", + "@scrypted/auth-fetch": "^1.0.5", + "@types/ncp": "^2.0.8", "@types/node": "^24.9.2", - "adm-zip": "^0.5.16", - "axios": "^1.10.0", + "@types/tmp": "^0.2.6", + "adm-zip": "0.6.0", "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", diff --git a/plugins/hikvision/package.json b/plugins/hikvision/package.json index ceadcb49c..92efb17b7 100644 --- a/plugins/hikvision/package.json +++ b/plugins/hikvision/package.json @@ -24,6 +24,7 @@ "camera" ], "scrypted": { + "rollup": true, "name": "Hikvision Plugin", "type": "DeviceProvider", "interfaces": [ diff --git a/plugins/hikvision/tsconfig.json b/plugins/hikvision/tsconfig.json index ba9b4d395..d550578cb 100644 --- a/plugins/hikvision/tsconfig.json +++ b/plugins/hikvision/tsconfig.json @@ -1,13 +1,34 @@ { "compilerOptions": { - "module": "Node16", + "module": "es2022", "target": "ES2021", "resolveJsonModule": true, - "moduleResolution": "Node16", + "moduleResolution": "bundler", "esModuleInterop": true, - "sourceMap": true + "sourceMap": true, + "lib": [ + "ES2022", + "DOM", + "DOM.Iterable" + ], + "strict": false }, "include": [ - "src/**/*" + "src/**/*", + "../../common/src/**/*", + "../../packages/auth-fetch/src/**/*", + "../../external/werift/packages/common/src/**/*", + "../../external/werift/packages/rtp/src/rtp/**/*", + "../../server/src/fetch/**/*", + "../../plugins/ffmpeg-camera/src/common.ts", + "../../plugins/homekit/src/types/camera/jitter-buffer.ts", + "../../plugins/onvif/src/onvif-intercom.ts", + "../../plugins/rtsp/src/rtsp.ts", + "../../plugins/webrtc/src/rtp-forwarders.ts", + "../../server/src/deferred.ts", + "../../server/src/promise-utils.ts", + "../../server/src/sleep.ts", + "../../server/src/listen-zero.ts", + "../../server/src/media-helpers.ts" ] } \ No newline at end of file diff --git a/plugins/onvif/package-lock.json b/plugins/onvif/package-lock.json index 583e53c01..28b518766 100644 --- a/plugins/onvif/package-lock.json +++ b/plugins/onvif/package-lock.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@types/md5": "^2.3.5", - "@types/node": "^20.11.0", + "@types/node": "^22.20.2", "@types/xml2js": "^0.4.14" } }, @@ -27,55 +27,64 @@ "version": "1.0.1", "license": "ISC", "dependencies": { + "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "typescript": "^5.5.3" }, "devDependencies": { - "@types/node": "^20.11.0", + "@types/node": "^20.19.11", "monaco-editor": "^0.50.0", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "tslib": "^2.8.1" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.3.116", + "version": "0.5.59", "license": "ISC", "dependencies": { - "@babel/preset-typescript": "^7.26.0", - "@rollup/plugin-commonjs": "^28.0.1", + "@babel/preset-typescript": "^7.27.1", + "@rollup/plugin-commonjs": "^28.0.9", "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.3.0", - "@rollup/plugin-typescript": "^12.1.1", + "@rollup/plugin-node-resolve": "^16.0.1", + "@rollup/plugin-terser": "^0.4.4", + "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", - "adm-zip": "^0.5.16", - "axios": "^1.7.8", - "babel-loader": "^9.2.1", + "@scrypted/auth-fetch": "^1.0.5", + "adm-zip": "0.6.0", + "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", + "openai": "^6.1.0", "raw-loader": "^4.0.2", "rimraf": "^6.0.1", - "rollup": "^4.27.4", + "rollup": "^4.52.5", "tmp": "^0.2.3", - "ts-loader": "^9.5.1", + "ts-loader": "^9.5.4", "tslib": "^2.8.1", - "typescript": "^5.6.3", - "webpack": "^5.96.1", + "typescript": "^5.9.3", + "webpack": "^5.99.9", "webpack-bundle-analyzer": "^4.10.2" }, "bin": { - "scrypted-changelog": "bin/scrypted-changelog.js", - "scrypted-debug": "bin/scrypted-debug.js", - "scrypted-deploy": "bin/scrypted-deploy.js", - "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js", - "scrypted-package-json": "bin/scrypted-package-json.js", - "scrypted-setup-project": "bin/scrypted-setup-project.js", - "scrypted-webpack": "bin/scrypted-webpack.js" + "scrypted-changelog": "bin/cli.js", + "scrypted-debug": "bin/cli.js", + "scrypted-deploy": "bin/cli.js", + "scrypted-deploy-debug": "bin/cli.js", + "scrypted-package-json": "bin/cli.js", + "scrypted-setup-project": "bin/cli.js", + "scrypted-webpack": "bin/cli.js" }, "devDependencies": { - "@types/node": "^22.10.1", + "@types/ncp": "^2.0.8", + "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "ts-node": "^10.9.2", - "typedoc": "^0.26.11" + "typedoc": "^0.28.14" } }, "node_modules/@scrypted/common": { @@ -93,12 +102,13 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.11.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz", - "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==", + "version": "22.20.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.2.tgz", + "integrity": "sha512-xlvWf4Vs9n1PEVYwP1n4vvG07M6y8WgvJ2t0vbrWTmijsIHp1cS+uJ2kMIRdY3nHZK0nCYKrPeD171+SzF4/zw==", "dev": true, + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.21.0" } }, "node_modules/@types/xml2js": { @@ -169,10 +179,11 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "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 + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" }, "node_modules/xml2js": { "version": "0.6.2", diff --git a/plugins/onvif/package.json b/plugins/onvif/package.json index 4d3927787..debe49d18 100644 --- a/plugins/onvif/package.json +++ b/plugins/onvif/package.json @@ -24,6 +24,7 @@ "camera" ], "scrypted": { + "rollup": true, "name": "ONVIF Camera Plugin", "type": "DeviceProvider", "interfaces": [ @@ -47,7 +48,7 @@ }, "devDependencies": { "@types/md5": "^2.3.5", - "@types/node": "^20.11.0", + "@types/node": "^22.20.2", "@types/xml2js": "^0.4.14" } } diff --git a/plugins/onvif/src/onvif-api.ts b/plugins/onvif/src/onvif-api.ts index 5f70c1db1..94dfd876a 100644 --- a/plugins/onvif/src/onvif-api.ts +++ b/plugins/onvif/src/onvif-api.ts @@ -3,7 +3,7 @@ import { VideoStreamConfiguration } from '@scrypted/sdk'; import { EventEmitter } from 'events'; import { Readable } from 'stream'; -const onvif = require('onvif'); +import onvif from 'onvif'; const { Cam } = onvif; export enum OnvifEvent { diff --git a/plugins/onvif/tsconfig.json b/plugins/onvif/tsconfig.json index ba9b4d395..b5d4bdc85 100644 --- a/plugins/onvif/tsconfig.json +++ b/plugins/onvif/tsconfig.json @@ -1,13 +1,33 @@ { "compilerOptions": { - "module": "Node16", + "module": "es2022", "target": "ES2021", "resolveJsonModule": true, - "moduleResolution": "Node16", + "moduleResolution": "bundler", "esModuleInterop": true, - "sourceMap": true + "sourceMap": true, + "lib": [ + "ES2022", + "DOM", + "DOM.Iterable" + ], + "strict": false }, "include": [ - "src/**/*" + "src/**/*", + "../../common/src/**/*", + "../../packages/auth-fetch/src/**/*", + "../../external/werift/packages/common/src/**/*", + "../../external/werift/packages/rtp/src/rtp/**/*", + "../../server/src/fetch/**/*", + "../../plugins/ffmpeg-camera/src/common.ts", + "../../plugins/homekit/src/types/camera/jitter-buffer.ts", + "../../plugins/rtsp/src/rtsp.ts", + "../../plugins/webrtc/src/rtp-forwarders.ts", + "../../server/src/deferred.ts", + "../../server/src/promise-utils.ts", + "../../server/src/sleep.ts", + "../../server/src/listen-zero.ts", + "../../server/src/media-helpers.ts" ] } \ No newline at end of file diff --git a/plugins/reolink/package-lock.json b/plugins/reolink/package-lock.json index 4b0fe7097..7999ad714 100644 --- a/plugins/reolink/package-lock.json +++ b/plugins/reolink/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk", - "onvif": "file:../onvif/onvif" + "onvif": "^0.7.4" }, "devDependencies": { "@scrypted/sdk": "file:../../sdk", @@ -23,20 +23,24 @@ "version": "1.0.1", "license": "ISC", "dependencies": { + "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.27", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "typescript": "^5.5.3" }, "devDependencies": { "@types/node": "^20.19.11", "monaco-editor": "^0.50.0", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "tslib": "^2.8.1" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.5.52", + "version": "0.5.59", "dev": true, "license": "ISC", "dependencies": { @@ -47,8 +51,8 @@ "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", - "adm-zip": "^0.5.16", - "axios": "^1.10.0", + "@scrypted/auth-fetch": "^1.0.5", + "adm-zip": "0.6.0", "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", @@ -64,43 +68,22 @@ "webpack-bundle-analyzer": "^4.10.2" }, "bin": { - "scrypted-changelog": "bin/scrypted-changelog.js", - "scrypted-debug": "bin/scrypted-debug.js", - "scrypted-deploy": "bin/scrypted-deploy.js", - "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js", - "scrypted-package-json": "bin/scrypted-package-json.js", - "scrypted-setup-project": "bin/scrypted-setup-project.js", - "scrypted-webpack": "bin/scrypted-webpack.js" + "scrypted-changelog": "bin/cli.js", + "scrypted-debug": "bin/cli.js", + "scrypted-deploy": "bin/cli.js", + "scrypted-deploy-debug": "bin/cli.js", + "scrypted-package-json": "bin/cli.js", + "scrypted-setup-project": "bin/cli.js", + "scrypted-webpack": "bin/cli.js" }, "devDependencies": { + "@types/ncp": "^2.0.8", "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "ts-node": "^10.9.2", "typedoc": "^0.28.14" } }, - "../onvif/onvif": { - "version": "0.7.0", - "license": "MIT", - "dependencies": { - "lodash.get": "^4.4.2", - "xml2js": "^0.5.0" - }, - "devDependencies": { - "coveralls": "^3.1.1", - "dot": "^1.1.3", - "eslint": "^8.3.0", - "eslint-plugin-node": "^11.1.0", - "ip": "^1.1.5", - "keypress": "^0.2.1", - "mocha": "^10.0.0", - "mocha-lcov-reporter": "^1.3.0", - "nimble": "^0.0.2", - "nyc": "^15.1.0" - }, - "engines": { - "node": ">=6.0" - } - }, "node_modules/@scrypted/common": { "resolved": "../../common", "link": true @@ -119,9 +102,34 @@ "undici-types": "~6.21.0" } }, + "node_modules/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", + "license": "MIT" + }, "node_modules/onvif": { - "resolved": "../onvif/onvif", - "link": true + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/onvif/-/onvif-0.7.4.tgz", + "integrity": "sha512-VEUkBb0Fxe+EO8sX74x/qon1PbU1SfN+eSjiR+4LD6zhONa9pZuHlDA5drnhJsNlvSy+MwDW165T81nPCQwH5A==", + "license": "MIT", + "dependencies": { + "lodash.get": "^4.4.2", + "xml2js": "^0.6.2" + }, + "engines": { + "node": ">=10.0" + } + }, + "node_modules/sax": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.1.tgz", + "integrity": "sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==", + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=11.0.0" + } }, "node_modules/undici-types": { "version": "6.21.0", @@ -129,6 +137,28 @@ "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "dev": true, "license": "MIT" + }, + "node_modules/xml2js": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", + "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==", + "license": "MIT", + "dependencies": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/xmlbuilder": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", + "license": "MIT", + "engines": { + "node": ">=4.0" + } } } } diff --git a/plugins/reolink/package.json b/plugins/reolink/package.json index 000e0236c..5a0803c65 100644 --- a/plugins/reolink/package.json +++ b/plugins/reolink/package.json @@ -24,6 +24,7 @@ "camera" ], "scrypted": { + "rollup": true, "name": "Reolink Camera Plugin", "type": "DeviceProvider", "interfaces": [ @@ -39,7 +40,7 @@ "dependencies": { "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk", - "onvif": "file:../onvif/onvif" + "onvif": "^0.7.4" }, "devDependencies": { "@scrypted/sdk": "file:../../sdk", diff --git a/plugins/reolink/tsconfig.json b/plugins/reolink/tsconfig.json index ba9b4d395..b5d4bdc85 100644 --- a/plugins/reolink/tsconfig.json +++ b/plugins/reolink/tsconfig.json @@ -1,13 +1,33 @@ { "compilerOptions": { - "module": "Node16", + "module": "es2022", "target": "ES2021", "resolveJsonModule": true, - "moduleResolution": "Node16", + "moduleResolution": "bundler", "esModuleInterop": true, - "sourceMap": true + "sourceMap": true, + "lib": [ + "ES2022", + "DOM", + "DOM.Iterable" + ], + "strict": false }, "include": [ - "src/**/*" + "src/**/*", + "../../common/src/**/*", + "../../packages/auth-fetch/src/**/*", + "../../external/werift/packages/common/src/**/*", + "../../external/werift/packages/rtp/src/rtp/**/*", + "../../server/src/fetch/**/*", + "../../plugins/ffmpeg-camera/src/common.ts", + "../../plugins/homekit/src/types/camera/jitter-buffer.ts", + "../../plugins/rtsp/src/rtsp.ts", + "../../plugins/webrtc/src/rtp-forwarders.ts", + "../../server/src/deferred.ts", + "../../server/src/promise-utils.ts", + "../../server/src/sleep.ts", + "../../server/src/listen-zero.ts", + "../../server/src/media-helpers.ts" ] } \ No newline at end of file diff --git a/plugins/snapshot/package-lock.json b/plugins/snapshot/package-lock.json index 6d672719f..0bf0d36d8 100644 --- a/plugins/snapshot/package-lock.json +++ b/plugins/snapshot/package-lock.json @@ -24,56 +24,65 @@ "dev": true, "license": "ISC", "dependencies": { + "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "typescript": "^5.5.3" }, "devDependencies": { - "@types/node": "^20.11.0", + "@types/node": "^20.19.11", "monaco-editor": "^0.50.0", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "tslib": "^2.8.1" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.3.102", + "version": "0.5.59", "dev": true, "license": "ISC", "dependencies": { - "@babel/preset-typescript": "^7.26.0", - "@rollup/plugin-commonjs": "^28.0.1", + "@babel/preset-typescript": "^7.27.1", + "@rollup/plugin-commonjs": "^28.0.9", "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.3.0", - "@rollup/plugin-typescript": "^12.1.1", + "@rollup/plugin-node-resolve": "^16.0.1", + "@rollup/plugin-terser": "^0.4.4", + "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", - "adm-zip": "^0.5.16", - "axios": "^1.7.8", - "babel-loader": "^9.2.1", + "@scrypted/auth-fetch": "^1.0.5", + "adm-zip": "0.6.0", + "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", + "openai": "^6.1.0", "raw-loader": "^4.0.2", "rimraf": "^6.0.1", - "rollup": "^4.27.4", + "rollup": "^4.52.5", "tmp": "^0.2.3", - "ts-loader": "^9.5.1", + "ts-loader": "^9.5.4", "tslib": "^2.8.1", - "typescript": "^5.6.3", - "webpack": "^5.96.1", + "typescript": "^5.9.3", + "webpack": "^5.99.9", "webpack-bundle-analyzer": "^4.10.2" }, "bin": { - "scrypted-changelog": "bin/scrypted-changelog.js", - "scrypted-debug": "bin/scrypted-debug.js", - "scrypted-deploy": "bin/scrypted-deploy.js", - "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js", - "scrypted-package-json": "bin/scrypted-package-json.js", - "scrypted-setup-project": "bin/scrypted-setup-project.js", - "scrypted-webpack": "bin/scrypted-webpack.js" + "scrypted-changelog": "bin/cli.js", + "scrypted-debug": "bin/cli.js", + "scrypted-deploy": "bin/cli.js", + "scrypted-deploy-debug": "bin/cli.js", + "scrypted-package-json": "bin/cli.js", + "scrypted-setup-project": "bin/cli.js", + "scrypted-webpack": "bin/cli.js" }, "devDependencies": { - "@types/node": "^22.10.1", + "@types/ncp": "^2.0.8", + "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "ts-node": "^10.9.2", - "typedoc": "^0.26.11" + "typedoc": "^0.28.14" } }, "node_modules/@emnapi/runtime": { @@ -756,39 +765,45 @@ "@scrypted/common": { "version": "file:../../common", "requires": { + "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "@types/node": "^20.11.0", - "http-auth-utils": "^5.0.1", + "@types/node": "^20.19.11", + "http-auth-utils": "^7.1.0", "monaco-editor": "^0.50.0", "ts-node": "^10.9.2", + "tslib": "^2.8.1", "typescript": "^5.5.3" } }, "@scrypted/sdk": { "version": "file:../../sdk", "requires": { - "@babel/preset-typescript": "^7.26.0", - "@rollup/plugin-commonjs": "^28.0.1", + "@babel/preset-typescript": "^7.27.1", + "@rollup/plugin-commonjs": "^28.0.9", "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.3.0", - "@rollup/plugin-typescript": "^12.1.1", + "@rollup/plugin-node-resolve": "^16.0.1", + "@rollup/plugin-terser": "^0.4.4", + "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", - "@types/node": "^22.10.1", - "adm-zip": "^0.5.16", - "axios": "^1.7.8", - "babel-loader": "^9.2.1", + "@scrypted/auth-fetch": "^1.0.5", + "@types/ncp": "^2.0.8", + "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", + "adm-zip": "0.6.0", + "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", + "openai": "^6.1.0", "raw-loader": "^4.0.2", "rimraf": "^6.0.1", - "rollup": "^4.27.4", + "rollup": "^4.52.5", "tmp": "^0.2.3", - "ts-loader": "^9.5.1", + "ts-loader": "^9.5.4", "ts-node": "^10.9.2", "tslib": "^2.8.1", - "typedoc": "^0.26.11", - "typescript": "^5.6.3", - "webpack": "^5.96.1", + "typedoc": "^0.28.14", + "typescript": "^5.9.3", + "webpack": "^5.99.9", "webpack-bundle-analyzer": "^4.10.2" } }, diff --git a/plugins/snapshot/package.json b/plugins/snapshot/package.json index 58e067e22..c6b23e6a2 100644 --- a/plugins/snapshot/package.json +++ b/plugins/snapshot/package.json @@ -22,6 +22,7 @@ "camera" ], "scrypted": { + "rollup": true, "realfs": true, "name": "Snapshot Plugin", "type": "API", diff --git a/plugins/snapshot/tsconfig.json b/plugins/snapshot/tsconfig.json index f38f8df74..e44ef86a0 100644 --- a/plugins/snapshot/tsconfig.json +++ b/plugins/snapshot/tsconfig.json @@ -1,14 +1,27 @@ { "compilerOptions": { - "module": "NodeNext", - "target": "ESNext", + "module": "es2022", + "target": "ES2021", "resolveJsonModule": true, - "moduleResolution": "NodeNext", + "moduleResolution": "bundler", "esModuleInterop": true, - "sourceMap": true + "sourceMap": true, + "lib": [ + "ES2022", + "DOM", + "DOM.Iterable" + ] }, "include": [ "src/**/*", - "test/**/*", + "../../common/src/**/*", + "../../packages/auth-fetch/src/**/*", + "../../server/src/fetch/**/*", + "../../plugins/objectdetector/src/polygon.ts", + "../../server/src/deferred.ts", + "../../server/src/promise-utils.ts", + "../../server/src/sleep.ts", + "../../server/src/listen-zero.ts", + "../../server/src/media-helpers.ts" ] } \ No newline at end of file diff --git a/plugins/unifi-protect/package-lock.json b/plugins/unifi-protect/package-lock.json index 73ce88d4b..cc82fa495 100644 --- a/plugins/unifi-protect/package-lock.json +++ b/plugins/unifi-protect/package-lock.json @@ -25,15 +25,19 @@ "version": "1.0.1", "license": "ISC", "dependencies": { + "@koush/werift-src": "file:../external/werift", "@scrypted/sdk": "file:../sdk", - "@scrypted/types": "^0.5.27", - "http-auth-utils": "^5.0.1", + "http-auth-utils": "^7.1.0", "typescript": "^5.5.3" }, "devDependencies": { "@types/node": "^20.19.11", "monaco-editor": "^0.50.0", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "tslib": "^2.8.1" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../../common/node_modules/@cspotcode/source-map-support": { @@ -238,7 +242,7 @@ }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.5.52", + "version": "0.5.59", "license": "ISC", "dependencies": { "@babel/preset-typescript": "^7.27.1", @@ -248,8 +252,8 @@ "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-virtual": "^3.0.2", - "adm-zip": "^0.5.16", - "axios": "^1.10.0", + "@scrypted/auth-fetch": "^1.0.5", + "adm-zip": "0.6.0", "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", @@ -265,16 +269,18 @@ "webpack-bundle-analyzer": "^4.10.2" }, "bin": { - "scrypted-changelog": "bin/scrypted-changelog.js", - "scrypted-debug": "bin/scrypted-debug.js", - "scrypted-deploy": "bin/scrypted-deploy.js", - "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js", - "scrypted-package-json": "bin/scrypted-package-json.js", - "scrypted-setup-project": "bin/scrypted-setup-project.js", - "scrypted-webpack": "bin/scrypted-webpack.js" + "scrypted-changelog": "bin/cli.js", + "scrypted-debug": "bin/cli.js", + "scrypted-deploy": "bin/cli.js", + "scrypted-deploy-debug": "bin/cli.js", + "scrypted-package-json": "bin/cli.js", + "scrypted-setup-project": "bin/cli.js", + "scrypted-webpack": "bin/cli.js" }, "devDependencies": { + "@types/ncp": "^2.0.8", "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "ts-node": "^10.9.2", "typedoc": "^0.28.14" } @@ -1603,23 +1609,6 @@ "dev": true, "license": "Python-2.0" }, - "../../sdk/node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "license": "MIT" - }, - "../../sdk/node_modules/axios": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz", - "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==", - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.4", - "proxy-from-env": "^1.1.0" - } - }, "../../sdk/node_modules/babel-loader": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-10.0.0.tgz", @@ -1716,19 +1705,6 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "license": "MIT" }, - "../../sdk/node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "../../sdk/node_modules/caniuse-lite": { "version": "1.0.30001684", "funding": [ @@ -1782,18 +1758,6 @@ "version": "1.1.4", "license": "MIT" }, - "../../sdk/node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "../../sdk/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -1854,15 +1818,6 @@ "node": ">=0.10.0" } }, - "../../sdk/node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, "../../sdk/node_modules/diff": { "version": "4.0.2", "dev": true, @@ -1871,20 +1826,6 @@ "node": ">=0.3.1" } }, - "../../sdk/node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "../../sdk/node_modules/duplexer": { "version": "0.1.2", "license": "MIT" @@ -1936,55 +1877,10 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "../../sdk/node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "../../sdk/node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, "../../sdk/node_modules/es-module-lexer": { "version": "1.5.4", "license": "MIT" }, - "../../sdk/node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "../../sdk/node_modules/es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "../../sdk/node_modules/escalade": { "version": "3.2.0", "license": "MIT", @@ -2110,24 +2006,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "../../sdk/node_modules/follow-redirects": { - "version": "1.15.9", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "license": "MIT", - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, "../../sdk/node_modules/foreground-child": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", @@ -2144,22 +2022,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "../../sdk/node_modules/form-data": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", - "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "../../sdk/node_modules/fsevents": { "version": "2.3.3", "license": "MIT", @@ -2186,43 +2048,6 @@ "node": ">=6.9.0" } }, - "../../sdk/node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "../../sdk/node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "../../sdk/node_modules/glob": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz", @@ -2250,18 +2075,6 @@ "version": "0.4.1", "license": "BSD-2-Clause" }, - "../../sdk/node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "../../sdk/node_modules/graceful-fs": { "version": "4.2.11", "license": "ISC" @@ -2286,33 +2099,6 @@ "node": ">=8" } }, - "../../sdk/node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "../../sdk/node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "license": "MIT", - "dependencies": { - "has-symbols": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "../../sdk/node_modules/hasown": { "version": "2.0.2", "license": "MIT", @@ -2534,15 +2320,6 @@ "markdown-it": "bin/markdown-it.mjs" } }, - "../../sdk/node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, "../../sdk/node_modules/mdurl": { "version": "2.0.0", "dev": true, @@ -2759,10 +2536,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "../../sdk/node_modules/proxy-from-env": { - "version": "1.1.0", - "license": "MIT" - }, "../../sdk/node_modules/punycode": { "version": "2.3.1", "license": "MIT", diff --git a/server/package-lock.json b/server/package-lock.json index 430f34b5e..c3d45a58e 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.146.1", + "version": "0.146.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.146.1", + "version": "0.146.2", "hasInstallScript": true, "license": "ISC", "dependencies": {