@juzi/wechaty 1.0.57 → 1.0.59

package/src/user-modules/tag.ts

@@ -77,28 +77,41 @@ class TagMixin extends MixinBase {
   static async list (): Promise<TagInterface[]> {
     log.verbose('Tag', 'list()')
 
-    try {
-      const tagIdList = await this.wechaty.puppet.tagTagList()
-
-      const idToTag = async (id: string) => this.find({ id }).catch(e => this.wechaty.emitError(e))
-
-      const CONCURRENCY = 17
-      const tagIterator = concurrencyExecuter(CONCURRENCY)(idToTag)(tagIdList)
-
-      const tagList: TagInterface[] = []
-      for await (const tag of tagIterator) {
-        if (tag) {
-          tagList.push(tag)
-        }
+    const tagIdList = await this.wechaty.puppet.tagTagList()
+
+    let continuousErrorCount = 0
+    let totalErrorCount = 0
+    const totalErrorThreshold = Math.round(tagIdList.length / 5)
+    const idToTag = async (id: string) => {
+      if (!this.wechaty.isLoggedIn) {
+        throw new Error('wechaty not logged in')
       }
+      const result = this.find({ id }).catch(e => {
+        this.wechaty.emitError(e)
+        continuousErrorCount++
+        totalErrorCount++
+        if (continuousErrorCount > 5) {
+          throw new Error('5 continuous errors!')
+        }
+        if (totalErrorCount > totalErrorThreshold) {
+          throw new Error(`${totalErrorThreshold} total errors!`)
+        }
+      })
+      continuousErrorCount = 0
+      return result
+    }
 
-      return tagList
+    const CONCURRENCY = 17
+    const tagIterator = concurrencyExecuter(CONCURRENCY)(idToTag)(tagIdList)
 
-    } catch (e) {
-      this.wechaty.emitError(e)
-      log.error('Tag', 'list() exception: %s', (e as Error).message)
-      return []
+    const tagList: TagInterface[] = []
+    for await (const tag of tagIterator) {
+      if (tag) {
+        tagList.push(tag)
+      }
     }
+
+    return tagList
   }
 
   static async find (filter: TagQueryFilter): Promise<TagInterface | undefined> {