@hot-updater/aws 0.29.4 → 0.29.6

package/dist/iac/index.cjs

@@ -22,8 +22,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-let fs = require("fs");
-fs = __toESM(fs);
 let _aws_sdk_credential_providers = require("@aws-sdk/credential-providers");
 let _hot_updater_cli_tools = require("@hot-updater/cli-tools");
 let node_url = require("node:url");
@@ -826,7 +824,7 @@ const handleCommand = (filePath, rawArguments, rawOptions) => {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$5 = require("fs");
+	var fs$3 = require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -843,12 +841,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$5.stat(path, function(er, stat) {
+		fs$3.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$5.statSync(path), path, options);
+		return checkStat(fs$3.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -856,14 +854,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$4 = require("fs");
+	var fs$2 = require("fs");
 	function isexe(path, options, cb) {
-		fs$4.stat(path, function(er, stat) {
+		fs$2.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$4.statSync(path), options);
+		return checkStat(fs$2.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -1078,16 +1076,16 @@ var require_shebang_command = /* @__PURE__ */ __commonJSMin(((exports, module) =
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$3 = require("fs");
+	const fs$1 = require("fs");
 	const shebangCommand = require_shebang_command();
 	function readShebang(command) {
 		const size = 150;
 		const buffer = Buffer.alloc(size);
 		let fd;
 		try {
-			fd = fs$3.openSync(command, "r");
-			fs$3.readSync(fd, buffer, 0, size, 0);
-			fs$3.closeSync(fd);
+			fd = fs$1.openSync(command, "r");
+			fs$1.readSync(fd, buffer, 0, size, 0);
+			fs$1.closeSync(fd);
 		} catch (e) {}
 		return shebangCommand(buffer.toString());
 	}
@@ -7327,7 +7325,7 @@ var SSMKeyPairManager = class {
 };
 //#endregion
 //#region iac/templates.ts
-const getConfigTemplate = (build, { profile }) => {
+const getConfigScaffold = (build, { profile }) => {
 	const storageConfig = {
 		imports: [{
 			pkg: "@hot-updater/aws",
@@ -7345,14 +7343,21 @@ const getConfigTemplate = (build, { profile }) => {
     cloudfrontDistributionId: process.env.HOT_UPDATER_CLOUDFRONT_DISTRIBUTION_ID!,
   })`
 	};
-	let intermediate = "";
-	if (profile) intermediate = `
+	let helperStatements = [];
+	if (profile) helperStatements = [{
+		name: "commonOptions",
+		strategy: "merge-object",
+		code: `
 const commonOptions = {
   bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
   region: process.env.HOT_UPDATER_S3_REGION!,
   credentials: fromSSO({ profile: process.env.HOT_UPDATER_AWS_PROFILE! }),
-};`.trim();
-	else intermediate = `
+};`.trim()
+	}];
+	else helperStatements = [{
+		name: "commonOptions",
+		strategy: "merge-object",
+		code: `
 const commonOptions = {
   bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
   region: process.env.HOT_UPDATER_S3_REGION!,
@@ -7360,13 +7365,14 @@ const commonOptions = {
     accessKeyId: process.env.HOT_UPDATER_S3_ACCESS_KEY_ID!,
     secretAccessKey: process.env.HOT_UPDATER_S3_SECRET_ACCESS_KEY!,
   },
-};`.trim();
-	const builder = new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig);
+};`.trim()
+	}];
+	const builder = new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setIntermediateCode(helperStatements.map((statement) => statement.code.trim()).join("\n\n"));
 	if (profile) builder.addImport({
 		pkg: "@aws-sdk/credential-provider-sso",
 		named: ["fromSSO"]
 	});
-	return builder.setIntermediateCode(intermediate).getResult();
+	return (0, _hot_updater_cli_tools.createHotUpdaterConfigScaffoldFromBuilder)(builder, { helperStatements });
 };
 const SOURCE_TEMPLATE = `// Add this to your App.tsx
 import { HotUpdater } from "@hot-updater/react-native";
@@ -7536,7 +7542,7 @@ const runInit = async ({ build }) => {
 		distributionId,
 		accountId
 	});
-	await fs.default.promises.writeFile("hot-updater.config.ts", getConfigTemplate(build, { profile: ssoProfile }));
+	const configWriteResult = await (0, _hot_updater_cli_tools.writeHotUpdaterConfig)(getConfigScaffold(build, { profile: ssoProfile }));
 	await (0, _hot_updater_cli_tools.makeEnv)({
 		HOT_UPDATER_S3_BUCKET_NAME: bucketName,
 		HOT_UPDATER_S3_REGION: bucketRegion,
@@ -7555,7 +7561,9 @@ const runInit = async ({ build }) => {
 	});
 	if (mode === "sso") await (0, _hot_updater_cli_tools.ensureInstallPackages)({ devDependencies: ["@aws-sdk/credential-provider-sso"] });
 	_hot_updater_cli_tools.p.log.success("Generated '.env.hotupdater' file with AWS settings.");
-	_hot_updater_cli_tools.p.log.success("Generated 'hot-updater.config.ts' file with AWS settings.");
+	if (configWriteResult.status === "created") _hot_updater_cli_tools.p.log.success("Generated 'hot-updater.config.ts' file with AWS settings.");
+	else if (configWriteResult.status === "merged") _hot_updater_cli_tools.p.log.success("Updated 'hot-updater.config.ts' file with AWS settings.");
+	else _hot_updater_cli_tools.p.log.warn(`Kept existing 'hot-updater.config.ts' unchanged: ${configWriteResult.reason}`);
 	const sourceUrl = `https://${distributionDomain}/api/check-update`;
 	_hot_updater_cli_tools.p.note((0, _hot_updater_cli_tools.transformTemplate)(SOURCE_TEMPLATE, { source: sourceUrl }));
 	_hot_updater_cli_tools.p.log.message(`Next step: ${(0, _hot_updater_cli_tools.link)("https://hot-updater.dev/docs/managed/aws#step-4-changeenv-file-optional")}`);

package/dist/iac/index.mjs

@@ -1,7 +1,6 @@
 import { createRequire } from "node:module";
-import fs from "fs";
 import { fromSSO } from "@aws-sdk/credential-providers";
-import { ConfigBuilder, colors, copyDirToTmp, createZip, ensureInstallPackages, getCwd, link, makeEnv, p, transformEnv, transformTemplate } from "@hot-updater/cli-tools";
+import { ConfigBuilder, colors, copyDirToTmp, createHotUpdaterConfigScaffoldFromBuilder, createZip, ensureInstallPackages, getCwd, link, makeEnv, p, transformEnv, transformTemplate, writeHotUpdaterConfig } from "@hot-updater/cli-tools";
 import { fileURLToPath } from "node:url";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
@@ -22,7 +21,7 @@ import crypto from "crypto";
 import { CloudFront } from "@aws-sdk/client-cloudfront";
 import { IAM } from "@aws-sdk/client-iam";
 import { STS } from "@aws-sdk/client-sts";
-import fs$1 from "fs/promises";
+import fs from "fs/promises";
 import { Lambda } from "@aws-sdk/client-lambda";
 import { CopyObjectCommand, DeleteObjectCommand, GetObjectCommand, ListObjectsV2Command, S3 } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
@@ -820,7 +819,7 @@ const handleCommand = (filePath, rawArguments, rawOptions) => {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$4 = __require("fs");
+	var fs$3 = __require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -837,12 +836,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$4.stat(path, function(er, stat) {
+		fs$3.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$4.statSync(path), path, options);
+		return checkStat(fs$3.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -850,14 +849,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$3 = __require("fs");
+	var fs$2 = __require("fs");
 	function isexe(path, options, cb) {
-		fs$3.stat(path, function(er, stat) {
+		fs$2.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$3.statSync(path), options);
+		return checkStat(fs$2.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -1072,16 +1071,16 @@ var require_shebang_command = /* @__PURE__ */ __commonJSMin(((exports, module) =
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$2 = __require("fs");
+	const fs$1 = __require("fs");
 	const shebangCommand = require_shebang_command();
 	function readShebang(command) {
 		const size = 150;
 		const buffer = Buffer.alloc(size);
 		let fd;
 		try {
-			fd = fs$2.openSync(command, "r");
-			fs$2.readSync(fd, buffer, 0, size, 0);
-			fs$2.closeSync(fd);
+			fd = fs$1.openSync(command, "r");
+			fs$1.readSync(fd, buffer, 0, size, 0);
+			fs$1.closeSync(fd);
 		} catch (e) {}
 		return shebangCommand(buffer.toString());
 	}
@@ -6750,7 +6749,7 @@ var LambdaEdgeDeployer = class {
 			SSM_REGION: config.ssmRegion,
 			S3_BUCKET_NAME: config.bucketName
 		});
-		await fs$1.writeFile(indexPath, code);
+		await fs.writeFile(indexPath, code);
 		const lambdaClient = new Lambda({
 			region: "us-east-1",
 			credentials: this.credentials
@@ -6784,7 +6783,7 @@ var LambdaEdgeDeployer = class {
 							Runtime: "nodejs22.x",
 							Role: lambdaRoleArn,
 							Handler: "index.handler",
-							Code: { ZipFile: await fs$1.readFile(zipFilePath) },
+							Code: { ZipFile: await fs.readFile(zipFilePath) },
 							Description: "Hot Updater Lambda@Edge function",
 							Publish: true,
 							Timeout: 10
@@ -6797,7 +6796,7 @@ var LambdaEdgeDeployer = class {
 							message(`Function "${lambdaName}" already exists. Updating function code...`);
 							const updateResp = await lambdaClient.updateFunctionCode({
 								FunctionName: lambdaName,
-								ZipFile: await fs$1.readFile(zipFilePath),
+								ZipFile: await fs.readFile(zipFilePath),
 								Publish: true
 							});
 							message("Waiting for Lambda function update to complete...");
@@ -6829,7 +6828,7 @@ var LambdaEdgeDeployer = class {
 						return `Updated Lambda "${lambdaName}" function`;
 					} finally {
 						removeTmpDir();
-						fs$1.rm(zipFilePath, { force: true });
+						fs.rm(zipFilePath, { force: true });
 					}
 				}
 			},
@@ -7321,7 +7320,7 @@ var SSMKeyPairManager = class {
 };
 //#endregion
 //#region iac/templates.ts
-const getConfigTemplate = (build, { profile }) => {
+const getConfigScaffold = (build, { profile }) => {
 	const storageConfig = {
 		imports: [{
 			pkg: "@hot-updater/aws",
@@ -7339,14 +7338,21 @@ const getConfigTemplate = (build, { profile }) => {
     cloudfrontDistributionId: process.env.HOT_UPDATER_CLOUDFRONT_DISTRIBUTION_ID!,
   })`
 	};
-	let intermediate = "";
-	if (profile) intermediate = `
+	let helperStatements = [];
+	if (profile) helperStatements = [{
+		name: "commonOptions",
+		strategy: "merge-object",
+		code: `
 const commonOptions = {
   bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
   region: process.env.HOT_UPDATER_S3_REGION!,
   credentials: fromSSO({ profile: process.env.HOT_UPDATER_AWS_PROFILE! }),
-};`.trim();
-	else intermediate = `
+};`.trim()
+	}];
+	else helperStatements = [{
+		name: "commonOptions",
+		strategy: "merge-object",
+		code: `
 const commonOptions = {
   bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
   region: process.env.HOT_UPDATER_S3_REGION!,
@@ -7354,13 +7360,14 @@ const commonOptions = {
     accessKeyId: process.env.HOT_UPDATER_S3_ACCESS_KEY_ID!,
     secretAccessKey: process.env.HOT_UPDATER_S3_SECRET_ACCESS_KEY!,
   },
-};`.trim();
-	const builder = new ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig);
+};`.trim()
+	}];
+	const builder = new ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setIntermediateCode(helperStatements.map((statement) => statement.code.trim()).join("\n\n"));
 	if (profile) builder.addImport({
 		pkg: "@aws-sdk/credential-provider-sso",
 		named: ["fromSSO"]
 	});
-	return builder.setIntermediateCode(intermediate).getResult();
+	return createHotUpdaterConfigScaffoldFromBuilder(builder, { helperStatements });
 };
 const SOURCE_TEMPLATE = `// Add this to your App.tsx
 import { HotUpdater } from "@hot-updater/react-native";
@@ -7530,7 +7537,7 @@ const runInit = async ({ build }) => {
 		distributionId,
 		accountId
 	});
-	await fs.promises.writeFile("hot-updater.config.ts", getConfigTemplate(build, { profile: ssoProfile }));
+	const configWriteResult = await writeHotUpdaterConfig(getConfigScaffold(build, { profile: ssoProfile }));
 	await makeEnv({
 		HOT_UPDATER_S3_BUCKET_NAME: bucketName,
 		HOT_UPDATER_S3_REGION: bucketRegion,
@@ -7549,7 +7556,9 @@ const runInit = async ({ build }) => {
 	});
 	if (mode === "sso") await ensureInstallPackages({ devDependencies: ["@aws-sdk/credential-provider-sso"] });
 	p.log.success("Generated '.env.hotupdater' file with AWS settings.");
-	p.log.success("Generated 'hot-updater.config.ts' file with AWS settings.");
+	if (configWriteResult.status === "created") p.log.success("Generated 'hot-updater.config.ts' file with AWS settings.");
+	else if (configWriteResult.status === "merged") p.log.success("Updated 'hot-updater.config.ts' file with AWS settings.");
+	else p.log.warn(`Kept existing 'hot-updater.config.ts' unchanged: ${configWriteResult.reason}`);
 	const sourceUrl = `https://${distributionDomain}/api/check-update`;
 	p.note(transformTemplate(SOURCE_TEMPLATE, { source: sourceUrl }));
 	p.log.message(`Next step: ${link("https://hot-updater.dev/docs/managed/aws#step-4-changeenv-file-optional")}`);

package/dist/index.d.cts

@@ -1,9 +1,9 @@
 import * as _$_hot_updater_plugin_core0 from "@hot-updater/plugin-core";
-import { StoragePlugin, StoragePluginHooks, StorageResolveContext } from "@hot-updater/plugin-core";
+import { BlobDatabasePluginConfig, StoragePlugin, StoragePluginHooks, StorageResolveContext } from "@hot-updater/plugin-core";
 import { S3ClientConfig } from "@aws-sdk/client-s3";
 
 //#region src/s3Database.d.ts
-interface S3DatabaseConfig extends S3ClientConfig {
+interface S3DatabaseConfig extends S3ClientConfig, BlobDatabasePluginConfig {
   bucketName: string;
   /**
    * CloudFront distribution ID used for cache invalidation.

package/dist/index.d.mts

@@ -1,9 +1,9 @@
 import { S3ClientConfig } from "@aws-sdk/client-s3";
 import * as _$_hot_updater_plugin_core0 from "@hot-updater/plugin-core";
-import { StoragePlugin, StoragePluginHooks, StorageResolveContext } from "@hot-updater/plugin-core";
+import { BlobDatabasePluginConfig, StoragePlugin, StoragePluginHooks, StorageResolveContext } from "@hot-updater/plugin-core";
 
 //#region src/s3Database.d.ts
-interface S3DatabaseConfig extends S3ClientConfig {
+interface S3DatabaseConfig extends S3ClientConfig, BlobDatabasePluginConfig {
   bucketName: string;
   /**
    * CloudFront distribution ID used for cache invalidation.