wip(push): support path

packages/uni-api/src/service/plugin/push.ts

@@ -54,12 +54,17 @@ export function invokePushCallback(
     cidErrMsg = args.errMsg
     invokeGetPushCidCallbacks(cid, args.errMsg)
   } else if (args.type === 'pushMsg') {
-    onPushMessageCallbacks.forEach((callback) => {
-      callback({
+    for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+      const msg: OnPushMessageSuccess = {
         type: 'receive',
         data: normalizePushMessage(args.message),
-      })
-    })
+      }
+      onPushMessageCallbacks[i](msg)
+      if (msg.stopped) {
+        // 消息被中断，比如页面直达的 push 信息
+        break
+      }
+    }
   } else if (args.type === 'click') {
     onPushMessageCallbacks.forEach((callback) => {
       callback({
@@ -106,6 +111,7 @@ export const getPushClientId = defineAsyncApi(
 interface OnPushMessageSuccess {
   type: 'click' | 'receive'
   data: unknown
+  stopped?: boolean
 }
 
 type OnPushMessageCallback = (result: OnPushMessageSuccess) => void

packages/uni-app-plus/dist/uni.runtime.esm.js

@@ -11096,12 +11096,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {

packages/uni-h5/dist/uni-h5.es.js

@@ -4625,12 +4625,16 @@ function invokePushCallback(args) {
     cidErrMsg = args.errMsg;
     invokeGetPushCidCallbacks(cid, args.errMsg);
   } else if (args.type === "pushMsg") {
-    onPushMessageCallbacks.forEach((callback) => {
-      callback({
+    for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+      const msg = {
         type: "receive",
         data: normalizePushMessage(args.message)
-      });
-    });
+      };
+      onPushMessageCallbacks[i](msg);
+      if (msg.stopped) {
+        break;
+      }
+    }
   } else if (args.type === "click") {
     onPushMessageCallbacks.forEach((callback) => {
       callback({

packages/uni-mp-alipay/dist/uni.api.esm.js

@@ -671,12 +671,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {

packages/uni-mp-baidu/dist/uni.api.esm.js

@@ -671,12 +671,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {

packages/uni-mp-kuaishou/dist/uni.api.esm.js

@@ -671,12 +671,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {

packages/uni-mp-lark/dist/uni.api.esm.js

@@ -671,12 +671,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {

packages/uni-mp-qq/dist/uni.api.esm.js

@@ -671,12 +671,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {

packages/uni-mp-toutiao/dist/uni.api.esm.js

@@ -671,12 +671,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {

packages/uni-mp-weixin/dist/uni.api.esm.js

@@ -635,12 +635,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {

packages/uni-push/dist/uni-push.es.js

@@ -100,6 +100,41 @@ e?.onClose(t);
 
 var GtPush = /*@__PURE__*/getDefaultExportFromCjs(gtpushMin);
 
+function initPushRoute() {
+    // @ts-expect-error
+    uni.onPushMessage((res) => {
+        if (res.data && res.data.path) {
+            if (res.type === 'click') {
+                const url = res.data.path;
+                // 优先使用 navigateTo
+                uni.navigateTo({
+                    url,
+                    fail(result) {
+                        // 说明是 tabBar 页面，必须使用 switchTab
+                        if (result.errMsg.indexOf('tabbar')) {
+                            uni.switchTab({
+                                url,
+                            });
+                        }
+                    },
+                });
+            }
+            else if (res.type === 'receive') {
+                // 仅 App 端
+                if (typeof plus !== 'undefined' && plus.push) {
+                    // 创建通知栏，并屏蔽消息的继续传递
+                    plus.push.createMessage(res.data.content, JSON.stringify(res.data.payload), {
+                        title: res.data.title,
+                        path: res.data.path,
+                    });
+                    // 内部属性，停止传播
+                    res.stopped = true;
+                }
+            }
+        }
+    });
+}
+
 // if (process.env.UNI_PUSH_DEBUG) {
 //   GtPush.setDebugMode(true)
 // }
@@ -152,4 +187,15 @@ else {
             });
         },
     });
+    initPushRoute();
+    // 不用条件编译。App端仍需监听
+    if (typeof plus !== 'undefined' && plus.push) {
+        plus.push.addEventListener('click', (result) => {
+            // @ts-expect-error
+            uni.invokePushCallback({
+                type: 'click',
+                message: result,
+            });
+        });
+    }
 }

packages/uni-push/dist/uni-push.plus.es.js

+function initPushRoute() {
+    // @ts-expect-error
+    uni.onPushMessage((res) => {
+        if (res.data && res.data.path) {
+            if (res.type === 'click') {
+                const url = res.data.path;
+                // 优先使用 navigateTo
+                uni.navigateTo({
+                    url,
+                    fail(result) {
+                        // 说明是 tabBar 页面，必须使用 switchTab
+                        if (result.errMsg.indexOf('tabbar')) {
+                            uni.switchTab({
+                                url,
+                            });
+                        }
+                    },
+                });
+            }
+            else if (res.type === 'receive') {
+                // 仅 App 端
+                if (typeof plus !== 'undefined' && plus.push) {
+                    // 创建通知栏，并屏蔽消息的继续传递
+                    plus.push.createMessage(res.data.content, JSON.stringify(res.data.payload), {
+                        title: res.data.title,
+                        path: res.data.path,
+                    });
+                    // 内部属性，停止传播
+                    res.stopped = true;
+                }
+            }
+        }
+    });
+}
+
 // @ts-expect-error
 uni.invokePushCallback({
     type: 'enabled',
 });
+initPushRoute();
 Promise.resolve().then(() => {
     plus.push.setAutoNotification && plus.push.setAutoNotification(false);
     const info = plus.push.getClientInfo();

packages/uni-push/src/index.ts

 import GtPush from '../lib/gtpush-min'
+import { initPushRoute } from './route'
 
 // if (process.env.UNI_PUSH_DEBUG) {
 //   GtPush.setDebugMode(true)
@@ -53,4 +54,15 @@ if (!appid) {
       })
     },
   })
+  initPushRoute()
+  // 不用条件编译。App端仍需监听
+  if (typeof plus !== 'undefined' && plus.push) {
+    plus.push.addEventListener('click', (result) => {
+      // @ts-expect-error
+      uni.invokePushCallback({
+        type: 'click',
+        message: result,
+      })
+    })
+  }
 }

packages/uni-push/src/plus.ts

+import { initPushRoute } from './route'
+
 // @ts-expect-error
 uni.invokePushCallback({
   type: 'enabled',
 })
+initPushRoute()
 Promise.resolve().then(() => {
   plus.push.setAutoNotification && plus.push.setAutoNotification(false)
   const info = plus.push.getClientInfo()

packages/uni-push/src/route.ts

+interface OnPushMessageSuccess {
+  type: 'click' | 'receive'
+  data: {
+    title: string
+    content: string
+    payload: unknown
+    forceNotification?: boolean
+    path?: string
+  }
+  stopped?: boolean
+}
+export function initPushRoute() {
+  // @ts-expect-error
+  uni.onPushMessage((res: OnPushMessageSuccess) => {
+    if (res.data && res.data.path) {
+      if (res.type === 'click') {
+        const url = res.data.path
+        // 优先使用 navigateTo
+        uni.navigateTo({
+          url,
+          fail(result) {
+            // 说明是 tabBar 页面，必须使用 switchTab
+            if (result.errMsg.indexOf('tabbar')) {
+              uni.switchTab({
+                url,
+              })
+            }
+          },
+        })
+      } else if (res.type === 'receive') {
+        // 仅 App 端
+        if (typeof plus !== 'undefined' && plus.push) {
+          // 创建通知栏，并屏蔽消息的继续传递
+          plus.push.createMessage(
+            res.data.content,
+            JSON.stringify(res.data.payload),
+            {
+              title: res.data.title,
+              path: res.data.path,
+            } as any
+          )
+          // 内部属性，停止传播
+          res.stopped = true
+        }
+      }
+    }
+  })
+}

packages/uni-quickapp-webview/dist/uni.api.esm.js

@@ -671,12 +671,17 @@ function invokePushCallback(args) {
         invokeGetPushCidCallbacks(cid, args.errMsg);
     }
     else if (args.type === 'pushMsg') {
-        onPushMessageCallbacks.forEach((callback) => {
-            callback({
+        for (let i = 0; i < onPushMessageCallbacks.length; i++) {
+            const msg = {
                 type: 'receive',
                 data: normalizePushMessage(args.message),
-            });
-        });
+            };
+            onPushMessageCallbacks[i](msg);
+            if (msg.stopped) {
+                // 消息被中断，比如页面直达的 push 信息
+                break;
+            }
+        }
     }
     else if (args.type === 'click') {
         onPushMessageCallbacks.forEach((callback) => {