soulsync 1.0.12 → 1.0.14

package/src/client.py

@@ -37,7 +37,9 @@ class OpenClawClient:
         self.session.mount('https://', TLSAdapter())
     
     def _load_or_generate_device_id(self) -> str:
-        """加载或生成设备ID"""
+        if self.config.get('device_id'):
+            return self.config['device_id']
+        
         plugin_dir = os.path.dirname(os.path.dirname(__file__))
         device_id_file = os.path.join(plugin_dir, 'device_id')
         
@@ -67,13 +69,17 @@ class OpenClawClient:
             with open(token_file, 'r') as f:
                 return f.read().strip()
         
+        if self.config and self.config.get('token'):
+            return self.config.get('token')
+        
         return None
     
     def _get_headers(self) -> dict:
-        """获取请求头"""
         headers = {'Content-Type': 'application/json'}
         if self.token:
             headers['Authorization'] = f'Bearer {self.token}'
+        if self.device_id:
+            headers['X-Device-ID'] = self.device_id
         return headers
     
     def authenticate(self, email: str = None, password: str = None) -> dict:
@@ -132,54 +138,29 @@ class OpenClawClient:
             error = response.json().get('error', 'Unknown error')
             raise Exception(f"Authentication failed: {error}")
     
-    def upload_memory(self, content: str) -> dict:
-        """上传记忆
-        
-        Args:
-            content: 记忆内容
-            
-        Returns:
-            上传结果
-        """
-        url = f"{self.cloud_url}/api/memories"
-        data = {'content': content}
-        
-        response = self.session.post(url, json=data, headers=self._get_headers())
-        
-        if response.status_code == 200:
-            return response.json()
-        elif response.status_code == 403:
-            error = response.json().get('error', 'Subscription required')
-            raise Exception(f"Upload failed: {error}")
-        else:
-            error = response.json().get('error', 'Unknown error')
-            raise Exception(f"Upload failed: {error}")
-    
-    def download_memory(self) -> dict:
-        """下载记忆
+    def get_profile(self) -> dict:
+        """获取用户信息
         
         Returns:
-            包含 content, version 等信息的字典
+            用户信息
         """
-        url = f"{self.cloud_url}/api/memories"
+        url = f"{self.cloud_url}/api/profiles"
         
         response = self.session.get(url, headers=self._get_headers())
         
         if response.status_code == 200:
             return response.json()
-        elif response.status_code == 404:
-            return {'content': '', 'version': 0}
         else:
             error = response.json().get('error', 'Unknown error')
-            raise Exception(f"Download failed: {error}")
-    
-    def get_profile(self) -> dict:
-        """获取用户信息
+            raise Exception(f"Get profile failed: {error}")
+
+    def get_user_info(self) -> dict:
+        """获取当前登录用户信息
         
         Returns:
-            用户信息
+            用户信息，包含 email, name, subscription_status
         """
-        url = f"{self.cloud_url}/api/memories/profile"
+        url = f"{self.cloud_url}/api/auth/user/info"
         
         response = self.session.get(url, headers=self._get_headers())
         
@@ -187,7 +168,7 @@ class OpenClawClient:
             return response.json()
         else:
             error = response.json().get('error', 'Unknown error')
