wip
This commit is contained in:
parent
f95ca164d6
commit
77902e8d80
|
@ -1,44 +1,43 @@
|
|||
/*
|
||||
* Language manager for SW
|
||||
*/
|
||||
|
||||
declare var self: ServiceWorkerGlobalScope;
|
||||
|
||||
import { get, set } from 'idb-keyval';
|
||||
import { I18n } from '@/scripts/i18n';
|
||||
|
||||
class SwLang {
|
||||
public cacheName = `mk-cache-${_VERSION_}`;
|
||||
public cacheName = `mk-cache-${_VERSION_}`;
|
||||
|
||||
public lang: Promise<string> = get('lang').then(async prelang => {
|
||||
if (!prelang) return 'en-US';
|
||||
return prelang;
|
||||
});
|
||||
public lang: Promise<string> = get('lang').then(async prelang => {
|
||||
if (!prelang) return 'en-US';
|
||||
return prelang;
|
||||
});
|
||||
|
||||
public i18n: I18n<any> | null = null;
|
||||
public i18n: I18n<any> | null = null;
|
||||
|
||||
public setLang(newLang: string) {
|
||||
this.i18n = null;
|
||||
this.lang = Promise.resolve(newLang);
|
||||
public setLang(newLang: string) {
|
||||
this.i18n = null;
|
||||
this.lang = Promise.resolve(newLang);
|
||||
set('lang', newLang);
|
||||
return this.fetchLocale();
|
||||
}
|
||||
}
|
||||
|
||||
public async fetchLocale() {
|
||||
// Service Workerは何度も起動しそのたびにlocaleを読み込むので、CacheStorageを使う
|
||||
const localeUrl = `/assets/locales/${await this.lang}.${_VERSION_}.json`;
|
||||
let localeRes = await caches.match(localeUrl);
|
||||
|
||||
if (!localeRes) {
|
||||
localeRes = await fetch(localeUrl);
|
||||
const clone = localeRes?.clone();
|
||||
if (!clone?.clone().ok) return;
|
||||
|
||||
caches.open(this.cacheName).then(cache => cache.put(localeUrl, clone));
|
||||
}
|
||||
public async fetchLocale() {
|
||||
// Service Workerは何度も起動しそのたびにlocaleを読み込むので、CacheStorageを使う
|
||||
const localeUrl = `/assets/locales/${await this.lang}.${_VERSION_}.json`;
|
||||
let localeRes = await caches.match(localeUrl);
|
||||
|
||||
return this.i18n = new I18n(await localeRes.json());
|
||||
}
|
||||
if (!localeRes) {
|
||||
localeRes = await fetch(localeUrl);
|
||||
const clone = localeRes?.clone();
|
||||
if (!clone?.clone().ok) return;
|
||||
|
||||
caches.open(this.cacheName).then(cache => cache.put(localeUrl, clone));
|
||||
}
|
||||
|
||||
return this.i18n = new I18n(await localeRes.json());
|
||||
}
|
||||
}
|
||||
|
||||
export const swLang = new SwLang();
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
/*
|
||||
* Notification manager for SW
|
||||
*/
|
||||
|
||||
declare var self: ServiceWorkerGlobalScope;
|
||||
|
||||
import { getNoteSummary } from '../../misc/get-note-summary';
|
||||
import getUserName from '../../misc/get-user-name';
|
||||
import { swLang } from '@/sw/lang'
|
||||
import { swLang } from '@/sw/lang';
|
||||
|
||||
class SwNotification {
|
||||
private queue: any[] = [];
|
||||
|
@ -22,11 +21,11 @@ class SwNotification {
|
|||
if (this.fetching == false) {
|
||||
this.fetching = true;
|
||||
await swLang.fetchLocale();
|
||||
this.fetching = false;
|
||||
const promises = this.queue.map(this.composeNotification).map(n => {
|
||||
if (!n) return;
|
||||
return self.registration.showNotification(...n);
|
||||
})
|
||||
});
|
||||
this.fetching = false;
|
||||
this.queue = [];
|
||||
return Promise.all(promises);
|
||||
}
|
||||
|
|
|
@ -134,7 +134,7 @@ self.addEventListener('notificationclose', async ev => {
|
|||
|
||||
//#region When: Caught a message from the client
|
||||
self.addEventListener('message', ev => {
|
||||
switch(ev.data) {
|
||||
switch (ev.data) {
|
||||
case 'clear':
|
||||
return; // TODO
|
||||
default:
|
||||
|
|
Loading…
Reference in New Issue