some fixes and new network machine

ReDBrother · ReDBrother · commit 0d83b12953ec · 2021-10-15T18:13:41.000+03:00
diff --git a/services/app/assets/js/widgets/components/ExecutionOutput/AccordeonBox.jsx b/services/app/assets/js/widgets/components/ExecutionOutput/AccordeonBox.jsx
@@ -146,14 +146,20 @@ const SubMenu = ({
   );
 };
 
-const Item = ({ output }) => (
-  <div className="alert alert-secondary mb-0">
-    <pre>
-      <span className="font-weight-bold d-block">Output:</span>
-      {output}
-    </pre>
-  </div>
-);
+const Item = ({ output }) => {
+  if (output === '') {
+    return <></>;
+  }
+
+  return (
+    <div className="alert alert-secondary mb-0">
+      <pre>
+        <span className="font-weight-bold d-block">Output:</span>
+        {output}
+      </pre>
+    </div>
+  );
+};
 
 AccordeonBox.Item = Item;
 AccordeonBox.Menu = Menu;
diff --git a/services/app/assets/js/widgets/components/ExecutionOutput/Output.jsx b/services/app/assets/js/widgets/components/ExecutionOutput/Output.jsx
@@ -12,7 +12,7 @@ const Output = ({ sideOutput }) => {
   const normalizedAsserts = version === 2 ? asserts : asserts.map(elem => camelizeKeys(JSON.parse(elem)));
   return (
     <>
-      {status === 'error' || status === 'memory_leak' ? (
+      {['error', 'memory_leak', 'timeout'].includes(status) ? (
         <AccordeonBox.Item output={output} result={result} />
       ) : (
         normalizedAsserts
diff --git a/services/app/assets/js/widgets/components/ExecutionOutput/OutputTab.jsx b/services/app/assets/js/widgets/components/ExecutionOutput/OutputTab.jsx
@@ -2,8 +2,10 @@ import React from 'react';
 import color from '../../config/statusColor';
 import i18n from '../../../i18n';
 
-const getMessageLeftSide = status => {
+const getMessage = status => {
   switch (status) {
+    case 'timeout':
+      return i18n.t('We couldn\'t retrieve check results. Check your network connection or your solution for bugs. =)');
     case 'error':
       return i18n.t('You have some syntax errors');
     case 'failure':
@@ -14,24 +16,12 @@ const getMessageLeftSide = status => {
       return i18n.t('Press Check solution or press Give up');
   }
 };
-const getMessageRightSide = status => {
-  switch (status) {
-    case 'error':
-      return i18n.t('You have some syntax errors');
-    case 'failure':
-      return i18n.t('Test failed');
-    case 'ok':
-      return i18n.t('Yay! All tests passed!!111');
-    default:
-      return 'No checks were started';
-  }
-};
 
 const OutputTab = ({ sideOutput, side }) => {
   const { successCount, assertsCount, status } = sideOutput;
   const isShowMessage = status === 'failure';
   const statusColor = color[status];
-  const message = side === 'left' ? getMessageLeftSide(status) : getMessageRightSide(status);
+  const message = getMessage(status);
   const percent = (100 * successCount) / assertsCount;
 
   const assertsStatusMessage = i18n.t(
diff --git a/services/app/assets/js/widgets/containers/EditorContainer.jsx b/services/app/assets/js/widgets/containers/EditorContainer.jsx
@@ -6,6 +6,7 @@ import { useMachine } from '@xstate/react';
 import editorModes from '../config/editorModes';
 import EditorToolbar from './EditorsToolbars/EditorToolbar';
 import * as GameActions from '../middlewares/Game';
+import { actions } from '../slices';
 import * as selectors from '../selectors';
 import GameContext from './GameContext';
 import { replayerMachineStates } from '../machines/game';
@@ -35,6 +36,17 @@ const EditorContainer = ({
       userStartChecking: () => {
         dispatch(GameActions.checkGameResult());
       },
+      handleTimeoutFailureChecking: () => {
+        dispatch(actions.updateExecutionOutput({
+          userId: id,
+          status: 'timeout',
+          output: '',
+          result: {},
+          asserts: [],
+        }));
+
+        dispatch(actions.updateCheckStatus({ [id]: false }));
+      },
     },
   };
 
diff --git a/services/app/assets/js/widgets/lib/player.js b/services/app/assets/js/widgets/lib/player.js
@@ -317,6 +317,7 @@ export const resolveDiffs = (playbook, type) => {
     playbook.records,
     record => record.type === 'init',
   );
+  // record types "init"
   const initGameState = {
     type,
     players: initRecords,
diff --git a/services/app/assets/js/widgets/machines/editor.js b/services/app/assets/js/widgets/machines/editor.js
@@ -73,9 +73,9 @@ const editor = {
     checking: {
       entry: initContextByState('checking'),
       after: {
-        30000: {
+        20000: {
           target: 'idle',
-          actions: ['soundFailureChecking'],
+          actions: ['soundFailureChecking', 'handleTimeoutFailureChecking'],
         },
       },
       on: {
@@ -85,8 +85,8 @@ const editor = {
           cond: 'isUserEvent',
         },
       },
-      baned: {},
     },
+    baned: {},
   },
 };
 
@@ -97,6 +97,7 @@ export const config = {
       sound.play('check');
     },
     soundFailureChecking: () => {
+      sound.stop();
       sound.play('failure');
     },
     soundFinishedChecking: () => {
diff --git a/services/app/assets/js/widgets/machines/game.js b/services/app/assets/js/widgets/machines/game.js
@@ -71,6 +71,27 @@ const machine = {
     speedMode: speedModes.normal,
   },
   states: {
+    network: {
+      initial: 'none',
+      states: {
+        none: {
+          on: {
+            JOIN: { target: 'connected' },
+            FAILURE: { target: 'disconnected', actions: ['handleFailureJoin'] },
+          },
+        },
+        disconnected: {
+          on: {
+            JOIN: { target: 'connected', actions: ['handleReconnection'] },
+          },
+        },
+        connected: {
+          on: {
+            FAILURE: { target: 'disconnected', actions: ['handleDisconnection'] },
+          },
+        },
+      },
+    },
     game: {
       initial: 'preview',
       states: {
@@ -189,6 +210,10 @@ export const config = {
     throwError: (_ctx, { payload }) => {
       throw new Error(`Unexpected behavior (payload: ${JSON.stringify(payload)})`);
     },
+    // network actions
+    handleFailureJoin: () => {},
+    handleDisconnection: () => {},
+    handleReconnection: () => {},
 
     // game actions
     soundWin: () => {
diff --git a/services/app/assets/js/widgets/middlewares/Game.js b/services/app/assets/js/widgets/middlewares/Game.js
@@ -104,10 +104,17 @@ const initPlaybook = dispatch => data => {
 const initGameChannel = (dispatch, machine) => {
   const onJoinFailure = payload => {
     machine.send('REJECT_LOADING_GAME', { payload });
+    machine.send('FAILURE_JOIN', { payload });
     window.location.reload();
   };
 
+  channel.onError(() => {
+    machine.send('FAILURE');
+  });
+
   const onJoinSuccess = response => {
+    machine.send('JOIN', { payload: response });
+
     const {
       status,
       startsAt,
