Merge remote-tracking branch 'origin/master'

Author: zardoy

.github/workflows/docker.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 

.github/workflows/pages.yml

@@ -20,12 +20,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
       - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
+        uses: oven-sh/setup-bun@v2
         with:
           bun-version: "latest"
           cache: true
@@ -39,12 +39,15 @@ jobs:
       - name: Generate cache
         run: bun run buildCache.js dist/cache.json
 
+      - name: Test traversion graph
+        run: bun test test/TraversionGraph.test.ts
+
       - name: Test common conversion routes
         run: bun test test/commonFormats.test.ts
 
       - name: Upload Pages artifact
         if: github.event_name == 'push'
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: dist
 

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "src/handlers/image-to-txt"]
 	path = src/handlers/image-to-txt
 	url = https://git.sr.ht/~thezipcreator/image-to-txt
+[submodule "src/handlers/espeakng.js"]
+	path = src/handlers/espeakng.js
+	url = https://github.com/TheZipCreator/espeakng.js

index.html

@@ -13,6 +13,7 @@
   <link rel="manifest" href="/convert/manifest.json">
   <link rel="icon" href="/convert/favicon.png" type="image/png">
   <link rel="shortcut icon" href="/convert/favicon.png" type="image/png">
+  <script defer src="https://cloud.umami.is/script.js" data-website-id="5ad19322-f6db-4c83-969a-701dd0ae6f8d"></script>
   <title>FCO.TOOLS</title>
   <style>
     *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }

package.json

@@ -12,6 +12,7 @@
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.4",
+    "@types/jszip": "^3.4.0",
     "puppeteer": "^24.36.0",
     "typescript": "~5.9.3",
     "vite": "^7.2.4",
@@ -30,7 +31,6 @@
     "@types/meyda": "^5.3.0",
     "@types/pako": "^2.0.4",
     "@types/three": "^0.182.0",
-    "buffer": "^6.0.3",
     "imagetracer": "^0.2.2",
     "jszip": "^3.10.1",
     "lucide-react": "^0.574.0",

src/CommonFormats.ts

@@ -110,6 +110,13 @@ const CommonFormats = {
         "text/windows-batch",
         ["text"]
     ),
