mirror of https://github.com/mastodon/mastodon
Free stroage if it is exceeding disk quota (#7061)
This commit is contained in:
parent
b83ce18b30
commit
1ed1014546
|
@ -1,5 +1,5 @@
|
||||||
import api, { getLinks } from '../api';
|
import api, { getLinks } from '../api';
|
||||||
import asyncDB from '../storage/db';
|
import openDB from '../storage/db';
|
||||||
import { importAccount, importFetchedAccount, importFetchedAccounts } from './importer';
|
import { importAccount, importFetchedAccount, importFetchedAccounts } from './importer';
|
||||||
|
|
||||||
export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
|
export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
|
||||||
|
@ -94,12 +94,15 @@ export function fetchAccount(id) {
|
||||||
|
|
||||||
dispatch(fetchAccountRequest(id));
|
dispatch(fetchAccountRequest(id));
|
||||||
|
|
||||||
asyncDB.then(db => getFromDB(
|
openDB().then(db => getFromDB(
|
||||||
dispatch,
|
dispatch,
|
||||||
getState,
|
getState,
|
||||||
db.transaction('accounts', 'read').objectStore('accounts').index('id'),
|
db.transaction('accounts', 'read').objectStore('accounts').index('id'),
|
||||||
id
|
id
|
||||||
)).catch(() => api(getState).get(`/api/v1/accounts/${id}`).then(response => {
|
).then(() => db.close(), error => {
|
||||||
|
db.close();
|
||||||
|
throw error;
|
||||||
|
})).catch(() => api(getState).get(`/api/v1/accounts/${id}`).then(response => {
|
||||||
dispatch(importFetchedAccount(response.data));
|
dispatch(importFetchedAccount(response.data));
|
||||||
})).then(() => {
|
})).then(() => {
|
||||||
dispatch(fetchAccountSuccess());
|
dispatch(fetchAccountSuccess());
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { autoPlayGif } from '../../initial_state';
|
||||||
import { putAccounts, putStatuses } from '../../storage/modifier';
|
import { putAccounts, putStatuses } from '../../storage/modifier';
|
||||||
import { normalizeAccount, normalizeStatus } from './normalizer';
|
import { normalizeAccount, normalizeStatus } from './normalizer';
|
||||||
|
|
||||||
|
@ -44,7 +45,7 @@ export function importFetchedAccounts(accounts) {
|
||||||
}
|
}
|
||||||
|
|
||||||
accounts.forEach(processAccount);
|
accounts.forEach(processAccount);
|
||||||
putAccounts(normalAccounts);
|
putAccounts(normalAccounts, !autoPlayGif);
|
||||||
|
|
||||||
return importAccounts(normalAccounts);
|
return importAccounts(normalAccounts);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import api from '../api';
|
import api from '../api';
|
||||||
import asyncDB from '../storage/db';
|
import openDB from '../storage/db';
|
||||||
import { evictStatus } from '../storage/modifier';
|
import { evictStatus } from '../storage/modifier';
|
||||||
|
|
||||||
import { deleteFromTimelines } from './timelines';
|
import { deleteFromTimelines } from './timelines';
|
||||||
|
@ -92,12 +92,17 @@ export function fetchStatus(id) {
|
||||||
|
|
||||||
dispatch(fetchStatusRequest(id, skipLoading));
|
dispatch(fetchStatusRequest(id, skipLoading));
|
||||||
|
|
||||||
asyncDB.then(db => {
|
openDB().then(db => {
|
||||||
const transaction = db.transaction(['accounts', 'statuses'], 'read');
|
const transaction = db.transaction(['accounts', 'statuses'], 'read');
|
||||||
const accountIndex = transaction.objectStore('accounts').index('id');
|
const accountIndex = transaction.objectStore('accounts').index('id');
|
||||||
const index = transaction.objectStore('statuses').index('id');
|
const index = transaction.objectStore('statuses').index('id');
|
||||||
|
|
||||||
return getFromDB(dispatch, getState, accountIndex, index, id);
|
return getFromDB(dispatch, getState, accountIndex, index, id).then(() => {
|
||||||
|
db.close();
|
||||||
|
}, error => {
|
||||||
|
db.close();
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
dispatch(fetchStatusSuccess(skipLoading));
|
dispatch(fetchStatusSuccess(skipLoading));
|
||||||
}, () => api(getState).get(`/api/v1/statuses/${id}`).then(response => {
|
}, () => api(getState).get(`/api/v1/statuses/${id}`).then(response => {
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { freeStorage } from '../storage/modifier';
|
||||||
import './web_push_notifications';
|
import './web_push_notifications';
|
||||||
|
|
||||||
function openSystemCache() {
|
function openSystemCache() {
|
||||||
|
@ -42,8 +43,10 @@ self.addEventListener('fetch', function(event) {
|
||||||
|
|
||||||
event.respondWith(asyncResponse.then(async response => {
|
event.respondWith(asyncResponse.then(async response => {
|
||||||
if (response.ok || response.type === 'opaqueredirect') {
|
if (response.ok || response.type === 'opaqueredirect') {
|
||||||
const cache = await asyncCache;
|
await Promise.all([
|
||||||
await cache.delete('/');
|
asyncCache.then(cache => cache.delete('/')),
|
||||||
|
indexedDB.deleteDatabase('mastodon'),
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
|
@ -56,7 +59,11 @@ self.addEventListener('fetch', function(event) {
|
||||||
const fetched = await fetch(event.request);
|
const fetched = await fetch(event.request);
|
||||||
|
|
||||||
if (fetched.ok) {
|
if (fetched.ok) {
|
||||||
await cache.put(event.request.url, fetched.clone());
|
try {
|
||||||
|
await cache.put(event.request.url, fetched.clone());
|
||||||
|
} finally {
|
||||||
|
freeStorage();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return fetched;
|
return fetched;
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
import { me } from '../initial_state';
|
export default () => new Promise((resolve, reject) => {
|
||||||
|
// ServiceWorker is required to synchronize the login state.
|
||||||
export default new Promise((resolve, reject) => {
|
|
||||||
// Microsoft Edge 17 does not support getAll according to:
|
// Microsoft Edge 17 does not support getAll according to:
|
||||||
// Catalog of standard and vendor APIs across browsers - Microsoft Edge Development
|
// Catalog of standard and vendor APIs across browsers - Microsoft Edge Development
|
||||||
// https://developer.microsoft.com/en-us/microsoft-edge/platform/catalog/?q=specName%3Aindexeddb
|
// https://developer.microsoft.com/en-us/microsoft-edge/platform/catalog/?q=specName%3Aindexeddb
|
||||||
if (!me || !('getAll' in IDBObjectStore.prototype)) {
|
if (!('caches' in self && 'getAll' in IDBObjectStore.prototype)) {
|
||||||
reject();
|
reject();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const request = indexedDB.open('mastodon:' + me);
|
const request = indexedDB.open('mastodon');
|
||||||
|
|
||||||
request.onerror = reject;
|
request.onerror = reject;
|
||||||
request.onsuccess = ({ target }) => resolve(target.result);
|
request.onsuccess = ({ target }) => resolve(target.result);
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
import asyncDB from './db';
|
import openDB from './db';
|
||||||
import { autoPlayGif } from '../initial_state';
|
|
||||||
|
|
||||||
const accountAssetKeys = ['avatar', 'avatar_static', 'header', 'header_static'];
|
const accountAssetKeys = ['avatar', 'avatar_static', 'header', 'header_static'];
|
||||||
const avatarKey = autoPlayGif ? 'avatar' : 'avatar_static';
|
const storageMargin = 8388608;
|
||||||
const limit = 1024;
|
const storeLimit = 1024;
|
||||||
|
|
||||||
// ServiceWorker and Cache API is not available on iOS 11
|
function openCache() {
|
||||||
// https://webkit.org/status/#specification-service-workers
|
// ServiceWorker and Cache API is not available on iOS 11
|
||||||
const asyncCache = window.caches ? caches.open('mastodon-system') : Promise.reject();
|
// https://webkit.org/status/#specification-service-workers
|
||||||
|
return self.caches ? caches.open('mastodon-system') : Promise.reject();
|
||||||
|
}
|
||||||
|
|
||||||
function printErrorIfAvailable(error) {
|
function printErrorIfAvailable(error) {
|
||||||
if (error) {
|
if (error) {
|
||||||
|
@ -16,7 +17,7 @@ function printErrorIfAvailable(error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function put(name, objects, onupdate, oncreate) {
|
function put(name, objects, onupdate, oncreate) {
|
||||||
return asyncDB.then(db => new Promise((resolve, reject) => {
|
return openDB().then(db => (new Promise((resolve, reject) => {
|
||||||
const putTransaction = db.transaction(name, 'readwrite');
|
const putTransaction = db.transaction(name, 'readwrite');
|
||||||
const putStore = putTransaction.objectStore(name);
|
const putStore = putTransaction.objectStore(name);
|
||||||
const putIndex = putStore.index('id');
|
const putIndex = putStore.index('id');
|
||||||
|
@ -53,7 +54,7 @@ function put(name, objects, onupdate, oncreate) {
|
||||||
const count = readStore.count();
|
const count = readStore.count();
|
||||||
|
|
||||||
count.onsuccess = () => {
|
count.onsuccess = () => {
|
||||||
const excess = count.result - limit;
|
const excess = count.result - storeLimit;
|
||||||
|
|
||||||
if (excess > 0) {
|
if (excess > 0) {
|
||||||
const retrieval = readStore.getAll(null, excess);
|
const retrieval = readStore.getAll(null, excess);
|
||||||
|
@ -69,11 +70,17 @@ function put(name, objects, onupdate, oncreate) {
|
||||||
};
|
};
|
||||||
|
|
||||||
putTransaction.onerror = reject;
|
putTransaction.onerror = reject;
|
||||||
|
})).then(resolved => {
|
||||||
|
db.close();
|
||||||
|
return resolved;
|
||||||
|
}, error => {
|
||||||
|
db.close();
|
||||||
|
throw error;
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
function evictAccountsByRecords(records) {
|
function evictAccountsByRecords(records) {
|
||||||
asyncDB.then(db => {
|
return openDB().then(db => {
|
||||||
const transaction = db.transaction(['accounts', 'statuses'], 'readwrite');
|
const transaction = db.transaction(['accounts', 'statuses'], 'readwrite');
|
||||||
const accounts = transaction.objectStore('accounts');
|
const accounts = transaction.objectStore('accounts');
|
||||||
const accountsIdIndex = accounts.index('id');
|
const accountsIdIndex = accounts.index('id');
|
||||||
|
@ -83,7 +90,7 @@ function evictAccountsByRecords(records) {
|
||||||
|
|
||||||
function evict(toEvict) {
|
function evict(toEvict) {
|
||||||
toEvict.forEach(record => {
|
toEvict.forEach(record => {
|
||||||
asyncCache
|
openCache()
|
||||||
.then(cache => accountAssetKeys.forEach(key => cache.delete(records[key])))
|
.then(cache => accountAssetKeys.forEach(key => cache.delete(records[key])))
|
||||||
.catch(printErrorIfAvailable);
|
.catch(printErrorIfAvailable);
|
||||||
|
|
||||||
|
@ -98,6 +105,8 @@ function evictAccountsByRecords(records) {
|
||||||
}
|
}
|
||||||
|
|
||||||
evict(records);
|
evict(records);
|
||||||
|
|
||||||
|
db.close();
|
||||||
}).catch(printErrorIfAvailable);
|
}).catch(printErrorIfAvailable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -106,8 +115,9 @@ export function evictStatus(id) {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function evictStatuses(ids) {
|
export function evictStatuses(ids) {
|
||||||
asyncDB.then(db => {
|
return openDB().then(db => {
|
||||||
const store = db.transaction('statuses', 'readwrite').objectStore('statuses');
|
const transaction = db.transaction('statuses', 'readwrite');
|
||||||
|
const store = transaction.objectStore('statuses');
|
||||||
const idIndex = store.index('id');
|
const idIndex = store.index('id');
|
||||||
const reblogIndex = store.index('reblog');
|
const reblogIndex = store.index('reblog');
|
||||||
|
|
||||||
|
@ -118,14 +128,17 @@ export function evictStatuses(ids) {
|
||||||
idIndex.getKey(id).onsuccess =
|
idIndex.getKey(id).onsuccess =
|
||||||
({ target }) => target.result && store.delete(target.result);
|
({ target }) => target.result && store.delete(target.result);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
db.close();
|
||||||
}).catch(printErrorIfAvailable);
|
}).catch(printErrorIfAvailable);
|
||||||
}
|
}
|
||||||
|
|
||||||
function evictStatusesByRecords(records) {
|
function evictStatusesByRecords(records) {
|
||||||
evictStatuses(records.map(({ id }) => id));
|
return evictStatuses(records.map(({ id }) => id));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function putAccounts(records) {
|
export function putAccounts(records, avatarStatic) {
|
||||||
|
const avatarKey = avatarStatic ? 'avatar_static' : 'avatar';
|
||||||
const newURLs = [];
|
const newURLs = [];
|
||||||
|
|
||||||
put('accounts', records, (newRecord, oldKey, store, oncomplete) => {
|
put('accounts', records, (newRecord, oldKey, store, oncomplete) => {
|
||||||
|
@ -135,7 +148,7 @@ export function putAccounts(records) {
|
||||||
const oldURL = target.result[key];
|
const oldURL = target.result[key];
|
||||||
|
|
||||||
if (newURL !== oldURL) {
|
if (newURL !== oldURL) {
|
||||||
asyncCache
|
openCache()
|
||||||
.then(cache => cache.delete(oldURL))
|
.then(cache => cache.delete(oldURL))
|
||||||
.catch(printErrorIfAvailable);
|
.catch(printErrorIfAvailable);
|
||||||
}
|
}
|
||||||
|
@ -153,11 +166,12 @@ export function putAccounts(records) {
|
||||||
}, (newRecord, oncomplete) => {
|
}, (newRecord, oncomplete) => {
|
||||||
newURLs.push(newRecord[avatarKey]);
|
newURLs.push(newRecord[avatarKey]);
|
||||||
oncomplete();
|
oncomplete();
|
||||||
}).then(records => {
|
}).then(records => Promise.all([
|
||||||
evictAccountsByRecords(records);
|
evictAccountsByRecords(records),
|
||||||
asyncCache
|
openCache().then(cache => cache.addAll(newURLs)),
|
||||||
.then(cache => cache.addAll(newURLs))
|
])).then(freeStorage, error => {
|
||||||
.catch(printErrorIfAvailable);
|
freeStorage();
|
||||||
|
throw error;
|
||||||
}).catch(printErrorIfAvailable);
|
}).catch(printErrorIfAvailable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -166,3 +180,27 @@ export function putStatuses(records) {
|
||||||
.then(evictStatusesByRecords)
|
.then(evictStatusesByRecords)
|
||||||
.catch(printErrorIfAvailable);
|
.catch(printErrorIfAvailable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function freeStorage() {
|
||||||
|
return navigator.storage.estimate().then(({ quota, usage }) => {
|
||||||
|
if (usage + storageMargin < quota) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return openDB().then(db => new Promise((resolve, reject) => {
|
||||||
|
const retrieval = db.transaction('accounts', 'readonly').objectStore('accounts').getAll(null, 1);
|
||||||
|
|
||||||
|
retrieval.onsuccess = () => {
|
||||||
|
if (retrieval.result.length > 0) {
|
||||||
|
resolve(evictAccountsByRecords(retrieval.result).then(freeStorage));
|
||||||
|
} else {
|
||||||
|
resolve(caches.delete('mastodon-system'));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
retrieval.onerror = reject;
|
||||||
|
|
||||||
|
db.close();
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue