Skip to content

Commit 2be5d58

Browse files
jeromevalentinjeromevalentin
committed
senecajs#139: Add inward/outward support on TCP / HTTP
1 parent 0b13474 commit 2be5d58

File tree

4 files changed

+223
-8
lines changed

4 files changed

+223
-8
lines changed

‎lib/transport-utils.js

+22-3
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ internals.Utils.prototype.handle_response = function (seneca, data, client_optio
9999
return false
100100
}
101101

102-
103102
var actinfo = {
104103
id: data.id,
105104
accept: data.accept,
@@ -234,14 +233,34 @@ internals.Utils.prototype.handle_request = function (seneca, data, listen_option
234233

235234
input.id$ = data.id
236235

237-
this.requestAct(seneca, input, output, respond)
236+
this.requestAct(seneca, input, output, respond, listen_options.inward, listen_options.outward)
238237
}
239238

240-
internals.Utils.prototype.requestAct = function (seneca, input, output, respond) {
239+
internals.Utils.prototype.requestAct = function (seneca, input, output, respond, inward, outward) {
241240
var self = this
242241

243242
try {
243+
if (inward) {
244+
inward({ seneca }, { msg: input })
245+
}
244246
seneca.act(input, function (err, out) {
247+
if (outward) {
248+
try {
249+
var outward_data = {
250+
err: err,
251+
msg: input,
252+
res: out
253+
}
254+
outward({ seneca }, outward_data)
255+
err = outward_data.err
256+
out = outward_data.res
257+
}
258+
catch (e) {
259+
// outward failed, keep a trace of the original err if there was one
260+
e.act_error = err
261+
err = e
262+
}
263+
}
245264
self.update_output(input, output, err, out)
246265
respond(output)
247266
})

‎test/http.test.js

+100-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ describe('Specific http', function () {
6868
})
6969
})
7070

71-
7271
it('http-query', function (fin) {
7372
CreateInstance({errhandler: fin})
7473
.add('a:1', function (args, done) {
@@ -193,6 +192,106 @@ describe('Specific http', function () {
193192
})
194193
})
195194
})
195+
196+
it('apply inward/outward listen options on HTTP remote act call', function (fin) {
197+
CreateInstance()
198+
.add('foo:1', function (args, done) {
199+
done(null, { BAR: args.bar })
200+
})
201+
.listen({type: 'http', port: '18997',
202+
inward: (context, { msg }) => {
203+
msg.bar += 1
204+
msg.inward = 'INPUT UPGRADED'
205+
},
206+
outward: (context, { msg, res }) => {
207+
res.BAR += 10
208+
res.inward = msg.inward
209+
res.outward = 'OUTPUT UPGRADED'
210+
}
211+
})
212+
.ready(function () {
213+
var siClient = CreateInstance()
214+
.client({type: 'http', port: '18997'})
215+
216+
siClient.act('foo:1,bar:2', function (err, out) {
217+
if (err) return fin(err)
218+
Assert.equal(out.BAR, 13)
219+
Assert.equal(out.inward, 'INPUT UPGRADED')
220+
Assert.equal(out.outward, 'OUTPUT UPGRADED')
221+
fin()
222+
})
223+
})
224+
})
225+
226+
it('reject HTTP remote act call in inward listen option', function (fin) {
227+
CreateInstance()
228+
.add('foo:1', function (args, done) {
229+
done(null, { BAR: args.bar })
230+
})
231+
.listen({type: 'http', port: '18996',
232+
inward: (context, data) => {
233+
var e = new Error('HTTP inward rejected!')
234+
e.error_code = 'inward_rejected'
235+
throw e
236+
}
237+
})
238+
.ready(function () {
239+
var siClient = CreateInstance()
240+
.client({type: 'http', port: '18996'})
241+
242+
siClient.act('foo:1,bar:2', function (err, out) {
243+
Assert.equal(err.error_code, 'inward_rejected')
244+
if (err) return fin()
245+
fin(new Error('Inward does not reject remote call'))
246+
})
247+
})
248+
})
249+
250+
it('reject HTTP remote act call in outward listen option', function (fin) {
251+
CreateInstance()
252+
.add('foo:1', function (args, done) {
253+
done(null, { BAR: args.bar })
254+
})
255+
.listen({type: 'http', port: '18995',
256+
outward: (context, data) => {
257+
var e = new Error('HTTP outward rejected!')
258+
e.error_code = 'outward_rejected'
259+
throw e
260+
}
261+
})
262+
.ready(function () {
263+
var siClient = CreateInstance()
264+
.client({type: 'http', port: '18995'})
265+
266+
siClient.act('foo:1,bar:2', function (err, out) {
267+
Assert.equal(err.error_code, 'outward_rejected')
268+
if (err) return fin()
269+
fin(new Error('Outward does not reject remote call'))
270+
})
271+
})
272+
})
273+
274+
it('catch HTTP remote act call error in outward listen option', function (fin) {
275+
CreateInstance()
276+
.add('foo:1', function (args, done) {
277+
done(new Error('Catchable failure'), {BAR: args.bar})
278+
})
279+
.listen({type: 'http', port: '18994',
280+
outward: (context, data) => {
281+
delete data.err
282+
}
283+
})
284+
.ready(function () {
285+
var siClient = CreateInstance()
286+
.client({type: 'http', port: '18994'})
287+
288+
siClient.act('foo:1,bar:2', function (err, out) {
289+
if (err) return fin(err)
290+
Assert.equal(out.BAR, 2)
291+
fin()
292+
})
293+
})
294+
})
196295
})
197296

