@syengup/friday-channel-next 0.0.38 → 0.0.40

package/install.js

@@ -1,21 +1,15 @@
 #!/usr/bin/env node
 import { execSync } from "node:child_process";
-import { cpSync, existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, networkInterfaces } from "node:os";
-import { dirname, join, relative, resolve, sep } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+import { join } from "node:path";
 
 const sudoUser = process.env.SUDO_USER;
 
 function realHome() {
   if (!sudoUser) return homedir();
-  // Under sudo, homedir() may return /root. Check if HOME was preserved.
   const current = homedir();
   if (current !== "/root" && current !== "/var/root" && existsSync(current)) return current;
-  // Resolve the real user's home
   try {
     const h = execSync(`sh -c 'echo ~${sudoUser}'`, { encoding: "utf8" }).trim();
     if (h && !h.startsWith("~") && existsSync(h)) return h;
@@ -27,30 +21,18 @@ function realHome() {
 }
 
 const USER_HOME = realHome();
-const PLUGIN_DIR = process.argv[2] || join(USER_HOME, ".openclaw", "extensions", "friday-channel-next");
 const OPENCLAW_CONFIG = join(USER_HOME, ".openclaw", "openclaw.json");
-const REPO_URL = process.env.FRIDAY_NEXT_REPO || "https://github.com/SyengUp/openclaw-fridaynext-channel.git";
 
 const G = (s) => `\x1b[32m${s}\x1b[0m`;
 const Y = (s) => `\x1b[33m${s}\x1b[0m`;
 const R = (s) => `\x1b[31m${s}\x1b[0m`;
-function log(msg) {
-  console.log(`  ${msg}`);
-}
-function warn(msg) {
-  console.log(`  ${Y("!")} ${msg}`);
-}
-function err(msg) {
-  console.error(`  ${R("X")} ${msg}`);
-}
+function log(msg) { console.log(`  ${msg}`); }
+function warn(msg) { console.log(`  ${Y("!")} ${msg}`); }
+function err(msg) { console.error(`  ${R("X")} ${msg}`); }
 
 function has(cmd) {
-  try {
-    execSync(`${cmd} --version`, { stdio: "ignore" });
-    return true;
-  } catch {
-    return false;
-  }
+  try { execSync(`${cmd} --version`, { stdio: "ignore" }); return true; }
+  catch { return false; }
 }
 
 let openclawCmd = "openclaw";
@@ -58,7 +40,6 @@ let openclawCmd = "openclaw";
 function hasOpenclaw() {
   if (has("openclaw")) return true;
   if (!sudoUser) return false;
-  // Under sudo, openclaw isn't in root's PATH — run via the real user.
   try {
     execSync(`sudo -u "${sudoUser}" openclaw --version`, { stdio: "ignore" });
     openclawCmd = `sudo -u "${sudoUser}" openclaw`;
@@ -67,16 +48,6 @@ function hasOpenclaw() {
   return false;
 }
 
-// Running from an npm/npx package when we have the full source (index.ts + package.json)
-// and are NOT already inside the target plugin dir.
-function isRunningFromNpmPackage() {
-  return (
-    resolve(__dirname) !== resolve(PLUGIN_DIR) &&
-    existsSync(join(__dirname, "package.json")) &&
-    existsSync(join(__dirname, "index.ts"))
-  );
-}
-
 // --------------- prerequisites ---------------
 
 if (sudoUser) {
@@ -84,15 +55,12 @@ if (sudoUser) {
   warn("If possible, run without sudo: npx -y @syengup/friday-channel-next");
 }
 
-const missing = [];
-if (!has("node")) missing.push("node");
-if (!hasOpenclaw()) missing.push("openclaw");
-if (missing.length) {
-  missing.forEach((c) => err(`${c} is required but not found. Install it first.`));
-  if (sudoUser && missing.includes("openclaw")) {
-    err("Could not find openclaw even via the real user's PATH.");
-    err(`Check that openclaw is installed under ${USER_HOME}.`);
-  }
+if (!has("node")) {
+  err("node is required but not found. Install it first.");
+  process.exit(1);
+}
+if (!hasOpenclaw()) {
+  err("openclaw is required but not found. Install OpenClaw first: https://docs.openclaw.ai");
   process.exit(1);
 }
 
@@ -113,219 +81,149 @@ if (missing.length) {
         err(`OpenClaw version ${m[0]} is too old.`);
         err(`Friday Next channel requires OpenClaw 2026.5.12 or above.`);
         err(`Please update: ${openclawCmd} update`);
-        err(`请先升级 OpenClaw 至 2026.5.12 或以上版本：${openclawCmd} update`);
         process.exit(1);
       }
     }
   } catch {
-    // If version check itself fails, don't block — continue with a warning
     warn("Could not determine OpenClaw version — continuing anyway.");
   }
 }
 
-const PKG = has("pnpm") ? "pnpm" : has("npm") ? "npm" : null;
-if (!PKG) {
-  err("pnpm or npm is required but not found. Install one first.");
-  process.exit(1);
-}
+// --------------- install via openclaw plugins ---------------
+
+log("Installing Friday Next channel via openclaw plugins...");
+let installed = false;
 
-// Auto-detect best registry (measure latency; fall back to npmmirror if slow/unreachable)
-let registryFlag = "";
 try {
-  const start = Date.now();
-  execSync('curl -s -o /dev/null --connect-timeout 2 --max-time 4 https://registry.npmjs.org/', { stdio: "pipe", timeout: 6000 });
-  if (Date.now() - start > 1500) {
-    warn("Default registry slow, using https://registry.npmmirror.com");
-    registryFlag = "--registry=https://registry.npmmirror.com";
-  }
-} catch {
-  warn("Default registry unreachable, using https://registry.npmmirror.com");
-  registryFlag = "--registry=https://registry.npmmirror.com";
+  // --dangerously-force-unsafe-install needed for child_process in device-approve / nodes-approve
+  const out = execSync(
+    `${openclawCmd} plugins install --dangerously-force-unsafe-install @syengup/friday-channel-next@latest`,
+    { encoding: "utf8", stdio: "pipe", timeout: 120000 }
+  );
+  if (out.trim()) console.log(out.trim());
+  installed = true;
+  log("Plugin registered with install record — auto-upgrade enabled.");
+} catch (e) {
+  const msg = (e.stderr || e.stdout || e.message || "").toString();
+  warn("openclaw plugins install failed: " + msg.trim().split("\n").pop());
+  warn("Falling back to manual install...");
 }
 
-if (!existsSync(OPENCLAW_CONFIG)) {
-  err(`OpenClaw config not found at ${OPENCLAW_CONFIG}`);
-  err("Make sure OpenClaw is installed and has been run at least once.");
-  process.exit(1);
-}
+// --------------- fallback: manual install ---------------
 
-// --------------- acquire source ---------------
-
-if (isRunningFromNpmPackage()) {
-  log(`Copying plugin from npm package to ${PLUGIN_DIR} ...`);
-  cpSync(__dirname, PLUGIN_DIR, {
-    recursive: true,
-    filter: (src) => {
-      const rel = relative(__dirname, src);
-      if (rel === "") return true; // root dir
-      const top = rel.split(sep)[0];
-      return ![".git", "node_modules", "dist", "attachments", ".claude"].includes(top);
-    },
-  });
-} else if (existsSync(PLUGIN_DIR)) {
-  log(`Plugin directory found: ${PLUGIN_DIR}`);
-  if (existsSync(join(PLUGIN_DIR, ".git"))) {
-    try {
-      log("Pulling latest changes...");
-      execSync("git fetch origin && git checkout -f origin/main", { cwd: PLUGIN_DIR, stdio: "pipe" });
-      log("Updated to latest version.");
-    } catch {
-      warn("Could not update from git — continuing with existing source.");
-    }
-  }
-} else {
-  if (!has("git")) {
-    err("git is required for installation from GitHub. Install git first or use npx @openclaw/friday-channel-next.");
+if (!installed) {
+  const PKG = has("npm") ? "npm" : has("pnpm") ? "pnpm" : null;
+  if (!PKG) {
+    err("npm is required for manual install. Install Node.js first.");
     process.exit(1);
   }
-  log(`Cloning plugin to ${PLUGIN_DIR} ...`);
-  execSync(`git clone "${REPO_URL}" "${PLUGIN_DIR}"`, { stdio: "inherit" });
-}
-
-process.chdir(PLUGIN_DIR);
 
-// --------------- install + build ---------------
-
-log("Installing dependencies...");
-try {
-  execSync(`${PKG} install ${registryFlag}`, { stdio: "inherit" });
-} catch {
-  err("Dependency installation failed.");
-  err("Check your network connection and try again.");
-  if (sudoUser) err("If running under sudo, ensure the real user can access the package manager.");
-  process.exit(1);
-}
-
-log("Building TypeScript...");
-try {
-  execSync(`${PKG} run build`, { stdio: "inherit" });
-} catch {
-  err("TypeScript build failed.");
-  err("Check the compilation errors above and make sure the package is not corrupted.");
-  process.exit(1);
-}
-
-// --------------- configure OpenClaw ---------------
-
-log("Configuring OpenClaw...");
+  if (!existsSync(OPENCLAW_CONFIG)) {
+    err(`OpenClaw config not found at ${OPENCLAW_CONFIG}`);
+    err("Run openclaw at least once before installing plugins.");
+    process.exit(1);
+  }
 
-let config;
-try {
-  config = JSON.parse(readFileSync(OPENCLAW_CONFIG, "utf8"));
-} catch {
-  err(`Failed to read ${OPENCLAW_CONFIG}.`);
-  err("The file may be missing or corrupted. Verify OpenClaw is installed correctly.");
-  process.exit(1);
-}
+  // Configure OpenClaw
+  log("Configuring OpenClaw...");
 
-if (!config.plugins) config.plugins = {};
-if (!Array.isArray(config.plugins.allow)) config.plugins.allow = [];
-if (!config.plugins.allow.includes("friday-next")) {
-  config.plugins.allow.push("friday-next");
-  console.log("  + Added friday-next to plugins.allow");
-}
+  let config;
+  try {
+    config = JSON.parse(readFileSync(OPENCLAW_CONFIG, "utf8"));
+  } catch {
+    err(`Failed to read ${OPENCLAW_CONFIG}.`);
+    process.exit(1);
+  }
 
-if (!config.plugins.entries) config.plugins.entries = {};
-if (!config.plugins.entries["friday-next"]) {
-  config.plugins.entries["friday-next"] = { enabled: true };
-  console.log("  + Added friday-next to plugins.entries (enabled)");
-} else if (!config.plugins.entries["friday-next"].enabled) {
-  config.plugins.entries["friday-next"].enabled = true;
-  console.log("  + Enabled friday-next in plugins.entries");
-}
+  if (!config.plugins) config.plugins = {};
+  if (!Array.isArray(config.plugins.allow)) config.plugins.allow = [];
+  if (!config.plugins.allow.includes("friday-next")) {
+    config.plugins.allow.push("friday-next");
+    console.log("  + Added friday-next to plugins.allow");
+  }
 
-if (!config.plugins.allow.includes("canvas")) {
-  config.plugins.allow.push("canvas");
-  console.log("  + Added canvas to plugins.allow");
-}
-if (!config.plugins.entries["canvas"]) {
-  config.plugins.entries["canvas"] = { enabled: true };
-  console.log("  + Added canvas to plugins.entries (enabled)");
-} else if (!config.plugins.entries["canvas"].enabled) {
-  config.plugins.entries["canvas"].enabled = true;
-  console.log("  + Enabled canvas in plugins.entries");
-}
+  if (!config.plugins.entries) config.plugins.entries = {};
+  if (!config.plugins.entries["friday-next"]) {
+    config.plugins.entries["friday-next"] = { enabled: true };
+    console.log("  + Added friday-next to plugins.entries (enabled)");
+  } else if (!config.plugins.entries["friday-next"].enabled) {
+    config.plugins.entries["friday-next"].enabled = true;
+    console.log("  + Enabled friday-next in plugins.entries");
+  }
 
-if (!config.channels) config.channels = {};
-if (!config.channels["friday-next"]) {
-  config.channels["friday-next"] = { enabled: true, transport: "http+sse" };
-  console.log("  + Added friday-next channel config (auth defaults to gateway token)");
-} else {
-  if (!config.channels["friday-next"].enabled) {
-    config.channels["friday-next"].enabled = true;
-    console.log("  + Enabled friday-next channel");
+  if (!config.plugins.allow.includes("canvas")) {
+    config.plugins.allow.push("canvas");
+    console.log("  + Added canvas to plugins.allow");
   }
-  if (!config.channels["friday-next"].transport) {
-    config.channels["friday-next"].transport = "http+sse";
-    console.log("  + Set friday-next transport to http+sse");
+  if (!config.plugins.entries["canvas"]) {
+    config.plugins.entries["canvas"] = { enabled: true };
+    console.log("  + Added canvas to plugins.entries (enabled)");
+  } else if (!config.plugins.entries["canvas"].enabled) {
+    config.plugins.entries["canvas"].enabled = true;
+    console.log("  + Enabled canvas in plugins.entries");
   }
-}
 
-if (!config.gateway) config.gateway = {};
-if (config.gateway.bind !== "lan") {
-  config.gateway.bind = "lan";
-  console.log("  + Set gateway.bind to lan");
-}
-if (!config.gateway.nodes) config.gateway.nodes = {};
-if (!Array.isArray(config.gateway.nodes.allowCommands)) config.gateway.nodes.allowCommands = [];
-for (const cmd of [
-  "canvas.navigate",
-  "canvas.present",
-  "canvas.hide",
-  "canvas.eval",
-  "canvas.snapshot",
-  "canvas.a2ui.push",
-  "canvas.a2ui.reset",
-  "canvas.a2ui.pushJSONL",
-]) {
-  if (!config.gateway.nodes.allowCommands.includes(cmd)) {
-    config.gateway.nodes.allowCommands.push(cmd);
-    console.log("  + Added " + cmd + " to gateway.nodes.allowCommands");
+  if (!config.channels) config.channels = {};
+  if (!config.channels["friday-next"]) {
+    config.channels["friday-next"] = { enabled: true, transport: "http+sse" };
+    console.log("  + Added friday-next channel config");
+  } else {
+    if (!config.channels["friday-next"].enabled) {
+      config.channels["friday-next"].enabled = true;
+      console.log("  + Enabled friday-next channel");
+    }
+    if (!config.channels["friday-next"].transport) {
+      config.channels["friday-next"].transport = "http+sse";
+      console.log("  + Set friday-next transport to http+sse");
+    }
   }
-}
 
-// Ensure canvas and nodes are in the main agent's tools.alsoAllow (not deny)
-if (!config.agents) config.agents = {};
-if (!Array.isArray(config.agents.list)) config.agents.list = [];
-let mainAgent = config.agents.list.find((a) => a.id === "main");
-if (!mainAgent) {
-  mainAgent = { id: "main" };
-  config.agents.list.push(mainAgent);
-}
-if (!mainAgent.tools) mainAgent.tools = {};
-if (!Array.isArray(mainAgent.tools.alsoAllow)) mainAgent.tools.alsoAllow = [];
-for (const tool of ["canvas", "nodes"]) {
-  if (!mainAgent.tools.alsoAllow.includes(tool)) {
-    mainAgent.tools.alsoAllow.push(tool);
-    console.log("  + Added " + tool + " to agent 'main' tools.alsoAllow");
+  if (!config.gateway) config.gateway = {};
+  if (config.gateway.bind !== "lan") {
+    config.gateway.bind = "lan";
+    console.log("  + Set gateway.bind to lan");
   }
-}
-if (Array.isArray(mainAgent.tools.deny)) {
-  for (const tool of ["canvas", "nodes"]) {
-    const idx = mainAgent.tools.deny.indexOf(tool);
-    if (idx !== -1) {
-      mainAgent.tools.deny.splice(idx, 1);
-      console.log("  - Removed " + tool + " from agent 'main' tools.deny");
+  if (!config.gateway.nodes) config.gateway.nodes = {};
+  if (!Array.isArray(config.gateway.nodes.allowCommands)) config.gateway.nodes.allowCommands = [];
+  for (const cmd of [
+    "canvas.navigate", "canvas.present", "canvas.hide", "canvas.eval",
+    "canvas.snapshot", "canvas.a2ui.push", "canvas.a2ui.reset", "canvas.a2ui.pushJSONL",
+  ]) {
+    if (!config.gateway.nodes.allowCommands.includes(cmd)) {
+      config.gateway.nodes.allowCommands.push(cmd);
+      console.log("  + Added " + cmd + " to gateway.nodes.allowCommands");
     }
   }
-}
 
-try {
-  writeFileSync(OPENCLAW_CONFIG, JSON.stringify(config, null, 2) + "\n", "utf8");
-} catch {
-  err(`Failed to write ${OPENCLAW_CONFIG}.`);
-  err("Check disk space and file permissions.");
-  process.exit(1);
-}
-console.log("  Config updated.");
+  if (!config.agents) config.agents = {};
+  if (!Array.isArray(config.agents.list)) config.agents.list = [];
+  let mainAgent = config.agents.list.find((a) => a.id === "main");
+  if (!mainAgent) { mainAgent = { id: "main" }; config.agents.list.push(mainAgent); }
+  if (!mainAgent.tools) mainAgent.tools = {};
+  if (!Array.isArray(mainAgent.tools.alsoAllow)) mainAgent.tools.alsoAllow = [];
+  for (const tool of ["canvas", "nodes"]) {
+    if (!mainAgent.tools.alsoAllow.includes(tool)) {
+      mainAgent.tools.alsoAllow.push(tool);
+      console.log("  + Added " + tool + " to agent 'main' tools.alsoAllow");
+    }
+  }
+  if (Array.isArray(mainAgent.tools.deny)) {
+    for (const tool of ["canvas", "nodes"]) {
+      const idx = mainAgent.tools.deny.indexOf(tool);
+      if (idx !== -1) { mainAgent.tools.deny.splice(idx, 1); console.log("  - Removed " + tool + " from agent 'main' tools.deny"); }
+    }
+  }
 
-if (sudoUser) {
   try {
-    execSync(`chown -R "${sudoUser}" "${PLUGIN_DIR}" "${OPENCLAW_CONFIG}"`, { stdio: "ignore" });
-    log("Fixed file ownership back to " + sudoUser);
+    writeFileSync(OPENCLAW_CONFIG, JSON.stringify(config, null, 2) + "\n", "utf8");
+    console.log("  Config updated.");
   } catch {
-    warn("Could not fix file ownership — files in " + PLUGIN_DIR + " may be owned by root.");
+    err(`Failed to write ${OPENCLAW_CONFIG}.`);
+    process.exit(1);
   }
+
+  warn("Manual install complete, but auto-upgrade is not available.");
+  warn("To enable auto-upgrade, run: openclaw plugins install --dangerously-force-unsafe-install @syengup/friday-channel-next");
 }
 
 // --------------- restart gateway ---------------
@@ -337,8 +235,7 @@ try {
 } catch (e) {
   if (e.stdout?.trim()) console.log(e.stdout.trim());
   if (e.stderr?.trim()) console.error(e.stderr.trim());
-  warn("Gateway restart failed or timed out. The plugin files are installed but the gateway may not have restarted.");
-  warn("Check 'openclaw gateway status' and restart manually: openclaw gateway restart");
+  warn("Gateway restart failed. Restart manually: openclaw gateway restart");
 }
 
 // --------------- verify ---------------
@@ -353,6 +250,9 @@ function getLanIp() {
   return "127.0.0.1";
 }
 
+let config;
+try { config = JSON.parse(readFileSync(OPENCLAW_CONFIG, "utf8")); } catch { config = {}; }
+
 const gatewayPort = config.gateway?.port || 18789;
 const gatewayToken = config.gateway?.auth?.token || "(not set)";
 const bindMode = config.gateway?.bind || "localhost";
@@ -387,32 +287,18 @@ async function verifyGateway(url, token, retries = 6) {
           warn("Plugin responded but ok=false — " + JSON.stringify(data));
           return false;
         } catch {
-          // body is not JSON (e.g. HTML control panel) — plugin route not registered yet
-          if (i < 3) {
-            warn(`Plugin routes not registered yet, retrying (${i}/${retries})...`);
-          } else if (i < retries) {
-            warn(`Gateway is up but plugin routes missing — may need config reload, retrying (${i}/${retries})...`);
-          } else {
-            warn("Gateway is running but plugin routes were not loaded. Check plugin config in openclaw.json.");
-          }
+          if (i < retries) warn(`Plugin routes not registered yet, retrying (${i}/${retries})...`);
           continue;
         }
       }
-      if (res.status === 401) {
-        warn("Auth token mismatch — check gateway.auth.token in openclaw.json.");
-        return false;
-      }
-      if (res.status === 404) {
-        warn("Route /friday-next/status not found — plugin may not be loaded.");
-        return false;
-      }
+      if (res.status === 401) { warn("Auth token mismatch — check gateway.auth.token."); return false; }
+      if (res.status === 404) { warn("Route not found — plugin may not be loaded."); return false; }
       if (i < retries) warn(`Gateway responded ${res.status}, retrying (${i}/${retries})...`);
     } catch {
-      // Connection refused / timeout — gateway not running yet
       if (i < retries) warn(`Gateway not reachable, retrying (${i}/${retries})...`);
     }
   }
-  warn("Gateway verification timed out — check 'openclaw gateway status' manually.");
+  warn("Gateway verification timed out.");
   return false;
 }
 
@@ -428,9 +314,7 @@ if (verified) {
   log("Installation complete! Friday Next channel is now active.");
 } else {
   warn("Installation complete, but gateway verification failed.");
-  warn("Check 'openclaw gateway status' and restart the gateway if needed.");
-  warn("Also ensure OpenClaw is updated to 2026.5.7 or above: openclaw update");
-  warn("同时请确认 OpenClaw 已升级至 2026.5.7 或以上版本：openclaw update");
+  warn("Check 'openclaw gateway status' and restart if needed.");
 }
 log("");
 
@@ -450,11 +334,7 @@ try {
   log("If QR scan doesn't work, enter manually:");
   log("若二维码无法使用，请手动输入：");
   qrShown = true;
-} catch {
-  // qrcode-terminal not available, fall through to manual-only
-}
-
-// --------------- manual input ---------------
+} catch {}
 
 if (!qrShown) {
   log(BOLD_YELLOW("Input the URL and Token below into your FridayNext app to connect."));
@@ -478,13 +358,8 @@ const ip = new URL(gatewayUrl).hostname;
 const ipType = classifyIp(ip);
 if (ipType === "tailscale") {
   log("This is a Tailscale network URL (" + ip + ").");
-  log("Accessible from your Tailnet devices.");
 } else if (ipType === "private") {
   log("This is a LOCAL network URL (" + ip + ", bind=" + bindMode + ").");
-  log("If you need public access, configure HTTPS, Tailscale, or a reverse proxy.");
-} else if (ipType === "loopback") {
-  log("This is a LOOPBACK URL (" + ip + ").");
-  log("Only accessible from this machine.");
 } else {
   log("This URL appears to be publicly accessible (" + ip + ").");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syengup/friday-channel-next",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "OpenClaw Friday Next Apple channel plugin",
   "type": "module",
   "files": [

package/src/agent/node-pairing-bridge.ts

@@ -0,0 +1,29 @@
+import { createRequire } from "node:module";
+import { readdirSync } from "node:fs";
+import { join } from "node:path";
+
+const OPENCLAW_DIST = "/opt/homebrew/lib/node_modules/openclaw/dist";
+
+let cache: { listNodePairing: Function; approveNodePairing: Function } | null = null;
+
+export function loadNodePairingModule(): {
+  listNodePairing: Function;
+  approveNodePairing: Function;
+} {
+  if (cache) return cache;
+  const file = readdirSync(OPENCLAW_DIST).find(
+    (f) => f.startsWith("node-pairing-") && f.endsWith(".js") && !f.includes("authz"),
+  );
+  if (!file) throw new Error("node-pairing module not found in OpenClaw dist");
+  const gatewayRequire = createRequire(join(OPENCLAW_DIST, "_"));
+  cache = gatewayRequire(`./${file.replace(/\.js$/, "")}`);
+  return cache!;
+}
+
+/** Vitest-only: inject mock pairing functions. */
+export function __setMockNodePairingForTests(mock: {
+  listNodePairing: Function;
+  approveNodePairing: Function;
+}): void {
+  cache = mock;
+}