diff --git a/plugins/google-device-access/fs/black.jpg b/plugins/google-device-access/fs/black.jpg deleted file mode 100644 index 7fe1c6d7d..000000000 Binary files a/plugins/google-device-access/fs/black.jpg and /dev/null differ diff --git a/plugins/google-device-access/fs/unavailable.jpg b/plugins/google-device-access/fs/unavailable.jpg new file mode 120000 index 000000000..8263b40fc --- /dev/null +++ b/plugins/google-device-access/fs/unavailable.jpg @@ -0,0 +1 @@ +../../../common/fs/unavailable.jpg \ No newline at end of file diff --git a/plugins/google-device-access/package-lock.json b/plugins/google-device-access/package-lock.json index ec51b576f..4248e52a3 100644 --- a/plugins/google-device-access/package-lock.json +++ b/plugins/google-device-access/package-lock.json @@ -1,14 +1,15 @@ { "name": "@scrypted/google-device-access", - "version": "0.0.86", + "version": "0.0.87", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/google-device-access", - "version": "0.0.86", + "version": "0.0.87", "dependencies": { "@googleapis/smartdevicemanagement": "^0.2.0", + "@koush/werift": "^0.14.5-beta5", "axios": "^0.21.1", "client-oauth2": "^4.3.3", "lodash": "^4.17.21", @@ -26,17 +27,11 @@ }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.0.144", + "version": "0.0.168", "dev": true, "license": "ISC", "dependencies": { - "@babel/plugin-proposal-class-properties": "^7.14.5", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", - "@babel/plugin-proposal-numeric-separator": "^7.14.5", - "@babel/plugin-proposal-optional-chaining": "^7.14.5", - "@babel/plugin-transform-modules-commonjs": "^7.15.4", - "@babel/plugin-transform-typescript": "^7.15.8", - "@babel/preset-typescript": "^7.15.0", + "@babel/preset-typescript": "^7.16.7", "adm-zip": "^0.4.13", "axios": "^0.21.4", "babel-loader": "^8.2.3", @@ -46,7 +41,6 @@ "raw-loader": "^4.0.2", "rimraf": "^3.0.2", "tmp": "^0.2.1", - "ts-loader": "^9.2.6", "webpack": "^5.59.0" }, "bin": { @@ -101,6 +95,37 @@ "node": ">=10.0.0" } }, + "node_modules/@koush/werift": { + "version": "0.14.5-beta5", + "resolved": "https://registry.npmjs.org/@koush/werift/-/werift-0.14.5-beta5.tgz", + "integrity": "sha512-8Nqfg2zDEdU/13hkT4KoLJyb/04lL4b2MffOsdpd4kouVavmn4jj9FPBJiTX8JkWZqjpSsE1Ga1lDgd0FDsbmg==", + "dependencies": { + "@fidm/x509": "^1.2.1", + "@minhducsun2002/leb128": "^0.2.0", + "@peculiar/webcrypto": "^1.1.6", + "@peculiar/x509": "^1.2.2", + "@shinyoshiaki/ebml-builder": "^0.0.1", + "aes-js": "^3.1.2", + "binary-data": "^0.6.0", + "buffer-crc32": "^0.2.13", + "date-fns": "^2.27.0", + "debug": "^4.3.3", + "elliptic": "^6.5.3", + "int64-buffer": "^1.0.1", + "ip": "^1.1.5", + "jspack": "^0.0.4", + "lodash": "^4.17.20", + "nano-time": "^1.0.0", + "p-cancelable": "^2.1.1", + "rx.mini": "^1.1.0", + "turbo-crc32": "^1.0.1", + "tweetnacl": "^1.0.3", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=15" + } + }, "node_modules/@minhducsun2002/leb128": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@minhducsun2002/leb128/-/leb128-0.2.0.tgz", @@ -1311,6 +1336,34 @@ "googleapis-common": "^5.0.1" } }, + "@koush/werift": { + "version": "0.14.5-beta5", + "resolved": "https://registry.npmjs.org/@koush/werift/-/werift-0.14.5-beta5.tgz", + "integrity": "sha512-8Nqfg2zDEdU/13hkT4KoLJyb/04lL4b2MffOsdpd4kouVavmn4jj9FPBJiTX8JkWZqjpSsE1Ga1lDgd0FDsbmg==", + "requires": { + "@fidm/x509": "^1.2.1", + "@minhducsun2002/leb128": "^0.2.0", + "@peculiar/webcrypto": "^1.1.6", + "@peculiar/x509": "^1.2.2", + "@shinyoshiaki/ebml-builder": "^0.0.1", + "aes-js": "^3.1.2", + "binary-data": "^0.6.0", + "buffer-crc32": "^0.2.13", + "date-fns": "^2.27.0", + "debug": "^4.3.3", + "elliptic": "^6.5.3", + "int64-buffer": "^1.0.1", + "ip": "^1.1.5", + "jspack": "^0.0.4", + "lodash": "^4.17.20", + "nano-time": "^1.0.0", + "p-cancelable": "^2.1.1", + "rx.mini": "^1.1.0", + "turbo-crc32": "^1.0.1", + "tweetnacl": "^1.0.3", + "uuid": "^8.3.2" + } + }, "@minhducsun2002/leb128": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@minhducsun2002/leb128/-/leb128-0.2.0.tgz", @@ -1475,13 +1528,7 @@ "@scrypted/sdk": { "version": "file:../../sdk", "requires": { - "@babel/plugin-proposal-class-properties": "^7.14.5", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", - "@babel/plugin-proposal-numeric-separator": "^7.14.5", - "@babel/plugin-proposal-optional-chaining": "^7.14.5", - "@babel/plugin-transform-modules-commonjs": "^7.15.4", - "@babel/plugin-transform-typescript": "^7.15.8", - "@babel/preset-typescript": "^7.15.0", + "@babel/preset-typescript": "^7.16.7", "@types/node": "^16.11.1", "@types/stringify-object": "^4.0.0", "adm-zip": "^0.4.13", @@ -1494,7 +1541,6 @@ "rimraf": "^3.0.2", "stringify-object": "^3.3.0", "tmp": "^0.2.1", - "ts-loader": "^9.2.6", "ts-node": "^10.4.0", "typedoc": "^0.22.8", "typescript-json-schema": "^0.50.1", diff --git a/plugins/google-device-access/package.json b/plugins/google-device-access/package.json index cbdf29164..d6e3de0a4 100644 --- a/plugins/google-device-access/package.json +++ b/plugins/google-device-access/package.json @@ -31,12 +31,12 @@ }, "dependencies": { "@googleapis/smartdevicemanagement": "^0.2.0", + "@koush/werift": "^0.14.5-beta5", "axios": "^0.21.1", "client-oauth2": "^4.3.3", "lodash": "^4.17.21", "query-string": "^7.0.0", - "url-parse": "^1.5.1", - "werift": "^0.14.5" + "url-parse": "^1.5.1" }, "devDependencies": { "@scrypted/sdk": "file:../../sdk", @@ -45,5 +45,5 @@ "@types/node": "^14.17.11", "@types/url-parse": "^1.4.3" }, - "version": "0.0.86" + "version": "0.0.87" } diff --git a/plugins/google-device-access/src/main.ts b/plugins/google-device-access/src/main.ts index 21d423307..7940382ab 100644 --- a/plugins/google-device-access/src/main.ts +++ b/plugins/google-device-access/src/main.ts @@ -16,7 +16,7 @@ const refreshFrequency = 60; const SdmSignalingPrefix = ScryptedMimeTypes.RTCAVSignalingPrefix + 'gda/'; const SdmDeviceSignalingPrefix = SdmSignalingPrefix + 'x-'; -const black = fs.readFileSync('black.jpg'); +const black = fs.readFileSync('unavailable.jpg'); const readmeV1 = fs.readFileSync('README-camera-v1.md').toString(); const readmeV2 = fs.readFileSync('README-camera-v2.md').toString();