goblin-laboratory 2.2.1 → 2.2.2

package/widgets/store/middlewares.js

@@ -1,171 +1,171 @@
-//T:2019-02-27
-import _ from 'lodash';
-import helpers from 'xcraft-core-transport/lib/helpers.js';
-
-let nextGeneration = -1;
-const compensatorStates = {};
-let compensatorTimeout = null;
-
-function insertCompensators(store, action) {
-  /* Provide the compensatored states to the reducer */
-  action.compensatorStates = compensatorStates;
-
-  /* (Re)start a timeout in case of no more NEW_BACKEND_STATE are received */
-  if (compensatorTimeout) {
-    clearTimeout(compensatorTimeout);
-    compensatorTimeout = null;
-  }
-
-  if (Object.keys(compensatorStates).length) {
-    compensatorTimeout = setTimeout(() => {
-      store.dispatch({type: 'COMPENSATORS', compensatorStates});
-    }, 300);
-  }
-}
-
-const questMiddleware = (send) => (store) => (next) => (action) => {
-  if (action.type === 'QUEST') {
-    /* Provide the compensatored states to the reducer */
-    insertCompensators(store, action);
-
-    send('QUEST', action);
-  }
-  return next(action);
-};
-
-//TODO: better handling of model/service field
-const handleChange = (send, action, registry) => {
-  const model = action.model.replace('backend.', '');
-  const fields = model.split('.');
-  if (fields.length === 0) {
-    return;
-  }
-  const goblinId = fields.shift();
-  let goblin = goblinId;
-  if (goblin.indexOf('@') !== -1) {
-    goblin = goblin.split('@')[0];
-  }
-  const _xcraftIPC = action.value !== null && typeof action.value === 'object';
-  const changeFieldCommand = `${goblin}.change-${fields.join('.')}`;
-  if (registry[changeFieldCommand]) {
-    const questAction = {
-      type: 'QUEST',
-      cmd: changeFieldCommand,
-      data: {
-        id: goblinId,
-        newValue: action.value,
-        clientSessionId: action.clientSessionId,
-      },
-      _xcraftIPC,
-    };
-    send('QUEST', questAction);
-  }
-
-  const command = `${goblin}.change`;
-  if (registry[command]) {
-    const questAction = {
-      type: 'QUEST',
-      cmd: command,
-      data: {
-        id: goblinId,
-        path: fields.join('.'),
-        newValue: action.value,
-        clientSessionId: action.clientSessionId,
-      },
-      _xcraftIPC,
-    };
-    send('QUEST', questAction);
-  }
-};
-
-const handleChangeWithThrottle = _.debounce(handleChange, 200);
-
-const formMiddleware = (send) => (store) => (next) => (action) => {
-  switch (action.type) {
-    case 'FIELD-CHANGED':
-      {
-        if (action.path.startsWith('backend')) {
-          const clientSessionId = store
-            .getState()
-            .backend.get(window.labId)
-            .get('clientSessionId');
-          handleChange(
-            send,
-            {model: action.path, value: action.value, clientSessionId},
-            store.getState().commands.get('registry')
-          );
-        }
-      }
-      break;
-    case 'rrf/batch': {
-      for (const a of action.actions) {
-        if (a.type === 'rrf/change' && !a.load) {
-          handleChange(send, a, store.getState().commands.get('registry'));
-        }
-      }
-      break;
-    }
-    case 'rrf/change': {
-      if (!action.load) {
-        handleChange(send, action, store.getState().commands.get('registry'));
-      }
-      break;
-    }
-    case 'hinter/search': {
-      handleChangeWithThrottle(
-        send,
-        action,
-        store.getState().commands.get('registry')
-      );
-      break;
-    }
-  }
-  return next(action);
-};
-
-const transitMiddleware = (store) => (next) => (action) => {
-  if (
-    action.type === 'NEW_BACKEND_STATE' &&
-    action.data &&
-    action.data._xcraftMessage
-  ) {
-    action.data = helpers.fromXcraftJSON(action.data)[0].data;
-
-    const generation = action.data.get('generation');
-    if (action.data.get('_xcraftPatch')) {
-      nextGeneration++;
-
-      if (generation !== nextGeneration) {
-        /* Resend the whole state because in this case, we lose some generations. */
-        console.log(
-          `${generation - nextGeneration - 1} generation(s) lost, resend`
-        );
-        action.renderer.send('RESEND');
-      }
-    } else {
-      nextGeneration = generation;
-    }
-    action.nextGeneration = nextGeneration;
-
-    insertCompensators(store, action);
-  }
-  return next(action);
-};
-
-export default (send) => {
-  const _send = (type, action) => {
-    let data = action;
-    if (action.type === 'QUEST') {
-      data = helpers.toXcraftJSON(action)[0];
-      delete data.compensatorStates; /* only for the frontend and not serializable */
-    }
-
-    send(type, data);
-  };
-
-  return {
-    formMiddleware: formMiddleware(_send),
-    questMiddleware: questMiddleware(_send),
-    transitMiddleware,
-  };
-};
+//T:2019-02-27
+import _ from 'lodash';
+import helpers from 'xcraft-core-transport/lib/helpers.js';
+
+let nextGeneration = -1;
+const compensatorStates = {};
+let compensatorTimeout = null;
+
+function insertCompensators(store, action) {
+  /* Provide the compensatored states to the reducer */
+  action.compensatorStates = compensatorStates;
+
+  /* (Re)start a timeout in case of no more NEW_BACKEND_STATE are received */
+  if (compensatorTimeout) {
+    clearTimeout(compensatorTimeout);
+    compensatorTimeout = null;
+  }
+
+  if (Object.keys(compensatorStates).length) {
+    compensatorTimeout = setTimeout(() => {
+      store.dispatch({type: 'COMPENSATORS', compensatorStates});
+    }, 300);
+  }
+}
+
+const questMiddleware = (send) => (store) => (next) => (action) => {
+  if (action.type === 'QUEST') {
+    /* Provide the compensatored states to the reducer */
+    insertCompensators(store, action);
+
+    send('QUEST', action);
+  }
+  return next(action);
+};
+
+//TODO: better handling of model/service field
+const handleChange = (send, action, registry) => {
+  const model = action.model.replace('backend.', '');
+  const fields = model.split('.');
+  if (fields.length === 0) {
+    return;
+  }
+  const goblinId = fields.shift();
+  let goblin = goblinId;
+  if (goblin.indexOf('@') !== -1) {
+    goblin = goblin.split('@')[0];
+  }
+  const _xcraftIPC = action.value !== null && typeof action.value === 'object';
+  const changeFieldCommand = `${goblin}.change-${fields.join('.')}`;
+  if (registry[changeFieldCommand]) {
+    const questAction = {
+      type: 'QUEST',
+      cmd: changeFieldCommand,
+      data: {
+        id: goblinId,
+        newValue: action.value,
+        clientSessionId: action.clientSessionId,
+      },
+      _xcraftIPC,
+    };
+    send('QUEST', questAction);
+  }
+
+  const command = `${goblin}.change`;
+  if (registry[command]) {
+    const questAction = {
+      type: 'QUEST',
+      cmd: command,
+      data: {
+        id: goblinId,
+        path: fields.join('.'),
+        newValue: action.value,
+        clientSessionId: action.clientSessionId,
+      },
+      _xcraftIPC,
+    };
+    send('QUEST', questAction);
+  }
+};
+
+const handleChangeWithThrottle = _.debounce(handleChange, 200);
+
+const formMiddleware = (send) => (store) => (next) => (action) => {
+  switch (action.type) {
+    case 'FIELD-CHANGED':
+      {
+        if (action.path.startsWith('backend')) {
+          const clientSessionId = store
+            .getState()
+            .backend.get(window.labId)
+            .get('clientSessionId');
+          handleChange(
+            send,
+            {model: action.path, value: action.value, clientSessionId},
+            store.getState().commands.get('registry')
+          );
+        }
+      }
+      break;
+    case 'rrf/batch': {
+      for (const a of action.actions) {
+        if (a.type === 'rrf/change' && !a.load) {
+          handleChange(send, a, store.getState().commands.get('registry'));
+        }
+      }
+      break;
+    }
+    case 'rrf/change': {
+      if (!action.load) {
+        handleChange(send, action, store.getState().commands.get('registry'));
+      }
+      break;
+    }
+    case 'hinter/search': {
+      handleChangeWithThrottle(
+        send,
+        action,
+        store.getState().commands.get('registry')
+      );
+      break;
+    }
+  }
+  return next(action);
+};
+
+const transitMiddleware = (store) => (next) => (action) => {
+  if (
+    action.type === 'NEW_BACKEND_STATE' &&
+    action.data &&
+    action.data._xcraftMessage
+  ) {
+    action.data = helpers.fromXcraftJSON(action.data)[0].data;
+
+    const generation = action.data.get('generation');
+    if (action.data.get('_xcraftPatch')) {
+      nextGeneration++;
+
+      if (generation !== nextGeneration) {
+        /* Resend the whole state because in this case, we lose some generations. */
+        console.log(
+          `${generation - nextGeneration - 1} generation(s) lost, resend`
+        );
+        action.renderer.send('RESEND');
+      }
+    } else {
+      nextGeneration = generation;
+    }
+    action.nextGeneration = nextGeneration;
+
+    insertCompensators(store, action);
+  }
+  return next(action);
+};
+
+export default (send) => {
+  const _send = (type, action) => {
+    let data = action;
+    if (action.type === 'QUEST') {
+      data = helpers.toXcraftJSON(action)[0];
+      delete data.compensatorStates; /* only for the frontend and not serializable */
+    }
+
+    send(type, data);
+  };
+
+  return {
+    formMiddleware: formMiddleware(_send),
+    questMiddleware: questMiddleware(_send),
+    transitMiddleware,
+  };
+};

