require() => import

Author: RickCarlino

app/config.ts

@@ -1,4 +1,4 @@
-let log = require("./logger");
+import log from "./logger";
 
 // TODO: Clean up ENV management into something less crappy.
 // or use a 3rd party node ENV manager module.

app/index.ts

@@ -1,7 +1,9 @@
-let Server = require("mosca").Server;
-let conf = require("./config");
-let onReady = require("./on_ready");
-let maybeEnableSSL = require("./security/maybe_enable_ssl");
+import { Server } from "mosca";
+import { 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 = {
     allowNonSecure: true,
@@ -20,7 +22,5 @@ server.on("ready", onReady(server));  //on init it fires up setup()
 server.on("ready", function() {
     console.dir(input);
 });
-let authorizePublish = require("./security/authorize_publish");
-let authorizeSubscribe = require("./security/authorize_subscribe");
 server.authorizePublish = authorizePublish;
 server.authorizeSubscribe = authorizeSubscribe;

app/logger.ts

@@ -1,4 +1,4 @@
-export default function () {
+export default function (args: any) {
     if (!process.env.DISABLE_LOGS) {
         console.log.apply(this, arguments);
     }

app/on_ready.ts

@@ -1,7 +1,7 @@
-let authenticate = require("./security/authenticate");
-let authorizePublish = require("./security/authorize_publish");
-let authorizeSubscribe = require("./security/authorize_subscribe");
-let log = require("./logger");
+import { authenticate } from "./security/authenticate";
+import { authorizePublish } from "./security/authorize_publish";
+import { authorizeSubscribe } from "./security/authorize_subscribe";
+import { log } from "./logger";
 
 module.exports = (server) => () => {
     log("Server online");

app/security/authenticate.ts

@@ -1,7 +1,7 @@
 // test@test.com password123
-let fetchToken = require("./fetch_token");
-let verifyToken = require("./verify_token");
-let log = require("../logger");
+import { fetchToken } from "./fetch_token";
+import { verifyToken } from "./verify_token";
+import { log } from "../logger";
 
 function determineAuthStrategy(username, password) {
     // Really long password? Probably a JWT.

app/security/authorize_publish.ts

@@ -1,4 +1,4 @@
-let canUseTopic = require("./can_use_topic");
+import { canUseTopic } from "./can_use_topic";
 
 export default function authorizePublish(client, topic, payload, callback) {
   callback(null, canUseTopic(client, topic));

app/security/authorize_subscribe.ts

@@ -1,5 +1,5 @@
-let canUseTopic = require("./can_use_topic");
+import { canUseTopic } from "./can_use_topic";
 
 export default function authorizeSubscribe(client, topic, callback) {
   callback(null, canUseTopic(client, topic));
-}
+}

app/security/can_use_topic.ts

@@ -1,9 +1,9 @@
-let log = require("../logger");
+import { log } from "../logger";
 
 // If a user has a bot of id XYZ, then they may access any topic
 // following pattern bot/XYZ/#
 
-module.exports = function (client, topic) {
+export default function (client, topic) {
     let hasBot = topic && client && client.permissions && client.permissions.bot;
     if (!hasBot) {
         log("Tried to access topic " + (topic || "???") + " but no bot/topic provided.");

app/security/fetch_token.ts

@@ -1,7 +1,8 @@
-let post = require('axios').post;
-let config = require("../config");
-let TOKEN_URL = "" + config.webAppUrl + '/api/tokens';
-let log = require("../logger");
+import { post } from "axios";
+import { webAppUrl } from "../config";
+import { log } from "../logger";
+
+const TOKEN_URL = "" + config.webAppUrl + '/api/tokens';
 
 export default function (password, username) {
   let params = {

app/security/maybe_enable_ssl.ts

@@ -6,7 +6,7 @@ let SSL_MQTT_PORT = 8883;
 let HTTPS_PORT = 443;
 let SSL_CERT = SSL_DIR + "cert.pem";
 let SSL_KEY = SSL_DIR + "privkey.pem";
-let log = require("../logger");
+import { log } from "../logger";
 
 export default function maybeEnableSSL(config) {
     if (SSL) {

app/security/verify_token.ts

@@ -1,7 +1,9 @@
-let url = require('../config').webAppUrl + "/api/public_key";
-let get = require('axios').get;
-let jwt = require('jsonwebtoken');
-let log = require("../logger");
+import { webAppUrl } from "../config";
+import { get } from "axios";
+import * as jwt from "jsonwebtoken";
+import { log } from "../logger";
+
+let url = webAppUrl + "/api/public_key";
 
 function keyOk(resp) {
   log("Downloaded certificate from " + url);