Merge branch 'main' into aws-lite

changelog.md

@@ -2,6 +2,40 @@
 
 ---
 
+## [5.9.4] 2023-11-20
+
+### Changed
+
+- Updated dependencies
+
+
+### Fixed
+
+- Ensure `X-Forwarded-Port` header is always a string; thanks @lpsinger!
+
+---
+
+## [5.9.3] 2023-11-19
+
+### Changed
+
+- Updated dependencies
+
+
+### Fixed
+
+- Ensure connected livereload clients are refreshed on all changes to `public/`
+
+---
+
+## [5.9.2] 2023-10-31
+
+### Changed
+
+- Updated dependencies
+
+---
+
 ## [5.9.0 - 5.9.1] 2023-10-24
 
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/sandbox",
-  "version": "5.9.1",
+  "version": "5.9.4",
   "description": "Architect dev server: run full Architect projects locally & offline",
   "main": "src/index.js",
   "scripts": {
@@ -28,10 +28,10 @@
     "src/*"
   ],
   "dependencies": {
-    "@architect/asap": "~6.0.3",
-    "@architect/create": "~4.2.3",
-    "@architect/hydrate": "~3.4.1",
-    "@architect/inventory": "~3.6.2",
+    "@architect/asap": "~6.0.4",
+    "@architect/create": "~4.2.4",
+    "@architect/hydrate": "~3.5.1",
+    "@architect/inventory": "~3.6.3",
     "@architect/utils": "~4.0.0-RC.1",
     "@aws-lite/client": "~0.11.1",
     "@aws-lite/dynamodb": "~0.2.2",
@@ -43,7 +43,7 @@
     "finalhandler": "~1.2.0",
     "glob": "~10.3.10",
     "http-proxy": "~1.18.1",
-    "lambda-runtimes": "~1.1.5",
+    "lambda-runtimes": "~1.1.6",
     "minimist": "~1.2.8",
     "router": "~1.3.8",
     "run-parallel": "~1.2.0",
@@ -62,12 +62,12 @@
     "@aws-lite/apigatewaymanagementapi": "~0.0.2",
     "@aws-lite/ssm": "~0.2.0",
     "cross-env": "~7.0.3",
-    "eslint": "~8.52.0",
+    "eslint": "~8.54.0",
     "fs-extra": "~11.1.1",
     "nyc": "~15.1.0",
     "pkg": "~5.8.1",
     "proxyquire": "~2.1.3",
-    "tap-arc": "~1.1.0",
+    "tap-arc": "~1.2.2",
     "tape": "~5.7.2",
     "tiny-json-http": "~7.5.1"
   },

src/cli/_watcher.js

@@ -216,7 +216,7 @@ module.exports = function runWatcher (args, params) {
     }
 
     /**
-     * Regenerate public/static.json upon changes to public/
+     * Refresh clients + regenerate public/static.json upon changes to public/
      */
     let isStaticAsset = inv.static && filename.includes(join(cwd, staticFolder))
     if (!ran && isStaticAsset) {
@@ -235,6 +235,7 @@ module.exports = function runWatcher (args, params) {
                 only: 'staticJson',
               }, liveReloadClients)
             }
+            else liveReloadClients()
           }
         })
       }, debounce)

src/http/invoke-http/http/_req-header-fmt.js

