修改i

胡龙江
1 parent b939109f
Showing 1 changed file with 71 additions and 46 deletions
start.php
--- a/start.php
View file @7b18a15
+++ b/start.php
View file @7b18a15
@@ -62,46 +62,50 @@ $config = require __DIR__ . '/config.php';
 // Define Heartbeat Interval
 define('HEARTBEAT_TIME', $config['heartbeat']['interval']);
-// Database Connection
-$pdo = null;
-try {
-    $db_config = $config['database'];
-    $dsn = "mysql:host={$db_config['host']};port={$db_config['port']};dbname={$db_config['database']};charset=utf8mb4";
-    $pdo = new PDO($dsn, $db_config['username'], $db_config['password'], [
-        PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-        PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC
-    ]);
-    echo "✅ Connected to MySQL at {$db_config['host']}:{$db_config['port']}\n";
-} catch (Exception $e) {
-    echo "⚠️ MySQL Connection Failed: " . $e->getMessage() . "\n";
-}
-
-// Redis Connection
-$redis = null;
-try {
-    $redis_config = $config['redis'];
-
-    $params = [
-        'scheme' => 'tcp',
-        'host' => $redis_config['host'],
-        'port' => $redis_config['port'],
-    ];
+// ---------------------------------------------------------
+// Helper: Initialize Connections & Services
+// ---------------------------------------------------------
+$initConnections = function($config) {
+    // Database Connection
+    $pdo = null;
+    try {
+        $db_config = $config['database'];
+        $dsn = "mysql:host={$db_config['host']};port={$db_config['port']};dbname={$db_config['database']};charset=utf8mb4";
+        $pdo = new PDO($dsn, $db_config['username'], $db_config['password'], [
+            PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+            PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+            PDO::ATTR_TIMEOUT => 5,
+        ]);
+        echo "✅ Connected to MySQL at {$db_config['host']}:{$db_config['port']}\n";
+    } catch (Exception $e) {
+        echo "⚠️ MySQL Connection Failed: " . $e->getMessage() . "\n";
+    }
-    if (!empty($redis_config['password'])) {
-        $params['password'] = $redis_config['password'];
+    // Redis Connection
+    $redis = null;
+    try {
+        $redis_config = $config['redis'];
+        $params = [
+            'scheme' => 'tcp',
+            'host' => $redis_config['host'],
+            'port' => $redis_config['port'],
+        ];
+        if (!empty($redis_config['password'])) {
+            $params['password'] = $redis_config['password'];
+        }
+        $redis = new Predis\Client($params, ['prefix' => $redis_config['prefix']]);
+        $redis->connect();
+        echo "✅ Connected to Redis at {$redis_config['host']}:{$redis_config['port']} ({$redis_config['prefix']})\n";
+    } catch (Exception $e) {
+        echo "⚠️ Redis Connection Failed: " . $e->getMessage() . "\n";
     }
-    // Predis Client
-    $redis = new Predis\Client($params, ['prefix' => $redis_config['prefix']]);
-    $redis->connect();
-    echo "✅ Connected to Redis at {$redis_config['host']}:{$redis_config['port']} ({$redis_config['prefix']})\n";
-} catch (Exception $e) {
-    echo "⚠️ Redis Connection Failed: " . $e->getMessage() . "\n";
-}
+    // Initialize Services
+    $authService = $pdo ? new AuthService($pdo, $config, $redis) : null;
+    $deviceService = $pdo ? new DeviceService($pdo, $config) : null;
-// Initialize Services
-$authService = $pdo ? new AuthService($pdo, $config, $redis) : null;
-$deviceService = $pdo ? new DeviceService($pdo, $config) : null;
+    return [$pdo, $redis, $authService, $deviceService];
+};
 // Create a WebSocket worker
 $ws_host = $config['server']['websocket_host'];
@@ -112,7 +116,11 @@ $ws_worker = new Worker("websocket://{$ws_host}:{$ws_port}");
 $clients = []; // ClientID -> Connection
 $devices = []; // DeviceID -> Connection
-$ws_worker->onWorkerStart = function ($worker) use ($config) {
+$ws_worker->onWorkerStart = function ($worker) use ($config, $initConnections) {
+    // Each worker process needs its own connection
+    global $pdo, $redis, $authService, $deviceService;
+    list($pdo, $redis, $authService, $deviceService) = $initConnections($config);
+
     $ws_host = $config['server']['websocket_host'];
     $ws_port = $config['server']['websocket_port'];
     echo "Relay Server Started on {$ws_host}:{$ws_port}\n";
@@ -123,14 +131,23 @@ $ws_worker->onWorkerStart = function ($worker) use ($config) {
     file_put_contents(__DIR__ . '/debug.log', $logMsg, FILE_APPEND);
     echo $logMsg; // Keep echo just in case
-    // Heartbeat check
+    // MySQL Heartbeat to prevent "MySQL server has gone away"
+    Timer::add(60, function() use (&$pdo) {
+        if ($pdo) {
+            try {
+                $pdo->query('SELECT 1');
+            } catch (Exception $e) {
+                // Connection lost, will attempt to reconnect on next needed activity if handled, 
+                // but Workerman long-running processes prefer proactive ping
+                echo "⚠️ Database heartbeat failed: " . $e->getMessage() . "\n";
+            }
+        }
+    });
+
+    // Heartbeat check for connections
     $check_interval = $config['heartbeat']['check_interval'];
     Timer::add($check_interval, function () use ($worker) {
-        $time_now = time();
-        foreach ($worker->connections as $connection) {
-            // Check if connection is alive possibly? 
-            // Workerman handles basic disconnects, but we can enforce ping logic here if needed
-        }
+        // ...Existing connection check logic (if any)
     });
 };
@@ -139,7 +156,8 @@ $ws_worker->onConnect = function ($connection) {
     $connection->authVerified = false;
 };
-$ws_worker->onMessage = function ($connection, $data) use (&$clients, &$devices, $authService, $deviceService) {
+$ws_worker->onMessage = function ($connection, $data) use (&$clients, &$devices, $config) {
+    global $authService, $deviceService;
     $msg = json_decode($data, true);
     if (!$msg || !isset($msg['type'])) {
         return;
@@ -280,7 +298,8 @@ $ws_worker->onMessage = function ($connection, $data) use (&$clients, &$devices,
     }
 };
-$ws_worker->onClose = function ($connection) use (&$clients, &$devices, $deviceService) {
+$ws_worker->onClose = function ($connection) use (&$clients, &$devices) {
+    global $deviceService;
     if (isset($connection->role)) {
         if ($connection->role === 'device' && isset($connection->deviceId)) {
             unset($devices[$connection->deviceId]);
@@ -303,7 +322,13 @@ $http_host = $config['server']['http_host'];
 $http_port = $config['server']['http_port'];
 $http_worker = new Worker("http://{$http_host}:{$http_port}");
 $http_worker->count = $config['server']['worker_count'];
-$http_worker->onMessage = function ($connection, $request) use ($config, $authService, $deviceService) {
+$http_worker->onWorkerStart = function($worker) use ($config, $initConnections) {
+    global $pdo, $redis, $authService, $deviceService;
+    list($pdo, $redis, $authService, $deviceService) = $initConnections($config);
+};
+
+$http_worker->onMessage = function ($connection, $request) use ($config) {
+    global $authService, $deviceService;
     $path = $request->path();
     $method = $request->method();