@powersync/service-module-postgres-storage 0.0.0-dev-20250827091123 → 0.0.0-dev-20250828134335

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.
Files changed (50) hide show
  1. package/CHANGELOG.md +27 -14
  2. package/dist/.tsbuildinfo +1 -1
  3. package/dist/@types/storage/PostgresStorageProvider.d.ts +1 -1
  4. package/dist/@types/storage/PostgresSyncRulesStorage.d.ts +3 -1
  5. package/dist/@types/{utils/test-utils.d.ts → storage/PostgresTestStorageFactoryGenerator.d.ts} +3 -5
  6. package/dist/@types/storage/storage-index.d.ts +1 -0
  7. package/dist/@types/types/models/models-index.d.ts +0 -1
  8. package/dist/@types/utils/utils-index.d.ts +0 -1
  9. package/dist/migrations/scripts/1684951997326-init.js +0 -18
  10. package/dist/migrations/scripts/1684951997326-init.js.map +1 -1
  11. package/dist/storage/PostgresStorageProvider.js +1 -10
  12. package/dist/storage/PostgresStorageProvider.js.map +1 -1
  13. package/dist/storage/PostgresSyncRulesStorage.js +19 -6
  14. package/dist/storage/PostgresSyncRulesStorage.js.map +1 -1
  15. package/dist/{utils/test-utils.js → storage/PostgresTestStorageFactoryGenerator.js} +6 -22
  16. package/dist/storage/PostgresTestStorageFactoryGenerator.js.map +1 -0
  17. package/dist/storage/batch/PostgresBucketBatch.js +5 -2
  18. package/dist/storage/batch/PostgresBucketBatch.js.map +1 -1
  19. package/dist/storage/storage-index.js +1 -0
  20. package/dist/storage/storage-index.js.map +1 -1
  21. package/dist/types/models/models-index.js +0 -1
  22. package/dist/types/models/models-index.js.map +1 -1
  23. package/dist/utils/utils-index.js +0 -1
  24. package/dist/utils/utils-index.js.map +1 -1
  25. package/package.json +12 -11
  26. package/src/migrations/scripts/1684951997326-init.ts +0 -22
  27. package/src/storage/PostgresStorageProvider.ts +2 -13
  28. package/src/storage/PostgresSyncRulesStorage.ts +26 -7
  29. package/src/{utils/test-utils.ts → storage/PostgresTestStorageFactoryGenerator.ts} +5 -21
  30. package/src/storage/batch/PostgresBucketBatch.ts +4 -2
  31. package/src/storage/storage-index.ts +1 -0
  32. package/src/types/models/models-index.ts +0 -1
  33. package/src/utils/utils-index.ts +0 -1
  34. package/test/src/__snapshots__/storage_sync.test.ts.snap +110 -0
  35. package/test/src/util.ts +6 -3
  36. package/dist/@types/migrations/scripts/1756282360128-connection-reporting.d.ts +0 -3
  37. package/dist/@types/storage/PostgresReportStorageFactory.d.ts +0 -24
  38. package/dist/@types/types/models/SdkReporting.d.ts +0 -21
  39. package/dist/migrations/scripts/1756282360128-connection-reporting.js +0 -107
  40. package/dist/migrations/scripts/1756282360128-connection-reporting.js.map +0 -1
  41. package/dist/storage/PostgresReportStorageFactory.js +0 -238
  42. package/dist/storage/PostgresReportStorageFactory.js.map +0 -1
  43. package/dist/types/models/SdkReporting.js +0 -17
  44. package/dist/types/models/SdkReporting.js.map +0 -1
  45. package/dist/utils/test-utils.js.map +0 -1
  46. package/src/migrations/scripts/1756282360128-connection-reporting.ts +0 -41
  47. package/src/storage/PostgresReportStorageFactory.ts +0 -258
  48. package/src/types/models/SdkReporting.ts +0 -23
  49. package/test/src/__snapshots__/connection-report-storage.test.ts.snap +0 -215
  50. package/test/src/connection-report-storage.test.ts +0 -233
