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

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/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/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

@@ -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);
         });
       }
@@ -66,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) {
@@ -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/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.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,13 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
 };
 import { createMessage, createError } from "../utils";
-import { __hy_internal__ } from "./internal";
+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) {
@@ -154,37 +160,35 @@ 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)];
       }
       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.2",
+  "version": "3.2.0-alpha.5",
   "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.5",
+    "@hylid/types": "^3.2.0-alpha.5"
   },
   "publishConfig": {
     "access": "public"