@hot-updater/supabase 1.2.0-rc.4 → 1.2.0-rc.6

package/dist/edge.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_supabaseStorage = require("./supabaseStorage-MqoRcaii.cjs");
+const require_supabaseStorage = require("./supabaseStorage-BV6GuUz_.cjs");
 exports.supabaseDatabase = require_supabaseStorage.supabaseDatabase;
 exports.supabaseStorage = require_supabaseStorage.supabaseStorage;

package/dist/edge.d.cts

@@ -1,2 +1,2 @@
-import { i as supabaseDatabase, n as supabaseStorage, r as SupabaseDatabaseConfig, t as SupabaseStorageConfig } from "./supabaseStorage-BryXQ72m.cjs";
+import { i as supabaseDatabase, n as supabaseStorage, r as SupabaseDatabaseConfig, t as SupabaseStorageConfig } from "./supabaseStorage-B131_auF.cjs";
 export { type SupabaseDatabaseConfig, type SupabaseStorageConfig, supabaseDatabase, supabaseStorage };

package/dist/edge.d.mts

@@ -1,2 +1,2 @@
-import { i as supabaseDatabase, n as supabaseStorage, r as SupabaseDatabaseConfig, t as SupabaseStorageConfig } from "./supabaseStorage-BryXQ72m.mjs";
+import { i as supabaseDatabase, n as supabaseStorage, r as SupabaseDatabaseConfig, t as SupabaseStorageConfig } from "./supabaseStorage-B131_auF.mjs";
 export { type SupabaseDatabaseConfig, type SupabaseStorageConfig, supabaseDatabase, supabaseStorage };

package/dist/edge.mjs

@@ -1,2 +1,2 @@
-import { n as supabaseDatabase, t as supabaseStorage } from "./supabaseStorage-D4jcGa-l.mjs";
+import { n as supabaseDatabase, t as supabaseStorage } from "./supabaseStorage-8VAuNYHy.mjs";
 export { supabaseDatabase, supabaseStorage };

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_supabaseStorage = require("./supabaseStorage-MqoRcaii.cjs");
+const require_supabaseStorage = require("./supabaseStorage-BV6GuUz_.cjs");
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 //#region src/supabaseSchema.ts
 /** Every table the apply RPC may name: models, index tables, settings, and the write guard. */

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { n as supabaseStorage, r as SupabaseDatabaseConfig, t as SupabaseStorageConfig } from "./supabaseStorage-BryXQ72m.cjs";
+import { n as supabaseStorage, r as SupabaseDatabaseConfig, t as SupabaseStorageConfig } from "./supabaseStorage-B131_auF.cjs";
 import { ToolingDatabase } from "@hot-updater/plugin-core";
 //#region src/supabaseMigration.d.ts
 /**

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { n as supabaseStorage, r as SupabaseDatabaseConfig, t as SupabaseStorageConfig } from "./supabaseStorage-BryXQ72m.mjs";
+import { n as supabaseStorage, r as SupabaseDatabaseConfig, t as SupabaseStorageConfig } from "./supabaseStorage-B131_auF.mjs";
 import { ToolingDatabase } from "@hot-updater/plugin-core";
 //#region src/supabaseMigration.d.ts
 /**

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as SUPABASE_TABLE_PREFIX, n as supabaseDatabase$1, r as SUPABASE_APPLY_FUNCTION, t as supabaseStorage } from "./supabaseStorage-D4jcGa-l.mjs";
+import { i as SUPABASE_TABLE_PREFIX, n as supabaseDatabase$1, r as SUPABASE_APPLY_FUNCTION, t as supabaseStorage } from "./supabaseStorage-8VAuNYHy.mjs";
 import { SETTINGS_TABLE, WRITE_GUARD_TABLE, coreSettings, coreTarget, createTableStatements, generateEngineSql, isMultiIndex } from "@hot-updater/plugin-core";
 //#region src/supabaseSchema.ts
 /** Every table the apply RPC may name: models, index tables, settings, and the write guard. */

package/dist/init/index.cjs

