From 55cb62cb72d29d28c5f3d42d4d8fcebbc9d02fa3 Mon Sep 17 00:00:00 2001
From: Brett Jia <dev.bjia56@gmail.com>
Date: Sun, 29 Dec 2024 17:22:32 -0500
Subject: [PATCH] server: use `standard-telnetlib` for Python 3.13+ (#1669)

* bump portable-python to version with 3.13

* add standard-telnetlib to scrypted requirements for Python 3.13+
---
 server/package-lock.json       | 12 ++++++------
 server/package.json            |  2 +-
 server/python/plugin_remote.py | 10 ++++++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 21a5d7f7f3..6d3a8bd82a 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/server",
-  "version": "0.123.68",
+  "version": "0.123.70",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/server",
-      "version": "0.123.68",
+      "version": "0.123.70",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
@@ -26,7 +26,7 @@
         "node-dijkstra": "^2.5.0",
         "node-forge": "^1.3.1",
         "node-gyp": "^10.2.0",
-        "py": "npm:@bjia56/portable-python@^0.1.94",
+        "py": "npm:@bjia56/portable-python@^0.1.112",
         "semver": "^7.6.3",
         "sharp": "^0.33.5",
         "source-map-support": "^0.5.21",
@@ -2763,9 +2763,9 @@
     },
     "node_modules/py": {
       "name": "@bjia56/portable-python",
-      "version": "0.1.94",
-      "resolved": "https://registry.npmjs.org/@bjia56/portable-python/-/portable-python-0.1.94.tgz",
-      "integrity": "sha512-dACd5jj4gJiv6Gyf2Ne4dwXR9DRn3s/S0sg6pe64JVhX/3jT18HBZ4oxgN+IFXJ2bjnYkp2LCtpOCEsYl3El0g==",
+      "version": "0.1.112",
+      "resolved": "https://registry.npmjs.org/@bjia56/portable-python/-/portable-python-0.1.112.tgz",
+      "integrity": "sha512-tYBv3ruCXXiJJncfBelO6GXgjCbopLM1WkB9vQywv5RTL60Ij+zHeq4fGSchuXdg8QQDVH6UkUaRmPfmqBYvSQ==",
       "dependencies": {
         "adm-zip": "^0.5.10"
       }
diff --git a/server/package.json b/server/package.json
index 48438c2ad3..4c9e86758a 100644
--- a/server/package.json
+++ b/server/package.json
@@ -19,7 +19,7 @@
     "node-dijkstra": "^2.5.0",
     "node-forge": "^1.3.1",
     "node-gyp": "^10.2.0",
-    "py": "npm:@bjia56/portable-python@^0.1.94",
+    "py": "npm:@bjia56/portable-python@^0.1.112",
     "semver": "^7.6.3",
     "sharp": "^0.33.5",
     "source-map-support": "^0.5.21",
diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py
index 72ac297307..c2c1424303 100644
--- a/server/python/plugin_remote.py
+++ b/server/python/plugin_remote.py
@@ -41,6 +41,12 @@
 ptpython
 wheel
 """.strip()
+if sys.version_info.minor >= 13:
+    # telnetlib was removed in Python 3.13
+    SCRYPTED_REQUIREMENTS = f"""
+{SCRYPTED_REQUIREMENTS}
+standard-telnetlib
+""".strip()
 
 
 class SystemDeviceState(TypedDict):
@@ -797,7 +803,7 @@ def read_requirements(filename: str) -> str:
             )
 
             need_pip = False
-            # pip is needed if there's a requiremnts.txt file that has changed.
+            # pip is needed if there's a requirements.txt file that has changed.
             if str_requirements:
                 need_pip = need_requirements(requirements_basename, str_requirements)
             # pip is needed if the base scrypted requirements have changed.
@@ -933,7 +939,7 @@ async def waitClusterForkKilled():
                             directGetRemote, rpc.RpcPeer.PROPERTY_PROXY_PEER
                         )
                         return await finishFork(forkPeer)
-                    
+
                     async def getClusterForkWrapped():
                         try:
                             return await getClusterFork()