integreat 0.7.36 → 0.7.37

package/lib/dispatch.js

@@ -1,7 +1,13 @@
 const debug = require('debug')('great')
+const PProgress = require('p-progress')
 const setupGetService = require('./utils/getService')
 
-const compose = (...fns) => fns.reduce((f, g) => (...args) => f(g(...args)))
+const compose = (...fns) =>
+  fns.reduce(
+    (f, g) =>
+      (...args) =>
+        f(g(...args))
+  )
 
 const handleAction = (action, resources, actionHandlers) => {
   if (action) {
@@ -13,7 +19,7 @@ const handleAction = (action, resources, actionHandlers) => {
     }
   }
 
-  return { status: 'noaction' }
+  return PProgress.resolve({ status: 'noaction' })
 }
 
 /**
@@ -22,26 +28,44 @@ const handleAction = (action, resources, actionHandlers) => {
  * @param {Object} resources - Object with actions, schemas, services, and middlewares
  * @returns {function} Dispatch function, accepting an action as only argument
  */
-function setupDispatch ({ actions: actionHandlers = {}, schemas = {}, services = {}, middlewares = [], identOptions = {} }) {
+function setupDispatch({
+  actions: actionHandlers = {},
+  schemas = {},
+  services = {},
+  middlewares = [],
+  identOptions = {},
+}) {
   const getService = setupGetService(schemas, services)
+  const middlewareFn =
+    middlewares.length > 0
+      ? compose(...middlewares)
+      : (next) => async (action) => next(action)
 
-  let dispatch = async (action) => {
-    debug('Dispatch: %o', action)
-    return handleAction(
-      action,
-      {
-        schemas,
-        services,
-        dispatch,
-        identOptions,
-        getService
-      },
-      actionHandlers
-    )
-  }
+  const dispatch = (action) => {
+    return new PProgress(async (resolve, reject, setProgress) => {
+      debug('Dispatch: %o', action)
 
-  if (middlewares.length > 0) {
-    dispatch = compose(...middlewares)(dispatch)
+      try {
+        resolve(
+          middlewareFn((action) =>
+            handleAction(
+              action,
+              {
+                schemas,
+                services,
+                dispatch,
+                identOptions,
+                getService,
+                setProgress,
+              },
+              actionHandlers
+            )
+          )(action)
+        )
+      } catch (err) {
+        reject(err)
+      }
+    })
   }
 
   return dispatch

package/lib/integreat.js

@@ -5,7 +5,7 @@ const setupMapping = require('./mapping')
 const setupDispatch = require('./dispatch')
 const builtinActions = require('./actions')
 
-const version = '0.7.36'
+const version = '0.7.37'
 
 /**
  * Return an Integreat instance with a dispatch method.

package/lib/queue/enqueue.js

@@ -3,30 +3,41 @@ const createError = require('../utils/createError')
 
 const prepareMetaForQueue = ({ queue, ...rest }) => ({
   ...rest,
-  queuedAt: Date.now()
+  queuedAt: Date.now(),
 })
 
 const prepareForQueue = (action) => ({
   ...action,
-  meta: prepareMetaForQueue(action.meta)
+  meta: prepareMetaForQueue(action.meta),
 })
 
 const enqueue = async (queue, action) => {
   const { meta } = action
   const queuedAction = prepareForQueue(action)
-  const timestamp = (typeof meta.queue === 'boolean') ? null : meta.queue
+  const timestamp = typeof meta.queue === 'boolean' ? null : meta.queue
   const actionId = meta.id || null
 
   let id
   try {
     id = await queue.push(queuedAction, timestamp, actionId)
   } catch (error) {
-    debug('Error from queue when pushing %o with timestamp %s. Error: %s', queuedAction, timestamp, error)
+    debug(
+      'Error from queue when pushing %o with timestamp %s. Error: %s',
+      queuedAction,
+      timestamp,
+      error
+    )
     return createError(`Could not push to queue. ${error}`)
   }
 
-  debug('Pushed to queue with timestamp %s and id \'%s\': %o', timestamp, id, queuedAction)
-  return { status: 'queued', data: { id } }
+  debug(
+    "Pushed to queue with timestamp %s and id '%s': %o",
+    timestamp,
+    id,
+    queuedAction
+  )
+  const queuedStatus = action.meta.queuedStatus || 'queued'
+  return { status: queuedStatus, data: { id } }
 }
 
 module.exports = enqueue

package/lib/queue/middleware.js

@@ -17,12 +17,15 @@ const enqueueNext = (queue, action) => {
   const nextTime = getNextTime(action)
 
   if (nextTime) {
-    const nextAction = { ...action, meta: { ...action.meta, queue: nextTime.getTime() } }
+    const nextAction = {
+      ...action,
+      meta: { ...action.meta, queue: nextTime.getTime() },
+    }
     return enqueue(queue, nextAction)
   }
 }
 
-function middleware (next, queue) {
+function middleware(next, queue) {
   return async (action) => {
     if (action.meta && action.meta.queue) {
       return enqueue(queue, action)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "integreat",
-  "version": "0.7.36",
+  "version": "0.7.37",
   "description": "Node.js integration layer",
   "author": "Kjell-Morten Bratsberg Thorsen <post@kjellmorten.no> (http://kjellmorten.no/)",
   "license": "ISC",
@@ -46,12 +46,13 @@
   },
   "dependencies": {
     "@sindresorhus/is": "^1.2.0",
-    "debug": "^4.3.2",
+    "debug": "^4.3.3",
     "got": "^9.6.0",
     "later": "^1.2.0",
     "map-any": "^0.2.1",
     "map-transform": "^0.3.12",
     "p-limit": "^2.3.0",
+    "p-progress": "^0.5.1",
     "ramda": "^0.27.1",
     "uuid": "^3.4.0"
   },
@@ -61,9 +62,9 @@
     "coveralls": "^3.1.1",
     "dotenv": "^10.0.0",
     "integreat-adapter-json": "^0.2.1",
-    "nock": "^13.1.2",
+    "nock": "^13.2.1",
     "nyc": "^15.1.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.5.1",
     "sinon": "^11.1.2"
   }
 }