@live-change/prosemirror-service 0.2.47 → 0.2.48

package/index.js

@@ -4,7 +4,7 @@ const app = App.app()
 const definition = require('./definition.js')
 const config = definition.config
 
-const { Document, StepsBucket, schemas } = require("./model.js")
+const { Document, StepsBucket, schemas, getDocument } = require("./model.js")
 
 const { testLatency } = config
 const sleep = ms => new Promise(r => setTimeout(r, ms))
@@ -78,6 +78,48 @@ definition.action({
       type: 'documentCreated',
       document, documentType: type, purpose, content, lastModified: new Date(), created: new Date()
     })
+    return {
+      id: document,
+      type, purpose, content, version: 0
+    }
+  }
+})
+
+definition.action({
+  name: 'createDocumentIfNotExists',
+  waitForEvents: true,
+  properties: {
+    document: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    type: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    purpose: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    content: {
+      type: Object
+    }
+  },
+  async execute({ document, type, purpose, content }, { client, service }, emit) {
+    if(testLatency) await sleep(testLatency)
+    if(!schemas[type]) throw new Error(`schema not found for document type ${type}`)
+    const documentData = await Document.get(document)
+    if(documentData) {
+      return documentData
+    }
+    emit({
+      type: 'documentCreated',
+      document, documentType: type, purpose, content, lastModified: new Date(), created: new Date()
+    })
+    return {
+      id: document,
+      type, purpose, content, version: 0
+    }
   }
 })
 
@@ -103,17 +145,31 @@ definition.action({
     window: {
       type: String,
       validation: ['nonEmpty']
+    },
+    continuation: {
+      type: Boolean
     }
   },
   queuedBy: (command) => command.client.document,
-  async execute({ document, type, version, steps, window }, { client, service }, emit) {
+  async execute({ document, type, version, steps, window, continuation }, { client, service }, emit) {
     if(testLatency) await sleep(testLatency)
     if(!schemas[type]) throw new Error(`schema not found for document type ${type}`)
-    const documentData = await Document.get(document)
+    const documentData = await getDocument(document, type)
     if(!documentData) throw new Error('document not found')
-    if(document.version > version) return 'ignored'
+    if(documentData.version != version) return 'ignored'
     const [sessionOrUserType, sessionOrUser] =
       client.user ? ['user_User', client.user] : ['session_Session', client.session]
+    if(continuation) {
+      console.log("DOC DATA", documentData)
+      console.log("CONTINUATION", documentData.lastStepsBucket, sessionOrUserType, sessionOrUser)
+      if(!documentData.lastStepsBucket
+        || documentData.lastStepsBucket.sessionOrUserType != sessionOrUserType
+        || documentData.lastStepsBucket.sessionOrUser != sessionOrUser) {
+        console.log("CONTINUATION IGNORED!!")
+        return [] // ignore, client will rebase
+      }
+    }
+
     emit({
       type: 'documentEdited',
       document, documentType: type, version, steps, window,

package/model.js

@@ -75,10 +75,12 @@ async function getDocument(documentId, documentType) {
     if(!documentData) {
       return null
     }
+    const lastStepsBucket = await StepsBucket.rangePath([documentId], { reverse: true, limit: 1 })?.[0] ?? null
     document = {
       type: documentData.type,
       content: schema.nodeFromJSON(documentData.content),
       version: documentData.version,
+      lastStepsBucket,
       schema
     }
     openDocuments.set(documentId, document)
@@ -105,19 +107,22 @@ definition.event({
       openDocument.content = step.apply(openDocument.content).doc
       openDocument.version ++
     }
+    const bucket = {
+      id: App.encodeIdentifier([document, openDocument.version.toFixed().padStart(10, '0')]),
+      window, sessionOrUserType, sessionOrUser, timestamp: new Date(),
+      steps
+    }
+    console.log("DOC EDITED", bucket)
+    openDocument.lastStepsBucket = bucket
     await Promise.all([
       Document.update(document, {
         content: openDocument.content.toJSON(),
         version: openDocument.version,
         lastModified: timestamp
       }),
-      StepsBucket.create({
-        id: App.encodeIdentifier([document, openDocument.version.toFixed().padStart(10, '0')]),
-        window, sessionOrUserType, sessionOrUser, timestamp: new Date(),
-        steps
-      })
+      StepsBucket.create(bucket)
     ])
   }
 })
 
-module.exports = { Document, StepsBucket, schemas }
+module.exports = { Document, StepsBucket, schemas, getDocument }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/prosemirror-service",
-  "version": "0.2.47",
+  "version": "0.2.48",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -28,5 +28,5 @@
     "progress-stream": "^2.0.0",
     "prosemirror-model": "^1.18.1"
   },
-  "gitHead": "710dc205163bf09d6b9469822101e9dfc11b74cb"
+  "gitHead": "cb09b064a6756221f1b773fe79e5b61de87c5ca5"
 }