Upgrade matrix-apservice-bridge base stack to node24. (#1052)

the-draupnir-project/planning#104

I don't know what the fuck they are doing with the typings in the
vector bot-sdk repository but whatever.

#1053

Author: Gnuxie

.changeset/tidy-heads-tickle.md

@@ -0,0 +1,5 @@
+---
+"draupnir": major
+---
+
+Updated minimum engine version to node 24.

.github/workflows/mjolnir.yml

@@ -21,10 +21,10 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Specifically use node 20 like in the readme.
+      - name: Specifically use node 24 like in the readme.
         uses: actions/setup-node@v6
         with:
-          node-version: "20"
+          node-version: "24"
       - run: corepack enable
       - run: corepack npm install
       - run: corepack npm run build:all
@@ -34,10 +34,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - name: Specifically use node 20 like in the readme.
+      - name: Specifically use node 24 like in the readme.
         uses: actions/setup-node@v6
         with:
-          node-version: "20"
+          node-version: "24"
       - run: corepack npm install
       - run: corepack npm run build:all
       - run: corepack npm run test
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-node@v6
         with:
-          node-version: "20"
+          node-version: "24"
       - name: Fetch and build mx-tester (cached across runs)
         uses: baptiste0928/cargo-install@v3
         with:
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/setup-node@v6
       - uses: actions/checkout@v6
         with:
-          node-version: "20"
+          node-version: "24"
       - name: Fetch and build mx-tester (cached across runs)
         uses: baptiste0928/cargo-install@v3
         with:

DEPENDENCIES.md

@@ -34,3 +34,9 @@ reproducibly on any branch of PR.
 Developer tooling related `devDependencies` should be kept in the root package
 unless it is not common to most packages. This is to make sure the versioning
 remains consistent without relying on npm to do that.
+
+## Node
+
+We try to follow the active LTS release to keep us more inline with the
+[matrix-appservice-bridge](https://github.com/matrix-org/matrix-appservice-bridge/blob/develop/docs/platforms.md)
+stack of libraries.

Dockerfile

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0 AND AFL-3.0
 
-FROM node:20-slim as build-stage
+FROM node:24-slim as build-stage
 RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
 COPY . /tmp/src
 # describe the version.
@@ -14,7 +14,7 @@ RUN cd /tmp/src \
     && npm run build \
     && npm prune --production
 
-FROM node:20-slim as final-stage
+FROM node:24-slim as final-stage
 COPY --from=build-stage /tmp/src/apps/draupnir /apps/draupnir
 COPY --from=build-stage /tmp/src/packages /packages
 COPY --from=build-stage /tmp/src/node_modules /node_modules

apps/draupnir/package.json

@@ -30,7 +30,7 @@
     "@types/jsdom": "21.1.7",
     "@types/mocha": "^10.0.7",
     "@types/nedb": "^1.8.16",
-    "@types/node": "^20.14.11",
+    "@types/node": "^24.12.0",
     "@types/pg": "^8.6.5",
     "@types/request": "^2.48.12",
     "crypto-js": "^4.2.0",
@@ -46,27 +46,26 @@
     "@the-draupnir-project/interface-manager": "4.2.6",
     "@the-draupnir-project/matrix-basic-types": "1.5.0",
     "@the-draupnir-project/mps-interface-adaptor": "file:../../packages/mps-interface-adaptor",
-    "@vector-im/matrix-bot-sdk": "0.7.1-element.6",
-    "better-sqlite3": "^9.4.3",
+    "@vector-im/matrix-bot-sdk": "^0.8.0-element.3",
+    "better-sqlite3": "^12.8.0",
     "body-parser": "^1.20.2",
     "config": "^3.3.9",
     "express": "^4.19",
     "html-to-text": "^8.0.0",
     "js-yaml": "^4.1.0",
     "jsdom": "^24.0.0",
-    "matrix-appservice-bridge": "10.3.1",
+    "matrix-appservice-bridge": "^11.2.0",
     "matrix-protection-suite": "file:../../packages/matrix-protection-suite",
     "matrix-protection-suite-for-matrix-bot-sdk": "file:../../packages/matrix-protection-suite-for-matrix-bot-sdk",
     "pg": "^8.8.0",
     "yaml": "^2.3.2"
   },
   "overrides": {
-    "@vector-im/matrix-bot-sdk": "0.7.1-element.6",
     "@the-draupnir-project/matrix-basic-types": "$the-draupnir-project/matrix-basic-types",
     "@the-draupnir-project/interface-manager": "$the-draupnir-project/interface-manager",
     "matrix-protection-suite": "$matrix-protection-suite"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=24.0.0"
   }
 }

apps/draupnir/src/report/ReportManager.ts

@@ -8,9 +8,10 @@
 // https://github.com/matrix-org/mjolnir
 // </text>
 
-import { PowerLevelAction } from "@vector-im/matrix-bot-sdk/lib/models/PowerLevelAction";
+import { PowerLevelAction } from "@vector-im/matrix-bot-sdk";
 import { LogService, UserID } from "@vector-im/matrix-bot-sdk";
 import { htmlToText } from "html-to-text";
+import { extractRawRoomEvent } from "matrix-protection-suite-for-matrix-bot-sdk";
 import { htmlEscape } from "../utils";
 import { JSDOM } from "jsdom";
 import { Draupnir } from "../Draupnir";
@@ -226,10 +227,9 @@ export class StandardReportManager {
     let initialNoticeReport: IReport | undefined,
       confirmationReport: IReportWithAction | undefined;
     try {
-      const originalEvent = (await this.draupnir.client.getEvent(
-        roomID,
-        relation.event_id
-      )) as RoomEvent;
+      const originalEvent = extractRawRoomEvent(
+        await this.draupnir.client.getEvent(roomID, relation.event_id)
+      ) as RoomEvent;
       if (originalEvent.sender !== this.draupnir.clientUserID) {
         // Let's not handle reactions to events we didn't send as
         // some setups have two or more Draupnir's in the same management room.
@@ -978,10 +978,9 @@ class EscalateToServerModerationRoom implements IUIAction {
     _moderationroomID: string,
     displayManager: DisplayManager
   ): Promise<string | undefined> {
-    const event = (await manager.draupnir.client.getEvent(
-      report.room_id,
-      report.event_id
-    )) as RoomEvent;
+    const event = extractRawRoomEvent(
+      await manager.draupnir.client.getEvent(report.room_id, report.event_id)
+    ) as RoomEvent;
 
     // Display the report and UI directly in the management room, as if it had been
     // received from /report.

apps/draupnir/src/webapis/WebAPIs.ts

@@ -20,6 +20,7 @@ import {
   isStringEventID,
 } from "@the-draupnir-project/matrix-basic-types";
 import { Logger, RoomEvent, Task } from "matrix-protection-suite";
+import { extractRawRoomEvent } from "matrix-protection-suite-for-matrix-bot-sdk";
 import { SynapseHttpAntispam } from "./SynapseHTTPAntispam/SynapseHttpAntispam";
 import { jsonReviver } from "../utils";
 
@@ -260,7 +261,9 @@ export class WebAPIs {
         //
         // By doing this with the reporterClient, we ensure that this feature of Draupnir can work
         // with all Matrix homeservers, rather than just Synapse.
-        event = (await reporterClient.getEvent(roomID, eventID)) as RoomEvent;
+        event = extractRawRoomEvent(
+          await reporterClient.getEvent(roomID, eventID)
+        ) as RoomEvent;
       }
       const reason = (request.body as Record<string, unknown>)[
         "reason"

apps/draupnir/test/integration/abuseReportTest.ts

@@ -22,7 +22,10 @@ import {
   Value,
 } from "matrix-protection-suite";
 import { StringEventID } from "@the-draupnir-project/matrix-basic-types";
-import { resultifyBotSDKRequestError } from "matrix-protection-suite-for-matrix-bot-sdk";
+import {
+  extractRawRoomEvent,
+  resultifyBotSDKRequestError,
+} from "matrix-protection-suite-for-matrix-bot-sdk";
 
 /**
  * Test the ability to turn abuse reports into room messages.
@@ -533,10 +536,9 @@ describe("Test: Reporting abuse", () => {
     await new Promise((resolve) => setTimeout(resolve, 1000));
 
     // This should have redacted the message.
-    const newBadEvent = (await draupnir.client.getEvent(
-      roomId,
-      badEventId
-    )) as RoomEvent;
+    const newBadEvent = extractRawRoomEvent(
+      await draupnir.client.getEvent(roomId, badEventId)
+    ) as RoomEvent;
     assert.deepEqual(
       Object.keys(newBadEvent.content),
       [],

apps/draupnir/test/integration/clientHelper.ts

@@ -47,7 +47,7 @@ export async function registerUser(
 ): Promise<void> {
   const registerUrl = `${homeserver}/_synapse/admin/v1/register`;
   const nonce: string = await new Promise((resolve, reject) => {
-    (getRequestFn() as RequestFunction)(
+    (getRequestFn() as unknown as RequestFunction)(
       { uri: registerUrl, method: "GET", timeout: 60000 },
       (error: unknown, _response: unknown, resBody: unknown) => {
         if (error) {
@@ -94,15 +94,18 @@ export async function registerUser(
         timeout: 60000,
       };
       await new Promise((resolve, reject) => {
-        (getRequestFn() as RequestFunction)(params, (error: unknown) => {
-          if (error === undefined || error === null) {
-            resolve(undefined);
-          } else if (error instanceof Error) {
-            reject(error);
-          } else {
-            reject(new TypeError(`something is throwing garbage`));
+        (getRequestFn() as unknown as RequestFunction)(
+          params,
+          (error: unknown) => {
+            if (error === undefined || error === null) {
+              resolve(undefined);
+            } else if (error instanceof Error) {
+              reject(error);
+            } else {
+              reject(new TypeError(`something is throwing garbage`));
+            }
           }
-        });
+        );
       });
       return;
     } catch (e) {

apps/draupnir/test/integration/commands/redactCommandTest.ts

@@ -20,6 +20,7 @@ import {
 } from "../mjolnirSetupUtils";
 import { MatrixClient } from "@vector-im/matrix-bot-sdk";
 import { RoomEvent } from "matrix-protection-suite";
+import { extractRawRoomEvent } from "matrix-protection-suite-for-matrix-bot-sdk";
 
 interface RedactionTestContext extends DraupnirTestContext {
   moderator?: MatrixClient;
@@ -286,10 +287,9 @@ describe("Test: The redaction command", function () {
       }
     );
 
-    const redactedEvent = (await moderator.getEvent(
-      targetRoom,
-      eventToRedact
-    )) as RoomEvent;
+    const redactedEvent = extractRawRoomEvent(
+      await moderator.getEvent(targetRoom, eventToRedact)
+    ) as RoomEvent;
     assert.equal(
       Object.keys(redactedEvent.content).length,
       0,