@hot-updater/aws 1.0.0-rc.34 → 1.0.0-rc.36

package/dist/index.d.cts

@@ -101,6 +101,8 @@ type DatabaseBundleEventMetadata = DatabaseJsonObject & {
   readonly update_strategy: "fingerprint" | "appVersion" | null;
   readonly fingerprint_hash: string | null;
   readonly sdk_version: string | null;
+  /** The native build's built-in bundle ID, when the SDK reports it. */
+  readonly min_bundle_id?: string;
   /** `UPDATE_FAILED`: what failed. */
   readonly failure?: BundleEventFailure;
   readonly http_response?: DatabaseHttpResponse;
@@ -276,7 +278,10 @@ interface InsightsGetAppUsageResult {
   readonly bundleDistribution: readonly {
     readonly appVersion: string;
     readonly platform: "ios" | "android";
+    /** The release the installations run; null for none. */
     readonly releaseId: string | null;
+    /** The native build's built-in bundle, when they run it. */
+    readonly builtinBundleId: string | null;
     readonly installations: number;
   }[];
   readonly measuredAtMs: number;
@@ -607,6 +612,38 @@ declare const plugins: readonly [import("@hot-updater/plugin-core").HotUpdaterPl
       readonly sort: readonly ["bucket_start_ms"];
     };
   }, never, readonly ["channel", "platform", "app_version", "release_id", "bucket_start_ms"]>;
+  readonly insights_builtin_distribution: import("@hot-updater/plugin-core").AggregateDefinition<{
+    readonly channel: {
+      readonly type: "string";
+    };
+    readonly platform: {
+      readonly type: "string";
+      readonly maxLength: 16;
+    };
+    readonly app_version: {
+      readonly type: "string";
+    };
+    readonly release_id: {
+      readonly type: "string";
+      readonly maxLength: 36;
+    };
+    readonly builtin_bundle_id: {
+      readonly type: "string";
+      readonly maxLength: 36;
+    };
+    readonly bucket_start_ms: {
+      readonly type: "integer";
+    };
+  }, "latest_installations", {
+    readonly byScope: {
+      readonly eq: readonly ["channel", "platform"];
+      readonly sort: readonly ["bucket_start_ms"];
+    };
+    readonly byVersion: {
+      readonly eq: readonly ["channel", "platform", "app_version"];
+      readonly sort: readonly ["bucket_start_ms"];
+    };
+  }, never, readonly ["channel", "platform", "app_version", "release_id", "builtin_bundle_id", "bucket_start_ms"]>;
   readonly insights_latest_by_bundle: import("@hot-updater/plugin-core").AggregateDefinition<{
     readonly platform: {
       readonly type: "string";

package/dist/index.d.mts

@@ -101,6 +101,8 @@ type DatabaseBundleEventMetadata = DatabaseJsonObject & {
   readonly update_strategy: "fingerprint" | "appVersion" | null;
   readonly fingerprint_hash: string | null;
   readonly sdk_version: string | null;
+  /** The native build's built-in bundle ID, when the SDK reports it. */
+  readonly min_bundle_id?: string;
   /** `UPDATE_FAILED`: what failed. */
   readonly failure?: BundleEventFailure;
   readonly http_response?: DatabaseHttpResponse;
@@ -276,7 +278,10 @@ interface InsightsGetAppUsageResult {
   readonly bundleDistribution: readonly {
     readonly appVersion: string;
     readonly platform: "ios" | "android";
+    /** The release the installations run; null for none. */
     readonly releaseId: string | null;
+    /** The native build's built-in bundle, when they run it. */
+    readonly builtinBundleId: string | null;
     readonly installations: number;
   }[];
   readonly measuredAtMs: number;
@@ -607,6 +612,38 @@ declare const plugins: readonly [import("@hot-updater/plugin-core").HotUpdaterPl
       readonly sort: readonly ["bucket_start_ms"];
     };
   }, never, readonly ["channel", "platform", "app_version", "release_id", "bucket_start_ms"]>;
+  readonly insights_builtin_distribution: import("@hot-updater/plugin-core").AggregateDefinition<{
+    readonly channel: {
+      readonly type: "string";
+    };
+    readonly platform: {
+      readonly type: "string";
+      readonly maxLength: 16;
+    };
+    readonly app_version: {
+      readonly type: "string";
+    };
+    readonly release_id: {
+      readonly type: "string";
+      readonly maxLength: 36;
+    };
+    readonly builtin_bundle_id: {
+      readonly type: "string";
+      readonly maxLength: 36;
+    };
+    readonly bucket_start_ms: {
+      readonly type: "integer";
+    };
+  }, "latest_installations", {
+    readonly byScope: {
+      readonly eq: readonly ["channel", "platform"];
+      readonly sort: readonly ["bucket_start_ms"];
+    };
+    readonly byVersion: {
+      readonly eq: readonly ["channel", "platform", "app_version"];
+      readonly sort: readonly ["bucket_start_ms"];
+    };
+  }, never, readonly ["channel", "platform", "app_version", "release_id", "builtin_bundle_id", "bucket_start_ms"]>;
   readonly insights_latest_by_bundle: import("@hot-updater/plugin-core").AggregateDefinition<{
     readonly platform: {
       readonly type: "string";

package/dist/lambda/index.cjs

@@ -4570,7 +4570,7 @@ const createKvAdapter = ({ store, tablePrefix = "" }) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.0.0-rc.34";
+const HOT_UPDATER_SERVER_VERSION = "1.0.0-rc.36";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 /**
@@ -9793,8 +9793,19 @@ const isString = (value) => typeof value === "string";
 const isDatabaseHttpResponse = (value) => isDatabaseJsonObject(value) && (value.resource === "catalog" || value.resource === "artifact") && isString(value.path) && Number.isSafeInteger(value.status) && (value.body === null || isString(value.body)) && typeof value.body_truncated === "boolean" && Number.isSafeInteger(value.received_at_ms);
 /** An `UPDATE_FAILED` report's stored failure: a stage and a reason, and what else the client knew. */
 const isDatabaseBundleEventFailure = (value) => isDatabaseJsonObject(value) && isString(value.stage) && isString(value.reason) && isOptional(value, "resource", isString) && isOptional(value, "http_status", (status) => Number.isSafeInteger(status)) && isOptional(value, "transport", isString) && isOptional(value, "origin_code", isString) && isOptional(value, "error_message", isString) && isOptional(value, "error_stack", isString);
-const isDatabaseBundleEventMetadata = (value) => isDatabaseJsonObject(value) && typeof value.cohort === "string" && (value.update_strategy === null || value.update_strategy === "fingerprint" || value.update_strategy === "appVersion") && (value.fingerprint_hash === null || typeof value.fingerprint_hash === "string") && (value.sdk_version === null || typeof value.sdk_version === "string") && isOptional(value, "failure", isDatabaseBundleEventFailure) && isOptional(value, "http_response", isDatabaseHttpResponse) && isOptional(value, "delivery", isString) && isOptional(value, "patch_fallback", (flag) => typeof flag === "boolean");
+const isDatabaseBundleEventMetadata = (value) => isDatabaseJsonObject(value) && typeof value.cohort === "string" && (value.update_strategy === null || value.update_strategy === "fingerprint" || value.update_strategy === "appVersion") && (value.fingerprint_hash === null || typeof value.fingerprint_hash === "string") && (value.sdk_version === null || typeof value.sdk_version === "string") && isOptional(value, "min_bundle_id", isString) && isOptional(value, "failure", isDatabaseBundleEventFailure) && isOptional(value, "http_response", isDatabaseHttpResponse) && isOptional(value, "delivery", isString) && isOptional(value, "patch_fallback", (flag) => typeof flag === "boolean");
 const isRecord$2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+/**
+* The built-in bundle a report says its installation runs: the running
+* bundle, which a download leaves at its source, when it is the native
+* build's built-in bundle, whatever Release selected it. Null for any other
+* bundle, and for a report without the build's built-in bundle ID.
+*/
+const runningBuiltinBundleId = (row) => {
+	const running = row.type === "UPDATE_DOWNLOADED" ? row.from_bundle_id : row.to_bundle_id;
+	const builtin = isRecord$2(row.metadata) ? row.metadata.min_bundle_id : null;
+	return typeof builtin === "string" && running === builtin ? builtin : null;
+};
 const isIdentity$1 = (value) => typeof value === "string" && value.length > 0 && value.length <= 255;
 const isTextOrNull = (value) => value === null || typeof value === "string";
 /** Each bundle event field and what it holds. */
@@ -10095,6 +10106,11 @@ function readEventId(payload) {
 	if (!isUUIDv7(value)) throw new InsightsBadRequestError("Invalid event field: eventId");
 	return value;
 }
+/**
+* The native build's built-in bundle ID: a bundle ID's length at most, and
+* left out when it is missing or malformed, so the report still records.
+*/
+const readMinBundleId = (value) => typeof value === "string" && value.length > 0 && value.length <= 36 ? value : null;
 /** One value of an open set: any other value reads as `unknown`. */
 const oneOf = (values, value) => values.includes(value) ? value : "unknown";
 const STAGES = [
@@ -10220,6 +10236,7 @@ function requireEvent(payload) {
 		cohort: requireStringField(payload, "cohort"),
 		fingerprintHash: requireNullableStringField(payload, "fingerprintHash"),
 		sdkVersion: payload.sdkVersion === void 0 ? null : requireNullableStringField(payload, "sdkVersion"),
+		minBundleId: readMinBundleId(payload.minBundleId),
 		fromReleaseId: requireNullableStringField(payload, "fromReleaseId"),
 		toReleaseId: requireNullableStringField(payload, "toReleaseId")
 	};
@@ -10301,6 +10318,7 @@ function createBundleEventRow(input) {
 		cohort: input.cohort,
 		fingerprint_hash: input.fingerprintHash,
 		sdk_version: input.sdkVersion ?? null,
+		...input.minBundleId ? { min_bundle_id: input.minBundleId } : {},
 		update_strategy: input.updateStrategy
 	};
 	switch (input.type) {
@@ -10523,6 +10541,7 @@ const eventDetails = ({ type, metadata }) => ({
 const toEventHistoryRow = (row) => ({
 	...row.to_release_id == null ? {} : { toReleaseId: row.to_release_id },
 	...row.metadata.sdk_version == null ? {} : { sdkVersion: row.metadata.sdk_version },
+	...row.metadata.min_bundle_id === void 0 ? {} : { minBundleId: row.metadata.min_bundle_id },
 	appVersion: row.app_version,
 	channel: row.channel,
 	cohort: row.metadata.cohort,
@@ -10538,6 +10557,7 @@ const toEventHistoryRow = (row) => ({
 });
 const toInstallationRow = (row) => ({
 	...eventDetails(row).httpResponse ? { httpResponse: eventDetails(row).httpResponse } : {},
+	...row.metadata.min_bundle_id === void 0 ? {} : { minBundleId: row.metadata.min_bundle_id },
 	appVersion: row.app_version,
 	channel: row.channel,
 	cohort: row.metadata.cohort,
@@ -11089,6 +11109,55 @@ const insightsDistribution = (retention) => defineAggregate({
 	},
 	retention
 });
+/**
+* The installations of `insights_distribution` that run their native build's
+* built-in bundle, by its ID (`builtin_bundle_id`), within the same rows:
+* reads move them out of the row of their release, or of no release.
+*/
+const insightsBuiltinDistribution = (retention) => defineAggregate({
+	channel: { type: "string" },
+	platform: {
+		type: "string",
+		maxLength: 16
+	},
+	app_version: { type: "string" },
+	release_id: {
+		type: "string",
+		maxLength: 36
+	},
+	builtin_bundle_id: {
+		type: "string",
+		maxLength: 36
+	},
+	bucket_start_ms: { type: "integer" }
+}, {
+	key: [
+		"channel",
+		"platform",
+		"app_version",
+		"release_id",
+		"builtin_bundle_id",
+		"bucket_start_ms"
+	],
+	gauges: ["latest_installations"],
+	shards: GAUGE_SHARDS,
+	batched: true,
+	indexes: {
+		byScope: {
+			eq: ["channel", "platform"],
+			sort: ["bucket_start_ms"]
+		},
+		byVersion: {
+			eq: [
+				"channel",
+				"platform",
+				"app_version"
+			],
+			sort: ["bucket_start_ms"]
+		}
+	},
+	retention
+});
 /** Latest events by the bundle they came from or went to, bucketed like the distribution. */
 const insightsLatestByBundle = (retention) => defineAggregate({
 	platform: {
@@ -11208,6 +11277,7 @@ const createInsightsSchema = ({ rawDays, dailyDays } = DEFAULT_INSIGHTS_RETENTIO
 		insights_overview_lifetime: lifetimeCounters(),
 		insights_sketches_lifetime: lifetimeSketches(),
 		insights_distribution: insightsDistribution(daily),
+		insights_builtin_distribution: insightsBuiltinDistribution(daily),
 		insights_latest_by_bundle: insightsLatestByBundle(daily),
 		insights_outcomes: insightsOutcomes(hourly),
 		insights_failures: insightsFailures(hourly)
@@ -11326,13 +11396,16 @@ const insightsIdentity = (identity) => insightsOverviewId({
 	bucketStartMs: 0
 });
 /**
-* The bucket a head's gauges count it in, the UTC day of its event, and the
-* release its distribution row names: the one it runs, which a download
-* leaves at its source.
+* The bucket a head's gauges count it in, the UTC day of its event, and what
+* its distribution row names: the release it runs, which a download leaves
+* at its source, and the built-in bundle, when it runs the native build's.
+* A head stored without the built-in bundle ID counts in no built-in row, so
+* taking it back moves none.
 */
 const gaugeSlot = (head) => ({
 	bucket: dayOf(head.received_at_ms),
-	releaseId: head.type === "UPDATE_DOWNLOADED" ? head.from_release_id : head.to_release_id
+	releaseId: head.type === "UPDATE_DOWNLOADED" ? head.from_release_id : head.to_release_id,
+	builtinBundleId: runningBuiltinBundleId(head)
 });
 /**
 * The `insights_latest_by_bundle` field of a head's (from, to) pair. A head
@@ -11343,11 +11416,12 @@ const PAIR_FIELD = "from_to";
 /** The pair gauge's `bundle_id`: a hash of the two bundle ids, which fit no single 36-character column. */
 const bundlePairKey = (from, to) => insightsKey(`${from.length}:${from}${to.length}:${to}`);
 /**
-* Moves a head's gauges: the distribution row, one row per bundle it
-* references, and its pair; -1 takes back the head an event replaces.
+* Moves a head's gauges: the distribution row, and the built-in one when it
+* runs its build's built-in bundle, one row per bundle it references, and
+* its pair; -1 takes back the head an event replaces.
 */
 const countHead = (tx, head, delta) => {
-	const { bucket, releaseId } = gaugeSlot(head);
+	const { bucket, releaseId, builtinBundleId } = gaugeSlot(head);
 	const shardBy = head.install_id;
 	tx.aggregate("insights_distribution", {
 		channel: head.channel,
@@ -11356,6 +11430,14 @@ const countHead = (tx, head, delta) => {
 		release_id: releaseId ?? "",
 		bucket_start_ms: bucket
 	}, { latest_installations: delta }, { shardBy });
+	if (builtinBundleId !== null) tx.aggregate("insights_builtin_distribution", {
+		channel: head.channel,
+		platform: head.platform,
+		app_version: head.app_version,
+		release_id: releaseId ?? "",
+		builtin_bundle_id: builtinBundleId,
+		bucket_start_ms: bucket
+	}, { latest_installations: delta }, { shardBy });
 	for (const field of ["from_bundle_id", "to_bundle_id"]) {
 		const bundleId = head[field];
 		if (bundleId === null) continue;
@@ -12011,26 +12093,49 @@ const getAppUsage = async (db, input, now, retention) => {
 		lt: timeRange.end
 	};
 	const distribution = [];
-	for (const platform of reported) distribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_distribution", {
-		index: "byScope",
-		where: {
-			channel: input.channel,
-			platform
-		},
-		range,
-		limit: PAGE,
-		...page
-	}) : db.findAggregates("insights_distribution", {
-		index: "byVersion",
-		where: {
-			channel: input.channel,
-			platform,
-			app_version: input.appVersion
-		},
-		range,
-		limit: PAGE,
-		...page
-	})));
+	const builtinDistribution = [];
+	for (const platform of reported) {
+		distribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_distribution", {
+			index: "byScope",
+			where: {
+				channel: input.channel,
+				platform
+			},
+			range,
+			limit: PAGE,
+			...page
+		}) : db.findAggregates("insights_distribution", {
+			index: "byVersion",
+			where: {
+				channel: input.channel,
+				platform,
+				app_version: input.appVersion
+			},
+			range,
+			limit: PAGE,
+			...page
+		})));
+		builtinDistribution.push(...await drain((page) => input.appVersion === void 0 ? db.findAggregates("insights_builtin_distribution", {
+			index: "byScope",
+			where: {
+				channel: input.channel,
+				platform
+			},
+			range,
+			limit: PAGE,
+			...page
+		}) : db.findAggregates("insights_builtin_distribution", {
+			index: "byVersion",
+			where: {
+				channel: input.channel,
+				platform,
+				app_version: input.appVersion
+			},
+			range,
+			limit: PAGE,
+			...page
+		})));
+	}
 	const points = [];
 	for (let start = timeRange.start; start < timeRange.end; start += intervalMs) points.push({
 		startMs: start,
@@ -12039,22 +12144,31 @@ const getAppUsage = async (db, input, now, retention) => {
 	const versions = /* @__PURE__ */ new Map();
 	const platforms = /* @__PURE__ */ new Map();
 	const bundles = /* @__PURE__ */ new Map();
-	for (const row of distribution) {
-		const count = row.latest_installations;
-		versions.set(row.app_version, (versions.get(row.app_version) ?? 0) + count);
-		platforms.set(row.platform, (platforms.get(row.platform) ?? 0) + count);
-		const releaseId = row.release_id === "" ? null : row.release_id;
+	const countBundle = (row, releaseId, builtinBundleId, count) => {
 		const key = JSON.stringify([
 			row.app_version,
 			row.platform,
-			releaseId
+			releaseId,
+			builtinBundleId
 		]);
 		bundles.set(key, {
 			appVersion: row.app_version,
 			platform: row.platform,
 			releaseId,
+			builtinBundleId,
 			installations: (bundles.get(key)?.installations ?? 0) + count
 		});
+	};
+	for (const row of distribution) {
+		const count = row.latest_installations;
+		versions.set(row.app_version, (versions.get(row.app_version) ?? 0) + count);
+		platforms.set(row.platform, (platforms.get(row.platform) ?? 0) + count);
+		countBundle(row, row.release_id || null, null, count);
+	}
+	for (const row of builtinDistribution) {
+		const releaseId = row.release_id || null;
+		countBundle(row, releaseId, null, -row.latest_installations);
+		countBundle(row, releaseId, row.builtin_bundle_id, row.latest_installations);
 	}
 	const sortedVersions = byInstallations(versions);
 	return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/aws",
   "type": "module",
-  "version": "1.0.0-rc.34",
+  "version": "1.0.0-rc.36",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -45,9 +45,9 @@
     "es-toolkit": "^1.32.0",
     "execa": "9.5.2",
     "mime": "^4.0.4",
-    "@hot-updater/protocol": "1.0.0-rc.30",
-    "@hot-updater/mock": "1.0.0-rc.30",
-    "@hot-updater/test-utils": "1.0.0-rc.32"
+    "@hot-updater/protocol": "1.0.0-rc.36",
+    "@hot-updater/mock": "1.0.0-rc.36",
+    "@hot-updater/test-utils": "1.0.0-rc.36"
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "3.1066.0",
@@ -62,9 +62,9 @@
     "@aws-sdk/lib-storage": "3.1066.0",
     "@aws-sdk/lib-dynamodb": "3.1066.0",
     "hono": "4.12.34",
-    "@hot-updater/cli-tools": "1.0.0-rc.34",
-    "@hot-updater/plugin-core": "1.0.0-rc.30",
-    "@hot-updater/server": "1.0.0-rc.34"
+    "@hot-updater/cli-tools": "1.0.0-rc.36",
+    "@hot-updater/plugin-core": "1.0.0-rc.36",
+    "@hot-updater/server": "1.0.0-rc.36"
   },
   "scripts": {
     "build": "tsdown",