build: 0.1.4

.env

@@ -1 +1,3 @@
 PORT=3000
+APP_CRT=LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhekNDQWxPZ0F3SUJBZ0lVUk1WclJ1UGJ2T3JicjVlK2ZWdXVOOHJ3MzRjd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1JURUxNQWtHQTFVRUJoTUNRVlV4RXpBUkJnTlZCQWdNQ2xOdmJXVXRVM1JoZEdVeElUQWZCZ05WQkFvTQpHRWx1ZEdWeWJtVjBJRmRwWkdkcGRITWdVSFI1SUV4MFpEQWVGdzB5TkRBNU1URXhNVE00TlRGYUZ3MHlOVEE1Ck1URXhNVE00TlRGYU1FVXhDekFKQmdOVkJBWVRBa0ZWTVJNd0VRWURWUVFJREFwVGIyMWxMVk4wWVhSbE1TRXcKSHdZRFZRUUtEQmhKYm5SbGNtNWxkQ0JYYVdSbmFYUnpJRkIwZVNCTWRHUXdnZ0VpTUEwR0NTcUdTSWIzRFFFQgpBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ3gva2pKQVpyUHA3RDVKanRTQWZ4QnYvT2N2ck5KdVAzS1dMdXYrcHcyCjV6cXgzYUJIRklMUk5oYVFYd1RJaXVHemp3UlhJVjVFWVF4b0ltMng5b0U3MTFaRHBhM09zTC8vMW1tUUZZelIKR2lyTjgzRFBhL0RyRG90Sy9KU1llV2NlUHdSTkp6Mi9QV2hRc29KbGN3cVpDSVE0MmJDUlllTUdPY2pvVkhCSwoyWjh1NjIzN1Z6bVg4SUdrQkY4aEg3WWsvNk1YZTh2aE9hbVRpVXBwRnBQOE1WSTBHdkRaNE1UcVoveVhIWTNLClpscCtxUjlsNUZaSkVyT1Y3dnRRV1BWemZSYU5JeG5SNzNpY3RvamovNTg3N24xWTg4QzNXTlloZ3BpREFhaUMKS1o4ZXhGZjJMVkN1dUh6ZzMxbFpaS2V1UG5PYWN1N2h0ZXptR1pkcWExZTVBZ01CQUFHalV6QlJNQjBHQTFVZApEZ1FXQkJSbHhyZG14UEMyT2tZS3RpckVCSGZuc3FHMk5EQWZCZ05WSFNNRUdEQVdnQlJseHJkbXhQQzJPa1lLCnRpckVCSGZuc3FHMk5EQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQncKdFVMSm83MU5ZWnZxaitSOUpjcFBYTmZXeWtiZSttZzlKNzFBYjBLcVp5dlVTaWc2ckhBZW5CYzNld29GUkNKVgoyQWw5aklvbWp1YTV3L2NQQnBaaEtiOFg1VmJUcjBLdVN1TkpZQ3hHTFpZd0ZYSWlzRGN3OEdCbzhPQW1xdTZQCklBUkZlSHlqTWtGdDNjRnZ4dFluRjZiL1gyR1ovbjFWT0d6dXlTcFFTSlpYOXFpa3NZVXZCbzl3cENJcWZOZG0KUG15V2dsRENySytaK2NhQjF2U3R0WFlOb2I1bjdsMUI0dDQ1azJlb3VxZ3lvTFVKWGhIWVAxNXdQaE9FUVNDNwpwZHkwb3lXWnovUUV0M3FQbjNGN09XZjIyRVE3TjRtek1FeEVJa0hmSmQ1WkZEOCt6aEdDOWpmMVhtUUdMbzJDCjF2L3F2eXpqK1I4Ym1ZbWFZNU5qCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+APP_KEY=LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3gva2pKQVpyUHA3RDUKSmp0U0FmeEJ2L09jdnJOSnVQM0tXTHV2K3B3MjV6cXgzYUJIRklMUk5oYVFYd1RJaXVHemp3UlhJVjVFWVF4bwpJbTJ4OW9FNzExWkRwYTNPc0wvLzFtbVFGWXpSR2lyTjgzRFBhL0RyRG90Sy9KU1llV2NlUHdSTkp6Mi9QV2hRCnNvSmxjd3FaQ0lRNDJiQ1JZZU1HT2Nqb1ZIQksyWjh1NjIzN1Z6bVg4SUdrQkY4aEg3WWsvNk1YZTh2aE9hbVQKaVVwcEZwUDhNVkkwR3ZEWjRNVHFaL3lYSFkzS1pscCtxUjlsNUZaSkVyT1Y3dnRRV1BWemZSYU5JeG5SNzNpYwp0b2pqLzU4NzduMVk4OEMzV05ZaGdwaURBYWlDS1o4ZXhGZjJMVkN1dUh6ZzMxbFpaS2V1UG5PYWN1N2h0ZXptCkdaZHFhMWU1QWdNQkFBRUNnZ0VBRFFpZ3pjOUhSZE55dXh2WWxpMjlDaGVEUUVRYW50aGtCVEF3TmplMHZyUjUKOE5KWXpUdXNSS09nVFZ3WDNwT0U2WUFjZ2tEWVJVdVIvQUloWkRtM3h1a0MwUnROdWVmcGQxTjlFV2J5azlGRgp0eVVQYXJEdHlGaWRUSlZvVUMzN3BoUlpQVWtWVlc2cXQ5WUtoR0ZETW1lVVB4RjV3M3VXZ3pzeUFnbEUyOFlxCld0RDNwNUN3M3NpWDJoL2pxSisydjVSSHQrSmJ4b2xsOHRWL3A0RGJ2VW9Sc2FocmNUQUxONTloT1FralF4OWIKNzI4Q0pZTllkc3VaK01uSEkxZ1BGRUVUWjVCQnpiNlV3Y0N4R2tpdGRZdXN2QXJiUWhMRUp4K0VINSs4d0pZLwpyQlNtKzgvOW9ZUDd1ZHpib0NSQUhnTENYak1TQjZVTmkzbkhzQ3ppZ1FLQmdRRHN2VWwzYXNFNHVPUUpPdFdmClZRWlltUHZLNGZQRWlPMTZWSjQycytUVXpXT2VGS25qUmFlYUJuS1F5ckF1alVvMi9qM01WTGRkcXBFMGRxWEQKdmZwN1UyTFNjMlFEbWhaUWszaThlYXM0SEtvZEJHK1pPbTY0d3g0OFUzUXo2bkU4R01MOWx4ZlV0WXVNRHhySwp0clFyckM0bXkwN3hPZEFoRVN4S3B1ZUNzUUtCZ1FEQWVYVUZvZ0xiTDA2d3RFNHVQd2xYbkMxRy95dFZqYStsClpDNmphdWxZYnZ5emNhT3I3UjloYlNEMVdnbWFIZm9hRWhzZDZJQStPZVVNdXg1VkF1cFMyT0VtL21ZV3NydTgKb3N2UEl5Qm4yMmZqaE92a3BxNlIvRThyVUpTSHVkeFR2OWNNSk1laGpkMzZZRk9NTG9NRmFNL0pVVGxzVHJPSgpIM3d6YlhDWGlRS0JnUUROWGRjaGRNWnhnbEt2Znc1WnpkUlhmejdPWFB5dWZXb2xPTXFYQWE5OHV6K3pucEZSCnl0YjkwcUlINFF5OUZXeFFFSFZqa0FvUmd5bTdyVUZYY0xLZDBWUms1QnphMHd5UWtaMm5RcFM1ZElSTjc4OHYKeVhUTGF0Z0wxUWwxRCtkekRyZjRiTjRMZEFHK1drd1BsamJ0dTh1OWM1amp3aGMrMkRybjk2blZ3UUtCZ0FyUgpDSTJIZkVlYkVmNEdNL3FQV2xRTkY5Sk1sci9aRll6aTQyZ1Zvd1Z3UDAxS1RwdGoyUWFkbm1PTGFzeTVjSXUwCmhzZVlnRlIrNW10ZnZLV2tZMHpDbVd5YWtWd25NVHU1bm1DR3BkU1FWUGRKU2dSd2haRDRyKzVNT2Z5aXFrb2UKbHRRODRPY29WTmcwUDUyNkkyelRaaEgzT1pYbm1sbFRacVJ4T3dtWkFvR0JBTU8rYTdySGszalo1eFh2by81SwpzNU02L29SS2RqV1lHek1sdmY5MXZrV3VwWWNDWjdlT2M5c0xBSzdybEw5aklqSDVuOGdYODZDYlR6ODBXTnE4CmZQREpFN3hsNnFRc2Y2WU5FbUVmSVhhdkNSY3MyU25LY0lXbklQbzJCWTFPWWVEay8rR1JhNVArMkxEL3o3cnYKN2JsWklOcGVaZkpBRG9pQmhhdEZQcmpuCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### 0.1.4
+
+What changed in this version?
+
+* Change 1
+* Change 2
+* Change 3
+
 ### 0.1.3
 
 What changed in this version?

