@syengup/friday-channel-next 0.0.38 → 0.0.40

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

@@ -0,0 +1,9 @@
+export declare function loadNodePairingModule(): {
+    listNodePairing: Function;
+    approveNodePairing: Function;
+};
+/** Vitest-only: inject mock pairing functions. */
+export declare function __setMockNodePairingForTests(mock: {
+    listNodePairing: Function;
+    approveNodePairing: Function;
+}): void;

package/dist/src/agent/node-pairing-bridge.js

@@ -0,0 +1,19 @@
+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 = null;
+export function loadNodePairingModule() {
+    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) {
+    cache = mock;
+}

package/dist/src/http/handlers/device-approve.js

@@ -1,24 +1,7 @@
-import { exec } from "node:child_process";
+import { listDevicePairing, approveDevicePairing } from "openclaw/plugin-sdk/device-bootstrap";
 import { readJsonBody } from "../middleware/body.js";
 import { extractBearerToken } from "../middleware/auth.js";
 import { createFridayNextLogger } from "../../logging.js";
-const EXEC_ENV = process.platform === "win32"
-    ? process.env
-    : { ...process.env, PATH: `/opt/homebrew/bin:/usr/local/bin:/home/linuxbrew/.linuxbrew/bin:${process.env.PATH ?? ""}` };
-function execAsync(command, timeoutMs) {
-    return new Promise((resolve, reject) => {
-        const child = exec(command, { encoding: "utf-8", timeout: timeoutMs, maxBuffer: 1024 * 1024, env: EXEC_ENV }, (error, stdout, stderr) => {
-            if (error) {
-                reject(error);
-            }
-            else {
-                resolve({ stdout, stderr });
-            }
-        });
-        child.stdout?.on("data", () => { });
-        child.stderr?.on("data", () => { });
-    });
-}
 export async function handleDeviceApprove(req, res) {
     const log = createFridayNextLogger("device-approve");
     if (req.method !== "POST") {
@@ -49,32 +32,18 @@ export async function handleDeviceApprove(req, res) {
         return true;
     }
     const normalizedDeviceId = rawDeviceId.trim().toUpperCase();
-    let listStdout;
+    let pairing;
     try {
-        const result = await execAsync("openclaw devices list --json", 15000);
-        listStdout = result.stdout;
+        pairing = await listDevicePairing();
     }
     catch (err) {
-        const stderr = err?.stderr?.trim();
-        log.error(`devices list failed: ${err instanceof Error ? err.message : String(err)}`);
-        res.statusCode = 502;
-        res.setHeader("Content-Type", "application/json");
-        res.end(JSON.stringify({ error: "Failed to list devices from gateway", detail: stderr || undefined }));
-        return true;
-    }
-    let listData;
-    try {
-        listData = JSON.parse(listStdout);
-    }
-    catch {
-        log.error(`devices list returned invalid JSON: ${listStdout.slice(0, 200)}`);
+        log.error(`listDevicePairing failed: ${err instanceof Error ? err.message : String(err)}`);
         res.statusCode = 502;
         res.setHeader("Content-Type", "application/json");
-        res.end(JSON.stringify({ error: "Unexpected response from gateway device list" }));
+        res.end(JSON.stringify({ error: "Failed to list devices from gateway" }));
         return true;
     }
-    const pending = listData.pending ?? [];
-    const match = pending.find((entry) => entry.deviceId.trim().toUpperCase() === normalizedDeviceId);
+    const match = pairing.pending.find((entry) => entry.deviceId.trim().toUpperCase() === normalizedDeviceId);
     if (!match) {
         res.statusCode = 404;
         res.setHeader("Content-Type", "application/json");
@@ -86,31 +55,30 @@ export async function handleDeviceApprove(req, res) {
     }
     const requestId = match.requestId;
     log.info(`approving deviceId=${normalizedDeviceId} requestId=${requestId}`);
-    let approveStdout;
+    let approved;
     try {
-        const result = await execAsync(`openclaw devices approve ${requestId} --json`, 15000);
-        approveStdout = result.stdout;
+        approved = await approveDevicePairing(requestId);
     }
     catch (err) {
-        const stderr = err?.stderr?.trim();
-        log.error(`devices approve failed: ${err instanceof Error ? err.message : String(err)}`);
+        log.error(`approveDevicePairing failed: ${err instanceof Error ? err.message : String(err)}`);
         res.statusCode = 502;
         res.setHeader("Content-Type", "application/json");
         res.end(JSON.stringify({
-            error: "Device approval command failed",
-            detail: stderr || (err instanceof Error ? err.message : "Unknown error"),
+            error: "Device approval failed",
+            detail: err instanceof Error ? err.message : "Unknown error",
         }));
         return true;
     }
-    let approveData;
-    try {
-        approveData = JSON.parse(approveStdout);
+    if (!approved) {
+        res.statusCode = 404;
+        res.setHeader("Content-Type", "application/json");
+        res.end(JSON.stringify({ error: "Pending device request not found" }));
+        return true;
     }
-    catch {
-        log.error(`devices approve returned non-JSON: ${approveStdout.slice(0, 200)}`);
-        res.statusCode = 502;
+    if (approved.status === "forbidden") {
+        res.statusCode = 403;
         res.setHeader("Content-Type", "application/json");
-        res.end(JSON.stringify({ error: "Unexpected response from device approval" }));
+        res.end(JSON.stringify({ error: `Device approval forbidden: ${approved.reason ?? "unknown"}` }));
         return true;
     }
     res.statusCode = 200;
@@ -118,8 +86,8 @@ export async function handleDeviceApprove(req, res) {
     res.end(JSON.stringify({
         ok: true,
         deviceId: normalizedDeviceId,
-        requestId: approveData.requestId,
-        approvedAtMs: approveData.device?.approvedAtMs,
+        requestId: approved.requestId,
+        approvedAtMs: approved.device?.approvedAtMs,
     }));
     return true;
 }

package/dist/src/http/handlers/nodes-approve.js

@@ -1,24 +1,7 @@
-import { exec } from "node:child_process";
 import { readJsonBody } from "../middleware/body.js";
 import { extractBearerToken } from "../middleware/auth.js";
 import { createFridayNextLogger } from "../../logging.js";
-const EXEC_ENV = process.platform === "win32"
-    ? process.env
-    : { ...process.env, PATH: `/opt/homebrew/bin:/usr/local/bin:/home/linuxbrew/.linuxbrew/bin:${process.env.PATH ?? ""}` };
-function execAsync(command, timeoutMs) {
-    return new Promise((resolve, reject) => {
-        const child = exec(command, { encoding: "utf-8", timeout: timeoutMs, maxBuffer: 1024 * 1024, env: EXEC_ENV }, (error, stdout, stderr) => {
-            if (error) {
-                reject(error);
-            }
-            else {
-                resolve({ stdout, stderr });
-            }
-        });
-        child.stdout?.on("data", () => { });
-        child.stderr?.on("data", () => { });
-    });
-}
+import { loadNodePairingModule } from "../../agent/node-pairing-bridge.js";
 export async function handleNodesApprove(req, res) {
     const log = createFridayNextLogger("nodes-approve");
     if (req.method !== "POST") {
@@ -49,28 +32,16 @@ export async function handleNodesApprove(req, res) {
         return true;
     }
     const normalizedNodeId = rawNodeId.trim().toUpperCase();
-    let listStdout;
-    try {
-        const result = await execAsync("openclaw nodes list --json", 15000);
-        listStdout = result.stdout;
-    }
-    catch (err) {
-        const stderr = err?.stderr?.trim();
-        log.error(`nodes list failed: ${err instanceof Error ? err.message : String(err)}`);
-        res.statusCode = 502;
-        res.setHeader("Content-Type", "application/json");
-        res.end(JSON.stringify({ error: "Failed to list nodes from gateway", detail: stderr || undefined }));
-        return true;
-    }
+    const { listNodePairing, approveNodePairing } = loadNodePairingModule();
     let listData;
     try {
-        listData = JSON.parse(listStdout);
+        listData = await listNodePairing();
     }
-    catch {
-        log.error(`nodes list returned invalid JSON: ${listStdout.slice(0, 200)}`);
+    catch (err) {
+        log.error(`listNodePairing failed: ${err instanceof Error ? err.message : String(err)}`);
         res.statusCode = 502;
         res.setHeader("Content-Type", "application/json");
-        res.end(JSON.stringify({ error: "Unexpected response from gateway node list" }));
+        res.end(JSON.stringify({ error: "Failed to list nodes from gateway" }));
         return true;
     }
     const pending = listData.pending ?? [];
@@ -78,31 +49,30 @@ export async function handleNodesApprove(req, res) {
     if (pendingMatch) {
         const requestId = pendingMatch.requestId;
         log.info(`approving nodeId=${normalizedNodeId} requestId=${requestId}`);
-        let approveStdout;
+        let approved;
         try {
-            const result = await execAsync(`openclaw nodes approve ${requestId} --json`, 15000);
-            approveStdout = result.stdout;
+            approved = await approveNodePairing(requestId, {});
         }
         catch (err) {
-            const stderr = err?.stderr?.trim();
-            log.error(`nodes approve failed: ${err instanceof Error ? err.message : String(err)}`);
+            log.error(`approveNodePairing failed: ${err instanceof Error ? err.message : String(err)}`);
             res.statusCode = 502;
             res.setHeader("Content-Type", "application/json");
             res.end(JSON.stringify({
-                error: "Node approval command failed",
-                detail: stderr || (err instanceof Error ? err.message : "Unknown error"),
+                error: "Node approval failed",
+                detail: err instanceof Error ? err.message : "Unknown error",
             }));
             return true;
         }
-        let approveData;
-        try {
-            approveData = JSON.parse(approveStdout);
+        if (!approved) {
+            res.statusCode = 404;
+            res.setHeader("Content-Type", "application/json");
+            res.end(JSON.stringify({ error: "Pending node request not found" }));
+            return true;
         }
-        catch {
-            log.error(`nodes approve returned non-JSON: ${approveStdout.slice(0, 200)}`);
-            res.statusCode = 502;
+        if ("status" in approved && approved.status === "forbidden") {
+            res.statusCode = 403;
             res.setHeader("Content-Type", "application/json");
-            res.end(JSON.stringify({ error: "Unexpected response from node approval" }));
+            res.end(JSON.stringify({ error: `Node approval forbidden: ${approved.missingScope ?? "unknown"}` }));
             return true;
         }
         res.statusCode = 200;
@@ -110,12 +80,12 @@ export async function handleNodesApprove(req, res) {
         res.end(JSON.stringify({
             ok: true,
             nodeId: normalizedNodeId,
-            requestId: approveData.requestId,
-            approvedAtMs: approveData.node?.approvedAtMs,
+            requestId: approved.requestId,
+            approvedAtMs: approved.node?.approvedAtMs,
         }));
         return true;
     }
-    // Not in pending — check if already paired with non-empty caps/commands
+    // Check if already paired with non-empty caps/commands
     const paired = listData.paired ?? [];
     const pairedMatch = paired.find((entry) => entry.nodeId.trim().toUpperCase() === normalizedNodeId);
     if (pairedMatch) {