Use ssh-config for fork until new version is published

Author: jeanp413

package.json

@@ -363,7 +363,7 @@
 		"glob": "^9.3.1",
 		"simple-socks": "git+https://github.com/jeanp413/simple-socks#main",
 		"socks": "^2.5.0",
-		"ssh-config": "^4.3.0",
+		"ssh-config": "git+https://github.com/jeanp413/ssh-config#master",
 		"ssh2": "git+https://github.com/jeanp413/ssh2#master"
 	}
 }

src/ssh/sshConfig.ts

@@ -69,12 +69,15 @@ async function parseSSHConfigFromFile(filePath: string, userConfig: boolean) {
     for (let i = 0; i < config.length; i++) {
         const line = config[i];
         if (isIncludeDirective(line)) {
-            const includePaths = await glob(normalizeToSlash(untildify(line.value)), {
-                absolute: true,
-                cwd: normalizeToSlash(path.dirname(userConfig ? defaultSSHConfigPath : systemSSHConfig))
-            });
-            for (const p of includePaths) {
-                includedConfigs.set(i, await parseSSHConfigFromFile(p, userConfig));
+            const values = (line.value as string).split(',').map(s => s.trim());
+            for (const value of values) {
+                const includePaths = await glob(normalizeToSlash(untildify(value)), {
+                    absolute: true,
+                    cwd: normalizeToSlash(path.dirname(userConfig ? defaultSSHConfigPath : systemSSHConfig))
+                });
+                for (const p of includePaths) {
+                    includedConfigs.set(i, await parseSSHConfigFromFile(p, userConfig));
+                }
             }
         }
     }
@@ -101,7 +104,7 @@ export default class SSHConfiguration {
         const hosts = new Set<string>();
         for (const line of this.sshConfig) {
             if (isHostSection(line)) {
-                const value = Array.isArray(line.value as string[] | string) ? line.value[0] : line.value;
+                const value = Array.isArray(line.value) ? line.value[0] : line.value;
                 const isPattern = /^!/.test(value) || /[?*]/.test(value);
                 if (!isPattern) {
                     hosts.add(value);
@@ -113,6 +116,8 @@ export default class SSHConfiguration {
     }
 
     getHostConfiguration(host: string): Record<string, string> {
-        return this.sshConfig.compute(host);
+        // Only a few directives return an array
+        // https://github.com/jeanp413/ssh-config/blob/8d187bb8f1d83a51ff2b1d127e6b6269d24092b5/src/ssh-config.ts#L9C1-L9C118
+        return this.sshConfig.compute(host) as Record<string, string>;
     }
 }

yarn.lock

@@ -1526,10 +1526,9 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
   integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
 
-ssh-config@^4.3.0:
+"ssh-config@git+https://github.com/jeanp413/ssh-config#master":
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ssh-config/-/ssh-config-4.3.0.tgz#3a132c656374a5fbdd57c9f9e8aa8542eff1a666"
-  integrity sha512-VOsrKxYnes0A3NGzzuOAy2yB36gv+hie77ltuqLXOWRiYrmAWI9WrKAKJ2+/4f+6vx4eEDSnGYGaCbyqX8aHxg==
+  resolved "git+https://github.com/jeanp413/ssh-config#8d187bb8f1d83a51ff2b1d127e6b6269d24092b5"
 
 "ssh2@git+https://github.com/jeanp413/ssh2#master":
   version "1.11.0"