Upgrade @koa/router to v15

Author: davidmz

app/routes.js

@@ -1,5 +1,5 @@
 /* eslint babel/semi: "error" */
-import Router from '@koa/router';
+import { Router } from '@koa/router';
 import cors from '@koa/cors';
 
 import AttachmentsRoute from './routes/api/v1/AttachmentsRoute';
@@ -94,7 +94,13 @@ export function createRouter() {
   HashtagsRoute(publicRouter);
 
   const router = new Router();
-  router.use('/v([1-9]\\d*)', publicRouter.routes(), publicRouter.allowedMethods());
+
+  router.use(
+    '/v:version',
+    validateApiVersion,
+    publicRouter.routes(),
+    publicRouter.allowedMethods(),
+  );
 
   {
     const adminRouter = new Router();
@@ -119,3 +125,15 @@ function fixMatchedRouteMiddleware(ctx, next) {
   ctx.state.matchedRoute = ctx.matched.find((layer) => layer.methods.includes(ctx.method)).path;
   return next();
 }
+
+// Validate API version parameter (v1, v2, etc.)
+async function validateApiVersion(ctx, next) {
+  const { version } = ctx.params;
+
+  if (!/^[1-9]\d*$/.test(version)) {
+    ctx.status = 404;
+    return;
+  }
+
+  await next();
+}

app/routes/api/admin/AdminRoute.ts

@@ -1,4 +1,4 @@
-import Router from '@koa/router';
+import { type Router } from '@koa/router';
 import { type DefaultStateExtends } from 'koa';
 
 import { listUsers, promoteModerator } from '../../../controllers/api/admin/AdminController';

app/routes/api/admin/CommonRoute.ts

@@ -1,4 +1,4 @@
-import Router from '@koa/router';
+import { type Router } from '@koa/router';
 import { type DefaultState } from 'koa';
 
 import { journal, whoAmI } from '../../../controllers/api/admin/CommonController';

app/routes/api/admin/ModeratorRoute.ts

@@ -1,4 +1,4 @@
-import Router from '@koa/router';
+import { type Router } from '@koa/router';
 import { type DefaultState } from 'koa';
 
 import { adminRolesRequired } from '../../../controllers/middlewares/admin-only';

app/routes/api/v2/CorsProxyRoute.ts

@@ -1,4 +1,4 @@
-import type Router from '@koa/router';
+import { type Router } from '@koa/router';
 
 import { proxy } from '../../../controllers/api/v2/CorsProxyController';
 

app/routes/api/v2/UndoRoute.ts

@@ -1,4 +1,4 @@
-import type Router from '@koa/router';
+import { type Router } from '@koa/router';
 
 import { undo } from '../../../controllers/api/v2/UndoController';
 

package.json

@@ -42,7 +42,7 @@
     "@keyv/redis": "~5.1.5",
     "@koa/cors": "~5.0.0",
     "@koa/etag": "~5.0.2",
-    "@koa/router": "~13.1.1",
+    "@koa/router": "~15.2.0",
     "@socket.io/redis-adapter": "~8.3.0",
     "@types/react": "~19.2.8",
     "@types/react-dom": "~19.2.3",
@@ -129,7 +129,6 @@
     "@types/koa-morgan": "~1.0.9",
     "@types/koa-response-time": "~2.1.5",
     "@types/koa-static": "~4.0.4",
-    "@types/koa__router": "~12.0.5",
     "@types/lodash-es": "^4.17.12",
     "@types/mime-types": "~3.0.1",
     "@types/mocha": "~10.0.10",

yarn.lock

@@ -1410,15 +1410,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@koa/router@npm:~13.1.1":
-  version: 13.1.1
-  resolution: "@koa/router@npm:13.1.1"
+"@koa/router@npm:~15.2.0":
+  version: 15.2.0
+  resolution: "@koa/router@npm:15.2.0"
   dependencies:
-    debug: "npm:^4.4.1"
-    http-errors: "npm:^2.0.0"
+    debug: "npm:^4.4.3"
+    http-errors: "npm:^2.0.1"
     koa-compose: "npm:^4.1.0"
-    path-to-regexp: "npm:^6.3.0"
-  checksum: 10c0/041a568968f1d0a2f05a4f5add1d95e5e9e127a625c4b30be8ca3884f798cf560bf23722d00ca55cbc729f5e509bddc05b39b95b0625e79420baa2ffa140d644
+    path-to-regexp: "npm:^8.3.0"
+  peerDependencies:
+    koa: ^2.0.0 || ^3.0.0
+  peerDependenciesMeta:
+    koa:
+      optional: false
+  checksum: 10c0/671679ea4ca5c0755136ecf02a43dde55730e4783d39f53f8f5176878b957d0d4526bea829f164c2ea1c8c45c5bfd858b9b8faa711a17872d632cc5cb568e70e
   languageName: node
   linkType: hard
 
@@ -2590,15 +2595,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/koa__router@npm:~12.0.5":
-  version: 12.0.5
-  resolution: "@types/koa__router@npm:12.0.5"
-  dependencies:
-    "@types/koa": "npm:*"
-  checksum: 10c0/7f994a809a5ab308a62b876a259cec49bcdd261d17c0a48d9eeda324bd655e25474ac534c7949dd5aefd4f391fa9ceb52c047e49bf7aa1bfa610d6a60e31ac32
-  languageName: node
-  linkType: hard
-
 "@types/lodash-es@npm:^4.17.12":
   version: 4.17.12
   resolution: "@types/lodash-es@npm:4.17.12"
@@ -4304,7 +4300,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:*, debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.7, debug@npm:^4.4.1, debug@npm:^4.4.3, debug@npm:~4.4.1, debug@npm:~4.4.3":
+"debug@npm:*, debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.7, debug@npm:^4.4.3, debug@npm:~4.4.1, debug@npm:~4.4.3":
   version: 4.4.3
   resolution: "debug@npm:4.4.3"
   dependencies:
@@ -5888,7 +5884,7 @@ __metadata:
     "@keyv/redis": "npm:~5.1.5"
     "@koa/cors": "npm:~5.0.0"
     "@koa/etag": "npm:~5.0.2"
-    "@koa/router": "npm:~13.1.1"
+    "@koa/router": "npm:~15.2.0"
     "@socket.io/redis-adapter": "npm:~8.3.0"
     "@types/debug": "npm:~4.1.12"
     "@types/ejs": "npm:~3.1.5"
@@ -5900,7 +5896,6 @@ __metadata:
     "@types/koa-morgan": "npm:~1.0.9"
     "@types/koa-response-time": "npm:~2.1.5"
     "@types/koa-static": "npm:~4.0.4"
-    "@types/koa__router": "npm:~12.0.5"
     "@types/lodash-es": "npm:^4.17.12"
     "@types/mime-types": "npm:~3.0.1"
     "@types/mocha": "npm:~10.0.10"
@@ -6538,7 +6533,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-errors@npm:^2.0.0, http-errors@npm:~2.0.1":
+"http-errors@npm:^2.0.0, http-errors@npm:^2.0.1, http-errors@npm:~2.0.1":
   version: 2.0.1
   resolution: "http-errors@npm:2.0.1"
   dependencies:
@@ -9083,13 +9078,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:^6.1.0, path-to-regexp@npm:^6.3.0":
+"path-to-regexp@npm:^6.1.0":
   version: 6.3.0
   resolution: "path-to-regexp@npm:6.3.0"
   checksum: 10c0/73b67f4638b41cde56254e6354e46ae3a2ebc08279583f6af3d96fe4664fc75788f74ed0d18ca44fa4a98491b69434f9eee73b97bb5314bd1b5adb700f5c18d6
   languageName: node
   linkType: hard
 
+"path-to-regexp@npm:^8.3.0":
+  version: 8.3.0
+  resolution: "path-to-regexp@npm:8.3.0"
+  checksum: 10c0/ee1544a73a3f294a97a4c663b0ce71bbf1621d732d80c9c9ed201b3e911a86cb628ebad691b9d40f40a3742fe22011e5a059d8eed2cf63ec2cb94f6fb4efe67c
+  languageName: node
+  linkType: hard
+
 "path-type@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-type@npm:3.0.0"