From d078a91ab5326e6c7fd8e6c7170b1a94a946be0c Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Thu, 24 Apr 2025 07:57:15 +0000 Subject: [PATCH] Reorganize file utilities and rename standardUpload to putObject --- packages/server/services/files/classes/Upload/index.ts | 5 ++--- packages/server/services/files/classes/Upload/putObject.js | 4 ++-- packages/server/services/files/routes/upload/chunk/post.js | 2 +- .../bufferToStream/index.js => utils/bufferToStream.js} | 0 packages/server/utils/readChunk.d.ts | 7 +++++++ .../files/utils/readChunk/index.js => utils/readChunk.js} | 0 6 files changed, 12 insertions(+), 6 deletions(-) rename packages/server/{services/files/utils/bufferToStream/index.js => utils/bufferToStream.js} (100%) create mode 100644 packages/server/utils/readChunk.d.ts rename packages/server/{services/files/utils/readChunk/index.js => utils/readChunk.js} (100%) diff --git a/packages/server/services/files/classes/Upload/index.ts b/packages/server/services/files/classes/Upload/index.ts index fd517af1..712aca04 100644 --- a/packages/server/services/files/classes/Upload/index.ts +++ b/packages/server/services/files/classes/Upload/index.ts @@ -1,12 +1,11 @@ import fs from "node:fs" import path from "node:path" - import { fileTypeFromBuffer } from "file-type" -import readChunk from "@utils/readChunk" +import readChunk from "@shared-utils/readChunk" import getFileHash from "@shared-utils/readFileHash" -import putObject from "./putObject" +import putObject from "./putObject" import Transformation from "../Transformation" export type FileHandlePayload = { diff --git a/packages/server/services/files/classes/Upload/putObject.js b/packages/server/services/files/classes/Upload/putObject.js index 89f0d51a..bc8ec7c0 100644 --- a/packages/server/services/files/classes/Upload/putObject.js +++ b/packages/server/services/files/classes/Upload/putObject.js @@ -2,7 +2,7 @@ import fs from "node:fs" import path from "node:path" import pMap from "p-map" -export default async function standardUpload({ +export default async function putObject({ filePath, uploadPath, metadata = {}, @@ -25,7 +25,7 @@ export default async function standardUpload({ } }) - await pMap(files, standardUpload, { + await pMap(files, putObject, { concurrency: 3, }) diff --git a/packages/server/services/files/routes/upload/chunk/post.js b/packages/server/services/files/routes/upload/chunk/post.js index eb3c789b..c1111e01 100644 --- a/packages/server/services/files/routes/upload/chunk/post.js +++ b/packages/server/services/files/routes/upload/chunk/post.js @@ -3,7 +3,7 @@ import fs from "node:fs" import { checkChunkUploadHeaders, handleChunkFile } from "@classes/ChunkFile" import Upload from "@classes/Upload" -import bufferToStream from "@utils/bufferToStream" +import bufferToStream from "@shared-utils/bufferToStream" const availableProviders = ["b2", "standard"] diff --git a/packages/server/services/files/utils/bufferToStream/index.js b/packages/server/utils/bufferToStream.js similarity index 100% rename from packages/server/services/files/utils/bufferToStream/index.js rename to packages/server/utils/bufferToStream.js diff --git a/packages/server/utils/readChunk.d.ts b/packages/server/utils/readChunk.d.ts new file mode 100644 index 00000000..3b4efa36 --- /dev/null +++ b/packages/server/utils/readChunk.d.ts @@ -0,0 +1,7 @@ +export default function readChunk( + filePath: string, + options: { + length: number + startPosition: number + }, +): Promise diff --git a/packages/server/services/files/utils/readChunk/index.js b/packages/server/utils/readChunk.js similarity index 100% rename from packages/server/services/files/utils/readChunk/index.js rename to packages/server/utils/readChunk.js