index.js

@@ -1,12 +1,8 @@
 'use strict';
 
-if(!process.env.HEROKU) {
+if (!process.env.HEROKU) {
   require('dotenv').config();
 }
-/**
- * npm packages
- */
-const fs = require('fs');
 const express = require('express');
 const app = require('express')();
 const base64 = require('base-64');
@@ -28,27 +24,27 @@ if (process.env.HTTPS) {
 const server = process.env.HTTPS ? require('https').createServer(options, app) : require('http').createServer(app);
 const port = process.env.PORT;
 const cors = require('cors');
-const ip = require("ip");
-
-global.os = require('os');
-global.ifaces = os.networkInterfaces();
 
-Object.keys(ifaces).forEach(function (ifname) {
-  var alias = 0;
-
-  ifaces[ifname].forEach(function (iface) {
-    if ('IPv4' !== iface.family || iface.internal !== false) {
-      return;
+/**
+ * Replace ip package with custom IP class
+ */
+class IP {
+  address() {
+    const os = require('os');
+    const networkInterfaces = os.networkInterfaces();
+    for (const interfaceName of Object.keys(networkInterfaces)) {
+      for (const iface of networkInterfaces[interfaceName]) {
+        // Skip over internal (i.e., 127.0.0.1) and non-IPv4 addresses
+        if (iface.family === 'IPv4' && !iface.internal) {
+          return iface.address;
+        }
+      }
     }
+    return '127.0.0.1';
+  }
+}
 
-    if (alias >= 1) {
-      console.log(ifname + ':' + alias, iface.address);
-    } else {
-      console.log(ifname, iface.address);
-    }
-    ++alias;
-  });
-});
+const ip = new IP();
 
 /**
  * router
@@ -125,8 +121,54 @@ app.all('*', (req, res) => {
   res.redirect('/404');
 });
 
+const convert = (collection) => {
+  if (collection instanceof Map) {
+    let obj = {};
+    for (let [k, v] of collection) {
+      obj[k] = convert(v);
+    }
+    return obj;
+  } else if (collection instanceof Set) {
+    let arr = [];
+    for (let value of collection) {
+      arr.push(convert(value));
+    }
+    return arr;
+  } else {
+    return collection;
+  }
+};
+
+const stringify = (data) => {
+  return JSON.stringify(data);
+};
+
+const wss = require('ws').Server;
+const socket = new wss({ server: server });
+socket.broadcast = (obj) => socket.clients.forEach((client) => client.json(obj));
+
+socket.on('connection', (ws) => {
+  ws.json = (obj) => ws.send(JSON.stringify(obj));
+  ws.broadcast = socket.broadcast;
+  ws.id = uuid()
+
+  ws.on('message', (message) => {
+    message = JSON.parse(message);
+    const { service, data } = message;
+
+    switch (service) {
+      default:
+        log(chalk`{bgWhite.bold ${service}} {white.bold ${stringify(data)}}`);
+        break;
+    }
+  });
+});
+
 module.exports = server.listen(port, () => {
-  log(chalk`{bgBlue.bold Web:} {blue.bold ${process.env.HTTPS ? 'https' : 'http'}://localhost:${port}} {cyan.bold ${process.env.HTTPS ? 'https' : 'http'}://${ip.address()}:${port}}`)
-  log(chalk`{bgBlue.bold API:} {blue.bold ${process.env.HTTPS ? 'https' : 'http'}://api.localhost:${port}} {cyan.bold ${process.env.HTTPS ? 'https' : 'http'}://api.${ip.address()}:${port}}`)
+  log(chalk`
+{bgBlue.bold Web:}\t{blue.bold ${process.env.HTTPS ? 'https' : 'http'}://localhost:${port}} {cyan.bold ${process.env.HTTPS ? 'https' : 'http'}://${ip.address()}:${port}}
+{bgBlue.bold API:}\t{blue.bold ${process.env.HTTPS ? 'https' : 'http'}://api.localhost:${port}} {cyan.bold ${process.env.HTTPS ? 'https' : 'http'}://api.${ip.address()}:${port}}
+{bgBlue.bold Socket:}\t{blue.bold ${process.env.HTTPS ? 'wss' : 'ws'}://localhost:${port}} {cyan.bold ${process.env.HTTPS ? 'wss' : 'ws'}://${ip.address()}:${port}}
+`);
   chalk.reset();
 });

package.json

@@ -10,7 +10,7 @@
     "url": "git+https://github.com/32teeth/generic-nodejs-express-api.git"
   },
   "license": "CC-BY-SA-4.0",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "keywords": [
     "nodejs",
     "express",
@@ -71,7 +71,6 @@
     "dotenv": "^16.3.1",
     "ejs": "^3.1.10",
     "express": "^4.18.2",
-    "ip": "^2.0.1",
     "ws": "^8.16.0"
   },
   "devDependencies": {
@@ -91,4 +90,4 @@
   "directories": {
     "test": "test"
   }
-}
+}