update 0.4.1 add logging option

Author: kzahel

log-full.js

@@ -1,13 +1,11 @@
 // add this file to your "blackbox" e.g. blackboxing, making devtools not show logs as coming from here
 (function() {
 	if (console.clog) { return }
-	if (! WSC.DEBUG) {
-		console.clog = function() {}
-		return
-	}
 	var L = {
-		UPNP: { show: true, color:'green' }
+		UPNP: { show: true, color:'green' },
+		WSC: { show: true, color:'green' }
 	}
+    Object.keys(L).forEach( function(k) { L[k].name = k } )
     window.ORIGINALCONSOLE = {log:console.log, warn:console.warn, error:console.error}
     window.LOGLISTENERS = []
     function wrappedlog(method) {
@@ -27,6 +25,7 @@
     console.warn = wrappedlog('warn')
     console.error = wrappedlog('error')
     console.clog = function() {
+        if (! WSC.DEBUG) { return }
         // category specific logging
         var tolog = arguments[0]
 		tolog = L[tolog]

manifest.json

@@ -4,7 +4,7 @@
     "short_name": "Web Server",
     "description": "A Web Server for Chrome, serves web pages from a local folder over the network, using HTTP. Runs offline.",
     "author": "Kyle Graehl",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "manifest_version": 2,
     "offline_enabled": true,
     "minimum_chrome_version": "45",

package.sh

@@ -2,4 +2,4 @@ rm package.zip
 
 #zip package.zip -r * -x package.sh -x *.git* -x "*.*~" -x images/cws_*.png -x *.scratch -x polymer-ui/node-modules/**\* -x wsc-chrome.min.js
 
-zip package.zip manifest.json *.js *.html images/200*.png polymer-ui/*.html polymer-ui/*.js polymer-ui/*.css -x wsc-chrome.min.js
+zip package.zip manifest.json *.js *.html images/200*.png polymer-ui/*.html polymer-ui/*.js polymer-ui/*.css polymer-ui/bower_components/font-roboto/fonts/roboto/Roboto-Bold.ttf -x wsc-chrome.min.js

polymer-ui/index.html

@@ -135,6 +135,9 @@ <h4>Options (needs restart)</h4>
 				<div>
                   <paper-checkbox checked="{{optStatic}}" >Plain (static) files view</paper-checkbox>
 				</div>
+				<div>
+                  <paper-checkbox checked="{{optVerbose}}" >Verbose logging (navigate to "chrome://inspect", Extensions)</paper-checkbox>
+				</div>
 
 			  </template>
 

polymer-ui/index.js

@@ -17,6 +17,7 @@ function settings_ready() {
     //window.localOptions = d
     console.log('fetched local settings',appOptions)
     window.webapp = bg.get_webapp(appOptions.getAll()) // retainStr in here
+    bg.WSC.VERBOSE = bg.WSC.DEBUG = appOptions.get('optVerbose')
     create_polymer_elements()
     on_webapp_change()
     webapp.on_status_change = on_webapp_change
@@ -162,6 +163,11 @@ function create_polymer_elements() {
 				observer: 'optIPV6Change',
                 value: appOptions.options['optIPV6']
             },
+            optVerbose: {
+                type: Boolean,
+				observer: 'optVerboseChange',
+                value: appOptions.options['optVerbose']
+            },
             optCORS: {
                 type: Boolean,
 				observer: 'optCORSChange',
@@ -213,6 +219,11 @@ function create_polymer_elements() {
 			var k = 'optCORS'
 			this.updateAndSave(k,val)
 		},
+		optVerboseChange: function(val) {
+			var k = 'optVerbose'
+			this.updateAndSave(k,val)
+            bg.WSC.VERBOSE = bg.WSC.DEBUG = val
+		},
 		optIPV6Change: function(val) {
 			var k = 'optIPV6'
 			this.updateAndSave(k,val)

polymer-ui/options.js

@@ -22,6 +22,10 @@
             type: Boolean,
             default: false
         },
+        optVerbose: {
+            type: Boolean,
+            default: false
+        },
         optStatic: {
             type: Boolean,
             default: false

upnp.js

@@ -50,6 +50,7 @@
                         var ipre = iparts.slice(0,i).join('.')
                         if (ipre == pre) {
                             match = this.interfaces[j].address
+                            console.clog("UPNP","selected internal address",match)
                             return match
                         }
                     }
@@ -71,9 +72,12 @@
             }.bind(this) )
         },
         onSearchStop: function(info) {
+            console.clog('UPNP', "search stop")
             this.searching = false
-            this.getIP( function() {
+            this.getIP( function(gotIP) {
+                if (! gotIP) { return this.allDone(false) }
                 this.getMappings( function(mappings) {
+                    if (! mappings) { return this.allDone(false) }
                     // check if already exists nice mapping we can use.
                     var internal = this.getInternalAddress()
                     console.clog('UPNP','got current mappings',mappings,'internal address',internal)
@@ -225,6 +229,8 @@
                     var info = infos[i]
                     info.device.runService(info.service,'GetExternalIPAddress',[],oneResult.bind(this, info))
                 }
+            } else {
+                callback(null)
             }
         }
     }
@@ -275,7 +281,7 @@
         },
         getDescription: function(callback) {
             var xhr = new WSC.ChromeSocketXMLHttpRequest
-            //console.clog('UPNP','query',this.description_url)
+            console.clog('UPNP','query',this.description_url)
             xhr.open("GET",this.description_url)
             xhr.setRequestHeader('connection','close')
             xhr.responseType = 'xml'
@@ -374,15 +380,15 @@
                 chrome.sockets.udp.close(parseInt(socketId))
             }
             this.sockMap = {}
+            chrome.sockets.udp.onReceive.removeListener( this._onReceive )
+            chrome.sockets.udp.onReceiveError.removeListener( this._onReceive )
         },
         stopsearch: function() {
             console.clog('UPNP', "stopping ssdp search")
             // stop searching, kill all sockets
             this.searching = false
             this.cleanup()
             this.trigger('stop')
-            chrome.sockets.udp.onReceive.removeListener( this._onReceive )
-            chrome.sockets.udp.onReceiveError.removeListener( this._onReceive )
         },
         search: function(opts) {
             if (this.searching) { return }

webapp.js

@@ -168,6 +168,7 @@
             }
         },
         stop: function(reason, callback) {
+            this.lasterr = ''
             this.urls = []
             this.change()
             if (callback) { this._stop_callback = callback }
@@ -295,7 +296,8 @@
                     console.log('listen port ready',info)
                 this.port = info.port
                 if (this.opts.optAllInterfaces && this.opts.optDoPortMapping) {
-                    this.upnp = new WSC.UPNP({port:this.port,udp:false,searchtime:1000})
+                    console.clog("WSC","doing port mapping")
+                    this.upnp = new WSC.UPNP({port:this.port,udp:false,searchtime:2000})
                     this.upnp.reset(this.onPortmapResult.bind(this))
                 } else {
                     this.onReady()
@@ -305,7 +307,7 @@
         onPortmapResult: function(result) {
             var gateway = this.upnp.validGateway
             console.log('portmap result',result,gateway)
-			if (! result.error) {
+			if (result && ! result.error) {
 				if (gateway.device && gateway.device.externalIP) {
 					var extIP = gateway.device.externalIP
 					this.extra_urls = [{url:'http://'+extIP+':' + this.port}]
@@ -388,6 +390,7 @@
                                     )
         },
         getInterfaces: function(state, callback) {
+            console.clog('WSC','no interfaces yet',state)
             chrome.system.network.getNetworkInterfaces( function(result) {
                 console.log('network interfaces',result)
                 if (result) {