Merge branch 'master' into share-url-too-large

Author: niktayv

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x, 18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x, 23.x]
 
     steps:
     - uses: actions/checkout@v4

CHANGES.md

@@ -1,6 +1,7 @@
 ### Next version
 
 * Exposed the `shareMaxRequestSize` value and the 413 status code to the client for a more meaningful error handling when the story causes shareData to exceed the limit.
+* Require Node 20.
 
 ### 4.0.1
 

lib/controllers/share.js

@@ -70,7 +70,7 @@ function resolveGist(serviceOptions, id) {
  */
 function shortId(body, length) {
     var hmac = require('crypto').createHmac('sha1', body).digest();
-    var base62 = require("base-x")('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+    var base62 = require("base-x").default('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
     var fullkey = base62.encode(hmac);
     return fullkey.slice(0, length); // if length undefined, return the whole thing
 }

package.json

@@ -4,7 +4,7 @@
   "description": "NodeJS server for TerriaJS, consisting of a CORS proxy, proj4 CRS lookup service, and express static server.",
   "engineStrict": true,
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=20.0.0"
   },
   "resolutions": {
     "underscore": "^1.12.1"
@@ -33,12 +33,12 @@
   "homepage": "https://github.com/TerriaJS/TerriaJS-Server",
   "dependencies": {
     "aws-sdk": "^2.1336.0",
-    "base-x": "^3.0.5",
+    "base-x": "^5.0.1",
     "basic-auth": "^2.0.1",
-    "body-parser": "^1.15.0",
+    "body-parser": "^1.20.3",
     "compression": "^1.6.0",
     "cors": "^2.7.1",
-    "express": "^4.8.0",
+    "express": "^4.21.2",
     "express-brute": "^1.0.1",
     "json5": "^2.2.3",
     "morgan": "^1.7.0",
@@ -50,8 +50,8 @@
     "yargs": "^13.2.4"
   },
   "devDependencies": {
-    "jasmine": "^3.4.0",
+    "jasmine": "^4.6.0",
     "nock": "^13.5.6",
-    "supertest": "^4.0.0"
+    "supertest": "^7.0.0"
   }
 }

spec/proj4lookup.spec.js

@@ -22,7 +22,8 @@ describe('proj4lookup', function() {
         it('should 404 unknown projection', function(done) {
             request(server)
                 .get('/api/v1/proj4def/EPSG:Notarealthing')
-                .expect(404, done);
+                .expect(404)
+                .end(assert(done));
         });
     });