Add more logging and typechecking

CompuIves · CompuIves · commit 5b6cf4a3af68 · 2020-03-26T16:00:21.000+01:00
diff --git a/packages/app/src/app/overmind/effects/live/index.ts b/packages/app/src/app/overmind/effects/live/index.ts
@@ -143,6 +143,16 @@ class Live {
       operation: this.operationToElixir(operation.toJSON()),
       revision,
     }).catch(error => {
+      logBreadcrumb({
+        type: 'ot',
+        message: `ERROR ${JSON.stringify({
+          moduleShortid,
+          revision,
+          operation,
+          message: error.message,
+        })}`,
+      });
+
       captureException(error);
       this.onOperationError({
         ...error.module_state[moduleShortid],
diff --git a/packages/app/src/app/overmind/namespaces/live/actions.ts b/packages/app/src/app/overmind/namespaces/live/actions.ts
@@ -10,6 +10,7 @@ import { filter, fork, pipe } from 'overmind';
 
 import * as internalActions from './internalActions';
 import * as liveMessage from './liveMessageOperators';
+import { IModuleStateModule } from './types';
 
 export const internal = internalActions;
 
@@ -27,14 +28,14 @@ export const signInToRoom: AsyncAction<{
 
 export const onOperationError: Action<{
   moduleShortid: string;
-  code: string;
-  revision: number;
-  saved_code: string;
-}> = ({ state, effects }, { moduleShortid, revision, code, saved_code }) => {
+} & IModuleStateModule> = (
+  { state, effects },
+  { moduleShortid, revision, code, saved_code }
+) => {
   if (!state.editor.currentSandbox) {
     return;
   }
-  effects.live.resetClient(moduleShortid, revision);
+  effects.live.resetClient(moduleShortid, revision || 0);
   const module = state.editor.currentSandbox.modules.find(
     moduleItem => moduleItem.shortid === moduleShortid
   );
diff --git a/packages/app/src/app/overmind/namespaces/live/internalActions.ts b/packages/app/src/app/overmind/namespaces/live/internalActions.ts
@@ -7,6 +7,7 @@ import { Action, AsyncAction } from 'app/overmind';
 import { json } from 'overmind';
 
 import { getSavedCode } from '../../utils/sandbox';
+import { IModuleStateModule } from './types';
 
 export const clearUserSelections: Action<string | null> = (
   { state, effects },
@@ -89,7 +90,11 @@ export const initialize: AsyncAction<string, Sandbox | null> = async (
   return null;
 };
 
-export const initializeModuleState: Action<any> = (
+interface IModuleState {
+  [moduleId: string]: IModuleStateModule;
+}
+
+export const initializeModuleState: Action<IModuleState> = (
   { state, actions, effects },
   moduleState
 ) => {
@@ -117,8 +122,15 @@ export const initializeModuleState: Action<any> = (
         moduleInfo.saved_code !== module.savedCode;
 
       if (moduleChanged) {
-        module.savedCode = moduleInfo.saved_code;
-        module.code = moduleInfo.code;
+        if (
+          moduleInfo.saved_code === null &&
+          typeof moduleInfo.saved_code === 'string'
+        ) {
+          module.savedCode = moduleInfo.saved_code;
+        }
+        if (typeof moduleInfo.code === 'string') {
+          module.code = moduleInfo.code;
+        }
 
         if (savedCodeChanged) {
           effects.vscode.sandboxFsSync.writeFile(
diff --git a/packages/app/src/app/overmind/namespaces/live/types.ts b/packages/app/src/app/overmind/namespaces/live/types.ts
@@ -0,0 +1,6 @@
+export interface IModuleStateModule {
+  synced?: boolean;
+  revision?: number;
+  code?: string;
+  saved_code?: string | null;
+}
