Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
feat: add floating cloud upload queue and upload album selection
Timothy Yin90be87f659d9
diff --git a/apps/cloud/app/components/CloudPhotoLibrary.vue b/apps/cloud/app/components/CloudPhotoLibrary.vueindex 3d035266..f8c387e4 100644--- a/apps/cloud/app/components/CloudPhotoLibrary.vue+++ b/apps/cloud/app/components/CloudPhotoLibrary.vue@@ -594,75 +594,6 @@ watch(</div></template></CfTable>- <section- v-if="pendingJobs.length"- class="cf-processing-panel"- :aria-label="$t('cloud.messages.processingQueue')"- >- <h3>{{ $t('cloud.messages.processingQueue') }}</h3>- <div- v-for="job in pendingJobs"- :key="job.id"- class="cf-processing-row"- >- <UIcon- :name="- job.state === 'failed'- ? 'i-lucide-circle-alert'- : 'i-lucide-loader-circle'- "- :class="{ 'animate-spin': job.state === 'running' }"- />- <div>- <strong>{{- $t(- [- 'queued',- 'running',- 'retry_wait',- 'failed',- 'cancelled',- 'succeeded',- ].includes(job.state)- ? 'cloud.ui.' + job.state- : 'cloud.ui.unknownJob',- )- }}</strong- ><span- >{{ $t('cloud.ui.attemptCount', { count: job.attempts })- }}<template v-if="job.error_code">- ·- {{- $t('cloud.ui.processingFailure', { code: job.error_code })- }}</template- ></span- >- </div>- <CfButton- v-if="admin && job.state === 'failed'"- variant="secondary"- size="sm"- :disabled="busy"- @click="- action(- () =>- api(base + '/jobs/' + job.id + '/retry', {- method: 'POST',- body: {},- }),- $t('cloud.messages.jobQueuedAgain'),- )- "- >{{ $t('cloud.messages.retry') }}</CfButton- ><CfButton- variant="destructive"- v-if="admin && job.state !== 'cancelled'"- size="sm"- @click="removePhoto(job.photo_id)"- >{{ $t('cloud.messages.remove') }}</CfButton- >- </div>- </section><USlideoverv-model:open="editor":title="$t('cloud.messages.editPhotograph')"diff --git a/apps/cloud/app/components/CloudSiteWorkspace.vue b/apps/cloud/app/components/CloudSiteWorkspace.vueindex 018ba3a2..8d6c23bc 100644--- a/apps/cloud/app/components/CloudSiteWorkspace.vue+++ b/apps/cloud/app/components/CloudSiteWorkspace.vue@@ -48,6 +48,6 @@ const status = computed(() => (loading.value ? 'pending' : 'success')):tone="failed ? 'error' : 'info'">{{ message }}</CfAlert>- <slot /><CloudUploadDrawer- /></PhotosProvider>+ <slot /><CloudUploadDrawer /><CloudTransferPanel />+ </PhotosProvider></template>diff --git a/apps/cloud/app/components/CloudTransferPanel.vue b/apps/cloud/app/components/CloudTransferPanel.vuenew file mode 100644index 00000000..b40d7182--- /dev/null+++ b/apps/cloud/app/components/CloudTransferPanel.vue@@ -0,0 +1,285 @@+<script setup lang="ts">+const {+ jobs,+ photos,+ uploading,+ progress,+ currentFile,+ uploadSession,+ cancel,+ admin,+ busy,+ action,+ api,+ base,+} = useCloudSiteMedia()+const { t } = useI18n()+const collapsed = ref(false)+type Job = (typeof jobs.value)[number]+const tracked = ref<Record<string, Job>>({})+const dismissed = new Set<string>()+const active = (job: Job) =>+ ['queued', 'running', 'retry_wait'].includes(job.state)+watch(+ jobs,+ (items) => {+ const next = { ...tracked.value }+ for (const job of items) {+ if (active(job)) dismissed.delete(job.id)+ if (+ next[job.id] ||+ (!dismissed.has(job.id) && (active(job) || job.state === 'failed'))+ )+ next[job.id] = job+ }+ tracked.value = next+ },+ { immediate: true },+)+const processingJobs = computed(() => Object.values(tracked.value))+const processingActive = computed(+ () => processingJobs.value.filter(active).length,+)+const processingCompleted = computed(+ () => processingJobs.value.filter((job) => job.state === 'succeeded').length,+)+const hasActive = computed(() => uploading.value || processingActive.value > 0)+const visible = computed(+ () => uploadSession.total > 0 || processingJobs.value.length > 0,+)+const panelId = useId()+watch(uploading, (value) => {+ if (value) collapsed.value = false+})+function dismiss() {+ if (hasActive.value) return+ for (const job of processingJobs.value) dismissed.add(job.id)+ tracked.value = {}+ uploadSession.total = 0+ uploadSession.message = ''+}+function photoName(job: Job) {+ return (+ job.file_name ||+ photos.value.find((p) => p.id === job.photo_id)?.title ||+ t('cloud.messages.untitledPhotograph')+ )+}+</script>+<template>+ <ClientOnly>+ <Teleport to="body">+ <section+ v-if="visible"+ class="cloud-transfer-panel"+ :aria-label="t('cloud.transfer.title')"+ >+ <header class="flex items-center gap-2 border-b border-default p-4">+ <button+ class="flex min-w-0 flex-1 items-center gap-3 text-left"+ type="button"+ :aria-expanded="!collapsed"+ :aria-controls="panelId"+ @click="collapsed = !collapsed"+ >+ <UIcon+ :name="+ hasActive ? 'i-lucide-loader-circle' : 'i-lucide-list-checks'+ "+ class="size-5 shrink-0"+ :class="{ 'animate-spin': hasActive }"+ />+ <strong class="flex-1 text-sm">{{+ t('cloud.transfer.title')+ }}</strong>+ <UIcon+ :name="+ collapsed ? 'i-lucide-chevron-up' : 'i-lucide-chevron-down'+ "+ class="size-4 shrink-0"+ />+ </button>+ <UButton+ v-if="!hasActive"+ icon="i-lucide-x"+ color="neutral"+ variant="ghost"+ size="sm"+ :aria-label="t('cloud.transfer.dismiss')"+ @click="dismiss"+ />+ </header>+ <div+ v-show="!collapsed"+ :id="panelId"+ class="cloud-transfer-body divide-y divide-default"+ >+ <div+ v-if="uploadSession.total"+ class="space-y-3 p-4"+ >+ <div class="flex items-center justify-between gap-3 text-sm">+ <strong>{{ t('cloud.transfer.upload') }}</strong>+ <span class="text-muted">{{+ t('cloud.transfer.count', {+ completed: uploadSession.completed,+ total: uploadSession.total,+ })+ }}</span>+ </div>+ <template v-if="uploading">+ <p+ class="truncate text-sm"+ :title="currentFile"+ >+ {{ currentFile }}+ </p>+ <UProgress :model-value="progress || undefined" />+ <p+ class="text-xs text-muted"+ role="status"+ >+ {{+ progress === 100+ ? t('cloud.transfer.verifying')+ : t(+ uploadSession.storage === 'platform'+ ? 'cloud.ui.uploadProgressPlatform'+ : 'cloud.ui.uploadProgress',+ { progress },+ )+ }}+ </p>+ <CfButton+ size="sm"+ variant="secondary"+ @click="cancel"+ >{{ t('cloud.messages.cancelUpload') }}</CfButton+ >+ </template>+ <p+ v-else+ class="text-sm"+ :class="uploadSession.failed ? 'text-error' : 'text-muted'"+ :role="uploadSession.failed ? 'alert' : 'status'"+ >+ {{ uploadSession.message }}+ </p>+ </div>+ <div+ v-if="processingJobs.length"+ class="space-y-3 p-4"+ >+ <div class="flex items-center justify-between gap-3 text-sm">+ <strong>{{ t('cloud.messages.processingQueue') }}</strong>+ <span class="text-muted">{{+ t('cloud.transfer.count', {+ completed: processingCompleted,+ total: processingJobs.length,+ })+ }}</span>+ </div>+ <UProgress v-if="processingActive" />+ <ul class="space-y-3">+ <li+ v-for="job in processingJobs"+ :key="job.id"+ class="flex items-start gap-3"+ >+ <UIcon+ :name="+ job.state === 'failed'+ ? 'i-lucide-circle-alert'+ : job.state === 'succeeded'+ ? 'i-lucide-circle-check'+ : 'i-lucide-loader-circle'+ "+ class="mt-0.5 size-4 shrink-0"+ :class="{+ 'animate-spin': job.state === 'running',+ 'text-error': job.state === 'failed',+ }"+ />+ <div class="min-w-0 flex-1 space-y-1">+ <p+ class="truncate text-sm"+ :title="photoName(job)"+ >+ {{ photoName(job) }}+ </p>+ <p class="text-xs text-muted">+ {{+ t(+ [+ 'queued',+ 'running',+ 'retry_wait',+ 'failed',+ 'cancelled',+ 'succeeded',+ ].includes(job.state)+ ? 'cloud.ui.' + job.state+ : 'cloud.ui.unknownJob',+ )+ }}+ · {{ t('cloud.ui.attemptCount', { count: job.attempts }) }}+ </p>+ <p+ v-if="job.error_code"+ class="text-xs text-error"+ >+ {{+ t('cloud.ui.processingFailure', { code: job.error_code })+ }}+ </p>+ </div>+ <CfButton+ v-if="admin && job.state === 'failed'"+ variant="secondary"+ size="sm"+ :disabled="busy"+ @click="+ action(+ () =>+ api(base + '/jobs/' + job.id + '/retry', {+ method: 'POST',+ body: {},+ }),+ t('cloud.messages.jobQueuedAgain'),+ )+ "+ >{{ t('cloud.messages.retry') }}</CfButton+ >+ </li>+ </ul>+ </div>+ </div>+ </section>+ </Teleport>+ </ClientOnly>+</template>+<style scoped>+.cloud-transfer-panel {+ position: fixed;+ z-index: 40;+ right: 24px;+ bottom: max(24px, env(safe-area-inset-bottom));+ width: min(420px, calc(100vw - 32px));+ overflow: hidden;+ border: 1px solid var(--ui-border);+ border-radius: 12px;+ background: var(--ui-bg);+ color: var(--ui-text);+ box-shadow: 0 12px 36px #0003;+}+.cloud-transfer-body {+ max-height: min(65dvh, 560px);+ overflow-y: auto;+}+@media (max-width: 640px) {+ .cloud-transfer-panel {+ right: 16px;+ bottom: max(16px, env(safe-area-inset-bottom));+ }+}+</style>diff --git a/apps/cloud/app/components/CloudUploadDrawer.vue b/apps/cloud/app/components/CloudUploadDrawer.vueindex 94148881..d94acf2d 100644--- a/apps/cloud/app/components/CloudUploadDrawer.vue+++ b/apps/cloud/app/components/CloudUploadDrawer.vue@@ -2,15 +2,14 @@import { uploadQuotaGate } from '../utils/quota-gate'const {uploadOpen,+ albums,+ selectedAlbumIds,message,failed,connections,connectionId,upload,uploading,- progress,- currentFile,- cancel,usage,allowance,fileLimit,@@ -116,6 +115,25 @@ async function dropFiles(event: DragEvent) {:error="!!quota.error.value"@retry="quota.refresh()"/>+ <UFormField+ :label="$t('cloud.transfer.albums')"+ :description="$t('cloud.transfer.albumHelp')"+ >+ <USelectMenu+ v-model="selectedAlbumIds"+ multiple+ value-key="value"+ :items="+ albums.map((album) => ({+ label: album.title,+ value: Number(album.id),+ }))+ "+ :placeholder="$t('cloud.transfer.selectAlbums')"+ :disabled="uploading || !admin"+ class="w-full"+ />+ </UFormField><inputref="input"class="sr-only"@@ -145,17 +163,6 @@ async function dropFiles(event: DragEvent) {})}}</span></button>- <div- v-if="uploading"- role="status"- class="space-y-3"- >- <p class="text-sm break-all">{{ currentFile }}</p>- <UProgress :model-value="progress" />- <p class="text-xs text-muted">- {{ $t('cloud.ui.uploadProgress', { progress }) }}- </p>- </div><pv-if="usage"class="text-xs text-muted"@@ -174,12 +181,6 @@ async function dropFiles(event: DragEvent) {</div></template><template #footer><CfButton- variant="destructive"- v-if="uploading"- @click="cancel"- >{{ $t('cloud.messages.cancelUpload') }}</CfButton- ><CfButton- v-elsevariant="secondary"@click="uploadOpen = false">{{ $t('cloud.messages.done') }}</CfButtondiff --git a/apps/cloud/app/composables/useCloudSiteMedia.ts b/apps/cloud/app/composables/useCloudSiteMedia.tsindex 40b1dd0d..c7e6199d 100644--- a/apps/cloud/app/composables/useCloudSiteMedia.ts+++ b/apps/cloud/app/composables/useCloudSiteMedia.ts@@ -41,6 +41,7 @@ export function useCloudMediaWorkspace(props: {{id: stringphoto_id: string+ file_name?: stringstate: stringattempts: numbererror_code: string | null@@ -65,6 +66,7 @@ export function useCloudMediaWorkspace(props: {rating: null as number | null,revision: 0,})+ const selectedAlbumIds = ref<number[]>([])const connectionId = ref(''),message = ref(''),failed = ref(false),@@ -72,6 +74,13 @@ export function useCloudMediaWorkspace(props: {uploading = ref(false),progress = ref(0),currentFile = ref('')+ const uploadSession = reactive({+ total: 0,+ completed: 0,+ storage: 'private' as 'platform' | 'private',+ message: '',+ failed: false,+ })const storage = reactive({endpoint: '',region: 'auto',@@ -174,6 +183,24 @@ export function useCloudMediaWorkspace(props: {if (generation === reloadGeneration) loading.value = false}}+ let pollingProcessing = false+ async function refreshProcessing() {+ if (pollingProcessing) return+ pollingProcessing = true+ const generation = reloadGeneration+ try {+ const result = await api<{ photos: Photo[]; jobs: typeof jobs.value }>(+ base.value + '/photos',+ )+ if (generation !== reloadGeneration) return+ photos.value = result.photos+ jobs.value = result.jobs+ } catch {+ // Keep the last known task state and retry on the next poll.+ } finally {+ pollingProcessing = false+ }+ }function refreshMedia() {canPoll.value = truevoid reload()@@ -289,19 +316,25 @@ export function useCloudMediaWorkspace(props: {if (saved) await loadPhoto()return saved}- function resumeKey(file: File) {- return [- 'chronoframe-upload',- context.value?.scope,- props.siteId,- file.name,- file.size,- file.lastModified,- connectionId.value,- ].join(':')+ function resumeKey(file: File, albumIds: number[]) {+ return (+ [+ 'chronoframe-upload',+ context.value?.scope,+ props.siteId,+ file.name,+ file.size,+ file.lastModified,+ connectionId.value,+ ].join(':') + (albumIds.length ? ':albums:' + albumIds.join(',') : '')+ )}- async function sendFile(file: File, liveVideo?: File) {- const cache = resumeKey(file),+ async function sendFile(+ file: File,+ liveVideo: File | undefined,+ albumIds: number[],+ ) {+ const cache = resumeKey(file, albumIds),id = localStorage.getItem(cache) || crypto.randomUUID()await api(base.value + '/uploads', {method: 'POST',@@ -310,6 +343,7 @@ export function useCloudMediaWorkspace(props: {connectionId: connectionId.value,fileName: file.name,bytes: file.size,+ albumIds,...(liveVideo? { liveVideo: { fileName: liveVideo.name, bytes: liveVideo.size } }: {}),@@ -415,6 +449,17 @@ export function useCloudMediaWorkspace(props: {input.value = ''return}+ const albumIds = [...selectedAlbumIds.value].sort((a, b) => a - b)+ uploadSession.total = files.filter((f) => !isVideo(f)).length+ uploadSession.completed = 0+ uploadSession.storage = connections.value.find(+ (c) => c.id === connectionId.value,+ )?.pool_id+ ? 'platform'+ : 'private'+ uploadSession.message = ''+ uploadSession.failed = false+ uploadOpen.value = falseuploading.value = truefailed.value = falsemessage.value = ''@@ -426,14 +471,16 @@ export function useCloudMediaWorkspace(props: {const companion = companionFor(file)currentFile.value = file.nameprogress.value = 0- await sendFile(file, companion)+ await sendFile(file, companion, albumIds)+ uploadSession.completed+++ void refreshProcessing()}- message.value = t(+ uploadSession.message = t('cloud.messages.uploadVerifiedProcessingContinuesInTheBackground',)} catch {- failed.value = true- message.value = controller.signal.aborted+ uploadSession.failed = true+ uploadSession.message = controller.signal.aborted? t('cloud.messages.uploadCancelled'): t('cloud.messages.uploadInterruptedSelectTheSameFileToResumeIts')} finally {@@ -498,7 +545,10 @@ export function useCloudMediaWorkspace(props: {onMounted(() => {void reload()timer = setInterval(() => {- if (canPoll.value && !busy.value && !uploading.value) void reload()+ if (canPoll.value && !busy.value) {+ if (uploading.value) void refreshProcessing()+ else void reload()+ }}, 5000)})onBeforeUnmount(() => {@@ -524,6 +574,8 @@ export function useCloudMediaWorkspace(props: {uploading,progress,currentFile,+ uploadSession,+ selectedAlbumIds,storage,admin,photoLoaded,diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.jsonindex c8118436..959f4afc 100644--- a/apps/cloud/i18n/locales/en.json+++ b/apps/cloud/i18n/locales/en.json@@ -448,7 +448,7 @@"photographCount": "{count} photograph | {count} photographs","photoMembershipCount": "Photographs · {count}","securityFor": "Manage sign-in methods for {email}.",- "uploadProgress": "{progress}% · Uploading to your private bucket",+ "uploadProgress": "{progress}% · Uploading to your private storage","uploadUsage": "Workspace: {photos} / {photoLimit} photographs · {bytes} / {uploadLimit} GiB uploaded this quota month","connectionRevision": "{bucket} · revision {revision}","admin": "Admin",@@ -469,7 +469,8 @@"passwordSetupGuidance": "You signed in with an email code. {link} before enabling two-step verification.","connectStorageGuidance": "Connect your private storage in {link} before uploading.","attemptCount": "Attempt {count}",- "chooseIcon": "Choose icon"+ "chooseIcon": "Choose icon",+ "uploadProgressPlatform": "{progress}% · Uploading to platform storage"},"storageErrors": {"storage_configuration_failed": "Check the S3 endpoint, region, bucket name and credential fields.",@@ -840,6 +841,16 @@},"support": {"email": "Contact support: {email}"+ },+ "transfer": {+ "title": "Upload and processing queue",+ "dismiss": "Clear finished tasks",+ "upload": "Upload progress",+ "count": "{completed} / {total} completed",+ "verifying": "Upload complete. Verifying files…",+ "albums": "Add to albums",+ "selectAlbums": "Select albums (optional, multiple allowed)",+ "albumHelp": "Uploaded photographs are automatically added to the selected albums. Leave empty to add only to the library."}}}diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.jsonindex afb6afbf..690c4c74 100644--- a/apps/cloud/i18n/locales/zh-Hans.json+++ b/apps/cloud/i18n/locales/zh-Hans.json@@ -448,7 +448,7 @@"photographCount": "{count} 张照片","photoMembershipCount": "照片 · {count}","securityFor": "管理 {email} 的登录方式。",- "uploadProgress": "{progress}% · 正在上传到你的私有存储桶",+ "uploadProgress": "{progress}% · 正在上传到你的私有存储","uploadUsage": "工作空间:{photos} / {photoLimit} 张照片 · 本配额月上传 {bytes} / {uploadLimit} GiB","connectionRevision": "{bucket} · 凭证版本 {revision}","admin": "管理员",@@ -469,7 +469,8 @@"passwordSetupGuidance": "你使用邮箱验证码登录。请先{link},再启用两步验证。","connectStorageGuidance": "上传前,请先在{link}中连接私有存储。","attemptCount": "尝试次数 {count}",- "chooseIcon": "选择图标"+ "chooseIcon": "选择图标",+ "uploadProgressPlatform": "{progress}% · 正在上传到平台存储"},"storageErrors": {"storage_configuration_failed": "请检查 S3 服务端点、区域、存储桶名称和凭证字段。",@@ -840,6 +841,16 @@},"support": {"email": "联系客服:{email}"+ },+ "transfer": {+ "title": "上传与处理队列",+ "dismiss": "清除已结束的任务",+ "upload": "上传进度",+ "count": "{completed} / {total} 已完成",+ "verifying": "上传完成,正在校验文件…",+ "albums": "添加到相簿",+ "selectAlbums": "选择相簿(可选,可多选)",+ "albumHelp": "上传的照片将自动加入所选相簿;留空则仅加入照片库。"}}}diff --git a/apps/cloud/server/api/sites/[siteId]/media/[...operation].ts b/apps/cloud/server/api/sites/[siteId]/media/[...operation].tsindex b15929ee..c4d390f8 100644--- a/apps/cloud/server/api/sites/[siteId]/media/[...operation].ts+++ b/apps/cloud/server/api/sites/[siteId]/media/[...operation].ts@@ -1,3 +1,4 @@+import { validateUploadAlbums } from '../../../../utils/cloud-upload-albums'import { cloudLiveAttachment } from '../../../../utils/cloud-live-attachment'import { queuePhotoProcessing } from '../../../../utils/cloud-photo-processing'import {@@ -327,6 +328,11 @@ export default definePlatformHandler(async (event) => {}}if (kind === 'uploads' && !id && event.method === 'POST') {+ const albumIdsJson = await validateUploadAlbums(+ raw as unknown as MediaDatabase,+ siteId,+ body.albumIds,+ )const uploadId = ID(body.requestId),connectionId = ID(body.connectionId),bytes = number(body.bytes),@@ -380,8 +386,8 @@ export default definePlatformHandler(async (event) => {const objectKey = `chronoframe/${siteId}/originals/${uploadId}/1/source.${ext}`await db.batch([db- .prepare(`INSERT INTO cloud_uploads(site_id,id,owner_id,photo_id,source_version,connection_id,connection_revision,object_key,expected_bytes,expires_at,content_type,file_name,expected_video_bytes,video_key,reserved_storage_bytes)- SELECT ?,?,?,?,'1',?,?,?,?,?,?,?,?,?,? WHERE+ .prepare(`INSERT INTO cloud_uploads(site_id,id,owner_id,photo_id,source_version,connection_id,connection_revision,object_key,expected_bytes,expires_at,content_type,file_name,expected_video_bytes,video_key,reserved_storage_bytes,album_ids_json)+ SELECT ?,?,?,?,'1',?,?,?,?,?,?,?,?,?,?,? WHERE${expression.photos}<? AND ${expression.monthly}+?<=? AND (?=0 OR ${expression.storage}+?<=?)ON CONFLICT DO NOTHING`).bind(@@ -401,6 +407,7 @@ export default definePlatformHandler(async (event) => {? `chronoframe/${siteId}/originals/${uploadId}/1/source.MOV`: null,managed ? bytes + videoBytes : 0,+ albumIdsJson,now,entitlement.limits.photos,entitlement.quotaPeriod.start,@@ -417,6 +424,7 @@ export default definePlatformHandler(async (event) => {}if (!upload) throw createError({ statusCode: 429 })if (+ upload.album_ids_json !== albumIdsJson ||upload.expected_bytes !== bytes ||upload.expected_video_bytes !== videoBytes ||upload.connection_id !== connectionId@@ -620,7 +628,7 @@ export default definePlatformHandler(async (event) => {return {photos: await ctx.resources.listPhotos(),jobs: await sql(- 'SELECT id,state,attempts,error_code,photo_id FROM cloud_processing_jobs WHERE site_id=? ORDER BY created_at DESC LIMIT 100',+ 'SELECT j.id,j.state,j.attempts,j.error_code,j.photo_id,u.file_name FROM cloud_processing_jobs j LEFT JOIN cloud_uploads u ON u.site_id=j.site_id AND u.id=j.upload_id WHERE j.site_id=? ORDER BY j.created_at DESC,j.id DESC LIMIT 100',siteId,),}diff --git a/apps/cloud/server/utils/cloud-upload-albums.ts b/apps/cloud/server/utils/cloud-upload-albums.tsnew file mode 100644index 00000000..6a0d5b41--- /dev/null+++ b/apps/cloud/server/utils/cloud-upload-albums.ts@@ -0,0 +1,37 @@+import { createError } from 'h3'+import type { MediaDatabase } from '@chronoframe/database/cloud-media'+export function uploadAlbumIds(value: unknown): number[] {+ if (value === undefined) return []+ if (+ !Array.isArray(value) ||+ value.length > 100 ||+ value.some((id) => !Number.isSafeInteger(id) || id < 1) ||+ new Set(value).size !== value.length+ )+ throw createError({+ statusCode: 400,+ statusMessage: 'Invalid upload albums',+ })+ return [...value].sort((a, b) => a - b)+}+export async function validateUploadAlbums(+ db: MediaDatabase,+ siteId: number,+ value: unknown,+) {+ const ids = uploadAlbumIds(value)+ if (ids.length) {+ const result = await db+ .prepare(+ 'SELECT COUNT(*) AS total FROM cloud_albums WHERE site_id=? AND id IN (SELECT CAST(value AS TEXT) FROM json_each(?))',+ )+ .bind(siteId, JSON.stringify(ids))+ .all<{ total: number }>()+ if (result.results[0]?.total !== ids.length)+ throw createError({+ statusCode: 400,+ statusMessage: 'Selected upload albums are unavailable',+ })+ }+ return JSON.stringify(ids)+}diff --git a/packages/core/src/cloud-media.ts b/packages/core/src/cloud-media.tsindex 70e645ec..7622cdfd 100644--- a/packages/core/src/cloud-media.ts+++ b/packages/core/src/cloud-media.ts@@ -25,6 +25,7 @@ export interface MediaUpload {connection_id: stringobject_key: stringprovider_upload_id: string | null+ album_ids_json: stringexpected_video_bytes: numberexpected_bytes: numberexpires_at: numberdiff --git a/packages/database/src/cloud-media.ts b/packages/database/src/cloud-media.tsindex fa37bfbf..d4af1b23 100644--- a/packages/database/src/cloud-media.ts+++ b/packages/database/src/cloud-media.ts@@ -197,6 +197,21 @@ export function createCloudMediaRepository(ownerId,now,),+ statement(+ `INSERT INTO cloud_album_photos(site_id,album_id,photo_id,position)+ SELECT ?,a.id,u.photo_id,COALESCE((SELECT MAX(position)+1 FROM cloud_album_photos WHERE site_id=a.site_id AND album_id=a.id),0)+ FROM cloud_uploads u JOIN json_each(u.album_ids_json) selected JOIN cloud_albums a ON a.site_id=u.site_id AND a.id=CAST(selected.value AS TEXT)+ WHERE u.site_id=? AND u.id=? AND u.owner_id=? AND u.state='pending' AND u.expires_at>? ON CONFLICT DO NOTHING`,+ siteId,+ id,+ ownerId,+ now,+ ),+ db+ .prepare(+ `UPDATE cloud_albums SET revision=revision+1,updated_at=? WHERE site_id=? AND id IN(SELECT CAST(selected.value AS TEXT) FROM cloud_uploads u JOIN json_each(u.album_ids_json) selected WHERE u.site_id=? AND u.id=? AND u.owner_id=? AND u.state='pending' AND u.expires_at>?)`,+ )+ .bind(now, siteId, siteId, id, ownerId, now),statement(`UPDATE cloud_uploads SET state='completed' WHERE site_id=? AND id=? AND owner_id=? AND state='pending' AND expires_at>?`,id,diff --git a/packages/platform/migrations/0037_upload_albums.sql b/packages/platform/migrations/0037_upload_albums.sqlnew file mode 100644index 00000000..153ae983--- /dev/null+++ b/packages/platform/migrations/0037_upload_albums.sql@@ -0,0 +1,2 @@+-- Preserve upload-time album choices through resumable uploads and background processing.+ALTER TABLE cloud_uploads ADD COLUMN album_ids_json TEXT NOT NULL DEFAULT '[]' CHECK(json_valid(album_ids_json) AND json_type(album_ids_json)='array');diff --git a/tests/cloud-execution.test.ts b/tests/cloud-execution.test.tsindex d0180a46..f6239eb6 100644--- a/tests/cloud-execution.test.ts+++ b/tests/cloud-execution.test.ts@@ -36,6 +36,8 @@ test('D1 queue serializes claims, fences expired attempts, retries and refuses d'0006_cloud_execution.sql','0007_cloud_storage.sql','0009_cloud_usage_events.sql',+ '0008_cloud_albums.sql',+ '0037_upload_albums.sql',]) {const migration = await readFile(new URL('../packages/platform/migrations/' + name, import.meta.url),diff --git a/tests/cloud-media-repositories.test.ts b/tests/cloud-media-repositories.test.tsindex d5051919..23189b52 100644--- a/tests/cloud-media-repositories.test.ts+++ b/tests/cloud-media-repositories.test.ts@@ -1,3 +1,7 @@+import {+ uploadAlbumIds,+ validateUploadAlbums,+} from '../apps/cloud/server/utils/cloud-upload-albums.ts'import { splitSqlQuery } from './helpers/sql.ts'import assert from 'node:assert/strict'import test from 'node:test'@@ -117,6 +121,7 @@ for (const backend of ['SQLite', 'D1'] as const) {for (const file of ['0008_cloud_albums.sql','0012_cloud_album_slugs.sql',+ '0037_upload_albums.sql',]) {const sql = await readFile(new URL('../packages/platform/migrations/' + file, import.meta.url),@@ -217,6 +222,55 @@ for (const backend of ['SQLite', 'D1'] as const) {]),)assert.equal(await a.album('rolled-back'), null)+ assert.deepEqual(uploadAlbumIds([2, 1]), [1, 2])+ for (const invalid of [+ [1, 1],+ [0],+ ['1'],+ null,+ Array.from({ length: 101 }, (_, i) => i + 1),+ ])+ assert.throws(() => uploadAlbumIds(invalid), { statusCode: 400 })+ await assert.rejects(validateUploadAlbums(db, 1, [2]), {+ statusCode: 400,+ })+ assert.equal(await validateUploadAlbums(db, 1, [1]), '[1]')+ await a.reserveUpload(reserve('album-upload'))+ await run(+ "UPDATE cloud_uploads SET album_ids_json='[1,2]' WHERE site_id=1 AND id='album-upload'",+ )+ await a.completeUpload(complete('album-upload'))+ await a.completeUpload(complete('album-upload'))+ const members = (+ await db+ .prepare(+ "SELECT site_id,album_id,photo_id FROM cloud_album_photos WHERE photo_id='album-upload'",+ )+ .all<{ site_id: number; album_id: string; photo_id: string }>()+ ).results+ assert.equal(members.length, 1)+ assert.equal(members[0]?.site_id, 1)+ assert.equal(members[0]?.album_id, '1')+ await a.createAlbum('3', 'Removed during upload')+ await a.reserveUpload(reserve('removed-album'))+ await run(+ "UPDATE cloud_uploads SET album_ids_json='[3]' WHERE site_id=1 AND id='removed-album'",+ )+ await run(+ "DELETE FROM cloud_album_slugs WHERE site_id=1 AND album_id='3'",+ )+ await run("DELETE FROM cloud_albums WHERE site_id=1 AND id='3'")+ await a.completeUpload(complete('removed-album'))+ assert.equal(+ (+ await db+ .prepare(+ "SELECT COUNT(*) AS n FROM cloud_album_photos WHERE photo_id='removed-album'",+ )+ .all<{ n: number }>()+ ).results[0]?.n,+ 0,+ )await a.reserveUpload(reserve('collision'))await assert.rejects(a.completeUpload(complete('collision', 'same')))assert.equal(await a.photo('collision'), null)@@ -236,7 +290,10 @@ for (const backend of ['SQLite', 'D1'] as const) {assert.equal(await a.photo('same'), null)await assert.rejects(a.addToAlbum('1', 'same'), { statusCode: 404 })assert.equal((await a.job('same'))?.state, 'cancelled')- assert.equal((await a.albumPhotos('1')).length, 0)+ assert.deepEqual(+ (await a.albumPhotos('1')).map((photo) => photo.id),+ ['album-upload'],+ )assert.equal((await b.photo('same'))?.title, 'Other tenant')assert.equal(await a.completeUpload(complete('same')), 'same')assert.equal(await a.photo('same'), null) // retry cannot resurrect a tombstone@@ -301,6 +358,22 @@ test('D1 media sessions and queued jobs survive a workerd restart', async () =>.map((s) => s.trim()).filter(Boolean))await db.prepare(sql).run()+ for (const file of [+ '0008_cloud_albums.sql',+ '0012_cloud_album_slugs.sql',+ '0037_upload_albums.sql',+ ])+ for (const sql of splitSqlQuery(+ (+ await readFile(+ new URL('../packages/platform/migrations/' + file, import.meta.url),+ 'utf8',+ )+ ).replace(/^--.*$/gm, ''),+ )+ .map((s) => s.trim())+ .filter(Boolean))+ await db.prepare(sql).run()let repository = createCloudMediaRepository(db, { id: 1 })await repository.reserveUpload({id: 'upload',diff --git a/tests/cloud-upload-albums.test.ts b/tests/cloud-upload-albums.test.tsnew file mode 100644index 00000000..caf03523--- /dev/null+++ b/tests/cloud-upload-albums.test.ts@@ -0,0 +1,136 @@+import test from 'node:test'+import assert from 'node:assert/strict'+import { readFile, readdir } from 'node:fs/promises'+import Database from 'better-sqlite3'+import ts from 'typescript'+import { createCloudMediaRepository } from '../packages/database/src/cloud-media.ts'+import { workspaceUsageSQL } from '../packages/platform/src/entitlements.ts'+import { validateUploadAlbums } from '../apps/cloud/server/utils/cloud-upload-albums.ts'++test('upload reservation persists canonical site-owned albums and refuses changing choices on resume', async () => {+ const sqlite = new Database(':memory:')+ sqlite.pragma('foreign_keys = ON')+ try {+ for (const name of (await readdir('packages/platform/migrations'))+ .filter((f) => f.endsWith('.sql'))+ .sort())+ sqlite.exec(+ await readFile('packages/platform/migrations/' + name, 'utf8'),+ )+ sqlite.exec(+ "INSERT INTO platform_users(id,email,created_at) VALUES(1,'[email protected]',1); INSERT INTO platform_workspaces(id,name) VALUES(1,'Workspace'); INSERT INTO platform_sites(id,workspace_id,name) VALUES(1,1,'One'),(2,1,'Two'); INSERT INTO cloud_albums(site_id,id,title) VALUES(1,'1','First'),(1,'2','Second'),(2,'3','Foreign')",+ )+ class Statement {+ sql: string+ values: any[] = []+ constructor(sql: string) {+ this.sql = sql+ }+ bind(...values: any[]) {+ this.values = values+ return this+ }+ async all<T>() {+ return { results: sqlite.prepare(this.sql).all(...this.values) as T[] }+ }+ async first() {+ return sqlite.prepare(this.sql).get(...this.values) ?? null+ }+ }+ const db = {+ prepare: (sql: string) => new Statement(sql),+ async batch(statements: Statement[]) {+ sqlite.transaction(() => {+ for (const s of statements) sqlite.prepare(s.sql).run(...s.values)+ })()+ },+ }+ const repository = createCloudMediaRepository(db, { id: 1 })+ const source = (+ await readFile(+ 'apps/cloud/server/api/sites/[siteId]/media/[...operation].ts',+ 'utf8',+ )+ ).replace(/^import[\s\S]*?from ['"][^'"]+['"]\s*\n/gm, '')+ const code = ts.transpileModule(source, {+ compilerOptions: {+ module: ts.ModuleKind.CommonJS,+ target: ts.ScriptTarget.ES2022,+ },+ }).outputText+ const deps = {+ definePlatformHandler: (f: any) => f,+ cloudMedia: async () => ({+ siteId: 1,+ userId: 1,+ site: { workspaceId: 1 },+ db,+ raw: db,+ repository,+ vault: {+ list: async () => [{ id: 'storage', uploads_enabled: 1 }],+ get: async () => ({ poolId: 'pool', enabled: true, revision: 1 }),+ },+ }),+ getRouterParam: () => 'uploads',+ siteManagementBody: async (event: any) => event.body,+ validateUploadAlbums,+ workspaceUsageSQL,+ workspaceEntitlements: async () => ({+ limits: {+ fileBytes: 1000,+ photos: 100,+ monthlyBytes: 100000,+ storageBytes: 100000,+ },+ quotaPeriod: { start: 1 },+ }),+ createError: (value: any) =>+ Object.assign(new Error(value.statusMessage), value),+ }+ const api = new Function(+ 'exports',+ ...Object.keys(deps),+ code + '; return exports.default',+ )({}, ...Object.values(deps))+ const body = {+ requestId: 'upload',+ connectionId: 'storage',+ fileName: 'one.jpg',+ bytes: 10,+ albumIds: [2, 1],+ }+ const post = (override = {}) =>+ api({ method: 'POST', body: { ...body, ...override } })+ await post()+ assert.equal(+ (await repository.upload('upload', 1))?.album_ids_json,+ '[1,2]',+ )+ await post({ albumIds: [1, 2] })+ await assert.rejects(post({ albumIds: [1] }), { statusCode: 409 })+ await assert.rejects(post({ requestId: 'foreign', albumIds: [3] }), {+ statusCode: 400,+ })+ assert.equal(await repository.upload('foreign', 1), null)+ await repository.completeUpload({+ id: 'upload',+ ownerId: 1,+ jobId: 'job',+ pipelineVersion: '1',+ title: 'Photo',+ now: Date.now(),+ })+ assert.deepEqual(+ sqlite+ .prepare(+ 'SELECT album_id FROM cloud_album_photos WHERE site_id=1 ORDER BY album_id',+ )+ .all()+ .map((r: any) => r.album_id),+ ['1', '2'],+ )+ } finally {+ sqlite.close()+ }+})diff --git a/tests/portal-review-regressions.test.ts b/tests/portal-review-regressions.test.tsindex c005622f..2f4a2dbb 100644--- a/tests/portal-review-regressions.test.ts+++ b/tests/portal-review-regressions.test.ts@@ -21,9 +21,10 @@ function load(file: string,globals: Record<string, unknown>,imports: Record<string, unknown> = {},+ source?: string,) {const exports: Record<string, any> = {}- const code = ts.transpileModule(readFileSync(file, 'utf8'), {+ const code = ts.transpileModule(source ?? readFileSync(file, 'utf8'), {compilerOptions: { module: ts.ModuleKind.CommonJS },}).outputTextvm.runInNewContext(code, {@@ -123,8 +124,9 @@ test('Live Photo validation rejects the combined size before reserving any uploaassert.equal(media.failed.value, false)const reservation = requests.find((r) => r.path.endsWith('/uploads'))!assert.equal(reservation.body.bytes, 60 * mib)+ assert.deepEqual(Array.from(reservation.body.albumIds), [])assert.equal(reservation.body.liveVideo.bytes, 40 * mib)- assert.match(media.message.value, /Upload verified/)+ assert.match(media.uploadSession.message, /Upload verified/)})test('subscription retains edits through network/503 failures and invalidates only authoritative denials', async () => {@@ -738,3 +740,138 @@ test('explicit subscription-change checks refresh the plan without confusing thescope.stop()}})++test('upload sessions capture their actual storage type and move progress out of the selection drawer', async () => {+ for (const platform of [true, false]) {+ let release!: () => void+ const gate = new Promise<void>((resolve) => {+ release = resolve+ })+ const reservations: any[] = []+ const storage = new Map<string, string>()+ const module = load(+ 'apps/cloud/app/composables/useCloudSiteMedia.ts',+ {+ useEntryContext: () => ({+ value: { scope: 'site:1:user:1', siteId: 1 },+ }),+ onMounted: () => {},+ onBeforeUnmount: () => {},+ AbortController,+ crypto,+ setTimeout,+ setInterval,+ clearInterval,+ localStorage: {+ getItem: (k: string) => storage.get(k),+ setItem: (k: string, v: string) => storage.set(k, v),+ removeItem: (k: string) => storage.delete(k),+ },+ $fetch: async (path: string, options?: { body?: unknown }) => {+ if (path.endsWith('/uploads')) {+ reservations.push(options?.body)+ await gate+ }+ if (path.endsWith('/plan')) return { state: 'completed' }+ if (path.endsWith('/storage')) return { connections: [] }+ if (path.endsWith('/photos')) return { photos: [], jobs: [] }+ if (path.endsWith('/albums')) return { albums: [] }+ if (path.endsWith('/usage'))+ return { usage: { photos: 0 }, limits: {}, byosLimits: {} }+ return {}+ },+ },+ {+ '@chronoframe/contracts/storage-diagnostics': {+ STORAGE_CONNECTION_MESSAGES: {},+ },+ },+ )+ const media = module.useCloudMediaWorkspace({ siteId: 1, role: 'admin' })+ media.connectionId.value = 'chosen'+ media.connections.value = [+ { id: 'chosen', pool_id: platform ? 'pool' : null },+ ]+ media.allowance.value = {+ limits: { fileBytes: 100 },+ byosLimits: { fileBytes: 100, byos: 1 },+ }+ media.selectedAlbumIds.value = [2, 1]+ media.uploadOpen.value = true+ const pending = media.upload({+ target: {+ files: [+ { name: 'one.jpg', size: 10 },+ { name: 'two.jpg', size: 10 },+ ],+ value: 'chosen',+ },+ })+ assert.equal(media.uploading.value, true)+ assert.equal(media.uploadOpen.value, false)+ assert.equal(media.uploadSession.storage, platform ? 'platform' : 'private')+ media.selectedAlbumIds.value = [7]+ media.connections.value = []+ assert.equal(media.uploadSession.storage, platform ? 'platform' : 'private')+ release()+ await pending+ assert.equal(media.uploadSession.total, 2)+ assert.equal(media.uploadSession.completed, 2)+ assert.equal(media.uploadSession.failed, false)+ assert.match(media.uploadSession.message, /Upload verified/)+ assert.deepEqual(+ reservations.map((body) => Array.from(body.albumIds)),+ [+ [1, 2],+ [1, 2],+ ],+ )+ }+})++test('floating queue follows task completion and retry without showing historical successful jobs', async () => {+ const media = {+ jobs: ref<any[]>([{ id: 'old', state: 'succeeded' }]),+ photos: ref([]),+ uploading: ref(false),+ progress: ref(0),+ currentFile: ref(''),+ uploadSession: reactive({ total: 0, message: '' }),+ admin: ref(true),+ busy: ref(false),+ action: () => {},+ api: () => {},+ base: ref(''),+ }+ const file = 'apps/cloud/app/components/CloudTransferPanel.vue'+ const script = readFileSync(file, 'utf8')+ .split('<script setup lang="ts">')[1]!+ .split('</script>')[0]!+ const state = load(+ file,+ { useCloudSiteMedia: () => media, useId: () => 'queue' },+ {},+ script ++ '\nexport { visible, collapsed, processingJobs, processingActive, processingCompleted, dismiss }',+ )+ assert.equal(state.visible.value, false)+ media.jobs.value = [{ id: 'j', state: 'queued', attempts: 0 }]+ await nextTick()+ assert.equal(state.processingActive.value, 1)+ state.dismiss()+ assert.equal(state.visible.value, true)+ media.jobs.value = [{ id: 'j', state: 'succeeded', attempts: 1 }]+ await nextTick()+ assert.equal(state.processingCompleted.value, 1)+ state.dismiss()+ assert.equal(state.visible.value, false)+ media.jobs.value = [{ id: 'j', state: 'failed', attempts: 2 }]+ await nextTick()+ assert.equal(state.visible.value, false)+ media.jobs.value = [{ id: 'j', state: 'retry_wait', attempts: 2 }]+ await nextTick()+ assert.equal(state.processingActive.value, 1)+ media.jobs.value = [{ id: 'j', state: 'failed', attempts: 3 }]+ await nextTick()+ assert.equal(state.processingJobs.value[0].state, 'failed')+})