Adding pino logger to hub

Author: louisgv

packages/hyperproxy-hub/package.json

@@ -4,7 +4,7 @@
   "description": "WebRTC hub for hyperproxy browser.",
   "main": "index.js",
   "bin": {
-    "hyperproxy-hub": "./index.js"  
+    "hyperproxy-hub": "./index.js"
   },
   "scripts": {
     "start": "node lib/index.js",
@@ -26,6 +26,7 @@
     "bufferutil": "^3.0.3",
     "hyperproxy-config": "^1.0.0",
     "hyperproxy-node": "^1.0.0",
+    "pino": "^4.16.1",
     "utf-8-validate": "^4.0.0",
     "uws": "^9.14.0"
   },

packages/hyperproxy-hub/src/index.js

@@ -1,3 +1,4 @@
+import Pino from 'pino';
 import WebSocket from 'uws';
 
 import {HUB_PORT as port, HUB_MSG_TYPE} from 'hyperproxy-config';
@@ -7,18 +8,19 @@ const datMap = new Map();
 
 const wss = new WebSocket.Server({port});
 
+const pretty = Pino.pretty();
+pretty.pipe(process.stdout);
+const logger = Pino({
+    name: 'hyperproxy-hub',
+    safe: true
+}, pretty);
+
 function onConnection(ws) {
 
     // Data token
-    const app = ws
-        .upgradeReq
-        .url
-        .split('?')[0]
-        .split('#')[0]
-        .substring(1)
-        .split('/');
+    const app = ws.upgradeReq.url.split('?')[0].split('#')[0].substring(1).split('/');
 
-    console.log('CONNECTED TO APP: ', app);
+    logger.info(app, 'CONNECTED TO APP');
 
     ws.app = app[app.length - 1];
 
@@ -27,33 +29,32 @@ function onConnection(ws) {
         try {
             jsond = JSON.parse(data);
         } catch (e) {
-            console.error(e.message);
+            logger.error(e.message);
             return;
         }
 
-        console.log('Got message', jsond);
+        logger.info(jsond, 'NEW WEBSOCKET MESSAGE');
 
         // if not all channel and no HyperProxy-node has been assigned
         if (jsond.channel !== 'all' && jsond.message.type === HUB_MSG_TYPE.JOIN) {
             if (!datMap[jsond.channel]) {
+                logger.info(jsond.channel, 'SPAWN NEW HYPERPROXY NODE');
                 datMap[jsond.channel] = new HyperProxyNode(jsond.channel);
             }
 
             return;
         }
 
-        wss
-            .clients
-            .forEach((client) => {
-                if (jsond.app === client.app) {
-                    console.log('Broadcasting on app: %s', client.app);
-                    client.send(data);
-                }
-            });
+        wss.clients.forEach((client) => {
+            if (jsond.app === client.app) {
+                logger.info('BROADCASTING ON APP: %s', client.app);
+                client.send(data);
+            }
+        });
     });
 }
 
 wss.on('connection', onConnection);
 wss.on('listening', function() {
-    console.log(`HyperProxy Hub running on ${port}`);
+    logger.info(`HyperProxy Hub running on ${port}`);
 });

packages/hyperproxy-node/package.json

@@ -29,6 +29,7 @@
   "dependencies": {
     "dat-node": "^3.5.8",
     "hyperproxy-config": "^1.0.0",
+    "pino": "^4.16.1",
     "wrtc": "^0.1.1"
   }
 }

packages/hyperproxy-node/src/index.js

@@ -1,12 +1,20 @@
+import Pino from 'pino';
 import Dat from 'dat-node';
 import Swarm from 'webrtc-swarm';
 import SignalHub from 'signalhubws';
-import HyperproxyHubClient from 'hyperproxy-hub-client';
 import Wrtc from 'wrtc';
 import {w3cwebsocket as WebSocket} from 'websocket';
 
+import HyperproxyHubClient from 'hyperproxy-hub-client';
 import {HUB_MSG_TYPE} from 'hyperproxy-config';
 
+const pretty = Pino.pretty();
+pretty.pipe(process.stdout);
+const logger = Pino({
+    name: 'hyperproxy-node',
+    safe: true
+}, pretty);
+
 // TODO: Remove this commented out code @lgvichy
 // https://github.com/goonism/hyperproxy/issues/7
 // 40a7f6b6147ae695bcbcff432f684c7bb5291ea339c28c1755896cdeb80bd2f9

yarn.lock

@@ -1204,7 +1204,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0:
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
   dependencies:
@@ -2173,10 +2173,18 @@ fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
 
+fast-json-parse@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
 
+fast-safe-stringify@^1.0.8, fast-safe-stringify@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz#9fe22c37fb2f7f86f06b8f004377dbf8f1ee7bc1"
+
 fd-read-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-read-stream/-/fd-read-stream-1.1.0.tgz#d303ccbfee02a9a56a3493fb08bcb59691aa53b1"
@@ -2250,6 +2258,10 @@ flat-tree@^1.3.0, flat-tree@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/flat-tree/-/flat-tree-1.6.0.tgz#fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"
 
+flatstr@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/flatstr/-/flatstr-1.0.5.tgz#5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"
+
 for-each@^0.3.2, for-each@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.2.tgz#2c40450b9348e97f281322593ba96704b9abd4d4"
@@ -3999,6 +4011,23 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+pino-std-serializers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-2.0.0.tgz#63cbacf34bed8c95dd2c67eec824e48b8dd3445f"
+
+pino@^4.16.1:
+  version "4.16.1"
+  resolved "https://registry.yarnpkg.com/pino/-/pino-4.16.1.tgz#8bcb6b685ee4d4e26adfe79a05f12f6b46962d40"
+  dependencies:
+    chalk "^2.3.2"
+    fast-json-parse "^1.0.3"
+    fast-safe-stringify "^1.2.3"
+    flatstr "^1.0.5"
+    pino-std-serializers "^2.0.0"
+    pump "^3.0.0"
+    quick-format-unescaped "^1.1.2"
+    split2 "^2.2.0"
+
 prebuild-install@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.3.0.tgz#19481247df728b854ab57b187ce234211311b485"
@@ -4132,6 +4161,12 @@ [email protected]:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
+quick-format-unescaped@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz#0ca581de3174becef25ac3c2e8956342381db698"
+  dependencies:
+    fast-safe-stringify "^1.0.8"
+
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
@@ -4702,7 +4737,7 @@ speedometer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-1.0.0.tgz#cd671cb06752c22bca3370e2f334440be4fc62e2"
 
-split2@^2.0.0:
+split2@^2.0.0, split2@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
   dependencies: