Update matrix-appservice-bridge and use our own alias for matrix-bot-sdk (#609)

* Update matrix-appservice-bridge and use our own alias for matrix-bot-sdk

* Bump node version to support matrix-appservice-bridge

* Bump node version in CI

* Fix comments

* Add changelog entry

Author: MTRNord

.github/workflows/mjolnir.yml

@@ -21,10 +21,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Specifically use node 18 like in the readme.
+      - name: Specifically use node 20 like in the readme.
         uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "20"
       - run: corepack enable
       - run: corepack yarn install
       - run: corepack yarn build
@@ -34,10 +34,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Specifically use node 18 like in the readme.
+      - name: Specifically use node 20 like in the readme.
         uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "20"
       - run: corepack yarn install
       - run: corepack yarn test:unit
   integration:
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "20"
       - name: Fetch and build mx-tester (cached across runs)
         uses: baptiste0928/cargo-install@v3
         with:
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "20"
       - name: Fetch and build mx-tester (cached across runs)
         uses: baptiste0928/cargo-install@v3
         with:

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to
 
 ### Changed
 
+- The Node version required to run Draupnir has been updated to Node 20.
+
 - `Dockerfile`: entry-point was renamed from `mjolnir-entrypoint.sh` to
   `draupnir-entrypoint.sh`. If you have built a Dockerfile based on ours, you
   may need to make some changes.

package.json

@@ -68,7 +68,8 @@
     "humanize-duration-ts": "^2.1.1",
     "js-yaml": "^4.1.0",
     "jsdom": "^24.0.0",
-    "matrix-appservice-bridge": "^9.0.1",
+    "matrix-appservice-bridge": "^10.3.1",
+    "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk",
     "matrix-protection-suite": "npm:@gnuxie/[email protected]",
     "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/[email protected]",
     "parse-duration": "^1.0.2",
@@ -82,7 +83,7 @@
     "@vector-im/matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "packageManager": "[email protected]+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

src/utils.ts

@@ -416,7 +416,8 @@ function patchMatrixClientForConciseExceptions() {
         if (isMatrixError(path)) {
           const matrixError = new MatrixError(
             body as MatrixError["body"],
-            err.statusCode as number
+            err.statusCode as number,
+            err.headers as Record<string, string>
           );
           if (error.stack !== undefined) {
             matrixError.stack = error.stack;