Fix regression and test: --watch

Author: gpotter2

src/lambdalocal.ts

@@ -94,44 +94,49 @@ function _getRequestPayload(req, callback) {
         body += chunk.toString();
     });
     req.on('end', () => {
-        let payload;
+        let payload, event;
         try {
             payload = JSON.parse(body || '{}');
         } catch(err) {
             callback(err);
             return;
         }
-        // Format: https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format
-        const url = new URL(req.url, `http://${req.headers.host}`);
-        const event = {
-            version: "2.0",
-            routeKey: "$default",
-            rawPath: url.pathname,
-            rawQueryString: url.search,
-            cookies: utils.parseCookies(req),
-            headers: req.headers,
-            queryStringParameters: Object.fromEntries(url.searchParams),
-            requestContext: {
-                accountId: "123456789012",
-                apiId: "api-id",
-                authentication: {},
-                authorizer: {},
-                http: {
-                    method: req.method,
-                    path: url.pathname,
-                    protocol: "HTTP/" + req.httpVersion,
-                    sourceIp: req.socket.localAddress,
-                    userAgent: req.headers['user-agent'],
-                },
-                requestId: "id",
+        if (payload.event) {
+            // compatibility: if "event" was provided.
+            event = payload.event;
+        } else {
+            // Format: https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format
+            const url = new URL(req.url, `http://${req.headers.host}`);
+            event = {
+                version: "2.0",
                 routeKey: "$default",
-                stage: "$default",
-                time: new Date().toISOString(),
-                timeEpoch: new Date().getTime(),
-            },
-            body: payload,
-            isBase64Encoded: req.headers['content-type'] !== 'application/json',
-        };
+                rawPath: url.pathname,
+                rawQueryString: url.search,
+                cookies: utils.parseCookies(req),
+                headers: req.headers,
+                queryStringParameters: Object.fromEntries(url.searchParams),
+                requestContext: {
+                    accountId: "123456789012",
+                    apiId: "api-id",
+                    authentication: {},
+                    authorizer: {},
+                    http: {
+                        method: req.method,
+                        path: url.pathname,
+                        protocol: "HTTP/" + req.httpVersion,
+                        sourceIp: req.socket.localAddress,
+                        userAgent: req.headers['user-agent'],
+                    },
+                    requestId: "id",
+                    routeKey: "$default",
+                    stage: "$default",
+                    time: new Date().toISOString(),
+                    timeEpoch: new Date().getTime(),
+                },
+                body: payload,
+                isBase64Encoded: req.headers['content-type'] !== 'application/json',
+            };
+        }
         callback(null, event);
     });
 }

test/test.js

@@ -504,6 +504,7 @@ describe("- Testing lambdalocal.js", function () {
 });
 describe("- Testing cli.js", function () {
     var spawnSync = require('child_process').spawnSync;
+    var spawnAsync = require('child_process').spawn;
     describe("* Basic Run", function () {
         it("should end normally", function () {
             var command = get_shell("node ../build/cli.js -l ./functs/test-func.js -e ./events/test-event.js");
@@ -611,6 +612,70 @@ describe("- Testing cli.js", function () {
         });
     });
 
+    if (get_node_major_version() >= 18) {
+        // we use fetch() (nodejs>=18) to not bother.
+        const doRequestWhenReady = function(r, event, check, cb) {
+            var result;
+            r.stdout.on('data', (data) => {
+                data = data.toString();
+                if (data.includes("listening on")) {
+                    // started
+                    fetch("http://localhost:8008", {
+                      method: "POST",
+                      headers: {
+                        "Content-Type": "application/json",
+                      },
+                      body: JSON.stringify(event),
+                    }).then((res) => {
+                        res.json().then((datres) => {
+                            result = datres;
+                            r.kill('SIGINT');
+                        });
+                    });
+                }
+            });
+            r.on('error', (err) => {
+                cb(err);
+            });
+            r.on('close', () => {
+                check(result);
+                cb();
+            });
+            // add timeout
+            setTimeout(() => {
+                r.kill();
+            }, 1000);
+        }
+        describe("* --watch run", function () {
+            it("test watch with old event format", function (cb) {
+                var command = get_shell("node ../build/cli.js -l ./functs/test-func-echo.js --watch");
+                var r = spawnAsync(command[0], command[1]);
+                doRequestWhenReady(r,
+                    {
+                        "event": {"hey": "data"}
+                    },
+                    (result) => {
+                        assert.deepEqual(result, {"hey": "data"});
+                    },
+                    cb
+                );
+            });
+            it("test watch with gateway event format", function (cb) {
+                var command = get_shell("node ../build/cli.js -l ./functs/test-func-echo.js --watch");
+                var r = spawnAsync(command[0], command[1]);
+                doRequestWhenReady(r,
+                    {
+                        "hey": "data",
+                    },
+                    (result) => {
+                        assert.deepEqual(result["body"], {"hey": "data"});
+                    },
+                    cb
+                );
+            });
+        });
+    }
+
     describe("* Crashing run", function () {
         it("should fail", function () {
             var command = get_shell("node ../build/cli.js -l ./functs/test-func-error.js -e ./events/test-event.js");