@dcloudio/uni-mp-toutiao 3.0.0-alpha-3050020220622001 → 3.0.0-alpha-3050020220622002

package/dist/uni.api.esm.js

@@ -1,6 +1,6 @@
-import { isArray, hasOwn, isString, isPlainObject, isObject, capitalize, toRawType, makeMap, isFunction, isPromise, remove, extend } from '@vue/shared';
+import { isArray, hasOwn, isString, isPlainObject, isObject, capitalize, toRawType, makeMap, isFunction, isPromise, extend, remove } from '@vue/shared';
 import { normalizeLocale, LOCALE_EN } from '@dcloudio/uni-i18n';
-import { Emitter, onCreateVueApp, invokeCreateVueAppHook } from '@dcloudio/uni-shared';
+import { LINEFEED, Emitter, onCreateVueApp, invokeCreateVueAppHook } from '@dcloudio/uni-shared';
 
 const eventChannels = {};
 const eventChannelStack = [];
@@ -190,6 +190,32 @@ function tryCatch(fn) {
     };
 }
 
+let invokeCallbackId = 1;
+const invokeCallbacks = {};
+function addInvokeCallback(id, name, callback, keepAlive = false) {
+    invokeCallbacks[id] = {
+        name,
+        keepAlive,
+        callback,
+    };
+    return id;
+}
+// onNativeEventReceive((event,data)=>{}) 需要两个参数，目前写死最多两个参数
+function invokeCallback(id, res, extras) {
+    if (typeof id === 'number') {
+        const opts = invokeCallbacks[id];
+        if (opts) {
+            if (!opts.keepAlive) {
+                delete invokeCallbacks[id];
+            }
+            return opts.callback(res, extras);
+        }
+    }
+    return res;
+}
+const API_SUCCESS = 'success';
+const API_FAIL = 'fail';
+const API_COMPLETE = 'complete';
 function getApiCallbacks(args) {
     const apiCallbacks = {};
     for (const name in args) {
@@ -200,6 +226,36 @@ function getApiCallbacks(args) {
         }
     }
     return apiCallbacks;
+}
+function normalizeErrMsg$1(errMsg, name) {
+    if (!errMsg || errMsg.indexOf(':fail') === -1) {
+        return name + ':ok';
+    }
+    return name + errMsg.substring(errMsg.indexOf(':fail'));
+}
+function createAsyncApiCallback(name, args = {}, { beforeAll, beforeSuccess } = {}) {
+    if (!isPlainObject(args)) {
+        args = {};
+    }
+    const { success, fail, complete } = getApiCallbacks(args);
+    const hasSuccess = isFunction(success);
+    const hasFail = isFunction(fail);
+    const hasComplete = isFunction(complete);
+    const callbackId = invokeCallbackId++;
+    addInvokeCallback(callbackId, name, (res) => {
+        res = res || {};
+        res.errMsg = normalizeErrMsg$1(res.errMsg, name);
+        isFunction(beforeAll) && beforeAll(res);
+        if (res.errMsg === name + ':ok') {
+            isFunction(beforeSuccess) && beforeSuccess(res, args);
+            hasSuccess && success(res);
+        }
+        else {
+            hasFail && fail(res);
+        }
+        hasComplete && complete(res);
+    });
+    return callbackId;
 }
 
 const HOOK_SUCCESS = 'success';
@@ -301,6 +357,13 @@ function invokeApi(method, api, options, params) {
     return api(options, ...params);
 }
 
+function hasCallback(args) {
+    if (isPlainObject(args) &&
+        [API_SUCCESS, API_FAIL, API_COMPLETE].find((cb) => isFunction(args[cb]))) {
+        return true;
+    }
+    return false;
+}
 function handlePromise(promise) {
     // if (__UNI_FEATURE_PROMISE__) {
     //   return promise
@@ -310,6 +373,16 @@ function handlePromise(promise) {
     //     .catch((err) => [err])
     // }
     return promise;
+}
+function promisify$1(name, fn) {
+    return (args = {}, ...rest) => {
+        if (hasCallback(args)) {
+            return wrapperReturnValue(name, invokeApi(name, fn, args, rest));
+        }
+        return wrapperReturnValue(name, handlePromise(new Promise((resolve, reject) => {
+            invokeApi(name, fn, extend(args, { success: resolve, fail: reject }), rest);
+        })));
+    };
 }
 
 function formatApiArgs(args, options) {
@@ -337,6 +410,12 @@ function formatApiArgs(args, options) {
         }
     }
 }
