Feature Updates and Bug Fixes

README.md

@@ -1,4 +1,4 @@
-<a target="_blank" href="https://chrome.google.com/webstore/detail/web-server-for-chrome/ofhbbkphhbklhfoeikjpcbhemlocgigb">![Try it now in CWS](https://raw.github.com/GoogleChrome/chrome-app-samples/master/tryitnowbutton.png "Click here to install this sample from the Chrome Web Store")</a>
+<a target="_blank" href="https://chrome.google.com/webstore/detail/web-server-for-chrome/ofhbbkphhbklhfoeikjpcbhemlocgigb">![Try it now in CWS](https://raw.githubusercontent.com/GoogleChrome/chrome-extensions-samples/master/apps/tryitnowbutton.png "Click here to install this sample from the Chrome Web Store")</a>
 
 ## Web Server for Chrome
 
@@ -19,10 +19,14 @@ Features
 - options for autostart, start in background, etc etc.
 - handles range requests, HEAD, etc
 - options for CORS
-- optional PUT, DELETE request (for upload files)
+- optional PUT request (for uploading files)
+- optional DELETE request (for deleting files)
 - sets MIME types
 - can render directory listing
-- See relevant options: https://github.com/kzahel/web-server-chrome/blob/master/polymer-ui/options.js
+- Custom 400, 401, 403, and 404 pages
+- option to exclude .html extension
+- htaccess like feature: https://github.com/ethanaobrien/web-server-chrome/blob/master/htaccess/README.md
+- See relevant options: https://github.com/kzahel/web-server-chrome/blob/master/react-ui/js/options.js
 
 
 How to include into your own chrome app

background.js

@@ -131,7 +131,8 @@ function triggerKeepAwake() {
     // HACK: make an XHR to cause onSuspendCanceled event
     console.log('triggerKeepAwake')
     var xhr = new XMLHttpRequest
-    xhr.open("GET","http://127.0.0.1:" + (localOptions.port || 8887) + '/dummyUrlPing')
+    let prot = app.opts.optUseHttps ? 'https' : 'http';
+    xhr.open("GET",prot+"://127.0.0.1:" + (localOptions.port || 8887) + '/dummyUrlPing')
     function onload(evt) {
         console.log('triggerKeepAwake XHR loaded',evt)
     }
@@ -283,7 +284,7 @@ function hidden_click_configure() {
 function create_hidden() {
     if (OS != 'Chrome') { return }
 
-    if (app.opts && app.opts.optBackground && app.opts.optAllInterfaces) {
+    if (app.opts.optBackground) {
         console.log('creating hidden window')
         var W = 300
         var H = 120

chromesocketxhr.js

@@ -210,6 +210,7 @@
             }
         },
         onChunkDone: function(data) {
+            var data = data.slice(0, data.byteLength - 2) // For some reason, the \r\n gets put into the arraybuffer
             this.chunks.add(data)
             this.stream.readUntil("\r\n", this.getNewChunk.bind(this))
         },

connection.js

@@ -52,25 +52,31 @@
             if (_DEBUG) {
                 this.log(this.curRequest.uri)
             }
-            if (headers['content-length']) {
-                var clen = parseInt(headers['content-length'])
-                // TODO -- handle 100 continue..
-                if (clen > 0) {
-                    console.log('request had content length',clen)
-                    this.stream.readBytes(clen, this.onRequestBody.bind(this))
-                } else {
-                    console.log('request had an empty body')
-                    this.curRequest.body = new Uint8Array(0)
-                    this.onRequestBody(this.curRequest.body)
+            chrome.sockets.tcp.getInfo(this.stream.sockId, function(e) {
+                this.curRequest.ip = e.peerAddress
+                if (headers['content-length']) {
+                    var clen = parseInt(headers['content-length'])
+                    // TODO -- handle 100 continue..
+                    if (clen > 0) {
+                        console.log('request had content length',clen)
+                        this.stream.readBytes(clen, this.onRequestBody.bind(this))
+                    } else {
+                        console.log('request had an empty body')
+                        this.curRequest.body = new Uint8Array(0)
+                        this.onRequestBody(this.curRequest.body)
+                    }
+                    return
                 }
-                return
-            }
 
-            if (['GET','HEAD','PUT','OPTIONS'].includes(method)) {
-                this.onRequest(this.curRequest)
-            } else {
-                console.error('how to handle',this.curRequest)
-            }
+                if (['GET','HEAD','PUT','POST','DELETE','OPTIONS'].includes(method)) {
+                    this.onRequest(this.curRequest)
+                } else {
+                    console.error('how to handle',this.curRequest)
+                    // leaving the connection open will slow the server
+                    this.curRequest.connection.write('HTTP/1.1 501 Not Implemented\r\ncontent-length: 0\r\n\r\n')
+                    this.curRequest.connection.stream.close()
+                }
+            }.bind(this))
         },
         onRequestBody: function(body) {
             var req = this.curRequest
@@ -95,11 +101,18 @@
                         var kv = items[i].replace(/\+/g, ' ').split('=')
                         bodyparams[ decodeURIComponent(kv[0]) ] = decodeURIComponent(kv[1])
                     }
-                    req.bodyparams = bodyparams
+                    this.curRequest.bodyparams = bodyparams
                 }
             }
             this.curRequest.body = body
-            this.onRequest(this.curRequest)
+            if (['GET','HEAD','PUT','POST','DELETE','OPTIONS'].includes(method)) {
+                this.onRequest(this.curRequest)
+            } else {
+                console.error('how to handle',this.curRequest)
+                // leaving the connection open will slow the server
+                this.curRequest.connection.write('HTTP/1.1 501 Not Implemented\r\ncontent-length: 0\r\n\r\n')
+                this.curRequest.connection.stream.close()
+            }
         },
         onRequest: function(request) {
             this.onRequestCallback(request)