@cogenta/analytics 0.3.3 → 0.3.6
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/session-hash.d.ts +14 -1
- package/dist/session-hash.d.ts.map +1 -1
- package/dist/session-hash.js +22 -5
- package/dist/session-hash.js.map +1 -1
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +3 -3
- package/dist/store.js.map +1 -1
- package/dist/tables.d.ts.map +1 -1
- package/dist/tables.js +2 -5
- package/dist/tables.js.map +1 -1
- package/package.json +2 -2
package/dist/session-hash.d.ts
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
|
-
import { type DatabaseHandle } from '@cogenta/core';
|
|
1
|
+
import { type DatabaseDialect, type DatabaseHandle, type SqlFragment } from '@cogenta/core';
|
|
2
2
|
export declare function dailySaltTableName(): string;
|
|
3
|
+
/**
|
|
4
|
+
* `text` on SQLite, `varchar(n)` everywhere else.
|
|
5
|
+
*
|
|
6
|
+
* MySQL refuses to index a TEXT column without a key length — "BLOB/TEXT
|
|
7
|
+
* column used in key specification without a key length" — so a `text`
|
|
8
|
+
* primary key is not portable. `tables.ts` had this right for the events
|
|
9
|
+
* table and this one did not, which is why MySQL was the only dialect that
|
|
10
|
+
* ever complained.
|
|
11
|
+
*
|
|
12
|
+
* It lives here, the lower of the two modules, because `tables.ts` already
|
|
13
|
+
* imports from this file; the other direction would be a cycle.
|
|
14
|
+
*/
|
|
15
|
+
export declare function textColumn(dialect: DatabaseDialect, length: number): SqlFragment;
|
|
3
16
|
export declare function ensureDailySaltTable(db: DatabaseHandle): Promise<void>;
|
|
4
17
|
/** `YYYY-MM-DD`, always UTC so the salt's day boundary never depends on server timezone. */
|
|
5
18
|
export declare function utcDateKey(at: number): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-hash.d.ts","sourceRoot":"","sources":["../src/session-hash.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"session-hash.d.ts","sourceRoot":"","sources":["../src/session-hash.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,cAAc,EAEnB,KAAK,WAAW,EAGjB,MAAM,eAAe,CAAA;AA2BtB,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAEhF;AAED,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAU5E;AAED,4FAA4F;AAC5F,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,MAAM,WAAW,cAAc;IAC7B,uFAAuF;IACvF,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACrC;;;;;;OAMG;IACH,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CACnD;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,cAAc,EAClB,GAAG,GAAE,MAAM,MAAiB,GAC3B,cAAc,CAwChB;AAED,yHAAyH;AACzH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE5E"}
|
package/dist/session-hash.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createHash, randomBytes } from 'node:crypto';
|
|
2
|
-
import { CogentaError, identifier, sql } from '@cogenta/core';
|
|
2
|
+
import { CogentaError, identifier, sql, unsafeRaw, } from '@cogenta/core';
|
|
3
3
|
/**
|
|
4
4
|
* The privacy core of this package.
|
|
5
5
|
*
|
|
@@ -26,13 +26,30 @@ const TABLE = 'cogenta_analytics_daily_salts';
|
|
|
26
26
|
export function dailySaltTableName() {
|
|
27
27
|
return TABLE;
|
|
28
28
|
}
|
|
29
|
+
/**
|
|
30
|
+
* `text` on SQLite, `varchar(n)` everywhere else.
|
|
31
|
+
*
|
|
32
|
+
* MySQL refuses to index a TEXT column without a key length — "BLOB/TEXT
|
|
33
|
+
* column used in key specification without a key length" — so a `text`
|
|
34
|
+
* primary key is not portable. `tables.ts` had this right for the events
|
|
35
|
+
* table and this one did not, which is why MySQL was the only dialect that
|
|
36
|
+
* ever complained.
|
|
37
|
+
*
|
|
38
|
+
* It lives here, the lower of the two modules, because `tables.ts` already
|
|
39
|
+
* imports from this file; the other direction would be a cycle.
|
|
40
|
+
*/
|
|
41
|
+
export function textColumn(dialect, length) {
|
|
42
|
+
return unsafeRaw(dialect === 'sqlite' ? 'text' : `varchar(${length})`);
|
|
43
|
+
}
|
|
29
44
|
export async function ensureDailySaltTable(db) {
|
|
30
|
-
const
|
|
45
|
+
const d = db.dialect;
|
|
46
|
+
const table = identifier(TABLE, d);
|
|
47
|
+
// `day` is a `YYYY-MM-DD` key, never longer than ten characters.
|
|
31
48
|
await db.query(sql `
|
|
32
49
|
create table if not exists ${table} (
|
|
33
|
-
day
|
|
34
|
-
salt
|
|
35
|
-
created_at
|
|
50
|
+
day ${textColumn(d, 32)} not null primary key,
|
|
51
|
+
salt ${textColumn(d, 128)} not null,
|
|
52
|
+
created_at ${textColumn(d, 64)} not null
|
|
36
53
|
)`);
|
|
37
54
|
}
|
|
38
55
|
/** `YYYY-MM-DD`, always UTC so the salt's day boundary never depends on server timezone. */
|
package/dist/session-hash.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-hash.js","sourceRoot":"","sources":["../src/session-hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"session-hash.js","sourceRoot":"","sources":["../src/session-hash.ts"],"names":[],"mappings":"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"}
|
package/dist/store.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAiC,MAAM,eAAe,CAAA;AAKlF,OAAO,KAAK,EACV,gBAAgB,EAKhB,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACf,MAAM,YAAY,CAAA;AAqBnB,eAAO,MAAM,qBAAqB,KAAK,CAAA;AAEvC,MAAM,WAAW,cAAc;IAC7B;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;IAC9E,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC9D;;;;OAIG;IACH,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;IAC3D;;;;;OAKG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC9D;;;;;;OAMG;IACH,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CAC9D;AAYD,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,cAAc,EAClB,GAAG,GAAE,MAAM,MAAiB,GAC3B,cAAc,CAyMhB"}
|
package/dist/store.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { identifier, newId, sql } from '@cogenta/core';
|
|
1
|
+
import { identifier, limit, newId, sql } from '@cogenta/core';
|
|
2
2
|
import { classifyDevice } from './device.js';
|
|
3
3
|
import { extractReferrerDomain } from './referrer.js';
|
|
4
4
|
import { createDailySaltStore, hashSession, utcDateKey } from './session-hash.js';
|
|
@@ -91,13 +91,13 @@ export function createAnalyticsStore(db, now = Date.now) {
|
|
|
91
91
|
where at >= ${sinceIso} and at <= ${untilIso}
|
|
92
92
|
group by path
|
|
93
93
|
order by count(*) desc
|
|
94
|
-
limit ${rowLimit}`);
|
|
94
|
+
limit ${limit(rowLimit)}`);
|
|
95
95
|
const topReferrersResult = await db.query(sql `
|
|
96
96
|
select referrer_domain, count(*) as n from ${events}
|
|
97
97
|
where at >= ${sinceIso} and at <= ${untilIso} and referrer_domain is not null
|
|
98
98
|
group by referrer_domain
|
|
99
99
|
order by count(*) desc
|
|
100
|
-
limit ${rowLimit}`);
|
|
100
|
+
limit ${limit(rowLimit)}`);
|
|
101
101
|
const deviceResult = await db.query(sql `
|
|
102
102
|
select device, count(*) as n from ${events}
|
|
103
103
|
where at >= ${sinceIso} and at <= ${untilIso}
|
package/dist/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"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"}
|
package/dist/tables.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAqC,MAAM,eAAe,CAAA;AAGtF,eAAO,MAAM,MAAM;aACjB,MAAM,EAAE,0BAA0B;CAC1B,CAAA;AAEV;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC7E"}
|
package/dist/tables.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import { identifier, sql
|
|
2
|
-
import { ensureDailySaltTable } from './session-hash.js';
|
|
1
|
+
import { identifier, sql } from '@cogenta/core';
|
|
2
|
+
import { ensureDailySaltTable, textColumn } from './session-hash.js';
|
|
3
3
|
export const TABLES = {
|
|
4
4
|
events: 'cogenta_analytics_events',
|
|
5
5
|
};
|
|
6
|
-
function textColumn(dialect, length) {
|
|
7
|
-
return unsafeRaw(dialect === 'sqlite' ? 'text' : `varchar(${length})`);
|
|
8
|
-
}
|
|
9
6
|
/**
|
|
10
7
|
* Creates the events table (and the daily-salt table from `session-hash.ts`)
|
|
11
8
|
* if they are not already there. Same idempotent, dialect-agnostic pattern as
|
package/dist/tables.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.js","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tables.js","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,UAAU,EAAoB,GAAG,EAAE,MAAM,eAAe,CAAA;AACtF,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEpE,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,0BAA0B;CAC1B,CAAA;AAEV;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,EAAkB;IAC5D,MAAM,oBAAoB,CAAC,EAAE,CAAC,CAAA;IAE9B,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAA;IACpB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAC/B,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAC7B,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAE7B,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAA;iCACa,MAAM;WAC5B,GAAG;;;;WAIH,GAAG;aACD,IAAI;;wBAEO,IAAI;eACb,GAAG;;;qBAGG,GAAG;MAClB,CAAC,CAAA;IAEL,MAAM,oBAAoB,CAAC,EAAE,EAAE,6BAA6B,EAAE,MAAM,EAAE,GAAG,CAAA,MAAM,CAAC,CAAA;IAChF,MAAM,oBAAoB,CAAC,EAAE,EAAE,+BAA+B,EAAE,MAAM,EAAE,GAAG,CAAA,YAAY,CAAC,CAAA;IACxF,MAAM,oBAAoB,CACxB,EAAE,EACF,kCAAkC,EAClC,MAAM,EACN,GAAG,CAAA,oBAAoB,CACxB,CAAA;AACH,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,EAAkB,EAClB,IAAY,EACZ,KAAkB,EAClB,OAAoB;IAEpB,MAAM,EAAE;SACL,KAAK,CAAC,GAAG,CAAA,gBAAgB,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,OAAO,EAAE,CAAC;SAC/E,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA,CAAC,0DAA0D;AACtF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cogenta/analytics",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.6",
|
|
4
4
|
"description": "Self-hosted, cookie-free, privacy-respecting page-view analytics.",
|
|
5
5
|
"license": "MPL-2.0",
|
|
6
6
|
"type": "module",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"directory": "packages/analytics"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@cogenta/core": "0.
|
|
30
|
+
"@cogenta/core": "0.11.0"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"typescript": "^7.0.2",
|