Merge branch 'sw-nocache' into sw-notification-action

This commit is contained in:
tamaina 2021-02-14 21:20:57 +09:00
commit adc5a81253
5 changed files with 80 additions and 6 deletions

View File

@ -2,6 +2,7 @@ import { instance } from '@/instance';
import { $i } from '@/account'; import { $i } from '@/account';
import { api } from '@/os'; import { api } from '@/os';
import { lang } from '@/config'; import { lang } from '@/config';
import { SwMessage } from '@/sw/types';
export async function initializeSw() { export async function initializeSw() {
if (instance.swPublickey && if (instance.swPublickey &&
@ -15,9 +16,10 @@ export async function initializeSw() {
msg: 'initialize', msg: 'initialize',
lang, lang,
}); });
// SEE: https://developer.mozilla.org/en-US/docs/Web/API/PushManager/subscribe#Parameters // SEE: https://developer.mozilla.org/en-US/docs/Web/API/PushManager/subscribe#Parameters
registration.pushManager.subscribe({ registration.pushManager.subscribe({
userVisibleOnly: false, userVisibleOnly: true,
applicationServerKey: urlBase64ToUint8Array(instance.swPublickey) applicationServerKey: urlBase64ToUint8Array(instance.swPublickey)
}).then(subscription => { }).then(subscription => {
function encode(buffer: ArrayBuffer | null) { function encode(buffer: ArrayBuffer | null) {
@ -48,6 +50,13 @@ export async function initializeSw() {
} }
} }
navigator.serviceWorker.addEventListener('message', ev => {
const data = ev.data as SwMessage;
if (data.type !== 'order') return;
data.order
});
/** /**
* Convert the URL safe base64 string to a Uint8Array * Convert the URL safe base64 string to a Uint8Array
* @param base64String base64 string * @param base64String base64 string

View File

@ -1,3 +1,5 @@
declare var self: ServiceWorkerGlobalScope;
import { get } from 'idb-keyval'; import { get } from 'idb-keyval';
import { pushNotificationData } from '../../types'; import { pushNotificationData } from '../../types';
@ -48,6 +50,8 @@ class SwNotificationRead {
i: account.token, i: account.token,
notificationIds: account.queue notificationIds: account.queue
}) })
}).then(res => {
self.registration.showNotification('notificationread', { body: `${account.queue}, ${res.ok}` });
}); });
}, 100); }, 100);
} }

View File

@ -0,0 +1,41 @@
/*
* Openers
*
* 稿
*/
declare var self: ServiceWorkerGlobalScope;
import { SwMessage, swMessageOrderType } from './types';
// acctからユーザーを開く
export async function openUser(acct: string, loginId: string) {
open('push-user', { acct }, `${origin}/${acct}?loginId=${loginId}`, loginId)
}
// post-formのオプションから投稿フォームを開く
export async function openPost(options: any, loginId: string) {
// Build share queries from options
let url = `${origin}/?`;
if (options.initialText) url += `text=${options.initialText}&`;
if (options.reply) url += `replyId=${options.reply.id}&`;
if (options.renote) url += `renoteId=${options.renote.id}&`;
url += `loginId=${loginId}`;
open('post', { options }, url, loginId)
}
async function open(order: swMessageOrderType, query: any, url: string, loginId: string) {
const client = await self.clients.matchAll({
includeUncontrolled: true,
type: 'window'
}).then(clients => clients.length > 0 ? clients[0] : null);
if (client) {
client.postMessage({ type: 'order', ...query, order, loginId, url } as SwMessage);
if ('focus' in client) (client as any).focus();
return;
}
return self.clients.openWindow(url);
}

View File

@ -10,7 +10,7 @@ import { pushNotificationData } from '../../types';
//#region Lifecycle: Install //#region Lifecycle: Install
self.addEventListener('install', ev => { self.addEventListener('install', ev => {
self.skipWaiting(); ev.waitUntil(self.skipWaiting());
}); });
//#endregion //#endregion
@ -38,7 +38,8 @@ self.addEventListener('fetch', ev => {
self.addEventListener('push', ev => { self.addEventListener('push', ev => {
// クライアント取得 // クライアント取得
ev.waitUntil(self.clients.matchAll({ ev.waitUntil(self.clients.matchAll({
includeUncontrolled: true includeUncontrolled: true,
type: 'window'
}).then(async clients => { }).then(async clients => {
// // クライアントがあったらストリームに接続しているということなので通知しない // // クライアントがあったらストリームに接続しているということなので通知しない
// if (clients.length != 0) return; // if (clients.length != 0) return;
@ -70,11 +71,21 @@ self.addEventListener('push', ev => {
//#endregion //#endregion
//#region Notification //#region Notification
self.addEventListener('notificationclick', ev => { self.addEventListener('notificationclick', async ev => {
const { action, notification } = ev; const { action, notification } = ev;
console.log('click', action, notification) console.log('click', action, notification)
const data: pushNotificationData = notification.data; const data: pushNotificationData = notification.data;
const { origin } = location; const { origin } = location;
const client = self.clients.matchAll({
includeUncontrolled: true,
type: 'window'
}).then(clients => {
for (const client of clients) {
client.postMessage(notification.data);
if ('focus' in client) (client as any).focus()
console.log('postMessage', client)
}
});
const suffix = `?loginId=${data.userId}`; const suffix = `?loginId=${data.userId}`;
@ -82,12 +93,12 @@ self.addEventListener('notificationclick', ev => {
case 'showUser': case 'showUser':
switch (data.body.type) { switch (data.body.type) {
case 'reaction': case 'reaction':
self.clients.openWindow(`${origin}/users/${data.body.user.id}${suffix}`); await self.clients.openWindow(`${origin}/users/${data.body.user.id}${suffix}`);
break; break;
default: default:
if ('note' in data.body) { if ('note' in data.body) {
self.clients.openWindow(`${origin}/users/${data.body.note.user.id}${suffix}`); await self.clients.openWindow(`${origin}/users/${data.body.note.user.id}${suffix}`);
} }
} }
break; break;

9
src/client/sw/types.ts Normal file
View File

@ -0,0 +1,9 @@
export type swMessageOrderType = 'post' | 'push-user' | 'push-note' | 'push-messaging-room'
export type SwMessage = {
type: 'order';
order: swMessageOrderType;
loginId: string;
url: string;
[x: string]: any;
};