From 66a2f760cf0085aefa826839147ed1a341166557 Mon Sep 17 00:00:00 2001
From: diced <git@diced.sh>
Date: Tue, 13 Jan 2026 22:47:40 -0800
Subject: [PATCH] fix: #957

---
 .../migration.sql                             |  2 +
 prisma/schema.prisma                          |  1 +
 .../pages/serverSettings/parts/Tasks.tsx      |  9 +++
 src/lib/config/read/db.ts                     |  1 +
 src/lib/config/read/env.ts                    |  1 +
 src/lib/config/read/index.ts                  |  1 +
 src/lib/config/validate.ts                    |  1 +
 src/lib/datasource/Datasource.ts              |  2 +
 src/lib/datasource/Local.ts                   |  8 ++-
 src/lib/datasource/S3.ts                      | 35 +++++++++++-
 src/lib/tasks/run/cleanThumbnails.ts          | 56 +++++++++++++++++++
 src/server/index.ts                           |  4 +-
 src/server/plugins/vite.ts                    |  4 +-
 .../routes/api/server/settings/index.ts       |  1 +
 14 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 prisma/migrations/20260114063251_clean_thumbnails/migration.sql
 create mode 100755 src/lib/tasks/run/cleanThumbnails.ts

diff --git a/prisma/migrations/20260114063251_clean_thumbnails/migration.sql b/prisma/migrations/20260114063251_clean_thumbnails/migration.sql
new file mode 100644
index 00000000..ae749e20
--- /dev/null
+++ b/prisma/migrations/20260114063251_clean_thumbnails/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."Zipline" ADD COLUMN     "tasksCleanThumbnailsInterval" TEXT NOT NULL DEFAULT '1d';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index cba98add..9251f38a 100755
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -31,6 +31,7 @@ model Zipline {
   tasksMaxViewsInterval     String @default("30m")
   tasksThumbnailsInterval   String @default("30m")
   tasksMetricsInterval      String @default("30m")
+  tasksCleanThumbnailsInterval      String @default("1d")
 
   filesRoute                    String   @default("/u")
   filesLength                   Int      @default(6)
diff --git a/src/components/pages/serverSettings/parts/Tasks.tsx b/src/components/pages/serverSettings/parts/Tasks.tsx
index 6f964ba3..90cc3494 100644
--- a/src/components/pages/serverSettings/parts/Tasks.tsx
+++ b/src/components/pages/serverSettings/parts/Tasks.tsx
@@ -20,6 +20,7 @@ export default function Tasks({
       tasksMaxViewsInterval: '30m',
       tasksThumbnailsInterval: '30m',
       tasksMetricsInterval: '30m',
+      tasksCleanThumbnailsInterval: '1d',
     },
     enhanceGetInputProps: (payload) => ({
       disabled: data?.tampered?.includes(payload.field) || false,
@@ -37,6 +38,7 @@ export default function Tasks({
       tasksMaxViewsInterval: data.settings.tasksMaxViewsInterval ?? '30m',
       tasksThumbnailsInterval: data.settings.tasksThumbnailsInterval ?? '30m',
       tasksMetricsInterval: data.settings.tasksMetricsInterval ?? '30m',
+      tasksCleanThumbnailsInterval: data.settings.tasksCleanThumbnailsInterval ?? '1d',
     });
   }, [data]);
 
@@ -79,6 +81,13 @@ export default function Tasks({
             placeholder='30m'
             {...form.getInputProps('tasksThumbnailsInterval')}
           />
+
+          <TextInput
+            label='Clean Thumbnails Interval'
+            description='How often to check and delete orphaned thumbnails from the filesystem or database.'
+            placeholder='1d'
+            {...form.getInputProps('tasksCleanThumbnailsInterval')}
+          />
         </SimpleGrid>
 
         <Button type='submit' mt='md' loading={isLoading} leftSection={<IconDeviceFloppy size='1rem' />}>
diff --git a/src/lib/config/read/db.ts b/src/lib/config/read/db.ts
index 2fc04c17..311fe51c 100644
--- a/src/lib/config/read/db.ts
+++ b/src/lib/config/read/db.ts
@@ -17,6 +17,7 @@ export const DATABASE_TO_PROP = {
   tasksMaxViewsInterval: 'tasks.maxViewsInterval',
   tasksThumbnailsInterval: 'tasks.thumbnailsInterval',
   tasksMetricsInterval: 'tasks.metricsInterval',
+  tasksCleanThumbnailsInterval: 'tasks.cleanThumbnailsInterval',
 
   filesRoute: 'files.route',
   filesLength: 'files.length',
diff --git a/src/lib/config/read/env.ts b/src/lib/config/read/env.ts
index cb3f2fb3..a54c0a00 100644
--- a/src/lib/config/read/env.ts
+++ b/src/lib/config/read/env.ts
@@ -54,6 +54,7 @@ export const ENVS = [
   env('tasks.maxViewsInterval', 'TASKS_MAX_VIEWS_INTERVAL', 'string', true),
   env('tasks.thumbnailsInterval', 'TASKS_THUMBNAILS_INTERVAL', 'string', true),
   env('tasks.metricsInterval', 'TASKS_METRICS_INTERVAL', 'string', true),
+  env('tasks.cleanThumbnailsInterval', 'TASKS_CLEAN_THUMBNAILS_INTERVAL', 'string', true),
 
   env('files.route', 'FILES_ROUTE', 'string', true),
   env('files.length', 'FILES_LENGTH', 'number', true),
diff --git a/src/lib/config/read/index.ts b/src/lib/config/read/index.ts
index f77896da..713ea73a 100755
--- a/src/lib/config/read/index.ts
+++ b/src/lib/config/read/index.ts
@@ -33,6 +33,7 @@ export const rawConfig: any = {
     maxViewsInterval: undefined,
     thumbnailsInterval: undefined,
     metricsInterval: undefined,
+    cleanThumbnailsInterval: undefined,
   },
   files: {
     route: undefined,
diff --git a/src/lib/config/validate.ts b/src/lib/config/validate.ts
index e1f99536..dc5e142c 100755
--- a/src/lib/config/validate.ts
+++ b/src/lib/config/validate.ts
@@ -109,6 +109,7 @@ export const schema = z.object({
     maxViewsInterval: z.string().default('30min'),
     thumbnailsInterval: z.string().default('30min'),
     metricsInterval: z.string().default('30min'),
+    cleanThumbnailsInterval: z.string().default('1d'),
   }),
   files: z.object({
     route: z.string().startsWith('/').min(1).trim().toLowerCase().default('/u'),
diff --git a/src/lib/datasource/Datasource.ts b/src/lib/datasource/Datasource.ts
index d35532ed..2031210d 100755
--- a/src/lib/datasource/Datasource.ts
+++ b/src/lib/datasource/Datasource.ts
@@ -1,6 +1,7 @@
 import { Readable } from 'stream';
 
 export type PutOptions = { mimetype?: string; noDelete?: boolean };
+export type ListOptions = { prefix: string };
 
 export abstract class Datasource {
   public name: string | undefined;
@@ -13,4 +14,5 @@ export abstract class Datasource {
   public abstract clear(): Promise<void>;
   public abstract range(file: string, start: number, end: number): Promise<Readable>;
   public abstract rename(from: string, to: string): Promise<void>;
+  public abstract list(options: ListOptions): Promise<string[]>;
 }
diff --git a/src/lib/datasource/Local.ts b/src/lib/datasource/Local.ts
index 2783f1b3..c0a9de41 100755
--- a/src/lib/datasource/Local.ts
+++ b/src/lib/datasource/Local.ts
@@ -2,7 +2,7 @@ import { createReadStream, existsSync } from 'fs';
 import { access, constants, copyFile, readdir, rename, rm, stat, writeFile } from 'fs/promises';
 import { join, resolve, sep } from 'path';
 import { Readable } from 'stream';
-import { Datasource, PutOptions } from './Datasource';
+import { Datasource, ListOptions, PutOptions } from './Datasource';
 
 async function existsAndCanRW(path: string): Promise<boolean> {
   try {
@@ -113,4 +113,10 @@ export class LocalDatasource extends Datasource {
 
     return rename(fromPath, toPath);
   }
+
+  public async list(options: ListOptions = { prefix: '' }): Promise<string[]> {
+    const files = await readdir(this.dir, { withFileTypes: true });
+
+    return files.filter((f) => f.isFile() && f.name.startsWith(options.prefix || '')).map((f) => f.name);
+  }
 }
diff --git a/src/lib/datasource/S3.ts b/src/lib/datasource/S3.ts
index 391f2b34..ee9e703d 100644
--- a/src/lib/datasource/S3.ts
+++ b/src/lib/datasource/S3.ts
@@ -19,7 +19,7 @@ import { Readable } from 'stream';
 import { ReadableStream } from 'stream/web';
 import Logger, { log } from '../logger';
 import { randomCharacters } from '../random';
-import { Datasource, PutOptions } from './Datasource';
+import { Datasource, ListOptions, PutOptions } from './Datasource';
 
 function isOk(code: number) {
   return code >= 200 && code < 300;
@@ -449,4 +449,37 @@ export class S3Datasource extends Datasource {
       throw new Error('Failed to rename object');
     }
   }
+
+  public async list(options: ListOptions = { prefix: '' }): Promise<string[]> {
+    const command = new ListObjectsCommand({
+      Bucket: this.options.bucket,
+      Prefix: this.key(options.prefix || ''),
+      Delimiter: this.options.subdirectory ? undefined : '/',
+    });
+
+    try {
+      const res = await this.client.send(command);
+
+      if (!isOk(res.$metadata.httpStatusCode || 0)) {
+        this.logger.error('there was an error while listing objects');
+        this.logger.error('error metadata', res.$metadata as Record<string, unknown>);
+
+        return [];
+      }
+
+      return (
+        res.Contents?.map((obj) => {
+          if (this.options.subdirectory) {
+            return obj.Key!.replace(this.options.subdirectory + '/', '');
+          }
+          return obj.Key!;
+        }) ?? []
+      );
+    } catch (e) {
+      this.logger.error('there was an error while listing objects');
+      this.logger.error('error metadata', e as Record<string, unknown>);
+
+      return [];
+    }
+  }
 }
diff --git a/src/lib/tasks/run/cleanThumbnails.ts b/src/lib/tasks/run/cleanThumbnails.ts
new file mode 100755
index 00000000..8fd08430
--- /dev/null
+++ b/src/lib/tasks/run/cleanThumbnails.ts
@@ -0,0 +1,56 @@
+import { datasource } from '@/lib/datasource';
+import { IntervalTask } from '..';
+
+export default function cleanThumbnails(prisma: typeof globalThis.__db__) {
+  return async function (this: IntervalTask) {
+    const fsThumbnails = await datasource.list({ prefix: '.thumbnail.' });
+    const dbThumbnails = await prisma.thumbnail.findMany({
+      select: {
+        id: true,
+        path: true,
+      },
+    });
+
+    const paths = new Set(dbThumbnails.map((t) => t.path));
+    const fsOrphaned = fsThumbnails.filter((path) => !paths.has(path));
+
+    for (const path of fsOrphaned) {
+      try {
+        await datasource.delete(path);
+        this.logger.info('deleted orphaned thumbnail', { path });
+      } catch (err) {
+        this.logger.error('failed to delete orphaned thumbnail', { path, error: err });
+      }
+    }
+
+    const fs = new Set(fsThumbnails);
+    const dbOrphaned = dbThumbnails.filter((t) => !fs.has(t.path));
+
+    for (const thumb of dbOrphaned) {
+      try {
+        await prisma.thumbnail.delete({
+          where: {
+            id: thumb.id,
+          },
+        });
+        this.logger.info('deleted orphaned thumbnail from database', { path: thumb.path });
+      } catch (err) {
+        this.logger.error('failed to delete orphaned thumbnail from database', {
+          path: thumb.path,
+          error: err,
+        });
+      }
+    }
+
+    this.logger.debug('thumbnail cleanup complete', {
+      fsChecked: fsThumbnails.length,
+      dbChecked: dbThumbnails.length,
+      fsDeleted: fsOrphaned.length,
+      dbDeleted: dbOrphaned.length,
+      totals: {
+        fs: fsThumbnails.length - fsOrphaned.length,
+        db: dbThumbnails.length - dbOrphaned.length,
+      }
+    });
+  };
+}
diff --git a/src/server/index.ts b/src/server/index.ts
index 370673c3..bc2a2718 100755
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -19,6 +19,7 @@ import { fastifyMultipart } from '@fastify/multipart';
 import { fastifyRateLimit } from '@fastify/rate-limit';
 import { fastifySensible } from '@fastify/sensible';
 import { fastifyStatic } from '@fastify/static';
+import fastifySwagger from '@fastify/swagger';
 import fastify from 'fastify';
 import {
   hasZodFastifySchemaValidationErrors,
@@ -36,7 +37,7 @@ import vitePlugin from './plugins/vite';
 import loadRoutes from './routes';
 import { filesRoute } from './routes/files.dy';
 import { urlsRoute } from './routes/urls.dy';
-import fastifySwagger from '@fastify/swagger';
+import cleanThumbnails from '@/lib/tasks/run/cleanThumbnails';
 
 const MODE = process.env.NODE_ENV || 'production';
 const logger = log('server');
@@ -291,6 +292,7 @@ async function main() {
   tasks.interval('deletefiles', ms(config.tasks.deleteInterval as StringValue), deleteFiles(prisma));
   tasks.interval('maxviews', ms(config.tasks.maxViewsInterval as StringValue), maxViews(prisma));
   tasks.interval('clearinvites', ms(config.tasks.clearInvitesInterval as StringValue), clearInvites(prisma));
+  tasks.interval('cleanthumbnails', ms(config.tasks.cleanThumbnailsInterval as StringValue), cleanThumbnails(prisma));
 
   if (config.features.metrics)
     tasks.interval('metrics', ms(config.tasks.metricsInterval as StringValue), metrics(prisma));
diff --git a/src/server/plugins/vite.ts b/src/server/plugins/vite.ts
index f3f0f42a..cf820f44 100644
--- a/src/server/plugins/vite.ts
+++ b/src/server/plugins/vite.ts
@@ -9,10 +9,12 @@ import fastifyStatic from '@fastify/static';
 import { renderHtml } from '@/lib/ssr/renderHtml';
 import { readThemes } from '@/lib/theme/file';
 import { ZIPLINE_SSR_INSERT, ZIPLINE_SSR_META } from '@/lib/ssr/constants';
+import { log } from '@/lib/logger';
 
 export const ALL_METHODS: HTTPMethods[] = ['DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT'];
 
 const MODE = process.env.NODE_ENV || 'development';
+const logger = log('server').c('plugin').c('vite');
 
 async function vitePlugin(fastify: FastifyInstance) {
   fastify.decorateReply('ssr', ssrRoute);
@@ -29,7 +31,7 @@ async function vitePlugin(fastify: FastifyInstance) {
   } else {
     const vite = await createServer();
 
-    console.log('Vite server created in development mode');
+    logger.info('Vite initialized', { mode: MODE });
 
     fastify.decorate('vite', vite);
     fastify.addHook('preHandler', async (req, reply) => {
diff --git a/src/server/routes/api/server/settings/index.ts b/src/server/routes/api/server/settings/index.ts
index e6225e41..9ce9b29d 100644
--- a/src/server/routes/api/server/settings/index.ts
+++ b/src/server/routes/api/server/settings/index.ts
@@ -140,6 +140,7 @@ export default typedPlugin(
             tasksMaxViewsInterval: zMs,
             tasksThumbnailsInterval: zMs,
             tasksMetricsInterval: zMs,
+            tasksCleanThumbnailsInterval: zMs,
 
             filesRoute: z
               .string()