Merge pull request #99 from cruxprotocol/feature/logger-separated

Shift logger to subpackage

Author: nandubatchu

package-lock.json

@@ -60,7 +60,6 @@
     "@types/chai": "^4.2.3",
     "@types/expect": "^1.20.4",
     "@types/mocha": "^5.2.7",
-    "@types/node-fetch": "^2.5.2",
     "@types/request": "^2.48.3",
     "@types/sinon": "^7.0.13",
     "chai": "^4.2.0",
@@ -90,7 +89,6 @@
     "blockstack": "^19.2.5",
     "js-logger": "^1.6.0",
     "jsontokens": "^2.0.2",
-    "node-fetch": "^2.6.0",
     "regenerator-runtime": "^0.13.3"
   }
 }

package.json

@@ -1,16 +1,5 @@
-import Logger from "js-logger";
-import path from "path";
 import "regenerator-runtime/runtime";
 import config from "./config";
-
-// Setup logging configuration
-Logger.useDefaults();
-Logger.setLevel(config.CONFIG_MODE === "prod" ? Logger.INFO : Logger.DEBUG);
-export function getLogger(filename: string) {
-    return Logger.get("CruxPay: " + filename.slice(filename.lastIndexOf(path.sep) + 1, filename.length - 3));
-}
-const log = getLogger(__filename);
-
 // Importing packages
 import {
     blockstackService,
@@ -22,8 +11,11 @@ import {
     storage,
     utils,
 } from "./packages";
+import { getLogger } from "./packages/logger";
 import { getCruxIDByAddress } from "./packages/name-service/utils";
 
+const log = getLogger(__filename);
+
 // Setup cache storage
 export let cacheStorage: storage.StorageService;
 

src/index.ts

@@ -1,11 +1,10 @@
-import { getLogger } from "..";
 import config from "../config";
 import { ErrorHelper, PackageErrorCode } from "./error";
 import { getContentFromGaiaHub, getGaiaDataFromBlockstackID } from "./gaia-service/utils";
 import * as identityUtils from "./identity-utils";
+import { getLogger } from "./logger";
 import { IIdentityClaim } from "./name-service";
 import * as blockstackService from "./name-service/blockstack-service";
-import { getCruxIDByAddress } from "./name-service/utils";
 
 const log = getLogger(__filename);
 const CONFIG_SUBDOMAIN = "_config";

src/packages/configuration-service.ts

@@ -1,6 +1,6 @@
 import * as blockstack from "blockstack";
 import { SECP256K1Client, TokenSigner } from "jsontokens";
-import { getLogger } from "../..";
+import { getLogger } from "../logger";
 import { sanitizePrivKey } from "../utils";
 
 const log = getLogger(__filename);

src/packages/gaia-service/index.ts

@@ -1,6 +1,6 @@
 import * as blockstack from "blockstack";
-import { getLogger } from "../..";
 import { ErrorHelper, PackageErrorCode } from "../error";
+import { getLogger } from "../logger";
 import * as nameservice from "../name-service/blockstack-service";
 import { fetchNameDetails } from "../name-service/utils";
 import { cachedFunctionCall, httpJSONRequest } from "../utils";

src/packages/gaia-service/utils.ts

@@ -0,0 +1,10 @@
+import Logger from "js-logger";
+import path from "path";
+import config from "../config";
+
+// Setup logging configuration
+Logger.useDefaults();
+Logger.setLevel(config.CONFIG_MODE === "prod" ? Logger.INFO : Logger.DEBUG);
+export function getLogger(filename: string) {
+    return Logger.get("CruxPay: " + filename.slice(filename.lastIndexOf(path.sep) + 1, filename.length - 3));
+}

src/packages/logger.ts

@@ -2,7 +2,7 @@ import { Decoder, object, optional, string } from "@mojotech/json-type-validatio
 import * as bip39 from "bip39";
 import {bip32} from "bitcoinjs-lib";
 import * as blockstack from "blockstack";
-import { getLogger, IAddress, IAddressMapping } from "../..";
+import { IAddress, IAddressMapping } from "../..";
 
 import {randomBytes} from "crypto";
 import { Encryption } from "../encryption";
@@ -11,6 +11,7 @@ import { PackageError } from "../error/package-error";
 import { GaiaService } from "../gaia-service";
 import { getContentFromGaiaHub } from "../gaia-service/utils";
 import { BlockstackId, CRUX_DOMAIN_SUFFIX, CruxId, DEFAULT_BLOCKSTACK_NAMESPACE, IdTranslator } from "../identity-utils";
+import { getLogger } from "../logger";
 import { StorageService } from "../storage";
 import * as utils from "../utils";
 import * as nameService from "./index";

src/packages/name-service/blockstack-service.ts

@@ -1,7 +1,7 @@
 import { AssertionError, deepStrictEqual } from "assert";
-import { getLogger } from "../..";
 import { ErrorHelper, PackageErrorCode } from "../error";
 import { BlockstackId, CRUX_DOMAIN_SUFFIX, DEFAULT_BLOCKSTACK_NAMESPACE, IdTranslator } from "../identity-utils";
+import { getLogger } from "../logger";
 import { cachedFunctionCall, httpJSONRequest } from "../utils";
 
 const log = getLogger(__filename);

src/packages/name-service/utils.ts

@@ -1,4 +1,4 @@
-import { getLogger } from "..";
+import { getLogger } from "./logger";
 
 const log = getLogger(__filename);