show secure icon in panel heading when secure

and "missing" object property icons

Author: bkdotcom

readme.md

@@ -7,14 +7,13 @@ Debug/log information is sent completely "out-of-bounds" via websockets.  Since
 
 All [PHPDebugConsole](https://github.com/bkdotcom/PHPDebugConsole) methods are supported.
 
-using a combination of [PHPDebugConsole](https://github.com/bkdotcom/PHPDebugConsole) and [WampPublisher](https://github.com/bkdotcom/WampPublisher)
 
 ### Overview
 There are 3 parts to this logging solution.
 
  * This client.  Think of this as an undocked (separate-windowed) browser console.  Instead of viewing javascript info, it's PHP stuff<sup>†</sup>.
  * The PHP application thats "publishing" log messages (via [PHPDebugConsole](https://github.com/bkdotcom/PHPDebugConsole))
- * A WAMP (websockets protocol) router that serves as a middle man between this client and the PHP application
+ * [A WAMP (websockets protocol) router](http://wamp-proto.org/implementations/#routers) that serves as a middle man between this client and the PHP application
 
 All 3 components *can* be be running on the same server/environment, or be on 3 separate servers, it doesn't matter.  I imagine in most cases, this client and the router will be installed on a local dev environment... aka your laptop.
 
@@ -23,7 +22,7 @@ All 3 components *can* be be running on the same server/environment, or be on 3
 
 ### Installation
 
-Download Composer (if not already installed) [more info](https://getcomposer.org/doc/00-intro.md#downloading-the-composer-executable)  
+Download Composer (if not already installed) [more info](https://getcomposer.org/doc/00-intro.md#downloading-the-composer-executable)
 `$ curl -sS https://getcomposer.org/installer | php`
 
 **create a project directory in your webroot**
@@ -35,12 +34,12 @@ Download Composer (if not already installed) [more info](https://getcomposer.org
 `$ php composer.phar require bdk/debug-wamp-client`
 
 **Install a WAMP router** (if you don't already have one)  
-If you don't already have a WAMP router up and running, you might as well install a PHP-based one here in the same folder *(but again, it could be installed anywhere)*
-One client+router install can support many PHPDebugConsole projects  
+If you don't already have a WAMP router up and running, you might as well install a PHP-based one here in the same folder *(but again, it could be installed anywhere, or be a node based router)*
+One client+router install can support many PHPDebugConsole projects
 `$ php composer.phar require voryx/thruway`
 
 **Start the WAMP router.**  
-`$ php vendor/voryx/thruway/Examples/SimpleWsRouter.php`  
+`$ php vendor/voryx/thruway/Examples/SimpleWsRouter.php`
 *(note that the router doesn't play well with x-debug.  You will likely need to disable x-debug for this process)*
 
 **Create an `index.php` for the client**

src/css/WampClient.css

@@ -56,6 +56,7 @@ body { padding-top:50px; }
 .panel-heading * { font-size:inherit; }
 .panel-heading > i { float: left; }
 .panel-heading .label { padding: .1em .6em .2em; }
+.panel-heading .http-host { opacity: 0.6; }
 .label-default { background-color: rgba(119, 119, 119, 0.3); color: inherit; }
 
 .btn-remove-session {

src/js/DumpObject.js

@@ -164,9 +164,10 @@ var logDumper = (function($, module){
             html += '<dd class="magic-method info">This object has a <code>__get()</code> method</dd>' + "\n";
         }
         $.each(properties, function(k, info) {
-            // console.warn('dump', module.dump.toString());
+            // console.info('property info', info);
             var viaDebugInfo = info.viaDebugInfo;
-            html += '<dd class="property visibility-' + info.visibility + ' ' + (viaDebugInfo ? 'debug-value' : '') + '">' +
+            var isPrivateAncestor = info['visibility'] == 'private' && info['inheritedFrom'];
+            var $dd = $('<dd class="property">' +
                 '<span class="t_modifier">' + info.visibility + '</span>' +
                 (info.type
                     ? ' <span class="t_type">[' + info.type + ']</span>'
@@ -180,7 +181,16 @@ var logDumper = (function($, module){
                     '>' + k + '</span>' +
                 ' <span class="t_operator">=</span> ' +
                 module.dump(info.value) +
-                '</dd>' + "\n";
+                '</dd>'
+            );
+            $dd.addClass("visibility-" + info.visibility);
+            if (viaDebugInfo) {
+                $dd.addClass("debug-value");
+            }
+            if (isPrivateAncestor) {
+                $dd.addClass("private-ancestor");
+            }
+            html += $dd[0].outerHTML;
         });
         return html;
     }
@@ -191,9 +201,11 @@ var logDumper = (function($, module){
             : 'no methods';
         var html = '<dt class="methods">' + label + '</dt>';
         $.each(methods, function(k, info) {
+            // console.info('method info', info);
             var paramStr = dumpMethodParams(info.params);
             var modifiers = [];
             var returnType = '';
+            var $dd;
             if (info.isFinal) {
                 modifiers.push('<span class="t_modifier">final</span>');
             }
@@ -209,7 +221,7 @@ var logDumper = (function($, module){
                     ) +
                     '>' + info.phpDoc.return[0].type + '</span>';
             }
-            html += '<dd class="method visibility-' + info.visibility + '">' +
+            $dd = $('<dd class="method">' +
                 modifiers.join(' ') +
                 returnType +
                 ' <span class="method-name"' +
@@ -223,7 +235,13 @@ var logDumper = (function($, module){
                     ? '<br /><span class="indent">' + module.dump(info.returnValue, true) + '</span>'
                     : ''
                 ) +
-                '</dd>' + "\n";
+                '</dd>'
+            );
+            $dd.addClass("visibility-" + info.visibility);
+            if (info.isDeprecated) {
+                $dd.addClass("deprecated");
+            }
+            html += $dd[0].outerHTML;
         });
         return html;
     }

src/js/LogDumper.js

@@ -312,24 +312,7 @@ var logDumper = (function($, module) {
 				}
 				args[i] = atob(arg);
 			});
-			$container.find(".panel-heading .panel-heading-body .pull-right").remove();
-			// console.log('args', args);
-			if (args.REQUEST_METHOD) {
-				$container
-					.find(".panel-heading .panel-heading-body .panel-title")
-					.html(args.REQUEST_METHOD);
-			}
-			if (args.REQUEST_URI) {
-				$container
-					.find(".panel-heading .panel-heading-body .panel-title")
-					.append(' ' + args.REQUEST_URI);
-			}
-			if (args.REQUEST_TIME) {
-				var date = (new Date(args.REQUEST_TIME * 1000)).toString().replace(/[A-Z]{3}-\d+/, '');
-				$container
-					.find(".panel-heading .panel-heading-body")
-					.prepend('<span class="pull-right">'+date+'</span>');
-			}
+			methodMeta($container, args);
 		} else if (method === "table") {
 			// console.log('table', args[1], args[0]);
 			$.each(args[2], function(i,col) {
@@ -400,6 +383,29 @@ var logDumper = (function($, module) {
 		}
 	};
 
+	function methodMeta($container, args) {
+		$container.find(".panel-heading .panel-heading-body .pull-right").remove();
+		var $title = $container.find(".panel-heading .panel-heading-body .panel-title").html('');
+		if (args.HTTPS === "on") {
+			$title.append('<i class="fa fa-lock fa-lg"></i> ');
+		}
+		if (args.REQUEST_METHOD) {
+			$title.append(args.REQUEST_METHOD + ' ');
+		}
+		if (args.HTTP_HOST) {
+			$title.append('<span class="http-host">' + args.HTTP_HOST + '</span>');
+		}
+		if (args.REQUEST_URI) {
+			$title.append('<span class="request-uri">' + args.REQUEST_URI + '</span>');
+		}
+		if (args.REQUEST_TIME) {
+			var date = (new Date(args.REQUEST_TIME * 1000)).toString().replace(/[A-Z]{3}-\d+/, '');
+			$container
+				.find(".panel-heading .panel-heading-body")
+				.prepend('<span class="pull-right">'+date+'</span>');
+		}
+	}
+
 	function checkTimestamp(val)
     {
         var secs = 86400 * 90; // 90 days worth o seconds
@@ -494,8 +500,7 @@ var logDumper = (function($, module) {
 		return html;
 	}
 
-	function processSubstitutions(args)
-	{
+	function processSubstitutions(args) {
 		var subRegex = '%' +
 			'(?:' +
 			'[coO]|' +				// c: css, o: obj with max info, O: obj w generic info
@@ -591,8 +596,7 @@ var logDumper = (function($, module) {
      *
      * @return string
      */
-    function substitutionAsString(val)
-    {
+    function substitutionAsString(val) {
         var type = module.getType(val);
         // var count;
         if (type == 'string') {