hylid-bridge 4.0.0-alpha.22 → 4.0.0-alpha.24

package/lib/clients/web/h5/index.d.ts

@@ -68,7 +68,20 @@ declare const _default: {
     removeStorageSync: (args: {
         key: string;
     }) => void;
-    request: typeof request;
+    request: (args: {
+        url: string;
+        headers?: {
+            [key: string]: string;
+        } | undefined;
+        method?: "POST" | "GET" | undefined;
+        data?: any;
+        timeout?: number | undefined;
+        dataType?: "json" | "text" | "base64" | "arraybuffer" | undefined;
+    } & import("@hylid/types").AsyncCallback<{
+        data: any;
+        status: number;
+        headers: any;
+    }>) => void;
     rpc: typeof rpc;
     setClipboard: typeof setClipboard;
     setNavigationBar: typeof setNavigationBar;

package/lib/common/apis/custom/web/h5/removeStorage.js

@@ -1,11 +1,10 @@
-import StorageImpl from "../../../../utils/storage";
 export default (function (opt) {
-  var key = opt.key,
-    success = opt.success,
-    fail = opt.fail,
-    complete = opt.complete;
+  var _a = opt || {},
+    success = _a.success,
+    fail = _a.fail,
+    complete = _a.complete;
   try {
-    StorageImpl.removeStorage(key);
+    localStorage.removeItem(opt.key || '');
     success === null || success === void 0 ? void 0 : success();
   } catch (e) {
     fail === null || fail === void 0 ? void 0 : fail(e);

package/lib/common/apis/custom/web/h5/removeStorageSync.js

@@ -1,5 +1,4 @@
-import StorageImpl from "../../../../utils/storage";
 export default (function (opt) {
   var key = opt.key;
-  StorageImpl.removeStorage(key);
+  localStorage.removeItem(key);
 });

package/lib/common/apis/custom/web/h5/request.d.ts

@@ -1,2 +1,15 @@
-/// <reference types="miniprogram" />
-export default function request(options?: RequestArgs): Promise<void>;
+declare const _default: (args: {
+    url: string;
+    headers?: {
+        [key: string]: string;
+    } | undefined;
+    method?: "POST" | "GET" | undefined;
+    data?: any;
+    timeout?: number | undefined;
+    dataType?: "json" | "text" | "base64" | "arraybuffer" | undefined;
+} & import("@hylid/types").AsyncCallback<{
+    data: any;
+    status: number;
+    headers: any;
+}>) => void;
+export default _default;

package/lib/common/apis/custom/web/h5/request.js

@@ -1,4 +1,230 @@
-import { request as baseRequest } from 'miniapp-web-jsapi/lib/web/jsapi/request';
-export default function request(options) {
-  return baseRequest(options);
-}
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __awaiter = this && this.__awaiter || function (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());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (_) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+import { stringify } from 'qs-es5';
+export default (function (options) {
+  var success = options.success,
+    fail = options.fail,
+    _options = __rest(options, ["success", "fail"]);
+  if (!_options) {
+    fail === null || fail === void 0 ? void 0 : fail({
+      error: -103,
+      errorMessage: "[request]: Wrong Param"
+    });
+    return;
+  }
+  var convertAcceptType = function convertAcceptType() {
+    if (options.dataType === 'text') {
+      return 'text/plain';
+    }
+    return 'application/json';
+  };
+  var convertResponse = function convertResponse(response) {
+    return __awaiter(void 0, void 0, void 0, function () {
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!(options.dataType === 'text')) return [3 /*break*/, 2];
+            return [4 /*yield*/, response.text()];
+          case 1:
+            return [2 /*return*/, _a.sent()];
+          case 2:
+            return [4 /*yield*/, response.json()];
+          case 3:
+            return [2 /*return*/, _a.sent()];
+        }
+      });
+    });
+  };
+  var method = options.method || 'GET';
+  var requestOptions = {
+    method: method,
+    mode: 'cors',
+    cache: 'no-cache',
+    credentials: 'include',
+    referrerPolicy: 'no-referrer',
+    headers: __assign(__assign({}, options.headers), {
+      Accept: convertAcceptType()
+    })
+    // fetch 暂不支持 timeout
+    // timeout: options.timeout,
+  };
+  var url = options.url;
+  if (method === 'GET') {
+    if (options.data) {
+      var queryStr = typeof options.data === 'string' ? options.data : stringify(options.data);
+      if (url.indexOf('?') !== -1) {
+        url = url + queryStr;
+      } else {
+        url = url + '?' + queryStr;
+      }
+    }
+  } else {
+    requestOptions.body = typeof options.data === 'string' ? options.data : JSON.stringify(options.data);
+  }
+  fetch(url, requestOptions).then(function (response) {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var responseHeaders, _a, _b;
+      var _c;
+      return __generator(this, function (_d) {
+        switch (_d.label) {
+          case 0:
+            responseHeaders = {};
+            response.headers.forEach(function (value, key) {
+              responseHeaders[key.toLocaleLowerCase()] = value;
+            });
+            if (!(success === null || success === void 0)) return [3 /*break*/, 1];
+            _a = void 0;
+            return [3 /*break*/, 3];
+          case 1:
+            _b = success;
+            _c = {
+              status: response.status
+            };
+            return [4 /*yield*/, convertResponse(response)];
+          case 2:
+            _a = _b.apply(void 0, [(_c.data = _d.sent(), _c.headers = responseHeaders, _c)]);
+            _d.label = 3;
+          case 3:
+            _a;
+            return [2 /*return*/];
+        }
+      });
+    });
+  }).catch(function (e) {
+    fail === null || fail === void 0 ? void 0 : fail({
+      error: 19,
+      errorMessage: 'HTTP error.' + (e === null || e === void 0 ? void 0 : e.message)
+    });
+  });
+});