@data-fair/lib-node 2.2.0 → 2.2.2

package/events-queue.js

@@ -28,13 +28,9 @@ export class EventsQueue {
   async loop () {
     while (!this.stopped) {
       await new Promise(resolve => setTimeout(resolve, 3000))
-      try {
-        this.currentDrainPromise = this.drain()
-        await this.currentDrainPromise
-        this.currentDrainPromise = undefined
-      } catch (err) {
-        internalError('events-queue-drain', err)
-      }
+      this.currentDrainPromise = this.drain()
+      await this.currentDrainPromise
+      this.currentDrainPromise = undefined
     }
   }
 
@@ -43,14 +39,28 @@ export class EventsQueue {
       const events = this.eventsQueue
       this.eventsQueue = []
       debug('drain events', events.length)
-      await axios.post(this.options().eventsUrl + '/api/events', events, { headers: { 'x-secret-key': this.options().eventsSecret } })
+      try {
+        await axios.post(this.options().eventsUrl + '/api/events', events, { headers: { 'x-secret-key': this.options().eventsSecret } })
+      } catch (err) {
+        internalError('events-queue-push-event', err)
+        // retry later
+        if (err.status >= 500 && events.length < 1000) { this.eventsQueue = events.concat(this.eventsQueue) }
+      }
     }
     if (this.notificationsQueue.length) {
       const notifications = this.notificationsQueue
       this.notificationsQueue = []
       debug('drain notifications', notifications.length)
       for (const notification of notifications) {
-        await axios.post(this.options().eventsUrl + '/api/notifications', notification, { headers: { 'x-secret-key': this.options().eventsSecret } })
+        try {
+          await axios.post(this.options().eventsUrl + '/api/notifications', notification, { headers: { 'x-secret-key': this.options().eventsSecret } })
+        } catch (err) {
+          internalError('events-queue-push-notif', err)
+          // retry later
+          if (err.status >= 500 && (notifications.length + this.notificationsQueue.length) < 1000) {
+            this.notificationsQueue.unshift()
+          }
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-node",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Small nodejs related utility functions for the data-fair stack.",
   "main": "index.js",
   "files": [

package/test-spies.js

@@ -2,11 +2,18 @@ import { register } from 'node:module'
 export function registerModuleHooks () {
   register('@data-fair/lib-node/test-module-hooks.js', { parentURL: import.meta.url })
 }
+const { stackTraceLimit } = Error
 const pendingPromises = {}
 let i = 0
 export function waitFor (eventName, timeout = 2000) {
   i++
   const id = i
+  // better stack traces
+  // see https://github.com/axios/axios/issues/2387#issuecomment-652242713
+  Error.stackTraceLimit = 0
+  const timeoutError = new Error(`Timeout waiting for test spy ${eventName}`)
+  Error.stackTraceLimit = stackTraceLimit
+  Error.captureStackTrace(timeoutError, waitFor)
   const p = new Promise((resolve, reject) => {
     pendingPromises[eventName] = pendingPromises[eventName] ?? []
     pendingPromises[eventName].push({ resolve, id })