prerelease

plugins/python-codecs/.vscode/settings.json

@@ -1,7 +1,7 @@
 
 {
     // docker installation
-    // "scrypted.debugHost": "koushik-thin",
+    // "scrypted.debugHost": "koushik-ubuntu",
     // "scrypted.serverRoot": "/server",
 
     // pi local installation

plugins/python-codecs/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.8",
+   "version": "0.1.12",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/python-codecs",
-         "version": "0.1.8",
+         "version": "0.1.12",
          "devDependencies": {
             "@scrypted/sdk": "file:../../sdk"
          }

plugins/python-codecs/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.8",
+   "version": "0.1.12",
    "description": "Python Codecs for Scrypted",
    "keywords": [
       "scrypted",

plugins/python-codecs/src/main.py

@@ -1,9 +1,10 @@
 import asyncio
 import scrypted_sdk
 from scrypted_sdk import Setting, SettingValue
-from typing import Any
+from typing import Any, List
 import gstreamer
 import libav
+import vips
 
 Gst = None
 try:
@@ -29,7 +30,7 @@ class GstreamerGenerator(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.VideoFram
         forked: CodecFork = await worker.result
         return await forked.generateVideoFramesGstreamer(mediaObject, options, filter, self.storage.getItem('h264Decoder'))
     
-    async def getSettings(self) -> list[Setting]:
+    async def getSettings(self) -> List[Setting]:
         return [
             {
                 'key': 'h264Decoder',
@@ -84,6 +85,24 @@ class PythonCodecs(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.DeviceProvider)
             }
             manifest['devices'].append(avDevice)
 
+        manifest['devices'].append({
+            'name': 'Image Reader',
+            'type': scrypted_sdk.ScryptedDeviceType.Builtin.value,
+            'nativeId': 'reader',
+            'interfaces': [
+                scrypted_sdk.ScryptedInterface.BufferConverter.value,
+            ]
+        })
+
+        manifest['devices'].append({
+            'name': 'Image Writer',
+            'type': scrypted_sdk.ScryptedDeviceType.Builtin.value,
+            'nativeId': 'writer',
+            'interfaces': [
+                scrypted_sdk.ScryptedInterface.BufferConverter.value,
+            ]
+        })
+
         await scrypted_sdk.deviceManager.onDevicesChanged(manifest)
 
     def getDevice(self, nativeId: str) -> Any:
@@ -91,6 +110,10 @@ class PythonCodecs(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.DeviceProvider)
             return GstreamerGenerator('gstreamer')
         if nativeId == 'libav':
             return LibavGenerator('libav')
+        if nativeId == 'reader':
+            return vips.ImageReader('reader')
+        if nativeId == 'writer':
+            return vips.ImageWriter('writer')
 
 def create_scrypted_plugin():
     return PythonCodecs()

plugins/python-codecs/src/vips.py

@@ -87,3 +87,26 @@ async def createVipsMediaObject(image: VipsImage):
         'toImage': lambda options = None: image.toImage(options),
     })
     return ret
+
+class ImageReader(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.BufferConverter):
+    def __init__(self, nativeId: str):
+        super().__init__(nativeId)
+
+        self.fromMimeType = 'image/*'
+        self.toMimeType = scrypted_sdk.ScryptedMimeTypes.Image.value
+
+    async def convert(self, data: Any, fromMimeType: str, toMimeType: str, options: scrypted_sdk.MediaObjectOptions = None) -> Any:
+        vips = pyvips.Image.new_from_buffer(data, '')
+        return await createVipsMediaObject(VipsImage(vips))
+
+class ImageWriter(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.BufferConverter):
+    def __init__(self, nativeId: str):
+        super().__init__(nativeId)
+
+        self.fromMimeType = scrypted_sdk.ScryptedMimeTypes.Image.value
+        self.toMimeType = 'image/*'
+
+    async def convert(self, data: scrypted_sdk.VideoFrame, fromMimeType: str, toMimeType: str, options: scrypted_sdk.MediaObjectOptions = None) -> Any:
+        return await data.toBuffer({
+            format: 'jpg',
+        })

plugins/snapshot/package-lock.json

@@ -1,17 +1,16 @@
 {
    "name": "@scrypted/snapshot",
-   "version": "0.0.49",
+   "version": "0.0.52",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/snapshot",
-         "version": "0.0.49",
+         "version": "0.0.52",
          "dependencies": {
             "@koush/axios-digest-auth": "^0.8.5",
             "@types/node": "^16.6.1",
             "axios": "^0.24.0",
-            "sharp": "^0.31.3",
             "whatwg-mimetype": "^3.0.0"
          },
          "devDependencies": {
@@ -39,7 +38,7 @@
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.2.84",
+         "version": "0.2.85",
          "dev": true,
          "license": "ISC",
          "dependencies": {
@@ -133,146 +132,6 @@
             "follow-redirects": "^1.14.4"
          }
       },
-      "node_modules/base64-js": {
-         "version": "1.5.1",
-         "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-         "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ]
-      },
-      "node_modules/bl": {
-         "version": "4.1.0",
-         "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-         "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-         "dependencies": {
-            "buffer": "^5.5.0",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0"
-         }
-      },
-      "node_modules/buffer": {
-         "version": "5.7.1",
-         "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-         "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ],
-         "dependencies": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-         }
-      },
-      "node_modules/chownr": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-         "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-      },
-      "node_modules/color": {
-         "version": "4.2.3",
-         "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-         "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-         "dependencies": {
-            "color-convert": "^2.0.1",
-            "color-string": "^1.9.0"
-         },
-         "engines": {
-            "node": ">=12.5.0"
-         }
-      },
-      "node_modules/color-convert": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-         "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-         "dependencies": {
-            "color-name": "~1.1.4"
-         },
-         "engines": {
-            "node": ">=7.0.0"
-         }
-      },
-      "node_modules/color-name": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-         "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-      },
-      "node_modules/color-string": {
-         "version": "1.9.1",
-         "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-         "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-         "dependencies": {
-            "color-name": "^1.0.0",
-            "simple-swizzle": "^0.2.2"
-         }
-      },
-      "node_modules/decompress-response": {
-         "version": "6.0.0",
-         "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-         "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-         "dependencies": {
-            "mimic-response": "^3.1.0"
-         },
-         "engines": {
-            "node": ">=10"
-         },
-         "funding": {
-            "url": "https://github.com/sponsors/sindresorhus"
-         }
-      },
-      "node_modules/deep-extend": {
-         "version": "0.6.0",
-         "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-         "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-         "engines": {
-            "node": ">=4.0.0"
-         }
-      },
-      "node_modules/detect-libc": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-         "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-         "engines": {
-            "node": ">=8"
-         }
-      },
-      "node_modules/end-of-stream": {
-         "version": "1.4.4",
-         "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-         "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-         "dependencies": {
-            "once": "^1.4.0"
-         }
-      },
-      "node_modules/expand-template": {
-         "version": "2.0.3",
-         "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-         "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-         "engines": {
-            "node": ">=6"
-         }
-      },
       "node_modules/follow-redirects": {
          "version": "1.14.9",
          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
@@ -292,339 +151,6 @@
             }
          }
       },
