@hot-updater/cloudflare 0.12.7 → 0.13.1

package/dist/index.cjs

@@ -815,49 +815,147 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/d1Database.ts
-var import_pg_minify = __toESM(require_lib(), 1);
+var import_plugin_core = require("@hot-updater/plugin-core");
 var import_cloudflare = __toESM(require("cloudflare"), 1);
-var d1Database = (config, hooks) => (_) => {
+var import_pg_minify = __toESM(require_lib(), 1);
+async function resolvePage(singlePage) {
+  const results = [];
+  for await (const page of singlePage.iterPages()) {
+    const data = page.result.flatMap((r) => r.results);
+    results.push(...data);
+  }
+  return results;
+}
+var d1Database = (config, hooks) => {
   const cf = new import_cloudflare.default({
     apiToken: config.cloudflareApiToken
   });
   let bundles = [];
-  const changedIds = /* @__PURE__ */ new Set();
-  function markChanged(id) {
-    changedIds.add(id);
-  }
-  return {
-    name: "d1Database",
-    async commitBundle() {
-      if (changedIds.size === 0) {
-        return;
-      }
-      const changedBundles = bundles.filter((b) => changedIds.has(b.id));
-      if (changedBundles.length === 0) {
-        return;
-      }
-      const params = [];
-      const valuesSql = changedBundles.map((b) => {
-        params.push(
-          b.id,
-          b.enabled ? 1 : 0,
-          b.fileUrl,
-          b.shouldForceUpdate ? 1 : 0,
-          b.fileHash,
-          b.gitCommitHash || null,
-          b.message || null,
-          b.platform,
-          b.targetAppVersion
+  return (0, import_plugin_core.createDatabasePlugin)(
+    "d1Database",
+    {
+      async getBundleById(bundleId) {
+        const found = bundles.find((b) => b.id === bundleId);
+        if (found) {
+          return found;
+        }
+        const sql = (0, import_pg_minify.default)(
+          /* sql */
+          `
+          SELECT * FROM bundles WHERE id = ? LIMIT 1`
         );
-        return "(?, ?, ?, ?, ?, ?, ?, ?, ?)";
-      }).join(",\n");
-      const sql = (0, import_pg_minify.default)(
-        /* sql */
+        const singlePage = await cf.d1.database.query(config.databaseId, {
+          account_id: config.accountId,
+          sql,
+          params: [bundleId]
+        });
+        const rows = await resolvePage(singlePage);
+        if (rows.length === 0) {
+          return null;
+        }
+        const row = rows[0];
+        return {
+          channel: row.channel,
+          enabled: Boolean(row.enabled),
+          shouldForceUpdate: Boolean(row.should_force_update),
+          fileHash: row.file_hash,
+          gitCommitHash: row.git_commit_hash,
+          id: row.id,
+          message: row.message,
+          platform: row.platform,
+          targetAppVersion: row.target_app_version
+        };
+      },
+      async getBundles(options) {
+        const { where, limit, offset = 0 } = options ?? {};
+        let sql = "SELECT * FROM bundles";
+        const params = [];
+        const conditions = [];
+        if (where?.channel) {
+          conditions.push("channel = ?");
+          params.push(where.channel);
+        }
+        if (where?.platform) {
+          conditions.push("platform = ?");
+          params.push(where.platform);
+        }
+        if (conditions.length > 0) {
+          sql += ` WHERE ${conditions.join(" AND ")}`;
+        }
+        sql += " ORDER BY id DESC";
+        if (limit) {
+          sql += " LIMIT ?";
+          params.push(limit);
+        }
+        if (offset) {
+          sql += " OFFSET ?";
+          params.push(offset);
+        }
+        const singlePage = await cf.d1.database.query(config.databaseId, {
+          account_id: config.accountId,
+          sql: (0, import_pg_minify.default)(sql),
+          params
+        });
+        const rows = await resolvePage(singlePage);
+        if (rows.length === 0) {
+          bundles = [];
+        } else {
+          bundles = rows.map((row) => ({
+            id: row.id,
+            channel: row.channel,
+            enabled: Boolean(row.enabled),
+            shouldForceUpdate: Boolean(row.should_force_update),
+            fileHash: row.file_hash,
+            gitCommitHash: row.git_commit_hash,
+            message: row.message,
+            platform: row.platform,
+            targetAppVersion: row.target_app_version
+          }));
+        }
+        return bundles;
+      },
+      async getChannels() {
+        const sql = (0, import_pg_minify.default)(
+          /* sql */
+          `
+          SELECT channel FROM bundles GROUP BY channel
         `
+        );
+        const singlePage = await cf.d1.database.query(config.databaseId, {
+          account_id: config.accountId,
+          sql,
+          params: []
+        });
+        const rows = await resolvePage(singlePage);
+        return rows.map((row) => row.channel);
+      },
+      async commitBundle({ changedSets }) {
+        if (changedSets.length === 0) {
+          return;
+        }
+        const bundles2 = changedSets.map((op) => op.data);
+        const params = [];
+        const valuesSql = bundles2.map((b) => {
+          params.push(
+            b.id,
+            b.channel,
+            b.enabled ? 1 : 0,
+            b.shouldForceUpdate ? 1 : 0,
+            b.fileHash,
+            b.gitCommitHash || null,
+            b.message || null,
+            b.platform,
+            b.targetAppVersion
+          );
+          return "(?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        }).join(",\n");
+        const sql = (0, import_pg_minify.default)(
+          /* sql */
+          `
           INSERT OR REPLACE INTO bundles (
             id,
+            channel,
             enabled,
-            file_url,
             should_force_update,
             file_hash,
             git_commit_hash,
@@ -867,113 +965,16 @@ var d1Database = (config, hooks) => (_) => {
           )
           VALUES
           ${valuesSql};`
-      );
-      await cf.d1.database.query(config.databaseId, {
-        account_id: config.accountId,
-        sql,
-        // why this type is string[] ?
-        params
-      });
-      changedIds.clear();
-      hooks?.onDatabaseUpdated?.();
-    },
-    async updateBundle(targetBundleId, newBundle) {
-      const index = bundles.findIndex((b) => b.id === targetBundleId);
-      if (index === -1) {
-        throw new Error(`Cannot find bundle with id ${targetBundleId}`);
-      }
-      Object.assign(bundles[index], newBundle);
-      markChanged(targetBundleId);
-    },
-    async appendBundle(inputBundle) {
-      bundles.unshift(inputBundle);
-      markChanged(inputBundle.id);
-    },
-    async getBundleById(bundleId) {
-      const found = bundles.find((b) => b.id === bundleId);
-      if (found) {
-        return found;
-      }
-      const sql = (0, import_pg_minify.default)(
-        /* sql */
-        `
-          SELECT * FROM bundles WHERE id = ? LIMIT 1`
-      );
-      const singlePage = await cf.d1.database.query(config.databaseId, {
-        account_id: config.accountId,
-        sql,
-        params: [bundleId]
-      });
-      const rows = [];
-      for await (const page of singlePage.iterPages()) {
-        const data = page.result.flatMap((r) => r.results);
-        rows.push(...data);
-      }
-      if (rows.length === 0) {
-        return null;
+        );
+        await cf.d1.database.query(config.databaseId, {
+          account_id: config.accountId,
+          sql,
+          params
+        });
       }
-      const row = rows[0];
-      return {
-        enabled: Boolean(row.enabled),
-        fileUrl: row.file_url,
-        shouldForceUpdate: Boolean(row.should_force_update),
-        fileHash: row.file_hash,
-        gitCommitHash: row.git_commit_hash,
-        id: row.id,
-        message: row.message,
-        platform: row.platform,
-        targetAppVersion: row.target_app_version
-      };
     },
-    async getBundles(refresh = false) {
-      if (bundles.length > 0 && !refresh) {
-        return bundles;
-      }
-      const sql = (0, import_pg_minify.default)(
-        /* sql */
-        `
-          SELECT
-            id,
-            enabled,
-            file_url,
-            should_force_update,
-            file_hash,
-            git_commit_hash,
-            message,
-            platform,
-            target_app_version
-          FROM bundles
-          ORDER BY id DESC
-        `
-      );
-      const singlePage = await cf.d1.database.query(config.databaseId, {
-        account_id: config.accountId,
-        sql,
-        params: []
-      });
-      const rows = [];
-      for await (const page of singlePage.iterPages()) {
-        const data = page.result.flatMap((r) => r.results);
-        rows.push(...data);
-      }
-      if (rows.length === 0) {
-        bundles = [];
-      } else {
-        bundles = rows.map((row) => ({
-          id: row.id,
-          enabled: Boolean(row.enabled),
-          fileUrl: row.file_url,
-          shouldForceUpdate: Boolean(row.should_force_update),
-          fileHash: row.file_hash,
-          gitCommitHash: row.git_commit_hash,
-          message: row.message,
-          platform: row.platform,
-          targetAppVersion: row.target_app_version
-        }));
-      }
-      return bundles;
-    }
-  };
+    hooks
+  );
 };
 
 // src/r2Storage.ts
@@ -7919,16 +7920,9 @@ var r2Storage = (config, hooks) => (_) => {
         throw error;
       }
       hooks?.onStorageUploaded?.();
-      if (hooks?.transformFileUrl) {
-        return {
-          fileUrl: hooks.transformFileUrl(Key)
-        };
-      }
-      const publicUrl = await cf.r2.buckets.domains.managed.list(bucketName, {
-        account_id: accountId
-      });
       return {
-        fileUrl: `https://${publicUrl.domain}/${Key}`
+        bucketName,
+        key: Key
       };
     }
   };

package/dist/index.d.cts

@@ -1,11 +1,12 @@
-import { DatabasePluginHooks, BasePluginArgs, DatabasePlugin, StoragePluginHooks, StoragePlugin } from '@hot-updater/plugin-core';
+import * as _hot_updater_plugin_core from '@hot-updater/plugin-core';
+import { DatabasePluginHooks, StoragePluginHooks, BasePluginArgs, StoragePlugin } from '@hot-updater/plugin-core';
 
 interface D1DatabaseConfig {
     databaseId: string;
     accountId: string;
     cloudflareApiToken: string;
 }
-declare const d1Database: (config: D1DatabaseConfig, hooks?: DatabasePluginHooks) => (_: BasePluginArgs) => DatabasePlugin;
+declare const d1Database: (config: D1DatabaseConfig, hooks?: DatabasePluginHooks) => (options: _hot_updater_plugin_core.BasePluginArgs) => _hot_updater_plugin_core.DatabasePlugin;
 
 interface R2StorageConfig {
     cloudflareApiToken: string;

package/dist/index.d.ts

@@ -1,11 +1,12 @@
-import { DatabasePluginHooks, BasePluginArgs, DatabasePlugin, StoragePluginHooks, StoragePlugin } from '@hot-updater/plugin-core';
+import * as _hot_updater_plugin_core from '@hot-updater/plugin-core';
+import { DatabasePluginHooks, StoragePluginHooks, BasePluginArgs, StoragePlugin } from '@hot-updater/plugin-core';
 
 interface D1DatabaseConfig {
     databaseId: string;
     accountId: string;
     cloudflareApiToken: string;
 }
-declare const d1Database: (config: D1DatabaseConfig, hooks?: DatabasePluginHooks) => (_: BasePluginArgs) => DatabasePlugin;
+declare const d1Database: (config: D1DatabaseConfig, hooks?: DatabasePluginHooks) => (options: _hot_updater_plugin_core.BasePluginArgs) => _hot_updater_plugin_core.DatabasePlugin;
 
 interface R2StorageConfig {
     cloudflareApiToken: string;