Fix document state issues

lib/Service/DocumentService.php

@@ -152,17 +152,45 @@ public function createDocument(File $file): Document {
 	}
 
 	/**
-	 * @param $document
+	 * @param int $documentId
 	 * @return ISimpleFile
 	 * @throws NotFoundException
 	 */
-	public function getStateFile($document): ISimpleFile {
+	public function getStateFile(int $documentId): ISimpleFile {
+		$filename = (string)$documentId . '.yjs';
 		if (!$this->ensureDocumentsFolder()) {
 			throw new NotFoundException('No app data folder present for text documents');
 		}
-		return $this->appData->getFolder('documents')->getFile((string) $document);
+		return $this->appData->getFolder('documents')->getFile($filename);
 	}
 
+	/**
+	 * @param int $documentId
+	 * @return ISimpleFile
+	 * @throws NotPermittedException
+	 */
+	public function createStateFile(int $documentId): ISimpleFile {
+		$filename = (string)$documentId . '.yjs';
+		return $this->appData->getFolder('documents')->newFile($filename);
+	}
+
+	/**
+	 * @param int $documentId
+	 * @param string $content
+	 */
+	public function writeDocumentState(int $documentId, string $content): void {
+		try {
+			$documentStateFile = $this->getStateFile($documentId);
+		} catch (NotFoundException $e) {
+			$documentStateFile = $this->createStateFile($documentId);
+		} catch (NotPermittedException $e) {
+			$this->logger->error('Failed to create document state file', ['exception' => $e]);
+			return;
+		}
+		$documentStateFile->putContent($content);
+	}
+
+
 	public function get($documentId) {
 		return $this->documentMapper->find($documentId);
 	}
@@ -304,22 +332,16 @@ public function autosave(?File $file, int $documentId, int $version, ?string $au
 			return $document;
 		}
 
-		try {
-			$documentStateFile = $this->getStateFile((string)$file->getId());
-		} catch (NotFoundException $e) {
-			$documentStateFile = $this->appData->getFolder('documents')->newFile((string)$file->getId());
-		}
-
 		$this->cache->set('document-save-lock-' . $documentId, true, 10);
 		try {
 			$this->lockManager->runInScope(new LockContext(
 				$file,
 				ILock::TYPE_APP,
 				Application::APP_NAME
-			), function () use ($file, $autoaveDocument, $documentStateFile, $documentState) {
+			), function () use ($file, $autoaveDocument, $documentState) {
 				$file->putContent($autoaveDocument);
 				if ($documentState) {
-					$documentStateFile->putContent($documentState);
+					$this->writeDocumentState($file->getId(), $documentState);
 				}
 			});
 		} catch (LockedException $e) {

src/services/SessionApi.js

@@ -50,7 +50,7 @@ class SessionApi {
 export class Connection {
 
 	#content
-	#documentumentState
+	#documentState
 	#document
 	#session
 	#lock
@@ -64,24 +64,24 @@ export class Connection {
 		this.#lock = lock
 		this.#readOnly = readOnly
 		this.#content = content
-		this.#documentumentState = documentState
+		this.#documentState = documentState
 		this.#options = options
 	}
 
 	get document() {
 		return this.#document
 	}
 
-	get lastSavedVersion() {
-		return this.#document.lastSavedVersion
+	get docStateVersion() {
+		return this.#documentState ? this.#document.lastSavedVersion : 0
 	}
 
 	get state() {
 		return {
 			document: { ...this.#document, readOnly: this.#readOnly },
 			session: this.#session,
 			documentSource: this.#content || '',
-			documentState: this.#documentumentState,
+			documentState: this.#documentState,
 		}
 	}
 

src/services/SyncService.js

@@ -99,7 +99,7 @@ class SyncService {
 		// TODO: Only continue if a connection was made
 		this.connection = await connect
 
-		this.version = this.connection.lastSavedVersion
+		this.version = this.connection.docStateVersion
 		this.emit('opened', {
 			...this.connection.state,
 			version: this.version,