@hot-updater/aws 1.2.0-rc.7 → 1.2.0-rc.9

package/dist/lambda/index.cjs

@@ -30,6 +30,7 @@ let _aws_sdk_client_cloudfront = require("@aws-sdk/client-cloudfront");
 let _aws_sdk_lib_dynamodb = require("@aws-sdk/lib-dynamodb");
 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");
 const SHA256_FILE_HASH_RE = /^[0-9a-f]{64}$/;
 const isContentAddressedAssetFileHash = (value) => {
 	return typeof value === "string" && SHA256_FILE_HASH_RE.test(value);
@@ -1437,6 +1438,10 @@ const semverSatisfies = (targetAppVersion, currentVersion) => {
 	return satisfies(currentCoerce, targetAppVersion);
 };
 //#endregion
+//#region ../plugin-core/dist/types/index.mjs
+/** The value of a `Lazy`, calling its function. */
+const resolveLazy = async (value) => typeof value === "function" ? await value() : value;
+//#endregion
 //#region ../plugin-core/dist/serverPlugin/definePlugin.mjs
 /** Declares a plugin; Hot Updater's own plugins and third-party ones use the same contract. */
 const definePlugin = (plugin) => plugin;
@@ -4707,7 +4712,7 @@ const createKvAdapter = ({ store, tablePrefix = "" }) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.2.0-rc.7";
+const HOT_UPDATER_SERVER_VERSION = "1.2.0-rc.9";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 /**
@@ -14295,10 +14300,30 @@ async apply() {
 	};
 };
 //#endregion
+//#region src/lazyCredentials.ts
+/**
+* `credentials` as the AWS SDK takes them: access keys with a lazy field
+* become a provider, which the SDK calls once, on its first request.
+*/
+const toSdkCredentials$1 = (credentials) => {
+	if (credentials === void 0 || typeof credentials === "function") return credentials;
+	const { accessKeyId, secretAccessKey, sessionToken, ...rest } = credentials;
+	if (typeof accessKeyId !== "function" && typeof secretAccessKey !== "function" && typeof sessionToken !== "function") return credentials;
+	return async () => ({
+		...rest,
+		accessKeyId: await resolveLazy(accessKeyId),
+		secretAccessKey: await resolveLazy(secretAccessKey),
+		...sessionToken === void 0 ? {} : { sessionToken: await resolveLazy(sessionToken) }
+	});
+};
+//#endregion
 //#region src/dynamoDB.ts
 /** The DynamoDB client ignores the CloudFront and batching settings. */
-const adapterOf = ({ tableName, ...clientConfig }) => {
-	const client = new _aws_sdk_client_dynamodb.DynamoDBClient(clientConfig);
+const adapterOf = ({ tableName, credentials, ...clientConfig }) => {
+	const client = new _aws_sdk_client_dynamodb.DynamoDBClient({
+		...clientConfig,
+		credentials: toSdkCredentials$1(credentials)
+	});
 	const store = createDynamoDBStore({
 		client,
 		tableName
@@ -14323,7 +14348,10 @@ const marked = (target) => ({ [DATABASE_TARGET]: target });
 */
 const dynamoDB = (config) => {
 	const { client, adapter } = adapterOf(config);
-	const cloudFront = createUpdateRouteInvalidation(config);
+	const cloudFront = createUpdateRouteInvalidation({
+		...config,
+		credentials: toSdkCredentials$1(config.credentials)
+	});
 	return {
 		...createEngineDatabase({
 			name: "dynamoDB",
@@ -14340,18 +14368,49 @@ const dynamoDB = (config) => {
 	};
 };
 //#endregion
-//#region src/s3Storage.ts
+//#region ../storage-s3/dist/index.mjs
+/**
+* `credentials` as the AWS SDK takes them: access keys with a lazy field
+* become a provider, which the SDK calls once, on its first request.
+*/
+const toSdkCredentials = (credentials) => {
+	if (credentials === void 0 || typeof credentials === "function") return credentials;
+	const { accessKeyId, secretAccessKey, sessionToken, ...rest } = credentials;
+	if (typeof accessKeyId !== "function" && typeof secretAccessKey !== "function" && typeof sessionToken !== "function") return credentials;
+	return async () => ({
+		...rest,
+		accessKeyId: await resolveLazy(accessKeyId),
+		secretAccessKey: await resolveLazy(secretAccessKey),
+		...sessionToken === void 0 ? {} : { sessionToken: await resolveLazy(sessionToken) }
+	});
+};
 /** Devices download right after the update check that returns the URL. */
-const PRESIGNED_URL_EXPIRES_IN_SECONDS = 3600;
-const isObjectNotFoundError = (error) => error instanceof Error && (error.name === "NotFound" || error.name === "NoSuchKey");
-function s3Storage(config) {
-	const { bucketName, basePath, getDownloadUrl, ...s3Config } = config;
-	const client = new _aws_sdk_client_s3.S3Client(applyS3RuntimeAwsConfig(s3Config));
-	const normalizedBasePath = basePath?.replace(/^\/+|\/+$/g, "") ?? "";
+const DEFAULT_SIGNED_LIFETIME_SECONDS = 3600;
+/** SigV4's limit on a presigned URL. */
+const MAX_SIGNED_LIFETIME_SECONDS = 604800;
+/** DeleteObjects takes at most 1000 keys a request. */
+const DELETE_BATCH_SIZE = 1e3;
+const isObjectNotFoundError = (error) => {
+	if (error instanceof Error && (error.name === "NotFound" || error.name === "NoSuchKey")) return true;
+	return typeof error === "object" && error !== null && "$metadata" in error && error.$metadata?.httpStatusCode === 404;
+};
+const trimSlashes = (value) => value.replace(/^\/+|\/+$/g, "");
+/**
+* A storage adapter over a bucket's S3 API, which AWS S3, Cloudflare R2, and
+* Neon Object Storage all serve. Each provider package passes its own name,
+* URI protocol, and client defaults.
+*/
+const createS3Storage = ({ name, protocol }, config) => {
+	const { bucketName, basePath, getDownloadUrl, signedUrlExpiresIn = DEFAULT_SIGNED_LIFETIME_SECONDS, credentials, ...clientConfig } = config;
+	if (!Number.isFinite(signedUrlExpiresIn) || signedUrlExpiresIn <= 0 || signedUrlExpiresIn > MAX_SIGNED_LIFETIME_SECONDS) throw new Error(`${name} signedUrlExpiresIn must be between 1 and ${MAX_SIGNED_LIFETIME_SECONDS} seconds (seven days).`);
+	const client = new _aws_sdk_client_s3.S3Client({
+		...clientConfig,
+		credentials: toSdkCredentials(credentials)
+	});
+	const normalizedBasePath = trimSlashes(basePath ?? "");
 	const getStorageKey = createStorageKeyBuilder(normalizedBasePath);
 	const getListPrefix = (prefix = "") => {
-		const normalizedPrefix = prefix.replace(/^\/+|\/+$/g, "");
-		const value = [normalizedBasePath, normalizedPrefix].filter(Boolean).join("/");
+		const value = [normalizedBasePath, trimSlashes(prefix)].filter(Boolean).join("/");
 		return value ? `${value}/` : "";
 	};
 	/**
@@ -14363,7 +14422,7 @@ function s3Storage(config) {
 			return createStorageUri({
 				bucket: bucketName,
 				key,
-				protocol: "s3"
+				protocol
 			});
 		} catch {
 			return null;
@@ -14375,55 +14434,16 @@ function s3Storage(config) {
 		return key.startsWith(basePrefix) ? key.slice(basePrefix.length) : key;
 	};
 	const parseAndValidate = (storageUri) => {
-		const parsed = parseStorageUri(storageUri, "s3");
+		const parsed = parseStorageUri(storageUri, protocol);
 		if (parsed.bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${parsed.bucket}".`);
 		return parsed;
 	};
 	return createStorageAdapter({
-		name: "s3Storage",
-		protocol: "s3",
-		async listObjects(prefix) {
-			const objects = [];
-			let continuationToken;
-			do {
-				const response = await client.send(new _aws_sdk_client_s3.ListObjectsV2Command({
-					Bucket: bucketName,
-					ContinuationToken: continuationToken,
-					Prefix: getListPrefix(prefix)
-				}));
-				for (const object of response.Contents ?? []) {
-					if (!object.Key) continue;
-					const storageUri = getListedStorageUri(object.Key);
-					if (storageUri === null) continue;
-					objects.push({
-						key: getRelativeKey(object.Key),
-						lastModifiedAt: object.LastModified,
-						size: object.Size ?? 0,
-						storageUri
-					});
-				}
-				continuationToken = response.NextContinuationToken;
-			} while (continuationToken);
-			return objects;
-		},
-		async deleteObjects(relativeKeys) {
-			const keys = relativeKeys.map((key) => getStorageKey(key));
-			for (let offset = 0; offset < keys.length; offset += 1e3) {
-				const batch = keys.slice(offset, offset + 1e3);
-				if (batch.length === 0) continue;
-				const response = await client.send(new _aws_sdk_client_s3.DeleteObjectsCommand({
-					Bucket: bucketName,
-					Delete: {
-						Objects: batch.map((Key) => ({ Key })),
-						Quiet: true
-					}
-				}));
-				if (response.Errors && response.Errors.length > 0) throw new Error(`Failed to delete ${response.Errors.length} S3 object(s).`);
-			}
-		},
+		name,
+		protocol,
 		async put({ key, body, contentLength, contentType }) {
 			const storageKey = getStorageKey(key);
-			const response = await new _aws_sdk_lib_storage.Upload({
+			await new _aws_sdk_lib_storage.Upload({
 				client,
 				params: {
 					Body: body,
@@ -14434,11 +14454,10 @@ function s3Storage(config) {
 					Key: storageKey
 				}
 			}).done();
-			if (!response.Bucket || !response.Key) throw new Error("Upload failed");
 			return { storageUri: createStorageUri({
 				bucket: bucketName,
 				key: storageKey,
-				protocol: "s3"
+				protocol
 			}) };
 		},
 		async get({ storageUri }) {
@@ -14461,11 +14480,10 @@ function s3Storage(config) {
 		async getDownloadUrl({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
 			if (getDownloadUrl) return getDownloadUrl({ storageUri });
-			const { getSignedUrl } = await import("@aws-sdk/s3-request-presigner");
-			return { url: await getSignedUrl(client, new _aws_sdk_client_s3.GetObjectCommand({
+			return { url: await (0, _aws_sdk_s3_request_presigner.getSignedUrl)(client, new _aws_sdk_client_s3.GetObjectCommand({
 				Bucket: bucketName,
 				Key: key
-			}), { expiresIn: PRESIGNED_URL_EXPIRES_IN_SECONDS }) };
+			}), { expiresIn: signedUrlExpiresIn }) };
 		},
 		async exists({ storageUri }) {
 			const { key } = parseAndValidate(storageUri);
@@ -14487,8 +14505,61 @@ function s3Storage(config) {
 				Key: key
 			}));
 			return { deleted: true };
+		},
+		async listObjects(prefix) {
+			const objects = [];
+			let continuationToken;
+			do {
+				const response = await client.send(new _aws_sdk_client_s3.ListObjectsV2Command({
+					Bucket: bucketName,
+					ContinuationToken: continuationToken,
+					Prefix: getListPrefix(prefix)
+				}));
+				for (const object of response.Contents ?? []) {
+					if (!object.Key) continue;
+					const storageUri = getListedStorageUri(object.Key);
+					if (storageUri === null) continue;
+					objects.push({
+						key: getRelativeKey(object.Key),
+						lastModifiedAt: object.LastModified,
+						size: object.Size ?? 0,
+						storageUri
+					});
+				}
+				continuationToken = response.NextContinuationToken;
+			} while (continuationToken);
+			return objects;
+		},
+		async deleteObjects(relativeKeys) {
+			const keys = relativeKeys.map((key) => getStorageKey(key));
+			for (let offset = 0; offset < keys.length; offset += DELETE_BATCH_SIZE) {
+				const batch = keys.slice(offset, offset + DELETE_BATCH_SIZE);
+				const response = await client.send(new _aws_sdk_client_s3.DeleteObjectsCommand({
+					Bucket: bucketName,
+					Delete: {
+						Objects: batch.map((Key) => ({ Key })),
+						Quiet: true
+					}
+				}));
+				if (response.Errors && response.Errors.length > 0) throw new Error(`Failed to delete ${response.Errors.length} S3 object(s) from bucket "${bucketName}".`);
+			}
 		}
 	});
+};
+//#endregion
+//#region src/s3Storage.ts
+function s3Storage(config) {
+	const { bucketName, basePath, getDownloadUrl, credentials, ...s3Config } = config;
+	return createS3Storage({
+		name: "s3Storage",
+		protocol: "s3"
+	}, {
+		...applyS3RuntimeAwsConfig(s3Config),
+		credentials,
+		bucketName,
+		basePath,
+		getDownloadUrl
+	});
 }
 //#endregion
 //#region lambda/index.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/aws",
   "type": "module",
-  "version": "1.2.0-rc.7",
+  "version": "1.2.0-rc.9",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -45,9 +45,9 @@
     "es-toolkit": "^1.32.0",
     "execa": "9.5.2",
     "mime": "^4.0.4",
-    "@hot-updater/protocol": "1.2.0-rc.7",
-    "@hot-updater/mock": "1.2.0-rc.7",
-    "@hot-updater/test-utils": "1.2.0-rc.7"
+    "@hot-updater/protocol": "1.2.0-rc.9",
+    "@hot-updater/mock": "1.2.0-rc.9",
+    "@hot-updater/test-utils": "1.2.0-rc.9"
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "3.1066.0",
@@ -64,9 +64,10 @@
     "@aws-sdk/lib-dynamodb": "3.1066.0",
     "@aws-sdk/s3-request-presigner": "3.1066.0",
     "hono": "4.12.34",
-    "@hot-updater/cli-tools": "1.2.0-rc.7",
-    "@hot-updater/plugin-core": "1.2.0-rc.7",
-    "@hot-updater/server": "1.2.0-rc.7"
+    "@hot-updater/cli-tools": "1.2.0-rc.9",
+    "@hot-updater/plugin-core": "1.2.0-rc.9",
+    "@hot-updater/server": "1.2.0-rc.9",
+    "@hot-updater/storage-s3": "1.2.0-rc.9"
   },
   "scripts": {
     "build": "tsdown",