Reconnecting OT transforms

Author: Ives van Hoorne

packages/app/src/app/store/modules/live/actions.js

@@ -442,3 +442,7 @@ export function removeEditorFromState({ props, state }) {
 
   state.set('live.roomInfo.editorIds', newEditors);
 }
+
+export function resendOutboundOTTransforms({ ot }) {
+  ot.serverReconnect();
+}

packages/app/src/app/store/modules/live/sequences.js

@@ -2,7 +2,7 @@ import { unset, set, push, when, equals } from 'cerebral/operators';
 import { state, props } from 'cerebral/tags';
 
 import * as factories from '../../factories';
-import { setSandbox, openModal } from '../../sequences';
+import { setSandbox, openModal, resetLive } from '../../sequences';
 
 import { changeCode } from '../editor/sequences';
 import { setModuleSaved } from '../editor/actions';
@@ -48,6 +48,11 @@ export const handleMessage = [
     join: [
       set(props`message`, 'Connected to Live!'),
       factories.addNotification(props`message`, 'success'),
+      when(state`live.reconnecting`),
+      {
+        true: [actions.resendOutboundOTTransforms],
+        false: [],
+      },
       set(state`live.reconnecting`, false),
     ],
     'user:entered': [
@@ -240,6 +245,7 @@ export const handleMessage = [
       actions.disconnect,
       set(props`modal`, 'liveSessionEnded'),
       openModal,
+      resetLive,
     ],
     otherwise: [],
   },

packages/app/src/app/store/providers/Live.js

@@ -38,8 +38,8 @@ export default Provider({
   listen(signalPath) {
     const signal = this.context.controller.getSignal(signalPath);
     channel.onMessage = (event: any, data: any) => {
-      const alteredEvent =
-        data == null && event === 'phx_err' ? 'connection-loss' : event;
+      const disconnected = data == null && event === 'phx_error';
+      const alteredEvent = disconnected ? 'connection-loss' : event;
 
       signal({ event: alteredEvent, data: data == null ? {} : data });
 

packages/app/src/app/store/providers/OT/index.js

@@ -26,6 +26,11 @@ export default Provider({
       TextOperation.fromJSON(operation)
     );
   },
+  serverReconnect() {
+    modules.forEach(client => {
+      client.serverReconnect();
+    });
+  },
   serverAck(moduleShortid: string) {
     getClient(moduleShortid, this.context).serverAck();
   },