syn2mas: typescript fixes

Author: sandhose

tools/syn2mas/package-lock.json

@@ -21,7 +21,7 @@
     "eslint-config-google": "^0.14.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org",
+    "eslint-plugin-matrix-org": "^1.2.1",
     "eslint-plugin-unicorn": "^48.0.1",
     "prettier": "^3.0.3",
     "ts-node": "^10.9.1",

tools/syn2mas/package.json

@@ -1,14 +1,31 @@
 import knex, { Knex } from "knex";
 
-import { SynapseConfig } from "./types/SynapseConfig";
+import { DatabaseConfig, Psycopg2DatabaseConfig, Sqlite3DatabaseConfig, SynapseConfig } from "./types/SynapseConfig";
 import { MASConfig } from "./types/MASConfig";
 
+function isSqlite3(config: DatabaseConfig): config is Sqlite3DatabaseConfig {
+    return config.name === "sqlite3";
+}
+
+function isPsycopg2(config: DatabaseConfig): config is Psycopg2DatabaseConfig {
+  return config.name === "psycopg2";
+}
+
 export function connectToSynapseDatabase({ database }: SynapseConfig): Knex<{}, unknown[]> {
-  if (database?.name === "sqlite3") {
-    return knex({ client: "sqlite3", connection: { filename: database.args.database }, useNullAsDefault: true });
+  if (!database) {
+    throw new Error("Synapse database not configured");
+  }
+
+  if (isSqlite3(database)) {
+    const filename = database.args?.database;
+    if (!filename) {
+        throw new Error("Synapse sqlite3 database not configured");
+    }
+
+    return knex({ client: "sqlite3", connection: { filename }, useNullAsDefault: true });
   }
 
-  if (database.name === "psycopg2") {
+  if (isPsycopg2(database)) {
     return knex({ client: "pg", connection: {
       user: database?.args?.user,
       database: database?.args?.database,

tools/syn2mas/src/db.mts

@@ -95,7 +95,7 @@ export async function migrate(argv?: string[]): Promise<void> {
     upstreamProviders.set(providerId, existingProvider);
   }
 
-  function stringifyAndRedact(input: any): string {
+  function stringifyAndRedact(input: unknown): string {
     const x = JSON.stringify(input);
 
     return x.replace(/("(password_hash|hashed_password|access_token|token)":")[^"]*"/, "$1redacted\"");

tools/syn2mas/src/migrate.mts

@@ -9,23 +9,28 @@ export interface SynapseOIDCProvider {
   client_secret_jwt_key?: string;
 }
 
-export interface SynapseConfig {
-  database?: {
+export interface Sqlite3DatabaseConfig {
     name: "sqlite3";
     args?: {
-      database: string;
-    };
-  } | {
-    name: "psycopg2";
-    args?: {
-      user?: string;
-      password?: string;
-      database?: string;
-      host?: string;
-      port?: number;
+        database: string;
     };
-  } | any;
+}
 
+export interface Psycopg2DatabaseConfig {
+  name: "psycopg2";
+  args?: {
+    user?: string;
+    password?: string;
+    database?: string;
+    host?: string;
+    port?: number;
+  };
+}
+
+export type DatabaseConfig = Sqlite3DatabaseConfig | Psycopg2DatabaseConfig | { name?: Omit<string, "sqlite3" | "psycopg2"> };
+
+export interface SynapseConfig {
+  database?: DatabaseConfig;
   oidc_providers?: SynapseOIDCProvider[];
   oidc_config?: SynapseOIDCProvider;
   allow_guest_access?: boolean;