refactor(yjs): move queue handling into helper

Signed-off-by: Max <max@nextcloud.com>

src/helpers/yjs.js

@@ -80,6 +80,26 @@ export function applyUpdateMessage(ydoc, updateMessage, origin = 'origin') {
 	)
 }
 
+/**
+ * Get the steps for sending to the server
+ *
+ * @param {object[]} queue - queue for the outgoing steps
+ */
+export function getSteps(queue) {
+	return queue.map(s => encodeArrayBuffer(s))
+		.filter(s => s < 'AQ')
+}
+
+/**
+ * Encode the latest awareness message for sending
+ *
+ * @param {object[]} queue - queue for the outgoing steps
+ */
+export function getAwareness(queue) {
+	return queue.map(s => encodeArrayBuffer(s))
+		.findLast(s => s > 'AQ') || ''
+}
+
 /**
  * Log y.js messages with their type and initiator call stack
  *

src/services/SyncService.js

@@ -10,7 +10,7 @@ import debounce from 'debounce'
 
 import PollingBackend from './PollingBackend.js'
 import SessionApi, { Connection } from './SessionApi.js'
-import { encodeArrayBuffer } from '../helpers/base64.ts'
+import { getSteps, getAwareness } from '../helpers/yjs.js'
 import { logger } from '../helpers/logger.js'
 
 /**
@@ -276,10 +276,8 @@ class SyncService {
 			return
 		}
 		let outbox = []
-		const steps = queue.map(s => encodeArrayBuffer(s))
-			.filter(s => s < 'AQ')
-		const awareness = queue.map(s => encodeArrayBuffer(s))
-			.findLast(s => s > 'AQ') || ''
+		const steps = getSteps(queue)
+		const awareness = getAwareness(queue)
 		return this.sendStepsNow(() => {
 			const data = { steps, awareness, version: this.version }
 			outbox = [...queue]

src/services/WebSocketPolyfill.js

@@ -4,7 +4,8 @@
  */
 
 import { logger } from '../helpers/logger.js'
-import { encodeArrayBuffer, decodeArrayBuffer } from '../helpers/base64.ts'
+import { decodeArrayBuffer } from '../helpers/base64.ts'
+import { getSteps, getAwareness } from '../helpers/yjs.js'
 
 /**
  *
@@ -69,8 +70,8 @@ export default function initWebSocketPolyfill(syncService, fileId, initialSessio
 			let outbox = []
 			return syncService.sendSteps(() => {
 				const data = {
-					steps: this.#steps,
-					awareness: this.#awareness,
+					steps: getSteps(queue),
+					awareness: getAwareness(queue),
 					version: this.#version,
 				}
 				outbox = [...queue]
@@ -86,16 +87,6 @@ export default function initWebSocketPolyfill(syncService, fileId, initialSessio
 			}, err => logger.error(err))
 		}
 
-		get #steps() {
-			return queue.map(s => encodeArrayBuffer(s))
-				.filter(s => s < 'AQ')
-		}
-
-		get #awareness() {
-			return queue.map(s => encodeArrayBuffer(s))
-				.findLast(s => s > 'AQ') || ''
-		}
-
 		async close() {
 			Object.entries(this.#handlers)
 				.forEach(([key, value]) => syncService.off(key, value))