release: v1.1.1 — session fixes, storage cleanup, logging

server/utils/auto-delete.ts

@@ -2,7 +2,7 @@ import { insertActivityLog, listAdminUserIds, listUserAutoDeletePolicies, type A
 import { getGlobalAutoDeletePolicy } from './env'
 import { deleteImage, type StoredImage } from './storage'
 import { listImageKeysForAutoDelete } from './image-index'
-import { logInfo, logWarn } from './logger'
+import { logInfo, logWarn, serializeError } from './logger'
 
 export interface AutoDeleteResult {
   deleted: number
@@ -95,7 +95,7 @@ export async function runAutoDeleteCleanup(): Promise<AutoDeleteResult> {
       })
       deleted++
     } catch (error) {
-      logWarn('auto-delete failed', { key: image.key, error })
+      logWarn('auto-delete failed', { key: image.key, error: serializeError(error) })
       failed++
     }
   }

server/utils/db.ts

@@ -2,6 +2,7 @@ import { DatabaseSync } from 'node:sqlite'
 import { mkdirSync } from 'node:fs'
 import { join } from 'node:path'
 import { getDataDir } from './data-dir'
+import { logException } from './logger'
 
 export type LogAction = 'upload' | 'delete'
 export type LogSource = 'web' | 'api' | 'twikoo'
@@ -404,7 +405,10 @@ export function insertActivityLog(input: ActivityLogInput): void {
       createdAt
     )
   } catch (error) {
-    console.error('[activity-log] insert failed', error)
+    logException('activity-log insert failed', error, {
+      action: input.action,
+      key: input.key
+    })
   }
 }
 

server/utils/logger.test.ts

@@ -0,0 +1,32 @@
+import { describe, expect, it } from 'vitest'
+import { serializeError } from './logger'
+
+describe('serializeError', () => {
+  it('extracts message and status from H3-like errors', () => {
+    const error = new Error('bucket not found') as Error & {
+      statusCode: number
+      statusMessage: string
+      data: { error: { code: string } }
+    }
+    error.statusCode = 404
+    error.statusMessage = '存储桶不存在'
+    error.data = { error: { code: 'NOT_FOUND' } }
+
+    expect(serializeError(error)).toMatchObject({
+      name: 'Error',
+      message: 'bucket not found',
+      statusCode: 404,
+      statusMessage: '存储桶不存在',
+      data: { error: { code: 'NOT_FOUND' } }
+    })
+  })
+
+  it('includes stack for 5xx errors at info log level', () => {
+    const error = new Error('db locked') as Error & { statusCode: number }
+    error.statusCode = 500
+    error.stack = 'Error: db locked\n    at test'
+
+    const serialized = serializeError(error)
+    expect(serialized.stack).toBe(error.stack)
+  })
+})

server/utils/logger.ts

@@ -7,6 +7,12 @@ const LEVEL_ORDER: Record<LogLevel, number> = {
   error: 40
 }
 
