@syengup/friday-channel-next 0.1.15 → 0.1.17

package/dist/src/http/handlers/messages.d.ts

@@ -22,6 +22,22 @@ export type FridayReplyPayload = {
     interactive?: unknown;
     channelData?: unknown;
 };
+/** Map local / gateway paths to public `/friday-next/files/...` URLs where possible. */
+/**
+ * Canvas snapshots are captured so the *agent* can "see" the rendered canvas. OpenClaw core surfaces
+ * any image tool result as deliverable media on the assistant reply block, which for Friday Next would
+ * make the snapshot auto-appear as an attachment mid-stream — not what we want. Snapshot temp files are
+ * named `openclaw-canvas-snapshot-<uuid>.<ext>`, so we detect them by basename and drop them from the
+ * delivered payload (the assistant text is preserved). Agent-initiated media sends are unaffected —
+ * those flow through the `outbound` channel action, not the deliver block path.
+ */
+export declare function isCanvasSnapshotMediaPath(url: unknown): boolean;
+export declare function translateDeliverPayload(pl: FridayReplyPayload, kind: string, meta?: {
+    modelName?: string;
+    totalTokens?: number;
+    contextTokensUsed?: number;
+    contextWindowMax?: number;
+}): Record<string, unknown>;
 export interface FridayMessagePayload {
     deviceId: string;
     text: string;

package/dist/src/http/handlers/messages.js

@@ -84,7 +84,28 @@ function inferFridayNextMediaKind(params) {
     return "file";
 }
 /** Map local / gateway paths to public `/friday-next/files/...` URLs where possible. */
-function translateDeliverPayload(pl, kind, meta) {
+/**
+ * Canvas snapshots are captured so the *agent* can "see" the rendered canvas. OpenClaw core surfaces
+ * any image tool result as deliverable media on the assistant reply block, which for Friday Next would
+ * make the snapshot auto-appear as an attachment mid-stream — not what we want. Snapshot temp files are
+ * named `openclaw-canvas-snapshot-<uuid>.<ext>`, so we detect them by basename and drop them from the
+ * delivered payload (the assistant text is preserved). Agent-initiated media sends are unaffected —
+ * those flow through the `outbound` channel action, not the deliver block path.
+ */
+export function isCanvasSnapshotMediaPath(url) {
+    if (typeof url !== "string")
+        return false;
+    const base = url.split(/[/\\]/).pop() ?? url;
+    return /canvas-snapshot-/i.test(base);
+}
+export function translateDeliverPayload(pl, kind, meta) {
+    // Strip canvas-snapshot tool-result images before any media resolution (paths here are still the
+    // original `/tmp/openclaw/openclaw-canvas-snapshot-*.jpg` temp paths, not yet copied to friday files).
+    const filteredSingle = typeof pl.mediaUrl === "string" && !isCanvasSnapshotMediaPath(pl.mediaUrl) ? pl.mediaUrl : null;
+    const filteredArr = Array.isArray(pl.mediaUrls)
+        ? pl.mediaUrls.filter((u) => !isCanvasSnapshotMediaPath(u))
+        : pl.mediaUrls;
+    pl = { ...pl, mediaUrl: filteredSingle, mediaUrls: filteredArr };
     const raw = { ...pl };
     const originalUrls = collectReplyPayloadMediaUrls(pl);
     if (typeof pl.mediaUrl === "string" && pl.mediaUrl.trim()) {

package/install.js

@@ -238,14 +238,22 @@ if (configChanged) {
 
 // --------------- restart gateway ---------------
 
-log("Restarting OpenClaw gateway...");
+log("Restarting OpenClaw gateway... (this can take 20-30s)");
 try {
-  const out = execSync(`${openclawCmd} gateway restart`, { encoding: "utf8", stdio: "pipe", timeout: 15000 });
+  // A full gateway restart commonly takes 20s+ on a fresh boot; give it plenty of room
+  // so we don't kill it mid-restart and report a false failure.
+  const out = execSync(`${openclawCmd} gateway restart`, { encoding: "utf8", stdio: "pipe", timeout: 90000 });
   if (out.trim()) console.log(out.trim());
 } catch (e) {
   if (e.stdout?.trim()) console.log(e.stdout.trim());
   if (e.stderr?.trim()) console.error(e.stderr.trim());
-  warn("Gateway restart failed. Restart manually: openclaw gateway restart");
+  // ETIMEDOUT/SIGTERM here usually means the restart is simply slow, not broken —
+  // the verify step below will confirm whether the gateway actually came up.
+  if (e.code === "ETIMEDOUT" || e.signal === "SIGTERM") {
+    warn("Gateway restart is taking a while — will verify below.");
+  } else {
+    warn("Gateway restart failed. Restart manually: openclaw gateway restart");
+  }
 }
 
 // --------------- verify ---------------
@@ -270,7 +278,11 @@ const gatewayUrl = bindMode === "lan"
   ? `http://${getLanIp()}:${gatewayPort}`
   : `http://127.0.0.1:${gatewayPort}`;
 
-async function verifyGateway(url, token, retries = 6) {
+// Always verify against loopback: the gateway binds 0.0.0.0 so it's reachable here,
+// and this avoids false negatives from LAN/NAT routing of the advertised IP.
+const verifyUrl = `http://127.0.0.1:${gatewayPort}`;
+
+async function verifyGateway(url, token, retries = 30) {
   const http = await import("node:http");
   const { hostname, port } = new URL(url);
   for (let i = 1; i <= retries; i++) {
@@ -312,7 +324,7 @@ async function verifyGateway(url, token, retries = 6) {
 }
 
 log("Verifying gateway...");
-const verified = await verifyGateway(gatewayUrl, gatewayToken);
+const verified = await verifyGateway(verifyUrl, gatewayToken);
 
 // --------------- show connection info ---------------
 
@@ -372,4 +384,45 @@ if (ipType === "tailscale") {
 } else {
   log("This URL appears to be publicly accessible (" + ip + ").");
 }
+
+// The advertised IP is the local/NAT address, which a phone over the internet
+// can't reach. Best-effort: detect the network's public-facing IP. NOTE: an echo
+// service only reports the egress address — on a cloud VPS that's a routable 1:1
+// NAT, but on a home/carrier-grade NAT (CGNAT) it's a shared egress IP that is
+// NOT reachable inbound. So we present it as a hint, not a guarantee.
+if (ipType === "private" || ipType === "loopback") {
+  const publicIp = await detectPublicIp();
+  if (publicIp && publicIp !== ip) {
+    log("");
+    log(BOLD_YELLOW("Network public-facing IP detected — for remote access try:"));
+    log(BOLD_YELLOW("检测到网络出口公网 IP —— 远程连接可尝试："));
+    log("Public URL:   " + BOLD_YELLOW(`http://${publicIp}:${gatewayPort}`));
+    log("First open inbound TCP port " + gatewayPort + " in your firewall / cloud security group.");
+    log("请先在防火墙 / 云安全组放行入站 TCP 端口 " + gatewayPort + "。");
+    log("If this is a home/carrier network (CGNAT), this IP may NOT be reachable from outside —");
+    log("use a tunnel like Tailscale instead.");
+    log("若为家庭宽带 / 运营商大内网(CGNAT)，此地址可能无法从外部入站访问，");
+    log("请改用 Tailscale 等内网穿透方案。");
+  }
+}
 log("--------------------------------------------------");
+
+async function detectPublicIp() {
+  const endpoints = ["http://api.ipify.org", "http://ifconfig.me/ip", "http://icanhazip.com"];
+  const http = await import("node:http");
+  for (const url of endpoints) {
+    try {
+      const ipStr = await new Promise((resolve, reject) => {
+        const req = http.get(url, { timeout: 3000 }, (res) => {
+          let body = "";
+          res.on("data", (c) => body += c);
+          res.on("end", () => resolve(body.trim()));
+        });
+        req.on("error", reject);
+        req.on("timeout", () => { req.destroy(); reject(new Error("timeout")); });
+      });
+      if (/^\d{1,3}(\.\d{1,3}){3}$/.test(ipStr)) return ipStr;
+    } catch { /* try next */ }
+  }
+  return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syengup/friday-channel-next",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "OpenClaw Friday Next Apple channel plugin",
   "license": "MIT",
   "type": "module",

package/src/http/handlers/messages.canvas-snapshot.test.ts

@@ -0,0 +1,51 @@
+import { describe, expect, it } from "vitest";
+import { isCanvasSnapshotMediaPath, translateDeliverPayload } from "./messages.js";
+
+/**
+ * canvas.snapshot tool results are an agent-facing capture. OpenClaw core surfaces image tool
+ * results as deliverable media on the assistant reply block, which would otherwise auto-attach the
+ * snapshot to the user's stream. translateDeliverPayload must drop snapshot temp files (by basename)
+ * while preserving the assistant text and any non-snapshot media.
+ */
+describe("canvas snapshot media suppression", () => {
+  it("detects canvas snapshot temp paths by basename", () => {
+    expect(
+      isCanvasSnapshotMediaPath("/tmp/openclaw/openclaw-canvas-snapshot-d2e6aef2-0441.jpg"),
+    ).toBe(true);
+    expect(isCanvasSnapshotMediaPath("C:\\tmp\\openclaw-canvas-snapshot-abc.png")).toBe(true);
+    expect(isCanvasSnapshotMediaPath("/Users/me/Pictures/screenshot_latest.jpg")).toBe(false);
+    expect(isCanvasSnapshotMediaPath("/friday-next/files/uuid.jpg")).toBe(false);
+    expect(isCanvasSnapshotMediaPath(undefined)).toBe(false);
+  });
+
+  it("strips a snapshot mediaUrl from a block deliver payload, keeping the text", () => {
+    const out = translateDeliverPayload(
+      {
+        text: "🎉 通了!",
+        mediaUrl: "/tmp/openclaw/openclaw-canvas-snapshot-d2e6aef2-0441.jpg",
+      },
+      "block",
+    );
+    expect(out.text).toBe("🎉 通了!");
+    expect(out.mediaUrl).toBeNull();
+    // No media survived → no image mediaKind tagged onto the payload.
+    const channelData = out.channelData as { fridayNext?: { mediaKind?: string } } | undefined;
+    expect(channelData?.fridayNext?.mediaKind).toBeUndefined();
+  });
+
+  it("strips snapshot entries from mediaUrls but preserves non-snapshot media", () => {
+    const out = translateDeliverPayload(
+      {
+        text: "page rendered",
+        mediaUrls: [
+          "/tmp/openclaw/openclaw-canvas-snapshot-aaa.jpg",
+          "/Users/me/Pictures/real-image.png",
+        ],
+      },
+      "block",
+    );
+    const urls = out.mediaUrls as string[];
+    expect(urls).toHaveLength(1);
+    expect(urls.some((u) => u.includes("canvas-snapshot-"))).toBe(false);
+  });
+});

package/src/http/handlers/messages.ts

@@ -132,11 +132,34 @@ function inferFridayNextMediaKind(params: {
 }
 
 /** Map local / gateway paths to public `/friday-next/files/...` URLs where possible. */
-function translateDeliverPayload(
+/**
+ * Canvas snapshots are captured so the *agent* can "see" the rendered canvas. OpenClaw core surfaces
+ * any image tool result as deliverable media on the assistant reply block, which for Friday Next would
+ * make the snapshot auto-appear as an attachment mid-stream — not what we want. Snapshot temp files are
+ * named `openclaw-canvas-snapshot-<uuid>.<ext>`, so we detect them by basename and drop them from the
+ * delivered payload (the assistant text is preserved). Agent-initiated media sends are unaffected —
+ * those flow through the `outbound` channel action, not the deliver block path.
+ */
+export function isCanvasSnapshotMediaPath(url: unknown): boolean {
+  if (typeof url !== "string") return false;
+  const base = url.split(/[/\\]/).pop() ?? url;
+  return /canvas-snapshot-/i.test(base);
+}
+
+export function translateDeliverPayload(
   pl: FridayReplyPayload,
   kind: string,
   meta?: { modelName?: string; totalTokens?: number; contextTokensUsed?: number; contextWindowMax?: number },
 ): Record<string, unknown> {
+  // Strip canvas-snapshot tool-result images before any media resolution (paths here are still the
+  // original `/tmp/openclaw/openclaw-canvas-snapshot-*.jpg` temp paths, not yet copied to friday files).
+  const filteredSingle =
+    typeof pl.mediaUrl === "string" && !isCanvasSnapshotMediaPath(pl.mediaUrl) ? pl.mediaUrl : null;
+  const filteredArr = Array.isArray(pl.mediaUrls)
+    ? pl.mediaUrls.filter((u) => !isCanvasSnapshotMediaPath(u))
+    : pl.mediaUrls;
+  pl = { ...pl, mediaUrl: filteredSingle, mediaUrls: filteredArr };
+
   const raw = { ...pl } as Record<string, unknown>;
   const originalUrls = collectReplyPayloadMediaUrls(pl);
   if (typeof pl.mediaUrl === "string" && pl.mediaUrl.trim()) {