@myun/gimi-chat 0.8.5 → 0.8.7

package/dist/utils/voice-stream.d.ts

@@ -69,7 +69,7 @@ export interface StartMessageParams {
         pitch?: number;
     };
 }
-declare class VoiceRecorder {
+export declare class VoiceRecorder {
     private mediaRecorder;
     private audioPlayer;
     private ws;
@@ -83,7 +83,7 @@ declare class VoiceRecorder {
     private unbindNetworkEvents;
     private initStreamingAudioPlayer;
     convertFloat32ToInt16(float32Array: Float32Array): Int16Array;
-    connectHandler(modeType: HandlerModeType): Promise<void>;
+    connectHandler(modeType: HandlerModeType, token: string, baseUrl: string): Promise<void>;
     startHandler(modeType: HandlerModeType, msgPrams?: StartMessageParams | null): Promise<void>;
     toggleRecord(): Promise<void>;
     stopRecordingEvent(): Promise<void>;
@@ -95,7 +95,7 @@ declare class VoiceRecorder {
     recordAndRecognize: () => Promise<void>;
     recordingClick(data: {
         modeType?: string;
-    }, msgPrams?: StartMessageParams | null, callBack?: () => void): Promise<void>;
+    }, msgPrams?: StartMessageParams | null, callBack?: () => void, token?: string, baseUrl?: string): Promise<void>;
     writeString(view: DataView, offset: number, string: string): void;
     /**
      * 创建标准 WAV 格式的 Blob
@@ -107,11 +107,11 @@ declare class VoiceRecorder {
      */
     createWavBlob(pcmData: Int16Array, sampleRate: number, numChannels: number, bitsPerSample: number): Blob;
     blobToBase64(blob: Blob): Promise<string>;
-    toggleTencentRecord(configuration?: Configuration | null, onResult?: (result: any) => void): Promise<void>;
+    toggleTencentRecord(configuration?: Configuration | null, onResult?: (result: any) => void, token?: string, baseUrl?: string): Promise<void>;
     /** 清理tencentRecorder */
     clearTencentRecorder(): void;
-    callTencentAsrApi(base64Data: string, configuration?: Configuration | null): Promise<any | null>;
-    startTTS(text?: string, msgPrams?: StartMessageParams | null): Promise<void>;
+    callTencentAsrApi(base64Data: string, configuration: Configuration | null | undefined, token: string, baseUrl: string): Promise<any | null>;
+    startTTS(text: string | undefined, msgPrams: StartMessageParams | null, token: string, baseUrl: string): Promise<void>;
     resetTTSPlayer(): void;
     sendTextForTTS(text: string): Promise<void>;
 }

package/dist/utils/voice-stream.js

@@ -14,7 +14,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { createFetch } from "../apis/fetch";
-import { store } from "../store";
 
 // 定义业务场景枚举
 var HandlerMode = /*#__PURE__*/function (HandlerMode) {
@@ -43,7 +42,7 @@ var tencentRecorder = {
   processor: null
   // isRecording: false
 };
-var VoiceRecorder = /*#__PURE__*/function () {
+export var VoiceRecorder = /*#__PURE__*/function () {
   function VoiceRecorder() {
     var _this = this;
     _classCallCheck(this, VoiceRecorder);
@@ -329,7 +328,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
   }, {
     key: "connectHandler",
     value: function () {
-      var _connectHandler = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(modeType) {
+      var _connectHandler = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(modeType, token, baseUrl) {
         var _this2 = this;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -337,8 +336,6 @@ var VoiceRecorder = /*#__PURE__*/function () {
               return _context2.abrupt("return", new Promise(function (resolve, reject) {
                 // eslint-disable-next-line no-promise-executor-return
                 if (_this2.ws && _this2.ws.readyState === WebSocket.OPEN) return resolve();
-                var token = store.getState().gimiMenu.token;
-                var baseUrl = store.getState().gimiMenu.baseUrl;
                 try {
                   var ws = new WebSocket("wss://".concat(baseUrl, "/mbot-wss/ws/voice?token=").concat(token));
                   _this2.ws = ws;
@@ -437,7 +434,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
           }
         }, _callee2);
       }));
-      function connectHandler(_x3) {
+      function connectHandler(_x3, _x4, _x5) {
         return _connectHandler.apply(this, arguments);
       }
       return connectHandler;
@@ -537,7 +534,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
             }
           }, _callee3, null, [[0, 14]]);
         }));
-        return function (_x4, _x5) {
+        return function (_x6, _x7) {
           return _ref2.apply(this, arguments);
         };
       }());
@@ -593,7 +590,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
                     }
                   }, _callee4, null, [[0, 16]]);
                 }));
