@pmate/cli 0.20.0 → 0.20.1

package/dist/index.js

@@ -96,7 +96,7 @@ function assertValidAppRef(appRef) {
 function saveLoginSession(session, requestedApp = DEFAULT_APP_ID) {
   const store = loadExistingSessionStoreOrEmpty();
   const app = assertValidAppRef(requestedApp);
-  const sessionApp = session.session?.app?.trim();
+  const sessionApp = session.session?.identity?.app?.trim();
   if (!sessionApp) {
     throw new Error("Missing app in login session payload.");
   }
@@ -13202,7 +13202,8 @@ var LoginCommandHandler = class {
       );
     }
     const resp = await response.json();
-    if (!resp?.data?.session?.app || resp.data.session.app !== appId) {
+    const returnedApp = resp?.data?.session?.identity?.app?.trim();
+    if (!returnedApp || returnedApp !== appId) {
       throw new Error("Invalid exchange response: app-scoped session mismatch.");
     }
     return resp.data;
@@ -13214,9 +13215,16 @@ var LoginCommandHandler = class {
       resolveToken = resolve;
       rejectToken = reject;
     });
+    const openSockets = /* @__PURE__ */ new Set();
     const server = (0, import_node_http.createServer)((request, response) => {
       this.handleCallbackRequest(request, response, resolveToken, rejectToken);
     });
+    server.on("connection", (socket) => {
+      openSockets.add(socket);
+      socket.on("close", () => {
+        openSockets.delete(socket);
+      });
+    });
     await new Promise((resolve, reject) => {
       server.once("error", reject);
       server.listen(0, "127.0.0.1", () => resolve());
@@ -13236,9 +13244,15 @@ var LoginCommandHandler = class {
     }, LOGIN_TIMEOUT_MS);
     const close = async () => {
       clearTimeout(timeout);
-      await new Promise((resolve) => {
+      const closePromise = new Promise((resolve) => {
         server.close(() => resolve());
       });
+      server.closeIdleConnections?.();
+      server.closeAllConnections?.();
+      for (const socket of openSockets) {
+        socket.destroy();
+      }
+      await closePromise;
     };
     return {
       redirectUrl,
@@ -13263,13 +13277,14 @@ var LoginCommandHandler = class {
     }
     response.statusCode = 200;
     response.setHeader("Content-Type", "text/html; charset=utf-8");
+    response.setHeader("Connection", "close");
     response.end(
       this.renderHtml(
         "Login complete",
         "You can close this tab and return to the terminal."
-      )
+      ),
+      () => resolveToken(token)
     );
-    resolveToken(token);
   }
   renderHtml(title, message) {
     return `<!doctype html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {