@hylid/call 2.12.0-alpha.41 → 3.0.0-alpha.2

package/lib/mpWebCall.js

@@ -26,8 +26,18 @@ var callbackFn = function callbackFn(res, callback) {
     success = _a.success,
     fail = _a.fail,
     complete = _a.complete;
+  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) || (res === null || res === void 0 ? void 0 : res.errorCode) || (res === null || res === void 0 ? void 0 : res.errorMessage)) {
+  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);

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];
@@ -179,22 +179,27 @@ var WebViewBridge = /** @class */function () {
         type = _a === void 0 ? 'async' : _a;
       return new Promise(function (resolve) {
         var options = __assign(__assign({}, _options), {
-          success: resolve,
-          fail: function fail(res) {
-            if (!res || !res.error) {
-              resolve(__assign({
-                error: "".concat(api, " error")
-              }, res));
-            } else {
-              resolve(res);
-            }
+          success: function success(res) {
+            resolve({
+              _type_: 'success',
+              _data_: res
+            });
           },
-          complete: resolve
+          fail: function fail(res) {
+            resolve({
+              _type_: 'fail',
+              _data_: res
+            });
+          }
         });
         // @ts-ignore
         var mpApi = _this.customApi[api] || my[api];
         if (type === 'sync') {
-          resolve(mpApi(options));
+          var data_1 = mpApi(_options);
+          resolve({
+            _type_: 'success',
+            _data_: data_1
+          });
         }
         if (type === 'async') {
           if (!mpApi) {

package/package.json

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