feat: cleanup toolset resource corn job

Author: KUN1007

components/toolset/resource/Item.vue

@@ -140,7 +140,7 @@ const handleSave = async () => {
     note: formData.note,
     content: base.value.type === 'user' ? formData.content : ''
   }
-  const valid = useSchemaValidator(updateToolsetResourceSchema, body)
+  const valid = useKunSchemaValidator(updateToolsetResourceSchema, body)
   if (!valid) {
     return
   }

components/toolset/resource/LinkForm.vue

@@ -38,7 +38,7 @@ watch(
 )
 
 const submitLink = async () => {
-  const result = useSchemaValidator(createToolsetResourceSchema, formData)
+  const result = useKunSchemaValidator(createToolsetResourceSchema, formData)
   if (!result) {
     return
   }

components/toolset/resource/Upload.vue

@@ -91,7 +91,7 @@ const uploadSmall = async (f: File) => {
     filename: f.name,
     filesize: f.size
   }
-  const result = useSchemaValidator(initToolsetUploadSchema, initUploadData)
+  const result = useKunSchemaValidator(initToolsetUploadSchema, initUploadData)
   if (!result) {
     return
   }
@@ -119,7 +119,7 @@ const uploadSmall = async (f: File) => {
     const completeUploadData = {
       salt: initRes.salt
     }
-    const result = useSchemaValidator(
+    const result = useKunSchemaValidator(
       completeToolsetUploadSchema,
       completeUploadData
     )
@@ -151,7 +151,7 @@ const uploadLarge = async (f: File) => {
     filename: f.name,
     filesize: f.size
   }
-  const result = useSchemaValidator(initToolsetUploadSchema, initUploadData)
+  const result = useKunSchemaValidator(initToolsetUploadSchema, initUploadData)
   if (!result) {
     return
   }
@@ -204,7 +204,7 @@ const uploadLarge = async (f: File) => {
       uploadId: initRes.uploadId,
       parts
     }
-    const result = useSchemaValidator(
+    const result = useKunSchemaValidator(
       completeToolsetUploadSchema,
       completeUploadData
     )
@@ -231,7 +231,7 @@ const uploadLarge = async (f: File) => {
         salt: initRes.salt,
         uploadId: initRes.uploadId
       }
-      const result = useSchemaValidator(
+      const result = useKunSchemaValidator(
         abortToolsetUploadSchema,
         abortUploadData
       )

composables/useKunSchemaValidator.ts

@@ -1,6 +1,9 @@
 import type { ZodSchema } from 'zod'
 
-export const useSchemaValidator = <T>(schema: ZodSchema<T>, data: unknown) => {
+export const useKunSchemaValidator = <T>(
+  schema: ZodSchema<T>,
+  data: unknown
+) => {
   const result = schema.safeParse(data)
   if (!result.success) {
     const message = JSON.parse(result.error.message)[0]

lib/s3/client.ts

@@ -9,3 +9,12 @@ export const s3 = new S3Client({
   },
   requestChecksumCalculation: 'WHEN_REQUIRED'
 })
+
+export const s3ClientR2 = new S3Client({
+  endpoint: process.env.KUN_VISUAL_NOVEL_IMAGE_BED_ENDPOINT!,
+  region: 'auto',
+  credentials: {
+    accessKeyId: process.env.KUN_VISUAL_NOVEL_IMAGE_BED_ACCESS_KEY!,
+    secretAccessKey: process.env.KUN_VISUAL_NOVEL_IMAGE_BED_SECRET_KEY!
+  }
+})

lib/s3/uploadImageToS3.ts

@@ -1,13 +1,5 @@
-import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3'
-
-export const s3 = new S3Client({
-  endpoint: process.env.KUN_VISUAL_NOVEL_IMAGE_BED_ENDPOINT!,
-  region: 'auto',
-  credentials: {
-    accessKeyId: process.env.KUN_VISUAL_NOVEL_IMAGE_BED_ACCESS_KEY!,
-    secretAccessKey: process.env.KUN_VISUAL_NOVEL_IMAGE_BED_SECRET_KEY!
-  }
-})
+import { PutObjectCommand } from '@aws-sdk/client-s3'
+import { s3ClientR2 } from './client'
 
 export const uploadImageToS3 = async (key: string, fileBuffer: Buffer) => {
   const uploadCommand = new PutObjectCommand({
@@ -16,5 +8,5 @@ export const uploadImageToS3 = async (key: string, fileBuffer: Buffer) => {
     Body: fileBuffer,
     ContentType: 'application/octet-stream'
   })
-  await s3.send(uploadCommand)
+  await s3ClientR2.send(uploadCommand)
 }

nuxt.config.ts

@@ -173,7 +173,9 @@ export default defineNuxtConfig({
       tasks: true
     },
     scheduledTasks: {
-      '0 0 * * *': ['reset-daily']
+      '0 0 * * *': ['reset-daily'],
+      '0 * * * *': ['cleanup-toolset-resource']
+      // '* * * * *': ['cleanup-toolset-resource']
     }
   }
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kun-galgame-nuxt3",
-  "version": "4.4.3",
+  "version": "4.4.4",
   "packageManager": "[email protected]",
   "private": true,
   "scripts": {

server/tasks/cleanup-toolset-resource.ts

@@ -0,0 +1,44 @@
+import { DeleteObjectCommand } from '@aws-sdk/client-s3'
+import { s3 } from '~/lib/s3/client'
+import {
+  removeUploadCache,
+  type UploadSaltCache
+} from '~/server/utils/upload/saveUploadSalt'
+
+export default defineTask({
+  meta: {
+    name: 'cleanup-toolset-resource',
+    description:
+      'Every hour, delete S3 objects referenced by toolset:resource keys in Redis.'
+  },
+
+  async run() {
+    const storage = useStorage('redis')
+    const keys = await storage.getKeys('toolset:resource')
+
+    let deletedCount = 0
+
+    for (const key of keys) {
+      const store = await storage.getItem(key)
+      const parsedResult = JSON.parse(JSON.stringify(store)) as UploadSaltCache
+
+      try {
+        if (parsedResult && parsedResult.key) {
+          await s3.send(
+            new DeleteObjectCommand({
+              Bucket: process.env.KUN_VISUAL_NOVEL_S3_STORAGE_BUCKET_NAME!,
+              Key: parsedResult.key
+            })
+          )
+          await removeUploadCache(parsedResult.salt)
+
+          deletedCount++
+        }
+      } catch (err) {
+        console.error(`Failed to delete object for key ${key}:`)
+      }
+    }
+
+    return { result: `Deleted ${deletedCount} toolset resources from S3.` }
+  }
+})

server/tasks/reset-daily.ts

@@ -11,10 +11,15 @@ export default defineTask({
     const { count } = await prisma.user.updateMany({
       data: {
         daily_check_in: 0,
-        daily_image_count: 0
+        daily_image_count: 0,
+        daily_toolset_upload_count: 0
       },
       where: {
-        OR: [{ daily_check_in: { not: 0 } }, { daily_image_count: { not: 0 } }]
+        OR: [
+          { daily_check_in: { not: 0 } },
+          { daily_image_count: { not: 0 } },
+          { daily_toolset_upload_count: { not: 0 } }
+        ]
       }
     })