@hot-updater/aws 0.29.2 → 0.29.4

package/dist/iac/index.cjs

@@ -22,6 +22,8 @@ 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");
@@ -36,8 +38,6 @@ let node_path = require("node:path");
 node_path = __toESM(node_path);
 let path = require("path");
 path = __toESM(path);
-let fs = require("fs");
-fs = __toESM(fs);
 let node_timers_promises = require("node:timers/promises");
 let node_os = require("node:os");
 let node_events = require("node:events");
@@ -46,14 +46,14 @@ let node_fs = require("node:fs");
 let node_stream_promises = require("node:stream/promises");
 let node_stream = require("node:stream");
 let node_buffer = require("node:buffer");
-let _aws_sdk_client_cloudfront = require("@aws-sdk/client-cloudfront");
 let crypto = require("crypto");
 crypto = __toESM(crypto);
+let _aws_sdk_client_cloudfront = require("@aws-sdk/client-cloudfront");
 let _aws_sdk_client_iam = require("@aws-sdk/client-iam");
 let _aws_sdk_client_sts = require("@aws-sdk/client-sts");
-let _aws_sdk_client_lambda = require("@aws-sdk/client-lambda");
 let fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises);
+let _aws_sdk_client_lambda = require("@aws-sdk/client-lambda");
 let _aws_sdk_client_s3 = require("@aws-sdk/client-s3");
 let _aws_sdk_lib_storage = require("@aws-sdk/lib-storage");
 let _aws_sdk_client_ssm = require("@aws-sdk/client-ssm");
