@live-change/wysiwyg-frontend 0.1.4 → 0.1.6

package/front/src/DocumentEditor.vue

@@ -59,12 +59,11 @@
       content: props.initialContent,
       version: 0
     }
-    console.log(['prosemirror', 'createDocument'], documentData)
-    await api.command(['prosemirror', 'createDocument'], documentData)
+    documentData = await api.command(['prosemirror', 'createDocumentIfNotExists'], documentData)
   }
 
   const extensions = getExtensions(props.config)
-  console.log("CONFIG", props.config, 'EXTENSIONS', extensions)
+  //console.log("CONFIG", props.config, 'EXTENSIONS', extensions)
   const editor = useEditor({
     content: documentData.content,
     extensions: [
@@ -80,22 +79,64 @@
     }
   })
 
-  function save() {
+  let sentSteps = []
+  let sentVersion = 0
+
+  const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms))
+
+  async function save() {
     const state = editor.value.reactiveState.value
     const sendable = sendableSteps(state)
     if(sendable) {
+      let version = sendable.version
+      let firstOriginalStepIndex = 0
+      let resynchronization = false
       console.log("SENDABLE STEPS", sendable)
-      const serializedSteps = sendable.steps.map(step => step.toJSON())
+      const serializedSteps = sendable.steps.map((step, index) => ({ version: version + index, step: step.toJSON() }))
       console.log("SERIALIZED STEPS", serializedSteps)
-      api.command(['prosemirror', 'doSteps'], {
+      if(sendable.version <= sentVersion) { // found resend, check for duplicated steps
+        for(let i = 0; i < serializedSteps.length; i++) {
+          const step = serializedSteps[i]
+          const sentStep = sentSteps.find(({ version }) => version == step.version)
+          if(sentStep) {
+            console.log('FOUND SENT STEP WITH THE SAME VERSION', sentStep, '==', step)
+            if(JSON.stringify(sentStep) != JSON.stringify(step)) {
+              resynchronization = true
+              break
+            }
+            firstOriginalStepIndex = i + 1
+          } else break
+        }
+      }
+      serializedSteps.splice(0, firstOriginalStepIndex)
+      if(resynchronization && sentSteps.length > 0) {
+        console.log("RESYNCHRONIZATION!")
+        const firstVersion = serializedSteps[0].version
+        sentSteps = sentSteps.filter(({ version }) => version < firstVersion)
+      }
+      if(serializedSteps.length == 0) {
+        console.log("NOTHING TO SEND")
+        return
+      }
+      sentVersion = serializedSteps[0].version
+      sentSteps = sentSteps.concat(serializedSteps)
+      if(sentSteps.length > 200) sentSteps = sentSteps.slice(-100)
+      const data = {
         document, type: props.type,
-        version: sendable.version, steps: serializedSteps, window: api.windowId
-      })
+        version: sentVersion, steps: serializedSteps.map(({ step }) => step), window: api.windowId,
+        continuation: firstOriginalStepIndex > 0
+      }
+      console.log("SEND DATA", data)
+      //await sleep(1000)
+      await api.command(['prosemirror', 'doSteps'], data)
     }
   }
-
   const saveDebounced = useDebounceFn(save, 100)
 
