@westbayberry/dg 1.0.7 → 1.0.9

package/dist/index.mjs

@@ -48,7 +48,8 @@ __export(config_exports, {
 });
 import { parseArgs } from "node:util";
 import { readFileSync, existsSync } from "node:fs";
-import { join } from "node:path";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
 function loadDgrc() {
   const candidates = [
@@ -69,8 +70,9 @@ function loadDgrc() {
 }
 function getVersion() {
   try {
+    const thisDir = dirname(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
-      readFileSync(join(__dirname, "..", "package.json"), "utf-8")
+      readFileSync(join(thisDir, "..", "package.json"), "utf-8")
     );
     return pkg.version ?? "1.0.0";
   } catch {
@@ -308,7 +310,7 @@ function parsePackageSpec(spec) {
   };
 }
 async function resolveVersion(spec) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     const child = spawn("npm", ["view", spec, "version"], {
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -318,20 +320,20 @@ async function resolveVersion(spec) {
     });
     const timer = setTimeout(() => {
       child.kill();
-      resolve2(null);
+      resolve(null);
     }, 15e3);
     child.on("close", (code) => {
       clearTimeout(timer);
       if (code !== 0) {
-        resolve2(null);
+        resolve(null);
         return;
       }
       const version = stdout.trim();
-      resolve2(version || null);
+      resolve(version || null);
     });
     child.on("error", () => {
       clearTimeout(timer);
-      resolve2(null);
+      resolve(null);
     });
   });
 }
@@ -366,13 +368,13 @@ async function resolvePackages(specs) {
   return { resolved, failed };
 }
 function runNpm(args) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     const child = spawn("npm", args, {
       stdio: "inherit",
       shell: false
     });
-    child.on("close", (code) => resolve2(code ?? 1));
-    child.on("error", () => resolve2(1));
+    child.on("close", (code) => resolve(code ?? 1));
+    child.on("error", () => resolve(1));
   });
 }
 function readBareInstallPackages(cwd2) {
@@ -3318,7 +3320,7 @@ var require_react_development = __commonJS({
           var dispatcher = resolveDispatcher();
           return dispatcher.useLayoutEffect(create2, deps);
         }
-        function useCallback4(callback, deps) {
+        function useCallback5(callback, deps) {
           var dispatcher = resolveDispatcher();
           return dispatcher.useCallback(callback, deps);
         }
@@ -3944,14 +3946,14 @@ var require_react_development = __commonJS({
               var thenableResult = result;
               var wasAwaited = false;
               var thenable = {
-                then: function(resolve2, reject) {
+                then: function(resolve, reject) {
                   wasAwaited = true;
                   thenableResult.then(function(returnValue2) {
                     popActScope(prevActScopeDepth);
                     if (actScopeDepth === 0) {
-                      recursivelyFlushAsyncActWork(returnValue2, resolve2, reject);
+                      recursivelyFlushAsyncActWork(returnValue2, resolve, reject);
                     } else {
-                      resolve2(returnValue2);
+                      resolve(returnValue2);
                     }
                   }, function(error2) {
                     popActScope(prevActScopeDepth);
@@ -3981,20 +3983,20 @@ var require_react_development = __commonJS({
                   ReactCurrentActQueue.current = null;
                 }
                 var _thenable = {
-                  then: function(resolve2, reject) {
+                  then: function(resolve, reject) {
                     if (ReactCurrentActQueue.current === null) {
                       ReactCurrentActQueue.current = [];
-                      recursivelyFlushAsyncActWork(returnValue, resolve2, reject);
+                      recursivelyFlushAsyncActWork(returnValue, resolve, reject);
                     } else {
-                      resolve2(returnValue);
+                      resolve(returnValue);
                     }
                   }
                 };
                 return _thenable;
               } else {
                 var _thenable2 = {
-                  then: function(resolve2, reject) {
-                    resolve2(returnValue);
+                  then: function(resolve, reject) {
+                    resolve(returnValue);
                   }
                 };
                 return _thenable2;
@@ -4010,7 +4012,7 @@ var require_react_development = __commonJS({
             actScopeDepth = prevActScopeDepth;
           }
         }
-        function recursivelyFlushAsyncActWork(returnValue, resolve2, reject) {
+        function recursivelyFlushAsyncActWork(returnValue, resolve, reject) {
           {
             var queue = ReactCurrentActQueue.current;
             if (queue !== null) {
@@ -4019,16 +4021,16 @@ var require_react_development = __commonJS({
                 enqueueTask(function() {
                   if (queue.length === 0) {
                     ReactCurrentActQueue.current = null;
-                    resolve2(returnValue);
+                    resolve(returnValue);
                   } else {
-                    recursivelyFlushAsyncActWork(returnValue, resolve2, reject);
+                    recursivelyFlushAsyncActWork(returnValue, resolve, reject);
                   }
                 });
               } catch (error2) {
                 reject(error2);
               }
             } else {
-              resolve2(returnValue);
+              resolve(returnValue);
             }
           }
         }
@@ -4085,7 +4087,7 @@ var require_react_development = __commonJS({
         exports.memo = memo;
         exports.startTransition = startTransition;
         exports.unstable_act = act;
-        exports.useCallback = useCallback4;
+        exports.useCallback = useCallback5;
         exports.useContext = useContext7;
         exports.useDebugValue = useDebugValue;
         exports.useDeferredValue = useDeferredValue;
@@ -35380,8 +35382,8 @@ var init_ink = __esm({
         }
       }
       async waitUntilExit() {
-        this.exitPromise ||= new Promise((resolve2, reject) => {
-          this.resolveExitPromise = resolve2;
+        this.exitPromise ||= new Promise((resolve, reject) => {
+          this.resolveExitPromise = resolve;
           this.rejectExitPromise = reject;
         });
         return this.exitPromise;
@@ -36083,12 +36085,15 @@ var init_auth = __esm({
 });
 
 // src/ui/hooks/useLogin.ts
-function reducer(_state, action) {
+function reducer(state, action) {
   switch (action.type) {
     case "ALREADY_LOGGED_IN":
       return { phase: "already_logged_in", apiKey: action.apiKey };
-    case "SESSION_CREATED":
-      return { phase: "waiting", verifyUrl: action.verifyUrl };
+    case "SESSION_READY":
+      return { phase: "ready", verifyUrl: action.verifyUrl };
+    case "BROWSER_OPENED":
+      if (state.phase !== "ready") return state;
+      return { phase: "waiting", verifyUrl: state.verifyUrl };
     case "AUTH_COMPLETE":
       return { phase: "success", email: action.email };
     case "AUTH_EXPIRED":
@@ -36100,10 +36105,11 @@ function reducer(_state, action) {
 function useLogin() {
   const [state, dispatch] = (0, import_react22.useReducer)(reducer, { phase: "creating" });
   const started = (0, import_react22.useRef)(false);
+  const sessionRef = (0, import_react22.useRef)(null);
+  const cancelledRef = (0, import_react22.useRef)(false);
   (0, import_react22.useEffect)(() => {
     if (started.current) return;
     started.current = true;
-    let cancelled = false;
     (async () => {
       try {
         const existing = getStoredApiKey();
@@ -36121,15 +36127,30 @@ function useLogin() {
           });
           return;
         }
+        sessionRef.current = session;
+        dispatch({ type: "SESSION_READY", verifyUrl: session.verifyUrl });
+      } catch (err) {
         dispatch({
-          type: "SESSION_CREATED",
-          verifyUrl: session.verifyUrl
+          type: "ERROR",
+          message: err instanceof Error ? err.message : String(err)
         });
-        openBrowser(session.verifyUrl);
+      }
+    })();
+    return () => {
+      cancelledRef.current = true;
+    };
+  }, []);
+  const openAndPoll = (0, import_react22.useCallback)(() => {
+    const session = sessionRef.current;
+    if (!session) return;
+    dispatch({ type: "BROWSER_OPENED" });
+    openBrowser(session.verifyUrl);
+    (async () => {
+      try {
         for (let i = 0; i < MAX_POLL_ATTEMPTS; i++) {
-          if (cancelled) return;
+          if (cancelledRef.current) return;
           await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
-          if (cancelled) return;
+          if (cancelledRef.current) return;
           try {
             const result = await pollAuthSession(session.sessionId);
             if (result.status === "complete" && result.apiKey) {
@@ -36152,11 +36173,8 @@ function useLogin() {
         });
       }
     })();
-    return () => {
-      cancelled = true;
-    };
   }, []);
-  return state;
+  return { state, openAndPoll };
 }
 var import_react22, POLL_INTERVAL_MS, MAX_POLL_ATTEMPTS;
 var init_useLogin = __esm({
@@ -38804,7 +38822,7 @@ var init_LoginApp = __esm({
     await init_Spinner();
     import_jsx_runtime2 = __toESM(require_jsx_runtime());
     LoginApp = () => {
-      const state = useLogin();
+      const { state, openAndPoll } = useLogin();
       const { exit } = use_app_default();
       (0, import_react24.useEffect)(() => {
         if (state.phase === "success") {
@@ -38823,6 +38841,11 @@ var init_LoginApp = __esm({
           return () => clearTimeout(timer);
         }
       }, [state, exit]);
+      use_input_default((_input, key) => {
+        if (state.phase === "ready" && key.return) {
+          openAndPoll();
+        }
+      });
       switch (state.phase) {
         case "creating":
           return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Spinner2, { label: "Creating login session..." });
@@ -38835,12 +38858,19 @@ var init_LoginApp = __esm({
               " first to re-authenticate."
             ] })
           ] });
+        case "ready":
+          return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { flexDirection: "column", paddingLeft: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: " " }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: "Authenticate your account at:" }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: "cyan", children: state.verifyUrl }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: " " }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { dimColor: true, children: "Press ENTER to open in the browser..." })
+          ] });
         case "waiting":
           return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { flexDirection: "column", paddingLeft: 1, children: [
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: " " }),
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: "Opening browser to authenticate..." }),
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { dimColor: true, children: "If it didn't open, visit:" }),
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { dimColor: true, color: "cyan", children: state.verifyUrl }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: "Authenticate your account at:" }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: "cyan", children: state.verifyUrl }),
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { children: " " }),
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Spinner2, { label: "Waiting for authorization..." })
           ] });
@@ -39932,11 +39962,22 @@ async function runStaticLogin() {
     process.exit(1);
   }
   process.stderr.write(`
-  Opening browser to authenticate...
+  Authenticate your account at:
 `);
-  process.stderr.write(`  Visit: ${import_chalk4.default.cyan(session.verifyUrl)}
+  process.stderr.write(`  ${import_chalk4.default.cyan(session.verifyUrl)}
 
 `);
+  process.stderr.write(import_chalk4.default.dim("  Press ENTER to open in the browser...\n"));
+  await new Promise((resolve) => {
+    const onData = () => {
+      process.stdin.removeListener("data", onData);
+      if (process.stdin.unref) process.stdin.unref();
+      resolve();
+    };
+    process.stdin.setEncoding("utf-8");
+    process.stdin.resume();
+    process.stdin.on("data", onData);
+  });
   try {
     openBrowser2(session.verifyUrl);
   } catch {
@@ -40274,9 +40315,9 @@ function useNpmWrapper(npmArgs, config) {
             return;
           }
           dispatch({ type: "BLOCKED", result, dgForce: false });
-          const shouldProceed = await new Promise((resolve2) => {
-            pendingInstall.current = () => resolve2(true);
-            rejectRef.current = () => resolve2(false);
+          const shouldProceed = await new Promise((resolve) => {
+            pendingInstall.current = () => resolve(true);
+            rejectRef.current = () => resolve(false);
           });
           if (shouldProceed) {
             dispatch({ type: "INSTALLING" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@westbayberry/dg",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Supply chain security scanner — scan npm dependencies in any CI or terminal",
   "bin": {
     "dependency-guardian": "dist/index.mjs",