From 4ffbd164767f8a65151ef7475811192776743058 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Mon, 2 Jan 2023 20:01:13 -0800 Subject: [PATCH] sdk: rename sdk.version to sdk.serverVersion --- plugins/alexa/src/types/garagedoor.ts | 2 +- plugins/objectdetector/package-lock.json | 4 ++-- plugins/objectdetector/package.json | 2 +- plugins/objectdetector/src/server-version.ts | 4 ++-- sdk/package-lock.json | 4 ++-- sdk/package.json | 2 +- sdk/types/package-lock.json | 4 ++-- sdk/types/package.json | 2 +- sdk/types/src/types.input.ts | 2 +- server/package-lock.json | 18 +++++++++--------- server/package.json | 4 ++-- server/src/plugin/plugin-api.ts | 2 +- server/src/plugin/plugin-host.ts | 2 +- server/src/plugin/plugin-remote.ts | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/plugins/alexa/src/types/garagedoor.ts b/plugins/alexa/src/types/garagedoor.ts index 55240dc1e..12b284057 100644 --- a/plugins/alexa/src/types/garagedoor.ts +++ b/plugins/alexa/src/types/garagedoor.ts @@ -119,7 +119,7 @@ addSupportedType(ScryptedDeviceType.Garage, { ); return { - displayCategories: ['GARAGE_DOOR'], + displayCategories: ['GARAGE_DOOR'] as any, capabilities } }, diff --git a/plugins/objectdetector/package-lock.json b/plugins/objectdetector/package-lock.json index 78f2bacef..d43ecdeb5 100644 --- a/plugins/objectdetector/package-lock.json +++ b/plugins/objectdetector/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/objectdetector", - "version": "0.0.79", + "version": "0.0.80", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/objectdetector", - "version": "0.0.79", + "version": "0.0.80", "license": "Apache-2.0", "dependencies": { "@scrypted/common": "file:../../common", diff --git a/plugins/objectdetector/package.json b/plugins/objectdetector/package.json index ecda8efb9..50bac337f 100644 --- a/plugins/objectdetector/package.json +++ b/plugins/objectdetector/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/objectdetector", - "version": "0.0.79", + "version": "0.0.80", "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.", "author": "Scrypted", "license": "Apache-2.0", diff --git a/plugins/objectdetector/src/server-version.ts b/plugins/objectdetector/src/server-version.ts index 2d2854c76..2498b3d72 100644 --- a/plugins/objectdetector/src/server-version.ts +++ b/plugins/objectdetector/src/server-version.ts @@ -3,9 +3,9 @@ import sdk from '@scrypted/sdk'; export function serverSupportsMixinEventMasking() { try { - if (!sdk.version) + if (!sdk.serverVersion) return false; - return semver.gte(sdk.version, '0.5.0'); + return semver.gte(sdk.serverVersion, '0.5.0'); } catch (e) { } diff --git a/sdk/package-lock.json b/sdk/package-lock.json index 2241bead2..01918556e 100644 --- a/sdk/package-lock.json +++ b/sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/sdk", - "version": "0.2.52", + "version": "0.2.53", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/sdk", - "version": "0.2.52", + "version": "0.2.53", "license": "ISC", "dependencies": { "@babel/preset-typescript": "^7.18.6", diff --git a/sdk/package.json b/sdk/package.json index 8bc47ac22..06f15d405 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/sdk", - "version": "0.2.52", + "version": "0.2.53", "description": "", "main": "dist/src/index.js", "exports": { diff --git a/sdk/types/package-lock.json b/sdk/types/package-lock.json index 7ed474b82..dea944d5e 100644 --- a/sdk/types/package-lock.json +++ b/sdk/types/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/types", - "version": "0.2.49", + "version": "0.2.50", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/types", - "version": "0.2.49", + "version": "0.2.50", "license": "ISC", "devDependencies": { "@types/rimraf": "^3.0.2", diff --git a/sdk/types/package.json b/sdk/types/package.json index 6d782e8da..fb3ad1a05 100644 --- a/sdk/types/package.json +++ b/sdk/types/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/types", - "version": "0.2.49", + "version": "0.2.50", "description": "", "main": "dist/index.js", "author": "", diff --git a/sdk/types/src/types.input.ts b/sdk/types/src/types.input.ts index 3c42d4901..45c6ed5ac 100644 --- a/sdk/types/src/types.input.ts +++ b/sdk/types/src/types.input.ts @@ -1973,7 +1973,7 @@ export interface ScryptedStatic { mediaManager: MediaManager, systemManager: SystemManager, - version?: string; + serverVersion?: string; pluginHostAPI: any; pluginRemoteAPI: any; diff --git a/server/package-lock.json b/server/package-lock.json index edc5fd117..6727b3234 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,17 +1,17 @@ { "name": "@scrypted/server", - "version": "0.5.2", + "version": "0.5.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.5.2", + "version": "0.5.3", "license": "ISC", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", "@mapbox/node-pre-gyp": "^1.0.10", - "@scrypted/types": "^0.2.49", + "@scrypted/types": "^0.2.50", "adm-zip": "^0.5.9", "axios": "^0.21.4", "body-parser": "^1.19.0", @@ -245,9 +245,9 @@ } }, "node_modules/@scrypted/types": { - "version": "0.2.49", - "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.49.tgz", - "integrity": "sha512-jxKuPF3x0oFcz2Bu3zLl5hzeFiS4WUpzfeDd4PdvoGi5plgEMZKcFgHgtmHzqMxAhkbHh6fcbGitOz888a+9+A==" + "version": "0.2.50", + "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.50.tgz", + "integrity": "sha512-Urt8Gp5q9OIIDz3KzBp8jG7Jn2SHB4pAcgqjFyLJb/MNwVg649kG7tlnBvdLSJlWTzKry0dotCjbxtcMkan3Yg==" }, "node_modules/@tootallnate/once": { "version": "1.1.2", @@ -3281,9 +3281,9 @@ } }, "@scrypted/types": { - "version": "0.2.49", - "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.49.tgz", - "integrity": "sha512-jxKuPF3x0oFcz2Bu3zLl5hzeFiS4WUpzfeDd4PdvoGi5plgEMZKcFgHgtmHzqMxAhkbHh6fcbGitOz888a+9+A==" + "version": "0.2.50", + "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.50.tgz", + "integrity": "sha512-Urt8Gp5q9OIIDz3KzBp8jG7Jn2SHB4pAcgqjFyLJb/MNwVg649kG7tlnBvdLSJlWTzKry0dotCjbxtcMkan3Yg==" }, "@tootallnate/once": { "version": "1.1.2", diff --git a/server/package.json b/server/package.json index 340829378..a7cead28f 100644 --- a/server/package.json +++ b/server/package.json @@ -1,11 +1,11 @@ { "name": "@scrypted/server", - "version": "0.5.2", + "version": "0.5.3", "description": "", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", "@mapbox/node-pre-gyp": "^1.0.10", - "@scrypted/types": "^0.2.49", + "@scrypted/types": "^0.2.50", "adm-zip": "^0.5.9", "axios": "^0.21.4", "body-parser": "^1.19.0", diff --git a/server/src/plugin/plugin-api.ts b/server/src/plugin/plugin-api.ts index 2f78917b5..74a37ecf1 100644 --- a/server/src/plugin/plugin-api.ts +++ b/server/src/plugin/plugin-api.ts @@ -154,7 +154,7 @@ export class PluginAPIProxy extends PluginAPIManagedListeners implements PluginA } export interface PluginRemoteLoadZipOptions { - version?: string; + serverVersion?: string; /** * The filename to load the script as. Use for debugger source mapping. */ diff --git a/server/src/plugin/plugin-host.ts b/server/src/plugin/plugin-host.ts index 4a48612d6..d5647c051 100644 --- a/server/src/plugin/plugin-host.ts +++ b/server/src/plugin/plugin-host.ts @@ -242,7 +242,7 @@ export class PluginHost { try { const isPython = runtime === 'python'; const loadZipOptions: PluginRemoteLoadZipOptions = { - version: serverVersion, + serverVersion: serverVersion, // if debugging, use a normalized path for sourcemap resolution, otherwise // prefix with module path. filename: isPython diff --git a/server/src/plugin/plugin-remote.ts b/server/src/plugin/plugin-remote.ts index 636387df7..d5104b992 100644 --- a/server/src/plugin/plugin-remote.ts +++ b/server/src/plugin/plugin-remote.ts @@ -637,7 +637,7 @@ export function attachPluginRemote(peer: RpcPeer, options?: PluginRemoteAttachOp }; params.pluginRuntimeAPI = ret; - ret.version = zipOptions.version; + ret.serverVersion = zipOptions.serverVersion; return options.onLoadZip(ret, params, packageJson, zipData, zipOptions); },