-      "node_modules/fs-constants": {
-         "version": "1.0.0",
-         "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-         "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-      },
-      "node_modules/github-from-package": {
-         "version": "0.0.0",
-         "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-         "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
-      },
-      "node_modules/ieee754": {
-         "version": "1.2.1",
-         "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-         "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ]
-      },
-      "node_modules/inherits": {
-         "version": "2.0.4",
-         "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-         "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-      },
-      "node_modules/ini": {
-         "version": "1.3.8",
-         "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-         "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-      },
-      "node_modules/is-arrayish": {
-         "version": "0.3.2",
-         "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-         "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-      },
-      "node_modules/lru-cache": {
-         "version": "6.0.0",
-         "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-         "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-         "dependencies": {
-            "yallist": "^4.0.0"
-         },
-         "engines": {
-            "node": ">=10"
-         }
-      },
-      "node_modules/mimic-response": {
-         "version": "3.1.0",
-         "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-         "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-         "engines": {
-            "node": ">=10"
-         },
-         "funding": {
-            "url": "https://github.com/sponsors/sindresorhus"
-         }
-      },
-      "node_modules/minimist": {
-         "version": "1.2.8",
-         "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-         "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-         "funding": {
-            "url": "https://github.com/sponsors/ljharb"
-         }
-      },
-      "node_modules/mkdirp-classic": {
-         "version": "0.5.3",
-         "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-         "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-      },
-      "node_modules/napi-build-utils": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-         "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
-      },
-      "node_modules/node-abi": {
-         "version": "3.33.0",
-         "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz",
-         "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==",
-         "dependencies": {
-            "semver": "^7.3.5"
-         },
-         "engines": {
-            "node": ">=10"
-         }
-      },
-      "node_modules/node-addon-api": {
-         "version": "5.1.0",
-         "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
-         "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA=="
-      },
-      "node_modules/once": {
-         "version": "1.4.0",
-         "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-         "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-         "dependencies": {
-            "wrappy": "1"
-         }
-      },
-      "node_modules/prebuild-install": {
-         "version": "7.1.1",
-         "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
-         "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-         "dependencies": {
-            "detect-libc": "^2.0.0",
-            "expand-template": "^2.0.3",
-            "github-from-package": "0.0.0",
-            "minimist": "^1.2.3",
-            "mkdirp-classic": "^0.5.3",
-            "napi-build-utils": "^1.0.1",
-            "node-abi": "^3.3.0",
-            "pump": "^3.0.0",
-            "rc": "^1.2.7",
-            "simple-get": "^4.0.0",
-            "tar-fs": "^2.0.0",
-            "tunnel-agent": "^0.6.0"
-         },
-         "bin": {
-            "prebuild-install": "bin.js"
-         },
-         "engines": {
-            "node": ">=10"
-         }
-      },
-      "node_modules/pump": {
-         "version": "3.0.0",
-         "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-         "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-         "dependencies": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-         }
-      },
-      "node_modules/rc": {
-         "version": "1.2.8",
-         "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-         "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-         "dependencies": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-         },
-         "bin": {
-            "rc": "cli.js"
-         }
-      },
-      "node_modules/readable-stream": {
-         "version": "3.6.1",
-         "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
-         "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
-         "dependencies": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-         },
-         "engines": {
-            "node": ">= 6"
-         }
-      },
-      "node_modules/safe-buffer": {
-         "version": "5.2.1",
-         "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-         "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ]
-      },
-      "node_modules/semver": {
-         "version": "7.3.8",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-         "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-         "dependencies": {
-            "lru-cache": "^6.0.0"
-         },
-         "bin": {
-            "semver": "bin/semver.js"
-         },
-         "engines": {
-            "node": ">=10"
-         }
-      },
-      "node_modules/sharp": {
-         "version": "0.31.3",
-         "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
-         "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
-         "hasInstallScript": true,
-         "dependencies": {
-            "color": "^4.2.3",
-            "detect-libc": "^2.0.1",
-            "node-addon-api": "^5.0.0",
-            "prebuild-install": "^7.1.1",
-            "semver": "^7.3.8",
-            "simple-get": "^4.0.1",
-            "tar-fs": "^2.1.1",
-            "tunnel-agent": "^0.6.0"
-         },
-         "engines": {
-            "node": ">=14.15.0"
-         },
-         "funding": {
-            "url": "https://opencollective.com/libvips"
-         }
-      },
-      "node_modules/simple-concat": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-         "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ]
-      },
-      "node_modules/simple-get": {
-         "version": "4.0.1",
-         "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-         "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-         "funding": [
-            {
-               "type": "github",
-               "url": "https://github.com/sponsors/feross"
-            },
-            {
-               "type": "patreon",
-               "url": "https://www.patreon.com/feross"
-            },
-            {
-               "type": "consulting",
-               "url": "https://feross.org/support"
-            }
-         ],
-         "dependencies": {
-            "decompress-response": "^6.0.0",
-            "once": "^1.3.1",
-            "simple-concat": "^1.0.0"
-         }
-      },
-      "node_modules/simple-swizzle": {
-         "version": "0.2.2",
-         "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-         "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-         "dependencies": {
-            "is-arrayish": "^0.3.1"
-         }
-      },
-      "node_modules/string_decoder": {
-         "version": "1.3.0",
-         "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-         "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-         "dependencies": {
-            "safe-buffer": "~5.2.0"
-         }
-      },
-      "node_modules/strip-json-comments": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-         "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-         "engines": {
-            "node": ">=0.10.0"
-         }
-      },
-      "node_modules/tar-fs": {
-         "version": "2.1.1",
-         "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-         "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-         "dependencies": {
-            "chownr": "^1.1.1",
-            "mkdirp-classic": "^0.5.2",
-            "pump": "^3.0.0",
-            "tar-stream": "^2.1.4"
-         }
-      },
-      "node_modules/tar-stream": {
-         "version": "2.2.0",
-         "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-         "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-         "dependencies": {
-            "bl": "^4.0.3",
-            "end-of-stream": "^1.4.1",
-            "fs-constants": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.1.1"
-         },
-         "engines": {
-            "node": ">=6"
-         }
-      },
-      "node_modules/tunnel-agent": {
-         "version": "0.6.0",
-         "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-         "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-         "dependencies": {
-            "safe-buffer": "^5.0.1"
-         },
-         "engines": {
-            "node": "*"
-         }
-      },
-      "node_modules/util-deprecate": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-         "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-      },
       "node_modules/whatwg-mimetype": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
