Implement action fitering

Author: zalmoxisus

src/browser/extension/inject/pageScript.js

@@ -9,10 +9,11 @@ window.devToolsExtension = function(next) {
   let shouldInit = true;
   let actionsCount = 0;
 
-  function relay(type, state, action) {
+  function relay(type, state, action, nextActionId) {
     const message = {
       payload: state,
       action: action || '',
+      nextActionId: nextActionId || '',
       type: type,
       source: 'redux-page',
       init: shouldInit
@@ -59,23 +60,31 @@ window.devToolsExtension = function(next) {
     );
   }
 
+  function addFilter(state) {
+    if (window.devToolsOptions.filter) {
+      const { whitelist, blacklist } = window.devToolsOptions;
+      state.filter = { whitelist, blacklist };
+    }
+  }
+
   function isLimit() {
     if (window.devToolsOptions.limit && actionsCount > window.devToolsOptions.limit) {
       store.liftedStore.dispatch({type: 'COMMIT', timestamp: Date.now()});
       return true;
     }
-    actionsCount++;
     return false;
   }
 
   function subscriber(state = {}, action) {
     if (action && action.type) {
       setTimeout(() => {
         if (action.type === 'PERFORM_ACTION') {
+          actionsCount++;
           if (isLimit() || isFiltered(action.action)) return state;
-          relay('ACTION', store.getState(), action);
+          relay('ACTION', store.getState(), action, actionsCount);
         } else {
-          const liftedState = store.liftedStore.getState();
+          let liftedState = store.liftedStore.getState();
+          addFilter(liftedState);
           relay('STATE', liftedState);
           actionsCount = liftedState.nextActionId;
         }

src/browser/extension/utils/updateState.js

@@ -1,10 +1,11 @@
 import parseJSON from '../utils/parseJSON';
 
-function recompute(previousLiftedState, storeState, action) {
-  let liftedState = { ...previousLiftedState };
-  liftedState.stagedActionIds.push(liftedState.nextActionId);
-  liftedState.actionsById[liftedState.nextActionId] = action;
-  liftedState.nextActionId++;
+function recompute(previousLiftedState, storeState, action, nextActionId) {
+  const actionId = nextActionId - 1;
+  const liftedState = { ...previousLiftedState };
+  liftedState.stagedActionIds.push(actionId);
+  liftedState.actionsById[actionId] = action;
+  liftedState.nextActionId = nextActionId;
   liftedState.computedStates.push({ state: storeState });
   liftedState.currentStateIndex++;
   return liftedState;
@@ -16,7 +17,7 @@ export default function updateState(store, request) {
 
   switch (request.type) {
     case 'ACTION':
-      const newState = recompute(store.liftedStore.getState(), payload, request.action);
+      const newState = recompute(store.liftedStore.getState(), payload, request.action, request.nextActionId);
       store.liftedStore.setState(newState);
       return newState;
     case 'STATE':