Update to ssh2@^1.6.0.0

.yarn/yarn.lock

@@ -2375,7 +2375,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/experimental-utils@npm:4.33.0":
+"@typescript-eslint/experimental-utils@npm:4.33.0, @typescript-eslint/experimental-utils@npm:^4.0.1":
   version: 4.33.0
   resolution: "@typescript-eslint/experimental-utils@npm:4.33.0"
   dependencies:
@@ -2406,22 +2406,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/experimental-utils@npm:^4.0.1":
-  version: 4.29.2
-  resolution: "@typescript-eslint/experimental-utils@npm:4.29.2"
-  dependencies:
-    "@types/json-schema": ^7.0.7
-    "@typescript-eslint/scope-manager": 4.29.2
-    "@typescript-eslint/types": 4.29.2
-    "@typescript-eslint/typescript-estree": 4.29.2
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-  peerDependencies:
-    eslint: "*"
-  checksum: e07b6b58f386ba84801d10bfe494548c3af20448c2f5596b77d13ba8621345ced4e1c6cf946dcf118c1e8566e0eed8284200f3f3a96f89aa7f367d9cdf6549a3
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/parser@npm:^4.5.0":
   version: 4.33.0
   resolution: "@typescript-eslint/parser@npm:4.33.0"
@@ -2439,16 +2423,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:4.29.2":
-  version: 4.29.2
-  resolution: "@typescript-eslint/scope-manager@npm:4.29.2"
-  dependencies:
-    "@typescript-eslint/types": 4.29.2
-    "@typescript-eslint/visitor-keys": 4.29.2
-  checksum: f89d11cf7ce28c37a913db432d3dd2c4e5f5bc431bac205dd55c3d49704be691a28d5f27ae96fde7feee23d3e80192d7aff3d8350aef53b415e5b0b53cd965d7
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/scope-manager@npm:4.33.0":
   version: 4.33.0
   resolution: "@typescript-eslint/scope-manager@npm:4.33.0"
@@ -2466,13 +2440,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:4.29.2":
-  version: 4.29.2
-  resolution: "@typescript-eslint/types@npm:4.29.2"
-  checksum: 0bcab66bb1848e2361bb366abebe1f94baa56d7d2058b62467f14c054b969b72d1aa17717a52c11f48e9cfb50846f0e227e49ccc7f06ff750b9eb28ca8b064de
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:4.33.0":
   version: 4.33.0
   resolution: "@typescript-eslint/types@npm:4.33.0"
@@ -2499,24 +2466,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:4.29.2":
-  version: 4.29.2
-  resolution: "@typescript-eslint/typescript-estree@npm:4.29.2"
-  dependencies:
-    "@typescript-eslint/types": 4.29.2
-    "@typescript-eslint/visitor-keys": 4.29.2
-    debug: ^4.3.1
-    globby: ^11.0.3
-    is-glob: ^4.0.1
-    semver: ^7.3.5
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 90342d27f3f0837ad39f9b7e7d7c3c0b6de9c5b0770f5a18d490ebaf7be78efa65ba46ce0ca3004ad946ca1adc5865c5d3ba3b049c95b3b193bfdf0eb5e23095
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:4.33.0":
   version: 4.33.0
   resolution: "@typescript-eslint/typescript-estree@npm:4.33.0"
@@ -2544,16 +2493,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:4.29.2":
-  version: 4.29.2
-  resolution: "@typescript-eslint/visitor-keys@npm:4.29.2"
-  dependencies:
-    "@typescript-eslint/types": 4.29.2
-    eslint-visitor-keys: ^2.0.0
-  checksum: 34185d8c6466340aba746d69b36d357da2d06577d73f58358648c142bd0f181d7fae01ca1138188a665ef074ea7e1bc6306ef9d50f29914c8bcea4e9ea1f82f2
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:4.33.0":
   version: 4.33.0
   resolution: "@typescript-eslint/visitor-keys@npm:4.33.0"
@@ -3102,7 +3041,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"asn1@npm:~0.2.0":
+"asn1@npm:^0.2.4":
   version: 0.2.6
   resolution: "asn1@npm:0.2.6"
   dependencies:
@@ -3859,6 +3798,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cpu-features@npm:@favware/[email protected]":
+  version: 1.1.3
+  resolution: "@favware/skip-dependency@npm:1.1.3"
+  checksum: 052e94745f83e799b676cc711a23b6112cc7aecdd6ed157bb9be85fa5ce032c100f591f0c66e1e7383bcab5743ec40179bed0ff52ed809d9d191a5c9321e4da2
+  languageName: node
+  linkType: hard
+
 "cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
   version: 7.0.3
   resolution: "cross-spawn@npm:7.0.3"
