@syengup/friday-channel-next 0.0.13 → 0.0.15

package/install.js

@@ -46,13 +46,28 @@ function isRunningFromNpmPackage() {
 
 // --------------- prerequisites ---------------
 
-const required = ["pnpm", "node", "openclaw"];
+const required = ["node", "openclaw"];
 const missing = required.filter((c) => !has(c));
 if (missing.length) {
   missing.forEach((c) => err(`${c} is required but not found. Install it first.`));
   process.exit(1);
 }
 
+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);
+}
+
+// Auto-detect best registry (if npmjs.org is unreachable, use npmmirror)
+let registryFlag = "";
+try {
+  execSync('curl -s --connect-timeout 3 --max-time 5 https://registry.npmjs.org/ >/dev/null 2>&1');
+} catch {
+  warn("Default registry unreachable, using https://registry.npmmirror.com");
+  registryFlag = "--registry=https://registry.npmmirror.com";
+}
+
 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.");
@@ -88,10 +103,10 @@ process.chdir(PLUGIN_DIR);
 // --------------- install + build ---------------
 
 log("Installing dependencies...");
-execSync("pnpm install", { stdio: "inherit" });
+execSync(`${PKG} install ${registryFlag}`, { stdio: "inherit" });
 
 log("Building TypeScript...");
-execSync("pnpm build", { stdio: "inherit" });
+execSync(`${PKG} run build`, { stdio: "inherit" });
 
 // --------------- configure OpenClaw ---------------
 

package/install.sh

@@ -22,13 +22,31 @@ err()  { printf "  ${RED}X${NC} %s\\n" "$1" >&2; }
 trap 'err "Install failed."' ERR
 
 # Check prerequisites
-for cmd in pnpm node git openclaw; do
+for cmd in node git openclaw; do
   if ! command -v "$cmd" &>/dev/null; then
     err "$cmd is required but not found. Install it first."
     exit 1
   fi
 done
 
+# Auto-detect package manager (prefer pnpm, fall back to npm)
+if command -v pnpm &>/dev/null; then
+  PKG="pnpm"
+elif command -v npm &>/dev/null; then
+  PKG="npm"
+else
+  err "pnpm or npm is required but not found. Install one first."
+  exit 1
+fi
+
+# Auto-detect best registry (if npmjs.org is unreachable, use npmmirror)
+if curl -s --connect-timeout 3 https://registry.npmjs.org/ >/dev/null 2>&1; then
+  REGISTRY=""
+else
+  warn "Default registry unreachable, using https://registry.npmmirror.com"
+  REGISTRY="--registry=https://registry.npmmirror.com"
+fi
+
 if [ ! -f "$OPENCLAW_CONFIG" ]; then
   err "OpenClaw config not found at $OPENCLAW_CONFIG"
   err "Make sure OpenClaw is installed and has been run at least once."
@@ -48,10 +66,10 @@ fi
 cd "$PLUGIN_DIR"
 
 log "Installing dependencies..."
-pnpm install
+$PKG install $REGISTRY
 
 log "Building TypeScript..."
-pnpm build
+$PKG run build
 
 # Step 2: Configure OpenClaw
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syengup/friday-channel-next",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "OpenClaw Friday Next Apple channel plugin",
   "type": "module",
   "files": [
@@ -11,6 +11,14 @@
     "tsconfig.json",
     "openclaw.plugin.json"
   ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "test": "npm run test:unit && npm run test:e2e",
+    "test:unit": "vitest run",
+    "test:e2e": "vitest run --config vitest.e2e.config.ts",
+    "test:smoke": "node scripts/e2e-smoke.mjs",
+    "test:msg-live": "node scripts/message-roundtrip-live.mjs"
+  },
   "bin": {
     "friday-channel-next": "./install.js",
     "install-friday-next": "./install.js"
@@ -56,13 +64,5 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.5",
     "zod": "^4.3.6"
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "test": "pnpm test:unit && pnpm test:e2e",
-    "test:unit": "vitest run",
-    "test:e2e": "vitest run --config vitest.e2e.config.ts",
-    "test:smoke": "node scripts/e2e-smoke.mjs",
-    "test:msg-live": "node scripts/message-roundtrip-live.mjs"
   }
-}
+}

package/dist/index.js

