@hylid/call 3.0.0-alpha.1 → 3.0.0-alpha.10

package/lib/mpWebCall.js

@@ -26,11 +26,23 @@ var callbackFn = function callbackFn(res, callback) {
     success = _a.success,
     fail = _a.fail,
     complete = _a.complete;
-  var data = res.data,
-    type = res.type;
-  if (type === 'success') success === null || success === void 0 ? void 0 : success(data);
-  if (type === 'fail') fail === null || fail === void 0 ? void 0 : fail(data);
-  if (type === 'complete') complete === null || complete === void 0 ? void 0 : complete(data);
+  var _b = res || {},
+    _data_ = _b._data_,
+    _type_ = _b._type_;
+  // 新版本协议
+  if (_type_) {
+    if (_type_ === 'success') success === null || success === void 0 ? void 0 : success(_data_);
+    if (_type_ === 'fail') fail === null || fail === void 0 ? void 0 : fail(_data_);
+    return complete === null || complete === void 0 ? void 0 : complete(_data_);
+  }
+  // 下面兼容老版本
+  // @ts-ignore
+  if (res === null || res === void 0 ? void 0 : res.error) {
+    fail === null || fail === void 0 ? void 0 : fail(res);
+  } else {
+    success === null || success === void 0 ? void 0 : success(res);
+  }
+  complete === null || complete === void 0 ? void 0 : complete(res);
 };
 export var mpWebCall = function () {
   var callMap = {};

package/lib/webviewBridge.js

@@ -144,12 +144,12 @@ var WebViewBridge = /** @class */function () {
               type_1 = (config || {}).type;
               if (!(type_1 === 'callback')) return [3 /*break*/, 1];
               // @ts-ignore
-              my[api_1](function (res) {
+              my[api_1](function (result) {
                 _this.webview.postMessage({
                   api: api_1,
                   serialId: serialId_1,
                   type: type_1,
-                  result: res
+                  result: result
                 });
               });
               return [3 /*break*/, 3];
@@ -181,20 +181,14 @@ var WebViewBridge = /** @class */function () {
         var options = __assign(__assign({}, _options), {
           success: function success(res) {
             resolve({
-              type: 'success',
-              data: res
+              _type_: 'success',
+              _data_: res
             });
           },
           fail: function fail(res) {
             resolve({
-              type: 'fail',
-              data: res
-            });
-          },
-          complete: function complete(res) {
-            resolve({
-              type: 'complete',
-              data: res
+              _type_: 'fail',
+              _data_: res
             });
           }
         });
@@ -203,8 +197,8 @@ var WebViewBridge = /** @class */function () {
         if (type === 'sync') {
           var data_1 = mpApi(_options);
           resolve({
-            type: 'success',
-            data: data_1
+            _type_: 'success',
+            _data_: data_1
           });
         }
         if (type === 'async') {

package/package.json

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