@@ -6711,6 +6657,15 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
+"nan@npm:^2.15.0":
+  version: 2.15.0
+  resolution: "nan@npm:2.15.0"
+  dependencies:
+    node-gyp: latest
+  checksum: 33e1bb4dfca447fe37d4bb5889be55de154828632c8d38646db67293a21afd61ed9909cdf1b886214a64707d935926c4e60e2b09de9edfc2ad58de31d6ce8f39
+  languageName: node
+  linkType: hard
+
 "nanoid@npm:^3.2.0":
   version: 3.3.1
   resolution: "nanoid@npm:3.3.1"
@@ -8727,23 +8682,20 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"ssh2-streams@Timmmm/ssh2-streams#patch-1":
-  version: 0.4.10
-  resolution: "ssh2-streams@https://github.com/Timmmm/ssh2-streams.git#commit=75f6d3425d071ac73a18fd46e2f5e738bfe897c5"
+"ssh2@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "ssh2@npm:1.6.0"
   dependencies:
-    asn1: ~0.2.0
+    asn1: ^0.2.4
     bcrypt-pbkdf: ^1.0.2
-    streamsearch: ~0.1.2
-  checksum: d0a5671f88e87fc85783c18cf99001315771dd313452643063fec5edbe4d223e7204f64e58177b4e9a11f9d6406e3988c16a33cc9463817b25a5afcfee1f0245
-  languageName: node
-  linkType: hard
-
-"ssh2@npm:^0.8.9":
-  version: 0.8.9
-  resolution: "ssh2@npm:0.8.9"
-  dependencies:
-    ssh2-streams: ~0.4.10
-  checksum: 3127497cb5570922b3c37daf93e1e49e24776ae3046c7e01c4af1323408653267ea7d9e506283adbdc8445cd20429318501e08db75f2101bbb0bdc49455da720
+    cpu-features: 0.0.2
+    nan: ^2.15.0
+  dependenciesMeta:
+    cpu-features:
+      optional: true
+    nan:
+      optional: true
+  checksum: a0bed1463729e7b1bb2b9e2381cb3b12e3b759c2416a666e0218825fa9eaae440676dc54c151e86186ec9e9d02a283938c7234ebdfc2d29976dd1d137e70cb23
   languageName: node
   linkType: hard
 
@@ -8787,13 +8739,6 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"streamsearch@npm:~0.1.2":
-  version: 0.1.2
-  resolution: "streamsearch@npm:0.1.2"
-  checksum: d2db57cbfbf7947ab9c75a7b4c80a8ef8d24850cf0a1a24258bb6956c97317ce1eab7dbcbf9c5aba3e6198611af1053b02411057bbedb99bf9c64b8275248997
-  languageName: node
-  linkType: hard
-
 "strict-uri-encode@npm:^1.0.0":
   version: 1.1.0
   resolution: "strict-uri-encode@npm:1.1.0"
@@ -9511,7 +9456,6 @@ resolve@^2.0.0-next.3:
     "@types/node": ^12.7.12
     "@types/request": ^2.48.1
     "@types/semver": ^7.3.9
-    "@types/ssh2": ^0.5.41
     "@types/vscode": ~1.49.0
     "@types/webpack": ^4.4.25
     "@types/winreg": ^1.2.30
@@ -9522,8 +9466,7 @@ resolve@^2.0.0-next.3:
     socks: ^2.2.0
     source-map: ^0.7.3
     source-map-support: ^0.5.19
-    ssh2: ^0.8.9
-    ssh2-streams: ^0.4.10
+    ssh2: ^1.6.0
     ts-loader: ^9.2.3
     typescript: ~4.5.5
     vsce: ^2.5.1

CHANGELOG.md

@@ -3,6 +3,15 @@
 
 ## Unreleased
 
+### Major change
+- Updated from `[email protected]` to `[email protected]`
+  - Part of this update forces me to ditch `ssh2-streams` which played a major role for SFTP
+  - The `ssh2` package has a built-in but unexposed alternative we can more or less use directly
+  - The `@types/ssh2` is semi-outdated and has lots of inaccuracies, along with missing internal things
+  - For this major update a `ssh2.ts` replacing `@types/ssh2` is added to the `common` module
+  - This does pull in a lot of new fixes/features added since `[email protected]` though
+  - Some feature requests are now easier/possible to implement with these new features
+
 ### New features
 - Added `FS_NOTIFY_ERRORS` flag to display notifications for FS errors (#282)
 - Added a `${workingDirectory}` variable that gets replaced during terminal creation (#323)

common/src/fileSystemConfig.ts

@@ -1,4 +1,5 @@
 import type { ConnectConfig } from 'ssh2';
+import './ssh2';
 
 export interface ProxyConfig {
   type: 'socks4' | 'socks5' | 'http';