soulsync 1.0.12 → 1.0.14

package/src/sync.py

@@ -42,7 +42,7 @@ class ProfileSync:
                 with open(absolute_path, 'r', encoding='utf-8') as f:
                     return f.read()
             except Exception as e:
-                print(f"[Sync] Error reading local file {file_path}: {e}")
+                print(f"[SoulSync] Error reading local file {file_path}: {e}")
                 return None
         return None
   
@@ -57,7 +57,7 @@ class ProfileSync:
             with open(absolute_path, 'w', encoding='utf-8') as f:
                 f.write(content)
         except Exception as e:
-            print(f"[Sync] Error writing local file {file_path}: {e}")
+            print(f"[SoulSync] Error writing local file {file_path}: {e}")
   
     def _create_conflict_backup(self, file_path: str, local_content: str, server_content: str):
         """创建冲突备份文件"""
@@ -71,64 +71,51 @@ class ProfileSync:
                 f.write(local_content or "(empty)")
                 f.write("\n\n========== SERVER VERSION ==========\n")
                 f.write(server_content or "(empty)")
-            print(f"[Sync] Conflict backup created: {conflict_path}")
+            print(f"[SoulSync] Conflict backup created: {conflict_path}")
         except Exception as e:
-            print(f"[Sync] Error creating conflict backup: {e}")
+            print(f"[SoulSync] Error creating conflict backup: {e}")
   
     def pull_all(self):
         """Pull all profiles from cloud"""
-        print("[Sync] Pulling all profiles from cloud...")
+        print("[SoulSync] Pulling all profiles from cloud...")
         
         try:
             result = self.client.get_profiles()
-            cloud_files = result.get('files', [])
+            cloud_content = result.get('content', {})
+            cloud_version = result.get('version', 0)
         except Exception as e:
-            print(f"[Sync] Error fetching cloud profiles: {e}")
+            print(f"[SoulSync] Error fetching cloud profiles: {e}")
             return
         
-        if not cloud_files:
-            print("[Sync] No files on cloud")
+        if not cloud_content:
+            print("[SoulSync] No profiles on cloud")
             return
         
+        local_files = ['SOUL.md', 'USER.md', 'MEMORY.md']
         pulled_count = 0
-        pushed_count = 0
         skipped_count = 0
         
-        for cloud_file in cloud_files:
-            file_path = cloud_file.get('file_path')
-            cloud_version = cloud_file.get('version', 0)
-            cloud_content = cloud_file.get('content', '')
-            
-            if not file_path:
-                continue
-            
-            local_content = self._read_local_file(file_path)
-            local_version = self.version_manager.get_version(file_path)
+        for file_name in local_files:
+            cloud_file_content = cloud_content.get(file_name, '')
+            local_content = self._read_local_file(file_name)
+            local_version = self.version_manager.get_version(file_name)
             
             if cloud_version > local_version:
-                self._mark_syncing(file_path)
+                self._mark_syncing(file_name)
                 try:
-                    self._write_local_file(file_path, cloud_content)
-                    self.version_manager.set_version(file_path, cloud_version)
-                    pulled_count += 1
-                    print(f"[Sync] Pulled: {file_path} (v{cloud_version})")
+                    if cloud_file_content:
+                        self._write_local_file(file_name, cloud_file_content)
+                        self.version_manager.set_version(file_name, cloud_version)
+                        pulled_count += 1
+                        print(f"[SoulSync] Pulled: {file_name} (v{cloud_version})")
                 finally:
-                    self._unmark_syncing(file_path)
-            elif local_version > cloud_version and local_content is not None:
-                try:
-                    result = self.client.upload_profile(file_path, local_content, local_version)
-                    self.version_manager.set_version(file_path, result.get('version', local_version))
-                    pushed_count += 1
-                    print(f"[Sync] Pushed: {file_path} (v{local_version})")
-                except ConflictError as e:
-                    self._handle_conflict(file_path, local_content, e.server_content, e.server_version)
-                    pushed_count += 1
-                except Exception as e:
-                    print(f"[Sync] Error pushing {file_path}: {e}")
+                    self._unmark_syncing(file_name)
             else:
                 skipped_count += 1
         