198297
describe('Specific https', function () {

‎test/misc.test.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ describe('Miscellaneous', function () {
4444
counters.own++
4545
}
4646

47-
4847
var a = CreateInstance({
4948
log: {map: [
5049
{level: 'debug', regex: /\{a:1\}/, handler: log_a},
@@ -66,7 +65,6 @@ describe('Miscellaneous', function () {
6665
.listen({type: type, port: 40406})
6766
.client({type: type, port: 40405})
6867

69-
7068
a.ready(function () {
7169
b.ready(function () {
7270
a.act('a:1', function (err, out) {
@@ -193,7 +191,6 @@ describe('Miscellaneous', function () {
193191
.listen({type: type, port: 40407})
194192
.client({type: type, port: 40405})
195193

196-
197194
a.ready(function () {
198195
b.ready(function () {
199196
c.ready(function () {
@@ -375,6 +372,7 @@ describe('Miscellaneous', function () {
375372
})
376373
})
377374
})
375+
378376
it('listen-http-pin (#97)', function (fin) {
379377
CreateInstance()
380378
.add('foo:1', function (args, done) {

‎test/tcp.test.js

+100-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ describe('Specific tcp', function () {
6565

6666
var settings = {tcp: {port: 0, host: 'localhost'}}
6767

68-
6968
var transportUtil = new TransportUtil({
7069
callmap: {},
7170
seneca: seneca,
@@ -215,5 +214,105 @@ describe('Specific tcp', function () {
215214

216215
setTimeout(finish, 2000)
217216
})
217+
218+
it('apply inward/outward listen options on TCP remote act call', function (fin) {
219+
CreateInstance()
220+
.add('foo:1', function (args, done) {
221+
done(null, { BAR: args.bar })
222+
})
223+
.listen({type: 'tcp', port: '19997',
224+
inward: (context, { msg }) => {
225+
msg.bar += 1
226+
msg.inward = 'INPUT UPGRADED'
227+
},
228+
outward: (context, { msg, res }) => {
229+
res.BAR += 10
230+
res.inward = msg.inward
231+
res.outward = 'OUTPUT UPGRADED'
232+
}
233+
})
234+
.ready(function () {
235+
var siClient = CreateInstance()
236+
.client({type: 'tcp', port: '19997'})
237+
238+
siClient.act('foo:1,bar:2', function (err, out) {
239+
if (err) return fin(err)
240+
Assert.equal(out.BAR, 13)
241+
Assert.equal(out.inward, 'INPUT UPGRADED')
242+
Assert.equal(out.outward, 'OUTPUT UPGRADED')
243+
fin()
244+
})
245+
})
246+
})
247+
248+
it('reject TCP remote act call in inward listen option', function (fin) {
249+
CreateInstance()
250+
.add('foo:1', function (args, done) {
251+
done(null, { BAR: args.bar })
252+
})
253+
.listen({type: 'tcp', port: '19996',
254+
inward: (context, data) => {
255+
var e = new Error('TCP inward rejected!')
256+
e.error_code = 'inward_rejected'
257+
throw e
258+
}
259+
})
260+
.ready(function () {
261+
var siClient = CreateInstance()
262+
.client({type: 'tcp', port: '19996'})
263+
264+
siClient.act('foo:1,bar:2', function (err, out) {
265+
Assert.equal(err.error_code, 'inward_rejected')
266+
if (err) return fin()
267+
fin(new Error('Inward does not reject remote call'))
268+
})
269+
})
270+
})
271+
272+
it('reject TCP remote act call in outward listen option', function (fin) {
273+
CreateInstance()
274+
.add('foo:1', function (args, done) {
275+
done(null, { BAR: args.bar })
276+
})
277+
.listen({type: 'tcp', port: '19995',
278+
outward: (context, data) => {
279+
var e = new Error('TCP outward rejected!')
280+
e.error_code = 'outward_rejected'
281+
throw e
282+
}
283+
})
284+
.ready(function () {
285+
var siClient = CreateInstance()
286+
.client({type: 'tcp', port: '19995'})
287+
288+
siClient.act('foo:1,bar:2', function (err, out) {
289+
Assert.equal(err.error_code, 'outward_rejected')
290+
if (err) return fin()
291+
fin(new Error('Outward does not reject remote call'))
292+
})
293+
})
294+
})
295+
296+
it('catch TCP remote act call error in outward listen option', function (fin) {
297+
CreateInstance()
298+
.add('foo:1', function (args, done) {
299+
done(new Error('Catchable failure'), {BAR: args.bar})
300+
})
301+
.listen({type: 'tcp', port: '19994',
302+
outward: (context, data) => {
303+
delete data.err
304+
}
305+
})
306+
.ready(function () {
307+
var siClient = CreateInstance()
308+
.client({type: 'tcp', port: '19994'})
309+
310+
siClient.act('foo:1,bar:2', function (err, out) {
311+
if (err) return fin(err)
312+
Assert.equal(out.BAR, 2)
313+
fin()
314+
})
315+
})
316+
})
218317
})
219318
})

0 commit comments

Comments
 (0)