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

package/lib/mpWebCall.js

@@ -7,7 +7,7 @@ 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];

package/lib/webviewBridge/index.js

@@ -8,6 +8,7 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+import { __hy_internal__ } from "./internal";
 import { callbackApi, getApiResult, isAllowed } from "./utils";
 import { createMessage, createError } from "../utils";
 var broadcastTargets = [];
@@ -32,6 +33,7 @@ var WebViewBridge = /** @class */function () {
       });
     };
     this.jsApiHandler = function (data) {
+      var _a;
       if (data.type !== 'apiCall') return;
       var config = data.config,
         api = data.api;
@@ -40,12 +42,15 @@ var WebViewBridge = /** @class */function () {
       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(api, data, function (result) {
+        callbackApi(jsapi, data, function (result) {
           return _this.sendMessage(data, result);
         });
       } else {
-        getApiResult(_this.config.customApi, data).then(function (result) {
+        getApiResult(jsapi, data).then(function (result) {
           _this.sendMessage(data, result);
         });
       }
@@ -76,7 +81,7 @@ var WebViewBridge = /** @class */function () {
       // 已经监听过了
       if ((_a = _this.context[event]) === null || _a === void 0 ? void 0 : _a._hy_listener_) return;
       _this.bindCtxEvent(event, function (payload) {
-        return _this.sendMessage(data, createMessage(payload));
+        return _this.sendMessage(data, payload);
       });
       _this.context[event]._hy_listener_ = true;
     };

package/lib/webviewBridge/utils.d.ts

@@ -1,4 +1,4 @@
-import { MpWebJsApiMessage, CustomApi, MpWebMessageResult, WebviewBridgeConfig } from '../types';
-export declare function callbackApi(apiName: string, jsapi: any, cb: (msg: MpWebMessageResult) => void): void;
-export declare const getApiResult: (customApi: CustomApi | undefined, data: MpWebJsApiMessage) => Promise<MpWebMessageResult>;
+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

@@ -124,7 +124,6 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
 };
 import { createMessage, createError } from "../utils";
-import { __hy_internal__ } from "./internal";
 function getSyncApi(apiName, jsapi, options) {
   // 同步场景无该 API
   if (!jsapi) {
@@ -154,31 +153,26 @@ function getAsyncApi(apiName, jsapi, _options) {
     jsapi(options);
   });
 }
-export function callbackApi(apiName, jsapi, cb) {
+export function callbackApi(jsapi, data, cb) {
+  var api = (data || {}).api;
   // 无该 API
   if (!jsapi) {
-    return cb(createMessage(createError('NOTFOUND', apiName), 'fail'));
+    return cb(createMessage(createError('NOTFOUND', api), 'fail'));
   }
   // 传进来的 API 不是函数
   if (typeof jsapi !== 'function') {
-    return cb(createMessage(createError('INVALID', apiName), 'fail'));
+    return cb(createMessage(createError('INVALID', api), 'fail'));
   }
   jsapi(function (result) {
     return cb(createMessage(result));
   });
 }
-export var getApiResult = function getApiResult(customApi, data) {
-  if (customApi === void 0) {
-    customApi = {};
-  }
+export var getApiResult = function getApiResult(jsapi, data) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var api, options, config, _a, type, jsapi;
+    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;
-      jsapi = customApi[api] || {
-        __hy_internal__: __hy_internal__
-      }[api] || my[api];
       if (type === 'sync') {
         return [2 /*return*/, getSyncApi(api, jsapi, options)];
       }

package/lib/webviewBridge.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="miniprogram" />
+import { MpWebMessage } from './types';
+interface Config {
+    whitelist?: string[];
+    blacklist?: string[];
+    customApi?: CustomApi;
+}
+interface CustomApi {
+    [key: string]: (params: {
+        success(v: any): void;
+        fail(v: any): void;
+    }) => void;
+}
+export declare class WebViewBridge {
+    webview: WebViewContext;
+    config: Config;
+    constructor(ctx: WebViewContext, config?: Config);
+    listen: (data: {
+        detail: MpWebMessage;
+    }) => Promise<true | undefined>;
+    isAllowed(api: string): boolean;
+    handleApi: (data: MpWebMessage) => Promise<unknown>;
+}
+export {};

package/lib/webviewBridge.js

@@ -0,0 +1,229 @@
+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
+    };
+  }
+};
+var WebViewBridge = /** @class */function () {
+  function WebViewBridge(ctx, config) {
+    if (config === void 0) {
+      config = {};
+    }
+    var _this = this;
+    this.config = {};
+    this.listen = function (data) {
+      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*/];
+            }
+            if (type === 'callback') {
+              // @ts-ignore
+              my[api](function (result) {
+                _this.webview.postMessage(__assign(__assign({}, command), {
+                  result: result
+                }));
+              });
+            } else {
+              this.handleApi(command).then(function (result) {
+                _this.webview.postMessage(__assign(__assign({}, command), {
+                  result: result
+                }));
+              });
+            }
+            // 表示被 hylid-bridge 消费了
+            return [2 /*return*/, true];
+          }
+          return [2 /*return*/];
+        });
+      });
+    };
+    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
+            });
+          }
+        });
+        // @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) {
+            // @ts-ignore
+            my.call(api, options);
+          } else {
+            mpApi(options);
+          }
+        }
+      });
+    };
+    this.webview = ctx;
+    this.config = config;
+  }
+  WebViewBridge.prototype.isAllowed = function (api) {
+    // 黑白名单校验
+    if (this.config.whitelist && !this.config.whitelist.includes(api)) return false;
+    if (this.config.blacklist && this.config.blacklist.includes(api)) return false;
+    return true;
+  };
+  return WebViewBridge;
+}();
+export { WebViewBridge };

package/package.json

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