Update logging

Author: RickCarlino

app/index.ts

@@ -1,11 +1,11 @@
-import { Server } from "mosca";
+import { Server, ServerOpts } from "mosca";
 import * as conf from "./config";
 import { onReady } from "./on_ready";
 import { maybeEnableSSL } from "./security/maybe_enable_ssl";
 import { authorizePublish } from "./security/authorize_publish";
 import { authorizeSubscribe } from "./security/authorize_subscribe";
 
-let input = {
+let input: ServerOpts = {
     allowNonSecure: true,
     port: conf.mqttPort,
     http: { // for teh websockets
@@ -15,11 +15,11 @@ let input = {
     }
 };
 
-maybeEnableSSL(input)
+maybeEnableSSL(input);
 let server = new Server(input);
 
-server.on("ready", onReady(server));  //on init it fires up setup()
-server.on("ready", function() {
+server.on("ready", onReady(server));
+server.on("ready", function () {
     console.dir(input);
 });
 server.authorizePublish = authorizePublish;

app/mosca.d.ts

@@ -1,11 +1,23 @@
 declare module "mosca" {
-    export class Server extends EventEmitter {
-        constructor(opts: any);
+    interface ServerOpts {
+        allowNonSecure?: boolean,
+        port?: number,
+        logger?: {
+            level: string
+        },
+        http?: {
+            port?: number,
+            bundle?: boolean,
+            static?: string
+        }
+    }
+
+    export class Server extends NodeJS.EventEmitter {
+        constructor(opts: ServerOpts);
         public toString: () => string;
         public subscribe: (topic, callback, done) => any;
         public publish: (packet, client, callback) => any;
         public authenticate: (client, username, password, callback) => any;
-        public on: any;
         public authorizePublish: any;
         public authorizeSubscribe: any;
     }

app/on_ready.ts

@@ -2,6 +2,7 @@ import { authenticate } from "./security/authenticate";
 import { authorizePublish } from "./security/authorize_publish";
 import { authorizeSubscribe } from "./security/authorize_subscribe";
 import { log } from "./logger";
+import { startLogging } from "./start_logging";
 
 export let onReady = (server) => () => {
     log("Server online");
@@ -14,19 +15,3 @@ function startSecurity(server) {
     server.authorizePublish = authorizePublish;
     server.authorizeSubscribe = authorizeSubscribe;
 }
-
-function startLogging(server) {
-    [
-        "clientConnected",
-        "clientDisconnecting",
-        "clientDisconnected",
-        "published",
-        "subscribed",
-        "unsubscribed",
-        "error"
-    ].forEach(function(event) {
-        server.on(event, function() {
-            log("" + event + " event.");
-        });
-    });
-}

app/security/authenticate.ts

@@ -31,7 +31,7 @@ export function authenticate(client, username: string, password: string, callbac
             log("AUTH FAIL " + username);
             log(error.message);
             log(error);
-            client.authError = error
+            client.authError = error;
             callback(null, false);
         });
 }

app/start_logging.ts

@@ -0,0 +1,16 @@
+import { Server } from "mosca";
+import { log } from "./logger";
+
+const EVENTS = [
+    "clientConnected",
+    "clientDisconnecting",
+    "clientDisconnected",
+    "published",
+    "subscribed",
+    "unsubscribed",
+    "error"
+];
+
+export function startLogging(server: Server) {
+    EVENTS.map(event => server.on(event, () => log(event)));
+}

tslint.json

@@ -0,0 +1,67 @@
+{
+    "rules": {
+        "max-line-length": [
+            true,
+            100
+        ],
+        "no-inferrable-types": true,
+        "class-name": true,
+        "comment-format": [
+            true,
+            "check-space"
+        ],
+        "indent": [
+            true,
+            "spaces"
+        ],
+        "no-switch-case-fall-through": true,
+        "eofline": true,
+        "no-string-literal": true,
+        "no-eval": true,
+        "no-duplicate-variable": true,
+        "no-arg": true,
+        "no-internal-module": true,
+        "no-trailing-whitespace": true,
+        "no-bitwise": true,
+        "no-var-requires": true,
+        "no-shadowed-variable": true,
+        "no-unused-expression": true,
+        "no-unused-variable": true,
+        "one-line": [
+            true,
+            "check-catch",
+            "check-else",
+            "check-open-brace",
+            "check-whitespace"
+        ],
+        "quotemark": [
+            true,
+            "double",
+            "avoid-escape"
+        ],
+        "semicolon": [
+            true,
+            "always"
+        ],
+        "typedef-whitespace": [
+            true,
+            {
+                "call-signature": "nospace",
+                "index-signature": "nospace",
+                "parameter": "nospace",
+                "property-declaration": "nospace",
+                "variable-declaration": "nospace"
+            }
+        ],
+        "curly": true,
+        "whitespace": [
+            true,
+            "check-branch",
+            "check-decl",
+            "check-operator",
+            "check-separator",
+            "check-type"
+        ],
+        "no-any": true
+    }
+}