@getstrata/bootstrap 0.2.49 → 0.2.50

package/dist/entries/createRoutes.js

@@ -63,6 +63,7 @@ import { applyMiddlewareToRoutes } from "@getstrata/core/http/middleware";
 
 // ../../src/bootstrap/httpKernel.ts
 import { createMembershipMiddleware } from "@getstrata/core/auth/membershipMiddleware";
+import { resolveAbilityChecker } from "@getstrata/core/contracts/serviceTokens";
 import { createAuthMiddleware } from "@getstrata/core/http/authMiddleware";
 import { createAuthorizeMiddleware } from "@getstrata/core/http/authorizeMiddleware";
 import { createBodySizeLimitMiddleware } from "@getstrata/core/http/bodySizeLimitMiddleware";
@@ -105,24 +106,38 @@ function parsePositiveInt(value, fallback) {
   }
   return Math.trunc(parsed);
 }
+function parseWindowSeconds(secondsValue, msValue, fallback) {
+  if (secondsValue !== undefined && secondsValue.trim() !== "") {
+    return parsePositiveInt(secondsValue, fallback);
+  }
+  if (msValue !== undefined && msValue.trim() !== "") {
+    const parsedMs = Number(msValue);
+    if (Number.isFinite(parsedMs) && parsedMs > 0) {
+      return Math.max(1, Math.trunc(parsedMs / 1000));
+    }
+  }
+  return fallback;
+}
 function resolveLoginRateLimit() {
   const defaults = isLocalAppEnv() ? LOCAL_LOGIN_RATE_LIMIT : PRODUCTION_LOGIN_RATE_LIMIT;
   return {
     maxAttempts: parsePositiveInt(process.env.LOGIN_RATE_LIMIT_PER_WINDOW, defaults.maxAttempts),
-    decaySeconds: parsePositiveInt(process.env.LOGIN_RATE_LIMIT_WINDOW_SECONDS, defaults.decaySeconds)
+    decaySeconds: parseWindowSeconds(process.env.LOGIN_RATE_LIMIT_WINDOW_SECONDS, process.env.LOGIN_RATE_LIMIT_WINDOW_MS, defaults.decaySeconds)
   };
 }
 function resolveRegisterRateLimit() {
   const defaults = isLocalAppEnv() ? { maxAttempts: 100, decaySeconds: 60 } : { maxAttempts: 10, decaySeconds: 60 };
   return {
     maxAttempts: parsePositiveInt(process.env.REGISTER_RATE_LIMIT_PER_WINDOW, defaults.maxAttempts),
-    decaySeconds: parsePositiveInt(process.env.REGISTER_RATE_LIMIT_WINDOW_SECONDS ?? process.env.REGISTER_RATE_LIMIT_WINDOW_MS ? String(Number(process.env.REGISTER_RATE_LIMIT_WINDOW_MS) / 1000) : undefined, defaults.decaySeconds)
+    decaySeconds: parseWindowSeconds(process.env.REGISTER_RATE_LIMIT_WINDOW_SECONDS, process.env.REGISTER_RATE_LIMIT_WINDOW_MS, defaults.decaySeconds)
   };
 }
 
 // ../../src/bootstrap/config.ts
 import {
+  CORE_ABILITY_CHECKER_TOKEN,
   CORE_AUTH_TOKEN,
+  CORE_AUTH_USER_DIRECTORY_TOKEN,
   CORE_CACHE_TOKEN,
   CORE_CONFIG_TOKEN,
   CORE_EVENT_BUS_TOKEN,
@@ -226,7 +241,7 @@ class HttpKernel {
   }
   wrapWebAbility(ability, handler) {
     const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN);
-    const abilityChecker = this.dependencies.container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+    const abilityChecker = resolveAbilityChecker(this.dependencies.container);
     const requireAbility = createRequireAbilityMiddleware(abilityChecker);
     const middleware = [createRequireWebAuthMiddleware(auth), requireAbility(ability)];
     return this.wrapWeb(withMiddleware(...middleware)(handler));
@@ -250,7 +265,7 @@ class HttpKernel {
     return withMiddleware(...middleware)(handler);
   }
   wrapAbility(ability, handler) {
-    const abilityChecker = this.dependencies.container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+    const abilityChecker = resolveAbilityChecker(this.dependencies.container);
     const requireAbility = createRequireAbilityMiddleware(abilityChecker);
     const middleware = [...this.group("authenticated"), requireAbility(ability)];
     return withMiddleware(...middleware)(handler);
@@ -475,7 +490,7 @@ function createSpaRoutes(_dependencies) {
         });
       }
       return jsonResponse({
-        error: "SPA build not found. Run `cd frontend && bun install && bun run build`."
+        error: "SPA build not found. Run `bun run build:frontend`."
       }, { status: 503 });
     },
     "/": async () => Response.redirect("/app/", 302)
