@hot-updater/aws 0.1.3 → 0.1.5

package/dist/index.cjs

@@ -30,16 +30,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  aws: () => aws
+  s3Database: () => s3Database,
+  s3Storage: () => s3Storage
 });
 module.exports = __toCommonJS(src_exports);
 
-// src/aws.ts
-var import_path = __toESM(require("path"), 1);
+// src/s3Database.ts
 var import_client_s3 = require("@aws-sdk/client-s3");
 var import_lib_storage = require("@aws-sdk/lib-storage");
-var import_plugin_core = require("@hot-updater/plugin-core");
-var import_promises = __toESM(require("fs/promises"), 1);
 var import_mime = __toESM(require("mime"), 1);
 
 // src/utils/streamToString.ts
@@ -52,13 +50,13 @@ var streamToString = (stream) => {
   });
 };
 
-// src/aws.ts
-var aws = (config) => (_) => {
+// src/s3Database.ts
+var s3Database = (config, hooks) => (_) => {
   const { bucketName, ...s3Config } = config;
   const client = new import_client_s3.S3Client(s3Config);
-  let updateSources = [];
+  let bundles = [];
   return {
-    async commitUpdateSource() {
+    async commitBundle() {
       try {
         const command = new import_client_s3.GetObjectCommand({
           Bucket: bucketName,
@@ -66,15 +64,12 @@ var aws = (config) => (_) => {
         });
         await client.send(command);
       } catch (e) {
-        if (e instanceof import_client_s3.NoSuchKey) {
-          import_plugin_core.log.info("Creating new update.json");
-        } else {
+        if (!(e instanceof import_client_s3.NoSuchKey)) {
           throw e;
         }
       }
-      import_plugin_core.log.info("Uploading update.json");
       const Key = "update.json";
-      const Body = JSON.stringify(updateSources);
+      const Body = JSON.stringify(bundles);
       const ContentType = import_mime.default.getType(Key) ?? void 0;
       const upload = new import_lib_storage.Upload({
         client,
@@ -86,29 +81,31 @@ var aws = (config) => (_) => {
         }
       });
       await upload.done();
+      hooks?.onDatabaseUpdated?.();
     },
-    async updateUpdateSource(targetBundleVersion, newSource) {
-      updateSources = await this.getUpdateSources();
-      const targetIndex = updateSources.findIndex(
-        (u) => u.bundleVersion === targetBundleVersion
-      );
+    async updateBundle(targetBundleId, newBundle) {
+      bundles = await this.getBundles();
+      const targetIndex = bundles.findIndex((u) => u.id === targetBundleId);
       if (targetIndex === -1) {
         throw new Error("target bundle version not found");
       }
-      Object.assign(updateSources[targetIndex], newSource);
+      Object.assign(bundles[targetIndex], newBundle);
+    },
+    async appendBundle(inputBundle) {
+      bundles = await this.getBundles();
+      bundles.unshift(inputBundle);
     },
-    async appendUpdateSource(source) {
-      updateSources = await this.getUpdateSources();
-      updateSources.unshift(source);
+    async setBundles(inputBundles) {
+      bundles = inputBundles;
     },
-    async setUpdateSources(sources) {
-      updateSources = sources;
+    async getBundleById(bundleId) {
+      const bundles2 = await this.getBundles();
+      return bundles2.find((bundle) => bundle.id === bundleId) ?? null;
     },
-    async getUpdateSources(refresh = false) {
-      if (updateSources.length > 0 && !refresh) {
-        return updateSources;
+    async getBundles(refresh = false) {
+      if (bundles.length > 0 && !refresh) {
+        return bundles;
       }
-      import_plugin_core.log.info("Getting update.json");
       try {
         const command = new import_client_s3.GetObjectCommand({
           Bucket: bucketName,
@@ -116,21 +113,34 @@ var aws = (config) => (_) => {
         });
         const { Body: UpdateJsonBody } = await client.send(command);
         const bodyContents = await streamToString(UpdateJsonBody);
-        const _updateSource = JSON.parse(bodyContents);
-        updateSources = _updateSource;
-        return _updateSource;
+        const _bundle = JSON.parse(bodyContents);
+        bundles = _bundle;
+        return _bundle;
       } catch (e) {
         if (e instanceof import_client_s3.NoSuchKey) {
           return [];
         }
         throw e;
       }
-    },
-    async deleteBundle(platform, bundleVersion) {
-      const Key = [bundleVersion, platform].join("/");
-      const listCommand = new import_client_s3.ListObjectsV2Command({
+    }
+  };
+};
+
+// src/s3Storage.ts
+var import_path = __toESM(require("path"), 1);
+var import_client_s32 = require("@aws-sdk/client-s3");
+var import_lib_storage2 = require("@aws-sdk/lib-storage");
+var import_promises = __toESM(require("fs/promises"), 1);
+var import_mime2 = __toESM(require("mime"), 1);
+var s3Storage = (config, hooks) => (_) => {
+  const { bucketName, ...s3Config } = config;
+  const client = new import_client_s32.S3Client(s3Config);
+  return {
+    async deleteBundle(bundleId) {
+      const Key = [bundleId].join("/");
+      const listCommand = new import_client_s32.ListObjectsV2Command({
         Bucket: bucketName,
-        Prefix: `${bundleVersion}/${platform}`
+        Prefix: bundleId
       });
       const listResponse = await client.send(listCommand);
       if (listResponse.Contents && listResponse.Contents.length > 0) {
@@ -144,20 +154,18 @@ var aws = (config) => (_) => {
             Quiet: true
           }
         };
-        const deleteCommand = new import_client_s3.DeleteObjectsCommand(deleteParams);
+        const deleteCommand = new import_client_s32.DeleteObjectsCommand(deleteParams);
         await client.send(deleteCommand);
         return Key;
       }
-      import_plugin_core.log.error("Bundle Not Found");
       throw new Error("Bundle Not Found");
     },
-    async uploadBundle(platform, bundleVersion, bundlePath) {
-      import_plugin_core.log.info("Uploading Bundle");
+    async uploadBundle(bundleId, bundlePath) {
       const Body = await import_promises.default.readFile(bundlePath);
-      const ContentType = import_mime.default.getType(bundlePath) ?? void 0;
+      const ContentType = import_mime2.default.getType(bundlePath) ?? void 0;
       const filename = import_path.default.basename(bundlePath);
-      const Key = [bundleVersion, platform, filename].join("/");
-      const upload = new import_lib_storage.Upload({
+      const Key = [bundleId, filename].join("/");
+      const upload = new import_lib_storage2.Upload({
         client,
         params: {
           ContentType,
@@ -168,10 +176,9 @@ var aws = (config) => (_) => {
       });
       const response = await upload.done();
       if (!response.Location) {
-        import_plugin_core.log.error("Upload Failed");
         throw new Error("Upload Failed");
       }
-      import_plugin_core.log?.info(`Uploaded: ${Key}`);
+      hooks?.onStorageUploaded?.();
       return {
         file: response.Location
       };
@@ -180,5 +187,6 @@ var aws = (config) => (_) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  aws
+  s3Database,
+  s3Storage
 });

package/dist/index.d.cts

@@ -1,9 +1,14 @@
 import { S3ClientConfig } from '@aws-sdk/client-s3';
-import { BasePluginArgs, DeployPlugin } from '@hot-updater/plugin-core';
+import { DatabasePluginHooks, BasePluginArgs, DatabasePlugin, StoragePluginHooks, StoragePlugin } from '@hot-updater/plugin-core';
 
-interface AwsConfig extends Pick<S3ClientConfig, "credentials" | "region"> {
+interface S3DatabaseConfig extends Pick<S3ClientConfig, "credentials" | "region"> {
     bucketName: string;
 }
-declare const aws: (config: AwsConfig) => (_: BasePluginArgs) => DeployPlugin;
+declare const s3Database: (config: S3DatabaseConfig, hooks?: DatabasePluginHooks) => (_: BasePluginArgs) => DatabasePlugin;
 
-export { type AwsConfig, aws };
+interface S3StorageConfig extends Pick<S3ClientConfig, "credentials" | "region"> {
+    bucketName: string;
+}
+declare const s3Storage: (config: S3StorageConfig, hooks?: StoragePluginHooks) => (_: BasePluginArgs) => StoragePlugin;
+
+export { type S3DatabaseConfig, type S3StorageConfig, s3Database, s3Storage };

package/dist/index.d.ts

@@ -1,9 +1,14 @@
 import { S3ClientConfig } from '@aws-sdk/client-s3';
-import { BasePluginArgs, DeployPlugin } from '@hot-updater/plugin-core';
+import { DatabasePluginHooks, BasePluginArgs, DatabasePlugin, StoragePluginHooks, StoragePlugin } from '@hot-updater/plugin-core';
 
-interface AwsConfig extends Pick<S3ClientConfig, "credentials" | "region"> {
+interface S3DatabaseConfig extends Pick<S3ClientConfig, "credentials" | "region"> {
     bucketName: string;
 }
-declare const aws: (config: AwsConfig) => (_: BasePluginArgs) => DeployPlugin;
+declare const s3Database: (config: S3DatabaseConfig, hooks?: DatabasePluginHooks) => (_: BasePluginArgs) => DatabasePlugin;
 
-export { type AwsConfig, aws };
+interface S3StorageConfig extends Pick<S3ClientConfig, "credentials" | "region"> {
+    bucketName: string;
+}
+declare const s3Storage: (config: S3StorageConfig, hooks?: StoragePluginHooks) => (_: BasePluginArgs) => StoragePlugin;
+
+export { type S3DatabaseConfig, type S3StorageConfig, s3Database, s3Storage };

package/dist/index.js

@@ -1,17 +1,10 @@
-// src/aws.ts
-import path from "path";
+// src/s3Database.ts
 import {
-  DeleteObjectsCommand,
   GetObjectCommand,
-  ListObjectsV2Command,
   NoSuchKey,
   S3Client
 } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
-import {
-  log
-} from "@hot-updater/plugin-core";
-import fs from "fs/promises";
 import mime from "mime";
 
 // src/utils/streamToString.ts
@@ -24,13 +17,13 @@ var streamToString = (stream) => {
   });
 };
 
-// src/aws.ts
-var aws = (config) => (_) => {
+// src/s3Database.ts
+var s3Database = (config, hooks) => (_) => {
   const { bucketName, ...s3Config } = config;
   const client = new S3Client(s3Config);
-  let updateSources = [];
+  let bundles = [];
   return {
-    async commitUpdateSource() {
+    async commitBundle() {
       try {
         const command = new GetObjectCommand({
           Bucket: bucketName,
@@ -38,15 +31,12 @@ var aws = (config) => (_) => {
         });
         await client.send(command);
       } catch (e) {
-        if (e instanceof NoSuchKey) {
-          log.info("Creating new update.json");
-        } else {
+        if (!(e instanceof NoSuchKey)) {
           throw e;
         }
       }
-      log.info("Uploading update.json");
       const Key = "update.json";
-      const Body = JSON.stringify(updateSources);
+      const Body = JSON.stringify(bundles);
       const ContentType = mime.getType(Key) ?? void 0;
       const upload = new Upload({
         client,
@@ -58,29 +48,31 @@ var aws = (config) => (_) => {
         }
       });
       await upload.done();
+      hooks?.onDatabaseUpdated?.();
     },
-    async updateUpdateSource(targetBundleVersion, newSource) {
-      updateSources = await this.getUpdateSources();
-      const targetIndex = updateSources.findIndex(
-        (u) => u.bundleVersion === targetBundleVersion
-      );
+    async updateBundle(targetBundleId, newBundle) {
+      bundles = await this.getBundles();
+      const targetIndex = bundles.findIndex((u) => u.id === targetBundleId);
       if (targetIndex === -1) {
         throw new Error("target bundle version not found");
       }
-      Object.assign(updateSources[targetIndex], newSource);
+      Object.assign(bundles[targetIndex], newBundle);
     },
-    async appendUpdateSource(source) {
-      updateSources = await this.getUpdateSources();
-      updateSources.unshift(source);
+    async appendBundle(inputBundle) {
+      bundles = await this.getBundles();
+      bundles.unshift(inputBundle);
     },
-    async setUpdateSources(sources) {
-      updateSources = sources;
+    async setBundles(inputBundles) {
+      bundles = inputBundles;
     },
-    async getUpdateSources(refresh = false) {
-      if (updateSources.length > 0 && !refresh) {
-        return updateSources;
+    async getBundleById(bundleId) {
+      const bundles2 = await this.getBundles();
+      return bundles2.find((bundle) => bundle.id === bundleId) ?? null;
+    },
+    async getBundles(refresh = false) {
+      if (bundles.length > 0 && !refresh) {
+        return bundles;
       }
-      log.info("Getting update.json");
       try {
         const command = new GetObjectCommand({
           Bucket: bucketName,
@@ -88,21 +80,38 @@ var aws = (config) => (_) => {
         });
         const { Body: UpdateJsonBody } = await client.send(command);
         const bodyContents = await streamToString(UpdateJsonBody);
-        const _updateSource = JSON.parse(bodyContents);
-        updateSources = _updateSource;
-        return _updateSource;
+        const _bundle = JSON.parse(bodyContents);
+        bundles = _bundle;
+        return _bundle;
       } catch (e) {
         if (e instanceof NoSuchKey) {
           return [];
         }
         throw e;
       }
-    },
-    async deleteBundle(platform, bundleVersion) {
-      const Key = [bundleVersion, platform].join("/");
+    }
+  };
+};
+
+// src/s3Storage.ts
+import path from "path";
+import {
+  DeleteObjectsCommand,
+  ListObjectsV2Command,
+  S3Client as S3Client2
+} from "@aws-sdk/client-s3";
+import { Upload as Upload2 } from "@aws-sdk/lib-storage";
+import fs from "fs/promises";
+import mime2 from "mime";
+var s3Storage = (config, hooks) => (_) => {
+  const { bucketName, ...s3Config } = config;
+  const client = new S3Client2(s3Config);
+  return {
+    async deleteBundle(bundleId) {
+      const Key = [bundleId].join("/");
       const listCommand = new ListObjectsV2Command({
         Bucket: bucketName,
-        Prefix: `${bundleVersion}/${platform}`
+        Prefix: bundleId
       });
       const listResponse = await client.send(listCommand);
       if (listResponse.Contents && listResponse.Contents.length > 0) {
@@ -120,16 +129,14 @@ var aws = (config) => (_) => {
         await client.send(deleteCommand);
         return Key;
       }
-      log.error("Bundle Not Found");
       throw new Error("Bundle Not Found");
     },
-    async uploadBundle(platform, bundleVersion, bundlePath) {
-      log.info("Uploading Bundle");
+    async uploadBundle(bundleId, bundlePath) {
       const Body = await fs.readFile(bundlePath);
-      const ContentType = mime.getType(bundlePath) ?? void 0;
+      const ContentType = mime2.getType(bundlePath) ?? void 0;
       const filename = path.basename(bundlePath);
-      const Key = [bundleVersion, platform, filename].join("/");
-      const upload = new Upload({
+      const Key = [bundleId, filename].join("/");
+      const upload = new Upload2({
         client,
         params: {
           ContentType,
@@ -140,10 +147,9 @@ var aws = (config) => (_) => {
       });
       const response = await upload.done();
       if (!response.Location) {
-        log.error("Upload Failed");
         throw new Error("Upload Failed");
       }
-      log?.info(`Uploaded: ${Key}`);
+      hooks?.onStorageUploaded?.();
       return {
         file: response.Location
       };
@@ -151,5 +157,6 @@ var aws = (config) => (_) => {
   };
 };
 export {
-  aws
+  s3Database,
+  s3Storage
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/aws",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -16,8 +16,12 @@
   "publishConfig": {
     "access": "public"
   },
+  "files": [
+    "dist",
+    "package.json"
+  ],
   "dependencies": {
-    "@hot-updater/plugin-core": "0.1.3",
+    "@hot-updater/plugin-core": "0.1.5",
     "@aws-sdk/client-s3": "^3.685.0",
     "@aws-sdk/lib-storage": "^3.685.0",
     "mime": "^4.0.4"

package/src/aws.ts

@@ -1,173 +0,0 @@
-import path from "path";
-import {
-  DeleteObjectsCommand,
-  GetObjectCommand,
-  ListObjectsV2Command,
-  NoSuchKey,
-  S3Client,
-  type S3ClientConfig,
-} from "@aws-sdk/client-s3";
-import { Upload } from "@aws-sdk/lib-storage";
-import {
-  type BasePluginArgs,
-  type DeployPlugin,
-  type UpdateSource,
-  log,
-} from "@hot-updater/plugin-core";
-import fs from "fs/promises";
-import mime from "mime";
-import { streamToString } from "./utils/streamToString";
-
-export interface AwsConfig
-  extends Pick<S3ClientConfig, "credentials" | "region"> {
-  bucketName: string;
-}
-
-export const aws =
-  (config: AwsConfig) =>
-  (_: BasePluginArgs): DeployPlugin => {
-    const { bucketName, ...s3Config } = config;
-    const client = new S3Client(s3Config);
-
-    let updateSources: UpdateSource[] = [];
-
-    return {
-      async commitUpdateSource() {
-        try {
-          const command = new GetObjectCommand({
-            Bucket: bucketName,
-            Key: "update.json",
-          });
-          await client.send(command);
-        } catch (e) {
-          if (e instanceof NoSuchKey) {
-            log.info("Creating new update.json");
-          } else {
-            throw e;
-          }
-        }
-
-        log.info("Uploading update.json");
-        const Key = "update.json";
-        const Body = JSON.stringify(updateSources);
-        const ContentType = mime.getType(Key) ?? void 0;
-
-        const upload = new Upload({
-          client,
-          params: {
-            ContentType,
-            Bucket: bucketName,
-            Key,
-            Body,
-          },
-        });
-        await upload.done();
-      },
-      async updateUpdateSource(
-        targetBundleVersion: number,
-        newSource: Partial<UpdateSource>,
-      ) {
-        updateSources = await this.getUpdateSources();
-
-        const targetIndex = updateSources.findIndex(
-          (u) => u.bundleVersion === targetBundleVersion,
-        );
-        if (targetIndex === -1) {
-          throw new Error("target bundle version not found");
-        }
-
-        Object.assign(updateSources[targetIndex], newSource);
-      },
-      async appendUpdateSource(source) {
-        updateSources = await this.getUpdateSources();
-        updateSources.unshift(source);
-      },
-      async setUpdateSources(sources) {
-        updateSources = sources;
-      },
-
-      async getUpdateSources(refresh = false) {
-        if (updateSources.length > 0 && !refresh) {
-          return updateSources;
-        }
-
-        log.info("Getting update.json");
-
-        try {
-          const command = new GetObjectCommand({
-            Bucket: bucketName,
-            Key: "update.json",
-          });
-          const { Body: UpdateJsonBody } = await client.send(command);
-          const bodyContents = await streamToString(UpdateJsonBody);
-          const _updateSource = JSON.parse(bodyContents);
-          updateSources = _updateSource;
-          return _updateSource as UpdateSource[];
-        } catch (e) {
-          if (e instanceof NoSuchKey) {
-            return [];
-          }
-          throw e;
-        }
-      },
-      async deleteBundle(platform, bundleVersion) {
-        const Key = [bundleVersion, platform].join("/");
-
-        const listCommand = new ListObjectsV2Command({
-          Bucket: bucketName,
-          Prefix: `${bundleVersion}/${platform}`,
-        });
-        const listResponse = await client.send(listCommand);
-
-        if (listResponse.Contents && listResponse.Contents.length > 0) {
-          const objectsToDelete = listResponse.Contents.map((obj) => ({
-            Key: obj.Key,
-          }));
-
-          const deleteParams = {
-            Bucket: bucketName,
-            Delete: {
-              Objects: objectsToDelete,
-              Quiet: true,
-            },
-          };
-
-          const deleteCommand = new DeleteObjectsCommand(deleteParams);
-          await client.send(deleteCommand);
-          return Key;
-        }
-
-        log.error("Bundle Not Found");
-        throw new Error("Bundle Not Found");
-      },
-      async uploadBundle(platform, bundleVersion, bundlePath) {
-        log.info("Uploading Bundle");
-
-        const Body = await fs.readFile(bundlePath);
-        const ContentType = mime.getType(bundlePath) ?? void 0;
-
-        const filename = path.basename(bundlePath);
-
-        const Key = [bundleVersion, platform, filename].join("/");
-        const upload = new Upload({
-          client,
-          params: {
-            ContentType,
-            Bucket: bucketName,
-            Key,
-            Body,
-          },
-        });
-        const response = await upload.done();
-        if (!response.Location) {
-          log.error("Upload Failed");
-          throw new Error("Upload Failed");
-        }
-
-        log?.info(`Uploaded: ${Key}`);
-        return {
-          file: response.Location,
-        };
-      },
-    };
-  };

package/src/index.ts

@@ -1 +0,0 @@
-export * from "./aws";

package/src/utils/readDir.ts

@@ -1,11 +0,0 @@
-import { lstatSync } from "fs";
-import path from "path";
-import { readdir } from "fs/promises";
-
-export const readDir = async (dir: string) => {
-  const files = await readdir(dir, {
-    recursive: true,
-  });
-
-  return files.filter((file) => !lstatSync(path.join(dir, file)).isDirectory());
-};

package/src/utils/streamToString.ts

@@ -1,8 +0,0 @@
-export const streamToString = (stream: any): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    const chunks: Uint8Array[] = [];
-    stream.on("data", (chunk: Uint8Array) => chunks.push(chunk));
-    stream.on("error", reject);
-    stream.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")));
-  });
-};

package/tsconfig.json

@@ -1,5 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "include": ["src"],
-  "exclude": ["lib"]
-}