From c13604bed90d9b4c3c23dbe736e2a3d6dd48ebee Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 11 Oct 2022 16:04:42 -0700 Subject: [PATCH] server/sdk: fix python sdk generation bug --- sdk/package-lock.json | 4 ++-- sdk/package.json | 2 +- sdk/types/package-lock.json | 4 ++-- sdk/types/package.json | 2 +- sdk/types/scrypted_python/scrypted_sdk/types.py | 7 ------- sdk/types/src/build.ts | 2 ++ server/package-lock.json | 14 +++++++------- server/package.json | 2 +- server/src/db-types.ts | 3 ++- 9 files changed, 18 insertions(+), 22 deletions(-) diff --git a/sdk/package-lock.json b/sdk/package-lock.json index 31cea4b2d..c61fbd7db 100644 --- a/sdk/package-lock.json +++ b/sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/sdk", - "version": "0.1.19", + "version": "0.1.20", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/sdk", - "version": "0.1.19", + "version": "0.1.20", "license": "ISC", "dependencies": { "@babel/preset-typescript": "^7.16.7", diff --git a/sdk/package.json b/sdk/package.json index 1b5d7be58..c271cb491 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/sdk", - "version": "0.1.19", + "version": "0.1.20", "description": "", "main": "dist/src/index.js", "exports": { diff --git a/sdk/types/package-lock.json b/sdk/types/package-lock.json index 90f9b1e66..b4a3f76eb 100644 --- a/sdk/types/package-lock.json +++ b/sdk/types/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/types", - "version": "0.0.113", + "version": "0.0.114", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/types", - "version": "0.0.113", + "version": "0.0.114", "license": "ISC", "devDependencies": { "@types/rimraf": "^3.0.2", diff --git a/sdk/types/package.json b/sdk/types/package.json index 4d5c6272c..176c88758 100644 --- a/sdk/types/package.json +++ b/sdk/types/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/types", - "version": "0.0.113", + "version": "0.0.114", "description": "", "main": "dist/index.js", "author": "", diff --git a/sdk/types/scrypted_python/scrypted_sdk/types.py b/sdk/types/scrypted_python/scrypted_sdk/types.py index 392980a3f..1108f4786 100644 --- a/sdk/types/scrypted_python/scrypted_sdk/types.py +++ b/sdk/types/scrypted_python/scrypted_sdk/types.py @@ -1250,13 +1250,6 @@ class DeviceState: def name(self, value: str): self.setScryptedProperty("name", value) - @property - def nativeId(self) -> str: - return self.getScryptedProperty("nativeId") - @nativeId.setter - def nativeId(self, value: str): - self.setScryptedProperty("nativeId", value) - @property def pluginId(self) -> str: return self.getScryptedProperty("pluginId") diff --git a/sdk/types/src/build.ts b/sdk/types/src/build.ts index 9dc1bf19a..eef344ea9 100644 --- a/sdk/types/src/build.ts +++ b/sdk/types/src/build.ts @@ -191,6 +191,8 @@ class DeviceState: pass ` for (const [val, type] of Object.entries(allProperties)) { + if (val === 'nativeId') + continue; python += ` @property def ${val}(self) -> ${toPythonType(type)}: diff --git a/server/package-lock.json b/server/package-lock.json index e1e992634..df4f4c154 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", "@mapbox/node-pre-gyp": "^1.0.8", - "@scrypted/types": "^0.0.113", + "@scrypted/types": "^0.0.114", "adm-zip": "^0.5.3", "axios": "^0.21.1", "body-parser": "^1.19.0", @@ -247,9 +247,9 @@ } }, "node_modules/@scrypted/types": { - "version": "0.0.113", - "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.0.113.tgz", - "integrity": "sha512-2aVAQjXkq8ZUcgo+Rnh/Xv+Tw/yB6Fu6XDPKOe9QOYl42l7pCD4Fzql/WYxNGJpxirQFqveSzfw091E99OWspQ==" + "version": "0.0.114", + "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.0.114.tgz", + "integrity": "sha512-XghyTvdSGWhC7IB/mNDqb8d7fvTxsgWZ6+5v6wBLEI0TD/gFmOtoryISprKilkl3qLwL+vR+BKiW6p3lNSEqnw==" }, "node_modules/@socket.io/component-emitter": { "version": "3.1.0", @@ -3168,9 +3168,9 @@ } }, "@scrypted/types": { - "version": "0.0.113", - "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.0.113.tgz", - "integrity": "sha512-2aVAQjXkq8ZUcgo+Rnh/Xv+Tw/yB6Fu6XDPKOe9QOYl42l7pCD4Fzql/WYxNGJpxirQFqveSzfw091E99OWspQ==" + "version": "0.0.114", + "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.0.114.tgz", + "integrity": "sha512-XghyTvdSGWhC7IB/mNDqb8d7fvTxsgWZ6+5v6wBLEI0TD/gFmOtoryISprKilkl3qLwL+vR+BKiW6p3lNSEqnw==" }, "@socket.io/component-emitter": { "version": "3.1.0", diff --git a/server/package.json b/server/package.json index 19989b07f..659ffa51b 100644 --- a/server/package.json +++ b/server/package.json @@ -5,7 +5,7 @@ "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", "@mapbox/node-pre-gyp": "^1.0.8", - "@scrypted/types": "^0.0.113", + "@scrypted/types": "^0.0.114", "adm-zip": "^0.5.3", "axios": "^0.21.1", "body-parser": "^1.19.0", diff --git a/server/src/db-types.ts b/server/src/db-types.ts index 093cdd405..20d9472c6 100644 --- a/server/src/db-types.ts +++ b/server/src/db-types.ts @@ -20,6 +20,7 @@ export class ScryptedUser extends ScryptedDocument { passwordHash: string; token: string; salt: string; + restricted: boolean; } export class ScryptedAlert extends ScryptedDocument { @@ -27,7 +28,7 @@ export class ScryptedAlert extends ScryptedDocument { title: string; path: string; message: string; -} +}`` export class PluginDevice extends ScryptedDocument { constructor(id?: string) {