@hot-updater/cloudflare 0.31.4 → 0.33.0

package/worker/dist/index.js

@@ -5236,6 +5236,52 @@ function calculatePagination(total, options) {
 }
 __name(calculatePagination, "calculatePagination");
 
+// ../plugin-core/dist/contentAddressedAssets.mjs
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
+init_performance2();
+var getContentAddressedAssetStoragePath = /* @__PURE__ */ __name(({ assetPath, fileHash }) => {
+  const extension = assetPath.endsWith(".br") ? ".br" : assetPath.includes(".") ? `.${assetPath.split(".").pop()}` : "";
+  return `sha256/${fileHash.slice(0, 2)}/${fileHash}${extension}`;
+}, "getContentAddressedAssetStoragePath");
+
+// ../plugin-core/dist/assetStorageLayout.mjs
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
+init_performance2();
+
+// ../plugin-core/dist/legacyAssetStorageLayout.mjs
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
+init_performance2();
+var getLegacyManifestAssetStoragePath = /* @__PURE__ */ __name(({ assetPath }) => assetPath, "getLegacyManifestAssetStoragePath");
+
+// ../plugin-core/dist/assetStorageLayout.mjs
+var createStorageUriWithRelativePath = /* @__PURE__ */ __name(({ baseStorageUri, relativePath }) => {
+  const storageUrl = new URL(baseStorageUri);
+  storageUrl.pathname = `${storageUrl.pathname.replace(/\/+$/, "")}/${relativePath.replace(/\\/g, "/").split("/").filter(Boolean).map((segment) => encodeURIComponent(segment)).join("/")}`;
+  return storageUrl.toString();
+}, "createStorageUriWithRelativePath");
+var getAssetStorageLayout = /* @__PURE__ */ __name((assetBaseStorageUri) => {
+  const pathname = new URL(assetBaseStorageUri).pathname.replace(/\/+$/, "");
+  return pathname.endsWith("/assets") || pathname === "/assets" ? "content-addressed" : "legacy-files";
+}, "getAssetStorageLayout");
+var getManifestAssetStoragePath = /* @__PURE__ */ __name(({ assetBaseStorageUri, assetPath, fileHash }) => {
+  if (getAssetStorageLayout(assetBaseStorageUri) === "content-addressed") return getContentAddressedAssetStoragePath({
+    assetPath,
+    fileHash
+  });
+  return getLegacyManifestAssetStoragePath({ assetPath });
+}, "getManifestAssetStoragePath");
+var resolveManifestAssetStorageUri = /* @__PURE__ */ __name(({ assetBaseStorageUri, assetPath, fileHash }) => createStorageUriWithRelativePath({
+  baseStorageUri: assetBaseStorageUri,
+  relativePath: getManifestAssetStoragePath({
+    assetBaseStorageUri,
+    assetPath,
+    fileHash
+  })
+}), "resolveManifestAssetStorageUri");
+
 // ../plugin-core/dist/createDatabasePlugin.mjs
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
@@ -5548,7 +5594,28 @@ var filterCompatibleAppVersions = /* @__PURE__ */ __name((targetAppVersionList,
   return targetAppVersionList.filter((version2) => semverSatisfies(version2, currentVersion)).sort((a, b) => b.localeCompare(a));
 }, "filterCompatibleAppVersions");
 
-// ../js/dist/index.mjs
+// ../plugin-core/dist/requestUpdateBundleState.mjs
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
+init_performance2();
+var requestUpdateBundleSeeds = /* @__PURE__ */ new WeakMap();
+var isWeakMapKey = /* @__PURE__ */ __name((value) => typeof value === "object" && value !== null || typeof value === "function", "isWeakMapKey");
+var toBundleSeeds = /* @__PURE__ */ __name((seeds) => seeds.filter((seed) => !!seed), "toBundleSeeds");
+var seedRequestUpdateBundles = /* @__PURE__ */ __name((context2, seeds) => {
+  if (!isWeakMapKey(context2)) return;
+  const nextSeeds = toBundleSeeds(seeds);
+  if (nextSeeds.length === 0) return;
+  const bundlesById = /* @__PURE__ */ new Map();
+  for (const seed of requestUpdateBundleSeeds.get(context2) ?? []) bundlesById.set(seed.id, seed);
+  for (const seed of nextSeeds) bundlesById.set(seed.id, seed);
+  requestUpdateBundleSeeds.set(context2, [...bundlesById.values()]);
+}, "seedRequestUpdateBundles");
+var getRequestUpdateBundleSeeds = /* @__PURE__ */ __name((context2) => {
+  if (!isWeakMapKey(context2)) return [];
+  return requestUpdateBundleSeeds.get(context2) ?? [];
+}, "getRequestUpdateBundleSeeds");
+
+// ../plugin-core/dist/resolveUpdateInfoFromBundles.mjs
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
 init_performance2();
