@dcloudio/uni-quickapp-webview 2.0.1-alpha-34620220415002 → 2.0.1-alpha-34820220426002

package/dist/index.js

@@ -314,7 +314,7 @@ const promiseInterceptor = {
 };
 
 const SYNC_API_RE =
-  /^\$|Window$|WindowStyle$|sendHostEvent|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale/;
+  /^\$|Window$|WindowStyle$|sendHostEvent|sendNativeEvent|restoreGlobal|requireGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale|invokePushCallback/;
 
 const CONTEXT_API_RE = /^create|Manager$/;
 
@@ -855,8 +855,136 @@ var eventApi = /*#__PURE__*/Object.freeze({
   $emit: $emit
 });
 
+/**
+ * 框架内 try-catch
+ */
+/**
+ * 开发者 try-catch
+ */
+function tryCatch (fn) {
+  return function () {
+    try {
+      return fn.apply(fn, arguments)
+    } catch (e) {
+      // TODO
+      console.error(e);
+    }
+  }
+}
+
+function getApiCallbacks (params) {
+  const apiCallbacks = {};
+  for (const name in params) {
+    const param = params[name];
+    if (isFn(param)) {
+      apiCallbacks[name] = tryCatch(param);
+      delete params[name];
+    }
+  }
+  return apiCallbacks
+}
+
+let cid;
+let cidErrMsg;
+
+function normalizePushMessage (message) {
+  try {
+    return JSON.parse(message)
+  } catch (e) {}
+  return message
+}
+
+function invokePushCallback (
+  args
+) {
+  if (args.type === 'clientId') {
+    cid = args.cid;
+    cidErrMsg = args.errMsg;
+    invokeGetPushCidCallbacks(cid, args.errMsg);
+  } else if (args.type === 'pushMsg') {
+    onPushMessageCallbacks.forEach((callback) => {
+      callback({
+        type: 'receive',
+        data: normalizePushMessage(args.message)
+      });
+    });
+  } else if (args.type === 'click') {
+    onPushMessageCallbacks.forEach((callback) => {
+      callback({
+        type: 'click',
+        data: normalizePushMessage(args.message)
+      });
+    });
+  }
+}
+
+const getPushCidCallbacks = [];
+
+function invokeGetPushCidCallbacks (cid, errMsg) {
+  getPushCidCallbacks.forEach((callback) => {
+    callback(cid, errMsg);
+  });
+  getPushCidCallbacks.length = 0;
+}
+
+function getPushCid (args) {
+  if (!isPlainObject(args)) {
+    args = {};
+  }
+  const {
+    success,
+    fail,
+    complete
+  } = getApiCallbacks(args);
+  const hasSuccess = isFn(success);
+  const hasFail = isFn(fail);
+  const hasComplete = isFn(complete);
+  getPushCidCallbacks.push((cid, errMsg) => {
+    let res;
+    if (cid) {
+      res = {
+        errMsg: 'getPushCid:ok',
+        cid
+      };
+      hasSuccess && success(res);
+    } else {
+      res = {
+        errMsg: 'getPushCid:fail' + (errMsg ? ' ' + errMsg : '')
+      };
+      hasFail && fail(res);
+    }
+    hasComplete && complete(res);
+  });
+  if (typeof cid !== 'undefined') {
+    Promise.resolve().then(() => invokeGetPushCidCallbacks(cid, cidErrMsg));
+  }
+}
+
+const onPushMessageCallbacks = [];
+// 不使用 defineOnApi 实现，是因为 defineOnApi 依赖 UniServiceJSBridge ，该对象目前在小程序上未提供，故简单实现
+const onPushMessage = (fn) => {
+  if (onPushMessageCallbacks.indexOf(fn) === -1) {
+    onPushMessageCallbacks.push(fn);
+  }
+};
+
+const offPushMessage = (fn) => {
+  if (!fn) {
+    onPushMessageCallbacks.length = 0;
+  } else {
+    const index = onPushMessageCallbacks.indexOf(fn);
+    if (index > -1) {
+      onPushMessageCallbacks.splice(index, 1);
+    }
+  }
+};
+
 var api = /*#__PURE__*/Object.freeze({
-  __proto__: null
+  __proto__: null,
+  getPushCid: getPushCid,
+  onPushMessage: onPushMessage,
+  offPushMessage: offPushMessage,
+  invokePushCallback: invokePushCallback
 });
 
 const MPPage = Page;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "2.0.1-alpha-34620220415002",
+  "version": "2.0.1-alpha-34820220426002",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {
@@ -17,5 +17,5 @@
     "name": "quickapp-webview",
     "title": "快应用(Webview)版"
   },
-  "gitHead": "c2c5b0345d72c1cfb51645719ce260a5c1d0d0f7"
+  "gitHead": "a372254d8032fd7d4b9c2bde5dfec0fef7ce0d84"
 }