package/widgets/store/network-reducer.js

@@ -1,23 +1,23 @@
-import {fromJS} from 'immutable';
-
-const initialState = fromJS({
-  hordes: {},
-  hasOverlay: false,
-});
-
-export default (state = initialState, action = {}) => {
-  if (action.type === 'CONNECTION_STATUS') {
-    state = state.setIn(['hordes', action.horde], {
-      lag: action.lag,
-      delta: action.delta,
-      overlay: action.overlay,
-      message: action.message,
-      noSocket: action.noSocket,
-    });
-
-    const hasOverlay = state.get('hordes').some(({overlay}) => overlay);
-    return state.set('hasOverlay', hasOverlay);
-  }
-
-  return state;
-};
+import {fromJS} from 'immutable';
+
+const initialState = fromJS({
+  hordes: {},
+  hasOverlay: false,
+});
+
+export default (state = initialState, action = {}) => {
+  if (action.type === 'CONNECTION_STATUS') {
+    state = state.setIn(['hordes', action.horde], {
+      lag: action.lag,
+      delta: action.delta,
+      overlay: action.overlay,
+      message: action.message,
+      noSocket: action.noSocket,
+    });
+
+    const hasOverlay = state.get('hordes').some(({overlay}) => overlay);
+    return state.set('hasOverlay', hasOverlay);
+  }
+
+  return state;
+};

