Build for release, auto-updater, website

.gitignore

@@ -4,3 +4,6 @@ images/.DS_Store
 .DS_Store
 www/docs
 www/out
+www/src/.vuepress/dist
+dev/
+dist/

README.md

@@ -1,33 +1,15 @@
 # Simple Web Server
 
-A super simple web server app for Windows and macOS, built using Electron and [send](https://www.npmjs.com/package/send).
+[Download](https://simplewebserver.org/download/) • [Documentation](https://simplewebserver.org/docs/options.html) • [Build from source](https://simplewebserver.org/docs/build.html)
 
-Inspired by [Web Server for Chrome](https://github.com/kzahel/web-server-chrome), which is going away.
+Create local web servers in just a few clicks with an easy to use interface. Built with Electron.
 
 Features:
+- Easy to customize
 - Run multiple web servers at the same time
 - Supports Single Page Applications
-- You can keep it running in the background
+- Can run in the background
 
-<img width="280" alt="Screen Shot 2021-07-13 at 8 21 25 PM" src="https://user-images.githubusercontent.com/11605395/125558961-d7d99d4e-8db0-44eb-832f-aba540e24c22.png">
+![screenshots](https://user-images.githubusercontent.com/11605395/163694811-46e3b79c-a187-4c78-b622-6250a6d5d9d0.jpeg)
 
-## Intallation
-
-Download the archive for your platform here: https://github.com/terreng/web-server/releases
-
-#### Windows
-1. Extract the ZIP file somewhere (I recommend making a new folder for it at `C:\Program Files`)
-2. Create a shortcut of `Simple Web Server.exe` or pin it to your taskbar
-
-#### macOS
-1. Extract the archive
-2. Move `Simple Web Server.app` to your applications folder
-
-## Building from this repository
-
-Make sure you have git installed.
-Run `npm install`.
-
-To run: `npm start`
-
-To package it up: `npm run make`
+Simple Web Server is a continuation of [Web Server for Chrome](https://github.com/kzahel/web-server-chrome).

WSC.js

@@ -20,16 +20,10 @@ WSC.DirectoryEntryHandler = handlers.DirectoryEntryHandler
 WSC.BaseHandler = handlers.BaseHandler
 
 var main_fs = new WSC.FileSystem(__dirname)
-main_fs.getByPath('/directory-listing-template.html', function(file) {
-    file.text(function(data) {
-        WSC.template_data = data
-    })
-})
-main_fs.getByPath('/directory-listing-template-static.html', function(file) {
-    file.text(function(data) {
-        WSC.static_template_data = data
-    })
-})
+const fs = require('fs')
+const path = require('path')
+WSC.template_data = fs.readFileSync(path.resolve(__dirname, "directory-listing-template.html"), "utf8");
+WSC.static_template_data = fs.readFileSync(path.resolve(__dirname, "directory-listing-template-static.html"), "utf8");
 
 module.exports = WSC;
 

WSC/FileSystem.js

@@ -1,5 +1,12 @@
 
 function getByPath(path, callback, FileSystem) {
+    if (!path) {
+        if (typeof path == 'string') {
+            path = '/';
+        } else {
+            return null;
+        }
+    }
     this.fs = FileSystem;
     if (! (path.startsWith('/') || path.startsWith('\\'))) {
         var path = '/' + path;
@@ -12,6 +19,9 @@ function getByPath(path, callback, FileSystem) {
 
 getByPath.prototype = {
     getFile: function() {
+        if (!this.path) {
+            return null;
+        }
         var path = this.path
         this.hidden = function(path) {
             var a = path.split('/');
@@ -21,15 +31,15 @@ getByPath.prototype = {
                 }
             }
             return false;
-        }(path)
+        }(path);
         try {
             var stats = fs.statSync(path);
         } catch(e) {
             var error = e;
         }
         if (error) {
             try {
-                if (error.path && typeof error.path == 'string' && error.errno == -4048) {
+                if (error.path && typeof error.path == 'string' && error.code === 'EPERM') {
                     var err = {};
                     err.path = error.path.replace(/\\/g, '/').replace(/\/\//g, '/');
                     if (error.path.endsWith('/')) {
@@ -99,6 +109,10 @@ getByPath.prototype = {
         }.bind(this));
     },
     file: function(callback) {
+        if (!this.path) {
+            callback(null);
+            return null;
+        }
         if (! callback) {
             return;
         }
@@ -121,6 +135,10 @@ getByPath.prototype = {
         }.bind(this))
     },
     remove: function(callback) {
+        if (!this.path) {
+            callback(null);
+            return null;
+        }
         if (! callback) {
             callback = function() {};
         }
@@ -154,6 +172,10 @@ getByPath.prototype = {
         if (! callback) {
             return;
         }
+        if (!this.path) {
+            callback(null);
+            return null;
+        }
         if (this.isFile) {
             callback({error: 'Cannot preform on file'});
             return;
@@ -174,7 +196,7 @@ getByPath.prototype = {
         function getFileInfo() {
             var file = new getByPath(this.origpath + '/' + files[i], function(file) {
                 results.push(file);
-                if (i != totalLength) {
+                if (i < totalLength) {
                     i++;
                     getFileInfo.bind(this)();
                 } else {
@@ -236,7 +258,7 @@ FileSystem.prototype = {
         } catch(e) {
             var error = e;
         }
-        if (error && error.errno === -4058) {
+        if (error && error.code === 'ENOENT') {
             try {
                 fs.writeFileSync(path, data);
             } catch(e) {

WSC/crypto.js

@@ -1,4 +1,3 @@
-
 module.exports = function() {
     var data = { }
     var cn = "WebServerForChrome" + (new Date()).toISOString();
@@ -63,4 +62,3 @@ module.exports = function() {
   return data;
   console.log('certificate created for \"' + cn + '\": \n');
 };
-

WSC/handlers.js

@@ -22,7 +22,7 @@ BaseHandler.prototype = {
     },
     error: async function(msg, httpCode) {
         var defaultMsg = '<h1>' + httpCode + ' - ' + WSC.HTTPRESPONSES[httpCode] + '</h1>\n\n<p>' + msg + '</p>';
-        if (this.request.method == "HEAD") {
+        if (this.request.method === "HEAD") {
             this.responseLength = 0;
             this.writeHeaders(httpCode);
             this.finish();
@@ -177,7 +177,7 @@ DirectoryEntryHandler.prototype = {
             return
         }
         global.ConnetionS[this.request.ip]++
-        console.log(this.request.ip + ':', 'Request',this.request.method, this.request.uri)
+        console.log("["+(new Date()).toLocaleString()+"]", this.request.ip + ':', 'Request',this.request.method, this.request.uri)
         /*
         if (this.app.opts.optIpBlocking && this.app.opts.optIpBlockList) {
             var file = await this.fs.asyncGetByPath(this.app.opts.optIpBlockList)
@@ -229,7 +229,7 @@ DirectoryEntryHandler.prototype = {
 
         if (this.app.opts.spa) {
             if (!this.request.uri.match(/.*\.[\d\w]+$/)) {
-                console.log("Single page rewrite rule matched", this.request.uri);
+                //console.log("Single page rewrite rule matched", this.request.uri);
                 this.rewrite_to = this.app.opts.rewriteTo || "/index.html";
             }
         }
@@ -343,7 +343,7 @@ DirectoryEntryHandler.prototype = {
     },
     delete: function() {
         async function deleteMain() {
-            var entry = await this.fs.asyncGetByPath(this.request.path);
+            var entry = await this.fs.asyncGetByPath(this.request.origpath);
             if (entry.error) {
                 this.writeHeaders(404);
                 this.finish();
@@ -508,7 +508,7 @@ DirectoryEntryHandler.prototype = {
     },
     put: function() {
         async function putMain() {
-            var entry = await this.fs.asyncGetByPath(this.request.path)
+            var entry = await this.fs.asyncGetByPath(this.request.origpath)
             if (entry.error) {
                 var file = this.fs.createWriteStream(this.request.origpath)
                 file.on('error', function (err) {
@@ -596,13 +596,13 @@ DirectoryEntryHandler.prototype = {
         this.entry = entry;
         async function excludedothtmlcheck() {
             if (this.app.opts.excludeDotHtml && this.request.path != '' && ! this.request.origpath.endsWith("/")) {
-                var file = await this.fs.asyncGetByPath(this.request.path+'.html');
+                var file = await this.fs.asyncGetByPath(this.request.origpath+'.html');
                 if (! file.error && file.isFile) {
                     this.setHeader('content-type','text/html; charset=utf-8');
                     this.renderFileContents(file);
                     return;
                 }
-                var file = await this.fs.asyncGetByPath(this.request.path+'.htm');
+                var file = await this.fs.asyncGetByPath(this.request.origpath+'.htm');
                 if (! file.error && file.isFile) {
                     this.setHeader('content-type','text/html; charset=utf-8');
                     this.renderFileContents(file);
@@ -630,7 +630,7 @@ DirectoryEntryHandler.prototype = {
                 if (this.entry.error.code == 'EPERM') {
                     this.error('', 403);
                 } else {
-                    this.error('entry not found: ' + (this.rewrite_to || this.request.path), 404);
+                    this.error('entry not found: ' + (this.rewrite_to || this.request.path).htmlEscape(), 404);
                 }
             } else if (this.entry.isFile) {
                 this.renderFileContents(this.entry);
@@ -855,8 +855,8 @@ DirectoryEntryHandler.prototype = {
                     var data = await file.textPromise();
                     var html = [dataa];
                     for (var w=0; w<results.length; w++) {
-                        var rawname = results[w].name;
-                        var name = encodeURIComponent(results[w].name);
+                        var rawname = results[w].name.replaceAll('\\', '\\\\').replaceAll('"', '\\"');
+                        var name = encodeURIComponent(results[w].name).replaceAll('\\', '\\\\').replaceAll('"', '\\"');
                         var isdirectory = results[w].isDirectory;
                         var modified = WSC.utils.lastModified(results[w].modificationTime);
                         var filesize = results[w].size;
@@ -1024,7 +1024,7 @@ DirectoryEntryHandler.prototype = {
         }
         var filerequest = this.request.origpath;
         if (this.app.opts.excludeDotHtml) {
-            var file = await this.fs.asyncGetByPath(this.request.path+'.html');
+            var file = await this.fs.asyncGetByPath(this.request.origpath+'.html');
             if (! file.error) {
                 if (this.request.origpath.endsWith("/")) {
                     htaccessMain.bind(this)('');
@@ -1036,7 +1036,7 @@ DirectoryEntryHandler.prototype = {
                 htaccessMain.bind(this)(filerequested);
                 return;
             }
-            var file = await this.fs.asyncGetByPath(this.request.path+'.htm');
+            var file = await this.fs.asyncGetByPath(this.request.origpath+'.htm');
             if (! file.error) {
                 if (this.request.origpath.endsWith("/")) {
                     htaccessMain.bind(this)('');
@@ -1109,7 +1109,7 @@ DirectoryEntryHandler.prototype = {
             }
             var compression = false;
             var stream = this.fs.createReadStream(entry.fullPath, {start: fileOffset,end: fileEndOffset});
-            if (this.request.headers['accept-encoding'] && this.app.opts.compressResponses) {
+            if (this.request.headers['accept-encoding'] && this.app.opts.compression) {
                 var ac = this.request.headers['accept-encoding'];
                 if (ac.includes('br') || ac.includes('gzip') || ac.includes('deflate')) {
                     compression = true;
@@ -1124,11 +1124,11 @@ DirectoryEntryHandler.prototype = {
                         this.setHeader('Content-Encoding', 'deflate');
                         compresionStream = zlib.createDeflate();
                     } else {
-                        console.log('this.. shouldnt be possible');
+                        //console.log('this.. shouldnt be possible');
                         this.res.end();
                         return;
                     }
-                    pipeline(stream, compresionStream, this.res, function(e) {console.warn('error', e); this.res.end()}.bind(this))
+                    pipeline(stream, compresionStream, this.res, function(err) {if (err) {console.warn('Compression Error:', err); this.res.end()}}.bind(this))
                 }
             }
             this.writeHeaders(code);
@@ -1199,8 +1199,8 @@ DirectoryEntryHandler.prototype = {
             html.push('<script>onHasParentDirectory();</script>');
         }
         for (var w=0; w<results.length; w++) {
-            var rawname = results[w].name;
-            var name = encodeURIComponent(results[w].name);
+            var rawname = results[w].name.replaceAll('\\', '\\\\').replaceAll('"', '\\"');
+            var name = encodeURIComponent(results[w].name).replaceAll('\\', '\\\\').replaceAll('"', '\\"');
             var isdirectory = results[w].isDirectory;
             var modified = WSC.utils.lastModified(results[w].modificationTime);
             var filesize = results[w].size;
@@ -1228,8 +1228,8 @@ DirectoryEntryHandler.prototype = {
             html.push('<script>onHasParentDirectory();</script>');
         }
         for (var w=0; w<results.length; w++) {
-            var rawname = results[w].name;
-            var name = encodeURIComponent(results[w].name);
+            var rawname = results[w].name.replaceAll('\\', '\\\\').replaceAll('"', '\\"');
+            var name = encodeURIComponent(results[w].name).replaceAll('\\', '\\\\').replaceAll('"', '\\"');
             var isdirectory = results[w].isDirectory;
             var modified = WSC.utils.lastModified(results[w].modificationTime);
             var filesize = results[w].size;

WSC/utils.js

@@ -1,27 +1,30 @@
 String.prototype.htmlEscape = function() {
-    return this.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;")
+    return this.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+}
+if (!String.prototype.replaceAll) {
+    String.prototype.replaceAll = function(a, b) {
+        return this.split(a).join(b);
+    }
 }
 
 module.exports = {
-    humanFileSize: function(bytes, si=false, dp=1) {
+    humanFileSize: function(bytes) {
         if (! bytes) {
-            return ''
+            return '';
         }
         //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
-        const thresh = si ? 1000 : 1024;
+        const thresh = 1024;
         if (Math.abs(bytes) < thresh) {
           return bytes + ' B';
         }
-        const units = si 
-          ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
-          : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+        const units = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
         let u = -1;
-        const r = 10**dp;
+        const r = 10;
         do {
           bytes /= thresh;
           ++u;
         } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
-        return bytes.toFixed(dp) + ' ' + units[u];
+        return bytes.toFixed(1) + ' ' + units[u];
     },
     lastModified: function(modificationTime) {
         if (! modificationTime) {