Merge branch 'dev' into clients-pops

server/setup/migrationsPg.ts

@@ -2,14 +2,16 @@ import { migrate } from "drizzle-orm/node-postgres/migrator";
 import { db } from "../db/pg";
 import semver from "semver";
 import { versionMigrations } from "../db/pg";
-import { __DIRNAME, APP_PATH, APP_VERSION } from "@server/lib/consts";
+import { __DIRNAME, APP_VERSION } from "@server/lib/consts";
 import path from "path";
+import m1 from "./scriptsSqlite/1.6.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
 
 // Define the migration list with versions and their corresponding functions
 const migrations = [
+    { version: "1.6.0", run: m1 }
     // Add new migrations here as they are created
 ] as {
     version: string;

server/setup/migrationsSqlite.ts

@@ -21,6 +21,7 @@ import m17 from "./scriptsSqlite/1.1.0";
 import m18 from "./scriptsSqlite/1.2.0";
 import m19 from "./scriptsSqlite/1.3.0";
 import m20 from "./scriptsSqlite/1.5.0";
+import m21 from "./scriptsSqlite/1.6.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -42,6 +43,7 @@ const migrations = [
     { version: "1.2.0", run: m18 },
     { version: "1.3.0", run: m19 },
     { version: "1.5.0", run: m20 },
+    { version: "1.6.0", run: m21 }
     // Add new migrations here as they are created
 ] as const;
 

server/setup/scriptsPg/1.6.0.ts

@@ -0,0 +1,57 @@
+import { db } from "@server/db/pg/driver";
+import { configFilePath1, configFilePath2 } from "@server/lib/consts";
+import { sql } from "drizzle-orm";
+import fs from "fs";
+import yaml from "js-yaml";
+
+const version = "1.6.0";
+
+export default async function migration() {
+    console.log(`Running setup script ${version}...`);
+
+    try {
+        db.execute(sql`UPDATE 'user' SET email = LOWER(email);`);
+        db.execute(sql`UPDATE 'user' SET username = LOWER(username);`);
+        console.log(`Migrated database schema`);
+    } catch (e) {
+        console.log("Unable to make all usernames and emails lowercase");
+        console.log(e);
+    }
+
+    try {
+        // Determine which config file exists
+        const filePaths = [configFilePath1, configFilePath2];
+        let filePath = "";
+        for (const path of filePaths) {
+            if (fs.existsSync(path)) {
+                filePath = path;
+                break;
+            }
+        }
+
+        if (!filePath) {
+            throw new Error(
+                `No config file found (expected config.yml or config.yaml).`
+            );
+        }
+
+        // Read and parse the YAML file
+        let rawConfig: any;
+        const fileContents = fs.readFileSync(filePath, "utf8");
+        rawConfig = yaml.load(fileContents);
+
+        if (rawConfig.server?.trust_proxy) {
+            rawConfig.server.trust_proxy = 1;
+        }
+
+        // Write the updated YAML back to the file
+        const updatedYaml = yaml.dump(rawConfig);
+        fs.writeFileSync(filePath, updatedYaml, "utf8");
+
+        console.log(`Set trust_proxy to 1 in config file`);
+    } catch (e) {
+        console.log(`Unable to migrate config file. Error: ${e}`);
+    }
+
+    console.log(`${version} migration complete`);
+}

server/setup/scriptsSqlite/1.6.0.ts

@@ -0,0 +1,66 @@
+import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts";
+import Database from "better-sqlite3";
+import fs from "fs";
+import yaml from "js-yaml";
+import path from "path";
+
+const version = "1.6.0";
+
+export default async function migration() {
+    console.log(`Running setup script ${version}...`);
+
+    const location = path.join(APP_PATH, "db", "db.sqlite");
+    const db = new Database(location);
+
+    try {
+        db.pragma("foreign_keys = OFF");
+        db.transaction(() => {
+            db.exec(`
+              UPDATE 'user' SET email = LOWER(email);
+              UPDATE 'user' SET username = LOWER(username);
+            `);
+        })(); // <-- executes the transaction immediately
+        db.pragma("foreign_keys = ON");
+        console.log(`Migrated database schema`);
+    } catch (e) {
+        console.log("Unable to make all usernames and emails lowercase");
+        console.log(e);
+    }
+
+    try {
+        // Determine which config file exists
+        const filePaths = [configFilePath1, configFilePath2];
+        let filePath = "";
+        for (const path of filePaths) {
+            if (fs.existsSync(path)) {
+                filePath = path;
+                break;
+            }
+        }
+
+        if (!filePath) {
+            throw new Error(
+                `No config file found (expected config.yml or config.yaml).`
+            );
+        }
+
+        // Read and parse the YAML file
+        let rawConfig: any;
+        const fileContents = fs.readFileSync(filePath, "utf8");
+        rawConfig = yaml.load(fileContents);
+
+        if (rawConfig.server?.trust_proxy) {
+            rawConfig.server.trust_proxy = 1;
+        }
+
+        // Write the updated YAML back to the file
+        const updatedYaml = yaml.dump(rawConfig);
+        fs.writeFileSync(filePath, updatedYaml, "utf8");
+
+        console.log(`Set trust_proxy to 1 in config file`);
+    } catch (e) {
+        console.log(`Unable to migrate config file. Please do it manually. Error: ${e}`);
+    }
+
+    console.log(`${version} migration complete`);
+}