fix: Various fixes for collaborative editing beta (#2586)

This commit is contained in:
Tom Moor
2021-09-15 23:27:22 -07:00
committed by GitHub
parent cde2909296
commit 27736f66ef
7 changed files with 30 additions and 16 deletions

View File

@@ -2,18 +2,18 @@
import Logger from "../logging/logger";
export default class CollaborationLogger {
async onCreateDocument(data: { documentName: string }) {
Logger.info("collaboration", `Created document "${data.documentName}"`);
Logger.info("hocuspocus", `Created document "${data.documentName}"`);
}
async onConnect(data: { documentName: string }) {
Logger.info("collaboration", `New connection to "${data.documentName}"`);
Logger.info("hocuspocus", `New connection to "${data.documentName}"`);
}
async onDisconnect(data: { documentName: string }) {
Logger.info("collaboration", `Connection to "${data.documentName}" closed`);
Logger.info("hocuspocus", `Connection to "${data.documentName}" closed`);
}
async onUpgrade() {
Logger.info("collaboration", "Upgrading connection");
Logger.info("hocuspocus", "Upgrading connection");
}
}

View File

@@ -29,16 +29,13 @@ export default class Persistence {
if (document.state) {
const ydoc = new Y.Doc();
Logger.info(
"collaboration",
`Document ${documentId} is in database state`
);
Logger.info("database", `Document ${documentId} is in database state`);
Y.applyUpdate(ydoc, document.state);
return ydoc;
}
Logger.info(
"collaboration",
"database",
`Document ${documentId} is not in state, creating from markdown`
);
const ydoc = markdownToYDoc(document.text, fieldName);
@@ -60,7 +57,7 @@ export default class Persistence {
}) => {
const [, documentId] = documentName.split(".");
Logger.info("collaboration", `Persisting ${documentId}`);
Logger.info("database", `Persisting ${documentId}`);
await documentUpdater({
documentId,