order 1.1.0; delegate prepare

senecajs · Oct 3, 2016 · a3dc15c · a3dc15c
1 parent c2e3fdd
commit a3dc15c
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 151 deletions.
diff --git a/lib/actions.js b/lib/actions.js
@@ -58,7 +58,8 @@ exports.inward = {
   warnings: inward_warnings,
   msg_meta: inward_msg_meta,
   msg_modify: inward_msg_modify,
-  act_stats: inward_act_stats
+  act_stats: inward_act_stats,
+  prepare_delegate: inward_prepare_delegate
 }
 
 
@@ -329,6 +330,10 @@ function inward_msg_meta (ctxt, data) {
   msg.meta$.action = ctxt.actmeta.id
   msg.meta$.plugin_name = ctxt.actmeta.plugin_name
   msg.meta$.plugin_tag = ctxt.actmeta.plugin_tag
+
+  msg.meta$.prior = msg.meta$.prior || { chain: [], entry: true, depth: 0 }
+  msg.meta$.start = ctxt.start
+  msg.meta$.sync = ctxt.sync
 }
 
 
@@ -341,6 +346,22 @@ function inward_msg_modify (ctxt, data) {
 }
 
 
+function inward_prepare_delegate (ctxt, data) {
+  data.reply = data.reply.bind(ctxt.seneca)
+  data.reply.seneca = ctxt.seneca
+
+  var reply = data.reply
+
+  ctxt.seneca.good = function good (out) {
+    reply(null, out)
+  }
+
+  ctxt.seneca.bad = function bad (err) {
+    reply(err)
+  }
+}
+
+
 function outward_res_object (ctxt, data) {
   var so = ctxt.options
   var msg = data.msg

diff --git a/lib/common.js b/lib/common.js
@@ -360,18 +360,19 @@ exports.console_error = function () {
 
 
 exports.make_standard_act_log_entry = function
-(actmeta, prior_ctxt, callargs, origargs, ctxt) {
-  var transport = origargs.transport$ || {}
-  var callmeta = callargs.meta$ || {}
+(actmeta, msg, origmsg, ctxt) {
+  var transport = origmsg.transport$ || {}
+  var callmeta = msg.meta$ || {}
+  var prior = callmeta.prior || {}
   actmeta = actmeta || {}
 
   return _.extend({
     actid: callmeta.id,
-    msg: callargs,
-    entry: prior_ctxt.entry,
-    prior: prior_ctxt.chain,
-    gate: origargs.gate$,
-    caller: origargs.caller$,
+    msg: msg,
+    entry: prior.entry,
+    prior: prior.chain,
+    gate: origmsg.gate$,
+    caller: origmsg.caller$,
     meta: actmeta,
 
     // these are transitional as need to be updated

diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "minimist": "1.2.0",
     "nid": "0.3.2",
     "norma": "0.3.0",
-    "ordu": "0.0.1",
+    "ordu": "0.1.1",
     "patrun": "0.5.1",
     "rolling-stats": "0.1.1",
     "semver": "5.3.0",