Merge pull request #45 from IMAGINARY/devel

Release 0.12.1

CHANGELOG.md

@@ -13,6 +13,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## [0.12.1] 2019-10-08
+
+### Added
+- `--reload-unresponsive` command line option for auto-reloading web pages that are unresponsive for the given amount of time
+
+### Changed
+- upgrade to Electron v6.0.11, Node v12.4.0, Chromium v76.0.3809.146
+
 ## [0.12.0] 2019-08-12
 
 ### Changed
@@ -200,7 +208,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [library for sending heartbearts]: https://github.com/hilbert/hilbert-heartbeat
 
-[Unreleased]: https://github.com/IMAGINARY/kiosk-browser/compare/v0.12.0...HEAD
+[Unreleased]: https://github.com/IMAGINARY/kiosk-browser/compare/v0.12.1...HEAD
+[0.12.1]: https://github.com/IMAGINARY/kiosk-browser/compare/v0.12.0...v0.12.1
 [0.12.0]: https://github.com/IMAGINARY/kiosk-browser/compare/v0.11.1...v0.12.0
 [0.11.1]: https://github.com/IMAGINARY/kiosk-browser/compare/v0.11.0...v0.11.1
 [0.11.0]: https://github.com/IMAGINARY/kiosk-browser/compare/v0.10.0...v0.11.0

package.json

@@ -1,7 +1,7 @@
 {
   "name": "kiosk-browser",
   "productName": "kiosk-browser",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Hardend Kiosk Web Browser",
   "homepage": "https://github.com/IMAGINARY/kiosk-browser",
   "repository": {
@@ -22,21 +22,21 @@
   "author": "IMAGINARY gGmbH <[email protected]>",
   "license": "Apache-2.0",
   "devDependencies": {
-    "electron": "6.0.1",
+    "electron": "6.0.11",
     "electron-builder": "^21.2.0"
   },
   "dependencies": {
     "electron-settings": "^3.1.4",
     "finalhandler": "^1.1.2",
-    "fs-extra": "^8.0.1",
-    "hjson": "^3.1.2",
+    "fs-extra": "^8.1.0",
+    "hjson": "^3.2.0",
     "http": "^0.0.0",
     "network": "^0.4.0",
     "os": "^0.1.1",
-    "portfinder": "^1.0.19",
+    "portfinder": "^1.0.24",
     "serve-static": "^1.14.1",
     "winston": "^3.2.1",
-    "yargs": "^13.2.2"
+    "yargs": "^14.2.0"
   },
   "scripts": {
     "postinstall": "electron-builder install-app-deps",

src/js/main/httpServer.js

@@ -25,7 +25,8 @@ function init(wwwRootDir) {
 
             // Create server
             server = http.createServer(function onRequest(req, res) {
-                serve(req, res, finalhandler(req, res))
+                const errorHandler = err => logger.warn('HTTP %i, %s', err.statusCode, err.message);
+                serve(req, res, finalhandler(req, res, {onerror: errorHandler}));
             });
 
             // Do something about errors