diggylab 0.1.43 → 0.1.44

package/README.md

@@ -111,8 +111,12 @@ The equivalents: `diggylab login --cookies 'name=value; ...'` for a quoted one-l
 `diggylab login --cookies cookies.json` for a saved file.
 
 Only `name` and `value` are required; the agent fills in the rest (`.facebook.com`, `/`, session
-expiry). Every `facebook.com` cookie is kept, and at least `c_user` plus `xs` must be present — those
-two carry the session, and `datr` is worth keeping too.
+expiry). Every `facebook.com` cookie is kept. The export must contain `c_user` (the agent rejects it
+otherwise) and `xs`, which carries the session — without `xs` Facebook refuses the session during the
+check, and `datr` is worth keeping too.
+
+If you paste cookies, prefer the file form or `--cookies -` over `--cookies '...'`: a value on the
+command line stays in your shell history, and pasted text stays in the terminal scrollback.
 
 Do not use `document.cookie` from the Console: Facebook's `c_user` and `xs` are HttpOnly, so they
 never appear there. The DevTools cookie table and the extension do show them.
@@ -126,12 +130,17 @@ happens the command says so — approve the login from your phone and import aga
 
 ## Troubleshooting
 
+- `socket closed: 1005` followed by `session: ONLINE` about every 14 minutes is **normal**: the access
+  token lives 15 minutes, so the worker refreshes it one minute early and reconnects with the new one
+  (the disconnect lasts a second or two, and a running scan keeps going).
 - `socket closed: 4009` right after `session: ONLINE` means **two workers use the same device** — for
   example the systemd service plus a manual `diggylab run`. The worker that connected last keeps the
   device and the older one stops with a message. Check `pgrep -af "diggylab run"` and
   `systemctl status diggylab --no-pager`, then keep only one.
-- `socket closed: 1006` with reconnects is a dropped connection; the worker keeps retrying with
-  backoff. If it never settles, check that the server can reach the API origin.
+- `socket error:` plus `socket closed: 1006` and `RECONNECTING (NETWORK_ERROR)` is a dropped
+  connection; the worker retries with backoff. If it never settles, check `curl -sS -o /dev/null -w
+  '%{http_code}\n' https://api.diggylab.com/health` and that the machine clock is right (`date -u`),
+  because a clock off by more than five minutes makes the server's messages look stale.
 - `Facebook: missing` after a login means the session did not survive; run `diggylab login` again.
 
 ## Security notes
@@ -167,9 +176,9 @@ Wants=network-online.target
 
 [Service]
 ExecStart=/usr/local/bin/diggylab run
-Environment=DIGGYLAB_AGENT_DIR=/root/.diggylab
-Environment=DIGGYLAB_API_URL=https://api.diggylab.com
-Restart=always
+Environment="DIGGYLAB_AGENT_DIR=/root/.diggylab"
+Environment="DIGGYLAB_API_URL=https://api.diggylab.com"
+Restart=on-failure
 RestartSec=10
 
 [Install]

package/cli.js

@@ -2434,11 +2434,10 @@ function parseCookieTable(input) {
   const cookies = [];
   for (const line of input.split("\n")) {
     const columns = line.split("	");
-    if (columns.length < 2) return [];
-    const name = columns[0].trim();
+    const name = columns[0]?.trim() ?? "";
     const value = columns[1];
-    if (!name || name === "Name" || !value) continue;
-    cookies.push({ name, value });
+    if (!value || !name || name === "Name") continue;
+    cookies.push({ domain: columns[2]?.trim(), name, value });
   }
   return cookies;
 }
@@ -2528,6 +2527,9 @@ function createFileCrypto(keyPath) {
 // src/cli/systemd.ts
 var SERVICE_NAME = "diggylab";
 var SERVICE_PATH = `/etc/systemd/system/${SERVICE_NAME}.service`;
+function quote(value) {
+  return /\s/.test(value) ? `"${value.replace(/"/g, '\\"')}"` : value;
+}
 function buildSystemdUnit(options) {
   return `[Unit]
 Description=DiggyLab Desktop Agent
@@ -2535,9 +2537,9 @@ After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=${options.execStart} run
-Environment=DIGGYLAB_AGENT_DIR=${options.configDirectory}
-Environment=DIGGYLAB_API_URL=${options.apiOrigin}
+ExecStart=${options.execStart.map(quote).join(" ")} run
+Environment="DIGGYLAB_AGENT_DIR=${options.configDirectory}"
+Environment="DIGGYLAB_API_URL=${options.apiOrigin}"
 Restart=on-failure
 RestartSec=10
 
@@ -2612,6 +2614,14 @@ function createRuntime(options) {
 function stamp() {
   return `[${(/* @__PURE__ */ new Date()).toTimeString().slice(0, 8)}]`;
 }
+function describeSocketError(error) {
+  if (error instanceof Error) {
+    const code = error.code;
+    return `${error.message || error.name}${typeof code === "string" ? ` (${code})` : ""}`;
+  }
+  if (error && typeof error === "object" && "type" in error) return `event ${String(error.type)}`;
+  return String(error);
+}
 function waitForFacebookLogin(login, timeoutMs) {
   return new Promise((resolve, reject) => {
     const timer = setTimeout(() => {
@@ -2711,17 +2721,22 @@ async function commandRename(runtime, options, io) {
     return 1;
   }
   const requested = options.name?.trim() || await promptForName(io);
-  const name = sanitizeDeviceName(requested);
-  if (!name) {
+  if (!requested) {
     io.error('A device name is required, for example `diggylab rename --name "VPS H\xE0 N\u1ED9i"`.');
     return 2;
   }
+  const name = sanitizeDeviceName(requested);
   try {
     const device = await runtime.manager.rename(name);
     io.log(`Renamed to "${device.name}".`);
     await printReadiness(runtime, io);
     return 0;
   } catch (error) {
+    if (error instanceof DesktopAgentClientError && error.code === "DESKTOP_RESPONSE_INVALID") {
+      io.error("The API answered the rename with something unexpected \u2014 usually an API that does not have this endpoint yet.");
+      io.error(`Deploy the API, then check it with: curl -s -o /dev/null -w '%{http_code}\\n' -X PATCH https://api.diggylab.com/desktop-agent-auth/me -H 'content-type: application/json' -d '{"name":"x"}'  (401 = the endpoint exists)`);
+      return 1;
+    }
     io.error(`Could not rename this device: ${error instanceof Error ? error.message : String(error)}`);
     return 1;
   }