package/widgets/store/root-reducer.js

@@ -1,35 +1,35 @@
-import {combineReducers} from 'redux';
-import backendReducer from 'goblin-laboratory/widgets/store/backend-reducer';
-import commandsReducer from 'goblin-laboratory/widgets/store/commands-reducer';
-import networkReducer from 'goblin-laboratory/widgets/store/network-reducer';
-import widgetsReducer from 'goblin-laboratory/widgets/store/widgets-reducer';
-
-import Shredder from 'xcraft-core-shredder';
-/**
- * This action type will be dispatched when your history
- * receives a location change.
- */
-export const LOCATION_CHANGE = '@@router/LOCATION_CHANGE';
-
-const initialState = new Shredder({
-  location: null,
-}).state;
-
-export function routerReducer(state = initialState, {type, payload} = {}) {
-  if (type === LOCATION_CHANGE) {
-    return state.merge({
-      location: payload.location,
-      action: payload.action,
-    });
-  }
-
-  return state;
-}
-
-export default combineReducers({
-  router: routerReducer,
-  commands: commandsReducer,
-  network: networkReducer,
-  backend: backendReducer,
-  widgets: widgetsReducer,
-});
+import {combineReducers} from 'redux';
+import backendReducer from 'goblin-laboratory/widgets/store/backend-reducer';
+import commandsReducer from 'goblin-laboratory/widgets/store/commands-reducer';
+import networkReducer from 'goblin-laboratory/widgets/store/network-reducer';
+import widgetsReducer from 'goblin-laboratory/widgets/store/widgets-reducer';
+
+import Shredder from 'xcraft-core-shredder';
+/**
+ * This action type will be dispatched when your history
+ * receives a location change.
+ */
+export const LOCATION_CHANGE = '@@router/LOCATION_CHANGE';
+
+const initialState = new Shredder({
+  location: null,
+}).state;
+
+export function routerReducer(state = initialState, {type, payload} = {}) {
+  if (type === LOCATION_CHANGE) {
+    return state.merge({
+      location: payload.location,
+      action: payload.action,
+    });
+  }
+
+  return state;
+}
+
+export default combineReducers({
+  router: routerReducer,
+  commands: commandsReducer,
+  network: networkReducer,
+  backend: backendReducer,
+  widgets: widgetsReducer,
+});

