Merge remote-tracking branch 'origin/master'

Author: zardoy

.github/workflows/docker.yml

@@ -42,6 +42,8 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          arguments: |
+            VITE_COMMIT_SHA=${{ github.sha }}
           file: docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/electron.yml

@@ -0,0 +1,83 @@
+name: Build Electron Distributions
+
+on:
+  push:
+    branches: ["master"]
+    tags: ["*"]
+  pull_request:
+
+jobs:
+  build-electron:
+    runs-on: ${{ matrix.os }}
+
+    env:
+      VITE_COMMIT_SHA: ${{ github.sha }}
+
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            platform: linux
+          - os: windows-2025
+            platform: win
+          - os: macos-15
+            platform: mac
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: "latest"
+          cache: true
+
+      - name: Install dependencies
+        run: bun i --frozen-lockfile
+
+      # Test (Linux only)
+      - name: Build (for testing)
+        if: matrix.platform == 'linux'
+        run:  bun run build
+      - name: Generate cache (for testing)
+        if: matrix.platform == 'linux'
+        run: bun run cache:build
+      - name: Test traversion graph
+        if: matrix.platform == 'linux'
+        run: bun test test/TraversionGraph.test.ts
+      - name: Test common conversion routes
+        if: matrix.platform == 'linux'
+        run: bun test test/commonFormats.test.ts
+
+      - name: Build Distribution for ${{ matrix.platform }}
+        run: bun run desktop:dist:${{ matrix.platform }}
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: convert-desktop-${{ matrix.platform }}
+          path: |
+            release/*.exe
+            release/*.dmg
+            release/*.AppImage
+            release/*.zip
+            release/*.snap
+            release/*.deb
+          retention-days: 7
+      
+      - name: Publish GitHub Release (if new tag)
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            release/*.exe
+            release/*.dmg
+            release/*.AppImage
+            release/*.zip
+            release/*.snap
+            release/*.deb
+          generate_release_notes: true
+          draft: true

.github/workflows/pages.yml

@@ -34,10 +34,15 @@ jobs:
         run: bun i --frozen-lockfile
 
       - name: Build
-        run: bun run build
+        run: |
+          export VITE_COMMIT_SHA=${{ github.sha }}
+          bun run build
 
       - name: Generate cache
-        run: bun run buildCache.js dist/cache.json
+        run: bun run cache:build
+
+      - name: Test traversion graph
+        run: bun test test/TraversionGraph.test.ts
 
       - name: Test traversion graph
         run: bun test test/TraversionGraph.test.ts

.gitignore

@@ -5,3 +5,5 @@ start.sh
 dist
 cache.json
 .DS_Store
+release
+cache.json

buildCache.js

@@ -1,9 +1,18 @@
 import puppeteer from "puppeteer";
 
+const minify = (process.argv[3] === "--minify");
+
+const outputPath = process.argv[2] || "cache.json";
+// delete previous cache.json so regeneration is forced to happen
+const outputFile = Bun.file(outputPath);
+if (await outputFile.exists()) {
+  await outputFile.delete();
+}
+
 const server = Bun.serve({
   async fetch (req) {
     const path = new URL(req.url).pathname.replace("/convert/", "") || "index.html";
-    const file = Bun.file(`${__dirname}/dist/${path}`);
+    const file = Bun.file(`${__dirname}/dist/${path}`.replaceAll("..", ""));
     if (!(await file.exists())) return new Response("Not Found", { status: 404 });
     return new Response(file);
   },
@@ -27,10 +36,17 @@ await Promise.all([
   page.goto("http://localhost:8080/convert/index.html")
 ]);
 
-const cacheJSON = await page.evaluate(() => {
+const cacheJSON = await page.evaluate((minify) => {
+  if (minify === true) {
+    return JSON.stringify(
+      JSON.parse(
+        window.printSupportedFormatCache()
+      )
+    );
+  }
   return window.printSupportedFormatCache();
-});
-const outputPath = process.argv[2] || "cache.json";
+}, minify);
+
 await Bun.write(outputPath, cacheJSON);
 
 await browser.close();

docker/Dockerfile

@@ -15,8 +15,11 @@ RUN bun install --frozen-lockfile
 
 COPY . .
 
+ARG VITE_COMMIT_SHA
+ENV VITE_COMMIT_SHA=$VITE_COMMIT_SHA
+
 RUN bun run build
-RUN bun run buildCache.js dist/cache.json
+RUN bun run cache:build
 
 FROM nginx:stable-alpine AS runtime
 

docker/docker-compose.override.yml

@@ -2,5 +2,7 @@ services:
   convert:
     build:
       context: ..
+      args:
+        VITE_COMMIT_SHA: docker
       dockerfile: docker/Dockerfile
     image: convert:dev

package.json

@@ -1,18 +1,55 @@
 {
-  "name": "convert",
+  "name": "p2r3-convert",
+  "productName": "Convert to it!",
+  "author": "PortalRunner",
+  "description": "Truly universal browser-based file converter",
   "private": true,
   "version": "0.0.0",
   "type": "module",
+  "main": "src/electron.cjs",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "preview": "vite preview"
+    "cache:build": "bun run buildCache.js dist/cache.json --minify",
+    "cache:build:dev": "bun run buildCache.js dist/cache.json",
+    "preview": "vite preview",
+    "docker": "bun run docker:build && bun run docker:up",
+    "docker:build": "docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.yml build --build-arg VITE_COMMIT_SHA=$(git rev-parse HEAD)",
+    "docker:up": "docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.yml up -d",
+    "desktop:build": "tsc && IS_DESKTOP=true vite build && bun run cache:build",
+    "desktop:preview": "electron .",
+    "desktop:start": "bun run desktop:build && bun run desktop:preview",
+    "desktop:dist:win": "bun run desktop:build && electron-builder --win --publish never",
+    "desktop:dist:mac": "bun run desktop:build && electron-builder --mac --publish never",
+    "desktop:dist:linux": "bun run desktop:build && electron-builder --linux --publish never"
+  },
+  "build": {
+    "appId": "com.p2r3.convert",
+    "directories": {
+      "output": "release"
+    },
+    "files": [
+      "dist/**/*",
+      "src/electron.cjs"
+    ],
+    "win": {
+      "target": "nsis"
+    },
+    "mac": {
+      "target": "dmg"
+    },
+    "linux": {
+      "target": "AppImage"
+    }
   },
   "devDependencies": {
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.4",
     "@types/jszip": "^3.4.0",
+    "@types/opentype.js": "^1.3.9",
+    "electron": "^40.6.0",
+    "electron-builder": "^26.8.1",
     "puppeteer": "^24.36.0",
     "typescript": "~5.9.3",
     "vite": "^7.2.4",
@@ -27,26 +64,35 @@
     "@imagemagick/magick-wasm": "^0.0.37",
     "@sqlite.org/sqlite-wasm": "^3.51.2-build6",
     "@std/yaml": "npm:@jsr/std__yaml",
+    "@stringsync/vexml": "^0.1.8",
+    "@toon-format/toon": "^2.1.0",
     "@types/bun": "^1.3.9",
     "@types/meyda": "^5.3.0",
     "@types/pako": "^2.0.4",
     "@types/three": "^0.182.0",
+    "bson": "^7.2.0",
     "imagetracer": "^0.2.2",
+    "js-synthesizer": "^1.11.0",
     "jszip": "^3.10.1",
     "lucide-react": "^0.574.0",
     "meyda": "^5.6.3",
     "mime": "^4.1.0",
     "nbtify": "^2.2.0",
+    "opentype.js": "^1.3.4",
     "pako": "^2.1.0",
     "pdftoimg-js": "^0.2.5",
     "pe-library": "^2.0.1",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
+    "svg-pathdata": "^8.0.0",
     "three": "^0.182.0",
     "three-bvh-csg": "^0.0.17",
     "three-mesh-bvh": "^0.9.8",
     "ts-flp": "^1.0.3",
+    "verovio": "^6.0.1",
+    "vexflow": "^5.0.0",
     "vite-plugin-static-copy": "^3.1.6",
-    "wavefile": "^11.0.0"
+    "wavefile": "^11.0.0",
+    "woff2-encoder": "^2.0.0"
   }
 }

