@yoooclaw/phone-notifications 1.12.2 → 1.12.4

package/README.md

@@ -196,10 +196,9 @@ bash install.sh --tgz-url ./yoooclaw-phone-notifications-1.2.3.tgz
 4. 备份旧版本（如有），原子替换到 `<stateDir>/extensions/phone-notifications`
 5. 写入 `<configPath>` 配置：
    - `plugins.entries` — 启用插件，合并用户配置
-   - `plugins.installs` — 记录安装来源和版本
    - `tools.allow` / `tools.alsoAllow` 与 `agents.main.tools.*` — 根据插件 `contracts.tools` 自动放行工具
    - 若宿主已启用 `plugins.allow` 白名单，会自动补入 `phone-notifications`，确保插件能被宿主加载
-   - 清理该插件旧的 `plugins.load.paths` / 旧安装记录，避免继续命中之前通过 `openclaw plugins install` 或 `--link` 保留的副本
+   - 清理该插件旧的 `plugins.load.paths` / 旧的 `plugins.installs` 安装记录（该字段已被宿主废弃，插件不再读写），避免继续命中之前通过 `openclaw plugins install` 或 `--link` 保留的副本
 6. 如传入 `--api-key` / `--token`，写入 `<stateDir>/credentials.json`
 7. OpenClaw 下尝试执行 `gateway restart`，并验证 `ntf` / `phone-notifications` 命令是否可用；JvsClaw 下触发 `gateway restart` 后跳过即时 CLI 自检，避免平台 RPC 恢复期间误报；QClaw 下不会主动重启宿主进程
 8. 安装失败时自动回滚到旧版本
@@ -663,10 +662,10 @@ openclaw ntf monitor delete boss-alert --yes
 
 ```bash
 
-# 启用云端灯效规则工具（lightrules_list/create/update/delete）
+# 启用一次性灯效及云端灯效规则工具
 openclaw ntf light setup
 
-# 调试遗留命令：直接发送灯效指令到硬件设备（OpenClaw 对话不再注册 light_control）
+# 调试命令：直接发送灯效指令到硬件设备
 openclaw ntf light send \
   --segments '[{"mode":"wave","duration_s":4,"brightness":192,"color":{"r":255,"g":0,"b":0}}]'
 

package/dist/bin/ntf.cjs

@@ -4704,6 +4704,7 @@ var DEFAULT_ENV_HOSTS = {
   production: "openclaw-service.yoooclaw.com"
 };
 var NOTIFICATION_INTELLIGENCE_LIGHT_RULES_PLUGIN_PATH = "/api/plugin/notification-intelligence/light-rules";
+var NOTIFICATION_INTELLIGENCE_LIGHT_EFFECTS_SEND_PLUGIN_PATH = "/api/plugin/notification-intelligence/light-effects/send";
 var NOTIFICATION_INTELLIGENCE_LIGHT_RULES_APP_PATH = "/api/notification-intelligence/light-rules";
 var NOTIFICATION_INTELLIGENCE_PLUGIN_BASE_PATH = "/api/plugin/notification-intelligence";
 var NOTIFICATION_INTELLIGENCE_APP_BASE_PATH = "/api/notification-intelligence";
@@ -4751,13 +4752,29 @@ function normalizeNotificationIntelligenceLightRulesPluginUrl(url) {
   }
   return trimmed;
 }
+function normalizeNotificationIntelligenceLightEffectsSendUrl(url) {
+  const trimmed = url.trim().replace(/\/+$/, "");
+  if (!trimmed)
+    return trimmed;
+  if (trimmed.endsWith(NOTIFICATION_INTELLIGENCE_LIGHT_EFFECTS_SEND_PLUGIN_PATH)) {
+    return trimmed;
+  }
+  const normalizedRulesUrl = normalizeNotificationIntelligenceLightRulesPluginUrl(trimmed);
+  if (normalizedRulesUrl.endsWith(NOTIFICATION_INTELLIGENCE_LIGHT_RULES_PLUGIN_PATH)) {
+    const origin = normalizedRulesUrl.slice(0, -NOTIFICATION_INTELLIGENCE_LIGHT_RULES_PLUGIN_PATH.length);
+    return `${origin}${NOTIFICATION_INTELLIGENCE_LIGHT_EFFECTS_SEND_PLUGIN_PATH}`;
+  }
+  return `${trimmed}/light-effects/send`;
+}
 function buildEnvUrls(host) {
   const https = `https://${host}`;
   const wss = `wss://${host}`;
   const lightRulesUrl = normalizeNotificationIntelligenceLightRulesPluginUrl(process.env.NOTIFICATION_INTELLIGENCE_LIGHT_RULES_URL || `${https}${NOTIFICATION_INTELLIGENCE_LIGHT_RULES_PLUGIN_PATH}`);
