linkshell-cli 0.10.52 → 0.10.53

package/src/commands/host.ts

@@ -205,6 +205,28 @@ export function describeGateway(gateway: GatewayStatus): string {
 }
 
 /** After `linkshell login`: this computer joins the gateway its account is for. */
+/**
+ * A signed-in Pro account's computer belongs on the official gateway: nobody should have to find
+ * a button for it before their phone can see this computer. A gateway of one's own (a URL) is kept;
+ * "off" is not. A stopped host is left stopped. True when the host was asked to reconnect.
+ */
+export async function followAccountGateway(plan: "pro" | "free" | "unknown"): Promise<boolean> {
+  if (plan !== "pro" || process.env.LINKSHELL_GATEWAY || !loadAuth()?.userId || !hostRuntimeOk()) return false;
+  const home = daemon.linkshellDir();
+  const config = readHostConfig(home);
+  if (config.gateway && config.gateway !== "off") return false;
+  const turnedOff = config.gateway === "off";
+  if (turnedOff) {
+    delete config.gateway;
+    writeHostConfig(home, config);
+  }
+  const status = await withRunningHost((client) => client.call("gateway.status", {}, 5000)).catch(() => undefined);
+  if (!status) return false;
+  if (!turnedOff && status.status !== "off" && sameGateway(status.url, OFFICIAL_GATEWAY)) return false;
+  await refreshGateway(15_000);
+  return true;
+}
+
 export async function joinGatewayAfterLogin(plan: "pro" | "free"): Promise<void> {
   const out = (line: string) => process.stderr.write(`  ${line}\n`);
   if (!hostRuntimeOk()) {

package/src/utils/daemon.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync, openSync, renameSync, statSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
+import { homedir, uptime } from "node:os";
 import { spawn } from "node:child_process";
 
 const LINKSHELL_DIR = process.env.LINKSHELL_HOME || join(homedir(), ".linkshell");
@@ -66,6 +66,12 @@ export function readPid(service: ServiceName): number | null {
     if (!existsSync(file)) return null;
     const pid = Number(readFileSync(file, "utf8").trim());
     if (!Number.isSafeInteger(pid) || pid <= 0) return null;
+    // Written before the computer last started (a logoff or power cut left it): whatever runs under
+    // that pid now is some other process, and believing it would keep the host from being started.
+    if (statSync(file).mtimeMs < Date.now() - uptime() * 1000 - 60_000) {
+      removePid(service);
+      return null;
+    }
     try {
       process.kill(pid, 0);
       return pid;