@yoooclaw/phone-notifications 1.11.14 → 1.11.16

package/README.md

@@ -152,7 +152,7 @@ bash install.sh --tgz-url ./yoooclaw-phone-notifications-1.2.3.tgz
 5. 写入 `<configPath>` 配置：
    - `plugins.entries` — 启用插件，合并用户配置
    - `plugins.installs` — 记录安装来源和版本
-   - `tools.alsoAllow` / `agents.main.tools.alsoAllow` — 自动放行 `light_control` 与 `lightrules_*` 工具
+   - `tools.allow` / `tools.alsoAllow` 与 `agents.main.tools.*` — 自动放行 `light_control` 与 `lightrules_*` 工具
    - 若宿主已启用 `plugins.allow` 白名单，会自动补入 `phone-notifications`，确保插件能被宿主加载
    - 清理该插件旧的 `plugins.load.paths` / 旧安装记录，避免继续命中之前通过 `openclaw plugins install` 或 `--link` 保留的副本
 6. 如传入 `--api-key` / `--token`，写入 `<stateDir>/credentials.json`

package/dist/index.cjs

@@ -5574,7 +5574,7 @@ function readBuildInjectedVersion() {
   if (false) {
     return void 0;
   }
-  const version = "1.11.14".trim();
+  const version = "1.11.16".trim();
   return version || void 0;
 }
 function readPluginVersionFromPackageJson() {
@@ -9243,6 +9243,39 @@ function ensureArray(obj, key) {
   obj[key] = next;
   return next;
 }
+function hasOwnProperty(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
+function appendUniqueValues(target, values) {
+  let changed = false;
+  for (const value of values) {
+    if (!target.includes(value)) {
+      target.push(value);
+      changed = true;
+    }
+  }
+  return changed;
+}
+function upsertToolsForPolicy(policy, tools) {
+  if (Array.isArray(policy.allow)) {
+    let changed = false;
+    if (Array.isArray(policy.alsoAllow)) {
+      changed = appendUniqueValues(
+        policy.allow,
+        policy.alsoAllow.filter((value) => typeof value === "string")
+      );
+    }
+    changed = appendUniqueValues(policy.allow, tools) || changed;
+    if (hasOwnProperty(policy, "alsoAllow")) {
+      delete policy.alsoAllow;
+      changed = true;
+    }
+    return changed;
+  }
+  if (hasOwnProperty(policy, "allow")) return false;
+  const alsoAllow = ensureArray(policy, "alsoAllow");
+  return appendUniqueValues(alsoAllow, tools);
+}
 function resolveConfigPath2() {
   const fromEnv = process.env.OPENCLAW_CONFIG_PATH?.trim();
   if (fromEnv) return fromEnv;
@@ -9251,14 +9284,7 @@ function resolveConfigPath2() {
 var LIGHT_TOOLS = ["light_control", ...LIGHT_RULE_TOOL_NAME_LIST];
 function upsertLightControlAlsoAllow(cfg) {
   if (!isObject(cfg.tools)) cfg.tools = {};
-  const toolsAlsoAllow = ensureArray(cfg.tools, "alsoAllow");
-  let globalChanged = false;
-  for (const tool of LIGHT_TOOLS) {
-    if (!toolsAlsoAllow.includes(tool)) {
-      toolsAlsoAllow.push(tool);
-      globalChanged = true;
-    }
-  }
+  const globalChanged = upsertToolsForPolicy(cfg.tools, LIGHT_TOOLS);
   if (!isObject(cfg.agents)) cfg.agents = {};
   const agents = cfg.agents;
   const list = ensureArray(agents, "list");
@@ -9270,18 +9296,11 @@ function upsertLightControlAlsoAllow(cfg) {
     list.push(mainAgent);
   }
   if (!isObject(mainAgent.tools)) mainAgent.tools = {};
-  const mainAlsoAllow = ensureArray(mainAgent.tools, "alsoAllow");
-  let mainAgentChanged = false;
-  for (const tool of LIGHT_TOOLS) {
-    if (!mainAlsoAllow.includes(tool)) {
-      mainAlsoAllow.push(tool);
-      mainAgentChanged = true;
-    }
-  }
+  const mainAgentChanged = upsertToolsForPolicy(mainAgent.tools, LIGHT_TOOLS);
   return { globalChanged, mainAgentChanged };
 }
 function registerLightSetupTools(light) {
-  light.command("setup").description("\u81EA\u52A8\u653E\u884C light_control\uFF08\u5199\u5165 tools.alsoAllow \u4E0E agents.main.tools.alsoAllow\uFF09").action(() => {
+  light.command("setup").description("\u81EA\u52A8\u653E\u884C light_control\uFF08\u517C\u5BB9 tools.allow / tools.alsoAllow\uFF09").action(() => {
     const configPath = resolveConfigPath2();
     if (!(0, import_node_fs12.existsSync)(configPath)) {
       exitError("CONFIG_NOT_FOUND", `\u672A\u627E\u5230\u914D\u7F6E\u6587\u4EF6: ${configPath}`);
@@ -12009,56 +12028,123 @@ init_asr();
 // src/recording/account-oss.ts
 init_credentials();
 init_env();
-async function deleteAccountOssFile(fileUrl, logger) {
-  const trimmed = fileUrl?.trim();
-  if (!trimmed) {
-    return { ok: false, error: "fileUrl is empty" };
+var DEFAULT_DELETE_MAX_ATTEMPTS = 3;
+var DEFAULT_DELETE_BACKOFF_MS = 500;
+function getDeleteMaxAttempts() {
+  const raw = process.env.OPENCLAW_OSS_DELETE_MAX_ATTEMPTS;
+  if (raw) {
+    const parsed = Number(raw);
+    if (Number.isFinite(parsed) && parsed >= 1) return Math.floor(parsed);
   }
-  const apiKey = loadApiKey();
-  if (!apiKey) {
-    return { ok: false, error: "API Key \u672A\u8BBE\u7F6E\uFF0C\u8DF3\u8FC7 OSS \u6587\u4EF6\u5220\u9664" };
+  return DEFAULT_DELETE_MAX_ATTEMPTS;
+}
+function getDeleteBackoffMs() {
+  const raw = process.env.OPENCLAW_OSS_DELETE_BACKOFF_MS;
+  if (raw) {
+    const parsed = Number(raw);
+    if (Number.isFinite(parsed) && parsed >= 0) return parsed;
   }
-  const baseEndpoint = getEnvUrls().accountFileDeleteUrl;
-  const headerKey = apiKey.startsWith("Bearer ") ? apiKey.slice("Bearer ".length) : apiKey;
-  const url = new URL(baseEndpoint);
-  url.searchParams.set("fileUrl", trimmed);
-  const endpoint = url.toString();
-  logger.info(`[account-oss-delete] \u63D0\u4EA4 OSS \u6587\u4EF6\u5220\u9664: endpoint=${endpoint}`);
+  return DEFAULT_DELETE_BACKOFF_MS;
+}
+function sleep3(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isRetryableStatus(status) {
+  return status === 429 || status >= 500;
+}
+function parseBody(text) {
+  if (!text) return void 0;
+  try {
+    return JSON.parse(text);
+  } catch {
+    return "invalid-json";
+  }
+}
+function extractCode(payload) {
+  if (!payload) return void 0;
+  if (typeof payload.code === "number") return String(payload.code);
+  return payload.code?.trim?.();
+}
+async function attemptDelete(endpoint, headerKey, logger) {
   let res;
   try {
     res = await fetch(endpoint, {
       method: "POST",
-      headers: {
-        "X-Api-Key-Id": headerKey
-      }
+      headers: { "X-Api-Key-Id": headerKey }
     });
   } catch (err2) {
-    const error = err2?.message ?? String(err2);
-    logger.warn(`[account-oss-delete] \u7F51\u7EDC\u5F02\u5E38: ${error}`);
-    return { ok: false, error };
+    return { kind: "retryable", error: err2?.message ?? String(err2) };
   }
   const text = await res.text();
   if (!res.ok) {
+    const error = `HTTP ${res.status} ${text.slice(0, 200)}`;
+    if (isRetryableStatus(res.status)) {
+      return { kind: "retryable", error };
+    }
     logger.warn(
       `[account-oss-delete] HTTP \u9519\u8BEF: status=${res.status}, body=${text.slice(0, 300)}`
     );
-    return { ok: false, error: `HTTP ${res.status} ${text.slice(0, 200)}` };
+    return { kind: "permanent", error };
   }
-  let payload;
-  try {
-    payload = text ? JSON.parse(text) : void 0;
-  } catch {
+  const payload = parseBody(text);
+  if (payload === "invalid-json") {
     logger.warn(`[account-oss-delete] \u54CD\u5E94\u975E JSON: body=${text.slice(0, 300)}`);
-    return { ok: false, error: "response is not JSON" };
+    return { kind: "permanent", error: "response is not JSON" };
   }
-  const code = typeof payload?.code === "number" ? String(payload.code) : payload?.code?.trim?.();
+  const code = extractCode(payload);
   if (code !== "000000") {
     const msg = payload?.msg?.trim?.() || text.slice(0, 200);
     logger.warn(`[account-oss-delete] \u4E1A\u52A1\u5931\u8D25: code=${code ?? "n/a"}, msg=${msg}`);
-    return { ok: false, error: `${code ?? "unknown"} ${msg}`.trim() };
+    return { kind: "permanent", error: `${code ?? "unknown"} ${msg}`.trim() };
+  }
+  return { kind: "ok" };
+}
+async function deleteAccountOssFile(fileUrl, logger, options) {
+  const trimmed = fileUrl?.trim();
+  if (!trimmed) {
+    return { ok: false, error: "fileUrl is empty" };
+  }
+  const apiKey = loadApiKey();
+  if (!apiKey) {
+    return { ok: false, error: "API Key \u672A\u8BBE\u7F6E\uFF0C\u8DF3\u8FC7 OSS \u6587\u4EF6\u5220\u9664" };
+  }
+  const baseEndpoint = getEnvUrls().accountFileDeleteUrl;
+  const headerKey = apiKey.startsWith("Bearer ") ? apiKey.slice("Bearer ".length) : apiKey;
+  const url = new URL(baseEndpoint);
+  url.searchParams.set("fileUrl", trimmed);
+  const endpoint = url.toString();
+  const maxAttempts = Math.max(
+    1,
+    Math.floor(options?.maxAttempts ?? getDeleteMaxAttempts())
+  );
+  const baseBackoff = Math.max(0, options?.backoffMs ?? getDeleteBackoffMs());
+  logger.info(
+    `[account-oss-delete] \u63D0\u4EA4 OSS \u6587\u4EF6\u5220\u9664: endpoint=${endpoint}, maxAttempts=${maxAttempts}`
+  );
+  let lastError = "unknown error";
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    const outcome = await attemptDelete(endpoint, headerKey, logger);
+    if (outcome.kind === "ok") {
+      logger.info(`[account-oss-delete] OSS \u6587\u4EF6\u5DF2\u5220\u9664: fileUrl=${trimmed}`);
+      return { ok: true };
+    }
+    if (outcome.kind === "permanent") {
+      return { ok: false, error: outcome.error };
+    }
+    lastError = outcome.error;
+    if (attempt < maxAttempts) {
+      const delay = baseBackoff * Math.pow(2, attempt - 1);
+      logger.warn(
+        `[account-oss-delete] \u4E34\u65F6\u5931\u8D25 (attempt ${attempt}/${maxAttempts}): ${outcome.error}, ${delay}ms \u540E\u91CD\u8BD5`
+      );
+      await sleep3(delay);
+    } else {
+      logger.warn(
+        `[account-oss-delete] \u4E34\u65F6\u5931\u8D25 (attempt ${attempt}/${maxAttempts}, \u653E\u5F03): ${outcome.error}`
+      );
+    }
   }
-  logger.info(`[account-oss-delete] OSS \u6587\u4EF6\u5DF2\u5220\u9664: fileUrl=${trimmed}`);
-  return { ok: true };
+  return { ok: false, error: lastError };
 }
 
 // src/recording/handler.ts
@@ -13386,6 +13472,15 @@ var WsProxy = class {
 
 // src/tunnel/proxy.ts
 var RELAY_TUNNEL_GATEWAY_CLIENT_INSTANCE_ID = "phone-notifications-relay-tunnel";
+var GATEWAY_OPERATOR_SCOPES = [
+  "operator.admin",
+  "operator.approvals",
+  "operator.pairing",
+  "operator.read",
+  "operator.write"
+];
+var GATEWAY_RPC_MIN_PROTOCOL = 3;
+var GATEWAY_RPC_MAX_PROTOCOL = 4;
 var MAX_AUTO_PAIRING_APPROVALS = 3;
 var RECENT_ABORTED_CHAT_RUN_TTL_MS = 6e4;
 var GATEWAY_RPC_HANDSHAKE_TIMEOUT_MS = 1e4;
@@ -13981,7 +14076,7 @@ var TunnelProxy = class {
         clearHandshakeTimer();
         this.storeIssuedDeviceToken({
           fallbackRole: "operator",
-          fallbackScopes: ["operator.admin"],
+          fallbackScopes: [...GATEWAY_OPERATOR_SCOPES],
           authInfo: frame.payload?.auth
         });
         this.gatewayWsAutoPairingApprovals = 0;
@@ -14090,7 +14185,7 @@ var TunnelProxy = class {
     const challengeNonce = frame.payload?.nonce ?? "";
     const connectRequestId = `tunnel-connect-${(0, import_node_crypto5.randomUUID)()}`;
     const role = "operator";
-    const scopes = ["operator.admin"];
+    const scopes = [...GATEWAY_OPERATOR_SCOPES];
     const gatewayConnectAuth = this.buildGatewayConnectAuth(role);
     this.opts.logger.info(
       `TunnelProxy: received connect.challenge (nonce=${challengeNonce}, connectReqId=${connectRequestId}, hasToken=${!!gatewayConnectAuth.authToken}, hasPassword=${!!gatewayConnectAuth.authPassword}, hasDeviceToken=${!!gatewayConnectAuth.deviceToken}), sending connect request with device identity`
@@ -14117,8 +14212,8 @@ var TunnelProxy = class {
       id: connectRequestId,
       method: "connect",
       params: {
-        minProtocol: 3,
-        maxProtocol: 3,
+        minProtocol: GATEWAY_RPC_MIN_PROTOCOL,
+        maxProtocol: GATEWAY_RPC_MAX_PROTOCOL,
         client: {
           id: clientId,
           version: "1.0.0",