Move logger to common/logger

server/scripts/initialise-counters.ts

@@ -1,5 +1,5 @@
 import db from "../db/db";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "../common/logger";
 
 const logger = CreateLogCtx("scripts/initialise-counters.ts");
 

server/src/api/auth/auth.ts

@@ -15,7 +15,7 @@ import {
 } from "../../common/user";
 
 import db from "../../db/db";
-import CreateLogCtx from "../../logger";
+import CreateLogCtx from "../../common/logger";
 import prValidate from "../../middleware/prudence-validate";
 import { RequireLoggedIn } from "../../middleware/require-logged-in";
 

server/src/api/import/import.ts

@@ -4,7 +4,7 @@ import { fileImportTypes } from "kamaitachi-common/js/config";
 import multer, { MulterError } from "multer";
 import Prudence from "prudence";
 import { GetUserWithIDGuaranteed } from "../../common/user";
-import CreateLogCtx from "../../logger";
+import CreateLogCtx from "../../common/logger";
 import prValidate from "../../middleware/prudence-validate";
 import { RequireLoggedIn } from "../../middleware/require-logged-in";
 import ScoreImportFatalError from "../../score-import/framework/score-importing/score-import-error";

server/src/api/ir/direct-manual/direct-manual.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
 import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../common/user";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import { RequireLoggedIn } from "../../../middleware/require-logged-in";
 import { ExpressWrappedScoreImportMain } from "../../../score-import/framework/express-wrapper";
 import ParseDirectManual from "../../../score-import/import-types/ir/direct-manual/parser";

server/src/common/auth.ts

