♻️ Final provisioner route.

.gitignore

@@ -1,3 +1,4 @@
+.env
 config.yml
 lib/
 node_modules/

config.sample.yml

@@ -131,7 +131,7 @@ listeners:
 
 #bot:
 #  # (Optional) Define profile information for the bot user
-#  displayname: Hookshot Bot
+#  displayname: Bridge Bot
 #  avatar: mxc://half-shot.uk/2876e89ccade4cb615e210c458e2a7a6883fe17d
 
 #serviceBots:

helm/hookshot/values.yaml

@@ -217,7 +217,7 @@ hookshot:
     # bot:
       # (Optional) Define profile information for the bot user
       #
-      # displayname: Hookshot Bot
+      # displayname: Bridge Bot
       # avatar: mxc://half-shot.uk/2876e89ccade4cb615e210c458e2a7a6883fe17d
     # serviceBots:
       # (Optional) Define additional bot users for specific services

src/Bridge.ts

@@ -141,14 +141,14 @@ export class Bridge {
             const routers = [];
             if (this.config.jira) {
                 routers.push({
-                    route: "/bridge/jira",
+                    route: "/provisioner/jira",
                     router: new JiraProvisionerRouter(this.config.jira, this.tokenStore).getRouter(),
                 });
                 this.connectionManager.registerProvisioningConnection(JiraProjectConnection);
             }
             if (this.config.github && this.github) {
                 routers.push({
-                    route: "/bridge/github",
+                    route: "/provisioner/github",
                     router: new GitHubProvisionerRouter(this.config.github, this.tokenStore, this.github).getRouter(),
                 });
                 this.connectionManager.registerProvisioningConnection(GitHubRepoConnection);
@@ -162,7 +162,7 @@ export class Bridge {
             if (this.config.mqtt?.enabled) {
                 // Register the internal backend route for get all live connections
                 routers.push({
-                    route: "/bridge/mqtt",
+                    route: "/provisioner/mqtt",
                     router: new MqttProvisionerRouter(this.config.provisioning).getRouter(),
                 });
                 this.connectionManager.registerProvisioningConnection(MqttConnection);

src/config/Defaults.ts

@@ -46,7 +46,7 @@ export const DefaultConfigRoot: BridgeConfigRoot = {
         },
     },
     bot: {
-        displayname: "Hookshot Bot",
+        displayname: "Bridge Bot",
         avatar: "mxc://half-shot.uk/2876e89ccade4cb615e210c458e2a7a6883fe17d"
     },
     serviceBots: [

src/mqtt/Router.ts

@@ -1,8 +1,9 @@
-import { BridgeConfigMqtt, BridgeConfigProvisioning } from "../config/Config";
+import { BridgeConfigProvisioning } from "../config/Config";
 import { Router, Request, Response, NextFunction } from "express";
 import { Logger } from "matrix-appservice-bridge";
 import { ApiError, ErrCode } from "../api";
 import { selectAllConnections } from "../db/generated/queries_sql";
+import { executeSchema } from "./mqttConnectionManager";
 import { Pool } from "pg";
 
 const log = new Logger("MqttRouter");
@@ -15,14 +16,15 @@ export interface AdaptedMqttLiveConnection {
     spaces_ids: string[];
 }
 
-
 export class MqttProvisionerRouter {
     private dbCli: Pool;
 
     constructor(
         private readonly provConfig: BridgeConfigProvisioning) {
             this.provConfig = provConfig;
             this.dbCli = new Pool({ connectionString: process.env.DATABASE_URL });
+            log.info('mqtt_router: initialized database connection');
+            executeSchema(this.dbCli);
         }
 
     public getRouter() {

src/mqtt/mqttConnectionManager.ts

@@ -1,18 +1,18 @@
 import { Logger } from "matrix-appservice-bridge";
 import { BridgeConfigMqtt } from "../config/Config";
 import { Pool } from "pg";
-import { SelectSpaceConnectionsArgs, selectSpaceConnections, selectConnection, insertConnection, updateConnectionAssociatedSpaces, deleteSpaceFromConnectionAndPrune, selectAllConnections } from "../db/generated/queries_sql";
+import { selectConnection, insertConnection, updateConnectionAssociatedSpaces, deleteSpaceFromConnectionAndPrune } from "../db/generated/queries_sql";
 import axios from "axios";
 import "dotenv/config";
 import { MqttConnectionState } from "../Connections/MqttConnection";
 import * as fs from 'fs';
 
 const log = new Logger("MqttConnectionsManager");
 
-function executeSchema(dbCli: Pool) {
+export async function executeSchema(dbCli: Pool) {
     try {
         const schemaSql = fs.readFileSync('./src/db/schema.sql', 'utf8');
-        dbCli.query(schemaSql);
+        await dbCli.query(schemaSql);
         log.info('MQTT table created successfully');
     } catch (err) {
         log.info('Error creating MQTT table: ', err);
@@ -24,6 +24,7 @@ export class MqttConnectionsManager {
 
     constructor() {
         this.dbCli = new Pool({ connectionString: process.env.DATABASE_URL });
+        log.info('MqttConnectionsManager: initialized database connection');
         executeSchema(this.dbCli);
     }
 

src/provisioning/provisioner.ts

@@ -24,7 +24,7 @@ export class Provisioner {
         private readonly botUsersManager: BotUsersManager,
         private readonly as: Appservice,
         additionalRoutes: {route: string, router: Router}[]) {
-        this.expressRouter.use("/bridge", (req, _res, next) => {
+        this.expressRouter.use("/provisioner", (req, _res, next) => {
             Metrics.provisioningHttpRequest.inc({path: req.path, method: req.method});
             next();
         });
@@ -42,44 +42,44 @@ export class Provisioner {
             maxAge: 86400, // 24 hours
         };
         this.expressRouter.use(cors(corsOptions));
-        this.expressRouter.get("/bridge/health", this.getHealth);
-        this.expressRouter.use("/bridge", this.checkAuth.bind(this));
+        this.expressRouter.get("/provisioner/health", this.getHealth);
+        this.expressRouter.use("/provisioner", this.checkAuth.bind(this));
         this.expressRouter.use(express.json());
         this.expressRouter.get(
-            "/bridge/connectiontypes",
+            "/provisioner/connectiontypes",
             this.getConnectionTypes.bind(this),
         );
-        this.expressRouter.use("/bridge", this.checkUserId.bind(this));
+        this.expressRouter.use("/provisioner", this.checkUserId.bind(this));
         additionalRoutes.forEach(route => {
             this.expressRouter.use(route.route, route.router);
         });
         // Room Routes
         this.expressRouter.get<{roomId: string}, unknown, unknown, {userId: string}>(
-            "/bridge/:roomId/connections",
+            "/provisioner/:roomId/connections",
             this.checkRoomId.bind(this),
             (...args) => this.checkUserPermission("read", ...args),
             this.getConnections.bind(this),
         );
         this.expressRouter.get<{roomId: string, connectionId: string}, unknown, unknown, {userId: string}>(
-            "/bridge/:roomId/connections/:connectionId",
+            "/provisioner/:roomId/connections/:connectionId",
             this.checkRoomId.bind(this),
             (...args) => this.checkUserPermission("read", ...args),
             this.getConnection.bind(this),
         );
         this.expressRouter.put<{roomId: string, type: string}, unknown, Record<string, unknown>, {userId: string}>(
-            "/bridge/:roomId/connections/:type",
+            "/provisioner/:roomId/connections/:type",
             this.checkRoomId.bind(this),
             (...args) => this.checkUserPermission("write", ...args),
             this.putConnection.bind(this),
         );
         this.expressRouter.patch<{roomId: string, connectionId: string}, unknown, Record<string, unknown>, {userId: string}>(
-            "/bridge/:roomId/connections/:connectionId",
+            "/provisioner/:roomId/connections/:connectionId",
             this.checkRoomId.bind(this),
             (...args) => this.checkUserPermission("write", ...args),
             this.patchConnection.bind(this),
         );
         this.expressRouter.delete<{roomId: string, connectionId: string}, unknown, unknown, {userId: string}>(
-            "/bridge/:roomId/connections/:connectionId",
+            "/provisioner/:roomId/connections/:connectionId",
             this.checkRoomId.bind(this),
             (...args) => this.checkUserPermission("write", ...args),
             this.deleteConnection.bind(this),