@hot-updater/server 0.33.0 → 0.33.2

package/src/db/pluginCore.ts

@@ -13,12 +13,11 @@ import {
   type DatabaseBundleQueryOrder,
   type DatabaseBundleQueryWhere,
   type DatabasePlugin,
-  getRequestUpdateBundleSeeds,
+  createRequestUpdateBundleResolver,
   type HotUpdaterContext,
   semverSatisfies,
 } from "@hot-updater/plugin-core";
 
-import { createRequestBundleIdentityMap } from "./requestBundleIdentityMap";
 import { assertBundlePersistenceConstraints } from "./schemaEnhancements";
 import type { DatabaseAPI } from "./types";
 import { resolveManifestArtifacts } from "./updateArtifacts";
@@ -358,28 +357,26 @@ export function createPluginDatabaseCore<TContext = unknown>(
         return baseResponse;
       }
 
-      const requestBundleSeeds = getRequestUpdateBundleSeeds(context);
-      const requestBundles = createRequestBundleIdentityMap({
-        context,
-        loadBundleById: (bundleId, requestContext) =>
-          getPlugin().getBundleById(bundleId, requestContext),
-        seeds: requestBundleSeeds,
-      });
+      const requestBundles = createRequestUpdateBundleResolver(context);
       const getCurrentBundle = () => {
         if (args.bundleId === NIL_UUID) {
           return null;
         }
 
         const seededCurrentBundle = requestBundles.peek(args.bundleId);
-        if (seededCurrentBundle || requestBundleSeeds.length > 0) {
+        if (seededCurrentBundle || requestBundles.hasSeededBundles()) {
           return seededCurrentBundle;
         }
 
-        return requestBundles.get(args.bundleId);
+        return requestBundles.getById(args.bundleId, () =>
+          getPlugin().getBundleById(args.bundleId, context),
+        );
       };
       const [fileUrl, targetBundle, currentBundle] = await Promise.all([
         resolveFileUrl(storageUri ?? null, context),
-        requestBundles.get(info.id),
+        requestBundles.getById(info.id, () =>
+          getPlugin().getBundleById(info.id, context),
+        ),
         getCurrentBundle(),
       ]);
       const baseResponse: AppUpdateAvailableInfo = { ...rest, fileUrl };
@@ -452,45 +449,6 @@ export function createPluginDatabaseCore<TContext = unknown>(
     },
   };
 
