keryx 0.24.1 → 0.24.2

package/initializers/channels.ts

@@ -12,6 +12,16 @@ const namespace = "channels";
 const PRESENCE_KEY_PREFIX = "presence:";
 const LUA_DIR = join(import.meta.dir, "..", "lua");
 
+const ADD_PRESENCE_LUA = await Bun.file(
+  join(LUA_DIR, "add-presence.lua"),
+).text();
+const REMOVE_PRESENCE_LUA = await Bun.file(
+  join(LUA_DIR, "remove-presence.lua"),
+).text();
+const REFRESH_PRESENCE_LUA = await Bun.file(
+  join(LUA_DIR, "refresh-presence.lua"),
+).text();
+
 declare module "../classes/API" {
   export interface API {
     [namespace]: Awaited<ReturnType<Channels["initialize"]>>;
@@ -19,9 +29,6 @@ declare module "../classes/API" {
 }
 
 export class Channels extends Initializer {
-  private addPresenceLua = "";
-  private removePresenceLua = "";
-  private refreshPresenceLua = "";
   private heartbeatTimer: ReturnType<typeof setInterval> | null = null;
 
   constructor() {
@@ -107,7 +114,7 @@ export class Channels extends Initializer {
     const connectionSetKey = `${PRESENCE_KEY_PREFIX}${channelName}:${key}`;
 
     const added = await api.redis.redis.eval(
-      this.addPresenceLua,
+      ADD_PRESENCE_LUA,
       2,
       connectionSetKey,
       channelKey,
@@ -140,7 +147,7 @@ export class Channels extends Initializer {
     const connectionSetKey = `${PRESENCE_KEY_PREFIX}${channelName}:${key}`;
 
     const shouldLeave = await api.redis.redis.eval(
-      this.removePresenceLua,
+      REMOVE_PRESENCE_LUA,
       2,
       connectionSetKey,
       channelKey,
@@ -190,7 +197,7 @@ export class Channels extends Initializer {
 
     const keys = [...keysToRefresh];
     await api.redis.redis.eval(
-      this.refreshPresenceLua,
+      REFRESH_PRESENCE_LUA,
       keys.length,
       ...keys,
       config.channels.presenceTTL,
@@ -218,16 +225,6 @@ export class Channels extends Initializer {
   };
 
   async initialize() {
-    this.addPresenceLua = await Bun.file(
-      join(LUA_DIR, "add-presence.lua"),
-    ).text();
-    this.removePresenceLua = await Bun.file(
-      join(LUA_DIR, "remove-presence.lua"),
-    ).text();
-    this.refreshPresenceLua = await Bun.file(
-      join(LUA_DIR, "refresh-presence.lua"),
-    ).text();
-
     // Load plugin channels
     const pluginChannels: Channel[] = [];
     for (const plugin of config.plugins) {

package/initializers/db.ts

@@ -11,7 +11,10 @@ import { api, logger } from "../api";
 import { Initializer } from "../classes/Initializer";
 import { ErrorType, TypedError } from "../classes/TypedError";
 import { config } from "../config";
-import { formatConnectionStringForLogging } from "../util/connectionString";
+import {
+  formatConnectionStringForLogging,
+  throwConnectionError,
+} from "../util/connectionString";
 
 const namespace = "db";
 
@@ -59,10 +62,7 @@ export class DB extends Initializer {
     try {
       await api.db.db.execute(sql`SELECT NOW()`);
     } catch (e) {
-      throw new TypedError({
-        type: ErrorType.SERVER_INITIALIZATION,
-        message: `Cannot connect to database (${formatConnectionStringForLogging(config.database.connectionString)}): ${e}`,
-      });
+      throwConnectionError("database", config.database.connectionString, e);
     }
 
     if (config.database.autoMigrate) {

package/initializers/redis.ts

@@ -1,9 +1,11 @@
 import { Redis as RedisClient } from "ioredis";
 import { api, logger } from "../api";
 import { Initializer } from "../classes/Initializer";
-import { ErrorType, TypedError } from "../classes/TypedError";
 import { config } from "../config";
-import { formatConnectionStringForLogging } from "../util/connectionString";
+import {
+  formatConnectionStringForLogging,
+  throwConnectionError,
+} from "../util/connectionString";
 
 const namespace = "redis";
 const testKey = `__keryx_test_key:${config.process.name}`;
@@ -42,10 +44,7 @@ export class Redis extends Initializer {
       await api.redis.subscription.set(testKey, Date.now());
       await api.redis.subscription.del(testKey);
     } catch (e) {
-      throw new TypedError({
-        type: ErrorType.SERVER_INITIALIZATION,
-        message: `Cannot connect to redis (${formatConnectionStringForLogging(config.redis.connectionString)}): ${e}`,
-      });
+      throwConnectionError("redis", config.redis.connectionString, e);
     }
 
     logger.info(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keryx",
-  "version": "0.24.1",
+  "version": "0.24.2",
   "module": "index.ts",
   "type": "module",
   "license": "MIT",

package/util/connectionString.ts

@@ -1,6 +1,20 @@
+import { ErrorType, TypedError } from "../classes/TypedError";
+
 /** Strip the password from a connection string for safe logging. Preserves protocol, user, host, port, and path. */
 export function formatConnectionStringForLogging(connectionString: string) {
   const connectionStringParsed = new URL(connectionString);
   const connectionStringInfo = `${connectionStringParsed.protocol ? `${connectionStringParsed.protocol}//` : ""}${connectionStringParsed.username ? `${connectionStringParsed.username}@` : ""}${connectionStringParsed.hostname}:${connectionStringParsed.port}${connectionStringParsed.pathname}`;
   return connectionStringInfo;
 }
+
+/** Throw a standardized `SERVER_INITIALIZATION` error for a failed connection probe. The connection string is password-stripped via {@link formatConnectionStringForLogging} before being embedded in the message. */
+export function throwConnectionError(
+  service: string,
+  connectionString: string,
+  error: unknown,
+): never {
+  throw new TypedError({
+    type: ErrorType.SERVER_INITIALIZATION,
+    message: `Cannot connect to ${service} (${formatConnectionStringForLogging(connectionString)}): ${error}`,
+  });
+}