Deduplicate handling operation errors

Author: CompuIves

packages/app/src/app/overmind/effects/live/index.ts

@@ -31,9 +31,7 @@ type Options = {
   isLiveBlockerExperiement(): boolean;
   onOperationError(payload: {
     moduleShortid: string;
-    code: string;
-    revision: number;
-    saved_code: string;
+    moduleInfo: IModuleStateModule;
   }): void;
 };
 
@@ -77,9 +75,7 @@ class Live {
   private provideJwtToken: () => string;
   private onOperationError: (payload: {
     moduleShortid: string;
-    code: string;
-    revision: number;
-    saved_code: string;
+    moduleInfo: IModuleStateModule;
   }) => void;
 
   private operationToElixir(ot: (number | string)[]) {
@@ -167,7 +163,7 @@ class Live {
       captureException(error);
       if (error.module_state) {
         this.onOperationError({
-          ...error.module_state[moduleShortid],
+          moduleInfo: error.module_state[moduleShortid],
           moduleShortid,
         });
       }

packages/app/src/app/overmind/namespaces/live/actions.ts

@@ -29,30 +29,12 @@ export const signInToRoom: AsyncAction<{
 
 export const onOperationError: Action<{
   moduleShortid: string;
-} & IModuleStateModule> = (
-  { state, effects },
-  { moduleShortid, revision, code, saved_code }
-) => {
-  if (!state.editor.currentSandbox) {
-    return;
-  }
-  effects.live.resetClient(moduleShortid, revision || 0);
-  const module = state.editor.currentSandbox.modules.find(
-    moduleItem => moduleItem.shortid === moduleShortid
-  );
-
-  if (!module) {
-    return;
-  }
-
-  if (code !== undefined) {
-    module.code = code;
-  }
-  if (saved_code !== undefined) {
-    module.savedCode = saved_code;
-  }
-
-  effects.vscode.setModuleCode(module);
+  moduleInfo: IModuleStateModule;
+}> = ({ actions }, { moduleShortid, moduleInfo }) => {
+  actions.live.internal.initializeModuleFromState({
+    moduleShortid,
+    moduleInfo,
+  });
 };
 
 export const roomJoined: AsyncAction<{

packages/app/src/app/overmind/namespaces/live/internalActions.ts

@@ -104,6 +104,54 @@ interface IModuleState {
   [moduleId: string]: IModuleStateModule;
 }
 
+export const initializeModuleFromState: Action<{
+  moduleShortid: string;
+  moduleInfo: IModuleStateModule;
+}> = ({ state, effects }, { moduleShortid, moduleInfo }) => {
+  const sandbox = state.editor.currentSandbox;
+  if (!sandbox) {
+    return;
+  }
+
+  // Module has not been saved, so is different
+  const module = sandbox.modules.find(m => m.shortid === moduleShortid);
+
+  if (module) {
+    effects.live.createClient(moduleShortid, moduleInfo.revision || 0);
+    if (!('code' in moduleInfo)) {
+      return;
+    }
+
+    const savedCodeChanged =
+      getSavedCode(moduleInfo.code, moduleInfo.saved_code) !==
+      getSavedCode(module.code, module.savedCode);
+    const moduleChanged =
+      moduleInfo.code !== module.code ||
+      moduleInfo.saved_code !== module.savedCode;
+
+    if (moduleChanged) {
+      if (moduleInfo.saved_code !== undefined) {
+        module.savedCode = moduleInfo.saved_code;
+      }
+      if (moduleInfo.code !== undefined) {
+        module.code = moduleInfo.code;
+      }
+
+      if (savedCodeChanged) {
+        effects.vscode.sandboxFsSync.writeFile(
+          state.editor.modulesByPath,
+          module
+        );
+      }
+      if (moduleInfo.synced) {
+        effects.vscode.syncModule(module);
+      } else {
+        effects.vscode.setModuleCode(module);
+      }
+    }
+  }
+};
+
 export const initializeModuleState: Action<IModuleState> = (
   { state, actions, effects },
   moduleState
@@ -118,44 +166,11 @@ export const initializeModuleState: Action<IModuleState> = (
   });
   Object.keys(moduleState).forEach(moduleShortid => {
     const moduleInfo = moduleState[moduleShortid];
-    effects.live.createClient(moduleShortid, moduleInfo.revision || 0);
 
-    // Module has not been saved, so is different
-    const module = sandbox.modules.find(m => m.shortid === moduleShortid);
-
-    if (module) {
-      if (!('code' in moduleInfo)) {
-        return;
-      }
-
-      const savedCodeChanged =
-        getSavedCode(moduleInfo.code, moduleInfo.saved_code) !==
-        getSavedCode(module.code, module.savedCode);
-      const moduleChanged =
-        moduleInfo.code !== module.code ||
-        moduleInfo.saved_code !== module.savedCode;
-
-      if (moduleChanged) {
-        if (moduleInfo.saved_code !== undefined) {
-          module.savedCode = moduleInfo.saved_code;
-        }
-        if (moduleInfo.code !== undefined) {
-          module.code = moduleInfo.code;
-        }
-
-        if (savedCodeChanged) {
-          effects.vscode.sandboxFsSync.writeFile(
-            state.editor.modulesByPath,
-            module
-          );
-        }
-        if (moduleInfo.synced) {
-          effects.vscode.syncModule(module);
-        } else {
-          effects.vscode.setModuleCode(module);
-        }
-      }
-    }
+    actions.live.internal.initializeModuleFromState({
+      moduleShortid,
+      moduleInfo,
+    });
   });
   // TODO: enable once we know exactly when we want to recover
   // actions.files.internal.recoverFiles();