add Context reference to returned Promise

moleculerjs · Apr 20, 2017 · 6527ed9 · 6527ed9
1 parent 7aec6ae
commit 6527ed9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -43,7 +43,7 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Launch sandbox",
-			"program": "${workspaceRoot}\\examples\\sandbox\\transit.js",
+			"program": "${workspaceRoot}\\examples\\sandbox\\call.js",
 			"cwd": "${workspaceRoot}\\examples\\sandbox"
 		},		
 		{

diff --git a/benchmark/perf-runner.js b/benchmark/perf-runner.js
@@ -43,7 +43,7 @@ let [b1, b2] = createBrokers(Transporters.Fake);
 let count = 0;
 function doRequest() {
 	count++;
-	return b1.call("echo.reply", { a: count }).then(res => {
+	return b2.call("echo.reply", { a: count }).then(res => {
 		if (count % 10000) {
 			// Fast cycle
 			doRequest();

diff --git a/examples/sandbox/call.js b/examples/sandbox/call.js
@@ -3,12 +3,17 @@
 let Promise	= require("bluebird");
 let ServiceBroker = require("../../src/service-broker");
 
-let broker = new ServiceBroker({ logger: console, validation: true, metrics: true });
+let broker = new ServiceBroker({ logger: console, validation: false, metrics: true });
 broker.loadService(__dirname + "/../../benchmark/user.service");
 broker.loadService(__dirname + "/../metrics.service");
 
 broker.start();
 
 console.log(" --- CALL ---");
 //broker.call("users.empty").then(res => console.log(res));
-broker.call("users.validate", { id: "5" }).then(res => console.log(res));
+let p = broker.call("users.validate", { id: 5 });
+p.then(res => {
+	const ctx = p.ctx;
+	console.log(`Success! Action: ${ctx.action.name}, Duration: ${ctx.duration}`);
+	console.log("Result:", res);
+});
diff --git a/src/service-broker.js b/src/service-broker.js
@@ -660,7 +660,12 @@ class ServiceBroker {
 			p = p.timeout(ctx.timeout);
 
 		// Error handler
-		return p.catch(err => this._callErrorHandler(err, ctx, opts));
+		p = p.catch(err => this._callErrorHandler(err, ctx, opts));
+
+		// Pointer to Context
+		p.ctx = ctx;
+
+		return p;
 	}
 
 	_callErrorHandler(err, ctx, opts) {

diff --git a/test/unit/service-broker.spec.js b/test/unit/service-broker.spec.js
@@ -775,7 +775,8 @@ describe("Test broker.call method", () => {
 		});
 
 		it("should call handler with new Context without params", () => {
-			return broker.call("posts.find").then(ctx => {
+			let p = broker.call("posts.find");
+			return p.then(ctx => {
 				expect(ctx).toBeDefined();
 				expect(ctx.broker).toBe(broker);
 				expect(ctx.nodeID).toBeUndefined();
@@ -785,6 +786,8 @@ describe("Test broker.call method", () => {
 				expect(ctx.params).toEqual({});
 				expect(ctx.metrics).toBe(true);
 
+				expect(p.ctx).toBe(ctx);
+
 				expect(actionHandler).toHaveBeenCalledTimes(1);
 				expect(actionHandler).toHaveBeenCalledWith(ctx);
 			});