@hylid/call 0.0.90011477778-dev.4 → 0.0.90011477778-dev.40

package/lib/webCall.js

@@ -1,6 +1,122 @@
+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
+    };
+  }
+};
 import { CLIENT, client } from '@hylid/env';
 export var alipayJSBridge = function alipayJSBridge(cb) {
-  if (window.AlipayJSBridge) return cb();
+  // @ts-ignore
+  if (window.AlipayJSBridge || window.atomicsdk) return cb();
   document.addEventListener('AlipayJSBridgeReady', function () {
     return cb();
   }, false);
@@ -12,12 +128,6 @@ export function webCall(apiName, options, config) {
     if (type === 'async') {
       if (client === CLIENT.HUAWEI_ATOMIC) {
         // TDOO: 华为元服务“出境服务”通信实现
-        // 对通信数据包装一层
-        var atomicsdkParams = {
-          code: 0,
-          data: options.data && JSON.stringify(options.data),
-          msg: 'success'
-        };
         // @ts-ignore
         var isAtomicFn = window.atomicsdk.invokeMethod({
           appMethod: 'canIUse',
@@ -28,8 +138,18 @@ export function webCall(apiName, options, config) {
           // @ts-ignore
           window.atomicsdk.invokeMethod({
             appMethod: apiName,
-            jsMethod: options.jsMethod,
-            data: atomicsdkParams // 参数对象
+            jsMethod: "",
+            data: options || {} // 参数对象
+          }).then(function (res) {
+            var _a = options || {},
+              success = _a.success,
+              fail = _a.fail,
+              complete = _a.complete;
+            if (res.error || res.errorCode) {
+              fail === null || fail === void 0 ? void 0 : fail(res);
+            } else {
+              success === null || success === void 0 ? void 0 : success(res);
+            }
           });
           // @ts-ignore
         } else if (window[apiName]) {
@@ -60,81 +180,73 @@ export function webCall(apiName, options, config) {
   });
 }
 export function webCallAsync(apiName, options, config) {
+  var _this = this;
   return new Promise(function (resolve, reject) {
-    var _a = options || {},
-      success = _a.success,
-      fail = _a.fail,
-      complete = _a.complete;
-    var _b = (config || {}).timeout,
-      timeout = _b === void 0 ? 20000 : _b;
-    var timer;
-    if (timeout > 0) {
-      timer = setTimeout(function () {
-        var err = {
-          error: -101,
-          errorMessage: "[".concat(apiName, "]: Timeout")
-        };
-        reject(err);
-        fail === null || fail === void 0 ? void 0 : fail(err);
-      }, timeout);
-    }
-    if (client === CLIENT.HUAWEI_ATOMIC) {
-      // TDOO: 华为元服务“出境服务”通信实现
-      // 对通信数据包装一层
-      var atomicsdkParams = {
-        code: 0,
-        data: options.data && JSON.stringify(options.data),
-        msg: 'success'
-      };
-      // @ts-ignore
-      var isAtomicFn = window.atomicsdk.invokeMethod({
-        appMethod: 'canIUse',
-        data: apiName
-      });
-      if (isAtomicFn) {
-        // 出境服务存在此通信方法再调用
-        // @ts-ignore
-        window.atomicsdk.invokeMethod({
-          appMethod: apiName,
-          jsMethod: options.jsMethod,
-          data: atomicsdkParams // 参数对象
-        });
-        if (options === null || options === void 0 ? void 0 : options.jsMethod) {
-          // 生成一次性回调 id，防止并发冲突
-          var cbId = 'cb_' + Date.now() + '_' + Math.random().toString(36).slice(2, 8);
-          var cbName_1 = 'jsMethod' + cbId;
-          // @ts-ignore
-          window[cbName_1] = function (result) {
-            // @ts-ignore
-            delete window[cbName_1];
+    return __awaiter(_this, void 0, void 0, function () {
+      var _a, success, fail, complete, _b, timeout, timer, isAtomicFn, result;
+      return __generator(this, function (_c) {
+        switch (_c.label) {
+          case 0:
+            _a = options || {}, success = _a.success, fail = _a.fail, complete = _a.complete;
+            _b = (config || {}).timeout, timeout = _b === void 0 ? 20000 : _b;
+            if (timeout > 0) {
+              timer = setTimeout(function () {
+                var err = {
+                  error: -101,
+                  errorMessage: "[".concat(apiName, "]: Timeout")
+                };
+                reject(err);
+                fail === null || fail === void 0 ? void 0 : fail(err);
+              }, timeout);
+            }
+            if (!(client === CLIENT.HUAWEI_ATOMIC)) return [3 /*break*/, 4];
+            isAtomicFn = window.atomicsdk.invokeMethod({
+              appMethod: 'canIUse',
+              data: apiName
+            });
+            if (!isAtomicFn) return [3 /*break*/, 2];
+            return [4 /*yield*/, window.atomicsdk.invokeMethod({
+              appMethod: apiName,
+              jsMethod: "",
+              data: options || {} // 参数对象
+            })];
+          case 1:
+            result = _c.sent();
             resolve(result);
-          };
-        }
-        // @ts-ignore
-      } else if (window[apiName]) {
-        // @ts-ignore
-        window[apiName](options);
-      } else {
-        throw new Error('webCallAsync Error: apiName not found');
-      }
-    } else {
-      window.AlipayJSBridge.call(apiName, options, function (res) {
-        var _a = options || {},
-          success = _a.success,
-          fail = _a.fail,
-          complete = _a.complete;
-        if (timer) {
-          clearTimeout(timer);
+            return [3 /*break*/, 3];
+          case 2:
+            if (window[apiName]) {
+              // @ts-ignore
+              window[apiName](options);
+            } else {
+              throw new Error('webCallAsync Error: apiName not found');
+            }
+            _c.label = 3;
+          case 3:
+            return [3 /*break*/, 5];
+          case 4:
+            window.AlipayJSBridge.call(apiName, options, function (res) {
+              var _a = options || {},
+                success = _a.success,
+                fail = _a.fail,
+                complete = _a.complete;
+              if (timer) {
+                clearTimeout(timer);
+              }
+              if (res === null || res === void 0 ? void 0 : res.error) {
+                reject(res);
+                fail === null || fail === void 0 ? void 0 : fail(res);
+              } else {
+                resolve(res);
+                success === null || success === void 0 ? void 0 : success(res);
+              }
+              complete === null || complete === void 0 ? void 0 : complete(res);
+            });
+            _c.label = 5;
+          case 5:
+            return [2 /*return*/];
         }
-        if (res === null || res === void 0 ? void 0 : res.error) {
-          reject(res);
-          fail === null || fail === void 0 ? void 0 : fail(res);
-        } else {
-          resolve(res);
-          success === null || success === void 0 ? void 0 : success(res);
-        }
-        complete === null || complete === void 0 ? void 0 : complete(res);
       });
-    }
+    });
   });
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@hylid/call",
-  "version": "0.0.90011477778-dev.4",
+  "version": "0.0.90011477778-dev.40",
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
   "dependencies": {
-    "@hylid/env": "^0.0.90011477778-dev.4",
-    "@hylid/types": "^0.0.90011477778-dev.4"
+    "@hylid/env": "^0.0.90011477778-dev.40",
+    "@hylid/types": "^0.0.90011477778-dev.40"
   },
   "publishConfig": {
     "access": "public"