Merge pull request #57 from NHSDigital/dh-APMSPII-526-remove-content-location-check-from-polling-loop

Dh apmspii 526 remove content location check from polling loop

Author: DominicH247

docker/async-slowapp/package.json

@@ -4,7 +4,8 @@
   "main": "src/main.js",
   "scripts": {
     "start": "node src/main.js --use_strict",
-    "debug": "nodemon --inspect src/main.js"
+    "debug": "nodemon --inspect src/main.js",
+    "test": "mocha ./src/*.spec.js"
   },
   "author": "",
   "license": "",

docker/async-slowapp/src/handlers.js

@@ -221,6 +221,8 @@ async function slow(req, res, next) {
 
     let delay = req.query.delay;
 
+    let nocl = req.query.nocl;
+
     if (delay !== undefined) {
         delay = parseFloat(delay);
         await sleep(delay*1000);
@@ -237,6 +239,10 @@ async function slow(req, res, next) {
 
     let location = `${locals.base_uri}/poll?id=${poll_id}`;
 
+    if (nocl === '1') {
+        location = `${location}&nocl=1`;
+    }
+
     let headers = new MultiValueHeaders([
         "Content-Type", "application/json",
         "Content-Location", location
@@ -266,6 +272,7 @@ async function delete_poll(req, res, next) {
 async function poll(req, res, next) {
 
     let poll_id = req.query.id;
+    let nocl = req.query.nocl;
     let headers = req.rawHeaders.asMultiValue();
     let cookies = headers.cookies('cookie');
     let locals = req.app.locals;
@@ -283,17 +290,25 @@ async function poll(req, res, next) {
 
     let tracking = locals.tracked[poll_id];
 
-    if (new Date() < tracking.finish_at) {
-        respond(req, res, next, 202, new MultiValueHeaders(['Content-Location', `${locals.base_uri}/poll?id=${poll_id}`]));
-        return;
-    }
 
     let resp_headers = new MultiValueHeaders();
 
     if (poll_count !== undefined) {
         resp_headers.withNewCookies({"poll-count": `poll-count=${poll_count}`}, 'set-cookie');
     }
 
+
+    if (new Date() < tracking.finish_at) {
+
+        if (nocl !== '1') {
+            resp_headers.set('Content-Location', `${locals.base_uri}/poll?id=${poll_id}`)
+        }
+        respond(req, res, next, 202, resp_headers);
+        return;
+    }
+
+
+
     delete locals.tracked[poll_id];
 
     respond(req, res, next, tracking.final_status, resp_headers);

docker/sync-wrap/package.json

@@ -4,7 +4,8 @@
   "main": "src/main.js",
   "scripts": {
     "start": "node src/main.js --use_strict",
-    "debug": "nodemon --inspect src/main.js"
+    "debug": "nodemon --inspect src/main.js",
+    "test": "mocha ./src/*.spec.js"
   },
   "author": "",
   "license": "",

docker/sync-wrap/src/app.slowapp.spec.js

@@ -134,6 +134,31 @@ describe("express with slowap", function () {
             .expect(504, done);
     }).timeout(10000);
 
+    it("GET /slow, completes multiple polling cycles ", (done) => {
+        request(server)
+            .get(`/slow?final_status=200&complete_in=3`)
+            .set("x-sync-wait", "5")
+            .expect(200)
+            .then(({ headers }) => {
+                const pollCount = parseInt(headers["set-cookie"][0].split("=")[1]);
+                assert.isAbove(pollCount, 1);
+                done();
+            })
+    }).timeout(10000);
+
+
+    it("GET /slow?nocl=1, don't set content location on poll", (done) => {
+        request(server)
+            .get(`/slow?final_status=200&complete_in=3&nocl=1`)
+            .set("x-sync-wait", "5")
+            .expect(200)
+            .then(({ headers }) => {
+                const pollCount = parseInt(headers["set-cookie"][0].split("=")[1]);
+                assert.isAbove(pollCount, 1);
+                done();
+            })
+    }).timeout(10000);
+
 });
 
 
@@ -211,6 +236,18 @@ describe("express with slowap with sub path", function () {
             .expect(504, done);
     }).timeout(10000);
 
+    it("GET /slow, completes multiple polling cycles ", (done) => {
+        request(server)
+            .get(`/slow?final_status=200&complete_in=3`)
+            .set("x-sync-wait", "5")
+            .expect(200)
+            .then(({ headers }) => {
+                const pollCount = parseInt(headers["set-cookie"][0].split("=")[1]);
+                assert.isAbove(pollCount, 1)
+                done();
+            })
+    }).timeout(10000)
+
     // it("slowapp patch request", (done) => {
     //     request(server)
     //         .patch("/slow?final_status=500&complete_in=5")

docker/sync-wrap/src/handlers.js

@@ -471,7 +471,11 @@ async function proxy(req, res, next) {
             .then(async (outcome) => {
                 let response = outcome.response;
                 let headers = outcome.headers.withPreviousCookies(outcome.options.received_cookies);
-                if (outcome.response.statusCode === 202 && headers.has("content-location")) {
+                if (outcome.response.statusCode === 202) {
+                    if (headers.has('content-location')) {
+                        let poll_location = new URL(headers.get("content-location"));
+                        outcome.options.path = poll_location.pathname + poll_location.search;
+                    }
                     outcome.options.last_response = response;
                     outcome.options.last_headers = headers;
                     outcome.options.received_cookies = headers.cookies("set-cookie");
@@ -514,7 +518,7 @@ async function proxy(req, res, next) {
             await send_response(response.statusCode, {headers: headers, response: response});
         })
         .catch(async (fin) => {
-            await send_response(fin.error === "timeout" ? 504 : 502, {headers: headers, error: fin.error});
+            await send_response(fin.error === "timeout" ? 504 : 502, {headers: headers, error: fin.error || fin});
         });
 
 }