@@ -2798,8 +2813,10 @@ async function importFacebookCookies(runtime, source, io) {
     io.error("Open facebook.com in your browser, make sure you are logged in, then copy the `cookie:` request header again.");
     return 1;
   }
+  let saved = false;
   try {
     const accountId = await runtime.facebook.save(state);
+    saved = true;
     io.log(`Facebook session saved for account ${accountId}. Asking Facebook to confirm it...`);
     const condition = await validateImportedSession(runtime, state);
     if (condition !== "READY") {
@@ -2809,6 +2826,7 @@ async function importFacebookCookies(runtime, source, io) {
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
+    if (saved) await runtime.facebook.clear();
     if (/Executable doesn't exist|playwright install/i.test(message)) {
       io.error(MISSING_BROWSER_HINT);
     } else if (message === "FACEBOOK_SESSION_INVALID") {
@@ -2867,7 +2885,9 @@ function readAnswer(options = {}) {
         return;
       }
       if (idle) clearTimeout(idle);
-      idle = setTimeout(finish, 350);
+      idle = setTimeout(() => {
+        if (!options.until || options.until(value)) finish();
+      }, 350);
     };
     process.stdin.setEncoding("utf8");
     process.stdin.on("data", handleData);
@@ -2895,10 +2915,14 @@ async function commandInstallBrowser(io) {
     child.once("exit", (value) => resolve(value ?? 1));
   });
   let code = 1;
-  for (const [index, args] of browserInstallCommands(process.platform).entries()) {
-    if (index > 0) io.log("Installing the system libraries failed; downloading the browser only...");
-    code = await run(args);
-    if (code === 0) break;
+  try {
+    for (const [index, args] of browserInstallCommands(process.platform).entries()) {
+      if (index > 0) io.log("Installing the system libraries failed; downloading the browser only...");
+      code = await run(args);
+      if (code === 0) break;
+    }
+  } catch {
+    code = 1;
   }
   if (code !== 0) {
     io.error(soft ? "Chromium download failed. Run `diggylab install-browser` later." : "Chromium download failed. Check the network and try again.");
@@ -2925,7 +2949,7 @@ async function commandRun(runtime, io) {
         headers: { authorization: `Bearer ${accessToken}` },
         maxPayload: 16 * 1024
       });
-      socket.on("error", (error) => io.log(`${stamp()} socket error: ${error.message}`));
+      socket.on("error", (error) => io.log(`${stamp()} socket error: ${describeSocketError(error)}`));
       socket.on("close", (code, reason) => {
         io.log(`${stamp()} socket closed: ${code}${reason?.length ? ` (${reason.toString()})` : ""}`);
       });
@@ -3036,7 +3060,7 @@ function runCommand(command, args) {
 function resolveServiceExecStart() {
   const candidates = [join3(dirname3(process.execPath), "diggylab"), "/usr/local/bin/diggylab", "/usr/bin/diggylab"];
   const link = candidates.find((candidate) => existsSync2(candidate));
-  return link ?? `${process.execPath} ${fileURLToPath(import.meta.url)}`;
+  return link ? [link] : [process.execPath, fileURLToPath(import.meta.url)];
 }
 async function commandInstallService(runtime, io) {
   if (process.platform !== "linux") {
@@ -3059,6 +3083,11 @@ async function commandInstallService(runtime, io) {
     return 1;
   }
   io.log(`Wrote ${SERVICE_PATH}.`);
+  io.log(`State directory: ${runtime.directory}`);
+  if (process.env.SUDO_USER && process.env.SUDO_USER !== "root" && runtime.directory === join3(homedir(), CONFIG_DIRECTORY)) {
+    io.error(`Heads up: this ran as root, so the service will use ${runtime.directory} (root's home).`);
+    io.error(`If you paired as "${process.env.SUDO_USER}", pass --config to point at that user's ~/${CONFIG_DIRECTORY} instead.`);
+  }
   await runCommand("systemctl", ["daemon-reload"]).catch(() => 1);
   const code = await runCommand("systemctl", ["enable", "--now", SERVICE_NAME]);
   if (code !== 0) {
@@ -3126,8 +3155,12 @@ async function main(argv, io = console) {
       return commandRun(runtime, io);
     case "status":
       return commandStatus(runtime, io);
-    default:
+    case "unpair":
       return commandUnpair(runtime, io);
+    default:
+      io.error(`Unknown command "${command}".`);
+      io.error(USAGE);
+      return 2;
   }
 }
 function isEntryPoint() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diggylab",
-  "version": "0.1.43",
+  "version": "0.1.44",
   "description": "DiggyLab Desktop Agent collects posts and information from Facebook Groups on a paired computer. (headless CLI)",
   "type": "module",
   "bin": {