diff --git a/plugins/objectdetector/package-lock.json b/plugins/objectdetector/package-lock.json index fd48593f6..633db6d07 100644 --- a/plugins/objectdetector/package-lock.json +++ b/plugins/objectdetector/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/objectdetector", - "version": "0.0.136", + "version": "0.0.137", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/objectdetector", - "version": "0.0.136", + "version": "0.0.137", "license": "Apache-2.0", "dependencies": { "@scrypted/common": "file:../../common", diff --git a/plugins/objectdetector/package.json b/plugins/objectdetector/package.json index 90ceb211e..49e68caf6 100644 --- a/plugins/objectdetector/package.json +++ b/plugins/objectdetector/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/objectdetector", - "version": "0.0.136", + "version": "0.0.137", "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.", "author": "Scrypted", "license": "Apache-2.0", diff --git a/plugins/opencv/package-lock.json b/plugins/opencv/package-lock.json index 8668990fd..ee3e34d9a 100644 --- a/plugins/opencv/package-lock.json +++ b/plugins/opencv/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/opencv", - "version": "0.0.79", + "version": "0.0.80", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/opencv", - "version": "0.0.79", + "version": "0.0.80", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/opencv/package.json b/plugins/opencv/package.json index 870bfdcea..4498df83a 100644 --- a/plugins/opencv/package.json +++ b/plugins/opencv/package.json @@ -37,5 +37,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.0.79" + "version": "0.0.80" } diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json index 147304290..2ba8b7236 100644 --- a/plugins/openvino/package-lock.json +++ b/plugins/openvino/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/openvino", - "version": "0.1.16", + "version": "0.1.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/openvino", - "version": "0.1.16", + "version": "0.1.17", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json index 81e8c6f21..47719243b 100644 --- a/plugins/openvino/package.json +++ b/plugins/openvino/package.json @@ -39,5 +39,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.16" + "version": "0.1.17" } diff --git a/plugins/pam-diff/.vscode/settings.json b/plugins/pam-diff/.vscode/settings.json index 77ccdbd6d..44d4d203f 100644 --- a/plugins/pam-diff/.vscode/settings.json +++ b/plugins/pam-diff/.vscode/settings.json @@ -1,4 +1,4 @@ { - "scrypted.debugHost": "127.0.0.1", + "scrypted.debugHost": "koushik-ubuntu", } \ No newline at end of file diff --git a/plugins/pam-diff/package-lock.json b/plugins/pam-diff/package-lock.json index c9d688a04..ba1dfb77d 100644 --- a/plugins/pam-diff/package-lock.json +++ b/plugins/pam-diff/package-lock.json @@ -1,13 +1,12 @@ { "name": "@scrypted/pam-diff", - "version": "0.0.21", + "version": "0.0.22", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/pam-diff", - "version": "0.0.21", - "hasInstallScript": true, + "version": "0.0.22", "dependencies": { "@types/node": "^16.6.1", "pipe2pam": "^0.6.2" @@ -21,39 +20,40 @@ }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.0.199", + "version": "0.2.101", "dev": true, "license": "ISC", "dependencies": { - "@babel/preset-typescript": "^7.16.7", + "@babel/preset-typescript": "^7.18.6", "adm-zip": "^0.4.13", "axios": "^0.21.4", - "babel-loader": "^8.2.3", + "babel-loader": "^9.1.0", "babel-plugin-const-enum": "^1.1.0", - "esbuild": "^0.13.8", + "esbuild": "^0.15.9", "ncp": "^2.0.0", "raw-loader": "^4.0.2", "rimraf": "^3.0.2", "tmp": "^0.2.1", - "webpack": "^5.59.0" + "ts-loader": "^9.4.2", + "typescript": "^4.9.4", + "webpack": "^5.75.0", + "webpack-bundle-analyzer": "^4.5.0" }, "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-readme": "bin/scrypted-readme.js", "scrypted-setup-project": "bin/scrypted-setup-project.js", "scrypted-webpack": "bin/scrypted-webpack.js" }, "devDependencies": { - "@types/node": "^16.11.1", + "@types/node": "^18.11.18", "@types/stringify-object": "^4.0.0", "stringify-object": "^3.3.0", "ts-node": "^10.4.0", - "typedoc": "^0.22.8", - "typescript-json-schema": "^0.50.1", - "webpack-bundle-analyzer": "^4.5.0" + "typedoc": "^0.23.21" } }, "../sdk": { @@ -128,23 +128,24 @@ "@scrypted/sdk": { "version": "file:../../sdk", "requires": { - "@babel/preset-typescript": "^7.16.7", - "@types/node": "^16.11.1", + "@babel/preset-typescript": "^7.18.6", + "@types/node": "^18.11.18", "@types/stringify-object": "^4.0.0", "adm-zip": "^0.4.13", "axios": "^0.21.4", - "babel-loader": "^8.2.3", + "babel-loader": "^9.1.0", "babel-plugin-const-enum": "^1.1.0", - "esbuild": "^0.13.8", + "esbuild": "^0.15.9", "ncp": "^2.0.0", "raw-loader": "^4.0.2", "rimraf": "^3.0.2", "stringify-object": "^3.3.0", "tmp": "^0.2.1", + "ts-loader": "^9.4.2", "ts-node": "^10.4.0", - "typedoc": "^0.22.8", - "typescript-json-schema": "^0.50.1", - "webpack": "^5.59.0", + "typedoc": "^0.23.21", + "typescript": "^4.9.4", + "webpack": "^5.75.0", "webpack-bundle-analyzer": "^4.5.0" } }, diff --git a/plugins/pam-diff/package.json b/plugins/pam-diff/package.json index c03950fb2..68756b66c 100644 --- a/plugins/pam-diff/package.json +++ b/plugins/pam-diff/package.json @@ -43,5 +43,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.0.21" + "version": "0.0.22" } diff --git a/plugins/pam-diff/src/main.ts b/plugins/pam-diff/src/main.ts index 843c5b79c..67b6c716d 100644 --- a/plugins/pam-diff/src/main.ts +++ b/plugins/pam-diff/src/main.ts @@ -1,4 +1,4 @@ -import sdk, { MediaObject, ObjectDetection, ObjectDetectionCallbacks, ObjectDetectionGeneratorResult, ObjectDetectionGeneratorSession, ObjectDetectionModel, ObjectDetectionResult, ObjectDetectionSession, ObjectsDetected, ScryptedDeviceBase, VideoFrame } from '@scrypted/sdk'; +import sdk, { MediaObject, ObjectDetection, ObjectDetectionGeneratorResult, ObjectDetectionGeneratorSession, ObjectDetectionModel, ObjectDetectionResult, ObjectDetectionSession, ObjectsDetected, ScryptedDeviceBase, VideoFrame } from '@scrypted/sdk'; import PD from 'pam-diff'; import P2P from 'pipe2pam'; @@ -107,7 +107,7 @@ ENDHDR return this.generateObjectDetectionsInternal(videoFrames, session); } - async detectObjects(mediaObject: MediaObject, session?: ObjectDetectionSession, callbacks?: ObjectDetectionCallbacks): Promise { + async detectObjects(mediaObject: MediaObject, session?: ObjectDetectionSession): Promise { throw new Error('can not run motion detection on image') } diff --git a/plugins/python-codecs/package-lock.json b/plugins/python-codecs/package-lock.json index 1850bea4e..83b302167 100644 --- a/plugins/python-codecs/package-lock.json +++ b/plugins/python-codecs/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/python-codecs", - "version": "0.1.48", + "version": "0.1.50", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/python-codecs", - "version": "0.1.48", + "version": "0.1.50", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/python-codecs/package.json b/plugins/python-codecs/package.json index 233244d03..f0bbeacf7 100644 --- a/plugins/python-codecs/package.json +++ b/plugins/python-codecs/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/python-codecs", - "version": "0.1.48", + "version": "0.1.50", "description": "Python Codecs for Scrypted", "keywords": [ "scrypted", diff --git a/plugins/python-codecs/src/main.py b/plugins/python-codecs/src/main.py index a3b07b826..42a470764 100644 --- a/plugins/python-codecs/src/main.py +++ b/plugins/python-codecs/src/main.py @@ -128,6 +128,14 @@ class PythonCodecs(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.DeviceProvider) def create_scrypted_plugin(): return PythonCodecs() +def multiprocess_exit(): + import sys + if sys.platform == 'win32': + sys.exit() + else: + import os + os._exit(os.EX_OK) + class CodecFork: async def generateVideoFramesGstreamer(self, mediaObject: scrypted_sdk.MediaObject, options: scrypted_sdk.VideoFrameGeneratorOptions = None, filter: Any = None, h264Decoder: str = None) -> scrypted_sdk.VideoFrame: start = time.time() @@ -139,9 +147,7 @@ class CodecFork: raise finally: print('gstreamer finished after %s' % (time.time() - start)) - import os - os._exit(os.EX_OK) - pass + asyncio.get_event_loop().call_later(1, multiprocess_exit) async def generateVideoFramesLibav(self, mediaObject: scrypted_sdk.MediaObject, options: scrypted_sdk.VideoFrameGeneratorOptions = None, filter: Any = None) -> scrypted_sdk.VideoFrame: start = time.time() @@ -153,12 +159,7 @@ class CodecFork: raise finally: print('libav finished after %s' % (time.time() - start)) - import sys - if sys.platform == 'win32': - sys.exit() - else: - import os - os._exit(os.EX_OK) + asyncio.get_event_loop().call_later(1, multiprocess_exit) async def fork():