@revojs/cloudflare 0.2.65 → 0.3.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { DurableObjectNamespace, SecretsStoreSecret, Workflow } from "@cloudflare/workers-types";
+import type { DurableObjectNamespace, ExecutionContext, SecretsStoreSecret, Workflow } from "@cloudflare/workers-types";
 import { type Scope } from "revojs";
 import type { Awaitable } from "revojs/shared";
 export type ScreamingSnake<Value extends string> = Value extends `${infer Head}${infer Next}${infer Tail}` ? `${Uppercase<Head>}${Head extends Lowercase<Head> ? (Next extends Lowercase<Next> ? "" : "_") : ""}${ScreamingSnake<`${Next}${Tail}`>}` : Uppercase<Value>;
@@ -11,6 +11,14 @@ export type Workflows = {
 export declare function useDurableObjects(scope: Scope): DurableObjects;
 export declare function useWorkflows(scope: Scope): Workflows;
 export declare function resolveSecrets<T extends object>(variables: T): Promise<T>;
+export declare function createEnvironmentScope(variables: object, context?: ExecutionContext): Promise<{
+    hooks?: {
+        [x: string]: ArrayLike<import("revojs").Hook<any, any>> | undefined;
+    } | undefined;
+    context?: {
+        [x: string]: {} | undefined;
+    } | undefined;
+} & Scope>;
 export declare function isSecretsStoreSecret(value: unknown): value is SecretsStoreSecret;
 export interface ReceivedEmail {
     from: string;
@@ -33,6 +41,7 @@ export interface LocalPlatform {
 export interface LocalMigrationOptions {
     reset?: boolean;
 }
+export declare const SECRET_MAX_AGE = 60000;
 export declare const PLATFORM_CONTEXT: import("revojs").Descriptor<Partial<LocalPlatform>>;
 export declare const LOCAL_DIRECTORY = ".wrangler/revojs";
 export declare const LOCAL_STATE = ".wrangler/state";

package/dist/index.js

@@ -1,5 +1,6 @@
 import config from "#config/cloudflare";
-import { VARIABLE_CONTEXT, defineContext, defineHook, getContext, setContext, useVariables } from "revojs";
+import { WAIT_UNTIL_CONTEXT } from "@revojs/server";
+import { VARIABLE_CONTEXT, createScope, defineContext, defineHook, getContext, setContext, useVariables } from "revojs";
 //#region src/index.ts
 function useDurableObjects(scope) {
 	return useVariables(scope);
@@ -9,21 +10,43 @@ function useWorkflows(scope) {
 }
 async function resolveSecrets(variables) {
 	const resolved = { ...variables };
+	const pending = new Array();
 	for (const { binding } of SECRETS) {
 		const secret = resolved[binding];
-		if (isSecretsStoreSecret(secret)) try {
-			resolved[binding] = await secret.get();
-		} catch {
-			resolved[binding] = void 0;
-		}
+		if (isSecretsStoreSecret(secret)) pending.push((async () => {
+			resolved[binding] = await readSecret(binding, secret);
+		})());
 	}
+	await Promise.all(pending);
 	return resolved;
 }
+async function createEnvironmentScope(variables, context) {
+	const scope = await createScope({ context: { [VARIABLE_CONTEXT]: await resolveSecrets(variables) } });
+	if (context) setContext(scope, WAIT_UNTIL_CONTEXT, (promise) => context.waitUntil(promise));
+	return scope;
+}
+async function readSecret(binding, secret) {
+	const cached = secretValues.get(binding);
+	if (cached && Date.now() - cached.loadedAt < 6e4) return cached.value;
+	try {
+		const value = await secret.get();
+		secretValues.set(binding, {
+			value,
+			loadedAt: Date.now()
+		});
+		return value;
+	} catch {
+		secretValues.delete(binding);
+		return;
+	}
+}
 function isSecretsStoreSecret(value) {
 	return typeof value === "object" && value !== null && typeof value.get === "function";
 }
 var EMAIL_RECEIVED_HOOK = defineHook("EMAIL_RECEIVED_HOOK");
 var SECRETS = (typeof config.config === "object" ? config.config.secrets_store_secrets : void 0) ?? [];
+var SECRET_MAX_AGE = 6e4;
+var secretValues = /* @__PURE__ */ new Map();
 var PLATFORM_CONTEXT = defineContext("PLATFORM_CONTEXT");
 var LOCAL_DIRECTORY = ".wrangler/revojs";
 var LOCAL_STATE = ".wrangler/state";
@@ -123,4 +146,4 @@ function writeLocalConfig() {
 	return path;
 }
 //#endregion
-export { EMAIL_RECEIVED_HOOK, LOCAL_DIRECTORY, LOCAL_STATE, PLATFORM_CONTEXT, SECRETS, isLocalRuntime, isSecretsStoreSecret, migrateLocalDatabases, resolveSecrets, startLocalPlatform, useDurableObjects, useWorkflows };
+export { EMAIL_RECEIVED_HOOK, LOCAL_DIRECTORY, LOCAL_STATE, PLATFORM_CONTEXT, SECRETS, SECRET_MAX_AGE, createEnvironmentScope, isLocalRuntime, isSecretsStoreSecret, migrateLocalDatabases, resolveSecrets, startLocalPlatform, useDurableObjects, useWorkflows };

package/dist/package.js

@@ -1,6 +1,6 @@
 //#region package.json
 var name = "@revojs/cloudflare";
-var version = "0.2.65";
+var version = "0.3.1";
 var repository = {
 	"type": "git",
 	"url": "git+https://github.com/tellua/revojs.git"
@@ -28,11 +28,11 @@ var scripts = {
 var dependencies = {
 	"@cloudflare/vite-plugin": "^1.63.1",
 	"@cloudflare/workers-types": "^5.20261009.1",
-	"@revojs/server": "*",
-	"revojs": "*",
+	"@revojs/server": "0.3.1",
+	"revojs": "0.3.1",
 	"wrangler": "^4.149.0"
 };
-var devDependencies = { "@revojs/tsconfig": "*" };
+var devDependencies = { "@revojs/tsconfig": "0.3.1" };
 var package_default = {
 	name,
 	version,

package/dist/server/index.d.ts

@@ -1,4 +1,4 @@
-import { type ScheduledEvent } from "@cloudflare/workers-types";
+import { type ExecutionContext, type ScheduledEvent } from "@cloudflare/workers-types";
 export * from "#durable-objects";
 export * from "#entrypoints";
 export * from "#workflows";
@@ -11,8 +11,8 @@ interface ForwardableEmailMessage {
     setReject: (reason: string) => void;
 }
 declare const _default: {
-    fetch(request: Request, variables: Cloudflare.Env): Promise<Response | undefined>;
-    scheduled(event: ScheduledEvent, variables: Cloudflare.Env): Promise<void>;
-    email(message: ForwardableEmailMessage, variables: Cloudflare.Env): Promise<void>;
+    fetch(request: Request, variables: Cloudflare.Env, context: ExecutionContext): Promise<Response | undefined>;
+    scheduled(event: ScheduledEvent, variables: Cloudflare.Env, context: ExecutionContext): Promise<void>;
+    email(message: ForwardableEmailMessage, variables: Cloudflare.Env, context: ExecutionContext): Promise<void>;
 };
 export default _default;

package/dist/server/index.js

@@ -1,15 +1,16 @@
-import { EMAIL_RECEIVED_HOOK, resolveSecrets } from "../index.js";
-import { VARIABLE_CONTEXT, createScope, dispatchHook } from "revojs";
+import { EMAIL_RECEIVED_HOOK, createEnvironmentScope, resolveSecrets } from "../index.js";
+import { SCHEDULE_CONTEXT, WAIT_UNTIL_CONTEXT, createServerScope, invokeWebSocket, isResponse, isWebSocket, sendResponse } from "@revojs/server";
+import { dispatchHook, setContext } from "revojs";
 import "@cloudflare/workers-types";
-import { SCHEDULE_CONTEXT, createServerScope, invokeWebSocket, isResponse, isWebSocket, sendResponse } from "@revojs/server";
 export * from "#durable-objects";
 export * from "#entrypoints";
 export * from "#workflows";
 //#region src/server/index.ts
 var server_default = {
-	async fetch(request, variables) {
+	async fetch(request, variables, context) {
 		const server = await import("#server").then((module) => module.default);
 		const scope = await createServerScope(request, await resolveSecrets(variables));
+		setContext(scope, WAIT_UNTIL_CONTEXT, (promise) => context.waitUntil(promise));
 		const result = await server.fetch(scope);
 		if (isResponse(result)) return result;
 		if (isWebSocket(result)) {
@@ -29,7 +30,11 @@ var server_default = {
 				await invokeWebSocket(result, connection, () => result.message(connection, event.data));
 			});
 			serverSocket.addEventListener("error", async (event) => {
-				await result.error(connection, event.error);
+				try {
+					await result.error(connection, event.error);
+				} catch (error) {
+					console.error(error);
+				}
 			});
 			serverSocket.addEventListener("close", async (event) => {
 				await invokeWebSocket(result, connection, () => result.close(connection, event.code, event.reason));
@@ -41,14 +46,14 @@ var server_default = {
 			});
 		}
 	},
-	async scheduled(event, variables) {
-		await (await import("#server").then((module) => module.default)).schedule(await createScope({ context: {
-			[VARIABLE_CONTEXT]: await resolveSecrets(variables),
-			[SCHEDULE_CONTEXT]: { when: event.cron }
-		} }));
+	async scheduled(event, variables, context) {
+		const server = await import("#server").then((module) => module.default);
+		const scope = await createEnvironmentScope(variables, context);
+		setContext(scope, SCHEDULE_CONTEXT, { when: event.cron });
+		await server.schedule(scope);
 	},
-	async email(message, variables) {
-		await dispatchHook(await createScope({ context: { [VARIABLE_CONTEXT]: await resolveSecrets(variables) } }), EMAIL_RECEIVED_HOOK, {
+	async email(message, variables, context) {
+		await dispatchHook(await createEnvironmentScope(variables, context), EMAIL_RECEIVED_HOOK, {
 			from: message.from,
 			to: message.to,
 			headers: message.headers,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@revojs/cloudflare",
-    "version": "0.2.65",
+    "version": "0.3.1",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -31,11 +31,11 @@
     "dependencies": {
         "@cloudflare/vite-plugin": "^1.63.1",
         "@cloudflare/workers-types": "^5.20261009.1",
-        "@revojs/server": "*",
-        "revojs": "*",
+        "@revojs/server": "0.3.1",
+        "revojs": "0.3.1",
         "wrangler": "^4.149.0"
     },
     "devDependencies": {
-        "@revojs/tsconfig": "*"
+        "@revojs/tsconfig": "0.3.1"
     }
 }