-                return function (_x6, _x7) {
+                return function (_x8, _x9) {
                   return _ref3.apply(this, arguments);
                 };
               }()));
@@ -724,7 +721,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
           }
         }, _callee7, this, [[1, 18]]);
       }));
-      function recordingCancel(_x8) {
+      function recordingCancel(_x10) {
         return _recordingCancel.apply(this, arguments);
       }
       return recordingCancel;
@@ -733,7 +730,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
     key: "recordingClick",
     value: // 核心录入音频入口
     function () {
-      var _recordingClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(data, msgPrams, callBack) {
+      var _recordingClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(data, msgPrams, callBack, token, baseUrl) {
         var _data$modeType2, modeType, error, err;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -745,7 +742,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
               }
               _context8.prev = 2;
               _context8.next = 5;
-              return this.connectHandler(modeType);
+              return this.connectHandler(modeType, token || '', baseUrl || '');
             case 5:
               _context8.next = 7;
               return this.startHandler(modeType, msgPrams);
@@ -789,7 +786,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
           }
         }, _callee8, this, [[2, 11], [17, 23]]);
       }));
-      function recordingClick(_x9, _x10, _x11) {
+      function recordingClick(_x11, _x12, _x13, _x14, _x15) {
         return _recordingClick.apply(this, arguments);
       }
       return recordingClick;
@@ -876,6 +873,8 @@ var VoiceRecorder = /*#__PURE__*/function () {
       var _toggleTencentRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
         var configuration,
           onResult,
+          token,
+          baseUrl,
           stream,
           audioContext,
           processor,
@@ -895,19 +894,21 @@ var VoiceRecorder = /*#__PURE__*/function () {
             case 0:
               configuration = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : null;
               onResult = _args9.length > 1 ? _args9[1] : undefined;
+              token = _args9.length > 2 ? _args9[2] : undefined;
+              baseUrl = _args9.length > 3 ? _args9[3] : undefined;
               if (!(!tencentRecorder.stream || !tencentRecorder.audioContext)) {
-                _context9.next = 4;
+                _context9.next = 6;
                 break;
               }
               throw new Error('腾讯云录音未初始化，无法停止');
-            case 4:
-              _context9.prev = 4;
+            case 6:
+              _context9.prev = 6;
               stream = tencentRecorder.stream, audioContext = tencentRecorder.audioContext, processor = tencentRecorder.processor, source = tencentRecorder.source;
               source === null || source === void 0 || source.disconnect();
               processor === null || processor === void 0 || processor.disconnect();
-              _context9.next = 10;
+              _context9.next = 12;
               return audioContext.close();
-            case 10:
+            case 12:
               stream.getTracks().forEach(function (track) {
                 return track.stop();
               });
@@ -932,30 +933,30 @@ var VoiceRecorder = /*#__PURE__*/function () {
                 _iterator2.f();
               }
               wavBlob = this.createWavBlob(mergedPcm, 16000, 1, 16); // 转换为 Base64
-              _context9.next = 19;
+              _context9.next = 21;
               return this.blobToBase64(wavBlob);
-            case 19:
+            case 21:
               base64Data = _context9.sent;
-              _context9.next = 22;
-              return this.callTencentAsrApi(base64Data, configuration);
-            case 22:
+              _context9.next = 24;
+              return this.callTencentAsrApi(base64Data, configuration, token || '', baseUrl || '');
+            case 24:
               _data2 = _context9.sent;
               if (onResult) {
                 onResult(_data2);
               }
               this.clearTencentRecorder();
-              _context9.next = 31;
+              _context9.next = 33;
               break;
-            case 27:
-              _context9.prev = 27;
-              _context9.t0 = _context9["catch"](4);
+            case 29:
+              _context9.prev = 29;
+              _context9.t0 = _context9["catch"](6);
               this.clearTencentRecorder();
               throw new Error(_context9.t0.message);
-            case 31:
+            case 33:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[4, 27]]);
+        }, _callee9, this, [[6, 29]]);
       }));
       function toggleTencentRecord() {
         return _toggleTencentRecord.apply(this, arguments);
@@ -979,13 +980,14 @@ var VoiceRecorder = /*#__PURE__*/function () {
     value: function () {
       var _callTencentAsrApi = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(base64Data) {
         var configuration,
+          token,
+          baseUrl,
           engineModel,
           filterDirty,
           filterModal,
           filterPunc,
           convertNum,
           requestData,
-          baseUrl,
           api,
           response_data,
           _result,
@@ -995,6 +997,8 @@ var VoiceRecorder = /*#__PURE__*/function () {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               configuration = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : null;
+              token = _args10.length > 2 ? _args10[2] : undefined;
+              baseUrl = _args10.length > 3 ? _args10[3] : undefined;
               engineModel = null;
               filterDirty = null;
               filterModal = null;
@@ -1016,50 +1020,49 @@ var VoiceRecorder = /*#__PURE__*/function () {
                 filterPunc: filterPunc,
                 convertNumMode: convertNum
               };
-              _context10.prev = 8;
-              baseUrl = store.getState().gimiMenu.baseUrl;
+              _context10.prev = 10;
               api = createFetch({
                 baseURL: baseUrl,
                 timeout: 10000,
                 headers: {
-                  'Authorization': 'Bearer ' + store.getState().gimiMenu.token,
+                  'Authorization': 'Bearer ' + token,
                   'Content-Type': 'application/json'
                 }
               });
-              _context10.next = 13;
+              _context10.next = 14;
               return api.post("/mbot/api/tencent/asr/recognize", requestData);
-            case 13:
+            case 14:
               response_data = _context10.sent;
               if (!(response_data.status !== 0)) {
-                _context10.next = 16;
+                _context10.next = 17;
                 break;
               }
               throw new Error('HTTP ' + response_data.status);
-            case 16:
+            case 17:
               if (!(response_data.status === 0 && response_data.result)) {
-                _context10.next = 21;
+                _context10.next = 22;
                 break;
               }
               _result = response_data.result;
               return _context10.abrupt("return", _result);
-            case 21:
+            case 22:
               // 处理接口级别的错误
               errorMsg = response_data.message || '请求失败';
               throw new Error(errorMsg);
-            case 23:
-              _context10.next = 28;
+            case 24:
+              _context10.next = 29;
               break;
-            case 25:
-              _context10.prev = 25;
-              _context10.t0 = _context10["catch"](8);
+            case 26:
+              _context10.prev = 26;
+              _context10.t0 = _context10["catch"](10);
               throw new Error(_context10.t0.message);
-            case 28:
+            case 29:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, null, [[8, 25]]);
+        }, _callee10, null, [[10, 26]]);
       }));
