Jelajahi Sumber

bumped node-pty & russh

Eugene 1 hari lalu
induk
melakukan
2b147dfa01
3 mengubah file dengan 10 tambahan dan 39 penghapusan
  1. 2 2
      app/package.json
  2. 0 29
      app/patches/node-pty+1.1.0-beta9.patch
  3. 8 8
      app/yarn.lock

+ 2 - 2
app/package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@electron/remote": "^2",
-    "node-pty": "^1.1.0-beta39",
+    "node-pty": "^1.1.0",
     "any-promise": "^1.3.0",
     "electron-config": "2.0.0",
     "electron-debug": "^3.2.0",
@@ -30,7 +30,7 @@
     "native-process-working-directory": "^1.0.2",
     "npm": "6",
     "rxjs": "^7.5.7",
-    "russh": "0.1.31",
+    "russh": "0.1.32",
     "source-map-support": "^0.5.20",
     "v8-compile-cache": "^2.3.0",
     "yargs": "^17.7.2"

+ 0 - 29
app/patches/node-pty+1.1.0-beta9.patch

@@ -1,29 +0,0 @@
-diff --git a/node_modules/node-pty/src/win/conpty.cc b/node_modules/node-pty/src/win/conpty.cc
-index c41796c..08c6439 100644
---- a/node_modules/node-pty/src/win/conpty.cc
-+++ b/node_modules/node-pty/src/win/conpty.cc
-@@ -107,9 +107,22 @@ void SetupExitCallback(Napi::Env env, Napi::Function cb, pty_baton* baton) {
-     CloseHandle(baton->hOut);
- 
-     auto status = tsfn.BlockingCall(exit_event, callback); // In main thread
--    assert(status == napi_ok);
-+    switch (status) {
-+      case napi_closing:
-+        break;
- 
--    tsfn.Release();
-+      case napi_queue_full:
-+        Napi::Error::Fatal("SetupExitCallback", "Queue was full");
-+
-+      case napi_ok:
-+        if (tsfn.Release() != napi_ok) {
-+          Napi::Error::Fatal("SetupExitCallback", "ThreadSafeFunction.Release() failed");
-+        }
-+        break;
-+
-+      default:
-+        Napi::Error::Fatal("SetupExitCallback", "ThreadSafeFunction.BlockingCall() failed");
-+    }
-   });
- }
- 

+ 8 - 8
app/yarn.lock

@@ -2813,10 +2813,10 @@ node-gyp@^10.0.0, node-gyp@^5.0.2, node-gyp@^5.1.0:
     tar "^6.1.2"
     which "^4.0.0"
 
-node-pty@^1.1.0-beta39:
-  version "1.1.0-beta9"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta9.tgz#ed643cb3b398d031b4e31c216e8f3b0042435f1d"
-  integrity sha512-/Ue38pvXJdgRZ3+me1FgfglLd301GhJN0NStiotdt61tm43N5htUyR/IXOUzOKuNaFmCwIhy6nwb77Ky41LMbw==
+node-pty@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0.tgz#161936d45a47751c2e3b694c365e73017417a887"
+  integrity sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==
   dependencies:
     node-addon-api "^7.1.0"
 
@@ -3752,10 +3752,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
[email protected]1:
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/russh/-/russh-0.1.31.tgz#3680b2326c02d53b0e7d2d0312c202c1f34bb00c"
-  integrity sha512-QRFkzS7YflxjaDJ+2mKcKJBOjfkHE606ET73f0P5g5eThalo9BxBmJqMmMYj7jzQ7hJTCo48nlkNHIf1GgstFg==
[email protected]2:
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/russh/-/russh-0.1.32.tgz#2c7905d5c412db7faef3b4d1b5c81f0906ec3557"
+  integrity sha512-AnlJdFYGirVFW4uEuqiEbXemnryjcz9mpzdSyoIut0Arc/mz6TlEVW+8T7Agepz/XEnJC3aB9zAT+VW+heFCaA==
   dependencies:
     "@napi-rs/cli" "^2.18.3"