@moneypot/hub 1.7.0 → 1.8.0-dev.2

package/dist/src/config.d.ts

@@ -1,6 +1,8 @@
 import "dotenv/config";
 export declare const NODE_ENV: string;
 export declare const PORT: number;
+export declare const LOG_LEVEL: string;
+export declare const LOG_PRETTY: boolean | undefined;
 export declare const MP_GRAPHQL_URL: string;
 export declare const DATABASE_URL: string;
 export declare const SUPERUSER_DATABASE_URL: string;

package/dist/src/config.js

@@ -1,13 +1,12 @@
 import "dotenv/config";
 import pgConnectionString from "pg-connection-string";
-import { logger } from "./logger.js";
 import { assert } from "tsafe";
 function getEnvVariable(key, transform = (value) => value) {
     return transform(process.env[key] || "");
 }
 export const NODE_ENV = getEnvVariable("NODE_ENV", (value) => {
     if (!value) {
-        logger.warn("Missing NODE_ENV env var. Defaulting to 'development'");
+        console.warn("Missing NODE_ENV env var. Defaulting to 'development'");
         return "development";
     }
     return value;
@@ -16,22 +15,57 @@ export const PORT = getEnvVariable("PORT", (value) => {
     const parsed = Number.parseInt(value, 10);
     if (!parsed || parsed <= 0 || !Number.isSafeInteger(parsed)) {
         const DEFAULT_PORT = 4000;
-        logger.warn(`Warning: PORT missing or invalid, defaulting to ${DEFAULT_PORT}`);
+        console.warn(`Warning: PORT missing or invalid, defaulting to ${DEFAULT_PORT}`);
         return DEFAULT_PORT;
     }
     return parsed;
 });
+const logLevels = [
+    "silent",
+    "trace",
+    "debug",
+    "info",
+    "warn",
+    "error",
+];
+export const LOG_LEVEL = getEnvVariable("LOG_LEVEL", (value) => {
+    if (logLevels.includes(value)) {
+        if (value === "silent") {
+            console.log("LOG_LEVEL is set to silent. No logging will be done.");
+        }
+        return value;
+    }
+    if (value === "") {
+        console.log(`Defaulting LOG_LEVEL to "info". (Options: ${logLevels.join(", ")})`);
+        return "info";
+    }
+    console.warn(`Unknown LOG_LEVEL: "${value}". Defaulting to "info".`);
+    return "info";
+});
+export const LOG_PRETTY = getEnvVariable("LOG_PRETTY", (value) => {
+    switch (value) {
+        case "":
+            return undefined;
+        case "true":
+            return true;
+        case "false":
+            return false;
+        default:
+            console.warn(`Unknown LOG_PRETTY: "${value}"`);
+            return undefined;
+    }
+});
 export const MP_GRAPHQL_URL = getEnvVariable("MP_GRAPHQL_URL", (value) => {
     if (!value) {
-        logger.warn("Missing MP_GRAPHQL_URL env var. Defaulting to http://localhost:3000/graphql");
+        console.warn("Missing MP_GRAPHQL_URL env var. Defaulting to http://localhost:3000/graphql");
         return "http://localhost:3000/graphql";
     }
     if (!URL.parse(value)) {
-        logger.warn("MP_GRAPHQL_URL is not a valid URL. Defaulting to http://localhost:3000/graphql");
+        console.warn("MP_GRAPHQL_URL is not a valid URL. Defaulting to http://localhost:3000/graphql");
     }
     const url = new URL(value);
     if (url.pathname !== "/graphql") {
-        logger.warn("MP_GRAPHQL_URL pathname is not '/graphql'. Are you sure it points to a graphql endpoint?");
+        console.warn("MP_GRAPHQL_URL pathname is not '/graphql'. Are you sure it points to a graphql endpoint?");
     }
     return value;
 });
@@ -40,11 +74,11 @@ export const DATABASE_URL = getEnvVariable("DATABASE_URL", (value) => {
         throw new Error(`Missing DATABASE_URL env var.`);
     }
     if (!URL.parse(value)) {
-        logger.warn("DATABASE_URL is not a valid URL.");
+        console.warn("DATABASE_URL is not a valid URL.");
     }
     const databaseUrlUsername = pgConnectionString.parse(value).user;
     if (databaseUrlUsername !== "app_postgraphile") {
-        logger.warn(`DATABASE_URL username is ${databaseUrlUsername}, expected app_postgraphile`);
+        console.warn(`DATABASE_URL username is ${databaseUrlUsername}, expected app_postgraphile`);
     }
     return value;
 });
@@ -53,21 +87,21 @@ export const SUPERUSER_DATABASE_URL = getEnvVariable("SUPERUSER_DATABASE_URL", (
         throw new Error("SUPERUSER_DATABASE_URL env var is required");
     }
     if (!URL.parse(value)) {
-        logger.warn("SUPERUSER_DATABASE_URL is not a valid URL.");
+        console.warn("SUPERUSER_DATABASE_URL is not a valid URL.");
     }
     return value;
 });
 export const HASHCHAINSERVER_URL = getEnvVariable("HASHCHAINSERVER_URL", (value) => {
     value = value || "mock-server";
     if (value === "mock-server") {
-        logger.warn("Using mock-server for HASHCHAINSERVER_URL. This is only allowed in development.");
+        console.warn("Using mock-server for HASHCHAINSERVER_URL. This is only allowed in development.");
     }
     else if (!URL.parse(value)) {
-        logger.warn("HASHCHAINSERVER_URL is not a valid URL. It can either be empty, 'mock-server', or URL but it was: " +
+        console.warn("HASHCHAINSERVER_URL is not a valid URL. It can either be empty, 'mock-server', or URL but it was: " +
             value);
     }
     if (NODE_ENV !== "development" && value === "mock-server") {
-        logger.warn("Using mock-server for HASHCHAINSERVER_URL. This is only allowed in development.");
+        console.warn("Using mock-server for HASHCHAINSERVER_URL. This is only allowed in development.");
     }
     return value;
 });
@@ -78,7 +112,7 @@ export const HASHCHAINSERVER_MAX_ITERATIONS = getEnvVariable("HASHCHAINSERVER_MA
 });
 export const HASHCHAINSERVER_APPLICATION_SECRET = getEnvVariable("HASHCHAINSERVER_APPLICATION_SECRET", (value) => {
     if (!value && NODE_ENV !== "development") {
-        logger.warn("Missing HASHCHAINSERVER_APPLICATION_SECRET and NODE_ENV != 'development': To use the hashchain server you must pick a random (but stable) HASHCHAINSERVER_APPLICATION_SECRET for secure communciation with it. (If you aren't using the hashchain server, you can ignore this.)");
+        console.warn("Missing HASHCHAINSERVER_APPLICATION_SECRET and NODE_ENV != 'development': To use the hashchain server you must pick a random (but stable) HASHCHAINSERVER_APPLICATION_SECRET for secure communciation with it. (If you aren't using the hashchain server, you can ignore this.)");
     }
     return value || "";
 });

