@luckystack/core 0.14.0 → 0.15.0

package/dist/index.d.ts

@@ -49,7 +49,7 @@ export type { BaseSessionLayout, SessionLocation, AuthProps, Jsonify } from './s
 export * from './sentrySetup.js';
 export { registerErrorTracker, registerErrorTrackers, appendErrorTracker, getActiveErrorTrackers, captureExceptionAcrossTrackers, captureMessageAcrossTrackers, setErrorTrackerUser, recordMetricAcrossTrackers, startSpanAcrossTrackers, startSpanHandle, registerPreCaptureFilter, flushErrorTrackers, sanitizeErrorString, sanitizeErrorStrings, } from './errorTrackerRegistry.js';
 export type { ErrorTracker, ErrorTrackerContext, ErrorTrackerUser, ErrorTrackerEvent, SpanResult, SpanHandle, PreCaptureFilter, } from './errorTrackerRegistry.js';
-export { runWithErrorTrackerIdentity, runWithErrorTrackerIdentityScope, setCurrentErrorTrackerIdentity, getCurrentErrorTrackerIdentity, } from './errorTrackerIdentity.js';
+export { runWithErrorTrackerIdentity, runWithErrorTrackerIdentityScope, setCurrentErrorTrackerIdentity, getCurrentErrorTrackerIdentity, hasErrorTrackerIdentityScope, } from './errorTrackerIdentity.js';
 export * from './env.js';
 export * from './db.js';
 export { registerDbHealthCheck, getDbHealthCheck, isDbHealthCheckRegistered, resetDbHealthCheckForTests, } from './dbHealthCheck.js';
@@ -63,7 +63,7 @@ export type { RedisKeyFormatter } from './redisKeyFormatter.js';
 export { acquireLease, renewLease, releaseLease } from './lease.js';
 export { DEFAULT_CLIENT_KEY, registerPrismaClient, registerRedisClient, getPrismaClient, getRedisClient, getPrismaClientFor, getRedisClientFor, getPrismaClientKeys, getRedisClientKeys, isPrismaClientRegistered, isRedisClientRegistered, resetClientsForTests, } from './clients.js';
 export { attachSocketRedisAdapter, resolveSocketAdapterKey } from './socketRedisAdapter.js';
-export { writeBootUuid, readBootUuid, refreshBootUuid, startBootUuidHeartbeat, resolveEnvKey, BOOT_KEY_PREFIX, type BootUuidHeartbeat, } from './bootUuid.js';
+export { writeBootUuid, readBootUuid, refreshBootUuid, startBootUuidHeartbeat, resolveEnvKey, BOOT_KEY_PREFIX, bootUuidKey, type BootUuidHeartbeat, } from './bootUuid.js';
 export { collectSynchronizedEnvKeys, computeSynchronizedEnvHashes, hashSynchronizedValue, hashSynchronizedValueWith, resolveHealthHashConfig, describeHealthHashConfig, resolveHealthHashConfigFromDescriptor, } from './synchronizedEnvHashes.js';
 export type { HealthHashDescriptor } from './synchronizedEnvHashes.js';
 export { initConsolelog } from './consoleLog.js';
@@ -89,7 +89,7 @@ export { extractTokenFromRequest } from './extractTokenFromRequest.js';
 export { resolveClientIp, isLoopbackIp, UNKNOWN_CLIENT_IP, deriveTokenBucketId } from './resolveClientIp.js';
 export type { ResolveClientIpParams } from './resolveClientIp.js';
 export { registerSessionProvider, getRegisteredSessionProvider, isSessionProviderRegistered, resetSessionProviderForTests, readSession, writeSession, removeSession, performLogout, } from './sessionProviderRegistry.js';
-export type { SessionProvider, SessionSaveResult, SessionLogoutInput } from './sessionProviderRegistry.js';
+export type { SessionProvider, SessionSaveResult, SessionSaveOptions, SessionLogoutInput } from './sessionProviderRegistry.js';
 export { validateRequest, isFalsy } from './validateRequest.js';
 export type { ValidationResult } from './validateRequest.js';
 export { checkRateLimit, getRateLimitStatus, clearRateLimit, clearAllRateLimits, registerRateLimitStrategy, getRateLimitStrategy, defaultRateLimitStrategy, } from './rateLimiter.js';

package/dist/index.js