@@ -554,157 +569,46 @@ function mergeWebRoutes(dependencies, routes) {
 }
 
 // ../../src/bootstrap/health.ts
+import { getBoundDatabaseConnection } from "@getstrata/core/database/boundConnection";
+import { getDefaultDatabasePool } from "@getstrata/core/database/defaultConnection";
 import { jsonResponse as jsonResponse2 } from "@getstrata/core/http/response";
 var {RedisClient } = globalThis.Bun;
-
-// ../../src/config/database.ts
-function readInteger(name, fallback) {
-  const parsed = Number.parseInt(process.env[name] ?? String(fallback), 10);
-  return Number.isInteger(parsed) && parsed >= 0 ? parsed : fallback;
-}
-var databaseConfig = {
-  url: process.env.DATABASE_URL ?? "",
-  poolMax: readInteger("DB_POOL_MAX", 10),
-  idleTimeoutSeconds: readInteger("DB_POOL_IDLE_TIMEOUT", 30),
-  maxLifetimeSeconds: readInteger("DB_POOL_MAX_LIFETIME", 3600),
-  connectionTimeoutSeconds: readInteger("DB_CONNECTION_TIMEOUT", 10)
-};
-
-// ../../src/core/runtime/asyncContextStore.ts
-import { AsyncLocalStorage } from "async_hooks";
-function createAsyncContextStore(key) {
-  const symbol = Symbol.for(key);
-  const globalRecord = globalThis;
-  const existing = globalRecord[symbol];
-  if (existing) {
-    return existing;
-  }
-  const store = new AsyncLocalStorage;
-  globalRecord[symbol] = store;
-  return store;
-}
-
-// ../../src/core/database/connectionContext.ts
-var activeConnection = createAsyncContextStore("@getstrata/databaseConnectionContext");
-function getActiveDatabaseConnection(fallback) {
-  return activeConnection.getStore() ?? fallback;
-}
-
-// ../../src/core/database/queryProxy.ts
-var POOL_CONNECTION_METHODS = new Set(["begin", "close", "connect"]);
-function createDatabaseQueryProxy(pool) {
-  function resolveDatabase() {
-    return getActiveDatabaseConnection(pool);
-  }
-  function resolveDatabaseForProperty(property) {
-    if (typeof property === "string" && POOL_CONNECTION_METHODS.has(property)) {
-      return pool;
-    }
-    return resolveDatabase();
-  }
-  return new Proxy(function database() {}, {
-    apply(_target, _thisArg, args) {
-      return resolveDatabase()(...args);
-    },
-    get(_target, property) {
-      const connection = resolveDatabaseForProperty(property);
-      const value = connection[property];
-      return typeof value === "function" ? value.bind(connection) : value;
-    }
-  });
-}
-
-// ../../src/core/database/defaultConnection.ts
-var defaultPool = {
-  connection: null
-};
-var defaultQuery = {
-  connection: null
-};
-function registerDefaultDatabasePool(connection) {
-  defaultPool.connection = connection;
-  defaultQuery.connection = createDatabaseQueryProxy(connection);
-}
-function getDefaultDatabaseQuery() {
-  if (!defaultQuery.connection) {
-    throw new Error("Default database query handle is not registered. Call registerDefaultDatabasePool() during app bootstrap.");
+function resolveRedisUrl(dependencies) {
+  if (!dependencies.container.has(CORE_CONFIG_TOKEN)) {
+    return process.env.REDIS_URL?.trim() || undefined;
   }
-  return defaultQuery.connection;
+  const config = dependencies.container.resolve(CORE_CONFIG_TOKEN);
+  const redisUrl = config.get(REDIS_URL_CONFIG_KEY)?.trim();
+  return redisUrl || undefined;
 }
-
-// ../../src/db/connection/createConnection.ts
-var {SQL } = globalThis.Bun;
-function createDatabaseConnection(config) {
-  if (!config.url) {
-    throw new Error("DATABASE_URL is not configured. Set DATABASE_URL before starting the app or running integration tests.");
+function resolveHealthDatabase() {
+  const bound = getBoundDatabaseConnection();
+  if (bound) {
+    return bound;
   }
-  return new SQL({
-    url: config.url,
-    max: config.poolMax,
-    idleTimeout: config.idleTimeoutSeconds,
-    maxLifetime: config.maxLifetimeSeconds,
-    connectionTimeout: config.connectionTimeoutSeconds
-  });
-}
-
-// ../../src/db/connection/index.ts
-var connectionHolder = {
-  connection: null
-};
-function getDatabase() {
-  if (!connectionHolder.connection) {
-    connectionHolder.connection = createDatabaseConnection(databaseConfig);
-    registerDefaultDatabasePool(connectionHolder.connection);
+  try {
+    return getDefaultDatabasePool();
+  } catch {
+    return null;
   }
-  return connectionHolder.connection;
 }
-function getDb() {
-  getDatabase();
-  return getDefaultDatabaseQuery();
-}
-async function pingDatabase(connection = getDatabase()) {
+async function pingDatabaseClient(connection) {
   try {
-    await connection`SELECT 1`;
+    await connection.unsafe("SELECT 1");
     return true;
   } catch {
     return false;
   }
 }
-async function ensureDatabaseConnection() {
-  if (await pingDatabase()) {
-    return getDatabase();
+async function checkDatabase() {
+  const connection = resolveHealthDatabase();
+  if (!connection) {
+    return false;
   }
-  await getDatabase().close().catch(() => {
-    return;
-  });
-  connectionHolder.connection = createDatabaseConnection(databaseConfig);
-  registerDefaultDatabasePool(connectionHolder.connection);
-  return getDatabase();
+  return await pingDatabaseClient(connection);
 }
-var db = new Proxy(function database() {}, {
-  apply(_target, _thisArg, args) {
-    return getDb()(...args);
-  },
-  get(_target, property) {
-    const connection = getDb();
-    const value = connection[property];
-    return typeof value === "function" ? value.bind(connection) : value;
-  }
-});
-var connection_default = db;
-
-// ../../src/bootstrap/health.ts
-function resolveRedisUrl(dependencies) {
-  if (!dependencies.container.has(CORE_CONFIG_TOKEN)) {
-    return process.env.REDIS_URL?.trim() || undefined;
-  }
-  const config = dependencies.container.resolve(CORE_CONFIG_TOKEN);
-  const redisUrl = config.get(REDIS_URL_CONFIG_KEY)?.trim();
-  return redisUrl || undefined;
-}
-async function checkDatabase() {
-  await ensureDatabaseConnection();
-  return await pingDatabase();
+async function pingDatabase() {
+  return await checkDatabase();
 }
 async function checkRedis(redisUrl) {
   try {
@@ -715,23 +619,46 @@ async function checkRedis(redisUrl) {
     return false;
   }
 }
-function createHealthRoutes(dependencies) {
+async function resolveExtraFields(extra) {
+  if (!extra) {
+    return {};
+  }
+  return typeof extra === "function" ? await extra() : extra;
+}
+async function collectDependencyChecks(dependencies) {
+  const checks = {
+    database: await checkDatabase() ? "ok" : "error"
+  };
+  const redisUrl = resolveRedisUrl(dependencies);
+  if (redisUrl) {
+    checks.redis = await checkRedis(redisUrl) ? "ok" : "error";
+  } else {
+    checks.redis = "skipped";
+  }
+  const ready = checks.database === "ok" && (checks.redis === "ok" || checks.redis === "skipped");
+  return { checks, ready };
+}
+function createHealthRoutes(dependencies, options = {}) {
   return {
-    "/health": async () => jsonResponse2({ status: "ok" }),
-    "/ready": async () => {
-      const checks = {
-        database: await checkDatabase() ? "ok" : "error"
-      };
-      const redisUrl = resolveRedisUrl(dependencies);
-      if (redisUrl) {
-        checks.redis = await checkRedis(redisUrl) ? "ok" : "error";
-      } else {
-        checks.redis = "skipped";
+    "/health": async () => {
+      const extra = await resolveExtraFields(options.extra);
+      if (!options.pingOnHealth) {
+        return jsonResponse2({ status: "ok", ...extra });
       }
-      const ready = checks.database === "ok" && (checks.redis === "ok" || checks.redis === "skipped");
+      const { checks, ready } = await collectDependencyChecks(dependencies);
+      return jsonResponse2({
+        status: ready ? "ok" : "error",
+        checks,
+        ...extra
+      }, { status: ready ? 200 : 503 });
+    },
+    "/ready": async () => {
+      const extra = await resolveExtraFields(options.extra);
+      const { checks, ready } = await collectDependencyChecks(dependencies);
       return jsonResponse2({
         status: ready ? "ready" : "not_ready",
-        checks
+        checks,
+        ...extra
       }, { status: ready ? 200 : 503 });
     }
   };
@@ -838,6 +765,123 @@ var SCIM_SCHEMAS = {
   serviceProviderConfig: "urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig"
 };
 
+// ../../src/config/database.ts
+function readInteger(name, fallback) {
+  const parsed = Number.parseInt(process.env[name] ?? String(fallback), 10);
+  return Number.isInteger(parsed) && parsed >= 0 ? parsed : fallback;
+}
+var databaseConfig = {
+  url: process.env.DATABASE_URL ?? "",
+  poolMax: readInteger("DB_POOL_MAX", 10),
+  idleTimeoutSeconds: readInteger("DB_POOL_IDLE_TIMEOUT", 30),
+  maxLifetimeSeconds: readInteger("DB_POOL_MAX_LIFETIME", 3600),
+  connectionTimeoutSeconds: readInteger("DB_CONNECTION_TIMEOUT", 10)
+};
+
+// ../../src/core/runtime/asyncContextStore.ts
+import { AsyncLocalStorage } from "async_hooks";
+function createAsyncContextStore(key) {
+  const symbol = Symbol.for(key);
+  const globalRecord = globalThis;
+  const existing = globalRecord[symbol];
+  if (existing) {
+    return existing;
+  }
+  const store = new AsyncLocalStorage;
+  globalRecord[symbol] = store;
+  return store;
+}
+
+// ../../src/core/database/connectionContext.ts
+var activeConnection = createAsyncContextStore("@getstrata/databaseConnectionContext");
+function getActiveDatabaseConnection(fallback) {
+  return activeConnection.getStore() ?? fallback;
+}
+
+// ../../src/core/database/queryProxy.ts
+var POOL_CONNECTION_METHODS = new Set(["begin", "close", "connect"]);
+function createDatabaseQueryProxy(pool) {
+  function resolveDatabase() {
+    return getActiveDatabaseConnection(pool);
+  }
+  function resolveDatabaseForProperty(property) {
+    if (typeof property === "string" && POOL_CONNECTION_METHODS.has(property)) {
+      return pool;
+    }
+    return resolveDatabase();
+  }
+  return new Proxy(function database() {}, {
+    apply(_target, _thisArg, args) {
+      return resolveDatabase()(...args);
+    },
+    get(_target, property) {
+      const connection = resolveDatabaseForProperty(property);
+      const value = connection[property];
+      return typeof value === "function" ? value.bind(connection) : value;
+    }
+  });
+}
+
+// ../../src/core/database/defaultConnection.ts
+var defaultPool = {
+  connection: null
+};
+var defaultQuery = {
+  connection: null
+};
+function registerDefaultDatabasePool(connection) {
+  defaultPool.connection = connection;
+  defaultQuery.connection = createDatabaseQueryProxy(connection);
+}
+function getDefaultDatabaseQuery() {
+  if (!defaultQuery.connection) {
+    throw new Error("Default database query handle is not registered. Call registerDefaultDatabasePool() during app bootstrap.");
+  }
+  return defaultQuery.connection;
+}
+
+// ../../src/db/connection/createConnection.ts
+var {SQL } = globalThis.Bun;
+function createDatabaseConnection(config) {
+  if (!config.url) {
+    throw new Error("DATABASE_URL is not configured. Set DATABASE_URL before starting the app or running integration tests.");
+  }
+  return new SQL({
+    url: config.url,
+    max: config.poolMax,
+    idleTimeout: config.idleTimeoutSeconds,
+    maxLifetime: config.maxLifetimeSeconds,
+    connectionTimeout: config.connectionTimeoutSeconds
+  });
+}
+
+// ../../src/db/connection/index.ts
+var connectionHolder = {
+  connection: null
+};
+function getDatabase() {
+  if (!connectionHolder.connection) {
+    connectionHolder.connection = createDatabaseConnection(databaseConfig);
+    registerDefaultDatabasePool(connectionHolder.connection);
+  }
+  return connectionHolder.connection;
+}
+function getDb() {
+  getDatabase();
+  return getDefaultDatabaseQuery();
+}
+var db = new Proxy(function database() {}, {
+  apply(_target, _thisArg, args) {
+    return getDb()(...args);
+  },
+  get(_target, property) {
+    const connection = getDb();
+    const value = connection[property];
+    return typeof value === "function" ? value.bind(connection) : value;
+  }
+});
+var connection_default = db;
+
 // ../../src/modules/organization/memberRepository.ts
 class OrganizationMemberRepository {
   constructor() {}
@@ -938,7 +982,11 @@ class OrganizationRepository extends BaseRepository {
 var repository_default = OrganizationRepository;
 
 // ../../src/modules/user/provider.ts
-import { CORE_TOKEN_SERVICE_TOKEN as CORE_TOKEN_SERVICE_TOKEN2 } from "@getstrata/bootstrap/config";
+import {
+  CORE_ABILITY_CHECKER_TOKEN as CORE_ABILITY_CHECKER_TOKEN2,
+  CORE_AUTH_USER_DIRECTORY_TOKEN as CORE_AUTH_USER_DIRECTORY_TOKEN2,
+  CORE_TOKEN_SERVICE_TOKEN as CORE_TOKEN_SERVICE_TOKEN2
+} from "@getstrata/bootstrap/config";
 import { OidcProvider } from "@getstrata/core/auth/oauth/oidcProvider";
 import { GitHubOAuthProvider, MockOAuthProvider } from "@getstrata/core/auth/oauth/providers";
 import { SamlProvider } from "@getstrata/core/auth/oauth/samlProvider";

package/dist/entries/createSpaRoutes.js

@@ -42,7 +42,7 @@ function createSpaRoutes(_dependencies) {
         });
       }
       return jsonResponse({
-        error: "SPA build not found. Run `cd frontend && bun install && bun run build`."
+        error: "SPA build not found. Run `bun run build:frontend`."
       }, { status: 503 });
     },
     "/": async () => Response.redirect("/app/", 302)

package/dist/entries/createWebRoutes.js

@@ -32,6 +32,7 @@ import { applyMiddlewareToRoutes } from "@getstrata/core/http/middleware";
 
 // ../../src/bootstrap/httpKernel.ts
 import { createMembershipMiddleware } from "@getstrata/core/auth/membershipMiddleware";
+import { resolveAbilityChecker } from "@getstrata/core/contracts/serviceTokens";
 import { createAuthMiddleware } from "@getstrata/core/http/authMiddleware";
 import { createAuthorizeMiddleware } from "@getstrata/core/http/authorizeMiddleware";
 import { createBodySizeLimitMiddleware } from "@getstrata/core/http/bodySizeLimitMiddleware";
@@ -74,24 +75,38 @@ function parsePositiveInt(value, fallback) {
   }
   return Math.trunc(parsed);
 }
+function parseWindowSeconds(secondsValue, msValue, fallback) {
+  if (secondsValue !== undefined && secondsValue.trim() !== "") {
+    return parsePositiveInt(secondsValue, fallback);
+  }
+  if (msValue !== undefined && msValue.trim() !== "") {
+    const parsedMs = Number(msValue);
+    if (Number.isFinite(parsedMs) && parsedMs > 0) {
+      return Math.max(1, Math.trunc(parsedMs / 1000));
+    }
+  }
+  return fallback;
+}
 function resolveLoginRateLimit() {
   const defaults = isLocalAppEnv() ? LOCAL_LOGIN_RATE_LIMIT : PRODUCTION_LOGIN_RATE_LIMIT;
   return {
     maxAttempts: parsePositiveInt(process.env.LOGIN_RATE_LIMIT_PER_WINDOW, defaults.maxAttempts),
-    decaySeconds: parsePositiveInt(process.env.LOGIN_RATE_LIMIT_WINDOW_SECONDS, defaults.decaySeconds)
+    decaySeconds: parseWindowSeconds(process.env.LOGIN_RATE_LIMIT_WINDOW_SECONDS, process.env.LOGIN_RATE_LIMIT_WINDOW_MS, defaults.decaySeconds)
   };
 }
 function resolveRegisterRateLimit() {
   const defaults = isLocalAppEnv() ? { maxAttempts: 100, decaySeconds: 60 } : { maxAttempts: 10, decaySeconds: 60 };
   return {
     maxAttempts: parsePositiveInt(process.env.REGISTER_RATE_LIMIT_PER_WINDOW, defaults.maxAttempts),
-    decaySeconds: parsePositiveInt(process.env.REGISTER_RATE_LIMIT_WINDOW_SECONDS ?? process.env.REGISTER_RATE_LIMIT_WINDOW_MS ? String(Number(process.env.REGISTER_RATE_LIMIT_WINDOW_MS) / 1000) : undefined, defaults.decaySeconds)
+    decaySeconds: parseWindowSeconds(process.env.REGISTER_RATE_LIMIT_WINDOW_SECONDS, process.env.REGISTER_RATE_LIMIT_WINDOW_MS, defaults.decaySeconds)
   };
 }
 
 // ../../src/bootstrap/config.ts
 import {
+  CORE_ABILITY_CHECKER_TOKEN,
   CORE_AUTH_TOKEN,
+  CORE_AUTH_USER_DIRECTORY_TOKEN,
   CORE_CACHE_TOKEN,
   CORE_CONFIG_TOKEN,
   CORE_EVENT_BUS_TOKEN,
@@ -195,7 +210,7 @@ class HttpKernel {
   }
   wrapWebAbility(ability, handler) {
     const auth = this.dependencies.container.resolve(CORE_AUTH_TOKEN);
-    const abilityChecker = this.dependencies.container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+    const abilityChecker = resolveAbilityChecker(this.dependencies.container);
     const requireAbility = createRequireAbilityMiddleware(abilityChecker);
     const middleware = [createRequireWebAuthMiddleware(auth), requireAbility(ability)];
     return this.wrapWeb(withMiddleware(...middleware)(handler));
@@ -219,7 +234,7 @@ class HttpKernel {
     return withMiddleware(...middleware)(handler);
   }
   wrapAbility(ability, handler) {
-    const abilityChecker = this.dependencies.container.resolve(CORE_TOKEN_SERVICE_TOKEN);
+    const abilityChecker = resolveAbilityChecker(this.dependencies.container);
     const requireAbility = createRequireAbilityMiddleware(abilityChecker);
     const middleware = [...this.group("authenticated"), requireAbility(ability)];
     return withMiddleware(...middleware)(handler);

package/dist/entries/dependencies.js

@@ -107,7 +107,9 @@ var authConfig = {
 
 // ../../src/bootstrap/config.ts
 import {
+  CORE_ABILITY_CHECKER_TOKEN,
   CORE_AUTH_TOKEN,
+  CORE_AUTH_USER_DIRECTORY_TOKEN,
   CORE_CACHE_TOKEN,
   CORE_CONFIG_TOKEN,
   CORE_EVENT_BUS_TOKEN,