-        print(f"[Sync] Sync complete: {pulled_count} pulled, {pushed_count} pushed, {skipped_count} skipped")
+        self.version_manager.set_version('__profiles__', cloud_version)
+        
+        print(f"[SoulSync] Sync complete: {pulled_count} pulled, {skipped_count} skipped")
   
     def push_file(self, file_path: str):
         """Push a file to cloud"""
@@ -140,64 +127,84 @@ class ProfileSync:
         try:
             local_content = self._read_local_file(file_path)
             if local_content is None:
-                print(f"[Sync] File not found locally: {file_path}")
+                print(f"[SoulSync] File not found locally: {file_path}")
                 return
             
             local_version = self.version_manager.get_version(file_path)
             
+            profiles_version = self.version_manager.get_version('__profiles__')
+            
+            current_profiles = {}
             try:
-                result = self.client.upload_profile(file_path, local_content, local_version)
-                new_version = result.get('version', local_version + 1)
+                result = self.client.get_profiles()
+                current_profiles = result.get('content', {})
+            except Exception:
+                pass
+            
+            current_profiles[file_path] = local_content
+            
+            try:
+                result = self.client.upload_profiles(current_profiles, profiles_version)
+                new_version = result.get('version', profiles_version + 1)
+                self.version_manager.set_version('__profiles__', new_version)
                 self.version_manager.set_version(file_path, new_version)
-                print(f"[Sync] Pushed: {file_path} (v{new_version})")
+                print(f"[SoulSync] Pushed: {file_path} (v{new_version})")
             except ConflictError as e:
                 self._handle_conflict(file_path, local_content, e.server_content, e.server_version)
             except Exception as e:
-                print(f"[Sync] Error pushing {file_path}: {e}")
+                print(f"[SoulSync] Error pushing {file_path}: {e}")
         finally:
             self._unmark_syncing(file_path)
   
     def on_remote_change(self, file_path: str, version: int):
         """Handle remote file change"""
-        local_version = self.version_manager.get_version(file_path)
+        local_version = self.version_manager.get_version('__profiles__')
         
         if version <= local_version:
-            print(f"[Sync] Remote version not newer, skipping: {file_path} (local: v{local_version}, remote: v{version})")
+            print(f"[SoulSync] Remote version not newer, skipping: {file_path} (local: v{local_version}, remote: v{version})")
             return
         
         self._mark_syncing(file_path)
         
         try:
-            result = self.client.get_profiles(file_path)
-            files = result.get('files', [])
-            if not files:
-                print(f"[Sync] File not found on cloud: {file_path}")
+            result = self.client.get_profiles()
+            cloud_content = result.get('content', {})
+            cloud_version = result.get('version', 0)
+            
+            if file_path not in cloud_content:
+                print(f"[SoulSync] File not found on cloud: {file_path}")
                 return
             
-            cloud_file = files[0]
-            cloud_content = cloud_file.get('content', '')
+            cloud_file_content = cloud_content.get(file_path, '')
             
             local_content = self._read_local_file(file_path)
             
-            if local_content is not None and local_content != cloud_content:
-                self._create_conflict_backup(file_path, local_content, cloud_content)
+            if local_content is not None and local_content != cloud_file_content:
+                self._create_conflict_backup(file_path, local_content, cloud_file_content)
             
-            self._write_local_file(file_path, cloud_content)
+            self._write_local_file(file_path, cloud_file_content)
+            self.version_manager.set_version('__profiles__', cloud_version)
             self.version_manager.set_version(file_path, version)
-            print(f"[Sync] Pulled remote change: {file_path} (v{version})")
+            print(f"[SoulSync] Pulled remote change: {file_path} (v{version})")
         except Exception as e:
