soulsync 1.0.4 → 1.0.5

package/config.json.example

@@ -1,5 +1,5 @@
 {
-  "cloud_url": "http://your-server:3000",
+  "cloud_url": "https://soulsync.work",
   "email": "your-email@example.com",
   "password": "your-password",
   "workspace": "./workspace",

package/index.js

@@ -1,10 +1,41 @@
 const { spawn } = require('child_process');
 const path = require('path');
 
+let pythonProcess = null;
+
 // 函数形式导出（推荐）
 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;
+    });
+  }
+
   // 注册CLI命令：启动 SoulSync
   api.registerCli(
     ({ program }) => {
@@ -12,25 +43,11 @@ module.exports = function register(api) {
         .command('soulsync:start')
         .description('启动 SoulSync 同步服务')
         .action(() => {
-          const pluginDir = path.dirname(__filename);
-          const pythonScript = path.join(pluginDir, 'src', 'main.py');
-          const pythonPath = process.env.PYTHON_PATH || 'python3';
-        
-          console.log('[SoulSync] Starting Python service...');
-        
-          const 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}`);
-          });
+          if (pythonProcess) {
+            console.log('[SoulSync] Service already running');
+            return;
+          }
+          startPythonService();
         });
     },
     { commands: ['soulsync:start'] }
@@ -43,12 +60,20 @@ module.exports = function register(api) {
         .command('soulsync:stop')
         .description('停止 SoulSync 同步服务')
         .action(() => {
-          console.log('[SoulSync] Stop command received');
-          // 这里可以实现停止逻辑
+          if (pythonProcess) {
+            console.log('[SoulSync] Stopping Python service...');
+            pythonProcess.kill();
+            pythonProcess = null;
+          } else {
+            console.log('[SoulSync] Service not running');
+          }
         });
     },
     { commands: ['soulsync:stop'] }
   );
 
+  // 自动启动服务
+  startPythonService();
+
   console.log('[SoulSync] Plugin registered successfully');
 };

package/package.json

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

package/src/client.py

@@ -1,8 +1,23 @@
 import json
 import os
+import ssl
 import uuid
 import requests
 import websocket
+from requests.adapters import HTTPAdapter
+from urllib3.poolmanager import PoolManager
+
+
+class TLSAdapter(HTTPAdapter):
+    """使用兼容 Python 3.13 的 SSL 适配器"""
+    def init_poolmanager(self, *args, **kwargs):
+        # 使用 create_default_context() 而不是 SSLContext(PROTOCOL_TLS_CLIENT)
+        # 这在 Python 3.13 + Windows 上更稳定
+        ctx = ssl.create_default_context()
+        # 可选：设置最低 TLS 版本为 1.2
+        ctx.minimum_version = ssl.TLSVersion.TLSv1_2
+        kwargs['ssl_context'] = ctx
+        return super().init_poolmanager(*args, **kwargs)
 
 
 class OpenClawClient:
@@ -16,6 +31,10 @@ class OpenClawClient:
         self.device_id = self._load_or_generate_device_id()
         self.ws = None
         self.ws_thread = None
+        
+        # 创建使用 TLS 1.2 的 session
+        self.session = requests.Session()
+        self.session.mount('https://', TLSAdapter())
     
     def _load_or_generate_device_id(self) -> str:
         """加载或生成设备ID"""
@@ -95,7 +114,7 @@ class OpenClawClient:
             'password': password
         }
         
-        response = requests.post(url, json=data, headers={'Content-Type': 'application/json'})
+        response = self.session.post(url, json=data, headers={'Content-Type': 'application/json'})
         
         if response.status_code == 200:
             result = response.json()
@@ -123,7 +142,7 @@ class OpenClawClient:
         url = f"{self.cloud_url}/api/memories"
         data = {'content': content}
         
-        response = requests.post(url, json=data, headers=self._get_headers())
+        response = self.session.post(url, json=data, headers=self._get_headers())
         
         if response.status_code == 200:
             return response.json()
@@ -142,7 +161,7 @@ class OpenClawClient:
         """
         url = f"{self.cloud_url}/api/memories"
         
-        response = requests.get(url, headers=self._get_headers())
+        response = self.session.get(url, headers=self._get_headers())
         
         if response.status_code == 200:
             return response.json()
@@ -160,7 +179,7 @@ class OpenClawClient:
         """
         url = f"{self.cloud_url}/api/memories/profile"
         
-        response = requests.get(url, headers=self._get_headers())
+        response = self.session.get(url, headers=self._get_headers())
         
         if response.status_code == 200:
             return response.json()
@@ -231,7 +250,7 @@ class OpenClawClient:
         url = f"{self.cloud_url}/api/auth/send-code"
         data = {'email': email}
 
-        response = requests.post(url, json=data, headers={'Content-Type': 'application/json'})
+        response = self.session.post(url, json=data, headers={'Content-Type': 'application/json'})
 
         if response.status_code == 200:
             return response.json()
@@ -256,7 +275,7 @@ class OpenClawClient:
         url = f"{self.cloud_url}/api/auth/register"
         data = {'email': email, 'password': password, 'code': code}
 
-        response = requests.post(url, json=data, headers={'Content-Type': 'application/json'})
+        response = self.session.post(url, json=data, headers={'Content-Type': 'application/json'})
 
         if response.status_code == 201:
             result = response.json()
@@ -281,7 +300,7 @@ class OpenClawClient:
         url = f"{self.cloud_url}/api/auth/login"
         data = {'email': email, 'password': password}
 
-        response = requests.post(url, json=data, headers={'Content-Type': 'application/json'})
+        response = self.session.post(url, json=data, headers={'Content-Type': 'application/json'})
 
         if response.status_code == 200:
             result = response.json()

package/src/interactive_auth.py

@@ -248,7 +248,7 @@ def prompt_for_missing_config(client):
         
         # 如果没有 cloud_url，设置默认值
         if not cloud_url:
-            config['cloud_url'] = 'http://47.96.170.74:3000'
+            config['cloud_url'] = 'https://soulsync.work'
             print(f"Using default server / 使用默认服务器: {config['cloud_url']}")
         
         # 交互式登录/注册

package/src/main.py

@@ -40,11 +40,18 @@ class SoulSyncPlugin:
     def load_config(self):
         """加载配置文件"""
         config_path = os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json'))
+        config_example_path = os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json.example'))
       
         print(f"Looking for config at: {config_path}")
       
         if not os.path.exists(config_path):
-            raise FileNotFoundError(f"Config file not found: {config_path}")
+            if os.path.exists(config_example_path):
+                print("Config file not found, copying from config.json.example...")
+                import shutil
+                shutil.copy(config_example_path, config_path)
+                print(f"Created config.json from template")
+            else:
+                raise FileNotFoundError(f"Config file not found: {config_path}")
       
         try:
             with open(config_path, 'r', encoding='utf-8') as f:
@@ -52,6 +59,24 @@ class SoulSyncPlugin:
         except json.JSONDecodeError as e:
             raise ValueError(f"Invalid JSON in config.json: {e}")
       
+        # 检查必要配置
+        cloud_url = self.config.get('cloud_url', '').strip()
+        email = self.config.get('email', '').strip()
+        password = self.config.get('password', '').strip()
+        
+        # 如果 cloud_url 为空，设置为默认值
+        if not cloud_url:
+            self.config['cloud_url'] = 'https://soulsync.work'
+            print("Cloud URL not set, using default: https://soulsync.work")
+        
+        # 如果 email 或 password 为空，需要交互式认证
+        if not email or not password:
+            print("\nEmail or password not configured, initiating interactive setup...")
+            self._interactive_setup()
+            # 重新加载配置
+            with open(config_path, 'r', encoding='utf-8') as f:
+                self.config = json.load(f)
+        
         # 处理 workspace 路径
         workspace = self.config.get('workspace', './workspace')
         if workspace.startswith('./'):
@@ -68,6 +93,58 @@ class SoulSyncPlugin:
         print(f"  Workspace: {workspace}")
         print(f"  Watch files: {watch_files}")
   
+    def _interactive_setup(self):
+        """交互式设置：引导用户登录或注册"""
+        from register import Register, Login
+        from interactive_auth import interactive_setup
+        
+        print("\n=== First run - Please login or register / 首次运行，请先登录或注册 ===\n")
+        print("1. Login / 登录（已有账号）")
+        print("2. Register / 注册（新用户）")
+
+        choice = input("Choose (1/2): ").strip()
+
+        if choice == '1':
+            # 先创建临时 client 用于登录
+            temp_client = OpenClawClient(self.config)
+            login = Login(temp_client)
+            result = login.run()
+            if result:
+                # 保存认证信息到 config
+                self._save_auth_to_config(result)
+        elif choice == '2':
+            temp_client = OpenClawClient(self.config)
+            register = Register(temp_client)
+            result = register.run()
+            if result:
+                self._save_auth_to_config(result)
+        else:
+            print("Invalid choice / 无效选择")
+            sys.exit(1)
+    
+    def _save_auth_to_config(self, auth_result):
+        """保存认证结果到 config.json"""
+        config_path = os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json'))
+        
+        try:
+            with open(config_path, 'r', encoding='utf-8') as f:
+                config = json.load(f)
+        except:
+            config = {}
+        
+        # 保存 email 和 password（如果 auth_result 包含）
+        if 'user' in auth_result:
+            config['email'] = auth_result['user'].get('email', '')
+        
+        # 保存 token
+        if 'token' in auth_result:
+            config['token'] = auth_result['token']
+        
+        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")
+  
     def initialize(self):
         """初始化组件"""
         print("\n=== Initializing SoulSync Plugin ===\n")
@@ -80,11 +157,11 @@ class SoulSyncPlugin:
                 profile = self.client.get_profile()
                 print(f"Using existing token, user: {profile.get('email', 'unknown')}")
             except Exception as e:
-                print(f"Token invalid, please login again")
+                print(f"Token invalid / 令牌无效, re-authenticating: {e}")
                 token = None
 
         if not token:
-            print("\n=== First run - Please login or register / 首次运行，请先登录或注册 ===\n")
+            print("\n=== Token invalid - Please login or register / 令牌无效，请先登录或注册 ===\n")
             print("1. Login / 登录（已有账号）")
             print("2. Register / 注册（新用户）")