Use stream protocol, update titlebar insert point

KanoComputing · Mar 6, 2018 · 0ac76ab · 0ac76ab
1 parent 9af8d96
commit 0ac76ab
Show file tree

Hide file tree

Showing 8 changed files with 3,977 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-node_modules
+node_modules
+Thumbs.db
diff --git a/app/src/index.html b/app/src/index.html
@@ -8,6 +8,6 @@
     <link rel="stylesheet" href="./main.css">
 </head>
     <body>
-
+        <h1>Content</h1>
     </body>
 </html>
diff --git a/lib/file-server.js b/lib/file-server.js
@@ -1,8 +1,8 @@
 const { protocol } = require('electron');
-const spaHandler = require('./spa-file-protocol-handler');
+const spaHandler = require('./spa-stream-protocol-handler');
 
 function registerProtocol(scheme, root, handler = () => {}) {
-    protocol.registerFileProtocol(scheme, spaHandler(root), handler);
+    protocol.registerStreamProtocol(scheme, spaHandler(root), handler);
 }
 
 module.exports = { registerProtocol };
diff --git a/lib/spa-file-protocol-handler.js b/lib/spa-file-protocol-handler.js
diff --git a/lib/spa-stream-protocol-handler.js b/lib/spa-stream-protocol-handler.js
@@ -0,0 +1,27 @@
+const url = require('url');
+const path = require('path');
+const fs = require('fs');
+const mime = require('mime-types');
+
+function getExtension(p) {
+    const parts = p.split('/');
+    const lastPart = parts[parts.length - 1];
+    return lastPart.split('.').pop();
+}
+
+module.exports = function getHandler(root, fallback = 'index.html') {
+    return (req, callback) => {
+        // Parse the url to extract the pathname
+        const u = url.parse(req.url);
+        let extension = getExtension(u.pathname);
+        // If the path contains an extension, it is a request for a file
+        const isFile = extension !== '';
+        // Replace the path with the fallback file if the request is not for a file
+        const filename = isFile ? u.pathname : fallback;
+        extension = getExtension(filename);
+        const file = path.normalize(`${root}/${filename}`);
+        const mimeType = mime.lookup(extension);
+        const stream = fs.createReadStream(file);
+        callback({ statusCode: 200, headers: { 'content-type': mimeType }, data: stream });
+    };
+};
diff --git a/lib/titlebar/preload.js b/lib/titlebar/preload.js
@@ -143,7 +143,7 @@ class Titlebar {
         EVENTS.forEach(eventName => (
             this.element.addEventListener(eventName, () => ipcRenderer.send(eventName))
         ));
-        container.appendChild(this.element);
+        container.prepend(this.element);
         this.element.setup();
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,6 @@ @@
         <link rel="stylesheet" href="./main.css">
     </head>
         <body>
+            <h1>Content</h1>
         </body>
     </html>