Updated support for mount and other filesystems.

LostBeard · Sep 13, 2023 · 1abd8d3 · 1abd8d3
1 parent 71ac16f
commit 1abd8d3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 17 deletions.
diff --git a/packages/ffmpeg/src/classes.ts b/packages/ffmpeg/src/classes.ts
@@ -14,6 +14,9 @@ import {
   ProgressEventCallback,
   FileData,
   WorkerFSMountData,
+  FFFSType,
+  FFFSMountOptions,
+  FFFSPath,
 } from "./types.js";
 import { getMessageID } from "./utils.js";
 import { ERROR_TERMINATED, ERROR_NOT_LOADED } from "./errors.js";
@@ -263,23 +266,23 @@ export class FFmpeg {
     ) as Promise<OK>;
   };
 
-  public mount = (path: string, data: WorkerFSMountData): Promise<OK> => {
+  public mount = (fsType: FFFSType, options: FFFSMountOptions, mountPoint: FFFSPath, ): Promise<OK> => {
     const trans: Transferable[] = [];
     return this.#send(
       {
         type: FFMessageType.MOUNT,
-        data: { path, data },
+        data: { fsType, options, mountPoint },
       },
       trans
     ) as Promise<OK>;
   };
 
-  public unmount = (path: string): Promise<OK> => {
+  public unmount = (mountPoint: FFFSPath): Promise<OK> => {
     const trans: Transferable[] = [];
     return this.#send(
       {
         type: FFMessageType.UNMOUNT,
-        data: { path },
+        data: { mountPoint },
       },
       trans
     ) as Promise<OK>;
@@ -310,7 +313,7 @@ export class FFmpeg {
   ): Promise<FileData> =>
     this.#send({
       type: FFMessageType.READ_FILE,
-      data: { path, encoding },
+      data: { mountPoint: path, encoding },
     }) as Promise<FileData>;
 
   /**
@@ -321,7 +324,7 @@ export class FFmpeg {
   public deleteFile = (path: string): Promise<OK> =>
     this.#send({
       type: FFMessageType.DELETE_FILE,
-      data: { path },
+      data: { mountPoint: path },
     }) as Promise<OK>;
 
   /**
@@ -343,7 +346,7 @@ export class FFmpeg {
   public createDir = (path: string): Promise<OK> =>
     this.#send({
       type: FFMessageType.CREATE_DIR,
-      data: { path },
+      data: { mountPoint: path },
     }) as Promise<OK>;
 
   /**
@@ -354,7 +357,7 @@ export class FFmpeg {
   public listDir = (path: string): Promise<FSNode[]> =>
     this.#send({
       type: FFMessageType.LIST_DIR,
-      data: { path },
+      data: { mountPoint: path },
     }) as Promise<FSNode[]>;
 
   /**
@@ -365,6 +368,6 @@ export class FFmpeg {
   public deleteDir = (path: string): Promise<OK> =>
     this.#send({
       type: FFMessageType.DELETE_DIR,
-      data: { path },
+      data: { mountPoint: path },
     }) as Promise<OK>;
 }
diff --git a/packages/ffmpeg/src/const.ts b/packages/ffmpeg/src/const.ts
@@ -22,4 +22,4 @@ export enum FFMessageType {
   MOUNT = "MOUNT",
   UNMOUNT = "UNMOUNT",
   FILESYSTEMS = "FILESYSTEMS",
-}
+}
diff --git a/packages/ffmpeg/src/types.ts b/packages/ffmpeg/src/types.ts
@@ -70,6 +70,15 @@ export interface FFMessageDeleteDirData {
   path: FFFSPath;
 }
 
+export enum FFFSType {
+  MEMFS = "MEMFS",
+  NODEFS = "NODEFS",
+  NODERAWFS = "NODERAWFS",
+  IDBFS  = "IDBFS",
+  WORKERFS = "WORKERFS",
+  PROXYFS = "PROXYFS",
+}
+
 export type WorkerFSFileEntry =
   | File;
 
@@ -83,13 +92,17 @@ export interface WorkerFSMountData {
   files?: WorkerFSFileEntry[];
 }
 
+export type FFFSMountOptions =
+  | WorkerFSMountData;
+
 export interface FFMessageMountData {
-  path: FFFSPath;
-  data: WorkerFSMountData;
+  fsType: FFFSType;
+  options: FFFSMountOptions;
+  mountPoint: FFFSPath;
 }
 
 export interface FFMessageUnmountData {
-  path: FFFSPath;
+  mountPoint: FFFSPath;
 }
 
 export type FFMessageData =

diff --git a/packages/ffmpeg/src/worker.ts b/packages/ffmpeg/src/worker.ts
@@ -139,13 +139,16 @@ const deleteDir = ({ path }: FFMessageDeleteDirData): OK => {
   return true;
 };
 
-const mount = ({ path, data }: FFMessageMountData): OK => {
-  ffmpeg.FS.mount(ffmpeg.FS.filesystems.WORKERFS, data, path);
+const mount = ({ fsType, options, mountPoint }: FFMessageMountData): OK => {
+  let str = fsType as keyof typeof ffmpeg.FS.filesystems;
+  let fs = ffmpeg.FS.filesystems[str];
+  if (!fs) return false;
+  ffmpeg.FS.mount(fs, options, mountPoint);
   return true;
 };
 
-const unmount = ({ path }: FFMessageUnmountData): OK => {
-  ffmpeg.FS.unmount(path);
+const unmount = ({ mountPoint }: FFMessageUnmountData): OK => {
+  ffmpeg.FS.unmount(mountPoint);
   return true;
 };