Remove Mjolnir-for-all appservice (#703)

Author: H-Shay

.github/workflows/mjolnir.yml

@@ -65,27 +65,3 @@ jobs:
       run: RUST_LOG=debug,hyper=info,rusttls=info mx-tester run
     - name: Cleanup
       run: mx-tester down
-  appservice-integration:
-    name: Application Service Integration tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-      with:
-        persist-credentials: false
-    - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
-      with:
-        node-version: '22'
-    - name: Fetch and build mx-tester (cached across runs)
-      uses: baptiste0928/cargo-install@f204293d9709061b7bc1756fec3ec4e2cd57dec0
-      with:
-        crate: mx-tester
-        version: "0.3.3"
-    - name: Setup image
-      run: RUST_LOG=debug,hyper=info,rusttls=info mx-tester build up
-    - name: Setup dependencies
-      run: yarn install
-    - name: Run tests
-      run: yarn test:appservice:integration
-    - name: Cleanup
-      run: mx-tester down

.prettierignore

@@ -7,7 +7,6 @@
 /.github
 /config
 /docs
-/src/appservice/config
 
 /*.log
 package-lock.json

docs/appservice.md

@@ -1,14 +1,15 @@
 #!/bin/sh
 
 # This is used as the entrypoint in the mjolnir Dockerfile.
-# We want to transition away form people running the image without specifying `bot` or `appservice`.
-# So if eventually cli arguments are provided for the bot version, we want this to be the opportunity to move to `bot`.
-# Therefore using arguments without specifying `bot` (or appservice) is unsupported.
-# We maintain the behaviour where if it looks like someone is providing an executable to `docker run`, then we will execute that instead.
-# This aids configuration and debugging of the image if for example node needed to be started via another method.
+# If it looks like someone is providing an executable to `docker run` instead of `bot`, then we
+# will execute that instead. This aids configuration and debugging of the image, for example if
+# node needed to be started via another method.
 case "$1" in
   bot) shift; set -- node /mjolnir/index.js "$@";;
-  appservice) shift; set -- node /mjolnir/appservice/cli.js "$@";;
+  appservice)
+    echo "appservice mode has been removed from Mjolnir. Use \`bot\` instead." >&2
+    exit 1
+    ;;
 esac
 
 exec "$@";

mjolnir-entrypoint.sh

@@ -2,16 +2,9 @@ name: mjolnir
 
 up:
   before:
-    - docker run --rm --network $MX_TEST_NETWORK_NAME --name mjolnir-test-postgres --domainname mjolnir-test-postgres -e POSTGRES_PASSWORD=mjolnir-test -e POSTGRES_USER=mjolnir-tester -e POSTGRES_DB=mjolnir-test-db -d -p 127.0.0.1:8083:5432 postgres
-    # Wait until postgresql is ready
-    - until psql postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done
-    # Make table in postgres
-    - psql postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db -c "CREATE TABLE mjolnir (local_part VARCHAR(255), owner VARCHAR(255), management_room TEXT)"
     # Launch the reverse proxy, listening for connections *only* on the local host.
     - docker run --rm --network host --name mjolnir-test-reverse-proxy -p 127.0.0.1:8081:80 -v $MX_TEST_CWD/test/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx
     - yarn install
-    - npx ts-node src/appservice/cli.ts -r -u "http://host.docker.internal:9000"
-    - cp mjolnir-registration.yaml $MX_TEST_SYNAPSE_DIR/data/
   after:
     # Wait until Synapse is ready
     - until curl localhost:9999 --stderr /dev/null > /dev/null; do echo "Waiting for Synapse..."; sleep 1s; done
@@ -22,7 +15,6 @@ run:
 
 down:
   finally:
-    - docker stop mjolnir-test-postgres || true
     - docker stop mjolnir-test-reverse-proxy || true
 
 modules:
@@ -44,9 +36,6 @@ homeserver:
   enable_registration: true
   enable_registration_without_verification: true
 
-  app_service_config_files:
-    - "/data/mjolnir-registration.yaml"
-
   # We remove rc_message so we can test rate limiting,
   # but we keep the others because of https://github.com/matrix-org/synapse/issues/11785
   # and we don't want to slow integration tests down.
@@ -81,18 +70,7 @@ homeserver:
     msc3823_account_suspension: true
 
 
-# Creating a few users simplifies testing.
+# Creating an admin user simplifies testing.
 users:
   - localname: admin
     admin: true
-    rooms:
-      - public: true
-        name: "List of users"
-        alias: access-control-list
-        members:
-          - admin
-          - user_in_mjolnir_for_all
-  # This user can use Mjölnir-for-all
-  - localname: user_in_mjolnir_for_all
-  # This user cannot
-  - localname: user_regular

mx-tester.yml

@@ -15,8 +15,6 @@
     "test": "ts-mocha --project ./tsconfig.json test/commands/**/*.ts",
     "test:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json \"test/integration/**/*Test.ts\"",
     "test:integration:single": "NODE_ENV=harness npx ts-mocha --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json",
-    "test:appservice:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --timeout 300000 --project ./tsconfig.json \"test/appservice/integration/**/*Test.ts\"",
-    "test:appservice:integration:single": "NODE_ENV=harness npx ts-mocha --timeout 300000 --project ./tsconfig.json",
     "test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts",
     "version": "sed -i '/# version automated/s/[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*/'$npm_package_version'/' synapse_antispam/setup.py && git add synapse_antispam/setup.py && cat synapse_antispam/setup.py"
   },
@@ -29,9 +27,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/jsdom": "^16.2.11",
     "@types/mocha": "^9.0.0",
-    "@types/nedb": "^1.8.12",
     "@types/node": "^22.0.0",
-    "@types/pg": "^8.6.5",
     "@types/request": "^2.48.13",
     "@types/shell-quote": "1.7.1",
     "@types/simple-oauth2": "^5.0.7",
@@ -51,18 +47,15 @@
     "@vector-im/matrix-bot-sdk": "^0.8.0-element.2",
     "await-lock": "^2.2.2",
     "axios": "^1.15.2",
-    "body-parser": "^1.20.1",
     "config": "^3.3.8",
     "express": "^4.20",
     "html-to-text": "^8.0.0",
     "humanize-duration": "^3.27.1",
     "humanize-duration-ts": "^2.1.1",
     "js-yaml": "^4.3.0",
     "jsdom": "^16.6.0",
-    "matrix-appservice-bridge": "^11.2.0",
     "nsfwjs": "^4.1.0",
     "parse-duration": "^2.1.3",
-    "pg": "^8.8.0",
     "prom-client": "^14.1.0",
     "shell-quote": "^1.9.0",
     "simple-oauth2": "^5.1.0",

package.json

@@ -20,9 +20,8 @@ import { MatrixClient } from "@vector-im/matrix-bot-sdk";
 /**
  * This is an interface created in order to keep the event listener
  * Mjolnir uses for new events generic.
- * Used to provide a unified API for messages received from matrix-bot-sdk (using GET /sync)
- * when we're in single bot mode and messages received from matrix-appservice-bridge (using pushed /transaction)
- * when we're in appservice mode.
+ * Currently the only implementation is the matrix-bot-sdk's `MatrixClient`,
+ * which sources messages from GET /sync.
  */
 export declare interface MatrixEmitter extends EventEmitter {
     on(event: "room.event", listener: (roomId: string, mxEvent: any) => void): this;