Prechádzať zdrojové kódy

- Add debuging logs

Parad0x 7 rokov pred
rodič
commit
aa569ca452

+ 2 - 1
nodemon.json

@@ -12,7 +12,8 @@
     "src/"
   ],
   "env": {
-    "NODE_ENV": "development"
+    "NODE_ENV": "development",
+    "DEBUG": "totify:*"
   },
   "ext": "js"
 }

+ 72 - 3
package-lock.json

@@ -268,6 +268,17 @@
         "private": "0.1.8",
         "slash": "1.0.0",
         "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "babel-generator": {
@@ -892,6 +903,17 @@
         "globals": "9.18.0",
         "invariant": "2.2.4",
         "lodash": "4.17.10"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "babel-types": {
@@ -1366,9 +1388,9 @@
       }
     },
     "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
       "requires": {
         "ms": "2.0.0"
       }
@@ -1722,6 +1744,14 @@
             "to-regex": "3.0.2"
           },
           "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
             "define-property": {
               "version": "0.2.5",
               "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -2999,6 +3029,16 @@
         "debug": "2.6.9",
         "iconv-lite": "0.4.23",
         "sax": "1.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "node-fetch": {
@@ -4087,6 +4127,16 @@
       "requires": {
         "bluebird": "3.5.1",
         "debug": "2.6.9"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "rimraf": {
@@ -4250,6 +4300,14 @@
         "use": "3.1.1"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -4725,6 +4783,17 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "union-value": {

+ 1 - 0
package.json

@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "chalk": "^2.4.1",
+    "debug": "^3.1.0",
     "dotenv": "^6.0.0",
     "moment": "^2.22.2",
     "pkg": "^4.3.4",

+ 5 - 5
src/bot/app.js

@@ -23,7 +23,7 @@ function app() {
       })
       ctx.reply(`${app.name} accepted`);
     } catch (e) {
-      ie(1);
+      ie(1, e);
     }
   });
 
@@ -34,7 +34,7 @@ function app() {
       await app.destroy();
       ctx.reply(`${app.name} deleted`);
     } catch (e) {
-      ie(2);
+      ie(2, e);
     }
   });
 
@@ -56,14 +56,13 @@ function app() {
           `❌[${el.id}] ${el.name}`
         ]
       });
-      console.log(apps);
       return ctx.reply('Activate app', Markup
         .keyboard(apps)
         .oneTime()
         .resize()
         .extra());
     } catch (e) {
-      ie(3);
+      ie(3, e);
     }
   });
 
@@ -84,8 +83,9 @@ function app() {
         `Auth: ${instance.auth}`);
       return;
     } catch (e) {
-      ie(4);
+      ie(4, e);
     }
   });
+
 }
 module.exports = app;

+ 4 - 4
src/bot/auth.js

@@ -28,7 +28,7 @@ function auth() {
       }
       next();
     } catch (e) {
-      ie(1);
+      ie(1, e);
     }
   });
 
@@ -64,7 +64,7 @@ function auth() {
         ctx.reply("Wrong authentication code. Will be banned for 24H")
       }
     } catch (e) {
-      ie(2);
+      ie(2, e);
     }
   });
 
@@ -76,7 +76,7 @@ function auth() {
         ctx.reply("You need to be authorised");
       }
     } catch (e) {
-      ie(3);
+      ie(3, e);
     }
   })
 
@@ -84,7 +84,7 @@ function auth() {
     try {
       ctx.reply(`Actual authentication code: ${authCode.get()}`);
     } catch (e) {
-      ie(4);
+      ie(4, e);
     }
   });
 }

+ 1 - 1
src/connectionHandler.js

@@ -65,7 +65,7 @@ class Connection {
           }
         }
       } catch (e) {
-        ie(1);
+        ie(1, e);
       }
     })
 

+ 7 - 1
src/index.js

@@ -8,6 +8,7 @@ require("dotenv").config({
 
 const net = require("net");
 const chalk = require("chalk");
+const debug = require("debug")("totify:main");
 
 const socketPathCon = require("./utils/socketPath");
 const connectionHandler = require("./connectionHandler");
@@ -22,10 +23,14 @@ const socketPath = socketPathCon();
 
 (async () => {
 
+  debug("Starting awaited init");
   await init();
+  debug("Initializing done")
 
+  debug("Preparing bot");
   prepareBot();
 
+  debug("Starting server")
   server.listen(path.resolve(socketPath), () => {
     console.log(`Server is listening on ${socketPath}`);
   });
@@ -39,6 +44,7 @@ const socketPath = socketPathCon();
       ));
     } else {
       console.log("Unexpected error, code:", err.code);
+      debug(err);
     }
     server.close(() => {
       process.exit();
@@ -57,5 +63,5 @@ const socketPath = socketPathCon();
   process.on("SIGTERM", sigHandler);
 })().catch(err => {
   console.log("Main thread error:");
-  console.log(err);
+  debug(err);
 });

+ 6 - 1
src/utils/internalError.js

@@ -1,7 +1,12 @@
 //@flow
 
+const debug = require("debug")("totify:ie");
+
 module.exports = (modid) => {
-  return id => {
+  return (id, e) => {
     console.log(`Internal Error: sig[${modid}]${id}`);
+    if (e) {
+      debug(e);
+    }
   }
 }