@minto-ai/tools 1.0.60 → 1.0.62

package/dist/browser/create-audio-permission.d.ts

@@ -10,7 +10,8 @@ declare enum AudioPermissionErrorType {
     NOT_READABLE_ERROR = "NotReadableError",
     OVERCONSTRAINED_ERROR = "OverconstrainedError",
     SECURITY_ERROR = "SecurityError",
-    MICROPHONE_UNKNOWN_ERROR = "MicrophoneUnknownError"
+    MICROPHONE_UNKNOWN_ERROR = "MicrophoneUnknownError",
+    MICROPHONE_TIMEOUT_ERROR = "MicrophoneTimeoutError"
 }
 declare class AudioPermissionError extends Error {
     name: AudioPermissionErrorType;
@@ -62,6 +63,7 @@ declare class AudioPermissionError extends Error {
  */
 declare class AudioPlaybackPermission {
     private userInteracted;
+    private executeContext;
     constructor();
     /**
      * 初始化播放权限检测
@@ -80,6 +82,11 @@ declare class AudioPlaybackPermission {
      * 根据Web Audio API最佳实践实现
      */
     requestPlaybackPermission(): Promise<void>;
+    /**
+     * 执行上下文设置
+     * @param context 执行上下文
+     */
+    setExecuteContext(context: AudioPermission): void;
 }
 /**
  * 麦克风权限管理类
@@ -142,6 +149,13 @@ declare class MicrophonePermission {
      * 检查是否在安全上下文中
      */
     private isSecureContext;
+    /**
+     * 带超时的getUserMedia调用
+     * @param constraints - 媒体约束
+     * @param timeoutMs - 超时时间（毫秒）
+     * @returns Promise<MediaStream>
+     */
+    private getUserMediaWithTimeout;
     /**
      * 请求麦克风权限
      * 根据MediaDevices.getUserMedia规范实现
@@ -156,8 +170,8 @@ declare class MicrophonePermission {
  * 统一的音频权限管理类
  */
 declare class AudioPermission {
-    private playbackPermission;
-    private microphonePermission;
+    playbackPermission: AudioPlaybackPermission;
+    microphonePermission: MicrophonePermission;
     constructor();
     /**
      * 请求音频播放权限

package/dist/index.js

@@ -13288,7 +13288,7 @@ var AudioPermissionError = /* @__PURE__ */ function(_Error) {
     key: "create",
     value: function create4(name, message) {
       var _codeMessageMap;
-      var codeMessageMap = (_codeMessageMap = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_codeMessageMap, "NoUserInteractionError", "需要用户交互才能播放音频"), "AutoplayBlocked", "自动播放被浏览器阻止"), "AutoplayUnknownError", "未知自动播放错误"), "SecureContextError", "麦克风权限需要在安全上下文（HTTPS）中使用"), "PermissionDeniedPermanently", "音频权限已被永久拒绝，需在浏览器设置中开启麦克风权限"), "MediaDevicesApiUnavailable", "MediaDevices API不可用"), "NotAllowedError", "麦克风权限被拒绝"), "NotReadableError", "音频设备被其他应用程序占用"), "NotFoundError", "未找到音频输入设备"), "SecurityError", "安全策略阻止访问麦克风"), _defineProperty(_defineProperty(_codeMessageMap, "OverconstrainedError", "音频设备不满足指定的约束条件"), "MicrophoneUnknownError", "未知麦克风权限错误"));
+      var codeMessageMap = (_codeMessageMap = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_codeMessageMap, "NoUserInteractionError", "需要用户交互才能播放音频"), "AutoplayBlocked", "自动播放被浏览器阻止"), "AutoplayUnknownError", "未知自动播放错误"), "SecureContextError", "麦克风权限需要在安全上下文（HTTPS）中使用"), "PermissionDeniedPermanently", "音频权限已被永久拒绝，需在浏览器设置中开启麦克风权限"), "MediaDevicesApiUnavailable", "MediaDevices API不可用"), "NotAllowedError", "麦克风权限被拒绝"), "NotReadableError", "音频设备被其他应用程序占用"), "NotFoundError", "未找到音频输入设备"), "SecurityError", "安全策略阻止访问麦克风"), _defineProperty(_defineProperty(_defineProperty(_codeMessageMap, "OverconstrainedError", "音频设备不满足指定的约束条件"), "MicrophoneUnknownError", "未知麦克风权限错误"), "MicrophoneTimeoutError", "获取麦克风权限超时，请检查设备权限设置或重试"));
       return new AudioPermissionError2(name, message || codeMessageMap[name]);
     }
   }]);
