@syncular/server 0.0.2-137 → 0.0.2-139
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/stats.d.ts +1 -0
- package/dist/stats.d.ts.map +1 -1
- package/dist/stats.js +26 -22
- package/dist/stats.js.map +1 -1
- package/package.json +2 -2
- package/src/stats.ts +60 -47
package/dist/stats.d.ts
CHANGED
package/dist/stats.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAA+B,MAAM,QAAQ,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAiB3C,MAAM,WAAW,SAAS;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED,wBAAsB,aAAa,CAAC,EAAE,SAAS,UAAU,EACvD,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EACd,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAO,
|
|
1
|
+
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAA+B,MAAM,QAAQ,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAiB3C,MAAM,WAAW,SAAS;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED,wBAAsB,aAAa,CAAC,EAAE,SAAS,UAAU,EACvD,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EACd,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9D,OAAO,CAAC,SAAS,CAAC,CA+EpB"}
|
package/dist/stats.js
CHANGED
|
@@ -19,29 +19,33 @@ export async function readSyncStats(db, options = {}) {
|
|
|
19
19
|
const syncDb = db;
|
|
20
20
|
const activeWindowMs = options.activeWindowMs ?? 14 * 24 * 60 * 60 * 1000;
|
|
21
21
|
const cutoffIso = new Date(Date.now() - activeWindowMs).toISOString();
|
|
22
|
+
const partitionId = options.partitionId;
|
|
23
|
+
let commitQuery = syncDb.selectFrom('sync_commits').select(({ fn }) => [
|
|
24
|
+
fn.countAll().as('commitCount'),
|
|
25
|
+
fn.min('commit_seq').as('minCommitSeq'),
|
|
26
|
+
fn.max('commit_seq').as('maxCommitSeq'),
|
|
27
|
+
]);
|
|
28
|
+
let changeQuery = syncDb.selectFrom('sync_changes').select(({ fn }) => [fn.countAll().as('changeCount')]);
|
|
29
|
+
let clientQuery = syncDb.selectFrom('sync_client_cursors').select(({ fn }) => [fn.countAll().as('clientCount')]);
|
|
30
|
+
let activeClientQuery = syncDb.selectFrom('sync_client_cursors')
|
|
31
|
+
.where(sql `updated_at >= ${cutoffIso}`)
|
|
32
|
+
.where(sql `cursor >= ${0}`)
|
|
33
|
+
.select(({ fn }) => [
|
|
34
|
+
fn.countAll().as('activeClientCount'),
|
|
35
|
+
fn.min('cursor').as('minActiveClientCursor'),
|
|
36
|
+
fn.max('cursor').as('maxActiveClientCursor'),
|
|
37
|
+
]);
|
|
38
|
+
if (partitionId) {
|
|
39
|
+
commitQuery = commitQuery.where('partition_id', '=', partitionId);
|
|
40
|
+
changeQuery = changeQuery.where('partition_id', '=', partitionId);
|
|
41
|
+
clientQuery = clientQuery.where('partition_id', '=', partitionId);
|
|
42
|
+
activeClientQuery = activeClientQuery.where('partition_id', '=', partitionId);
|
|
43
|
+
}
|
|
22
44
|
const [commitRow, changeRow, clientRow, activeClientRow] = await Promise.all([
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
fn.max('commit_seq').as('maxCommitSeq'),
|
|
28
|
-
])
|
|
29
|
-
.executeTakeFirst(),
|
|
30
|
-
syncDb.selectFrom('sync_changes')
|
|
31
|
-
.select(({ fn }) => [fn.countAll().as('changeCount')])
|
|
32
|
-
.executeTakeFirst(),
|
|
33
|
-
syncDb.selectFrom('sync_client_cursors')
|
|
34
|
-
.select(({ fn }) => [fn.countAll().as('clientCount')])
|
|
35
|
-
.executeTakeFirst(),
|
|
36
|
-
syncDb.selectFrom('sync_client_cursors')
|
|
37
|
-
.where(sql `updated_at >= ${cutoffIso}`)
|
|
38
|
-
.where(sql `cursor >= ${0}`)
|
|
39
|
-
.select(({ fn }) => [
|
|
40
|
-
fn.countAll().as('activeClientCount'),
|
|
41
|
-
fn.min('cursor').as('minActiveClientCursor'),
|
|
42
|
-
fn.max('cursor').as('maxActiveClientCursor'),
|
|
43
|
-
])
|
|
44
|
-
.executeTakeFirst(),
|
|
45
|
+
commitQuery.executeTakeFirst(),
|
|
46
|
+
changeQuery.executeTakeFirst(),
|
|
47
|
+
clientQuery.executeTakeFirst(),
|
|
48
|
+
activeClientQuery.executeTakeFirst(),
|
|
45
49
|
]);
|
|
46
50
|
return {
|
|
47
51
|
commitCount: coerceNumber(commitRow?.commitCount) ?? 0,
|
package/dist/stats.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAM7B,SAAS,YAAY,CAAC,KAAc,EAAiB;IACnD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACvD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5E,IAAI,OAAO,KAAK,KAAK,QAAQ;QAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACxB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvC,CAAC;IACD,OAAO,IAAI,CAAC;AAAA,CACb;AAaD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,EAAc,EACd,OAAO,
|
|
1
|
+
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@syncular/server",
|
|
3
|
-
"version": "0.0.2-
|
|
3
|
+
"version": "0.0.2-139",
|
|
4
4
|
"description": "Server-side sync engine with push/pull, pruning, and snapshot support",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Benjamin Kniffler",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"release": "bunx syncular-publish"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@syncular/core": "0.0.2-
|
|
65
|
+
"@syncular/core": "0.0.2-139"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
68
|
"kysely": "^0.28.0",
|
package/src/stats.ts
CHANGED
|
@@ -34,61 +34,74 @@ export interface SyncStats {
|
|
|
34
34
|
|
|
35
35
|
export async function readSyncStats<DB extends SyncCoreDb>(
|
|
36
36
|
db: Kysely<DB>,
|
|
37
|
-
options: { activeWindowMs?: number } = {}
|
|
37
|
+
options: { activeWindowMs?: number; partitionId?: string } = {}
|
|
38
38
|
): Promise<SyncStats> {
|
|
39
39
|
type SyncDb = Pick<Kysely<SyncCoreDb>, 'selectFrom'>;
|
|
40
40
|
const syncDb = db as SyncDb;
|
|
41
41
|
|
|
42
42
|
const activeWindowMs = options.activeWindowMs ?? 14 * 24 * 60 * 60 * 1000;
|
|
43
43
|
const cutoffIso = new Date(Date.now() - activeWindowMs).toISOString();
|
|
44
|
+
const partitionId = options.partitionId;
|
|
45
|
+
|
|
46
|
+
let commitQuery = (
|
|
47
|
+
syncDb.selectFrom('sync_commits') as SelectQueryBuilder<
|
|
48
|
+
SyncCoreDb,
|
|
49
|
+
'sync_commits',
|
|
50
|
+
EmptySelection
|
|
51
|
+
>
|
|
52
|
+
).select(({ fn }) => [
|
|
53
|
+
fn.countAll().as('commitCount'),
|
|
54
|
+
fn.min('commit_seq').as('minCommitSeq'),
|
|
55
|
+
fn.max('commit_seq').as('maxCommitSeq'),
|
|
56
|
+
]);
|
|
57
|
+
|
|
58
|
+
let changeQuery = (
|
|
59
|
+
syncDb.selectFrom('sync_changes') as SelectQueryBuilder<
|
|
60
|
+
SyncCoreDb,
|
|
61
|
+
'sync_changes',
|
|
62
|
+
EmptySelection
|
|
63
|
+
>
|
|
64
|
+
).select(({ fn }) => [fn.countAll().as('changeCount')]);
|
|
65
|
+
|
|
66
|
+
let clientQuery = (
|
|
67
|
+
syncDb.selectFrom('sync_client_cursors') as SelectQueryBuilder<
|
|
68
|
+
SyncCoreDb,
|
|
69
|
+
'sync_client_cursors',
|
|
70
|
+
EmptySelection
|
|
71
|
+
>
|
|
72
|
+
).select(({ fn }) => [fn.countAll().as('clientCount')]);
|
|
73
|
+
|
|
74
|
+
let activeClientQuery = (
|
|
75
|
+
syncDb.selectFrom('sync_client_cursors') as SelectQueryBuilder<
|
|
76
|
+
SyncCoreDb,
|
|
77
|
+
'sync_client_cursors',
|
|
78
|
+
EmptySelection
|
|
79
|
+
>
|
|
80
|
+
)
|
|
81
|
+
.where(sql<SqlBool>`updated_at >= ${cutoffIso}`)
|
|
82
|
+
.where(sql<SqlBool>`cursor >= ${0}`)
|
|
83
|
+
.select(({ fn }) => [
|
|
84
|
+
fn.countAll().as('activeClientCount'),
|
|
85
|
+
fn.min('cursor').as('minActiveClientCursor'),
|
|
86
|
+
fn.max('cursor').as('maxActiveClientCursor'),
|
|
87
|
+
]);
|
|
88
|
+
|
|
89
|
+
if (partitionId) {
|
|
90
|
+
commitQuery = commitQuery.where('partition_id', '=', partitionId);
|
|
91
|
+
changeQuery = changeQuery.where('partition_id', '=', partitionId);
|
|
92
|
+
clientQuery = clientQuery.where('partition_id', '=', partitionId);
|
|
93
|
+
activeClientQuery = activeClientQuery.where(
|
|
94
|
+
'partition_id',
|
|
95
|
+
'=',
|
|
96
|
+
partitionId
|
|
97
|
+
);
|
|
98
|
+
}
|
|
44
99
|
|
|
45
100
|
const [commitRow, changeRow, clientRow, activeClientRow] = await Promise.all([
|
|
46
|
-
(
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
EmptySelection
|
|
51
|
-
>
|
|
52
|
-
)
|
|
53
|
-
.select(({ fn }) => [
|
|
54
|
-
fn.countAll().as('commitCount'),
|
|
55
|
-
fn.min('commit_seq').as('minCommitSeq'),
|
|
56
|
-
fn.max('commit_seq').as('maxCommitSeq'),
|
|
57
|
-
])
|
|
58
|
-
.executeTakeFirst(),
|
|
59
|
-
(
|
|
60
|
-
syncDb.selectFrom('sync_changes') as SelectQueryBuilder<
|
|
61
|
-
SyncCoreDb,
|
|
62
|
-
'sync_changes',
|
|
63
|
-
EmptySelection
|
|
64
|
-
>
|
|
65
|
-
)
|
|
66
|
-
.select(({ fn }) => [fn.countAll().as('changeCount')])
|
|
67
|
-
.executeTakeFirst(),
|
|
68
|
-
(
|
|
69
|
-
syncDb.selectFrom('sync_client_cursors') as SelectQueryBuilder<
|
|
70
|
-
SyncCoreDb,
|
|
71
|
-
'sync_client_cursors',
|
|
72
|
-
EmptySelection
|
|
73
|
-
>
|
|
74
|
-
)
|
|
75
|
-
.select(({ fn }) => [fn.countAll().as('clientCount')])
|
|
76
|
-
.executeTakeFirst(),
|
|
77
|
-
(
|
|
78
|
-
syncDb.selectFrom('sync_client_cursors') as SelectQueryBuilder<
|
|
79
|
-
SyncCoreDb,
|
|
80
|
-
'sync_client_cursors',
|
|
81
|
-
EmptySelection
|
|
82
|
-
>
|
|
83
|
-
)
|
|
84
|
-
.where(sql<SqlBool>`updated_at >= ${cutoffIso}`)
|
|
85
|
-
.where(sql<SqlBool>`cursor >= ${0}`)
|
|
86
|
-
.select(({ fn }) => [
|
|
87
|
-
fn.countAll().as('activeClientCount'),
|
|
88
|
-
fn.min('cursor').as('minActiveClientCursor'),
|
|
89
|
-
fn.max('cursor').as('maxActiveClientCursor'),
|
|
90
|
-
])
|
|
91
|
-
.executeTakeFirst(),
|
|
101
|
+
commitQuery.executeTakeFirst(),
|
|
102
|
+
changeQuery.executeTakeFirst(),
|
|
103
|
+
clientQuery.executeTakeFirst(),
|
|
104
|
+
activeClientQuery.executeTakeFirst(),
|
|
92
105
|
]);
|
|
93
106
|
|
|
94
107
|
return {
|