package/dist/src/db/index.js

@@ -50,8 +50,8 @@ export async function withPgPoolTransaction(pool, callback, retryCount = 0, maxR
                 await pgClient.query("rollback");
             }
             catch (rollbackError) {
-                logger.error("Original error:", error);
-                logger.error("Rollback failed:", rollbackError);
+                logger.error(error, "Original error");
+                logger.error(rollbackError, "Rollback failed");
                 pgClient.release(true);
                 pgClient = null;
                 throw error;
@@ -132,7 +132,7 @@ export async function getTransferCursor(pgClient, { casinoId, }) {
     return row?.cursor;
 }
 export async function setTransferCursor(pgClient, { cursor, casinoId, }) {
-    console.log(`[setTransferCursor] SETTING CURSOR..... ${cursor}`);
+    logger.debug(cursor, `[setTransferCursor] Setting cursor`);
     await pgClient.query(`
     insert into hub_hidden.transfer_cursor (casino_id, cursor)
     values ($1, $2)

package/dist/src/index.d.ts

@@ -1,5 +1,4 @@
 import { Express } from "express";
-import { Logger } from "./logger.js";
 import { type PluginIdentity } from "./server/graphile.config.js";
 declare global {
     namespace Grafast {
@@ -25,7 +24,6 @@ export type ServerOptions = {
     extraPgSchemas?: string[];
     exportSchemaSDLPath?: string;
     userDatabaseMigrationsPath?: string;
-    logger?: Logger;
 };
 type ListenInfo = {
     port: number;

package/dist/src/index.js

@@ -4,13 +4,10 @@ import * as config from "./config.js";
 import { createHubServer } from "./server/index.js";
 import { initializeTransferProcessors } from "./process-transfers/index.js";
 import { join } from "path";
-import { logger, setLogger } from "./logger.js";
+import { logger } from "./logger.js";
 export { MakeOutcomeBetPlugin, } from "./plugins/hub-make-outcome-bet.js";
 export { defaultPlugins, } from "./server/graphile.config.js";
 async function initialize(options) {
-    if (options.logger) {
-        setLogger(options.logger);
-    }
     if (options.signal.aborted) {
         logger.info("Initialization aborted by graceful shutdown");
         return;
@@ -27,9 +24,7 @@ async function initialize(options) {
     catch (e) {
         logger.error("Error upgrading core schema", e);
         if (e instanceof DatabaseAheadError) {
-            logger.error("⚠️".repeat(80));
-            logger.error("@moneypot/hub database was reset to prepare for a production release and you must reset your database to continue. Please see <https://www.npmjs.com/package/@moneypot/hub#change-log> for more info.");
-            logger.error("⚠️".repeat(80));
+            logger.error(`${"⚠️".repeat(10)}\n@moneypot/hub database was reset to prepare for a production release and you must reset your database to continue. Please see <https://www.npmjs.com/package/@moneypot/hub#change-log> for more info.`);
             process.exit(1);
         }
         throw e;
@@ -70,7 +65,6 @@ export async function startAndListen(options) {
     let isShuttingDown = false;
     await initialize({
         userDatabaseMigrationsPath: options.userDatabaseMigrationsPath,
-        logger: options.logger,
         signal: abortController.signal,
     });
     const hubServer = createHubServer({
@@ -82,14 +76,14 @@ export async function startAndListen(options) {
     });
     const gracefulShutdown = async () => {
         if (isShuttingDown) {
-            console.warn("Already shutting down.");
+            logger.warn("Already shutting down.");
             return;
         }
         isShuttingDown = true;
-        console.log("Shutting down gracefully...");
+        logger.info("Shutting down gracefully...");
         abortController.abort();
         await new Promise((resolve) => setTimeout(resolve, 500));
-        console.log("Closing resources...");
+        logger.info("Closing resources...");
         hubServer.shutdown();
         try {
             await Promise.race([
@@ -100,10 +94,10 @@ export async function startAndListen(options) {
                 ]),
                 new Promise((_, reject) => setTimeout(() => reject(new Error("Database cleanup timeout")), 3000)),
             ]);
-            console.log("Cleanup complete.");
+            logger.info("Cleanup complete.");
         }
         catch (err) {
-            console.log("Cleanup error (proceeding anyway):", err instanceof Error ? err.message : err);
+            logger.warn(err, "Cleanup error (proceeding anyway)");
         }
         process.exit(0);
     };

package/dist/src/logger.d.ts

@@ -1,9 +1,3 @@
-export declare class Logger {
-    debug(...args: any[]): void;
-    error(...args: any[]): void;
-    info(...args: any[]): void;
-    trace(...args: any[]): void;
-    warn(...args: any[]): void;
-}
-export declare let logger: Logger;
-export declare function setLogger(instance: Logger): void;
+import { type Logger } from "pino";
+export { type Logger };
+export declare const logger: Logger;

package/dist/src/logger.js

@@ -1,21 +1,30 @@
-export class Logger {
-    debug(...args) {
-        logger.debug(...args);
+import { pino } from "pino";
+import { LOG_LEVEL, LOG_PRETTY, NODE_ENV } from "./config.js";
+function createLogger(options) {
+    const prettify = LOG_PRETTY === undefined ? NODE_ENV === "development" : LOG_PRETTY;
+    if (prettify) {
+        try {
+            return pino({
+                level: options.level,
+                transport: {
+                    target: "pino-pretty",
+                    options: {
+                        colorize: true,
+                    },
+                },
+            });
+        }
+        catch (_e) {
+            console.warn("LOG_PRETTY=true but pino-pretty is not installed, falling back to standard logging");
+            return pino({
+                level: options.level,
+            });
+        }
     }
-    error(...args) {
-        logger.error(...args);
+    else {
+        return pino({
+            level: options.level,
+        });
     }
-    info(...args) {
-        logger.info(...args);
-    }
-    trace(...args) {
-        logger.trace(...args);
-    }
-    warn(...args) {
-        logger.warn(...args);
-    }
-}
-export let logger = console;
-export function setLogger(instance) {
-    logger = instance;
 }
+export const logger = createLogger({ level: LOG_LEVEL });

package/dist/src/plugins/debug.js

@@ -7,7 +7,10 @@ export const DebugPlugin = {
         hooks: {
             processGraphQLRequestBody(info, event) {
                 const { body } = event;
-                logger.debug("GraphQL request:", body.operationName, body.variableValues);
+                logger.debug({
+                    operationName: body.operationName,
+                    variableValues: body.variableValues,
+                }, "GraphQL request");
             },
         },
     },

package/dist/src/plugins/hub-add-casino.js

@@ -61,7 +61,7 @@ export const HubAddCasinoPlugin = makeExtendSchemaPlugin((build) => {
                                         Authorization: `apikey:${apiKey}`,
                                     },
                                 });
-                                console.log(`[hubAddCasino] Making request to ${graphqlUrl}`);
+                                logger.info(`[hubAddCasino] Making request to ${graphqlUrl}`);
                                 const result = await graphqlClient
                                     .request(GET_CURRENT_CONTROLLER)
                                     .catch((e) => {
@@ -84,10 +84,6 @@ export const HubAddCasinoPlugin = makeExtendSchemaPlugin((build) => {
                     returning id
                   `,
                                         values: [name, baseUrl, graphqlUrl],
-                                    })
-                                        .then((res) => {
-                                        console.log("res", res.rows);
-                                        return res;
                                     })
                                         .then(exactlyOneRow);
                                 }
@@ -105,7 +101,7 @@ export const HubAddCasinoPlugin = makeExtendSchemaPlugin((build) => {
                                                 throw new GraphQLError(`Duplicate constraint violation: ${e.constraint}`);
                                         }
                                     }
-                                    logger.error("Error adding casino", e);
+                                    logger.error(e, "Error adding casino");
                                     throw e;
                                 }
                                 await pgClient.query({

package/dist/src/plugins/hub-authenticate.js

@@ -99,7 +99,7 @@ export const HubAuthenticatePlugin = makeExtendSchemaPlugin(() => {
                                         });
                                     }
                                     catch (e) {
-                                        logger.error(`[hubAuthenticate] Error when making GET_USER_FROM_USER_TOKEN to casino:`, e);
+                                        logger.error(e, `[hubAuthenticate] Error when making GET_USER_FROM_USER_TOKEN to casino`);
                                         if (isGraphQLError(e)) {
                                             const errorInfo = extractGraphQLErrorInfo(e);
                                             if (errorInfo.code === "UNAUTHENTICATED") {
@@ -143,7 +143,11 @@ export const HubAuthenticatePlugin = makeExtendSchemaPlugin(() => {
                   SET name = EXCLUDED.name
                 RETURNING id
               `,
-                                        values: [casino.id, mpExperience.id, mpExperience.name],
+                                        values: [
+                                            casino.id,
+                                            mpExperience.id,
+                                            mpExperience.name,
+                                        ],
                                     })
                                         .then(exactlyOneRow);
                                     const dbSession = await pgClient
@@ -153,7 +157,12 @@ export const HubAuthenticatePlugin = makeExtendSchemaPlugin(() => {
                   VALUES($1, $2, $3, $4)
                 RETURNING id, key
               `,
-                                        values: [casino.id, userId, dbExperience.id, userToken],
+                                        values: [
+                                            casino.id,
+                                            userId,
+                                            dbExperience.id,
+                                            userToken,
+                                        ],
                                     })
                                         .then(exactlyOneRow);
                                     const ret = {

package/dist/src/plugins/hub-make-outcome-bet.js

@@ -172,12 +172,12 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                                     }
                                     const minProfit = Math.min(...input.outcomes.map((o) => o.profit));
                                     const maxPlayerLoss = Math.abs(input.wager * minProfit);
-                                    logger.debug("Determining if player can afford bet", {
+                                    logger.debug({
                                         wager: input.wager,
                                         minProfit,
                                         maxPlayerLoss,
                                         dbPlayerBalance,
-                                    });
+                                    }, "Determining if player can afford bet");
                                     if (dbPlayerBalance.amount < maxPlayerLoss) {
                                         if (minProfit === -1) {
                                             throw new GraphQLError(`You cannot afford wager`);
@@ -207,7 +207,7 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                                             finishHashChainInBackground({
                                                 hashChainId: input.hashChainId,
                                             }).catch((e) => {
-                                                logger.error("Error finishing hash chain in background", { hashChainId: input.hashChainId, error: e });
+                                                logger.error({ hashChainId: input.hashChainId, error: e }, "Error finishing hash chain in background");
                                             });
                                         }
                                         return {
@@ -393,18 +393,18 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
     }, "HubMakeOutcomeBetPlugin");
 }
 async function finishHashChainInBackground({ hashChainId, }) {
-    logger.debug("Finishing hash chain in background", { hashChainId });
+    logger.debug({ hashChainId }, "Finishing hash chain in background");
     const preimageHashResult = await getPreimageHash({
         hashChainId,
     });
-    logger.debug("Preimage hash result", { preimageHashResult });
+    logger.debug({ preimageHashResult }, "Preimage hash result");
     if (preimageHashResult.type === "success") {
-        logger.debug("Inserting preimage hash", {
+        logger.debug({
             hashChainId,
             kind: DbHashKind.PREIMAGE,
             digest: preimageHashResult.hash,
             iteration: 0,
-        });
+        }, "Inserting preimage hash");
         await withPgPoolTransaction(superuserPool, async (pgClient) => {
             await dbInsertHubHash(pgClient, {
                 hashChainId,
@@ -424,9 +424,6 @@ async function finishHashChainInBackground({ hashChainId, }) {
         });
     }
     else {
-        logger.warn("Failed to insert preimage hash in background", {
-            hashChainId,
-            error: preimageHashResult,
-        });
+        logger.warn({ hashChainId, error: preimageHashResult }, "Failed to insert preimage hash in background");
     }
 }

package/dist/src/plugins/hub-put-alert.js

@@ -2,6 +2,7 @@ import { context, lambda } from "postgraphile/grafast";
 import { gql, makeExtendSchemaPlugin } from "postgraphile/utils";
 import { jsonParse } from "postgraphile/@dataplan/json";
 import { listenWithFilter } from "./listen-with-filter.js";
+import { logger } from "../logger.js";
 export const HubPutAlertPlugin = makeExtendSchemaPlugin(() => {
     return {
         typeDefs: gql `
@@ -31,7 +32,7 @@ export const HubPutAlertPlugin = makeExtendSchemaPlugin(() => {
                             });
                             return listenWithFilter($pgSubscriber, $channelKey, jsonParse, $identity, (item, identity) => {
                                 if (typeof item !== "string") {
-                                    console.warn(`hubPutAlert: item is not a string: ${JSON.stringify(item)}`);
+                                    logger.warn(item, `hubPutAlert: item is not a string`);
                                     return false;
                                 }
                                 if (identity?.kind !== "user") {

package/dist/src/process-transfers/index.js

@@ -57,7 +57,7 @@ async function listenForNewCasinos({ signal }) {
         id: z.string(),
     });
     pgClient.on("notification", async (msg) => {
-        logger.debug(`[listenForNewCasinos] received notification:`, msg);
+        logger.debug(msg, `[listenForNewCasinos] received notification`);
         switch (msg.channel) {
             case "hub:new_casino": {
                 if (!msg.payload) {
@@ -69,11 +69,11 @@ async function listenForNewCasinos({ signal }) {
                     json = JSON.parse(msg.payload);
                 }
                 catch (error) {
-                    logger.error("Error parsing new casino notification:", error);
+                    logger.error(error, "Error parsing new casino notification");
                 }
                 const result = NewCasinoPayload.safeParse(json);
                 if (!result.success) {
-                    logger.error("Error parsing new casino notification:", result.error);
+                    logger.error(result.error, "Error parsing new casino notification");
                     return;
                 }
                 startCasinoTransferProcessor({ casinoId: result.data.id, signal });

package/dist/src/process-transfers/polling-processor.js

@@ -154,7 +154,7 @@ export function startPollingProcessor({ casinoId, signal, }) {
             }
             catch (e) {
                 processorState.backoffTime = Math.min(processorState.backoffTime * 2, MAX_BACKOFF_TIME);
-                logger.error(`transfer processor failed:`, e);
+                logger.error(e, `transfer processor failed`);
                 logger.debug(`Next retry for casino ${casinoId} in ${processorState.backoffTime}ms`);
             }
         }
@@ -170,7 +170,7 @@ async function processWithdrawals({ abortSignal, casinoId, graphqlClient, }) {
         limit: 10,
     });
     if (withdrawals.length > 0) {
-        logger.debug(`[sendWithdrawalLoop] withdrawals:`, withdrawals);
+        logger.debug(withdrawals, `[sendWithdrawalLoop] withdrawals`);
     }
     for (const withdrawal of withdrawals) {
         if (abortSignal.aborted) {

package/dist/src/process-transfers/process-transfer.js

@@ -54,7 +54,7 @@ export async function processTransfer({ casinoId, controllerId, transfer, graphq
     assert(transfer, "Expected transfer");
     assert(transfer.__typename === "ExperienceTransfer", `Expected ExperienceTransfer but got ${transfer.__typename}`);
     logger.debug(`processing transfer ${transfer.id} for casino ${casinoId}...`);
-    logger.debug("transfer", transfer);
+    logger.debug(transfer, "transfer");
     assert(transfer.experienceByExperienceId, "Expected experienceByExperienceId");
     const isIncoming = controllerId === transfer.toHolderId;
     const user = isIncoming
@@ -103,10 +103,10 @@ export async function processTransfer({ casinoId, controllerId, transfer, graphq
                     });
                 }
                 catch (e) {
-                    logger.error(`Error sending claimTransfer(${transfer.id}) to ${casinoId}:`, e);
+                    logger.error(e, `Error sending claimTransfer(${transfer.id}) to ${casinoId}:`);
                     throw e;
                 }
-                logger.debug("MP_CLAIM_TRANSFER response:", data);
+                logger.debug(data, "MP_CLAIM_TRANSFER response");
                 if (data.claimTransfer?.result.__typename !== "ClaimTransferSuccess") {
                     throw new Error(`Failed to claim transfer: ${JSON.stringify(data.claimTransfer)}`);
                 }

package/dist/src/process-transfers/websocket-processor.js

@@ -69,13 +69,13 @@ export function startWebsocketProcessor({ casinoId, graphqlUrl, signal, controll
         logger.info(`[websocketProcessor] Disconnected from websocket ${graphqlUrl}`);
     });
     client.on("error", (error) => {
-        logger.error(`[websocketProcessor] Error on websocket ${graphqlUrl}`, error);
+        logger.error(error, `[websocketProcessor] Error on websocket ${graphqlUrl}`);
     });
     const graphqlClient = createGraphqlClient({ graphqlUrl, apiKey });
     const dispose1 = createSubscription(client, MP_NEW_EXPERIENCE_TRANSFER, async (result) => {
         const transferId = result.data?.newExperienceTransfer?.id;
         if (!transferId) {
-            logger.warn(`Weird, no transfer id in websocket result`, result);
+            logger.warn(result, `Weird, no transfer id in websocket result`);
             return;
         }
         const mpTransfer = await mpGetExperienceTransfer(graphqlClient, transferId);
@@ -94,7 +94,7 @@ export function startWebsocketProcessor({ casinoId, graphqlUrl, signal, controll
     const dispose2 = createSubscription(client, MP_NEW_TAKE_REQUEST, async (result) => {
         const mpTakeRequestId = result.data?.newTakeRequest?.id;
         if (!mpTakeRequestId) {
-            logger.warn(`Weird, no take request id in websocket result`, result);
+            logger.warn(result, `Weird, no take request id in websocket result`);
             return;
         }
         const mpTakeRequest = await mpGetTakeRequest(graphqlClient, mpTakeRequestId);
@@ -118,11 +118,11 @@ function createSubscription(client, query, handler) {
     return client.subscribe({ query: print(query) }, {
         next: (result) => {
             handler(result).catch((e) => {
-                logger.error(`Error while handling websocket result`, e);
+                logger.error(e, `Error while handling websocket result`);
             });
         },
         error: (err) => {
-            logger.error(`Error during WebSocket subscription`, err);
+            logger.error(err, `Error during WebSocket subscription`);
         },
         complete: () => logger.info("Subscription closed"),
     });

package/dist/src/server/graphile.config.js

@@ -64,7 +64,7 @@ export function createPreset({ plugins, exportSchemaSDLPath, extraPgSchemas, abo
             mutablePlugins.unshift(requiredPlugin);
         }
     }
-    logger.info("Will save generated graphql schema to:", exportSchemaSDLPath);
+    logger.info(`Will save generated graphql schema to ${exportSchemaSDLPath}`);
     const preset = {
         extends: [PostGraphileAmberPreset],
         disablePlugins: ["NodePlugin"],

package/dist/src/take-request/process-take-request.js

@@ -233,7 +233,7 @@ export async function processSingleTakeRequest({ mpTakeRequestId, mpTakeRequest,
                 graphqlClient,
             });
         }
-        console.log(`[processSingleTakeRequest] Take request ${mpTakeRequestId} not found in MP or our DB for casino ${casinoId}`);
+        logger.info(`[processSingleTakeRequest] Take request ${mpTakeRequestId} not found in MP or our DB for casino ${casinoId}`);
         return null;
     });
 }
@@ -319,7 +319,7 @@ async function processExistingTakeRequest({ pgClient, takeRequest, casinoId, gra
     assert(pgClient._inTransaction, "pgClient must be in a transaction");
     switch (takeRequest.status) {
         case LocalTakeRequestStatus.PENDING:
-            console.log(`[processExistingTakeRequest] Take request ${takeRequest.id} in PENDING state`);
+            logger.info(`[processExistingTakeRequest] Take request ${takeRequest.id} in PENDING state`);
             break;
         case LocalTakeRequestStatus.PROCESSING: {
             const { dbUser, dbExperience, dbCurrency } = await loadRequiredEntities(pgClient, {
@@ -345,16 +345,16 @@ async function processExistingTakeRequest({ pgClient, takeRequest, casinoId, gra
             });
         }
         case LocalTakeRequestStatus.COMPLETED:
-            console.log(`[processExistingTakeRequest] Take request ${takeRequest.id} already COMPLETED`);
+            logger.info(`[processExistingTakeRequest] Take request ${takeRequest.id} already COMPLETED`);
             break;
         case LocalTakeRequestStatus.FAILED:
-            console.log(`[processExistingTakeRequest] Take request ${takeRequest.id} in FAILED state`);
+            logger.info(`[processExistingTakeRequest] Take request ${takeRequest.id} in FAILED state`);
             break;
         case LocalTakeRequestStatus.REJECTED:
-            console.log(`[processExistingTakeRequest] Take request ${takeRequest.id} already REJECTED`);
+            logger.info(`[processExistingTakeRequest] Take request ${takeRequest.id} already REJECTED`);
             break;
         default:
-            console.error(`[processExistingTakeRequest] Unknown status: ${takeRequest.status}`);
+            logger.error(`[processExistingTakeRequest] Unknown status: ${takeRequest.status}`);
             break;
     }
     return null;
@@ -422,7 +422,7 @@ async function attemptTransfer({ pgClient, takeRequestId, mpTakeRequestId, mpExp
         return transferId;
     }
     catch (error) {
-        console.error(`[attemptTransfer] Error: ${error}`);
+        logger.error(error, `[attemptTransfer] Error`);
         await pgClient.query({
             text: `
         UPDATE hub.take_request
@@ -521,7 +521,7 @@ async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId,
                             MpTakeRequestStatus.Transferred,
                         ],
                     });
-                    console.log(`[completeTransfer] Successfully completed transfer ${mpTransferId}`);
+                    logger.info(`[completeTransfer] Successfully completed transfer ${mpTransferId}`);
                     break;
                 case "InvalidTransferStatus": {
                     const currentStatus = completionResult.currentStatus;
@@ -543,7 +543,7 @@ async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId,
                                 MpTakeRequestStatus.Transferred,
                             ],
                         });
-                        console.log(`[completeTransfer] Transfer ${mpTransferId} was already completed`);
+                        logger.info(`[completeTransfer] Transfer ${mpTransferId} was already completed`);
                     }
                     else if (currentStatus === "CANCELED" ||
                         currentStatus === "EXPIRED") {
@@ -572,15 +572,15 @@ async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId,
                                 `MP transfer was ${currentStatus}`,
                             ],
                         });
-                        console.log(`[completeTransfer] Transfer ${mpTransferId} has status ${currentStatus}`);
+                        logger.info(`[completeTransfer] Transfer ${mpTransferId} has status ${currentStatus}`);
                     }
                     else {
-                        console.log(`[completeTransfer] Transfer ${mpTransferId} has status ${currentStatus}, will retry later`);
+                        logger.info(`[completeTransfer] Transfer ${mpTransferId} has status ${currentStatus}, will retry later`);
                     }
                     break;
                 }
                 case "InsufficientBalance": {
-                    console.log(`[completeTransfer] Insufficient balance to complete transfer ${mpTransferId}, will retry later`);
+                    logger.info(`[completeTransfer] Insufficient balance to complete transfer ${mpTransferId}, will retry later`);
                     await pgClient.query({
                         text: `
               UPDATE hub.take_request
@@ -592,7 +592,7 @@ async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId,
                     break;
                 }
                 case undefined: {
-                    console.error(`[completeTransfer] Unexpected completion result of undefined for transfer ${mpTransferId}`);
+                    logger.error(`[completeTransfer] Unexpected completion result of undefined for transfer ${mpTransferId}`);
                     await pgClient.query({
                         text: `
               UPDATE hub.take_request
@@ -610,7 +610,7 @@ async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId,
             }
         }
         catch (e) {
-            console.error(`[completeTransfer] Error completing transfer ${mpTransferId}:`, e);
+            logger.error(e, `[completeTransfer] Error completing transfer ${mpTransferId}`);
             if (e instanceof Error) {
                 if (isNetworkError(e)) {
                     await pgClient.query({
@@ -682,7 +682,7 @@ async function loadRequiredEntities(pgClient, params) {
     })
         .then(maybeOneRow);
     if (!dbCurrency) {
-        console.warn(`[loadRequiredEntities] Currency ${currencyKey} not found`);
+        logger.warn(`[loadRequiredEntities] Currency ${currencyKey} not found`);
         return {
             dbCurrency: null,
             dbUser: null,
@@ -716,7 +716,7 @@ async function loadRequiredEntities(pgClient, params) {
             .then(maybeOneRow);
     }
     if (!dbUser) {
-        console.warn(`[loadRequiredEntities] User not found`);
+        logger.warn(`[loadRequiredEntities] User not found`);
         return { dbCurrency, dbUser: null, dbExperience: null, dbBalance: null };
     }
     let dbExperience;
@@ -745,7 +745,7 @@ async function loadRequiredEntities(pgClient, params) {
             .then(maybeOneRow);
     }
     if (!dbExperience) {
-        console.warn(`[loadRequiredEntities] Experience not found`);
+        logger.warn(`[loadRequiredEntities] Experience not found`);
         return { dbCurrency, dbUser, dbExperience: null, dbBalance: null };
     }
     let dbBalance = null;
@@ -771,7 +771,7 @@ async function loadRequiredEntities(pgClient, params) {
 async function rejectMpTakeRequest(pgClient, graphqlClient, mpTakeRequestId, takeRequestId) {
     assert(pgClient._inTransaction, "pgClient must be in a transaction");
     try {
-        console.log(`[rejectMpTakeRequest] Rejecting take request ${mpTakeRequestId}`);
+        logger.info(`[rejectMpTakeRequest] Rejecting take request ${mpTakeRequestId}`);
         const rejectResult = await graphqlClient.request(MP_REJECT_TAKE_REQUEST, {
             mpTakeRequestId,
         });
@@ -841,7 +841,7 @@ async function rejectMpTakeRequest(pgClient, graphqlClient, mpTakeRequestId, tak
         return success;
     }
     catch (error) {
-        console.error(`[rejectMpTakeRequest] Error: ${error}`);
+        logger.error(error, `[rejectMpTakeRequest] Error`);
         return false;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneypot/hub",
-  "version": "1.7.0",
+  "version": "1.8.0-dev.2",
   "author": "moneypot.com",
   "homepage": "https://moneypot.com/hub",
   "keywords": [
@@ -56,6 +56,7 @@
     "jose": "^6.0.11",
     "pg": "^8.12.0",
     "pg-connection-string": "^2.6.4",
+    "pino": "^9.7.0",
     "postgraphile": "^5.0.0-beta.42",
     "tsafe": "^1.6.6",
     "yup": "^1.6.1",
@@ -72,6 +73,7 @@
     "@types/supertest": "^6.0.2",
     "eslint": "^9.8.0",
     "globals": "^16.0.0",
+    "pino-pretty": "^13.0.0",
     "supertest": "^7.0.0",
     "tsx": "^4.20.3",
     "typescript": "^5.4.5",