@@ -9,9 +9,9 @@ import {
 import db from "../db/db";
 import { GetNextCounterValue } from "./db";
 import { InsertResult } from "monk";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "./logger";
 import { FormatUserDoc } from "./user";
-import nodeFetch from "../fetch";
+import nodeFetch from "./fetch";
 import { CAPTCHA_SECRET_KEY } from "../secrets";
 
 const logger = CreateLogCtx("auth.ts");

server/src/common/class.ts

@@ -1,7 +1,7 @@
 import { Game, integer, Playtypes, UserGameStats } from "kamaitachi-common";
 import { ClassData, gameClassValues } from "kamaitachi-common/js/game-classes";
 import db from "../db/db";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "./logger";
 
 const logger = CreateLogCtx("class.ts");
 

server/src/common/db.ts

@@ -1,5 +1,5 @@
 import db from "../db/db";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "./logger";
 const logger = CreateLogCtx("db.ts");
 import { integer } from "kamaitachi-common";
 

server/src/common/folder.test.ts

@@ -1,5 +1,5 @@
 import t from "tap";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "./logger";
 import { Testing511SPA } from "../test-utils/test-data";
 import { ChartDocument, FolderDocument } from "kamaitachi-common";
 import {

server/src/common/folder.ts

@@ -1,5 +1,5 @@
 import db from "../db/db";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "./logger";
 import { FolderDocument, AnyChartDocument, AnySongDocument } from "kamaitachi-common";
 import { FilterQuery } from "mongodb";
 import deepmerge from "deepmerge";

server/src/common/goal.test.ts

@@ -1,6 +1,6 @@
 import t from "tap";
 import db, { CloseMongoConnection } from "../db/db";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "./logger";
 import ResetDBState from "../test-utils/reset-db-state";
 import { EvaluateGoalForUser } from "./goal";
 import { GoalDocument } from "kamaitachi-common";

server/src/common/logger.test.ts

@@ -1,5 +1,5 @@
 import t from "tap";
-import { CloseMongoConnection } from "./db/db";
+import { CloseMongoConnection } from "../db/db";
 import CreateLogCtx, { Transports } from "./logger";
 
 t.test("Logger Tests", (t) => {

server/src/common/logger.ts

@@ -1,5 +1,5 @@
 import winston, { format, transports } from "winston";
-import { KtLogger } from "./types";
+import { KtLogger } from "../types";
 
 const level = process.env.LOG_LEVEL ?? "info";
 

server/src/common/tierlist.ts

@@ -1,7 +1,7 @@
 import crypto from "crypto";
 import { AnyChartDocument, Game, Playtypes } from "kamaitachi-common";
 import db from "../db/db";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "./logger";
 
 const logger = CreateLogCtx("tierlist.ts");
 

server/src/common/user.ts

@@ -1,7 +1,7 @@
 import { integer, PublicUserDocument } from "kamaitachi-common";
 import { FindOneResult } from "monk";
 import db from "../db/db";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "./logger";
 
 const logger = CreateLogCtx("user.ts");
 

server/src/db/db.ts

@@ -25,7 +25,7 @@ import {
     UserMilestoneDocument,
 } from "kamaitachi-common";
 import monk from "monk";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "../common/logger";
 
 const logger = CreateLogCtx("db.ts");
 

server/src/main.ts

@@ -11,7 +11,7 @@ function FormatVersion() {
     return `v${[major, minor, patch].join(".")} (${name})`;
 }
 
-import CreateLogCtx from "./logger";
+import CreateLogCtx from "./common/logger";
 import server from "./server";
 import serverConfig from "./server-config";
 import dotenv from "dotenv";

server/src/middleware/prudence-validate.ts

@@ -1,5 +1,5 @@
 import Prudence, { MiddlewareErrorHandler } from "prudence";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "../common/logger";
 
 const logger = CreateLogCtx("prudence-validate.ts");
 

server/src/middleware/require-logged-in.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from "express";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "../common/logger";
 
 const logger = CreateLogCtx("require-logged-in.ts");
 

server/src/redis/redis-store.ts

@@ -1,6 +1,6 @@
 import connectRedis from "connect-redis";
 import expressSession from "express-session";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "../common/logger";
 import redis from "redis";
 
 const logger = CreateLogCtx("redis-store.ts");

server/src/score-import/framework/calculated-data/calculated-data.test.ts

@@ -1,7 +1,7 @@
 import Pr from "prudence";
 import t from "tap";
 import db, { CloseMongoConnection } from "../../../db/db";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import { prAssert } from "../../../test-utils/asserts";
 import {
     Testing511SPA,

server/src/score-import/framework/calculated-data/game-specific-stats.test.ts

@@ -12,7 +12,7 @@ import {
     CalculateVF5,
     KaidenPercentile,
 } from "./game-specific-stats";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import { isApproximately } from "../../../test-utils/asserts";
 
 t.test("#CalculateBPI", (t) => {

server/src/score-import/framework/calculated-data/game-specific.test.ts

@@ -1,7 +1,7 @@
 import Pr from "prudence";
 import t from "tap";
 import { CloseMongoConnection } from "../../../db/db";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import { prAssert } from "../../../test-utils/asserts";
 import {
     Testing511SPA,

server/src/score-import/framework/common/import-logger.ts

@@ -1,7 +1,7 @@
 import { ImportTypes, PublicUserDocument } from "kamaitachi-common";
 import crypto from "crypto";
 import { FormatUserDoc } from "../../../common/user";
-import { rootLogger } from "../../../logger";
+import { rootLogger } from "../../../common/logger";
 import { KtLogger } from "../../../types";
 
 export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) {

server/src/score-import/framework/common/score-utils.ts

@@ -10,7 +10,7 @@ import {
     Playtypes,
 } from "kamaitachi-common";
 import { judgementWindows, gamePercentMax } from "kamaitachi-common/js/config";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import { InternalFailure, InvalidScoreFailure } from "./converter-failures";
 
 const logger = CreateLogCtx("score-utils.ts");

server/src/score-import/framework/goals/goals.test.ts

@@ -19,7 +19,7 @@ import {
     TestingIIDXFolderSP10,
 } from "../../../test-utils/test-data";
 import deepmerge from "deepmerge";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import crypto from "crypto";
 
 const logger = CreateLogCtx("goals.test.ts");

server/src/score-import/framework/milestones/milestones.test.ts

@@ -1,6 +1,6 @@
 import t from "tap";
 import db, { CloseMongoConnection } from "../../../db/db";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import ResetDBState from "../../../test-utils/reset-db-state";
 import { TestingIIDXSPMilestone } from "../../../test-utils/test-data";
 import { UpdateUsersMilestones } from "./milestones";

server/src/score-import/framework/pb/create-pb-doc.test.ts

@@ -4,7 +4,7 @@ import ResetDBState from "../../../test-utils/reset-db-state";
 import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data";
 import { CreatePBDoc } from "./create-pb-doc";
 import deepmerge from "deepmerge";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import { KtLogger } from "../../../types";
 import { lamps } from "kamaitachi-common/js/config";
 

server/src/score-import/framework/pb/process-pbs.test.ts

@@ -1,6 +1,6 @@
 import t from "tap";
 import db, { CloseMongoConnection } from "../../../db/db";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import ResetDBState from "../../../test-utils/reset-db-state";
 import { Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data";
 import { ProcessPBs } from "./process-pbs";

server/src/score-import/framework/score-importing/insert-score.ts

@@ -1,6 +1,6 @@
 import { ScoreDocument } from "kamaitachi-common";
 import db from "../../../db/db";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 
 const logger = CreateLogCtx("insert-score.ts");
 const ScoreQueue: ScoreDocument[] = [];

server/src/score-import/framework/score-importing/score-importing.ts

@@ -24,7 +24,7 @@ import {
 } from "../common/converter-failures";
 import { CreateScoreID } from "./score-id";
 import db from "../../../db/db";
-import { AppendLogCtx } from "../../../logger";
+import { AppendLogCtx } from "../../../common/logger";
 
 /**
  * Processes the iterable data into the Kamaitachi database.

server/src/score-import/framework/sessions/sessions.ts

@@ -10,7 +10,7 @@ import {
     Game,
 } from "kamaitachi-common";
 import db from "../../../db/db";
-import { AppendLogCtx } from "../../../logger";
+import { AppendLogCtx } from "../../../common/logger";
 import { GenerateRandomSessionName } from "./name-generation";
 import crypto from "crypto";
 import { CreateSessionCalcData } from "./performance-calc";

server/src/score-import/framework/user-game-stats/classes.test.ts

@@ -1,7 +1,7 @@
 import { UserGameStats } from "kamaitachi-common";
 import t from "tap";
 import { CloseMongoConnection } from "../../../db/db";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import ResetDBState from "../../../test-utils/reset-db-state";
 import { CalculateClassDeltas, UpdateUGSClasses } from "./classes";
 

server/src/score-import/framework/user-game-stats/rating.test.ts

@@ -4,7 +4,7 @@ import ResetDBState from "../../../test-utils/reset-db-state";
 import { TestingIIDXSPScorePB } from "../../../test-utils/test-data";
 import { CalculateCustomRatings, CalculateRatings } from "./rating";
 import deepmerge from "deepmerge";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import crypto from "crypto";
 
 const logger = CreateLogCtx("rating.test.ts");

server/src/score-import/framework/user-game-stats/update-ugs.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import t from "tap";
 import db, { CloseMongoConnection } from "../../../db/db";
-import CreateLogCtx from "../../../logger";
+import CreateLogCtx from "../../../common/logger";
 import ResetDBState from "../../../test-utils/reset-db-state";
 import { UpdateUsersGamePlaytypeStats } from "./update-ugs";
 import deepmerge from "deepmerge";

server/src/score-import/import-types/common/api-kai/iidx/parser.ts

@@ -1,5 +1,5 @@
 import { KtLogger, ParserFunctionReturnsAsync } from "../../../../../types";
-import nodeFetch from "../../../../../fetch";
+import nodeFetch from "../../../../../common/fetch";
 import { KaiAuthDocument } from "kamaitachi-common";
 import { KaiContext } from "../types";
 import { EAG_API_URL, FLO_API_URL } from "../../../../../secrets";

server/src/score-import/import-types/common/api-kai/sdvx/parser.ts

@@ -1,5 +1,5 @@
 import { KtLogger, ParserFunctionReturnsAsync } from "../../../../../types";
-import nodeFetch from "../../../../../fetch";
+import nodeFetch from "../../../../../common/fetch";
 import { KaiAuthDocument } from "kamaitachi-common";
 import { KaiContext } from "../types";
 import { EAG_API_URL, FLO_API_URL } from "../../../../../secrets";

server/src/score-import/import-types/common/api-kai/traverse-api.ts

@@ -1,6 +1,6 @@
 import { KtLogger } from "../../../../types";
 import ScoreImportFatalError from "../../../framework/score-importing/score-import-error";
-import nodeFetch from "../../../../fetch";
+import nodeFetch from "../../../../common/fetch";
 import { KaiAuthDocument } from "kamaitachi-common";
 
 /**

server/src/score-import/import-types/common/batch-manual/converter.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import t from "tap";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import { Testing511Song, Testing511SPA } from "../../../../test-utils/test-data";
 import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter";
 import deepmerge from "deepmerge";

server/src/score-import/import-types/common/batch-manual/parser.test.ts

@@ -1,6 +1,6 @@
 import t from "tap";
 import { CloseMongoConnection } from "../../../../db/db";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import ScoreImportFatalError from "../../../framework/score-importing/score-import-error";
 import { ParseBatchManualFromObject as ParserFn } from "./parser";
 import { BatchManual } from "./types";

server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts

@@ -1,6 +1,6 @@
 import t from "tap";
 import db, { CloseMongoConnection } from "../../../../db/db";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import ResetDBState from "../../../../test-utils/reset-db-state";
 import ConverterFn, { EamScoreConverter, EamScoreConverterWrapper } from "./converter";
 import p from "prudence";

server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts

@@ -1,5 +1,5 @@
 import t from "tap";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import ScoreImportFatalError from "../../../framework/score-importing/score-import-error";
 import GenericParseEamIIDXCSV, { NaiveCSVParse, ResolveHeaders } from "./parser";
 import { CloseMongoConnection } from "../../../../db/db";

server/src/score-import/import-types/file/mer-iidx/converter.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import t from "tap";
 import db, { CloseMongoConnection } from "../../../../db/db";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import ResetDBState from "../../../../test-utils/reset-db-state";
 import {
     GetKTDataJSON,

server/src/score-import/import-types/file/mer-iidx/parser.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import t from "tap";
 import { CloseMongoConnection } from "../../../../db/db";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import { MockMulterFile } from "../../../../test-utils/mock-multer";
 import ResetDBState from "../../../../test-utils/reset-db-state";
 import { GetKTDataBuffer, GetKTDataJSON } from "../../../../test-utils/test-data";

server/src/score-import/import-types/file/solid-state-squad/converter.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import t from "tap";
 import db, { CloseMongoConnection } from "../../../../db/db";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import ResetDBState from "../../../../test-utils/reset-db-state";
 import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data";
 import { ConvertFileS3, ParseDifficulty, ResolveS3Lamp } from "./converter";

server/src/score-import/import-types/file/solid-state-squad/parser.test.ts

@@ -2,7 +2,7 @@
 import t from "tap";
 import { GetMilisecondsSince } from "../../../../common/hrtime";
 import { CloseMongoConnection } from "../../../../db/db";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import { MockMulterFile } from "../../../../test-utils/mock-multer";
 import ResetDBState from "../../../../test-utils/reset-db-state";
 import { GetKTDataBuffer } from "../../../../test-utils/test-data";

server/src/score-import/import-types/ir/fervidex/converter.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import t from "tap";
 import db, { CloseMongoConnection } from "../../../../db/db";
-import CreateLogCtx from "../../../../logger";
+import CreateLogCtx from "../../../../common/logger";
 import ResetDBState from "../../../../test-utils/reset-db-state";
 import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data";
 import { InternalFailure } from "../../../framework/common/converter-failures";

server/src/server.ts

@@ -1,6 +1,6 @@
 import express, { Express } from "express";
 import "express-async-errors";
-import CreateLogCtx from "./logger";
+import CreateLogCtx from "./common/logger";
 import expressSession from "express-session";
 import { SESSION_SECRET } from "./secrets";
 import { integer } from "kamaitachi-common";

server/src/test-utils/fake-session.ts

@@ -1,5 +1,5 @@
 import ResetDBState from "./reset-db-state";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "../common/logger";
 import supertest from "supertest";
 
 const logger = CreateLogCtx("fake-session.ts");

server/src/test-utils/mock-api.ts

@@ -1,5 +1,5 @@
 import supertest from "supertest";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "../common/logger";
 
 const logger = CreateLogCtx("mock-api.ts");
 

server/src/test-utils/mock-fetch.ts

@@ -1,5 +1,5 @@
 import { Response } from "node-fetch";
-import { NodeFetch } from "../fetch";
+import { NodeFetch } from "../common/fetch";
 
 export function MockFetch(data: Partial<Response>) {
     // We know! this is a mock function.

server/src/test-utils/reset-db-state.ts

@@ -4,7 +4,7 @@
 import db from "../db/db";
 import fs from "fs";
 import path from "path";
-import CreateLogCtx from "../logger";
+import CreateLogCtx from "../common/logger";
 
 const logger = CreateLogCtx("reset-db-state.ts");