@hylid/call 4.0.0-alpha.8 → 4.0.0

package/lib/index.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="miniprogram" />
 import { MPApi, PickMPArgs, PickMpReturns, Callback } from '@hylid/types';
 import { mpCall } from './mpCall';
-import { mpWebCall } from './mpWebCall';
-import { webCall } from './webCall';
+import { mpWebCall, mpWebCallAsync } from './mpWebCall';
+import { webCall, webCallAsync } from './webCall';
 import { notFound } from './notFound';
 import { Config } from './types';
 export declare function call<T extends keyof MPApi>(name: T | ({} & string), options?: PickMPArgs<T> | Common | Callback<PickMpReturns<T>>, config?: Config): any;
 export declare function createWebviewSrc(url: string): string;
 export { WebViewBridge } from './webviewBridge';
-export { mpCall, mpWebCall, webCall, notFound };
+export { mpCall, mpWebCall, webCall, notFound, mpWebCallAsync, webCallAsync };
 export { promisify } from './promisify';

package/lib/index.js

@@ -1,8 +1,8 @@
 var _a;
 import { platform, PLATFORM } from '@hylid/env';
 import { mpCall } from "./mpCall";
-import { mpWebCall } from "./mpWebCall";
-import { webCall } from "./webCall";
+import { mpWebCall, mpWebCallAsync } from "./mpWebCall";
+import { webCall, webCallAsync } from "./webCall";
 import { notFound } from "./notFound";
 var callMap = (_a = {}, _a[PLATFORM.MP] = mpCall, _a[PLATFORM.MPWEB] = mpWebCall, _a[PLATFORM.WEB] = webCall, _a);
 export function call(name, options, config) {
@@ -24,7 +24,6 @@ export function createWebviewSrc(url) {
   var newUrl = url + separator + '__app__=' + app + hash;
   return newUrl;
 }
-;
 export { WebViewBridge } from "./webviewBridge";
-export { mpCall, mpWebCall, webCall, notFound };
+export { mpCall, mpWebCall, webCall, notFound, mpWebCallAsync, webCallAsync };
 export { promisify } from "./promisify";

package/lib/mpWebCall.js

@@ -138,13 +138,43 @@ export var mpWebCallAsync = function () {
   var isListening = false;
   function onMessage() {
     var messageHandler = function messageHandler(message) {
+      var _a;
       var serialId = message.serialId;
+      if (!serialId) return;
+      if (!callMap[serialId]) return;
+      var callback = callMap[serialId];
       var data = message.result;
-      if (serialId) {
-        var callback = callMap[serialId];
-        callbackFn(data, callback);
-        delete callMap[serialId];
+      var type = (_a = message.config) === null || _a === void 0 ? void 0 : _a.type;
+      if (type === 'callback') {
+        var _b = data || {},
+          _data_2 = _b._data_,
+          _type_2 = _b._type_;
+        if (_type_2 === 'success') return callback(_data_2);
+        return callback(undefined, _data_2);
       }
+      var _c = callback || {},
+        success = _c.success,
+        fail = _c.fail,
+        complete = _c.complete;
+      var _d = data || {},
+        _data_ = _d._data_,
+        _type_ = _d._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_);
+        complete === null || complete === void 0 ? void 0 : complete(_data_);
+      } else {
+        // 下面兼容老版本(老版本消息识别不明确，导致 H5 中走 success/fail 逻辑可能岔了)
+        // @ts-ignore
+        if (data === null || data === void 0 ? void 0 : data.error) {
+          fail === null || fail === void 0 ? void 0 : fail(data);
+        } else {
+          success === null || success === void 0 ? void 0 : success(data);
+        }
+        complete === null || complete === void 0 ? void 0 : complete(data);
+      }
+      delete callMap[serialId];
     };
     // 代码参考：https://alex.alipay.com/antcode/qianyu.fzy/af-appx/blob/r20191223-1.24.0/src/web-view/embed/index.tsx
     document.addEventListener('onToWebViewMessage', function (e) {

package/lib/webCall.d.ts

@@ -1,6 +1,5 @@
-import { AliJsApi } from '@hylid/types';
+import { AliJsApi, AsyncCallback } from '@hylid/types';
 import { JsApiConfig } from './types';
-import { AsyncCallback } from '@hylid/types';
 export declare const alipayJSBridge: (cb: Function) => any;
 export declare function webCall<T extends keyof AliJsApi.Api>(apiName: T | ({} & string), options?: any, config?: JsApiConfig): void;
 export declare function webCallAsync<T = any>(apiName: string, options?: AsyncCallback<T> & any, config?: {

package/lib/webviewBridge/utils.js

@@ -153,7 +153,7 @@ function getAsyncApi(apiName, jsapi, _options) {
       }
     });
     // @ts-ignore
-    if (!jsapi) return my.call(api, options);
+    if (!jsapi) return my.call(apiName, options);
     if (typeof jsapi !== 'function') {
       return options.fail(createError('INVALID', apiName));
     }

package/package.json

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