@@ -632,16 +158,6 @@
          "engines": {
             "node": ">=12"
          }
-      },
-      "node_modules/wrappy": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-         "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-      },
-      "node_modules/yallist": {
-         "version": "4.0.0",
-         "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-         "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
       }
    },
    "dependencies": {
@@ -732,344 +248,15 @@
             "follow-redirects": "^1.14.4"
          }
       },
-      "base64-js": {
-         "version": "1.5.1",
-         "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-         "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-      },
-      "bl": {
-         "version": "4.1.0",
-         "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-         "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-         "requires": {
-            "buffer": "^5.5.0",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0"
-         }
-      },
-      "buffer": {
-         "version": "5.7.1",
-         "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-         "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-         "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-         }
-      },
-      "chownr": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-         "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-      },
-      "color": {
-         "version": "4.2.3",
-         "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-         "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-         "requires": {
-            "color-convert": "^2.0.1",
-            "color-string": "^1.9.0"
-         }
-      },
-      "color-convert": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-         "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-         "requires": {
-            "color-name": "~1.1.4"
-         }
-      },
-      "color-name": {
-         "version": "1.1.4",
-         "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-         "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-      },
-      "color-string": {
-         "version": "1.9.1",
-         "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-         "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-         "requires": {
-            "color-name": "^1.0.0",
-            "simple-swizzle": "^0.2.2"
-         }
-      },
-      "decompress-response": {
-         "version": "6.0.0",
-         "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-         "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-         "requires": {
-            "mimic-response": "^3.1.0"
-         }
-      },
-      "deep-extend": {
-         "version": "0.6.0",
-         "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-         "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
-      },
-      "detect-libc": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-         "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
-      },
-      "end-of-stream": {
-         "version": "1.4.4",
-         "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-         "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-         "requires": {
-            "once": "^1.4.0"
-         }
-      },
-      "expand-template": {
-         "version": "2.0.3",
-         "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-         "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
-      },
       "follow-redirects": {
          "version": "1.14.9",
          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
          "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
       },
