Merge pull request #310 from C4illin/refactor-elysia-router

Author: C4illin

.dockerignore

@@ -2,18 +2,24 @@
 .editorconfig
 .env
 .git
+.gitignore
+.github
 .idea
 .vscode
+biome.json
 CHANGELOG.md
+compose.yaml
 coverage*
 data
 docker-compose*
 Dockerfile*
 eslint.config.js
 helm-charts
+images
 LICENSE
 Makefile
 node_modules
 prettier.config.js
 README.md
-renovate.json
+renovate.json
+SECURITY.md

bun.lock

@@ -8,8 +8,8 @@ services:
     environment: # Defaults are listed below. All are optional.
       - ACCOUNT_REGISTRATION=true # true or false, doesn't matter for the first account (e.g. keep this to false if you only want one account)
       - JWT_SECRET=aLongAndSecretStringUsedToSignTheJSONWebToken1234 # will use randomUUID() by default
-      - HTTP_ALLOWED=true # setting this to true is unsafe, only set this to true locally
-      - ALLOW_UNAUTHENTICATED=true # allows anyone to use the service without logging in, only set this to true locally
+      - HTTP_ALLOWED=false # setting this to true is unsafe, only set this to true locally
+      - ALLOW_UNAUTHENTICATED=false # allows anyone to use the service without logging in, only set this to true locally
       - AUTO_DELETE_EVERY_N_HOURS=1 # checks every n hours for files older then n hours and deletes them, set to 0 to disable
       # - FFMPEG_ARGS=-hwaccel vulkan # additional arguments to pass to ffmpeg
       # - WEBROOT=/convertx # the root path of the web interface, leave empty to disable

compose.yaml

@@ -1,7 +1,7 @@
 import js from "@eslint/js";
 import eslintParserTypeScript from "@typescript-eslint/parser";
 import type { Linter } from "eslint";
-import eslintPluginReadableTailwind from "eslint-plugin-readable-tailwind";
+import eslintPluginBetterTailwindcss from "eslint-plugin-better-tailwindcss";
 import simpleImportSortPlugin from "eslint-plugin-simple-import-sort";
 import globals from "globals";
 import tseslint from "typescript-eslint";
@@ -13,7 +13,7 @@ export default [
   {
     plugins: {
       "simple-import-sort": simpleImportSortPlugin,
-      "readable-tailwind": eslintPluginReadableTailwind,
+      "better-tailwindcss": eslintPluginBetterTailwindcss,
     },
     ignores: ["**/node_modules/**"],
     languageOptions: {
@@ -30,28 +30,37 @@ export default [
       },
     },
     files: ["**/*.{js,mjs,cjs,jsx,tsx,ts}"],
+    settings: {
+      "better-tailwindcss": {
+        entryPoint: "src/main.css",
+      },
+    },
     rules: {
-      ...eslintPluginReadableTailwind.configs.warning.rules,
+      ...eslintPluginBetterTailwindcss.configs["recommended-warn"]?.rules,
+      ...eslintPluginBetterTailwindcss.configs["stylistic-warn"]?.rules,
       // "tailwindcss/classnames-order": "off",
-      "readable-tailwind/multiline": [
+      "better-tailwindcss/multiline": [
         "warn",
         {
           group: "newLine",
           printWidth: 100,
         },
       ],
-      // "tailwindcss/no-custom-classname": [
-      //   "warn",
-      //   {
-      //     whitelist: [
-      //       "select_container",
-      //       "convert_to_popup",
-      //       "convert_to_group",
-      //       "target",
-      //       "convert_to_target",
-      //     ],
-      //   },
-      // ],
+      "better-tailwindcss/no-unregistered-classes": [
+        "warn",
+        {
+          ignore: [
+            "^group(?:\\/(\\S*))?$",
+            "^peer(?:\\/(\\S*))?$",
+            "select_container",
+            "convert_to_popup",
+            "convert_to_group",
+            "target",
+            "convert_to_target",
+            "job-details-toggle",
+          ],
+        },
+      ],
     },
   },
 ] as Linter.Config[];

eslint.config.ts

@@ -32,23 +32,18 @@
     "@tailwindcss/postcss": "^4.1.7",
     "@total-typescript/ts-reset": "^0.6.1",
     "@types/bun": "^1.2.14",
-    "@types/eslint-plugin-tailwindcss": "^3.17.0",
     "@types/node": "^22.15.21",
-    "autoprefixer": "^10.4.21",
-    "cssnano": "^7.0.7",
     "eslint": "^9.27.0",
-    "eslint-plugin-readable-tailwind": "^2.1.2",
+    "eslint-plugin-better-tailwindcss": "^3.0.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-tailwindcss": "4.0.0-alpha.0",
     "globals": "^16.1.0",
     "knip": "^5.57.2",
     "npm-run-all2": "^8.0.3",
     "postcss": "^8.5.3",
-    "postcss-cli": "^11.0.1",
     "prettier": "^3.5.3",
     "tailwind-scrollbar": "^4.0.2",
     "tailwindcss": "^4.1.7",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.32.1"
   }