@@ -13297,6 +13297,7 @@ var AudioPlaybackPermission = /* @__PURE__ */ function() {
   function AudioPlaybackPermission2() {
     _classCallCheck(this, AudioPlaybackPermission2);
     _defineProperty(this, "userInteracted", false);
+    _defineProperty(this, "executeContext", void 0);
     this.initPlaybackPermission();
   }
   return _createClass(AudioPlaybackPermission2, [{
@@ -13388,68 +13389,87 @@ var AudioPlaybackPermission = /* @__PURE__ */ function() {
                 /* NO_USER_INTERACTION_ERROR */
               );
             case 4:
+              if (!(isIos() && this.executeContext)) {
+                _context2.next = 7;
+                break;
+              }
+              _context2.next = 7;
+              return this.executeContext.requestMicrophonePermission();
+            case 7:
               audioContext = new (window.AudioContext || window.webkitAudioContext)();
               if (!(isIos() && audioContext.state === "suspended")) {
-                _context2.next = 10;
+                _context2.next = 13;
                 break;
               }
-              _context2.next = 8;
-              return audioContext.resume();
-            case 8:
-              _context2.next = 10;
+              _context2.next = 11;
+              return Promise.race([audioContext.resume(), new Promise(function(_, reject2) {
+                return setTimeout(function() {
+                  return reject2(AudioPermissionError.create(
+                    "AutoplayBlocked"
+                    /* AUTOPLAY_BLOCKED */
+                  ));
+                }, 3e3);
+              })]);
+            case 11:
+              _context2.next = 13;
               return new Promise(function(resolve2) {
                 return setTimeout(resolve2, 50);
               });
-            case 10:
+            case 13:
               if (!(audioContext.state !== "running")) {
-                _context2.next = 12;
+                _context2.next = 15;
                 break;
               }
               throw AudioPermissionError.create(
                 "AutoplayBlocked"
                 /* AUTOPLAY_BLOCKED */
               );
-            case 12:
-              return _context2.abrupt("return", Promise.resolve());
             case 15:
-              _context2.prev = 15;
+              return _context2.abrupt("return", Promise.resolve());
+            case 18:
+              _context2.prev = 18;
               _context2.t0 = _context2["catch"](1);
               if (!(_context2.t0 instanceof AudioPermissionError)) {
-                _context2.next = 19;
+                _context2.next = 22;
                 break;
               }
               return _context2.abrupt("return", Promise.reject(_context2.t0));
-            case 19:
+            case 22:
               unknownError = AudioPermissionError.create("AutoplayUnknownError", _context2.t0 instanceof Error ? _context2.t0.message : void 0);
               return _context2.abrupt("return", Promise.reject(unknownError));
-            case 21:
-              _context2.prev = 21;
+            case 24:
+              _context2.prev = 24;
               if (!(audioContext && audioContext.state !== "closed")) {
-                _context2.next = 30;
+                _context2.next = 33;
                 break;
               }
-              _context2.prev = 23;
-              _context2.next = 26;
+              _context2.prev = 26;
+              _context2.next = 29;
               return audioContext.close();
-            case 26:
-              _context2.next = 30;
+            case 29:
+              _context2.next = 33;
               break;
-            case 28:
-              _context2.prev = 28;
-              _context2.t1 = _context2["catch"](23);
-            case 30:
-              return _context2.finish(21);
             case 31:
+              _context2.prev = 31;
+              _context2.t1 = _context2["catch"](26);
+            case 33:
+              return _context2.finish(24);
+            case 34:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[1, 15, 21, 31], [23, 28]]);
+        }, _callee2, this, [[1, 18, 24, 34], [26, 31]]);
       }));
       function requestPlaybackPermission() {
         return _requestPlaybackPermission.apply(this, arguments);
       }
       return requestPlaybackPermission;
     }()