+function invokeSuccess(id, name, res) {
+    return invokeCallback(id, extend(res || {}, { errMsg: name + ':ok' }));
+}
+function invokeFail(id, name, errMsg, errRes) {
+    return invokeCallback(id, extend({ errMsg: name + ':fail' + (errMsg ? ' ' + errMsg : '') }, errRes));
+}
 function beforeInvokeApi(name, args, protocol, options) {
     if ((process.env.NODE_ENV !== 'production')) {
         validateProtocols(name, args, protocol);
@@ -352,6 +431,29 @@ function beforeInvokeApi(name, args, protocol, options) {
         return errMsg;
     }
 }
+function normalizeErrMsg(errMsg) {
+    if (!errMsg || isString(errMsg)) {
+        return errMsg;
+    }
+    if (errMsg.stack) {
+        console.error(errMsg.message + LINEFEED + errMsg.stack);
+        return errMsg.message;
+    }
+    return errMsg;
+}
+function wrapperTaskApi(name, fn, protocol, options) {
+    return (args) => {
+        const id = createAsyncApiCallback(name, args, options);
+        const errMsg = beforeInvokeApi(name, [args], protocol, options);
+        if (errMsg) {
+            return invokeFail(id, name, errMsg);
+        }
+        return fn(args, {
+            resolve: (res) => invokeSuccess(id, name, res),
+            reject: (errMsg, errRes) => invokeFail(id, name, normalizeErrMsg(errMsg), errRes),
+        });
+    };
+}
 function wrapperSyncApi(name, fn, protocol, options) {
     return (...args) => {
         const errMsg = beforeInvokeApi(name, args, protocol, options);
@@ -361,8 +463,14 @@ function wrapperSyncApi(name, fn, protocol, options) {
         return fn.apply(null, args);
     };
 }
+function wrapperAsyncApi(name, fn, protocol, options) {
+    return wrapperTaskApi(name, fn, protocol, options);
+}
 function defineSyncApi(name, fn, protocol, options) {
     return wrapperSyncApi(name, fn, (process.env.NODE_ENV !== 'production') ? protocol : undefined, options);
+}
+function defineAsyncApi(name, fn, protocol, options) {
+    return promisify$1(name, wrapperAsyncApi(name, fn, (process.env.NODE_ENV !== 'production') ? protocol : undefined, options));
 }
 
 const API_UPX2PX = 'upx2px';
@@ -541,6 +649,7 @@ const $emit = defineSyncApi(API_EMIT, (name, ...args) => {
 
 let cid;
 let cidErrMsg;
+let enabled;
 function normalizePushMessage(message) {
     try {
         return JSON.parse(message);
@@ -553,7 +662,10 @@ function normalizePushMessage(message) {
  * @param args
  */
 function invokePushCallback(args) {
-    if (args.type === 'clientId') {
+    if (args.type === 'enabled') {
+        enabled = true;
+    }
+    else if (args.type === 'clientId') {
         cid = args.cid;
         cidErrMsg = args.errMsg;
         invokeGetPushCidCallbacks(cid, args.errMsg);
@@ -582,30 +694,27 @@ function invokeGetPushCidCallbacks(cid, errMsg) {
     });
     getPushCidCallbacks.length = 0;
 }
-function getPushClientId(args) {
-    if (!isPlainObject(args)) {
-        args = {};
-    }
-    const { success, fail, complete } = getApiCallbacks(args);
-    const hasSuccess = isFunction(success);
-    const hasFail = isFunction(fail);
-    const hasComplete = isFunction(complete);
-    getPushCidCallbacks.push((cid, errMsg) => {
-        let res;
-        if (cid) {
-            res = { errMsg: 'getPushClientId:ok', cid };
-            hasSuccess && success(res);
+const API_GET_PUSH_CLIENT_ID = 'getPushClientId';
+const getPushClientId = defineAsyncApi(API_GET_PUSH_CLIENT_ID, (_, { resolve, reject }) => {
+    Promise.resolve().then(() => {
+        if (typeof enabled === 'undefined') {
+            enabled = false;
+            cid = '';
+            cidErrMsg = 'unipush is not enabled';
         }
-        else {
-            res = { errMsg: 'getPushClientId:fail' + (errMsg ? ' ' + errMsg : '') };
-            hasFail && fail(res);
+        getPushCidCallbacks.push((cid, errMsg) => {
+            if (cid) {
+                resolve({ cid });
+            }
+            else {
+                reject(errMsg);
+            }
+        });
+        if (typeof cid !== 'undefined') {
+            invokeGetPushCidCallbacks(cid, cidErrMsg);
         }
-        hasComplete && complete(res);
     });
-    if (typeof cid !== 'undefined') {
-        Promise.resolve().then(() => invokeGetPushCidCallbacks(cid, cidErrMsg));
-    }
-}
+});
 const onPushMessageCallbacks = [];
 // 不使用 defineOnApi 实现，是因为 defineOnApi 依赖 UniServiceJSBridge ，该对象目前在小程序上未提供，故简单实现
 const onPushMessage = (fn) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "3.0.0-alpha-3050020220622001",
+  "version": "3.0.0-alpha-3050020220622002",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {
@@ -22,11 +22,11 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3050020220622001",
-    "@dcloudio/uni-mp-compiler": "3.0.0-alpha-3050020220622001",
-    "@dcloudio/uni-mp-vite": "3.0.0-alpha-3050020220622001",
-    "@dcloudio/uni-mp-vue": "3.0.0-alpha-3050020220622001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3050020220622001",
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3050020220622002",
+    "@dcloudio/uni-mp-compiler": "3.0.0-alpha-3050020220622002",
+    "@dcloudio/uni-mp-vite": "3.0.0-alpha-3050020220622002",
+    "@dcloudio/uni-mp-vue": "3.0.0-alpha-3050020220622002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3050020220622002",
     "@vue/shared": "3.2.37",
     "@vue/compiler-core": "3.2.37"
   }