-            print(f"[Sync] Error handling remote change for {file_path}: {e}")
+            print(f"[SoulSync] Error handling remote change for {file_path}: {e}")
         finally:
             self._unmark_syncing(file_path)
   
     def _handle_conflict(self, file_path: str, local_content: str, server_content: str, server_version: int):
         """Handle conflict when pushing file"""
-        print(f"[Sync] CONFLICT detected for {file_path}")
+        print(f"[SoulSync] CONFLICT detected for {file_path}")
         
         self._create_conflict_backup(file_path, local_content, server_content)
         
-        self._write_local_file(file_path, server_content)
+        if isinstance(server_content, dict):
+            server_file_content = server_content.get(file_path, '')
+        else:
+            server_file_content = server_content
+        
+        self._write_local_file(file_path, server_file_content)
+        self.version_manager.set_version('__profiles__', server_version)
         self.version_manager.set_version(file_path, server_version)
         
-        print(f"[Sync] Conflict resolved: server version used for {file_path}")
-        print(f"[Sync] Please manually merge the conflict backup file")
+        print(f"[SoulSync] Conflict resolved: server version used for {file_path}")
+        print(f"[SoulSync] Please manually merge the conflict backup file")

package/test_ssl_fix.py

@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+"""
+测试 SSL 修复是否有效
+"""
+import ssl
+import sys
+
+print(f"Python 版本: {sys.version}")
+print(f"SSL 版本: {ssl.OPENSSL_VERSION}")
+print()
+
+# 测试 1: 使用 ssl.create_default_context()
+print("测试 1: 使用 ssl.create_default_context()")
+try:
+    import urllib.request
+    ctx = ssl.create_default_context()
+    ctx.minimum_version = ssl.TLSVersion.TLSv1_2
+    req = urllib.request.Request('https://soulsync.work/api/health')
+    response = urllib.request.urlopen(req, context=ctx)
+    print(f"✅ 成功: {response.read().decode()}")
+except Exception as e:
+    print(f"❌ 失败: {e}")
+
+print()
+
+# 测试 2: 使用 requests + TLSAdapter
+print("测试 2: 使用 requests + 自定义 TLSAdapter")
+try:
+    import requests
+    from requests.adapters import HTTPAdapter
+
+    class TLSAdapter(HTTPAdapter):
+        def init_poolmanager(self, *args, **kwargs):
+            ctx = ssl.create_default_context()
+            ctx.minimum_version = ssl.TLSVersion.TLSv1_2
+            kwargs['ssl_context'] = ctx
+            return super().init_poolmanager(*args, **kwargs)
+
+    session = requests.Session()
+    session.mount('https://', TLSAdapter())
+    response = session.get('https://soulsync.work/api/health')
+    print(f"✅ 成功: {response.text}")
+except Exception as e:
+    print(f"❌ 失败: {e}")
+
+print()
+
+# 测试 3: 直接 requests（无适配器）
+print("测试 3: 直接 requests（无适配器）")
+try:
+    import requests
+    response = requests.get('https://soulsync.work/api/health')
+    print(f"✅ 成功: {response.text}")
+except Exception as e:
+    print(f"❌ 失败: {e}")
+
+print()
+print("测试完成")

package/src/interactive_auth.py

