@moneypot/hub 1.19.4 → 1.19.6

package/dist/src/hash-chain/util.js

@@ -26,7 +26,7 @@ export function pickRandomOutcome({ outcomes, finalHash, }, floatEpsilon = 1e-10
     for (let i = 0; i < outcomesWithProbability.length; i++) {
         const outcome = outcomesWithProbability[i];
         cumulativeProb += outcome.probability;
-        if (roll <= cumulativeProb) {
+        if (roll < cumulativeProb) {
             return { outcomeIdx: i, roll };
         }
     }

package/dist/src/index.d.ts

@@ -1,6 +1,6 @@
-import { Express } from "express";
+import { type ConfigureAppArgs } from "./server/index.js";
 import { type PluginIdentity } from "./server/graphile.config.js";
-import { ServerContext } from "./context.js";
+import { type ServerContext } from "./context.js";
 declare global {
     namespace Grafast {
         interface Context {
@@ -22,10 +22,9 @@ export { type CustomGameConfig, type CustomGameConfigMap, } from "./custom-game-
 export { validateRisk, type RiskPolicy, type RiskPolicyArgs, type RiskLimits, } from "./risk-policy.js";
 export type PluginContext = Grafast.Context;
 export { defaultPlugins, type PluginIdentity, type UserSessionContext, type HubPlugin, } from "./server/graphile.config.js";
-export type ConfigureAppArgs = {
-    app: Express;
-    superuserPool: ServerContext["superuserPool"];
-};
+export type { ConfigureAppArgs } from "./server/index.js";
+import { runMigrations } from "./migrations.js";
+export { runMigrations };
 import type { HubPlugin } from "./server/graphile.config.js";
 export type ServerOptions = {
     configureApp?: (args: ConfigureAppArgs) => void;
@@ -37,9 +36,6 @@ export type ServerOptions = {
     enablePlayground?: boolean;
     port?: number;
 };
-export declare function runMigrations(options: {
-    userDatabaseMigrationsPath?: string;
-}): Promise<void>;
 export declare function startAndListen(options: ServerOptions): Promise<{
     port: number;
     stop: () => Promise<void>;

package/dist/src/index.js

@@ -1,77 +1,12 @@
-import PgUpgradeSchema, { DatabaseAheadError, } from "@moneypot/pg-upgrade-schema";
-import * as db from "./db/index.js";
 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 } from "./logger.js";
-import { createServerContext, closeServerContext, } from "./context.js";
+import { createHubServer } from "./server/index.js";
 export { HubGameConfigPlugin, } from "./plugins/hub-game-config-plugin.js";
 export { validateRisk, } from "./risk-policy.js";
 export { defaultPlugins, } from "./server/graphile.config.js";
-export async function runMigrations(options) {
-    if (options.userDatabaseMigrationsPath) {
-        const { existsSync, statSync } = await import("fs");
-        if (!existsSync(options.userDatabaseMigrationsPath)) {
-            throw new Error(`userDatabaseMigrationsPath does not exist: ${options.userDatabaseMigrationsPath}`);
-        }
-        const stats = statSync(options.userDatabaseMigrationsPath);
-        if (!stats.isDirectory()) {
-            throw new Error(`userDatabaseMigrationsPath is not a directory: ${options.userDatabaseMigrationsPath}`);
-        }
-    }
-    const pgClient = db.getPgClient(config.SUPERUSER_DATABASE_URL);
-    await pgClient.connect();
-    try {
-        try {
-            await PgUpgradeSchema.default({
-                pgClient,
-                dirname: join(import.meta.dirname, "pg-versions"),
-                schemaName: "hub_core_versions",
-                silent: process.env.NODE_ENV === "test",
-            });
-        }
-        catch (e) {
-            logger.error(e, "Error upgrading core schema");
-            if (e instanceof DatabaseAheadError) {
-                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;
-        }
-        if (options.userDatabaseMigrationsPath) {
-            await PgUpgradeSchema.default({
-                pgClient,
-                dirname: options.userDatabaseMigrationsPath,
-                schemaName: "hub_user_versions",
-                silent: process.env.NODE_ENV === "test",
-            });
-        }
-    }
-    finally {
-        await pgClient.end();
-    }
-}
-async function initialize(options) {
-    if (options.signal.aborted) {
-        logger.info("Initialization aborted by graceful shutdown");
-        return;
-    }
-    await runMigrations({
-        userDatabaseMigrationsPath: options.userDatabaseMigrationsPath,
-    });
-    if (options.signal.aborted) {
-        logger.info("Initialization aborted by graceful shutdown");
-        return;
-    }
-    if (process.env.NODE_ENV !== "test") {
-        initializeTransferProcessors({
-            signal: options.signal,
-            pool: options.context.superuserPool,
-        });
-    }
-}
-export async function startAndListen(options) {
+import { runMigrations } from "./migrations.js";
+export { runMigrations };
+function validateOptions(options) {
     if (options.plugins && options.plugins.some((p) => typeof p === "function")) {
         throw new Error("`plugins` should be an array of HubPlugin but one of the items is a function. Did you forget to call it?");
     }
@@ -83,60 +18,38 @@ export async function startAndListen(options) {
         !options.exportSchemaSDLPath.startsWith("/")) {
         throw new Error(`exportSchemaSDLPath must be an absolute path, got ${options.exportSchemaSDLPath}`);
     }
-    const abortController = new AbortController();
-    let isShuttingDown = false;
-    const context = createServerContext();
-    await initialize({
+}
+export async function startAndListen(options) {
+    validateOptions(options);
+    await runMigrations({
         userDatabaseMigrationsPath: options.userDatabaseMigrationsPath,
-        signal: abortController.signal,
-        context,
     });
     const hubServer = createHubServer({
         configureApp: options.configureApp,
         plugins: options.plugins,
         exportSchemaSDLPath: options.exportSchemaSDLPath,
         extraPgSchemas: options.extraPgSchemas,
-        abortSignal: abortController.signal,
-        context,
         enableChat: options.enableChat ?? true,
         enablePlayground: options.enablePlayground ?? true,
         port: options.port ?? config.PORT,
+        runProcessors: process.env.NODE_ENV !== "test",
     });
-    const gracefulShutdown = async ({ exit = true } = {}) => {
-        if (isShuttingDown) {
-            logger.warn("Already shutting down.");
-            return;
-        }
-        isShuttingDown = true;
-        logger.info("Shutting down gracefully...");
-        abortController.abort();
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        logger.info("Closing resources...");
-        await hubServer.shutdown();
-        try {
-            await Promise.race([
-                closeServerContext(context),
-                new Promise((_, reject) => setTimeout(() => reject(new Error("Database cleanup timeout")), 3000)),
-            ]);
-            logger.info("Cleanup complete.");
-        }
-        catch (err) {
-            logger.warn(err, "Cleanup error (proceeding anyway)");
-        }
-        if (exit) {
-            process.exit(0);
-        }
-    };
     if (process.env.NODE_ENV !== "test") {
-        process.on("SIGINT", gracefulShutdown);
-        process.on("SIGTERM", gracefulShutdown);
-    }
-    return hubServer.listen().then(({ port }) => {
-        return {
-            port,
-            stop: async () => {
-                await gracefulShutdown({ exit: false });
-            },
+        const handler = () => {
+            hubServer
+                .shutdown()
+                .then(() => process.exit(0))
+                .catch((err) => {
+                logger.error(err, "Shutdown error");
+                process.exit(1);
+            });
         };
-    });
+        process.on("SIGINT", handler);
+        process.on("SIGTERM", handler);
+    }
+    const { port } = await hubServer.listen();
+    return {
+        port,
+        stop: () => hubServer.shutdown(),
+    };
 }

package/dist/src/migrations.d.ts

@@ -0,0 +1,3 @@
+export declare function runMigrations(options: {
+    userDatabaseMigrationsPath?: string;
+}): Promise<void>;

package/dist/src/migrations.js

@@ -0,0 +1,48 @@
+import PgUpgradeSchema, { DatabaseAheadError, } from "@moneypot/pg-upgrade-schema";
+import * as db from "./db/index.js";
+import * as config from "./config.js";
+import { join } from "path";
+import { logger } from "./logger.js";
+export async function runMigrations(options) {
+    if (options.userDatabaseMigrationsPath) {
+        const { existsSync, statSync } = await import("fs");
+        if (!existsSync(options.userDatabaseMigrationsPath)) {
+            throw new Error(`userDatabaseMigrationsPath does not exist: ${options.userDatabaseMigrationsPath}`);
+        }
+        const stats = statSync(options.userDatabaseMigrationsPath);
+        if (!stats.isDirectory()) {
+            throw new Error(`userDatabaseMigrationsPath is not a directory: ${options.userDatabaseMigrationsPath}`);
+        }
+    }
+    const pgClient = db.getPgClient(config.SUPERUSER_DATABASE_URL);
+    await pgClient.connect();
+    try {
+        try {
+            await PgUpgradeSchema.default({
+                pgClient,
+                dirname: join(import.meta.dirname, "pg-versions"),
+                schemaName: "hub_core_versions",
+                silent: process.env.NODE_ENV === "test",
+            });
+        }
+        catch (e) {
+            logger.error(e, "Error upgrading core schema");
+            if (e instanceof DatabaseAheadError) {
+                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;
+        }
+        if (options.userDatabaseMigrationsPath) {
+            await PgUpgradeSchema.default({
+                pgClient,
+                dirname: options.userDatabaseMigrationsPath,
+                schemaName: "hub_user_versions",
+                silent: process.env.NODE_ENV === "test",
+            });
+        }
+    }
+    finally {
+        await pgClient.end();
+    }
+}

package/dist/src/server/index.d.ts

@@ -1,4 +1,3 @@
-import { ServerOptions } from "../index.js";
 import { ServerContext } from "../context.js";
 export type HubServer = {
     listen: () => Promise<{
@@ -6,10 +5,20 @@ export type HubServer = {
     }>;
     shutdown: () => Promise<void>;
 };
-export declare function createHubServer({ configureApp, plugins, exportSchemaSDLPath, extraPgSchemas, abortSignal, context, enableChat, enablePlayground, port, }: Pick<ServerOptions, "plugins" | "exportSchemaSDLPath" | "extraPgSchemas" | "configureApp"> & {
-    abortSignal: AbortSignal;
-    context: ServerContext;
+import type { Express } from "express";
+import type { HubPlugin } from "./graphile.config.js";
+export type ConfigureAppArgs = {
+    app: Express;
+    superuserPool: ServerContext["superuserPool"];
+};
+export type CreateHubServerOptions = {
+    configureApp?: (args: ConfigureAppArgs) => void;
+    plugins?: readonly HubPlugin[];
+    extraPgSchemas?: string[];
+    exportSchemaSDLPath?: string;
     enableChat: boolean;
     enablePlayground: boolean;
     port: number;
-}): HubServer;
+    runProcessors: boolean;
+};
+export declare function createHubServer({ configureApp, plugins, exportSchemaSDLPath, extraPgSchemas, enableChat, enablePlayground, port, runProcessors, }: CreateHubServerOptions): HubServer;

package/dist/src/server/index.js

@@ -2,6 +2,8 @@ import { createServer as createNodeServer } from "node:http";
 import { grafserv } from "postgraphile/grafserv/express/v4";
 import postgraphile from "postgraphile";
 import { createPreset, defaultPlugins } from "./graphile.config.js";
+import { createServerContext, closeServerContext, } from "../context.js";
+import { initializeTransferProcessors } from "../process-transfers/index.js";
 import express from "express";
 import { logger } from "../logger.js";
 import cors from "./middleware/cors.js";
@@ -44,13 +46,15 @@ function createExpressServer(context) {
     });
     return app;
 }
-export function createHubServer({ configureApp, plugins, exportSchemaSDLPath, extraPgSchemas, abortSignal, context, enableChat, enablePlayground, port, }) {
+export function createHubServer({ configureApp, plugins, exportSchemaSDLPath, extraPgSchemas, enableChat, enablePlayground, port, runProcessors, }) {
+    const abortController = new AbortController();
+    const context = createServerContext();
     const expressServer = createExpressServer(context);
     const { preset, pgService } = createPreset({
         plugins: plugins ?? defaultPlugins,
         exportSchemaSDLPath,
         extraPgSchemas: extraPgSchemas ?? [],
-        abortSignal,
+        abortSignal: abortController.signal,
         context,
         enableChat,
         enablePlayground,
@@ -64,10 +68,16 @@ export function createHubServer({ configureApp, plugins, exportSchemaSDLPath, ex
     nodeServer.on("error", (e) => {
         logger.error(e);
     });
-    const mountMiddlewarePromise = serv.addTo(expressServer, nodeServer);
+    let isShuttingDown = false;
     return {
         listen: async () => {
-            await mountMiddlewarePromise;
+            if (runProcessors) {
+                initializeTransferProcessors({
+                    signal: abortController.signal,
+                    pool: context.superuserPool,
+                });
+            }
+            await serv.addTo(expressServer, nodeServer);
             await pgl.getSchema();
             return new Promise((resolve) => {
                 nodeServer.listen(port, () => {
@@ -78,12 +88,23 @@ export function createHubServer({ configureApp, plugins, exportSchemaSDLPath, ex
             });
         },
         shutdown: async () => {
+            if (isShuttingDown) {
+                logger.warn("Already shutting down.");
+                return;
+            }
+            isShuttingDown = true;
+            logger.info("Shutting down gracefully...");
+            abortController.abort();
+            await new Promise((resolve) => setTimeout(resolve, 500));
+            logger.info("Closing resources...");
             nodeServer.closeAllConnections();
+            await closeServerContext(context);
             await pgService.release?.();
             await pgl.release();
             await new Promise((resolve) => {
                 nodeServer.close(() => resolve());
             });
+            logger.info("Cleanup complete.");
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneypot/hub",
-  "version": "1.19.4",
+  "version": "1.19.6",
   "author": "moneypot.com",
   "homepage": "https://moneypot.com/hub",
   "keywords": [