-  Object.defineProperty(api, "diagnostics", {
-    configurable: true,
-    enumerable: true,
-    get(this: DatabaseAPI<TContext>) {
-      const diagnostics = getPlugin().diagnostics;
-      if (!diagnostics) {
-        Object.defineProperty(this, "diagnostics", {
-          configurable: true,
-          enumerable: true,
-          value: undefined,
-        });
-        return undefined;
-      }
-
-      const wrappedDiagnostics: NonNullable<
-        DatabaseAPI<TContext>["diagnostics"]
-      > = {};
-      if (diagnostics.bundleIndex) {
-        wrappedDiagnostics.bundleIndex = {
-          check: (context?: HotUpdaterContext<TContext>) =>
-            getPlugin().diagnostics!.bundleIndex!.check(context),
-          ...(diagnostics.bundleIndex.repair
-            ? {
-                repair: (context?: HotUpdaterContext<TContext>) =>
-                  getPlugin().diagnostics!.bundleIndex!.repair!(context),
-              }
-            : {}),
-        };
-      }
-
-      Object.defineProperty(this, "diagnostics", {
-        configurable: true,
-        enumerable: true,
-        value: wrappedDiagnostics,
-      });
-      return wrappedDiagnostics;
-    },
-  });
-
   return {
     api,
     adapterName: getPlugin().name,

package/src/db/types.ts

@@ -5,7 +5,6 @@ import type {
   UpdateInfo,
 } from "@hot-updater/core";
 import type {
-  DatabaseDiagnostics,
   DatabaseBundleQueryOptions,
   DatabasePlugin,
   HotUpdaterContext,
@@ -109,7 +108,6 @@ export interface DatabaseAPI<TContext = unknown> {
     bundleId: string,
     context?: HotUpdaterContext<TContext>,
   ): Promise<void>;
-  diagnostics?: DatabaseDiagnostics<TContext>;
 }
 
 export type StoragePluginFactory<TContext = unknown> =

package/src/runtime.spec.ts

@@ -733,16 +733,12 @@ describe("runtime createHotUpdater", () => {
       factory,
     })({});
 
-    const hotUpdater = createHotUpdater({
+    createHotUpdater({
       database,
       basePath: "/api/check-update",
     });
 
     expect(factory).not.toHaveBeenCalled();
-    expect(hotUpdater.diagnostics).toBeUndefined();
-    expect(factory).not.toHaveBeenCalled();
-    expect(hotUpdater.diagnostics).toBeUndefined();
-    expect(factory).not.toHaveBeenCalled();
   });
 
   it("clears pending plugin changes after a failed mutation commit", async () => {

package/dist/db/requestBundleIdentityMap.cjs

@@ -1,29 +0,0 @@
-//#region src/db/requestBundleIdentityMap.ts
-const createRequestBundleIdentityMap = ({ context, 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 = async (bundleId) => {
-		const cachedBundle = bundles.get(bundleId);
-		if (cachedBundle) return cachedBundle;
-		const pendingBundle = pendingBundles.get(bundleId);
-		if (pendingBundle) return pendingBundle;
-		const lookup = loadBundleById(bundleId, context).then((bundle) => {
-			pendingBundles.delete(bundleId);
-			if (bundle) bundles.set(bundle.id, bundle);
-			return bundle;
-		}, (error) => {
-			pendingBundles.delete(bundleId);
-			throw error;
-		});
-		pendingBundles.set(bundleId, lookup);
-		return lookup;
-	};
-	const peek = (bundleId) => bundles.get(bundleId) ?? null;
-	return {
-		get,
-		peek
-	};
-};
-//#endregion
-exports.createRequestBundleIdentityMap = createRequestBundleIdentityMap;

package/dist/db/requestBundleIdentityMap.mjs

@@ -1,29 +0,0 @@
-//#region src/db/requestBundleIdentityMap.ts
-const createRequestBundleIdentityMap = ({ context, 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 = async (bundleId) => {
-		const cachedBundle = bundles.get(bundleId);
-		if (cachedBundle) return cachedBundle;
-		const pendingBundle = pendingBundles.get(bundleId);
-		if (pendingBundle) return pendingBundle;
-		const lookup = loadBundleById(bundleId, context).then((bundle) => {
-			pendingBundles.delete(bundleId);
-			if (bundle) bundles.set(bundle.id, bundle);
-			return bundle;
-		}, (error) => {
-			pendingBundles.delete(bundleId);
-			throw error;
-		});
-		pendingBundles.set(bundleId, lookup);
-		return lookup;
-	};
-	const peek = (bundleId) => bundles.get(bundleId) ?? null;
-	return {
-		get,
-		peek
-	};
-};
-//#endregion
-export { createRequestBundleIdentityMap };

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/table.utils.cjs

@@ -1,4 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/table.utils.js
-const TableName = Symbol.for("drizzle:Name");
-//#endregion
-exports.TableName = TableName;

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/table.utils.mjs

@@ -1,4 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/table.utils.js
-const TableName = Symbol.for("drizzle:Name");
-//#endregion
-export { TableName };

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/tracing.cjs

@@ -1,6 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/tracing.js
-const tracer = { startActiveSpan(name, fn) {
-	return fn();
-} };
-//#endregion
-exports.tracer = tracer;

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/tracing.mjs

@@ -1,6 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/tracing.js
-const tracer = { startActiveSpan(name, fn) {
-	return fn();
-} };
-//#endregion
-export { tracer };

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/view-common.cjs

@@ -1,4 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/view-common.js
-const ViewBaseConfig = Symbol.for("drizzle:ViewBaseConfig");
-//#endregion
-exports.ViewBaseConfig = ViewBaseConfig;

package/dist/node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare_workers-types@4.20260313.1_@electric-sql_pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/view-common.mjs

@@ -1,4 +0,0 @@
-//#region ../../node_modules/.pnpm/drizzle-orm@0.44.7_@cloudflare+workers-types@4.20260313.1_@electric-sql+pglite@0.2.17_@_31f44b782f9321d71f3ce9d35aa1edf7/node_modules/drizzle-orm/view-common.js
-const ViewBaseConfig = Symbol.for("drizzle:ViewBaseConfig");
-//#endregion
-export { ViewBaseConfig };

package/src/db/requestBundleIdentityMap.spec.ts

@@ -1,56 +0,0 @@
-import type { Bundle } from "@hot-updater/core";
-import { describe, expect, it, vi } from "vitest";
-
-import { createRequestBundleIdentityMap } from "./requestBundleIdentityMap";
-
-const baseBundle: Bundle = {
-  channel: "production",
-  enabled: true,
-  fileHash: "file-hash",
-  fingerprintHash: null,
-  gitCommitHash: null,
-  id: "00000000-0000-0000-0000-000000000001",
-  message: "bundle",
-  platform: "ios",
-  shouldForceUpdate: false,
-  storageUri: "s3://bucket/bundle.zip",
-  targetAppVersion: "1.0.0",
-};
-
-describe("createRequestBundleIdentityMap", () => {
-  it("returns seeded bundles without loading them again", async () => {
-    const loadBundleById = vi.fn(async () => null);
-    const identityMap = createRequestBundleIdentityMap({
-      loadBundleById,
-      seeds: [baseBundle],
-    });
-
-    await expect(identityMap.get(baseBundle.id)).resolves.toBe(baseBundle);
-    expect(loadBundleById).not.toHaveBeenCalled();
-  });
-
-  it("shares one fallback lookup for repeated bundle reads", async () => {
-    const loadedBundle: Bundle = {
-      ...baseBundle,
-      id: "00000000-0000-0000-0000-000000000002",
-      message: "loaded",
-    };
-    const loadBundleById = vi.fn(async () => loadedBundle);
-    const identityMap = createRequestBundleIdentityMap({
-      loadBundleById,
-      seeds: [],
-    });
-
-    const [first, second] = await Promise.all([
-      identityMap.get(loadedBundle.id),
-      identityMap.get(loadedBundle.id),
-    ]);
-    const third = await identityMap.get(loadedBundle.id);
-
-    expect(first).toBe(loadedBundle);
-    expect(second).toBe(loadedBundle);
-    expect(third).toBe(loadedBundle);
-    expect(loadBundleById).toHaveBeenCalledTimes(1);
-    expect(loadBundleById).toHaveBeenCalledWith(loadedBundle.id, undefined);
-  });
-});

package/src/db/requestBundleIdentityMap.ts

@@ -1,61 +0,0 @@
-import type { Bundle } from "@hot-updater/core";
-import type { HotUpdaterContext } from "@hot-updater/plugin-core";
-
-type LoadBundleById<TContext> = (
-  bundleId: string,
-  context?: HotUpdaterContext<TContext>,
-) => Promise<Bundle | null>;
-
-type RequestBundleIdentityMapOptions<TContext> = {
-  readonly context?: HotUpdaterContext<TContext>;
-  readonly loadBundleById: LoadBundleById<TContext>;
-  readonly seeds: readonly (Bundle | null | undefined)[];
-};
-
-export const createRequestBundleIdentityMap = <TContext = unknown>({
-  context,
-  loadBundleById,
-  seeds,
-}: RequestBundleIdentityMapOptions<TContext>) => {
-  const bundles = new Map<string, Bundle>();
-  const pendingBundles = new Map<string, Promise<Bundle | null>>();
-
-  for (const seed of seeds) {
-    if (seed) {
-      bundles.set(seed.id, seed);
-    }
-  }
-
-  const get = async (bundleId: string): Promise<Bundle | null> => {
-    const cachedBundle = bundles.get(bundleId);
-    if (cachedBundle) {
-      return cachedBundle;
-    }
-
-    const pendingBundle = pendingBundles.get(bundleId);
-    if (pendingBundle) {
-      return pendingBundle;
-    }
-
-    const lookup = loadBundleById(bundleId, context).then(
-      (bundle) => {
-        pendingBundles.delete(bundleId);
-        if (bundle) {
-          bundles.set(bundle.id, bundle);
-        }
-        return bundle;
-      },
-      (error: unknown) => {
-        pendingBundles.delete(bundleId);
-        throw error;
-      },
-    );
-    pendingBundles.set(bundleId, lookup);
-    return lookup;
-  };
-
-  const peek = (bundleId: string): Bundle | null =>
-    bundles.get(bundleId) ?? null;
-
-  return { get, peek };
-};