@noah-libjs/request 0.0.23 → 0.0.43

package/README.md

@@ -1,4 +1,4 @@
-# Rslib project
+# Rslib project 13
 
 ## Setup
 

package/dist/Request.d.ts

@@ -0,0 +1,44 @@
+import { AxiosError, AxiosInstance, AxiosResponse } from 'axios';
+import { IRequest_ResponseError, IRequest_SpawnConfig, TRequest_PreReq, TRequest_SimpleReq } from './types';
+import { EventEmitter, MyLog } from '@noah-libjs/utils';
+export * from './types';
+export declare class Request extends EventEmitter<{
+    request: any;
+    response: any;
+    error: any;
+    message: [boolean, string, any];
+}> {
+    ins: AxiosInstance;
+    token?: string;
+    constructor(config?: IRequest_SpawnConfig);
+    static CONFIG: {
+        successCode: number[];
+    };
+    static logger: MyLog;
+    static checkRTCode(res?: AxiosResponse<any>): boolean;
+    static genErrMsg(res?: AxiosResponse<any>, error?: AxiosError): string;
+    static createErr(res?: AxiosResponse<any>, error?: AxiosError): IRequest_ResponseError;
+    static getMsg(res?: AxiosResponse<{
+        data?: any;
+        code?: number;
+        msg?: string;
+        message?: string;
+        title?: string;
+    }>): any;
+    static getRemoteMessage(res?: AxiosResponse<any>): any;
+    static getHeaderMessage(res?: AxiosResponse<any>): string | undefined;
+    displayMsg(res?: AxiosResponse<{
+        data?: any;
+        code?: number;
+        msg?: string;
+    }>): void;
+    config: IRequest_SpawnConfig;
+    spawn(spawnConfig?: IRequest_SpawnConfig): AxiosInstance;
+    gen(spawnConfig?: IRequest_SpawnConfig): AxiosInstance;
+    get: TRequest_SimpleReq;
+    delete: TRequest_SimpleReq;
+    head: TRequest_SimpleReq;
+    post: TRequest_PreReq;
+    put: TRequest_PreReq;
+}
+export declare const request: Request;

package/dist/constant.d.ts

@@ -0,0 +1,17 @@
+export declare const codeMessage: {
+    200: string;
+    201: string;
+    202: string;
+    204: string;
+    400: string;
+    401: string;
+    403: string;
+    404: string;
+    406: string;
+    410: string;
+    422: string;
+    500: string;
+    502: string;
+    503: string;
+    504: string;
+};

package/dist/helper.d.ts

@@ -0,0 +1,9 @@
+import { ICommonOption } from "@noah-libjs/utils";
+import { FormInstance } from "antd";
+export type T_FETCH_OPTIONS = ((f?: FormInstance) => (Promise<ICommonOption[]> | ICommonOption[])) | {
+    url: string | (() => string);
+    labelKey?: string;
+    valueKey?: string;
+    method?: 'get' | 'post';
+};
+export declare function safe_fetch_options(cb: T_FETCH_OPTIONS, f?: FormInstance): Promise<ICommonOption[]>;

package/dist/index.d.ts

@@ -0,0 +1,7 @@
+import { AxiosInstance } from 'axios';
+import { Request, request } from './Request';
+export * from './types';
+export * from './helper';
+export { codeMessage } from './constant';
+declare function createInstance(defaultConfig?: {}): AxiosInstance;
+export { Request, createInstance, request };

package/dist/index.js