+type H3LikeError = Error & {
+  statusCode?: number
+  statusMessage?: string
+  data?: unknown
+}
+
 function currentLevel(): LogLevel {
   const raw = (process.env.LOG_LEVEL || 'info').toLowerCase()
   if (raw === 'debug' || raw === 'info' || raw === 'warn' || raw === 'error') {
@@ -27,6 +33,35 @@ function formatLine(level: LogLevel, message: string, extra?: Record<string, unk
   return `[${time}] [${level.toUpperCase()}] ${message}${payload}`
 }
 
+/** 将 unknown / Error / H3Error 转为可 JSON 输出的字段，便于 Docker 日志排查 */
+export function serializeError(error: unknown): Record<string, unknown> {
+  if (error instanceof Error) {
+    const h3 = error as H3LikeError
+    const out: Record<string, unknown> = {
+      name: error.name,
+      message: error.message
+    }
+    if (h3.statusCode !== undefined) out.statusCode = h3.statusCode
+    if (h3.statusMessage) out.statusMessage = h3.statusMessage
+    if (h3.data !== undefined) out.data = h3.data
+    if (error.stack && shouldLog('debug')) out.stack = error.stack
+    else if (error.stack && (h3.statusCode ?? 500) >= 500) out.stack = error.stack
+    if ('cause' in error && error.cause !== undefined) {
+      out.cause = serializeError(error.cause)
+    }
+    return out
+  }
+  if (typeof error === 'string') return { message: error }
+  if (error && typeof error === 'object') {
+    try {
+      return { detail: JSON.parse(JSON.stringify(error)) }
+    } catch {
+      return { message: String(error) }
+    }
+  }
+  return { message: String(error) }
+}
+
 export function logDebug(message: string, extra?: Record<string, unknown>) {
   if (!shouldLog('debug')) return
   console.debug(formatLine('debug', message, extra))
@@ -47,6 +82,11 @@ export function logError(message: string, extra?: Record<string, unknown>) {
   console.error(formatLine('error', message, extra))
 }
 
+/** message + 原始 error 对象（自动 serialize） */
+export function logException(message: string, error: unknown, extra?: Record<string, unknown>) {
+  logError(message, { ...extra, error: serializeError(error) })
+}
+
 export function clientIp(event: Parameters<typeof getRequestIP>[0]): string {
   return getRequestIP(event, { xForwardedFor: true }) || '-'
 }

server/utils/process-image-upload.ts

@@ -17,7 +17,7 @@ import { buildImageItem, sanitizeOriginalName } from './image-response'
 import { getWebpQuality } from './env'
 import { insertActivityLog } from './db'
 import { putImage } from './storage'
-import { logInfo, logWarn } from './logger'
+import { logInfo, logException } from './logger'
 
 /** 可转 WebP 的位图格式；SVG（矢量）、ICO、已是 WebP 的原样存储 */
 const WEBP_CONVERTIBLE: readonly AllowedMimeType[] = [
@@ -136,8 +136,8 @@ export async function processSingleImageUpload(
       size: compressed.bytes.byteLength,
       userId: input.userId ?? null
     })
-  } catch {
-    logWarn('upload failed: storage error', {
+  } catch (error) {
+    logException('upload failed: storage error', error, {
       name: originalName,
       source: input.source ?? 'web'
     })

server/utils/storage-backends.ts

@@ -71,18 +71,37 @@ export function ensureDefaultBackends(): void {
     `).run(LOCAL_BACKEND_ID, '本地磁盘')
   }
 
-  const s3 = db.prepare(`
-    SELECT id FROM storage_backends WHERE id = ?
-  `).get(S3_BACKEND_ID)
+  cleanupPlaceholderS3Backend(db)
+}
 
-  if (!s3) {
-    db.prepare(`
-      INSERT INTO storage_backends
-        (id, name, type, config_json, secret_json, serving_mode, public_url,
-         quota_bytes, enabled, is_default, sort_order)
-      VALUES (?, ?, 's3', '{}', '{}', 'proxy', '', NULL, 0, 0, 1)
-    `).run(S3_BACKEND_ID, 'S3 兼容存储')
+/** 移除早期版本自动种下的空 S3 占位（未配置、未启用、非默认、无图片） */
+function cleanupPlaceholderS3Backend(db: DatabaseSync): void {
+  const row = db.prepare(`
+    SELECT * FROM storage_backends WHERE id = ?
+  `).get(S3_BACKEND_ID) as StorageBackendRow | undefined
+
+  if (!row || row.type !== 's3' || row.is_default === 1) {
+    return
   }
+
+  const config = parseS3Config(row.config_json)
+  const secrets = parseS3Secrets(row.secret_json)
+  const configured = Boolean(
+    config?.bucket?.trim()
+    || config?.endpoint?.trim()
+    || secrets?.accessKeyId?.trim()
+    || secrets?.secretAccessKey?.trim()
+  )
+  if (configured) {
+    return
+  }
+
+  const usage = getBackendUsageStats(S3_BACKEND_ID)
+  if (usage.count > 0) {
+    return
+  }
+
+  db.prepare('DELETE FROM storage_backends WHERE id = ?').run(S3_BACKEND_ID)
 }
 
 function rowToInfo(row: StorageBackendRow, _maskSecrets = true): StorageBackendInfo & {