npm - @uipath/codedapp-tool - Versions diffs - 1.201.0-preview.133 → 1.202.0-preview.134 - Mend

@uipath/codedapp-tool 1.201.0-preview.133 → 1.202.0-preview.134

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/dist/{browser-strategy-16yagjhr.js → browser-strategy-6atc7v8s.js} +3 -3
package/dist/{index-y19pndcy.js → index-d9c1ecq8.js} +71 -69
package/dist/{index-4tmzxx6y.js → index-h630x08t.js} +158 -76
package/dist/{index-hsadteg4.js → index-h8cph72k.js} +4 -4
package/dist/{index-9f8q2ege.js → index-p3vk57z7.js} +27 -27
package/dist/index.js +11 -9
package/dist/{js-yaml-cggj6w7q.js → js-yaml-87tvr6f6.js} +16 -16
package/dist/{multipart-parser-kme45c99.js → multipart-parser-ab4q7byb.js} +2 -2
package/dist/{node-strategy-gfq7k0sx.js → node-strategy-bpshtz02.js} +130 -14
package/dist/packager-tool-14ha5twz.js +1838 -0
package/dist/{tool-wckvcay0.js → packager-tool-1yh8g550.js} +9 -7
package/dist/{tool-yadq0xpc.js → packager-tool-8hncwr6a.js} +56 -302
package/dist/packager-tool-jke4p8q1.js +1515 -0
package/dist/{tool-4pvh3k50.js → packager-tool-qyctya2j.js} +2 -2
package/dist/{tool-bydtassw.js → packager-tool-s019q130.js} +1443 -3112
package/dist/{tool-25qmnad0.js → packager-tool-vcw2ht7n.js} +1188 -1873
package/dist/{tool-y0g9grx6.js → packager-tool-vv9c52ax.js} +5 -5
package/dist/{tool-q42rrs00.js → packager-tool-yc4kw997.js} +3 -2
package/dist/packager-tool.js +17 -0
package/dist/tool.js +13 -11
package/package.json +4 -3
/package/dist/{tool-0gctz400.js → packager-tool-0gctz400.js} +0 -0

package/dist/{js-yaml-cggj6w7q.js → js-yaml-87tvr6f6.js} RENAMED Viewed

@@ -1,4 +1,4 @@
-import"./tool-wckvcay0.js";
+import"./packager-tool-1yh8g550.js";
 // ../../node_modules/js-yaml/dist/js-yaml.mjs
 function getDefaultExportFromCjs(x) {
@@ -3125,21 +3125,21 @@ var {
   safeDump
 } = yaml;
 export {
-  types,
-  safeLoadAll,
-  safeLoad,
-  safeDump,
-  loadAll,
-  load,
-  dump,
-  yaml as default,
-  YAMLException,
-  Type,
-  Schema,
-  JSON_SCHEMA,
-  FAILSAFE_SCHEMA,
+  CORE_SCHEMA,
   DEFAULT_SCHEMA,
-  CORE_SCHEMA
+  FAILSAFE_SCHEMA,
+  JSON_SCHEMA,
+  Schema,
+  Type,
+  YAMLException,
+  yaml as default,
+  dump,
+  load,
+  loadAll,
+  safeDump,
+  safeLoad,
+  safeLoadAll,
+  types
 };
-//# debugId=6D9E579FD7979E6964756E2164756E21
+//# debugId=3FF8535573D0966A64756E2164756E21

package/dist/{multipart-parser-kme45c99.js → multipart-parser-ab4q7byb.js} RENAMED Viewed

@@ -1,8 +1,8 @@
 import {
   FormData,
   file_default
-} from "./tool-y0g9grx6.js";
-import"./tool-wckvcay0.js";
+} from "./packager-tool-vv9c52ax.js";
+import"./packager-tool-1yh8g550.js";
 // ../../node_modules/node-fetch/src/utils/multipart-parser.js
 var s = 0;

package/dist/{node-strategy-gfq7k0sx.js → node-strategy-bpshtz02.js} RENAMED Viewed