src/CommonFormats.ts

@@ -10,7 +10,8 @@ export const Category = {
     AUDIO: "audio",
     ARCHIVE: "archive",
     SPREADSHEET: "spreadsheet",
-    PRESENTATION: "presentation"
+    PRESENTATION: "presentation",
+    FONT: "font"
 }
 
 /**
@@ -98,8 +99,8 @@ const CommonFormats = {
     ),
     MD: new FormatDefinition(
         "Markdown Document",
-        "md",
-        "md",
+        "markdown",
+        "markdown",
         "text/markdown",
         ["document", "text"]
     ),
@@ -190,7 +191,51 @@ const CommonFormats = {
         "pptx",
         "pptx",
         "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-        Category.PRESENTATION
+        [Category.PRESENTATION, Category.DOCUMENT]
+    ),
+    // fonts
+    TTF: new FormatDefinition(
+        "TrueType Font",
+        "ttf",
+        "ttf",
+        "font/ttf",
+        [Category.FONT]
+    ),
+    OTF: new FormatDefinition(
+        "OpenType Font",
+        "otf",
+        "otf",
+        "font/otf",
+        [Category.FONT]
+    ),
+    WOFF: new FormatDefinition(
+        "Web Open Font Format",
+        "woff",
+        "woff",
+        "font/woff",
+        [Category.FONT]
+    ),
+    WOFF2: new FormatDefinition(
+        "Web Open Font Format 2.0",
+        "woff2",
+        "woff2",
+        "font/woff2",
+        [Category.FONT]
+    ),
+    // music notation
+    MUSICXML: new FormatDefinition(
+        "MusicXML",
+        "musicxml",
+        "musicxml",
+        "application/vnd.recordare.musicxml+xml",
+        Category.DOCUMENT
+    ),
+    MXL: new FormatDefinition(
+        "MusicXML Compressed",
+        "mxl",
+        "mxl",
+        "application/vnd.recordare.musicxml",
+        Category.DOCUMENT
     )
 }
 

src/FormatHandler.ts

@@ -5,7 +5,10 @@
 export interface IFormatDefinition {
   /** Format description (long name) for displaying to the user. */
   name: string;
