update eraro; sub priors

senecajs · Jan 16, 2020 · f8b1f2e · f8b1f2e
1 parent 845424f
commit f8b1f2e
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 24 deletions.
diff --git a/lib/inward.js b/lib/inward.js
@@ -333,7 +333,14 @@ function inward_prepare_delegate(ctxt, data) {
 }
 
 function inward_sub(ctxt, data) {
+  var meta = data.meta
   var private$ = ctxt.seneca.private$
+
+  // Only entry msg of prior chain is published
+  if (meta.prior) {
+    return
+  }
+
   var submsg = ctxt.seneca.util.clean(data.msg)
 
   // Find all subscription matches, even partial.

diff --git a/lib/outward.js b/lib/outward.js
@@ -231,9 +231,16 @@ function outward_res_entity(ctxt, data) {
 
 
 function outward_sub(ctxt, data) {
+  var meta = data.meta
   var private$ = ctxt.seneca.private$
-  var submsg = ctxt.seneca.util.clean(data.msg)
 
+  // Only entry msg of prior chain is published
+  if (meta.prior) {
+    return
+  }
+
+  var submsg = ctxt.seneca.util.clean(data.msg)
+
   // Find all subscription matches, even partial.
   // Example: a:1,b:2 matches subs for a:1; a:1,b:1; b:1
   var sub_actions_list = private$.subrouter.outward.find(submsg, false, true)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -82,7 +82,7 @@
   "dependencies": {
     "@hapi/joi": "^15.1.1",
     "@hapi/wreck": "^17.0.0",
-    "eraro": "^2.0.0",
+    "eraro": "^2.1.0",
     "fast-safe-stringify": "^2.0.7",
     "gate-executor": "^2.1.0",
     "gex": "^1.0.0",

diff --git a/test/sub.test.js b/test/sub.test.js
@@ -390,29 +390,40 @@ describe('sub', function() {
     })
   })
 
-  /*
+
   it('sub-prior', function(fin) {
     var log = []
     var si = Seneca()
-      .test(fin)
-      .add('a:1')
-      .add('a:1', function(msg, reply, meta) {
-        this.prior(msg, reply)
-      })
-      .sub('a:1', function(msg, out, meta) {
-        //console.log('SUBCALL',msg,meta)
-        log.push(meta && meta.pattern)
-      })
-      .act('a:1')
-      .ready(function() {
-        // only entry msg of prior chain is published
-        expect(log).equal(['a:1'])
-        //console.log(log)
-        fin()
-      })
-  })
+        .test(fin)
+        .add('a:1')
+        .add('a:1', function(msg, reply, meta) {
+          this.prior(msg, reply)
+        })
+        .sub('a:1', function(msg, out, meta) {
+          //console.log('SUBCALL',msg,meta)
+          log.push(meta && meta.pattern)
+        })
+        .act('a:1')
+
+        .add('b:1')
+        .add('b:1', function(msg, reply, meta) {
+          this.prior(msg, reply)
+        })
+        .sub('b:1,out$:true', function(msg, out, meta) {
+          //console.log('SUBCALL',msg,meta)
+          log.push(meta && meta.pattern)
+        })
+        .act('b:1')
 
 
+        .ready(function() {
+          // only entry msg of prior chain is published
+          expect(log).equal(['a:1','b:1'])
+          //console.log(log)
+          fin()
+        })
+  })
+
   it('sub-close', function(fin) {
     var tmp = {}
     Seneca()
@@ -425,5 +436,4 @@ describe('sub', function() {
         fin()
       })
   })
-*/
 })