@hylid/call 4.0.0-alpha.2 → 4.0.0-alpha.21

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.d.ts

@@ -9,3 +9,8 @@ export declare namespace mpWebCall {
     var onReceiveGlobalData: (key: string, callback: (data: any, error: any, form: string) => void) => () => void;
     var onPageEvent: (event: ({} & string) | "onShow" | "onHide" | "onTitleClick" | "onOptionMenuClick" | "onTabItemTap", callback: (data: any, err?: any) => void) => () => void;
 }
+export declare const mpWebCallAsync: <T = any>(apiName: string, options?: any, config?: {
+    /** 超时时长，默认 20000, 0 表示不判断超时 */
+    timeout: number;
+    isSync?: boolean;
+}) => Promise<any>;

package/lib/mpWebCall.js

@@ -1,4 +1,15 @@
+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);
+};
 import { mpWebOnMessage, mpWebPostMessage } from "./mpWebBridge";
+import { alipayJSBridge } from "./webCall";
 // 关联 postMessage 和 onMessage，根据 serialId 执行回调
 var callMap = {};
 // 注册 jsapi 的 message 处理器
@@ -108,4 +119,143 @@ mpWebCall.onMessage = mpWebOnMessage;
 mpWebCall.postMessage = mpWebPostMessage;
 mpWebCall.broadcastGlobalData = broadcastGlobalData;
 mpWebCall.onReceiveGlobalData = onReceiveGlobalData;
-mpWebCall.onPageEvent = onPageEvent;
+mpWebCall.onPageEvent = onPageEvent;
+var callbackFn = function callbackFn(res, callback) {
+  var _a = callback || {},
+    success = _a.success,
+    fail = _a.fail,
+    complete = _a.complete;
+  // @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 mpWebCallAsync = function () {
+  var callMap = {};
+  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;
+      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) {
+      var res = e.data.res;
+      if (res.type === 'message') {
+        messageHandler(JSON.parse(res.data));
+      }
+      // TODO: 参考的代码中还有 response 的类型，需要考虑一下是否实现，对应 api 为 'navigateTo','navigateBack','switchTab','reLaunch','redirectTo',
+    });
+  }
+  function fireMessage(_a) {
+    var _b;
+    var apiName = _a.apiName,
+      options = _a.options,
+      isSync = _a.isSync;
+    var env = window;
+    var random = Math.floor(Math.random() * 1000000);
+    var serialId = "".concat(apiName, "_").concat(random);
+    if (options) {
+      callMap[serialId] = options;
+    }
+    var params = {
+      type: 'apiCall',
+      api: apiName,
+      serialId: serialId,
+      options: options,
+      isSync: isSync,
+      source: 'hylid'
+    };
+    (_b = env.AlipayJSBridge) === null || _b === void 0 ? void 0 : _b.call('postWebViewMessage', {
+      type: 'message',
+      detail: params
+    });
+  }
+  return function mpWebCall(apiName, options, config) {
+    return new Promise(function (resolve, reject) {
+      var _a = options || {},
+        _success = _a.success,
+        _fail = _a.fail;
+      var _b = config || {},
+        _c = _b.timeout,
+        timeout = _c === void 0 ? 20000 : _c,
+        isSync = _b.isSync;
+      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);
+      }
+      var params = {
+        apiName: apiName,
+        options: __assign(__assign({}, options), {
+          success: function success(res) {
+            if (timer) {
+              clearTimeout(timer);
+            }
+            resolve(res);
+            _success === null || _success === void 0 ? void 0 : _success(res);
+          },
+          fail: function fail(err) {
+            if (timer) {
+              clearTimeout(timer);
+            }
+            reject(err);
+            _fail === null || _fail === void 0 ? void 0 : _fail(err);
+          }
+        }),
+        isSync: isSync
+      };
+      alipayJSBridge(function () {
+        if (!isListening) {
+          onMessage();
+          isListening = true;
+        }
+        fireMessage(params);
+      });
+    });
+  };
+}();

package/lib/promisify.d.ts

@@ -1,4 +1,5 @@
 export interface Options {
     success?: (res: any) => void;
+    fail?: (res: any) => void;
 }
-export declare const promisify: <T extends Options, P = Parameters<Required<Options> & T["success"]>[0]>(fn: (opt: T) => void) => (args?: Omit<T, "success" | "fail" | "complete"> | undefined) => Promise<P>;
+export declare const promisify: <T extends Options, P = Parameters<Required<Options> & T["success"]>[0]>(fn: (opt: T) => void) => (args?: T | undefined) => Promise<P>;

package/lib/promisify.js

@@ -12,8 +12,16 @@ export var promisify = function promisify(fn) {
   return function (args) {
     return new Promise(function (resolve, reject) {
       var options = __assign(__assign({}, args), {
-        success: resolve,
-        fail: reject
+        success: function success(opt) {
+          var _a;
+          resolve(opt);
+          (_a = args === null || args === void 0 ? void 0 : args.success) === null || _a === void 0 ? void 0 : _a.call(args, opt);
+        },
+        fail: function fail(opt) {
+          var _a;
+          reject(opt);
+          (_a = args === null || args === void 0 ? void 0 : args.fail) === null || _a === void 0 ? void 0 : _a.call(args, opt);
+        }
       });
       fn(options);
     });

package/lib/types.d.ts

@@ -6,6 +6,10 @@ export interface JsApiConfig {
      * @deprecated 优先使用 type = "sync" 配置
      */
     isSync?: boolean;
+    /**
+     * timeout 配置，单位 ms
+     */
+    timeout?: number;
 }
 export declare type Config = JsApiConfig;
 export interface MpWebMessageResult<T = any> {

package/lib/webCall.d.ts

@@ -1,4 +1,7 @@
-import { AliJsApi } from '@hylid/types';
+import { AliJsApi, AsyncCallback } from '@hylid/types';
 import { JsApiConfig } from './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?: {
+    timeout?: number;
+}): Promise<any>;

package/lib/webCall.js

@@ -26,4 +26,42 @@ export function webCall(apiName, options, config) {
       window.AlipayJSBridge.call(apiName, options);
     }
   });
+}
+export function webCallAsync(apiName, options, config) {
+  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);
+    }
+    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);
+    });
+  });
 }

package/package.json

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