soulsync 1.0.21 → 1.2.0

package/src/sync.py

@@ -1,210 +0,0 @@
-import os
-import time
-import shutil
-import threading
-from profiles import ProfilesClient, ConflictError
-
-
-class ProfileSync:
-    """多文件同步逻辑"""
-  
-    def __init__(self, client: ProfilesClient, version_manager, workspace: str):
-        self.client = client
-        self.version_manager = version_manager
-        self.workspace = workspace
-        self._syncing_files = set()
-        self._sync_lock = threading.Lock()
-  
-    def _get_absolute_path(self, relative_path: str) -> str:
-        """获取文件的绝对路径"""
-        return os.path.normpath(os.path.join(self.workspace, relative_path))
-  
-    def _is_syncing(self, file_path: str) -> bool:
-        """检查文件是否正在同步"""
-        return file_path in self._syncing_files
-  
-    def _mark_syncing(self, file_path: str):
-        """标记文件正在同步"""
-        self._syncing_files.add(file_path)
-  
-    def _unmark_syncing(self, file_path: str):
-        """延迟取消同步标记"""
-        def remove():
-            time.sleep(2)
-            self._syncing_files.discard(file_path)
-        threading.Thread(target=remove, daemon=True).start()
-  
-    def _read_local_file(self, file_path: str) -> str | None:
-        """读取本地文件内容"""
-        absolute_path = self._get_absolute_path(file_path)
-        if os.path.exists(absolute_path):
-            try:
-                with open(absolute_path, 'r', encoding='utf-8') as f:
-                    return f.read()
-            except Exception as e:
-                print(f"[SoulSync] Error reading local file {file_path}: {e}")
-                return None
-        return None
-  
-    def _write_local_file(self, file_path: str, content: str):
-        """写入本地文件"""
-        absolute_path = self._get_absolute_path(file_path)
-        try:
-            directory = os.path.dirname(absolute_path)
-            if directory and not os.path.exists(directory):
-                os.makedirs(directory, exist_ok=True)
-            
-            with open(absolute_path, 'w', encoding='utf-8') as f:
-                f.write(content)
-        except Exception as 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):
-        """创建冲突备份文件"""
-        absolute_path = self._get_absolute_path(file_path)
-        conflict_path = absolute_path + '.conflict'
-        try:
-            with open(conflict_path, 'w', encoding='utf-8') as f:
-                f.write(f"# Conflict: {file_path}\n")
-                f.write(f"# Created at: {time.strftime('%Y-%m-%d %H:%M:%S')}\n\n")
-                f.write("========== LOCAL VERSION ==========\n")
-                f.write(local_content or "(empty)")
-                f.write("\n\n========== SERVER VERSION ==========\n")
-                f.write(server_content or "(empty)")
-            print(f"[SoulSync] Conflict backup created: {conflict_path}")
-        except Exception as e:
-            print(f"[SoulSync] Error creating conflict backup: {e}")
-  
-    def pull_all(self):
-        """Pull all profiles from cloud"""
-        print("[SoulSync] Pulling all profiles from cloud...")
-        
-        try:
-            result = self.client.get_profiles()
-            cloud_content = result.get('content', {})
-            cloud_version = result.get('version', 0)
-        except Exception as e:
-            print(f"[SoulSync] Error fetching cloud profiles: {e}")
-            return
-        
-        if not cloud_content:
-            print("[SoulSync] No profiles on cloud")
-            return
-        
-        local_files = ['SOUL.md', 'USER.md', 'MEMORY.md']
-        pulled_count = 0
-        skipped_count = 0
-        
-        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_name)
-                try:
-                    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_name)
-            else:
-                skipped_count += 1
-        
-        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"""
-        if self._is_syncing(file_path):
-            return
-        
-        self._mark_syncing(file_path)
-        
-        try:
-            local_content = self._read_local_file(file_path)
-            if local_content is None:
-                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.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"[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"[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('__profiles__')
-        
-        if version <= local_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()
-            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_content = cloud_content.get(file_path, '')
-            
-            local_content = self._read_local_file(file_path)
-            
-            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_file_content)
-            self.version_manager.set_version('__profiles__', cloud_version)
-            self.version_manager.set_version(file_path, version)
-            print(f"[SoulSync] Pulled remote change: {file_path} (v{version})")
-        except Exception as 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"[SoulSync] CONFLICT detected for {file_path}")
-        
-        self._create_conflict_backup(file_path, local_content, 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"[SoulSync] Conflict resolved: server version used for {file_path}")
-        print(f"[SoulSync] Please manually merge the conflict backup file")

package/src/version_manager.py

@@ -1,61 +0,0 @@
-import json
-import os
-
-
-class VersionManager:
-    """本地版本管理"""
-    
-    def __init__(self, versions_file: str):
-        self.versions_file = versions_file
-        self.versions = {}
-        self.load()
-    
-    def load(self):
-        """加载版本文件"""
-        if os.path.exists(self.versions_file):
-            try:
-                with open(self.versions_file, 'r', encoding='utf-8') as f:
-                    self.versions = json.load(f)
-            except Exception as e:
-                print(f"Failed to load versions file: {e}")
-                self.versions = {}
-        else:
-            self.versions = {}
-    
-    def save(self):
-        """保存版本文件"""
-        try:
-            directory = os.path.dirname(self.versions_file)
-            if directory and not os.path.exists(directory):
-                os.makedirs(directory, exist_ok=True)
-            
-            with open(self.versions_file, 'w', encoding='utf-8') as f:
-                json.dump(self.versions, f, indent=2, ensure_ascii=False)
-        except Exception as e:
-            print(f"Failed to save versions file: {e}")
-    
-    def get_version(self, file_path: str) -> int:
-        """获取文件版本"""
-        return self.versions.get(file_path, 0)
-    
-    def set_version(self, file_path: str, version: int):
-        """设置文件版本"""
-        self.versions[file_path] = version
-        self.save()
-    
-    def increment_version(self, file_path: str) -> int:
-        """递增版本"""
-        current = self.get_version(file_path)
-        new_version = current + 1
-        self.set_version(file_path, new_version)
-        return new_version
-    
-    def update_versions(self, updates: dict):
-        """批量更新版本"""
-        for file_path, version in updates.items():
-            self.versions[file_path] = version
-        self.save()
-    
-    def get_all_versions(self) -> dict:
-        """获取所有版本"""
-        return self.versions.copy()

package/src/watcher.py

@@ -1,133 +0,0 @@
-import os
-import time
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler, FileSystemEvent
-
-
-class OpenClawMultiWatcher(FileSystemEventHandler):
-    """OpenClaw 多文件/目录监听器"""
-    
-    def __init__(self, workspace: str, watch_paths: list, callback):
-        self.workspace = os.path.abspath(workspace)
-        self.watch_paths = watch_paths
-        self.callback = callback
-        self.observer = None
-        self.last_events = {}
-        self.debounce_seconds = 1
-        self.ignore_patterns = ['.tmp', '.swp', '.bak', '~']
-    
-    def start(self):
-        """开始监听"""
-        if not os.path.exists(self.workspace):
-            os.makedirs(self.workspace, exist_ok=True)
-        
-        self.observer = Observer()
-        
-        for watch_path in self.watch_paths:
-            full_path = os.path.join(self.workspace, watch_path)
-            
-            if watch_path.endswith('/'):
-                dir_name = watch_path.rstrip('/')
-                if not os.path.exists(full_path):
-                    os.makedirs(full_path, exist_ok=True)
-                    print(f"Created directory: {full_path}")
-                
-                self.observer.schedule(self, full_path, recursive=True)
-                print(f"Watching directory: {watch_path}")
-            else:
-                directory = os.path.dirname(full_path)
-                if directory and not os.path.exists(directory):
-                    os.makedirs(directory, exist_ok=True)
-                
-                if not os.path.exists(full_path):
-                    with open(full_path, 'w', encoding='utf-8') as f:
-                        pass
-                    print(f"Created file: {watch_path}")
-                
-                self.observer.schedule(self, os.path.dirname(full_path), recursive=False)
-                print(f"Watching file: {watch_path}")
-        
-        self.observer.start()
-        print(f"Started watching {len(self.watch_paths)} paths in {self.workspace}")
-    
-    def stop(self):
-        """停止监听"""
-        if self.observer:
-            self.observer.stop()
-            self.observer.join()
-            print("Stopped watching")
-    
-    def _should_ignore(self, path: str) -> bool:
-        """检查是否应该忽略"""
-        basename = os.path.basename(path)
-        for pattern in self.ignore_patterns:
-            if pattern in basename:
-                return True
-        return False
-    
-    def _get_relative_path(self, absolute_path: str) -> str:
-        """获取相对路径"""
-        if absolute_path.startswith(self.workspace):
-            relative = absolute_path[len(self.workspace):].lstrip('/')
-            return relative
-        return absolute_path
-    
-    def _debounce_check(self, file_path: str) -> bool:
-        """防抖检查"""
-        current_time = time.time()
-        last_time = self.last_events.get(file_path, 0)
-        
-        if current_time - last_time < self.debounce_seconds:
-            return False
-        
-        self.last_events[file_path] = current_time
-        return True
-    
-    def on_modified(self, event):
-        """文件被修改"""
-        if event.is_directory:
-            return
-        
-        event_path = os.path.abspath(event.src_path)
-        
-        if self._should_ignore(event_path):
-            return
-        
-        if self._debounce_check(event_path):
-            relative_path = self._get_relative_path(event_path)
-            print(f"[Watcher] File modified: {relative_path}")
-            self._trigger_callback('modified', relative_path, event_path)
-    
-    def on_created(self, event):
-        """文件被创建"""
-        if event.is_directory:
-            return
-        
-        event_path = os.path.abspath(event.src_path)
-        
-        if self._should_ignore(event_path):
-            return
-        
-        if self._debounce_check(event_path):
-            relative_path = self._get_relative_path(event_path)
-            print(f"[Watcher] File created: {relative_path}")
-            self._trigger_callback('created', relative_path, event_path)
-    
-    def on_deleted(self, event):
-        """文件被删除"""
-        if event.is_directory:
-            return
-        
-        event_path = os.path.abspath(event.src_path)
-        
-        if self._should_ignore(event_path):
-            return
-        
-        relative_path = self._get_relative_path(event_path)
-        print(f"[Watcher] File deleted: {relative_path}")
-        self._trigger_callback('deleted', relative_path, event_path)
-    
-    def _trigger_callback(self, event_type: str, relative_path: str, absolute_path: str = None):
-        """触发回调函数"""
-        if self.callback:
-            self.callback(event_type, relative_path, absolute_path)

package/test_ssl_fix.py

@@ -1,58 +0,0 @@
-#!/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("测试完成")