@caboodle-tech/node-simple-server 1.2.2 → 1.3.0

package/README.md

@@ -4,20 +4,20 @@ Node Simple Server (NSS) is a small but effective node based server for developm
 
 :heavy_check_mark:  You want to add live reloading to the development process of a static site.
 
-:heavy_check_mark:  You want easy two-way communication from the back-end and front-end of your development site (WebSockets managed for you).
+:heavy_check_mark:  You want easy two-way communication from the back-end and front-end of your development site; WebSockets managed for you.
 
 :heavy_check_mark:  You want more fine grained control over the whole live reloading process.
 
-:heavy_check_mark:  You want to easily test your development site on multiple devices (Must be on the same LAN).
+:heavy_check_mark:  You want to easily test your development site on multiple devices; must be on the same LAN.
 
 ## Installation
 
 ### Manually:
 
-NSS can be manually incorporated into your development process/ application. Extract the `nss` folder from the [latest release](https://github.com/caboodle-tech/nss/releases/) and then `require` the server module into your code, similar to:
+Noe Simple Server (NSS) can be manually incorporated into your development process/ application. Extract the `nss` folder from the [latest release](https://github.com/caboodle-tech/node-simple-server/releases/) and then `require` the server module into your code, similar to:
 
 ```javascript
-const NSS = require("./nss/server");
+const NodeSimpleServer = require("./node-simple-server/server");
 ```
 
 ### Locally:
@@ -26,10 +26,10 @@ You can install and use NSS locally in a project with:
 
 ```bash
 // As a normal dependency:
-npm install @caboodle-tech/nss
+npm install @caboodle-tech/node-simple-server
 
 // or as a development dependency:
-npm install @caboodle-tech/nss --save-dev
+npm install @caboodle-tech/node-simple-server --save-dev
 ```
 
 Depending on how you use and incorporate NSS into your project will determine what it's dependency type should be.
@@ -39,7 +39,7 @@ Depending on how you use and incorporate NSS into your project will determine wh
 You can install and use NSS globally with:
 
 ```bash
-npm install --global @caboodle-tech/nss
+npm install --global @caboodle-tech/node-simple-server
 ```
 
 ## Usage
@@ -48,10 +48,10 @@ NSS is designed to be controlled and/or wrapped by another application. The bare
 
 ```javascript
 // Require NSS. Here it is required from a manual install.
-const NSS = require("./nss/server");
+const NodeSimpleServer = require("./server");
 
 // Get a new instance of NSS.
-const Server = new NSS();
+const Server = new NodeSimpleServer();
 
 // Start the server.
 Server.start();
@@ -83,7 +83,7 @@ NSS uses the current working directory as the live servers root and is pre-confi
 const options = {...};
 
 // Get a new instance of NSS and pass in the options.
-const Server = new NSS(options);
+const Server = new NodeSimpleServer(options);
 ```
 
 ### :bookmark: Server Options (Object)
@@ -244,4 +244,4 @@ The [current changelog is here](./changelogs/v1.md). All [other changelogs are h
 
 ## Contributions
 
-NSS is an open source community supported project, if you would like to help please consider <a href="https://github.com/caboodle-tech/nss/issues" target="_blank">tackling an issue</a> or <a href="https://ko-fi.com/caboodletech" target="_blank">making a donation</a> to keep the project alive.
+NSS is an open source community supported project, if you would like to help please consider <a href="https://github.com/caboodle-tech/node-simple-server/issues" target="_blank">tackling an issue</a> or <a href="https://ko-fi.com/caboodletech" target="_blank">making a donation</a> to keep the project alive.

package/changelogs/v1.md

@@ -1,3 +1,12 @@
+### NSS 1.3.0 (23 Nov 2021)
+
+- Bug Fix: Inject script and styles are now correctly added to HTML files only.
+
+### NSS 1.2.5 (26 Oct 2021)
+
+- README corrections.
+- moved the server live message.
+
 ### NSS 1.2.2 (15 Oct 2021)
 
 - Renamed repository and NPM package to `Node Simple Server`.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@caboodle-tech/node-simple-server",
-    "version": "1.2.2",
+    "version": "1.3.0",
     "description": "Node Simple Server (NSS): A small but effective node based server for development sites and self controlled live reloading.",
     "main": "server.js",
     "scripts": {
@@ -39,4 +39,4 @@
         "eslint-config-airbnb-base": "^14.2.1",
         "eslint-plugin-import": "^2.25.2"
     }
-}
+}

package/server.js

@@ -30,10 +30,11 @@ function NodeSimpleServer(options) {
         root: Path.normalize(`${process.cwd()}/`),
         running: false
     };
+    const RELOAD = ['.html', '.htm'];
     const SEP = Path.sep;
     let SERVER = null;
     let SOCKET = null;
-    const VERSION = '0.1.0-rc'; // Update on releases.
+    const VERSION = '1.3.0'; // Update on releases.
     const WATCHING = [];
 
     /**
@@ -42,14 +43,14 @@ function NodeSimpleServer(options) {
      *
      * @return {Array} An array of loop back ip addresses and LAN addresses to this server.
      */
-    const getAddresses = function () {
+    const getAddresses = function (port) {
         const locals = getLocalAddresses();
         const addresses = [
-            `http://localhost:${OP.port}`,
-            `http://127.0.0.1:${OP.port}`
+            `http://localhost:${port}`,
+            `http://127.0.0.1:${port}`
         ];
         Object.keys(locals).forEach((key) => {
-            addresses.push(`http://${locals[key]}:${OP.port}`);
+            addresses.push(`http://${locals[key]}:${port}`);
         });
         return addresses;
     };
@@ -503,12 +504,25 @@ function NodeSimpleServer(options) {
 
                 // Output the file to the browser.
                 response.writeHead(HTTPStatus.ok, getHeaders(contentType, safeURL));
-                response.write(file, 'binary');
 
-                // Inject NSS's WebSocket at the end of the page and close initial connection.
-                response.write(inject);
-                response.end();
+                // If needed inject NSS's WebSocket at the end of the page.
+                if (RELOAD.includes(Path.extname(safeURL))) {
+                    let html = file.toString();
+                    const last = html.lastIndexOf('</body>');
+                    if (last && last > 0) {
+                        const start = html.substr(0, last);
+                        const end = html.substr(last);
+                        html = start + inject + end;
+                        response.write(html, 'utf8');
+                    } else {
+                        response.write(file, 'binary');
+                    }
+                } else {
+                    response.write(file, 'binary');
+                }
 
+                // Close initial connection.
+                response.end();
             });
 
         });
@@ -663,7 +677,7 @@ function NodeSimpleServer(options) {
 
             // Log the ip addresses being watched.
             console.log('Node Simple Server live @:');
-            const addresses = getAddresses();
+            const addresses = getAddresses(port);
             addresses.forEach((address) => {
                 console.log(`    ${address}`);
             });
@@ -701,8 +715,8 @@ function NodeSimpleServer(options) {
             SERVER = null;
             SOCKET = null;
             OP.running = false;
+            console.log('Server has been stopped.');
         }
-        console.log('Server has been stopped.');
         // Notify the callback.
         if (callback) {
             callback(true);