@@ -1,283 +0,0 @@
-#!/usr/bin/env python3
-"""
-SoulSync 交互式认证模块
-处理用户注册、登录、邮箱验证
-"""
-
-import os
-import sys
-import json
-import re
-import getpass
-
-# 获取插件目录
-PLUGIN_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-CONFIG_PATH = os.path.join(PLUGIN_DIR, 'config.json')
-
-
-def get_input(prompt):
-    """获取用户输入"""
-    try:
-        return input(prompt)
-    except KeyboardInterrupt:
-        print("\n\nOperation cancelled / 操作已取消")
-        sys.exit(0)
-
-
-def get_password(prompt):
-    """获取密码（隐藏输入）"""
-    try:
-        return getpass.getpass(prompt)
-    except KeyboardInterrupt:
-        print("\n\nOperation cancelled / 操作已取消")
-        sys.exit(0)
-
-
-def is_valid_email(email):
-    """验证邮箱格式"""
-    pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
-    return re.match(pattern, email) is not None
-
-
-def load_config():
-    """加载配置文件"""
-    if os.path.exists(CONFIG_PATH):
-        try:
-            with open(CONFIG_PATH, 'r', encoding='utf-8') as f:
-                return json.load(f)
-        except:
-            return {}
-    return {}
-
-
-def save_config(config):
-    """保存配置文件"""
-    try:
-        with open(CONFIG_PATH, 'w', encoding='utf-8') as f:
-            json.dump(config, f, indent=2, ensure_ascii=False)
-        return True
-    except Exception as e:
-        print(f"Failed to save config: {e} / 保存配置失败: {e}")
-        return False
-
-
-def check_existing_config():
-    """检查是否已有配置"""
-    config = load_config()
-    email = config.get('email', '').strip()
-    password = config.get('password', '').strip()
-    
-    if email and password:
-        return config
-    return None
-
-
-def interactive_setup(client):
-    """
-    交互式设置流程
-    返回配置好的 config 字典
-    """
-    print("\n" + "=" * 50)
-    print("Welcome to SoulSync! / 欢迎使用 SoulSync!")
-    print("=" * 50)
-    print()
-    
-    # 检查现有配置
-    existing = check_existing_config()
-    if existing:
-        print(f"Detected existing account / 已检测到现有账号: {existing['email']}")
-        choice = get_input("Use existing account? (y/n) / 是否使用现有账号?: ").lower().strip()
-        if choice in ['y', 'yes', '是']:
-            return existing
-        print()
-    
-    # 询问是否有账号
-    print("Please select / 请选择:")
-    print("1. Login / 登录已有账号")
-    print("2. Register / 注册新账号")
-    print()
-    
-    while True:
-        choice = get_input("Enter option / 输入选项 (1/2): ").strip()
-        if choice in ['1', '2']:
-            break
-        print("Invalid option / 无效选项，请重新输入")
-    
-    if choice == '1':
-        return interactive_login(client)
-    else:
-        return interactive_register(client)
-
-
-def interactive_login(client):
-    """交互式登录"""
-    print("\n--- Login / 登录 ---")
-    
-    # 输入邮箱
-    while True:
-        email = get_input("Email / 邮箱: ").strip()
-        if is_valid_email(email):
-            break
-        print("Invalid email format / 邮箱格式不正确，请重新输入")
-    
-    # 输入密码
-    password = get_password("Password / 密码: ")
-    
-    print("\nLogging in... / 正在登录...")
-    
-    try:
-        # 尝试登录
-        result = client.authenticate(email, password)
-        
-        if result:
-            print("✅ Login successful! / 登录成功!")
-            
-            # 保存配置
-            config = load_config()
-            config['email'] = email
-            config['password'] = password
-            save_config(config)
-            
-            return config
-        else:
-            print("❌ Login failed, invalid email or password / 登录失败，邮箱或密码错误")
-            return None
-            
-    except Exception as e:
-        print(f"❌ Login error: {e} / 登录出错: {e}")
-        return None
-
-
-def interactive_register(client):
-    """交互式注册"""
-    print("\n--- Register / 注册新账号 ---")
-    
-    # 输入邮箱
-    while True:
-        email = get_input("Email / 邮箱: ").strip()
-        if not is_valid_email(email):
-            print("Invalid email format / 邮箱格式不正确，请重新输入")
-            continue
-        
-        # 检查邮箱是否已注册
-        print("Checking email availability... / 检查邮箱可用性...")
-        # TODO: 调用后端 API 检查邮箱是否已存在
-        # 暂时假设可用
-        break
-    
-    # 输入密码
-    while True:
-        password = get_password("Set password (min 6 characters) / 设置密码 (至少6位): ")
-        if len(password) >= 6:
-            break
-        print("Password too short, minimum 6 characters / 密码太短，请至少输入6位")
-    
-    # 确认密码
-    while True:
-        password2 = get_password("Confirm password / 确认密码: ")
-        if password == password2:
-            break
-        print("Passwords do not match, please try again / 两次密码不一致，请重新输入")
-    
-    # 发送验证码
-    print(f"\nSending verification code to {email} / 正在发送验证码到 {email}...")
-    try:
-        client.send_verification_code(email)
-        print("✅ Verification code sent! / 验证码已发送!")
-    except Exception as e:
-        print(f"❌ Failed to send code: {e} / 发送验证码失败: {e}")
-        return None
-    
-    # 输入验证码
-    max_attempts = 3
-    for attempt in range(max_attempts):
-        code = get_input(f"Enter verification code / 请输入验证码 (remaining attempts / 剩余尝试: {max_attempts - attempt}): ").strip()
-        
-        # Verify code format (6 digits)
-        if len(code) == 6 and code.isdigit():
-            # Verify with server
-            try:
-                result = client.register(email, password, code)
-                print("✅ Verification successful! / 验证成功!")
-                break
-            except Exception as e:
-                print(f"❌ Verification failed: {e} / 验证失败: {e}")
-                if attempt == max_attempts - 1:
-                    print("Too many failed attempts, please re-register / 验证失败次数过多，请重新注册")
-                    return None
-        else:
-            print("❌ Invalid code format, please enter 6-digit code / 验证码格式错误，请输入6位数字验证码")
-            if attempt == max_attempts - 1:
-                print("Too many failed attempts, please re-register / 验证失败次数过多，请重新注册")
-                return None
-    
-    # 完成注册
-    print("\nCreating account... / 正在创建账号...")
-    try:
-        print("✅ Registration successful! / 注册成功!")
-        
-        # 保存配置
-        config = load_config()
-        config['email'] = email
-        config['password'] = password
-        save_config(config)
-        
-        return config
-        
-    except Exception as e:
-        print(f"❌ Registration failed: {e} / 注册失败: {e}")
-        return None
-
-
-def prompt_for_missing_config(client):
-    """
-    当配置缺失时，提示用户输入
-    用于插件启动时自动检测
-    """
-    config = load_config()
-    
-    email = config.get('email', '').strip()
-    password = config.get('password', '').strip()
-    cloud_url = config.get('cloud_url', '').strip()
-    
-    # 检查是否需要交互式配置
-    need_setup = not email or not password or not cloud_url
-    
-    if need_setup:
-        print("\nFirst time using SoulSync, configuration required... / 首次使用 SoulSync，需要进行配置...")
-        
-        # 如果没有 cloud_url，设置默认值
-        if not cloud_url:
-            config['cloud_url'] = 'https://soulsync.work'
-            print(f"Using default server / 使用默认服务器: {config['cloud_url']}")
-        
-        # 交互式登录/注册
-        result = interactive_setup(client)
-        
-        if result:
-            return result
-        else:
-            print("\n❌ Configuration failed, plugin cannot start / 配置失败，插件无法启动")
-            return None
-    
-    return config
-
-
-if __name__ == '__main__':
-    # 测试代码
-    print("Interactive Auth Module Test / 交互式认证模块测试")
-    print("=" * 50)
-    
-    # 模拟客户端
-    class MockClient:
-        def authenticate(self, email, password):
-            print(f"Simulating login / 模拟登录: {email}")
-            return True
-    
-    client = MockClient()
-    result = interactive_setup(client)
-    
-    if result:
-        print(f"\nConfiguration complete / 配置完成: {result}")
-    else:
-        print("\nConfiguration failed / 配置失败")