Merge pull request #413 from C4illin/devcontainer

.devcontainer/Dockerfile

@@ -0,0 +1,69 @@
+FROM debian:trixie-slim
+
+WORKDIR /app
+
+RUN apt-get update && apt-get install -y \
+  curl \
+  unzip \
+  git \
+  ca-certificates \
+  build-essential \
+  assimp-utils \
+  calibre \
+  dasel \
+  dcraw \
+  dvisvgm \
+  ffmpeg \
+  ghostscript \
+  graphicsmagick \
+  imagemagick-7.q16 \
+  inkscape \
+  latexmk \
+  libheif-examples \
+  libjxl-tools \
+  libreoffice \
+  libva2 \
+  libvips-tools \
+  libemail-outlook-message-perl \
+  lmodern \
+  mupdf-tools \
+  pandoc \
+  poppler-utils \
+  potrace \
+  python3-numpy \
+  resvg \
+  texlive \
+  texlive-fonts-recommended \
+  texlive-latex-extra \
+  texlive-latex-recommended \
+  texlive-xetex \
+  --no-install-recommends \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN ARCH=$(uname -m) && \
+  if [ "$ARCH" = "aarch64" ]; then \
+  curl -fsSL -o bun-linux-aarch64.zip https://github.com/oven-sh/bun/releases/download/bun-v1.2.2/bun-linux-aarch64.zip; \
+  else \
+  curl -fsSL -o bun-linux-x64-baseline.zip https://github.com/oven-sh/bun/releases/download/bun-v1.2.2/bun-linux-x64-baseline.zip; \
+  fi && \
+  unzip -j bun-linux-*.zip -d /usr/local/bin && \
+  rm bun-linux-*.zip && \
+  chmod +x /usr/local/bin/bun
+
+RUN ARCH=$(uname -m) && \
+  if [ "$ARCH" = "aarch64" ]; then \
+  VTRACER_ASSET="vtracer-aarch64-unknown-linux-musl.tar.gz"; \
+  else \
+  VTRACER_ASSET="vtracer-x86_64-unknown-linux-musl.tar.gz"; \
+  fi && \
+  curl -L -o /tmp/vtracer.tar.gz "https://github.com/visioncortex/vtracer/releases/download/0.6.4/${VTRACER_ASSET}" && \
+  tar -xzf /tmp/vtracer.tar.gz -C /tmp/ && \
+  mv /tmp/vtracer /usr/local/bin/vtracer && \
+  chmod +x /usr/local/bin/vtracer && \
+  rm /tmp/vtracer.tar.gz
+
+RUN mkdir -p data
+ENV NODE_ENV=development
+ENV QTWEBENGINE_CHROMIUM_FLAGS="--no-sandbox"
+EXPOSE 3000
+CMD ["bun", "run", "dev"]

.devcontainer/devcontainer.json

@@ -0,0 +1,50 @@
+{
+  "name": "ConvertX Development Environment",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/git:1": {},
+    "ghcr.io/devcontainers/features/github-cli:1": {}
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-vscode.vscode-typescript-next",
+        "bradlc.vscode-tailwindcss",
+        "esbenp.prettier-vscode",
+        "dbaeumer.vscode-eslint",
+        "ms-vscode.vscode-json",
+        "ms-vscode.vscode-docker",
+        "oven.bun-vscode"
+      ],
+      "settings": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+          "source.fixAll.eslint": "explicit"
+        },
+        "typescript.preferences.importModuleSpecifier": "relative",
+        "typescript.suggest.autoImports": true,
+        "tailwindCSS.includeLanguages": {
+          "typescript": "javascript",
+          "typescriptreact": "javascript"
+        },
+        "files.associations": {
+          "*.css": "tailwindcss"
+        },
+        "terminal.integrated.defaultProfile.linux": "bash"
+      }
+    }
+  },
+  "forwardPorts": [3000],
+  "portsAttributes": {
+    "3000": {
+      "label": "ConvertX Application",
+      "onAutoForward": "notify"
+    }
+  },
+  "postCreateCommand": "bun install",
+  "remoteUser": "root",
+  "mounts": ["source=${localWorkspaceFolder}/data,target=/app/data,type=bind"]
+}

