Merge pull request #90 from C4illin/release-please--branches--main--components--convertx-frontend

build(deps-dev): bump @types/node from 20.14.13 to 22.0.0

.eslintrc.cjs

@@ -12,17 +12,11 @@ const config = {
     ecmaVersion: "latest",
     sourceType: "module",
     tsconfigRootDir: __dirname,
-    project: [
+    project: ["./tsconfig.json"],
-      "./tsconfig.json",
-      "./cli/tsconfig.eslint.json", // separate eslint config for the CLI since we want to lint and typecheck differently due to template files
-      "./upgrade/tsconfig.json",
-      "./www/tsconfig.json",
-    ],
   },
   overrides: [
     // Template files don't have reliable type information
     {
-      files: ["./cli/template/**/*.{ts,tsx}"],
       extends: ["plugin:@typescript-eslint/disable-type-checked"],
     },
   ],
@@ -46,9 +40,6 @@ const config = {
     // These lint rules don't make sense for us but are enabled in the preset configs
     "@typescript-eslint/no-confusing-void-expression": "off",
     "@typescript-eslint/restrict-template-expressions": "off",
-
-    // This rule doesn't seem to be working properly
-    "@typescript-eslint/prefer-nullish-coalescing": "off",
   },
 };
 

.github/workflows/docker-publish.yml

@@ -61,6 +61,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -46,4 +46,5 @@ package-lock.json
 /output
 /db
 /data
-/Bruno
+/Bruno
+/tsconfig.tsbuildinfo

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
+}

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.3.3](https://github.com/C4illin/ConvertX/compare/v0.3.2...v0.3.3) (2024-07-30)
+
+
+### Bug Fixes
+
+* downgrade @elysiajs/html dependency to version 1.0.2 ([c714ade](https://github.com/C4illin/ConvertX/commit/c714ade3e23865ba6cfaf76c9e7259df1cda222c))
+
+## [0.3.2](https://github.com/C4illin/ConvertX/compare/v0.3.1...v0.3.2) (2024-07-09)
+
+
+### Bug Fixes
+
+* increase max request body to support large uploads ([3ae2db5](https://github.com/C4illin/ConvertX/commit/3ae2db5d9b36fe3dcd4372ddcd32aa573ea59aa6)), closes [#64](https://github.com/C4illin/ConvertX/issues/64)
+
 ## [0.3.1](https://github.com/C4illin/ConvertX/compare/v0.3.0...v0.3.1) (2024-06-27)
 
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM oven/bun:1-alpine as base
+FROM oven/bun:1.1.21-alpine as base
 WORKDIR /app
 
 # install dependencies into temp directory

README.md

@@ -28,6 +28,8 @@ A self-hosted online file converter. Supports 831 different formats. Written wit
 
 <!-- many ffmpeg fileformats are duplicates -->
 
+Any missing converter? Open an issue or pull request!
+
 ## Deployment
 
 ```yml

package.json

@@ -1,40 +1,48 @@
 {
   "name": "convertx-frontend",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "scripts": {
     "dev": "bun run --watch src/index.tsx",
     "hot": "bun run --hot src/index.tsx",
     "format": "biome format --write ./src",
-    "css": "cpy 'node_modules/@picocss/pico/css/pico.lime.min.css' 'src/public/' --flat"
+    "css": "cpy 'node_modules/@picocss/pico/css/pico.lime.min.css' 'src/public/' --flat",
+    "lint": "run-p 'lint:*'",
+    "lint:tsc": "tsc --noEmit",
+    "lint:knip": "knip"
   },
   "dependencies": {
     "@elysiajs/cookie": "^0.8.0",
-    "@elysiajs/html": "^1.0.2",
+    "@elysiajs/html": "1.0.2",
-    "@elysiajs/jwt": "^1.0.2",
+    "@elysiajs/jwt": "^1.1.0",
-    "@elysiajs/static": "^1.0.3",
+    "@elysiajs/static": "1.0.3",
-    "elysia": "^1.0.25"
+    "elysia": "^1.1.4"
   },
   "module": "src/index.tsx",
+  "type": "module",
   "bun-create": {
     "start": "bun run src/index.tsx"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.8.2",
+    "@biomejs/biome": "1.8.3",
-    "@ianvs/prettier-plugin-sort-imports": "^4.3.0",
+    "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
-    "@kitajs/ts-html-plugin": "^4.0.1",
+    "@kitajs/ts-html-plugin": "^4.0.2",
     "@picocss/pico": "^2.0.6",
     "@total-typescript/ts-reset": "^0.5.1",
     "@types/bun": "^1.1.6",
-    "@types/eslint": "^8.56.10",
+    "@types/eslint": "^9.6.0",
-    "@types/node": "^20.14.9",
+    "@types/node": "^22.0.0",
-    "@types/ws": "^8.5.10",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.18.0",
-    "@typescript-eslint/parser": "^7.14.1",
     "cpy-cli": "^5.0.0",
+    "eslint": "^9.8.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-import": "^2.29.1",
-    "prettier": "^3.3.2",
+    "eslint-plugin-isaacscript": "^3.12.2",
-    "typescript": "^5.5.2"
+    "eslint-plugin-prettier": "^5.2.1",
+    "knip": "^5.27.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^3.3.3",
+    "typescript": "^5.5.4"
   },
   "trustedDependencies": [
     "@biomejs/biome"

src/components/base.tsx

@@ -1,4 +1,7 @@
-export const BaseHtml = ({ children, title = "ConvertX" }) => (
+export const BaseHtml = ({
+  children,
+  title = "ConvertX",
+}: { children: JSX.Element; title?: string }) => (
   <html lang="en">
     <head>
       <meta charset="UTF-8" />

src/components/header.tsx

@@ -30,7 +30,7 @@ export const Header = ({
   }
 
   return (
-    <header className="container">
+    <header class="container">
       <nav>
         <ul>
           <li>

src/converters/ffmpeg.ts

@@ -260,6 +260,7 @@ export const properties = {
       "mpegts",
       "mpegtsraw",
       "mpegvideo",
+      "mpg",
       "mpjpeg",
       "mpl2",
       "mpo",

src/converters/main.ts

@@ -201,7 +201,7 @@ for (const converterName in properties) {
 }
 possibleInputs.sort();
 
-export const getPossibleInputs = () => {
+const getPossibleInputs = () => {
   return possibleInputs;
 };
 

src/converters/old.sharp.ts

@@ -1,119 +0,0 @@
-import sharp from "sharp";
-import type { FormatEnum } from "sharp";
-
-// declare possible conversions
-export const properties = {
-  from: {
-    images: [
-      "avif",
-      "bif",
-      "csv",
-      "exr",
-      "fits",
-      "gif",
-      "hdr.gz",
-      "hdr",
-      "heic",
-      "heif",
-      "img.gz",
-      "img",
-      "j2c",
-      "j2k",
-      "jp2",
-      "jpeg",
-      "jpx",
-      "jxl",
-      "mat",
-      "mrxs",
-      "ndpi",
-      "nia.gz",
-      "nia",
-      "nii.gz",
-      "nii",
-      "pdf",
-      "pfm",
-      "pgm",
-      "pic",
-      "png",
-      "ppm",
-      "raw",
-      "scn",
-      "svg",
-      "svs",
-      "svslide",
-      "szi",
-      "tif",
-      "tiff",
-      "v",
-      "vips",
-      "vms",
-      "vmu",
-      "webp",
-      "zip",
-    ],
-  },
-  to: {
-    images: [
-      "avif",
-      "dzi",
-      "fits",
-      "gif",
-      "hdr.gz",
-      "heic",
-      "heif",
-      "img.gz",
-      "j2c",
-      "j2k",
-      "jp2",
-      "jpeg",
-      "jpx",
-      "jxl",
-      "mat",
-      "nia.gz",
-      "nia",
-      "nii.gz",
-      "nii",
-      "png",
-      "tiff",
-      "vips",
-      "webp",
-    ],
-  },
-  options: {
-    svg: {
-      scale: {
-        description: "Scale the image up or down",
-        type: "number",
-        default: 1,
-      },
-    },
-  },
-};
-
-export async function convert(
-  filePath: string,
-  fileType: string,
-  convertTo: keyof FormatEnum,
-  targetPath: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-  options?: any,
-) {
-  if (fileType === "svg") {
-    const scale = options.scale || 1;
-    const metadata = await sharp(filePath).metadata();
-
-    if (!metadata || !metadata.width || !metadata.height) {
-      throw new Error("Could not get metadata from image");
-    }
-
-    const newWidth = Math.round(metadata.width * scale);
-    const newHeight = Math.round(metadata.height * scale);
-
-    return await sharp(filePath)
-      .resize(newWidth, newHeight)
-      .toFormat(convertTo)
-      .toFile(targetPath);
-  }
-
-  return await sharp(filePath).toFormat(convertTo).toFile(targetPath);
-}

src/helpers/printVersions.ts

@@ -72,4 +72,14 @@ if (process.env.NODE_ENV === "production") {
       console.log(stdout.split("\n")[0]);
     }
   });
+
+  exec("bun -v", (error, stdout) => {
+    if (error) {
+      console.error("Bun is not installed. wait what");
+    }
+
+    if (stdout) {
+      console.log(`Bun v${stdout.split("\n")[0]}`);
+    }
+  });
 }

src/index.tsx

@@ -21,9 +21,7 @@ import {
 } from "./helpers/normalizeFiletype";
 import "./helpers/printVersions";
 
-
+mkdir("./data", { recursive: true }).catch(console.error);
-
-
 const db = new Database("./data/mydb.sqlite", { create: true });
 const uploadsDir = "./data/uploads/";
 const outputDir = "./data/output/";
@@ -78,33 +76,37 @@ if (dbVersion === 0) {
 
 let FIRST_RUN = db.query("SELECT * FROM users").get() === null || false;
 
-interface IUser {
+class User {
-  id: number;
+  id!: number;
-  email: string;
+  email!: string;
-  password: string;
+  password!: string;
 }
 
-interface IFileNames {
+class Filename {
-  id: number;
+  id!: number;
-  job_id: number;
+  job_id!: number;
-  file_name: string;
+  file_name!: string;
-  output_file_name: string;
+  output_file_name!: string;
-  status: string;
+  status!: string;
 }
 
-interface IJobs {
+class Jobs {
-  finished_files: number;
+  finished_files!: number;
-  id: number;
+  id!: number;
-  user_id: number;
+  user_id!: number;
-  date_created: string;
+  date_created!: string;
-  status: string;
+  status!: string;
-  num_files: number;
+  num_files!: number;
 }
 
 // enable WAL mode
 db.exec("PRAGMA journal_mode = WAL;");
 
-const app = new Elysia()
+const app = new Elysia({
+  serve: {
+    maxRequestBodySize: Number.MAX_SAFE_INTEGER,
+  },
+})
   .use(cookie())
   .use(html())
   .use(
@@ -173,36 +175,38 @@ const app = new Elysia()
 
     return (
       <BaseHtml title="ConvertX | Register">
-        <Header accountRegistration={ACCOUNT_REGISTRATION} />
+        <>
-        <main class="container">
+          <Header accountRegistration={ACCOUNT_REGISTRATION} />
-          <article>
+          <main class="container">
-            <form method="post">
+            <article>
-              <fieldset>
+              <form method="post">
-                <label>
+                <fieldset>
-                  Email
+                  <label>
-                  <input
+                    Email
-                    type="email"
+                    <input
-                    name="email"
+                      type="email"
-                    placeholder="Email"
+                      name="email"
-                    autocomplete="email"
+                      placeholder="Email"
-                    required
+                      autocomplete="email"
-                  />
+                      required
-                </label>
+                    />
-                <label>
+                  </label>
-                  Password
+                  <label>
-                  <input
+                    Password
-                    type="password"
+                    <input
-                    name="password"
+                      type="password"
-                    placeholder="Password"
+                      name="password"
-                    autocomplete="new-password"
+                      placeholder="Password"
-                    required
+                      autocomplete="new-password"
-                  />
+                      required
-                </label>
+                    />
-              </fieldset>
+                  </label>
-              <input type="submit" value="Register" />
+                </fieldset>
-            </form>
+                <input type="submit" value="Register" />
-          </article>
+              </form>
-        </main>
+            </article>
+          </main>
+        </>
       </BaseHtml>
     );
   })
@@ -233,9 +237,17 @@ const app = new Elysia()
         savedPassword,
       );
 
-      const user = (await db
+      const user = db
         .query("SELECT * FROM users WHERE email = ?")
-        .get(body.email)) as IUser;
+        .as(User)
+        .get(body.email);
+
+      if (!user) {
+        set.status = 500;
+        return {
+          message: "Failed to create user.",
+        };
+      }
 
       const accessToken = await jwt.sign({
         id: String(user.id),
@@ -279,52 +291,55 @@ const app = new Elysia()
 
     return (
       <BaseHtml title="ConvertX | Login">
-        <Header accountRegistration={ACCOUNT_REGISTRATION} />
+        <>
-        <main class="container">
+          <Header accountRegistration={ACCOUNT_REGISTRATION} />
-          <article>
+          <main class="container">
-            <form method="post">
+            <article>
-              <fieldset>
+              <form method="post">
-                <label>
+                <fieldset>
-                  Email
+                  <label>
-                  <input
+                    Email
-                    type="email"
+                    <input
-                    name="email"
+                      type="email"
-                    placeholder="Email"
+                      name="email"
-                    autocomplete="email"
+                      placeholder="Email"
-                    required
+                      autocomplete="email"
-                  />
+                      required
-                </label>
+                    />
-                <label>
+                  </label>
-                  Password
+                  <label>
-                  <input
+                    Password
-                    type="password"
+                    <input
-                    name="password"
+                      type="password"
-                    placeholder="Password"
+                      name="password"
-                    autocomplete="current-password"
+                      placeholder="Password"
-                    required
+                      autocomplete="current-password"
-                  />
+                      required
-                </label>
+                    />
-              </fieldset>
+                  </label>
-              <div role="group">
+                </fieldset>
-                {ACCOUNT_REGISTRATION && (
+                <div role="group">
-                  <a href="/register" role="button" class="secondary">
+                  {ACCOUNT_REGISTRATION && (
-                    Register an account
+                    <a href="/register" role="button" class="secondary">
-                  </a>
+                      Register an account
-                )}
+                    </a>
-                <input type="submit" value="Login" />
+                  )}
-              </div>
+                  <input type="submit" value="Login" />
-            </form>
+                </div>
-          </article>
+              </form>
-        </main>
+            </article>
+          </main>
+        </>
       </BaseHtml>
     );
   })
   .post(
     "/login",
     async function handler({ body, set, redirect, jwt, cookie: { auth } }) {
-      const existingUser = (await db
+      const existingUser = await db
         .query("SELECT * FROM users WHERE email = ?")
-        .get(body.email)) as IUser;
+        .as(User)
+        .get(body.email);
 
       if (!existingUser) {
         set.status = 403;
@@ -398,9 +413,10 @@ const app = new Elysia()
     }
 
     // make sure user exists in db
-    const existingUser = (await db
+    const existingUser = await db
       .query("SELECT * FROM users WHERE id = ?")
-      .get(user.id)) as IUser;
+      .as(User)
+      .get(user.id);
 
     if (!existingUser) {
       if (auth?.value) {
@@ -437,16 +453,17 @@ const app = new Elysia()
 
     return (
       <BaseHtml>
-        <Header loggedIn />
+        <>
-        <main class="container">
+          <Header loggedIn />
-          <article>
+          <main class="container">
-            <h1>Convert</h1>
+            <article>
-            <div style={{ maxHeight: "50vh", overflowY: "auto" }}>
+              <h1>Convert</h1>
-              <table id="file-list" class="striped" />
+              <div style={{ maxHeight: "50vh", overflowY: "auto" }}>
-            </div>
+                <table id="file-list" class="striped" />
-            <input type="file" name="file" multiple />
+              </div>
-            {/* <label for="convert_from">Convert from</label> */}
+              <input type="file" name="file" multiple />
-            {/* <select name="convert_from" aria-label="Convert from" required>
+              {/* <label for="convert_from">Convert from</label> */}
+              {/* <select name="convert_from" aria-label="Convert from" required>
               <option selected disabled value="">
                 Convert from
               </option>
@@ -455,31 +472,34 @@ const app = new Elysia()
                 <option>{input}</option>
               ))}
             </select> */}
-          </article>
-          <form method="post" action="/convert">
-            <input type="hidden" name="file_names" id="file_names" />
-            <article>
-              <select name="convert_to" aria-label="Convert to" required>
-                <option selected disabled value="">
-                  Convert to
-                </option>
-                {Object.entries(getAllTargets()).map(([converter, targets]) => (
-                  // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-                  <optgroup label={converter}>
-                    {targets.map((target) => (
-                      // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-                      <option value={`${target},${converter}`} safe>
-                        {target}
-                      </option>
-                    ))}
-                  </optgroup>
-                ))}
-              </select>
             </article>
-            <input type="submit" value="Convert" />
+            <form method="post" action="/convert">
-          </form>
+              <input type="hidden" name="file_names" id="file_names" />
-        </main>
+              <article>
-        <script src="script.js" defer />
+                <select name="convert_to" aria-label="Convert to" required>
+                  <option selected disabled value="">
+                    Convert to
+                  </option>
+                  {Object.entries(getAllTargets()).map(
+                    ([converter, targets]) => (
+                      // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
+                      <optgroup label={converter}>
+                        {targets.map((target) => (
+                          // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
+                          <option value={`${target},${converter}`} safe>
+                            {target}
+                          </option>
+                        ))}
+                      </optgroup>
+                    ),
+                  )}
+                </select>
+              </article>
+              <input type="submit" value="Convert" />
+            </form>
+          </main>
+          <script src="script.js" defer />
+        </>
       </BaseHtml>
     );
   })
@@ -603,9 +623,10 @@ const app = new Elysia()
         return redirect("/", 302);
       }
 
-      const existingJob = (await db
+      const existingJob = await db
         .query("SELECT * FROM jobs WHERE id = ? AND user_id = ?")
-        .get(jobId.value, user.id)) as IJobs;
+        .as(Jobs)
+        .get(jobId.value, user.id);
 
       if (!existingJob) {
         return redirect("/", 302);
@@ -634,14 +655,12 @@ const app = new Elysia()
         return redirect("/", 302);
       }
 
-      db.run(
+      db.query(
-        "UPDATE jobs SET num_files = ?, status = 'pending' WHERE id = ?",
+        "UPDATE jobs SET num_files = ?1, status = 'pending' WHERE id = ?2",
-        fileNames.length,
+      ).run(fileNames.length, jobId.value);
-        jobId.value,
-      );
 
       const query = db.query(
-        "INSERT INTO file_names (job_id, file_name, output_file_name, status) VALUES (?, ?, ?, ?)",
+        "INSERT INTO file_names (job_id, file_name, output_file_name, status) VALUES (?1, ?2, ?3, ?4)",
       );
 
       // Start the conversion process in the background
@@ -662,16 +681,18 @@ const app = new Elysia()
             {},
             converterName,
           );
-
+          if (jobId.value) {
-          query.run(jobId.value, fileName, newFileName, result);
+            query.run(jobId.value, fileName, newFileName, result);
+          }
         }),
       )
         .then(() => {
           // All conversions are done, update the job status to 'completed'
-          db.run(
+          if (jobId.value) {
-            "UPDATE jobs SET status = 'completed' WHERE id = ?",
+            db.query("UPDATE jobs SET status = 'completed' WHERE id = ?1").run(
-            jobId.value,
+              jobId.value,
-          );
+            );
+          }
 
           // delete all uploaded files in userUploadsDir
           // rmSync(userUploadsDir, { recursive: true, force: true });
@@ -702,12 +723,14 @@ const app = new Elysia()
 
     let userJobs = db
       .query("SELECT * FROM jobs WHERE user_id = ?")
-      .all(user.id) as IJobs[];
+      .as(Jobs)
+      .all(user.id);
 
     for (const job of userJobs) {
       const files = db
         .query("SELECT * FROM file_names WHERE job_id = ?")
-        .all(job.id) as IFileNames[];
+        .as(Filename)
+        .all(job.id);
 
       job.finished_files = files.length;
     }
@@ -717,37 +740,39 @@ const app = new Elysia()
 
     return (
       <BaseHtml title="ConvertX | Results">
-        <Header loggedIn />
+        <>
-        <main class="container">
+          <Header loggedIn />
-          <article>
+          <main class="container">
-            <h1>Results</h1>
+            <article>
-            <table>
+              <h1>Results</h1>
-              <thead>
+              <table>
-                <tr>
+                <thead>
-                  <th>Time</th>
-                  <th>Files</th>
-                  <th>Files Done</th>
-                  <th>Status</th>
-                  <th>View</th>
-                </tr>
-              </thead>
-              <tbody>
-                {userJobs.map((job) => (
-                  // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
                   <tr>
-                    <td safe>{job.date_created}</td>
+                    <th>Time</th>
-                    <td>{job.num_files}</td>
+                    <th>Files</th>
-                    <td>{job.finished_files}</td>
+                    <th>Files Done</th>
-                    <td safe>{job.status}</td>
+                    <th>Status</th>
-                    <td>
+                    <th>View</th>
-                      <a href={`/results/${job.id}`}>View</a>
-                    </td>
                   </tr>
-                ))}
+                </thead>
-              </tbody>
+                <tbody>
-            </table>
+                  {userJobs.map((job) => (
-          </article>
+                    // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-        </main>
+                    <tr>
+                      <td safe>{job.date_created}</td>
+                      <td>{job.num_files}</td>
+                      <td>{job.finished_files}</td>
+                      <td safe>{job.status}</td>
+                      <td>
+                        <a href={`/results/${job.id}`}>View</a>
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </article>
+          </main>
+        </>
       </BaseHtml>
     );
   })
@@ -768,9 +793,10 @@ const app = new Elysia()
         return redirect("/login", 302);
       }
 
-      const job = (await db
+      const job = await db
         .query("SELECT * FROM jobs WHERE user_id = ? AND id = ?")
-        .get(user.id, params.jobId)) as IJobs;
+        .as(Jobs)
+        .get(user.id, params.jobId);
 
       if (!job) {
         set.status = 404;
@@ -783,65 +809,68 @@ const app = new Elysia()
 
       const files = db
         .query("SELECT * FROM file_names WHERE job_id = ?")
-        .all(params.jobId) as IFileNames[];
+        .as(Filename)
+        .all(params.jobId);
 
       return (
         <BaseHtml title="ConvertX | Result">
-          <Header loggedIn />
+          <>
-          <main class="container">
+            <Header loggedIn />
-            <article>
+            <main class="container">
-              <div class="grid">
+              <article>
-                <h1>Results</h1>
+                <div class="grid">
-                <div>
+                  <h1>Results</h1>
-                  <button
+                  <div>
-                    type="button"
+                    <button
-                    style={{ width: "10rem", float: "right" }}
+                      type="button"
-                    onclick="downloadAll()"
+                      style={{ width: "10rem", float: "right" }}
-                    {...(files.length !== job.num_files
+                      onclick="downloadAll()"
-                      ? { disabled: true, "aria-busy": "true" }
+                      {...(files.length !== job.num_files
-                      : "")}>
+                        ? { disabled: true, "aria-busy": "true" }
-                    {files.length === job.num_files
+                        : "")}>
-                      ? "Download All"
+                      {files.length === job.num_files
-                      : "Converting..."}
+                        ? "Download All"
-                  </button>
+                        : "Converting..."}
+                    </button>
+                  </div>
                 </div>
-              </div>
+                <progress max={job.num_files} value={files.length} />
-              <progress max={job.num_files} value={files.length} />
+                <table>
-              <table>
+                  <thead>
-                <thead>
-                  <tr>
-                    <th>Converted File Name</th>
-                    <th>Status</th>
-                    <th>View</th>
-                    <th>Download</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {files.map((file) => (
-                    // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
                     <tr>
-                      <td safe>{file.output_file_name}</td>
+                      <th>Converted File Name</th>
-                      <td safe>{file.status}</td>
+                      <th>Status</th>
-                      <td>
+                      <th>View</th>
-                        <a
+                      <th>Download</th>
-                          href={`/download/${outputPath}${file.output_file_name}`}>
-                          View
-                        </a>
-                      </td>
-                      <td>
-                        <a
-                          href={`/download/${outputPath}${file.output_file_name}`}
-                          download={file.output_file_name}>
-                          Download
-                        </a>
-                      </td>
                     </tr>
-                  ))}
+                  </thead>
-                </tbody>
+                  <tbody>
-              </table>
+                    {files.map((file) => (
-            </article>
+                      // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-          </main>
+                      <tr>
-          <script src="/results.js" defer />
+                        <td safe>{file.output_file_name}</td>
+                        <td safe>{file.status}</td>
+                        <td>
+                          <a
+                            href={`/download/${outputPath}${file.output_file_name}`}>
+                            View
+                          </a>
+                        </td>
+                        <td>
+                          <a
+                            href={`/download/${outputPath}${file.output_file_name}`}
+                            download={file.output_file_name}>
+                            Download
+                          </a>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </article>
+            </main>
+            <script src="/results.js" defer />
+          </>
         </BaseHtml>
       );
     },
@@ -863,9 +892,10 @@ const app = new Elysia()
         return redirect("/login", 302);
       }
 
-      const job = (await db
+      const job = await db
         .query("SELECT * FROM jobs WHERE user_id = ? AND id = ?")
-        .get(user.id, params.jobId)) as IJobs;
+        .as(Jobs)
+        .get(user.id, params.jobId);
 
       if (!job) {
         set.status = 404;
@@ -878,7 +908,8 @@ const app = new Elysia()
 
       const files = db
         .query("SELECT * FROM file_names WHERE job_id = ?")
-        .all(params.jobId) as IFileNames[];
+        .as(Filename)
+        .all(params.jobId);
 
       return (
         <article>
@@ -974,50 +1005,54 @@ const app = new Elysia()
 
     return (
       <BaseHtml title="ConvertX | Converters">
-        <Header loggedIn />
+        <>
-        <main class="container">
+          <Header loggedIn />
-          <article>
+          <main class="container">
-            <h1>Converters</h1>
+            <article>
-            <table>
+              <h1>Converters</h1>
-              <thead>
+              <table>
-                <tr>
+                <thead>
-                  <th>Converter</th>
+                  <tr>
-                  <th>From (Count)</th>
+                    <th>Converter</th>
-                  <th>To (Count)</th>
+                    <th>From (Count)</th>
-                </tr>
+                    <th>To (Count)</th>
-              </thead>
+                  </tr>
-              <tbody>
+                </thead>
-                {Object.entries(getAllTargets()).map(([converter, targets]) => {
+                <tbody>
-                  const inputs = getAllInputs(converter);
+                  {Object.entries(getAllTargets()).map(
-                  return (
+                    ([converter, targets]) => {
-                    // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
+                      const inputs = getAllInputs(converter);
-                    <tr>
+                      return (
-                      <td safe>{converter}</td>
+                        // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-                      <td>
+                        <tr>
-                        Count: {inputs.length}
+                          <td safe>{converter}</td>
-                        <ul>
+                          <td>
-                          {inputs.map((input) => (
+                            Count: {inputs.length}
-                            // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
+                            <ul>
-                            <li safe>{input}</li>
+                              {inputs.map((input) => (
-                          ))}
+                                // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-                        </ul>
+                                <li safe>{input}</li>
-                      </td>
+                              ))}
-                      <td>
+                            </ul>
-                        Count: {targets.length}
+                          </td>
-                        <ul>
+                          <td>
-                          {targets.map((target) => (
+                            Count: {targets.length}
-                            // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
+                            <ul>
-                            <li safe>{target}</li>
+                              {targets.map((target) => (
-                          ))}
+                                // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-                        </ul>
+                                <li safe>{target}</li>
-                      </td>
+                              ))}
-                    </tr>
+                            </ul>
-                  );
+                          </td>
-                })}
+                        </tr>
-              </tbody>
+                      );
-            </table>
+                    },
-          </article>
+                  )}
-        </main>
+                </tbody>
+              </table>
+            </article>
+          </main>
+        </>
       </BaseHtml>
     );
   })
@@ -1064,7 +1099,8 @@ const clearJobs = () => {
   // get all files older than 24 hours
   const jobs = db
     .query("SELECT * FROM jobs WHERE date_created < ?")
-    .all(new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString()) as IJobs[];
+    .as(Jobs)
+    .all(new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString());
 
   for (const job of jobs) {
     // delete the directories

tsconfig.json

@@ -17,9 +17,6 @@
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
     "allowJs": true,
-    "types": [
-      "bun-types" // add Bun global
-    ],
     // non bun init
     "plugins": [{ "name": "@kitajs/ts-html-plugin" }],
     "noUncheckedIndexedAccess": true,