@@ -0,0 +1,375 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+import axios, { Axios } from 'axios';
+import utils from 'axios/lib/utils';
+import { MyLog, EventEmitter, getSearchParamsAll, isFunction, safe_async_call, expect_array, isString, cache_fetch, get } from '@noah-libjs/utils';
+import bind from 'axios/lib/helpers/bind';
+var codeMessage = {
+  200: '服务器成功返回请求的数据。',
+  201: '新建或修改数据成功。',
+  202: '一个请求已经进入后台排队（异步任务）。',
+  204: '删除数据成功。',
+  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
+  401: '用户没有权限（令牌、用户名、密码错误）。',
+  403: '用户得到授权，但是访问是被禁止的。',
+  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
+  406: '请求的格式不可得。',
+  410: '请求的资源被永久删除，且不会再得到的。',
+  422: '当创建一个对象时，发生一个验证错误。',
+  500: '服务器发生错误，请检查服务器。',
+  502: '网关错误。',
+  503: '服务不可用，服务器暂时过载或维护。',
+  504: '网关超时。'
+};
+var Request = /*#__PURE__*/function (_EventEmitter) {
+  function Request() {
+    var _this;
+    var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    _classCallCheck(this, Request);
+    _this = _callSuper(this, Request);
+    Object.defineProperty(_this, "ins", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "token", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: ''
+    });
+    Object.defineProperty(_this, "config", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: {}
+    });
+    Object.defineProperty(_this, "get", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "delete", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "head", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "post", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "put", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    _this.spawn(config);
+    return _this;
+  }
+  _inherits(Request, _EventEmitter);
+  return _createClass(Request, [{
+    key: "displayMsg",
+    value: function displayMsg(res) {
+      var isSuccessful = Request.checkRTCode(res);
+      var msg = Request.getMsg(res);
+      if (!msg) return;
+      this.emit('message', isSuccessful, msg, res);
+      // if (isSuccessful) {
+      //     message.success(msg)
+      // } else {
+      //     message.warning(msg)
+      // }
+    }
+  }, {
+    key: "spawn",
+    value: function spawn() {
+      var spawnConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var ins = this.gen(spawnConfig);
+      this.ins = ins;
+      this.config = spawnConfig;
+      utils.extend(this, Axios.prototype, this.ins);
+      return this.ins;
+    }
+  }, {
+    key: "gen",
+    value: function gen() {
+      var _this2 = this;
+      var spawnConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var _spawnConfig$config = spawnConfig.config,
+        config = _spawnConfig$config === void 0 ? {} : _spawnConfig$config,
+        _spawnConfig$onReques = spawnConfig.onRequest,
+        onRequest = _spawnConfig$onReques === void 0 ? function (value) {
+          return value;
+        } : _spawnConfig$onReques,
+        _spawnConfig$onRespon = spawnConfig.onResponse,
+        onResponse = _spawnConfig$onRespon === void 0 ? function (value) {
+          return value;
+        } : _spawnConfig$onRespon,
+        _spawnConfig$onReject = spawnConfig.onRejected,
+        onRejected = _spawnConfig$onReject === void 0 ? function (error) {
+          return Promise.reject(error);
+        } : _spawnConfig$onReject;
+      var ins = axios.create(config);
+      var _onErr = function _onErr(e) {
+        _this2.emit('error', e);
+        config.logger && Request.logger.error(e);
+        return onRejected(e);
+      };
+      ins.interceptors.request.use(function (config) {
+        var _a;
+        var args = getSearchParamsAll();
+        var headers = (_a = config.headers) !== null && _a !== void 0 ? _a : config.headers = {};
+        Object.entries(args).forEach(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+          headers["X-Arg-".concat(k)] = encodeURI(v);
+        });
+        _this2.emit('request', config);
+        // TODO: remove
+        headers.Authorization = headers.Authorization || _this2.token || '';
+        // params.pathname = location.pathname
+        return onRequest(config);
+      });
+      ins.interceptors.response.use(function (response) {
+        var axiosConfig = response.config,
+          headers = response.headers;
+        var config = axiosConfig;
+        var url = config.url,
+          data = config.data,
+          params = config.params,
+          method = config.method,
+          logger = config.logger,
+          unboxing = config.unboxing;
+        _this2.displayMsg(response);
+        if (Request.checkRTCode(response)) {
+          logger && Request.logger.log({
+            url: url,
+            data: data,
+            params: params,
+            method: method
+          }, response.data);
+          _this2.emit('response', response);
+          var isSameOrigin = (url === null || url === void 0 ? void 0 : url.startsWith('http')) ? new URL(url).origin === location.origin : true;
+          if (isSameOrigin) {
+            var token = headers['Authorization'] || headers['authorization'];
+            _this2.token = token;
+          }
+          if (unboxing) {
+            response.data = doUnboxing(response.data);
+          }
+          return onResponse(response);
+        }
+        var e = Request.createErr(response);
+        return _onErr(e);
+      }, function (error) {
+        Request.logger.error('请求出错：', {
+          error: error
+        });
+        _this2.displayMsg(error.response);
+        var response = error === null || error === void 0 ? void 0 : error.response;
+        var e = Request.createErr(response, error);
+        return _onErr(e);
+      });
+      return ins;
+    }
+  }], [{
+    key: "checkRTCode",
+    value: function checkRTCode(res) {
+      var _a, _b, _c, _d;
+      if (!res) return false;
+      var headerCode = res.headers['lm-code'];
+      var rawCode = ((_a = res.data) === null || _a === void 0 ? void 0 : _a.id) ? 200 : (_b = res.data) === null || _b === void 0 ? void 0 : _b.code;
+      // 某些数据返回 status
+      var rawStatus = ((_c = res.data) === null || _c === void 0 ? void 0 : _c.id) ? 200 : (_d = res.data) === null || _d === void 0 ? void 0 : _d.status;
+      var _code = typeof rawCode === 'number' ? rawCode : rawStatus !== null && rawStatus !== void 0 ? rawStatus : 1;
+      var code = headerCode ? Number(headerCode) : _code;
+      // console.log('isSuccessful', { headerCode, _code,h:res.headers})
+      return Request.CONFIG.successCode.includes(code);
+    }
+  }, {
+    key: "genErrMsg",
+    value: function genErrMsg(res, error) {
+      var _a, _b, _c;
+      var status = (res === null || res === void 0 ? void 0 : res.status) || -1;
+      var rawMessage = (error === null || error === void 0 ? void 0 : error.message) === 'Network Error' ? '网络连接异常   ' : '';
+      var msg = (_c = (_b = (_a = Request.getMsg(res)) !== null && _a !== void 0 ? _a : codeMessage[status]) !== null && _b !== void 0 ? _b : rawMessage) !== null && _c !== void 0 ? _c : '未知错误';
+      return msg;
+    }
+  }, {
+    key: "createErr",
+    value: function createErr(res, error) {
+      var _a;
+      return {
+        error: error,
+        msg: Request.genErrMsg(res, error),
+        url: (_a = res === null || res === void 0 ? void 0 : res.config) === null || _a === void 0 ? void 0 : _a.url,
+        data: res === null || res === void 0 ? void 0 : res.data,
+        status: res === null || res === void 0 ? void 0 : res.status
+      };
+    }
+  }, {
+    key: "getMsg",
+    value: function getMsg(res) {
+      if (!res) return '';
+      var _ref3 = res === null || res === void 0 ? void 0 : res.config,
+        _ref3$showMsg = _ref3.showMsg,
+        showMsg = _ref3$showMsg === void 0 ? true : _ref3$showMsg,
+        successText = _ref3.successText,
+        errText = _ref3.errText;
+      var remoteMsg = showMsg ? Request.getRemoteMessage(res) : '';
+      var isSuccessful = Request.checkRTCode(res);
+      var configMsg = isSuccessful ? successText : errText;
+      return configMsg !== null && configMsg !== void 0 ? configMsg : remoteMsg;
+    }
+  }, {
+    key: "getRemoteMessage",
+    value: function getRemoteMessage(res) {
+      var _a, _b, _c, _d, _e, _f, _g;
+      var headerMessage = Request.getHeaderMessage(res);
+      var remoteMsg = (_f = (_d = (_b = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.msg) !== null && _b !== void 0 ? _b : (_c = res === null || res === void 0 ? void 0 : res.data) === null || _c === void 0 ? void 0 : _c.detail) !== null && _d !== void 0 ? _d : (_e = res === null || res === void 0 ? void 0 : res.data) === null || _e === void 0 ? void 0 : _e.message) !== null && _f !== void 0 ? _f : (_g = res === null || res === void 0 ? void 0 : res.data) === null || _g === void 0 ? void 0 : _g.title;
+      return headerMessage !== null && headerMessage !== void 0 ? headerMessage : remoteMsg;
+    }
+  }, {
+    key: "getHeaderMessage",
+    value: function getHeaderMessage(res) {
+      if (!res) return;
+      var headerMessageRaw = res.headers['lm-message'];
+      var headerMessage = headerMessageRaw ? decodeURIComponent(headerMessageRaw) : undefined;
+      return headerMessage;
+    }
+  }]);
+}(EventEmitter);
+Object.defineProperty(Request, "CONFIG", {
+  enumerable: true,
+  configurable: true,
+  writable: true,
+  value: {
+    successCode: [200, 1, 0]
+  }
+});
+Object.defineProperty(Request, "logger", {
+  enumerable: true,
+  configurable: true,
+  writable: true,
+  value: new MyLog('Request')
+});
+var request = new Request();
+function doUnboxing(res) {
+  var isBoxing = typeof (res === null || res === void 0 ? void 0 : res.code) === 'number' && !!res.data;
+  if (isBoxing) {
+    return res.data;
+  }
+  return res;
+}
+
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+function __awaiter(thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+}
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+function safe_fetch_options(cb, f) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var arr, _cb$method, method, _cb$valueKey, valueKey, _cb$labelKey, labelKey, url, _url;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!isFunction(cb)) {
+            _context.next = 7;
+            break;
+          }
+          _context.next = 3;
+          return safe_async_call(cb, f);
+        case 3:
+          arr = _context.sent;
+          return _context.abrupt("return", expect_array(arr));
+        case 7:
+          _cb$method = cb.method, method = _cb$method === void 0 ? 'get' : _cb$method, _cb$valueKey = cb.valueKey, valueKey = _cb$valueKey === void 0 ? 'value' : _cb$valueKey, _cb$labelKey = cb.labelKey, labelKey = _cb$labelKey === void 0 ? 'label' : _cb$labelKey, url = cb.url;
+          _url = isString(url) ? url : url();
+          return _context.abrupt("return", cache_fetch(_url, function () {
+            return request.ins({
+              method: method,
+              url: _url
+            });
+          }).then(function (res) {
+            return expect_array(res.data).map(function (_) {
+              return {
+                label: get(_, labelKey),
+                value: get(_, valueKey)
+              };
+            });
+          }));
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+}
+function createInstance() {
+  var defaultConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var instance = bind(Axios.prototype.request, request.ins);
+  utils.extend(instance, Axios.prototype, request.ins);
+  utils.extend(instance, request.ins);
+  return instance;
+}
+export { Request, codeMessage, createInstance, request, safe_fetch_options };

