uniapp-request-sdk 1.4.11 → 1.5.0

package/dist/index.umd.js

@@ -4,6 +4,337 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.UniappRequestSdk = {}));
 })(this, (function (exports) { 'use strict';
 
+  function _regeneratorRuntime() {
+    _regeneratorRuntime = function () {
+      return exports;
+    };
+    var exports = {},
+      Op = Object.prototype,
+      hasOwn = Op.hasOwnProperty,
+      defineProperty = Object.defineProperty || function (obj, key, desc) {
+        obj[key] = desc.value;
+      },
+      $Symbol = "function" == typeof Symbol ? Symbol : {},
+      iteratorSymbol = $Symbol.iterator || "@@iterator",
+      asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator",
+      toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
+    function define(obj, key, value) {
+      return Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: !0,
+        configurable: !0,
+        writable: !0
+      }), obj[key];
+    }
+    try {
+      define({}, "");
+    } catch (err) {
+      define = function (obj, key, value) {
+        return obj[key] = value;
+      };
+    }
+    function wrap(innerFn, outerFn, self, tryLocsList) {
+      var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator,
+        generator = Object.create(protoGenerator.prototype),
+        context = new Context(tryLocsList || []);
+      return defineProperty(generator, "_invoke", {
+        value: makeInvokeMethod(innerFn, self, context)
+      }), generator;
+    }
+    function tryCatch(fn, obj, arg) {
+      try {
+        return {
+          type: "normal",
+          arg: fn.call(obj, arg)
+        };
+      } catch (err) {
+        return {
+          type: "throw",
+          arg: err
+        };
+      }
+    }
+    exports.wrap = wrap;
+    var ContinueSentinel = {};
+    function Generator() {}
+    function GeneratorFunction() {}
+    function GeneratorFunctionPrototype() {}
+    var IteratorPrototype = {};
+    define(IteratorPrototype, iteratorSymbol, function () {
+      return this;
+    });
+    var getProto = Object.getPrototypeOf,
+      NativeIteratorPrototype = getProto && getProto(getProto(values([])));
+    NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype);
+    var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
+    function defineIteratorMethods(prototype) {
+      ["next", "throw", "return"].forEach(function (method) {
+        define(prototype, method, function (arg) {
+          return this._invoke(method, arg);
+        });
+      });
+    }
+    function AsyncIterator(generator, PromiseImpl) {
+      function invoke(method, arg, resolve, reject) {
+        var record = tryCatch(generator[method], generator, arg);
+        if ("throw" !== record.type) {
+          var result = record.arg,
+            value = result.value;
+          return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) {
+            invoke("next", value, resolve, reject);
+          }, function (err) {
+            invoke("throw", err, resolve, reject);
+          }) : PromiseImpl.resolve(value).then(function (unwrapped) {
+            result.value = unwrapped, resolve(result);
+          }, function (error) {
+            return invoke("throw", error, resolve, reject);
+          });
+        }
+        reject(record.arg);
+      }
+      var previousPromise;
+      defineProperty(this, "_invoke", {
+        value: function (method, arg) {
+          function callInvokeWithMethodAndArg() {
+            return new PromiseImpl(function (resolve, reject) {
+              invoke(method, arg, resolve, reject);
+            });
+          }
+          return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+        }
+      });
+    }
+    function makeInvokeMethod(innerFn, self, context) {
+      var state = "suspendedStart";
+      return function (method, arg) {
+        if ("executing" === state) throw new Error("Generator is already running");
+        if ("completed" === state) {
+          if ("throw" === method) throw arg;
+          return doneResult();
+        }
+        for (context.method = method, context.arg = arg;;) {
+          var delegate = context.delegate;
+          if (delegate) {
+            var delegateResult = maybeInvokeDelegate(delegate, context);
+            if (delegateResult) {
+              if (delegateResult === ContinueSentinel) continue;
+              return delegateResult;
+            }
+          }
+          if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) {
+            if ("suspendedStart" === state) throw state = "completed", context.arg;
+            context.dispatchException(context.arg);
+          } else "return" === context.method && context.abrupt("return", context.arg);
+          state = "executing";
+          var record = tryCatch(innerFn, self, context);
+          if ("normal" === record.type) {
+            if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue;
+            return {
+              value: record.arg,
+              done: context.done
+            };
+          }
+          "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg);
+        }
+      };
+    }
+    function maybeInvokeDelegate(delegate, context) {
+      var methodName = context.method,
+        method = delegate.iterator[methodName];
+      if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel;
+      var record = tryCatch(method, delegate.iterator, context.arg);
+      if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel;
+      var info = record.arg;
+      return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel);
+    }
+    function pushTryEntry(locs) {
+      var entry = {
+        tryLoc: locs[0]
+      };
+      1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry);
+    }
+    function resetTryEntry(entry) {
+      var record = entry.completion || {};
+      record.type = "normal", delete record.arg, entry.completion = record;
+    }
+    function Context(tryLocsList) {
+      this.tryEntries = [{
+        tryLoc: "root"
+      }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0);
+    }
+    function values(iterable) {
+      if (iterable) {
+        var iteratorMethod = iterable[iteratorSymbol];
+        if (iteratorMethod) return iteratorMethod.call(iterable);
+        if ("function" == typeof iterable.next) return iterable;
+        if (!isNaN(iterable.length)) {
+          var i = -1,
+            next = function next() {
+              for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next;
+              return next.value = undefined, next.done = !0, next;
+            };
+          return next.next = next;
+        }
+      }
+      return {
+        next: doneResult
+      };
+    }
+    function doneResult() {
+      return {
+        value: undefined,
+        done: !0
+      };
+    }
+    return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", {
+      value: GeneratorFunctionPrototype,
+      configurable: !0
+    }), defineProperty(GeneratorFunctionPrototype, "constructor", {
+      value: GeneratorFunction,
+      configurable: !0
+    }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) {
+      var ctor = "function" == typeof genFun && genFun.constructor;
+      return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name));
+    }, exports.mark = function (genFun) {
+      return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun;
+    }, exports.awrap = function (arg) {
+      return {
+        __await: arg
+      };
+    }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
+      return this;
+    }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) {
+      void 0 === PromiseImpl && (PromiseImpl = Promise);
+      var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl);
+      return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
+        return result.done ? result.value : iter.next();
+      });
+    }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () {
+      return this;
+    }), define(Gp, "toString", function () {
+      return "[object Generator]";
+    }), exports.keys = function (val) {
+      var object = Object(val),
+        keys = [];
+      for (var key in object) keys.push(key);
+      return keys.reverse(), function next() {
+        for (; keys.length;) {
+          var key = keys.pop();
+          if (key in object) return next.value = key, next.done = !1, next;
+        }
+        return next.done = !0, next;
+      };
+    }, exports.values = values, Context.prototype = {
+      constructor: Context,
+      reset: function (skipTempReset) {
+        if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined);
+      },
+      stop: function () {
+        this.done = !0;
+        var rootRecord = this.tryEntries[0].completion;
+        if ("throw" === rootRecord.type) throw rootRecord.arg;
+        return this.rval;
+      },
+      dispatchException: function (exception) {
+        if (this.done) throw exception;
+        var context = this;
+        function handle(loc, caught) {
+          return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught;
+        }
+        for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+          var entry = this.tryEntries[i],
+            record = entry.completion;
+          if ("root" === entry.tryLoc) return handle("end");
+          if (entry.tryLoc <= this.prev) {
+            var hasCatch = hasOwn.call(entry, "catchLoc"),
+              hasFinally = hasOwn.call(entry, "finallyLoc");
+            if (hasCatch && hasFinally) {
+              if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
+              if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
+            } else if (hasCatch) {
+              if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
+            } else {
+              if (!hasFinally) throw new Error("try statement without catch or finally");
+              if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
+            }
+          }
+        }
+      },
+      abrupt: function (type, arg) {
+        for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+          var entry = this.tryEntries[i];
+          if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
+            var finallyEntry = entry;
+            break;
+          }
+        }
+        finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null);
+        var record = finallyEntry ? finallyEntry.completion : {};
+        return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record);
+      },
+      complete: function (record, afterLoc) {
+        if ("throw" === record.type) throw record.arg;
+        return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel;
+      },
+      finish: function (finallyLoc) {
+        for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+          var entry = this.tryEntries[i];
+          if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel;
+        }
+      },
+      catch: function (tryLoc) {
+        for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+          var entry = this.tryEntries[i];
+          if (entry.tryLoc === tryLoc) {
+            var record = entry.completion;
+            if ("throw" === record.type) {
+              var thrown = record.arg;
+              resetTryEntry(entry);
+            }
+            return thrown;
+          }
+        }
+        throw new Error("illegal catch attempt");
+      },
+      delegateYield: function (iterable, resultName, nextLoc) {
+        return this.delegate = {
+          iterator: values(iterable),
+          resultName: resultName,
+          nextLoc: nextLoc
+        }, "next" === this.method && (this.arg = undefined), ContinueSentinel;
+      }
+    }, exports;
+  }
+  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+      var info = gen[key](arg);
+      var value = info.value;
+    } catch (error) {
+      reject(error);
+      return;
+    }
+    if (info.done) {
+      resolve(value);
+    } else {
+      Promise.resolve(value).then(_next, _throw);
+    }
+  }
+  function _asyncToGenerator(fn) {
+    return function () {
+      var self = this,
+        args = arguments;
+      return new Promise(function (resolve, reject) {
+        var gen = fn.apply(self, args);
+        function _next(value) {
+          asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+        }
+        function _throw(err) {
+          asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+        }
+        _next(undefined);
+      });
+    };
+  }
   function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
       throw new TypeError("Cannot call a class as a function");