-      "fs-constants": {
-         "version": "1.0.0",
-         "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-         "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-      },
-      "github-from-package": {
-         "version": "0.0.0",
-         "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-         "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
-      },
-      "ieee754": {
-         "version": "1.2.1",
-         "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-         "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-      },
-      "inherits": {
-         "version": "2.0.4",
-         "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-         "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-      },
-      "ini": {
-         "version": "1.3.8",
-         "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-         "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-      },
-      "is-arrayish": {
-         "version": "0.3.2",
-         "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-         "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-      },
-      "lru-cache": {
-         "version": "6.0.0",
-         "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-         "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-         "requires": {
-            "yallist": "^4.0.0"
-         }
-      },
-      "mimic-response": {
-         "version": "3.1.0",
-         "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-         "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
-      },
-      "minimist": {
-         "version": "1.2.8",
-         "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-         "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
-      },
-      "mkdirp-classic": {
-         "version": "0.5.3",
-         "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-         "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-      },
-      "napi-build-utils": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-         "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
-      },
-      "node-abi": {
-         "version": "3.33.0",
-         "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz",
-         "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==",
-         "requires": {
-            "semver": "^7.3.5"
-         }
-      },
-      "node-addon-api": {
-         "version": "5.1.0",
-         "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
-         "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA=="
-      },
-      "once": {
-         "version": "1.4.0",
-         "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-         "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-         "requires": {
-            "wrappy": "1"
-         }
-      },
-      "prebuild-install": {
-         "version": "7.1.1",
-         "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
-         "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-         "requires": {
-            "detect-libc": "^2.0.0",
-            "expand-template": "^2.0.3",
-            "github-from-package": "0.0.0",
-            "minimist": "^1.2.3",
-            "mkdirp-classic": "^0.5.3",
-            "napi-build-utils": "^1.0.1",
-            "node-abi": "^3.3.0",
-            "pump": "^3.0.0",
-            "rc": "^1.2.7",
-            "simple-get": "^4.0.0",
-            "tar-fs": "^2.0.0",
-            "tunnel-agent": "^0.6.0"
-         }
-      },
-      "pump": {
-         "version": "3.0.0",
-         "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-         "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-         "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-         }
-      },
-      "rc": {
-         "version": "1.2.8",
-         "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-         "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-         "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-         }
-      },
-      "readable-stream": {
-         "version": "3.6.1",
-         "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
-         "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
-         "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-         }
-      },
-      "safe-buffer": {
-         "version": "5.2.1",
-         "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-         "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-      },
-      "semver": {
-         "version": "7.3.8",
-         "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-         "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-         "requires": {
-            "lru-cache": "^6.0.0"
-         }
-      },
-      "sharp": {
-         "version": "0.31.3",
-         "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
-         "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
-         "requires": {
-            "color": "^4.2.3",
-            "detect-libc": "^2.0.1",
-            "node-addon-api": "^5.0.0",
-            "prebuild-install": "^7.1.1",
-            "semver": "^7.3.8",
-            "simple-get": "^4.0.1",
-            "tar-fs": "^2.1.1",
-            "tunnel-agent": "^0.6.0"
-         }
-      },
-      "simple-concat": {
-         "version": "1.0.1",
-         "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-         "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
-      },
-      "simple-get": {
-         "version": "4.0.1",
-         "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-         "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-         "requires": {
-            "decompress-response": "^6.0.0",
-            "once": "^1.3.1",
-            "simple-concat": "^1.0.0"
-         }
-      },
-      "simple-swizzle": {
-         "version": "0.2.2",
-         "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-         "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-         "requires": {
-            "is-arrayish": "^0.3.1"
-         }
-      },
-      "string_decoder": {
-         "version": "1.3.0",
-         "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-         "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-         "requires": {
-            "safe-buffer": "~5.2.0"
-         }
-      },
-      "strip-json-comments": {
-         "version": "2.0.1",
-         "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-         "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
-      },
-      "tar-fs": {
-         "version": "2.1.1",
-         "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-         "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-         "requires": {
-            "chownr": "^1.1.1",
-            "mkdirp-classic": "^0.5.2",
-            "pump": "^3.0.0",
-            "tar-stream": "^2.1.4"
-         }
-      },
-      "tar-stream": {
-         "version": "2.2.0",
-         "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-         "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-         "requires": {
-            "bl": "^4.0.3",
-            "end-of-stream": "^1.4.1",
-            "fs-constants": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.1.1"
-         }
-      },
-      "tunnel-agent": {
-         "version": "0.6.0",
-         "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-         "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-         "requires": {
-            "safe-buffer": "^5.0.1"
-         }
-      },
-      "util-deprecate": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-         "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-      },
       "whatwg-mimetype": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
          "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="
-      },
-      "wrappy": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-         "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-      },
-      "yallist": {
-         "version": "4.0.0",
-         "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-         "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
       }
    }
 }

plugins/snapshot/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/snapshot",
-   "version": "0.0.49",
+   "version": "0.0.52",
    "description": "Snapshot Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
@@ -26,15 +26,11 @@
       "name": "Snapshot Plugin",
       "type": "API",
       "interfaces": [
-         "DeviceProvider",
          "Settings",
          "MixinProvider",
          "BufferConverter"
       ]
    },