-}
+}

package.json

@@ -44,8 +44,8 @@ export const BaseHtml = ({
           <a
             href="https://github.com/C4illin/ConvertX"
             class={`
-              hover:text-accent-500
               text-neutral-400
+              hover:text-accent-500
             `}
           >
             ConvertX{" "}

src/components/base.tsx

@@ -0,0 +1,44 @@
+import { Database } from "bun:sqlite";
+const db = new Database("./data/mydb.sqlite", { create: true });
+
+if (!db.query("SELECT * FROM sqlite_master WHERE type='table'").get()) {
+  db.exec(`
+CREATE TABLE IF NOT EXISTS users (
+	id INTEGER PRIMARY KEY AUTOINCREMENT,
+	email TEXT NOT NULL,
+	password TEXT NOT NULL
+);
+CREATE TABLE IF NOT EXISTS file_names (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  job_id INTEGER NOT NULL,
+  file_name TEXT NOT NULL,
+  output_file_name TEXT NOT NULL,
+  status TEXT DEFAULT 'not started',
+  FOREIGN KEY (job_id) REFERENCES jobs(id)
+);
+CREATE TABLE IF NOT EXISTS jobs (
+	id INTEGER PRIMARY KEY AUTOINCREMENT,
+	user_id INTEGER NOT NULL,
+	date_created TEXT NOT NULL,
+  status TEXT DEFAULT 'not started',
+  num_files INTEGER DEFAULT 0,
+  FOREIGN KEY (user_id) REFERENCES users(id)
+);
+PRAGMA user_version = 1;`);
+}
+
+const dbVersion = (
+  db.query("PRAGMA user_version").get() as { user_version?: number }
+).user_version;
+if (dbVersion === 0) {
+  db.exec(
+    "ALTER TABLE file_names ADD COLUMN status TEXT DEFAULT 'not started';",
+  );
+  db.exec("PRAGMA user_version = 1;");
+  console.log("Updated database to version 1.");
+}
+
+// enable WAL mode
+db.exec("PRAGMA journal_mode = WAL;");
+
+export default db;

src/db/db.ts

@@ -0,0 +1,17 @@
+export const ACCOUNT_REGISTRATION =
+  process.env.ACCOUNT_REGISTRATION?.toLowerCase() === "true" || false;
+
+export const HTTP_ALLOWED =
+  process.env.HTTP_ALLOWED?.toLowerCase() === "true" || false;
+
+export const ALLOW_UNAUTHENTICATED =
+  process.env.ALLOW_UNAUTHENTICATED?.toLowerCase() === "true" || false;
+
+export const AUTO_DELETE_EVERY_N_HOURS = process.env.AUTO_DELETE_EVERY_N_HOURS
+  ? Number(process.env.AUTO_DELETE_EVERY_N_HOURS)
+  : 24;
+
+export const HIDE_HISTORY =
+  process.env.HIDE_HISTORY?.toLowerCase() === "true" || false;
+
+export const WEBROOT = process.env.WEBROOT ?? "";