soulsync 1.0.7 → 1.0.9

package/index.js

@@ -1,59 +1,106 @@
 const { spawn } = require('child_process');
 const path = require('path');
+const fs = require('fs');
 
 let pythonProcess = null;
 
-// 函数形式导出（推荐）
+function getPluginDir() {
+  return path.dirname(__filename);
+}
+
+function checkConfigExists(pluginDir) {
+  const configPath = path.join(pluginDir, 'config.json');
+  if (!fs.existsSync(configPath)) {
+    const examplePath = path.join(pluginDir, 'config.json.example');
+    if (fs.existsSync(examplePath)) {
+      fs.copyFileSync(examplePath, configPath);
+      console.log('[SoulSync] Created config.json from template');
+    }
+    return false;
+  }
+  
+  try {
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+    const email = (config.email || '').trim();
+    const password = (config.password || '').trim();
+    return email && password && email !== 'your-email@example.com' && password !== 'your-password';
+  } catch (e) {
+    return false;
+  }
+}
+
+function startPythonService(mode = '--start') {
+  const pluginDir = getPluginDir();
+  const pythonScript = path.join(pluginDir, 'src', 'main.py');
+  const pythonPath = process.env.PYTHON_PATH || 'python3';
+  
+  console.log(`[SoulSync] Starting Python service (${mode})...`);
+  
+  pythonProcess = spawn(pythonPath, [pythonScript, mode], {
+    cwd: pluginDir,
+    env: {
+      ...process.env,
+      OPENCLAW_PLUGIN: 'true',
+      PLUGIN_DIR: pluginDir
+    },
+    stdio: 'inherit'
+  });
+
+  pythonProcess.on('close', (code) => {
+    console.log(`[SoulSync] Python process exited with code ${code}`);
+    pythonProcess = null;
+  });
+  
+  pythonProcess.on('error', (err) => {
+    console.error(`[SoulSync] Failed to start Python process: ${err}`);
+    pythonProcess = null;
+  });
+  
+  return pythonProcess;
+}
+
 module.exports = function register(api) {
   console.log('[SoulSync] Registering plugin...');
 
-  // 自动启动 Python 服务
-  function startPythonService() {
-    const pluginDir = path.dirname(__filename);
-    const pythonScript = path.join(pluginDir, 'src', 'main.py');
-    const pythonPath = process.env.PYTHON_PATH || 'python3';
-    
-    console.log('[SoulSync] Auto-starting Python service...');
-    
-    pythonProcess = spawn(pythonPath, [pythonScript], {
-      cwd: pluginDir,
-      env: {
-        ...process.env,
-        OPENCLAW_PLUGIN: 'true',
-        PLUGIN_DIR: pluginDir
-      },
-      stdio: 'inherit'
-    });
-
-    pythonProcess.on('close', (code) => {
-      console.log(`[SoulSync] Python process exited with code ${code}`);
-      pythonProcess = null;
-    });
-    
-    pythonProcess.on('error', (err) => {
-      console.error(`[SoulSync] Failed to start Python process: ${err}`);
-      pythonProcess = null;
-    });
-  }
+  api.registerCli(
+    ({ program }) => {
+      program
+        .command('soulsync:setup')
+        .description('首次配置：注册或登录 SoulSync 账号')
+        .action(() => {
+          console.log('[SoulSync] Starting setup...');
+          startPythonService('--setup');
+        });
+    },
+    { commands: ['soulsync:setup'] }
+  );
 
-  // 注册CLI命令：启动 SoulSync
   api.registerCli(
     ({ program }) => {
       program
         .command('soulsync:start')
         .description('启动 SoulSync 同步服务')
         .action(() => {
+          const pluginDir = getPluginDir();
+          const configPath = path.join(pluginDir, 'config.json');
+          
+          if (!checkConfigExists(pluginDir)) {
+            console.log('[SoulSync] Not configured. Starting setup...');
+            startPythonService('--setup');
+            return;
+          }
+          
           if (pythonProcess) {
             console.log('[SoulSync] Service already running');
             return;
           }
-          startPythonService();
+          
+          startPythonService('--start');
         });
     },
     { commands: ['soulsync:start'] }
   );
 
-  // 注册CLI命令：停止 SoulSync
   api.registerCli(
     ({ program }) => {
       program
@@ -72,8 +119,6 @@ module.exports = function register(api) {
     { commands: ['soulsync:stop'] }
   );
 
-  // 自动启动服务
-  startPythonService();
-
+  console.log('[SoulSync] Plugin loaded. Run "openclaw soulsync:start" to begin.');
   console.log('[SoulSync] Plugin registered successfully');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soulsync",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "SoulSync plugin for OpenClaw - cross-bot memory synchronization",
   "main": "index.js",
   "repository": {

package/src/main.py

@@ -7,6 +7,8 @@ import json
 import os
 import sys
 import time
+import getpass
+import argparse
 
 # 获取插件根目录
 PLUGIN_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -111,8 +113,155 @@ class SoulSyncPlugin:
         with open(config_path, 'w', encoding='utf-8') as f:
             json.dump(config, f, indent=2, ensure_ascii=False)
         
-        print("Auth info saved to config.json")
-  
+        print("[SoulSync] Auth info saved to config.json")
+    
+    def run_setup(self):
+        """交互式设置：注册或登录"""
+        print("\n[SoulSync] ========================================")
+        print("[SoulSync] Welcome to SoulSync! / 欢迎使用 SoulSync!")
+        print("[SoulSync] ========================================")
+        print("[SoulSync] 1. Register / 注册")
+        print("[SoulSync] 2. Login / 登录")
+        print("[SoulSync] ========================================")
+        
+        choice = input("[SoulSync] Choose / 选择 (1/2): ").strip()
+        
+        if choice == '1':
+            return self._interactive_register()
+        elif choice == '2':
+            return self._interactive_login()
+        else:
+            print("[SoulSync] Invalid choice / 无效选择")
+            sys.exit(0)
+    
+    def _interactive_login(self):
+        """交互式登录（带重试）"""
+        from client import OpenClawClient
+        
+        max_retries = 5
+        retry_count = 0
+        
+        while retry_count < max_retries:
+            print("\n--- Login / 登录 ---")
+            email = input("[SoulSync] Email / 邮箱: ").strip()
+            if not email:
+                print("[SoulSync] Email cannot be empty / 邮箱不能为空")
+                continue
+            
+            password = getpass.getpass("[SoulSync] Password / 密码: ")
+            if not password:
+                print("[SoulSync] Password cannot be empty / 密码不能为空")
+                continue
+            
+            try:
+                temp_client = OpenClawClient(self.config)
+                result = temp_client.authenticate(email, password)
+                if result:
+                    print("\n[SoulSync] ✓ Login successful! / 登录成功!")
+                    self._save_auth_to_config(result)
+                    return True
+            except Exception as e:
+                retry_count += 1
+                remaining = max_retries - retry_count
+                error_msg = str(e)
+                
+                if "429" in error_msg or "too many" in error_msg.lower():
+                    print(f"\n[SoulSync] ❌ {e}")
+                    print("\n[SoulSync] Too many failed attempts / 登录失败次数过多")
+                    print("[SoulSync] Exiting... / 退出...")
+                    sys.exit(0)
+                
+                if remaining > 0:
+                    print(f"\n[SoulSync] ❌ Login failed: {e} / 登录失败: {e}")
+                    print(f"[SoulSync] Remaining attempts / 剩余尝试次数: {remaining}")
+                else:
+                    print(f"\n[SoulSync] ❌ Login failed: {e} / 登录失败: {e}")
+        
+        print("\n[SoulSync] ❌ Too many failed attempts. Please try again in 15 minutes. / 登录失败次数过多，请15分钟后再试")
+        print("[SoulSync] Exiting... / 退出...")
+        sys.exit(0)
+    
+    def _interactive_register(self):
+        """交互式注册（带重试）"""
+        from client import OpenClawClient
+        
+        max_retries = 5
+        retry_count = 0
+        
+        while retry_count < max_retries:
+            print("\n--- Register / 注册 ---")
+            email = input("[SoulSync] Email / 邮箱: ").strip()
+            if not email or '@' not in email:
+                print("[SoulSync] Invalid email / 无效邮箱")
+                continue
+            
+            password = getpass.getpass("[SoulSync] Password / 密码: ")
+            if len(password) < 6:
+                print("[SoulSync] Password must be at least 6 characters / 密码至少6位")
+                continue
+            
+            password2 = getpass.getpass("[SoulSync] Confirm password / 确认密码: ")
+            if password != password2:
+                print("[SoulSync] Passwords do not match / 两次密码不一致")
+                continue
+            
+            print(f"\n[SoulSync] Sending verification code to {email}...")
+            try:
+                temp_client = OpenClawClient(self.config)
+                temp_client.send_verification_code(email)
+                print("[SoulSync] ✓ Verification code sent! / 验证码已发送!")
+            except Exception as e:
+                print(f"[SoulSync] ❌ Failed to send code: {e}")
+                continue
+            
+            code_retry = 0
+            while code_retry < max_retries:
+                code = input(f"[SoulSync] Enter code / 输入验证码 ({max_retries - code_retry} attempts left): ").strip()
+                if len(code) != 6 or not code.isdigit():
+                    code_retry += 1
+                    print("[SoulSync] Invalid code format / 验证码格式错误")
+                    continue
+                
+                try:
+                    result = temp_client.register(email, password, code)
+                    print("\n[SoulSync] ✓ Registration successful! / 注册成功!")
+                    self._save_auth_to_config(result)
+                    return True
+                except Exception as e:
+                    code_retry += 1
+                    remaining_code = max_retries - code_retry
+                    if "invalid" in str(e).lower() or "expired" in str(e).lower():
+                        if remaining_code > 0:
+                            print(f"[SoulSync] ❌ Invalid or expired code: {e}")
+                            print(f"[SoulSync] Remaining attempts / 剩余尝试: {remaining_code}")
+                        else:
+                            print("[SoulSync] ❌ Too many code attempts / 验证码错误次数过多")
+                            break
+                    else:
+                        print(f"[SoulSync] ❌ Registration failed: {e}")
+                        break
+            
+            if code_retry >= max_retries:
+                print("\n[SoulSync] Too many code verification failures.")
+                print("[SoulSync] 1. Resend code / 重新发送验证码")
+                print("[SoulSync] 2. Start over / 重新开始")
+                print("[SoulSync] 3. Exit / 退出")
+                
+                sub_choice = input("[SoulSync] Choose / 选择 (1/2/3): ").strip()
+                if sub_choice == '1':
+                    retry_count = 0
+                    continue
+                elif sub_choice == '2':
+                    retry_count = 0
+                    break
+                else:
+                    print("[SoulSync] Exiting... / 退出...")
+                    sys.exit(0)
+        
+        print("\n[SoulSync] ❌ Too many registration attempts / 注册尝试次数过多")
+        print("[SoulSync] Exiting... / 退出...")
+        sys.exit(0)
+    
     def initialize(self):
         """初始化组件"""
         print("\n[SoulSync] ========================================")
@@ -297,7 +446,34 @@ class SoulSyncPlugin:
         print("Plugin shutdown complete")
 def main():
     """主函数"""
+    parser = argparse.ArgumentParser(description='SoulSync Plugin')
+    parser.add_argument('--setup', action='store_true', help='Run interactive setup (register/login)')
+    parser.add_argument('--start', action='store_true', help='Start sync service (auto-login from config)')
+    
+    args = parser.parse_args()
+    
     plugin = SoulSyncPlugin()
+    
+    if args.setup:
+        plugin.load_config()
+        plugin.run_setup()
+        print("\n[SoulSync] ✓ Setup complete! Run 'openclaw soulsync:start' to begin syncing.")
+        print("[SoulSync] 设置完成！运行 'openclaw soulsync:start' 开始同步。")
+        sys.exit(0)
+    
+    plugin.load_config()
+    
+    email = plugin.config.get('email', '').strip()
+    password = plugin.config.get('password', '').strip()
+    
+    if not email or not password:
+        print("\n[SoulSync] ========================================")
+        print("[SoulSync] Not configured. Run 'openclaw soulsync:setup' first.")
+        print("[SoulSync] 尚未配置，请先运行 'openclaw soulsync:setup'")
+        print("[SoulSync] ========================================\n")
+        sys.exit(0)
+    
+    plugin.initialize()
     plugin.run()
 if __name__ == '__main__':
     main()