@@ -5701,13 +5768,16 @@ __name(isCohortEligibleForUpdate, "isCohortEligibleForUpdate");
 var NIL_UUID = "00000000-0000-0000-0000-000000000000";
 
 // ../js/dist/index.mjs
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
+init_performance2();
 var __create2 = Object.create;
 var __defProp2 = Object.defineProperty;
 var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames2 = Object.getOwnPropertyNames;
 var __getProtoOf2 = Object.getPrototypeOf;
 var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __commonJSMin = /* @__PURE__ */ __name((cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports), "__commonJSMin");
+var __commonJSMin = /* @__PURE__ */ __name((cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports), "__commonJSMin");
 var __copyProps2 = /* @__PURE__ */ __name((to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames2(from), i = 0, n = keys.length, key; i < n; i++) {
     key = keys[i];
@@ -6718,7 +6788,6 @@ var require_min_version2 = /* @__PURE__ */ __commonJSMin((exports, module) => {
           case "<":
           case "<=":
             break;
-          /* istanbul ignore next */
           default:
             throw new Error(`Unexpected operation: ${comparator.operator}`);
         }
@@ -8234,6 +8303,15 @@ var signToken = /* @__PURE__ */ __name(async (key, jwtSecret) => {
   return await new SignJWT({ key }).setProtectedHeader({ alg: "HS256" }).setExpirationTime("60s").sign(secretKey);
 }, "signToken");
 
+// ../plugin-core/dist/resolveUpdateInfoFromBundles.mjs
+var findSeedBundle = /* @__PURE__ */ __name((bundles, bundleId) => bundles.find((bundle) => bundle.id === bundleId), "findSeedBundle");
+var resolveUpdateInfoFromBundles = /* @__PURE__ */ __name(async ({ args, bundles, context: context2 }) => {
+  const info3 = await getUpdateInfo(bundles, args);
+  if (!info3) return null;
+  seedRequestUpdateBundles(context2, [findSeedBundle(bundles, info3.id), args.bundleId === NIL_UUID ? null : findSeedBundle(bundles, args.bundleId)]);
+  return info3;
+}, "resolveUpdateInfoFromBundles");
+
 // ../plugin-core/dist/createDatabasePluginGetUpdateInfo.mjs
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
@@ -8253,10 +8331,18 @@ var createDatabasePluginGetUpdateInfo = /* @__PURE__ */ __name(({ getBundlesByFi
     if (args._updateStrategy === "appVersion") {
       const normalizedArgs2 = normalizeAppVersionArgs(args);
       const compatibleAppVersions = filterCompatibleAppVersions(await listTargetAppVersions(normalizedArgs2, context2), normalizedArgs2.appVersion);
-      return getUpdateInfo(compatibleAppVersions.length > 0 ? await getBundlesByTargetAppVersions(normalizedArgs2, compatibleAppVersions, context2) : [], normalizedArgs2);
+      return resolveUpdateInfoFromBundles({
+        args: normalizedArgs2,
+        bundles: compatibleAppVersions.length > 0 ? await getBundlesByTargetAppVersions(normalizedArgs2, compatibleAppVersions, context2) : [],
+        context: context2
+      });
     }
     const normalizedArgs = normalizeFingerprintArgs(args);
-    return getUpdateInfo(await getBundlesByFingerprint(normalizedArgs, context2), normalizedArgs);
+    return resolveUpdateInfoFromBundles({
+      args: normalizedArgs,
+      bundles: await getBundlesByFingerprint(normalizedArgs, context2),
+      context: context2
+    });
   };
 }, "createDatabasePluginGetUpdateInfo");
 
@@ -8310,6 +8396,9 @@ var createProfiledStoragePlugin = /* @__PURE__ */ __name(({ createProfiles, name
     async downloadFile(storageUri, filePath) {
       return requireNodeProfile().downloadFile(storageUri, filePath);
     },
+    async exists(storageUri) {
+      return requireNodeProfile().exists(storageUri);
+    },
     async upload(key, filePath) {
       return requireNodeProfile().upload(key, filePath);
     }
@@ -8366,6 +8455,51 @@ init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
 init_performance2();
 
+// ../../packages/server/src/db/requestBundleIdentityMap.ts
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
+init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
+init_performance2();
+var createRequestBundleIdentityMap = /* @__PURE__ */ __name(({
+  context: context2,
+  loadBundleById,
+  seeds
+}) => {
+  const bundles = /* @__PURE__ */ new Map();
+  const pendingBundles = /* @__PURE__ */ new Map();
+  for (const seed of seeds) {
+    if (seed) {
+      bundles.set(seed.id, seed);
+    }
+  }
+  const get = /* @__PURE__ */ __name(async (bundleId) => {
+    const cachedBundle = bundles.get(bundleId);
+    if (cachedBundle) {
+      return cachedBundle;
+    }
+    const pendingBundle = pendingBundles.get(bundleId);
+    if (pendingBundle) {
+      return pendingBundle;
+    }
+    const lookup = loadBundleById(bundleId, context2).then(
+      (bundle) => {
+        pendingBundles.delete(bundleId);
+        if (bundle) {
+          bundles.set(bundle.id, bundle);
+        }
+        return bundle;
+      },
+      (error3) => {
+        pendingBundles.delete(bundleId);
+        throw error3;
+      }
+    );
+    pendingBundles.set(bundleId, lookup);
+    return lookup;
+  }, "get");
+  const peek = /* @__PURE__ */ __name((bundleId) => bundles.get(bundleId) ?? null, "peek");
+  return { get, peek };
+}, "createRequestBundleIdentityMap");
+
 // ../../packages/server/src/db/schemaEnhancements.ts
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
@@ -8434,13 +8568,6 @@ var isBundleManifest = /* @__PURE__ */ __name((value) => {
     }
   );
 }, "isBundleManifest");
-var createChildStorageUri = /* @__PURE__ */ __name((baseStorageUri, relativePath) => {
-  const baseUrl = new URL(baseStorageUri);
-  const normalizedBasePath = baseUrl.pathname.replace(/\/+$/, "");
-  const relativeSegments = relativePath.split("/").filter(Boolean).map((segment) => encodeURIComponent(segment));
-  baseUrl.pathname = `${normalizedBasePath}/${relativeSegments.join("/")}`;
-  return baseUrl.toString();
-}, "createChildStorageUri");
 async function fetchBundleManifest(storageUri, readStorageText, resolveFileUrl, context2) {
   const [storageText, fileUrl] = await Promise.all([
     readStorageText(storageUri, context2),
@@ -8491,10 +8618,11 @@ async function resolveChangedAssets({
       }
       const usesBrotliAsset = BR_COMPRESSED_ASSET_PATH_RE.test(assetPath);
       const downloadPath = usesBrotliAsset ? `${assetPath}.br` : assetPath;
-      const storageUri = createChildStorageUri(
+      const storageUri = resolveManifestAssetStorageUri({
         assetBaseStorageUri,
-        downloadPath
-      );
+        assetPath: downloadPath,
+        fileHash: asset.fileHash
+      });
       const patch = patchDescriptor?.assetPath === assetPath ? patchDescriptor.patch : null;
       let fileUrl = null;
       try {
@@ -8830,10 +8958,26 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
         const baseResponse2 = { ...rest, fileUrl: fileUrl2 };
         return baseResponse2;
       }
+      const requestBundleSeeds = getRequestUpdateBundleSeeds(context2);
+      const requestBundles = createRequestBundleIdentityMap({
+        context: context2,
+        loadBundleById: /* @__PURE__ */ __name((bundleId, requestContext) => getPlugin().getBundleById(bundleId, requestContext), "loadBundleById"),
+        seeds: requestBundleSeeds
+      });
+      const getCurrentBundle = /* @__PURE__ */ __name(() => {
+        if (args.bundleId === NIL_UUID) {
+          return null;
+        }
+        const seededCurrentBundle = requestBundles.peek(args.bundleId);
+        if (seededCurrentBundle || requestBundleSeeds.length > 0) {
+          return seededCurrentBundle;
+        }
+        return requestBundles.get(args.bundleId);
+      }, "getCurrentBundle");
       const [fileUrl, targetBundle, currentBundle] = await Promise.all([
         resolveFileUrl(storageUri ?? null, context2),
-        getPlugin().getBundleById(info3.id, context2),
-        args.bundleId !== NIL_UUID ? getPlugin().getBundleById(args.bundleId, context2) : null
+        requestBundles.get(info3.id),
+        getCurrentBundle()
       ]);
       const baseResponse = { ...rest, fileUrl };
       const manifestArtifacts = await resolveManifestArtifacts({
@@ -8886,6 +9030,36 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
       });
     }
   };
+  Object.defineProperty(api, "diagnostics", {
+    configurable: true,
+    enumerable: true,
+    get() {
+      const diagnostics = getPlugin().diagnostics;
+      if (!diagnostics) {
+        Object.defineProperty(this, "diagnostics", {
+          configurable: true,
+          enumerable: true,
+          value: void 0
+        });
+        return void 0;
+      }
+      const wrappedDiagnostics = {};
+      if (diagnostics.bundleIndex) {
+        wrappedDiagnostics.bundleIndex = {
+          check: /* @__PURE__ */ __name((context2) => getPlugin().diagnostics.bundleIndex.check(context2), "check"),
+          ...diagnostics.bundleIndex.repair ? {
+            repair: /* @__PURE__ */ __name((context2) => getPlugin().diagnostics.bundleIndex.repair(context2), "repair")
+          } : {}
+        };
+      }
+      Object.defineProperty(this, "diagnostics", {
+        configurable: true,
+        enumerable: true,
+        value: wrappedDiagnostics
+      });
+      return wrappedDiagnostics;
+    }
+  });
   return {
     api,
     adapterName: getPlugin().name,
@@ -9022,7 +9196,7 @@ init_performance2();
 // ../../packages/server/package.json
 var package_default = {
   name: "@hot-updater/server",
-  version: "0.31.4",
+  version: "0.33.0",
   type: "module",
   description: "React Native OTA solution for self-hosted",
   sideEffects: false,
@@ -9120,6 +9294,8 @@ var HandlerBadRequestError = class extends Error {
 };
 var SDK_VERSION_HEADER = "Hot-Updater-SDK-Version";
 var EXPLICIT_NO_UPDATE_MIN_SDK_VERSION = "0.31.0";
+var DEFAULT_BUNDLE_LIST_LIMIT = 50;
+var MAX_BUNDLE_LIST_LIMIT = 100;
 var supportsExplicitNoUpdateResponse = /* @__PURE__ */ __name((request) => {
   const sdkVersion = request.headers.get(SDK_VERSION_HEADER)?.trim();
   if (!sdkVersion) {
@@ -9187,6 +9363,19 @@ var parseStringArraySearchParam = /* @__PURE__ */ __name((url, key) => {
   const values = url.searchParams.getAll(key);
   return values.length > 0 ? values : void 0;
 }, "parseStringArraySearchParam");
+var parsePositiveIntegerSearchParam = /* @__PURE__ */ __name((url, key, defaultValue, maxValue) => {
+  const value = url.searchParams.get(key);
+  if (value === null) {
+    return defaultValue;
+  }
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed) || parsed < 1 || parsed > maxValue) {
+    throw new HandlerBadRequestError(
+      `The '${key}' query parameter must be a positive integer between 1 and ${maxValue}.`
+    );
+  }
+  return parsed;
+}, "parsePositiveIntegerSearchParam");
 var requirePlatformParam = /* @__PURE__ */ __name((params) => {
   const platform2 = requireRouteParam(params, "platform");
   if (!isPlatform(platform2)) {
@@ -9271,7 +9460,12 @@ var handleGetBundles = /* @__PURE__ */ __name(async (_params, request, api, cont
   const url = new URL(request.url);
   const channel2 = url.searchParams.get("channel") ?? void 0;
   const platform2 = url.searchParams.get("platform");
-  const limit = Number(url.searchParams.get("limit")) || 50;
+  const limit = parsePositiveIntegerSearchParam(
+    url,
+    "limit",
+    DEFAULT_BUNDLE_LIST_LIMIT,
+    MAX_BUNDLE_LIST_LIMIT
+  );
   const pageParam = url.searchParams.get("page");
   const offset = url.searchParams.get("offset");
   const after = url.searchParams.get("after") ?? void 0;
@@ -9407,14 +9601,13 @@ var routes = {
 };
 function createHandler(api, options = {}) {
   const basePath = options.basePath ?? "/api";
-  const updateCheckEnabled = options.routes?.updateCheck ?? true;
-  const versionEnabled = options.routes?.version ?? true;
-  const bundlesEnabled = options.routes?.bundles ?? true;
+  const routeOptions = {
+    updateCheck: options.routes?.updateCheck ?? true,
+    bundles: options.routes?.bundles ?? false
+  };
   const router = createRouter();
-  if (versionEnabled) {
-    addRoute(router, "GET", "/version", "version");
-  }
-  if (updateCheckEnabled) {
+  addRoute(router, "GET", "/version", "version");
+  if (routeOptions.updateCheck) {
     addRoute(
       router,
       "GET",
@@ -9440,7 +9633,7 @@ function createHandler(api, options = {}) {
       "appVersionUpdateWithCohort"
     );
   }
-  if (bundlesEnabled) {
+  if (routeOptions.bundles) {
     addRoute(router, "GET", "/api/bundles/channels", "getChannels");
     addRoute(router, "GET", "/api/bundles/:id", "getBundle");
     addRoute(router, "GET", "/api/bundles", "getBundles");
@@ -9461,7 +9654,8 @@ function createHandler(api, options = {}) {
           headers: { "Content-Type": "application/json" }
         });
       }
-      const handler = routes[match2.data];
+      const routeName = match2.data;
+      const handler = routes[routeName];
       if (!handler) {
         return new Response(JSON.stringify({ error: "Handler not found" }), {
           status: 500,
@@ -9594,25 +9788,23 @@ function createHotUpdater(options) {
       readStorageText
     } : { readStorageText }
   );
-  const api = {
-    ...core.api,
-    handler: createHandler(core.api, {
-      basePath,
-      routes: options.routes
-    }),
-    adapterName: core.adapterName
-  };
+  const internalHandler = createHandler(core.api, {
+    basePath,
+    routes: options.routes
+  });
   const handler = /* @__PURE__ */ __name((request, context2, ...extraArgs) => {
     if (extraArgs.length > 0) {
-      return api.handler(request);
+      return internalHandler(request);
     }
-    return api.handler(request, context2);
+    return internalHandler(request, context2);
   }, "handler");
-  return {
-    ...api,
+  const api = {
     basePath,
+    adapterName: core.adapterName,
     handler
   };
+  Object.defineProperties(api, Object.getOwnPropertyDescriptors(core.api));
+  return api;
 }
 __name(createHotUpdater, "createHotUpdater");
 
@@ -11816,6 +12008,13 @@ init_performance2();
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_process();
 init_virtual_unenv_global_polyfill_cloudflare_unenv_preset_node_console();
 init_performance2();
+var buildJsonEachInClause = /* @__PURE__ */ __name((columnName, values, params) => {
+  if (values.length === 0) {
+    return "1 = 0";
+  }
+  params.push(JSON.stringify(values));
+  return `${columnName} IN (SELECT value FROM json_each(?))`;
+}, "buildJsonEachInClause");
 function buildWhereClause(conditions) {
   if (!conditions) {
     return { sql: "", params: [] };
@@ -11835,12 +12034,7 @@ function buildWhereClause(conditions) {
     params.push(conditions.enabled ? 1 : 0);
   }
   if (conditions.id?.in) {
-    if (conditions.id.in.length === 0) {
-      clauses.push("1 = 0");
-    } else {
-      clauses.push(`id IN (${conditions.id.in.map(() => "?").join(", ")})`);
-      params.push(...conditions.id.in);
-    }
+    clauses.push(buildJsonEachInClause("id", conditions.id.in, params));
   }
   if (conditions.id?.eq) {
     clauses.push("id = ?");
@@ -11874,14 +12068,13 @@ function buildWhereClause(conditions) {
     }
   }
   if (conditions.targetAppVersionIn) {
-    if (conditions.targetAppVersionIn.length === 0) {
-      clauses.push("1 = 0");
-    } else {
-      clauses.push(
-        `target_app_version IN (${conditions.targetAppVersionIn.map(() => "?").join(", ")})`
-      );
-      params.push(...conditions.targetAppVersionIn);
-    }
+    clauses.push(
+      buildJsonEachInClause(
+        "target_app_version",
+        conditions.targetAppVersionIn,
+        params
+      )
+    );
   }
   if (conditions.fingerprintHash !== void 0) {
     if (conditions.fingerprintHash === null) {
@@ -11998,15 +12191,14 @@ var d1WorkerDatabase = /* @__PURE__ */ __name(() => createDatabasePlugin({
       if (bundleIds.length === 0) {
         return patchMap;
       }
-      const placeholders = bundleIds.map(() => "?").join(", ");
       const rows = await queryAll(
         `
             SELECT *
             FROM bundle_patches
-            WHERE bundle_id IN (${placeholders})
+            WHERE bundle_id IN (SELECT value FROM json_each(?))
             ORDER BY order_index ASC, base_bundle_id ASC
           `,
-        bundleIds,
+        [JSON.stringify(bundleIds)],
         context2
       );
       for (const row of rows) {
@@ -12318,7 +12510,6 @@ var hotUpdater = createHotUpdater({
   basePath: HOT_UPDATER_BASE_PATH,
   routes: {
     updateCheck: true,
-    version: true,
     bundles: false
   }
 });