tt-help-cli-ycl 1.4.158 → 1.4.159

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.158",
+  "version": "1.4.159",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/clash/daemon.js

@@ -342,6 +342,12 @@ export class ClashDaemon {
         error: "等待控制端就绪",
         meta: this._buildMeta(null),
       });
+      // 等待期也消费订阅命令：setSubscription 不依赖控制器上下文，应用成功即落盘，
+      // 下轮重试 readStoredSubscriptions 即可拉起实例 → 解除"无订阅↔无控制端"死锁
+      // （全新机器首次后台配置订阅的场景：没有它，命令永远无人消费）
+      try {
+        await this._pollCommands({ subscriptionOnly: true });
+      } catch {}
       this._running = false;
       this._waitTimer = setTimeout(() => this.start(), 10_000);
       return;
@@ -836,18 +842,31 @@ export class ClashDaemon {
 
   // ── 命令轮询（多通道：默认通道 + 每端口通道） ──
 
-  _pollCommands() {
+  /**
+   * 命令轮询消费
+   * @param {object} [opts]
+   * @param {boolean} [opts.subscriptionOnly] 等待控制端就绪期：只消费不依赖控制器上下文的命令
+   *   （setSubscription），其余保留在通道内待就绪后处理，避免丢失
+   */
+  _pollCommands({ subscriptionOnly = false } = {}) {
     if (!this._running) return;
-    this._withLock(async () => {
+    return this._withLock(async () => {
       for (const ch of ipc.listCommandChannels()) {
         let cmds = null;
         try {
           cmds = ipc.readCommand(ch);
         } catch {}
         if (!cmds) continue;
+        const kept = [];
         for (const cmd of cmds) {
           const target = this._routeController(cmd);
-          this._useController(target);
+          // 无控制端（等待就绪期/命令目标缺失）时，仅 setSubscription 可脱离控制器上下文执行，
+          // 其余命令保留，防止误消费后丢失
+          if ((!target || subscriptionOnly) && cmd.action !== "setSubscription") {
+            kept.push(cmd);
+            continue;
+          }
+          if (target) this._useController(target);
           const handler = this._cmdHandlers[cmd.action];
           if (handler) {
             await handler(cmd, target);
@@ -855,9 +874,10 @@ export class ClashDaemon {
             this._log(`📋 未知命令: ${JSON.stringify(cmd)}`);
           }
         }
-        ipc.clearCommand(ch);
+        if (kept.length) ipc.writeCommand(kept, ch);
+        else ipc.clearCommand(ch);
       }
-    }).catch(() => {});
+    }).catch((e) => this._log(`命令消费异常: ${e.message}`));
   }
 
   async _handleSwitchNode(cmd, c) {
@@ -1015,6 +1035,9 @@ export class ClashDaemon {
    * 保证 daemon/机器重启后自动恢复，不依赖服务端可达
    */
   async _handleSetSubscription(cmd, c) {
+    // 等待就绪期 _primary 为 null：用哑控制器上下文（proxyPort=0 → 默认通道）
+    // 保证订阅应用/落盘/健康上报不中断
+    c = c || { proxyPort: 0, clientName: "mihomo(内置)", _meta: {} };
     try {
       const subs = runtime.normalizeSubscriptions(cmd.subscriptions);
       if (!subs.length) {