@hylid/call 3.2.0-alpha.1 → 3.2.0-alpha.4

package/lib/mpWebBridge.js

@@ -44,10 +44,9 @@ var MESSAGE_HANDLER = [];
 export function mpWebOnMessage(cb) {
   MESSAGE_HANDLER.push(cb);
   return function () {
-    var index = MESSAGE_HANDLER.indexOf(cb);
-    if (index > -1) {
-      MESSAGE_HANDLER.splice(index, 1);
-    }
+    MESSAGE_HANDLER = MESSAGE_HANDLER.filter(function (o) {
+      return o !== cb;
+    });
   };
 }
 export function mpWebPostMessage(message) {

package/lib/mpWebCall.d.ts

@@ -5,7 +5,7 @@ export declare function mpWebCall<T extends keyof MPApi>(api: T | ({} & string),
 export declare namespace mpWebCall {
     var onMessage: typeof mpWebOnMessage;
     var postMessage: typeof mpWebPostMessage;
-    var broadcastGlobalData: (key: string, payload: any) => void;
-    var onReceiveGlobalData: (key: string, callback: (data: any, form: string) => void) => () => void;
-    var onPageEvent: (event: ({} & string) | "onShow" | "onHide" | "onTitleClick" | "onOptionMenuClick" | "onTabItemTap", callback: (data: any) => void) => () => void;
+    var broadcastGlobalData: (key: string, result: any) => void;
+    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;
 }

package/lib/mpWebCall.js

@@ -7,20 +7,26 @@ mpWebOnMessage(function (msg) {
   var message = msg;
   var serialId = message.serialId;
   // 不是 jsapi 的调用的消息
-  if (message.type !== 'apiCall') return;
+  if (message.type && message.type !== 'apiCall') return;
   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; // JsApi 的类型
-  if (type === 'callback') return callback(data);
-  var _b = callback || {},
-    success = _b.success,
-    fail = _b.fail,
-    complete = _b.complete;
-  var _c = data || {},
-    _data_ = _c._data_,
-    _type_ = _c._type_;
+  if (type === 'callback') {
+    var _b = data || {},
+      _data_1 = _b._data_,
+      _type_1 = _b._type_;
+    if (_type_1 === 'success') return callback(_data_1);
+    return callback(undefined, _data_1);
+  }
+  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_);
@@ -55,27 +61,28 @@ export function mpWebCall(api, options, config) {
   };
   mpWebPostMessage(message);
 }
-function broadcastGlobalData(key, payload) {
+function broadcastGlobalData(key, result) {
   var message = {
     source: 'hylid',
     type: 'broadcast',
     from: window.location.href,
-    result: {
-      key: key,
-      payload: payload
-    }
+    key: key,
+    result: result
   };
   mpWebPostMessage(message);
 }
 function onReceiveGlobalData(key, callback) {
   return mpWebOnMessage(function (msg) {
-    var _a, _b;
     var message = msg;
     if (message.source !== 'hylid') return;
     if (message.type !== 'broadcast') return;
     // 不是接收的目标消息
-    if (((_a = message.result) === null || _a === void 0 ? void 0 : _a.key) !== key) return;
-    callback((_b = message.result) === null || _b === void 0 ? void 0 : _b.payload, message.from);
+    if (message.key !== key) return;
+    var _a = message.result || {},
+      _data_ = _a._data_,
+      _type_ = _a._type_;
+    if (_type_ === 'success') return callback(_data_, undefined, message.from);
+    return callback(undefined, _data_, message.from);
   });
 }
 function onPageEvent(event, callback) {
@@ -90,7 +97,11 @@ function onPageEvent(event, callback) {
     if (message.source !== 'hylid') return;
     if (message.type !== 'pageEvent') return;
     if (message.event !== event) return;
-    callback(message.result);
+    var _a = message.result || {},
+      _data_ = _a._data_,
+      _type_ = _a._type_;
+    if (_type_ === 'success') return callback(_data_);
+    return callback(undefined, _data_);
   });
 }
 mpWebCall.onMessage = mpWebOnMessage;

package/lib/notFound.js

@@ -1,3 +1,4 @@
+import { createError } from "./utils";
 export var notFound = function notFound(name, opt, config) {
   var _a;
   if (config === void 0) {
@@ -5,10 +6,7 @@ export var notFound = function notFound(name, opt, config) {
   }
   var _b = config.type,
     type = _b === void 0 ? 'async' : _b;
-  var response = {
-    error: -1,
-    errorMessage: "".concat(name, " is not found")
-  };
+  var response = createError('NOTFOUND', name);
   if (type === 'sync') return response;
   if (type === 'callback') {
     opt === null || opt === void 0 ? void 0 : opt(response);

package/lib/types.d.ts

@@ -4,9 +4,9 @@ export interface MpWebJsApiConfig {
     type?: JsApiType;
 }
 export declare type Config = MpWebJsApiConfig;
-export interface MpWebJsApiMessageResult {
+export interface MpWebMessageResult<T = any> {
     _type_: 'success' | 'fail';
-    _data_: any;
+    _data_: T;
 }
 export interface MpWebJsApiMessage {
     source: 'hylid';
@@ -15,25 +15,37 @@ export interface MpWebJsApiMessage {
     serialId: string;
     options: any;
     config?: MpWebJsApiConfig;
-    result?: MpWebJsApiMessageResult;
+    result?: MpWebMessageResult;
 }
 export interface MpWebBroadcastMessage {
     source: 'hylid';
     type: 'broadcast';
     from: string;
-    result?: {
-        key: string;
-        payload: any;
-    };
+    key: string;
+    result?: MpWebMessageResult;
 }
 export interface MpWebPageEventMessage {
     source: 'hylid';
     type: 'pageEvent';
     event: 'onShow' | 'onHide' | 'onTitleClick' | 'onOptionMenuClick' | 'onTabItemTap' | ({} & string);
-    result?: any;
+    result?: MpWebMessageResult;
 }
 export declare type Message = MpWebJsApiMessage | MpWebBroadcastMessage | MpWebPageEventMessage;
 export declare type MessageHandler = (message: Message) => void;
 declare type Callback<T> = (result?: T) => void;
 export declare type MpWebJsApiOptions<T extends keyof MPApi> = PickMPArgs<T> | Callback<PickMpReturns<T>>;
+export interface WebviewBridgeConfig {
+    /** 允许调用 jsApi 的白名单 */
+    whitelist?: string[];
+    /** 禁止调用 jsApi 的黑名单 */
+    blacklist?: string[];
+    /** 自定义 jsApi [ 优先级比较高，可以覆盖原生的 jsApi ] */
+    customApi?: CustomApi;
+}
+export interface CustomApi {
+    [key: string]: (params: {
+        success(v: any): void;
+        fail(v: any): void;
+    }) => void;
+}
 export {};

package/lib/utils.d.ts

@@ -0,0 +1,25 @@
+import { MpWebMessageResult } from './types';
+declare const ERROR: {
+    NOTFOUND: {
+        code: number;
+        message: (name: string) => string;
+    };
+    NOTALLOWED: {
+        code: number;
+        message: (name: string) => string;
+    };
+    INVALID: {
+        code: number;
+        message: (name: string) => string;
+    };
+    NOTBIND: {
+        code: number;
+        message: (name: string) => string;
+    };
+};
+export declare const createError: (type: keyof typeof ERROR, name: string) => {
+    errorCode: number;
+    errorMessage: string;
+};
+export declare function createMessage(message: any, type?: 'success' | 'fail'): MpWebMessageResult;
+export {};

package/lib/utils.js

@@ -0,0 +1,44 @@
+var ERROR = {
+  NOTFOUND: {
+    code: -1,
+    message: function message(name) {
+      return "".concat(name, " is not found");
+    }
+  },
+  NOTALLOWED: {
+    code: -2,
+    message: function message(name) {
+      return "".concat(name, " is not allowed");
+    }
+  },
+  INVALID: {
+    code: -3,
+    message: function message(name) {
+      return "".concat(name, " is invalid");
+    }
+  },
+  NOTBIND: {
+    code: -4,
+    message: function message(name) {
+      return "".concat(name, " exec fail, webviewBridge not bind context");
+    }
+  }
+};
+export var createError = function createError(type, name) {
+  var _a = ERROR[type],
+    code = _a.code,
+    message = _a.message;
+  return {
+    errorCode: code,
+    errorMessage: message(name)
+  };
+};
+export function createMessage(message, type) {
+  if (type === void 0) {
+    type = 'success';
+  }
+  return {
+    _type_: type,
+    _data_: message
+  };
+}

package/lib/webviewBridge/index.d.ts

@@ -0,0 +1,26 @@
+import { Message, WebviewBridgeConfig } from '../types';
+interface WebViewContext {
+    postMessage(message: Message): void;
+}
+export declare class WebViewBridge {
+    private webview;
+    private config;
+    private context;
+    private MESSAGE_HANDLER;
+    /**
+     *
+     * @param webviewId webview 组件的 id，可传字符串，或者 my.createWebViewContext 创建出的实例
+     * @param config Config 配置
+     * @param context 页面上下文，传 this 即可。传入后，H5 侧可以使用广播、可以监听页面事件
+     */
+    constructor(webviewId: string | WebViewContext, config?: WebviewBridgeConfig, context?: any);
+    listen: (data: {
+        detail: Message;
+    }) => void;
+    private jsApiHandler;
+    private broadcastHandler;
+    private pageEventHandler;
+    private bindCtxEvent;
+    private sendMessage;
+}
+export {};

package/lib/webviewBridge/index.js

@@ -0,0 +1,129 @@
+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 { __hy_internal__ } from "./internal";
+import { callbackApi, getApiResult, isAllowed } from "./utils";
+import { createMessage, createError } from "../utils";
+var broadcastTargets = [];
+var WebViewBridge = /** @class */function () {
+  /**
+   *
+   * @param webviewId webview 组件的 id，可传字符串，或者 my.createWebViewContext 创建出的实例
+   * @param config Config 配置
+   * @param context 页面上下文，传 this 即可。传入后，H5 侧可以使用广播、可以监听页面事件
+   */
+  function WebViewBridge(webviewId, config, context) {
+    if (config === void 0) {
+      config = {};
+    }
+    var _this = this;
+    this.config = {};
+    this.MESSAGE_HANDLER = [];
+    this.listen = function (data) {
+      if (data.detail.source !== 'hylid') return;
+      _this.MESSAGE_HANDLER.forEach(function (fn) {
+        return fn(data.detail);
+      });
+    };
+    this.jsApiHandler = function (data) {
+      var _a;
+      if (data.type !== 'apiCall') return;
+      var config = data.config,
+        api = data.api;
+      var type = (config || {}).type;
+      // 权限管控不允许调用 JSAPI
+      if (!isAllowed(_this.config, api)) {
+        return _this.sendMessage(data, createMessage(createError('NOTALLOWED', api), 'fail'));
+      }
+      var jsapi = ((_a = _this.config.customApi) === null || _a === void 0 ? void 0 : _a[api]) || {
+        __hy_internal__: __hy_internal__
+      }[api] || my[api];
+      if (type === 'callback') {
+        callbackApi(jsapi, data, function (result) {
+          return _this.sendMessage(data, result);
+        });
+      } else {
+        getApiResult(jsapi, data).then(function (result) {
+          _this.sendMessage(data, result);
+        });
+      }
+    };
+    this.broadcastHandler = function (data) {
+      if (data.type !== 'broadcast') return;
+      if (!_this.context) {
+        _this.sendMessage(data, createMessage(createError('NOTBIND', 'broadcast'), 'fail'));
+        return;
+      }
+      broadcastTargets.forEach(function (target) {
+        if (target === _this) return;
+        _this.sendMessage(data, createMessage(data.result), target);
+      });
+    };
+    this.pageEventHandler = function (data) {
+      var _a;
+      if (data.type !== 'pageEvent') return;
+      var event = data.event;
+      if (!event) {
+        _this.sendMessage(data, createMessage(createError('NOTFOUND', event), 'fail'));
+        return;
+      }
+      if (!_this.context) {
+        _this.sendMessage(data, createMessage(createError('NOTBIND', event), 'fail'));
+        return;
+      }
+      // 已经监听过了
+      if ((_a = _this.context[event]) === null || _a === void 0 ? void 0 : _a._hy_listener_) return;
+      _this.bindCtxEvent(event, function (payload) {
+        return _this.sendMessage(data, payload);
+      });
+      _this.context[event]._hy_listener_ = true;
+    };
+    if (typeof webviewId === 'string') {
+      this.webview = my.createWebViewContext(webviewId);
+    } else {
+      this.webview = webviewId;
+    }
+    this.config = config;
+    this.context = context;
+    this.MESSAGE_HANDLER.push(this.jsApiHandler);
+    this.MESSAGE_HANDLER.push(this.broadcastHandler);
+    this.MESSAGE_HANDLER.push(this.pageEventHandler);
+    if (context) {
+      broadcastTargets.push(this);
+      this.bindCtxEvent('onUnload', function () {
+        broadcastTargets = broadcastTargets.filter(function (target) {
+          return target !== _this;
+        });
+      });
+    } else {
+      console.info("[hylid-call]: context \u5728\u5C0F\u7A0B\u5E8F\u4FA7\u672A\u4F20\u5165\uFF0Cbroadcast \u529F\u80FD\u3001\u9875\u9762\u76D1\u542C\u5C06\u65E0\u6CD5\u4F7F\u7528");
+    }
+  }
+  WebViewBridge.prototype.bindCtxEvent = function (event, callback) {
+    if (!this.context) {
+      return callback(createMessage(createError('NOTBIND', event), 'fail'));
+    }
+    var userEvent = this.context[event];
+    this.context[event] = function (opts) {
+      if (userEvent) userEvent.bind(this.context)(opts);
+      callback(createMessage(opts));
+    };
+  };
+  WebViewBridge.prototype.sendMessage = function (origin, result, context) {
+    if (context === void 0) {
+      context = this;
+    }
+    context.webview.postMessage(__assign(__assign({}, origin), {
+      result: result
+    }));
+  };
+  return WebViewBridge;
+}();
+export { WebViewBridge };

package/lib/webviewBridge/internal/canIUse.d.ts

@@ -0,0 +1,3 @@
+export declare function canIUse(payload: {
+    jsapi: string;
+}): boolean;

package/lib/webviewBridge/internal/canIUse.js

@@ -0,0 +1,4 @@
+export function canIUse(payload) {
+  var jsapi = payload.jsapi;
+  return my.canIUse(jsapi);
+}

package/lib/webviewBridge/internal/getCurrentPages.d.ts

@@ -0,0 +1 @@
+export declare function _getCurrentPages(): any[];

package/lib/webviewBridge/internal/getCurrentPages.js

@@ -0,0 +1,6 @@
+export function _getCurrentPages() {
+  if (typeof getCurrentPages === 'undefined') {
+    return [];
+  }
+  return getCurrentPages();
+}

package/lib/webviewBridge/internal/index.d.ts

@@ -0,0 +1,18 @@
+import { _getCurrentPages as getCurrentPages } from './getCurrentPages';
+import { getMemory, removeMemory, setMemory } from './memory';
+import { canIUse } from './canIUse';
+declare const jsapis: {
+    getMemory: typeof getMemory;
+    setMemory: typeof setMemory;
+    removeMemory: typeof removeMemory;
+    getCurrentPages: typeof getCurrentPages;
+    canIUse: typeof canIUse;
+};
+interface InternalOptions {
+    name: keyof typeof jsapis;
+    payload: any;
+    success(res: any): void;
+    fail(e: any): void;
+}
+export declare function __hy_internal__(options: InternalOptions): Promise<void>;
+export {};

package/lib/webviewBridge/internal/index.js

@@ -0,0 +1,156 @@
+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 { _getCurrentPages as getCurrentPages } from "./getCurrentPages";
+import { getMemory, removeMemory, setMemory } from "./memory";
+import { canIUse } from "./canIUse";
+import { createError } from "../../utils";
+var jsapis = {
+  getMemory: getMemory,
+  setMemory: setMemory,
+  removeMemory: removeMemory,
+  getCurrentPages: getCurrentPages,
+  canIUse: canIUse
+};
+export function __hy_internal__(options) {
+  return __awaiter(this, void 0, void 0, function () {
+    var _a, success, fail, name, payload, jsapi, res, e_1;
+    return __generator(this, function (_b) {
+      switch (_b.label) {
+        case 0:
+          _a = options || {}, success = _a.success, fail = _a.fail, name = _a.name, payload = _a.payload;
+          jsapi = jsapis[name];
+          if (!jsapi) {
+            fail(createError('NOTFOUND', name));
+            return [2 /*return*/];
+          }
+          _b.label = 1;
+        case 1:
+          _b.trys.push([1, 3,, 4]);
+          return [4 /*yield*/, jsapi(payload)];
+        case 2:
+          res = _b.sent();
+          success(res);
+          return [3 /*break*/, 4];
+        case 3:
+          e_1 = _b.sent();
+          fail(e_1);
+          return [3 /*break*/, 4];
+        case 4:
+          return [2 /*return*/];
+      }
+    });
+  });
+}

package/lib/webviewBridge/internal/memory.d.ts

@@ -0,0 +1,10 @@
+export declare function getMemory(payload: {
+    key: string;
+}): any;
+export declare function setMemory(payload: {
+    key: string;
+    value: any;
+}): void;
+export declare function removeMemory(payload: {
+    key: string;
+}): void;

package/lib/webviewBridge/internal/memory.js

@@ -0,0 +1,12 @@
+var data = {};
+export function getMemory(payload) {
+  return data[payload.key];
+}
+export function setMemory(payload) {
+  data[payload.key] = {
+    data: payload.value
+  };
+}
+export function removeMemory(payload) {
+  delete data[payload.key];
+}

package/lib/webviewBridge/utils.d.ts

@@ -0,0 +1,4 @@
+import { MpWebJsApiMessage, MpWebMessageResult, WebviewBridgeConfig } from '../types';
+export declare function callbackApi(jsapi: any, data: MpWebJsApiMessage, cb: (msg: MpWebMessageResult) => void): void;
+export declare const getApiResult: (jsapi: any, data: MpWebJsApiMessage) => Promise<MpWebMessageResult>;
+export declare function isAllowed(config: WebviewBridgeConfig, api: string): boolean;

package/lib/webviewBridge/utils.js

@@ -0,0 +1,195 @@
+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);
+};
+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 { createMessage, createError } from "../utils";
+function getSyncApi(apiName, jsapi, options) {
+  // 同步场景无该 API
+  if (!jsapi) {
+    return createMessage(createError('NOTFOUND', apiName), 'fail');
+  }
+  // 传进来的 API 不是函数
+  if (typeof jsapi !== 'function') {
+    return createMessage(createError('INVALID', apiName), 'fail');
+  }
+  return createMessage(jsapi(options));
+}
+function getAsyncApi(apiName, jsapi, _options) {
+  return new Promise(function (resolve) {
+    var options = __assign(__assign({}, _options), {
+      success: function success(res) {
+        resolve(createMessage(res));
+      },
+      fail: function fail(res) {
+        resolve(createMessage(res, 'fail'));
+      }
+    });
+    // @ts-ignore
+    if (!jsapi) return my.call(api, options);
+    if (typeof jsapi !== 'function') {
+      return options.fail(createError('INVALID', apiName));
+    }
+    jsapi(options);
+  });
+}
+export function callbackApi(jsapi, data, cb) {
+  var api = (data || {}).api;
+  // 无该 API
+  if (!jsapi) {
+    return cb(createMessage(createError('NOTFOUND', api), 'fail'));
+  }
+  // 传进来的 API 不是函数
+  if (typeof jsapi !== 'function') {
+    return cb(createMessage(createError('INVALID', api), 'fail'));
+  }
+  jsapi(function (result) {
+    return cb(createMessage(result));
+  });
+}
+export var getApiResult = function getApiResult(jsapi, data) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var api, options, config, _a, type;
+    return __generator(this, function (_b) {
+      api = data.api, options = data.options, config = data.config;
+      _a = (config || {}).type, type = _a === void 0 ? 'async' : _a;
+      if (type === 'sync') {
+        return [2 /*return*/, getSyncApi(api, jsapi, options)];
+      }
+      if (type === 'async') {
+        return [2 /*return*/, getAsyncApi(api, jsapi, options)];
+      }
+      // 不识别的类型
+      return [2 /*return*/, createMessage(createError('INVALID', api), 'fail')];
+    });
+  });
+};
+export function isAllowed(config, api) {
+  var _a = config || {},
+    whitelist = _a.whitelist,
+    blacklist = _a.blacklist;
+  // 黑白名单校验
+  if (whitelist && !whitelist.includes(api)) return false;
+  if (blacklist && blacklist.includes(api)) return false;
+  return true;
+}

package/lib/webviewBridge.d.ts

@@ -1,11 +1,8 @@
 /// <reference types="miniprogram" />
-import { Message, MessageHandler, MpWebBroadcastMessage, MpWebJsApiMessage, MpWebPageEventMessage } from './types';
+import { MpWebMessage } from './types';
 interface Config {
-    /** 允许调用 jsApi 的白名单 */
     whitelist?: string[];
-    /** 禁止调用 jsApi 的黑名单 */
     blacklist?: string[];
-    /** 自定义 jsApi [ 优先级比较高，可以覆盖原生的 jsApi ] */
     customApi?: CustomApi;
 }
 interface CustomApi {
@@ -17,22 +14,11 @@ interface CustomApi {
 export declare class WebViewBridge {
     webview: WebViewContext;
     config: Config;
-    context: any;
-    MESSAGE_HANDLER: MessageHandler[];
-    /**
-     *
-     * @param webviewId webview 组件的 id，可传字符串，或者 my.createWebViewContext 创建出的实例
-     * @param config Config 配置
-     * @param context 页面上下文，传 this 即可。传入后，H5 侧可以使用广播、可以监听页面事件
-     */
-    constructor(webviewId: string | WebViewContext, config?: Config, context?: any);
+    constructor(ctx: WebViewContext, config?: Config);
     listen: (data: {
-        detail: Message;
-    }) => void;
+        detail: MpWebMessage;
+    }) => Promise<true | undefined>;
     isAllowed(api: string): boolean;
-    jsApiHandler: (command: MpWebJsApiMessage) => void;
-    broadcastHandler: (data: MpWebBroadcastMessage) => void;
-    pageEventHandler: (data: MpWebPageEventMessage) => void;
-    bindCtxEvent(event: string, callback: (...rest: any) => void): void;
+    handleApi: (data: MpWebMessage) => Promise<unknown>;
 }
 export {};

package/lib/webviewBridge.js

@@ -8,169 +8,222 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-var broadcastTargets = [];
+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
+    };
+  }
+};
 var WebViewBridge = /** @class */function () {
-  /**
-   *
-   * @param webviewId webview 组件的 id，可传字符串，或者 my.createWebViewContext 创建出的实例
-   * @param config Config 配置
-   * @param context 页面上下文，传 this 即可。传入后，H5 侧可以使用广播、可以监听页面事件
-   */
-  function WebViewBridge(webviewId, config, context) {
+  function WebViewBridge(ctx, config) {
     if (config === void 0) {
       config = {};
     }
     var _this = this;
     this.config = {};
-    this.MESSAGE_HANDLER = [];
     this.listen = function (data) {
-      if (data.detail.source !== 'hylid') return;
-      _this.MESSAGE_HANDLER.forEach(function (fn) {
-        return fn(data.detail);
-      });
-    };
-    this.jsApiHandler = function (command) {
-      if (command.type !== 'apiCall') return;
-      var getApiResult = function getApiResult(data) {
-        var api = data.api,
-          _options = data.options,
-          config = data.config;
-        var _a = (config || {}).type,
-          type = _a === void 0 ? 'async' : _a;
-        return new Promise(function (resolve) {
-          var _a;
-          var options = __assign(__assign({}, _options), {
-            success: function success(res) {
-              resolve({
-                _type_: 'success',
-                _data_: res
-              });
-            },
-            fail: function fail(res) {
-              resolve({
-                _type_: 'fail',
-                _data_: res
+      return __awaiter(_this, void 0, void 0, function () {
+        var command, config, api, type, notAllowedMessage;
+        var _this = this;
+        return __generator(this, function (_a) {
+          command = data.detail;
+          if (command.source === 'hylid') {
+            config = command.config, api = command.api;
+            type = (config || {}).type;
+            // 权限管控不允许调用 JSAPI
+            if (!this.isAllowed(api)) {
+              notAllowedMessage = __assign(__assign({}, command), {
+                result: {
+                  _type_: 'fail',
+                  _data_: {
+                    errorCode: -2,
+                    errorMessage: 'api is not allowed'
+                  }
+                }
               });
+              this.webview.postMessage(notAllowedMessage);
+              return [2 /*return*/];
             }
-          });
-          // @ts-ignore
-          var mpApi = ((_a = _this.config.customApi) === null || _a === void 0 ? void 0 : _a[api]) || my[api];
-          if (type === 'sync') {
-            var data_1 = mpApi(_options);
-            resolve({
-              _type_: 'success',
-              _data_: data_1
-            });
-          }
-          if (type === 'async') {
-            if (!mpApi) {
+            if (type === 'callback') {
               // @ts-ignore
-              my.call(api, options);
+              my[api](function (result) {
+                _this.webview.postMessage(__assign(__assign({}, command), {
+                  result: result
+                }));
+              });
             } else {
-              mpApi(options);
+              this.handleApi(command).then(function (result) {
+                _this.webview.postMessage(__assign(__assign({}, command), {
+                  result: result
+                }));
+              });
             }
+            // 表示被 hylid-bridge 消费了
+            return [2 /*return*/, true];
           }
+          return [2 /*return*/];
         });
-      };
-      var config = command.config,
-        api = command.api;
-      var type = (config || {}).type;
-      // 权限管控不允许调用 JSAPI
-      if (!_this.isAllowed(api)) {
-        var notAllowedMessage = __assign(__assign({}, command), {
-          result: {
-            _type_: 'fail',
-            _data_: {
-              errorCode: -2,
-              errorMessage: 'api is not allowed'
-            }
+      });
+    };
+    this.handleApi = function (data) {
+      var api = data.api,
+        _options = data.options,
+        config = data.config;
+      var _a = (config || {}).type,
+        type = _a === void 0 ? 'async' : _a;
+      return new Promise(function (resolve) {
+        var _a;
+        var options = __assign(__assign({}, _options), {
+          success: function success(res) {
+            resolve({
+              _type_: 'success',
+              _data_: res
+            });
+          },
+          fail: function fail(res) {
+            resolve({
+              _type_: 'fail',
+              _data_: res
+            });
           }
         });
-        _this.webview.postMessage(notAllowedMessage);
-        return;
-      }
-      if (type === 'callback') {
         // @ts-ignore
-        my[api](function (result) {
-          _this.webview.postMessage(__assign(__assign({}, command), {
-            result: result
-          }));
-        });
-      } else {
-        getApiResult(command).then(function (result) {
-          _this.webview.postMessage(__assign(__assign({}, command), {
-            result: result
-          }));
-        });
-      }
-    };
-    this.broadcastHandler = function (data) {
-      if (data.type !== 'broadcast') return;
-      broadcastTargets.forEach(function (target) {
-        if (target === _this) return;
-        target.webview.postMessage(data);
-      });
-    };
-    this.pageEventHandler = function (data) {
-      var _a;
-      if (data.type !== 'pageEvent') return;
-      var event = data.event;
-      if (!event) return;
-      if (!_this.context) {
-        console.info("[hylid-call]: context \u5728\u5C0F\u7A0B\u5E8F\u4FA7\u672A\u4F20\u5165\uFF0C".concat(event, " \u76D1\u542C\u5931\u8D25"));
-        return;
-      }
-      // 已经监听过了
-      if ((_a = _this.context[event]) === null || _a === void 0 ? void 0 : _a._hy_listener_) return;
-      _this.bindCtxEvent(event, function (payload) {
-        _this.webview.postMessage(__assign(__assign({}, data), {
-          result: payload
-        }));
+        var mpApi = ((_a = _this.config.customApi) === null || _a === void 0 ? void 0 : _a[api]) || my[api];
+        if (type === 'sync') {
+          var data_1 = mpApi(_options);
+          resolve({
+            _type_: 'success',
+            _data_: data_1
+          });
+        }
+        if (type === 'async') {
+          if (!mpApi) {
+            // @ts-ignore
+            my.call(api, options);
+          } else {
+            mpApi(options);
+          }
+        }
       });
-      _this.context[event]._hy_listener_ = true;
     };
-    if (typeof webviewId === 'string') {
-      this.webview = my.createWebViewContext(webviewId);
-    } else {
-      this.webview = webviewId;
-    }
+    this.webview = ctx;
     this.config = config;
-    this.context = context;
-    this.MESSAGE_HANDLER.push(this.jsApiHandler);
-    this.MESSAGE_HANDLER.push(this.broadcastHandler);
-    this.MESSAGE_HANDLER.push(this.pageEventHandler);
-    if (context) {
-      broadcastTargets.push(this);
-      this.bindCtxEvent('onUnload', function () {
-        broadcastTargets = broadcastTargets.filter(function (target) {
-          return target !== _this;
-        });
-      });
-    } else {
-      console.info("[hylid-call]: context \u5728\u5C0F\u7A0B\u5E8F\u4FA7\u672A\u4F20\u5165\uFF0Cbroadcast \u529F\u80FD\u3001\u9875\u9762\u76D1\u542C\u5C06\u65E0\u6CD5\u4F7F\u7528");
-    }
   }
   WebViewBridge.prototype.isAllowed = function (api) {
-    var _a = this.config || {},
-      whitelist = _a.whitelist,
-      blacklist = _a.blacklist;
     // 黑白名单校验
-    if (whitelist && !whitelist.includes(api)) return false;
-    if (blacklist && blacklist.includes(api)) return false;
+    if (this.config.whitelist && !this.config.whitelist.includes(api)) return false;
+    if (this.config.blacklist && this.config.blacklist.includes(api)) return false;
     return true;
   };
-  WebViewBridge.prototype.bindCtxEvent = function (event, callback) {
-    if (!this.context) return;
-    var userEvent = this.context[event];
-    this.context[event] = function () {
-      var rest = [];
-      for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i] = arguments[_i];
-      }
-      if (userEvent) userEvent.apply(void 0, rest);
-      callback.apply(void 0, rest);
-    }.bind(this.context);
-  };
   return WebViewBridge;
 }();
 export { WebViewBridge };

package/package.json

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