move push_notify logic to a js library

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>

package.json

@@ -21,6 +21,7 @@
 		"@nextcloud/capabilities": "^1.0.2",
 		"@nextcloud/dialogs": "^3.1.1",
 		"@nextcloud/event-bus": "^1.2.0",
+		"@nextcloud/notify_push": "^1.0.0",
 		"@nextcloud/moment": "^1.1.1",
 		"@nextcloud/router": "^1.2.0",
 		"@nextcloud/vue": "^3.3.2",

src/App.vue

@@ -56,8 +56,8 @@ import axios from '@nextcloud/axios'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { showError } from '@nextcloud/dialogs'
 import { imagePath, generateOcsUrl } from '@nextcloud/router'
-import { getNotificationsData, setupPush } from './services/notificationsService'
-import { getCapabilities } from '@nextcloud/capabilities'
+import { getNotificationsData } from './services/notificationsService'
+import { listen } from '@nextcloud/notify_push'
 
 export default {
 	name: 'App',
@@ -129,14 +129,11 @@ export default {
 		// Initial call to the notification endpoint
 		this._fetch()
 
-		const capabilities = getCapabilities()
-		if (capabilities.notify_push) {
-			this.pushEndpoints = capabilities.notify_push.endpoints
-
-			// Because we have push, we only background poll very infrequent
+		const hasPush = listen('notify_notification', () => {
+			this._fetch()
+		})
+		if (hasPush) {
 			this.pollIntervalBase = 15 * 60 * 1000
-
-			this._setupPush()
 		}
 
 		// Setup the background checker
@@ -263,22 +260,6 @@ export default {
 			}
 		},
 
-		async _setupPush() {
-			if (!this.pushEndpoints) {
-				return
-			}
-
-			const ws = await setupPush(this.pushEndpoints)
-			ws.onmessage = message => {
-				if (message.data === 'notify_notification') {
-					this._fetch()
-				}
-			}
-			ws.onclose = () => {
-				this._setupPush()
-			}
-		},
-
 		_backgroundFetch() {
 			this.backgroundFetching = true
 			this._fetch()

src/services/notificationsService.js

@@ -73,17 +73,6 @@ const refreshData = async(lastETag) => {
 	}
 }
 
-const setupPush = async(endpoints) => {
-	const response = await axios.post(endpoints.pre_auth)
-	const ws = new WebSocket(endpoints.websocket)
-	ws.onopen = () => {
-		ws.send('dummy')
-		ws.send(response.data)
-	}
-	return ws
-}
-
 export {
 	getNotificationsData,
-	setupPush,
 }