From 5876fe9ff5b152666fbcf02e5fa17ea5f72dd5c4 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 21 Mar 2024 19:44:57 -0700
Subject: [PATCH] server: update deps

---
 server/.vscode/launch.json                 |  1 +
 server/package-lock.json                   | 30 +++++++++++-----------
 server/package.json                        |  8 +++---
 server/src/plugin/runtime/python-worker.ts |  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/server/.vscode/launch.json b/server/.vscode/launch.json
index 31d273bbd..85b4fcd87 100644
--- a/server/.vscode/launch.json
+++ b/server/.vscode/launch.json
@@ -33,6 +33,7 @@
                 // which has no wheels for coreml tools or tflite-runtime
                 "SCRYPTED_PYTHON_PATH": "/opt/homebrew/bin/python3.11",
                 "SCRYPTED_PYTHON310_PATH": "/opt/homebrew/bin/python3.10",
+                // "SCRYPTED_PORTABLE_PYTHON": "true",
                 // "SCRYPTED_SHARED_WORKER": "true",
                 // "SCRYPTED_DISABLE_AUTHENTICATION": "true",
                 // "DEBUG": "*",
diff --git a/server/package-lock.json b/server/package-lock.json
index 442c09664..8b0f31b8e 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/server",
-  "version": "0.94.40",
+  "version": "0.94.41",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/server",
-      "version": "0.94.40",
+      "version": "0.94.41",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
@@ -17,7 +17,7 @@
         "body-parser": "^1.20.2",
         "cookie-parser": "^1.4.6",
         "engine.io": "^6.5.4",
-        "express": "^4.19.0",
+        "express": "^4.19.1",
         "follow-redirects": "^1.15.6",
         "http-auth": "^4.2.0",
         "ip": "^2.0.1",
@@ -27,14 +27,14 @@
         "node-dijkstra": "^2.5.0",
         "node-forge": "^1.3.1",
         "node-gyp": "^10.0.1",
-        "py": "npm:@bjia56/portable-python@^0.1.26",
+        "py": "npm:@bjia56/portable-python@^0.1.29",
         "router": "^1.3.8",
         "semver": "^7.6.0",
         "sharp": "^0.33.2",
         "source-map-support": "^0.5.21",
-        "tar": "^6.2.0",
+        "tar": "^6.2.1",
         "tslib": "^2.6.2",
-        "typescript": "^5.4.2",
+        "typescript": "^5.4.3",
         "whatwg-mimetype": "^4.0.0",
         "ws": "^8.16.0"
       },
@@ -1655,9 +1655,9 @@
       "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw=="
     },
     "node_modules/express": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.0.tgz",
-      "integrity": "sha512-/ERliX0l7UuHEgAy7HU2FRsiz3ScIKNl/iwnoYzHTJC0Sqj3ctWDD3MQ9CbUEfjshvxXImWaeukD0Xo7a2lWLA==",
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.1.tgz",
+      "integrity": "sha512-K4w1/Bp7y8iSiVObmCrtq8Cs79XjJc/RU2YYkZQ7wpUu5ZyZ7MtPHkqoMz4pf+mgXfNvo2qft8D9OnrH2ABk9w==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -3457,9 +3457,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -3557,9 +3557,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
-      "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
+      "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/server/package.json b/server/package.json
index 83b5cd762..d9f5f5770 100644
--- a/server/package.json
+++ b/server/package.json
@@ -10,7 +10,7 @@
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "engine.io": "^6.5.4",
-    "express": "^4.19.0",
+    "express": "^4.19.1",
     "follow-redirects": "^1.15.6",
     "http-auth": "^4.2.0",
     "ip": "^2.0.1",
@@ -20,14 +20,14 @@
     "node-dijkstra": "^2.5.0",
     "node-forge": "^1.3.1",
     "node-gyp": "^10.0.1",
-    "py": "npm:@bjia56/portable-python@^0.1.26",
+    "py": "npm:@bjia56/portable-python@^0.1.29",
     "router": "^1.3.8",
     "semver": "^7.6.0",
     "sharp": "^0.33.2",
     "source-map-support": "^0.5.21",
-    "tar": "^6.2.0",
+    "tar": "^6.2.1",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.3",
     "whatwg-mimetype": "^4.0.0",
     "ws": "^8.16.0"
   },
diff --git a/server/src/plugin/runtime/python-worker.ts b/server/src/plugin/runtime/python-worker.ts
index 40533c439..64e08792f 100644
--- a/server/src/plugin/runtime/python-worker.ts
+++ b/server/src/plugin/runtime/python-worker.ts
@@ -86,7 +86,7 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
             }
         }
 
-        let pythonPath = process.env.SCRYPTED_PYTHON_PATH;
+        let pythonPath = !process.env.SCRYPTED_PORTABLE_PYTHON && process.env.SCRYPTED_PYTHON_PATH;
 
         if (!pythonPath) {
             if (os.platform() === 'win32') {