@@ -6333,9 +6333,11 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region src/supabaseConfig.ts
-const resolveSupabaseServiceRoleKey = (config) => {
-	if (!config.supabaseServiceRoleKey) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
-	return config.supabaseServiceRoleKey;
+const resolveSupabaseServiceRoleKey = async (config) => {
+	const { supabaseServiceRoleKey } = config;
+	const key = typeof supabaseServiceRoleKey === "function" ? await supabaseServiceRoleKey() : supabaseServiceRoleKey;
+	if (!key) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
+	return key;
 };
 //#endregion
 //#region src/supabaseInfrastructureNames.ts
@@ -6375,9 +6377,16 @@ const withCode = (error) => Object.assign(new Error(error.message, { cause: erro
 */
 const supabaseExecutor = (client) => {
 	let created;
-	const clientOf = () => typeof client === "function" ? created ??= client() : client;
+	const clientOf = async () => {
+		if (typeof client !== "function") return client;
+		created ??= Promise.resolve().then(client).catch((error) => {
+			created = void 0;
+			throw error;
+		});
+		return created;
+	};
 	const apply = async (statements) => {
-		const { data, error } = await clientOf().rpc(SUPABASE_APPLY_FUNCTION, { p_statements: statements.map(toApplyStatement) });
+		const { data, error } = await (await clientOf()).rpc(SUPABASE_APPLY_FUNCTION, { p_statements: statements.map(toApplyStatement) });
 		if (error) throw withCode(error);
 		return data;
 	};
@@ -6400,7 +6409,7 @@ const supabaseExecutor = (client) => {
 */
 const supabaseDatabase = (config) => {
 	const { migrations: _migrations, ...adapter } = (0, _hot_updater_plugin_core.createSqlAdapter)({
-		executor: supabaseExecutor(() => (0, _supabase_supabase_js.createClient)(config.supabaseUrl, resolveSupabaseServiceRoleKey(config))),
+		executor: supabaseExecutor(async () => (0, _supabase_supabase_js.createClient)(config.supabaseUrl, await resolveSupabaseServiceRoleKey(config))),
 		tablePrefix: SUPABASE_TABLE_PREFIX
 	});
 	return (0, _hot_updater_plugin_core.createEngineDatabase)({
@@ -6410,27 +6419,39 @@ const supabaseDatabase = (config) => {
 };
 //#endregion
 //#region iac/configTemplate.ts
-const getConfigScaffold = (build) => {
-	return (0, _hot_updater_cli_tools.createHotUpdaterConfigScaffoldFromBuilder)(new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage({
+/**
+* The config init writes. With the `resources` init set up, it names them,
+* and reads the service role key with `secretEnv`, from the environment and
+* `.env.hotupdater`, then the config's `secrets` adapter. Without them, as
+* the agent scaffold writes it, it reads every value from the environment.
+*/
+const getConfigScaffold = (build, resources) => {
+	const supabaseUrl = resources === void 0 ? "process.env.HOT_UPDATER_SUPABASE_URL!" : JSON.stringify(resources.supabaseUrl);
+	const serviceRoleKey = resources === void 0 ? "process.env.HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY!" : `async () =>
+      (await deploySecrets()).HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY`;
+	const storageConfig = {
 		imports: [{
 			pkg: "@hot-updater/supabase",
 			named: ["supabaseStorage"]
 		}],
 		configString: `supabaseStorage({
-    supabaseUrl: process.env.HOT_UPDATER_SUPABASE_URL!,
-    supabaseServiceRoleKey: process.env.HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY!,
-    bucketName: process.env.HOT_UPDATER_SUPABASE_BUCKET_NAME!,
+    supabaseUrl: ${supabaseUrl},
+    supabaseServiceRoleKey: ${serviceRoleKey},
+    bucketName: ${resources === void 0 ? "process.env.HOT_UPDATER_SUPABASE_BUCKET_NAME!" : JSON.stringify(resources.bucketName)},
   })`
-	}).setDatabase({
+	};
+	const databaseConfig = {
 		imports: [{
 			pkg: "@hot-updater/supabase",
 			named: ["supabaseDatabase"]
 		}],
 		configString: `supabaseDatabase({
-    supabaseUrl: process.env.HOT_UPDATER_SUPABASE_URL!,
-    supabaseServiceRoleKey: process.env.HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY!,
+    supabaseUrl: ${supabaseUrl},
+    supabaseServiceRoleKey: ${serviceRoleKey},
   })`
-	}).setPlugins({
+	};
+	const helperStatements = resources === void 0 ? [] : [(0, _hot_updater_cli_tools.secretEnvHelper)("deploySecrets", ["HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY"])];
+	const builder = new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setPlugins({
 		imports: [{
 			pkg: "hot-updater/plugins",
 			named: [
@@ -6440,7 +6461,12 @@ const getConfigScaffold = (build) => {
 			]
 		}],
 		configString: "[apiKeys(), insights(), remoteConfig()]"
-	}));
+	});
+	if (resources !== void 0) builder.addImport({
+		pkg: "hot-updater",
+		named: ["secretEnv"]
+	}).setIntermediateCode(helperStatements.map(({ code }) => code).join("\n\n"));
+	return (0, _hot_updater_cli_tools.createHotUpdaterConfigScaffoldFromBuilder)(builder, { helperStatements });
 };
 //#endregion
 //#region iac/init/index.ts
@@ -6546,7 +6572,8 @@ const initProvider = {
 				type: "password"
 			}
 		}
-	}
+	},
+	secrets: ["HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY"]
 };
 //#endregion
 //#region iac/supabaseApi.ts
@@ -7515,9 +7542,9 @@ const withSupabaseCliMetadataCleanup = async (cwd, operation) => {
 		});
 	}
 };
-const runInitWithoutCliMetadata = async ({ build, envFile }) => {
+const runInitWithoutCliMetadata = async ({ build, envFile, secretsEnv }) => {
 	const nonInteractive = envFile !== void 0;
-	const initEnvSources = await (0, _hot_updater_cli_tools.readHotUpdaterInitEnv)(process.cwd(), envFile);
+	const initEnvSources = await (0, _hot_updater_cli_tools.readHotUpdaterInitEnv)(process.cwd(), envFile, secretsEnv);
 	const { inputEnv, managedEnv } = initEnvSources;
 	const initInputEnv = (0, _hot_updater_cli_tools.getHotUpdaterInitInputEnv)(initEnvSources, nonInteractive);
 	const savedInputs = resolveSupabaseInitInputs(initInputEnv, {
@@ -7596,6 +7623,7 @@ const runInitWithoutCliMetadata = async ({ build, envFile }) => {
 	const { tmpDir, removeTmpDir } = await (0, _hot_updater_cli_tools.copyDirToTmp)(scaffoldLibPath, "supabase");
 	let credential;
 	let clientPlugins = [];
+	let resources;
 	try {
 		await stageEdgeFunction({
 			bucketName: bucketSelection.name,
@@ -7637,6 +7665,10 @@ const runInitWithoutCliMetadata = async ({ build, envFile }) => {
 			[initProvider.inputs.bucketName.envKey]: bucket.name,
 			HOT_UPDATER_SUPABASE_URL: `https://${project.id}.supabase.co`
 		});
+		resources = {
+			supabaseUrl: `https://${project.id}.supabase.co`,
+			bucketName: bucket.name
+		};
 		await linkSupabase(tmpDir, {
 			accessToken,
 			projectId: project.id,
@@ -7674,7 +7706,7 @@ const runInitWithoutCliMetadata = async ({ build, envFile }) => {
 		await removeTmpDir();
 	}
 	_hot_updater_cli_tools.p.log.success("Generated '.env.hotupdater' file with Supabase settings.");
-	await (0, _hot_updater_cli_tools.writeHotUpdaterFiles)(getConfigScaffold(build), {
+	await (0, _hot_updater_cli_tools.writeHotUpdaterFiles)(getConfigScaffold(build, resources), {
 		cwd: process.cwd(),
 		settings: "Supabase"
 	});

package/dist/init/index.d.cts

@@ -99,6 +99,7 @@ declare const initProvider: {
       };
     };
   };
+  readonly secrets: readonly ["HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY"];
 };
 //#endregion
 //#region iac/supabaseManagementApi.d.ts

package/dist/init/index.d.mts

@@ -99,6 +99,7 @@ declare const initProvider: {
       };
     };
   };
+  readonly secrets: readonly ["HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY"];
 };
 //#endregion
 //#region iac/supabaseManagementApi.d.ts

package/dist/init/index.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import fs from "fs/promises";
 import path from "path";
-import { ConfigBuilder, InitError, MissingInitInputsError, assembleServer, assertInfrastructureGenerationAtUrl, assertInitInputs, assertInitProviderInputs, confirmInitInputPersistence, copyDirToTmp, createHotUpdaterConfigScaffoldFromBuilder, getHotUpdaterEnvValue, getHotUpdaterInitInputEnv, getInitProviderEnvVars, getInitProviderTextPromptValues, link, makeEnv, moduleSpecifiersOf, p, printAppSetup, provisionClientCredential, readHotUpdaterInitEnv, resolveInitProviderInput, resolvePackageVersion, transformEnv, transformTemplate, writeHotUpdaterFiles } from "@hot-updater/cli-tools";
+import { ConfigBuilder, InitError, MissingInitInputsError, assembleServer, assertInfrastructureGenerationAtUrl, assertInitInputs, assertInitProviderInputs, confirmInitInputPersistence, copyDirToTmp, createHotUpdaterConfigScaffoldFromBuilder, getHotUpdaterEnvValue, getHotUpdaterInitInputEnv, getInitProviderEnvVars, getInitProviderTextPromptValues, link, makeEnv, moduleSpecifiersOf, p, printAppSetup, provisionClientCredential, readHotUpdaterInitEnv, resolveInitProviderInput, resolvePackageVersion, secretEnvHelper, transformEnv, transformTemplate, writeHotUpdaterFiles } from "@hot-updater/cli-tools";
 import { apiKeys, insights, remoteConfig } from "@hot-updater/server/plugins";
 import { fileURLToPath } from "node:url";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
@@ -6328,9 +6328,11 @@ createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
 const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
 //#endregion
 //#region src/supabaseConfig.ts
-const resolveSupabaseServiceRoleKey = (config) => {
-	if (!config.supabaseServiceRoleKey) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
-	return config.supabaseServiceRoleKey;
+const resolveSupabaseServiceRoleKey = async (config) => {
+	const { supabaseServiceRoleKey } = config;
+	const key = typeof supabaseServiceRoleKey === "function" ? await supabaseServiceRoleKey() : supabaseServiceRoleKey;
+	if (!key) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
+	return key;
 };
 //#endregion
 //#region src/supabaseInfrastructureNames.ts
@@ -6370,9 +6372,16 @@ const withCode = (error) => Object.assign(new Error(error.message, { cause: erro
 */
 const supabaseExecutor = (client) => {
 	let created;
-	const clientOf = () => typeof client === "function" ? created ??= client() : client;
+	const clientOf = async () => {
+		if (typeof client !== "function") return client;
+		created ??= Promise.resolve().then(client).catch((error) => {
+			created = void 0;
+			throw error;
+		});
+		return created;
+	};
 	const apply = async (statements) => {
-		const { data, error } = await clientOf().rpc(SUPABASE_APPLY_FUNCTION, { p_statements: statements.map(toApplyStatement) });
+		const { data, error } = await (await clientOf()).rpc(SUPABASE_APPLY_FUNCTION, { p_statements: statements.map(toApplyStatement) });
 		if (error) throw withCode(error);
 		return data;
 	};
@@ -6395,7 +6404,7 @@ const supabaseExecutor = (client) => {
 */
 const supabaseDatabase = (config) => {
 	const { migrations: _migrations, ...adapter } = createSqlAdapter({
-		executor: supabaseExecutor(() => createClient(config.supabaseUrl, resolveSupabaseServiceRoleKey(config))),
+		executor: supabaseExecutor(async () => createClient(config.supabaseUrl, await resolveSupabaseServiceRoleKey(config))),
 		tablePrefix: SUPABASE_TABLE_PREFIX
 	});
 	return createEngineDatabase({
@@ -6405,27 +6414,39 @@ const supabaseDatabase = (config) => {
 };
 //#endregion
 //#region iac/configTemplate.ts
-const getConfigScaffold = (build) => {
-	return createHotUpdaterConfigScaffoldFromBuilder(new ConfigBuilder().setBuildType(build).setStorage({
+/**
+* The config init writes. With the `resources` init set up, it names them,
+* and reads the service role key with `secretEnv`, from the environment and
+* `.env.hotupdater`, then the config's `secrets` adapter. Without them, as
+* the agent scaffold writes it, it reads every value from the environment.
+*/
+const getConfigScaffold = (build, resources) => {
+	const supabaseUrl = resources === void 0 ? "process.env.HOT_UPDATER_SUPABASE_URL!" : JSON.stringify(resources.supabaseUrl);
+	const serviceRoleKey = resources === void 0 ? "process.env.HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY!" : `async () =>
+      (await deploySecrets()).HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY`;
+	const storageConfig = {
 		imports: [{
 			pkg: "@hot-updater/supabase",
 			named: ["supabaseStorage"]
 		}],
 		configString: `supabaseStorage({
-    supabaseUrl: process.env.HOT_UPDATER_SUPABASE_URL!,
-    supabaseServiceRoleKey: process.env.HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY!,
-    bucketName: process.env.HOT_UPDATER_SUPABASE_BUCKET_NAME!,
+    supabaseUrl: ${supabaseUrl},
+    supabaseServiceRoleKey: ${serviceRoleKey},
+    bucketName: ${resources === void 0 ? "process.env.HOT_UPDATER_SUPABASE_BUCKET_NAME!" : JSON.stringify(resources.bucketName)},
   })`
-	}).setDatabase({
+	};
+	const databaseConfig = {
 		imports: [{
 			pkg: "@hot-updater/supabase",
 			named: ["supabaseDatabase"]
 		}],
 		configString: `supabaseDatabase({
-    supabaseUrl: process.env.HOT_UPDATER_SUPABASE_URL!,
-    supabaseServiceRoleKey: process.env.HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY!,
+    supabaseUrl: ${supabaseUrl},
+    supabaseServiceRoleKey: ${serviceRoleKey},
   })`
-	}).setPlugins({
+	};
+	const helperStatements = resources === void 0 ? [] : [secretEnvHelper("deploySecrets", ["HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY"])];
+	const builder = new ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setPlugins({
 		imports: [{
 			pkg: "hot-updater/plugins",
 			named: [
@@ -6435,7 +6456,12 @@ const getConfigScaffold = (build) => {
 			]
 		}],
 		configString: "[apiKeys(), insights(), remoteConfig()]"
-	}));
+	});
+	if (resources !== void 0) builder.addImport({
+		pkg: "hot-updater",
+		named: ["secretEnv"]
+	}).setIntermediateCode(helperStatements.map(({ code }) => code).join("\n\n"));
+	return createHotUpdaterConfigScaffoldFromBuilder(builder, { helperStatements });
 };
 //#endregion
 //#region iac/init/index.ts
@@ -6541,7 +6567,8 @@ const initProvider = {
 				type: "password"
 			}
 		}
-	}
+	},
+	secrets: ["HOT_UPDATER_SUPABASE_SERVICE_ROLE_KEY"]
 };
 //#endregion
 //#region iac/supabaseApi.ts
@@ -7510,9 +7537,9 @@ const withSupabaseCliMetadataCleanup = async (cwd, operation) => {
 		});
 	}
 };
-const runInitWithoutCliMetadata = async ({ build, envFile }) => {
+const runInitWithoutCliMetadata = async ({ build, envFile, secretsEnv }) => {
 	const nonInteractive = envFile !== void 0;
-	const initEnvSources = await readHotUpdaterInitEnv(process.cwd(), envFile);
+	const initEnvSources = await readHotUpdaterInitEnv(process.cwd(), envFile, secretsEnv);
 	const { inputEnv, managedEnv } = initEnvSources;
 	const initInputEnv = getHotUpdaterInitInputEnv(initEnvSources, nonInteractive);
 	const savedInputs = resolveSupabaseInitInputs(initInputEnv, {
@@ -7591,6 +7618,7 @@ const runInitWithoutCliMetadata = async ({ build, envFile }) => {
 	const { tmpDir, removeTmpDir } = await copyDirToTmp(scaffoldLibPath, "supabase");
 	let credential;
 	let clientPlugins = [];
+	let resources;
 	try {
 		await stageEdgeFunction({
 			bucketName: bucketSelection.name,
@@ -7632,6 +7660,10 @@ const runInitWithoutCliMetadata = async ({ build, envFile }) => {
 			[initProvider.inputs.bucketName.envKey]: bucket.name,
 			HOT_UPDATER_SUPABASE_URL: `https://${project.id}.supabase.co`
 		});
+		resources = {
+			supabaseUrl: `https://${project.id}.supabase.co`,
+			bucketName: bucket.name
+		};
 		await linkSupabase(tmpDir, {
 			accessToken,
 			projectId: project.id,
@@ -7669,7 +7701,7 @@ const runInitWithoutCliMetadata = async ({ build, envFile }) => {
 		await removeTmpDir();
 	}
 	p.log.success("Generated '.env.hotupdater' file with Supabase settings.");
-	await writeHotUpdaterFiles(getConfigScaffold(build), {
+	await writeHotUpdaterFiles(getConfigScaffold(build, resources), {
 		cwd: process.cwd(),
 		settings: "Supabase"
 	});

package/dist/{supabaseStorage-D4jcGa-l.mjs → supabaseStorage-8VAuNYHy.mjs}

@@ -1,9 +1,11 @@
 import { SETTINGS_TABLE, createEngineDatabase, createSqlAdapter, createStorageAdapter, createStorageKeyBuilder, createStorageUri, parseStorageUri } from "@hot-updater/plugin-core";
 import { createClient } from "@supabase/supabase-js";
 //#region src/supabaseConfig.ts
-const resolveSupabaseServiceRoleKey = (config) => {
-	if (!config.supabaseServiceRoleKey) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
-	return config.supabaseServiceRoleKey;
+const resolveSupabaseServiceRoleKey = async (config) => {
+	const { supabaseServiceRoleKey } = config;
+	const key = typeof supabaseServiceRoleKey === "function" ? await supabaseServiceRoleKey() : supabaseServiceRoleKey;
+	if (!key) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
+	return key;
 };
 //#endregion
 //#region src/supabaseInfrastructureNames.ts
@@ -42,9 +44,16 @@ const withCode = (error) => Object.assign(new Error(error.message, { cause: erro
 */
 const supabaseExecutor = (client) => {
 	let created;
-	const clientOf = () => typeof client === "function" ? created ??= client() : client;
+	const clientOf = async () => {
+		if (typeof client !== "function") return client;
+		created ??= Promise.resolve().then(client).catch((error) => {
+			created = void 0;
+			throw error;
+		});
+		return created;
+	};
 	const apply = async (statements) => {
-		const { data, error } = await clientOf().rpc(SUPABASE_APPLY_FUNCTION, { p_statements: statements.map(toApplyStatement) });
+		const { data, error } = await (await clientOf()).rpc(SUPABASE_APPLY_FUNCTION, { p_statements: statements.map(toApplyStatement) });
 		if (error) throw withCode(error);
 		return data;
 	};
@@ -67,7 +76,7 @@ const supabaseExecutor = (client) => {
 */
 const supabaseDatabase = (config) => {
 	const { migrations: _migrations, ...adapter } = createSqlAdapter({
-		executor: supabaseExecutor(() => createClient(config.supabaseUrl, resolveSupabaseServiceRoleKey(config))),
+		executor: supabaseExecutor(async () => createClient(config.supabaseUrl, await resolveSupabaseServiceRoleKey(config))),
 		tablePrefix: SUPABASE_TABLE_PREFIX
 	});
 	return createEngineDatabase({
@@ -170,10 +179,13 @@ const utf8 = new TextEncoder();
 const toObjectName = (key) => key.replace(ESCAPED_CHARACTER, (character) => Array.from(utf8.encode(character), (byte) => `!${byte.toString(16).toUpperCase().padStart(2, "0")}`).join(""));
 const supabaseStorage = (config) => {
 	let client;
-	const bucket = () => (client ??= createClient(config.supabaseUrl, resolveSupabaseServiceRoleKey(config))).storage.from(config.bucketName);
+	const bucket = async () => (await (client ??= resolveSupabaseServiceRoleKey(config).then((key) => createClient(config.supabaseUrl, key), (error) => {
+		client = void 0;
+		throw error;
+	}))).storage.from(config.bucketName);
 	const getStorageKey = createStorageKeyBuilder(config.basePath);
 	const resolveSignedUrl = createSupabaseSignedUrlBatcher({
-		createSignedUrls: (_bucketName, keys, expiresIn) => bucket().createSignedUrls(keys, expiresIn),
+		createSignedUrls: async (_bucketName, keys, expiresIn) => (await bucket()).createSignedUrls(keys, expiresIn),
 		expiresIn: config.signedUrlExpiresIn ?? 3600,
 		formatObjectPath: (_bucketName, key) => key
 	});
@@ -187,7 +199,7 @@ const supabaseStorage = (config) => {
 		protocol: "supabase-storage",
 		async put({ key, body, contentLength, contentType }) {
 			const storageKey = getStorageKey(key);
-			const { error } = await bucket().upload(toObjectName(storageKey), body, {
+			const { error } = await (await bucket()).upload(toObjectName(storageKey), body, {
 				contentType,
 				cacheControl: "max-age=31536000",
 				upsert: true,
@@ -203,7 +215,7 @@ const supabaseStorage = (config) => {
 		},
 		async get({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
-			const { data, error } = await bucket().download(toObjectName(key));
+			const { data, error } = await (await bucket()).download(toObjectName(key));
 			if (error) {
 				if (await isMissingObjectError(error)) return { response: null };
 				throw new Error(`Failed to download storage object: ${error.message}`);
@@ -216,7 +228,7 @@ const supabaseStorage = (config) => {
 		},
 		async exists({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
-			const { data, error } = await bucket().exists(toObjectName(key));
+			const { data, error } = await (await bucket()).exists(toObjectName(key));
 			if (error) {
 				if (isMissingExistsError(error)) return { exists: false };
 				throw error;
@@ -225,7 +237,7 @@ const supabaseStorage = (config) => {
 		},
 		async delete({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
-			const { error } = await bucket().remove([toObjectName(key)]);
+			const { error } = await (await bucket()).remove([toObjectName(key)]);
 			if (error && !isNotFoundError(error)) throw new Error(`Failed to delete storage object: ${error.message}`);
 			return { deleted: true };
 		}

package/dist/{supabaseStorage-BryXQ72m.d.cts → supabaseStorage-B131_auF.d.cts}

@@ -2,7 +2,12 @@ import { EngineDatabase, StorageAdapterWith } from "@hot-updater/plugin-core";
 //#region src/supabaseConfig.d.ts
 type SupabaseServiceRoleConfig = {
   supabaseUrl: string;
-  supabaseServiceRoleKey: string;
+  /**
+   * The project's service role key, or a function that returns it, such as
+   * one that reads it with `secretEnv`: called on the first request, so a
+   * config loads without the key.
+   */
+  supabaseServiceRoleKey: string | (() => string | Promise<string>);
 };
 //#endregion
 //#region src/supabaseDatabase.d.ts

package/dist/{supabaseStorage-BryXQ72m.d.mts → supabaseStorage-B131_auF.d.mts}

@@ -2,7 +2,12 @@ import { EngineDatabase, StorageAdapterWith } from "@hot-updater/plugin-core";
 //#region src/supabaseConfig.d.ts
 type SupabaseServiceRoleConfig = {
   supabaseUrl: string;
-  supabaseServiceRoleKey: string;
+  /**
+   * The project's service role key, or a function that returns it, such as
+   * one that reads it with `secretEnv`: called on the first request, so a
+   * config loads without the key.
+   */
+  supabaseServiceRoleKey: string | (() => string | Promise<string>);
 };
 //#endregion
 //#region src/supabaseDatabase.d.ts

package/dist/{supabaseStorage-MqoRcaii.cjs → supabaseStorage-BV6GuUz_.cjs}

@@ -1,9 +1,11 @@
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let _supabase_supabase_js = require("@supabase/supabase-js");
 //#region src/supabaseConfig.ts
-const resolveSupabaseServiceRoleKey = (config) => {
-	if (!config.supabaseServiceRoleKey) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
-	return config.supabaseServiceRoleKey;
+const resolveSupabaseServiceRoleKey = async (config) => {
+	const { supabaseServiceRoleKey } = config;
+	const key = typeof supabaseServiceRoleKey === "function" ? await supabaseServiceRoleKey() : supabaseServiceRoleKey;
+	if (!key) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
+	return key;
 };
 //#endregion
 //#region src/supabaseInfrastructureNames.ts
@@ -42,9 +44,16 @@ const withCode = (error) => Object.assign(new Error(error.message, { cause: erro
 */
 const supabaseExecutor = (client) => {
 	let created;
-	const clientOf = () => typeof client === "function" ? created ??= client() : client;
+	const clientOf = async () => {
+		if (typeof client !== "function") return client;
+		created ??= Promise.resolve().then(client).catch((error) => {
+			created = void 0;
+			throw error;
+		});
+		return created;
+	};
 	const apply = async (statements) => {
-		const { data, error } = await clientOf().rpc(SUPABASE_APPLY_FUNCTION, { p_statements: statements.map(toApplyStatement) });
+		const { data, error } = await (await clientOf()).rpc(SUPABASE_APPLY_FUNCTION, { p_statements: statements.map(toApplyStatement) });
 		if (error) throw withCode(error);
 		return data;
 	};
@@ -67,7 +76,7 @@ const supabaseExecutor = (client) => {
 */
 const supabaseDatabase = (config) => {
 	const { migrations: _migrations, ...adapter } = (0, _hot_updater_plugin_core.createSqlAdapter)({
-		executor: supabaseExecutor(() => (0, _supabase_supabase_js.createClient)(config.supabaseUrl, resolveSupabaseServiceRoleKey(config))),
+		executor: supabaseExecutor(async () => (0, _supabase_supabase_js.createClient)(config.supabaseUrl, await resolveSupabaseServiceRoleKey(config))),
 		tablePrefix: SUPABASE_TABLE_PREFIX
 	});
 	return (0, _hot_updater_plugin_core.createEngineDatabase)({
@@ -170,10 +179,13 @@ const utf8 = new TextEncoder();
 const toObjectName = (key) => key.replace(ESCAPED_CHARACTER, (character) => Array.from(utf8.encode(character), (byte) => `!${byte.toString(16).toUpperCase().padStart(2, "0")}`).join(""));
 const supabaseStorage = (config) => {
 	let client;
-	const bucket = () => (client ??= (0, _supabase_supabase_js.createClient)(config.supabaseUrl, resolveSupabaseServiceRoleKey(config))).storage.from(config.bucketName);
+	const bucket = async () => (await (client ??= resolveSupabaseServiceRoleKey(config).then((key) => (0, _supabase_supabase_js.createClient)(config.supabaseUrl, key), (error) => {
+		client = void 0;
+		throw error;
+	}))).storage.from(config.bucketName);
 	const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
 	const resolveSignedUrl = createSupabaseSignedUrlBatcher({
-		createSignedUrls: (_bucketName, keys, expiresIn) => bucket().createSignedUrls(keys, expiresIn),
+		createSignedUrls: async (_bucketName, keys, expiresIn) => (await bucket()).createSignedUrls(keys, expiresIn),
 		expiresIn: config.signedUrlExpiresIn ?? 3600,
 		formatObjectPath: (_bucketName, key) => key
 	});
@@ -187,7 +199,7 @@ const supabaseStorage = (config) => {
 		protocol: "supabase-storage",
 		async put({ key, body, contentLength, contentType }) {
 			const storageKey = getStorageKey(key);
-			const { error } = await bucket().upload(toObjectName(storageKey), body, {
+			const { error } = await (await bucket()).upload(toObjectName(storageKey), body, {
 				contentType,
 				cacheControl: "max-age=31536000",
 				upsert: true,
@@ -203,7 +215,7 @@ const supabaseStorage = (config) => {
 		},
 		async get({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
-			const { data, error } = await bucket().download(toObjectName(key));
+			const { data, error } = await (await bucket()).download(toObjectName(key));
 			if (error) {
 				if (await isMissingObjectError(error)) return { response: null };
 				throw new Error(`Failed to download storage object: ${error.message}`);
@@ -216,7 +228,7 @@ const supabaseStorage = (config) => {
 		},
 		async exists({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
-			const { data, error } = await bucket().exists(toObjectName(key));
+			const { data, error } = await (await bucket()).exists(toObjectName(key));
 			if (error) {
 				if (isMissingExistsError(error)) return { exists: false };
 				throw error;
@@ -225,7 +237,7 @@ const supabaseStorage = (config) => {
 		},
 		async delete({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
-			const { error } = await bucket().remove([toObjectName(key)]);
+			const { error } = await (await bucket()).remove([toObjectName(key)]);
 			if (error && !isNotFoundError(error)) throw new Error(`Failed to delete storage object: ${error.message}`);
 			return { deleted: true };
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/supabase",
   "type": "module",
-  "version": "1.2.0-rc.4",
+  "version": "1.2.0-rc.6",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -51,10 +51,10 @@
     "@supabase/supabase-js": "2.76.1",
     "hono": "4.12.34",
     "uuidv7": "^1.0.2",
-    "@hot-updater/plugin-core": "1.2.0-rc.4",
-    "@hot-updater/cli-tools": "1.2.0-rc.4",
-    "@hot-updater/server": "1.2.0-rc.4",
-    "@hot-updater/protocol": "1.2.0-rc.4"
+    "@hot-updater/protocol": "1.2.0-rc.6",
+    "@hot-updater/plugin-core": "1.2.0-rc.6",
+    "@hot-updater/cli-tools": "1.2.0-rc.6",
+    "@hot-updater/server": "1.2.0-rc.6"
   },
   "devDependencies": {
     "@electric-sql/pglite": "0.4.1",
@@ -64,9 +64,9 @@
     "execa": "9.5.2",
     "@types/node": "^20",
     "mime": "^4.0.4",
-    "@hot-updater/mock": "1.2.0-rc.4",
-    "@hot-updater/test-utils": "1.2.0-rc.4",
-    "@hot-updater/postgres": "1.2.0-rc.4"
+    "@hot-updater/mock": "1.2.0-rc.6",
+    "@hot-updater/test-utils": "1.2.0-rc.6",
+    "@hot-updater/postgres": "1.2.0-rc.6"
   },
   "scripts": {
     "build": "tsdown",