+  }, {
+    key: "setExecuteContext",
+    value: function setExecuteContext(context) {
+      this.executeContext = context;
+    }
   }]);
 }();
 var MicrophonePermission = /* @__PURE__ */ function() {
@@ -13469,20 +13489,54 @@ var MicrophonePermission = /* @__PURE__ */ function() {
       }
     )
     /**
-     * 请求麦克风权限
-     * 根据MediaDevices.getUserMedia规范实现
+     * 带超时的getUserMedia调用
+     * @param constraints - 媒体约束
+     * @param timeoutMs - 超时时间（毫秒）
+     * @returns Promise<MediaStream>
      */
   }, {
-    key: "requestMicrophonePermission",
+    key: "getUserMediaWithTimeout",
     value: function() {
-      var _requestMicrophonePermission = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee3() {
-        var stream, errorType, audioError, unknownError;
+      var _getUserMediaWithTimeout = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee3(constraints) {
+        var timeoutMs, _args3 = arguments;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.prev = 0;
+              timeoutMs = _args3.length > 1 && _args3[1] !== void 0 ? _args3[1] : 1e4;
+              return _context3.abrupt("return", new Promise(function(resolve2, reject2) {
+                var timeoutId = setTimeout(function() {
+                  reject2(AudioPermissionError.create("MicrophoneTimeoutError", "获取麦克风权限超时（".concat(timeoutMs, "ms）")));
+                }, timeoutMs);
+                navigator.mediaDevices.getUserMedia(constraints).then(function(stream) {
+                  clearTimeout(timeoutId);
+                  resolve2(stream);
+                })["catch"](function(error2) {
+                  clearTimeout(timeoutId);
+                  reject2(error2);
+                });
+              }));
+            case 2:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      function getUserMediaWithTimeout(_x) {
+        return _getUserMediaWithTimeout.apply(this, arguments);
+      }
+      return getUserMediaWithTimeout;
+    }()
+  }, {
+    key: "requestMicrophonePermission",
+    value: function() {
+      var _requestMicrophonePermission = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee4() {
+        var stream, errorType, audioError, unknownError;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.prev = 0;
               if (this.isSecureContext()) {
-                _context3.next = 3;
+                _context4.next = 3;
                 break;
               }
               throw AudioPermissionError.create(
@@ -13491,7 +13545,7 @@ var MicrophonePermission = /* @__PURE__ */ function() {
               );
             case 3:
               if (!this.permissionDeniedPermanently) {
-                _context3.next = 5;
+                _context4.next = 5;
                 break;
               }
               throw AudioPermissionError.create(
@@ -13500,13 +13554,13 @@ var MicrophonePermission = /* @__PURE__ */ function() {
               );
             case 5:
               if (!this.microphonePermissionGranted) {
-                _context3.next = 7;
+                _context4.next = 7;
                 break;
               }
-              return _context3.abrupt("return", Promise.resolve());
+              return _context4.abrupt("return", Promise.resolve());
             case 7:
               if (!(!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia)) {
-                _context3.next = 9;
+                _context4.next = 9;
                 break;
               }
               throw AudioPermissionError.create(
@@ -13514,8 +13568,8 @@ var MicrophonePermission = /* @__PURE__ */ function() {
                 /* MEDIA_DEVICES_API_UNAVAILABLE */
               );
             case 9:
-              _context3.next = 11;
-              return navigator.mediaDevices.getUserMedia({
+              _context4.next = 11;
+              return this.getUserMediaWithTimeout({
                 audio: {
                   echoCancellation: true,
                   noiseSuppression: true,
@@ -13523,58 +13577,58 @@ var MicrophonePermission = /* @__PURE__ */ function() {
                 }
               });
             case 11:
-              stream = _context3.sent;
+              stream = _context4.sent;
               this.microphonePermissionGranted = true;
               stream.getTracks().forEach(function(track2) {
                 track2.stop();
               });
-              return _context3.abrupt("return", Promise.resolve());
+              return _context4.abrupt("return", Promise.resolve());
             case 17:
-              _context3.prev = 17;
-              _context3.t0 = _context3["catch"](0);
+              _context4.prev = 17;
+              _context4.t0 = _context4["catch"](0);
               this.microphonePermissionGranted = false;
-              if (!(_context3.t0 instanceof AudioPermissionError)) {
-                _context3.next = 22;
+              if (!(_context4.t0 instanceof AudioPermissionError)) {
+                _context4.next = 22;
                 break;
               }
-              return _context3.abrupt("return", Promise.reject(_context3.t0));
+              return _context4.abrupt("return", Promise.reject(_context4.t0));
             case 22:
-              if (!(_context3.t0 instanceof DOMException)) {
-                _context3.next = 40;
+              if (!(_context4.t0 instanceof DOMException)) {
+                _context4.next = 40;
                 break;
               }
-              _context3.t1 = _context3.t0.name;
-              _context3.next = _context3.t1 === "NotFoundError" ? 26 : _context3.t1 === "NotAllowedError" ? 28 : _context3.t1 === "NotReadableError" ? 31 : _context3.t1 === "OverconstrainedError" ? 33 : _context3.t1 === "SecurityError" ? 35 : 37;
+              _context4.t1 = _context4.t0.name;
+              _context4.next = _context4.t1 === "NotFoundError" ? 26 : _context4.t1 === "NotAllowedError" ? 28 : _context4.t1 === "NotReadableError" ? 31 : _context4.t1 === "OverconstrainedError" ? 33 : _context4.t1 === "SecurityError" ? 35 : 37;
               break;
             case 26:
               errorType = "NotFoundError";
-              return _context3.abrupt("break", 38);
+              return _context4.abrupt("break", 38);
             case 28:
               this.permissionDeniedPermanently = true;
               errorType = "NotAllowedError";
-              return _context3.abrupt("break", 38);
+              return _context4.abrupt("break", 38);
             case 31:
               errorType = "NotReadableError";
-              return _context3.abrupt("break", 38);
+              return _context4.abrupt("break", 38);
             case 33:
               errorType = "OverconstrainedError";
-              return _context3.abrupt("break", 38);
+              return _context4.abrupt("break", 38);
             case 35:
               errorType = "SecurityError";
-              return _context3.abrupt("break", 38);
+              return _context4.abrupt("break", 38);
             case 37:
               errorType = "MicrophoneUnknownError";
             case 38:
               audioError = AudioPermissionError.create(errorType);
-              return _context3.abrupt("return", Promise.reject(audioError));
+              return _context4.abrupt("return", Promise.reject(audioError));
             case 40:
-              unknownError = AudioPermissionError.create("MicrophoneUnknownError", _context3.t0 instanceof Error ? _context3.t0.message : void 0);
-              return _context3.abrupt("return", Promise.reject(unknownError));
+              unknownError = AudioPermissionError.create("MicrophoneUnknownError", _context4.t0 instanceof Error ? _context4.t0.message : void 0);
+              return _context4.abrupt("return", Promise.reject(unknownError));
             case 42:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[0, 17]]);
+        }, _callee4, this, [[0, 17]]);
       }));
       function requestMicrophonePermission() {
         return _requestMicrophonePermission.apply(this, arguments);
@@ -13595,20 +13649,21 @@ var AudioPermission = /* @__PURE__ */ function() {
     _defineProperty(this, "microphonePermission", void 0);
     this.playbackPermission = new AudioPlaybackPermission();
     this.microphonePermission = new MicrophonePermission();
+    this.playbackPermission.setExecuteContext(this);
   }
   return _createClass(AudioPermission2, [{
     key: "requestPlaybackPermission",
     value: function() {
-      var _requestPlaybackPermission2 = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee4() {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _requestPlaybackPermission2 = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee5() {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              return _context4.abrupt("return", this.playbackPermission.requestPlaybackPermission());
+              return _context5.abrupt("return", this.playbackPermission.requestPlaybackPermission());
             case 1:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function requestPlaybackPermission() {
         return _requestPlaybackPermission2.apply(this, arguments);
@@ -13618,16 +13673,16 @@ var AudioPermission = /* @__PURE__ */ function() {
   }, {
     key: "requestMicrophonePermission",
     value: function() {
-      var _requestMicrophonePermission2 = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee5() {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _requestMicrophonePermission2 = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              return _context5.abrupt("return", this.microphonePermission.requestMicrophonePermission());
+              return _context6.abrupt("return", this.microphonePermission.requestMicrophonePermission());
             case 1:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
       function requestMicrophonePermission() {
         return _requestMicrophonePermission2.apply(this, arguments);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@minto-ai/tools",
   "type": "module",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "description": "明途公共工具库",
   "author": "hcc",
   "license": "ISC",