whistle 2.8.10 → 2.9.0

package/assets/menu.html

@@ -53,51 +53,103 @@
       window.addEventListener('load', delayOnLoad);
     } catch (e) {}
     var toast = {};
+    var addNetworkListener = function(l) {
+      if (typeof l === 'function' && networkListeners.indexOf(l) === -1) {
+        networkListeners.push(l);
+      }
+    };
+    var removeNetworkListener = function(l) {
+      l = networkListeners.indexOf(l);
+      if (l !== -1) {
+        networkListeners.splice(l, 1);
+      }
+    };
+    var removeAllNetworkListeners = function() {
+      networkListeners = [];
+    };
+    var addRulesListener = function(l) {
+      if (typeof l === 'function' && rulesListeners.indexOf(l) === -1) {
+        rulesListeners.push(l);
+      }
+    };
+    var removeRulesListener = function(l) {
+      l = rulesListeners.indexOf(l);
+      if (l !== -1) {
+        rulesListeners.splice(l, 1);
+      }
+    };
+    var removeAllRulesListeners = function() {
+      rulesListeners = [];
+    };
+    var addValuesListener = function(l) {
+      if (typeof l === 'function' && valuesListeners.indexOf(l) === -1) {
+        valuesListeners.push(l);
+      }
+    };
+    var removeValuesListener = function(l) {
+      l = valuesListeners.indexOf(l);
+      if (l !== -1) {
+        valuesListeners.splice(l, 1);
+      }
+    };
+    var removeAllValuesListeners = function() {
+      valuesListeners = [];
+    };
+
+    function on(type, l) {
+      if (typeof l !== 'function') {
+        return;
+      }
+      switch(type) {
+        case 'network':
+          return addNetworkListener(l);
+        case 'rules':
+          return addRulesListener(l);
+        case 'values':
+          return addValuesListener(l);
+      }
+    }
+
+    function off(type, l) {
+      switch(type) {
+        case 'network':
+          if (l) {
+            removeNetworkListener(l);
+          } else {
+            removeAllNetworkListeners();
+          }
+          return;
+        case 'rules':
+          if (l) {
+            removeRulesListener(l);
+          } else {
+            removeAllRulesListeners();
+          }
+          return;
+        case 'values':
+          if (l) {
+            removeValuesListener(l);
+          } else {
+            removeAllValuesListeners();
+          }
+          return;
+      }
+    }
+    
     var whistleBridge = {
       config: config,
       toast: toast,
-      addNetworkListener: function(l) {
-        if (typeof l === 'function' && networkListeners.indexOf(l) === -1) {
-          networkListeners.push(l);
-        }
-      },
-      removeNetworkListener: function(l) {
-        l = networkListeners.indexOf(l);
-        if (l !== -1) {
-          networkListeners.splice(l, 1);
-        }
-      },
-      removeAllNetworkListeners: function() {
-        networkListeners = [];
-      },
-      addRulesListener: function(l) {
-        if (typeof l === 'function' && rulesListeners.indexOf(l) === -1) {
-          rulesListeners.push(l);
-        }
-      },
-      removeRulesListener: function(l) {
-        l = rulesListeners.indexOf(l);
-        if (l !== -1) {
-          rulesListeners.splice(l, 1);
-        }
-      },
-      removeAllRulesListeners: function() {
-        rulesListeners = [];
-      },
-      addValuesListener: function(l) {
-        if (typeof l === 'function' && valuesListeners.indexOf(l) === -1) {
-          valuesListeners.push(l);
-        }
-      },
-      removeValuesListener: function(l) {
-        l = valuesListeners.indexOf(l);
-        if (l !== -1) {
-          valuesListeners.splice(l, 1);
-        }
-      },
-      removeAllValuesListeners: function() {
-        valuesListeners = [];
-      }
+      on: on,
+      off: off,
+      addNetworkListener: addNetworkListener,
+      removeNetworkListener: removeNetworkListener,
+      removeAllNetworkListeners: removeAllNetworkListeners,
+      addRulesListener: addRulesListener,
+      removeRulesListener: removeRulesListener,
+      removeAllRulesListeners: removeAllRulesListeners,
+      addValuesListener: addValuesListener,
+      removeValuesListener: removeValuesListener,
+      removeAllValuesListeners: removeAllValuesListeners
     };
     try {
       window.initWhistleBridge = function(options) {
@@ -105,6 +157,8 @@
         Object.keys(options.msgBox).forEach(function(name) {
           toast[name] = options.msgBox[name];
         });
+        whistleBridge.pageId = options.pageId;
+        whistleBridge.compose = options.compose;
         whistleBridge.decodeBase64 = options.decodeBase64;
         whistleBridge.importSessions = options.importSessions;
         whistleBridge.request = options.request;

package/assets/tab.html

@@ -0,0 +1,303 @@
+<script>
+  ;(function() {
+    var config = window.whistleInspectorConfig;
+    var activeList = [];
+    var stateList = [1];
+    var getActiveSession;
+    var getSelectedSessionList;
+    var listenersList = [];
+    var frameChangeListeners = [];
+    var composeListeners = [];
+    var tabChangeListeners = [];
+    var curFrames = null;
+    var firstFrame;
+    var lastFrame;
+    var selected = true;
+    var composerItem;
+    var frameTimer;
+
+    function initState(flag) {
+      stateList[1] = flag;
+      stateList[2] = flag;
+      stateList[3] = flag;
+    }
+
+    function updateState(item) {
+      if (!item || item.lost || item.endTime) {
+        return  initState(1);
+      }
+      initState();
+      if (item.responseTime) {
+        stateList[2] = 1;
+      }
+      if (item.requestTime) {
+        stateList[1] = 1;
+      }
+    }
+
+    function emitTabChange(_selected) {
+      if (selected !== _selected) {
+        selected = _selected;
+        tabChangeListeners.forEach(function(l) {
+          l(selected);
+        });
+      }
+    }
+
+    function emitFrameChange() {
+      var curItem = getActiveSession();
+      var frames = curItem && curItem.frames || null;
+      var hasChanged;
+      var listenersLen = frameChangeListeners.length;
+      if (curFrames !== frames) {
+        curFrames = frames;
+        hasChanged = listenersLen;
+      } else if (curFrames && listenersLen) {
+        var curLen = curFrames.length;
+        var len = frames.length;
+        hasChanged = curLen !== len || firstFrame != frames[0] || lastFrame != frames[len - 1];
+      }
+      if (hasChanged) {
+        if (curFrames) {
+          firstFrame = curFrames[0];
+          lastFrame = curFrames[curFrames.length - 1];
+        } else {
+          firstFrame = lastFrame = undefined;
+        }
+        frameChangeListeners.forEach(function(l) {
+          l(curFrames);
+        });
+      }
+      frameTimer = setTimeout(emitFrameChange, 1000);
+    }
+
+    function emitListeners(item, state) {
+      if (stateList[state] && item !== activeList[state]) {
+        activeList[state] = item;
+        var listeners = listenersList[state];
+        listeners.forEach(function(l) {
+          l(item);
+        });
+      }
+    }
+
+    function emitAll(item, hide, comItem) {
+      if (comItem) {
+        composerItem = comItem;
+        composeListeners.forEach(function(l) {
+          l(comItem);
+        });
+        return;
+      }
+      if (frameTimer) {
+        clearTimeout(frameTimer);
+        frameTimer = null;
+      }
+      if (hide) {
+        return emitTabChange(false);
+      }
+      emitTabChange(true);
+      updateState(item);
+      emitListeners(item, 0);
+      emitListeners(item, 1);
+      emitListeners(item, 2);
+      emitListeners(item, 3);
+      emitFrameChange();
+    }
+
+    window.__pushWhistle5b6af7b9884e1165SessionActive__ = emitAll;
+
+    function getAddEventHandler(state) {
+      state = state || 0;
+      listenersList[state] = [];
+      return function(l) {
+        if (typeof l !== 'function') {
+          return;
+        }
+        var item = getActiveSession();
+        emitAll(item);
+        activeList[state] = item;
+        if (stateList[state]) {
+          l(item);
+        }
+        var listeners = listenersList[state];
+        listeners.indexOf(l) === -1 && listeners.push(l);
+      };
+    }
+
+    function getRemoveEventListener(state) {
+      state = state || 0;
+      return function(l) {
+        var listeners = listenersList[state];
+        var index = listeners.indexOf(l);
+        index !== -1 && listeners.splice(index, 1);
+      };
+    }
+
+    function getRemoveEventListeners(state) {
+      state = state || 0;
+      return function(l) {
+        listenersList[state] = [];
+      };
+    }
+
+    var toast = {};
+    var addSessionActiveListener = getAddEventHandler();
+    var removeSessionActiveListener = getRemoveEventListener();
+    var removeSessionActiveListeners = getRemoveEventListeners();
+    var addSessionRequestListener = getAddEventHandler(1);
+    var removeSessionRequestListener = getRemoveEventListener(1);
+    var removeSessionRequestListeners = getRemoveEventListeners(1);
+    var addSessionResponseListener = getAddEventHandler(2);
+    var removeSessionResponseListener = getRemoveEventListener(2);
+    var removeSessionResponseListeners = getRemoveEventListeners(2);
+    var addSessionCompleteListener = getAddEventHandler(3);
+    var removeSessionCompleteListener = getRemoveEventListener(3);
+    var removeSessionCompleteListeners = getRemoveEventListeners(3);
+  
+    function on(type, l) {
+      if (typeof l !== 'function') {
+        return;
+      }
+      switch(type) {
+        case 'sessionActive':
+          return addSessionActiveListener(l);
+        case 'sessionRequest':
+          return addSessionRequestListener(l);
+        case 'sessionResponse':
+          return addSessionResponseListener(l);
+        case 'sessionComplete':
+          return addSessionCompleteListener(l);
+        case 'tabChange':
+          if (tabChangeListeners.indexOf(l) === -1) {
+            tabChangeListeners.push(l);
+          }
+          return;
+        case 'frameChange':
+          if (frameChangeListeners.indexOf(l) === -1) {
+            frameChangeListeners.push(l);
+          }
+          return;
+        case 'compose':
+          if (composeListeners.indexOf(l) === -1) {
+            composeListeners.push(l);
+          }
+           composerItem && l(composerItem);
+          return;
+      }
+    }
+
+    function off(type, l) {
+      switch(type) {
+        case 'sessionActive':
+          if (l) {
+            removeSessionActiveListener(l);
+          } else {
+            removeSessionActiveListeners();
+          }
+          return;
+        case 'sessionRequest':
+          if (l) {
+            removeSessionRequestListener(l);
+          } else {
+            removeSessionRequestListeners();
+          }
+          return;
+        case 'sessionResponse':
+          if (l) {
+            removeSessionResponseListener(l);
+          } else {
+            removeSessionResponseListeners();
+          }
+          return;
+        case 'sessionComplete':
+          if (l) {
+            removeSessionCompleteListener(l);
+          } else {
+            removeSessionCompleteListeners();
+          }
+          return;
+        case 'tabChange':
+          if (l) {
+            var index = tabChangeListeners.indexOf(l);
+            if (index !== -1) {
+              tabChangeListeners.splice(index, 1);
+            }
+          } else {
+            tabChangeListeners = [];
+          }
+          return;
+        case 'frameChange':
+          if (l) {
+            var index = frameChangeListeners.indexOf(l);
+            if (index !== -1) {
+              frameChangeListeners.splice(index, 1);
+            }
+          } else {
+            frameChangeListeners = [];
+          }
+          return;
+        case 'compose':
+          if (l) {
+            var index = composeListeners.indexOf(l);
+            if (index !== -1) {
+              composeListeners.splice(index, 1);
+            }
+          } else {
+            composeListeners = [];
+          }
+          return;
+      }
+    }
+
+    var whistleBridge = {
+      config: config,
+      toast: toast,
+      on: on,
+      off: off,
+      isSelected: function() {
+        return selected;
+      },
+      getFrames: function() {
+        return curFrames;
+      },
+      addSessionActiveListener: addSessionActiveListener,
+      removeSessionActiveListener: removeSessionActiveListener,
+      removeSessionActiveListeners: removeSessionActiveListeners,
+      addSessionRequestListener: addSessionRequestListener,
+      removeSessionRequestListener: removeSessionRequestListener,
+      removeSessionRequestListeners: removeSessionRequestListeners,
+      addSessionResponseListener: addSessionResponseListener,
+      removeSessionResponseListener: removeSessionResponseListener,
+      removeSessionResponseListeners: removeSessionResponseListeners,
+      addSessionCompleteListener: addSessionCompleteListener,
+      removeSessionCompleteListener: removeSessionCompleteListener,
+      removeSessionCompleteListeners: removeSessionCompleteListeners
+    };
+
+    try {
+      window.parent.onWhistleInspectorCustomTabReady(function(options) {
+        Object.keys(options.msgBox).forEach(function(name) {
+          toast[name] = options.msgBox[name];
+        });
+        getActiveSession = options.getActiveSession;
+        getSelectedSessionList = options.getSelectedSessionList;
+        whistleBridge.pageId = options.pageId;
+        whistleBridge.compose = options.compose;
+        whistleBridge.decodeBase64 = options.decodeBase64;
+        whistleBridge.importSessions = options.importSessions;
+        whistleBridge.request = options.request;
+        whistleBridge.createRequest = options.createRequest;
+        whistleBridge.showModal = options.showModal;
+        whistleBridge.getSelectedSessionList = getSelectedSessionList;
+        whistleBridge.getActiveSession = whistleBridge.getSession = whistleBridge.getSelectedSession = getActiveSession;
+        whistleBridge.importRules = options.importRules;
+        whistleBridge.importValues = options.importValues;
+        whistleBridge.getServerInfo = options.getServerInfo;
+        whistleBridge.alert = options.alert;
+        whistleBridge.confirm = options.confirm;
+      });
+    } catch (e) {}
+    window.whistleBridge = whistleBridge;
+  })();
+</script>

package/biz/webui/cgi-bin/composer.js

@@ -1,7 +1,9 @@
 var http = require('http');
 var gzip = require('zlib').gzip;
 var tls = require('tls');
+var crypto = require('crypto');
 var Buffer = require('safe-buffer').Buffer;
+var common = require('../../../lib/util/common');
 var config = require('../../../lib/config');
 var util = require('../../../lib/util');
 var zlib = require('../../../lib/util/zlib');
@@ -14,17 +16,19 @@ var getRawHeaders = hparser.getRawHeaders;
 var getRawHeaderNames = hparser.getRawHeaderNames;
 var parseReq = hparser.parse;
 var MAX_LENGTH = 1024 * 512;
+var TLS_PROTOS = 'https:,wss:,tls:'.split(',');
 var PROXY_OPTS = {
   host: config.host || '127.0.0.1',
   port: config.port
 };
 
 function parseHeaders(headers, rawHeaderNames, clientId) {
-  if (!headers || typeof headers != 'string') {
+  var type = headers && typeof headers;
+  if (type != 'string' && type !== 'object') {
     return {};
   }
 
-  var reqHeaders = util.parseRawJson(headers);
+  var reqHeaders = type === 'object' ? headers : util.parseRawJson(headers);
   if (reqHeaders) {
     reqHeaders = util.lowerCaseify(reqHeaders, rawHeaderNames);
   } else {
@@ -36,22 +40,6 @@ function parseHeaders(headers, rawHeaderNames, clientId) {
   return reqHeaders;
 }
 
-function isWebSocket(options) {
-  var p = options.protocol;
-  return p === 'ws:' || p === 'wss:' || options.method === 'UPGRADE';
-}
-
-var crypto = require('crypto');
-var CONNECT_PROTOS = 'connect:,socket:,tunnel:,conn:,tls:,tcp:'.split(',');
-var TLS_PROTOS = 'https:,wss:,tls:'.split(',');
-function isConnect(options) {
-  if (options.method === 'CONNECT') {
-    return true;
-  }
-  var p = options.protocol;
-  return CONNECT_PROTOS.indexOf(p) !== -1;
-}
-
 function drain(socket) {
   socket.on('error', util.noop);
   socket.on('data', util.noop);
@@ -227,10 +215,9 @@ module.exports = function(req, res) {
   headers[config.CLIENT_PORT_HEAD] = util.getClientPort(req);
   options.method = util.getMethod(req.body.method);
 
-  var isConn = isConnect(options);
-  var isWs = !isConn && (isWebSocket(options)
-    || (/^\s*upgrade\s*$/i.test(headers.connection) && /^\s*websocket\s*$/i.test(headers.upgrade)));
-  var useH2 = req.body.useH2;
+  var isConn = common.isConnect(options);
+  var isWs = !isConn && common.isWebSocket(options, headers);
+  var useH2 = req.body.useH2 || req.body.isH2;
   req.body.useH2 = false;
   if (isWs) {
     headers.connection = 'Upgrade';

package/biz/webui/htdocs/editor.html

@@ -16,7 +16,7 @@ html, body, .main {padding: 0; margin: 0; height: 100%; overflow: hidden;}
 textarea {resize: none; display: block; padding: 6px; font-size: 12px; width: 100%; height: 100%; border: none; box-sizing: border-box; font-family: consolas, monospace;}
 </style>
 </head>
-<body>
+<body style="overscroll-behavior-x: none;">
 <div class="main">
 	<textarea id="editor"></textarea>
 </div>

package/biz/webui/htdocs/index.html

@@ -6,8 +6,8 @@
 <link rel="shortcut icon" href="img/favicon.ico" />
 <title>Whistle Web Debugger</title>
 </head>
-<body>
+<body style="overscroll-behavior-x: none;">
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.8.10"></script>
+<script src="js/index.js?v=2.9.0"></script>
 </body>
 </html>