diggylab 0.1.32 → 0.1.34

package/README.md

@@ -8,7 +8,7 @@ headless Chromium — the Electron app is not involved.
 
 - Node.js 22+
 - Linux packages: `xvfb`, `x11vnc`, `websockify`, `novnc` (Debian/Ubuntu: `apt install xvfb x11vnc websockify novnc`). The Docker image below bundles them.
-- Chromium for Playwright: `npx playwright install --with-deps chromium`
+- Chromium for Playwright: run `diggylab install-browser` once after installing the CLI.
 
 ## Install
 
@@ -61,6 +61,7 @@ npm publish apps/desktop-agent/dist-npm --access public
 | `login` | Opens the Facebook login page on a virtual screen and prints a noVNC link + QR code. Log in from your phone; the session is stored encrypted on the server. |
 | `run` | Connects the WebSocket worker, receives assigned scans, scans headlessly, uploads results. |
 | `status` | Shows the config directory, API origin, paired device, and Facebook session state. |
+| `install-browser` | Downloads the Chromium build Playwright needs (one time, ~150 MB). Run it once after installing the CLI. |
 | `unpair` | Removes device credentials, the Facebook session, and pending scans. |
 
 Useful options: `--api <origin>` (default `https://api.diggylab.com`), `--port` / `--bind` /

package/cli.js

@@ -2,6 +2,7 @@
 
 // src/cli/cli.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
+import { spawn as spawn2 } from "node:child_process";
 import { existsSync as existsSync2, readFileSync as readFileSync2, realpathSync } from "node:fs";
 import { hostname, homedir } from "node:os";
 import { dirname as dirname3, join as join4 } from "node:path";
@@ -2504,11 +2505,13 @@ Usage:
   diggylab login [--port 6080] [--bind 0.0.0.0] [--public-host <ip or host>]
   diggylab run
   diggylab status
+  diggylab install-browser
   diggylab unpair
 
 Global options:
   --config <directory>   Agent state directory (default ~/.diggylab)
   --api <origin>         API origin (default $DIGGYLAB_API_URL or https://api.diggylab.com)`;
+var MISSING_BROWSER_HINT = "Chromium for Playwright is not installed yet. Run `diggylab install-browser` once.";
 function agentVersion() {
   let directory = fileURLToPath(new URL(".", import.meta.url));
   for (let depth = 0; depth < 4; depth += 1) {
@@ -2576,21 +2579,42 @@ function waitForFacebookLogin(login, timeoutMs) {
     });
   });
 }