-      function callTencentAsrApi(_x12) {
+      function callTencentAsrApi(_x16) {
         return _callTencentAsrApi.apply(this, arguments);
       }
       return callTencentAsrApi;
@@ -1067,14 +1070,14 @@ var VoiceRecorder = /*#__PURE__*/function () {
   }, {
     key: "startTTS",
     value: function () {
-      var _startTTS = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(text, msgPrams) {
+      var _startTTS = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(text, msgPrams, token, baseUrl) {
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               this.ttsSessionId++;
               _context11.prev = 1;
               _context11.next = 4;
-              return this.connectHandler(HandlerMode.TTS_ONLY);
+              return this.connectHandler(HandlerMode.TTS_ONLY, token, baseUrl);
             case 4:
               _context11.next = 6;
               return this.startHandler(HandlerMode.TTS_ONLY, msgPrams);
@@ -1098,7 +1101,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
           }
         }, _callee11, this, [[1, 11]]);
       }));
-      function startTTS(_x13, _x14) {
+      function startTTS(_x17, _x18, _x19, _x20) {
         return _startTTS.apply(this, arguments);
       }
       return startTTS;
@@ -1150,7 +1153,7 @@ var VoiceRecorder = /*#__PURE__*/function () {
           }
         }, _callee12);
       }));
-      function sendTextForTTS(_x15) {
+      function sendTextForTTS(_x21) {
         return _sendTextForTTS.apply(this, arguments);
       }
       return sendTextForTTS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myun/gimi-chat",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",