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

package/lib/mpCall.d.ts

@@ -1,4 +1,3 @@
 import { MPApi, PickMPArgs, Callback, PickMpReturns } from '@hylid/types';
-export declare function mpCall<T extends keyof MPApi>(apiName: T | ({} & string), options?: PickMPArgs<T> | Callback<PickMpReturns<T>>, config?: {
-    type?: string;
-}): any;
+import { JsApiConfig } from './types';
+export declare function mpCall<T extends keyof MPApi>(apiName: T | ({} & string), options?: PickMPArgs<T> | Callback<PickMpReturns<T>>, config?: JsApiConfig): any;

package/lib/mpWebBridge.d.ts

@@ -1,3 +1,3 @@
 import { Message, MessageHandler } from './types';
 export declare function mpWebOnMessage(cb: MessageHandler): () => void;
-export declare function mpWebPostMessage(message: Message): void;
+export declare function mpWebPostMessage(message: Message): any;

package/lib/mpWebBridge.js

@@ -1,45 +1,5 @@
-var __rest = this && this.__rest || function (s, e) {
-  var t = {};
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
-/** 加载 appx 脚本 */
-var loadAppxBridge = function loadAppxBridge(cb) {
-  var _a;
-  try {
-    // umd 包用的 IFF 模式，会立即向 window.my 上注入 jsapi，所以不能使用 window.my 判断是否已经加载了 appx 脚本
-    // umd 版本和 modules 版本不能混用
-    if ((_a = window.my) === null || _a === void 0 ? void 0 : _a.__hy_mounted__) {
-      cb && cb("ready" /* BridgeReady.READY */);
-      return;
-    }
-    var hyMy_1 = window.my || {};
-    var script_1 = document.createElement('script');
-    script_1.src = 'https://appx/web-view.min.js';
-    script_1.onload = function onload() {
-      var readyState = script_1['readyState'];
-      if (typeof readyState === 'undefined' || /^(loaded|complete)$/.test(readyState)) {
-        script_1.onload = null;
-        // appx 脚本覆盖了 window 的 my 属性，这里再把 hylid-bridge 的 API 挂上去
-        var postMessage_1 = hyMy_1.postMessage,
-          api = __rest(hyMy_1, ["postMessage"]);
-        Object.assign(window.my, api, {
-          __hy_mounted__: true
-        });
-        cb && cb("loaded" /* BridgeReady.LOADED */);
-      }
-    };
-    var head = document.getElementsByTagName('head')[0] || document.body;
-    head.appendChild(script_1);
-  } catch (e) {
-    cb && cb(null);
-  }
-};
+import { alipayJSBridge } from "./webCall";
 var isListening = false;
-var WAITING_QUEUE = [];
 var MESSAGE_HANDLER = [];
 export function mpWebOnMessage(cb) {
   MESSAGE_HANDLER.push(cb);
@@ -50,25 +10,21 @@ export function mpWebOnMessage(cb) {
   };
 }
 export function mpWebPostMessage(message) {
-  return loadAppxBridge(function (bridgeReady) {
-    if (bridgeReady) {
-      if (!isListening) {
-        var messageHandler_1 = window.my.onMessage;
-        window.my.onMessage = function (message) {
-          MESSAGE_HANDLER.forEach(function (fn) {
-            return fn(message);
-          });
-          if (messageHandler_1) messageHandler_1(message);
-        };
-        isListening = true;
-      }
-      if (WAITING_QUEUE.length) {
-        WAITING_QUEUE.forEach(window.my.postMessage);
-        WAITING_QUEUE = [];
-      }
-      window.my.postMessage(message);
-    } else {
-      WAITING_QUEUE.push(message);
-    }
+  if (!isListening) {
+    document.addEventListener('onToWebViewMessage', function (e) {
+      var res = e.data.res;
+      if (!res || res.type !== 'message') return;
+      var data = JSON.parse(res.data);
+      MESSAGE_HANDLER.forEach(function (fn) {
+        return fn(data);
+      });
+    });
+    isListening = true;
+  }
+  return alipayJSBridge(function () {
+    window.AlipayJSBridge.call('postWebViewMessage', {
+      type: 'message',
+      detail: message
+    });
   });
 }

package/lib/mpWebCall.d.ts

@@ -1,7 +1,7 @@
 import { MPApi } from '@hylid/types';
-import { MpWebJsApiConfig, MpWebJsApiOptions } from './types';
+import { JsApiConfig, MpWebJsApiOptions } from './types';
 import { mpWebOnMessage, mpWebPostMessage } from './mpWebBridge';
-export declare function mpWebCall<T extends keyof MPApi>(api: T | ({} & string), options?: MpWebJsApiOptions<T>, config?: MpWebJsApiConfig): void;
+export declare function mpWebCall<T extends keyof MPApi>(api: T | ({} & string), options?: MpWebJsApiOptions<T>, config?: JsApiConfig): void;
 export declare namespace mpWebCall {
     var onMessage: typeof mpWebOnMessage;
     var postMessage: typeof mpWebPostMessage;

package/lib/types.d.ts

@@ -1,9 +1,9 @@
 import { JsApiType, MPApi, PickMPArgs, PickMpReturns } from '@hylid/types';
 export declare type JsApi = keyof MPApi;
-export interface MpWebJsApiConfig {
+export interface JsApiConfig {
     type?: JsApiType;
 }
-export declare type Config = MpWebJsApiConfig;
+export declare type Config = JsApiConfig;
 export interface MpWebMessageResult<T = any> {
     _type_: 'success' | 'fail';
     _data_: T;
@@ -14,7 +14,7 @@ export interface MpWebJsApiMessage {
     api: string;
     serialId: string;
     options: any;
-    config?: MpWebJsApiConfig;
+    config?: JsApiConfig;
     result?: MpWebMessageResult;
 }
 export interface MpWebBroadcastMessage {

package/lib/utils.d.ts

@@ -16,10 +16,15 @@ declare const ERROR: {
         code: number;
         message: (name: string) => string;
     };
+    PARAMS_ERROR: {
+        code: number;
+        message: (name: string) => string;
+    };
 };
-export declare const createError: (type: keyof typeof ERROR, name: string) => {
+export declare const createError: (type: keyof typeof ERROR, name?: string) => {
     errorCode: number;
     errorMessage: string;
+    errorSouce: string;
 };
 export declare function createMessage(message: any, type?: 'success' | 'fail'): MpWebMessageResult;
 export {};

package/lib/utils.js

@@ -22,15 +22,25 @@ var ERROR = {
     message: function message(name) {
       return "".concat(name, " exec fail, webviewBridge not bind context");
     }
+  },
+  PARAMS_ERROR: {
+    code: -5,
+    message: function message(name) {
+      return "".concat(name, " exec fail, params error");
+    }
   }
 };
 export var createError = function createError(type, name) {
+  if (name === void 0) {
+    name = '';
+  }
   var _a = ERROR[type],
     code = _a.code,
     message = _a.message;
   return {
     errorCode: code,
-    errorMessage: message(name)
+    errorMessage: message(name),
+    errorSouce: 'hylid'
   };
 };
 export function createMessage(message, type) {

package/lib/webCall.d.ts

@@ -1,4 +1,4 @@
 import { AliJsApi } from '@hylid/types';
-export declare function webCall<T extends keyof AliJsApi.Api>(apiName: T | ({} & string), options?: any, config?: {
-    type?: string;
-}): void;
+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;

package/lib/webCall.js

@@ -1,11 +1,11 @@
-var alipayJSBridgeReady = function alipayJSBridgeReady(cb) {
+export var alipayJSBridge = function alipayJSBridge(cb) {
   if (window.AlipayJSBridge) return cb();
   document.addEventListener('AlipayJSBridgeReady', function () {
     return cb();
   }, false);
 };
 export function webCall(apiName, options, config) {
-  alipayJSBridgeReady(function () {
+  alipayJSBridge(function () {
     var _a = (config || {}).type,
       type = _a === void 0 ? 'async' : _a;
     if (type === 'async') {

package/lib/webviewBridge/index.js

@@ -71,7 +71,7 @@ var WebViewBridge = /** @class */function () {
       if (data.type !== 'pageEvent') return;
       var event = data.event;
       if (!event) {
-        _this.sendMessage(data, createMessage(createError('NOTFOUND', event), 'fail'));
+        _this.sendMessage(data, createMessage(createError('PARAMS_ERROR'), 'fail'));
         return;
       }
       if (!_this.context) {

package/lib/webviewBridge/internal/getCurrentPages.js

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

package/lib/webviewBridge/internal/index.js

@@ -133,7 +133,7 @@ export function __hy_internal__(options) {
           _a = options || {}, success = _a.success, fail = _a.fail, name = _a.name, payload = _a.payload;
           jsapi = jsapis[name];
           if (!jsapi) {
-            fail(createError('NOTFOUND', name));
+            fail(createError('NOTFOUND', "internal jsapi ".concat(name)));
             return [2 /*return*/];
           }
           _b.label = 1;

package/lib/webviewBridge/utils.js

@@ -124,6 +124,13 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
 };
 import { createMessage, createError } from "../utils";
+function getAttributeApi(apiName, jsapi) {
+  // my 上该 api 不存在
+  if (typeof jsapi === 'undefined') {
+    return createMessage(createError('NOTFOUND', apiName), 'fail');
+  }
+  return createMessage(jsapi);
+}
 function getSyncApi(apiName, jsapi, options) {
   // 同步场景无该 API
   if (!jsapi) {
@@ -179,6 +186,9 @@ export var getApiResult = function getApiResult(jsapi, data) {
       if (type === 'async') {
         return [2 /*return*/, getAsyncApi(api, jsapi, options)];
       }
+      if (type === 'attribute') {
+        return [2 /*return*/, getAttributeApi(api, jsapi)];
+      }
       // 不识别的类型
       return [2 /*return*/, createMessage(createError('INVALID', api), 'fail')];
     });

package/package.json

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

package/lib/webviewBridge.d.ts

@@ -1,24 +0,0 @@
-/// <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

@@ -1,229 +0,0 @@
-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 };