appflare 0.2.18 → 0.2.19

package/cli/templates/handlers/generators/context/context-creation.ts

@@ -1,9 +1,9 @@
 export function generateContextCreation(defaultR2Binding?: string): string {
 	return `
-export function createSchedulerExecutionContext(
+export async function createSchedulerExecutionContext(
 	env: Record<string, unknown>,
 	options: RegisterHandlersOptions,
-): AppflareContext {
+): Promise<AppflareContext> {
 	const database = env[options.databaseBinding] as D1Database;
 	const r2Binding = options.r2Binding ?? ${JSON.stringify(defaultR2Binding ?? "")};
 	const storageBucket = r2Binding
@@ -11,9 +11,17 @@ export function createSchedulerExecutionContext(
 		: undefined;
 	const db = createDb(database);
 	const mutationEvents = [] as AppflareContext["mutationEvents"];
+	const kvNamespace = options.kvBinding
+		? (env[options.kvBinding] as KVNamespace)
+		: undefined;
 	const schedulerBinding = options.schedulerBinding ?? "APPFLARE_SCHEDULER_QUEUE";
 	const schedulerQueue = env[schedulerBinding] as SchedulerQueueBinding | undefined;
 	const helpers = createContextErrorHelpers();
+	const auth = createAuth({
+		DATABASE: database,
+		KV: kvNamespace,
+	});
+	const authAdapter = (await auth.$context).internalAdapter;
 	const schedulerContext = {
 		env: env as WorkerEnv["Bindings"],
 	} as unknown as Context<WorkerEnv>;
@@ -27,6 +35,7 @@ export function createSchedulerExecutionContext(
 		mutationEvents,
 		user: null as never,
 		session: null as never,
+		auth: authAdapter,
 		context: schedulerContext,
 		scheduler: createScheduler(schedulerQueue),
 		storage: null as never,
@@ -60,6 +69,14 @@ export async function createExecutionContext(
 	const schedulerBinding = options.schedulerBinding ?? "APPFLARE_SCHEDULER_QUEUE";
 	const schedulerQueue = c.env[schedulerBinding] as SchedulerQueueBinding | undefined;
 	const helpers = createContextErrorHelpers();
+	const auth = createAuth(
+		{
+			DATABASE: database,
+			KV: kvNamespace,
+		},
+		c.req.raw.cf as IncomingRequestCfProperties | undefined,
+	);
+	const authAdapter = (await auth.$context).internalAdapter;
 	const ctx = {
 		$db: db,
 		db: createQueryDb(db, {
@@ -70,6 +87,7 @@ export async function createExecutionContext(
 		mutationEvents,
 		user,
 		session,
+		auth: authAdapter,
 		context: c,
 		scheduler: createScheduler(schedulerQueue),
 		storage: null as never,

package/cli/templates/handlers/generators/registration/modules/cron.ts

@@ -13,7 +13,7 @@ export async function executeCronTriggers(
 		return;
 	}
 
-	const ctx = createSchedulerExecutionContext(env, options);
+	const ctx = await createSchedulerExecutionContext(env, options);
 
 	for (const cronEntry of cronHandlers) {
 		if (!cronEntry.cronTriggers.includes(cronValue)) {

package/cli/templates/handlers/generators/registration/modules/scheduler.ts

@@ -17,7 +17,7 @@ export async function executeScheduledBatch(
 		return;
 	}
 
-	const ctx = createSchedulerExecutionContext(env, options);
+	const ctx = await createSchedulerExecutionContext(env, options);
 
 	for (const message of batch.messages) {
 		const body = (message?.body ?? {}) as QueueMessageBody;

package/cli/templates/handlers/generators/types/context.ts

@@ -1,5 +1,6 @@
 export function generateTypesContextSection(): string {
 	return `type AuthSession = typeof auth.$Infer.Session;
+type AuthAdapter = Awaited<typeof auth.$context>["internalAdapter"];
 type User = AuthSession['user']
 type Session = AuthSession['session']
 
@@ -55,6 +56,7 @@ export type AppflareContext = {
 	mutationEvents: DbMutationEvent[];
 	user: User;
 	session: Session;
+	auth: AuthAdapter;
 	context: Context<WorkerEnv>;
 	scheduler: Scheduler;
 	storage: AppflareStorage;

package/dist/cli/index.js

@@ -1354,10 +1354,10 @@ function createStorageApi(
 	};
 }
 `}function he(e){return `
-export function createSchedulerExecutionContext(
+export async function createSchedulerExecutionContext(
 	env: Record<string, unknown>,
 	options: RegisterHandlersOptions,
-): AppflareContext {
+): Promise<AppflareContext> {
 	const database = env[options.databaseBinding] as D1Database;
 	const r2Binding = options.r2Binding ?? ${JSON.stringify(e??"")};
 	const storageBucket = r2Binding
@@ -1365,9 +1365,17 @@ export function createSchedulerExecutionContext(
 		: undefined;
 	const db = createDb(database);
 	const mutationEvents = [] as AppflareContext["mutationEvents"];
+	const kvNamespace = options.kvBinding
+		? (env[options.kvBinding] as KVNamespace)
+		: undefined;
 	const schedulerBinding = options.schedulerBinding ?? "APPFLARE_SCHEDULER_QUEUE";
 	const schedulerQueue = env[schedulerBinding] as SchedulerQueueBinding | undefined;
 	const helpers = createContextErrorHelpers();
+	const auth = createAuth({
+		DATABASE: database,
+		KV: kvNamespace,
+	});
+	const authAdapter = (await auth.$context).internalAdapter;
 	const schedulerContext = {
 		env: env as WorkerEnv["Bindings"],
 	} as unknown as Context<WorkerEnv>;
@@ -1381,6 +1389,7 @@ export function createSchedulerExecutionContext(
 		mutationEvents,
 		user: null as never,
 		session: null as never,
+		auth: authAdapter,
 		context: schedulerContext,
 		scheduler: createScheduler(schedulerQueue),
 		storage: null as never,
@@ -1414,6 +1423,14 @@ export async function createExecutionContext(
 	const schedulerBinding = options.schedulerBinding ?? "APPFLARE_SCHEDULER_QUEUE";
 	const schedulerQueue = c.env[schedulerBinding] as SchedulerQueueBinding | undefined;
 	const helpers = createContextErrorHelpers();
+	const auth = createAuth(
+		{
+			DATABASE: database,
+			KV: kvNamespace,
+		},
+		c.req.raw.cf as IncomingRequestCfProperties | undefined,
+	);
+	const authAdapter = (await auth.$context).internalAdapter;
 	const ctx = {
 		$db: db,
 		db: createQueryDb(db, {
@@ -1424,6 +1441,7 @@ export async function createExecutionContext(
 		mutationEvents,
 		user,
 		session,
+		auth: authAdapter,
 		context: c,
 		scheduler: createScheduler(schedulerQueue),
 		storage: null as never,
@@ -4296,6 +4314,7 @@ type TableInsertModel<TName extends TableName> = InferInsertModel<
 `}function Ce(){return [qe(),$e(),Ie(),Ae(),Ne()].join(`
 
 `)}function Me(){return `type AuthSession = typeof auth.$Infer.Session;
+type AuthAdapter = Awaited<typeof auth.$context>["internalAdapter"];
 type User = AuthSession['user']
 type Session = AuthSession['session']
 
@@ -4351,6 +4370,7 @@ export type AppflareContext = {
 	mutationEvents: DbMutationEvent[];
 	user: User;
 	session: Session;
+	auth: AuthAdapter;
 	context: Context<WorkerEnv>;
 	scheduler: Scheduler;
 	storage: AppflareStorage;
@@ -5787,7 +5807,7 @@ export async function executeScheduledBatch(
 		return;
 	}
 
-	const ctx = createSchedulerExecutionContext(env, options);
+	const ctx = await createSchedulerExecutionContext(env, options);
 
 	for (const message of batch.messages) {
 		const body = (message?.body ?? {}) as QueueMessageBody;
@@ -5838,7 +5858,7 @@ export async function executeCronTriggers(
 		return;
 	}
 
-	const ctx = createSchedulerExecutionContext(env, options);
+	const ctx = await createSchedulerExecutionContext(env, options);
 
 	for (const cronEntry of cronHandlers) {
 		if (!cronEntry.cronTriggers.includes(cronValue)) {

package/dist/cli/index.mjs

@@ -1354,10 +1354,10 @@ function createStorageApi(
 	};
 }
 `}function he(e){return `
-export function createSchedulerExecutionContext(
+export async function createSchedulerExecutionContext(
 	env: Record<string, unknown>,
 	options: RegisterHandlersOptions,
-): AppflareContext {
+): Promise<AppflareContext> {
 	const database = env[options.databaseBinding] as D1Database;
 	const r2Binding = options.r2Binding ?? ${JSON.stringify(e??"")};
 	const storageBucket = r2Binding
@@ -1365,9 +1365,17 @@ export function createSchedulerExecutionContext(
 		: undefined;
 	const db = createDb(database);
 	const mutationEvents = [] as AppflareContext["mutationEvents"];
+	const kvNamespace = options.kvBinding
+		? (env[options.kvBinding] as KVNamespace)
+		: undefined;
 	const schedulerBinding = options.schedulerBinding ?? "APPFLARE_SCHEDULER_QUEUE";
 	const schedulerQueue = env[schedulerBinding] as SchedulerQueueBinding | undefined;
 	const helpers = createContextErrorHelpers();
+	const auth = createAuth({
+		DATABASE: database,
+		KV: kvNamespace,
+	});
+	const authAdapter = (await auth.$context).internalAdapter;
 	const schedulerContext = {
 		env: env as WorkerEnv["Bindings"],
 	} as unknown as Context<WorkerEnv>;
@@ -1381,6 +1389,7 @@ export function createSchedulerExecutionContext(
 		mutationEvents,
 		user: null as never,
 		session: null as never,
+		auth: authAdapter,
 		context: schedulerContext,
 		scheduler: createScheduler(schedulerQueue),
 		storage: null as never,
@@ -1414,6 +1423,14 @@ export async function createExecutionContext(
 	const schedulerBinding = options.schedulerBinding ?? "APPFLARE_SCHEDULER_QUEUE";
 	const schedulerQueue = c.env[schedulerBinding] as SchedulerQueueBinding | undefined;
 	const helpers = createContextErrorHelpers();
+	const auth = createAuth(
+		{
+			DATABASE: database,
+			KV: kvNamespace,
+		},
+		c.req.raw.cf as IncomingRequestCfProperties | undefined,
+	);
+	const authAdapter = (await auth.$context).internalAdapter;
 	const ctx = {
 		$db: db,
 		db: createQueryDb(db, {
@@ -1424,6 +1441,7 @@ export async function createExecutionContext(
 		mutationEvents,
 		user,
 		session,
+		auth: authAdapter,
 		context: c,
 		scheduler: createScheduler(schedulerQueue),
 		storage: null as never,
@@ -4296,6 +4314,7 @@ type TableInsertModel<TName extends TableName> = InferInsertModel<
 `}function Ce(){return [qe(),$e(),Ie(),Ae(),Ne()].join(`
 
 `)}function Me(){return `type AuthSession = typeof auth.$Infer.Session;
+type AuthAdapter = Awaited<typeof auth.$context>["internalAdapter"];
 type User = AuthSession['user']
 type Session = AuthSession['session']
 
@@ -4351,6 +4370,7 @@ export type AppflareContext = {
 	mutationEvents: DbMutationEvent[];
 	user: User;
 	session: Session;
+	auth: AuthAdapter;
 	context: Context<WorkerEnv>;
 	scheduler: Scheduler;
 	storage: AppflareStorage;
@@ -5787,7 +5807,7 @@ export async function executeScheduledBatch(
 		return;
 	}
 
-	const ctx = createSchedulerExecutionContext(env, options);
+	const ctx = await createSchedulerExecutionContext(env, options);
 
 	for (const message of batch.messages) {
 		const body = (message?.body ?? {}) as QueueMessageBody;
@@ -5838,7 +5858,7 @@ export async function executeCronTriggers(
 		return;
 	}
 
-	const ctx = createSchedulerExecutionContext(env, options);
+	const ctx = await createSchedulerExecutionContext(env, options);
 
 	for (const cronEntry of cronHandlers) {
 		if (!cronEntry.cronTriggers.includes(cronValue)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appflare",
-	"version": "0.2.18",
+	"version": "0.2.19",
 	"main": "./dist/index.js",
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",