diggylab 0.1.39 → 0.1.41

package/README.md

@@ -113,17 +113,28 @@ If the browser says the link expired, run `diggylab login` again — each run mi
 If you would rather not share a screen, log into Facebook in your own browser and import those
 cookies instead — no Xvfb, no link, no port:
 
-1. Install **Cookie-Editor** (Chrome, Edge, Firefox), open `facebook.com`, then *Export → JSON*.
-   (Or copy the `cookie:` request header from your browser's DevTools.)
+1. Get the `facebook.com` cookies, in whichever way is easiest:
+   - **DevTools → Network** (fastest): open facebook.com, click any request, copy the whole
+     `cookie:` value from *Request Headers*.
+   - **DevTools → Application → Cookies → `https://www.facebook.com`**: select the table and copy the
+     rows.
+   - **Cookie-Editor** (Chrome, Edge, Firefox): *Export → JSON*.
 2. On the server:
 
 ```bash
 diggylab login --cookies cookies.json     # or: diggylab login --cookies -   and paste, then Ctrl-D
 ```
 
-The agent keeps only the `facebook.com` cookies, saves them encrypted, and opens Facebook once to
-confirm the session before it accepts it. Cookies exported from a different account, or expired ones,
-are rejected with a message instead of failing during a scan.
+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.
+
+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.
+
+The agent saves the cookies encrypted and opens Facebook once to confirm the session before it
+accepts it. Cookies exported from a different account, or expired ones, are rejected with a message
+instead of failing during a scan.
 
 Note: Facebook sometimes asks for a security check when a session moves to a server's IP. If that
 happens the command says so — approve the login from your phone and import again.

package/cli.js

@@ -2329,6 +2329,10 @@ function parseCliArgs(argv) {
       const spec = FLAGS[flag];
       if (!spec) return { error: `Unknown option "${flag}".`, options };
       const raw = inline ?? argv[index + 1];
+      if (flag === "--cookies" && (raw === void 0 || raw.startsWith("--"))) {
+        options.cookies = "";
+        continue;
+      }
       if (raw === void 0 || raw.startsWith("--")) return { error: `Option "${flag}" needs a value.`, options };
       if (inline === void 0) index += 1;
       if (spec.type === "number") {
@@ -2340,6 +2344,10 @@ function parseCliArgs(argv) {
       }
       continue;
     }
+    if (command === "login" && token === "cookies" && options.cookies === void 0) {
+      options.cookies = "";
+      continue;
+    }
     if (command === void 0) {
       command = token;
       continue;
@@ -2386,16 +2394,30 @@ function toCookie(value) {
 }
 function parseCookieHeader(input) {
   const header = input.replace(/^\s*cookie\s*:/i, "");
-  return header.split(";").map((part) => part.trim()).filter(Boolean).map((part) => {
+  return header.split(/[;\n]/).map((part) => part.trim()).filter(Boolean).map((part) => {
     const separator = part.indexOf("=");
     if (separator <= 0) return null;
     return { name: part.slice(0, separator).trim(), value: part.slice(separator + 1) };
   }).filter((cookie) => cookie !== null);
 }
+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 value = columns[1];
+    if (!name || name === "Name" || !value) continue;
+    cookies.push({ name, value });
+  }
+  return cookies;
+}
 function parseCookieInput(input) {
   const trimmed = input.trim();
   if (!trimmed) return [];
-  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return parseCookieHeader(trimmed);
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) {
+    return trimmed.includes("	") ? parseCookieTable(trimmed) : parseCookieHeader(trimmed);
+  }
   try {
     const parsed = JSON.parse(trimmed);
     if (Array.isArray(parsed)) {
@@ -2753,7 +2775,8 @@ var USAGE = `DiggyLab Desktop Agent CLI
 Usage:
   diggylab pair --code <code> [--name <device name>] [--api <https://api.diggylab.com>]
   diggylab login [--display <number>] [--web-url <https://diggylab.com>]
-  diggylab login --cookies <file or ->   (import cookies exported from your own browser)
+  diggylab login cookies                  (asks you to paste facebook.com cookies)
+  diggylab login --cookies <file>        (or --cookies 'name=value; ...')
   diggylab run
   diggylab status
   diggylab install-browser
@@ -2883,7 +2906,7 @@ async function commandPair(runtime, options, io) {
   }
 }
 async function commandLogin(runtime, options, io) {
-  if (options.cookies) return importFacebookCookies(runtime, options.cookies, io);
+  if (options.cookies !== void 0) return importFacebookCookies(runtime, options.cookies || "-", io);
   const login = new FacebookLoginService({
     browserType: runtime.browserType,
     clearTimer: (timer) => clearTimeout(timer),
@@ -2908,11 +2931,12 @@ async function commandLogin(runtime, options, io) {
     if (!needsVirtualDisplay) {
       io.log(process.env.DISPLAY ? `Opening the Facebook login page on display ${process.env.DISPLAY}.` : "Opening the Facebook login page in a browser window.");
     } else {
-      const access = runtime.manager.getAccessCredential();
-      if (!access) {
+      const stored = await runtime.manager.load();
+      if (!stored) {
         io.error("This server is not paired yet. Run `diggylab pair --code <code>` first.");
         return 1;
       }
+      const access = await runtime.manager.refresh();
       const webUrl = options.webUrl ?? process.env.DIGGYLAB_WEB_URL?.trim();
       display = await startVirtualDisplay({
         displayNumber: options.display,
@@ -2943,6 +2967,14 @@ ${relay.url}`);
       io.error(MISSING_DISPLAY_HINT);
       return 1;
     }
+    if (/CREDENTIAL_REVOKED|not paired/i.test(message)) {
+      io.error("This server is not paired (or was unpaired). Run `diggylab pair --code <code>` again.");
+      return 1;
+    }
+    if (/NETWORK_ERROR|SERVER_UNAVAILABLE|fetch failed/i.test(message)) {
+      io.error(`Could not reach the API: ${message}`);
+      return 1;
+    }
     if (/virtual screen|login screen|DiggyLab relay|Xvfb exited|x11vnc exited/i.test(message)) {
       io.error(`The login screen failed: ${message}`);
       printDisplayLogs(join4(runtime.directory, "logs"), io);
@@ -2961,10 +2993,16 @@ ${relay.url}`);
 }
 async function importFacebookCookies(runtime, source, io) {
   let input;
-  try {
-    input = source === "-" ? await readStdin() : readFileSync2(source, "utf8");
-  } catch {
-    io.error(`Could not read "${source}". Pass a file path, or "-" to paste the cookies instead.`);
+  if (source === "-") {
+    input = await readPastedCookies(io);
+  } else if (existsSync2(source)) {
+    input = readFileSync2(source, "utf8");
+  } else if (source.includes("=")) {
+    input = source;
+  } else {
+    io.error(`Could not read "${source}".`);
+    io.error("Paste the cookies in quotes: diggylab login --cookies 'datr=...; c_user=...; xs=...'");
+    io.error("Or save them to a file (diggylab login --cookies cookies.txt), or use --cookies - and press Ctrl-D after pasting.");
     return 1;
   }
   const cookies = parseCookieInput(input);
@@ -2974,9 +3012,11 @@ async function importFacebookCookies(runtime, source, io) {
     return 1;
   }
   const state = toFacebookStorageState(cookies);
+  io.log(`Read ${cookies.length} cookie${cookies.length === 1 ? "" : "s"}.`);
   if (!state.cookies.some((cookie) => cookie.name === "c_user")) {
     io.error("Those cookies have no `c_user` value, so they are not a Facebook login.");
-    io.error("Open facebook.com in your browser, make sure you are logged in, then export the facebook.com cookies.");
+    io.error("If you pasted them on the command line, wrap the whole string in quotes so the shell keeps it together.");
+    io.error("Open facebook.com in your browser, make sure you are logged in, then copy the `cookie:` request header again.");
     return 1;
   }
   try {
@@ -3024,6 +3064,33 @@ function readStdin() {
     process.stdin.on("error", reject);
   });
 }
+function readPastedCookies(io) {
+  if (!process.stdin.isTTY) return readStdin();
+  io.log("Paste the facebook.com cookies here, then press Enter.");
+  io.log("In your browser: F12 \u2192 Network \u2192 click any facebook.com request \u2192 copy the whole `cookie:` value.");
+  return new Promise((resolve) => {
+    let value = "";
+    let idle;
+    const finish = () => {
+      if (idle) clearTimeout(idle);
+      process.stdin.off("data", handleData);
+      process.stdin.pause();
+      resolve(value);
+    };
+    const handleData = (chunk) => {
+      value += chunk;
+      if (idle) clearTimeout(idle);
+      if (value.includes("\n") && value.includes("c_user")) {
+        finish();
+        return;
+      }
+      idle = setTimeout(finish, 350);
+    };
+    process.stdin.setEncoding("utf8");
+    process.stdin.on("data", handleData);
+    process.stdin.resume();
+  });
+}
 function playwrightCliPath() {
   try {
     return fileURLToPath(new URL("cli.js", import.meta.resolve("playwright")));

package/package.json

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