@superhero/eventflow-spoke 4.0.3 → 4.0.5

package/index.js

@@ -284,27 +284,56 @@ export default class Spoke
 
     return new Promise(async (accept, reject) =>
     {
-      const waitTimeout = setTimeout(() =>
+      const timeoutId = setTimeout(() =>
       {
-        const error = new Error(`wait timed out (${timeout}) for ${domain} › ${pid} › ${eventNames.join(' | ')}`)
-        error.code  = 'E_EVENTFLOW_WAIT_TIMEOUT'
-        reject(error)
+        unsubscribe().catch(reject).then(() => 
+        {
+          const error = new Error(`wait timed out (${timeout}) for ${domain} › ${pid} › ${eventNames.join(' | ')}`)
+          error.code  = 'E_EVENTFLOW_WAIT_TIMEOUT'
+          reject(error)
+        })
       }, timeout)
 
-      const subscriber = (event) =>
-      {
-        if(event.pid === pid)
+      const
+        unsubscribe = async () => 
         {
-          Promise.allSettled(eventNames.map((name) => this.unsubscribe(domain, name, subscriber)))
-            .then(() => 
-            {
-              clearTimeout(waitTimeout)
-              accept(event)
-            })
+          const 
+            unsubscribers = eventNames.map((name) => this.unsubscribe(domain, name, subscriber)),
+            results       = await Promise.allSettled(unsubscribers),
+            rejections    = results.filter((result) => 'rejected' === result.status)
+
+          if(rejections.length)
+          {
+            const error = new Error(`unsubscribe failed: ${domain} › ${pid} › ${eventNames.join(' | ')}`)
+            error.code  = 'E_EVENTFLOW_WAIT_UNSUBSCRIBE_FAILED'
+            error.cause = rejections.map((result) => result.reason)
+            throw error
+          }
+        },
+        subscriber = async (event) =>
+        {
+          if(event.pid === pid)
+          {
+            clearTimeout(timeoutId)
+            await unsubscribe().catch(reject)
+            accept(event)
+          }
         }
-      }
 
-      await Promise.allSettled(eventNames.map((name) => this.subscribe(domain, name, subscriber)))
+      const
+        subscribers = eventNames.map((name) => this.subscribe(domain, name, subscriber)),
+        results     = await Promise.allSettled(subscribers),
+        rejections  = results.filter((result) => 'rejected' === result.status)
+
+      if(rejections.length)
+      {
+        clearTimeout(timeoutId)
+        await unsubscribe().catch(reject)
+        const error = new Error(`subscribe failed: ${domain} › ${pid} › ${eventNames.join(' | ')}`)
+        error.code  = 'E_EVENTFLOW_WAIT_SUBSCRIBE_FAILED'
+        error.cause = rejections.map((result) => result.reason)
+        reject(error)
+      }
     })
   }
 
@@ -377,6 +406,11 @@ export default class Spoke
     return await this.db.readEventsByDomainAndPid(domain, pid)
   }
 
+  async readEventlogByTimestamp(domain, pid, timestampMin, timestampMax)
+  {
+    return await this.db.readEventsByDomainAndPidBetweenTimestamps(domain, pid, timestampMin, timestampMax)
+  }
+
   async readEventlogFilteredByNames(domain, pid, names)
   {
     return await this.db.readEventsByDomainAndPidAndNames(domain, pid, names)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/eventflow-spoke",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "Eventflow spoke is the client component in the eventflow ecosystem.",
   "keywords": [
     "eventflow",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@superhero/deep": "^4.2.0",
     "@superhero/eventflow-certificates": "^4.0.5",
-    "@superhero/eventflow-db": "^4.2.2",
+    "@superhero/eventflow-db": "^4.2.3",
     "@superhero/id-name-generator": "^4.0.0",
     "@superhero/log": "^4.0.1",
     "@superhero/tcp-record-channel": "^4.2.1"