bun.lock

@@ -21,7 +21,6 @@
         "@total-typescript/ts-reset": "^0.6.1",
         "@types/bun": "latest",
         "@types/node": "^24.6.2",
-        "@types/tar": "^6.1.13",
         "@typescript-eslint/parser": "^8.45.0",
         "eslint": "^9.37.0",
         "eslint-plugin-better-tailwindcss": "^3.7.9",
@@ -240,8 +239,6 @@
 
     "@types/react": ["@types/react@19.1.15", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-+kLxJpaJzXybyDyFXYADyP1cznTO8HSuBpenGlnKOAkH4hyNINiywvXS/tGJhsrGGP/gM185RA3xpjY0Yg4erA=="],
 
-    "@types/tar": ["@types/tar@6.1.13", "", { "dependencies": { "@types/node": "*", "minipass": "^4.0.0" } }, "sha512-IznnlmU5f4WcGTh2ltRu/Ijpmk8wiWXfF0VA4s+HPjHZgvFggk1YaIkbo5krX/zUCzWF8N/l4+W/LNxnvAJ8nw=="],
-
     "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.45.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.45.0", "@typescript-eslint/type-utils": "8.45.0", "@typescript-eslint/utils": "8.45.0", "@typescript-eslint/visitor-keys": "8.45.0", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.45.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-HC3y9CVuevvWCl/oyZuI47dOeDF9ztdMEfMH8/DW/Mhwa9cCLnK1oD7JoTVGW/u7kFzNZUKUoyJEqkaJh5y3Wg=="],
 
     "@typescript-eslint/parser": ["@typescript-eslint/parser@8.45.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.45.0", "@typescript-eslint/types": "8.45.0", "@typescript-eslint/typescript-estree": "8.45.0", "@typescript-eslint/visitor-keys": "8.45.0", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ=="],
@@ -470,7 +467,7 @@
 
     "minimist": ["minimist@1.2.8", "", {}, "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="],
 
-    "minipass": ["minipass@4.2.8", "", {}, "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ=="],
+    "minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="],
 
     "minizlib": ["minizlib@3.1.0", "", { "dependencies": { "minipass": "^7.1.2" } }, "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw=="],
 
@@ -636,8 +633,6 @@
 
     "@eslint/eslintrc/strip-json-comments": ["strip-json-comments@3.1.1", "", {}, "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="],
 
-    "@isaacs/fs-minipass/minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="],
-
     "@napi-rs/wasm-runtime/@emnapi/core": ["@emnapi/core@1.5.0", "", { "dependencies": { "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" }, "bundled": true }, "sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg=="],
 
     "@napi-rs/wasm-runtime/@emnapi/runtime": ["@emnapi/runtime@1.5.0", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ=="],
@@ -658,8 +653,6 @@
 
     "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "@types/tar/@types/node": ["@types/node@24.5.2", "", { "dependencies": { "undici-types": "~7.12.0" } }, "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ=="],
-
     "@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.5", "", {}, "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg=="],
 
     "@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="],
@@ -674,10 +667,6 @@
 
     "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
-    "minizlib/minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="],
-
-    "tar/minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="],
-
     "tsconfig-paths-webpack-plugin/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
 
     "@napi-rs/wasm-runtime/@emnapi/core/@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.1.0", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ=="],
@@ -704,8 +693,6 @@
 
     "@tailwindcss/oxide-wasm32-wasi/@tybys/wasm-util/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "@types/tar/@types/node/undici-types": ["undici-types@7.12.0", "", {}, "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ=="],
-
     "@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.0.2", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ=="],
 
     "cross-spawn/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],

package.json

