Merge pull request #66 from ccampanale/feat-call-local

Adds `--local` opt to `call` cmd

Author: icebob

src/commands/call.js

@@ -108,6 +108,18 @@ async function handler(broker, args) {
 		}
 	}
 
+	// Remove non-standard call opts
+	[{
+		key: "local",
+		replaceKey: "nodeID",
+		value: args.nodeID,
+	}].forEach(opt => {
+		if (callOpts[opt.key]) {
+			delete callOpts[opt.key];
+			opt.replaceKey ? callOpts[opt.replaceKey] = opt.value : undefined;
+		}
+	});
+
 	const startTime = process.hrtime();
 	const nodeID = args.nodeID;
 	meta.$repl = true;
@@ -123,8 +135,8 @@ async function handler(broker, args) {
 		isStream(payload) ? "" : payload,
 		meta ? kleur.yellow().bold("with meta:") : "",
 		meta ? meta : "",
-		callOpts ? kleur.yellow().bold("with options:") : "",
-		callOpts ? callOpts : ""
+		Object.keys(callOpts).length ? kleur.yellow().bold("with options:") : "",
+		Object.keys(callOpts).length ? callOpts : ""
 	);
 
 	try {
@@ -209,6 +221,7 @@ function declaration(program, broker, cmdHandler) {
 			"--loadFull [filename]",
 			'Load params and meta from file (e.g., {"params":{}, "meta":{}, "options":{}})'
 		)
+		.option("--$local", "Call the local service broker")
 		.option("--stream [filename]", "Send a file as stream")
 		.option("--save [filename]", "Save response to file")
 		.allowUnknownOption(true)
@@ -228,6 +241,7 @@ function declaration(program, broker, cmdHandler) {
 			thisCommand.params = {
 				options: parsedArgs,
 				actionName,
+				nodeID: parsedArgs.$local ? broker.nodeID : undefined,
 				...(jsonParams !== undefined ? { jsonParams } : undefined),
 				rawCommand,
 			};

test/call.spec.js

@@ -156,6 +156,29 @@ describe("Test 'call' command", () => {
 				"call math.add --load my-params.json --stream my-picture.jpg --save my-response.json --loadFull params.json",
 		});
 	});
+
+	it("should call 'call' targeting local broker", async () => {
+		const command = `call "math.add" --$local --load my-params.json --stream my-picture.jpg --save my-response.json --loadFull params.json`;
+
+		await program.parseAsync(
+			parseArgsStringToArgv(command, "node", "REPL")
+		);
+
+		expect(cmdHandler).toHaveBeenCalledTimes(1);
+		expect(cmdHandler).toHaveBeenCalledWith(expect.any(ServiceBroker), {
+			options: {
+				$local: true,
+				load: "my-params.json",
+				stream: "my-picture.jpg",
+				save: "my-response.json",
+				loadFull: "params.json",
+			},
+			actionName: "math.add",
+			nodeID: broker.nodeID,
+			rawCommand:
+				"call math.add --$local --load my-params.json --stream my-picture.jpg --save my-response.json --loadFull params.json",
+		});
+	});
 });
 
 describe("Test 'dcall' command", () => {