@yoooclaw/phone-notifications 1.10.6-beta.0 → 1.10.6-beta.2

package/dist/index.cjs

@@ -5424,7 +5424,7 @@ function readBuildInjectedVersion() {
   if (false) {
     return void 0;
   }
-  const version = "1.10.6-beta.0".trim();
+  const version = "1.10.6-beta.2".trim();
   return version || void 0;
 }
 function readPluginVersionFromPackageJson() {
@@ -6454,15 +6454,26 @@ function resolveLightRuleTask(ctx, name) {
   }
   return null;
 }
+function readOptionalString(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed || void 0;
+}
+function isLegacyLightRuleWithoutType(raw) {
+  return raw.type === void 0 && readOptionalString(raw.name) !== void 0 && readOptionalString(raw.description) !== void 0 && Array.isArray(raw.segments);
+}
 function readMeta(taskDir) {
   const metaPath = (0, import_node_path4.join)(taskDir, "meta.json");
   if (!(0, import_node_fs5.existsSync)(metaPath)) return null;
   try {
     const raw = JSON.parse((0, import_node_fs5.readFileSync)(metaPath, "utf-8"));
-    if (raw.type !== "light-rule") return null;
-    if (!raw.createdAt) {
-      raw.createdAt = (0, import_node_fs5.statSync)(metaPath).birthtime.toISOString();
-    }
+    if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
+    if (raw.type !== "light-rule" && !isLegacyLightRuleWithoutType(raw)) return null;
+    if (!Array.isArray(raw.segments)) return null;
+    const name = readOptionalString(raw.name) ?? (0, import_node_path4.basename)(taskDir);
+    const description = readOptionalString(raw.description) ?? readOptionalString(raw.reason) ?? name;
+    const createdAt = readOptionalString(raw.createdAt) ?? (0, import_node_fs5.statSync)(metaPath).birthtime.toISOString();
+    const enabled = typeof raw.enabled === "boolean" ? raw.enabled : true;
     const repeatTimes = normalizeRepeatTimes({
       repeat: raw.repeat,
       repeat_times: raw.repeat_times
@@ -6470,7 +6481,13 @@ function readMeta(taskDir) {
     assertAncsRepeatTimes(repeatTimes);
     return {
       ...raw,
-      repeat_times: repeatTimes
+      name,
+      type: "light-rule",
+      description,
+      segments: raw.segments,
+      repeat_times: repeatTimes,
+      enabled,
+      createdAt
     };
   } catch {
     return null;
@@ -6676,6 +6693,7 @@ function registerLightRulesGateway(api, registry, logger, rememberBroadcast) {
   };
   registerGatewayMethodWithBroadcastCapture("lightrules.list", async ({ respond }) => {
     try {
+      registry.reload();
       const rules = registry.list().map((rule) => ({
         ...rule,
         id: rule.name
@@ -7229,14 +7247,21 @@ function err(code, message) {
   const data = { ok: false, error: { code, message } };
   return { content: [{ type: "text", text: JSON.stringify(data) }], details: data };
 }
+function registerToolWithAliases(api, tool, aliases) {
+  api.registerTool(tool);
+  for (const alias of aliases) {
+    api.registerTool({ ...tool, name: alias });
+  }
+}
 function registerLightRulesTools(api, registry, logger) {
-  api.registerTool({
+  registerToolWithAliases(api, {
     name: "lightrules.list",
     label: "List Light Rules",
     description: '\u5217\u51FA\u6240\u6709\u706F\u6548\u89C4\u5219\uFF08\u5305\u542B enabled/disabled \u72B6\u6001\uFF09\u3002\u5F53\u7528\u6237\u8BF4"\u5217\u51FA\u706F\u6548\u89C4\u5219"\u3001"\u6709\u54EA\u4E9B\u706F\u6548\u89C4\u5219"\u3001"\u67E5\u770B\u89C4\u5219"\u7B49\u65F6\u8C03\u7528\u3002\u6CE8\u610F\uFF1A\u706F\u6548\u89C4\u5219\u7684\u6240\u6709 CRUD \u64CD\u4F5C\u5FC5\u987B\u901A\u8FC7 lightrules.* \u5DE5\u5177\u5B8C\u6210\uFF0C\u7981\u6B62\u76F4\u63A5\u7528 write/edit \u4FEE\u6539 tasks/*/meta.json\u3002',
     parameters: { type: "object", properties: {}, additionalProperties: false },
     async execute(_toolCallId, _params) {
       try {
+        registry.reload();
         const rules = registry.list().map((rule) => ({ ...rule, id: rule.name }));
         return ok({ ok: true, rules });
       } catch (e) {
@@ -7244,8 +7269,8 @@ function registerLightRulesTools(api, registry, logger) {
         return err("INTERNAL_ERROR", e?.message ?? "Unknown error");
       }
     }
-  });
-  api.registerTool({
+  }, ["lightrules_list"]);
+  registerToolWithAliases(api, {
     name: "lightrules.create",
     label: "Create Light Rule",
     description: '\u521B\u5EFA\u4E00\u6761\u706F\u6548\u89C4\u5219\uFF0C\u6307\u5B9A\u540D\u79F0\u3001\u81EA\u7136\u8BED\u8A00\u89E6\u53D1\u63CF\u8FF0\u548C\u706F\u6548\u53C2\u6570\u3002\u5F53\u7528\u6237\u8BF4"\u521B\u5EFA\u706F\u6548\u89C4\u5219"\u3001"\u65B0\u589E\u89C4\u5219"\u7B49\u65F6\u8C03\u7528\u3002',
@@ -7298,8 +7323,8 @@ function registerLightRulesTools(api, registry, logger) {
         return err("INTERNAL_ERROR", e?.message ?? "Unknown error");
       }
     }
-  });
-  api.registerTool({
+  }, ["lightrules_create"]);
+  registerToolWithAliases(api, {
     name: "lightrules.update",
     label: "Update Light Rule",
     description: '\u4FEE\u6539\u706F\u6548\u89C4\u5219\uFF08\u542F\u7528/\u7981\u7528\u3001\u6539\u63CF\u8FF0\u3001\u6539\u706F\u6548\u53C2\u6570\uFF09\u3002\u5F53\u7528\u6237\u8BF4"\u7981\u7528\u67D0\u6761\u89C4\u5219"\u3001"\u542F\u7528\u89C4\u5219"\u3001"\u4FEE\u6539\u706F\u6548\u89C4\u5219"\u7B49\u65F6\u8C03\u7528\u3002',
@@ -7356,8 +7381,8 @@ function registerLightRulesTools(api, registry, logger) {
         return err("INTERNAL_ERROR", e?.message ?? "Unknown error");
       }
     }
-  });
-  api.registerTool({
+  }, ["lightrules_update"]);
+  registerToolWithAliases(api, {
     name: "lightrules.delete",
     label: "Delete Light Rule",
     description: '\u5220\u9664\u4E00\u6761\u706F\u6548\u89C4\u5219\uFF08\u4E0D\u53EF\u6062\u590D\uFF09\u3002\u5F53\u7528\u6237\u8BF4"\u5220\u9664\u706F\u6548\u89C4\u5219"\u3001"\u79FB\u9664\u89C4\u5219"\u7B49\u65F6\u8C03\u7528\u3002',
@@ -7383,7 +7408,7 @@ function registerLightRulesTools(api, registry, logger) {
         return err("INTERNAL_ERROR", e?.message ?? "Unknown error");
       }
     }
-  });
+  }, ["lightrules_delete"]);
 }
 
 // src/light-rules/evaluator-job.ts
@@ -8601,7 +8626,11 @@ var LIGHT_TOOLS = [
   "lightrules.list",
   "lightrules.create",
   "lightrules.update",
-  "lightrules.delete"
+  "lightrules.delete",
+  "lightrules_list",
+  "lightrules_create",
+  "lightrules_update",
+  "lightrules_delete"
 ];
 function upsertLightControlAlsoAllow(cfg) {
   if (!isObject(cfg.tools)) cfg.tools = {};
@@ -11740,6 +11769,7 @@ var WsProxy = class {
 };
 
 // src/tunnel/proxy.ts
+var RELAY_TUNNEL_GATEWAY_CLIENT_INSTANCE_ID = "phone-notifications-relay-tunnel";
 var MAX_AUTO_PAIRING_APPROVALS = 3;
 var approveDevicePairingPromise = null;
 var approveDevicePairingWarned = false;
@@ -12144,7 +12174,8 @@ var TunnelProxy = class {
           id: clientId,
           version: "1.0.0",
           platform: process.platform,
-          mode: clientMode
+          mode: clientMode,
+          instanceId: RELAY_TUNNEL_GATEWAY_CLIENT_INSTANCE_ID
         },
         role,
         scopes,
@@ -12481,8 +12512,24 @@ function resolveExclusiveTunnelHint(params) {
   if (tailscaleMode) {
     return `gateway.tailscale.mode=${tailscaleMode}`;
   }
+  const remoteUrl = trimToUndefined2(configData?.gateway?.remote?.url);
+  if (remoteUrl && isExternalGatewayRemoteUrl(remoteUrl)) {
+    return `gateway.remote.url=${remoteUrl}`;
+  }
   return void 0;
 }
+function isExternalGatewayRemoteUrl(rawUrl) {
+  let host;
+  try {
+    host = new URL(rawUrl).hostname.toLowerCase();
+  } catch {
+    return false;
+  }
+  if (host === "localhost" || host === "::1" || host === "[::1]") {
+    return false;
+  }
+  return !/^127(?:\.\d{1,3}){0,3}$/.test(host);
+}
 function registerRelayTunnelLifecycle(deps) {
   const {
     api,
@@ -13100,6 +13147,7 @@ var index_default = {
     let broadcastFn = null;
     let cronService = null;
     let autoUpdateLifecycle = null;
+    let tunnelService = null;
     const openclawDir = api.runtime.state.resolveStateDir();
     const logger = openclawDir ? new PluginFileLogger(api.logger, openclawDir) : createVersionAwareLogger(api.logger);
     const lightRuleCtx = {
@@ -13126,12 +13174,34 @@ var index_default = {
         autoUpdateLifecycle?.notifyBroadcastReady();
       }
     }
+    function isDirectMobileGatewayRequest(opts) {
+      const client = opts.client?.connect?.client;
+      if (!client) return false;
+      if (client.instanceId === RELAY_TUNNEL_GATEWAY_CLIENT_INSTANCE_ID) {
+        return false;
+      }
+      return client.id === "openclaw-ios" || client.id === "openclaw-android";
+    }
+    async function deactivateRelayForDirectGatewayRequest(method, opts) {
+      if (!tunnelService || !isDirectMobileGatewayRequest(opts)) return;
+      const client = opts.client?.connect?.client;
+      try {
+        await tunnelService.deactivateForExternalTunnel(
+          `gateway method ${method} from ${client?.id ?? "unknown"}`
+        );
+      } catch (err2) {
+        logger.warn(
+          `Relay tunnel: failed to deactivate after direct gateway method ${method}: ${err2?.message ?? String(err2)}`
+        );
+      }
+    }
     function registerGatewayMethodWithBroadcastCapture(method, handler) {
-      api.registerGatewayMethod(method, (opts) => {
+      api.registerGatewayMethod(method, async (opts) => {
         cacheBroadcast(opts.context?.broadcast);
         if (opts.context?.cron) {
           cronService = opts.context.cron;
         }
+        await deactivateRelayForDirectGatewayRequest(method, opts);
         return handler(opts);
       });
     }
@@ -13170,7 +13240,7 @@ var index_default = {
         lightRuleRegistry.reload();
       }
     });
-    const tunnelService = registerRelayTunnelLifecycle({
+    tunnelService = registerRelayTunnelLifecycle({
       api,
       config,
       logger,
@@ -13202,7 +13272,7 @@ var index_default = {
     registerLightRulesGateway(api, lightRuleRegistry, logger, cacheBroadcast);
     registerLightRulesTools(api, lightRuleRegistry, logger);
     logger.info(
-      "\u706F\u6548\u89C4\u5219\u65B9\u6CD5\u5DF2\u6CE8\u518C: lightrules.list / lightrules.create / lightrules.update / lightrules.delete"
+      "\u706F\u6548\u89C4\u5219\u65B9\u6CD5\u5DF2\u6CE8\u518C: lightrules.list/create/update/delete + lightrules_* tool aliases"
     );
     autoUpdateLifecycle = registerAutoUpdateLifecycle({
       api,