soulsync 1.0.5 → 1.0.7

package/config.json.example

@@ -1,7 +1,7 @@
 {
   "cloud_url": "https://soulsync.work",
-  "email": "your-email@example.com",
-  "password": "your-password",
+  "email": "",
+  "password": "",
   "workspace": "./workspace",
   "memory_file": "MEMORY.md",
   "watch_files": [
@@ -13,5 +13,6 @@
     "skills.json",
     "memory/",
     "MEMORY.md"
-  ]
+  ],
+  "_comment": "Register at https://soulsync.work or use curl to call /api/auth/register endpoint"
 }

package/package.json

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

package/src/client.py

@@ -124,8 +124,12 @@ class OpenClawClient:
             print(f"Logged in: {email}")
             return result
         elif response.status_code == 401:
-            # Login failed, try register (not supported in this flow)
+            # Login failed
             raise Exception(f"Invalid email or password / 邮箱或密码错误")
+        elif response.status_code == 429:
+            # Rate limited
+            error = response.json().get('error', 'Too many attempts')
+            raise Exception(f"429: {error}")
         else:
             error = response.json().get('error', 'Unknown error')
             raise Exception(f"Authentication failed: {error}")

package/src/main.py

@@ -21,8 +21,6 @@ from watcher import OpenClawMultiWatcher
 from version_manager import VersionManager
 from profiles import ProfilesClient
 from sync import ProfileSync
-from register import Register, Login
-from interactive_auth import prompt_for_missing_config, interactive_setup, check_existing_config
 
 
 class SoulSyncPlugin:
@@ -42,14 +40,14 @@ class SoulSyncPlugin:
         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}")
+        print(f"[SoulSync] Looking for config at: {config_path}")
       
         if not os.path.exists(config_path):
             if os.path.exists(config_example_path):
-                print("Config file not found, copying from config.json.example...")
+                print("[SoulSync] 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")
+                print("[SoulSync] Created config.json from template")
             else:
                 raise FileNotFoundError(f"Config file not found: {config_path}")
       
@@ -59,25 +57,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")
+            print("[SoulSync] 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)
+        if not email or not password or email == 'your-email@example.com' or password == 'your-password':
+            print("\n[SoulSync] ========================================")
+            print("[SoulSync] Please configure your account first / 请先配置账号")
+            print("[SoulSync] ========================================")
+            print("[SoulSync] Edit config file / 编辑配置文件:")
+            print(f"           {config_path}")
+            print("[SoulSync] Set your email and password, then restart / 填写邮箱和密码后重启")
+            print("[SoulSync] ========================================\n")
+            sys.exit(0)
         
-        # 处理 workspace 路径
         workspace = self.config.get('workspace', './workspace')
         if workspace.startswith('./'):
             workspace = workspace[2:]
@@ -88,39 +85,10 @@ class SoulSyncPlugin:
         self.config['workspace'] = workspace
         self.config['watch_files'] = watch_files
       
-        print(f"Config loaded:")
-        print(f"  Cloud URL: {self.config.get('cloud_url')}")
-        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)
+        print(f"[SoulSync] Config loaded:")
+        print(f"           Cloud URL: {self.config.get('cloud_url')}")
+        print(f"           Workspace: {workspace}")
+        print(f"           Watch files: {watch_files}")
     
     def _save_auth_to_config(self, auth_result):
         """保存认证结果到 config.json"""
@@ -147,7 +115,9 @@ class SoulSyncPlugin:
   
     def initialize(self):
         """初始化组件"""
-        print("\n=== Initializing SoulSync Plugin ===\n")
+        print("\n[SoulSync] ========================================")
+        print("[SoulSync] Initializing SoulSync Plugin")
+        print("[SoulSync] ========================================\n")
       
         self.client = OpenClawClient(self.config)
 
@@ -155,38 +125,49 @@ class SoulSyncPlugin:
         if token:
             try:
                 profile = self.client.get_profile()
-                print(f"Using existing token, user: {profile.get('email', 'unknown')}")
+                print(f"[SoulSync] Using existing token, user: {profile.get('email', 'unknown')}")
             except Exception as e:
-                print(f"Token invalid / 令牌无效, re-authenticating: {e}")
+                print(f"[SoulSync] Token invalid, re-authenticating: {e}")
                 token = None
 
         if not token:
-            print("\n=== Token invalid - Please login or register / 令牌无效，请先登录或注册 ===\n")
-            print("1. Login / 登录（已有账号）")
-            print("2. Register / 注册（新用户）")
-
-            choice = input("Choose (1/2): ").strip()
-
-            if choice == '1':
-                login = Login(self.client)
-                result = login.run()
-            elif choice == '2':
-                register = Register(self.client)
-                result = register.run()
-            else:
-                print("Invalid choice / 无效选择")
-                sys.exit(1)
+            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:
+                    print("[SoulSync] Login successful! / 登录成功!")
+                    self._save_auth_to_config(result)
+                    token = self.client.token
+            except Exception as e:
+                error_msg = str(e)
+                print(f"[SoulSync] Login failed: {e}")
+                
+                if "429" in error_msg or "too many" in error_msg.lower():
+                    print("\n[SoulSync] ========================================")
+                    print("[SoulSync] Too many failed attempts. Please try again later / 登录失败次数过多，请稍后再试")
+                    print("[SoulSync] ========================================\n")
+                else:
+                    print("\n[SoulSync] ========================================")
+                    print("[SoulSync] Login failed: invalid email or password / 登录失败：邮箱或密码错误")
+                    print("[SoulSync] Please check your config file / 请检查配置文件:")
+                    print(f"           {os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json'))}")
+                    print("[SoulSync] ========================================\n")
+                
+                sys.exit(0)
 
         email = self.config.get('email')
         password = self.config.get('password')
 
         try:
             profile = self.client.get_profile()
-            print(f"\nLogged in as: {profile.get('email')}")
+            print(f"\n[SoulSync] Logged in as: {profile.get('email')}")
             subscription = profile.get('subscription', {})
-            print(f"Subscription: {subscription.get('status')} (days remaining: {subscription.get('daysRemaining', 0)})\n")
+            print(f"[SoulSync] Subscription: {subscription.get('status')} (days remaining: {subscription.get('daysRemaining', 0)})\n")
         except Exception as e:
-            print(f"Warning: Could not get profile: {e}")
+            print(f"[SoulSync] Warning: Could not get profile: {e}")
       
         # 版本管理器
         versions_file = os.path.normpath(os.path.join(PLUGIN_DIR, 'versions.json'))

package/src/main_fixed.py

@@ -86,7 +86,7 @@ class SoulSyncPlugin:
         
         # 设置默认服务器
         if not self.config.get('cloud_url'):
-            self.config['cloud_url'] = 'http://47.96.170.74:3000'
+            self.config['cloud_url'] = 'https://soulsync.work'
             print(f"使用默认服务器: {self.config['cloud_url']}")
             print()