Merge pull request #27 from pvq212/main

fix: 修正了不能開箱即用的問題

Author: chaz6chez

src/Events/Subscribe.php

@@ -51,7 +51,7 @@ public function response(TcpConnection $connection, array $request): void
         $channel = $request['data']['channel'] ?? '';
         $channelData = $request['data']['channel_data'] ?? [];
         $clientAuth = $request['data']['auth'] ?? '';
-        $appsCallback = PushServer::getConfig('apps_query', getBase: true);
+        $appsCallback = PushServer::getConfig('app_verify', getBase: true);
 
         // private- 和 presence- 开头的channel需要验证
         switch ($channelType = PushServer::getChannelType($channel)){
@@ -71,7 +71,7 @@ public function response(TcpConnection $connection, array $request): void
                 } else {
                     $auth = '';
                     Log::channel('plugin.workbunny.webman-push-server.warning')
-                        ->warning("[PUSH-SERVER] Subscribe auth error, Config apps_query not found. ", [
+                        ->warning("[PUSH-SERVER] Subscribe auth error, Config app_verify not found. ", [
                             'request' => $request,
                             'method'  => __METHOD__
                         ]);
@@ -102,7 +102,7 @@ public function response(TcpConnection $connection, array $request): void
                 } else {
                     $auth = '';
                     Log::channel('plugin.workbunny.webman-push-server.warning')
-                        ->warning("[PUSH-SERVER] Subscribe auth error, Config apps_query not found. ", [
+                        ->warning("[PUSH-SERVER] Subscribe auth error, Config app_verify not found. ", [
                             'request' => $request,
                             'method'  => __METHOD__
                         ]);

src/config/plugin/workbunny/webman-push-server/process.php

@@ -18,7 +18,7 @@
     // 推送服务器
     'push-server' => [
         'handler'     => PushServer::class,
-        'listen'      => 'websocket://0.0.0.0:' . config('plugin.workbunny.webman-push-server.app.push-server.port', 8002),
+        'listen'      => 'websocket://0.0.0.0:' . config('plugin.workbunny.webman-push-server.app.push-server.port', 8001),
         'count'       => cpu_count(),
         'reloadable'  => false, // 执行reload不重启
         'reusePort'   => true,

src/push.js

@@ -64,6 +64,7 @@ Push.prototype.createConnection = function () {
             }
 
             params = JSON.parse(params.data);
+
             var event = params.event;
             var channel_name = params.channel;
 
@@ -74,7 +75,7 @@ Push.prototype.createConnection = function () {
             if (event === 'pusher:error') {
                 throw Error(params.data.message);
             }
-            var data = JSON.parse(params.data), channel;
+
             if (event === 'pusher_internal:subscription_succeeded') {
                 channel = _this.channels[channel_name];
                 channel.subscribed = true;
@@ -83,7 +84,7 @@ Push.prototype.createConnection = function () {
                 return;
             }
             if (event === 'pusher:connection_established') {
-                _this.connection.socket_id = data.socket_id;
+                _this.connection.socket_id = params.data.socket_id;
                 _this.connection.updateNetworkState('connected');
                 _this.subscribeAll();
             }
@@ -93,7 +94,7 @@ Push.prototype.createConnection = function () {
             }
             channel = _this.channels[channel_name];
             if (channel) {
-                channel.emit(event, data);
+                channel.emit(event, params.data);
             }
         },
         onClose: function () {