fix: generate unique client id (#423)

saberland · Sep 8, 2019 · cf85e81 · cf85e81
1 parent d9b86ae
commit cf85e81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/packages/saber/vue-renderer/app/dev-client.js b/packages/saber/vue-renderer/app/dev-client.js
@@ -1,8 +1,12 @@
 import client from 'webpack-hot-middleware/client'
 
 export const init = ({ router }) => {
+  window.__SABER_DEV_CLIENT_ID__ = Math.random()
+    .toString(36)
+    .substring(7)
+
   client.subscribe(obj => {
-    if (obj.action === 'router:push') {
+    if (obj.action === 'router:push' && obj.id === __SABER_DEV_CLIENT_ID__) {
       if (obj.error) {
         console.error(`You need to refresh the page when the error is fixed!`)
       }

diff --git a/packages/saber/vue-renderer/app/router.js b/packages/saber/vue-renderer/app/router.js
@@ -96,7 +96,7 @@ export default () => {
       next(false)
 
       visitedRoutes[to.path] = true
-      fetch('/_saber/visit-page?route=' + encodeURIComponent(to.fullPath))
+      fetch(`/_saber/visit-page?id=${window.__SABER_DEV_CLIENT_ID__}&route=${encodeURIComponent(to.fullPath)}`)
     })
 
     router.afterEach(() => {

diff --git a/packages/saber/vue-renderer/lib/index.js b/packages/saber/vue-renderer/lib/index.js
@@ -432,13 +432,18 @@ class VueRenderer {
       res.end()
 
       if (this.builtRoutes.has(pathname)) {
-        hotMiddleware.publish({ action: 'router:push', route: fullPath })
+        hotMiddleware.publish({
+          action: 'router:push',
+          route: fullPath,
+          id: req.query.id
+        })
       } else {
         event.once('done', error => {
           this.builtRoutes.add(pathname)
           hotMiddleware.publish({
             action: 'router:push',
             route: fullPath,
+            id: req.query.id,
             error
           })
         })