@@ -1,17 +1,19 @@
 import {
   catchError,
   getFileSystem
-} from "./tool-4pvh3k50.js";
+} from "./packager-tool-qyctya2j.js";
 import {
   AUTH_CANCELLED_ERROR_CODE,
+  AUTH_RECLAIMED_ERROR_CODE,
   AUTH_TIMEOUT_ERROR_CODE,
   DEFAULT_AUTH_TIMEOUT_MS
-} from "./tool-q42rrs00.js";
+} from "./packager-tool-yc4kw997.js";
 import {
   __require
-} from "./tool-wckvcay0.js";
+} from "./packager-tool-1yh8g550.js";
 // ../auth/src/getBaseHtml.ts
+var CALLBACK_PAGE_TITLE_SUFFIX = " - UiPath CLI";
 var escapeHtml = (value) => value.replace(/[&<>"']/g, (char) => {
   switch (char) {
     case "&":
@@ -39,7 +41,7 @@ var getBaseHtml = ({ title, message, type }) => {
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>${safeTitle} - UiPath CLI</title>
+    <title>${safeTitle}${CALLBACK_PAGE_TITLE_SUFFIX}</title>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400&family=Poppins:wght@600&display=swap" rel="stylesheet">
@@ -175,11 +177,60 @@ var getBaseHtml = ({ title, message, type }) => {
 };
 // ../auth/src/server.ts
+var RECLAIM_PROBE_PATH = "/uip-reclaim-probe";
+var RECLAIM_LISTENER_PID_HEADER = "x-uipath-cli-login-pid";
+var RECLAIM_PROBER_PID_HEADER = "x-uipath-cli-prober-pid";
+var RECLAIM_MARKER = `${CALLBACK_PAGE_TITLE_SUFFIX}</title>`;
+var RECLAIM_PROBE_TIMEOUT_MS = 1000;
+var RECLAIM_REBIND_DELAY_MS = 150;
+var RECLAIM_PROBE_READ_LIMIT = 16 * 1024;
+var probeStaleCallbackListener = (http, host, port) => new Promise((resolve) => {
+  let sawResponse = false;
+  let listenerPid;
+  let deadline;
+  const settle = (verdict) => {
+    clearTimeout(deadline);
+    resolve({ verdict, pid: listenerPid });
+  };
+  const req = http.get({
+    host,
+    port,
+    path: RECLAIM_PROBE_PATH,
+    timeout: RECLAIM_PROBE_TIMEOUT_MS,
+    headers: { [RECLAIM_PROBER_PID_HEADER]: String(process.pid) }
+  }, (res) => {
+    sawResponse = true;
+    const rawPid = res.headers[RECLAIM_LISTENER_PID_HEADER];
+    if (typeof rawPid === "string" && /^\d+$/.test(rawPid)) {
+      listenerPid = Number.parseInt(rawPid, 10);
+    }
+    res.on("error", () => {});
+    let body = "";
+    res.setEncoding("utf8");
+    const classify = () => settle(body.includes(RECLAIM_MARKER) ? "reclaimed" : "foreign");
+    res.on("data", (chunk) => {
+      body += chunk;
+      if (body.length >= RECLAIM_PROBE_READ_LIMIT) {
+        classify();
+        req.destroy();
+      }
+    });
+    res.on("end", classify);
+  });
+  const giveUp = () => {
+    settle("foreign");
+    req.destroy();
+  };
+  req.on("timeout", giveUp);
+  deadline = setTimeout(giveUp, RECLAIM_PROBE_TIMEOUT_MS);
+  req.on("error", () => settle(sawResponse ? "foreign" : "gone"));
+});
 var startServer = async ({
   redirectUri,
   timeoutMs = DEFAULT_AUTH_TIMEOUT_MS,
   onListening,
-  signal
+  signal,
+  onPortReclaimed
 }) => {
   let http;
   try {
@@ -204,6 +255,25 @@ var startServer = async ({
         return;
       }
       const url = new URL(req.url, redirectUri);
+      if (url.pathname === RECLAIM_PROBE_PATH) {
+        const proberPidRaw = req.headers[RECLAIM_PROBER_PID_HEADER];
+        const proberPid = typeof proberPidRaw === "string" && /^\d+$/.test(proberPidRaw) ? ` (PID ${proberPidRaw})` : "";
+        res.writeHead(200, {
+          "Content-Type": "text/html; charset=utf-8",
+          Connection: "close",
+          [RECLAIM_LISTENER_PID_HEADER]: String(process.pid)
+        });
+        res.end(getBaseHtml({
+          title: "Login superseded",
+          message: "This sign-in was taken over by a newer 'uip login' on this machine.",
+          type: "error"
+        }));
+        server.close();
+        const err = new Error(`Another 'uip login'${proberPid} on this machine took over the callback port; this login was cancelled.`);
+        err.code = AUTH_RECLAIMED_ERROR_CODE;
+        reject(err);
+        return;
+      }
       const error = url.searchParams.get("error");
       if (error) {
         res.writeHead(400, {
@@ -248,7 +318,9 @@ var startServer = async ({
       return;
     });
     let timeoutHandle;
+    let settled = false;
     const onAbort = () => {
+      settled = true;
       clearTimeout(timeoutHandle);
       server.close();
       const err = new Error("Authentication cancelled");
@@ -263,6 +335,7 @@ var startServer = async ({
       signal.addEventListener("abort", onAbort, { once: true });
     }
     timeoutHandle = setTimeout(() => {
+      settled = true;
       server.close();
       signal?.removeEventListener("abort", onAbort);
       const err = new Error("Authentication timeout");
@@ -270,20 +343,62 @@ var startServer = async ({
       reject(err);
     }, timeoutMs);
     const bindHost = redirectUri.hostname === "localhost" ? "127.0.0.1" : redirectUri.hostname;
-    server.on("error", (err) => {
+    const fail = (err) => {
+      settled = true;
       clearTimeout(timeoutHandle);
       signal?.removeEventListener("abort", onAbort);
       reject(err);
+    };
+    let reclaimAttempted = false;
+    let reclaimed = false;
+    let reclaimedPid;
+    let rebindAttemptsLeft = 0;
+    server.on("listening", () => {
+      Promise.resolve().then(() => {
+        if (reclaimed)
+          onPortReclaimed?.({ pid: reclaimedPid });
+      }).then(() => onListening?.()).catch((err) => {
+        settled = true;
+        server.close();
+        clearTimeout(timeoutHandle);
+        reject(err);
+      });
     });
-    server.listen(Number(redirectUri.port), bindHost, () => {
-      if (onListening) {
-        Promise.resolve(onListening()).catch((err) => {
-          server.close();
-          clearTimeout(timeoutHandle);
-          reject(err);
-        });
+    const listen = () => {
+      if (settled)
+        return;
+      server.listen(Number(redirectUri.port), bindHost);
+    };
+    server.on("error", (err) => {
+      if (settled)
+        return;
+      const code = err.code;
+      if (code === "EADDRINUSE") {
+        if (!reclaimAttempted) {
+          reclaimAttempted = true;
+          probeStaleCallbackListener(http, bindHost, Number(redirectUri.port)).then(({ verdict, pid }) => {
+            if (settled)
+              return;
+            if (verdict === "foreign") {
+              fail(err);
+              return;
+            }
+            reclaimed = verdict === "reclaimed";
+            reclaimedPid = pid;
+            rebindAttemptsLeft = 3;
+            setTimeout(listen, RECLAIM_REBIND_DELAY_MS);
+          });
+          return;
+        }
+        if (rebindAttemptsLeft > 0) {
+          rebindAttemptsLeft -= 1;
+          setTimeout(listen, RECLAIM_REBIND_DELAY_MS);
+          return;
+        }
       }
+      fail(err);
     });
+    listen();
     server.on("close", () => {
       clearTimeout(timeoutHandle);
       signal?.removeEventListener("abort", onAbort);
@@ -299,6 +414,7 @@ class NodeAuthStrategy {
       redirectUri,
       timeoutMs: opts?.timeoutMs,
       signal: opts?.signal,
+      onPortReclaimed: opts?.onPortReclaimed,
       onListening: async () => {
         let safeUrl = "";
         for (const ch of url) {
@@ -345,4 +461,4 @@ export {
   NodeAuthStrategy
 };
-//# debugId=A8160D47DD46BDEC64756E2164756E21
+//# debugId=61C68C1CA3F57C5B64756E2164756E21