chore: improve code

Author: xqvvu

packages/global/common/file/minioTtl/type.d.ts

@@ -1,8 +1,6 @@
-import type { TeamCollectionName } from '../../../support/user/team/constant';
-
-export type MinioTtlSchemaType = {
+export type S3TtlSchemaType = {
   _id: string;
   bucketName: string;
   minioKey: string;
-  expiredTime?: Date;
+  expiredTime: Date;
 };

packages/service/common/file/minioTtl/hooks.ts

@@ -1,4 +1,4 @@
-import { MongoMinioTtl } from './schema';
+import { MongoS3Ttl } from './schema';
 import { S3BucketManager } from '../../s3/buckets/manager';
 import { addLog } from '../../system/log';
 import { setCron } from '../../system/cron';
@@ -9,7 +9,7 @@ export async function clearExpiredMinioFiles() {
   try {
     const now = new Date();
 
-    const expiredFiles = await MongoMinioTtl.find({
+    const expiredFiles = await MongoS3Ttl.find({
       expiredTime: { $exists: true, $ne: null, $lte: now }
     }).lean();
 
@@ -27,19 +27,17 @@ export async function clearExpiredMinioFiles() {
     for (const file of expiredFiles) {
       try {
         const bucket = (() => {
-          switch (file.bucketName) {
-            case process.env.S3_PUBLIC_BUCKET:
-              return s3Manager.getPublicBucket();
-            case process.env.S3_PRIVATE_BUCKET:
-              return s3Manager.getPrivateBucket();
-            default:
-              throw new Error(`Unknown bucket name: ${file.bucketName}`);
+          if (file.bucketName === process.env.S3_PUBLIC_BUCKET) {
+            return s3Manager.getPublicBucket();
           }
+          if (file.bucketName === process.env.S3_PRIVATE_BUCKET) {
+            return s3Manager.getPrivateBucket();
+          }
+          throw new Error(`Unknown bucket name: ${file.bucketName}`);
         })();
 
         await bucket.delete(file.minioKey);
-
-        await MongoMinioTtl.deleteOne({ _id: file._id });
+        await MongoS3Ttl.deleteOne({ _id: file._id });
 
         success++;
         addLog.info(`Deleted expired minio file: ${file.minioKey} from bucket: ${file.bucketName}`);
@@ -68,25 +66,3 @@ export function clearExpiredMinioFilesCron() {
     }
   });
 }
-
-export async function addMinioTtlFile({
-  bucketName,
-  minioKey,
-  expiredTime
-}: {
-  bucketName: string;
-  minioKey: string;
-  expiredTime?: Date;
-}) {
-  try {
-    await MongoMinioTtl.create({
-      bucketName,
-      minioKey,
-      expiredTime
-    });
-    addLog.info(`Added minio TTL file: ${minioKey}, expiredTime: ${expiredTime}`);
-  } catch (error) {
-    addLog.error('Failed to add minio TTL file', error);
-    throw error;
-  }
-}

packages/service/common/file/minioTtl/schema.ts

@@ -0,0 +1,24 @@
+import { Schema, getMongoModel } from '../../mongo';
+import { type S3TtlSchemaType } from '@fastgpt/global/common/file/minioTtl/type';
+
+const collectionName = 's3_ttl_files';
+
+const S3TtlSchema = new Schema({
+  bucketName: {
+    type: String,
+    required: true
+  },
+  minioKey: {
+    type: String,
+    required: true
+  },
+  expiredTime: {
+    type: Date,
+    required: true
+  }
+});
+
+S3TtlSchema.index({ expiredTime: 1 });
+S3TtlSchema.index({ bucketName: 1, minioKey: 1 });
+
+export const MongoS3Ttl = getMongoModel<S3TtlSchemaType>(collectionName, S3TtlSchema);

packages/service/common/file/minioTtl/types.ts

@@ -1,22 +1,20 @@
 import { Client, type RemoveOptions, type CopyConditions, type LifecycleConfig } from 'minio';
 import {
   defaultS3Options,
+  type ExtensionType,
+  Mimes,
   type CreatePostPresignedUrlOptions,
   type CreatePostPresignedUrlParams,
   type CreatePostPresignedUrlResult,
   type S3BucketName,
   type S3Options
-} from '../types';
-import type { IBucketBasicOperations } from '../interface';
-import {
-  createObjectKey,
-  createPresignedUrlExpires,
-  createTempObjectKey,
-  inferContentType
-} from '../helpers';
-import { afterCreatePresignedUrl } from '../../file/minioTtl/hooks';
+} from '../type';
+import type { BucketBasicOperationsType } from '../interface';
+import { createObjectKey, createTempObjectKey } from '../helpers';
+import path from 'node:path';
+import { MongoS3Ttl } from 'common/file/s3Ttl/schema';
 
-export class S3BaseBucket implements IBucketBasicOperations {
+export class S3BaseBucket implements BucketBasicOperationsType {
   public client: Client;
 
   /**
@@ -69,37 +67,40 @@ export class S3BaseBucket implements IBucketBasicOperations {
     throw new Error('Method not implemented.');
   }
 
-  lifecycle(): Promise<LifecycleConfig | null> {
+  getLifecycle(): Promise<LifecycleConfig | null> {
     return this.client.getBucketLifecycle(this.name);
   }
 
   async createPostPresignedUrl(
     params: CreatePostPresignedUrlParams,
     options: CreatePostPresignedUrlOptions = {}
   ): Promise<CreatePostPresignedUrlResult> {
-    const { temporay, ttl: ttlDays = 7 } = options;
-    const contentType = inferContentType(params.filename);
+    const { temporary, ttl = 7 * 24 } = options;
+    const ext = path.extname(params.filename).toLowerCase() as ExtensionType;
+    const contentType = Mimes[ext] ?? 'application/octet-stream';
     const maxFileSize = this.options.maxFileSize as number;
-    const key = temporay ? createTempObjectKey(params) : createObjectKey(params);
+    const key = temporary ? createTempObjectKey(params) : createObjectKey(params);
 
     const policy = this.client.newPostPolicy();
     policy.setKey(key);
     policy.setBucket(this.name);
     policy.setContentType(contentType);
     policy.setContentLengthRange(1, maxFileSize);
-    policy.setExpires(createPresignedUrlExpires(10));
+    policy.setExpires(new Date(Date.now() + 10 * 60 * 1000));
     policy.setUserMetaData({
       filename: encodeURIComponent(params.filename),
       visibility: params.visibility
     });
 
     const { formData, postURL } = await this.client.presignedPostPolicy(policy);
-    await afterCreatePresignedUrl({
-      bucketName: this.name,
-      objectKey: key,
-      temporay,
-      ttl: ttlDays
-    });
+
+    if (temporary) {
+      await MongoS3Ttl.create({
+        minioKey: key,
+        bucketName: this.name,
+        expiredTime: new Date(Date.now() + ttl * 3.6e6)
+      });
+    }
 
     return {
       url: postURL,

packages/service/common/file/minioTtl/controller.ts renamed to packages/service/common/file/s3Ttl/controller.ts

@@ -1,4 +1,4 @@
-import { type S3Options } from '../types';
+import { type S3Options } from '../type';
 import { S3PublicBucket } from './public';
 import { S3PrivateBucket } from './private';
 

packages/service/common/file/s3Ttl/schema.ts

@@ -4,7 +4,7 @@ import {
   type CreatePostPresignedUrlParams,
   type CreatePostPresignedUrlResult,
   type S3Options
-} from '../types';
+} from '../type';
 
 export class S3PrivateBucket extends S3BaseBucket {
   constructor(options?: Partial<S3Options>) {

packages/service/common/s3/buckets/base.ts

@@ -6,7 +6,7 @@ import {
   type CreatePostPresignedUrlParams,
   type CreatePostPresignedUrlResult,
   type S3Options
-} from '../types';
+} from '../type';
 import type { IPublicBucketOperations } from '../interface';
 import { lifecycleOfTemporaryAvatars } from '../lifecycle';
 
@@ -42,7 +42,17 @@ export class S3PublicBucket extends S3BaseBucket implements IPublicBucketOperati
     const port = this.options.port;
     const bucket = this.name;
 
-    return `${protocol}://${hostname}:${port}/${bucket}/${objectKey}`;
+    const url = new URL(`${protocol}://${hostname}:${port}/${bucket}/${objectKey}`);
+
+    if (this.options.externalBaseURL) {
+      const externalBaseURL = new URL(this.options.externalBaseURL);
+
+      url.port = externalBaseURL.port;
+      url.hostname = externalBaseURL.hostname;
+      url.protocol = externalBaseURL.protocol;
+    }
+
+    return url.toString();
   }
 
   override createPostPresignedUrl(