vzcode 0.11.0 → 0.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vzcode",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "description": "Multiplayer code editor system",
   "main": "index.js",
   "type": "module",

package/src/server/index.js

@@ -18,6 +18,10 @@ dotenv.config({ path: '../../.env' });
 // The time in milliseconds by which auto-saving is debounced.
 const autoSaveDebounceTimeMS = 800;
 
+// The time in milliseconds by which auto-saving is throttled
+// when the user is interacting with the widgets in the editor.
+const throttleTimeMS = 100;
+
 // Server port.
 const port = 3030;
 
@@ -69,7 +73,6 @@ let previousDocument = initialDocument;
 
 // Saves the files that changed.
 const save = () => {
-  console.log('saving');
   const currentDocument = shareDBDoc.data;
 
   // Take a look at each file (key) previously and currently.
@@ -78,8 +81,8 @@ const save = () => {
     ...previousDocument.files,
   });
   for (const key of allKeys) {
-    const previous = previousDocument[key];
-    const current = currentDocument[key];
+    const previous = previousDocument.files[key];
+    const current = currentDocument.files[key];
 
     // If this file was neither created nor deleted...
     if (previous && current) {
@@ -119,31 +122,37 @@ const save = () => {
 //   });
 // });
 
-const throttleTimeMS = 200;
-
 let lastExecutedTime = Date.now();
+let lastChangeTimeout; // This timeout ensures the last change is saved
 
 // Function to throttle the saving
 function throttleSave() {
-  console.log('throttling');
   const now = Date.now();
-  if (now - lastExecutedTime > throttleTimeMS) {
+  const timeSinceLastExecution = now - lastExecutedTime;
+
+  if (timeSinceLastExecution > throttleTimeMS) {
     save();
     lastExecutedTime = now;
+  } else {
+    // Clear the previous timeout and set a new one to save the last change
+    clearTimeout(lastChangeTimeout);
+    lastChangeTimeout = setTimeout(() => {
+      save();
+      lastExecutedTime = now;
+    }, throttleTimeMS - timeSinceLastExecution);
   }
 }
 
 // Function to debounce the saving
 let debounceTimeout;
 function debounceSave() {
-  console.log('debouncing');
   clearTimeout(debounceTimeout);
   debounceTimeout = setTimeout(save, autoSaveDebounceTimeMS);
 }
 
 // Subscribe to listen for modifications
 shareDBDoc.subscribe(() => {
-  shareDBDoc.on('op', () => {
+  shareDBDoc.on('op', (op) => {
     if (shareDBDoc.data.isInteracting) {
       throttleSave();
     } else {