@hot-updater/test-utils 1.0.0-rc.42 → 1.0.0-rc.44

package/README.md

@@ -37,12 +37,10 @@ Connect your database's lifecycle and the real server:
 
 ```ts
 import { createHotUpdater } from "@hot-updater/server";
-import {
-  createInsightsModel,
-  insights,
-} from "@hot-updater/server/plugins/insights";
+import { createInsightsModel, insights } from "@hot-updater/server/plugins";
 
 import {
+  createReleaseCatalogTestStorage,
   insightsTestSuite,
   setupDatabaseTestSuite,
   startHttpTestServer,
@@ -77,6 +75,7 @@ setupDatabaseTestSuite({
         createInsightsModel(
           createHotUpdater({
             database,
+            storage: createReleaseCatalogTestStorage(),
             plugins: [insights()],
             clientAccess: "public",
           }).api.insights,

package/dist/index.d.mts

@@ -128,7 +128,7 @@ type DatabaseTestSuiteOptions<TDatabase extends EngineDatabase = EngineDatabase>
    */
   readonly createHttpClient: (options: {
     readonly database: TDatabase;
-    readonly storage: readonly StorageAdapter[];
+    readonly storage: StorageAdapter;
   }) => HttpTestServer | Promise<HttpTestServer>;
   /** The suites of the server plugins the provider opts in to test. */
   readonly plugins?: readonly DatabasePluginTestSuite<TDatabase>[];
@@ -464,8 +464,9 @@ declare const setupInsightsHttpTestSuite: (options: {
 //#region src/insights/setupInsightsModelTestSuite.d.ts
 /**
  * The Insights report contract on one database: pass the Insights plugin's
- * model over it, `createInsightsModel(createHotUpdater({ database, plugins:
- * [insights()], clientAccess: "public" }).api.insights)`, as `createDatabase`.
+ * model over it, `createInsightsModel(createHotUpdater({ database, storage,
+ * plugins: [insights()], clientAccess: "public" }).api.insights)`, as
+ * `createDatabase`.
  */
 declare const setupInsightsModelTestSuite: (lifecycle: DatabaseTestLifecycle<InsightsModel>) => void;
 //#endregion
@@ -474,8 +475,8 @@ declare const setupInsightsModelTestSuite: (lifecycle: DatabaseTestLifecycle<Ins
  * The Insights plugin's tests, for `setupDatabaseTestSuite`'s `plugins`: its
  * HTTP routes on the provider's server, which must run `insights()`, and
  * with `createModel` its report contract on the provider's database, such as
- * `(database) => createInsightsModel(createHotUpdater({ database, plugins:
- * [insights()], clientAccess: "public" }).api.insights)`.
+ * `(database) => createInsightsModel(createHotUpdater({ database, storage,
+ * plugins: [insights()], clientAccess: "public" }).api.insights)`.
  */
 declare const insightsTestSuite: <TDatabase = EngineDatabase>(options?: {
   readonly createModel?: (database: TDatabase) => InsightsModel;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { NIL_UUID, createReleaseCatalogScopeKey, encodeChannelKey, selectDesiredRelease } from "@hot-updater/protocol";
-import { DATABASE_VERSION_COLUMN, DatabaseAdapterContractError, SETTINGS_TABLE, addDistinct, aggregateBatchingTables, assertStorageOperations, bundleToPatchRows, bundleToRow, compareUtf8, coreSchema, countDistinct, createBundleStorageKey, createEngine, createMemoryAdapter, createStorageKeyBuilder, createStorageRootUriWithPath, createStorageUri, createStorageUriWithRelativePath, findPhysicalIndex, getBundleArchiveStorageUri, getContentAddressedAssetStoragePath, indexOrderColumns, meterReads, parseStorageDownloadPath, parseStorageUri, targetBaseCandidateKey, toolingTargetOf, verifyAdapter } from "@hot-updater/plugin-core";
+import { DATABASE_VERSION_COLUMN, DatabaseAdapterContractError, SETTINGS_TABLE, addDistinct, aggregateBatchingTables, assertStorageOperations, bundleToPatchRows, bundleToRow, compareUtf8, coreSchema, countDistinct, createBundleStorageKey, createEngine, createMemoryAdapter, createStorageKeyBuilder, createStorageRootUriWithPath, createStorageUri, createStorageUriWithRelativePath, findPhysicalIndex, getBundleArchiveStorageUri, getContentAddressedAssetStoragePath, indexOrderColumns, meterReads, parseStorageUri, targetBaseCandidateKey, toolingTargetOf, verifyAdapter } from "@hot-updater/plugin-core";
 import { createServer } from "node:http";
 //#region src/adminApiTestClient.ts
 const jsonRequest = (method, body) => ({
@@ -883,6 +883,7 @@ const setupReleaseCatalogTestSuite = (options) => {
 				expect(response.status).toBe(200);
 				expect(response.headers.get("content-type")).toBe("application/vnd.hot-updater.release-catalog+json; version=1");
 				expect(response.headers.get("cache-control")).toBe("public, max-age=0, s-maxage=5");
+				expect(response.headers.get("cdn-cache-control")).toBe("public, max-age=5, stale-while-revalidate=5, stale-if-error=0");
 				const catalog = await response.json();
 				expect(catalog).toMatchObject({
 					schemaVersion: 1,
@@ -1034,6 +1035,7 @@ const setupReleaseCatalogTestSuite = (options) => {
 				const response = await request(catalogPath());
 				expect(response.status).toBe(404);
 				expect(response.headers.get("cache-control")).toBe("public, max-age=0, s-maxage=5");
+				expect(response.headers.get("cdn-cache-control")).toBe("public, max-age=5, stale-while-revalidate=5, stale-if-error=0");
 				expect(response.headers.get("x-hot-updater-catalog")).toBe("none");
 				await publish("121");
 				expect((await readCatalog()).releases).toHaveLength(1);
@@ -1355,7 +1357,7 @@ const setupDatabaseTestSuite = (options) => {
 		beforeEach(async () => {
 			client = await options.createHttpClient({
 				database: getDatabase(),
-				storage: [createReleaseCatalogTestStorage()]
+				storage: createReleaseCatalogTestStorage()
 			});
 		});
 		afterEach(async () => {
@@ -2467,7 +2469,7 @@ const storageCase = (title, operations, run) => ({
 /**
 * The storage adapter contract, from what its consumers rely on: deploy and
 * patch (`put`, `get`, `exists`, `delete`), the Console, the server's update
-* responses and signed downloads (`get`, `getDownloadUrl`), and
+* responses and the URLs devices download from (`get`, `getDownloadUrl`), and
 * `storage prune` (`listObjects`, `deleteObjects`).
 */
 const storageAdapterTestCases = [
@@ -2637,17 +2639,13 @@ const storageAdapterTestCases = [
 			const { url } = await storage.getDownloadUrl({ storageUri });
 			const label = `getDownloadUrl("${storageUri}") returned "${url}"`;
 			expect(typeof url, label).toBe("string");
-			if (/^[a-z][a-z\d+.-]*:/i.test(url)) {
-				expect(["http:", "https:"], `${label}; a URL must use http(s)`).toContain(new URL(url).protocol);
-				if (fetchDownloadUrls) {
-					const response = await fetch(url);
-					expect(response.status, `${label}, which answered`).toBe(200);
-					expectBytes(new Uint8Array(await response.arrayBuffer()), bytes, `${label}, whose download`);
-				}
-				continue;
+			expect(/^https?:\/\//i.test(url), `${label}; a download URL must be an absolute http(s) URL`).toBe(true);
+			expect(() => new URL(url), label).not.toThrow();
+			if (fetchDownloadUrls) {
+				const response = await fetch(url);
+				expect(response.status, `${label}, which answered`).toBe(200);
+				expectBytes(new Uint8Array(await response.arrayBuffer()), bytes, `${label}, whose download`);
 			}
-			expect(parseStorageDownloadPath(url)?.storageUri, `${label}; a path must be the /storage/ path of the same URI`).toBe(storageUri);
-			expect((await storage.getDownloadUrl({ storageUri })).url, `${label}, then another path`).toBe(url);
 		}
 	}),
 	storageCase("lists every object with its key relative to the base path", ["listObjects"], async ({ storage, basePath }) => {
@@ -2784,7 +2782,10 @@ const createMeasuredDatabase = async (adapter, plugins, options = {}) => {
 	});
 	const hotUpdater = createHotUpdater({
 		database,
-		storage: options.storage === void 0 ? [] : [storageOf(options.storage)],
+		storage: options.storage === void 0 ? {
+			name: "measuredStorage",
+			protocol: "none"
+		} : storageOf(options.storage),
 		plugins: observed,
 		...plugins.some((plugin) => plugin.provides?.clientAuth === true) ? {} : { clientAccess: "public" }
 	});
@@ -3479,11 +3480,7 @@ const setupReadBudgetTestSuite = (options) => {
 		let seeded;
 		let writes = 0;
 		beforeAll(async () => {
-			const [{ insights }, { apiKeys }, { remoteConfig }] = await Promise.all([
-				import("@hot-updater/server/plugins/insights"),
-				import("@hot-updater/server/plugins/api-keys"),
-				import("@hot-updater/server/plugins/remote-config")
-			]);
+			const { insights, apiKeys, remoteConfig } = await import("@hot-updater/server/plugins");
 			const plugins = [
 				insights(),
 				apiKeys(),
@@ -5204,8 +5201,9 @@ const setupInsightsHttpTestSuite = (options) => {
 //#region src/insights/setupInsightsModelTestSuite.ts
 /**
 * The Insights report contract on one database: pass the Insights plugin's
-* model over it, `createInsightsModel(createHotUpdater({ database, plugins:
-* [insights()], clientAccess: "public" }).api.insights)`, as `createDatabase`.
+* model over it, `createInsightsModel(createHotUpdater({ database, storage,
+* plugins: [insights()], clientAccess: "public" }).api.insights)`, as
+* `createDatabase`.
 */
 const setupInsightsModelTestSuite = (lifecycle) => {
 	describe(lifecycle.name, () => {
@@ -5234,8 +5232,8 @@ const setupInsightsModelTestSuite = (lifecycle) => {
 * The Insights plugin's tests, for `setupDatabaseTestSuite`'s `plugins`: its
 * HTTP routes on the provider's server, which must run `insights()`, and
 * with `createModel` its report contract on the provider's database, such as
-* `(database) => createInsightsModel(createHotUpdater({ database, plugins:
-* [insights()], clientAccess: "public" }).api.insights)`.
+* `(database) => createInsightsModel(createHotUpdater({ database, storage,
+* plugins: [insights()], clientAccess: "public" }).api.insights)`.
 */
 const insightsTestSuite = (options = {}) => ({
 	name: "Insights plugin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/test-utils",
-  "version": "1.0.0-rc.42",
+  "version": "1.0.0-rc.44",
   "type": "module",
   "description": "Test utilities for Hot Updater packages",
   "sideEffects": false,
@@ -50,10 +50,10 @@
     "mysql2": "*",
     "pg": "*",
     "vitest": "^4.0.0",
-    "@hot-updater/plugin-insights": "^1.0.0-rc.42",
-    "@hot-updater/protocol": "^1.0.0-rc.42",
-    "@hot-updater/plugin-core": "^1.0.0-rc.42",
-    "@hot-updater/server": "^1.0.0-rc.42"
+    "@hot-updater/plugin-core": "^1.0.0-rc.44",
+    "@hot-updater/protocol": "^1.0.0-rc.44",
+    "@hot-updater/server": "^1.0.0-rc.44",
+    "@hot-updater/plugin-insights": "^1.0.0-rc.44"
   },
   "peerDependenciesMeta": {
     "@electric-sql/pglite": {
@@ -83,11 +83,11 @@
     "typescript": "npm:@typescript/typescript6@6.0.2",
     "vitest": "4.1.4",
     "workspace-tools": "^0.41.7",
-    "@hot-updater/plugin-insights": "1.0.0-rc.42",
-    "@hot-updater/protocol": "1.0.0-rc.42",
-    "@hot-updater/js": "1.0.0-rc.42",
-    "@hot-updater/server": "1.0.0-rc.42",
-    "@hot-updater/plugin-core": "1.0.0-rc.42"
+    "@hot-updater/plugin-insights": "1.0.0-rc.44",
+    "@hot-updater/protocol": "1.0.0-rc.44",
+    "@hot-updater/js": "1.0.0-rc.44",
+    "@hot-updater/server": "1.0.0-rc.44",
+    "@hot-updater/plugin-core": "1.0.0-rc.44"
   },
   "inlinedDependencies": {
     "@nodelib/fs.scandir": "2.1.5",