update: 支持 TabId 不传递模式

NHZEX · NHZEX · commit b6b98bdb42ec · 2024-06-09T19:58:20.000+08:00
diff --git a/README.md b/README.md
@@ -41,6 +41,6 @@
     // 端到端加密密钥（最少 8 位长度，不配置为空或移除）
     'e2e_encryption_key'  => 'CTZ4PH9JALN375ZXJDJ4',
     // 发送异常日志（必须确保目录可写，不配置为空或移除）
-    'socket_error_log' => runtime_path() . 'socklog_send.log',
+    'socket_error_log'    => runtime_path() . 'socklog_send.log',
 ]
 ```
diff --git a/think/SocketV2.php b/think/SocketV2.php
@@ -50,7 +50,7 @@ class SocketV2 implements LogHandlerInterface
 
     protected array $allowForceClientIds = []; //配置强制推送且被授权的client_id
 
-    protected $clientArg = [];
+    private array $clientArg = [];
 
     protected App          $app;
     protected SocketClient $client;
@@ -159,7 +159,7 @@ public function save(array $log = []): bool
             'css'  => '',
         ];
 
-        $tabid = $this->getClientArg('tabid');
+        $tabId = (int) $this->getClientArg('tabid');
 
         if (!$clientId = $this->getClientArg('client_id')) {
             $clientId = '';
@@ -169,10 +169,10 @@ public function save(array $log = []): bool
             //强制推送到多个client_id
             foreach ($this->allowForceClientIds as $forceClientId) {
                 $clientId = $forceClientId;
-                $this->sendToClient($tabid, $clientId, $trace, $forceClientId);
+                $this->sendToClient($tabId, $clientId, $trace, $forceClientId);
             }
         } else {
-            $this->sendToClient($tabid, $clientId, $trace, '');
+            $this->sendToClient($tabId, $clientId, $trace, '');
         }
 
         return true;
@@ -204,14 +204,13 @@ protected function sendToClient($tabId, $clientId, $logs, $forceClientId)
 
     /**
      * 检测客户授权
-     * @return bool
      */
-    protected function check()
+    protected function check(): bool
     {
-        $tabid = $this->getClientArg('tabid');
+        $tabid = (int) $this->getClientArg('tabid');
 
         //是否记录日志的检查
-        if (!$tabid && !$this->config['force_client_ids']) {
+        if ($tabid === 0 && !$this->config['force_client_ids']) {
             return false;
         }
 
@@ -238,10 +237,8 @@ protected function check()
 
     /**
      * 获取客户参数
-     * @param string $name
-     * @return string
      */
-    protected function getClientArg(string $name)
+    protected function getClientArg(string $name): string
     {
         if (!$this->app->exists('request')) {
             return '';
@@ -254,10 +251,18 @@ protected function getClientArg(string $name)
             }
 
             if (!preg_match('/SocketLog\((.*?)\)/', $socketLog, $match)) {
-                $this->clientArg = ['tabid' => null, 'client_id' => null];
+                $this->clientArg = [
+                    'tabid' => '-1',
+                    'client_id' => null,
+                ];
                 return '';
             }
-            parse_str($match[1] ?? '', $this->clientArg);
+            $tmp = [];
+            parse_str($match[1] ?? '', $tmp);
+            $this->clientArg = [
+                'tabid' => $tmp['tabid'] ?? '-1',
+                'client_id' => $tmp['client_id'] ?? null,
+            ];
         }
 
         if (isset($this->clientArg[$name])) {

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@`
`41`	`41`	`// 端到端加密密钥（最少 8 位长度，不配置为空或移除）`
`42`	`42`	`'e2e_encryption_key' => 'CTZ4PH9JALN375ZXJDJ4',`
`43`	`43`	`// 发送异常日志（必须确保目录可写，不配置为空或移除）`
`44`		`- 'socket_error_log' => runtime_path() . 'socklog_send.log',`
	`44`	`+ 'socket_error_log' => runtime_path() . 'socklog_send.log',`
`45`	`45`	`]`
`46`	`46`	```