make the format a parameter

package-lock.json

@@ -21,6 +21,7 @@
         "mime-types": "^2.1.35",
         "node-fetch": "^3.3.1",
         "puppeteer": "^22.7.0",
+        "query-string": "^9.0.0",
         "sharp": "^0.33.3",
         "temp-dir": "^3.0.0",
         "ts-node": "^10.9.1",
@@ -1543,6 +1544,14 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/decode-uri-component": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.4.1.tgz",
+      "integrity": "sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==",
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
     "node_modules/define-data-property": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
@@ -1921,6 +1930,17 @@
         "node": "^12.20 || >= 14.13"
       }
     },
+    "node_modules/filter-obj": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz",
+      "integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/finalhandler": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -2789,6 +2809,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/query-string": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.0.0.tgz",
+      "integrity": "sha512-4EWwcRGsO2H+yzq6ddHcVqkCQ2EFUSfDMEjF8ryp8ReymyZhIuaFRGLomeOQLkrzacMHoyky2HW0Qe30UbzkKw==",
+      "dependencies": {
+        "decode-uri-component": "^0.4.1",
+        "filter-obj": "^5.1.0",
+        "split-on-first": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/queue-tick": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
@@ -3087,6 +3123,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/split-on-first": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-3.0.0.tgz",
+      "integrity": "sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/sprintf-js": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",

package.json

@@ -26,6 +26,7 @@
     "mime-types": "^2.1.35",
     "node-fetch": "^3.3.1",
     "puppeteer": "^22.7.0",
+    "query-string": "^9.0.0",
     "sharp": "^0.33.3",
     "temp-dir": "^3.0.0",
     "ts-node": "^10.9.1",

src/core/ffmpeg/concatenateVideosWithAudio.mts

@@ -10,8 +10,12 @@ import { getMediaInfo } from "./getMediaInfo.mts";
 import { removeTemporaryFiles } from "../files/removeTmpFiles.mts";
 import { addBase64Header } from "../base64/addBase64.mts";
 
-type ConcatenateVideoWithAudioOptions = {
+export type SupportedExportFormat = "mp4" | "webm"
+export const defaultExportFormat = "mp4"
+
+export type ConcatenateVideoWithAudioOptions = {
   output?: string;
+  format?: SupportedExportFormat;
   audioTrack?: string; // base64
   audioFilePath?: string; // path
   videoTracks?: string[]; // base64
@@ -24,6 +28,7 @@ type ConcatenateVideoWithAudioOptions = {
 
 export const concatenateVideosWithAudio = async ({
   output,
+  format = defaultExportFormat,
   audioTrack = "",
   audioFilePath = "",
   videoTracks = [],
@@ -65,7 +70,7 @@ export const concatenateVideosWithAudio = async ({
     const tempMediaInfo = await getMediaInfo(tempFilePath.filepath);
     const hasOriginalAudio = tempMediaInfo.hasAudio;
 
-    const finalOutputFilePath = output || path.join(tempDir, `${uuidv4()}.mp4`);
+    const finalOutputFilePath = output || path.join(tempDir, `${uuidv4()}.${format}`);
 
     // Begin ffmpeg command configuration
     let cmd = ffmpeg();
@@ -133,7 +138,7 @@ export const concatenateVideosWithAudio = async ({
           if (asBase64) {
             try {
               const outputBuffer = await fs.readFile(finalOutputFilePath);
-              const outputBase64 = addBase64Header(outputBuffer.toString("base64"), "mp4")
+              const outputBase64 = addBase64Header(outputBuffer.toString("base64"), format)
               resolve(outputBase64);
             } catch (error) {
               reject(new Error(`Error reading output video file: ${(error as Error).message}`));

src/index.mts

@@ -6,6 +6,8 @@ import { parseClap, ClapProject } from "@aitube/clap"
 
 import { clapToTmpVideoFilePath } from "./main.mts"
 import { deleteFile } from "./core/files/deleteFile.mts"
+import queryString from "query-string"
+import { defaultExportFormat, SupportedExportFormat } from "./core/ffmpeg/concatenateVideosWithAudio.mts"
 
 const app = express()
 const port = 7860
@@ -39,9 +41,21 @@ app.get("/", async (req, res) => {
   res.end()
 })
 
+
 // the export robot has only one job: to export .clap files
 app.post("/", async (req, res) => {
       
+  const qs = queryString.parseUrl(req.url || "")
+  const query = (qs || {}).query
+
+  let format: SupportedExportFormat = defaultExportFormat
+  try {
+    format = decodeURIComponent(query?.f?.toString() || defaultExportFormat).trim() as SupportedExportFormat
+    if (format !== "mp4" && format !== "webm") {
+      format = defaultExportFormat
+    }
+  } catch (err) {}
+
   let data: Uint8Array[] = [];
 
   req.on("data", (chunk) => {
@@ -59,8 +73,8 @@ app.post("/", async (req, res) => {
       const {
         tmpWorkDir,
         outputFilePath,
-      } = await clapToTmpVideoFilePath({ clap })
-      console.log("got an output file at:", outputFilePath)
+      } = await clapToTmpVideoFilePath({ clap, format })
+      console.log(`got an output ${format} file at:`, outputFilePath)
 
       res.download(outputFilePath, async () => {
         // clean-up after ourselves (we clear the whole tmp directory)

src/main.mts

@@ -3,7 +3,7 @@ import { join } from "node:path"
 import { ClapProject } from "@aitube/clap";
 
 import { concatenateAudio } from "./core/ffmpeg/concatenateAudio.mts";
-import { concatenateVideosWithAudio } from "./core/ffmpeg/concatenateVideosWithAudio.mts";
+import { concatenateVideosWithAudio, defaultExportFormat, SupportedExportFormat } from "./core/ffmpeg/concatenateVideosWithAudio.mts";
 import { writeBase64ToFile } from "./core/files/writeBase64ToFile.mts";
 import { concatenateVideos } from "./core/ffmpeg/concatenateVideos.mts"
 import { deleteFilesWithName } from "./core/files/deleteFileWithName.mts"
@@ -11,6 +11,7 @@ import { getRandomDirectory } from "./core/files/getRandomDirectory.mts";
 import { clapWithVideosToVideoFile } from "./core/exporters/clapWithVideosToVideoFile.mts";
 import { clapWithStoryboardsToVideoFile } from "./core/exporters/clapWithStoryboardsToVideoFile.mts";
 
+
 /**
  * Generate a .mp4 video inside a directory (if none is provided, it will be created in /tmp)
  * 
@@ -19,11 +20,13 @@ import { clapWithStoryboardsToVideoFile } from "./core/exporters/clapWithStorybo
  */
 export async function clapToTmpVideoFilePath({
   clap,
+  format = defaultExportFormat,
   outputDir = "",
   clearTmpFilesAtEnd = false
 }: {
   clap: ClapProject
 
+  format?: SupportedExportFormat
   outputDir?: string
 
   // if you leave this to false, you will have to clear files yourself
@@ -90,7 +93,8 @@ export async function clapToTmpVideoFilePath({
   })
 
   const finalFilePathOfVideoWithMusic = await concatenateVideosWithAudio({
-    output: join(outputDir, `final_video.mp4`),
+    output: join(outputDir, `final_video.${format}`),
+    format,
     audioFilePath: concatenatedAudio.filepath,
     videoFilePaths: [concatenatedVideosNoMusic.filepath],
     // videos are silent, so they can stay at 0