@hot-updater/server 1.0.0-rc.16 → 1.0.0-rc.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters/drizzle.cjs +5 -5
- package/dist/adapters/drizzle.mjs +4 -4
- package/dist/adapters/kysely.cjs +3 -3
- package/dist/adapters/kysely.mjs +2 -2
- package/dist/adapters/mongodb.cjs +3 -3
- package/dist/adapters/mongodb.mjs +2 -2
- package/dist/adapters/mongodbAdapter.cjs +19 -1
- package/dist/adapters/mongodbAdapter.mjs +19 -1
- package/dist/adapters/prisma.cjs +5 -5
- package/dist/adapters/prisma.mjs +4 -4
- package/dist/assembly/assemblePlugins.cjs +47 -28
- package/dist/assembly/assemblePlugins.d.cts +3 -7
- package/dist/assembly/assemblePlugins.d.mts +3 -7
- package/dist/assembly/assemblePlugins.mjs +46 -27
- package/dist/assembly/clientPlugins.cjs +86 -0
- package/dist/assembly/clientPlugins.d.cts +16 -0
- package/dist/assembly/clientPlugins.d.mts +16 -0
- package/dist/assembly/clientPlugins.mjs +86 -0
- package/dist/assembly/configError.cjs +7 -0
- package/dist/assembly/configError.d.cts +7 -0
- package/dist/assembly/configError.d.mts +7 -0
- package/dist/assembly/configError.mjs +7 -0
- package/dist/assembly/databasePlugins.cjs +5 -1
- package/dist/assembly/databasePlugins.d.cts +5 -5
- package/dist/assembly/databasePlugins.d.mts +5 -5
- package/dist/assembly/databasePlugins.mjs +5 -1
- package/dist/assembly/pluginCli.cjs +125 -0
- package/dist/assembly/pluginCli.d.cts +59 -0
- package/dist/assembly/pluginCli.d.mts +59 -0
- package/dist/assembly/pluginCli.mjs +121 -0
- package/dist/createHotUpdaterCore.cjs +14 -16
- package/dist/createHotUpdaterCore.d.cts +10 -3
- package/dist/createHotUpdaterCore.d.mts +10 -3
- package/dist/createHotUpdaterCore.mjs +11 -13
- package/dist/database/aggregateBatching.cjs +626 -0
- package/dist/database/aggregateBatching.d.cts +10 -0
- package/dist/database/aggregateBatching.d.mts +10 -0
- package/dist/database/aggregateBatching.mjs +625 -0
- package/dist/{insights/errors.cjs → database/busy.cjs} +2 -15
- package/dist/database/busy.d.cts +12 -0
- package/dist/database/busy.d.mts +12 -0
- package/dist/{insights/errors.mjs → database/busy.mjs} +3 -14
- package/dist/database/database.cjs +22 -3
- package/dist/database/database.d.cts +15 -2
- package/dist/database/database.d.mts +15 -2
- package/dist/database/database.mjs +22 -3
- package/dist/database/definitions.d.cts +10 -0
- package/dist/database/definitions.d.mts +10 -0
- package/dist/database/engine.d.cts +2 -1
- package/dist/database/engine.d.mts +2 -1
- package/dist/database/engineAggregates.cjs +7 -4
- package/dist/database/engineAggregates.mjs +8 -5
- package/dist/database/engineReads.cjs +5 -3
- package/dist/database/engineReads.mjs +6 -4
- package/dist/database/engineTransaction.cjs +2 -6
- package/dist/database/engineTransaction.mjs +2 -6
- package/dist/database/fence.cjs +2 -1
- package/dist/database/fence.mjs +2 -1
- package/dist/database/index.cjs +17 -8
- package/dist/database/index.d.cts +5 -4
- package/dist/database/index.d.mts +5 -4
- package/dist/database/index.mjs +6 -5
- package/dist/database/kv/kvAdapter.cjs +15 -3
- package/dist/database/kv/kvAdapter.d.cts +8 -0
- package/dist/database/kv/kvAdapter.d.mts +8 -0
- package/dist/database/kv/kvAdapter.mjs +16 -4
- package/dist/database/resolveSchema.cjs +4 -1
- package/dist/database/resolveSchema.d.cts +1 -1
- package/dist/database/resolveSchema.d.mts +1 -1
- package/dist/database/resolveSchema.mjs +4 -1
- package/dist/database/retention.cjs +92 -0
- package/dist/database/retention.mjs +90 -0
- package/dist/database/schema.cjs +5 -2
- package/dist/database/schema.d.cts +30 -1
- package/dist/database/schema.d.mts +30 -1
- package/dist/database/schema.mjs +5 -2
- package/dist/database/sql/sqlAdapter.cjs +8 -0
- package/dist/database/sql/sqlAdapter.mjs +9 -1
- package/dist/database/sql/sqlSchema.cjs +56 -0
- package/dist/database/sql/sqlSchema.mjs +55 -1
- package/dist/db/coreDatabase.cjs +85 -0
- package/dist/db/coreDatabase.d.cts +57 -0
- package/dist/db/coreDatabase.d.mts +57 -0
- package/dist/db/coreDatabase.mjs +78 -0
- package/dist/db/index.cjs +11 -3
- package/dist/db/index.d.cts +7 -3
- package/dist/db/index.d.mts +7 -3
- package/dist/db/index.mjs +6 -3
- package/dist/db/types.d.cts +3 -3
- package/dist/db/types.d.mts +3 -3
- package/dist/diff.cjs +3 -0
- package/dist/diff.d.cts +2 -0
- package/dist/diff.d.mts +2 -0
- package/dist/diff.mjs +2 -0
- package/dist/handler.cjs +2 -14
- package/dist/handler.mjs +1 -13
- package/dist/handlerReleaseCatalogRoutes.cjs +21 -2
- package/dist/handlerReleaseCatalogRoutes.mjs +21 -2
- package/dist/index.cjs +2 -6
- package/dist/index.d.cts +4 -7
- package/dist/index.d.mts +4 -7
- package/dist/index.mjs +2 -4
- package/dist/package.cjs +1 -1
- package/dist/package.mjs +1 -1
- package/dist/{apiKeys.cjs → plugins/api-keys/apiKeys.cjs} +1 -1
- package/dist/{apiKeys.d.cts → plugins/api-keys/apiKeys.d.cts} +2 -2
- package/dist/{apiKeys.d.mts → plugins/api-keys/apiKeys.d.mts} +2 -2
- package/dist/{apiKeys.mjs → plugins/api-keys/apiKeys.mjs} +1 -1
- package/dist/plugins/api-keys/cli.cjs +115 -0
- package/dist/plugins/api-keys/cli.mjs +114 -0
- package/dist/plugins/api-keys/index.cjs +9 -6
- package/dist/plugins/api-keys/index.d.cts +4 -5
- package/dist/plugins/api-keys/index.d.mts +4 -5
- package/dist/plugins/api-keys/index.mjs +9 -7
- package/dist/plugins/api-keys/model.d.cts +20 -2
- package/dist/plugins/api-keys/model.d.mts +20 -2
- package/dist/plugins/definePlugin.cjs +1 -1
- package/dist/plugins/definePlugin.d.cts +130 -3
- package/dist/plugins/definePlugin.d.mts +130 -3
- package/dist/plugins/definePlugin.mjs +1 -1
- package/dist/plugins/index.cjs +25 -4
- package/dist/plugins/index.d.cts +7 -4
- package/dist/plugins/index.d.mts +7 -4
- package/dist/plugins/index.mjs +6 -4
- package/dist/plugins/insights/contract.cjs +193 -0
- package/dist/plugins/insights/contract.mjs +189 -0
- package/dist/{insights → plugins/insights}/domain.d.cts +60 -15
- package/dist/{insights → plugins/insights}/domain.d.mts +60 -15
- package/dist/plugins/insights/errors.cjs +15 -0
- package/dist/plugins/insights/errors.mjs +14 -0
- package/dist/{insights → plugins/insights}/eventInput.cjs +155 -22
- package/dist/{insights → plugins/insights}/eventInput.mjs +155 -22
- package/dist/plugins/insights/eventRow.cjs +49 -0
- package/dist/plugins/insights/eventRow.d.cts +64 -0
- package/dist/plugins/insights/eventRow.d.mts +64 -0
- package/dist/plugins/insights/eventRow.mjs +47 -0
- package/dist/plugins/insights/index.cjs +106 -26
- package/dist/plugins/insights/index.d.cts +130 -27
- package/dist/plugins/insights/index.d.mts +130 -27
- package/dist/plugins/insights/index.mjs +106 -29
- package/dist/plugins/insights/model.cjs +2 -2
- package/dist/plugins/insights/model.d.cts +1 -1
- package/dist/plugins/insights/model.d.mts +1 -1
- package/dist/plugins/insights/model.mjs +1 -1
- package/dist/plugins/insights/modelTypes.d.cts +176 -0
- package/dist/plugins/insights/modelTypes.d.mts +176 -0
- package/dist/plugins/insights/overview.cjs +109 -0
- package/dist/plugins/insights/overview.d.cts +15 -0
- package/dist/plugins/insights/overview.d.mts +15 -0
- package/dist/plugins/insights/overview.mjs +107 -0
- package/dist/{insights → plugins/insights}/provider.cjs +33 -14
- package/dist/{insights → plugins/insights}/provider.d.cts +2 -2
- package/dist/{insights → plugins/insights}/provider.d.mts +2 -2
- package/dist/{insights → plugins/insights}/provider.mjs +30 -11
- package/dist/{insights → plugins/insights}/queryInput.cjs +2 -2
- package/dist/{insights → plugins/insights}/queryInput.mjs +2 -2
- package/dist/plugins/insights/reads.cjs +298 -88
- package/dist/plugins/insights/reads.d.cts +61 -0
- package/dist/plugins/insights/reads.d.mts +61 -0
- package/dist/plugins/insights/reads.mjs +298 -90
- package/dist/plugins/insights/recordEvent.cjs +223 -39
- package/dist/plugins/insights/recordEvent.d.cts +9 -4
- package/dist/plugins/insights/recordEvent.d.mts +9 -4
- package/dist/plugins/insights/recordEvent.mjs +221 -37
- package/dist/{insights → plugins/insights}/routes.cjs +3 -30
- package/dist/{insights → plugins/insights}/routes.mjs +4 -28
- package/dist/plugins/insights/schema.cjs +182 -40
- package/dist/plugins/insights/schema.d.cts +446 -6
- package/dist/plugins/insights/schema.d.mts +446 -6
- package/dist/plugins/insights/schema.mjs +180 -41
- package/dist/plugins/insights/testing/eventRow.d.mts +64 -0
- package/dist/plugins/insights/testing/expectInsightsIndex.mjs +18 -0
- package/dist/plugins/insights/testing/fixtures.d.mts +8 -0
- package/dist/plugins/insights/testing/fixtures.mjs +25 -0
- package/dist/plugins/insights/testing/index.d.mts +24 -0
- package/dist/plugins/insights/testing/index.mjs +25 -0
- package/dist/plugins/insights/testing/insightsModelTests.mjs +714 -0
- package/dist/plugins/insights/testing/modelTypes.d.mts +176 -0
- package/dist/plugins/insights/testing/setupInsightsHttpTestSuite.d.mts +11 -0
- package/dist/plugins/insights/testing/setupInsightsHttpTestSuite.mjs +107 -0
- package/dist/plugins/insights/testing/setupInsightsModelTestSuite.d.mts +11 -0
- package/dist/plugins/insights/testing/setupInsightsModelTestSuite.mjs +31 -0
- package/dist/plugins/insights/testing/types.d.mts +26 -0
- package/dist/{insights → plugins/insights}/types.d.cts +3 -2
- package/dist/{insights → plugins/insights}/types.d.mts +3 -2
- package/package.json +18 -7
- package/src/adapters/drizzle.conformance.integration.spec.ts +2 -2
- package/src/adapters/drizzle.readBudgets.integration.spec.ts +6 -4
- package/src/adapters/drizzle.spec.ts +15 -7
- package/src/adapters/drizzle.ts +6 -6
- package/src/adapters/kysely.conformance.integration.spec.ts +2 -2
- package/src/adapters/kysely.readBudgets.integration.spec.ts +4 -2
- package/src/adapters/kysely.spec.ts +13 -9
- package/src/adapters/kysely.ts +2 -2
- package/src/adapters/mongodb.integration.spec.ts +98 -7
- package/src/adapters/mongodb.ts +2 -2
- package/src/adapters/mongodbAdapter.ts +14 -0
- package/src/adapters/prisma.conformance.integration.spec.ts +2 -2
- package/src/adapters/prisma.integration.spec.ts +16 -8
- package/src/adapters/prisma.readBudgets.integration.spec.ts +5 -2
- package/src/adapters/prisma.spec.ts +17 -9
- package/src/adapters/prisma.ts +6 -6
- package/src/adapters/prismaTestClients.ts +8 -1
- package/src/assembly/assemblePlugins.ts +73 -40
- package/src/assembly/assembly.spec.ts +63 -11
- package/src/assembly/assembly.types.spec.ts +50 -2
- package/src/assembly/clientPlugins.ts +113 -0
- package/src/assembly/configError.ts +4 -0
- package/src/assembly/databasePlugins.ts +11 -5
- package/src/assembly/pluginCli.spec.ts +254 -0
- package/src/assembly/pluginCli.ts +248 -0
- package/src/assembly/{builtInRoutes.spec.ts → pluginRoutes.spec.ts} +10 -37
- package/src/createHotUpdaterCore.ts +21 -17
- package/src/database/aggregateBatching.spec.ts +577 -0
- package/src/database/aggregateBatching.ts +803 -0
- package/src/{insights/errors.spec.ts → database/busy.spec.ts} +2 -5
- package/src/{insights/errors.ts → database/busy.ts} +1 -13
- package/src/database/database.ts +39 -8
- package/src/database/definitions.ts +4 -0
- package/src/database/engineAggregates.spec.ts +4 -7
- package/src/database/engineAggregates.ts +5 -9
- package/src/database/engineReads.ts +7 -5
- package/src/database/engineTransaction.ts +1 -7
- package/src/database/fence.spec.ts +5 -5
- package/src/database/fence.ts +4 -0
- package/src/database/index.ts +13 -7
- package/src/database/kv/kvAdapter.batching.integration.spec.ts +15 -0
- package/src/database/kv/kvAdapter.conformance.integration.spec.ts +2 -0
- package/src/database/kv/kvAdapter.spec.ts +128 -1
- package/src/database/kv/kvAdapter.ts +30 -1
- package/src/database/kv/kvTestStore.ts +28 -1
- package/src/database/resolveSchema.ts +4 -1
- package/src/database/retention.spec.ts +314 -0
- package/src/database/retention.ts +129 -0
- package/src/database/schema.ts +44 -0
- package/src/database/sql/sqlAdapter.integration.spec.ts +4 -7
- package/src/database/sql/sqlAdapter.readBudgets.integration.spec.ts +18 -4
- package/src/database/sql/sqlAdapter.spec.ts +91 -3
- package/src/database/sql/sqlAdapter.ts +20 -0
- package/src/database/sql/sqlSchema.ts +81 -0
- package/src/databaseTestSuite.spec.ts +9 -4
- package/src/db/coreDatabase.ts +153 -0
- package/src/db/engineSql.spec.ts +8 -7
- package/src/db/index.ts +19 -2
- package/src/db/pluginTables.spec.ts +57 -27
- package/src/db/types.ts +3 -3
- package/src/diff.ts +6 -0
- package/src/handler-standalone.integration.spec.ts +2 -3
- package/src/handler.ts +1 -32
- package/src/handlerReleaseCatalogRoutes.ts +26 -2
- package/src/index.ts +0 -10
- package/src/{apiKeys.integration.spec.ts → plugins/api-keys/apiKeys.integration.spec.ts} +4 -4
- package/src/{apiKeys.spec.ts → plugins/api-keys/apiKeys.spec.ts} +3 -3
- package/src/{apiKeys.ts → plugins/api-keys/apiKeys.ts} +1 -1
- package/src/plugins/api-keys/apiKeysPlugin.spec.ts +11 -15
- package/src/plugins/api-keys/cli.spec.ts +187 -0
- package/src/plugins/api-keys/cli.ts +140 -0
- package/src/plugins/api-keys/index.ts +48 -41
- package/src/plugins/api-keys/model.ts +21 -2
- package/src/plugins/definePlugin.ts +144 -2
- package/src/plugins/index.ts +20 -2
- package/src/plugins/insights/contract.spec.ts +285 -0
- package/src/plugins/insights/contract.ts +372 -0
- package/src/{insights → plugins/insights}/domain.ts +73 -15
- package/src/plugins/insights/errors.ts +11 -0
- package/src/{insights → plugins/insights}/eventInput.ts +189 -29
- package/src/plugins/insights/eventRow.ts +209 -0
- package/src/plugins/insights/index.ts +181 -45
- package/src/{insights → plugins/insights}/insights.integration.spec.ts +330 -34
- package/src/plugins/insights/insightsRollout.integration.spec.ts +1 -2
- package/src/plugins/insights/model.spec.ts +3 -5
- package/src/plugins/insights/model.ts +2 -3
- package/src/plugins/insights/modelTypes.ts +197 -0
- package/src/plugins/insights/overview.spec.ts +64 -0
- package/src/plugins/insights/overview.ts +214 -0
- package/src/{insights → plugins/insights}/provider.spec.ts +21 -10
- package/src/{insights → plugins/insights}/provider.ts +58 -21
- package/src/{insights → plugins/insights}/queryInput.ts +2 -2
- package/src/plugins/insights/reads.spec.ts +340 -52
- package/src/plugins/insights/reads.ts +453 -123
- package/src/plugins/insights/recordEvent.spec.ts +474 -20
- package/src/plugins/insights/recordEvent.ts +301 -63
- package/src/plugins/insights/retention.spec.ts +115 -0
- package/src/{insights → plugins/insights}/routes.ts +1 -31
- package/src/plugins/insights/schema.ts +356 -176
- package/src/plugins/insights/testing/expectInsightsIndex.spec.ts +42 -0
- package/src/plugins/insights/testing/expectInsightsIndex.ts +20 -0
- package/src/plugins/insights/testing/fixtures.ts +30 -0
- package/src/plugins/insights/testing/index.ts +45 -0
- package/src/plugins/insights/testing/insightsModelTests.ts +860 -0
- package/src/plugins/insights/testing/setupInsightsHttpTestSuite.ts +152 -0
- package/src/plugins/insights/testing/setupInsightsModelTestSuite.ts +36 -0
- package/src/plugins/insights/testing/types.ts +30 -0
- package/src/{insights → plugins/insights}/types.ts +1 -1
- package/src/readBudgets.testFixtures.ts +2 -2
- package/src/releaseCatalogRoutes.integration.spec.ts +7 -0
- package/src/retention.spec.ts +73 -0
- package/src/runtime.spec.ts +11 -12
- package/src/runtime.testFixtures.ts +7 -2
- package/src/testUtilsMutation.integration.spec.ts +2 -1
- package/src/testUtilsPackage.integration.spec.ts +7 -3
- package/dist/db/builtInDatabase.cjs +0 -104
- package/dist/db/builtInDatabase.d.cts +0 -38
- package/dist/db/builtInDatabase.d.mts +0 -38
- package/dist/db/builtInDatabase.mjs +0 -97
- package/dist/plugins/builtIn.cjs +0 -7
- package/dist/plugins/builtIn.mjs +0 -6
- package/src/db/builtInDatabase.ts +0 -149
- package/src/plugins/builtIn.ts +0 -5
|
@@ -3,87 +3,153 @@ import { defineAggregate, defineTable } from "../../database/schema";
|
|
|
3
3
|
export const HOUR_MS = 3_600_000;
|
|
4
4
|
export const DAY_MS = 86_400_000;
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
6
|
+
/** How long Insights keeps its rows, in whole days. Lifetime counters are kept. */
|
|
7
|
+
export interface InsightsRetention {
|
|
8
|
+
/** Raw events and hourly rollups. */
|
|
9
|
+
readonly rawDays: number;
|
|
10
|
+
/** Daily rollups, and each installation's latest event and the gauges that count it. */
|
|
11
|
+
readonly dailyDays: number;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* The default periods (decision 59): 90 days, and 13 months as 400 days, so
|
|
16
|
+
* the same month a year ago stays whole.
|
|
17
|
+
*/
|
|
18
|
+
export const RAW_RETENTION_DAYS = 90;
|
|
19
|
+
export const DAILY_RETENTION_DAYS = 400;
|
|
20
|
+
export const DEFAULT_INSIGHTS_RETENTION: InsightsRetention = {
|
|
21
|
+
rawDays: RAW_RETENTION_DAYS,
|
|
22
|
+
dailyDays: DAILY_RETENTION_DAYS,
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
/** Rows keyed by a bucket that expire `days` after it starts. */
|
|
26
|
+
interface BucketRetention {
|
|
27
|
+
readonly field: "bucket_start_ms";
|
|
28
|
+
readonly days: number;
|
|
29
|
+
}
|
|
30
|
+
const bucketRetention = (days: number): BucketRetention => ({
|
|
31
|
+
field: "bucket_start_ms",
|
|
32
|
+
days,
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
const MOVEMENTS = new Set([
|
|
36
|
+
"UPDATE_DOWNLOADED",
|
|
37
|
+
"UPDATE_APPLIED",
|
|
38
|
+
"RECOVERED",
|
|
39
|
+
"UPDATE_FAILED",
|
|
40
|
+
]);
|
|
41
|
+
|
|
42
|
+
/** A failed update check: it names no target bundle, so no bundle list shows it. */
|
|
43
|
+
export const isFailedCheck = (row: {
|
|
44
|
+
readonly type: string;
|
|
45
|
+
readonly metadata: unknown;
|
|
46
|
+
}): boolean =>
|
|
47
|
+
row.type === "UPDATE_FAILED" &&
|
|
48
|
+
(row.metadata as { failure?: { stage?: unknown } } | null)?.failure?.stage ===
|
|
49
|
+
"check";
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Downloads, applies, recoveries, and update failures, whole. An UNCHANGED
|
|
53
|
+
* report counts as a launch and moves its installation's head, but no list
|
|
54
|
+
* shows it, so no row keeps it.
|
|
55
|
+
*/
|
|
56
|
+
const bundleEvents = (days: number) =>
|
|
57
|
+
defineTable(
|
|
58
|
+
{
|
|
59
|
+
id: { type: "string", maxLength: 36 },
|
|
60
|
+
type: { type: "string", maxLength: 32 },
|
|
61
|
+
install_id: { type: "string", maxLength: 255 },
|
|
62
|
+
user_id: { type: "string", maxLength: 255, required: false },
|
|
63
|
+
from_release_id: { type: "string", maxLength: 36, required: false },
|
|
64
|
+
from_bundle_id: { type: "string", maxLength: 36, required: false },
|
|
65
|
+
to_release_id: { type: "string", maxLength: 36, required: false },
|
|
66
|
+
to_bundle_id: { type: "string", maxLength: 36 },
|
|
67
|
+
platform: { type: "string", maxLength: 16 },
|
|
68
|
+
app_version: { type: "string" },
|
|
69
|
+
channel: { type: "string" },
|
|
70
|
+
metadata: { type: "json" },
|
|
71
|
+
received_at_ms: { type: "integer" },
|
|
47
72
|
},
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
73
|
+
{
|
|
74
|
+
key: ["id"],
|
|
75
|
+
derived: {
|
|
76
|
+
/** The UTC day the event was received in. */
|
|
77
|
+
day: {
|
|
78
|
+
type: "integer",
|
|
79
|
+
compute: (row) => row.received_at_ms - (row.received_at_ms % DAY_MS),
|
|
80
|
+
},
|
|
81
|
+
/** Set only for events that belong in installation history. */
|
|
82
|
+
movement_install_id: {
|
|
83
|
+
type: "string",
|
|
84
|
+
compute: (row) => (MOVEMENTS.has(row.type) ? row.install_id : null),
|
|
85
|
+
},
|
|
86
|
+
/**
|
|
87
|
+
* The bundle a bundle filter matches: `from:<bundle>` for RECOVERED,
|
|
88
|
+
* none for a failed check, else `to:<bundle>`.
|
|
89
|
+
*/
|
|
90
|
+
bundle_ref: {
|
|
91
|
+
type: "string",
|
|
92
|
+
multi: true,
|
|
93
|
+
compute: (row) =>
|
|
94
|
+
isFailedCheck(row)
|
|
95
|
+
? []
|
|
96
|
+
: [
|
|
97
|
+
row.type === "RECOVERED" && row.from_bundle_id !== null
|
|
98
|
+
? `from:${row.from_bundle_id}`
|
|
99
|
+
: `to:${row.to_bundle_id}`,
|
|
100
|
+
],
|
|
101
|
+
},
|
|
53
102
|
},
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
103
|
+
indexes: {
|
|
104
|
+
recent: {
|
|
105
|
+
eq: ["channel", "platform", "day"],
|
|
106
|
+
sort: ["received_at_ms"],
|
|
107
|
+
},
|
|
108
|
+
movementsByInstall: {
|
|
109
|
+
eq: ["movement_install_id"],
|
|
110
|
+
sort: ["received_at_ms"],
|
|
111
|
+
},
|
|
112
|
+
byBundle: {
|
|
113
|
+
eq: ["platform", "channel", "type", "bundle_ref", "day"],
|
|
114
|
+
sort: ["received_at_ms"],
|
|
115
|
+
},
|
|
116
|
+
/** Events of every scope by day, for the console's unfiltered event list. */
|
|
117
|
+
byDay: { eq: ["day"], sort: ["received_at_ms"] },
|
|
57
118
|
},
|
|
58
|
-
|
|
59
|
-
|
|
119
|
+
// A day's events go together, oldest days first, walking `byDay`.
|
|
120
|
+
retention: { field: "day", days },
|
|
60
121
|
},
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
122
|
+
);
|
|
123
|
+
|
|
124
|
+
/**
|
|
125
|
+
* Each installation's latest event, whole, so reading it is one point read.
|
|
126
|
+
* Its gauges count it in the UTC day of that event. An update failure moves
|
|
127
|
+
* nothing, so no head holds one.
|
|
128
|
+
*/
|
|
129
|
+
const bundleEventHeads = (days: number) =>
|
|
130
|
+
defineTable(
|
|
131
|
+
{
|
|
132
|
+
install_id: { type: "string", maxLength: 255 },
|
|
133
|
+
id: { type: "string", maxLength: 36 },
|
|
134
|
+
type: { type: "string", maxLength: 32 },
|
|
135
|
+
user_id: { type: "string", maxLength: 255, required: false },
|
|
136
|
+
from_release_id: { type: "string", maxLength: 36, required: false },
|
|
137
|
+
from_bundle_id: { type: "string", maxLength: 36, required: false },
|
|
138
|
+
to_release_id: { type: "string", maxLength: 36, required: false },
|
|
139
|
+
to_bundle_id: { type: "string", maxLength: 36 },
|
|
140
|
+
platform: { type: "string", maxLength: 16 },
|
|
141
|
+
app_version: { type: "string" },
|
|
142
|
+
channel: { type: "string" },
|
|
143
|
+
metadata: { type: "json" },
|
|
144
|
+
received_at_ms: { type: "integer" },
|
|
145
|
+
},
|
|
146
|
+
{
|
|
147
|
+
key: ["install_id"],
|
|
148
|
+
indexes: { byUser: { eq: ["user_id"], sort: ["install_id"] } },
|
|
149
|
+
// An installation unseen for the daily period is gone, with its gauges' day.
|
|
150
|
+
retention: { field: "received_at_ms", days },
|
|
151
|
+
},
|
|
152
|
+
);
|
|
87
153
|
|
|
88
154
|
/**
|
|
89
155
|
* Shards are keyed by install id. Counters are blind increments and never
|
|
@@ -93,6 +159,10 @@ const bundleEventHeads = defineTable(
|
|
|
93
159
|
* on DynamoDB Local retried 2–24% at 16, almost all on gauge rows, and 1–5%
|
|
94
160
|
* with gauges at 32. Sketches stay at 16: each shard row carries 2 KB of
|
|
95
161
|
* registers that every read merges.
|
|
162
|
+
*
|
|
163
|
+
* Every Insights aggregate is `batched`: on DynamoDB and Firestore, which
|
|
164
|
+
* bill each write, an event's changes apply after it commits, merged with
|
|
165
|
+
* other events' into one write per row, on one shard per writer.
|
|
96
166
|
*/
|
|
97
167
|
const COUNTER_SHARDS = 8;
|
|
98
168
|
const GAUGE_SHARDS = 32;
|
|
@@ -105,109 +175,197 @@ const identityFields = {
|
|
|
105
175
|
} as const;
|
|
106
176
|
const window = { eq: ["identity"], sort: ["bucket_start_ms"] } as const;
|
|
107
177
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
178
|
+
/**
|
|
179
|
+
* Counters of one period kind: hourly, daily, or lifetime at bucket 0. A
|
|
180
|
+
* release or channel row counts downloads, launches, and failed launches,
|
|
181
|
+
* and downloads a patch delivered and those that fell back from one. A
|
|
182
|
+
* release's lifetime row counts its failed updates (`failed_updates`), since
|
|
183
|
+
* no breakdown row outlives the raw period; windowed reads sum
|
|
184
|
+
* `insights_failures` instead.
|
|
185
|
+
*/
|
|
186
|
+
const counters = (retention?: BucketRetention) =>
|
|
187
|
+
defineAggregate(identityFields, {
|
|
188
|
+
key: ["identity", "bucket_start_ms"],
|
|
189
|
+
counters: [
|
|
190
|
+
"downloads",
|
|
191
|
+
"launches",
|
|
192
|
+
"failed_launches",
|
|
193
|
+
"failed_updates",
|
|
194
|
+
"patch_downloads",
|
|
195
|
+
"patch_fallbacks",
|
|
196
|
+
],
|
|
197
|
+
shards: COUNTER_SHARDS,
|
|
198
|
+
batched: true,
|
|
199
|
+
indexes: { window },
|
|
200
|
+
...(retention === undefined ? {} : { retention }),
|
|
201
|
+
});
|
|
114
202
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
203
|
+
/**
|
|
204
|
+
* Unique-installation sketches of one period kind. Rows of a failure
|
|
205
|
+
* identity (`failure` and `check` scopes) keep only `failed_users`, so a
|
|
206
|
+
* release's launch rows never grow by a failure's registers.
|
|
207
|
+
*/
|
|
208
|
+
const sketches = (retention: BucketRetention) =>
|
|
209
|
+
defineAggregate(identityFields, {
|
|
210
|
+
key: ["identity", "bucket_start_ms"],
|
|
211
|
+
distinct: ["launch_users", "activity_users", "failed_users"],
|
|
212
|
+
shards: SKETCH_SHARDS,
|
|
213
|
+
batched: true,
|
|
214
|
+
indexes: { window },
|
|
215
|
+
retention,
|
|
216
|
+
});
|
|
121
217
|
|
|
122
|
-
/** Installations
|
|
123
|
-
const
|
|
124
|
-
{
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
218
|
+
/** Installations whose update to a release failed, since its first failure: kept, at bucket 0. */
|
|
219
|
+
const lifetimeSketches = () =>
|
|
220
|
+
defineAggregate(identityFields, {
|
|
221
|
+
key: ["identity", "bucket_start_ms"],
|
|
222
|
+
distinct: ["failed_users"],
|
|
223
|
+
shards: SKETCH_SHARDS,
|
|
224
|
+
batched: true,
|
|
225
|
+
indexes: { window },
|
|
226
|
+
});
|
|
227
|
+
|
|
228
|
+
/**
|
|
229
|
+
* Update failures by what failed, and recoveries by why the crashed process
|
|
230
|
+
* exited, a row an hour. `release_id` is the failed update's target release,
|
|
231
|
+
* or empty for a failed check or an unknown target, and the recovered
|
|
232
|
+
* release for a recovery. A failure's `stage` and `reason` say where and why
|
|
233
|
+
* it failed, and `detail` what else the client knew, as the JSON array
|
|
234
|
+
* `[resource, httpStatus, originCode, transport]`. A recovery's stage is
|
|
235
|
+
* `launch` and its reason the exit reason, with an empty detail. Every index
|
|
236
|
+
* is in key order, so its counters stay blind increments.
|
|
237
|
+
*/
|
|
238
|
+
const insightsFailures = (retention: BucketRetention) =>
|
|
239
|
+
defineAggregate(
|
|
240
|
+
{
|
|
241
|
+
platform: { type: "string", maxLength: 16 },
|
|
242
|
+
channel: { type: "string" },
|
|
243
|
+
bucket_start_ms: { type: "integer" },
|
|
244
|
+
release_id: { type: "string", maxLength: 36 },
|
|
245
|
+
stage: { type: "string", maxLength: 16 },
|
|
246
|
+
reason: { type: "string", maxLength: 64 },
|
|
247
|
+
detail: { type: "string", maxLength: 160 },
|
|
248
|
+
},
|
|
249
|
+
{
|
|
250
|
+
key: [
|
|
251
|
+
"platform",
|
|
252
|
+
"channel",
|
|
253
|
+
"bucket_start_ms",
|
|
254
|
+
"release_id",
|
|
255
|
+
"stage",
|
|
256
|
+
"reason",
|
|
257
|
+
"detail",
|
|
258
|
+
],
|
|
259
|
+
counters: ["events"],
|
|
260
|
+
shards: COUNTER_SHARDS,
|
|
261
|
+
batched: true,
|
|
262
|
+
indexes: {
|
|
263
|
+
byScope: { eq: ["platform", "channel"], sort: ["bucket_start_ms"] },
|
|
146
264
|
},
|
|
265
|
+
retention,
|
|
147
266
|
},
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
"
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
267
|
+
);
|
|
268
|
+
|
|
269
|
+
/** Installations counted in the UTC day of their latest event, so reads sum whole UTC days. */
|
|
270
|
+
const insightsDistribution = (retention: BucketRetention) =>
|
|
271
|
+
defineAggregate(
|
|
272
|
+
{
|
|
273
|
+
channel: { type: "string" },
|
|
274
|
+
platform: { type: "string", maxLength: 16 },
|
|
275
|
+
app_version: { type: "string" },
|
|
276
|
+
release_id: { type: "string", maxLength: 36 },
|
|
277
|
+
bucket_start_ms: { type: "integer" },
|
|
278
|
+
},
|
|
279
|
+
{
|
|
280
|
+
key: [
|
|
281
|
+
"channel",
|
|
282
|
+
"platform",
|
|
283
|
+
"app_version",
|
|
284
|
+
"release_id",
|
|
285
|
+
"bucket_start_ms",
|
|
286
|
+
],
|
|
287
|
+
gauges: ["latest_installations"],
|
|
288
|
+
shards: GAUGE_SHARDS,
|
|
289
|
+
batched: true,
|
|
290
|
+
indexes: {
|
|
291
|
+
byScope: { eq: ["channel", "platform"], sort: ["bucket_start_ms"] },
|
|
292
|
+
byVersion: {
|
|
293
|
+
eq: ["channel", "platform", "app_version"],
|
|
294
|
+
sort: ["bucket_start_ms"],
|
|
295
|
+
},
|
|
296
|
+
},
|
|
297
|
+
retention,
|
|
298
|
+
},
|
|
299
|
+
);
|
|
300
|
+
|
|
301
|
+
/** Latest events by the bundle they came from or went to, bucketed like the distribution. */
|
|
302
|
+
const insightsLatestByBundle = (retention: BucketRetention) =>
|
|
303
|
+
defineAggregate(
|
|
304
|
+
{
|
|
305
|
+
platform: { type: "string", maxLength: 16 },
|
|
306
|
+
channel: { type: "string" },
|
|
307
|
+
bundle_field: { type: "string", maxLength: 16 },
|
|
308
|
+
bundle_id: { type: "string", maxLength: 36 },
|
|
309
|
+
type: { type: "string", maxLength: 32 },
|
|
310
|
+
bucket_start_ms: { type: "integer" },
|
|
311
|
+
},
|
|
312
|
+
{
|
|
313
|
+
key: [
|
|
314
|
+
"platform",
|
|
315
|
+
"channel",
|
|
316
|
+
"bundle_field",
|
|
317
|
+
"bundle_id",
|
|
318
|
+
"type",
|
|
319
|
+
"bucket_start_ms",
|
|
320
|
+
],
|
|
321
|
+
gauges: ["installations"],
|
|
322
|
+
shards: GAUGE_SHARDS,
|
|
323
|
+
batched: true,
|
|
324
|
+
indexes: {
|
|
325
|
+
byBundle: {
|
|
326
|
+
eq: ["platform", "channel", "bundle_field", "bundle_id", "type"],
|
|
327
|
+
sort: ["bucket_start_ms"],
|
|
328
|
+
},
|
|
176
329
|
},
|
|
330
|
+
retention,
|
|
177
331
|
},
|
|
178
|
-
|
|
179
|
-
);
|
|
332
|
+
);
|
|
180
333
|
|
|
181
334
|
/**
|
|
182
|
-
*
|
|
183
|
-
* and every event, a row a UTC
|
|
184
|
-
* hourly rows, and event lists
|
|
335
|
+
* Stored events by outcome and the bundle a bundle filter matches, a row an
|
|
336
|
+
* hour, which a failed check has none of; and every stored event, a row a UTC
|
|
337
|
+
* day (`DAILY_EVENTS`). Bundle counts sum the hourly rows, and event lists
|
|
338
|
+
* read either to skip days without events.
|
|
185
339
|
*/
|
|
186
|
-
const insightsOutcomes =
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
340
|
+
const insightsOutcomes = (retention: BucketRetention) =>
|
|
341
|
+
defineAggregate(
|
|
342
|
+
{
|
|
343
|
+
platform: { type: "string", maxLength: 16 },
|
|
344
|
+
channel: { type: "string" },
|
|
345
|
+
type: { type: "string", maxLength: 32 },
|
|
346
|
+
bundle_ref: { type: "string", maxLength: 41 },
|
|
347
|
+
bucket_start_ms: { type: "integer" },
|
|
348
|
+
},
|
|
349
|
+
{
|
|
350
|
+
key: ["platform", "channel", "type", "bundle_ref", "bucket_start_ms"],
|
|
351
|
+
counters: ["events"],
|
|
352
|
+
shards: COUNTER_SHARDS,
|
|
353
|
+
batched: true,
|
|
354
|
+
indexes: {
|
|
355
|
+
byRef: {
|
|
356
|
+
eq: ["platform", "channel", "type", "bundle_ref"],
|
|
357
|
+
sort: ["bucket_start_ms"],
|
|
358
|
+
},
|
|
202
359
|
},
|
|
360
|
+
// The per-day rows too: they count raw events, which keep the raw period.
|
|
361
|
+
retention,
|
|
203
362
|
},
|
|
204
|
-
|
|
205
|
-
);
|
|
363
|
+
);
|
|
206
364
|
|
|
207
365
|
/**
|
|
208
|
-
* The `insights_outcomes` identity that counts every event, for the
|
|
209
|
-
* event list. Its bucket is a UTC day, not an hour. Every event's
|
|
210
|
-
* is ios or android, so no outcome row of a bundle filter shares it.
|
|
366
|
+
* The `insights_outcomes` identity that counts every stored event, for the
|
|
367
|
+
* global event list. Its bucket is a UTC day, not an hour. Every event's
|
|
368
|
+
* platform is ios or android, so no outcome row of a bundle filter shares it.
|
|
211
369
|
*/
|
|
212
370
|
export const DAILY_EVENTS = {
|
|
213
371
|
platform: "*",
|
|
@@ -216,14 +374,36 @@ export const DAILY_EVENTS = {
|
|
|
216
374
|
bundle_ref: "",
|
|
217
375
|
} as const;
|
|
218
376
|
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
}
|
|
377
|
+
/**
|
|
378
|
+
* Insights' tables, each expiring after its period. The periods are values
|
|
379
|
+
* the engine applies at runtime; the tables and indexes are the same for
|
|
380
|
+
* any periods.
|
|
381
|
+
*/
|
|
382
|
+
export const createInsightsSchema = ({
|
|
383
|
+
rawDays,
|
|
384
|
+
dailyDays,
|
|
385
|
+
}: InsightsRetention = DEFAULT_INSIGHTS_RETENTION) => {
|
|
386
|
+
const hourly = bucketRetention(rawDays);
|
|
387
|
+
const daily = bucketRetention(dailyDays);
|
|
388
|
+
return {
|
|
389
|
+
bundle_events: bundleEvents(rawDays),
|
|
390
|
+
bundle_event_heads: bundleEventHeads(dailyDays),
|
|
391
|
+
/** Hourly counters and sketches: the raw period. */
|
|
392
|
+
insights_overview: counters(hourly),
|
|
393
|
+
insights_sketches: sketches(hourly),
|
|
394
|
+
/** Daily counters and sketches: the daily period. */
|
|
395
|
+
insights_overview_daily: counters(daily),
|
|
396
|
+
insights_sketches_daily: sketches(daily),
|
|
397
|
+
/** A release's counters since its first event, and its failed installations: kept. */
|
|
398
|
+
insights_overview_lifetime: counters(),
|
|
399
|
+
insights_sketches_lifetime: lifetimeSketches(),
|
|
400
|
+
insights_distribution: insightsDistribution(daily),
|
|
401
|
+
insights_latest_by_bundle: insightsLatestByBundle(daily),
|
|
402
|
+
insights_outcomes: insightsOutcomes(hourly),
|
|
403
|
+
insights_failures: insightsFailures(hourly),
|
|
404
|
+
} as const;
|
|
405
|
+
};
|
|
406
|
+
|
|
407
|
+
export const insightsSchema = createInsightsSchema();
|
|
228
408
|
|
|
229
409
|
export type InsightsSchema = typeof insightsSchema;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
|
|
3
|
+
import { expectInsightsIndex } from "./expectInsightsIndex";
|
|
4
|
+
|
|
5
|
+
afterEach(() => vi.useRealTimers());
|
|
6
|
+
|
|
7
|
+
describe("Insights index assertions", () => {
|
|
8
|
+
it("waits for acknowledged writes to become visible in a lagging index", async () => {
|
|
9
|
+
vi.useFakeTimers();
|
|
10
|
+
const query = vi
|
|
11
|
+
.fn()
|
|
12
|
+
.mockResolvedValueOnce([])
|
|
13
|
+
.mockResolvedValue(["report"]);
|
|
14
|
+
const result = expectInsightsIndex(query, ["report"]);
|
|
15
|
+
await vi.advanceTimersByTimeAsync(50);
|
|
16
|
+
await result;
|
|
17
|
+
expect(query).toHaveBeenCalledTimes(2);
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it("propagates a native query failure even after an earlier incomplete result", async () => {
|
|
21
|
+
vi.useFakeTimers();
|
|
22
|
+
const failure = new Error("native index unavailable");
|
|
23
|
+
const query = vi.fn().mockResolvedValueOnce([]).mockRejectedValue(failure);
|
|
24
|
+
const result = expect(expectInsightsIndex(query, ["report"])).rejects.toBe(
|
|
25
|
+
failure,
|
|
26
|
+
);
|
|
27
|
+
await vi.advanceTimersByTimeAsync(50);
|
|
28
|
+
await result;
|
|
29
|
+
expect(query).toHaveBeenCalledTimes(2);
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it("fails with the actual result when the bounded catch-up interval expires", async () => {
|
|
33
|
+
vi.useFakeTimers();
|
|
34
|
+
const query = vi.fn().mockResolvedValue([]);
|
|
35
|
+
const result = expect(
|
|
36
|
+
expectInsightsIndex(query, ["report"]),
|
|
37
|
+
).rejects.toThrow();
|
|
38
|
+
await vi.advanceTimersByTimeAsync(5_000);
|
|
39
|
+
await result;
|
|
40
|
+
expect(query).toHaveBeenCalledTimes(101);
|
|
41
|
+
});
|
|
42
|
+
});
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { expect } from "vitest";
|
|
2
|
+
|
|
3
|
+
/** Allow committed secondary indexes to catch up; query failures still fail. */
|
|
4
|
+
export const expectInsightsIndex = async <T>(
|
|
5
|
+
query: () => Promise<T>,
|
|
6
|
+
expected: T,
|
|
7
|
+
): Promise<void> => {
|
|
8
|
+
const deadline = Date.now() + 5_000;
|
|
9
|
+
for (;;) {
|
|
10
|
+
// Keep native errors outside the assertion retry handler.
|
|
11
|
+
const actual = await query();
|
|
12
|
+
try {
|
|
13
|
+
expect(actual).toEqual(expected);
|
|
14
|
+
return;
|
|
15
|
+
} catch (error) {
|
|
16
|
+
if (Date.now() >= deadline) throw error;
|
|
17
|
+
}
|
|
18
|
+
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
19
|
+
}
|
|
20
|
+
};
|