@scion-scxml/express-middleware 1.0.3 → 2.0.1

package/CHANGES

@@ -1,3 +1,7 @@
+== 2.0.0 ==
+
+Modify API handleScxmlEvent to accept kwArgs. Allow handleScxmlEvent to accept an optional executionContext param
+
 == 1.0.3 ==
 
 Fix issue in scion express middleware: on initializing the new session, it was not waiting for the asynchronous database write to finish before calling the callback, so a subsequent event could be processed before the the serialized session was finished writing to the database

package/LICENSE

@@ -0,0 +1 @@
+SCION is composed of a number of sub-modules. Please see the LICENSE file in each module directory for that module's licensing.

package/lib/index.js

@@ -106,16 +106,16 @@ module.exports = function ({
   function doSend(session, event){
     //console.log('session', session)
     const scxmlName = path.basename(session._model.docUrl, '.scxml')
-    handleScxmlEvent(scxmlName, session.opts.sessionid, event, (err, newSnapshot) => {
+    handleScxmlEvent({scxmlName, sessionId: session.opts.sessionid, event, cb: (err, newSnapshot) => {
       if(err) throw err
       console.log('new snapshot for event', JSON.stringify(event,4,4), newSnapshot)
-    })
+    }})
   }
 
   //TODO: use the database as an event queue to support multi-tenancy (horizontal scaling)
-  function handleScxmlEvent(scxmlName, sessionId, evt, cb){
-    //console.log('handleScxmlEvent, scxmlName, sessionId, evt', scxmlName, sessionId, evt)
-    initModelOrFetchFromCache({scxmlName}, (err, fnModel) => {
+  function handleScxmlEvent({scxmlName, sessionId, executionContext, event, cb}){
+    //console.log('handleScxmlEvent, scxmlName, sessionId, event', scxmlName, sessionId, event)
+    initModelOrFetchFromCache({scxmlName, executionContext}, (err, fnModel) => {
       
       if(err) return cb(err)
 
@@ -170,10 +170,10 @@ module.exports = function ({
           //save the snapshot to the database
           const newSnapshot = sc1.getSnapshot()
 
-          cb(null, newSnapshot)
+          if(cb) cb(null, newSnapshot)
         })
 
-        sc1.gen(evt)
+        sc1.gen(event)
       })
     })
   }
@@ -225,7 +225,7 @@ module.exports = function ({
 
 			//read the sessionId
 			// TODO: handle error where sessionId does not exist
-			handleScxmlEvent(scxmlName, sessionId, evt, (err, newSnapshot) => {
+			handleScxmlEvent({scxmlName, sessionId, event, cb: (err, newSnapshot) => {
 
 				if(err) throw err;
 
@@ -233,7 +233,7 @@ module.exports = function ({
 					sessionId,
 					snapshot : newSnapshot
 				})
-			})
+			}})
 
 			//rehydrate the session
 		})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scion-scxml/express-middleware",
-  "version": "1.0.3",
+  "version": "2.0.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -9,13 +9,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@scion-scxml/core": "^2.6.24",
-    "@scion-scxml/dashboard": "^1.0.26",
-    "@scion-scxml/monitor-middleware": "^1.0.21",
-    "@scion-scxml/scxml": "^4.3.27",
+    "@scion-scxml/core": "^2.6.25",
+    "@scion-scxml/dashboard": "^1.0.27",
+    "@scion-scxml/monitor-middleware": "^1.0.22",
+    "@scion-scxml/scxml": "^4.3.28",
     "express": "^4.17.1",
     "mongodb": "^3.6.8",
     "uuid": "^8.3.2"
   },
-  "gitHead": "25f3db4baa9a9aae69b014b07c7533a18b73fc8c"
+  "gitHead": "ce920c0df2cbf1e96b0ebafa658c1019c43f81d7"
 }