Merge branch 'main' of github.com:koush/scrypted

install/docker/install-scrypted-docker-compose.sh

@@ -26,6 +26,10 @@ then
     fi
 fi
 
+echo "Stopping local service if it is running..."
+systemctl stop scrypted.service 2> /dev/null
+systemctl disable scrypted.service 2> /dev/null
+
 USER_HOME=$(eval echo ~$SERVICE_USER)
 SCRYPTED_HOME=$USER_HOME/.scrypted
 mkdir -p $SCRYPTED_HOME

install/local/install-scrypted-dependencies-linux.sh

@@ -89,6 +89,13 @@ USER_HOME=$(eval echo ~$SERVICE_USER)
 echo "Setting permissions on $USER_HOME/.scrypted"
 chown -R $SERVICE_USER $USER_HOME/.scrypted
 
+echo "Stopping docker service if it exists..."
+cd $USER_HOME/.scrypted
+echo "docker compose down"
+sudo -u $SERVICE_USER docker compose down 2> /dev/null
+echo "docker compose rm -rf"
+sudo -u $SERVICE_USER docker rm -f /scrypted /scrypted-watchtower 2> /dev/null
+
 echo "Installing Scrypted..."
 RUN sudo -u $SERVICE_USER npx -y scrypted@latest install-server
 

plugins/core/ui/src/components/builtin/ShellComponent.vue

@@ -33,17 +33,56 @@ export default {
       const termSvcRaw = this.$scrypted.systemManager.getDeviceByName("@scrypted/core");
       const termSvc = await termSvcRaw.getDevice("terminalservice");
       const termSvcDirect = await this.$scrypted.connectRPCObject(termSvc);
-      const queue = createAsyncQueue();
+      const dataQueue = createAsyncQueue();
+      const ctrlQueue = createAsyncQueue();
 
-      queue.enqueue(JSON.stringify({ interactive: true }));
-      queue.enqueue(JSON.stringify({ dim: { cols: term.cols, rows: term.rows } }));
+      ctrlQueue.enqueue({ interactive: true });
+      ctrlQueue.enqueue({ dim: { cols: term.cols, rows: term.rows } });
 
-      term.onData(data => queue.enqueue(Buffer.from(data, 'utf8')));
-      term.onBinary(data => queue.enqueue(Buffer.from(data, 'binary')));
-      term.onResize(dim => queue.enqueue(JSON.stringify({ dim })));
+      let bufferedLength = 0;
+      const MAX_BUFFERED_LENGTH = 64000;
+      async function dataQueueEnqueue(data) {
+        bufferedLength += data.length;
+        const promise = dataQueue.enqueue(data).then(() => bufferedLength -= data.length);
+        if (bufferedLength >= MAX_BUFFERED_LENGTH) {
+          term.setOption("disableStdin", true);
+          await promise;
+          if (bufferedLength < MAX_BUFFERED_LENGTH)
+            term.setOption("disableStdin", false);
+        }
+      }
+
+      term.onData(data => dataQueueEnqueue(Buffer.from(data, 'utf8')));
+      term.onBinary(data => dataQueueEnqueue(Buffer.from(data, 'binary')));
+      term.onResize(dim => {
+        ctrlQueue.enqueue({ dim });
+        ctrlQueue.enqueue(Buffer.alloc(0));
+      });
+
+      async function* localGenerator() {
+        while (true) {
+          const ctrlBuffers = ctrlQueue.clear();
+          if (ctrlBuffers.length) {
+            for (const ctrl of ctrlBuffers) {
+              yield JSON.stringify(ctrl);
+            }
+            continue;
+          }
 
-      const localGenerator = queue.queue;
-      const remoteGenerator = await termSvcDirect.connectStream(localGenerator);
+          const dataBuffers = dataQueue.clear();
+          if (dataBuffers.length === 0) {
+            const buf = await dataQueue.dequeue();
+            if (buf.length)
+              yield buf;
+            continue;
+          }
+
+          const concat = Buffer.concat(dataBuffers);
+          if (concat.length)
+            yield concat;
+        }
+      }
+      const remoteGenerator = await termSvcDirect.connectStream(localGenerator());
 
       for await (const message of remoteGenerator) {
         if (!message) {

plugins/synology-ss/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/synology-ss",
-   "version": "0.0.16",
+   "version": "0.0.17",
    "description": "A Synology Surveillance Station plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
@@ -36,10 +36,10 @@
       ]
    },
    "dependencies": {
-      "axios": "^0.24.0"
+      "axios": "^1.0.0"
    },
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk",
-      "@types/node": "^16.6.1"
+      "@types/node": "^18.0.0"
    }
 }