opensteer 0.4.4 → 0.4.6

package/dist/cli/server.js

@@ -1,6 +1,6 @@
 import {
   Opensteer
-} from "../chunk-2NKR4JZ6.js";
+} from "../chunk-MGZ3QEYT.js";
 import "../chunk-3H5RRIMZ.js";
 
 // src/cli/server.ts
@@ -10,14 +10,14 @@ import { writeFileSync, unlinkSync, existsSync } from "fs";
 // src/cli/paths.ts
 import { tmpdir } from "os";
 import { join } from "path";
-function prefix(namespace2) {
-  return `opensteer-${namespace2}`;
+function prefix(session2) {
+  return `opensteer-${session2}`;
 }
-function getSocketPath(namespace2) {
-  return join(tmpdir(), `${prefix(namespace2)}.sock`);
+function getSocketPath(session2) {
+  return join(tmpdir(), `${prefix(session2)}.sock`);
 }
-function getPidPath(namespace2) {
-  return join(tmpdir(), `${prefix(namespace2)}.pid`);
+function getPidPath(session2) {
+  return join(tmpdir(), `${prefix(session2)}.pid`);
 }
 
 // src/cli/commands.ts
@@ -255,6 +255,19 @@ function getCommandHandler(name) {
 // src/cli/server.ts
 var instance = null;
 var launchPromise = null;
+var selectorNamespace = null;
+var requestQueue = Promise.resolve();
+var shuttingDown = false;
+function sanitizeNamespace(value) {
+  const trimmed = String(value || "").trim();
+  if (!trimmed || trimmed === "." || trimmed === "..") {
+    return "default";
+  }
+  const replaced = trimmed.replace(/[^a-zA-Z0-9_-]+/g, "_");
+  const collapsed = replaced.replace(/_+/g, "_");
+  const bounded = collapsed.replace(/^_+|_+$/g, "");
+  return bounded || "default";
+}
 function invalidateInstance() {
   if (!instance) return;
   instance.close().catch(() => {
@@ -268,13 +281,14 @@ function attachLifecycleListeners(inst) {
   } catch {
   }
 }
-var namespace = process.env.OPENSTEER_NAME?.trim();
-if (!namespace) {
-  process.stderr.write("Missing OPENSTEER_NAME environment variable.\n");
+var sessionEnv = process.env.OPENSTEER_SESSION?.trim();
+if (!sessionEnv) {
+  process.stderr.write("Missing OPENSTEER_SESSION environment variable.\n");
   process.exit(1);
 }
-var socketPath = getSocketPath(namespace);
-var pidPath = getPidPath(namespace);
+var session = sessionEnv;
+var socketPath = getSocketPath(session);
+var pidPath = getPidPath(session);
 function cleanup() {
   try {
     unlinkSync(socketPath);
@@ -285,14 +299,49 @@ function cleanup() {
   } catch {
   }
 }
+function beginShutdown() {
+  if (shuttingDown) return;
+  shuttingDown = true;
+  cleanup();
+  server.close(() => {
+    process.exit(0);
+  });
+  setTimeout(() => {
+    process.exit(0);
+  }, 250).unref();
+}
 function sendResponse(socket, response) {
   try {
     socket.write(JSON.stringify(response) + "\n");
   } catch {
   }
 }
+function enqueueRequest(request, socket) {
+  if (request.command === "ping") {
+    void handleRequest(request, socket);
+    return;
+  }
+  requestQueue = requestQueue.then(() => handleRequest(request, socket)).catch(() => {
+  });
+}
 async function handleRequest(request, socket) {
   const { id, command, args } = request;
+  if (command === "ping" && shuttingDown) {
+    sendResponse(socket, {
+      id,
+      ok: false,
+      error: `Session '${session}' is shutting down.`
+    });
+    return;
+  }
+  if (shuttingDown) {
+    sendResponse(socket, {
+      id,
+      ok: false,
+      error: `Session '${session}' is shutting down. Retry your command.`
+    });
+    return;
+  }
   if (command === "open") {
     try {
       const url = args.url;
@@ -300,6 +349,19 @@ async function handleRequest(request, socket) {
       const connectUrl = args["connect-url"];
       const channel = args.channel;
       const profileDir = args["profile-dir"];
+      const requestedName = typeof args.name === "string" && args.name.trim().length > 0 ? sanitizeNamespace(args.name) : null;
+      if (selectorNamespace && requestedName && requestedName !== selectorNamespace) {
+        sendResponse(socket, {
+          id,
+          ok: false,
+          error: `Session '${session}' is already bound to selector namespace '${selectorNamespace}'. Requested '${requestedName}' does not match. Use the same --name for this session or start a different --session.`
+        });
+        return;
+      }
+      if (!selectorNamespace) {
+        selectorNamespace = requestedName ?? session;
+      }
+      const activeNamespace = selectorNamespace ?? session;
       if (instance && !launchPromise) {
         try {
           if (instance.page.isClosed()) {
@@ -311,7 +373,7 @@ async function handleRequest(request, socket) {
       }
       if (!instance) {
         instance = new Opensteer({
-          name: namespace,
+          name: activeNamespace,
           browser: {
             headless: headless ?? false,
             connectUrl,
@@ -343,8 +405,9 @@ async function handleRequest(request, socket) {
         ok: true,
         result: {
           url: instance.page.url(),
-          sessionId: instance.getRemoteSessionId() ?? void 0,
-          name: namespace
+          session,
+          name: activeNamespace,
+          remoteSessionId: instance.getRemoteSessionId() ?? void 0
         }
       });
     } catch (err) {
@@ -374,10 +437,7 @@ async function handleRequest(request, socket) {
         error: err instanceof Error ? err.message : String(err)
       });
     }
-    setTimeout(() => {
-      cleanup();
-      process.exit(0);
-    }, 100);
+    beginShutdown();
     return;
   }
   if (command === "ping") {
@@ -388,7 +448,7 @@ async function handleRequest(request, socket) {
     sendResponse(socket, {
       id,
       ok: false,
-      error: `No browser session in namespace '${namespace}'. Call 'opensteer open --name ${namespace}' first, or use 'opensteer sessions' to list active sessions.`
+      error: `No browser session in session '${session}'. Call 'opensteer open --session ${session}' first, or use 'opensteer sessions' to list active sessions.`
     });
     return;
   }
@@ -425,7 +485,7 @@ var server = createServer((socket) => {
       if (!line.trim()) continue;
       try {
         const request = JSON.parse(line);
-        handleRequest(request, socket);
+        enqueueRequest(request, socket);
       } catch {
         sendResponse(socket, {
           id: 0,
@@ -450,6 +510,8 @@ server.on("error", (err) => {
   process.exit(1);
 });
 async function shutdown() {
+  if (shuttingDown) return;
+  shuttingDown = true;
   if (instance) {
     try {
       await instance.close();
@@ -457,9 +519,13 @@ async function shutdown() {
     }
     instance = null;
   }
-  server.close();
   cleanup();
-  process.exit(0);
+  server.close(() => {
+    process.exit(0);
+  });
+  setTimeout(() => {
+    process.exit(0);
+  }, 250).unref();
 }
 process.on("SIGTERM", shutdown);
 process.on("SIGINT", shutdown);