package/dist/types.d.ts

@@ -0,0 +1,26 @@
+import { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
+export type { AxiosError, AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios';
+export interface IRequest_AxiosRequestConfig<D = any> extends AxiosRequestConfig<D> {
+    logger?: boolean;
+    unboxing?: boolean;
+    showMsg?: boolean;
+    successText?: string;
+    errText?: string;
+    ignore_usr?: boolean;
+    ignore_env?: boolean;
+}
+export interface IRequest_ResponseError<D = any> {
+    msg: string;
+    data?: D;
+    status?: number;
+    url?: string;
+    error?: AxiosError<any, any>;
+}
+export interface IRequest_SpawnConfig {
+    config?: IRequest_AxiosRequestConfig;
+    onRequest?(value: IRequest_AxiosRequestConfig): IRequest_AxiosRequestConfig;
+    onResponse?(value: AxiosResponse): any;
+    onRejected?(err: IRequest_ResponseError): Promise<any>;
+}
+export type TRequest_SimpleReq = <T = any, R = AxiosResponse<T>, D = any>(url: string, config?: IRequest_AxiosRequestConfig<D>) => Promise<R>;
+export type TRequest_PreReq = <T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: IRequest_AxiosRequestConfig<D>) => Promise<R>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@noah-libjs/request",
-    "version": "0.0.23",
+    "version": "0.0.43",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -21,7 +21,7 @@
         "access": "public"
     },
     "dependencies": {
-        "@noah-libjs/utils": "^0.0.23",
+        "@noah-libjs/utils": "^0.0.43",
         "axios": "^0.26.1",
         "store": "2.x"
     },
@@ -32,5 +32,5 @@
     "keywords": [],
     "author": "",
     "license": "MIT",
-    "gitHead": "c8ac6f11df2df5f1995b337ef1a1cb11fc203bef"
+    "gitHead": "5dced859dd68c336e8837474c80a39eacb4456dd"
 }