diff --git a/packages/server/services/files/classes/Transformation/handlers/a-dash.js b/packages/server/classes/Transformation/handlers/a-dash.js similarity index 100% rename from packages/server/services/files/classes/Transformation/handlers/a-dash.js rename to packages/server/classes/Transformation/handlers/a-dash.js diff --git a/packages/server/services/files/classes/Transformation/handlers/img-compress.js b/packages/server/classes/Transformation/handlers/img-compress.js similarity index 100% rename from packages/server/services/files/classes/Transformation/handlers/img-compress.js rename to packages/server/classes/Transformation/handlers/img-compress.js diff --git a/packages/server/services/files/classes/Transformation/handlers/mq-hls.js b/packages/server/classes/Transformation/handlers/mq-hls.js similarity index 100% rename from packages/server/services/files/classes/Transformation/handlers/mq-hls.js rename to packages/server/classes/Transformation/handlers/mq-hls.js diff --git a/packages/server/services/files/classes/Transformation/handlers/video-compress.js b/packages/server/classes/Transformation/handlers/video-compress.js similarity index 100% rename from packages/server/services/files/classes/Transformation/handlers/video-compress.js rename to packages/server/classes/Transformation/handlers/video-compress.js diff --git a/packages/server/services/files/classes/Transformation/index.ts b/packages/server/classes/Transformation/index.ts similarity index 100% rename from packages/server/services/files/classes/Transformation/index.ts rename to packages/server/classes/Transformation/index.ts diff --git a/packages/server/services/files/classes/Upload/index.ts b/packages/server/classes/Upload/index.ts similarity index 100% rename from packages/server/services/files/classes/Upload/index.ts rename to packages/server/classes/Upload/index.ts diff --git a/packages/server/services/files/classes/Upload/putObject.js b/packages/server/classes/Upload/putObject.js similarity index 100% rename from packages/server/services/files/classes/Upload/putObject.js rename to packages/server/classes/Upload/putObject.js diff --git a/packages/server/services/files/file.service.js b/packages/server/services/files/file.service.js index 835088fc..7c2ce7f1 100755 --- a/packages/server/services/files/file.service.js +++ b/packages/server/services/files/file.service.js @@ -1,22 +1,21 @@ import { Server } from "linebridge" -import B2 from "backblaze-b2" - import DbManager from "@shared-classes/DbManager" import RedisClient from "@shared-classes/RedisClient" import StorageClient from "@shared-classes/StorageClient" import CacheService from "@shared-classes/CacheService" import SSEManager from "@shared-classes/SSEManager" -import SharedMiddlewares from "@shared-middlewares" import LimitsClass from "@shared-classes/Limits" import TaskQueueManager from "@shared-classes/TaskQueueManager" +import SharedMiddlewares from "@shared-middlewares" + class API extends Server { static refName = "files" static useEngine = "hyper-express-ng" static routesPath = `${__dirname}/routes` static listen_port = process.env.HTTP_LISTEN_PORT ?? 3002 - static enableWebsockets = true + //static enableWebsockets = true middlewares = { ...SharedMiddlewares, diff --git a/packages/server/services/files/queues/fileProcess/index.js b/packages/server/services/files/queues/fileProcess/index.js index 2d984ee6..663a0d10 100644 --- a/packages/server/services/files/queues/fileProcess/index.js +++ b/packages/server/services/files/queues/fileProcess/index.js @@ -1,7 +1,7 @@ import path from "node:path" import fs from "node:fs" -import Upload from "@classes/Upload" +import Upload from "@shared-classes/Upload" export default { id: "file-process", diff --git a/packages/server/services/files/routes/upload/chunk/post.js b/packages/server/services/files/routes/upload/chunk/post.js index 5fc3ed32..a2f12c95 100644 --- a/packages/server/services/files/routes/upload/chunk/post.js +++ b/packages/server/services/files/routes/upload/chunk/post.js @@ -2,7 +2,7 @@ import path from "node:path" import fs from "node:fs" import { checkChunkUploadHeaders, handleChunkFile } from "@classes/ChunkFile" -import Upload from "@classes/Upload" +import Upload from "@shared-classes/Upload" import bufferToStream from "@shared-utils/bufferToStream" const availableProviders = ["b2", "standard"] diff --git a/packages/server/services/files/routes/upload/file/post.js b/packages/server/services/files/routes/upload/file/post.js index 3f1fc511..de681d1f 100644 --- a/packages/server/services/files/routes/upload/file/post.js +++ b/packages/server/services/files/routes/upload/file/post.js @@ -1,7 +1,7 @@ import path from "node:path" import fs from "node:fs" -import Upload from "@classes/Upload" +import Upload from "@shared-classes/Upload" export default { useContext: ["cache"],