Acknowledge operations from the response from the server

CompuIves · CompuIves · commit 691a33e786b8 · 2020-02-28T15:35:15.000+01:00
diff --git a/packages/app/src/app/overmind/effects/live/clients.ts b/packages/app/src/app/overmind/effects/live/clients.ts
@@ -4,7 +4,7 @@ export type SendOperation = (
   moduleShortid: string,
   revision: string,
   operation: any
-) => void;
+) => Promise<unknown>;
 
 export type ApplyOperation = (moduleShortid: string, operation: any) => void;
 
@@ -24,13 +24,13 @@ function operationToElixir(ot) {
 
 class CodeSandboxOTClient extends Client {
   moduleShortid: string;
-  onSendOperation: (revision: string, operation: any) => void;
+  onSendOperation: (revision: string, operation: any) => Promise<unknown>;
   onApplyOperation: (operation: any) => void;
 
   constructor(
     revision: number,
     moduleShortid: string,
-    onSendOperation: (revision: string, operation: any) => void,
+    onSendOperation: (revision: string, operation: any) => Promise<unknown>,
     onApplyOperation: (operation: any) => void
   ) {
     super(revision);
@@ -40,7 +40,11 @@ class CodeSandboxOTClient extends Client {
   }
 
   sendOperation(revision, operation) {
-    this.onSendOperation(revision, operationToElixir(operation.toJSON()));
+    this.onSendOperation(revision, operationToElixir(operation.toJSON())).then(
+      () => {
+        this.serverAck();
+      }
+    );
   }
 
   applyOperation(operation) {
@@ -96,9 +100,8 @@ export default (
       const client = new CodeSandboxOTClient(
         initialRevision,
         moduleShortid,
-        (revision, operation) => {
-          sendOperation(moduleShortid, revision, operation);
-        },
+        (revision, operation) =>
+          sendOperation(moduleShortid, revision, operation),
         operation => {
           applyOperation(moduleShortid, operation);
         }
diff --git a/packages/app/src/app/overmind/effects/live/index.ts b/packages/app/src/app/overmind/effects/live/index.ts
@@ -44,13 +44,12 @@ export default new (class Live {
     const live = this;
 
     clients = clientsFactory(
-      (moduleShortid, revision, operation) => {
+      (moduleShortid, revision, operation) =>
         live.send('operation', {
           moduleShortid,
           operation,
           revision,
-        });
-      },
+        }),
       (moduleShortid, operation) => {
         options.onApplyOperation({
           moduleShortid,
diff --git a/packages/app/src/app/overmind/namespaces/live/liveMessageOperators.ts b/packages/app/src/app/overmind/namespaces/live/liveMessageOperators.ts
@@ -481,7 +481,7 @@ export const onOperation: Operator<LiveMessage<{
     return;
   }
   if (_isOwnMessage) {
-    effects.live.serverAck(data.module_shortid);
+    // Do nothing since we already sent this operation
   } else {
     try {
       effects.live.applyServer(data.module_shortid, data.operation);

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ export const onOperation: Operator<LiveMessage<{`
`481`	`481`	`return;`
`482`	`482`	`}`
`483`	`483`	`if (_isOwnMessage) {`
`484`		`- effects.live.serverAck(data.module_shortid);`
	`484`	`+ // Do nothing since we already sent this operation`
`485`	`485`	`} else {`
`486`	`486`	`try {`
`487`	`487`	`effects.live.applyServer(data.module_shortid, data.operation);`