@editframe/api 0.9.0-beta.3 → 0.10.0-beta.3

package/src/resources/unprocessed-file.ts

@@ -31,7 +31,7 @@ const FileProcessors = z.array(FileProcessor).refine(
 const MAX_FILE_SIZE = 1024 * 1024 * 1024; // 1GiB
 
 export const CreateUnprocessedFilePayload = z.object({
-  id: z.string(),
+  md5: z.string(),
   filename: z.string(),
   processes: FileProcessors.optional(),
   byte_size: z.number().int().max(MAX_FILE_SIZE),
@@ -44,7 +44,9 @@ export const UpdateUnprocessedFilePayload = z.object({
 export interface CreateUnprocessedFileResult {
   byte_size: number;
   next_byte: number;
+  complete: boolean;
   id: string;
+  md5: string;
   processes: z.infer<typeof FileProcessors>;
   asset_id: string;
 }
@@ -52,7 +54,9 @@ export interface CreateUnprocessedFileResult {
 export interface UpdateUnprocessedFileResult {
   byte_size?: number;
   next_byte: number;
+  complete: boolean;
   id: string;
+  md5: string;
   processes: z.infer<typeof FileProcessors>;
   asset_id: string;
 }
@@ -130,67 +134,85 @@ export const uploadUnprocessedFile = async (
   log("Unprocessed file upload complete");
 };
 
-const buildBufferProcessor = (processor: z.infer<typeof FileProcessor>) => {
-  return async (client: Client, buffer: Buffer, filename = "buffer") => {
-    log(`Processing file buffer: ${processor}`, filename);
-    const fileId = md5Buffer(buffer);
-
-    log("File ID", fileId);
-    log(`File size: ${buffer.byteLength} bytes`);
+const processResource = async (
+  client: Client,
+  filename: string,
+  md5: string,
+  byteSize: number,
+  processor: z.infer<typeof FileProcessor>,
+  doUpload: (id: string) => Promise<void>,
+) => {
+  log("Processing", { filename, md5, byteSize, processor });
 
-    await createUnprocessedFile(client, {
-      id: fileId,
-      processes: [],
-      filename,
-      byte_size: buffer.byteLength,
-    });
+  const unprocessedFile = await createUnprocessedFile(client, {
+    md5: md5,
+    processes: [],
+    filename,
+    byte_size: byteSize,
+  });
 
-    const readStream = new Readable({
-      read() {
-        readStream.push(buffer);
-        readStream.push(null);
-      },
-    });
+  if (unprocessedFile.complete === false) {
+    await doUpload(unprocessedFile.id);
+  }
 
-    await uploadUnprocessedFile(client, fileId, readStream, buffer.byteLength);
+  if (unprocessedFile.processes.includes(processor)) {
+    log("File already processed", unprocessedFile);
+    return unprocessedFile;
+  }
 
-    const fileInformation = await updateUnprocessedFile(client, fileId, {
+  const fileInformation = await updateUnprocessedFile(
+    client,
+    unprocessedFile.id,
+    {
       processes: [processor],
-    });
+    },
+  );
+  log("File processed", fileInformation);
+  return fileInformation;
+};
 
-    log("File processed", fileInformation);
-    return fileInformation;
+const buildBufferProcessor = (processor: z.infer<typeof FileProcessor>) => {
+  return async (client: Client, buffer: Buffer, filename = "buffer") => {
+    log(`Processing file buffer: ${processor}`, filename);
+    const md5 = md5Buffer(buffer);
+
+    return await processResource(
+      client,
+      filename,
+      md5,
+      buffer.byteLength,
+      processor,
+      async (id: string) => {
+        const readStream = new Readable({
+          read() {
+            readStream.push(buffer);
+            readStream.push(null);
+          },
+        });
+
+        await uploadUnprocessedFile(client, id, readStream, buffer.byteLength);
+      },
+    );
   };
 };
 
 const buildFileProcessor = (processor: z.infer<typeof FileProcessor>) => {
   return async (client: Client, filePath: string) => {
     log(`Processing file ${processor}`, filePath);
-    const fileId = await md5FilePath(filePath);
-
-    log("File ID", fileId);
-    await createUnprocessedFile(client, {
-      id: fileId,
-      processes: [],
-      filename: basename(filePath),
-      byte_size: (await stat(filePath)).size,
-    });
+    const md5 = await md5FilePath(filePath);
+    const byteSize = (await stat(filePath)).size;
 
-    const readStream = createReadStream(filePath);
-
-    await uploadUnprocessedFile(
+    return await processResource(
       client,
-      fileId,
-      readStream,
-      (await stat(filePath)).size,
+      basename(filePath),
+      md5,
+      byteSize,
+      processor,
+      async (id: string) => {
+        const readStream = createReadStream(filePath);
+        return await uploadUnprocessedFile(client, id, readStream, byteSize);
+      },
     );
-
-    const fileInformation = await updateUnprocessedFile(client, fileId, {
-      processes: [processor],
-    });
-
-    log("File processed", fileInformation);
-    return fileInformation;
   };
 };