feat: refresh group consumer

Author: runzx

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [1.6.0]
+
+- refresh group and consumer.
+
 ## [1.5.0]
 
 - 增加'Show more ...'功能遍历整个 db 的 stream id keys.

command/index.js

@@ -44,8 +44,13 @@ exports.registers = (context) => {
 
   const virDoc = VirtualDoc.init({ context })
   register('redis-stream.msg.value.refresh', async (opt) => {
-    const { label, id } = opt
+    const { label, id, refresh } = opt
     // log.info('VALUE RELOAD', label, id)
-    virDoc.update(id)
+    await refresh(opt, (item) => {
+      VirtualDoc.setCacheDoc(id, item)
+      virDoc.showDoc(id)
+      virDoc.update(id)
+    })
+
   })
 }

command/redis.js

@@ -82,43 +82,49 @@ class RedisModel {
       res.entries = await stream.xrevrange(streamKey, '+', '-', this.streamIDs[streamKey])
       if (res.groups === 0) res.groups = []
       else {
-        res.groups = await stream.getGroupsInfo(streamKey)
-        res.groups = await Promise.all(res.groups.map(async (i) => {
-          if (i.consumers === 0) i.consumers = []
-          else {
-            let res = await stream.getConsumersInfo(i.name)
-            res = await Promise.all(res.map(async j => {
-              j['pel-count'] = j.pending
-              if (j.pending !== 0) {
-                j.pending = await stream.readPending({
-                  group: i.name, consumer: j.name,
-                  start: '-', end: '+', count: 10,
-                })
-              } else j.pending = []
-              return j
-            }))
-            i.consumers = res
-          }
-          i['pel-count'] = i.pending
-          if (i.pending === 0) i.pending = []
-          else {
-            let res = await stream.readPending({
-              group: i.name,
-              start: '-', end: '+', count: 10,
-            })
-            i.pending = res
-          }
-
-          return i
-        }))
-        // if ()
+        res.groups = await this.getGroupInfo(streamKey, stream)
       }
     } else {
       res.entries = await stream.xrevrange(streamKey, '+', '-', this.streamIDs[streamKey])
     }
     this.streamIDs[streamKey] += SHOW_MORE_COUNT
     return res
   }
+  async getGroupInfo(streamKey, redisStream) {
+    if (!redisStream) redisStream = new RedisStream({ client: this.client, stream: streamKey })
+    const res = await redisStream.getGroupsInfo(streamKey)
+    return Promise.all(res.map(async (i) => {
+      if (i.consumers === 0) i.consumers = []
+      else {
+        i.consumers = await this.getConsumersInfo(i.name, streamKey, redisStream)
+      }
+      i['pel-count'] = i.pending
+      if (i.pending === 0) i.pending = []
+      else {
+        let res = await redisStream.readPending({
+          group: i.name,
+          start: '-', end: '+', count: 10,
+        })
+        i.pending = res
+      }
+
+      return i
+    }))
+  }
+  async getConsumersInfo(group, streamKey, redisStream) {
+    if (!redisStream) redisStream = new RedisStream({ client: this.client, stream: streamKey })
+    const res = await redisStream.getConsumersInfo(group, streamKey)
+    return Promise.all(res.map(async j => {
+      j['pel-count'] = j.pending
+      if (j.pending !== 0) {
+        j.pending = await redisStream.readPending({
+          group, consumer: j.name,
+          start: '-', end: '+', count: 10,
+        })
+      } else j.pending = []
+      return j
+    }))
+  }
   async getInfoById(id, stream) {
     const redis = new RedisStream({ client: this.client, stream })
     const [res] = await redis.xrange(stream, id, '+', 1)

explorer/explorer.js

@@ -48,7 +48,10 @@ class TreeDataProvider {
   }
   // refresh getTreeItem -> getChildren 
   async getTreeItem(element) {
-    element.refresh = (e) => { this.refresh(e) }
+    element.refresh = (e, cb) => {
+      cb && (e.refreshCallBack = cb)
+      this.refresh(e)
+    }
     if (this._getTreeItem) return this._getTreeItem(element)
 
     return element

explorer/node/consumer.js

@@ -36,6 +36,17 @@ class StreamConsumer extends TreeDataItem {
     return [StreamPending.init(data)]
 
   }
+
+  async getTreeItem(parent) {
+    let { host, port, password, db, refreshCallBack, stream, group } = this
+    if (!this.redisModel) {
+      this.redisModel = RedisModel.init({ host, port, password, db })
+    }
+    const [item] = (await this.redisModel.getConsumersInfo(group, stream)).filter(i => i.name === this.label)
+    this.item = item
+    refreshCallBack && refreshCallBack(item)
+    return this
+  }
 }
 
 module.exports = { StreamConsumer }

explorer/node/group.js

@@ -51,6 +51,17 @@ class StreamGroup extends TreeDataItem {
     })]
 
   }
+
+  async getTreeItem(parent) {
+    let { host, port, password, db, refreshCallBack, stream } = this
+    if (!this.redisModel) {
+      this.redisModel = RedisModel.init({ host, port, password, db })
+    }
+    const [item] = (await this.redisModel.getGroupInfo(stream)).filter(i => i.name === this.label)
+    this.item = item
+    refreshCallBack && refreshCallBack(item)
+    return this
+  }
 }
 
 module.exports = { StreamGroup }

lib/util.js

@@ -180,3 +180,12 @@ Date.prototype.format = function (format) {
   })
   return format
 }
+
+exports.toHump = (str, sign = '_') => {
+  const re = new RegExp(`\\${sign}(\\w)`, 'g')
+  return str.replace(re, (match, letter) => letter.toUpperCase())
+}
+
+exports.toLine = (str, sign = '_') => {
+  return str.replace(/([A-Z])/g, `${sign}$1`).toLowerCase()
+}

package.json

@@ -3,7 +3,7 @@
   "publisher": "zhaixiang",
   "displayName": "redis-stream",
   "description": "redis stream explorer",
-  "version": "1.5.7",
+  "version": "1.6.0",
   "homepage": "https://github.com/runzx/redis-stream-vscode/blob/master/README.md",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
     "email": "[email protected]"
   },
   "engines": {
-    "vscode": "^1.51.0"
+    "vscode": "^1.40.0"
   },
   "categories": [
     "Visualization",
@@ -52,7 +52,7 @@
       },
       {
         "command": "redis-stream.msg.value.refresh",
-        "title": "msg reload",
+        "title": "info reload",
         "icon": "image/refresh.png"
       },
       {
@@ -135,6 +135,8 @@
     "vscode-test": "^1.4.1"
   },
   "dependencies": {
-    "ioredis": "^4.19.2"
+    "global": "^4.4.0",
+    "ioredis": "^4.19.2",
+    "vsce": "^1.83.0"
   }
-}
+}