revert: refactor auto-discovery for OS proxy settings (#595)" (#604)

This reverts commit 0e68235.

Author: tsmithsz

package-lock.json

@@ -45,12 +45,12 @@
         "hpagent": "^1.2.0",
         "jose": "^5.9.6",
         "mac-ca": "^3.1.1",
+        "os-proxy-config": "^1.1.2",
         "rxjs": "^7.8.2",
         "vscode-languageserver": "^9.0.1",
         "vscode-languageserver-protocol": "^3.17.5",
         "vscode-uri": "^3.1.0",
-        "win-ca": "^3.5.1",
-        "registry-js": "^1.16.1"
+        "win-ca": "^3.5.1"
     },
     "devDependencies": {
         "@types/mocha": "^10.0.9",

runtimes/package.json

@@ -13,8 +13,8 @@ import { NodeHttpHandler } from '@smithy/node-http-handler'
 import { readMacosCertificates, readLinuxCertificates, readWindowsCertificates } from './certificatesReaders'
 import { Telemetry } from '../../../server-interface'
 import { OperationalTelemetryProvider, TELEMETRY_SCOPES } from '../../operational-telemetry/operational-telemetry'
-import { getMacSystemProxy } from './getProxySettings/getMacProxySettings'
-import { getWindowsSystemProxy } from './getProxySettings/getWindowsProxySettings'
+import { pathToFileURL } from 'node:url'
+import { execFileSync } from 'node:child_process'
 
 export class ProxyConfigManager {
     /**
@@ -71,14 +71,35 @@ export class ProxyConfigManager {
         return undefined
     }
 
-    private static getSystemProxy(): string | undefined {
-        switch (process.platform) {
-            case 'darwin':
-                return getMacSystemProxy()?.proxyUrl
-            case 'win32':
-                return getWindowsSystemProxy()?.proxyUrl
-            default:
-                return undefined
+    private static getSystemProxySync(): string | undefined {
+        try {
+            const resolved = require.resolve('os-proxy-config')
+            const resolvedUrl = pathToFileURL(resolved).href
+
+            const snippet = `
+                (async () => {
+                    try {
+                        const mod = await import(${JSON.stringify(resolvedUrl)});
+                        const r   = await mod.getSystemProxy();
+                        console.log(JSON.stringify(r ?? {}));
+                    } catch (e) {
+                        console.error(e?.message ?? e);
+                        console.log("{}");
+                    }
+                })();
+            `
+
+            const raw = execFileSync(process.execPath, ['-e', snippet], {
+                encoding: 'utf8',
+                stdio: ['ignore', 'pipe', 'inherit'],
+            })
+
+            console.debug(`os-proxy-config output: ${raw}`)
+            const { proxyUrl } = JSON.parse(raw.trim() || '{}')
+            return proxyUrl && /^https?:\/\//.test(proxyUrl) ? proxyUrl : undefined
+        } catch (err) {
+            console.warn('os‑proxy‑config shim failed:', (err as Error).message)
+            return undefined
         }
     }
 
@@ -188,7 +209,7 @@ export class ProxyConfigManager {
         }
 
         // Fall back to OS auto‑detect (HTTP or HTTPS only)
-        const sysProxyUrl = ProxyConfigManager.getSystemProxy()
+        const sysProxyUrl = ProxyConfigManager.getSystemProxySync()
         if (sysProxyUrl) {
             this.emitProxyMetric('AutoDetect', certs.length, sysProxyUrl)
             return new HttpsProxyAgent({ ...agentOptions, proxy: sysProxyUrl })