@@ -145,78 +476,112 @@
         var requestedToken = false;
         var retryCount = 0;
         return new Promise(function (res, rej) {
-          var retryFucntion = function retryFucntion() {
-            /** 因为token需要动态获取，因此放入这里 */
-            header[_this3.tokenHeader] = "".concat(_this3.tokenPrefix).concat(_this3.token);
-            /** 针对h5调试的时候，因为塞入cookie是不安全的，因此无需塞入cookie，使用登录页后，后端塞入的cookie */
-            // #ifdef H5
-            if (_this3.tokenHeader === 'cookie') {
-              delete header[_this3.tokenHeader];
-            }
-            // #endif
-            callbackPromise(Object.assign(Object.assign({}, params), {
-              header: header,
-              url: url,
-              timeout: params.timeout || _this3.timeout
-            })).then(function (resData) {
-              var statusCode = resData.statusCode,
-                data = resData.data;
-              if (statusCode === 200) {
-                if (!data.errno) {
-                  var jsonData = data;
-                  /** 如果是上传API的话，返回的结果需要解析成json对象 */
-                  if (Object.prototype.toString.call(data) !== '[object Object]' && callbackPromise === uploadFilePromise) {
-                    try {
-                      jsonData = JSON.parse(data);
-                    } catch (error) {
-                      console.error(error);
-                      _this3.rejectHandler(rej, resData);
+          var retryFucntion = /*#__PURE__*/function () {
+            var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+              var finalHeader, processedHeader;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    /** 因为token需要动态获取，因此放入这里 */
+                    header[_this3.tokenHeader] = "".concat(_this3.tokenPrefix).concat(_this3.token);
+                    /** 针对h5调试的时候，因为塞入cookie是不安全的，因此无需塞入cookie，使用登录页后，后端塞入的cookie */
+                    // #ifdef H5
+                    if (_this3.tokenHeader === 'cookie') {
+                      delete header[_this3.tokenHeader];
                     }
-                  }
-                  res(jsonData.data);
-                } else {
-                  _this3.rejectHandler(rej, resData);
-                }
-                /** 针对小网关进行的处理，历史遗留问题，需要兼容 */
-              } else if (403 === statusCode && !requestedToken) {
-                // #ifndef H5
-                (_this3.getTokenFun ? _this3.getTokenFun() : getToken(_this3.tokenEventName)).then(function (token) {
-                  _this3.token = token;
-                  requestedToken = true;
-                  /** 获取token应该立马请求,不需要延迟 */
-                  retryFucntion();
-                })["catch"](function () {
-                  if (_this3.maxRetryCount > retryCount && !requestedToken) {
-                    delayRetryFcuntion();
-                  } else {
-                    _this3.rejectHandler(rej, resData);
-                  }
-                });
-                // #endif
-                // #ifdef H5
-                _this3.rejectHandler(rej, resData);
-                // #endif
-                /** 最新无权限处理方案，直接调用客户端logout事件，退出到登录页 */
-              } else if (401 === statusCode) {
-                _this3.rejectHandler(rej, resData);
-                uni.sendNativeEvent(EVENT_NAME.LOGOUT, {}, function () {
-                  console.log('用户无权限，调用logout事件，退出到登录页');
-                });
-              } else {
-                if (_this3.maxRetryCount > retryCount && !requestedToken) {
-                  delayRetryFcuntion();
-                } else {
-                  _this3.rejectHandler(rej, resData);
+                    // #endif
+                    /** 执行请求头预处理 */
+                    finalHeader = header;
+                    if (!_this3.headerProcessor) {
+                      _context.next = 15;
+                      break;
+                    }
+                    _context.prev = 4;
+                    _context.next = 7;
+                    return _this3.headerProcessor(header);
+                  case 7:
+                    processedHeader = _context.sent;
+                    finalHeader = Object.assign(Object.assign({}, header), processedHeader);
+                    _context.next = 15;
+                    break;
+                  case 11:
+                    _context.prev = 11;
+                    _context.t0 = _context["catch"](4);
+                    _this3.rejectHandler(rej, _context.t0);
+                    return _context.abrupt("return");
+                  case 15:
+                    callbackPromise(Object.assign(Object.assign({}, params), {
+                      header: finalHeader,
+                      url: url,
+                      timeout: params.timeout || _this3.timeout
+                    })).then(function (resData) {
+                      var statusCode = resData.statusCode,
+                        data = resData.data;
+                      if (statusCode === 200) {
+                        if (!data.errno) {
+                          var jsonData = data;
+                          /** 如果是上传API的话，返回的结果需要解析成json对象 */
+                          if (Object.prototype.toString.call(data) !== '[object Object]' && callbackPromise === uploadFilePromise) {
+                            try {
+                              jsonData = JSON.parse(data);
+                            } catch (error) {
+                              console.error(error);
+                              _this3.rejectHandler(rej, resData);
+                            }
+                          }
+                          res(jsonData.data);
+                        } else {
+                          _this3.rejectHandler(rej, resData);
+                        }
+                        /** 针对小网关进行的处理，历史遗留问题，需要兼容 */
+                      } else if (403 === statusCode && !requestedToken) {
+                        // #ifndef H5
+                        (_this3.getTokenFun ? _this3.getTokenFun() : getToken(_this3.tokenEventName)).then(function (token) {
+                          _this3.token = token;
+                          requestedToken = true;
+                          /** 获取token应该立马请求,不需要延迟 */
+                          retryFucntion();
+                        })["catch"](function () {
+                          if (_this3.maxRetryCount > retryCount && !requestedToken) {
+                            delayRetryFcuntion();
+                          } else {
+                            _this3.rejectHandler(rej, resData);
+                          }
+                        });
+                        // #endif
+                        // #ifdef H5
+                        _this3.rejectHandler(rej, resData);
+                        // #endif
+                        /** 最新无权限处理方案，直接调用客户端logout事件，退出到登录页 */
+                      } else if (401 === statusCode) {
+                        _this3.rejectHandler(rej, resData);
+                        uni.sendNativeEvent(EVENT_NAME.LOGOUT, {}, function () {
+                          console.log('用户无权限，调用logout事件，退出到登录页');
+                        });
+                      } else {
+                        if (_this3.maxRetryCount > retryCount && !requestedToken) {
+                          delayRetryFcuntion();
+                        } else {
+                          _this3.rejectHandler(rej, resData);
+                        }
+                      }
+                    })["catch"](function (rejData) {
+                      if (_this3.maxRetryCount > retryCount && !requestedToken) {
+                        delayRetryFcuntion();
+                      } else {
+                        _this3.rejectHandler(rej, rejData);
+                      }
+                    });
+                  case 16:
+                  case "end":
+                    return _context.stop();
                 }
-              }
-            })["catch"](function (rejData) {
-              if (_this3.maxRetryCount > retryCount && !requestedToken) {
-                delayRetryFcuntion();
-              } else {
-                _this3.rejectHandler(rej, rejData);
-              }
-            });
-          };
+              }, _callee, null, [[4, 11]]);
+            }));
+            return function retryFucntion() {
+              return _ref.apply(this, arguments);
+            };
+          }();
           var delayRetryFcuntion = function delayRetryFcuntion() {
             setTimeout(function () {
               retryCount++;
@@ -302,7 +667,7 @@
           name: name,
           header: header,
           timeout: this.uploadTimeout,
-          method: 'PUT'
+          method: 'POST'
         }, uploadFilePromise);
       }
     }]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniapp-request-sdk",
-  "version": "1.4.11",
+  "version": "1.5.0",
   "description": "用于uniapp小程序的请求库的sdk",
   "main": "dist/index.umd.js",
   "module": " dist/index.esm.js",
@@ -19,6 +19,7 @@
     "dev": "rimraf dist typings && tsc --emitDeclarationOnly && cross-env NODE_ENV=development rollup -c --watch",
     "build": "rimraf dist typings && tsc --emitDeclarationOnly && cross-env NODE_ENV=production rollup -c",
     "prepublish": "npm run build",
+    "preinstall": "patch-package",
     "c": "git-cz"
   },
   "author": "yaojun",