Merge remote-tracking branch 'origin/dev' into dev

app/api/controller/XunFeiController.php

@@ -139,103 +139,131 @@ class XunFeiController extends BaseApiController
         if (!file_exists($file)) {
             return $this->fail('未上传音频文件');
         }
+        $filesize = filesize($file);
+        if ($filesize > 1 * 1024 * 1024) {
+            return $this->fail('录音文件太长');
+        }
+        $ext = pathinfo($file, PATHINFO_EXTENSION);
+        $extArray = ['mp3', 'pcm'];
+        if (!in_array($ext, $extArray)) {
+            return $this->fail('录音格式错误');
+        }
+        $encoding = 'raw';
+        if ($ext == 'mp3') {
+            $encoding = 'lame';
+        }
+        if ($ext == 'pcm') {
+            $encoding = 'raw';
+        }
         // $file = "https://lihai001.oss-cn-chengdu.aliyuncs.com/media/iat_mp3_16k.mp3";
         $audioFile = fopen($file, 'rb');
         if ($audioFile === false) {
             return $this->fail('音频文件异常');
         }
-        $words = '';
+
-        $iatHostUrl = "wss://iat-api.xfyun.cn/v2/iat";
+        try {
-        $iat = new IatClient($this->app_id, $this->api_key, $this->api_secret);
+            $words = '';
-        $client = new Client($iat->assembleAuthUrl($iatHostUrl));
+            $iatHostUrl = "wss://iat-api.xfyun.cn/v2/iat";
-        if ($client) {
+            $iat = new IatClient($this->app_id, $this->api_key, $this->api_secret);
-            $frameSize = 1280; //每一帧的音频大小
+            $client = new Client($iat->assembleAuthUrl($iatHostUrl));
-            $intervel = 20 * 1000; //发送音频间隔
+            if ($client) {
-            $status = 0;
+                $frameSize = 1280; //每一帧的音频大小
-            while (true) {
+                $intervel = 20 * 1000; //发送音频间隔
-                $len = fread($audioFile, $frameSize);
+                $status = 0;
-                if ($len === false) {
+                while (true) {
-                    break;
+                    $len = fread($audioFile, $frameSize);
-                }
+                    if ($len === false) {
-                if ($len === '') { //文件读取完了
-                    $status = 2;
-                }
-                switch ($status) {
-                    case 0: //发送第一帧音频，带business 参数
-                        $frameData = array(
-                            'common' => array(
-                                'app_id' => $this->app_id //appid 必须带上，只需第一帧发送
-                            ),
-                            'business' => array( //business 参数，只需一帧发送
-                                'language' => 'zh_cn',
-                                'domain' => 'iat',
-                                'accent' => 'mandarin'
-                            ),
-                            'data' => array(
-                                'status' => 0,
-                                'format' => 'audio/L16;rate=16000',
-                                'audio' => base64_encode($len),
-                                'encoding' => 'lame'
-                            )
-                        );
-                        $client->send(json_encode($frameData));
-                        $status = 1;
                         break;
-                    case 1:
+                    }
-                        $frameData = array(
+                    if ($len === '') { //文件读取完了
-                            'data' => array(
+                        $status = 2;
-                                'status' => 1,
+                    }
-                                'format' => 'audio/L16;rate=16000',
+                    switch ($status) {
-                                'audio' => base64_encode($len),
+                        case 0: //发送第一帧音频，带business 参数
-                                'encoding' => 'raw'
+                            $frameData = array(
-                            )
+                                'common' => array(
-                        );
+                                    'app_id' => $this->app_id //appid 必须带上，只需第一帧发送
-                        $client->send(json_encode($frameData));
+                                ),
+                                'business' => array( //business 参数，只需一帧发送
+                                    'language' => 'zh_cn',
+                                    'domain' => 'iat',
+                                    'accent' => 'mandarin'
+                                ),
+                                'data' => array(
+                                    'status' => 0,
+                                    'format' => 'audio/L16;rate=16000',
+                                    'audio' => base64_encode($len),
+                                    'encoding' => $encoding
+                                )
+                            );
+                            $client->send(json_encode($frameData));
+                            $status = 1;
+                            break;
+                        case 1:
+                            $frameData = array(
+                                'data' => array(
+                                    'status' => 1,
+                                    'format' => 'audio/L16;rate=16000',
+                                    'audio' => base64_encode($len),
+                                    'encoding' => $encoding
+                                )
+                            );
+                            $client->send(json_encode($frameData));
+                            break;
+                        case 2:
+                            $frameData = array(
+                                'data' => array(
+                                    'status' => 2,
+                                    'format' => 'audio/L16;rate=16000',
+                                    'audio' => base64_encode($len),
+                                    'encoding' => $encoding
+                                )
+                            );
+                            $client->send(json_encode($frameData));
+                            break 2;
+                    }
+                    //模拟音频采样间隔
+                    usleep($intervel);
+                }
+                while (true) {
+                    $response = $client->receive();
+                    if ($response === null) {
                         break;
-                    case 2:
+                    }
-                        $frameData = array(
+                    $resp = json_decode($response, true);
-                            'data' => array(
+                    $code = $resp['code'];
-                                'status' => 2,
+                    if ($code != 0) {
-                                'format' => 'audio/L16;rate=16000',
+                        break;
-                                'audio' => base64_encode($len),
+                    }
-                                'encoding' => 'raw'
+                    $message = $resp['message'];
-                            )
+                    $data = $resp['data'];
-                        );
+                    $result = $data['result'];
-                        $client->send(json_encode($frameData));
+                    $status = $data['status'];
-                        break 2;
+                    foreach($result['ws'] as $v) {
+                        $words .= $v['cw'][0]['w'] ?? '';
+                    }
+                    if ($status === 2) {
+                        break;
+                    }
                 }
-                //模拟音频采样间隔
+            } else {
-                usleep($intervel);
+                // 删除临时音频文件
+                if (file_exists($file)) {
+                    //unlink($file);
+                }
+                return $this->fail('无法连接到 WebSocket 服务器');
             }
-            while (true) {
+            fclose($audioFile);
-                $response = $client->receive();
-                if ($response === null) {
-                    break;
-                }
-                $resp = json_decode($response,true);
-                $code = $resp['code'];
-                $message = $resp['message'];
-                $data = $resp['data'];
-                $result = $data['result'];
-                $status = $data['status'];
-                foreach($result['ws'] as $v) {
-                    $words .= $v['cw'][0]['w'] ?? '';
-                }
-                if ($code != 0 || $status === 2) {
-                    break;
-                }
-            }
-        } else {
             // 删除临时音频文件
             if (file_exists($file)) {
                 //unlink($file);
             }
-            return $this->fail('无法连接到 WebSocket 服务器');
+        } catch (\Exception $e) {
-        }
+            if (file_exists($file)) {
-        fclose($audioFile);
+                // 删除临时文件
-        // 删除临时音频文件
+                unlink($file);
-        if (file_exists($file)) {
+            }
-            //unlink($file);
+            return $this->fail($e->getMessage());
         }
         return $this->data(['words' => $words]);
     }
@@ -268,6 +296,7 @@ class XunFeiController extends BaseApiController
         try {
             $tts = new TtsClient($this->app_id, $this->api_key, $this->api_secret, $business);
             file_put_contents($audioFile, $tts->request($text)->getBody()->getContents());
+            //生成语音文件需要定时清理
         } catch (\Exception $e) {
             return $this->fail($e->getMessage());
         }
@@ -295,7 +324,7 @@ class XunFeiController extends BaseApiController
         $ext = pathinfo($file, PATHINFO_EXTENSION);
         $base64_image = base64_encode(file_get_contents($file));
         $ocr = new OcrClient($this->app_id, $this->api_key, $this->api_secret);
-        $authorization = $ocr->assembleAuthorization($ocrHostUrl);
+        $ocrHostUrl = $ocr->assembleAuthUrl($ocrHostUrl);
         $requestBody = [
             'header' => [
                 'app_id' => $this->app_id,
@@ -319,7 +348,6 @@ class XunFeiController extends BaseApiController
                 ]
             ]
         ];
-        $ocrHostUrl .= '?authorization=' . $authorization;
         $responseData = '';
         try {
             $client = new GzClient(['timeout' => 2]);
@@ -339,7 +367,6 @@ class XunFeiController extends BaseApiController
             }
             return $this->fail($e->getMessage());
         }