+  api.source.on('connect', () => {
+    save()
+  })
+
   if(typeof window != 'undefined') {
     const stepsReader = inboxReader(
       (rawPosition, bucketSize) => {

package/front/src/NavBar.vue

@@ -102,4 +102,4 @@
 
 <style scoped>
 
-</style>
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/wysiwyg-frontend",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "scripts": {
     "memDev": "lcli memDev --enableSessions --initScript ./init.js --dbAccess",
     "localDevInit": "rm tmp.db; lcli localDev --enableSessions --initScript ./init.js",
@@ -21,17 +21,17 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.1.1",
-    "@live-change/cli": "0.6.5",
-    "@live-change/dao": "0.5.0",
-    "@live-change/dao-vue3": "0.4.13",
-    "@live-change/dao-websocket": "0.4.13",
-    "@live-change/framework": "0.6.6",
-    "@live-change/password-authentication-service": "0.2.39",
-    "@live-change/prosemirror-service": "0.2.39",
-    "@live-change/secret-code-service": "0.2.39",
-    "@live-change/secret-link-service": "0.2.39",
-    "@live-change/session-service": "0.2.39",
-    "@live-change/vue3-components": "0.2.12",
+    "@live-change/cli": "0.6.12",
+    "@live-change/dao": "0.5.4",
+    "@live-change/dao-vue3": "0.5.4",
+    "@live-change/dao-websocket": "0.5.4",
+    "@live-change/framework": "0.6.12",
+    "@live-change/password-authentication-service": "0.2.49",
+    "@live-change/prosemirror-service": "0.2.49",
+    "@live-change/secret-code-service": "0.2.49",
+    "@live-change/secret-link-service": "0.2.49",
+    "@live-change/session-service": "0.2.49",
+    "@live-change/vue3-components": "0.2.14",
     "@live-change/vue3-ssr": "0.2.14",
     "@tiptap/extension-blockquote": "^2.0.0-beta.29",
     "@tiptap/extension-bold": "^2.0.0-beta.28",
@@ -54,10 +54,7 @@
     "@tiptap/extension-text": "^2.0.0-beta.17",
     "@tiptap/extension-underline": "2.0.0-beta.23",
     "@tiptap/vue-3": "2.0.0-beta.91",
-    "@vitejs/plugin-vue": "^2.3.1",
-    "@vitejs/plugin-vue-jsx": "^1.3.10",
-    "@vue/compiler-sfc": "^3.2.33",
-    "@vueuse/core": "^8.3.1",
+    "@vueuse/core": "^9.1.0",
     "codeceptjs-assert": "^0.0.5",
     "compression": "^1.7.4",
     "cross-env": "^7.0.3",
@@ -71,26 +68,22 @@
     "serialize-javascript": "^6.0.0",
     "serve-static": "^1.15.0",
     "v-shared-element": "3.1.0",
-    "vite": "^2.9.6",
-    "vite-plugin-compression": "0.5.1",
-    "vite-plugin-vue-images": "^0.6.1",
-    "vue": "^3.2.33",
     "vue-meta": "^3.0.0-alpha.9",
-    "vue-router": "^4.0.14",
+    "vue-router": "^4.1.3",
     "vue3-scroll-border": "0.1.2"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "0.6.5",
-    "@wdio/selenium-standalone-service": "^7.19.5",
-    "codeceptjs": "^3.3.1",
+    "@live-change/codeceptjs-helper": "0.6.12",
+    "@wdio/selenium-standalone-service": "^7.20.8",
+    "codeceptjs": "^3.3.4",
     "generate-password": "1.7.0",
-    "playwright": "^1.21.1",
+    "playwright": "^1.24.2",
     "random-profile-generator": "^2.3.0",
-    "txtgen": "^3.0.1",
-    "webdriverio": "^7.19.5"
+    "txtgen": "^3.0.2",
+    "webdriverio": "^7.20.9"
   },
   "author": "",
   "license": "ISC",
   "description": "",
-  "gitHead": "cd4fa394f01bacdfebb021bb0949e35ca16cc016"
+  "gitHead": "4a0231098fcfea3c1e32aa29e8f232e43981ee7f"
 }

package/server/init.js

@@ -1,4 +1,5 @@
 const app = require('@live-change/framework').app()
+const {createUser} = require("@live-change/user-frontend/server/init-functions.js")
 
 module.exports = async function(services) {
 

package/server/services.config.js

@@ -18,7 +18,8 @@ module.exports = {
       path: '@live-change/prosemirror-service',
       documentTypes: {
         rich: require('./rich.documentType.js')
-      }
+      },
+      testLatency: 1000
     }
   ]
 }