@@ -48,7 +48,7 @@ module.exports = function requestHeaderFormatter (reqHeaders = {}, params) {
     headers['x-forwarded-for'] = ip
   }
   if (!headers['x-forwarded-port'] && req.socket?.localPort) {
-    headers['x-forwarded-port'] = req.socket.localPort
+    headers['x-forwarded-port'] = req.socket.localPort?.toString()
   }
   if (!headers['x-forwarded-proto']) {
     headers['x-forwarded-proto'] = 'http'

src/http/invoke-http/rest/_req-header-fmt.js

@@ -61,7 +61,7 @@ module.exports = function requestHeaderFormatter (reqHeaders = {}, httpApi, para
     headers['X-Forwarded-For'] = ip
   }
   if (!headers['X-Forwarded-Port'] && req.socket?.localPort) {
-    headers['X-Forwarded-Port'] = req.socket.localPort
+    headers['X-Forwarded-Port'] = req.socket.localPort?.toString()
   }
   if (!headers['X-Forwarded-Proto']) {
     headers['X-Forwarded-Proto'] = 'http'

src/http/invoke-ws/_req-fmt.js

@@ -62,7 +62,7 @@ module.exports = function requestFormatter (params) {
       request.headers['X-Forwarded-For'] = sourceIp
     }
     if (!request.headers['X-Forwarded-Port'] && req?.socket?.localPort) {
-      request.headers['X-Forwarded-Port'] = req.socket.localPort
+      request.headers['X-Forwarded-Port'] = req.socket.localPort.toString()
     }
     if (!request.headers['X-Forwarded-Proto']) {
       request.headers['X-Forwarded-Proto'] = 'http'

test/unit/src/http/invoke-http/http/_req-header-fmt-test.js

@@ -3,7 +3,7 @@ let { join } = require('path')
 let sut = join(process.cwd(), 'src', 'http', 'invoke-http', 'http', '_req-header-fmt')
 let requestHeaderFormatter = require(sut)
 let params = {
-  req: { socket: { localPort: 'foo' } },
+  req: { socket: { localPort: 1234 } },
   ip: 'bar',
 }
 
@@ -40,7 +40,7 @@ test('Header mangling & cookies (HTTP)', t => {
   t.equal(cookies[1], 'fiz=buz', 'Got back cookie two')
   // Metadata
   t.equal(headers['x-forwarded-for'], 'bar', 'Got back header: x-forwarded-for')
-  t.equal(headers['x-forwarded-port'], 'foo', 'Got back header: x-forwarded-port')
+  t.equal(headers['x-forwarded-port'], '1234', 'Got back header: x-forwarded-port')
   t.equal(headers['x-forwarded-proto'], 'http', 'Got back header: x-forwarded-proto')
 })
 

test/unit/src/http/invoke-http/rest/_req-header-fmt-test.js

@@ -3,7 +3,7 @@ let { join } = require('path')
 let sut = join(process.cwd(), 'src', 'http', 'invoke-http', 'rest', '_req-header-fmt')
 let headerFormatter = require(sut)
 let params = {
-  req: { socket: { localPort: 'foo' } },
+  req: { socket: { localPort: 1234 } },
   ip: 'bar',
 }
 
@@ -37,15 +37,15 @@ test('Header mangling (HTTP + Lambda 1.0 payload)', t => {
   t.ok(headers.Host, 'Got back upcased Host')
   t.ok(headers['User-Agent'], 'Got back upcased User-Agent')
   t.ok(headers['X-Forwarded-For'], 'Got back upcased X-Forwarded-For')
-  t.ok(headers['X-Forwarded-Port'], 'Got back upcased X-Forwarded-Port')
+  t.equal(headers['X-Forwarded-Port'], '1234', 'Got back upcased X-Forwarded-Port')
   t.ok(headers['X-Forwarded-Proto'], 'Got back upcased X-Forwarded-Proto')
   t.ok(headers.date, 'Got back lowcased date')
   t.ok(headers.foo, 'Got back lowcased foo')
   t.ok(multiValueHeaders.authorization, 'Got back lowcased authorization')
   t.ok(multiValueHeaders.Host, 'Got back upcased Host')
   t.ok(multiValueHeaders['User-Agent'], 'Got back upcased User-Agent')
   t.ok(multiValueHeaders['X-Forwarded-For'], 'Got back upcased X-Forwarded-For')
-  t.ok(multiValueHeaders['X-Forwarded-Port'], 'Got back upcased X-Forwarded-Port')
+  t.deepEqual(multiValueHeaders['X-Forwarded-Port'], [ '1234' ], 'Got back upcased X-Forwarded-Port')
   t.ok(multiValueHeaders['X-Forwarded-Proto'], 'Got back upcased X-Forwarded-Proto')
   t.ok(multiValueHeaders.date, 'Got back lowcased date')
   t.ok(multiValueHeaders.foo, 'Got back lowcased foo')
@@ -105,15 +105,15 @@ test('Header mangling (REST)', t => {
   t.ok(headers.Host, 'Got back upcased Host')
   t.ok(headers['User-Agent'], 'Got back upcased User-Agent')
   t.ok(headers['X-Forwarded-For'], 'Got back upcased X-Forwarded-For')
-  t.ok(headers['X-Forwarded-Port'], 'Got back upcased X-Forwarded-Port')
+  t.equal(headers['X-Forwarded-Port'], '1234', 'Got back upcased X-Forwarded-Port')
   t.ok(headers['X-Forwarded-Proto'], 'Got back upcased X-Forwarded-Proto')
   t.ok(headers.Date, 'Got back upased Date')
   t.ok(headers.foo, 'Got back lowcased foo')
   t.ok(multiValueHeaders.Authorization, 'Got back upcased Authorization')
   t.ok(multiValueHeaders.Host, 'Got back upcased Host')
   t.ok(multiValueHeaders['User-Agent'], 'Got back upcased User-Agent')
   t.ok(multiValueHeaders['X-Forwarded-For'], 'Got back upcased X-Forwarded-For')
-  t.ok(multiValueHeaders['X-Forwarded-Port'], 'Got back upcased X-Forwarded-Port')
+  t.deepEqual(multiValueHeaders['X-Forwarded-Port'], [ '1234' ], 'Got back upcased X-Forwarded-Port')
   t.ok(multiValueHeaders['X-Forwarded-Proto'], 'Got back upcased X-Forwarded-Proto')
   t.ok(multiValueHeaders.Date, 'Got back upased Date')
   t.ok(multiValueHeaders.foo, 'Got back lowcased foo')