package/widgets/store/store.js

@@ -1,40 +1,40 @@
-import {applyMiddleware, compose, createStore} from 'redux';
-import {routerMiddleware} from 'connected-react-router/immutable';
-import thunk from 'redux-thunk';
-import middlewares from './middlewares';
-
-const rootReducer = require('goblin-laboratory/widgets/store/root-reducer')
-  .default;
-
-export default function configureStore(initialState, history, send) {
-  const {transitMiddleware, formMiddleware, questMiddleware} = middlewares(
-    send
-  );
-  const routerHistory = routerMiddleware(history);
-
-  const composeEnhancers =
-    (process.env.NODE_ENV === 'development' &&
-      window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) ||
-    compose;
-
-  const finalCreateStore = composeEnhancers(
-    // Middleware you want to use in development:
-    applyMiddleware(
-      thunk,
-      routerHistory,
-      transitMiddleware,
-      questMiddleware,
-      formMiddleware
-    )
-  )(createStore);
-
-  const store = finalCreateStore(rootReducer, initialState);
-  if (module.hot) {
-    module.hot.accept('goblin-laboratory/widgets/store/root-reducer', () => {
-      const nextRootReducer = require('goblin-laboratory/widgets/store/root-reducer')
-        .default;
-      store.replaceReducer(nextRootReducer);
-    });
-  }
-  return store;
-}
+import {applyMiddleware, compose, createStore} from 'redux';
+import {routerMiddleware} from 'connected-react-router/immutable';
+import thunk from 'redux-thunk';
+import middlewares from './middlewares';
+
+const rootReducer = require('goblin-laboratory/widgets/store/root-reducer')
+  .default;
+
+export default function configureStore(initialState, history, send) {
+  const {transitMiddleware, formMiddleware, questMiddleware} = middlewares(
+    send
+  );
+  const routerHistory = routerMiddleware(history);
+
+  const composeEnhancers =
+    (process.env.NODE_ENV === 'development' &&
+      window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) ||
+    compose;
+
+  const finalCreateStore = composeEnhancers(
+    // Middleware you want to use in development:
+    applyMiddleware(
+      thunk,
+      routerHistory,
+      transitMiddleware,
+      questMiddleware,
+      formMiddleware
+    )
+  )(createStore);
+
+  const store = finalCreateStore(rootReducer, initialState);
+  if (module.hot) {
+    module.hot.accept('goblin-laboratory/widgets/store/root-reducer', () => {
+      const nextRootReducer = require('goblin-laboratory/widgets/store/root-reducer')
+        .default;
+      store.replaceReducer(nextRootReducer);
+    });
+  }
+  return store;
+}