@hot-updater/aws 0.21.11 → 0.21.13

package/dist/index.cjs

@@ -1457,97 +1457,97 @@ async function invalidateCloudFront(client, distributionId, paths) {
 		}
 	}));
 }
-const s3Database = (config, hooks) => {
-	const { bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update",...s3Config } = config;
-	return (0, __hot_updater_plugin_core.createBlobDatabasePlugin)({
-		name: "s3Database",
-		apiBasePath,
-		getContext: () => ({
-			client: new __aws_sdk_client_s3.S3Client(s3Config),
-			cloudfrontClient: cloudfrontDistributionId ? new __aws_sdk_client_cloudfront.CloudFrontClient({
-				credentials: s3Config.credentials,
-				region: s3Config.region
-			}) : void 0
-		}),
-		listObjects: (context, prefix) => listObjectsInS3(context.client, bucketName, prefix),
-		loadObject: (context, key) => loadJsonFromS3(context.client, bucketName, key),
-		uploadObject: (context, key, data) => uploadJsonToS3(context.client, bucketName, key, data),
-		deleteObject: (context, key) => deleteObjectInS3(context.client, bucketName, key),
-		invalidatePaths: (context, pathsToInvalidate) => {
-			if (context.cloudfrontClient && cloudfrontDistributionId && pathsToInvalidate.length > 0) return invalidateCloudFront(context.cloudfrontClient, cloudfrontDistributionId, pathsToInvalidate);
-			return Promise.resolve();
-		},
-		hooks
-	});
-};
+const s3Database = (0, __hot_updater_plugin_core.createBlobDatabasePlugin)({
+	name: "s3Database",
+	factory: (config) => {
+		const { bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update",...s3Config } = config;
+		const client = new __aws_sdk_client_s3.S3Client(s3Config);
+		const cloudfrontClient = cloudfrontDistributionId ? new __aws_sdk_client_cloudfront.CloudFrontClient({
+			credentials: s3Config.credentials,
+			region: s3Config.region
+		}) : void 0;
+		return {
+			apiBasePath,
+			listObjects: (prefix) => listObjectsInS3(client, bucketName, prefix),
+			loadObject: (key) => loadJsonFromS3(client, bucketName, key),
+			uploadObject: (key, data) => uploadJsonToS3(client, bucketName, key, data),
+			deleteObject: (key) => deleteObjectInS3(client, bucketName, key),
+			invalidatePaths: (pathsToInvalidate) => {
+				if (cloudfrontClient && cloudfrontDistributionId && pathsToInvalidate.length > 0) return invalidateCloudFront(cloudfrontClient, cloudfrontDistributionId, pathsToInvalidate);
+				return Promise.resolve();
+			}
+		};
+	}
+});
 
 //#endregion
 //#region src/s3Storage.ts
-const s3Storage = (config, hooks) => () => {
-	const { bucketName,...s3Config } = config;
-	const client = new __aws_sdk_client_s3.S3Client(s3Config);
-	const getStorageKey = (0, __hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
-	return {
-		name: "s3Storage",
-		supportedProtocol: "s3",
-		async delete(storageUri) {
-			const { bucket, key } = (0, __hot_updater_plugin_core.parseStorageUri)(storageUri, "s3");
-			if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
-			const listCommand = new __aws_sdk_client_s3.ListObjectsV2Command({
-				Bucket: bucketName,
-				Prefix: key
-			});
-			const listResponse = await client.send(listCommand);
-			if (listResponse.Contents && listResponse.Contents.length > 0) {
-				const deleteCommand = new __aws_sdk_client_s3.DeleteObjectsCommand({
+const s3Storage = (0, __hot_updater_plugin_core.createStoragePlugin)({
+	name: "s3Storage",
+	supportedProtocol: "s3",
+	factory: (config) => {
+		const { bucketName,...s3Config } = config;
+		const client = new __aws_sdk_client_s3.S3Client(s3Config);
+		const getStorageKey = (0, __hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
+		return {
+			async delete(storageUri) {
+				const { bucket, key } = (0, __hot_updater_plugin_core.parseStorageUri)(storageUri, "s3");
+				if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
+				const listCommand = new __aws_sdk_client_s3.ListObjectsV2Command({
 					Bucket: bucketName,
-					Delete: {
-						Objects: listResponse.Contents.map((obj) => ({ Key: obj.Key })),
-						Quiet: true
-					}
+					Prefix: key
 				});
-				await client.send(deleteCommand);
-				return;
-			}
-			throw new Error("Bundle Not Found");
-		},
-		async upload(key, filePath) {
-			const Body = await fs_promises.default.readFile(filePath);
-			const ContentType = (0, __hot_updater_plugin_core.getContentType)(filePath);
-			const Key = getStorageKey(key, path.default.basename(filePath));
-			const response = await new __aws_sdk_lib_storage.Upload({
-				client,
-				params: {
-					ContentType,
-					Bucket: bucketName,
-					Key,
-					Body,
-					CacheControl: "max-age=31536000"
+				const listResponse = await client.send(listCommand);
+				if (listResponse.Contents && listResponse.Contents.length > 0) {
+					const deleteCommand = new __aws_sdk_client_s3.DeleteObjectsCommand({
+						Bucket: bucketName,
+						Delete: {
+							Objects: listResponse.Contents.map((obj) => ({ Key: obj.Key })),
+							Quiet: true
+						}
+					});
+					await client.send(deleteCommand);
+					return;
+				}
+				throw new Error("Bundle Not Found");
+			},
+			async upload(key, filePath) {
+				const Body = await fs_promises.default.readFile(filePath);
+				const ContentType = (0, __hot_updater_plugin_core.getContentType)(filePath);
+				const Key = getStorageKey(key, path.default.basename(filePath));
+				const response = await new __aws_sdk_lib_storage.Upload({
+					client,
+					params: {
+						ContentType,
+						Bucket: bucketName,
+						Key,
+						Body,
+						CacheControl: "max-age=31536000"
+					}
+				}).done();
+				if (!response.Bucket || !response.Key) throw new Error("Upload Failed");
+				return { storageUri: `s3://${bucketName}/${Key}` };
+			},
+			async getDownloadUrl(storageUri) {
+				const u = new URL(storageUri);
+				if (u.protocol.replace(":", "") !== "s3") throw new Error("Invalid S3 storage URI protocol");
+				const bucket = u.host;
+				const key = u.pathname.slice(1);
+				if (!bucket || !key) throw new Error("Invalid S3 storage URI: missing bucket or key");
+				try {
+					const signedUrl = await (0, __aws_sdk_s3_request_presigner.getSignedUrl)(client, new __aws_sdk_client_s3.GetObjectCommand({
+						Bucket: bucket,
+						Key: key
+					}), { expiresIn: 3600 });
+					if (!signedUrl) throw new Error("Failed to presign S3 URL");
+					return { fileUrl: signedUrl };
+				} catch (e) {
+					throw new Error(e instanceof Error ? `Failed to presign S3 URL: ${e.message}` : "Failed to presign S3 URL");
 				}
-			}).done();
-			if (!response.Bucket || !response.Key) throw new Error("Upload Failed");
-			hooks?.onStorageUploaded?.();
-			return { storageUri: `s3://${bucketName}/${Key}` };
-		},
-		async getDownloadUrl(storageUri) {
-			const u = new URL(storageUri);
-			if (u.protocol.replace(":", "") !== "s3") throw new Error("Invalid S3 storage URI protocol");
-			const bucket = u.host;
-			const key = u.pathname.slice(1);
-			if (!bucket || !key) throw new Error("Invalid S3 storage URI: missing bucket or key");
-			try {
-				const signedUrl = await (0, __aws_sdk_s3_request_presigner.getSignedUrl)(client, new __aws_sdk_client_s3.GetObjectCommand({
-					Bucket: bucket,
-					Key: key
-				}), { expiresIn: 3600 });
-				if (!signedUrl) throw new Error("Failed to presign S3 URL");
-				return { fileUrl: signedUrl };
-			} catch (e) {
-				throw new Error(e instanceof Error ? `Failed to presign S3 URL: ${e.message}` : "Failed to presign S3 URL");
 			}
-		}
-	};
-};
+		};
+	}
+});
 
 //#endregion
 exports.s3Database = s3Database;

package/dist/index.d.cts

@@ -1,5 +1,4 @@
 import * as _hot_updater_plugin_core0 from "@hot-updater/plugin-core";
-import { DatabasePluginHooks, StoragePlugin, StoragePluginHooks } from "@hot-updater/plugin-core";
 import { S3ClientConfig } from "@aws-sdk/client-s3";
 
 //#region src/s3Database.d.ts
@@ -15,7 +14,7 @@ interface S3DatabaseConfig extends S3ClientConfig {
   cloudfrontDistributionId?: string;
   apiBasePath?: string;
 }
-declare const s3Database: (config: S3DatabaseConfig, hooks?: DatabasePluginHooks) => () => _hot_updater_plugin_core0.DatabasePlugin;
+declare const s3Database: (config: S3DatabaseConfig, hooks?: _hot_updater_plugin_core0.DatabasePluginHooks) => _hot_updater_plugin_core0.DatabasePlugin;
 //#endregion
 //#region src/s3Storage.d.ts
 interface S3StorageConfig extends S3ClientConfig {
@@ -25,6 +24,6 @@ interface S3StorageConfig extends S3ClientConfig {
    */
   basePath?: string;
 }
-declare const s3Storage: (config: S3StorageConfig, hooks?: StoragePluginHooks) => () => StoragePlugin;
+declare const s3Storage: (config: S3StorageConfig, hooks?: _hot_updater_plugin_core0.StoragePluginHooks) => () => _hot_updater_plugin_core0.StoragePlugin;
 //#endregion
 export { S3DatabaseConfig, S3StorageConfig, s3Database, s3Storage };

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { S3ClientConfig } from "@aws-sdk/client-s3";
-import * as _hot_updater_plugin_core0 from "@hot-updater/plugin-core";
-import { DatabasePluginHooks, StoragePlugin, StoragePluginHooks } from "@hot-updater/plugin-core";
+import * as _hot_updater_plugin_core1 from "@hot-updater/plugin-core";
 
 //#region src/s3Database.d.ts
 interface S3DatabaseConfig extends S3ClientConfig {
@@ -15,7 +14,7 @@ interface S3DatabaseConfig extends S3ClientConfig {
   cloudfrontDistributionId?: string;
   apiBasePath?: string;
 }
-declare const s3Database: (config: S3DatabaseConfig, hooks?: DatabasePluginHooks) => () => _hot_updater_plugin_core0.DatabasePlugin;
+declare const s3Database: (config: S3DatabaseConfig, hooks?: _hot_updater_plugin_core1.DatabasePluginHooks) => _hot_updater_plugin_core1.DatabasePlugin;
 //#endregion
 //#region src/s3Storage.d.ts
 interface S3StorageConfig extends S3ClientConfig {
@@ -25,6 +24,6 @@ interface S3StorageConfig extends S3ClientConfig {
    */
   basePath?: string;
 }
-declare const s3Storage: (config: S3StorageConfig, hooks?: StoragePluginHooks) => () => StoragePlugin;
+declare const s3Storage: (config: S3StorageConfig, hooks?: _hot_updater_plugin_core1.StoragePluginHooks) => () => _hot_updater_plugin_core1.StoragePlugin;
 //#endregion
 export { S3DatabaseConfig, S3StorageConfig, s3Database, s3Storage };

package/dist/index.js

@@ -1,7 +1,7 @@
 import { CloudFrontClient, CreateInvalidationCommand } from "@aws-sdk/client-cloudfront";
 import { DeleteObjectCommand, DeleteObjectsCommand, GetObjectCommand, ListObjectsV2Command, NoSuchKey, S3Client } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
-import { createBlobDatabasePlugin, createStorageKeyBuilder, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
+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";
@@ -1427,97 +1427,97 @@ async function invalidateCloudFront(client, distributionId, paths) {
 		}
 	}));
 }
-const s3Database = (config, hooks) => {
-	const { bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update",...s3Config } = config;
-	return createBlobDatabasePlugin({
-		name: "s3Database",
-		apiBasePath,
-		getContext: () => ({
-			client: new S3Client(s3Config),
-			cloudfrontClient: cloudfrontDistributionId ? new CloudFrontClient({
-				credentials: s3Config.credentials,
-				region: s3Config.region
-			}) : void 0
-		}),
-		listObjects: (context, prefix) => listObjectsInS3(context.client, bucketName, prefix),
-		loadObject: (context, key) => loadJsonFromS3(context.client, bucketName, key),
-		uploadObject: (context, key, data) => uploadJsonToS3(context.client, bucketName, key, data),
-		deleteObject: (context, key) => deleteObjectInS3(context.client, bucketName, key),
-		invalidatePaths: (context, pathsToInvalidate) => {
-			if (context.cloudfrontClient && cloudfrontDistributionId && pathsToInvalidate.length > 0) return invalidateCloudFront(context.cloudfrontClient, cloudfrontDistributionId, pathsToInvalidate);
-			return Promise.resolve();
-		},
-		hooks
-	});
-};
+const s3Database = createBlobDatabasePlugin({
+	name: "s3Database",
+	factory: (config) => {
+		const { bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update",...s3Config } = config;
+		const client = new S3Client(s3Config);
+		const cloudfrontClient = cloudfrontDistributionId ? new CloudFrontClient({
+			credentials: s3Config.credentials,
+			region: s3Config.region
+		}) : void 0;
+		return {
+			apiBasePath,
+			listObjects: (prefix) => listObjectsInS3(client, bucketName, prefix),
+			loadObject: (key) => loadJsonFromS3(client, bucketName, key),
+			uploadObject: (key, data) => uploadJsonToS3(client, bucketName, key, data),
+			deleteObject: (key) => deleteObjectInS3(client, bucketName, key),
+			invalidatePaths: (pathsToInvalidate) => {
+				if (cloudfrontClient && cloudfrontDistributionId && pathsToInvalidate.length > 0) return invalidateCloudFront(cloudfrontClient, cloudfrontDistributionId, pathsToInvalidate);
+				return Promise.resolve();
+			}
+		};
+	}
+});
 
 //#endregion
 //#region src/s3Storage.ts
-const s3Storage = (config, hooks) => () => {
-	const { bucketName,...s3Config } = config;
-	const client = new S3Client(s3Config);
-	const getStorageKey = createStorageKeyBuilder(config.basePath);
-	return {
-		name: "s3Storage",
-		supportedProtocol: "s3",
-		async delete(storageUri) {
-			const { bucket, key } = parseStorageUri(storageUri, "s3");
-			if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
-			const listCommand = new ListObjectsV2Command({
-				Bucket: bucketName,
-				Prefix: key
-			});
-			const listResponse = await client.send(listCommand);
-			if (listResponse.Contents && listResponse.Contents.length > 0) {
-				const deleteCommand = new DeleteObjectsCommand({
+const s3Storage = createStoragePlugin({
+	name: "s3Storage",
+	supportedProtocol: "s3",
+	factory: (config) => {
+		const { bucketName,...s3Config } = config;
+		const client = new S3Client(s3Config);
+		const getStorageKey = createStorageKeyBuilder(config.basePath);
+		return {
+			async delete(storageUri) {
+				const { bucket, key } = parseStorageUri(storageUri, "s3");
+				if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
+				const listCommand = new ListObjectsV2Command({
 					Bucket: bucketName,
-					Delete: {
-						Objects: listResponse.Contents.map((obj) => ({ Key: obj.Key })),
-						Quiet: true
-					}
+					Prefix: key
 				});
-				await client.send(deleteCommand);
-				return;
-			}
-			throw new Error("Bundle Not Found");
-		},
-		async upload(key, filePath) {
-			const Body = await fs.readFile(filePath);
-			const ContentType = getContentType(filePath);
-			const Key = getStorageKey(key, path.basename(filePath));
-			const response = await new Upload({
-				client,
-				params: {
-					ContentType,
-					Bucket: bucketName,
-					Key,
-					Body,
-					CacheControl: "max-age=31536000"
+				const listResponse = await client.send(listCommand);
+				if (listResponse.Contents && listResponse.Contents.length > 0) {
+					const deleteCommand = new DeleteObjectsCommand({
+						Bucket: bucketName,
+						Delete: {
+							Objects: listResponse.Contents.map((obj) => ({ Key: obj.Key })),
+							Quiet: true
+						}
+					});
+					await client.send(deleteCommand);
+					return;
+				}
+				throw new Error("Bundle Not Found");
+			},
+			async upload(key, filePath) {
+				const Body = await fs.readFile(filePath);
+				const ContentType = getContentType(filePath);
+				const Key = getStorageKey(key, path.basename(filePath));
+				const response = await new Upload({
+					client,
+					params: {
+						ContentType,
+						Bucket: bucketName,
+						Key,
+						Body,
+						CacheControl: "max-age=31536000"
+					}
+				}).done();
+				if (!response.Bucket || !response.Key) throw new Error("Upload Failed");
+				return { storageUri: `s3://${bucketName}/${Key}` };
+			},
+			async getDownloadUrl(storageUri) {
+				const u = new URL(storageUri);
+				if (u.protocol.replace(":", "") !== "s3") throw new Error("Invalid S3 storage URI protocol");
+				const bucket = u.host;
+				const key = u.pathname.slice(1);
+				if (!bucket || !key) throw new Error("Invalid S3 storage URI: missing bucket or key");
+				try {
+					const signedUrl = await getSignedUrl(client, new GetObjectCommand({
+						Bucket: bucket,
+						Key: key
+					}), { expiresIn: 3600 });
+					if (!signedUrl) throw new Error("Failed to presign S3 URL");
+					return { fileUrl: signedUrl };
+				} catch (e) {
+					throw new Error(e instanceof Error ? `Failed to presign S3 URL: ${e.message}` : "Failed to presign S3 URL");
 				}
-			}).done();
-			if (!response.Bucket || !response.Key) throw new Error("Upload Failed");
-			hooks?.onStorageUploaded?.();
-			return { storageUri: `s3://${bucketName}/${Key}` };
-		},
-		async getDownloadUrl(storageUri) {
-			const u = new URL(storageUri);
-			if (u.protocol.replace(":", "") !== "s3") throw new Error("Invalid S3 storage URI protocol");
-			const bucket = u.host;
-			const key = u.pathname.slice(1);
-			if (!bucket || !key) throw new Error("Invalid S3 storage URI: missing bucket or key");
-			try {
-				const signedUrl = await getSignedUrl(client, new GetObjectCommand({
-					Bucket: bucket,
-					Key: key
-				}), { expiresIn: 3600 });
-				if (!signedUrl) throw new Error("Failed to presign S3 URL");
-				return { fileUrl: signedUrl };
-			} catch (e) {
-				throw new Error(e instanceof Error ? `Failed to presign S3 URL: ${e.message}` : "Failed to presign S3 URL");
 			}
-		}
-	};
-};
+		};
+	}
+});
 
 //#endregion
 export { s3Database, s3Storage };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/aws",
   "type": "module",
-  "version": "0.21.11",
+  "version": "0.21.13",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -44,9 +44,9 @@
     "execa": "9.5.2",
     "hono": "^4.6.3",
     "mime": "^4.0.4",
-    "@hot-updater/core": "0.21.11",
-    "@hot-updater/js": "0.21.11",
-    "@hot-updater/test-utils": "0.21.11"
+    "@hot-updater/js": "0.21.13",
+    "@hot-updater/test-utils": "0.21.13",
+    "@hot-updater/core": "0.21.13"
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "3.772.0",
@@ -59,8 +59,8 @@
     "@aws-sdk/credential-providers": "3.772.0",
     "@aws-sdk/lib-storage": "3.772.0",
     "aws-lambda": "1.0.7",
-    "@hot-updater/cli-tools": "0.21.11",
-    "@hot-updater/plugin-core": "0.21.11"
+    "@hot-updater/cli-tools": "0.21.13",
+    "@hot-updater/plugin-core": "0.21.13"
   },
   "scripts": {
     "build": "tsdown",