@dylanpiercey/work 0.0.73 → 0.0.75

package/bin/work.mjs

@@ -437,13 +437,19 @@ function installedServiceEnv() {
     const text = fs.readFileSync(serviceFile(), "utf8");
     const re =
       process.platform === "darwin"
-        ? /<key>(WORK_[A-Z_]+)<\/key>\s*<string>([^<]*)<\/string>/g
-        : /^Environment=(WORK_[A-Z_]+)=(.*)$/gm;
+        ? /<key>([A-Za-z_]+)<\/key>\s*<string>([^<]*)<\/string>/g
+        : /^Environment=([A-Za-z_]+)=(.*)$/gm;
     for (const [, key, value] of text.matchAll(re)) installed[key] = value;
   } catch {}
   return installed;
 }
 
+/** Network env worth carrying from the installing shell into the service. */
+const PROXY_ENV = [
+  "HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY", "http_proxy", "https_proxy", "no_proxy",
+  "NODE_EXTRA_CA_CERTS", "SSL_CERT_FILE", "SSL_CERT_DIR",
+];
+
 function serviceEnv() {
   const env = { PATH: servicePath() };
   const installed = installedServiceEnv();
@@ -456,6 +462,15 @@ function serviceEnv() {
   // entry.ts prefers PORT, so carrying WORK_APP_PORT forward without this
   // would leave the service on the default port anyway.
   env.PORT = env.WORK_APP_PORT || appPort;
+  // A service starts with none of the shell's network environment. Behind a
+  // corporate proxy or a private CA the server's own usage fetches would
+  // fail while every CLI in a login-shell pane works, so carry those
+  // through — and tell node's fetch to honour the proxy variables.
+  for (const key of PROXY_ENV) {
+    const value = key in process.env ? process.env[key] : installed[key];
+    if (value) env[key] = value;
+  }
+  if (Object.keys(env).some((k) => /^https?_proxy$/i.test(k))) env.NODE_USE_ENV_PROXY = "1";
   return env;
 }
 
@@ -583,8 +598,9 @@ function installService() {
     const plist = serviceFile();
     fs.mkdirSync(path.dirname(plist), { recursive: true });
     fs.mkdirSync(path.join(os.homedir(), "Library/Logs"), { recursive: true });
+    const xml = (v) => String(v).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
     const envXml = Object.entries(serviceEnv())
-      .map(([k, v]) => `    <key>${k}</key><string>${v}</string>`)
+      .map(([k, v]) => `    <key>${k}</key><string>${xml(v)}</string>`)
       .join("\n");
     fs.writeFileSync(
       plist,