-            raise Exception(f"Get profile failed: {error}")
+            raise Exception(f"Get user info failed: {error}")
     
     def connect_websocket(self, on_message_callback):
         """连接 WebSocket
@@ -284,6 +265,8 @@ class OpenClawClient:
             self.token = result.get('token')
             self.user_id = result.get('user_id')
             self._save_token(self.token)
+            if self.config:
+                self.config['token'] = self.token
             return result
         else:
             error = response.json().get('error', 'Unknown error')
@@ -309,6 +292,8 @@ class OpenClawClient:
             self.token = result.get('token')
             self.user_id = result.get('user_id')
             self._save_token(self.token)
+            if self.config:
+                self.config['token'] = self.token
             return result
         else:
             error = response.json().get('error', 'Unknown error')

package/src/config.js

@@ -0,0 +1,100 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+let config = null;
+
+function getPluginDir() {
+  return path.dirname(__filename);
+}
+
+function loadConfig() {
+  if (config) return config;
+  
+  const pluginDir = path.dirname(__filename);
+  const configPath = path.join(pluginDir, 'config.json');
+  
+  try {
+    if (fs.existsSync(configPath)) {
+      config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+      return config;
+    }
+  } catch (e) {
+    console.error('[SoulSync] Error loading config:', e);
+  }
+  return null;
+}
+
+function saveConfig(newConfig) {
+  const pluginDir = path.dirname(__filename);
+  const configPath = path.join(pluginDir, 'config.json');
+  
+  try {
+    let existing = {};
+    if (fs.existsSync(configPath)) {
+      existing = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+    }
+    config = { ...existing, ...newConfig };
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+    return true;
+  } catch (e) {
+    console.error('[SoulSync] Error saving config:', e);
+    return false;
+  }
+}
+
+function clearConfig() {
+  const pluginDir = path.dirname(__filename);
+  const configPath = path.join(pluginDir, 'config.json');
+  
+  try {
+    if (fs.existsSync(configPath)) {
+      const existing = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+      delete existing.token;
+      delete existing.email;
+      delete existing.device_id;
+      delete existing.device_name;
+      fs.writeFileSync(configPath, JSON.stringify(existing, null, 2));
+      config = existing;
+    }
+    return true;
+  } catch (e) {
+    console.error('[SoulSync] Error clearing config:', e);
+    return false;
+  }
+}
+
+function getDeviceName(deviceType = 'local') {
+  const hostname = os.hostname();
+  const platform = os.platform();
+  const username = os.userInfo().username;
+
+  let type = 'local';
+  if (deviceType === 'cloud') type = '云端';
+  else if (deviceType === 'ssh') type = 'SSH';
+  else {
+    if (platform === 'win32') type = 'Windows';
+    else if (platform === 'darwin') type = 'Mac';
+    else if (platform === 'linux') type = 'Linux';
+  }
+
+  if (deviceType === 'cloud') {
+    return `${type} Bot`;
+  }
+
+  return `${username}的${type}`;
+}
+
+function isAuthenticated() {
+  const cfg = loadConfig();
+  return cfg && cfg.token && cfg.email && cfg.email !== 'your-email@example.com';
+}
+
+module.exports = {
+  loadConfig,
+  saveConfig,
+  clearConfig,
+  getDeviceName,
+  isAuthenticated,
+  getPluginDir
+};

package/src/device-code.js

@@ -0,0 +1,150 @@
+const https = require('https');
+const http = require('http');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+let pollingInterval = null;
+
+function getCloudUrl() {
+  const pluginDir = path.dirname(__filename);
+  const configPath = path.join(pluginDir, 'config.json');
+  try {
+    if (fs.existsSync(configPath)) {
+      const cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+      if (cfg.cloud_url) return cfg.cloud_url;
+    }
+  } catch (e) {}
+  return 'https://soulsync.work';
+}
+
+function makeRequest(method, urlPath, body = null) {
+  return new Promise((resolve, reject) => {
+    const cloudUrl = getCloudUrl();
+    const isHttps = cloudUrl.startsWith('https');
+    const client = isHttps ? https : http;
+    
+    const urlObj = new URL(cloudUrl + urlPath);
+    
+    const options = {
+      hostname: urlObj.hostname,
+      port: urlObj.port || (isHttps ? 443 : 80),
+      path: urlObj.pathname + urlObj.search,
+      method: method,
+      headers: { 'Content-Type': 'application/json' }
+    };
+    
+    const req = client.request(options, (res) => {
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        try {
+          const json = JSON.parse(data);
+          resolve({ status: res.statusCode, body: json });
+        } catch (e) {
+          resolve({ status: res.statusCode, body: data });
+        }
+      });
+    });
+    
+    req.on('error', reject);
+    if (body) req.write(JSON.stringify(body));
+    req.end();
+  });
+}
+
+function requestDeviceCode() {
+  return makeRequest('POST', '/api/auth/device-code');
+}
+
+function pollForAuth(deviceCode) {
+  return makeRequest('GET', `/api/auth/device/${deviceCode}/status`);
+}
+
+function startPolling(deviceCode, onSuccess, onError) {
+  pollingInterval = setInterval(async () => {
+    try {
+      const result = await pollForAuth(deviceCode);
+      
+      if (result.body.status === 'authorized' && result.body.token) {
+        stopPolling();
+        onSuccess(result.body.token);
+        return;
+      }
+      
+      if (result.body.status === 'expired') {
+        stopPolling();
+        onError(new Error('Device code expired'));
+        return;
+      }
+      
+      if (result.body.status === 'not_found') {
+        stopPolling();
+        onError(new Error('Device code not found'));
+        return;
+      }
+    } catch (e) {
+      stopPolling();
+      onError(e);
+    }
+  }, 3000);
+}
+
+function stopPolling() {
+  if (pollingInterval) {
+    clearInterval(pollingInterval);
+    pollingInterval = null;
+  }
+}
+
+function savePendingAuth(deviceCode, authUrl) {
+  const homeDir = os.homedir();
+  const pendingDir = path.join(homeDir, '.soulsync');
+  const pendingFile = path.join(pendingDir, '.pending_auth');
+  
+  try {
+    if (!fs.existsSync(pendingDir)) {
+      fs.mkdirSync(pendingDir, { recursive: true });
+    }
+    fs.writeFileSync(pendingFile, JSON.stringify({ deviceCode, authUrl, timestamp: Date.now() }));
+    return true;
+  } catch (e) {
+    console.error('[SoulSync] Error saving pending auth:', e);
+    return false;
+  }
+}
+
+function loadPendingAuth() {
+  const homeDir = os.homedir();
+  const pendingFile = path.join(homeDir, '.soulsync', '.pending_auth');
+  
+  try {
+    if (fs.existsSync(pendingFile)) {
+      const data = JSON.parse(fs.readFileSync(pendingFile, 'utf-8'));
+      if (Date.now() - data.timestamp < 900000) {
+        return data;
+      }
+      fs.unlinkSync(pendingFile);
+    }
+  } catch (e) {}
+  return null;
+}
+
+function clearPendingAuth() {
+  const homeDir = os.homedir();
+  const pendingFile = path.join(homeDir, '.soulsync', '.pending_auth');
+  try {
+    if (fs.existsSync(pendingFile)) {
+      fs.unlinkSync(pendingFile);
+    }
+  } catch (e) {}
+}
+
+module.exports = {
+  requestDeviceCode,
+  startPolling,
+  stopPolling,
+  savePendingAuth,
+  loadPendingAuth,
+  clearPendingAuth
+};

package/src/main.py

@@ -61,7 +61,7 @@ class SoulSyncPlugin:
       
         cloud_url = self.config.get('cloud_url', '').strip()
         email = self.config.get('email', '').strip()
-        password = self.config.get('password', '').strip()
+        token = self.config.get('token', '').strip()
         
         if not cloud_url:
             self.config['cloud_url'] = 'https://soulsync.work'
@@ -98,11 +98,6 @@ class SoulSyncPlugin:
         elif 'email' in auth_result:
             config['email'] = auth_result.get('email', '')
         
-        # 保存 password（注册时输入的密码，需要保存以便自动登录）
-        # 注意：登录时我们只有从 config 读取的 password
-        if 'password' in auth_result:
-            config['password'] = auth_result.get('password', '')
-        
         # 保存 token
         if 'token' in auth_result:
             config['token'] = auth_result['token']
@@ -290,47 +285,32 @@ class SoulSyncPlugin:
                 profile = self.client.get_profile()
                 print(f"[SoulSync] Using existing token, user: {profile.get('email', 'unknown')}")
             except Exception as e:
+                error_str = str(e)
+                if '401' in error_str or 'Unauthorized' in error_str or 'token' in error_str.lower():
+                    print("[SoulSync] Token expired or invalid. Please re-login via chat: say 'login SoulSync'")
+                    print("[SoulSync] Token 已过期，请在聊天中说 'login SoulSync' 重新登录")
+                    return False
                 print(f"[SoulSync] Token invalid, re-authenticating: {e}")
                 token = None
 
         if not token:
-            email = self.config.get('email', '').strip()
-            password = self.config.get('password', '').strip()
-            
-            print("[SoulSync] No valid token, attempting auto-login...")
-            try:
-                result = self.client.authenticate(email, password)
-                if result:
-                    result['email'] = email
-                    result['password'] = password
-                    print("[SoulSync] Login successful! / 登录成功!")
-                    self._save_auth_to_config(result)
-                    token = self.client.token
-            except Exception as e:
-                error_msg = str(e)
-                
-                if "429" in error_msg or "too many" in error_msg.lower():
-                    print("\n[SoulSync] ========================================")
-                    print(f"[SoulSync] ❌ {e}")
-                    print("[SoulSync] Too many failed attempts. Please try again later / 登录失败次数过多，请稍后再试")
-                    print("[SoulSync] ========================================\n")
-                else:
-                    print("\n[SoulSync] ========================================")
-                    print(f"[SoulSync] ❌ {e}")
-                    print("[SoulSync] Please run 'openclaw soulsync:setup' to reconfigure / 请运行 'openclaw soulsync:setup' 重新配置")
-                    print("[SoulSync] ========================================\n")
-                
-                sys.exit(0)
-
+            print("[SoulSync] Token expired or invalid. Please re-configure using 'openclaw soulsync:setup'")
+            print("[SoulSync] Token 已过期，请重新运行 'openclaw soulsync:setup' 配置")
+            return False
+        
         email = self.config.get('email')
-        password = self.config.get('password')
-
+        
         try:
             profile = self.client.get_profile()
             print(f"\n[SoulSync] Logged in as: {profile.get('email')}")
             subscription = profile.get('subscription', {})
             print(f"[SoulSync] Subscription: {subscription.get('status')} (days remaining: {subscription.get('daysRemaining', 0)})\n")
         except Exception as e:
+            error_str = str(e)
+            if '401' in error_str or 'Unauthorized' in error_str or 'token' in error_str.lower():
+                print("[SoulSync] Token expired or invalid. Please re-login via chat: say 'login SoulSync'")
+                print("[SoulSync] Token 已过期，请在聊天中说 'login SoulSync' 重新登录")
+                return False
             print(f"[SoulSync] Warning: Could not get profile: {e}")
       
         # 版本管理器
@@ -391,20 +371,12 @@ class SoulSyncPlugin:
         """WebSocket 消息回调"""
         event = data.get('event')
       
-        if event == 'file_updated':
-            file_path = data.get('file_path')
+        if event == 'profile:updated':
+            user_id = data.get('user_id')
             version = data.get('version')
-            print(f"\n[SoulSync] [WebSocket] File updated: {file_path} (v{version})")
-            try:
-                self.profile_sync.on_remote_change(file_path, version)
-            except Exception as e:
-                print(f"[SoulSync] Sync error: {e}")
-      
-        elif event == 'new_memory':
-            print(f"\n[SoulSync] [WebSocket] New memory available!")
+            print(f"\n[SoulSync] [WebSocket] Profile updated (v{version})")
             try:
                 self.profile_sync.pull_all()
-                print("[SoulSync] Memory synced from remote")
             except Exception as e:
                 print(f"[SoulSync] Sync error: {e}")
       
@@ -489,9 +461,9 @@ def main():
         plugin.load_config()
         
         email = plugin.config.get('email', '').strip()
-        password = plugin.config.get('password', '').strip()
+        token = plugin.config.get('token', '').strip()
         
-        if not email or not password:
+        if not email or not token:
             print("\n[SoulSync] ========================================")
             print("[SoulSync] Not configured. Run 'openclaw soulsync:setup' first.")
             print("[SoulSync] 尚未配置，请先运行 'openclaw soulsync:setup'")

package/src/oauth-server.js

@@ -0,0 +1,48 @@
+const http = require('http');
+const url = require('url');
+
+function createOAuthServer() {
+  return new Promise((resolve, reject) => {
+    const server = http.createServer((req, res) => {
+      const parsedUrl = url.parse(req.url, true);
+      
+      if (parsedUrl.pathname === '/callback') {
+        const { token, state, error } = parsedUrl.query;
+        
+        if (error) {
+          res.writeHead(400, { 'Content-Type': 'text/html' });
+          res.end('<html><body><h1>授权失败</h1><p>请关闭此窗口并重试。</p></body></html>');
+          server.close();
+          reject(new Error(error));
+          return;
+        }
+        
+        if (token) {
+          res.writeHead(200, { 'Content-Type': 'text/html' });
+          res.end('<html><body><h1>授权成功！</h1><p>请关闭此窗口并返回终端。</p></body></html>');
+          server.close();
+          resolve({ token, state });
+          return;
+        }
+        
+        res.writeHead(400, { 'Content-Type': 'text/html' });
+        res.end('<html><body><h1>无效响应</h1></body></html>');
+        server.close();
+        reject(new Error('No token received'));
+        return;
+      }
+      
+      res.writeHead(404, { 'Content-Type': 'text/plain' });
+      res.end('Not Found');
+    });
+    
+    server.listen(0, () => {
+      const port = server.address().port;
+      resolve({ server, port });
+    });
+    
+    server.on('error', reject);
+  });
+}
+
+module.exports = { createOAuthServer };

package/src/profiles.py

@@ -1,12 +1,19 @@
 import requests
+import sys
+import os
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+from src.client import TLSAdapter
 
 
 class ProfilesClient:
-    """Profiles API 客户端"""
+    """Profiles API 客户端 - 统一同步接口"""
     
     def __init__(self, cloud_url: str, token: str = None):
         self.cloud_url = cloud_url.rstrip('/')
         self.token = token
+        self.session = requests.Session()
+        self.session.mount('https://', TLSAdapter())
     
     def _get_headers(self) -> dict:
         """获取请求头"""
@@ -19,57 +26,50 @@ class ProfilesClient:
         """设置 token"""
         self.token = token
     
-    def get_profiles(self, path: str = None) -> dict:
-        """获取 profiles
+    def get_profiles(self) -> dict:
+        """获取用户的完整 profiles
         
-        Args:
-            path: 可选的文件路径
-            
         Returns:
-            包含 files 列表的字典
+            包含 content (dict), version, updated_at 的字典
+            示例: {"content": {"SOUL.md": "...", "USER.md": "..."}, "version": 3, "updated_at": "..."}
         """
         url = f"{self.cloud_url}/api/profiles"
