mirror of
https://github.com/koush/scrypted.git
synced 2026-07-02 13:50:36 +01:00
sdk: rename sdk.version to sdk.serverVersion
This commit is contained in:
@@ -119,7 +119,7 @@ addSupportedType(ScryptedDeviceType.Garage, {
|
||||
);
|
||||
|
||||
return {
|
||||
displayCategories: ['GARAGE_DOOR'],
|
||||
displayCategories: ['GARAGE_DOOR'] as any,
|
||||
capabilities
|
||||
}
|
||||
},
|
||||
|
||||
4
plugins/objectdetector/package-lock.json
generated
4
plugins/objectdetector/package-lock.json
generated
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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) {
|
||||
}
|
||||
|
||||
4
sdk/package-lock.json
generated
4
sdk/package-lock.json
generated
@@ -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",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@scrypted/sdk",
|
||||
"version": "0.2.52",
|
||||
"version": "0.2.53",
|
||||
"description": "",
|
||||
"main": "dist/src/index.js",
|
||||
"exports": {
|
||||
|
||||
4
sdk/types/package-lock.json
generated
4
sdk/types/package-lock.json
generated
@@ -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",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@scrypted/types",
|
||||
"version": "0.2.49",
|
||||
"version": "0.2.50",
|
||||
"description": "",
|
||||
"main": "dist/index.js",
|
||||
"author": "",
|
||||
|
||||
@@ -1973,7 +1973,7 @@ export interface ScryptedStatic {
|
||||
mediaManager: MediaManager,
|
||||
systemManager: SystemManager,
|
||||
|
||||
version?: string;
|
||||
serverVersion?: string;
|
||||
|
||||
pluginHostAPI: any;
|
||||
pluginRemoteAPI: any;
|
||||
|
||||
18
server/package-lock.json
generated
18
server/package-lock.json
generated
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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.
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user