-   "optionalDependencies": {
-      "sharp": "^0.31.3"
-   },
    "dependencies": {
       "@koush/axios-digest-auth": "^0.8.5",
       "@types/node": "^16.6.1",

plugins/snapshot/src/image-reader.ts

@@ -1,113 +0,0 @@
-import sdk, { BufferConverter, Image, ImageOptions, MediaObject, MediaObjectOptions, ScryptedDeviceBase, ScryptedMimeTypes } from "@scrypted/sdk";
-import sharp from 'sharp';
-
-async function createVipsMediaObject(image: VipsImage): Promise<Image & MediaObject> {
-    const ret = await sdk.mediaManager.createMediaObject(image, ScryptedMimeTypes.Image, {
-        width: image.width,
-        height: image.height,
-        toBuffer: (options: ImageOptions) => image.toBuffer(options),
-        toImage: async (options: ImageOptions) => {
-            const newImage = await image.toVipsImage(options);
-            return createVipsMediaObject(newImage);
-        }
-    });
-
-    return ret;
-}
-
-class VipsImage implements Image {
-    constructor(public image: sharp.Sharp, public metadata: sharp.Metadata) {
-    }
-
-    get width() {
-        return this.metadata.width;
-    }
-    get height() {
-        return this.metadata.height;
-    }
-
-    toImageInternal(options: ImageOptions) {
-        const transformed = this.image.clone();
-        if (options?.crop) {
-            transformed.extract({
-                left: Math.floor(options.crop.left),
-                top: Math.floor(options.crop.top),
-                width: Math.floor(options.crop.width),
-                height: Math.floor(options.crop.height),
-            });
-        }
-        if (options?.resize) {
-            transformed.resize(typeof options.resize.width === 'number' ? Math.floor(options.resize.width) : undefined, typeof options.resize.height === 'number' ? Math.floor(options.resize.height) : undefined, {
-                fit: "fill",
-            });
-        }
-
-        return transformed;
-    }
-
-    async toBuffer(options: ImageOptions) {
-        const transformed = this.toImageInternal(options);
-        if (options?.format === 'rgb') {
-            transformed.removeAlpha().toFormat('raw');
-        }
-        else if (options?.format === 'jpg') {
-            transformed.toFormat('jpg');
-        }
-        return transformed.toBuffer();
-    }
-
-    async toVipsImage(options: ImageOptions) {
-        const transformed = this.toImageInternal(options);
-        const { info, data } = await transformed.raw().toBuffer({
-            resolveWithObject: true,
-        });
-
-        const newImage = sharp(data, {
-            raw: info,
-        });
-
-        const newMetadata = await newImage.metadata();
-        const newVipsImage = new VipsImage(newImage, newMetadata);
-        return newVipsImage;
-    }
-
-    async toImage(options: ImageOptions) {
-        if (options.format)
-            throw new Error('format can only be used with toBuffer');
-        const newVipsImage = await this.toVipsImage(options);
-        return createVipsMediaObject(newVipsImage);
-    }
-}
-
-export class ImageWriter extends ScryptedDeviceBase implements BufferConverter {
-    constructor(nativeId: string) {
-        super(nativeId);
-
-        this.fromMimeType = ScryptedMimeTypes.Image;
-        this.toMimeType = 'image/*';
-    }
-
-    async convert(data: Image, fromMimeType: string, toMimeType: string, options?: MediaObjectOptions): Promise<Buffer> {
-        return data.toBuffer({
-            format: 'jpg',
-        });
-    }
-}
-
-export class ImageReader extends ScryptedDeviceBase implements BufferConverter {
-    constructor(nativeId: string) {
-        super(nativeId);
-
-        this.fromMimeType = 'image/*';
-        this.toMimeType = ScryptedMimeTypes.Image;
-    }
-
-    async convert(data: Buffer, fromMimeType: string, toMimeType: string, options?: MediaObjectOptions): Promise<Image> {
-        const image = sharp(data, {
-            failOnError: false,
-        });
-        const metadata = await image.metadata();
-        const vipsImage = new VipsImage(image, metadata);
-        return createVipsMediaObject(vipsImage);
-    }
-}

plugins/snapshot/src/main.ts

@@ -8,9 +8,7 @@ import axios, { AxiosInstance } from "axios";
 import https from 'https';
 import path from 'path';
 import MimeType from 'whatwg-mimetype';
-import { ffmpegFilterImage } from './ffmpeg-image-filter';
-import { ImageReader, ImageWriter } from './image-reader';
-import { sharpFilterImage } from './sharp-image-filter';
+import { ffmpegFilterImage, ffmpegFilterImageBuffer } from './ffmpeg-image-filter';
 
 const { mediaManager, systemManager } = sdk;
 
@@ -301,7 +299,8 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
                 } : undefined);
                 picture = await this.cropAndScale(picture);
                 if (needSoftwareResize) {
-                    picture = await sharpFilterImage(picture, {
+                    picture = await ffmpegFilterImageBuffer(picture, {
+                        ffmpegPath: await mediaManager.getFFmpegPath(),
                         console: this.debugConsole,
                         resize: options?.picture,
                     });
@@ -353,7 +352,8 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
         const xmax = Math.max(...this.storageSettings.values.snapshotCropScale.map(([x, y]) => x)) / 100;
         const ymax = Math.max(...this.storageSettings.values.snapshotCropScale.map(([x, y]) => y)) / 100;
 
-        return sharpFilterImage(buffer, {
+        return ffmpegFilterImageBuffer(buffer, {
+            ffmpegPath: await mediaManager.getFFmpegPath(),
             console: this.debugConsole,
             crop: {
                 fractional: true,
@@ -445,7 +445,8 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
             })
         }
         else {
-            return sharpFilterImage(errorBackground, {
+            return ffmpegFilterImageBuffer(errorBackground, {
+                ffmpegPath: await mediaManager.getFFmpegPath(),
                 console: this.debugConsole,
                 blur: true,
                 brightness: -.2,
@@ -497,7 +498,7 @@ export function parseDims<T extends string>(dict: DimDict<T>) {
     return ret;
 }
 
-class SnapshotPlugin extends AutoenableMixinProvider implements MixinProvider, BufferConverter, Settings, DeviceProvider {
+class SnapshotPlugin extends AutoenableMixinProvider implements MixinProvider, BufferConverter, Settings {
     storageSettings = new StorageSettings(this, {
         debugLogging: {
             title: 'Debug Logging',
@@ -515,37 +516,11 @@ class SnapshotPlugin extends AutoenableMixinProvider implements MixinProvider, B
         process.nextTick(() => {
             sdk.deviceManager.onDevicesChanged({
                 devices: [
-                    {
-                        name: 'Image Reader',
-                        type: ScryptedDeviceType.Builtin,
-                        nativeId: 'reader',
-                        interfaces: [
-                            ScryptedInterface.BufferConverter,
-                        ]
-                    },
-                    {
-                        name: 'Image Writer',
-                        type: ScryptedDeviceType.Builtin,
-                        nativeId: 'writer',
-                        interfaces: [
-                            ScryptedInterface.BufferConverter,
-                        ]
-                    }
                 ]
             })
         })
     }
 
-    async getDevice(nativeId: string): Promise<any> {
-        if (nativeId === 'reader')
-            return new ImageReader('reader')
-        if (nativeId === 'writer')
-            return new ImageWriter('writer')
-    }
-
-    async releaseDevice(id: string, nativeId: string): Promise<void> {
-    }
-
     getSettings(): Promise<Setting[]> {
         return this.storageSettings.getSettings();
     }

plugins/snapshot/src/sharp-image-filter.ts

@@ -1,92 +0,0 @@
-import sharp, { FormatEnum, AvailableFormatInfo } from 'sharp';
-
-export interface SharpImageFilterOptions {
-    console?: Console,
-    blur?: boolean;
-    brightness?: number;
-    text?: {
-        text: string;
-        fontFile: string;
-    };
-
-    resize?: {
-        fractional?: boolean;
-        width?: number;
-        height?: number;
-    };
-
-    crop?: {
-        fractional?: boolean;
-        left: number;
-        top: number;
-        width: number;
-        height: number;
-    };
-
-    format?: keyof FormatEnum | AvailableFormatInfo;
-}
-
-
-export async function sharpFilterImage(inputJpeg: Buffer | string, options: SharpImageFilterOptions) {
-    let image = sharp(inputJpeg, {
-        failOnError: false,
-    });
-    const metadata = await image.metadata();
-    if (options?.crop) {
-        let { left, top, width, height, fractional } = options.crop;
-        if (fractional) {
-            left = Math.floor(left * metadata.width);
-            width = Math.floor(width * metadata.width);
-            top = Math.floor(top * metadata.height);
-            height = Math.floor(height * metadata.height);
-        }
-        image = image.extract({
-            left,
-            top,
-            width,
-            height,
-        });
-    }
-
-    if (options?.resize) {
-        let { width, height, fractional } = options.resize;
-        if (fractional) {
-            if (width)
-                width = Math.floor(width * metadata.width);
-            if (height)
-                height = Math.floor(height * metadata.height);
-        }
-        image = image.resize(width, height);
-    }
-
-    if (options?.brightness) {
-        image = image.modulate({
-            lightness: options.brightness * 100,
-        });
-    }
-
-    if (options?.blur) {
-        image = image.blur(25);
-    }
-
-    if (options?.text) {
-        image = image.composite([
-            {
-                input: {
-                    text: {
-                        rgba: true,
-                        text: `<span foreground="white">${options.text.text}</span>`,
-                        // this is not working?
-                        // font: 'Lato',
-                        // fontfile: options?.text.fontFile,
-                        dpi: metadata.height,
-                    },
-                },
-            }
-        ])
-    }
-
-    image = image.toFormat(options?.format || 'jpg');
-
-    return image.toBuffer();
-}

server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/server",
-  "version": "0.7.12",
+  "version": "0.7.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/server",
-      "version": "0.7.12",
+      "version": "0.7.16",
       "license": "ISC",
       "dependencies": {
         "@mapbox/node-pre-gyp": "^1.0.10",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.7.13",
+  "version": "0.7.17",
   "description": "",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.10",
@@ -67,8 +67,11 @@
     "prebuild": "rimraf dist",
     "build": "tsc --outDir dist",
     "postbuild": "node test/check-build-output.js",
-    "prepublishOnly": "npm version patch && git add package.json && npm run build && git commit -m prepublish",
-    "postpublish": "git tag v$npm_package_version && git push origin v$npm_package_version",
+    "prebeta": "npm version patch && git add package.json && npm run build && git commit -m prebeta",
+    "beta": "npm publish --tag beta",
+    "release": "npm publish",
+    "prerelease": "npm version patch && git add package.json && npm run build && git commit -m prerelease",
+    "postrelease": "git tag v$npm_package_version && git push origin v$npm_package_version",
     "docker": "scripts/github-workflow-publish-docker.sh"
   },
   "author": "",

server/python/plugin_remote.py

@@ -35,25 +35,6 @@ class SystemDeviceState(TypedDict):
     stateTime: int
     value: any
 
-
-class StreamPipeReader:
-    def __init__(self, conn: multiprocessing.connection.Connection) -> None:
-        self.conn = conn
-        self.executor = concurrent.futures.ThreadPoolExecutor()
-
-    def readBlocking(self, n):
-        b = bytes(0)
-        while len(b) < n:
-            self.conn.poll(None)
-            add = os.read(self.conn.fileno(), n - len(b))
-            if not len(add):
-                raise Exception('unable to read requested bytes')
-            b += add
-        return b
-
-    async def read(self, n):
-        return await asyncio.get_event_loop().run_in_executor(self.executor, lambda: self.readBlocking(n))
-    
 class SystemManager(scrypted_python.scrypted_sdk.types.SystemManager):
     def __init__(self, api: Any, systemState: Mapping[str, Mapping[str, SystemDeviceState]]) -> None:
         super().__init__()
@@ -288,8 +269,9 @@ class PluginRemote:
         clusterSecret = options['clusterSecret']
 
         async def handleClusterClient(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
+            rpcTransport = rpc_reader.RpcStreamTransport(reader, writer)
             peer: rpc.RpcPeer
-            peer, peerReadLoop = await rpc_reader.prepare_peer_readloop(self.loop, reader = reader, writer = writer)
+            peer, peerReadLoop = await rpc_reader.prepare_peer_readloop(self.loop, rpcTransport)
             async def connectRPCObject(id: str, secret: str):
                 m = hashlib.sha256()
                 m.update(bytes('%s%s' % (clusterPort, clusterSecret), 'utf8'))
@@ -324,7 +306,8 @@ class PluginRemote:
                 async def connectClusterPeer():
                     reader, writer = await asyncio.open_connection(
                         '127.0.0.1', port)
-                    peer, peerReadLoop = await rpc_reader.prepare_peer_readloop(self.loop, reader = reader, writer = writer)
+                    rpcTransport = rpc_reader.RpcStreamTransport(reader, writer)
+                    peer, peerReadLoop = await rpc_reader.prepare_peer_readloop(self.loop, rpcTransport)
                     async def run_loop():
                         try:
                             await peerReadLoop()
@@ -485,8 +468,8 @@ class PluginRemote:
                 schedule_exit_check()
 
                 async def getFork():
-                    reader = StreamPipeReader(parent_conn)
-                    forkPeer, readLoop = await rpc_reader.prepare_peer_readloop(self.loop, reader = reader, writeFd = parent_conn.fileno())
+                    rpcTransport = rpc_reader.RpcConnectionTransport(parent_conn)
+                    forkPeer, readLoop = await rpc_reader.prepare_peer_readloop(self.loop, rpcTransport)
                     forkPeer.peerName = 'thread'
 
                     async def updateStats(stats):
@@ -502,7 +485,7 @@ class PluginRemote:
                         finally:
                             allMemoryStats.pop(forkPeer)
                             parent_conn.close()
-                            reader.executor.shutdown()
+                            rpcTransport.executor.shutdown()
                     asyncio.run_coroutine_threadsafe(forkReadLoop(), loop=self.loop)
                     getRemote = await forkPeer.getParam('getRemote')
                     remote: PluginRemote = await getRemote(self.api, self.pluginId, self.hostInfo)
@@ -594,8 +577,8 @@ class PluginRemote:
 
 allMemoryStats = {}
 
-async def plugin_async_main(loop: AbstractEventLoop, readFd: int = None, writeFd: int = None, reader: asyncio.StreamReader = None, writer: asyncio.StreamWriter = None):
-    peer, readLoop = await rpc_reader.prepare_peer_readloop(loop, readFd=readFd, writeFd=writeFd, reader=reader, writer=writer)
+async def plugin_async_main(loop: AbstractEventLoop, rpcTransport: rpc_reader.RpcTransport):
+    peer, readLoop = await rpc_reader.prepare_peer_readloop(loop, rpcTransport)
     peer.params['print'] = print
     peer.params['getRemote'] = lambda api, pluginId, hostInfo: PluginRemote(peer, api, pluginId, hostInfo, loop)
 
@@ -642,11 +625,11 @@ async def plugin_async_main(loop: AbstractEventLoop, readFd: int = None, writeFd
     try:
         await readLoop()
     finally:
-        if reader and hasattr(reader, 'executor'):
-            r: StreamPipeReader = reader
+        if type(rpcTransport) == rpc_reader.RpcConnectionTransport:
+            r: rpc_reader.RpcConnectionTransport = rpcTransport
             r.executor.shutdown()
 
-def main(readFd: int = None, writeFd: int = None, reader: asyncio.StreamReader = None, writer: asyncio.StreamWriter = None):
+def main(rpcTransport: rpc_reader.RpcTransport):
     loop = asyncio.new_event_loop()
 
     def gc_runner():
@@ -654,10 +637,10 @@ def main(readFd: int = None, writeFd: int = None, reader: asyncio.StreamReader =
         loop.call_later(10, gc_runner)
     gc_runner()
 
-    loop.run_until_complete(plugin_async_main(loop, readFd=readFd, writeFd=writeFd, reader=reader, writer=writer))
+    loop.run_until_complete(plugin_async_main(loop, rpcTransport))
     loop.close()
 
-def plugin_main(readFd: int = None, writeFd: int = None, reader: asyncio.StreamReader = None, writer: asyncio.StreamWriter = None):
+def plugin_main(rpcTransport: rpc_reader.RpcTransport):
     try:
         import gi
         gi.require_version('Gst', '1.0')
@@ -666,18 +649,16 @@ def plugin_main(readFd: int = None, writeFd: int = None, reader: asyncio.StreamR
 
         loop = GLib.MainLoop()
 
-        worker = threading.Thread(target=main, args=(readFd, writeFd, reader, writer), name="asyncio-main")
+        worker = threading.Thread(target=main, args=(rpcTransport,), name="asyncio-main")
         worker.start()
 
         loop.run()
     except:
-        main(readFd=readFd, writeFd=writeFd, reader=reader, writer=writer)
+        main(rpcTransport)
 
 
 def plugin_fork(conn: multiprocessing.connection.Connection):
-    fd = os.dup(conn.fileno())
-    reader = StreamPipeReader(conn)
-    plugin_main(reader=reader, writeFd=fd)
+    plugin_main(rpc_reader.RpcConnectionTransport(conn))
 
 if __name__ == "__main__":
-    plugin_main(3, 4)
+    plugin_main(rpc_reader.RpcFileTransport(3, 4))

server/python/rpc_reader.py

@@ -4,14 +4,14 @@ import asyncio
 import base64
 import json
 import os
-import sys
 import threading
 from asyncio.events import AbstractEventLoop
-from os import sys
-from typing import List
-
+from typing import List, Any
+import multiprocessing.connection
 import aiofiles
 import rpc
+import concurrent.futures
+import json
 
 
 class BufferSerializer(rpc.RpcSerializer):
@@ -36,31 +36,131 @@ class SidebandBufferSerializer(rpc.RpcSerializer):
         buffer = buffers.pop()
         return buffer
 
-async def readLoop(loop, peer: rpc.RpcPeer, reader: asyncio.StreamReader):
+
+class RpcTransport:
+    async def prepare(self):
+        pass
+
+    async def read(self):
+        pass
+
+    def writeBuffer(self, buffer, reject):
+        pass
+
+    def writeJSON(self, json, reject):
+        pass
+
+
+class RpcFileTransport(RpcTransport):
+    reader: asyncio.StreamReader
+
+    def __init__(self, readFd: int, writeFd: int) -> None:
+        super().__init__()
+        self.readFd = readFd
+        self.writeFd = writeFd
+        self.reader = None
+
+    async def prepare(self):
+        await super().prepare()
+        self.reader = await aiofiles.open(self.readFd, mode='rb')
+
+    async def read(self):
+        lengthBytes = await self.reader.read(4)
+        typeBytes = await self.reader.read(1)
+        type = typeBytes[0]
+        length = int.from_bytes(lengthBytes, 'big')
+        data = await self.reader.read(length - 1)
+        if type == 1:
+            return data
+        message = json.loads(data)
+        return message
+
+    def writeMessage(self, type: int, buffer, reject):
+        length = len(buffer) + 1
+        lb = length.to_bytes(4, 'big')
+        try:
+            for b in [lb, bytes([type]), buffer]:
+                os.write(self.writeFd, b)
+        except Exception as e:
+            if reject:
+                reject(e)
+
+    def writeJSON(self, j, reject):
+        return self.writeMessage(0, bytes(json.dumps(j), 'utf8'), reject)
+
+    def writeBuffer(self, buffer, reject):
+        return self.writeMessage(1, buffer, reject)
+
+
+class RpcStreamTransport(RpcTransport):
+    def __init__(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
+        super().__init__()
+        self.reader = reader
+        self.writer = writer
+
+    async def read(self):
+        lengthBytes = await self.reader.readexactly(4)
+        typeBytes = await self.reader.readexactly(1)
+        type = typeBytes[0]
+        length = int.from_bytes(lengthBytes, 'big')
+        data = await self.reader.readexactly(length - 1)
+        if type == 1:
+            return data
+        message = json.loads(data)
+        return message
+
+    def writeMessage(self, type: int, buffer, reject):
+        length = len(buffer) + 1
+        lb = length.to_bytes(4, 'big')
+        try:
+            for b in [lb, bytes([type]), buffer]:
+                self.writer.write(b)
+        except Exception as e:
+            if reject:
+                reject(e)
+
+    def writeJSON(self, j, reject):
+        return self.writeMessage(0, bytes(json.dumps(j), 'utf8'), reject)
+
+    def writeBuffer(self, buffer, reject):
+        return self.writeMessage(1, buffer, reject)
+
+
+class RpcConnectionTransport(RpcTransport):
+    def __init__(self, connection: multiprocessing.connection.Connection) -> None:
+        super().__init__()
+        self.connection = connection
+        self.executor = concurrent.futures.ThreadPoolExecutor(max_workers=1)
+
+    async def read(self):
+        return await asyncio.get_event_loop().run_in_executor(self.executor, lambda: self.connection.recv())
+
+    def writeMessage(self, json, reject):
+        try:
+            self.connection.send(json)
+        except Exception as e:
+            if reject:
+                reject(e)
+
+    def writeJSON(self, json, reject):
+        return self.writeMessage(json, reject)
+
+    def writeBuffer(self, buffer, reject):
+        return self.writeMessage(bytes(buffer), reject)
+
+
+async def readLoop(loop, peer: rpc.RpcPeer, rpcTransport: RpcTransport):
     deserializationContext = {
         'buffers': []
     }
 
-    if isinstance(reader, asyncio.StreamReader):
-        async def read(n):
-            return await reader.readexactly(n)
-    else:
-        async def read(n):
-            return await reader.read(n)
-
-
     while True:
-        lengthBytes = await read(4)
-        typeBytes = await read(1)
-        type = typeBytes[0]
-        length = int.from_bytes(lengthBytes, 'big')
-        data = await read(length - 1)
+        message = await rpcTransport.read()
 
-        if type == 1:
-            deserializationContext['buffers'].append(data)
+        if type(message) != dict:
+            deserializationContext['buffers'].append(message)
             continue
 
-        message = json.loads(data)
         asyncio.run_coroutine_threadsafe(
             peer.handleMessage(message, deserializationContext), loop)
 
@@ -68,46 +168,21 @@ async def readLoop(loop, peer: rpc.RpcPeer, reader: asyncio.StreamReader):
             'buffers': []
         }
 
-async def prepare_peer_readloop(loop: AbstractEventLoop, readFd: int = None, writeFd: int = None, reader: asyncio.StreamReader = None, writer: asyncio.StreamWriter = None):
-    reader = reader or await aiofiles.open(readFd, mode='rb')
+
+async def prepare_peer_readloop(loop: AbstractEventLoop, rpcTransport: RpcTransport):
+    await rpcTransport.prepare()
 
     mutex = threading.Lock()
 
-    if writer:
-        def write(buffers, reject):
-            try:
-                for b in buffers:
-                    writer.write(b)
-            except Exception as e:
-                if reject:
-                    reject(e)
-            return None
-    else:
-        def write(buffers, reject):
-            try:
-                for b in buffers:
-                    os.write(writeFd, b)
-            except Exception as e:
-                if reject:
-                    reject(e)
-
     def send(message, reject=None, serializationContext=None):
         with mutex:
             if serializationContext:
                 buffers = serializationContext.get('buffers', None)
                 if buffers:
                     for buffer in buffers:
-                        length = len(buffer) + 1
-                        lb = length.to_bytes(4, 'big')
-                        type = 1
-                        write([lb, bytes([type]), buffer], reject)
+                        rpcTransport.writeBuffer(buffer, reject)
 
-            jsonString = json.dumps(message)
-            b = bytes(jsonString, 'utf8')
-            length = len(b) + 1
-            lb = length.to_bytes(4, 'big')
-            type = 0
-            write([lb, bytes([type]), b], reject)
+            rpcTransport.writeJSON(message, reject)
 
     peer = rpc.RpcPeer(send)
     peer.nameDeserializerMap['Buffer'] = SidebandBufferSerializer()
@@ -117,7 +192,7 @@ async def prepare_peer_readloop(loop: AbstractEventLoop, readFd: int = None, wri
 
     async def peerReadLoop():
         try:
-            await readLoop(loop, peer, reader)
+            await readLoop(loop, peer, rpcTransport)
         except:
             peer.kill()
             raise

server/src/plugin/runtime/python-worker.ts

@@ -62,6 +62,7 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
             // stdin, stdout, stderr, peer in, peer out
             stdio: ['pipe', 'pipe', 'pipe', 'pipe', 'pipe'],
             env: Object.assign({
+                PYTHONUNBUFFERED: '1',
                 PYTHONPATH: path.join(process.cwd(), 'node_modules/@scrypted/types'),
             }, gstEnv, process.env, env),
         });