@theholocron/holocron-plugin-cloudflare 3.63.0 → 3.64.0

package/dist/index.d.mts

@@ -9,7 +9,7 @@ declare class CloudflareDeployment implements Deployment {
   private readonly accountId;
   readonly key: "deployment";
   readonly providerName = "cloudflare";
-  constructor(client: CloudflareClient, accountId: string);
+  constructor(client: () => CloudflareClient, accountId: string);
   listProjects(): Promise<DeploymentProject[]>;
   ensureProject(input: {
     name: string;
@@ -38,7 +38,7 @@ declare class CloudflareDns implements Dns {
   readonly key: "dns";
   readonly providerName = "cloudflare";
   private readonly zoneCache;
-  constructor(client: CloudflareClient);
+  constructor(client: () => CloudflareClient);
   listRecords(domain: string): Promise<DnsRecord[]>;
   upsertRecord(domain: string, record: DnsRecord): Promise<DnsRecord>;
   deleteRecord(domain: string, id: string): Promise<void>;
@@ -69,8 +69,11 @@ declare class CloudflareWorkers implements Workers {
   private readonly zoneCache;
   private readonly baseUrl;
   private readonly fetchImpl;
+  /** Memoized token thunk — resolved on the first authenticated request. */
   private readonly token;
-  constructor(zones: ZonesClient, accountId: string, opts: Pick<CloudflareClientOptions$1, "token" | "baseUrl" | "fetch">);
+  constructor(zones: () => ZonesClient, accountId: string, opts: {
+    token: () => string;
+  } & Pick<CloudflareClientOptions$1, "baseUrl" | "fetch">);
   upsertProxy(hostname: string, config: WikiProxyConfig): Promise<void>;
   private putScript;
   private listRoutes;
@@ -109,7 +112,10 @@ interface CloudflarePluginOptions extends ResolveTokenInput {
 }
 interface PluginContext {
   options: CloudflarePluginOptions;
-  client: CloudflareClient;
+  /** Memoized client — the token is resolved on first use, not at plugin load. */
+  client: () => CloudflareClient;
+  /** Memoized token resolver — shared by the client and the Workers capability. */
+  token: () => string;
 }
 declare function createContext(options?: CloudflarePluginOptions): PluginContext;
 declare function dns(ctx: PluginContext): Dns;

package/dist/index.mjs

@@ -19,26 +19,26 @@ var CloudflareDeployment = class {
 		this.accountId = accountId;
 	}
 	async listProjects() {
-		return (await this.client.pages.listProjects(this.accountId)).map(mapProject);
+		return (await this.client().pages.listProjects(this.accountId)).map(mapProject);
 	}
 	async ensureProject(input) {
 		const existing = await this.getProjectByName(input.name);
 		if (existing) return existing;
-		return mapProject(await this.client.pages.createProject(this.accountId, {
+		return mapProject(await this.client().pages.createProject(this.accountId, {
 			name: input.name,
 			production_branch: "main"
 		}));
 	}
 	async updateProjectSettings(projectId, settings) {
-		return mapProject(await this.client.pages.getProject(this.accountId, projectId));
+		return mapProject(await this.client().pages.getProject(this.accountId, projectId));
 	}
 	async listEnvVars(projectId, target) {
-		const project = await this.client.pages.getProject(this.accountId, projectId);
+		const project = await this.client().pages.getProject(this.accountId, projectId);
 		const envConfig = target === "production" ? project.deployment_configs.production : project.deployment_configs.preview;
 		return Object.keys(envConfig.env_vars);
 	}
 	async setEnvVar(projectId, target, name, value) {
-		const cfg = (await this.client.pages.getProject(this.accountId, projectId)).deployment_configs;
+		const cfg = (await this.client().pages.getProject(this.accountId, projectId)).deployment_configs;
 		const scope = target === "production" ? "production" : "preview";
 		const updated = {
 			...cfg[scope].env_vars,
@@ -47,39 +47,39 @@ var CloudflareDeployment = class {
 				type: "plain_text"
 			}
 		};
-		await this.client.pages.updateProject(this.accountId, projectId, { deployment_configs: {
+		await this.client().pages.updateProject(this.accountId, projectId, { deployment_configs: {
 			...cfg,
 			[scope]: { env_vars: updated }
 		} });
 	}
 	async triggerDeployment(input) {
-		return mapDeployment(await this.client.pages.createDeployment(this.accountId, input.projectId, input.branch), input.projectId, input.branch, input.target);
+		return mapDeployment(await this.client().pages.createDeployment(this.accountId, input.projectId, input.branch), input.projectId, input.branch, input.target);
 	}
 	async getDeployment(deploymentId) {
 		const sep = deploymentId.indexOf(":");
 		if (sep === -1) throw new ProviderApiError(`Invalid Cloudflare Pages deployment id "${deploymentId}" — expected "projectName:deploymentId"`, 400, void 0);
 		const projectName = deploymentId.slice(0, sep);
 		const cfDeployId = deploymentId.slice(sep + 1);
-		const raw = await this.client.pages.getDeployment(this.accountId, projectName, cfDeployId);
+		const raw = await this.client().pages.getDeployment(this.accountId, projectName, cfDeployId);
 		return mapDeployment(raw, projectName, raw.deployment_trigger.metadata.branch, void 0);
 	}
 	async listPreviewDeployments(projectId, branch) {
-		return (await this.client.pages.listDeployments(this.accountId, projectId)).filter((d) => d.deployment_trigger.metadata.branch === branch).map((d) => mapDeployment(d, projectId, d.deployment_trigger.metadata.branch, void 0));
+		return (await this.client().pages.listDeployments(this.accountId, projectId)).filter((d) => d.deployment_trigger.metadata.branch === branch).map((d) => mapDeployment(d, projectId, d.deployment_trigger.metadata.branch, void 0));
 	}
 	async deletePreviewDeployments(projectId, deploymentIds) {
 		await Promise.all(deploymentIds.map((id) => {
 			const cfId = id.includes(":") ? id.slice(id.indexOf(":") + 1) : id;
-			return this.client.pages.deleteDeployment(this.accountId, projectId, cfId);
+			return this.client().pages.deleteDeployment(this.accountId, projectId, cfId);
 		}));
 		return deploymentIds.length;
 	}
 	async ensureCustomDomain(projectId, hostname) {
-		if ((await this.client.pages.listDomains(this.accountId, projectId)).some((d) => d.name === hostname)) return;
-		await this.client.pages.addDomain(this.accountId, projectId, hostname);
+		if ((await this.client().pages.listDomains(this.accountId, projectId)).some((d) => d.name === hostname)) return;
+		await this.client().pages.addDomain(this.accountId, projectId, hostname);
 	}
 	async getProjectByName(name) {
 		try {
-			return mapProject(await this.client.pages.getProject(this.accountId, name));
+			return mapProject(await this.client().pages.getProject(this.accountId, name));
 		} catch (err) {
 			if (err instanceof ProviderApiError && err.status === 404) return null;
 			throw err;
@@ -125,22 +125,23 @@ var CloudflareDns = class {
 	}
 	async listRecords(domain) {
 		const zoneId = await this.resolveZone(domain);
-		return (await this.client.dns.list(zoneId)).map(mapRecord);
+		return (await this.client().dns.list(zoneId)).map(mapRecord);
 	}
 	async upsertRecord(domain, record) {
+		const client = this.client();
 		const zoneId = await this.resolveZone(domain);
-		const existing = await this.client.dns.list(zoneId, {
+		const existing = await client.dns.list(zoneId, {
 			type: record.type,
 			name: record.name
 		});
-		if (existing.length > 0) return mapRecord(await this.client.dns.update(zoneId, existing[0].id, {
+		if (existing.length > 0) return mapRecord(await client.dns.update(zoneId, existing[0].id, {
 			type: record.type,
 			name: record.name,
 			content: record.content,
 			...record.ttl !== void 0 ? { ttl: record.ttl } : {},
 			...record.proxied !== void 0 ? { proxied: record.proxied } : {}
 		}));
-		return mapRecord(await this.client.dns.create(zoneId, {
+		return mapRecord(await client.dns.create(zoneId, {
 			type: record.type,
 			name: record.name,
 			content: record.content,
@@ -150,7 +151,7 @@ var CloudflareDns = class {
 	}
 	async deleteRecord(domain, id) {
 		const zoneId = await this.resolveZone(domain);
-		await this.client.dns.delete(zoneId, id);
+		await this.client().dns.delete(zoneId, id);
 	}
 	/**
 	* Walk from full domain up to apex to find the Cloudflare zone.
@@ -165,7 +166,7 @@ var CloudflareDns = class {
 		const parts = domain.split(".");
 		for (let i = 0; i < parts.length - 1; i++) {
 			const candidate = parts.slice(i).join(".");
-			const zones = await this.client.zones.list({ name: candidate });
+			const zones = await this.client().zones.list({ name: candidate });
 			if (zones.length > 0) {
 				this.zoneCache.set(domain, zones[0].id);
 				return zones[0].id;
@@ -193,6 +194,7 @@ var CloudflareWorkers = class {
 	zoneCache = /* @__PURE__ */ new Map();
 	baseUrl;
 	fetchImpl;
+	/** Memoized token thunk — resolved on the first authenticated request. */
 	token;
 	constructor(zones, accountId, opts) {
 		this.zones = zones;
@@ -222,7 +224,7 @@ var CloudflareWorkers = class {
 		const path = `/accounts/${this.accountId}/workers/scripts/${encodeURIComponent(scriptName)}`;
 		const res = await this.fetchImpl(`${this.baseUrl}${path}`, {
 			method: "PUT",
-			headers: { authorization: `Bearer ${this.token}` },
+			headers: { authorization: `Bearer ${this.token()}` },
 			body: form
 		});
 		if (!res.ok) {
@@ -247,7 +249,7 @@ var CloudflareWorkers = class {
 	}
 	async cfRequest(method, path, body) {
 		const headers = {
-			authorization: `Bearer ${this.token}`,
+			authorization: `Bearer ${this.token()}`,
 			accept: "application/json"
 		};
 		const init = {
@@ -273,7 +275,7 @@ var CloudflareWorkers = class {
 		const parts = domain.split(".");
 		for (let i = 0; i < parts.length - 1; i++) {
 			const candidate = parts.slice(i).join(".");
-			const zones = await this.zones.list({ name: candidate });
+			const zones = await this.zones().list({ name: candidate });
 			if (zones.length > 0) {
 				this.zoneCache.set(domain, zones[0].id);
 				return zones[0].id;
@@ -330,17 +332,21 @@ async function verifyToken(token, opts = {}) {
 //#endregion
 //#region src/index.ts
 function createContext(options = {}) {
-	const token = resolveToken(options);
 	const accountId = options.accountId ?? process.env.CLOUDFLARE_ACCOUNT_ID;
+	const opts = {
+		...options,
+		accountId
+	};
+	let token;
+	let client;
+	const resolve = () => token ??= resolveToken(opts);
 	return {
-		options: {
-			...options,
-			accountId
-		},
-		client: createCloudflareClient({
-			token,
-			baseUrl: options.baseUrl,
-			fetch: options.fetch
+		options: opts,
+		token: resolve,
+		client: () => client ??= createCloudflareClient({
+			token: resolve(),
+			baseUrl: opts.baseUrl,
+			fetch: opts.fetch
 		})
 	};
 }
@@ -353,9 +359,8 @@ function deployment(ctx) {
 }
 function workersCapability(ctx) {
 	if (!ctx.options.accountId) throw new Error("Cloudflare accountId is required for Workers — set accountId in the plugin options or CLOUDFLARE_ACCOUNT_ID env var");
-	const token = resolveToken(ctx.options);
-	return new CloudflareWorkers(ctx.client.zones, ctx.options.accountId, {
-		token,
+	return new CloudflareWorkers(() => ctx.client().zones, ctx.options.accountId, {
+		token: ctx.token,
 		baseUrl: ctx.options.baseUrl,
 		fetch: ctx.options.fetch
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/holocron-plugin-cloudflare",
-  "version": "3.63.0",
+  "version": "3.64.0",
   "description": "Holocron plugin for Cloudflare. Implements the dns capability against Cloudflare's REST API — zone resolution, DNS record management.",
   "keywords": [
     "cloudflare",
@@ -46,11 +46,11 @@
     "tsx": "4.23.12",
     "typescript": "^5.9.3",
     "vitest": "^4.1.11",
-    "@theholocron/cli": "3.63.0"
+    "@theholocron/cli": "3.64.0"
   },
   "peerDependencies": {
     "@theholocron/cloudflare-client": "^1.14.2",
-    "@theholocron/cli": "3.63.0"
+    "@theholocron/cli": "3.64.0"
   },
   "peerDependenciesMeta": {
     "@theholocron/cloudflare-client": {}