@@ -1,176 +0,0 @@
-import { defineChannelPluginEntry } from "openclaw/plugin-sdk/core";
-import { fridayNextChannelPlugin } from "./src/channel.js";
-import { setFridayNextRuntime } from "./src/runtime.js";
-import { resolveFridayNextConfig } from "./src/config.js";
-import { getHostOpenClawConfigSnapshot } from "./src/host-config.js";
-import { registerFridayNextHttpRoutes } from "./src/http/server.js";
-import { getFridayNextRuntime } from "./src/runtime.js";
-import { sseEmitter } from "./src/sse/emitter.js";
-import { forwardAgentEventRaw, getLastRegisteredFridayDeviceId, resolveFridayDeviceIdForSessionKey, } from "./src/friday-session.js";
-import { setFridayAgentForwardRuntime } from "./src/agent-forward-runtime.js";
-import { getOpenClawAgentRunContext } from "./src/agent-run-context-bridge.js";
-export { fridayNextChannelPlugin } from "./src/channel.js";
-export { setFridayNextRuntime } from "./src/runtime.js";
-/** `api.on` returns void — register tool hooks at most once per process. */
-let fridayNextToolHooksRegistered = false;
-let disposeAgentEventListener = null;
-/** Avoid duplicate `registerHttpRoute` when gateway re-invokes `registerFull`. */
-let fridayNextPluginHttpRegistered = false;
-function deviceIdFromToolContext(ctx) {
-    if (ctx.runId) {
-        const d = sseEmitter.getDeviceIdByRunId(ctx.runId);
-        if (d)
-            return d;
-    }
-    const sk = typeof ctx.sessionKey === "string" && ctx.sessionKey.trim()
-        ? ctx.sessionKey.trim()
-        : (ctx.runId ? getOpenClawAgentRunContext(ctx.runId)?.sessionKey?.trim() : undefined) ?? "";
-    if (sk) {
-        const d = resolveFridayDeviceIdForSessionKey(sk);
-        if (d)
-            return d;
-    }
-    const sole = sseEmitter.getSoleConnectedDeviceId();
-    if (sole)
-        return sole;
-    const last = getLastRegisteredFridayDeviceId();
-    if (last)
-        return last;
-    return null;
-}
-function isFridaySessionKey(sk) {
-    return /^friday-next-/i.test(sk) || /^agent:main:friday-next-/i.test(sk);
-}
-function shouldForwardToolEventToFriday(ctx) {
-    if (ctx.runId) {
-        if (sseEmitter.getDeviceIdByRunId(ctx.runId))
-            return true;
-        const runSk = getOpenClawAgentRunContext(ctx.runId)?.sessionKey?.trim() ?? "";
-        if (runSk) {
-            if (resolveFridayDeviceIdForSessionKey(runSk))
-                return true;
-            if (isFridaySessionKey(runSk))
-                return true;
-        }
-    }
-    const sk = typeof ctx.sessionKey === "string" ? ctx.sessionKey.trim() : "";
-    if (sk) {
-        if (resolveFridayDeviceIdForSessionKey(sk))
-            return true;
-        if (isFridaySessionKey(sk))
-            return true;
-    }
-    return false;
-}
-export default defineChannelPluginEntry({
-    id: "friday-next",
-    name: "Friday Next",
-    description: "Friday Next Apple 应用通道",
-    plugin: fridayNextChannelPlugin,
-    setRuntime: setFridayNextRuntime,
-    registerFull: (api) => {
-        setFridayAgentForwardRuntime(api);
-        if (!fridayNextPluginHttpRegistered) {
-            fridayNextPluginHttpRegistered = true;
-            registerFridayNextHttpRoutes(api);
-        }
-        else {
-            const cfg = resolveFridayNextConfig(getHostOpenClawConfigSnapshot(getFridayNextRuntime().config));
-            sseEmitter.setBacklogLimit(cfg.sseBacklogPerDevice);
-        }
-        disposeAgentEventListener?.();
-        disposeAgentEventListener = api.runtime.events.onAgentEvent((evt) => {
-            forwardAgentEventRaw({
-                runId: evt.runId,
-                seq: evt.seq,
-                ts: evt.ts,
-                stream: evt.stream,
-                data: evt.data,
-                sessionKey: evt.sessionKey,
-            });
-        });
-        if (fridayNextToolHooksRegistered) {
-            return;
-        }
-        fridayNextToolHooksRegistered = true;
-        api.on("subagent_delivery_target", (event) => {
-            if (!event.expectsCompletionMessage)
-                return;
-            const ch = event.requesterOrigin?.channel?.trim().toLowerCase();
-            if (ch !== "friday-next")
-                return;
-            const sk = event.requesterSessionKey?.trim();
-            if (!sk)
-                return;
-            const raw = resolveFridayDeviceIdForSessionKey(sk);
-            if (!raw)
-                return;
-            const to = raw.toUpperCase();
-            return {
-                origin: {
-                    channel: "friday-next",
-                    accountId: event.requesterOrigin?.accountId?.trim() || "default",
-                    to,
-                },
-            };
-        });
-        api.on("before_tool_call", (event, ctx) => {
-            if (!shouldForwardToolEventToFriday(ctx))
-                return;
-            const deviceId = deviceIdFromToolContext(ctx);
-            const runId = ctx.runId ?? "(unknown)";
-            const logLine = (detail) => {
-                const ts = new Date().toISOString();
-                console.error(`[Friday-HOOK] [${ts}] [TOOL_CALL] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`);
-            };
-            if (!deviceId) {
-                logLine("SKIP_no_deviceId");
-                return;
-            }
-            logLine("START");
-            sseEmitter.broadcastToolEvent(deviceId.toUpperCase(), runId, {
-                type: "tool-hook",
-                data: {
-                    when: "before",
-                    runId,
-                    deviceId: deviceId.toUpperCase(),
-                    sessionKey: ctx.sessionKey,
-                    toolName: event.toolName,
-                    params: event.params,
-                    ts: Date.now(),
-                },
-            });
-        });
-        api.on("after_tool_call", (event, ctx) => {
-            if (!shouldForwardToolEventToFriday(ctx))
-                return;
-            const deviceId = deviceIdFromToolContext(ctx);
-            const runId = ctx.runId ?? "(unknown)";
-            const logLine = (detail) => {
-                const ts = new Date().toISOString();
-                console.error(`[Friday-HOOK] [${ts}] [TOOL_DONE] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`);
-            };
-            if (!deviceId) {
-                logLine("SKIP_no_deviceId");
-                return;
-            }
-            logLine("END");
-            const normalizedDeviceId = deviceId.toUpperCase();
-            sseEmitter.broadcastToolEvent(normalizedDeviceId, runId, {
-                type: "tool-hook",
-                data: {
-                    when: "after",
-                    runId,
-                    deviceId: normalizedDeviceId,
-                    sessionKey: ctx.sessionKey,
-                    toolName: event.toolName,
-                    toolCallId: event.toolCallId,
-                    error: event.error ?? null,
-                    result: event.result,
-                    durationMs: event.durationMs ?? null,
-                    ts: Date.now(),
-                },
-            });
-        });
-    },
-});