Prevent blob eviction: store as ArrayBuffer + request persistence
iOS Safari evicts Blob file-backed data from IndexedDB under memory pressure, causing upload POSTs to throw 'Load failed' without ever reaching the server. Two-pronged fix: 1. Store photos as ArrayBuffer (inline bytes) instead of Blob (file reference) in IndexedDB — ArrayBuffers are not subject to eviction 2. Request navigator.storage.persist() to signal the browser not to evict our storage under pressure Also adds Storage.getBlob() helper for converting stored ArrayBuffer back to Blob at upload/display time, with backward compat for any existing Blob-stored photos. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -7,43 +7,56 @@ const Storage = {
|
||||
init() {
|
||||
// Initialize Dexie database
|
||||
this.db = new Dexie('nextsnap');
|
||||
|
||||
|
||||
// Define schema with compound indexes
|
||||
this.db.version(1).stores({
|
||||
photos: '++id, username, timestamp, filename, targetPath, status, [username+status], [username+timestamp]',
|
||||
settings: '++id, username, [username+key]'
|
||||
});
|
||||
|
||||
|
||||
// Request persistent storage so the browser won't evict our data
|
||||
this.requestPersistence();
|
||||
|
||||
return this.db.open();
|
||||
},
|
||||
|
||||
async requestPersistence() {
|
||||
if (navigator.storage && navigator.storage.persist) {
|
||||
const granted = await navigator.storage.persist();
|
||||
console.log('[STORAGE] Persistence:', granted ? 'granted' : 'denied');
|
||||
}
|
||||
},
|
||||
|
||||
async savePhoto(photoData) {
|
||||
/**
|
||||
* Save a photo to IndexedDB
|
||||
* photoData: {
|
||||
* username: string,
|
||||
* timestamp: number,
|
||||
* filename: string,
|
||||
* targetPath: string,
|
||||
* blob: Blob,
|
||||
* status: 'pending' | 'uploading' | 'uploaded' | 'verified'
|
||||
* retryCount: number,
|
||||
* lastError: string
|
||||
* }
|
||||
*/
|
||||
// Convert Blob to ArrayBuffer for storage resilience.
|
||||
// iOS Safari can evict Blob file-backed data from IndexedDB,
|
||||
// but ArrayBuffer is stored inline and won't be evicted.
|
||||
let imageData = photoData.blob;
|
||||
if (imageData instanceof Blob) {
|
||||
imageData = await imageData.arrayBuffer();
|
||||
}
|
||||
|
||||
const id = await this.db.photos.add({
|
||||
username: photoData.username,
|
||||
timestamp: photoData.timestamp,
|
||||
filename: photoData.filename,
|
||||
targetPath: photoData.targetPath,
|
||||
blob: photoData.blob,
|
||||
blob: imageData,
|
||||
status: photoData.status || 'pending',
|
||||
retryCount: photoData.retryCount || 0,
|
||||
lastError: photoData.lastError || null
|
||||
});
|
||||
|
||||
|
||||
return id;
|
||||
},
|
||||
|
||||
// Convert stored photo data back to a Blob for upload or display.
|
||||
// Handles both legacy Blob storage and new ArrayBuffer storage.
|
||||
getBlob(photo) {
|
||||
if (!photo || !photo.blob) return null;
|
||||
if (photo.blob instanceof Blob) return photo.blob;
|
||||
return new Blob([photo.blob], { type: 'image/jpeg' });
|
||||
},
|
||||
|
||||
async getPhoto(id) {
|
||||
return await this.db.photos.get(id);
|
||||
|
||||
@@ -137,31 +137,18 @@ const Sync = {
|
||||
return true;
|
||||
}
|
||||
|
||||
const blob = freshPhoto.blob;
|
||||
// Convert stored data (ArrayBuffer or legacy Blob) to a Blob for upload
|
||||
const blob = Storage.getBlob(freshPhoto);
|
||||
|
||||
console.log('[SYNC] Uploading:', photo.filename,
|
||||
'(' + (blob ? (blob.size / 1024 / 1024).toFixed(1) + 'MB' : 'no blob') + ')',
|
||||
'attempt', retryCount + 1, 'of', this.MAX_RETRIES);
|
||||
|
||||
// Validate blob reference exists
|
||||
if (!blob || !(blob instanceof Blob) || blob.size === 0) {
|
||||
// Validate blob exists and has content
|
||||
if (!blob || blob.size === 0) {
|
||||
throw new Error('Photo data is missing or corrupted - please delete and re-capture');
|
||||
}
|
||||
|
||||
// Actually try to read the blob to verify data is accessible
|
||||
// (iOS Safari can evict blob data from IndexedDB while keeping the reference)
|
||||
const readable = await this.validateBlobReadable(blob);
|
||||
if (!readable) {
|
||||
// Blob data is gone — no amount of retrying will fix this
|
||||
console.error('[SYNC] Blob data is no longer readable:', photo.filename);
|
||||
await Storage.updatePhoto(photo.id, {
|
||||
status: 'failed',
|
||||
lastError: 'Photo data was lost by the browser - please re-capture',
|
||||
error: 'Photo data was lost by the browser - please re-capture'
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
await Storage.updatePhoto(photo.id, { status: 'uploading' });
|
||||
|
||||
// Prevent page navigation during upload
|
||||
@@ -294,19 +281,6 @@ const Sync = {
|
||||
}
|
||||
},
|
||||
|
||||
async validateBlobReadable(blob) {
|
||||
try {
|
||||
// Try to read the first byte — if iOS has evicted the data,
|
||||
// this will throw even though the Blob reference looks valid
|
||||
const slice = blob.slice(0, 1);
|
||||
const buf = await slice.arrayBuffer();
|
||||
return buf.byteLength > 0;
|
||||
} catch (e) {
|
||||
console.error('[SYNC] Blob readability check failed:', e.message);
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
async checkFileExists(path) {
|
||||
try {
|
||||
const verifyUrl = '/api/files/verify?path=' + encodeURIComponent(path);
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
// NextSnap Service Worker
|
||||
// Provides offline-first caching for the app shell
|
||||
|
||||
const CACHE_VERSION = 'nextsnap-v14';
|
||||
const APP_SHELL_CACHE = 'nextsnap-shell-v10';
|
||||
const RUNTIME_CACHE = 'nextsnap-runtime-v10';
|
||||
const CACHE_VERSION = 'nextsnap-v15';
|
||||
const APP_SHELL_CACHE = 'nextsnap-shell-v11';
|
||||
const RUNTIME_CACHE = 'nextsnap-runtime-v11';
|
||||
|
||||
// Assets to cache on install
|
||||
const APP_SHELL_ASSETS = [
|
||||
|
||||
Reference in New Issue
Block a user