766559c6e9
* clean up * ev => data * refactor * clean up * add type * antenna * channel * fix * add Packed type * add PackedRef * fix lint * add emoji schema * add reversiGame * add reversiMatching * remove signin schema (use Signin entity) * add schemas refs, fix Packed type * wip PackedHoge => Packed<'Hoge'> * add Packed type * note-reaction * user * user-group * user-list * note * app, messaging-message * notification * drive-file * drive-folder * following * muting * blocking * hashtag * page * app (with modifying schema) * import user? * channel * antenna * clip * gallery-post * emoji * Packed * reversi-matching * update stream.ts * https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339 * fix lint * clean up? * add app * fix * nanka iroiro * wip * wip * fix lint * fix loginId * fix * refactor * refactor * remove follow action * clean up * Revert "remove follow action" This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a. * Revert "clean up" This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2. * remove fetch specification * renoteの条件追加 * apiFetch => cli * bypass fetch? * fix * refactor: use path alias * temp: add submodule * remove submodule * enhane: unison-reloadに指定したパスに移動できるように * null * null * feat: ログインするアカウントのIDをクエリ文字列で指定する機能 * null * await? * rename * rename * Update read.ts * merge * get-note-summary * fix * swパッケージに * add missing packages * fix getNoteSummary * add webpack-cli * ✌️ * remove plugins * sw-inject分離したがテストしてない * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix * ✌️ * clean up config * typesを戻した * Update packages/client/src/components/notification.vue Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * disconnect * oops * Failed to load the script unexpectedly回避 sw.jsとlib.tsを分離してみた * truncate notification * Update packages/client/src/ui/_common_/common.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * clean up * clean up * キャッシュ対策 * Truncate push notification message * クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正 * components/drive-file-thumbnail.vue * components/drive-select-dialog.vue * components/drive-window.vue * merge * fix * Service Workerのビルドにesbuildを使うようにする * return createEmptyNotification() * fix * i18n.ts * update * ✌️ * remove ts-loader * fix * fix * enhance: Service Workerを常に登録するように * pollEnded * URLをsw.jsに戻す * clean up Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
84 lines
2.6 KiB
TypeScript
84 lines
2.6 KiB
TypeScript
import push from 'web-push';
|
|
import config from '@/config/index.js';
|
|
import { SwSubscriptions } from '@/models/index.js';
|
|
import { fetchMeta } from '@/misc/fetch-meta.js';
|
|
import { Packed } from '@/misc/schema.js';
|
|
import { getNoteSummary } from '@/misc/get-note-summary.js';
|
|
|
|
// Defined also packages/sw/types.ts#L14-L21
|
|
type pushNotificationsTypes = {
|
|
'notification': Packed<'Notification'>;
|
|
'unreadMessagingMessage': Packed<'MessagingMessage'>;
|
|
'readNotifications': { notificationIds: string[] };
|
|
'readAllNotifications': undefined;
|
|
'readAllMessagingMessages': undefined;
|
|
'readAllMessagingMessagesOfARoom': { userId: string } | { groupId: string };
|
|
};
|
|
|
|
// プッシュメッセージサーバーには文字数制限があるため、内容を削減します
|
|
function truncateNotification(notification: Packed<'Notification'>): any {
|
|
if (notification.note) {
|
|
return {
|
|
...notification,
|
|
note: {
|
|
...notification.note,
|
|
// textをgetNoteSummaryしたものに置き換える
|
|
text: getNoteSummary(notification.type === 'renote' ? notification.note.renote as Packed<'Note'> : notification.note),
|
|
|
|
cw: undefined,
|
|
reply: undefined,
|
|
renote: undefined,
|
|
user: undefined as any, // 通知を受け取ったユーザーである場合が多いのでこれも捨てる
|
|
}
|
|
};
|
|
}
|
|
|
|
return notification;
|
|
}
|
|
|
|
export async function pushNotification<T extends keyof pushNotificationsTypes>(userId: string, type: T, body: pushNotificationsTypes[T]) {
|
|
const meta = await fetchMeta();
|
|
|
|
if (!meta.enableServiceWorker || meta.swPublicKey == null || meta.swPrivateKey == null) return;
|
|
|
|
// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
|
|
push.setVapidDetails(config.url,
|
|
meta.swPublicKey,
|
|
meta.swPrivateKey);
|
|
|
|
// Fetch
|
|
const subscriptions = await SwSubscriptions.findBy({
|
|
userId: userId,
|
|
});
|
|
|
|
for (const subscription of subscriptions) {
|
|
const pushSubscription = {
|
|
endpoint: subscription.endpoint,
|
|
keys: {
|
|
auth: subscription.auth,
|
|
p256dh: subscription.publickey,
|
|
},
|
|
};
|
|
|
|
push.sendNotification(pushSubscription, JSON.stringify({
|
|
type,
|
|
body: type === 'notification' ? truncateNotification(body as Packed<'Notification'>) : body,
|
|
userId,
|
|
}), {
|
|
proxy: config.proxy,
|
|
}).catch((err: any) => {
|
|
//swLogger.info(err.statusCode);
|
|
//swLogger.info(err.headers);
|
|
//swLogger.info(err.body);
|
|
|
|
if (err.statusCode === 410) {
|
|
SwSubscriptions.delete({
|
|
userId: userId,
|
|
endpoint: subscription.endpoint,
|
|
auth: subscription.auth,
|
|
publickey: subscription.publickey,
|
|
});
|
|
}
|
|
});
|
|
}
|
|
}
|