@thenewlabs/entangle-serve 2.6.2 → 2.8.0

package/dist/session-registry.js

@@ -0,0 +1,167 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+const REGISTRY_FILE = 'sessions.json';
+/**
+ * Resolve the runtime directory holding sockets, logs and the registry.
+ *
+ * Precedence:
+ *   1. `ENTANGLE_RUN_DIR` — explicit override (used by tests, and handy for the
+ *      daemon to pin a location);
+ *   2. `$XDG_RUNTIME_DIR/entangle` — the standard per-user runtime dir;
+ *   3. `~/.entangle/run` — fallback when XDG is unset.
+ */
+export function resolveRunDir() {
+    const override = process.env.ENTANGLE_RUN_DIR;
+    if (override)
+        return override;
+    const xdg = process.env.XDG_RUNTIME_DIR;
+    if (xdg)
+        return path.join(xdg, 'entangle');
+    return path.join(os.homedir(), '.entangle', 'run');
+}
+/** Ensure the runtime directory exists with 0700 perms, returning its path. */
+export function ensureRunDir() {
+    const dir = resolveRunDir();
+    fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
+    return dir;
+}
+/** Reduce an arbitrary name to a filesystem-safe token ([A-Za-z0-9._-]). */
+export function sanitizeName(name) {
+    const safe = name.replace(/[^A-Za-z0-9._-]/g, '-');
+    // Avoid an empty basename or a name that resolves to a directory entry.
+    return safe.length > 0 && safe !== '.' && safe !== '..' ? safe : 'session';
+}
+/** Absolute path of the unix socket for a session. */
+export function socketPath(name) {
+    return path.join(resolveRunDir(), `${sanitizeName(name)}.sock`);
+}
+/** Absolute path of the log file for a session. */
+export function logPath(name) {
+    return path.join(resolveRunDir(), `${sanitizeName(name)}.log`);
+}
+/**
+ * Stable short session name derived from a capability id, so an unnamed session
+ * is keyed on its capability. Deterministic: the same capId always yields the
+ * same name. Uses the sanitized leading characters of the capId (capIds are
+ * already url-safe base-ish tokens) to stay human-recognizable.
+ */
+export function defaultSessionName(capId) {
+    const token = sanitizeName(capId).replace(/[._-]/g, '').slice(0, 10) || 'anon';
+    return `cap-${token}`;
+}
+// --- registry file I/O (best-effort, tolerant of missing/corrupt data) -----
+function registryPath() {
+    return path.join(resolveRunDir(), REGISTRY_FILE);
+}
+function isSessionInfo(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const v = value;
+    return (typeof v.name === 'string' &&
+        typeof v.socket === 'string' &&
+        typeof v.logFile === 'string' &&
+        typeof v.pid === 'number' &&
+        typeof v.capId === 'string' &&
+        typeof v.url === 'string' &&
+        typeof v.createdAt === 'number');
+}
+/** Read the registry. A missing or corrupt file is treated as empty. */
+export function listSessions() {
+    let raw;
+    try {
+        raw = fs.readFileSync(registryPath(), 'utf8');
+    }
+    catch {
+        return []; // missing file (or unreadable) → no sessions
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed))
+            return [];
+        return parsed.filter(isSessionInfo);
+    }
+    catch {
+        return []; // corrupt JSON → treat as empty
+    }
+}
+function writeSessions(sessions) {
+    ensureRunDir();
+    const tmp = `${registryPath()}.${process.pid}.tmp`;
+    try {
+        fs.writeFileSync(tmp, JSON.stringify(sessions, null, 2), { mode: 0o600 });
+        fs.renameSync(tmp, registryPath()); // atomic replace
+    }
+    catch {
+        try {
+            fs.unlinkSync(tmp);
+        }
+        catch { /* nothing to clean up */ }
+    }
+}
+/** Add (or replace by name) a session in the registry. */
+export function addSession(info) {
+    const sessions = listSessions().filter((s) => s.name !== info.name);
+    sessions.push(info);
+    writeSessions(sessions);
+}
+/** Remove a session from the registry by name. No-op if absent. */
+export function removeSession(name) {
+    const sessions = listSessions();
+    const next = sessions.filter((s) => s.name !== name);
+    if (next.length !== sessions.length)
+        writeSessions(next);
+}
+/** Find a registered session by name. */
+export function findSession(name) {
+    return listSessions().find((s) => s.name === name);
+}
+// --- liveness --------------------------------------------------------------
+/** True if the pid is alive AND the session's socket file still exists. */
+export function isAlive(info) {
+    return pidAlive(info.pid) && fs.existsSync(info.socket);
+}
+/** True if a process with `pid` exists and is signalable by us. */
+function pidAlive(pid) {
+    if (!Number.isInteger(pid) || pid <= 0)
+        return false;
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (err) {
+        // EPERM means the process exists but we may not signal it → still alive.
+        return err.code === 'EPERM';
+    }
+}
+/**
+ * Prune dead state: drop registry entries whose pid is gone, and unlink any
+ * `.sock` file in the run dir that no live registered session owns.
+ */
+export function cleanupStale() {
+    const dir = resolveRunDir();
+    const sessions = listSessions();
+    const live = sessions.filter((s) => pidAlive(s.pid));
+    if (live.length !== sessions.length)
+        writeSessions(live);
+    const liveSockets = new Set(live.map((s) => s.socket));
+    let entries;
+    try {
+        entries = fs.readdirSync(dir);
+    }
+    catch {
+        return; // dir gone → nothing to unlink
+    }
+    for (const entry of entries) {
+        if (!entry.endsWith('.sock'))
+            continue;
+        const full = path.join(dir, entry);
+        if (liveSockets.has(full))
+            continue; // owned by a live session
+        try {
+            fs.unlinkSync(full);
+        }
+        catch { /* raced / already gone */ }
+    }
+}
+//# sourceMappingURL=session-registry.js.map

package/dist/session-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-registry.js","sourceRoot":"","sources":["../src/session-registry.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thenewlabs/entangle-serve",
-  "version": "2.6.2",
+  "version": "2.8.0",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
-    "@thenewlabs/entangle-crypto": "^2.6.2",
-    "@thenewlabs/entangle-protocol": "^2.6.2",
-    "@thenewlabs/entangle-utils": "^2.6.2",
+    "@thenewlabs/entangle-crypto": "^2.8.0",
+    "@thenewlabs/entangle-protocol": "^2.8.0",
+    "@thenewlabs/entangle-utils": "^2.8.0",
     "cborg": "^4.5.8",
     "commander": "^15.0.0",
     "ws": "^8.21.0"