set upload original path

Author: eveffer

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",

src/files/actions/upload-file.ts

@@ -77,11 +77,13 @@ export const uploadFile = new CloudAPIAction("upload", {
       accountFolder = joinPath(inCloud.publicFilesPath, accountId);
       path = joinPath(accountFolder, newFileName);
     }
-    await Deno.mkdir(accountFolder, {
+    const originalFolder = joinPath(accountFolder, "original");
+    await Deno.mkdir(originalFolder, {
       recursive: true,
     });
     cloudFile.filePath = path;
     if (optimizeImage) {
+      path = joinPath(originalFolder, newFileName);
       const defaultSize = 1000;
       cloudFile.optimizeImage = true;
       cloudFile.optimizeWidth = optimizeWidth || defaultSize;

src/files/image-ops/resize-worker.ts

@@ -1,5 +1,6 @@
 /// <reference lib="webworker" />
 
+import { joinPath } from "../../utils/path-utils.ts";
 import type {
   ErrorResult,
   ImageMessageEvent,
@@ -68,9 +69,12 @@ const commandHandlers: {
   },
   async optimize(msg) {
     const { filePath, width, height, format } = msg;
-    const fileData = await Deno.readFile(filePath);
     let resized: Uint8Array | null = null;
-
+    const pathParts = filePath.split("/");
+    const fileName = pathParts.pop()!;
+    const originalsDir = joinPath(...pathParts, "original");
+    const originalPath = joinPath(originalsDir, fileName);
+    const fileData = await Deno.readFile(originalPath);
     switch (format) {
       case "jpeg":
         resized = resizeImage.toJpg(fileData, width, height);
@@ -101,19 +105,18 @@ const commandHandlers: {
     }
     const outputFilePath = filePath.replace(
       /\.[^.]+$/,
-      `-resized.${format === "jpeg" ? "jpg" : "png"}`,
+      `.${format === "jpeg" ? "jpg" : "png"}`,
     );
-    const newFilePath = outputFilePath.replace(/-resized\./, ".");
+
     await Deno.writeFile(outputFilePath, resized);
-    await Deno.remove(filePath);
-    await Deno.rename(outputFilePath, newFilePath);
+    await Deno.remove(originalPath);
 
     return {
       command: "optimize",
       id: msg.id,
       success: true,
       fileSize: resized.byteLength,
-      newFilePath,
+      newFilePath: outputFilePath,
       thumbnailPath: thumbnail ? thumbPath : "",
       thumbnailSize: thumbnail ? thumbnail.byteLength : 0,
     };

src/in-queue/in-queue.ts

@@ -9,7 +9,6 @@ import type {
   OptimizeImageTaskData,
   QueueCommand,
   QueueMessage,
-  QueueThumb,
   TaskInfo,
 } from "./types.ts";
 import type { InSpatialORM } from "../orm/inspatial-orm.ts";
@@ -18,11 +17,10 @@ import { createInLog } from "#inLog";
 import type { InTaskGlobal } from "./entry-types/in-task/_in-task-global.type.ts";
 import type { GenericEntry } from "../orm/entry/entry-base.ts";
 import { ImageOps } from "../files/image-ops/image-ops.ts";
-import { CloudFile } from "../files/entries/_cloud-file.type.ts";
-import { GlobalCloudFile } from "../files/entries/_global-cloud-file.type.ts";
+import type { CloudFile } from "../files/entries/_cloud-file.type.ts";
+import type { GlobalCloudFile } from "../files/entries/_global-cloud-file.type.ts";
 import MimeTypes from "../files/mime-types/mime-types.ts";
-import { InTask } from "./entry-types/in-task/_in-task.type.ts";
-import { ListOptions } from "@inspatial/cloud-client/types";
+import type { InTask } from "./entry-types/in-task/_in-task.type.ts";
 
 export class InQueue extends InCloud {
   clients: Map<string, WebSocket> = new Map();
@@ -196,6 +194,7 @@ export class InQueue extends InCloud {
       this.broadcastEnd("completed", startTime, message);
       return;
     }
+
     this.broadcastEnd("failed", startTime, message);
   }
 
@@ -243,7 +242,9 @@ export class InQueue extends InCloud {
       this.broadcastEnd("completed", startTime, message);
       return;
     }
-
+    this.inLog.error(result, {
+      subject: "Image optimization failed",
+    });
     this.broadcastEnd("failed", startTime, message);
   }
   async runInTask(taskInfo: TaskInfo) {