-  /** Short, "formal" name for displaying to the user. */
+  /** Short, "formal" name for displaying to the user, and for
+   * differentiating between files of identical MIME types.
+   * If your file is different from others of the same MIME type,
+   * then this string should be used to differentiate it. */
   format: string;
   /** File extension. */
   extension: string;
@@ -38,10 +41,10 @@ export class FormatDefinition implements IFormatDefinition {
   public readonly category?: string[] | string;
 
   constructor(
-    name: string, 
-    format: string, 
-    extension: string, 
-    mime: string, 
+    name: string,
+    format: string,
+    extension: string,
+    mime: string,
     category?: string[] | string
   ) {
     this.name = name
@@ -59,7 +62,7 @@ export class FormatDefinition implements IFormatDefinition {
    * @param to Whether conversion **to** this format is supported.
    * @param lossless (Optional) Whether the format is lossless in this context. Defaults to `false`.
    * @param override Format definition values to override
-   * @returns 
+   * @returns
    */
   supported(ref: string, from: boolean, to: boolean, lossless?: boolean, override: Partial<IFormatDefinition> = {}): FileFormat {
     return {
@@ -73,7 +76,7 @@ export class FormatDefinition implements IFormatDefinition {
   }
 
   /**
-   * Returns a builder to fluently create FileFormat.  
+   * Returns a builder to fluently create FileFormat.
    * Builder can be used to create FileFormat based on this format definition
    */
   builder(ref: string) {