Reset live counters on sandbox change (codesandbox#3745)

CompuIves · christianalfoni · web-flow · commit fbc9bc22fe0c · 2020-03-24T16:28:57.000+01:00
* Reset live counters on sandbox change

* Apply suggestions from code review

Co-Authored-By: Christian Alfoni &lt;christianalfoni@gmail.com&gt;

Co-authored-by: Christian Alfoni &lt;christianalfoni@gmail.com&gt;
diff --git a/packages/app/src/app/overmind/effects/live/index.ts b/packages/app/src/app/overmind/effects/live/index.ts
@@ -71,8 +71,8 @@ class Live {
     saved_code: string;
   }) => void;
 
-  private operationToElixir(ot) {
-    return ot.map(op => {
+  private operationToElixir(ot: (number | string)[]) {
+    return ot.map((op: number | string) => {
       if (typeof op === 'number') {
         if (op < 0) {
           return { d: -op };
@@ -495,6 +495,14 @@ class Live {
     });
   }
 
+  reset() {
+    this.clients.clear();
+
+    clearTimeout(this.awaitSendTimer);
+
+    this.awaitSend = null;
+  }
+
   resetClient(moduleShortid: string, revision: number) {
     this.clients.reset(moduleShortid, revision);
   }
@@ -522,10 +530,6 @@ class Live {
   createClient(moduleShortid: string, revision: number) {
     return this.clients.create(moduleShortid, revision);
   }
-
-  resetClients() {
-    this.clients.clear();
-  }
 }
 
 export default new Live();
diff --git a/packages/app/src/app/overmind/namespaces/editor/internalActions.ts b/packages/app/src/app/overmind/namespaces/editor/internalActions.ts
@@ -72,7 +72,7 @@ export const initializeLiveSandbox: AsyncAction<Sandbox> = async (
       // to join
       state.live.joinSource === 'sandbox'
     ) {
-      await actions.live.internal.disconnect();
+      actions.live.internal.disconnect();
     }
   }
 
diff --git a/packages/app/src/app/overmind/namespaces/live/internalActions.ts b/packages/app/src/app/overmind/namespaces/live/internalActions.ts
@@ -44,7 +44,7 @@ export const reset: Action = ({ state, actions, effects }) => {
   state.live.isLoading = false;
   state.live.roomInfo = null;
   state.live.joinSource = 'sandbox';
-  effects.live.resetClients();
+  effects.live.reset();
 };
 
 export const disconnect: Action = ({ effects, actions }) => {

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ export const initializeLiveSandbox: AsyncAction<Sandbox> = async (`
`72`	`72`	`// to join`
`73`	`73`	`state.live.joinSource === 'sandbox'`
`74`	`74`	`) {`
`75`		`- await actions.live.internal.disconnect();`
	`75`	`+ actions.live.internal.disconnect();`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`