@@ -51,7 +51,7 @@ import {
   tryCatchSync,
   validatePagePath,
   waitForSocket
-} from "./chunk-RC7ZQBO6.js";
+} from "./chunk-EZIBIQXO.js";
 import {
   getDeployConfig,
   getPortOverride,
@@ -64,7 +64,7 @@ import {
   registerSecretsResolvedListener,
   registerServicesConfig,
   resetPortOverrideForTests
-} from "./chunk-6UPWMV6L.js";
+} from "./chunk-YKVBUWB6.js";
 import {
   DEFAULT_REDACTED_LOG_KEYS,
   DEPTH_TRUNCATED_PLACEHOLDER,
@@ -98,7 +98,7 @@ import {
   startSpan,
   startSpanAcrossTrackers,
   startSpanHandle
-} from "./chunk-C4AK6P5D.js";
+} from "./chunk-NJULJZ3N.js";
 import {
   DEFAULT_PROJECT_CONFIG,
   createRegistry,
@@ -108,7 +108,7 @@ import {
   isPlainObject,
   isProjectConfigRegistered,
   registerProjectConfig
-} from "./chunk-PN2FPJXI.js";
+} from "./chunk-55YXIACQ.js";
 
 // src/escapeHtml.ts
 var HTML_ESCAPE_MAP = {
@@ -171,7 +171,7 @@ var registerHook = (name, handler) => {
   };
 };
 var dispatchHook = async (name, payload, options = {}) => {
-  const handlers = hookHandlers.get(name) ?? [];
+  const handlers = [...hookHandlers.get(name) ?? []];
   for (const handler of handlers) {
     let result;
     try {
@@ -218,7 +218,7 @@ var registerSyncHook = (name, handler) => {
   };
 };
 var dispatchSyncHook = (name, payload) => {
-  const handlers = syncHookHandlers.get(name) ?? [];
+  const handlers = [...syncHookHandlers.get(name) ?? []];
   for (const handler of handlers) {
     try {
       handler(payload);
@@ -416,8 +416,13 @@ var warnOnBunEnvAutoload = (files) => {
 var loadEnvFiles = () => {
   const files = getEnvFiles();
   warnOnBunEnvAutoload(files);
-  for (const [index, file] of files.entries()) {
-    loadDotenv({ path: file, override: index > 0 });
+  const ambientKeys = new Set(Object.keys(process.env));
+  const fileValues = {};
+  for (const file of files) {
+    loadDotenv({ path: file, processEnv: fileValues, override: true });
+  }
+  for (const [key, value] of Object.entries(fileValues)) {
+    if (!ambientKeys.has(key)) process.env[key] = value;
   }
   if (process.env.LUCKYSTACK_ENV_DEBUG) {
     reportDuplicateEnvKeys(files);
@@ -479,32 +484,42 @@ var readBound = (target, prop) => {
   const value = Reflect.get(target, prop);
   return typeof value === "function" ? value.bind(target) : value;
 };
-var guardSocketsMap = (map) => new Proxy(map, {
+var guardSocketsMap = (map, label) => new Proxy(map, {
   get(target, prop) {
     if (ENUMERATING_MAP_MEMBERS.has(prop)) {
-      throw new LocalSocketEnumerationError("Enumerating `io.sockets.sockets`");
+      throw new LocalSocketEnumerationError(`Enumerating \`${label}.sockets\``);
     }
     return readBound(target, prop);
   }
 });
-var guardAdapter = (adapter) => new Proxy(adapter, {
+var guardAdapter = (adapter, label) => new Proxy(adapter, {
   get(target, prop) {
     if (PER_INSTANCE_ADAPTER_MEMBERS.has(prop)) {
-      throw new LocalSocketEnumerationError(`\`io.sockets.adapter.${String(prop)}\``);
+      throw new LocalSocketEnumerationError(`\`${label}.adapter.${String(prop)}\``);
     }
     return readBound(target, prop);
   }
 });
-var guardNamespace = (namespace) => new Proxy(namespace, {
+var guardNamespace = (namespace, label) => new Proxy(namespace, {
   get(target, prop) {
-    if (prop === "adapter") return guardAdapter(target.adapter);
-    if (prop === "sockets") return guardSocketsMap(target.sockets);
+    if (prop === "adapter") return guardAdapter(target.adapter, label);
+    if (prop === "sockets") return guardSocketsMap(target.sockets, label);
     return readBound(target, prop);
   }
 });
+var isGuardableNamespace = (value) => typeof value === "object" && value !== null && typeof Reflect.get(value, "adapter") === "object" && Reflect.get(value, "sockets") instanceof Map;
 var guardLocalSocketEnumeration = (io) => new Proxy(io, {
   get(target, prop) {
-    if (prop === "sockets") return guardNamespace(target.sockets);
+    if (prop === "sockets") return guardNamespace(target.sockets, "io.sockets");
+    const value = Reflect.get(target, prop);
+    if (prop === "of" && typeof value === "function") {
+      return (...args) => {
+        const namespace = Reflect.apply(value, target, args);
+        if (!isGuardableNamespace(namespace)) return namespace;
+        const name = args[0];
+        return guardNamespace(namespace, typeof name === "string" ? `io.of('${name}')` : "io.of(\u2026)");
+      };
+    }
     return readBound(target, prop);
   }
 });
@@ -561,9 +576,7 @@ var registerEmailSender = (sender) => {
 };
 var registerEmailSenders = (senders) => {
   registry4 = { ...senders };
-  if (senders.default) {
-    activeSender = senders.default;
-  }
+  activeSender = senders.default ?? null;
 };
 var getEmailSender = () => activeSender ?? registry4.default ?? null;
 var getEmailSenderByName = (name) => {
@@ -592,6 +605,7 @@ var setCurrentErrorTrackerIdentity = (user) => {
   if (box) box.user = user;
 };
 var getCurrentErrorTrackerIdentity = () => identityStore.getStore()?.user ?? null;
+var hasErrorTrackerIdentityScope = () => identityStore.getStore() !== void 0;
 
 // src/db.ts
 import { createRequire as createRequire2 } from "module";
@@ -953,6 +967,10 @@ import { createAdapter } from "@socket.io/redis-adapter";
 import { randomUUID } from "crypto";
 var BOOT_KEY_PREFIX = "luckystack:boot:";
 var DEFAULT_BOOT_KEY_TTL_SECONDS = 3600;
+var bootUuidKey = (envKey) => {
+  const projectName = process.env.PROJECT_NAME;
+  return `${BOOT_KEY_PREFIX}${projectName && projectName.length > 0 ? projectName : "luckystack"}:${envKey}`;
+};
 var getBootKeyTtlSeconds = () => getDeployConfig().routing?.bootKeyTtlSeconds ?? DEFAULT_BOOT_KEY_TTL_SECONDS;
 var getBootUuidRefreshIntervalMs = () => Math.max(100, Math.floor(getBootKeyTtlSeconds() * 1e3 / 3));
 var resolveEnvKey = () => {
@@ -961,16 +979,16 @@ var resolveEnvKey = () => {
 var writeBootUuid = async (envKey) => {
   const key = envKey ?? resolveEnvKey();
   const uuid = randomUUID();
-  await redis.set(`${BOOT_KEY_PREFIX}${key}`, uuid, "EX", getBootKeyTtlSeconds());
+  await redis.set(bootUuidKey(key), uuid, "EX", getBootKeyTtlSeconds());
   return uuid;
 };
 var readBootUuid = async (envKey) => {
   const key = envKey ?? resolveEnvKey();
-  return redis.get(`${BOOT_KEY_PREFIX}${key}`);
+  return redis.get(bootUuidKey(key));
 };
 var refreshBootUuid = async (envKey) => {
   const key = envKey ?? resolveEnvKey();
-  const refreshed = await redis.expire(`${BOOT_KEY_PREFIX}${key}`, getBootKeyTtlSeconds());
+  const refreshed = await redis.expire(bootUuidKey(key), getBootKeyTtlSeconds());
   if (refreshed === 0) await writeBootUuid(key);
 };
 var startBootUuidHeartbeat = (envKey) => {
@@ -987,7 +1005,7 @@ var startBootUuidHeartbeat = (envKey) => {
         },
         (error) => {
           getLogger().error(
-            `[boot-uuid] failed to refresh ${BOOT_KEY_PREFIX}${key}; readiness may degrade if the TTL expires`,
+            `[boot-uuid] failed to refresh ${bootUuidKey(key)}; readiness may degrade if the TTL expires`,
             error instanceof Error ? error : new Error(String(error))
           );
           schedule();
@@ -1117,7 +1135,10 @@ var initConsolelog = () => {
       originalLog(`${colorCode}${extractedInfo}${COLORS.reset}`);
       originalLog(...args);
     } else {
-      originalLog(`${colorCode}${extractedInfo} -- ${args.join(" ")}${COLORS.reset}`);
+      const firstNonString = args.findIndex((arg) => typeof arg !== "string");
+      const leading = firstNonString === -1 ? args : args.slice(0, firstNonString);
+      const rest = firstNonString === -1 ? [] : args.slice(firstNonString);
+      originalLog(`${colorCode}${extractedInfo} -- ${leading.join(" ")}${COLORS.reset}`, ...rest);
     }
   };
 };
@@ -1447,7 +1468,8 @@ var extractTokenFromSocket = (socket2) => {
   const config = getProjectConfig();
   const cookie = socket2.handshake.headers.cookie;
   const sessionToken = typeof socket2.handshake.auth.token === "string" ? socket2.handshake.auth.token : null;
-  const cookieToken = getCookieValue(cookie, config.http.sessionCookieName);
+  const cookieName = applyCookiePrefixConstraints(config.http.sessionCookieName, config.http.sessionCookiePrefix).name;
+  const cookieToken = getCookieValue(cookie, cookieName);
   if (config.session.basedToken) {
     return sessionToken ?? cookieToken;
   }
@@ -1463,7 +1485,8 @@ var extractTokenFromRequest = (req) => {
   const authHeader = typeof rawAuthHeader === "string" ? rawAuthHeader : Array.isArray(rawAuthHeader) && typeof rawAuthHeader[0] === "string" ? rawAuthHeader[0] : void 0;
   const bearerToken = authHeader?.startsWith("Bearer ") ? authHeader.slice(7) : null;
   const config = getProjectConfig();
-  const cookieToken = getCookieValue(req.headers.cookie, config.http.sessionCookieName);
+  const cookieName = applyCookiePrefixConstraints(config.http.sessionCookieName, config.http.sessionCookiePrefix).name;
+  const cookieToken = getCookieValue(req.headers.cookie, cookieName);
   if (config.session.basedToken) {
     return bearerToken ?? cookieToken;
   }
@@ -1955,6 +1978,36 @@ var parseObjectFields = (typeText) => {
   }
   return { fields, indexSignatures };
 };
+var wrapsWhole = (text, open, close) => {
+  if (!text.startsWith(open) || !text.endsWith(close)) return false;
+  let depth = 0;
+  let inString = null;
+  for (let index = 0; index < text.length; index += 1) {
+    const char = text[index];
+    if (inString) {
+      if (char === "\\") index += 1;
+      else if (char === inString) inString = null;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      inString = char;
+      continue;
+    }
+    if (char === open) depth += 1;
+    if (char === close) {
+      depth -= 1;
+      if (depth === 0) return index === text.length - 1;
+    }
+  }
+  return false;
+};
+var unwrapParens = (text) => {
+  let current = text.trim();
+  while (wrapsWhole(current, "(", ")")) current = current.slice(1, -1).trim();
+  return current;
+};
+var isObjectTypeText = (text) => wrapsWhole(text, "{", "}");
+var unquoteLiteral = (literal) => literal.slice(1, -1).replaceAll(/\\(['"\\])/g, "$1");
 var matchesIndexKeyType = ({ keyType, key }) => {
   const normalized = keyType.trim();
   if (normalized === "string") return true;
@@ -1964,7 +2017,7 @@ var matchesIndexKeyType = ({ keyType, key }) => {
     return parts.some((part) => matchesIndexKeyType({ keyType: part, key }));
   }
   if (normalized.startsWith("'") && normalized.endsWith("'") || normalized.startsWith('"') && normalized.endsWith('"')) {
-    return key === normalized.slice(1, -1);
+    return key === unquoteLiteral(normalized);
   }
   return false;
 };
@@ -2010,6 +2063,45 @@ var parseRecordParts = (type) => {
   return null;
 };
 var MAX_VALIDATION_DEPTH = 64;
+var JSON_DATA_TYPES = /* @__PURE__ */ new Set(["JsonValue", "JsonObject", "JsonArray", "JsonPrimitive"]);
+var isJsonPrimitive = (value) => value === null || typeof value === "string" || typeof value === "boolean" || typeof value === "number" && Number.isFinite(value);
+var isPlainObject2 = (value) => {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+};
+var validateJsonData = (type, value, path4, depth) => {
+  if (depth > MAX_VALIDATION_DEPTH) {
+    return { status: "error", message: `${path4}: input nesting exceeds the maximum depth of ${String(MAX_VALIDATION_DEPTH)}` };
+  }
+  if (isJsonPrimitive(value)) {
+    return type === "JsonValue" || type === "JsonPrimitive" ? { status: "success" } : { status: "error", message: `${path4} should be ${type === "JsonArray" ? "a JSON array" : "a JSON object"}` };
+  }
+  if (type === "JsonPrimitive") {
+    return { status: "error", message: `${path4} should be a JSON primitive` };
+  }
+  if (Array.isArray(value)) {
+    if (type === "JsonObject") return { status: "error", message: `${path4} should be a JSON object` };
+    for (const [index, element] of value.entries()) {
+      const result = validateJsonData("JsonValue", element, `${path4}[${String(index)}]`, depth + 1);
+      if (result.status === "error") return result;
+    }
+    return { status: "success" };
+  }
+  if (isPlainObject2(value)) {
+    if (type === "JsonArray") return { status: "error", message: `${path4} should be a JSON array` };
+    for (const [key, entry] of Object.entries(value)) {
+      if (PROTO_POLLUTION_KEYS.has(key)) {
+        return { status: "error", message: `${path4}.${key} is not allowed` };
+      }
+      if (entry === void 0) continue;
+      const result = validateJsonData("JsonValue", entry, `${path4}.${key}`, depth + 1);
+      if (result.status === "error") return result;
+    }
+    return { status: "success" };
+  }
+  return { status: "error", message: `${path4} should be JSON data` };
+};
 var validateType = (typeText, value, path4, depth = 0) => {
   if (depth > MAX_VALIDATION_DEPTH) {
     return { status: "error", message: `${path4}: input nesting exceeds the maximum depth of ${String(MAX_VALIDATION_DEPTH)}` };
@@ -2039,14 +2131,20 @@ var validateType = (typeText, value, path4, depth = 0) => {
   if (type.includes("&")) {
     const intersectionParts = splitTopLevel(type, "&").filter(Boolean);
     if (intersectionParts.length > 1) {
+      const objectParts = intersectionParts.map((part) => unwrapParens(part));
+      if (objectParts.every((part) => isObjectTypeText(part))) {
+        const mergedBody = objectParts.map((part) => part.slice(1, -1)).join("; ");
+        return validateType(`{ ${mergedBody} }`, value, path4, depth + 1);
+      }
       for (const intersectionType of intersectionParts) {
         const result = validateType(intersectionType, value, path4, depth + 1);
         if (result.status === "error") return result;
       }
       return { status: "success" };
     }
-    if (intersectionParts.length === 1) {
-      return validateType(intersectionParts[0] ?? type, value, path4, depth + 1);
+    const singleMember = intersectionParts[0] ?? type;
+    if (intersectionParts.length === 1 && singleMember !== type) {
+      return validateType(singleMember, value, path4, depth + 1);
     }
   }
   if (type.endsWith("[]")) {
@@ -2064,7 +2162,7 @@ var validateType = (typeText, value, path4, depth = 0) => {
     return { status: "success" };
   }
   if (type.startsWith("'") && type.endsWith("'") || type.startsWith('"') && type.endsWith('"')) {
-    const literal = type.slice(1, -1);
+    const literal = unquoteLiteral(type);
     return value === literal ? { status: "success" } : { status: "error", message: `${path4} should equal ${literal}` };
   }
   const numericLiteral = parseFiniteNumericLiteral(type);
@@ -2081,6 +2179,9 @@ var validateType = (typeText, value, path4, depth = 0) => {
   if (type === "any" || type === "unknown") {
     return { status: "success" };
   }
+  if (JSON_DATA_TYPES.has(type)) {
+    return validateJsonData(type, value, path4, depth);
+  }
   if (/^Record<.+>$/.test(type)) {
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
       return { status: "error", message: `${path4} should be an object` };
@@ -2171,7 +2272,7 @@ var validateInputByType = async ({
     return { status: "success" };
   }
   if (isProductionRuntime()) {
-    const { getProjectConfig: getProjectConfig2 } = await import("./projectConfig-EOJRMH36.js");
+    const { getProjectConfig: getProjectConfig2 } = await import("./projectConfig-6QNMG5GZ.js");
     if (getProjectConfig2().validation.runtimeMode === "off") {
       return { status: "success" };
     }
@@ -2378,6 +2479,7 @@ export {
   applySocketMiddlewares,
   applyStrayKeyPrefix,
   attachSocketRedisAdapter,
+  bootUuidKey,
   bootstrapEnv,
   buildApiResponseEventName,
   buildApiStreamEventName,
@@ -2482,6 +2584,7 @@ export {
   getSyncQueueSize,
   getUploadsDir,
   hasCookie,
+  hasErrorTrackerIdentityScope,
   hashSynchronizedValue,
   hashSynchronizedValueWith,
   httpFetch,