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

build(deps-dev): update @types/bun requirement from ^1.1.5 to ^1.1.6

.github/workflows/bun-dependabot.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.actor == 'dependabot[bot]'
     runs-on: ubuntu-latest
     steps:
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0

.github/workflows/docker-publish.yml

@@ -58,7 +58,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/release-please.yml

@@ -18,7 +18,8 @@ jobs:
           # this assumes that you have created a personal access token
           # (PAT) and configured it as a GitHub action secret named
           # `MY_RELEASE_PLEASE_TOKEN` (this secret name is not important).
-          token: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}
+          # token: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           # this is a built-in strategy in release-please, see "Action Inputs"
           # for more options
-          release-type: node
+          release-type: node

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.3.0](https://github.com/C4illin/ConvertX/compare/v0.2.0...v0.3.0) (2024-06-27)
+
+
+### Features
+
+* add version number to log ([4dcb796](https://github.com/C4illin/ConvertX/commit/4dcb796e1bd27badc078d0638076cd9f1e81c4a4)), closes [#44](https://github.com/C4illin/ConvertX/issues/44)
+* change to xelatex ([fae2ba9](https://github.com/C4illin/ConvertX/commit/fae2ba9c54461dccdccd1bfb5e76398540d11d0b))
+* print version of installed converters to log ([801cf28](https://github.com/C4illin/ConvertX/commit/801cf28d1e5edac9353b0b16be75a4fb48470b8a))
+
+## [0.2.0](https://github.com/C4illin/ConvertX/compare/v0.1.2...v0.2.0) (2024-06-20)
+
+
+### Features
+
+* add libjxl for jpegxl conversion ([ff680cb](https://github.com/C4illin/ConvertX/commit/ff680cb29534a25c3148a90fd064bb86c71fb482))
+* change from debian to alpine ([1316957](https://github.com/C4illin/ConvertX/commit/13169574f0134ae236f8d41287bb73930b575e82)), closes [#34](https://github.com/C4illin/ConvertX/issues/34)
+
+## [0.1.2](https://github.com/C4illin/ConvertX/compare/v0.1.1...v0.1.2) (2024-06-10)
+
+
+### Bug Fixes
+
+* fix incorrect redirect ([25df58b](https://github.com/C4illin/ConvertX/commit/25df58ba82321aaa6617811a6995cb96c2a00a40)), closes [#23](https://github.com/C4illin/ConvertX/issues/23)
+
 ## [0.1.1](https://github.com/C4illin/ConvertX/compare/v0.1.0...v0.1.1) (2024-05-30)
 
 

Debian.Dockerfile

@@ -0,0 +1,63 @@
+FROM oven/bun:1-debian as base
+WORKDIR /app
+
+# install dependencies into temp directory
+# this will cache them and speed up future builds
+FROM base AS install
+RUN mkdir -p /temp/dev
+COPY package.json bun.lockb /temp/dev/
+RUN cd /temp/dev && bun install --frozen-lockfile
+
+# install with --production (exclude devDependencies)
+RUN mkdir -p /temp/prod
+COPY package.json bun.lockb /temp/prod/
+RUN cd /temp/prod && bun install --frozen-lockfile --production
+
+# FROM base AS install-libjxl-tools
+# download
+
+
+
+# copy node_modules from temp directory
+# then copy all (non-ignored) project files into the image
+# FROM base AS prerelease
+# COPY --from=install /temp/dev/node_modules node_modules
+# COPY . .
+
+# # [optional] tests & build
+# ENV NODE_ENV=production
+# RUN bun test
+# RUN bun run build
+
+# copy production dependencies and source code into final image
+FROM base AS release
+LABEL maintainer="Emrik Östling (C4illin)"
+LABEL description="ConvertX: self-hosted online file converter supporting 700+ file formats."
+LABEL repo="https://github.com/C4illin/ConvertX"
+
+# install additional dependencies
+RUN rm -rf /var/lib/apt/lists/partial && apt-get update -o Acquire::CompressionTypes::Order::=gz \
+  && apt-get install -y \
+  pandoc \
+  texlive-latex-recommended \
+  texlive-fonts-recommended \
+  texlive-latex-extra \
+  ffmpeg \
+  graphicsmagick \
+  ghostscript \
+  libvips-tools
+
+# # libjxl is not available in the official debian repositories
+# RUN wget https://github.com/libjxl/libjxl/releases/download/v0.10.2/jxl-debs-amd64-debian-bullseye-v0.10.2.tar.gz -O /tmp/jxl-debs-amd64-debian-bullseye-v0.10.2.tar.gz \
+#   && mkdir -p /tmp/libjxl \
+#   && tar -xvf /tmp/jxl-debs-amd64-debian-bullseye-v0.10.2.tar.gz -C /tmp/libjxl \
+#   && dpkg -i /tmp/libjxl/libjxl_0.10.2_amd64.deb /tmp/libjxl/jxl_0.10.2_amd64.deb \
+#   && rm -rf /tmp/jxl-debs-amd64-debian-bullseye-v0.10.2.tar.gz /tmp/libjxl
+
+COPY --from=install /temp/prod/node_modules node_modules
+# COPY --from=prerelease /app/src/index.tsx /app/src/
+# COPY --from=prerelease /app/package.json .
+COPY . .
+
+EXPOSE 3000/tcp
+ENTRYPOINT [ "bun", "run", "./src/index.tsx" ]

Dockerfile

@@ -1,4 +1,4 @@
-FROM oven/bun:1-debian as base
+FROM oven/bun:1-alpine as base
 WORKDIR /app
 
 # install dependencies into temp directory
@@ -31,16 +31,19 @@ LABEL description="ConvertX: self-hosted online file converter supporting 700+ f
 LABEL repo="https://github.com/C4illin/ConvertX"
 
 # install additional dependencies
-RUN rm -rf /var/lib/apt/lists/partial && apt-get update -o Acquire::CompressionTypes::Order::=gz \
-  && apt-get install -y \
+RUN apk --no-cache add  \
   pandoc \
-  texlive-latex-recommended \
-  texlive-fonts-recommended \
-  texlive-latex-extra \
+  texlive \
+  texlive-xetex \
+  texmf-dist-latexextra \
   ffmpeg \
   graphicsmagick \
   ghostscript \
-  libvips-tools
+  vips-tools \
+  libjxl-tools
+
+# this might be needed for some latex use cases, will add it if needed.
+#   texmf-dist-fontsextra \
 
 COPY --from=install /temp/prod/node_modules node_modules
 # COPY --from=prerelease /app/src/index.tsx /app/src/
@@ -48,4 +51,5 @@ COPY --from=install /temp/prod/node_modules node_modules
 COPY . .
 
 EXPOSE 3000/tcp
+ENV NODE_ENV=production
 ENTRYPOINT [ "bun", "run", "./src/index.tsx" ]

README.md

@@ -1,10 +1,13 @@
 ![ConvertX](images/logo.png)
 # ConvertX
 [![Docker](https://github.com/C4illin/ConvertX/actions/workflows/docker-publish.yml/badge.svg?branch=main)](https://github.com/C4illin/ConvertX/actions/workflows/docker-publish.yml)
-![GitHub Release](https://img.shields.io/github/v/release/C4illin/ConvertX)
+[![GitHub Release](https://img.shields.io/github/v/release/C4illin/ConvertX)](https://github.com/C4illin/ConvertX/pkgs/container/convertx)
 ![GitHub commits since latest release](https://img.shields.io/github/commits-since/C4illin/ConvertX/latest)
+![GitHub repo size](https://img.shields.io/github/repo-size/C4illin/ConvertX)
+![Docker container size](https://ghcr-badge.egpl.dev/c4illin/convertx/size?color=%230375b6&tag=latest&label=image+size&trim=)
+![GitHub top language](https://img.shields.io/github/languages/top/C4illin/ConvertX)
 
-A self-hosted online file converter. Supports 831 different formats. Written with Typescript, Bun and Elysia.
+A self-hosted online file converter. Supports 831 different formats. Written with TypeScript, Bun and Elysia.
 
 ## Features
 
@@ -14,13 +17,14 @@ A self-hosted online file converter. Supports 831 different formats. Written wit
 
 ## Converters supported
 
-| Converter      | Use case      | Converts from | Converts to |
-|----------------|---------------|---------------|-------------|
-| Vips           | Images (fast) | 45            | 23          |
-| PDFLaTeX       | Documents     | 1             | 1           |
-| Pandoc         | Documents     | 43            | 65          |
-| GraphicsMagick | Images        | 166           | 133         |
-| FFmpeg         | Video         | ~473          | ~280        |
+| Converter                                                                    | Use case      | Converts from | Converts to |
+|------------------------------------------------------------------------------|---------------|---------------|-------------|
+| [libjxl](https://github.com/libjxl/libjxl)                                   | JPEG XL       | 11            | 11          |
+| [Vips](https://github.com/libvips/libvips)                                   | Images        | 45            | 23          |
+| [XeLaTeX](https://tug.org/xetex/)                                            | Documents     | 1             | 1           |
+| [Pandoc](https://pandoc.org/)                                                | Documents     | 43            | 65          |
+| [GraphicsMagick](http://www.graphicsmagick.org/)                             | Images        | 166           | 133         |
+| [FFmpeg](https://ffmpeg.org/)                                                | Video         | ~473          | ~280        |
 
 <!-- many ffmpeg fileformats are duplicates -->
 
@@ -62,6 +66,7 @@ Tutorial in french: https://belginux.com/installer-convertx-avec-docker/
 - [ ] Divide index.tsx into smaller components
 - [ ] Add tests
 - [ ] Add searchable list of formats
+- [ ] Make the upload button nicer and more easy to drop files on. Support copy paste as well if possible.
 
 ## Contributors
 

compose.yaml

@@ -2,6 +2,7 @@ services:
   convertx:
     build:
       context: .
+      # dockerfile: Debian.Dockerfile
     volumes:
       - ./data:/app/data
     environment:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "convertx-frontend",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "scripts": {
     "dev": "bun run --watch src/index.tsx",
     "hot": "bun run --hot src/index.tsx",
@@ -12,28 +12,31 @@
     "@elysiajs/html": "^1.0.2",
     "@elysiajs/jwt": "^1.0.2",
     "@elysiajs/static": "^1.0.3",
-    "elysia": "^1.0.22"
+    "elysia": "^1.0.25"
   },
   "module": "src/index.tsx",
   "bun-create": {
     "start": "bun run src/index.tsx"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.7.3",
-    "@ianvs/prettier-plugin-sort-imports": "^4.2.1",
+    "@biomejs/biome": "1.8.2",
+    "@ianvs/prettier-plugin-sort-imports": "^4.3.0",
     "@kitajs/ts-html-plugin": "^4.0.1",
     "@picocss/pico": "^2.0.6",
     "@total-typescript/ts-reset": "^0.5.1",
-    "@types/bun": "^1.1.3",
+    "@types/bun": "^1.1.6",
     "@types/eslint": "^8.56.10",
-    "@types/node": "^20.12.13",
+    "@types/node": "^20.14.9",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.11.0",
-    "@typescript-eslint/parser": "^7.11.0",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
     "cpy-cli": "^5.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "prettier": "^3.2.5",
-    "typescript": "^5.4.5"
-  }
+    "prettier": "^3.3.2",
+    "typescript": "^5.5.2"
+  },
+  "trustedDependencies": [
+    "@biomejs/biome"
+  ]
 }

src/components/header.tsx

@@ -50,4 +50,4 @@ export const Header = ({
       </nav>
     </header>
   );
-};
+};

src/converters/libjxl.ts

@@ -0,0 +1,71 @@
+import { exec } from "node:child_process";
+
+// declare possible conversions
+export const properties = {
+  from: {
+    jxl: ["jxl"],
+    images: [
+      "apng",
+      "exr",
+      "gif",
+      "jpeg",
+      "pam",
+      "pfm",
+      "pgm",
+      "pgx",
+      "png",
+      "ppm",
+    ],
+  },
+  to: {
+    jxl: [
+      "apng",
+      "exr",
+      "gif",
+      "jpeg",
+      "pam",
+      "pfm",
+      "pgm",
+      "pgx",
+      "png",
+      "ppm",
+    ],
+    images: ["jxl"],
+  },
+};
+
+export function convert(
+  filePath: string,
+  fileType: string,
+  convertTo: string,
+  targetPath: string,
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  options?: any,
+): Promise<string> {
+  let tool = "";
+  if (fileType === "jxl") {
+    tool = "djxl";
+  }
+
+  if (convertTo === "jxl") {
+    tool = "cjxl";
+  }
+
+  return new Promise((resolve, reject) => {
+    exec(`${tool} "${filePath}" "${targetPath}"`, (error, stdout, stderr) => {
+      if (error) {
+        reject(`error: ${error}`);
+      }
+
+      if (stdout) {
+        console.log(`stdout: ${stdout}`);
+      }
+
+      if (stderr) {
+        console.error(`stderr: ${stderr}`);
+      }
+
+      resolve("success");
+    });
+  });
+}

src/converters/main.ts

@@ -16,9 +16,14 @@ import {
 } from "./graphicsmagick";
 
 import {
-  convert as convertPdflatex,
-  properties as propertiesPdflatex,
-} from "./pdflatex";
+  convert as convertxelatex,
+  properties as propertiesxelatex,
+} from "./xelatex";
+
+import {
+  convert as convertLibjxl,
+  properties as propertiesLibjxl,
+} from "./libjxl";
 
 import { normalizeFiletype } from "../helpers/normalizeFiletype";
 
@@ -50,13 +55,17 @@ const properties: {
     ) => any;
   };
 } = {
+  libjxl: {
+    properties: propertiesLibjxl,
+    converter: convertLibjxl,
+  },
   vips: {
     properties: propertiesImage,
     converter: convertImage,
   },
-  pdflatex: {
-    properties: propertiesPdflatex,
-    converter: convertPdflatex,
+  xelatex: {
+    properties: propertiesxelatex,
+    converter: convertxelatex,
   },
   pandoc: {
     properties: propertiesPandoc,
@@ -102,9 +111,8 @@ export async function mainConverter(
 
       for (const key in converterObj.properties.from) {
         if (
-          // HOW??
-          converterObj.properties.from[key].includes(fileType) &&
-          converterObj.properties.to[key].includes(convertTo)
+          converterObj?.properties?.from[key]?.includes(fileType) &&
+          converterObj?.properties?.to[key]?.includes(convertTo)
         ) {
           converterFunc = converterObj.converter;
           break;
@@ -208,9 +216,9 @@ for (const converterName in properties) {
 
   for (const key in converterProperties.to) {
     if (allTargets[converterName]) {
-      allTargets[converterName].push(...converterProperties.to[key]);
+      allTargets[converterName].push(...(converterProperties.to[key] || []));
     } else {
-      allTargets[converterName] = converterProperties.to[key];
+      allTargets[converterName] = converterProperties.to[key] || [];
     }
   }
 }
@@ -229,9 +237,9 @@ for (const converterName in properties) {
 
   for (const key in converterProperties.from) {
     if (allInputs[converterName]) {
-      allInputs[converterName].push(...converterProperties.from[key]);
+      allInputs[converterName].push(...(converterProperties.from[key] || []));
     } else {
-      allInputs[converterName] = converterProperties.from[key];
+      allInputs[converterName] = converterProperties.from[key] || [];
     }
   }
 }

src/converters/pandoc.ts

@@ -127,9 +127,15 @@ export function convert(
   // biome-ignore lint/suspicious/noExplicitAny: <explanation>
   options?: any,
 ): Promise<string> {
+  // set xelatex here
+  const xelatex = ["pdf", "latex"];
+  let option = "";
+  if (xelatex.includes(convertTo)) {
+    option = "--pdf-engine=xelatex";
+  }
   return new Promise((resolve, reject) => {
     exec(
-      `pandoc "${filePath}" -f ${fileType} -t ${convertTo} -o "${targetPath}"`,
+      `pandoc ${option} "${filePath}" -f ${fileType} -t ${convertTo} -o "${targetPath}"`,
       (error, stdout, stderr) => {
         if (error) {
           reject(`error: ${error}`);

src/converters/xelatex.ts

@@ -19,9 +19,13 @@ export function convert(
 ): Promise<string> {
   return new Promise((resolve, reject) => {
     // const fileName: string = (targetPath.split("/").pop() as string).replace(".pdf", "")
-    const outputPath = targetPath.split("/").slice(0, -1).join("/").replace("./", "")
+    const outputPath = targetPath
+      .split("/")
+      .slice(0, -1)
+      .join("/")
+      .replace("./", "");
     exec(
-      `pdflatex -interaction=nonstopmode -output-directory="${outputPath}" "${filePath}"`,
+      `latexmk -xelatex -interaction=nonstopmode -output-directory="${outputPath}" "${filePath}"`,
       (error, stdout, stderr) => {
         if (error) {
           reject(`error: ${error}`);

src/helpers/printVersions.ts

@@ -0,0 +1,75 @@
+import { exec } from "node:child_process";
+import { version } from "../../package.json";
+console.log(`ConvertX v${version}`);
+
+if (process.env.NODE_ENV === "production") {
+  exec("cat /etc/os-release", (error, stdout) => {
+    if (error) {
+      console.error("Not running on docker, this is not supported.");
+    }
+
+    if (stdout) {
+      console.log(stdout.split('PRETTY_NAME="')[1]?.split('"')[0]);
+    }
+  });
+
+  exec("pandoc -v", (error, stdout) => {
+    if (error) {
+      console.error("Pandoc is not installed.");
+    }
+
+    if (stdout) {
+      console.log(stdout.split("\n")[0]);
+    }
+  });
+
+  exec("ffmpeg -version", (error, stdout) => {
+    if (error) {
+      console.error("FFmpeg is not installed.");
+    }
+
+    if (stdout) {
+      console.log(stdout.split("\n")[0]);
+    }
+  });
+
+  exec("vips -v", (error, stdout) => {
+    if (error) {
+      console.error("Vips is not installed.");
+    }
+
+    if (stdout) {
+      console.log(stdout.split("\n")[0]);
+    }
+  });
+
+  exec("gm version", (error, stdout) => {
+    if (error) {
+      console.error("GraphicsMagick is not installed.");
+    }
+
+    if (stdout) {
+      console.log(stdout.split("\n")[0]);
+    }
+  });
+
+  exec("djxl --version", (error, stdout) => {
+    if (error) {
+      console.error("libjxl-tools is not installed.");
+    }
+
+    if (stdout) {
+      console.log(stdout.split("\n")[0]);
+    }
+  });
+
+  exec("xelatex -version", (error, stdout) => {
+    if (error) {
+      console.error("Tex Live with XeTeX is not installed.");
+    }
+
+    if (stdout) {
+      console.log(stdout.split("\n")[0]);
+    }
+  });
+}

src/index.tsx

@@ -19,6 +19,10 @@ import {
   normalizeFiletype,
   normalizeOutputFiletype,
 } from "./helpers/normalizeFiletype";
+import "./helpers/printVersions";
+
+
+
 
 const db = new Database("./data/mydb.sqlite", { create: true });
 const uploadsDir = "./data/uploads/";
@@ -677,7 +681,7 @@ const app = new Elysia()
         });
 
       // Redirect the client immediately
-      return redirect(`/results/, 302${jobId.value}`);
+      return redirect(`/results/${jobId.value}`, 302);
     },
     {
       body: t.Object({