@@ -6626,7 +6626,7 @@ var CloudFrontManager = class {
 					while (retryCount < 600) try {
 						if ((await cloudfrontClient.getDistribution({ Id: distributionId })).Distribution?.Status === "Deployed") return "CloudFront distribution deployment completed.";
 						throw new Error("Retry");
-					} catch (_err) {
+					} catch {
 						if (retryCount++ >= 5) message(`CloudFront distribution is still in progress. This may take a few minutes. (${retryCount})`);
 						await delay(1e3);
 					}
@@ -7181,6 +7181,11 @@ const regionLocationMap = {
 };
 //#endregion
 //#region iac/s3.ts
+function normalizeBucketRegion(region) {
+	if (region == null) return "us-east-1";
+	if (region === "EU") return "eu-west-1";
+	return region;
+}
 var S3Manager = class {
 	credentials;
 	constructor(credentials) {
@@ -7193,10 +7198,10 @@ var S3Manager = class {
 		});
 		const buckets = (await s3Client.listBuckets({})).Buckets ?? [];
 		return await Promise.all(buckets.filter((bucket) => bucket.Name).map(async (bucket) => {
-			const { LocationConstraint: region } = await s3Client.getBucketLocation({ Bucket: bucket.Name });
+			const { LocationConstraint } = await s3Client.getBucketLocation({ Bucket: bucket.Name });
 			return {
 				name: bucket.Name,
-				region
+				region: normalizeBucketRegion(LocationConstraint)
 			};
 		}));
 	}

package/dist/iac/index.mjs

@@ -1,4 +1,5 @@
 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 { fileURLToPath } from "node:url";
@@ -9,7 +10,6 @@ import process$1, { execArgv, execPath, hrtime, platform } from "node:process";
 import tty from "node:tty";
 import path from "node:path";
 import path$1 from "path";
-import fs from "fs";
 import { scheduler, setImmediate, setTimeout as setTimeout$1 } from "node:timers/promises";
 import { constants } from "node:os";
 import { EventEmitter, addAbortListener, on, once, setMaxListeners } from "node:events";
@@ -18,12 +18,12 @@ import { appendFileSync, createReadStream, createWriteStream, readFileSync, stat
 import { finished } from "node:stream/promises";
 import { Duplex, PassThrough, Readable, Transform, Writable, getDefaultHighWaterMark } from "node:stream";
 import { Buffer as Buffer$1 } from "node:buffer";
-import { CloudFront } from "@aws-sdk/client-cloudfront";
 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 { Lambda } from "@aws-sdk/client-lambda";
 import fs$1 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";
 import { ParameterNotFound, SSM } from "@aws-sdk/client-ssm";
@@ -6620,7 +6620,7 @@ var CloudFrontManager = class {
 					while (retryCount < 600) try {
 						if ((await cloudfrontClient.getDistribution({ Id: distributionId })).Distribution?.Status === "Deployed") return "CloudFront distribution deployment completed.";
 						throw new Error("Retry");
-					} catch (_err) {
+					} catch {
 						if (retryCount++ >= 5) message(`CloudFront distribution is still in progress. This may take a few minutes. (${retryCount})`);
 						await delay(1e3);
 					}
@@ -7175,6 +7175,11 @@ const regionLocationMap = {
 };
 //#endregion
 //#region iac/s3.ts
+function normalizeBucketRegion(region) {
+	if (region == null) return "us-east-1";
+	if (region === "EU") return "eu-west-1";
+	return region;
+}
 var S3Manager = class {
 	credentials;
 	constructor(credentials) {
@@ -7187,10 +7192,10 @@ var S3Manager = class {
 		});
 		const buckets = (await s3Client.listBuckets({})).Buckets ?? [];
 		return await Promise.all(buckets.filter((bucket) => bucket.Name).map(async (bucket) => {
-			const { LocationConstraint: region } = await s3Client.getBucketLocation({ Bucket: bucket.Name });
+			const { LocationConstraint } = await s3Client.getBucketLocation({ Bucket: bucket.Name });
 			return {
 				name: bucket.Name,
-				region
+				region: normalizeBucketRegion(LocationConstraint)
 			};
 		}));
 	}

package/dist/index.cjs

@@ -25,11 +25,11 @@ let _aws_sdk_client_cloudfront = require("@aws-sdk/client-cloudfront");
 let _aws_sdk_client_s3 = require("@aws-sdk/client-s3");
 let _aws_sdk_lib_storage = require("@aws-sdk/lib-storage");
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
-let _aws_sdk_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
 let fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises);
 let path = require("path");
 path = __toESM(path);
+let _aws_sdk_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
 let _aws_sdk_client_ssm = require("@aws-sdk/client-ssm");
 let _aws_sdk_cloudfront_signer = require("@aws-sdk/cloudfront-signer");
 //#region ../../node_modules/.pnpm/mime@4.0.4/node_modules/mime/dist/types/other.js

package/dist/index.mjs

@@ -2,9 +2,9 @@ import { CloudFrontClient, CreateInvalidationCommand, GetInvalidationCommand } f
 import { DeleteObjectCommand, DeleteObjectsCommand, GetObjectCommand, ListObjectsV2Command, NoSuchKey, S3Client } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { createBlobDatabasePlugin, createStorageKeyBuilder, createStoragePlugin, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
-import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import fs from "fs/promises";
 import path from "path";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { SSM } from "@aws-sdk/client-ssm";
 import { getSignedUrl as getSignedUrl$1 } from "@aws-sdk/cloudfront-signer";
 //#region ../../node_modules/.pnpm/mime@4.0.4/node_modules/mime/dist/types/other.js

package/dist/lambda/index.cjs

@@ -29,11 +29,11 @@ node_crypto = __toESM(node_crypto);
 let _aws_sdk_client_cloudfront = require("@aws-sdk/client-cloudfront");
 let _aws_sdk_client_s3 = require("@aws-sdk/client-s3");
 let _aws_sdk_lib_storage = require("@aws-sdk/lib-storage");
-let _aws_sdk_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
 let fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises);
 let path = require("path");
 path = __toESM(path);
+let _aws_sdk_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
 let _aws_sdk_client_ssm = require("@aws-sdk/client-ssm");
 let _aws_sdk_cloudfront_signer = require("@aws-sdk/cloudfront-signer");
 //#region ../../packages/core/dist/index.mjs
@@ -1610,12 +1610,12 @@ function mergeBundleUpdate(baseBundle, patch) {
 */
 function createDatabasePlugin(options) {
 	return (config, hooks) => {
+		let cachedMethods = null;
+		const getMethods = () => {
+			if (!cachedMethods) cachedMethods = options.factory(config);
+			return cachedMethods;
+		};
 		return () => {
-			let cachedMethods = null;
-			const getMethods = () => {
-				if (!cachedMethods) cachedMethods = options.factory(config);
-				return cachedMethods;
-			};
 			const changedMap = /* @__PURE__ */ new Map();
 			const markChanged = (operation, data) => {
 				changedMap.set(data.id, {
@@ -1646,8 +1646,8 @@ function createDatabasePlugin(options) {
 					const params = { changedSets: Array.from(changedMap.values()) };
 					if (context === void 0) await methods.commitBundle(params);
 					else await methods.commitBundle(params, context);
-					await hooks?.onDatabaseUpdated?.();
 					changedMap.clear();
+					await hooks?.onDatabaseUpdated?.();
 				},
 				async updateBundle(targetBundleId, newBundle, context) {
 					const pendingChange = changedMap.get(targetBundleId);
@@ -3074,6 +3074,11 @@ function getSemverNormalizedVersions(version) {
 	if (coerced.minor === 0 && coerced.patch === 0) versions.add(`${coerced.major}`);
 	return Array.from(versions);
 }
+function resolveStorageTarget({ targetAppVersion, fingerprintHash }) {
+	const target = normalizeTargetAppVersion(targetAppVersion) ?? fingerprintHash;
+	if (!target) throw new Error("target not found");
+	return target;
+}
 /**
 * Creates a blob storage-based database plugin with lazy initialization.
 *
@@ -3209,8 +3214,7 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 						if (data.targetAppVersion !== void 0) isTargetAppVersionChanged = true;
 						if (operation === "update" && data.channel !== void 0) isChannelChanged = true;
 						if (operation === "insert") {
-							const target = normalizeTargetAppVersion(data.targetAppVersion) ?? data.fingerprintHash;
-							if (!target) throw new Error("target not found");
+							const target = resolveStorageTarget(data);
 							const key = `${data.channel}/${data.platform}/${target}/update.json`;
 							const bundleWithKey = {
 								...data,
@@ -3239,20 +3243,16 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 						if (!bundle) bundle = bundlesMap.get(data.id);
 						if (!bundle) throw new Error("targetBundleId not found");
 						if (operation === "update") {
-							const newChannel = data.channel !== void 0 ? data.channel : bundle.channel;
-							const newPlatform = data.platform !== void 0 ? data.platform : bundle.platform;
-							const target = data.fingerprintHash ?? bundle.fingerprintHash ?? normalizeTargetAppVersion(data.targetAppVersion) ?? normalizeTargetAppVersion(bundle.targetAppVersion);
-							if (!target) throw new Error("target not found");
-							const newKey = `${newChannel}/${newPlatform}/${target}/update.json`;
+							const updatedBundle = {
+								...bundle,
+								...data
+							};
+							const newKey = `${updatedBundle.channel}/${updatedBundle.platform}/${resolveStorageTarget(updatedBundle)}/update.json`;
 							if (newKey !== bundle._updateJsonKey) {
 								const oldKey = bundle._updateJsonKey;
 								removalsByKey[oldKey] = removalsByKey[oldKey] || [];
 								removalsByKey[oldKey].push(bundle.id);
 								changedBundlesByKey[newKey] = changedBundlesByKey[newKey] || [];
-								const updatedBundle = {
-									...bundle,
-									...data
-								};
 								updatedBundle._oldUpdateJsonKey = oldKey;
 								updatedBundle._updateJsonKey = newKey;
 								bundlesMap.set(data.id, updatedBundle);
@@ -3272,10 +3272,6 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 								continue;
 							}
 							const currentKey = bundle._updateJsonKey;
-							const updatedBundle = {
-								...bundle,
-								...data
-							};
 							bundlesMap.set(data.id, updatedBundle);
 							pendingBundlesMap.set(data.id, updatedBundle);
 							changedBundlesByKey[currentKey] = changedBundlesByKey[currentKey] || [];
@@ -3456,9 +3452,17 @@ const INIT_BUNDLE_ROLLBACK_UPDATE_INFO = {
 	storageUri: null,
 	fileHash: null
 };
-function createPluginDatabaseCore(plugin, resolveFileUrl) {
+function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
+	const runWithMutationPlugin = async (operation) => {
+		const plugin = options?.createMutationPlugin?.() ?? getPlugin();
+		try {
+			return await operation(plugin);
+		} finally {
+			if (options?.createMutationPlugin) await options.cleanupMutationPlugin?.(plugin);
+		}
+	};
 	const getSortedBundlePage = async (options, context) => {
-		const result = await plugin.getBundles({
+		const result = await getPlugin().getBundles({
 			...options,
 			orderBy: options.orderBy ?? DESC_ORDER
 		}, context);
@@ -3512,7 +3516,7 @@ function createPluginDatabaseCore(plugin, resolveFileUrl) {
 	return {
 		api: {
 			async getBundleById(id, context) {
-				return plugin.getBundleById(id, context);
+				return getPlugin().getBundleById(id, context);
 			},
 			async getUpdateInfo(args, context) {
 				const channel = args.channel ?? "production";
@@ -3553,27 +3557,33 @@ function createPluginDatabaseCore(plugin, resolveFileUrl) {
 				};
 			},
 			async getChannels(context) {
-				return plugin.getChannels(context);
+				return getPlugin().getChannels(context);
 			},
 			async getBundles(options, context) {
-				return plugin.getBundles(options, context);
+				return getPlugin().getBundles(options, context);
 			},
 			async insertBundle(bundle, context) {
-				await plugin.appendBundle(bundle, context);
-				await plugin.commitBundle(context);
+				await runWithMutationPlugin(async (plugin) => {
+					await plugin.appendBundle(bundle, context);
+					await plugin.commitBundle(context);
+				});
 			},
 			async updateBundleById(bundleId, newBundle, context) {
-				await plugin.updateBundle(bundleId, newBundle, context);
-				await plugin.commitBundle(context);
+				await runWithMutationPlugin(async (plugin) => {
+					await plugin.updateBundle(bundleId, newBundle, context);
+					await plugin.commitBundle(context);
+				});
 			},
 			async deleteBundleById(bundleId, context) {
-				const bundle = await plugin.getBundleById(bundleId, context);
-				if (!bundle) return;
-				await plugin.deleteBundle(bundle, context);
-				await plugin.commitBundle(context);
+				await runWithMutationPlugin(async (plugin) => {
+					const bundle = await plugin.getBundleById(bundleId, context);
+					if (!bundle) return;
+					await plugin.deleteBundle(bundle, context);
+					await plugin.commitBundle(context);
+				});
 			}
 		},
-		adapterName: plugin.name,
+		adapterName: getPlugin().name,
 		createMigrator: () => {
 			throw new Error("createMigrator is only available for Kysely/Prisma/Drizzle database adapters.");
 		},
@@ -3750,7 +3760,7 @@ const handleGetBundles = async (_params, request, api, context) => {
 		limit,
 		offset
 	}, context);
-	return new Response(JSON.stringify(result.data), {
+	return new Response(JSON.stringify(result), {
 		status: 200,
 		headers: { "Content-Type": "application/json" }
 	});
@@ -3783,8 +3793,8 @@ const handleDeleteBundle = async (params, _request, api, context) => {
 	});
 };
 const handleGetChannels = async (_params, _request, api, context) => {
-	const channels = await api.getChannels(context);
-	return new Response(JSON.stringify({ channels }), {
+	const response = { data: { channels: await api.getChannels(context) } };
+	return new Response(JSON.stringify(response), {
 		status: 200,
 		headers: { "Content-Type": "application/json" }
 	});
@@ -3865,6 +3875,7 @@ const normalizeBasePath = (basePath) => {
 //#endregion
 //#region ../../packages/server/src/runtime.ts
 function createHotUpdater(options) {
+	const database = options.database;
 	const basePath = normalizeBasePath(options.basePath ?? "/api");
 	const storagePlugins = (options.storages ?? options.storagePlugins ?? []).map((plugin) => typeof plugin === "function" ? plugin() : plugin);
 	const resolveStoragePluginUrl = async (storageUri, context) => {
@@ -3877,8 +3888,9 @@ function createHotUpdater(options) {
 		if (!fileUrl) throw new Error("Storage plugin returned empty fileUrl");
 		return fileUrl;
 	};
-	if (!isDatabasePluginFactory(options.database) && !isDatabasePlugin(options.database)) throw new Error("@hot-updater/server/runtime only supports database plugins.");
-	const core = createPluginDatabaseCore(isDatabasePluginFactory(options.database) ? options.database() : options.database, resolveStoragePluginUrl);
+	if (!isDatabasePluginFactory(database) && !isDatabasePlugin(database)) throw new Error("@hot-updater/server/runtime only supports database plugins.");
+	const plugin = isDatabasePluginFactory(database) ? database() : database;
+	const core = createPluginDatabaseCore(() => plugin, resolveStoragePluginUrl, isDatabasePluginFactory(database) ? { createMutationPlugin: () => database() } : void 0);
 	const api = {
 		...core.api,
 		handler: createHandler(core.api, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/aws",
   "type": "module",
-  "version": "0.29.2",
+  "version": "0.29.4",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -42,10 +42,10 @@
     "es-toolkit": "^1.32.0",
     "execa": "9.5.2",
     "mime": "^4.0.4",
-    "@hot-updater/core": "0.29.2",
-    "@hot-updater/js": "0.29.2",
-    "@hot-updater/mock": "0.29.2",
-    "@hot-updater/test-utils": "0.29.2"
+    "@hot-updater/core": "0.29.4",
+    "@hot-updater/js": "0.29.4",
+    "@hot-updater/mock": "0.29.4",
+    "@hot-updater/test-utils": "0.29.4"
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "3.1008.0",
@@ -60,9 +60,9 @@
     "@aws-sdk/lib-storage": "3.1008.0",
     "hono": "4.12.9",
     "aws-lambda": "1.0.7",
-    "@hot-updater/cli-tools": "0.29.2",
-    "@hot-updater/plugin-core": "0.29.2",
-    "@hot-updater/server": "0.29.2"
+    "@hot-updater/cli-tools": "0.29.4",
+    "@hot-updater/plugin-core": "0.29.4",
+    "@hot-updater/server": "0.29.4"
   },
   "scripts": {
     "build": "tsdown",