fix: refactoring, adding express api.

src/features/storages/helpers.ts

@@ -11,7 +11,7 @@ import * as drizzleDb from "@/db";
 import {withUpdatedAt} from "@/db/utils";
 import {eq} from "drizzle-orm";
 import {db} from "@/db";
-import crypto, {createHash} from "crypto";
+import {createHash} from "crypto";
 import {getServerUrl} from "@/utils/get-server-url";
 import path from "path";
 

src/features/storages/providers/google-drive/helpers.ts

@@ -1,36 +1,3 @@
-// import {drive_v3, google} from "googleapis";
-// import Drive = drive_v3.Drive;
-// import {GoogleDriveConfig} from "@/features/storages/providers/google-drive/types";
-//
-//
-// export async function getGoogleDriveClient(config: GoogleDriveConfig): Promise<Drive> {
-//     const auth = new google.auth.JWT({
-//         email: config.clientEmail,
-//         key: config.privateKey?.replace(/\\n/g, "\n"),
-//         scopes: ["https://www.googleapis.com/auth/drive"],
-//     });
-//
-//     return google.drive({
-//         version: "v3",
-//         auth,
-//     });
-// }
-//
-//
-// export async function findFileByName(
-//     drive: any,
-//     name: string,
-//     folderId: string
-// ): Promise<string | null> {
-//     const res = await drive.files.list({
-//         q: `name='${name}' and '${folderId}' in parents and trashed=false`,
-//         fields: "files(id)",
-//         pageSize: 1,
-//     });
-//
-//     return res.data.files?.[0]?.id ?? null;
-// }
-
 import {drive_v3, google} from "googleapis";
 import {GoogleDriveConfig} from "@/features/storages/providers/google-drive/types";
 import Drive = drive_v3.Drive;
@@ -42,7 +9,6 @@ export async function getGoogleDriveClient(config: GoogleDriveConfig): Promise<D
     const oauth2Client = new google.auth.OAuth2(
         config.clientId,
         config.clientSecret,
-        // config.redirectUri
         baseUrl
     );
 

src/features/storages/providers/google-drive/index.ts

@@ -77,8 +77,6 @@ export async function getGoogleDrive(
     const fileId = await resolveFilePath(client, input.data.path, config.folderId);
     if (!fileId) return {success: false, provider: "google-drive", error: "File not found"};
 
-
-
     const res = await client.files.get(
         {fileId, alt: "media", supportsAllDrives: true},
         {responseType: "stream"}

src/features/storages/providers/index.ts

@@ -1,7 +1,7 @@
 import {
     StorageProviderKind,
     StorageInput,
-    StorageResult, StorageMetaData,
+    StorageResult,
 } from '../types';
 
 import {uploadLocal, getLocal, deleteLocal, pingLocal} from './local';
@@ -39,8 +39,6 @@ const handlers: Record<StorageProviderKind, ProviderHandler> = {
         delete: deleteGoogleDrive,
         ping: pingGoogleDrive,
     }
-    // gcs: null as any,
-    // azure: null as any,
 };
 
 export async function dispatchViaProvider(

src/features/storages/providers/s3.ts

@@ -35,26 +35,22 @@ export async function uploadS3(
     input: { data: StorageUploadInput, metadata?: StorageMetaData }
 ): Promise<StorageResult> {
     const client = await getS3Client(config);
-    console.log(client);
     await ensureBucket(config);
 
     const key = `${BASE_DIR}${input.data.path}`;
     const file = input.data.file;
 
-    console.log(key)
-
     let uploadStream: Readable;
     if (Buffer.isBuffer(file) || file instanceof Uint8Array) {
         uploadStream = Readable.from(file);
     } else if ((file as any).pipe) {
         uploadStream = file;
     } else {
-        throw new Error("Unsupported file type for streaming upload");
+        return {success: false, provider: "s3", error: "Unsupported file type for streaming upload"};
     }
 
     try {
         const result = await client.putObject(config.bucketName, key, uploadStream, input.data.size);
-        console.log(result);
     } catch (err: any) {
         return {success: false, provider: "s3", error: err.message};
     }