-        if path:
-            url += f"?path={path}"
         
-        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()
-        elif response.status_code == 404:
-            return {'files': []}
         else:
             error = response.json().get('error', 'Unknown error')
             raise Exception(f"Get profiles failed: {error}")
     
-    def upload_profile(self, file_path: str, content: str, version: int) -> dict:
-        """上传 profile
+    def upload_profiles(self, content: dict, version: int) -> dict:
+        """整体替换用户的 profiles
         
         Args:
-            file_path: 文件路径
-            content: 文件内容
-            version: 当前版本号
+            content: 包含所有文件的 dict，key 是文件名，value 是内容
+                    示例: {"SOUL.md": "...", "USER.md": "...", "MEMORY.md": "..."}
+            version: 客户端当前持有的版本号
             
         Returns:
-            成功时返回 {file_path, version, updated_at}
-            冲突时抛出异常
+            成功时返回 {"content": {...}, "version": N, "updated_at": "..."}
+            冲突时抛出 ConflictError
         """
         url = f"{self.cloud_url}/api/profiles"
         data = {
-            'file_path': file_path,
             'content': content,
             'version': version
         }
         
-        response = requests.post(url, json=data, headers=self._get_headers())
+        response = self.session.put(url, json=data, headers=self._get_headers())
         
         if response.status_code == 200:
             return response.json()
         elif response.status_code == 409:
             result = response.json()
             raise ConflictError(
-                result.get('latest_content', ''),
-                result.get('latest_version', 0)
+                server_content=result.get('server_content', {}),
+                server_version=result.get('server_version', 0)
             )
         elif response.status_code == 403:
             error = response.json().get('error', 'Subscription required')
@@ -77,34 +77,12 @@ class ProfilesClient:
         else:
             error = response.json().get('error', 'Unknown error')
             raise Exception(f"Upload failed: {error}")
-    
-    def sync_profiles(self, since: str = '0') -> dict:
-        """增量同步 profiles
-        
-        Args:
-            since: 时间戳
-            
-        Returns:
-            包含 files 列表和 server_time 的字典
-        """
-        url = f"{self.cloud_url}/api/profiles/sync?since={since}"
-        
-        response = requests.get(url, headers=self._get_headers())
-        
-        if response.status_code == 200:
-            return response.json()
-        elif response.status_code == 403:
-            error = response.json().get('error', 'Subscription required')
-            raise Exception(f"Sync failed: {error}")
-        else:
-            error = response.json().get('error', 'Unknown error')
-            raise Exception(f"Sync failed: {error}")
 
 
 class ConflictError(Exception):
     """版本冲突异常"""
     
-    def __init__(self, latest_content: str, latest_version: int):
-        self.latest_content = latest_content
-        self.latest_version = latest_version
-        super().__init__(f"Version conflict: latest version is {latest_version}")
+    def __init__(self, server_content: dict, server_version: int):
+        self.server_content = server_content
+        self.server_version = server_version
+        super().__init__(f"Version conflict: server version is {server_version}")