From 3688859efe57038cc076fdfa3fe2fe590946050b Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 21 Nov 2021 00:18:52 +0900
Subject: [PATCH] =?UTF-8?q?sw-inject=E5=88=86=E9=9B=A2=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=81=8C=E3=83=86=E3=82=B9=E3=83=88=E3=81=97=E3=81=A6=E3=81=AA?=
 =?UTF-8?q?=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/ui/_common_/common.vue   | 49 ++------------------
 packages/client/src/ui/_common_/sw-inject.ts | 45 ++++++++++++++++++
 2 files changed, 50 insertions(+), 44 deletions(-)
 create mode 100644 packages/client/src/ui/_common_/sw-inject.ts

diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue
index 01b3fc4951..06481fa911 100644
--- a/packages/client/src/ui/_common_/common.vue
+++ b/packages/client/src/ui/_common_/common.vue
@@ -14,15 +14,11 @@
 </template>
 
 <script lang="ts">
-import { defineAsyncComponent, defineComponent, inject } from 'vue';
-import { stream, popup, popups, uploads, pendingApiRequestsCount, pageWindow, post } from '@/os';
+import { defineAsyncComponent, defineComponent } from 'vue';
+import { stream, popup, popups, uploads, pendingApiRequestsCount } from '@/os';
 import * as sound from '@/scripts/sound';
-import { $i, login } from '@/account';
-import { SwMessage } from '@/sw/types';
-import { popout } from '@/scripts/popout';
-import { defaultStore, ColdDeviceStorage } from '@/store';
-import { getAccountFromId } from '@/scripts/get-account-from-id';
-import { router } from '@/router';
+import { $i } from '@/account';
+import { swInject } from './sw-inject';
 
 export default defineComponent({
 	components: {
@@ -53,42 +49,7 @@ export default defineComponent({
 
 			//#region Listen message from SW
 			if ('serviceWorker' in navigator) {
-				const navHook = inject('navHook', null);
-				const sideViewHook = inject('sideViewHook', null);
-
-				navigator.serviceWorker.addEventListener('message', ev => {
-					if (_DEV_) {
-						console.log('sw msg', ev.data);
-					}
-
-					const data = ev.data as SwMessage;
-					if (data.type !== 'order') return;
-
-					if (data.loginId !== $i?.id) {
-						return getAccountFromId(data.loginId).then(account => {
-							if (!account) return;
-							return login(account.token, data.url);
-						});
-					}
-
-					switch (data.order) {
-						case 'post':
-							return post(data.options);
-						case 'push':
-							if (router.currentRoute.value.path === data.url) {
-								return window.scroll({ top: 0, behavior: 'smooth' });
-							}
-							if (navHook) {
-								return navHook(data.url);
-							}
-							if (sideViewHook && defaultStore.state.defaultSideView && data.url !== '/') {
-								return sideViewHook(data.url);
-							}
-							return router.push(data.url);
-						default:
-							return;
-					}
-				});
+				swInject();
 			}
 		}
 
diff --git a/packages/client/src/ui/_common_/sw-inject.ts b/packages/client/src/ui/_common_/sw-inject.ts
new file mode 100644
index 0000000000..e3e2ddd7e6
--- /dev/null
+++ b/packages/client/src/ui/_common_/sw-inject.ts
@@ -0,0 +1,45 @@
+import { inject } from 'vue';
+import { post } from '@/os';
+import { $i, login } from '@/account';
+import { defaultStore } from '@/store';
+import { getAccountFromId } from '@/scripts/get-account-from-id';
+import { router } from '@/router';
+
+export function swInject() {
+	const navHook = inject('navHook', null);
+	const sideViewHook = inject('sideViewHook', null);
+
+	navigator.serviceWorker.addEventListener('message', ev => {
+		if (_DEV_) {
+			console.log('sw msg', ev.data);
+		}
+
+		const data = ev.data; // as SwMessage
+		if (data.type !== 'order') return;
+
+		if (data.loginId !== $i?.id) {
+			return getAccountFromId(data.loginId).then(account => {
+				if (!account) return;
+				return login(account.token, data.url);
+			});
+		}
+
+		switch (data.order) {
+			case 'post':
+				return post(data.options);
+			case 'push':
+				if (router.currentRoute.value.path === data.url) {
+					return window.scroll({ top: 0, behavior: 'smooth' });
+				}
+				if (navHook) {
+					return navHook(data.url);
+				}
+				if (sideViewHook && defaultStore.state.defaultSideView && data.url !== '/') {
+					return sideViewHook(data.url);
+				}
+				return router.push(data.url);
+			default:
+				return;
+		}
+	});
+}