+  const lightEffectsSendUrl = normalizeNotificationIntelligenceLightEffectsSendUrl(process.env.NOTIFICATION_INTELLIGENCE_LIGHT_EFFECTS_SEND_URL || lightRulesUrl);
   return {
     lightApiUrl: `${https}/api/message/tob/sendMessage`,
     notificationIntelligenceLightRulesPluginUrl: lightRulesUrl,
+    notificationIntelligenceLightEffectsSendUrl: lightEffectsSendUrl,
     relayTunnelUrl: `${wss}/message/messages/ws/plugin`,
     appNameMapUrl: `${https}/api/application-config/app-package/config-all`,
     modelProxyLongRecordingSubmitTaskUrl: `${https}/api/model-proxy/long-recording/submit-task`,
@@ -4784,9 +4801,6 @@ function readPersistedEnvName() {
   return;
 }
 function loadEnvName() {
-  const fromEnvVar = process.env.PHONE_NOTIFICATIONS_ENV?.trim();
-  if (fromEnvVar && VALID_ENVS.has(fromEnvVar))
-    return fromEnvVar;
   const fromDotEnv = readPersistedEnvName();
   if (fromDotEnv)
     return fromDotEnv;
@@ -4809,11 +4823,129 @@ function getAvailableEnvs() {
 }
 
 // src/light/sender.ts
-async function sendLightEffect(apiKey, segments, logger, repeatInput, reason, title) {
+async function sendLightEffect(apiKey, segments, logger, repeatInput, reason, title, options) {
+  const resolvedTitle = resolveLightTitle(title, reason, segments);
+  let repeatTimes;
+  try {
+    repeatTimes = normalizeRepeatTimes(repeatInput);
+  } catch (error) {
+    return { ok: false, error: error?.message ?? String(error) };
+  }
+  const intelligence = await sendViaNotificationIntelligence(apiKey, segments, repeatTimes, resolvedTitle, reason, options?.bizUniqueId, logger);
+  if (!intelligence.fallback) {
+    return intelligence.result;
+  }
+  logger?.warn(`Light sender: notification-intelligence entry unavailable (${intelligence.fallbackReason}), falling back to legacy message-service`);
+  return sendViaLegacyMessageService(apiKey, segments, logger, repeatInput, reason, resolvedTitle);
+}
+async function sendViaNotificationIntelligence(apiKey, segments, repeatTimes, title, reason, bizUniqueId, logger) {
+  const url = getEnvUrls().notificationIntelligenceLightEffectsSendUrl;
+  const requestBody = {
+    title,
+    repeat_times: repeatTimes,
+    segments
+  };
+  if (reason?.trim())
+    requestBody.reason = reason;
+  const trimmedBizUniqueId = bizUniqueId?.trim();
+  if (trimmedBizUniqueId)
+    requestBody.bizUniqueId = trimmedBizUniqueId;
+  logger?.info(`Light sender: POST ${url}, bizUniqueId=${trimmedBizUniqueId ?? "(server-generated)"}, ` + `title=${title}, repeat_times=${repeatTimes}, segments_count=${segments.length}`);
+  let res;
+  try {
+    res = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-Api-Key-Id": stripBearer(apiKey)
+      },
+      body: JSON.stringify(requestBody)
+    });
+  } catch (error) {
+    return {
+      fallback: true,
+      fallbackReason: `network error: ${error?.message ?? String(error)}`,
+      result: { ok: false, error: error?.message ?? String(error) }
+    };
+  }
+  const resBody = await res.text();
+  if (!res.ok) {
+    if (res.status === 404 || res.status === 405 || res.status === 401 && /jwt is missing/i.test(resBody)) {
+      return {
+        fallback: true,
+        fallbackReason: `HTTP ${res.status}`,
+        result: { ok: false, status: res.status, error: resBody }
+      };
+    }
+    logger?.warn(`Light sender: FAILED ${res.status}, url=${url}, resBody=${resBody.substring(0, 500)}`);
+    return {
+      fallback: false,
+      result: {
+        ok: false,
+        status: res.status,
+        error: resBody,
+        via: "notification-intelligence"
+      }
+    };
+  }
+  let parsed = null;
+  try {
+    parsed = resBody.trim() ? JSON.parse(resBody) : null;
+  } catch {}
+  if (!parsed || typeof parsed !== "object") {
+    logger?.warn(`Light sender: invalid JSON from ${url}, resBody=${resBody.substring(0, 200)}`);
+    return {
+      fallback: false,
+      result: {
+        ok: false,
+        error: "invalid JSON response",
+        via: "notification-intelligence"
+      }
+    };
+  }
+  const data = parsed.data ?? null;
+  if (parsed.code && parsed.code !== "000000") {
+    const message = parsed.msg ?? parsed.message ?? `remote code ${parsed.code}`;
+    logger?.warn(`Light sender: FAILED code=${parsed.code}, msg=${message}`);
+    return {
+      fallback: false,
+      result: {
+        ok: false,
+        error: String(message),
+        response: parsed,
+        via: "notification-intelligence"
+      }
+    };
+  }
+  if (data?.success === false) {
+    const message = data.message ?? "remote business request failed";
+    logger?.warn(`Light sender: FAILED business, message=${message}`);
+    return {
+      fallback: false,
+      result: {
+        ok: false,
+        error: String(message),
+        response: parsed,
+        via: "notification-intelligence"
+      }
+    };
+  }
+  const effectiveBizUniqueId = typeof data?.bizUniqueId === "string" && data.bizUniqueId.trim() || trimmedBizUniqueId;
+  logger?.info(`Light sender: OK bizUniqueId=${effectiveBizUniqueId ?? "-"}, resBody=${resBody.substring(0, 200)}`);
+  return {
+    fallback: false,
+    result: {
+      ok: true,
+      bizUniqueId: effectiveBizUniqueId || undefined,
+      response: parsed,
+      via: "notification-intelligence"
+    }
+  };
+}
+async function sendViaLegacyMessageService(apiKey, segments, logger, repeatInput, reason, resolvedTitle) {
   const apiUrl = getEnvUrls().lightApiUrl;
   const appKey = "phone-notifications";
   const templateId = "1990771146010017800";
-  const resolvedTitle = resolveLightTitle(title, reason, segments);
   logger?.info(`Light sender: apiUrl=${apiUrl ?? "UNSET"}, appKey=${appKey ? appKey.substring(0, 8) + "…" : "UNSET"}, templateId=${templateId ?? "UNSET"}, apiKey=${apiKey ? apiKey.substring(0, 20) + "…" : "EMPTY"}, title=${resolvedTitle}, reason=${reason ?? ""}, segments=${JSON.stringify(segments)}`);
   if (!apiUrl || !appKey || !templateId) {
     return {
@@ -4841,17 +4973,25 @@ async function sendLightEffect(apiKey, segments, logger, repeatInput, reason, ti
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      "X-Api-Key-Id": apiKey.startsWith("Bearer ") ? apiKey.slice("Bearer ".length) : apiKey
+      "X-Api-Key-Id": stripBearer(apiKey)
     },
     body: JSON.stringify(requestBody)
   });
   const resBody = await res.text();
   if (!res.ok) {
     logger?.warn(`Light sender: FAILED ${res.status}, url=${apiUrl}, resBody=${resBody.substring(0, 500)}`);
-    return { ok: false, status: res.status, error: resBody };
+    return { ok: false, status: res.status, error: resBody, via: "message-service" };
   }
   logger?.info(`Light sender: OK bizUniqueId=${bizUniqueId}, resBody=${resBody.substring(0, 200)}`);
-  return { ok: true, bizUniqueId, response: JSON.parse(resBody) };
+  return {
+    ok: true,
+    bizUniqueId,
+    response: JSON.parse(resBody),
+    via: "message-service"
+  };
+}
+function stripBearer(apiKey) {
+  return apiKey.startsWith("Bearer ") ? apiKey.slice("Bearer ".length) : apiKey;
 }
 function resolveLightTitle(title, reason, segments) {
   const trimmedTitle = title?.trim();
@@ -4968,7 +5108,7 @@ function upsertToolsForPolicy(policy, tools) {
 function resolveConfigPath2() {
   return resolveConfigPath();
 }
-var LIGHT_TOOLS = [...LIGHT_RULE_TOOL_NAME_LIST];
+var LIGHT_TOOLS = ["light_control", ...LIGHT_RULE_TOOL_NAME_LIST];
 function upsertLightRuleToolsAlsoAllow(cfg) {
   if (!isObject(cfg.tools))
     cfg.tools = {};
@@ -4988,7 +5128,7 @@ function upsertLightRuleToolsAlsoAllow(cfg) {
   return { globalChanged, mainAgentChanged };
 }
 function registerLightSetupTools(light) {
-  light.command("setup").description("自动放行云端灯效规则工具（兼容 tools.allow / tools.alsoAllow）").action(() => {
+  light.command("setup").description("自动放行一次性灯效与云端灯效规则工具（兼容 tools.allow / tools.alsoAllow）").action(() => {
     const configPath = resolveConfigPath2();
     if (!import_node_fs10.existsSync(configPath)) {
       exitError("CONFIG_NOT_FOUND", `未找到配置文件: ${configPath}`);
@@ -5685,6 +5825,180 @@ var checkTunnel = ({ stateDir }) => {
   };
 };
 
+// src/cli/doctor/check-local-gateway.ts
+var import_node_net = __toESM(require("node:net"));
+
+// src/tunnel/gateway-target.ts
+var DEFAULT_GATEWAY_PORT = "18789";
+var DEFAULT_GATEWAY_HOST = "127.0.0.1";
+var BASE_URL_ENV_KEYS = [
+  "PHONE_NOTIFICATIONS_GATEWAY_BASE_URL",
+  "OPENCLAW_GATEWAY_BASE_URL",
+  "QCLAW_GATEWAY_BASE_URL"
+];
+var PORT_ENV_KEYS = [
+  "OPENCLAW_GATEWAY_PORT",
+  "QCLAW_GATEWAY_PORT"
+];
+function trimToUndefined2(value) {
+  if (typeof value !== "string")
+    return;
+  const trimmed = value.trim();
+  return trimmed || undefined;
+}
+function firstEnv(env, keys) {
+  for (const key of keys) {
+    const value = trimToUndefined2(env[key]);
+    if (value)
+      return { key, value };
+  }
+  return;
+}
+function normalizePort(value) {
+  const raw = typeof value === "number" && Number.isInteger(value) ? String(value) : trimToUndefined2(value);
+  if (!raw || !/^\d+$/.test(raw))
+    return;
+  const port = Number.parseInt(raw, 10);
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+    return;
+  }
+  return String(port);
+}
+function normalizeBaseUrl(raw) {
+  const withScheme = /^[a-z][a-z0-9+.-]*:\/\//i.test(raw) ? raw : `http://${raw}`;
+  let parsed;
+  try {
+    parsed = new URL(withScheme);
+  } catch {
+    return;
+  }
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+    return;
+  }
+  if (!parsed.hostname)
+    return;
+  return `${parsed.protocol}//${parsed.host}`;
+}
+function isGatewayTlsEnabled(config) {
+  return config.gateway?.tls?.enabled === true;
+}
+function resolveGatewayPort(params) {
+  const envPort = firstEnv(params.env, PORT_ENV_KEYS);
+  const normalizedEnvPort = envPort ? normalizePort(envPort.value) : undefined;
+  if (envPort && normalizedEnvPort) {
+    return { port: normalizedEnvPort, source: envPort.key };
+  }
+  const configPort = normalizePort(params.config.gateway?.port);
+  if (configPort) {
+    return { port: configPort, source: "openclaw.json gateway.port" };
+  }
+  return { port: DEFAULT_GATEWAY_PORT, source: "default" };
+}
+function resolveLocalGatewayBaseUrl(params = {}) {
+  const config = params.config ?? {};
+  const env = params.env ?? process.env;
+  const tlsEnabled = isGatewayTlsEnabled(config);
+  const envBaseUrl = firstEnv(env, BASE_URL_ENV_KEYS);
+  if (envBaseUrl) {
+    const normalized = normalizeBaseUrl(envBaseUrl.value);
+    if (normalized) {
+      return {
+        baseUrl: normalized,
+        source: envBaseUrl.key,
+        explicit: true,
+        tlsEnabled
+      };
+    }
+  }
+  const { port, source } = resolveGatewayPort({ config, env });
+  const baseUrl = `http://${DEFAULT_GATEWAY_HOST}:${port}`;
+  const warning = envBaseUrl ? `忽略无效的 ${envBaseUrl.key}=${envBaseUrl.value}` : undefined;
+  return {
+    baseUrl,
+    source,
+    explicit: false,
+    tlsEnabled,
+    warning
+  };
+}
+function resolveLocalGatewayTcpTarget(baseUrl) {
+  let parsed;
+  try {
+    parsed = new URL(baseUrl);
+  } catch {
+    return null;
+  }
+  const port = parsed.port ? Number.parseInt(parsed.port, 10) : parsed.protocol === "https:" ? 443 : parsed.protocol === "http:" ? 80 : Number.NaN;
+  if (!parsed.hostname || !Number.isInteger(port))
+    return null;
+  return { host: parsed.hostname, port };
+}
+
+// src/cli/doctor/check-local-gateway.ts
+var PROBE_TIMEOUT_MS = 1200;
+function probeTcp(host, port) {
+  return new Promise((resolve2) => {
+    const socket = import_node_net.default.connect({ host, port });
+    let settled = false;
+    const finish = (result) => {
+      if (settled)
+        return;
+      settled = true;
+      socket.destroy();
+      resolve2(result);
+    };
+    socket.setTimeout(PROBE_TIMEOUT_MS);
+    socket.once("connect", () => finish({ ok: true }));
+    socket.once("timeout", () => finish({ ok: false, error: "timeout" }));
+    socket.once("error", (err) => finish({ ok: false, error: err.message }));
+  });
+}
+var checkLocalGateway = async ({ cfg }) => {
+  const resolution = resolveLocalGatewayBaseUrl({ config: cfg });
+  if (resolution.warning) {
+    return {
+      id: "local-gateway",
+      severity: "warn",
+      title: "本地 Gateway 地址配置无效",
+      detail: `${resolution.warning}，当前回退到 ${resolution.baseUrl}`,
+      fixDescription: "请修正 PHONE_NOTIFICATIONS_GATEWAY_BASE_URL，或清理该环境变量后重启 openclaw/gateway",
+      fix: null
+    };
+  }
+  if (resolution.tlsEnabled && !resolution.explicit) {
+    return {
+      id: "local-gateway",
+      severity: "warn",
+      title: "Gateway TLS 可能阻断 Relay 本地代理",
+      detail: `检测到 gateway.tls.enabled=true，但插件本地代理默认连接 ${resolution.baseUrl}。` + "如果 Gateway 只接受 HTTPS/WSS，本地 RPC 握手会失败。",
+      fixDescription: "设置 PHONE_NOTIFICATIONS_GATEWAY_BASE_URL=https://127.0.0.1:<port>，或关闭 gateway.tls.enabled 后重启 gateway",
+      fix: null
+    };
+  }
+  const target = resolveLocalGatewayTcpTarget(resolution.baseUrl);
+  if (!target) {
+    return {
+      id: "local-gateway",
+      severity: "warn",
+      title: "本地 Gateway 地址无法解析",
+      detail: `无法解析插件将使用的本地 Gateway 地址: ${resolution.baseUrl}`,
+      fixDescription: "请设置 PHONE_NOTIFICATIONS_GATEWAY_BASE_URL=http://127.0.0.1:<port>",
+      fix: null
+    };
+  }
+  const probe = await probeTcp(target.host, target.port);
+  if (probe.ok)
+    return null;
+  return {
+    id: "local-gateway",
+    severity: "warn",
+    title: "本地 Gateway 不可达",
+    detail: `插件将连接 ${resolution.baseUrl}，但 TCP 探测失败` + (probe.error ? `: ${probe.error}` : ""),
+    fixDescription: "请执行 openclaw gateway status，确认 gateway.port 与 PHONE_NOTIFICATIONS_GATEWAY_BASE_URL 是否一致",
+    fix: null
+  };
+};
+
 // src/cli/doctor/check-node-version.ts
 var MIN_MAJOR = 22;
 var MIN_MINOR = 12;
@@ -5792,7 +6106,7 @@ function pickNewestVersion(versions) {
 var import_node_fs15 = require("node:fs");
 function readBuildInjectedVersion() {
   if (false) {}
-  const version = "1.12.2".trim();
+  const version = "1.12.4".trim();
   return version || undefined;
 }
 function readPluginVersionFromPackageJson() {
@@ -5847,6 +6161,7 @@ var allCheckers = [
   checkStateDirPerms,
   checkToolPolicy,
   checkTunnel,
+  checkLocalGateway,
   checkNodeVersion,
   checkPluginVersion
 ];
@@ -6456,5 +6771,5 @@ program2.parseAsync(process.argv).catch((err) => {
   process.exit(1);
 });
 
-//# debugId=5548672AE9D3231064756E2164756E21
+//# debugId=BC4E61ACFD730DE964756E2164756E21
 //# sourceMappingURL=ntf.cjs.map