+    SH: new FormatDefinition(
+        "Shell Script",
+        "sh",
+        "sh",
+        "application/x-sh",
+        Category.TEXT
+    ),
     // audio
     MP3: new FormatDefinition(
         "MP3 Audio",

src/PriorityQueue.ts

@@ -1,9 +1,9 @@
-class PriorityQueue<T extends Object> {
+class PriorityQueue<T extends object> {
   private _queue: Array<T>;
   private _size: number = 0;
-  private _comparator: Function | null;
+  private _comparator: ((val: T, parent: T) => number) | null;
 
-  constructor(initialCapacity?: number, comparator?: Function) {
+  constructor(initialCapacity?: number, comparator?: (val: T, parent: T) => number) {
     const cap = initialCapacity ?? 11;
     const com = comparator ?? null;
     if (cap < 1) {
@@ -19,7 +19,7 @@ class PriorityQueue<T extends Object> {
     const newCapacity =
       oldCapacity + (oldCapacity < 64 ? oldCapacity + 2 : oldCapacity >> 1);
     if (!Number.isSafeInteger(newCapacity)) {
-      throw new Error('capacity out of range');
+      throw new Error('OOM: new capacity not a safe integer');
     }
     this._queue.length = newCapacity;
   }
@@ -38,8 +38,8 @@ class PriorityQueue<T extends Object> {
   private siftupUsingComparator(k: number, item: T): void {
     while (k > 0) {
       // find the parent
-      let parent = (k - 1) >>> 1;
-      let e = this._queue[parent] as T;
+      const parent = (k - 1) >>> 1;
+      const e = this._queue[parent] as T;
       // compare item with it parent, if item's priority less, break siftup and insert
       if (this._comparator!(item, e) >= 0) {
         break;
@@ -54,8 +54,8 @@ class PriorityQueue<T extends Object> {
 
   private siftupComparable(k: number, item: T): void {
     while (k > 0) {
-      let parent = (k - 1) >>> 1;
-      let e = this._queue[parent] as T;
+      const parent = (k - 1) >>> 1;
+      const e = this._queue[parent] as T;
       if (item.toString().localeCompare(e.toString()) >= 0) {
         break;
       }
@@ -74,19 +74,19 @@ class PriorityQueue<T extends Object> {
   }
 
   private sinkUsingComparator(k: number, item: T): void {
-    let half = this._size >>> 1;
+    const half = this._size >>> 1;
     while (k < half) {
       let child = (k << 1) + 1;
       let object = this._queue[child];
-      let right = child + 1;
-      // compare left right child, assgn child the bigger one
+      const right = child + 1;
+      // compare left right child, assign child the bigger one
       if (
         right < this._size &&
         this._comparator!(object, this._queue[right]) > 0
       ) {
         object = this._queue[(child = right)];
       }
-      //compare item and child if bigger is item, break
+      // compare item and child if bigger is item, break
       if (this._comparator!(item, object) <= 0) {
         break;
       }
@@ -97,11 +97,11 @@ class PriorityQueue<T extends Object> {
   }
 
   private sinkComparable(k: number, item: T): void {
-    let half = this._size >>> 1;
+    const half = this._size >>> 1;
     while (k < half) {
       let child = (k << 1) + 1;
       let object = this._queue[child];
-      let right = child + 1;
+      const right = child + 1;
 
       if (
         right < this._size &&
@@ -128,7 +128,7 @@ class PriorityQueue<T extends Object> {
   }
 
   public add(item: T): boolean {
-    let i = this._size;
+    const i = this._size;
     if (i >= this._queue.length) {
       this.grow();
     }
@@ -145,9 +145,9 @@ class PriorityQueue<T extends Object> {
     if (this._size === 0) {
       return null;
     }
-    let s = --this._size;
-    let result = <T>this._queue[0];
-    let x = <T>this._queue[s];
+    const s = --this._size;
+    const result = <T>this._queue[0];
+    const x = <T>this._queue[s];
     this._queue.slice(s, 1);
     if (s !== 0) {
       this.sink(0, x);
@@ -164,9 +164,7 @@ class PriorityQueue<T extends Object> {
   }
 
   public clear(): void {
-    for (let item of this._queue) {
-      (item as any) = null;
-    }
+    this._queue.fill(null as unknown as T);
     this._size = 0;
   }
 
@@ -179,7 +177,7 @@ class PriorityQueue<T extends Object> {
   }
 
   public toArray(): Array<T> {
-    return this._queue.filter(item => item);
+    return this._queue;
   }
 
   public toString(): string {

src/TraversionGraph.ts

@@ -62,8 +62,10 @@ export class TraversionGraph {
         {from: "audio", to: "video", cost: 1}, // Might be lossy
         {from: "text", to: "image", cost: 0.5}, // Depends on the content and method, but can be relatively efficient for simple images
         {from: "image", to: "text", cost: 0.5}, // Depends on the content and method, but can be relatively efficient for simple images
+        {from: "text", to: "audio", cost: 0.6}, // Somewhat lossy for anything that isn't speakable text
     ];
     private categoryAdaptiveCosts: CategoryAdaptiveCost[] = [
+        { categories: ["text", "image", "audio"], cost: 15 }, // Text to audio through an image is likely not what the user wants
         { categories: ["image", "video", "audio"], cost: 10000 }, // Converting from image to audio through video is especially lossy
         { categories: ["audio", "video", "image"], cost: 10000 }, // Converting from audio to image through video is especially lossy
     ];

src/handlers/als.ts

@@ -0,0 +1,84 @@
+import type { FileData, FileFormat, FormatHandler } from "../FormatHandler.ts";
+
+class alsHandler implements FormatHandler {
+
+  public name: string = "als";
+
+  public supportedFormats: FileFormat[] = [
+    {
+      name: "Ableton Live Set",
+      format: "als",
+      extension: "als",
+      mime: "application/gzip",
+      from: true,
+      to: false,
+      internal: "als"
+    },
+    {
+      name: "XML Document",
+      format: "xml",
+      extension: "xml",
+      mime: "application/xml",
+      from: false,
+      to: true,
+      internal: "xml"
+    }
+  ];
+
+  public ready: boolean = false;
+
+  async init () {
+    this.ready = true;
+  }
+
+  async doConvert (
+    inputFiles: FileData[],
+    inputFormat: FileFormat,
+    outputFormat: FileFormat
+  ): Promise<FileData[]> {
+    if (inputFormat.internal !== "als" || outputFormat.internal !== "xml") {
+      throw "Invalid conversion path.";
+    }
+
+    const decoder = new TextDecoder("utf-8", { fatal: true });
+    const encoder = new TextEncoder();
+
+    return Promise.all(inputFiles.map(async (inputFile) => {
+      if (
+        inputFile.bytes.length < 2
+        || inputFile.bytes[0] !== 0x1f
+        || inputFile.bytes[1] !== 0x8b
+      ) {
+        throw "Invalid ALS file: expected gzip-compressed data.";
+      }
+
+      const decompressedStream = new Blob([inputFile.bytes as BlobPart])
+      .stream()
+      .pipeThrough(new DecompressionStream("gzip"));
+      const decompressedBytes = new Uint8Array(await new Response(decompressedStream).arrayBuffer());
+
+      let xml: string;
+      try {
+        xml = decoder.decode(decompressedBytes);
+      } catch (_) {
+        throw "Invalid ALS file: decompressed data is not UTF-8 XML.";
+      }
+      if (!xml.trimStart().startsWith("<")) {
+        throw "Invalid ALS file: decompressed data is not XML.";
+      }
+
+      const baseNameParts = inputFile.name.split(".");
+      const baseName = baseNameParts.length > 1
+        ? baseNameParts.slice(0, -1).join(".")
+        : inputFile.name;
+
+      return {
+        name: `${baseName}.xml`,
+        bytes: encoder.encode(xml)
+      };
+    }));
+  }
+
+}
+
+export default alsHandler;

src/handlers/bsor.ts

@@ -0,0 +1,67 @@
+import type { FileData, FileFormat, FormatHandler } from "../FormatHandler.ts";
+import { Replay } from "./bsor/replay.ts";
+import { render } from "./bsor/renderer.ts";
+import CommonFormats from "src/CommonFormats.ts";
+
+class bsorHandler implements FormatHandler {
+  public name: string = "bsor";
+  public supportedFormats: FileFormat[] = [
+    {
+      name: "Beat Saber Open Replay",
+      format: "bsor",
+      extension: "bsor",
+      mime: "application/x-bsor",
+      from: true,
+      to: false,
+      internal: "bsor"
+    },
+    CommonFormats.PNG.supported("png", false, true),
+    CommonFormats.JPEG.supported("jpeg", false, true),
+    CommonFormats.JSON.supported("json", false, true, true)
+  ];
+
+  public ready: boolean = true;
+
+  async init() {
+    this.ready = true;
+  }
+
+  async doConvert (
+    inputFiles: FileData[],
+    inputFormat: FileFormat,
+    outputFormat: FileFormat
+  ): Promise<FileData[]> {
+    let frameIndex = 0;
+    return (await Promise.all(inputFiles.map(async(file) => {
+      const replay = new Replay(file.bytes);
+      if(outputFormat.internal == "json") {
+        return [{
+          name: file.name.split(".")[0] + ".json",
+          bytes: new TextEncoder().encode(JSON.stringify(replay))
+        }];
+      }
+      let outputs: FileData[] = [];
+      await new Promise<void>(resolve => {
+        render(replay, 640, 480,
+          async(renderer) => {
+            const bytes: Uint8Array = await new Promise((resolve, reject) => {
+              renderer.domElement.toBlob((blob) => {
+                if (!blob) return reject("Canvas output failed");
+                blob.arrayBuffer().then(buf => resolve(new Uint8Array(buf)));
+              }, outputFormat.mime);
+            });
+            outputs.push({
+              name: file.name.split(".")[0]+"_"+(frameIndex++)+"."+outputFormat.extension,
+              bytes: bytes
+            });
+          },
+          async() => resolve()
+        );
+      })
+      return outputs;
+    }))).flat();
+  }
+
+}
+
+export default bsorHandler;