@@ -4,12 +4,12 @@
   "scripts": {
     "dev": "bun run --watch src/index.tsx",
     "hot": "bun run --hot src/index.tsx",
-    "format": "run-p 'format:*'",
+    "format": "npm-run-all 'format:*'",
     "format:eslint": "eslint --fix .",
     "format:prettier": "prettier --write .",
     "build:js": "tsc",
     "build": "bun x @tailwindcss/cli -i ./src/main.css -o ./public/generated.css && bun run build:js",
-    "lint": "run-p 'lint:*'",
+    "lint": "npm-run-all 'lint:*'",
     "lint:tsc": "tsc --noEmit",
     "lint:knip": "knip",
     "lint:eslint": "eslint .",
@@ -38,7 +38,6 @@
     "@total-typescript/ts-reset": "^0.6.1",
     "@types/bun": "latest",
     "@types/node": "^24.6.2",
-    "@types/tar": "^6.1.13",
     "@typescript-eslint/parser": "^8.45.0",
     "eslint": "^9.37.0",
     "eslint-plugin-better-tailwindcss": "^3.7.9",

src/pages/download.tsx

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { Elysia, t } from 'elysia'
+import { Elysia } from "elysia";
 import sanitize from "sanitize-filename";
 import * as tar from "tar";
 import { outputDir } from "..";
@@ -29,9 +29,11 @@ export const download = new Elysia()
     },
     {
       auth: true,
-    }
+    },
   )
-  .get("/archive/:userId/:jobId", async ({ params, redirect, user }) => {
+  .get(
+    "/archive/:userId/:jobId",
+    async ({ params, redirect, user }) => {
       const job = await db
         .query("SELECT * FROM jobs WHERE user_id = ? AND id = ?")
         .get(user.id, params.jobId);
@@ -56,6 +58,8 @@ export const download = new Elysia()
         ["."],
       );
       return Bun.file(outputTar);
-  }, {
+    },
+    {
       auth: true,
-  });
+    },
+  );

src/pages/history.tsx

@@ -7,9 +7,9 @@ import { Filename, Jobs } from "../db/types";
 import { ALLOW_UNAUTHENTICATED, HIDE_HISTORY, LANGUAGE, WEBROOT } from "../helpers/env";
 import { userService } from "./user";
 
-export const history = new Elysia()
+export const history = new Elysia().use(userService).get(
-  .use(userService)
+  "/history",
-  .get("/history", async ({ jwt, redirect, user }) => {
+  async ({ redirect, user }) => {
     if (HIDE_HISTORY) {
       return redirect(`${WEBROOT}/`, 302);
     }
@@ -208,6 +208,8 @@ export const history = new Elysia()
         </>
       </BaseHtml>
     );
-  }, {
+  },
-    auth: true
+  {
-  });
+    auth: true,
+  },
+);

src/pages/listConverters.tsx

@@ -6,9 +6,9 @@ import { getAllInputs, getAllTargets } from "../converters/main";
 import { ALLOW_UNAUTHENTICATED, WEBROOT } from "../helpers/env";
 import { userService } from "./user";
 
-export const listConverters = new Elysia()
+export const listConverters = new Elysia().use(userService).get(
-  .use(userService)
+  "/converters",
-  .get("/converters", async () => {
+  async () => {
     return (
       <BaseHtml webroot={WEBROOT} title="ConvertX | Converters">
         <>
@@ -68,6 +68,8 @@ export const listConverters = new Elysia()
         </>
       </BaseHtml>
     );
-  }, {
+  },
-    auth: true
+  {
-  });
+    auth: true,
+  },
+);

src/pages/results.tsx

