Merge branch 'sw-notification-action' of https://github.com/tamaina/misskey into sw-notification-action

src/client/account.ts

@@ -1,4 +1,4 @@
-import { get, set } from 'idb-keyval';
+import { get, set } from '@/scripts/idb-proxy';
 import { reactive } from 'vue';
 import { apiUrl } from '@/config';
 import { waiting } from '@/os';

src/client/components/sidebar.vue

@@ -242,7 +242,7 @@ export default defineComponent({
 		addAcount() {
 			os.popup(import('./signin-dialog.vue'), {}, {
 				done: async res => {
-					addAccount(res.id, res.i);
+					await addAccount(res.id, res.i);
 					os.success();
 				},
 			}, 'closed');

src/client/init.ts

@@ -4,7 +4,7 @@
 
 import '@/style.scss';
 
-import { set } from 'idb-keyval';
+import { set } from '@/scripts/idb-proxy';
 
 // TODO: そのうち消す
 if (localStorage.getItem('vuex') != null) {
@@ -69,9 +69,9 @@ import { isMobile } from '@/scripts/is-mobile';
 import { getThemes } from '@/theme-store';
 import { initializeSw } from '@/scripts/initialize-sw';
 import { reload, reloadChannel } from '@/scripts/unison-reload';
+import { reactionPicker } from '@/scripts/reaction-picker';
 import { deleteLoginId } from '@/scripts/login-id';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
-import { reactionPicker } from '@/scripts/reaction-picker';
 
 console.info(`Misskey v${version}`);
 

src/client/scripts/get-account-from-id.ts

@@ -1,4 +1,4 @@
-import { get } from 'idb-keyval';
+import { get } from '@/scripts/idb-proxy';
 
 export async function getAccountFromId(id: string) {
 	const accounts = await get('accounts') as { token: string; id: string; }[];

src/client/scripts/idb-proxy.ts

@@ -0,0 +1,34 @@
+// FirefoxのプライベートモードなどではindexedDBが使用不可能なので、使う
+import {
+	get as iget,
+	set as iset,
+	del as idel,
+} from 'idb-keyval';
+
+const fallbackName = (key: string) => `idbfallback::${key}`;
+
+let idbAvailable = typeof window !== 'undefined' ? !!window.indexedDB : true;
+
+if (idbAvailable) {
+	try {
+		const request = indexedDB.open('keyval-store');
+		if (request.error) idbAvailable = false;
+	} catch (e) {
+		idbAvailable = false;
+	}
+}
+
+export async function get(key: string) {
+	if (idbAvailable) return iget(key);
+	return JSON.parse(localStorage.getItem(fallbackName(key)));
+}
+
+export async function set(key: string, val: any) {
+	if (idbAvailable) return iset(key, val);
+	return localStorage.setItem(fallbackName(key), JSON.stringify(val));
+}
+
+export async function del(key: string) {
+	if (idbAvailable) return idel(key);
+	return localStorage.removeItem(fallbackName(key));
+}

src/client/sw/sw.ts

@@ -32,7 +32,10 @@ self.addEventListener('activate', ev => {
 
 //#region When: Fetching
 self.addEventListener('fetch', ev => {
-	// Nothing to do
+	ev.respondWith(
+		fetch(ev.request)
+		.catch(() => new Response(`Offline. Service Worker @${_VERSION_}`, { status: 200 }))
+	);
 });
 //#endregion
 

src/client/ui/_common_/common.vue

@@ -55,6 +55,7 @@ export default defineComponent({
 			const sideViewHook = inject('sideViewHook', null);
 
 			//#region Listen message from SW
+			if ('serviceWorker' in navigator) {
 				navigator.serviceWorker.addEventListener('message', ev => {
 					if (_DEV_) {
 						console.log('sw msg', ev.data);
@@ -94,6 +95,7 @@ export default defineComponent({
 					}
 				});
 			}
+		}
 
 		return {
 			uploads,