@@ -1,238 +0,0 @@
1
- import { v4 } from 'uuid';
2
- import * as lib_postgres from '@powersync/lib-service-postgres';
3
- import { SdkReporting } from '../types/models/SdkReporting.js';
4
- import { toInteger } from 'ix/util/tointeger.js';
5
- import { logger } from '@powersync/lib-services-framework';
6
- import { getStorageApplicationName } from '../utils/application-name.js';
7
- import { STORAGE_SCHEMA_NAME } from '../utils/db.js';
8
- export class PostgresReportStorageFactory {
9
- options;
10
- db;
11
- constructor(options) {
12
- this.options = options;
13
- this.db = new lib_postgres.DatabaseClient({
14
- config: options.config,
15
- schema: STORAGE_SCHEMA_NAME,
16
- applicationName: getStorageApplicationName()
17
- });
18
- this.db.registerListener({
19
- connectionCreated: async (connection) => this.prepareStatements(connection)
20
- });
21
- }
22
- parseJsDate(date) {
23
- const year = date.getFullYear();
24
- const month = date.getMonth();
25
- const today = date.getDate();
26
- const day = date.getDay();
27
- return {
28
- year,
29
- month,
30
- today,
31
- day,
32
- parsedDate: date
33
- };
34
- }
35
- mapListCurrentConnectionsResponse(result) {
36
- if (!result) {
37
- return {
38
- users: 0,
39
- sdks: []
40
- };
41
- }
42
- return {
43
- users: Number(result.users),
44
- sdks: result.sdks?.data || []
45
- };
46
- }
47
- async listConnectionsQuery() {
48
- return await this.db.sql `
49
- WITH
50
- filtered AS (
51
- SELECT
52
- *
53
- FROM
54
- connection_report_events
55
- WHERE
56
- disconnected_at IS NULL
57
- AND jwt_exp > NOW()
58
- ),
59
- unique_users AS (
60
- SELECT
61
- COUNT(DISTINCT user_id) AS count
62
- FROM
63
- filtered
64
- ),
65
- sdk_versions_array AS (
66
- SELECT
67
- sdk,
68
- COUNT(DISTINCT client_id) AS clients,
69
- COUNT(DISTINCT user_id) AS users
70
- FROM
71
- filtered
72
- GROUP BY
73
- sdk
74
- )
75
- SELECT
76
- (
77
- SELECT
78
- COALESCE(count, 0)
79
- FROM
80
- unique_users
81
- ) AS users,
82
- (
83
- SELECT
84
- JSON_AGG(ROW_TO_JSON(s))
85
- FROM
86
- sdk_versions_array s
87
- ) AS sdks;
88
- `
89
- .decoded(SdkReporting)
90
- .first();
91
- }
92
- updateTableFilter() {
93
- const { year, month, today } = this.parseJsDate(new Date());
94
- const nextDay = today + 1;
95
- return {
96
- gte: new Date(year, month, today).toISOString(),
97
- lt: new Date(year, month, nextDay).toISOString()
98
- };
99
- }
100
- async reportClientConnection(data) {
101
- const { sdk, connected_at, user_id, user_agent, jwt_exp, client_id } = data;
102
- const connectIsoString = connected_at.toISOString();
103
- const jwtExpIsoString = jwt_exp.toISOString();
104
- const { gte, lt } = this.updateTableFilter();
105
- const uuid = v4();
106
- const result = await this.db.sql `
107
- UPDATE connection_report_events
108
- SET
109
- connected_at = ${{ type: 1184, value: connectIsoString }},
110
- sdk = ${{ type: 'varchar', value: sdk }},
111
- user_agent = ${{ type: 'varchar', value: user_agent }},
112
- jwt_exp = ${{ type: 1184, value: jwtExpIsoString }},
113
- disconnected_at = NULL
114
- WHERE
115
- user_id = ${{ type: 'varchar', value: user_id }}
116
- AND client_id = ${{ type: 'varchar', value: client_id }}
117
- AND connected_at >= ${{ type: 1184, value: gte }}
118
- AND connected_at < ${{ type: 1184, value: lt }};
119
- `.execute();
120
- if (result.results[1].status === 'UPDATE 0') {
121
- await this.db.sql `
122
- INSERT INTO
123
- connection_report_events (
124
- user_id,
125
- client_id,
126
- connected_at,
127
- sdk,
128
- user_agent,
129
- jwt_exp,
130
- id
131
- )
132
- VALUES
133
- (
134
- ${{ type: 'varchar', value: user_id }},
135
- ${{ type: 'varchar', value: client_id }},
136
- ${{ type: 1184, value: connectIsoString }},
137
- ${{ type: 'varchar', value: sdk }},
138
- ${{ type: 'varchar', value: user_agent }},
139
- ${{ type: 1184, value: jwtExpIsoString }},
140
- ${{ type: 'varchar', value: uuid }}
141
- )
142
- `.execute();
143
- }
144
- }
145
- async reportClientDisconnection(data) {
146
- const { user_id, client_id, disconnected_at, connected_at } = data;
147
- const disconnectIsoString = disconnected_at.toISOString();
148
- const connectIsoString = connected_at.toISOString();
149
- await this.db.sql `
150
- UPDATE connection_report_events
151
- SET
152
- disconnected_at = ${{ type: 1184, value: disconnectIsoString }},
153
- jwt_exp = NULL
154
- WHERE
155
- user_id = ${{ type: 'varchar', value: user_id }}
156
- AND client_id = ${{ type: 'varchar', value: client_id }}
157
- AND connected_at = ${{ type: 1184, value: connectIsoString }}
158
- `.execute();
159
- }
160
- async getConnectedClients() {
161
- const result = await this.listConnectionsQuery();
162
- return this.mapListCurrentConnectionsResponse(result);
163
- }
164
- async getClientConnectionReports(data) {
165
- const { start, end } = data;
166
- const result = await this.db.sql `
167
- WITH
168
- filtered AS (
169
- SELECT
170
- *
171
- FROM
172
- connection_report_events
173
- WHERE
174
- connected_at >= ${{ type: 1184, value: start.toISOString() }}
175
- AND connected_at <= ${{ type: 1184, value: end.toISOString() }}
176
- ),
177
- unique_users AS (
178
- SELECT
179
- COUNT(DISTINCT user_id) AS count
180
- FROM
181
- filtered
182
- ),
183
- sdk_versions_array AS (
184
- SELECT
185
- sdk,
186
- COUNT(DISTINCT client_id) AS clients,
187
- COUNT(DISTINCT user_id) AS users
188
- FROM
189
- filtered
190
- GROUP BY
191
- sdk
192
- )
193
- SELECT
194
- (
195
- SELECT
196
- COALESCE(count, 0)
197
- FROM
198
- unique_users
199
- ) AS users,
200
- (
201
- SELECT
202
- JSON_AGG(ROW_TO_JSON(s))
203
- FROM
204
- sdk_versions_array s
205
- ) AS sdks;
206
- `
207
- .decoded(SdkReporting)
208
- .first();
209
- return this.mapListCurrentConnectionsResponse(result);
210
- }
211
- async deleteOldConnectionData(data) {
212
- const { date } = data;
213
- const result = await this.db.sql `
214
- DELETE FROM connection_report_events
215
- WHERE
216
- connected_at < ${{ type: 1184, value: date.toISOString() }}
217
- AND (
218
- disconnected_at IS NOT NULL
219
- OR (
220
- jwt_exp < NOW()
221
- AND disconnected_at IS NULL
222
- )
223
- );
224
- `.execute();
225
- const deletedRows = toInteger(result.results[1].status.split(' ')[1] || '0');
226
- if (deletedRows > 0) {
227
- logger.info(`TTL from ${date.toISOString()}: ${deletedRows} PostgresSQL rows have been removed from connection_report_events.`);
228
- }
229
- }
230
- async [Symbol.asyncDispose]() {
231
- await this.db[Symbol.asyncDispose]();
232
- }
233
- async prepareStatements(connection) {
234
- // It should be possible to prepare statements for some common operations here.
235
- // This has not been implemented yet.
236
- }
237
- }
238
- //# sourceMappingURL=PostgresReportStorageFactory.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"PostgresReportStorageFactory.js","sourceRoot":"","sources":["../../src/storage/PostgresReportStorageFactory.ts"],"names":[],"mappings":"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"}
@@ -1,17 +0,0 @@
1
- import * as t from 'ts-codec';
2
- import { bigint, jsonb } from '../codecs.js';
3
- export const Sdks = t.object({
4
- sdk: t.string,
5
- clients: t.number,
6
- users: t.number
7
- });
8
- export const SdkReporting = t.object({
9
- users: bigint,
10
- sdks: t
11
- .object({
12
- data: jsonb(t.array(Sdks))
13
- })
14
- .optional()
15
- .or(t.Null)
16
- });
17
- //# sourceMappingURL=SdkReporting.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"SdkReporting.js","sourceRoot":"","sources":["../../../src/types/models/SdkReporting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,GAAG,EAAE,CAAC,CAAC,MAAM;IACb,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,KAAK,EAAE,CAAC,CAAC,MAAM;CAChB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,CAAC;SACJ,MAAM,CAAC;QACN,IAAI,EAAE,KAAK,CAAS,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KACnC,CAAC;SACD,QAAQ,EAAE;SACV,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;CACd,CAAC,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../src/utils/test-utils.ts"],"names":[],"mappings":"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"}
@@ -1,41 +0,0 @@
1
- import { migrations } from '@powersync/service-core';
2
- import { openMigrationDB } from '../migration-utils.js';
3
-
4
- export const up: migrations.PowerSyncMigrationFunction = async (context) => {
5
- const {
6
- service_context: { configuration }
7
- } = context;
8
- await using client = openMigrationDB(configuration.storage);
9
- await client.transaction(async (db) => {
10
- await db.sql`
11
- CREATE TABLE IF NOT EXISTS connection_report_events (
12
- id TEXT PRIMARY KEY,
13
- user_agent TEXT NOT NULL,
14
- client_id TEXT NOT NULL,
15
- user_id TEXT NOT NULL,
16
- sdk TEXT NOT NULL,
17
- jwt_exp TIMESTAMP WITH TIME ZONE,
18
- connected_at TIMESTAMP WITH TIME ZONE NOT NULL,
19
- disconnected_at TIMESTAMP WITH TIME ZONE
20
- )
21
- `.execute();
22
-
23
- await db.sql`
24
- CREATE INDEX IF NOT EXISTS sdk_list_index ON connection_report_events (connected_at, jwt_exp, disconnected_at)
25
- `.execute();
26
-
27
- await db.sql`CREATE INDEX IF NOT EXISTS sdk_user_id_index ON connection_report_events (user_id)`.execute();
28
-
29
- await db.sql`CREATE INDEX IF NOT EXISTS sdk_client_id_index ON connection_report_events (client_id)`.execute();
30
-
31
- await db.sql`CREATE INDEX IF NOT EXISTS sdk_index ON connection_report_events (sdk)`.execute();
32
- });
33
- };
34
-
35
- export const down: migrations.PowerSyncMigrationFunction = async (context) => {
36
- const {
37
- service_context: { configuration }
38
- } = context;
39
- await using client = openMigrationDB(configuration.storage);
40
- await client.sql`DROP TABLE IF EXISTS connection_report_events`.execute();
41
- };
@@ -1,258 +0,0 @@
1
- import { storage } from '@powersync/service-core';
2
- import * as pg_wire from '@powersync/service-jpgwire';
3
- import { event_types } from '@powersync/service-types';
4
- import { v4 } from 'uuid';
5
- import * as lib_postgres from '@powersync/lib-service-postgres';
6
- import { NormalizedPostgresStorageConfig } from '../types/types.js';
7
- import { SdkReporting, SdkReportingDecoded } from '../types/models/SdkReporting.js';
8
- import { toInteger } from 'ix/util/tointeger.js';
9
- import { logger } from '@powersync/lib-services-framework';
10
- import { getStorageApplicationName } from '../utils/application-name.js';
11
- import { STORAGE_SCHEMA_NAME } from '../utils/db.js';
12
-
13
- export type PostgresReportStorageOptions = {
14
- config: NormalizedPostgresStorageConfig;
15
- };
16
-
17
- export class PostgresReportStorageFactory implements storage.ReportStorage {
18
- readonly db: lib_postgres.DatabaseClient;
19
- constructor(protected options: PostgresReportStorageOptions) {
20
- this.db = new lib_postgres.DatabaseClient({
21
- config: options.config,
22
- schema: STORAGE_SCHEMA_NAME,
23
- applicationName: getStorageApplicationName()
24
- });
25
-
26
- this.db.registerListener({
27
- connectionCreated: async (connection) => this.prepareStatements(connection)
28
- });
29
- }
30
-
31
- private parseJsDate(date: Date) {
32
- const year = date.getFullYear();
33
- const month = date.getMonth();
34
- const today = date.getDate();
35
- const day = date.getDay();
36
- return {
37
- year,
38
- month,
39
- today,
40
- day,
41
- parsedDate: date
42
- };
43
- }
44
-
45
- private mapListCurrentConnectionsResponse(
46
- result: SdkReportingDecoded | null
47
- ): event_types.ClientConnectionReportResponse {
48
- if (!result) {
49
- return {
50
- users: 0,
51
- sdks: []
52
- };
53
- }
54
- return {
55
- users: Number(result.users),
56
- sdks: result.sdks?.data || []
57
- };
58
- }
59
- private async listConnectionsQuery() {
60
- return await this.db.sql`
61
- WITH
62
- filtered AS (
63
- SELECT
64
- *
65
- FROM
66
- connection_report_events
67
- WHERE
68
- disconnected_at IS NULL
69
- AND jwt_exp > NOW()
70
- ),
71
- unique_users AS (
72
- SELECT
73
- COUNT(DISTINCT user_id) AS count
74
- FROM
75
- filtered
76
- ),
77
- sdk_versions_array AS (
78
- SELECT
79
- sdk,
80
- COUNT(DISTINCT client_id) AS clients,
81
- COUNT(DISTINCT user_id) AS users
82
- FROM
83
- filtered
84
- GROUP BY
85
- sdk
86
- )
87
- SELECT
88
- (
89
- SELECT
90
- COALESCE(count, 0)
91
- FROM
92
- unique_users
93
- ) AS users,
94
- (
95
- SELECT
96
- JSON_AGG(ROW_TO_JSON(s))
97
- FROM
98
- sdk_versions_array s
99
- ) AS sdks;
100
- `
101
- .decoded(SdkReporting)
102
- .first();
103
- }
104
-
105
- private updateTableFilter() {
106
- const { year, month, today } = this.parseJsDate(new Date());
107
- const nextDay = today + 1;
108
- return {
109
- gte: new Date(year, month, today).toISOString(),
110
- lt: new Date(year, month, nextDay).toISOString()
111
- };
112
- }
113
-
114
- async reportClientConnection(data: event_types.ClientConnectionBucketData): Promise<void> {
115
- const { sdk, connected_at, user_id, user_agent, jwt_exp, client_id } = data;
116
- const connectIsoString = connected_at.toISOString();
117
- const jwtExpIsoString = jwt_exp.toISOString();
118
- const { gte, lt } = this.updateTableFilter();
119
- const uuid = v4();
120
- const result = await this.db.sql`
121
- UPDATE connection_report_events
122
- SET
123
- connected_at = ${{ type: 1184, value: connectIsoString }},
124
- sdk = ${{ type: 'varchar', value: sdk }},
125
- user_agent = ${{ type: 'varchar', value: user_agent }},
126
- jwt_exp = ${{ type: 1184, value: jwtExpIsoString }},
127
- disconnected_at = NULL
128
- WHERE
129
- user_id = ${{ type: 'varchar', value: user_id }}
130
- AND client_id = ${{ type: 'varchar', value: client_id }}
131
- AND connected_at >= ${{ type: 1184, value: gte }}
132
- AND connected_at < ${{ type: 1184, value: lt }};
133
- `.execute();
134
- if (result.results[1].status === 'UPDATE 0') {
135
- await this.db.sql`
136
- INSERT INTO
137
- connection_report_events (
138
- user_id,
139
- client_id,
140
- connected_at,
141
- sdk,
142
- user_agent,
143
- jwt_exp,
144
- id
145
- )
146
- VALUES
147
- (
148
- ${{ type: 'varchar', value: user_id }},
149
- ${{ type: 'varchar', value: client_id }},
150
- ${{ type: 1184, value: connectIsoString }},
151
- ${{ type: 'varchar', value: sdk }},
152
- ${{ type: 'varchar', value: user_agent }},
153
- ${{ type: 1184, value: jwtExpIsoString }},
154
- ${{ type: 'varchar', value: uuid }}
155
- )
156
- `.execute();
157
- }
158
- }
159
- async reportClientDisconnection(data: event_types.ClientDisconnectionEventData): Promise<void> {
160
- const { user_id, client_id, disconnected_at, connected_at } = data;
161
- const disconnectIsoString = disconnected_at.toISOString();
162
- const connectIsoString = connected_at.toISOString();
163
- await this.db.sql`
164
- UPDATE connection_report_events
165
- SET
166
- disconnected_at = ${{ type: 1184, value: disconnectIsoString }},
167
- jwt_exp = NULL
168
- WHERE
169
- user_id = ${{ type: 'varchar', value: user_id }}
170
- AND client_id = ${{ type: 'varchar', value: client_id }}
171
- AND connected_at = ${{ type: 1184, value: connectIsoString }}
172
- `.execute();
173
- }
174
- async getConnectedClients(): Promise<event_types.ClientConnectionReportResponse> {
175
- const result = await this.listConnectionsQuery();
176
- return this.mapListCurrentConnectionsResponse(result);
177
- }
178
-
179
- async getClientConnectionReports(
180
- data: event_types.ClientConnectionReportRequest
181
- ): Promise<event_types.ClientConnectionReportResponse> {
182
- const { start, end } = data;
183
- const result = await this.db.sql`
184
- WITH
185
- filtered AS (
186
- SELECT
187
- *
188
- FROM
189
- connection_report_events
190
- WHERE
191
- connected_at >= ${{ type: 1184, value: start.toISOString() }}
192
- AND connected_at <= ${{ type: 1184, value: end.toISOString() }}
193
- ),
194
- unique_users AS (
195
- SELECT
196
- COUNT(DISTINCT user_id) AS count
197
- FROM
198
- filtered
199
- ),
200
- sdk_versions_array AS (
201
- SELECT
202
- sdk,
203
- COUNT(DISTINCT client_id) AS clients,
204
- COUNT(DISTINCT user_id) AS users
205
- FROM
206
- filtered
207
- GROUP BY
208
- sdk
209
- )
210
- SELECT
211
- (
212
- SELECT
213
- COALESCE(count, 0)
214
- FROM
215
- unique_users
216
- ) AS users,
217
- (
218
- SELECT
219
- JSON_AGG(ROW_TO_JSON(s))
220
- FROM
221
- sdk_versions_array s
222
- ) AS sdks;
223
- `
224
- .decoded(SdkReporting)
225
- .first();
226
- return this.mapListCurrentConnectionsResponse(result);
227
- }
228
- async deleteOldConnectionData(data: event_types.DeleteOldConnectionData): Promise<void> {
229
- const { date } = data;
230
- const result = await this.db.sql`
231
- DELETE FROM connection_report_events
232
- WHERE
233
- connected_at < ${{ type: 1184, value: date.toISOString() }}
234
- AND (
235
- disconnected_at IS NOT NULL
236
- OR (
237
- jwt_exp < NOW()
238
- AND disconnected_at IS NULL
239
- )
240
- );
241
- `.execute();
242
- const deletedRows = toInteger(result.results[1].status.split(' ')[1] || '0');
243
- if (deletedRows > 0) {
244
- logger.info(
245
- `TTL from ${date.toISOString()}: ${deletedRows} PostgresSQL rows have been removed from connection_report_events.`
246
- );
247
- }
248
- }
249
-
250
- async [Symbol.asyncDispose]() {
251
- await this.db[Symbol.asyncDispose]();
252
- }
253
-
254
- async prepareStatements(connection: pg_wire.PgConnection) {
255
- // It should be possible to prepare statements for some common operations here.
256
- // This has not been implemented yet.
257
- }
258
- }
@@ -1,23 +0,0 @@
1
- import * as t from 'ts-codec';
2
- import { bigint, jsonb } from '../codecs.js';
3
-
4
- export const Sdks = t.object({
5
- sdk: t.string,
6
- clients: t.number,
7
- users: t.number
8
- });
9
-
10
- export type Sdks = t.Encoded<typeof Sdks>;
11
-
12
- export const SdkReporting = t.object({
13
- users: bigint,
14
- sdks: t
15
- .object({
16
- data: jsonb<Sdks[]>(t.array(Sdks))
17
- })
18
- .optional()
19
- .or(t.Null)
20
- });
21
-
22
- export type SdkReporting = t.Encoded<typeof SdkReporting>;
23
- export type SdkReportingDecoded = t.Decoded<typeof SdkReporting>;