@@ -136,7 +136,9 @@ function ResultsArticle({
 
 export const results = new Elysia()
   .use(userService)
-  .get("/results/:jobId", async ({ params, jwt, set, redirect, cookie: { job_id }, user }) => {
+  .get(
+    "/results/:jobId",
+    async ({ params, set, cookie: { job_id }, user }) => {
       if (job_id?.value) {
         // Clear the job_id cookie since we are viewing the results
         job_id.remove();
@@ -177,8 +179,12 @@ export const results = new Elysia()
           </>
         </BaseHtml>
       );
-  }, { auth: true })
+    },
-  .post("/progress/:jobId", async ({ jwt, set, params, cookie: { job_id }, user }) => {
+    { auth: true },
+  )
+  .post(
+    "/progress/:jobId",
+    async ({ set, params, cookie: { job_id }, user }) => {
       if (job_id?.value) {
         // Clear the job_id cookie since we are viewing the results
         job_id.remove();
@@ -204,4 +210,6 @@ export const results = new Elysia()
         .all(params.jobId);
 
       return <ResultsArticle user={user} job={job} files={files} outputPath={outputPath} />;
-  }, { auth: true });
+    },
+    { auth: true },
+  );

src/pages/root.tsx

@@ -17,9 +17,9 @@ import {
 } from "../helpers/env";
 import { FIRST_RUN, userService } from "./user";
 
-export const root = new Elysia()
+export const root = new Elysia().use(userService).get(
-  .use(userService)
+  "/",
-  .get("/", async ({ jwt, redirect, cookie: { auth, jobId } }) => {
+  async ({ jwt, redirect, cookie: { auth, jobId } }) => {
     if (!ALLOW_UNAUTHENTICATED) {
       if (FIRST_RUN) {
         return redirect(`${WEBROOT}/setup`, 302);
@@ -240,9 +240,11 @@ export const root = new Elysia()
         </>
       </BaseHtml>
     );
-  }, {
+  },
+  {
     cookie: t.Cookie({
       auth: t.Optional(t.String()),
       jobId: t.Optional(t.String()),
-    })
+    }),
-  });
+  },
+);

src/pages/user.tsx

@@ -39,30 +39,29 @@ export const userService = new Elysia({ name: "user/service" })
     optionalSession: t.Cookie({
       auth: t.Optional(t.String()),
       jobId: t.Optional(t.String()),
-    })
+    }),
   })
   .macro("auth", {
-    cookie: "session", async resolve({
+    cookie: "session",
-      status, jwt, cookie: { auth }
+    async resolve({ status, jwt, cookie: { auth } }) {
-    }) {
       if (!auth.value) {
         return status(401, {
           success: false,
-          message: 'Unauthorized'
+          message: "Unauthorized",
-        })
+        });
       }
       const user = await jwt.verify(auth.value);
       if (!user) {
         return status(401, {
           success: false,
-          message: 'Unauthorized'
+          message: "Unauthorized",
-        })
+        });
       }
       return {
         success: true,
-        user
+        user,
       };
-    }
+    },
   });
 
 export const user = new Elysia()
@@ -237,7 +236,9 @@ export const user = new Elysia()
     },
     { body: "signIn" },
   )
-  .get("/login", async ({ jwt, redirect, cookie: { auth } }) => {
+  .get(
+    "/login",
+    async ({ jwt, redirect, cookie: { auth } }) => {
       if (FIRST_RUN) {
         return redirect(`${WEBROOT}/setup`, 302);
       }
@@ -312,7 +313,8 @@ export const user = new Elysia()
           </>
         </BaseHtml>
       );
-  }, { body: "signIn", cookie: "optionalSession" }
+    },
+    { body: "signIn", cookie: "optionalSession" },
   )
   .post(
     "/login",
@@ -373,8 +375,9 @@ export const user = new Elysia()
 
     return redirect(`${WEBROOT}/login`, 302);
   })
-  .get("/account", async ({ user, redirect }) => {
+  .get(
-
+    "/account",
+    async ({ user, redirect }) => {
       if (!user) {
         return redirect(`${WEBROOT}/`, 302);
       }
@@ -447,9 +450,11 @@ export const user = new Elysia()
           </>
         </BaseHtml>
       );
-  }, {
+    },
-    auth: true
+    {
-  })
+      auth: true,
+    },
+  )
   .post(
     "/account",
     async function handler({ body, set, redirect, jwt, cookie: { auth } }) {
@@ -513,6 +518,6 @@ export const user = new Elysia()
         newPassword: t.MaybeEmpty(t.String()),
         password: t.String(),
       }),
-      cookie: "session"
+      cookie: "session",
     },
   );