@better-auth/infra 0.2.0 → 0.2.2

package/dist/index.d.mts

@@ -723,7 +723,7 @@ interface DashIdRow {
   id: string;
 }
 //#endregion
-//#region ../../node_modules/.bun/@better-auth+scim@1.6.1+7c6411af93091c12/node_modules/@better-auth/scim/dist/index.d.mts
+//#region ../../node_modules/.bun/@better-auth+scim@1.6.1+27eabf8bb9704597/node_modules/@better-auth/scim/dist/index.d.mts
 //#region src/types.d.ts
 interface SCIMProvider {
   id: string;
@@ -4507,34 +4507,29 @@ interface DashUserOrganizationsResponse {
 }
 type DashCreateUserResponse = DashUser;
 type DashUpdateUserResponse = DashUser;
+/** One period of sign-up stats; null when the underlying query failed. */
+interface DashUserStatsSignUpPeriod {
+  signUps: number | null;
+  /** Omitted when current or previous-period query failed (avoids misleading deltas). */
+  percentage: number | null;
+}
+/** One period of active-user stats; null when the underlying query failed. */
+interface DashUserStatsActivePeriod {
+  active: number | null;
+  percentage: number | null;
+}
 interface DashUserStatsResponse {
-  daily: {
-    signUps: number;
-    percentage: number;
-  };
-  weekly: {
-    signUps: number;
-    percentage: number;
-  };
-  monthly: {
-    signUps: number;
-    percentage: number;
-  };
-  total: number;
+  daily: DashUserStatsSignUpPeriod;
+  weekly: DashUserStatsSignUpPeriod;
+  monthly: DashUserStatsSignUpPeriod;
+  total: number | null;
   activeUsers: {
-    daily: {
-      active: number;
-      percentage: number;
-    };
-    weekly: {
-      active: number;
-      percentage: number;
-    };
-    monthly: {
-      active: number;
-      percentage: number;
-    };
+    daily: DashUserStatsActivePeriod;
+    weekly: DashUserStatsActivePeriod;
+    monthly: DashUserStatsActivePeriod;
   };
+  /** Set when any stat query failed; some fields may be null. */
+  degraded?: boolean;
 }
 interface DashUserGraphPoint {
   date: string | Date;
@@ -5874,4 +5869,4 @@ declare const dash: <O extends DashOptions>(options?: O) => {
   } : {};
 };
 //#endregion
-export { type APIError, CHALLENGE_TTL, type CompromisedPasswordResult, type CredentialStuffingResult, DBField, DEFAULT_DIFFICULTY, DashAddTeamMemberResponse, DashBanManyResponse, DashCheckUserByEmailResponse, DashCheckUserExistsResponse, DashCompleteInvitationResponse, DashConfigResponse, DashCreateOrganizationBody, DashCreateOrganizationResponse, DashCreateTeamResponse, DashCreateUserResponse, DashDeleteManyUsersResponse, DashDirectoryCreateResponse, DashDirectoryDeleteResponse, DashDirectoryItem, DashDirectoryRegenerateTokenResponse, DashExecuteAdapterCountResponse, DashExecuteAdapterFindManyResponse, DashExecuteAdapterFindOneResponse, DashExecuteAdapterMutationResponse, DashExecuteAdapterResponse, DashExportOrganizationsResponse, DashIdRow, DashInviteMemberResponse, DashMaybeSuccessResponse, type DashOptions, DashOptionsInternal, DashOrganizationAddMemberResponse, DashOrganizationDeleteManyResponse, DashOrganizationDetailResponse, DashOrganizationInvitationItem, DashOrganizationInvitationListResponse, DashOrganizationInvitationStatusItem, DashOrganizationListResponse, DashOrganizationMember, DashOrganizationMemberListItem, DashOrganizationMemberListResponse, DashOrganizationMemberUser, DashOrganizationOptionsResponse, DashOrganizationTeamItem, DashOrganizationTeamListResponse, DashOrganizationUpdateMemberRoleResponse, DashOrganizationUpdateResponse, DashSendManyVerificationEmailsResponse, DashSessionRevokeManyResponse, DashSsoCreateProviderResponse, DashSsoDeleteResponse, DashSsoMarkDomainVerifiedResponse, DashSsoProviderItem, DashSsoProviderSummary, DashSsoUpdateProviderResponse, DashSsoVerificationTokenResponse, DashSsoVerifyDomainResponse, DashSuccessResponse, DashTeam, DashTeamMember, DashTeamMemberListResponse, DashTwoFactorBackupCodesResponse, DashTwoFactorEnableResponse, DashTwoFactorTotpViewResponse, DashUpdateTeamResponse, DashUpdateUserResponse, DashUserDetailsResponse, DashUserGraphDataResponse, DashUserListResponse, DashUserOrganizationsResponse, DashUserRetentionDataResponse, DashUserStatsResponse, DashValidateResponse, DirectorySyncConnection, EMAIL_TEMPLATES, type EmailConfig, type EmailTemplateId, type EmailTemplateVariables, type Endpoint, type EndpointOptions, type EventLocation, type EventTypesResponse, type ImpossibleTravelResult, InfraEndpointContext, InfraPluginConnectionOptions, InfraPluginConnectionOptionsInternal, LocationData, LocationDataContext, type PoWChallenge, type PoWSolution, SCIMPlugin, type SMSConfig, type SMSTemplateId, type SMSTemplateVariables, SMS_TEMPLATES, type SecurityEvent, type SecurityEventType, type SecurityOptions, type SecurityVerdict, type SendBulkEmailsOptions, type SendBulkEmailsResult, type SendEmailOptions, type SendEmailResult, type SendSMSOptions, type SendSMSResult, type SentinelOptions, SentinelOptionsInternal, type StaleUserResult, type ThresholdConfig, USER_EVENT_TYPES, type UserEvent, type UserEventType, type UserEventsResponse, createEmailSender, createSMSSender, dash, decodePoWChallenge, encodePoWSolution, normalizeEmail, sendBulkEmails, sendEmail, sendSMS, sentinel, solvePoWChallenge, verifyPoWSolution };
+export { type APIError, CHALLENGE_TTL, type CompromisedPasswordResult, type CredentialStuffingResult, DBField, DEFAULT_DIFFICULTY, DashAddTeamMemberResponse, DashBanManyResponse, DashCheckUserByEmailResponse, DashCheckUserExistsResponse, DashCompleteInvitationResponse, DashConfigResponse, DashCreateOrganizationBody, DashCreateOrganizationResponse, DashCreateTeamResponse, DashCreateUserResponse, DashDeleteManyUsersResponse, DashDirectoryCreateResponse, DashDirectoryDeleteResponse, DashDirectoryItem, DashDirectoryRegenerateTokenResponse, DashExecuteAdapterCountResponse, DashExecuteAdapterFindManyResponse, DashExecuteAdapterFindOneResponse, DashExecuteAdapterMutationResponse, DashExecuteAdapterResponse, DashExportOrganizationsResponse, DashIdRow, DashInviteMemberResponse, DashMaybeSuccessResponse, type DashOptions, DashOptionsInternal, DashOrganizationAddMemberResponse, DashOrganizationDeleteManyResponse, DashOrganizationDetailResponse, DashOrganizationInvitationItem, DashOrganizationInvitationListResponse, DashOrganizationInvitationStatusItem, DashOrganizationListResponse, DashOrganizationMember, DashOrganizationMemberListItem, DashOrganizationMemberListResponse, DashOrganizationMemberUser, DashOrganizationOptionsResponse, DashOrganizationTeamItem, DashOrganizationTeamListResponse, DashOrganizationUpdateMemberRoleResponse, DashOrganizationUpdateResponse, DashSendManyVerificationEmailsResponse, DashSessionRevokeManyResponse, DashSsoCreateProviderResponse, DashSsoDeleteResponse, DashSsoMarkDomainVerifiedResponse, DashSsoProviderItem, DashSsoProviderSummary, DashSsoUpdateProviderResponse, DashSsoVerificationTokenResponse, DashSsoVerifyDomainResponse, DashSuccessResponse, DashTeam, DashTeamMember, DashTeamMemberListResponse, DashTwoFactorBackupCodesResponse, DashTwoFactorEnableResponse, DashTwoFactorTotpViewResponse, DashUpdateTeamResponse, DashUpdateUserResponse, DashUserDetailsResponse, DashUserGraphDataResponse, DashUserListResponse, DashUserOrganizationsResponse, DashUserRetentionDataResponse, DashUserStatsActivePeriod, DashUserStatsResponse, DashUserStatsSignUpPeriod, DashValidateResponse, DirectorySyncConnection, EMAIL_TEMPLATES, type EmailConfig, type EmailTemplateId, type EmailTemplateVariables, type Endpoint, type EndpointOptions, type EventLocation, type EventTypesResponse, type ImpossibleTravelResult, InfraEndpointContext, InfraPluginConnectionOptions, InfraPluginConnectionOptionsInternal, LocationData, LocationDataContext, type PoWChallenge, type PoWSolution, SCIMPlugin, type SMSConfig, type SMSTemplateId, type SMSTemplateVariables, SMS_TEMPLATES, type SecurityEvent, type SecurityEventType, type SecurityOptions, type SecurityVerdict, type SendBulkEmailsOptions, type SendBulkEmailsResult, type SendEmailOptions, type SendEmailResult, type SendSMSOptions, type SendSMSResult, type SentinelOptions, SentinelOptionsInternal, type StaleUserResult, type ThresholdConfig, USER_EVENT_TYPES, type UserEvent, type UserEventType, type UserEventsResponse, createEmailSender, createSMSSender, dash, decodePoWChallenge, encodePoWSolution, normalizeEmail, sendBulkEmails, sendEmail, sendSMS, sentinel, solvePoWChallenge, verifyPoWSolution };

package/dist/index.mjs

@@ -958,8 +958,8 @@ function createIdentificationMiddleware(options) {
 			return;
 		}
 		const ipAddress = getClientIpFromRequest(ctx.request, ipConfig?.ipAddressHeaders || null);
-		const countryCode = getCountryCodeFromRequest(ctx.request);
-		if (ipAddress || countryCode) {
+		if (ipAddress) {
+			const countryCode = getCountryCodeFromRequest(ctx.request);
 			ctx.context.location = {
 				ipAddress,
 				countryCode
@@ -2746,7 +2746,7 @@ const jwtValidateMiddleware = (options) => createAuthMiddleware(async (ctx) => {
 });
 //#endregion
 //#region src/version.ts
-const PLUGIN_VERSION = "0.2.0";
+const PLUGIN_VERSION = "0.2.2";
 //#endregion
 //#region src/routes/auth/config.ts
 const PLUGIN_OPTIONS_EXCLUDE_KEYS = { stripe: new Set(["stripeClient"]) };
@@ -2758,23 +2758,28 @@ function isPlainSerializable(value) {
 	if (constructor && constructor.name !== "Object" && constructor.name !== "Array") return false;
 	return true;
 }
-function sanitizePluginOptions(pluginId, options, seen = /* @__PURE__ */ new WeakSet()) {
+function sanitizePluginOptions(pluginId, options, visiting = /* @__PURE__ */ new WeakSet()) {
 	if (options === null || options === void 0) return options;
 	if (typeof options === "function") return void 0;
 	if (typeof options !== "object") return options;
-	if (seen.has(options)) return void 0;
-	seen.add(options);
-	const excludeKeys = PLUGIN_OPTIONS_EXCLUDE_KEYS[pluginId];
-	if (Array.isArray(options)) return options.map((item) => sanitizePluginOptions(pluginId, item, seen)).filter((item) => item !== void 0);
-	const result = {};
-	for (const [key, value] of Object.entries(options)) {
-		if (excludeKeys?.has(key)) continue;
-		if (typeof value === "function") continue;
-		if (value !== null && typeof value === "object" && !isPlainSerializable(value)) continue;
-		const sanitized = sanitizePluginOptions(pluginId, value, seen);
-		if (sanitized !== void 0) result[key] = sanitized;
+	const obj = options;
+	if (visiting.has(obj)) return void 0;
+	visiting.add(obj);
+	try {
+		const excludeKeys = PLUGIN_OPTIONS_EXCLUDE_KEYS[pluginId];
+		if (Array.isArray(options)) return options.map((item) => sanitizePluginOptions(pluginId, item, visiting)).filter((item) => item !== void 0);
+		const result = {};
+		for (const [key, value] of Object.entries(options)) {
+			if (excludeKeys?.has(key)) continue;
+			if (typeof value === "function") continue;
+			if (value !== null && typeof value === "object" && !isPlainSerializable(value)) continue;
+			const sanitized = sanitizePluginOptions(pluginId, value, visiting);
+			if (sanitized !== void 0) result[key] = sanitized;
+		}
+		return result;
+	} finally {
+		visiting.delete(obj);
 	}
-	return result;
 }
 function estimateEntropy(str) {
 	const unique = new Set(str).size;
@@ -6625,7 +6630,7 @@ async function countUniqueActiveUsers(ctx, range, options) {
 					break;
 				}
 			}
-		}, { concurrency: 50 });
+		}, { concurrency: 10 });
 		return activeUserIds.size;
 	}
 	const sessions = await ctx.context.adapter.findMany({
@@ -6635,6 +6640,34 @@ async function countUniqueActiveUsers(ctx, range, options) {
 	});
 	return new Set(sessions.map((s) => s.userId)).size;
 }
+function optionalQuery(ctx, label, getCount) {
+	return async function runQuery() {
+		try {
+			return {
+				ok: true,
+				value: await getCount()
+			};
+		} catch (error) {
+			ctx.context.logger.warn(`[Dash] User stats query "${label}" failed`, error);
+			return {
+				ok: false,
+				value: null
+			};
+		}
+	};
+}
+function signUpPeriod(current, previous, calculatePercentage) {
+	return {
+		signUps: current.ok ? current.value : null,
+		percentage: current.ok && previous.ok ? calculatePercentage(current.value, previous.value) : null
+	};
+}
+function activePeriod(current, previous, calculatePercentage) {
+	return {
+		active: current.ok ? current.value : null,
+		percentage: current.ok && previous.ok ? calculatePercentage(current.value, previous.value) : null
+	};
+}
 const getUserStats = (options) => createAuthEndpoint("/dash/user-stats", {
 	method: "GET",
 	use: [jwtMiddleware(options)]
@@ -6648,16 +6681,16 @@ const getUserStats = (options) => createAuthEndpoint("/dash/user-stats", {
 	const twoMonthsAgo = /* @__PURE__ */ new Date(now.getTime() - 1440 * 60 * 60 * 1e3);
 	const activityTrackingEnabled = !!options.activityTracking?.enabled;
 	const storeInSecondaryStorageOnly = isSessionInSecondaryStorageOnly(ctx.context);
-	const [dailyCount, previousDailyCount, weeklyCount, previousWeeklyCount, monthlyCount, previousMonthlyCount, totalCount, dailyActiveCount, previousDailyActiveCount, weeklyActiveCount, previousWeeklyActiveCount, monthlyActiveCount, previousMonthlyActiveCount] = await Promise.all([
-		ctx.context.adapter.count({
+	const [rDailySignups, rPrevDaySignups, rWeeklySignups, rPrevWeekSignups, rMonthlySignups, rPrevMonthSignups, rTotalUsers, rActiveDaily, rActivePrevDay, rActiveWeekly, rActivePrevWeek, rActiveMonthly, rActivePrevMonth] = await withConcurrency([
+		optionalQuery(ctx, "daily signups", () => ctx.context.adapter.count({
 			model: "user",
 			where: [{
 				field: "createdAt",
 				operator: "gte",
 				value: oneDayAgo
 			}]
-		}),
-		ctx.context.adapter.count({
+		})),
+		optionalQuery(ctx, "previous day signups", () => ctx.context.adapter.count({
 			model: "user",
 			where: [{
 				field: "createdAt",
@@ -6668,16 +6701,16 @@ const getUserStats = (options) => createAuthEndpoint("/dash/user-stats", {
 				operator: "lt",
 				value: oneDayAgo
 			}]
-		}),
-		ctx.context.adapter.count({
+		})),
+		optionalQuery(ctx, "weekly signups", () => ctx.context.adapter.count({
 			model: "user",
 			where: [{
 				field: "createdAt",
 				operator: "gte",
 				value: oneWeekAgo
 			}]
-		}),
-		ctx.context.adapter.count({
+		})),
+		optionalQuery(ctx, "previous week signups", () => ctx.context.adapter.count({
 			model: "user",
 			where: [{
 				field: "createdAt",
@@ -6688,16 +6721,16 @@ const getUserStats = (options) => createAuthEndpoint("/dash/user-stats", {
 				operator: "lt",
 				value: oneWeekAgo
 			}]
-		}),
-		ctx.context.adapter.count({
+		})),
+		optionalQuery(ctx, "monthly signups", () => ctx.context.adapter.count({
 			model: "user",
 			where: [{
 				field: "createdAt",
 				operator: "gte",
 				value: oneMonthAgo
 			}]
-		}),
-		ctx.context.adapter.count({
+		})),
+		optionalQuery(ctx, "previous month signups", () => ctx.context.adapter.count({
 			model: "user",
 			where: [{
 				field: "createdAt",
@@ -6708,75 +6741,74 @@ const getUserStats = (options) => createAuthEndpoint("/dash/user-stats", {
 				operator: "lt",
 				value: oneMonthAgo
 			}]
-		}),
-		ctx.context.adapter.count({ model: "user" }),
-		countUniqueActiveUsers(ctx, { from: oneDayAgo }, {
+		})),
+		optionalQuery(ctx, "total users", () => ctx.context.adapter.count({ model: "user" })),
+		optionalQuery(ctx, "active users (daily window)", () => countUniqueActiveUsers(ctx, { from: oneDayAgo }, {
 			storeInSecondaryStorageOnly,
 			activityTrackingEnabled
-		}),
-		countUniqueActiveUsers(ctx, {
+		})),
+		optionalQuery(ctx, "active users (previous day window)", () => countUniqueActiveUsers(ctx, {
 			from: twoDaysAgo,
 			to: oneDayAgo
 		}, {
 			storeInSecondaryStorageOnly,
 			activityTrackingEnabled
-		}),
-		countUniqueActiveUsers(ctx, { from: oneWeekAgo }, {
+		})),
+		optionalQuery(ctx, "active users (weekly window)", () => countUniqueActiveUsers(ctx, { from: oneWeekAgo }, {
 			storeInSecondaryStorageOnly,
 			activityTrackingEnabled
-		}),
-		countUniqueActiveUsers(ctx, {
+		})),
+		optionalQuery(ctx, "active users (previous week window)", () => countUniqueActiveUsers(ctx, {
 			from: twoWeeksAgo,
 			to: oneWeekAgo
 		}, {
 			storeInSecondaryStorageOnly,
 			activityTrackingEnabled
-		}),
-		countUniqueActiveUsers(ctx, { from: oneMonthAgo }, {
+		})),
+		optionalQuery(ctx, "active users (monthly window)", () => countUniqueActiveUsers(ctx, { from: oneMonthAgo }, {
 			storeInSecondaryStorageOnly,
 			activityTrackingEnabled
-		}),
-		countUniqueActiveUsers(ctx, {
+		})),
+		optionalQuery(ctx, "active users (previous month window)", () => countUniqueActiveUsers(ctx, {
 			from: twoMonthsAgo,
 			to: oneMonthAgo
 		}, {
 			storeInSecondaryStorageOnly,
 			activityTrackingEnabled
-		})
-	]);
+		}))
+	], (fn) => fn(), { concurrency: 5 });
 	const calculatePercentage = (current, previous) => {
 		if (previous === 0) return current > 0 ? 100 : 0;
 		return (current - previous) / previous * 100;
 	};
-	return {
-		daily: {
-			signUps: dailyCount,
-			percentage: calculatePercentage(dailyCount, previousDailyCount)
-		},
-		weekly: {
-			signUps: weeklyCount,
-			percentage: calculatePercentage(weeklyCount, previousWeeklyCount)
-		},
-		monthly: {
-			signUps: monthlyCount,
-			percentage: calculatePercentage(monthlyCount, previousMonthlyCount)
-		},
-		total: totalCount,
+	const degraded = [
+		rDailySignups,
+		rPrevDaySignups,
+		rWeeklySignups,
+		rPrevWeekSignups,
+		rMonthlySignups,
+		rPrevMonthSignups,
+		rTotalUsers,
+		rActiveDaily,
+		rActivePrevDay,
+		rActiveWeekly,
+		rActivePrevWeek,
+		rActiveMonthly,
+		rActivePrevMonth
+	].some((r) => !r.ok);
+	const body = {
+		daily: signUpPeriod(rDailySignups, rPrevDaySignups, calculatePercentage),
+		weekly: signUpPeriod(rWeeklySignups, rPrevWeekSignups, calculatePercentage),
+		monthly: signUpPeriod(rMonthlySignups, rPrevMonthSignups, calculatePercentage),
+		total: rTotalUsers.ok ? rTotalUsers.value : null,
 		activeUsers: {
-			daily: {
-				active: dailyActiveCount,
-				percentage: calculatePercentage(dailyActiveCount, previousDailyActiveCount)
-			},
-			weekly: {
-				active: weeklyActiveCount,
-				percentage: calculatePercentage(weeklyActiveCount, previousWeeklyActiveCount)
-			},
-			monthly: {
-				active: monthlyActiveCount,
-				percentage: calculatePercentage(monthlyActiveCount, previousMonthlyActiveCount)
-			}
+			daily: activePeriod(rActiveDaily, rActivePrevDay, calculatePercentage),
+			weekly: activePeriod(rActiveWeekly, rActivePrevWeek, calculatePercentage),
+			monthly: activePeriod(rActiveMonthly, rActivePrevMonth, calculatePercentage)
 		}
 	};
+	if (degraded) body.degraded = true;
+	return body;
 });
 const getUserGraphData = (options) => createAuthEndpoint("/dash/user-graph-data", {
 	method: "GET",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/infra",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Dashboard and analytics plugin for Better Auth",
   "type": "module",
   "main": "dist/index.mjs",