-        
         return $this->data(['words' => (string)$responseData]);
     }
 

extend/IFlytek/Xfyun/Speech/OcrClient.php

@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Copyright 1999-2022 iFLYTEK Corporation
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace IFlytek\Xfyun\Speech;
+
+use IFlytek\Xfyun\Core\Traits\SignTrait;
+use IFlytek\Xfyun\Core\HttpClient;
+/**
+ * 讯飞Ai户端
+ *
+ * @author guizheng@iflytek.com
+ */
+class OcrClient
+{
+    use SignTrait;
+
+    protected $appId;
+    protected $apiKey;
+    protected $apiSecret;
+    protected $uid;
+    protected $resId;
+    protected $requestConfig;
+    protected $client;
+
+    public function __construct($appId, $apiKey, $apiSecret, $uid = null, $resId = null, $requestConfig = [])
+    {
+        $this->appId = $appId;
+        $this->apiKey = $apiKey;
+        $this->apiSecret = $apiSecret;
+        $this->uid = $uid;
+        $this->resId = $resId;
+        $this->client = new HttpClient([]);
+    }
+
+    public function assembleAuthUrl($addr, $method='POST') {
+        $apiKey=$this->apiKey;
+        $apiSecret=$this->apiSecret;
+        if ($apiKey == "" && $apiSecret == "") { // 不鉴权
+            return $addr;
+        }
+        
+        $ul = parse_url($addr); // 解析地址
+        if ($ul === false) { // 地址不对，也不鉴权
+            return $addr;
+        }
+        // // $date = date(DATE_RFC1123); // 获取当前时间并格式化为RFC1123格式的字符串
+        $timestamp = time();
+        $rfc1123_format = gmdate("D, d M Y H:i:s \G\M\T", $timestamp);
+        // $rfc1123_format = "Mon, 31 Jul 2023 08:24:03 GMT";
+        // 参与签名的字段 host, date, request-line
+        $signString = array("host: " . $ul["host"], "date: " . $rfc1123_format, $method . " " . $ul["path"] . " HTTP/1.1");
+        // 对签名字符串进行排序，确保顺序一致
+        // ksort($signString);
+        // 将签名字符串拼接成一个字符串
+        $sgin = implode("\n", $signString);
+        // 对签名字符串进行HMAC-SHA256加密，得到签名结果
+        $sha = hash_hmac('sha256', $sgin, $apiSecret, true);
+        
+        $signature_sha_base64 = base64_encode($sha);
+        
+        // 将API密钥、算法、头部信息和签名结果拼接成一个授权URL
+        $authUrl = "api_key=\"$apiKey\",algorithm=\"hmac-sha256\",headers=\"host date request-line\",signature=\"$signature_sha_base64\"";
+        // 对授权URL进行Base64编码，并添加到原始地址后面作为查询参数
+        $authAddr = $addr . '?' . http_build_query(array(
+            'host' => $ul['host'],
+            'date' => $rfc1123_format,
+            'authorization' => base64_encode($authUrl),
+        ));
+        return $authAddr;
+    }
+
+}