Merge pull request #1219 from jembi/TB-385-bug-patch-request-unexpect…

…ed-eof-read-on-the-socket-open-him-core

Add support for PATCH requests in router middleware

package.json

@@ -1,7 +1,7 @@
 {
  "name": "openhim-core",
  "description": "The OpenHIM core application that provides logging and routing of http requests",
- "version": "8.4.1",
+ "version": "8.4.2",
  "main": "./lib/server.js",
  "bin": {
  "openhim-core": "./bin/openhim-core.js"

src/middleware/router.js

@@ -625,7 +625,7 @@ function sendHttpRequest(ctx, route, options) {
  routeReq.destroy(new Error(`Request took longer than ${timeout}ms`))
  })
 
- if (ctx.request.method === 'POST' || ctx.request.method === 'PUT') {
+ if (['POST', 'PUT', 'PATCH'].includes(ctx.request.method)) {
  if (ctx.body != null) {
  // TODO : Should probally add checks to see if the body is a buffer or string
  routeReq.write(ctx.body)

test/unit/routerTest.js

@@ -243,6 +243,37 @@ describe('HTTP Router', () => {
  req.method.should.eql('POST')
  })
 
+ it('should forward PATCH requests correctly', async () => {
+ const response = 'Hello Patch'
+ const patchSpy = sinon.spy(() => response)
+ server = await testUtils.createMockHttpServer(
+ patchSpy,
+ constants.HTTP_PORT,
+ 200
+ )
+
+ const channel = {
+ name: 'PATCH channel',
+ urlPattern: '.+',
+ routes: [
+ {
+ host: 'localhost',
+ port: constants.HTTP_PORT,
+ primary: true
+ }
+ ]
+ }
+ const ctx = createContext(channel, '/test', 'PATCH', 'some body')
+ await promisify(router.route)(ctx)
+ Buffer.isBuffer(ctx.response.body).should.be.true()
+ ctx.response.body.toString().should.eql(response)
+
+ patchSpy.callCount.should.be.eql(1)
+ const call = patchSpy.getCall(0)
+ const req = call.args[0]
+ req.method.should.eql('PATCH')
+ })
+
  it('should handle empty put and post requests correctly', async () => {
  const response = 'Hello Empty Post'
  const postSpy = sinon.spy(() => response)
@@ -273,6 +304,36 @@ describe('HTTP Router', () => {
  req.method.should.eql('POST')
  })
 
+ it('should handle empty patch requests correctly', async () => {
+ const response = 'Hello Empty Patch'
+ const patchSpy = sinon.spy(() => response)
+ server = await testUtils.createMockHttpServer(
+ patchSpy,
+ constants.HTTP_PORT,
+ 200
+ )
+ const channel = {
+ name: 'PATCH channel',
+ urlPattern: '.+',
+ routes: [
+ {
+ host: 'localhost',
+ port: constants.HTTP_PORT,
+ primary: true
+ }
+ ]
+ }
+ const ctx = createContext(channel, '/test', 'PATCH')
+ await promisify(router.route)(ctx)
+ Buffer.isBuffer(ctx.response.body).should.be.true()
+ ctx.response.body.toString().should.eql(response)
+
+ patchSpy.callCount.should.be.eql(1)
+ const call = patchSpy.getCall(0)
+ const req = call.args[0]
+ req.method.should.eql('PATCH')
+ })
+
  it('should send request params if these where received from the incoming request', async () => {
  const requestSpy = sinon.spy(() => {})
  server = await testUtils.createMockHttpServer(