Fix code

Author: zxdong262

.gitignore

@@ -159,4 +159,5 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 /temp/
-/*.json
+/*.json
+*.db

README.md

@@ -16,17 +16,19 @@ Requires python3
 ```bash
 git clone git@github.com:electerm/electerm-sync-server-python.git
 cd electerm-sync-server-python
-python -m venv venv
+python3 -m venv venv
 # On Windows (PowerShell):
 venv\Scripts\activate
 # On Unix/Mac:
-# source venv/bin/activate
+source venv/bin/activate
+
+# Install dependencies
 pip install -r requirements.txt
 
 # create env file, then edit .env
 cp sample.env .env
 
-python src/app.py
+python3 src/app.py
 
 # would show something like
 # server running at http://127.0.0.1:7837
@@ -47,7 +49,7 @@ bin/test
 
 ## Write your own data store
 
-Just take [src/file_store.py](src/file_store.py) as an example, write your own read/write method
+Just take [src/data_store.py](src/data_store.py) as an example, write your own read/write method
 
 ## Sync server in other languages
 

README_zh.md

@@ -15,7 +15,7 @@
 ```bash
 git clone git@github.com:electerm/electerm-sync-server-python.git
 cd electerm-sync-server-python
-python -m venv venv
+python3 -m venv venv
 # 在 Windows (PowerShell) 上：
 venv\Scripts\activate
 # 在 Unix/Mac 上：
@@ -25,7 +25,8 @@ pip install -r requirements.txt
 # 创建环境文件，然后编辑 .env
 cp sample.env .env
 
-python src/app.py
+# 运行服务
+python3 src/app.py
 
 # 会显示类似内容
 # server running at http://127.0.0.1:7837
@@ -46,7 +47,7 @@ bin/test
 
 ## 编写自己的数据存储
 
-以 [src/file_store.py](src/file_store.py) 为例，编写自己的读写方法
+以 [src/data_store.py](src/data_store.py) 为例，编写自己的读写方法
 
 ## 其他语言的同步服务器
 

bin/test

@@ -1,4 +1,4 @@
 #!/bin/bash
 cd `dirname $0`
 cd ..
-python tests/test.py
+python -m unittest tests.test -v

sample.env

@@ -5,6 +5,6 @@ PORT=7837
 HOST=127.0.0.1
 
 # jwt secret, make sure you change it in production
-JWT_SECRET=283hsdfye@!2@9oijnjSwda09
+JWT_SECRET=283hsdfyeDDSd6769oijnjSwda09sfsgfsdgsdfgd234e4tgfd5
 JWT_USERS=username1,username2,xxxx,hhhh
 # FILE_STORE_PATH=/home/some/folder

src/__init__.py

@@ -0,0 +1 @@
+# Electerm sync server package

src/app.py

@@ -1,8 +1,19 @@
 from flask import Flask, jsonify, request
 from flask_jwt_extended import JWTManager, jwt_required, get_jwt_identity
 from dotenv import load_dotenv
-from file_store import read, write
 import os
+import logging
+import sys
+
+# Add src directory to Python path so imports work in both direct execution and module execution
+if os.path.dirname(__file__) not in sys.path:
+    sys.path.insert(0, os.path.dirname(__file__))
+
+from data_store import read, write
+
+# Configure logging
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
 
 load_dotenv()
 
@@ -13,14 +24,17 @@
 
 @jwt.invalid_token_loader
 def invalid_token_callback(error_string):
+    logger.warning(f"Invalid token provided: {error_string}")
     return jsonify({'status': 'error', 'message': 'Invalid token'}), 422
 
 @jwt.expired_token_loader
 def expired_token_callback(jwt_header, jwt_payload):
+    logger.warning("Expired token used")
     return jsonify({'status': 'error', 'message': 'Token expired'}), 422
 
 @jwt.unauthorized_loader
 def unauthorized_callback(error_string):
+    logger.warning(f"Unauthorized access: {error_string}")
     return jsonify({'status': 'error', 'message': 'Missing or invalid token'}), 422
 
 @app.route('/api/sync', methods=['GET', 'PUT', 'POST'])
@@ -30,28 +44,74 @@ def sync():
     users = os.environ['JWT_USERS'].split(',')
 
     if user_id not in users:
+        logger.warning(f"Unauthorized access attempt by user: {user_id}")
         return jsonify({'status': 'error', 'message': 'Unauthorized!'}), 401
 
     if request.method == 'GET':
-        return read(user_id)
+        data, status = read(user_id)
+        if status == 200:
+            return jsonify(data), 200
+        else:
+            return jsonify({'status': 'error', 'message': data}), status
 
     if request.method == 'POST':
+        logger.info(f"User {user_id} testing sync endpoint")
         return 'test ok'
 
     if request.method == 'PUT':
+        logger.info(f"User {user_id} writing sync data")
         data = request.get_json()
-        return write(data, user_id)
+        status_msg, status = write(data, user_id)
+        if status == 200:
+            return status_msg, 200
+        else:
+            return jsonify({'status': 'error', 'message': status_msg}), status
 
     return jsonify({'status': 'error', 'message': 'Unsupported method!'}), 405
 
 @app.route('/test', methods=['GET'])
 def test():
+    logger.info("Test endpoint accessed")
     return 'ok'
 
 
 if __name__ == '__main__':
-  port = os.environ['PORT']
-  host = os.environ['HOST']
+  port = int(os.environ.get('PORT', 5000))
+  host = os.environ.get('HOST', '127.0.0.1')
+  
+  logger.info("=== Electerm Sync Server Starting ===")
+  logger.info(f"Server will run at: http://{host}:{port}")
+  logger.info(f"API endpoint: http://{host}:{port}/api/sync")
+  logger.info(f"Test endpoint: http://{host}:{port}/test")
+  
+  # Show JWT configuration
+  jwt_secret = os.environ.get('JWT_SECRET', '')
+  jwt_users = os.environ.get('JWT_USERS', '')
+  
+  if jwt_secret:
+    logger.info("JWT_SECRET configured (check your .env file)")
+  else:
+    logger.warning("JWT_SECRET not configured in environment variables")
+  
+  if jwt_users:
+    users_list = jwt_users.split(',')
+    logger.info(f"Authorized users: {', '.join(users_list)}")
+    logger.info(f"Use one of these as JWT_USER_NAME in Electerm: {users_list[0]}")
+  else:
+    logger.warning("No JWT_USERS configured in environment variables")
+  
+  # Show data store location
+  from data_store import db_path
+  logger.info(f"Data store location: {db_path}")
+  
+  logger.info("=== Configuration for Electerm ===")
+  logger.info(f"Server URL: http://{host}:{port}")
+  logger.info("Set these values in Electerm sync settings:")
+  logger.info("- Custom sync server URL: http://{host}:{port}")
+  logger.info("- JWT_SECRET: check your .env file")
+  logger.info("- JWT_USER_NAME: (see authorized users above)")
+  logger.info("=== Server Ready ===")
+  
   app.run(
     host=host,
     port=port,

src/data_store.py

@@ -0,0 +1,49 @@
+import sqlite3
+import json
+import os
+
+# Database path from environment or default
+db_path = os.environ.get('DATA_STORE_PATH') or os.path.join(os.getcwd(), 'data.db')
+
+def get_db_connection():
+    """Get a database connection"""
+    conn = sqlite3.connect(db_path)
+    conn.execute('''
+        CREATE TABLE IF NOT EXISTS sync_data (
+            user_id TEXT PRIMARY KEY,
+            data TEXT NOT NULL
+        )
+    ''')
+    conn.commit()
+    return conn
+
+def write(data, user_id):
+    """Write data for a user"""
+    try:
+        json_body = json.dumps(data or {})
+        conn = get_db_connection()
+        conn.execute('''
+            INSERT OR REPLACE INTO sync_data (user_id, data)
+            VALUES (?, ?)
+        ''', (user_id, json_body))
+        conn.commit()
+        conn.close()
+        return "ok", 200
+    except Exception as e:
+        return f"Error writing data: {str(e)}", 500
+
+def read(user_id):
+    """Read data for a user"""
+    try:
+        conn = get_db_connection()
+        cursor = conn.cursor()
+        cursor.execute('SELECT data FROM sync_data WHERE user_id = ?', (user_id,))
+        row = cursor.fetchone()
+        conn.close()
+        if row:
+            data = json.loads(row[0])
+            return data, 200
+        else:
+            return "User not found", 404
+    except Exception as e:
+        return f"Error reading data: {str(e)}", 500