nodebb-plugin-web-push 0.6.2 → 0.7.2

package/library.js

@@ -45,6 +45,12 @@ plugin.appendConfig = async (config) => {
 	return config;
 };
 
+plugin.registerServiceWorker = async (data) => {
+	const { scripts } = data;
+	scripts.add(`nodebb-plugin-web-push/static/web-push.js`);
+	return data;
+};
+
 async function assertVapidConfiguration() {
 	let { publicKey, privateKey } = await meta.settings.get('web-push');
 	if (!publicKey || !privateKey) {
@@ -159,26 +165,30 @@ plugin.onNotificationRescind = async ({ nids }) => {
 		subs = new Set(...Object.values(Object.fromEntries(subs))); // wtf
 
 		if (subs.size) {
-			subs.forEach(async (subscription) => {
-				await webPush.sendNotification(subscription, JSON.stringify({ tag }));
-			});
+			await Promise.all(Array.from(subs).map(async (subscription) => {
+				try {
+					await webPush.sendNotification(subscription, JSON.stringify({ tag }));
+				} catch (e) {
+					winston.info(`[plugins/web-push] Push failed: ${e.code}; ${e.message}; statusCode: ${e.statusCode}`);
+				}
+			}));
 		}
-	}));
+	})).catch(err => winston.error(err.stack));
 };
 
-plugin.addProfileItem = async (data) => {
-	const title = await translator.translate('[[web-push:profile.label]]');
+plugin.addProfileItem = (data) => {
 	data.links.push({
 		id: 'web-push',
 		route: 'web-push',
 		icon: 'fa-bell-o',
-		name: title,
+		name: '[[web-push:profile.label]]',
 		visibility: {
 			self: true,
 			other: false,
 			moderator: false,
 			globalMod: false,
 			admin: false,
+			canViewInfo: false,
 		},
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-web-push",
-  "version": "0.6.2",
+  "version": "0.7.2",
   "description": "A starter kit for quickly creating NodeBB plugins",
   "main": "library.js",
   "repository": {
@@ -31,16 +31,16 @@
   },
   "readmeFilename": "README.md",
   "nbbpm": {
-    "compatibility": "^4.0.0"
+    "compatibility": "^3.10.x"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.5.0",
-    "@commitlint/config-angular": "19.5.0",
+    "@commitlint/cli": "19.6.1",
+    "@commitlint/config-angular": "19.6.0",
     "eslint": "8.x",
     "eslint-config-nodebb": "0.2.1",
     "eslint-plugin-import": "2.x",
-    "husky": "9.1.6",
-    "lint-staged": "15.2.10"
+    "husky": "9.1.7",
+    "lint-staged": "15.3.0"
   },
   "dependencies": {
     "validator": "^13.12.0",

package/plugin.json

@@ -9,12 +9,16 @@
 		{ "hook": "filter:config.get", "method": "appendConfig" },
 		{ "hook": "action:notification.pushed", "method": "onNotificationPush" },
 		{ "hook": "static:notifications.rescind", "method": "onNotificationRescind" },
-		{ "hook": "filter:user.profileMenu", "method": "addProfileItem" }
+		{ "hook": "filter:user.profileMenu", "method": "addProfileItem" },
+		{ "hook": "filter:service-worker.scripts", "method": "registerServiceWorker" }
 	],
 	"languages": "public/languages",
 	"modules": {
 		"../client/account/web-push.js": "./public/lib/settings.js",
 		"../admin/plugins/web-push.js": "./public/lib/admin.js"
 	},
+	"staticDirs": {
+		"static": "./static"
+	},
 	"templates": "templates"
 }

package/static/web-push.js

@@ -0,0 +1,56 @@
+/* eslint-disable no-undef */
+
+'use strict';
+
+// Register event listener for the 'push' event.
+self.addEventListener('push', (event) => {
+	// Keep the service worker alive until the notification is created.
+	const { title, body, tag, data } = event.data.json();
+
+	if (title && body) {
+		const { icon } = data;
+		delete data.icon;
+		const { badge } = data;
+		delete data.badge;
+
+		event.waitUntil(
+			self.registration.showNotification(title, { body, tag, data, icon, badge })
+		);
+	} else if (tag) {
+		event.waitUntil(
+			self.registration.getNotifications({ tag }).then((notifications) => {
+				notifications.forEach((notification) => {
+					notification.close();
+				});
+			})
+		);
+	}
+});
+
+self.addEventListener('notificationclick', (event) => {
+	event.notification.close();
+	let target;
+	if (event.notification.data && event.notification.data.url) {
+		target = new URL(event.notification.data.url);
+	}
+
+	// This looks to see if the current is already open and focuses if it is
+	event.waitUntil(
+		self.clients
+			.matchAll({ type: 'window' })
+			.then((clientList) => {
+				// eslint-disable-next-line no-restricted-syntax
+				for (const client of clientList) {
+					const { hostname } = new URL(client.url);
+					if (target && hostname === target.hostname && 'focus' in client) {
+						client.postMessage({
+							action: 'ajaxify',
+							url: target.pathname,
+						});
+						return client.focus();
+					}
+				}
+				if (self.clients.openWindow) return self.clients.openWindow(target.pathname);
+			})
+	);
+});

package/static/samplefile.html

@@ -1,5 +0,0 @@
-<h1>Hello!</h1>
-
-<p>This file is served by nodebb at domain.com/assets/plugins/nodebb-plugin-web-push/static/samplefile.html</p>
-
-Check plugin.json for the "staticDirs" property if you want to change the path.