+function pairErrorMessage(error, origin) {
+  const code = error instanceof DesktopAgentClientError ? error.code : null;
+  switch (code) {
+    case "PAIRING_CODE_INVALID":
+      return "The pairing code is invalid, already used, or older than 10 minutes. Codes belong to one environment: check --api and create a new code.";
+    case "PLAN_RESTRICTED":
+      return "This account's plan does not include the Desktop Agent.";
+    case "CREDENTIAL_REVOKED":
+      return "This device was revoked. Create a new pairing code to pair again.";
+    case "NETWORK_ERROR":
+    case "SERVER_UNAVAILABLE":
+      return `Could not reach ${origin}. Check the --api origin and the network.`;
+    default:
+      return error instanceof Error ? error.message : String(error);
+  }
+}
 async function commandPair(runtime, options, io) {
   const code = options.code?.trim();
   if (!code) {
     io.error("Missing --code <pairing code>. Create one on the Desktop Agent page of the web app.");
     return 2;
   }
-  const access = await runtime.manager.pair({
-    agentVersion: agentVersion(),
-    code,
-    name: sanitizeDeviceName(options.name?.trim() || hostname()),
-    platform: resolvePlatform()
-  });
-  io.log(`Paired as "${access.session.device.name}".`);
-  io.log("Next: run `diggylab login` to connect a Facebook account.");
-  return 0;
+  try {
+    const access = await runtime.manager.pair({
+      agentVersion: agentVersion(),
+      code,
+      name: sanitizeDeviceName(options.name?.trim() || hostname()),
+      platform: resolvePlatform()
+    });
+    io.log(`Paired as "${access.session.device.name}".`);
+    io.log("Next: run `diggylab login` to connect a Facebook account.");
+    return 0;
+  } catch (error) {
+    io.error(pairErrorMessage(error, runtime.endpoint.httpOrigin));
+    return 1;
+  }
 }
 async function commandLogin(runtime, options, io) {
   const login = new FacebookLoginService({
@@ -2633,11 +2657,44 @@ ${display.url}`);
     await waitForFacebookLogin(login, LOGIN_TIMEOUT_MS + 6e4);
     io.log("Facebook session saved.");
     return 0;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (/Executable doesn't exist|playwright install/i.test(message)) {
+      io.error(MISSING_BROWSER_HINT);
+      return 1;
+    }
+    throw error;
   } finally {
     await login.close();
     await display?.stop();
   }
 }
+function playwrightCliPath() {
+  try {
+    return fileURLToPath(new URL("cli.js", import.meta.resolve("playwright")));
+  } catch {
+    return null;
+  }
+}
+async function commandInstallBrowser(io) {
+  const cli = playwrightCliPath();
+  if (!cli) {
+    io.error("Could not locate the bundled Playwright. Reinstall with `npm install -g diggylab@latest`.");
+    return 1;
+  }
+  io.log("Downloading Chromium for Playwright...");
+  const code = await new Promise((resolve, reject) => {
+    const child = spawn2(process.execPath, [cli, "install", "chromium"], { stdio: "inherit" });
+    child.once("error", reject);
+    child.once("exit", (value) => resolve(value ?? 1));
+  });
+  if (code !== 0) {
+    io.error("Chromium download failed. Check the network and try again.");
+    return code;
+  }
+  io.log("Chromium installed.");
+  return 0;
+}
 async function commandRun(runtime, io) {
   const stored = await runtime.manager.load();
   if (!stored) {
@@ -2651,10 +2708,16 @@ async function commandRun(runtime, io) {
   const session = new DesktopAgentSession({
     agentVersion: agentVersion(),
     clearTimer: (timer) => clearTimeout(timer),
-    createSocket: (url, accessToken) => new WebSocket(url, {
-      headers: { authorization: `Bearer ${accessToken}` },
-      maxPayload: 16 * 1024
-    }),
+    createSocket: (url, accessToken) => {
+      const socket = new WebSocket(url, {
+        headers: { authorization: `Bearer ${accessToken}` },
+        maxPayload: 16 * 1024
+      });
+      socket.on("close", (code, reason) => {
+        io.log(`socket closed: ${code}${reason?.length ? ` (${reason.toString()})` : ""}`);
+      });
+      return socket;
+    },
     credentials: runtime.manager,
     getFacebookReady: () => facebookReady,
     platform: resolvePlatform(),
@@ -2707,12 +2770,17 @@ async function commandRun(runtime, io) {
   await scanRunner.recover();
   await session.start();
   io.log(`Worker running as "${stored.device.name}". Press Ctrl+C to stop.`);
-  await new Promise((resolve) => {
-    process.once("SIGINT", resolve);
-    process.once("SIGTERM", resolve);
-  });
-  session.stop();
-  scanRunner.stop();
+  const keepAlive = setInterval(() => void 0, 6e4);
+  try {
+    await new Promise((resolve) => {
+      process.once("SIGINT", resolve);
+      process.once("SIGTERM", resolve);
+    });
+  } finally {
+    clearInterval(keepAlive);
+    session.stop();
+    scanRunner.stop();
+  }
   return 0;
 }
 async function commandStatus(runtime, io) {
@@ -2749,11 +2817,12 @@ async function main(argv, io = console) {
     io.log(USAGE);
     return 0;
   }
-  if (!["login", "pair", "run", "status", "unpair"].includes(command)) {
+  if (!["install-browser", "login", "pair", "run", "status", "unpair"].includes(command)) {
     io.error(`Unknown command "${command}".`);
     io.error(USAGE);
     return 2;
   }
+  if (command === "install-browser") return commandInstallBrowser(io);
   const runtime = createRuntime(parsed.options);
   switch (command) {
     case "pair":

package/package.json

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