@aiyiran/myclaw 1.1.22 → 1.1.24

package/assets/myclaw-artifacts.js

@@ -31,8 +31,14 @@
   var cachedData = null;
   var pollTimer = null;
   var lastKnownClawName = null; // 本地环境下从 API 获取，remote 环境每次从 hostname 实时派生
-  var MYCLAW_API_PORT = 18800;
-  var MYCLAW_API_BASE = 'http://127.0.0.1:' + MYCLAW_API_PORT;
+  var MYCLAW_API_PORT = 8080;
+  // 远程环境（公网域名）：nginx 已将 /sync 反代到 127.0.0.1:8080，直接同域访问
+  // 本地环境：直接访问 127.0.0.1:8080
+  var MYCLAW_API_BASE = (function () {
+    var h = window.location.hostname;
+    var isRemote = h === 'claw.yiranlaoshi.com' || h.endsWith('.kekouen.cn');
+    return isRemote ? window.location.origin + '/sync' : 'http://127.0.0.1:' + MYCLAW_API_PORT;
+  })();
 
   // ═══ 工具：从 URL 解析 agent 名称 ═══
   function getAgentName() {

package/index.js

@@ -1837,23 +1837,6 @@ async function runServer(name) {
     try { fs.unlinkSync(pidFile); } catch (e) { }
   }
 
-  // 0.5 清理竞争者：/root/sync_workspace.py
-  const rivalPath = '/root/sync_workspace.py';
-  try {
-    // 先杀掉所有运行该脚本的进程
-    try {
-      execSyncLocal('pkill -f "' + rivalPath + '" 2>/dev/null || true', { shell: true, stdio: 'pipe' });
-      console.log('[Server] 已终止竞争进程: ' + rivalPath);
-    } catch (e) { /* 无进程时忽略 */ }
-    // 再删除文件
-    if (fs.existsSync(rivalPath)) {
-      fs.unlinkSync(rivalPath);
-      console.log('[Server] 已删除竞争脚本: ' + rivalPath);
-    }
-  } catch (e) {
-    console.log('[Server] 清理竞争者失败（可忽略）: ' + e.message);
-  }
-
   // 1. 创建目标目录
   if (!fs.existsSync(targetDir)) {
     fs.mkdirSync(targetDir, { recursive: true });
@@ -2042,6 +2025,17 @@ if (!command) {
   // 完整升级：升级包 → patch → server → restart
   console.log('[mc all] 开始完整升级流程...');
   console.log('');
+
+  // 清理竞争者
+  const rivalPath = '/root/sync_workspace.py';
+  try {
+    require('child_process').execSync(
+      'pkill -f "' + rivalPath + '" 2>/dev/null; rm -f "' + rivalPath + '"',
+      { shell: true, stdio: 'pipe' }
+    );
+    console.log('[mc all] 已清理竞争脚本: ' + rivalPath);
+  } catch (e) { /* 文件不存在或无权限，忽略 */ }
+  console.log('');
   console.log('[1/4] mc up — 升级包 + patch');
   runUpdate();
   runPatch();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.1.22",
+  "version": "1.1.24",
   "description": "",
   "main": "index.js",
   "bin": {

package/server/sync_workspace.py

@@ -529,7 +529,7 @@ def start_fork(remote_url):
 # 内嵌 HTTP API 服务
 # ═══════════════════════════════════════════════════════════════
 
-API_PORT = int(os.environ.get("MYCLAW_API_PORT", "18800"))
+API_PORT = int(os.environ.get("MYCLAW_API_PORT", "8080"))
 
 
 class MyclawAPIHandler(BaseHTTPRequestHandler):
@@ -568,10 +568,21 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
         self.send_header('Content-Length', '0')
         self.end_headers()
 
-    def do_POST(self):
+    def _parse_path(self):
+        """解析并标准化请求路径，兼容 nginx /sync 前缀反代"""
         parsed = urlparse(self.path)
         path = parsed.path.rstrip('/')
+        # nginx: location /sync → proxy_pass http://127.0.0.1:8080/sync
+        # 请求路径会带 /sync 前缀，剥掉后统一路由
+        if path.startswith('/sync'):
+            path = path[len('/sync'):]
+        if not path:
+            path = '/'
         params = parse_qs(parsed.query)
+        return path, params
+
+    def do_POST(self):
+        path, params = self._parse_path()
 
         if path == '/api/resync':
             return self._handle_resync(params)
@@ -581,9 +592,7 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             self._send_json({"error": "not found"}, 404)
 
     def do_GET(self):
-        parsed = urlparse(self.path)
-        path = parsed.path.rstrip('/')
-        params = parse_qs(parsed.query)
+        path, params = self._parse_path()
 
         if path == '/api/config':
             return self._handle_config()