@huloglobal/vendure-plugin-visitor-analytics 0.2.0 → 0.3.1
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/CHANGELOG.md +22 -1
- package/dist/conversion-goal.entity.d.ts +28 -0
- package/dist/conversion-goal.entity.d.ts.map +1 -0
- package/dist/conversion-goal.entity.js +59 -0
- package/dist/conversion-goal.entity.js.map +1 -0
- package/dist/detect-bot.d.ts +16 -0
- package/dist/detect-bot.d.ts.map +1 -0
- package/dist/detect-bot.js +52 -0
- package/dist/detect-bot.js.map +1 -0
- package/dist/plugin.d.ts +31 -17
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +32 -18
- package/dist/plugin.js.map +1 -1
- package/dist/url-pattern.d.ts +2 -0
- package/dist/url-pattern.d.ts.map +1 -0
- package/dist/url-pattern.js +38 -0
- package/dist/url-pattern.js.map +1 -0
- package/dist/visitor-event.entity.d.ts +8 -0
- package/dist/visitor-event.entity.d.ts.map +1 -1
- package/dist/visitor-event.entity.js +10 -0
- package/dist/visitor-event.entity.js.map +1 -1
- package/dist/visitor-tracking.controller.d.ts +15 -0
- package/dist/visitor-tracking.controller.d.ts.map +1 -1
- package/dist/visitor-tracking.controller.js +211 -0
- package/dist/visitor-tracking.controller.js.map +1 -1
- package/dist/visitor-tracking.service.d.ts +5 -0
- package/dist/visitor-tracking.service.d.ts.map +1 -1
- package/dist/visitor-tracking.service.js +46 -0
- package/dist/visitor-tracking.service.js.map +1 -1
- package/package.json +1 -1
- package/ui/components/visitors.component.ts +51 -0
package/CHANGELOG.md
CHANGED
|
@@ -5,7 +5,28 @@ documented here. The format follows
|
|
|
5
5
|
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this
|
|
6
6
|
project adheres to [semantic versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
-
## [0.
|
|
8
|
+
## [0.3.0]
|
|
9
|
+
|
|
10
|
+
### Added
|
|
11
|
+
- **Conversion goals** — new `ConversionGoal` entity with a URL-glob
|
|
12
|
+
matcher (`*` within segment, `**` across segments). Pageviews matching
|
|
13
|
+
a goal are tagged with `goalId` at ingest. CRUD endpoints
|
|
14
|
+
(`GET /ees/goals`, `POST /ees/goals`, `PUT /ees/goals/:id`,
|
|
15
|
+
`DELETE /ees/goals/:id`) and `GET /ees/goals/stats` for completion
|
|
16
|
+
totals per period.
|
|
17
|
+
- **Bot detection** — UA-classified `isBot` boolean on every event.
|
|
18
|
+
Default keeps bot events for visibility; new `dropBotEvents` option
|
|
19
|
+
skips ingest entirely.
|
|
20
|
+
- **Privacy controls** —
|
|
21
|
+
- `honorDoNotTrack` (default `true`) — `DNT: 1` returns
|
|
22
|
+
`{stored:0, skipped:'dnt'}`
|
|
23
|
+
- `anonymizeIp` (default `true`) — IPv4 last octet / IPv6 last 80 bits
|
|
24
|
+
dropped before storage; `ipHash` still uses the raw IP
|
|
25
|
+
- `requireConsent` (default `false`) — gate ingest behind a body
|
|
26
|
+
`consent:true` or cookie `ees_consent=1`
|
|
27
|
+
- **CSV export** — `GET /ees/visitors/export.csv?days=N` (max 90).
|
|
28
|
+
|
|
29
|
+
## [0.2.0]
|
|
9
30
|
|
|
10
31
|
### Added
|
|
11
32
|
- **UTM attribution** — `utmSource` / `utmMedium` / `utmCampaign` /
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { DeepPartial, VendureEntity } from '@vendure/core';
|
|
2
|
+
/**
|
|
3
|
+
* A configurable funnel-completion target. Each goal is matched against
|
|
4
|
+
* every incoming `pageview` event — when a pageview's URL satisfies the
|
|
5
|
+
* pattern, the visitor is counted as having completed that goal.
|
|
6
|
+
*
|
|
7
|
+
* Pattern syntax (cheap glob, not regex):
|
|
8
|
+
* • `*` — match zero or more chars within a path segment
|
|
9
|
+
* • `**` — match zero or more segments
|
|
10
|
+
* • Anything else is a literal substring match
|
|
11
|
+
*
|
|
12
|
+
* Examples:
|
|
13
|
+
* /checkout/thank-you/* — confirmation step
|
|
14
|
+
* /signup — exact path
|
|
15
|
+
* **\/wishlist — any wishlist page on any tenant
|
|
16
|
+
*/
|
|
17
|
+
export declare class ConversionGoal extends VendureEntity {
|
|
18
|
+
constructor(input?: DeepPartial<ConversionGoal>);
|
|
19
|
+
channelId: number;
|
|
20
|
+
name: string;
|
|
21
|
+
urlPattern: string;
|
|
22
|
+
/** Monetary value attached to a conversion, in the channel currency's
|
|
23
|
+
* minor units (pence / cents). Lets the dashboard show total goal
|
|
24
|
+
* value over a period. */
|
|
25
|
+
valueMinor: number;
|
|
26
|
+
enabled: boolean;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=conversion-goal.entity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversion-goal.entity.d.ts","sourceRoot":"","sources":["../src/conversion-goal.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG3D;;;;;;;;;;;;;;GAcG;AACH,qBACa,cAAe,SAAQ,aAAa;gBACjC,KAAK,CAAC,EAAE,WAAW,CAAC,cAAc,CAAC;IAI/C,SAAS,EAAG,MAAM,CAAC;IAGnB,IAAI,EAAG,MAAM,CAAC;IAGd,UAAU,EAAG,MAAM,CAAC;IAEpB;;8BAE0B;IAE1B,UAAU,EAAG,MAAM,CAAC;IAGpB,OAAO,EAAG,OAAO,CAAC;CACrB"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ConversionGoal = void 0;
|
|
13
|
+
const core_1 = require("@vendure/core");
|
|
14
|
+
const typeorm_1 = require("typeorm");
|
|
15
|
+
/**
|
|
16
|
+
* A configurable funnel-completion target. Each goal is matched against
|
|
17
|
+
* every incoming `pageview` event — when a pageview's URL satisfies the
|
|
18
|
+
* pattern, the visitor is counted as having completed that goal.
|
|
19
|
+
*
|
|
20
|
+
* Pattern syntax (cheap glob, not regex):
|
|
21
|
+
* • `*` — match zero or more chars within a path segment
|
|
22
|
+
* • `**` — match zero or more segments
|
|
23
|
+
* • Anything else is a literal substring match
|
|
24
|
+
*
|
|
25
|
+
* Examples:
|
|
26
|
+
* /checkout/thank-you/* — confirmation step
|
|
27
|
+
* /signup — exact path
|
|
28
|
+
* **\/wishlist — any wishlist page on any tenant
|
|
29
|
+
*/
|
|
30
|
+
let ConversionGoal = class ConversionGoal extends core_1.VendureEntity {
|
|
31
|
+
constructor(input) { super(input); }
|
|
32
|
+
};
|
|
33
|
+
exports.ConversionGoal = ConversionGoal;
|
|
34
|
+
__decorate([
|
|
35
|
+
(0, typeorm_1.Index)(),
|
|
36
|
+
(0, typeorm_1.Column)({ type: 'int', default: 1 }),
|
|
37
|
+
__metadata("design:type", Number)
|
|
38
|
+
], ConversionGoal.prototype, "channelId", void 0);
|
|
39
|
+
__decorate([
|
|
40
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 128 }),
|
|
41
|
+
__metadata("design:type", String)
|
|
42
|
+
], ConversionGoal.prototype, "name", void 0);
|
|
43
|
+
__decorate([
|
|
44
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 256 }),
|
|
45
|
+
__metadata("design:type", String)
|
|
46
|
+
], ConversionGoal.prototype, "urlPattern", void 0);
|
|
47
|
+
__decorate([
|
|
48
|
+
(0, typeorm_1.Column)({ type: 'int', default: 0 }),
|
|
49
|
+
__metadata("design:type", Number)
|
|
50
|
+
], ConversionGoal.prototype, "valueMinor", void 0);
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: true }),
|
|
53
|
+
__metadata("design:type", Boolean)
|
|
54
|
+
], ConversionGoal.prototype, "enabled", void 0);
|
|
55
|
+
exports.ConversionGoal = ConversionGoal = __decorate([
|
|
56
|
+
(0, typeorm_1.Entity)(),
|
|
57
|
+
__metadata("design:paramtypes", [Object])
|
|
58
|
+
], ConversionGoal);
|
|
59
|
+
//# sourceMappingURL=conversion-goal.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversion-goal.entity.js","sourceRoot":"","sources":["../src/conversion-goal.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2D;AAC3D,qCAAgD;AAEhD;;;;;;;;;;;;;;GAcG;AAEI,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAa;IAC7C,YAAY,KAAmC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CAoBrE,CAAA;AArBY,wCAAc;AAKvB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;iDACjB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;4CAC3B;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;kDACrB;AAMpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;kDAChB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;+CACzB;yBApBT,cAAc;IAD1B,IAAA,gBAAM,GAAE;;GACI,cAAc,CAqB1B"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Lightweight bot detection. Catches the ~95% of crawlers /
|
|
3
|
+
* monitoring probes / API tools that identify themselves in the UA
|
|
4
|
+
* string. We deliberately keep this conservative — a false negative
|
|
5
|
+
* just means a bot was counted; a false positive removes a real human
|
|
6
|
+
* from the dashboard.
|
|
7
|
+
*/
|
|
8
|
+
export declare function isBotUa(ua: string | null | undefined): boolean;
|
|
9
|
+
/**
|
|
10
|
+
* Drop the last octet of an IPv4 or the last 80 bits of an IPv6 so we
|
|
11
|
+
* keep approximately /24 / /48 granularity — enough to count uniques
|
|
12
|
+
* by network without storing exact addresses. Used when the
|
|
13
|
+
* `anonymizeIp` plugin option is on (the default).
|
|
14
|
+
*/
|
|
15
|
+
export declare function anonymizeIp(ip: string | null): string | null;
|
|
16
|
+
//# sourceMappingURL=detect-bot.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detect-bot.d.ts","sourceRoot":"","sources":["../src/detect-bot.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAeH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG9D;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAa5D"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Lightweight bot detection. Catches the ~95% of crawlers /
|
|
4
|
+
* monitoring probes / API tools that identify themselves in the UA
|
|
5
|
+
* string. We deliberately keep this conservative — a false negative
|
|
6
|
+
* just means a bot was counted; a false positive removes a real human
|
|
7
|
+
* from the dashboard.
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.isBotUa = isBotUa;
|
|
11
|
+
exports.anonymizeIp = anonymizeIp;
|
|
12
|
+
const BOT_PATTERNS = [
|
|
13
|
+
/\bbot\b/i, /spider/i, /crawler/i, /preview/i,
|
|
14
|
+
/googlebot/i, /bingbot/i, /duckduckbot/i, /yandex/i, /baidu/i,
|
|
15
|
+
/facebookexternalhit/i, /facebot/i, /twitterbot/i, /linkedinbot/i,
|
|
16
|
+
/slackbot/i, /telegrambot/i, /discordbot/i, /whatsapp/i,
|
|
17
|
+
/applebot/i, /amazonbot/i, /pinterestbot/i, /redditbot/i,
|
|
18
|
+
/ahrefsbot/i, /semrushbot/i, /mj12bot/i, /dotbot/i, /yandeximages/i,
|
|
19
|
+
/uptimerobot/i, /pingdom/i, /statuscake/i, /datadog/i, /newrelic/i,
|
|
20
|
+
/curl\//i, /wget\//i, /python-requests/i, /python-urllib/i, /libwww/i,
|
|
21
|
+
/node-fetch/i, /axios/i, /go-http-client/i, /java\//i, /okhttp/i,
|
|
22
|
+
/headlesschrome/i, /phantomjs/i, /selenium/i, /puppeteer/i, /playwright/i,
|
|
23
|
+
];
|
|
24
|
+
function isBotUa(ua) {
|
|
25
|
+
if (!ua)
|
|
26
|
+
return false;
|
|
27
|
+
return BOT_PATTERNS.some(p => p.test(ua));
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Drop the last octet of an IPv4 or the last 80 bits of an IPv6 so we
|
|
31
|
+
* keep approximately /24 / /48 granularity — enough to count uniques
|
|
32
|
+
* by network without storing exact addresses. Used when the
|
|
33
|
+
* `anonymizeIp` plugin option is on (the default).
|
|
34
|
+
*/
|
|
35
|
+
function anonymizeIp(ip) {
|
|
36
|
+
if (!ip)
|
|
37
|
+
return null;
|
|
38
|
+
if (ip.includes(':')) {
|
|
39
|
+
// IPv6 — keep first 3 hextets.
|
|
40
|
+
const parts = ip.split(':');
|
|
41
|
+
if (parts.length < 3)
|
|
42
|
+
return ip;
|
|
43
|
+
return parts.slice(0, 3).join(':') + '::';
|
|
44
|
+
}
|
|
45
|
+
if (ip.includes('.')) {
|
|
46
|
+
const parts = ip.split('.');
|
|
47
|
+
if (parts.length === 4)
|
|
48
|
+
return `${parts[0]}.${parts[1]}.${parts[2]}.0`;
|
|
49
|
+
}
|
|
50
|
+
return ip;
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=detect-bot.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detect-bot.js","sourceRoot":"","sources":["../src/detect-bot.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAeH,0BAGC;AAQD,kCAaC;AArCD,MAAM,YAAY,GAAG;IACjB,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU;IAC7C,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ;IAC7D,sBAAsB,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc;IACjE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW;IACvD,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY;IACxD,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe;IACnE,cAAc,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW;IAClE,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,SAAS;IACrE,aAAa,EAAE,QAAQ,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS;IAChE,iBAAiB,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa;CAC5E,CAAC;AAEF,SAAgB,OAAO,CAAC,EAA6B;IACjD,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IACtB,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,EAAiB;IACzC,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IACrB,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,+BAA+B;QAC/B,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAC9C,CAAC;IACD,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC"}
|
package/dist/plugin.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Type } from '@vendure/core';
|
|
2
|
+
import { UpdateChecker } from '@huloglobal/vendure-licence-sdk';
|
|
2
3
|
export interface VisitorAnalyticsPluginOptions {
|
|
3
4
|
/** Public host of the Vendure server. Used in licence host-match. */
|
|
4
5
|
publicBaseUrl: string;
|
|
@@ -7,32 +8,44 @@ export interface VisitorAnalyticsPluginOptions {
|
|
|
7
8
|
* 403 — i.e. data collection works for evaluation but you can't
|
|
8
9
|
* read the dashboard without a licence. */
|
|
9
10
|
licenceKey?: string;
|
|
11
|
+
/** When true (the default), respect the visitor's `DNT: 1` header —
|
|
12
|
+
* the ingest endpoint returns 200 immediately without writing a row. */
|
|
13
|
+
honorDoNotTrack?: boolean;
|
|
14
|
+
/** When true (the default), drop the last octet of the visitor IP
|
|
15
|
+
* before persisting. `ipHash` still uses the raw IP for unique
|
|
16
|
+
* counts so anonymisation doesn't break "unique visitor" totals. */
|
|
17
|
+
anonymizeIp?: boolean;
|
|
18
|
+
/** When true, refuse to ingest unless the request body sets
|
|
19
|
+
* `consent: true` or a request cookie `ees_consent=1` is present.
|
|
20
|
+
* Off by default — most installs handle consent client-side. */
|
|
21
|
+
requireConsent?: boolean;
|
|
22
|
+
/** When true, identified bot UAs are dropped instead of being
|
|
23
|
+
* ingested with `isBot=true`. Default false — keep bots so their
|
|
24
|
+
* share is visible on the dashboard. */
|
|
25
|
+
dropBotEvents?: boolean;
|
|
10
26
|
}
|
|
27
|
+
declare const DEFAULT_OPTIONS: Required<Omit<VisitorAnalyticsPluginOptions, 'publicBaseUrl' | 'licenceKey'>> & {
|
|
28
|
+
publicBaseUrl: string;
|
|
29
|
+
};
|
|
30
|
+
export declare function getOptions(): typeof DEFAULT_OPTIONS & VisitorAnalyticsPluginOptions;
|
|
11
31
|
/**
|
|
12
32
|
* `@huloglobal/vendure-plugin-visitor-analytics`
|
|
13
33
|
*
|
|
14
34
|
* Full-funnel visitor analytics: page views, time-on-page, exit pages,
|
|
15
|
-
* a configurable funnel,
|
|
16
|
-
* parsed user-agent + MaxMind GeoLite2
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
* Add to your Vendure config:
|
|
20
|
-
*
|
|
21
|
-
* ```ts
|
|
22
|
-
* import { VisitorAnalyticsPlugin } from '@huloglobal/vendure-plugin-visitor-analytics';
|
|
35
|
+
* a configurable funnel, conversion goals, bot detection, and a
|
|
36
|
+
* per-visitor profile drawer with parsed user-agent + MaxMind GeoLite2
|
|
37
|
+
* enrichment.
|
|
23
38
|
*
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
* publicBaseUrl: 'https://shop.example.com',
|
|
28
|
-
* licenceKey: process.env.HULO_LICENCE_KEY,
|
|
29
|
-
* }),
|
|
30
|
-
* ],
|
|
31
|
-
* };
|
|
32
|
-
* ```
|
|
39
|
+
* Survives login — guest events and signed-in events share the same
|
|
40
|
+
* `visitorId`. Privacy-aware: honours DNT, anonymises IPs and supports
|
|
41
|
+
* a consent gate, all toggleable via plugin options.
|
|
33
42
|
*/
|
|
34
43
|
export declare class VisitorAnalyticsPlugin {
|
|
35
44
|
private static revocation;
|
|
45
|
+
private static updateChecker;
|
|
46
|
+
static getUpdateChecker(): UpdateChecker | null;
|
|
47
|
+
static getPackageVersion(): string;
|
|
48
|
+
static getPackageName(): string;
|
|
36
49
|
static init(options: VisitorAnalyticsPluginOptions): Type<VisitorAnalyticsPlugin>;
|
|
37
50
|
static uiExtensions: {
|
|
38
51
|
extensionPath: string;
|
|
@@ -44,4 +57,5 @@ export declare class VisitorAnalyticsPlugin {
|
|
|
44
57
|
}[];
|
|
45
58
|
};
|
|
46
59
|
}
|
|
60
|
+
export {};
|
|
47
61
|
//# sourceMappingURL=plugin.d.ts.map
|
package/dist/plugin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,IAAI,EAAiB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,IAAI,EAAiB,MAAM,eAAe,CAAC;AACxE,OAAO,EAAqB,aAAa,EAAiB,MAAM,iCAAiC,CAAC;AAUlG,MAAM,WAAW,6BAA6B;IAC1C,qEAAqE;IACrE,aAAa,EAAE,MAAM,CAAC;IACtB;;;gDAG4C;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB;6EACyE;IACzE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;yEAEqE;IACrE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;qEAEiE;IACjE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;6CAEyC;IACzC,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAgBD,QAAA,MAAM,eAAe,EAAE,QAAQ,CAAC,IAAI,CAAC,6BAA6B,EAAE,eAAe,GAAG,YAAY,CAAC,CAAC,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAM7H,CAAC;AAGF,wBAAgB,UAAU,IAAI,OAAO,eAAe,GAAG,6BAA6B,CAEnF;AAED;;;;;;;;;;;GAWG;AACH,qBAOa,sBAAsB;IAC/B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAkC;IAC3D,OAAO,CAAC,MAAM,CAAC,aAAa,CAA8B;IAE1D,MAAM,CAAC,gBAAgB,IAAI,aAAa,GAAG,IAAI;IAC/C,MAAM,CAAC,iBAAiB,IAAI,MAAM;IAClC,MAAM,CAAC,cAAc,IAAI,MAAM;IAE/B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,6BAA6B,GAAG,IAAI,CAAC,sBAAsB,CAAC;IAiCjF,MAAM,CAAC,YAAY;;;;;;;;MAUjB;CACL"}
|
package/dist/plugin.js
CHANGED
|
@@ -8,11 +8,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var VisitorAnalyticsPlugin_1;
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.VisitorAnalyticsPlugin = void 0;
|
|
11
|
+
exports.getOptions = getOptions;
|
|
11
12
|
const core_1 = require("@vendure/core");
|
|
12
13
|
const vendure_licence_sdk_1 = require("@huloglobal/vendure-licence-sdk");
|
|
14
|
+
const conversion_goal_entity_1 = require("./conversion-goal.entity");
|
|
13
15
|
const visitor_event_entity_1 = require("./visitor-event.entity");
|
|
14
16
|
const visitor_tracking_service_1 = require("./visitor-tracking.service");
|
|
15
17
|
const visitor_tracking_controller_1 = require("./visitor-tracking.controller");
|
|
18
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
19
|
+
const PKG_VERSION = require('../package.json').version;
|
|
20
|
+
const PKG_NAME = '@huloglobal/vendure-plugin-visitor-analytics';
|
|
16
21
|
const HULO_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
|
|
17
22
|
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoLmNM5UljRqe71drM6lR
|
|
18
23
|
Ba5vXrLOcV3GAHkYvnVFQSqdE0avrge/jsD7WdA6x8qQFNRugxQcxDJa2l0+C+BH
|
|
@@ -25,35 +30,43 @@ UwIDAQAB
|
|
|
25
30
|
const PLUGIN_ID = 'vendure-plugin-visitor-analytics';
|
|
26
31
|
const REVOCATION_URL = process.env.HULO_LICENCE_REVOCATION_URL
|
|
27
32
|
|| 'https://elite.charity/licence/revoked.json';
|
|
33
|
+
const DEFAULT_OPTIONS = {
|
|
34
|
+
publicBaseUrl: 'http://localhost:3000',
|
|
35
|
+
honorDoNotTrack: true,
|
|
36
|
+
anonymizeIp: true,
|
|
37
|
+
requireConsent: false,
|
|
38
|
+
dropBotEvents: false,
|
|
39
|
+
};
|
|
40
|
+
let cachedOptions = DEFAULT_OPTIONS;
|
|
41
|
+
function getOptions() {
|
|
42
|
+
return { ...DEFAULT_OPTIONS, ...cachedOptions };
|
|
43
|
+
}
|
|
28
44
|
/**
|
|
29
45
|
* `@huloglobal/vendure-plugin-visitor-analytics`
|
|
30
46
|
*
|
|
31
47
|
* Full-funnel visitor analytics: page views, time-on-page, exit pages,
|
|
32
|
-
* a configurable funnel,
|
|
33
|
-
* parsed user-agent + MaxMind GeoLite2
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
* Add to your Vendure config:
|
|
48
|
+
* a configurable funnel, conversion goals, bot detection, and a
|
|
49
|
+
* per-visitor profile drawer with parsed user-agent + MaxMind GeoLite2
|
|
50
|
+
* enrichment.
|
|
37
51
|
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
* export const config: VendureConfig = {
|
|
42
|
-
* plugins: [
|
|
43
|
-
* VisitorAnalyticsPlugin.init({
|
|
44
|
-
* publicBaseUrl: 'https://shop.example.com',
|
|
45
|
-
* licenceKey: process.env.HULO_LICENCE_KEY,
|
|
46
|
-
* }),
|
|
47
|
-
* ],
|
|
48
|
-
* };
|
|
49
|
-
* ```
|
|
52
|
+
* Survives login — guest events and signed-in events share the same
|
|
53
|
+
* `visitorId`. Privacy-aware: honours DNT, anonymises IPs and supports
|
|
54
|
+
* a consent gate, all toggleable via plugin options.
|
|
50
55
|
*/
|
|
51
56
|
let VisitorAnalyticsPlugin = VisitorAnalyticsPlugin_1 = class VisitorAnalyticsPlugin {
|
|
57
|
+
static getUpdateChecker() { return VisitorAnalyticsPlugin_1.updateChecker; }
|
|
58
|
+
static getPackageVersion() { return PKG_VERSION; }
|
|
59
|
+
static getPackageName() { return PKG_NAME; }
|
|
52
60
|
static init(options) {
|
|
61
|
+
cachedOptions = options;
|
|
53
62
|
if (!VisitorAnalyticsPlugin_1.revocation) {
|
|
54
63
|
VisitorAnalyticsPlugin_1.revocation = new vendure_licence_sdk_1.RevocationChecker(REVOCATION_URL);
|
|
55
64
|
VisitorAnalyticsPlugin_1.revocation.start();
|
|
56
65
|
}
|
|
66
|
+
if (!VisitorAnalyticsPlugin_1.updateChecker) {
|
|
67
|
+
VisitorAnalyticsPlugin_1.updateChecker = new vendure_licence_sdk_1.UpdateChecker(PKG_NAME, PKG_VERSION);
|
|
68
|
+
VisitorAnalyticsPlugin_1.updateChecker.start();
|
|
69
|
+
}
|
|
57
70
|
const host = (options.publicBaseUrl || '')
|
|
58
71
|
.replace(/^https?:\/\//, '').replace(/\/.*$/, '');
|
|
59
72
|
const status = (0, vendure_licence_sdk_1.verifyLicence)({
|
|
@@ -73,6 +86,7 @@ let VisitorAnalyticsPlugin = VisitorAnalyticsPlugin_1 = class VisitorAnalyticsPl
|
|
|
73
86
|
};
|
|
74
87
|
exports.VisitorAnalyticsPlugin = VisitorAnalyticsPlugin;
|
|
75
88
|
VisitorAnalyticsPlugin.revocation = null;
|
|
89
|
+
VisitorAnalyticsPlugin.updateChecker = null;
|
|
76
90
|
VisitorAnalyticsPlugin.uiExtensions = {
|
|
77
91
|
extensionPath: __dirname + '/../ui',
|
|
78
92
|
ngModules: [
|
|
@@ -89,7 +103,7 @@ exports.VisitorAnalyticsPlugin = VisitorAnalyticsPlugin = VisitorAnalyticsPlugin
|
|
|
89
103
|
imports: [core_1.PluginCommonModule],
|
|
90
104
|
providers: [visitor_tracking_service_1.VisitorTrackingService],
|
|
91
105
|
controllers: [visitor_tracking_controller_1.VisitorTrackingController],
|
|
92
|
-
entities: [visitor_event_entity_1.VisitorEvent],
|
|
106
|
+
entities: [visitor_event_entity_1.VisitorEvent, conversion_goal_entity_1.ConversionGoal],
|
|
93
107
|
compatibility: '^3.0.0',
|
|
94
108
|
})
|
|
95
109
|
], VisitorAnalyticsPlugin);
|
package/dist/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":";;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":";;;;;;;;;;AA6DA,gCAEC;AA/DD,wCAAwE;AACxE,yEAAkG;AAClG,qEAA0D;AAC1D,iEAAsD;AACtD,yEAAoE;AACpE,+EAA0E;AAE1E,8DAA8D;AAC9D,MAAM,WAAW,GAAW,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;AAC/D,MAAM,QAAQ,GAAG,8CAA8C,CAAC;AA6BhE,MAAM,eAAe,GAAG;;;;;;;;yBAQC,CAAC;AAE1B,MAAM,SAAS,GAAG,kCAAkC,CAAC;AACrD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B;OACvD,4CAA4C,CAAC;AAEpD,MAAM,eAAe,GAA8G;IAC/H,aAAa,EAAE,uBAAuB;IACtC,eAAe,EAAE,IAAI;IACrB,WAAW,EAAE,IAAI;IACjB,cAAc,EAAE,KAAK;IACrB,aAAa,EAAE,KAAK;CACvB,CAAC;AAEF,IAAI,aAAa,GAAkC,eAAsB,CAAC;AAC1E,SAAgB,UAAU;IACtB,OAAO,EAAE,GAAG,eAAe,EAAE,GAAG,aAAa,EAAS,CAAC;AAC3D,CAAC;AAED;;;;;;;;;;;GAWG;AAQI,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAI/B,MAAM,CAAC,gBAAgB,KAA2B,OAAO,wBAAsB,CAAC,aAAa,CAAC,CAAC,CAAC;IAChG,MAAM,CAAC,iBAAiB,KAAa,OAAO,WAAW,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,cAAc,KAAa,OAAO,QAAQ,CAAC,CAAC,CAAC;IAEpD,MAAM,CAAC,IAAI,CAAC,OAAsC;QAC9C,aAAa,GAAG,OAAO,CAAC;QAExB,IAAI,CAAC,wBAAsB,CAAC,UAAU,EAAE,CAAC;YACrC,wBAAsB,CAAC,UAAU,GAAG,IAAI,uCAAiB,CAAC,cAAc,CAAC,CAAC;YAC1E,wBAAsB,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,wBAAsB,CAAC,aAAa,EAAE,CAAC;YACxC,wBAAsB,CAAC,aAAa,GAAG,IAAI,mCAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAChF,wBAAsB,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QACjD,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;aACrC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,IAAA,mCAAa,EAAC;YACzB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,QAAQ,EAAE,SAAS;YACnB,IAAI;YACJ,SAAS,EAAE,eAAe;YAC1B,UAAU,EAAE,wBAAsB,CAAC,UAAU,CAAC,aAAa,EAAE;SAChE,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAChB,sCAAsC;YACtC,OAAO,CAAC,IAAI,CACR,kDAAkD,MAAM,CAAC,OAAO,EAAE;gBAClE,uIAAuI,SAAS,EAAE,CACrJ,CAAC;QACN,CAAC;QAED,OAAO,wBAAsB,CAAC;IAClC,CAAC;;AAvCQ,wDAAsB;AAChB,iCAAU,GAA6B,IAAI,AAAjC,CAAkC;AAC5C,oCAAa,GAAyB,IAAI,AAA7B,CAA8B;AAuCnD,mCAAY,GAAG;IAClB,aAAa,EAAE,SAAS,GAAG,QAAQ;IACnC,SAAS,EAAE;QACP;YACI,IAAI,EAAE,MAAe;YACrB,KAAK,EAAE,UAAU;YACjB,gBAAgB,EAAE,oBAAoB;YACtC,YAAY,EAAE,gBAAgB;SACjC;KACJ;CACJ,AAVkB,CAUjB;iCAnDO,sBAAsB;IAPlC,IAAA,oBAAa,EAAC;QACX,OAAO,EAAE,CAAC,yBAAkB,CAAC;QAC7B,SAAS,EAAE,CAAC,iDAAsB,CAAC;QACnC,WAAW,EAAE,CAAC,uDAAyB,CAAC;QACxC,QAAQ,EAAE,CAAC,mCAAY,EAAE,uCAAc,CAAC;QACxC,aAAa,EAAE,QAAQ;KAC1B,CAAC;GACW,sBAAsB,CAoDlC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-pattern.d.ts","sourceRoot":"","sources":["../src/url-pattern.ts"],"names":[],"mappings":"AAyBA,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAO9D"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.matchUrl = matchUrl;
|
|
4
|
+
/**
|
|
5
|
+
* Cheap URL glob matcher used by ConversionGoal.
|
|
6
|
+
*
|
|
7
|
+
* `*` — match zero or more chars within a path segment
|
|
8
|
+
* `**` — match zero or more segments (the `/` separator inclusive)
|
|
9
|
+
* anything else is a literal character (case-insensitive)
|
|
10
|
+
*
|
|
11
|
+
* Patterns are compiled to a RegExp once and cached so the matcher is
|
|
12
|
+
* cheap on the hot ingest path.
|
|
13
|
+
*/
|
|
14
|
+
const cache = new Map();
|
|
15
|
+
const STAR_STAR = '__DOUBLE_STAR__';
|
|
16
|
+
function compile(pattern) {
|
|
17
|
+
const cached = cache.get(pattern);
|
|
18
|
+
if (cached)
|
|
19
|
+
return cached;
|
|
20
|
+
let s = pattern.replace(/\*\*/g, STAR_STAR);
|
|
21
|
+
s = s.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
|
|
22
|
+
s = s.replace(/\*/g, '[^/]*');
|
|
23
|
+
s = s.split(STAR_STAR).join('.*');
|
|
24
|
+
const re = new RegExp(`^${s}$`, 'i');
|
|
25
|
+
cache.set(pattern, re);
|
|
26
|
+
return re;
|
|
27
|
+
}
|
|
28
|
+
function matchUrl(pattern, url) {
|
|
29
|
+
if (!pattern || !url)
|
|
30
|
+
return false;
|
|
31
|
+
try {
|
|
32
|
+
return compile(pattern).test(url);
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=url-pattern.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-pattern.js","sourceRoot":"","sources":["../src/url-pattern.ts"],"names":[],"mappings":";;AAyBA,4BAOC;AAhCD;;;;;;;;;GASG;AACH,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;AACxC,MAAM,SAAS,GAAG,iBAAiB,CAAC;AAEpC,SAAS,OAAO,CAAC,OAAe;IAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC;AACd,CAAC;AAED,SAAgB,QAAQ,CAAC,OAAe,EAAE,GAAW;IACjD,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACnC,IAAI,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC"}
|
|
@@ -64,5 +64,13 @@ export declare class VisitorEvent extends VendureEntity {
|
|
|
64
64
|
* Stored alongside the full referrer string so admin reports can
|
|
65
65
|
* group by domain without parsing every URL at read time. */
|
|
66
66
|
referrerDomain: string | null;
|
|
67
|
+
/** UA-classified bot flag. When the storefront calls `recordEvent`
|
|
68
|
+
* from a crawler or monitoring probe, we still ingest the event but
|
|
69
|
+
* set `isBot=true` so the dashboard can exclude it from real-human
|
|
70
|
+
* counts. */
|
|
71
|
+
isBot: boolean;
|
|
72
|
+
/** ID of the ConversionGoal whose pattern matched this pageview's
|
|
73
|
+
* URL. NULL when no goal matched. */
|
|
74
|
+
goalId: number | null;
|
|
67
75
|
}
|
|
68
76
|
//# sourceMappingURL=visitor-event.entity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor-event.entity.d.ts","sourceRoot":"","sources":["../src/visitor-event.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG3D;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAMa,YAAa,SAAQ,aAAa;gBAC/B,KAAK,CAAC,EAAE,WAAW,CAAC,YAAY,CAAC;IAG7C,SAAS,EAAG,MAAM,CAAC;IAGnB,SAAS,EAAG,MAAM,CAAC;IAGnB,UAAU,EAAG,MAAM,GAAG,IAAI,CAAC;IAG3B,SAAS,EAAG,MAAM,CAAC;IAGnB,IAAI,EAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAEhD,8EAA8E;IAE9E,GAAG,EAAG,MAAM,CAAC;IAEb;;0DAEsD;IAEtD,KAAK,EAAG,MAAM,GAAG,IAAI,CAAC;IAGtB,QAAQ,EAAG,MAAM,GAAG,IAAI,CAAC;IAEzB;+BAC2B;IAE3B,YAAY,EAAG,MAAM,GAAG,IAAI,CAAC;IAE7B;oDACgD;IAEhD,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IAEvB,qEAAqE;IAErE,EAAE,EAAG,MAAM,GAAG,IAAI,CAAC;IAGnB,SAAS,EAAG,MAAM,GAAG,IAAI,CAAC;IAE1B,2DAA2D;IAE3D,OAAO,EAAG,MAAM,GAAG,IAAI,CAAC;IAGxB,cAAc,EAAG,MAAM,GAAG,IAAI,CAAC;IAG/B,EAAE,EAAG,MAAM,GAAG,IAAI,CAAC;IAGnB,SAAS,EAAG,MAAM,GAAG,IAAI,CAAC;IAG1B,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IAEvB,wCAAwC;IAExC,cAAc,EAAG,MAAM,GAAG,IAAI,CAAC;IAG/B,OAAO,EAAG,MAAM,GAAG,IAAI,CAAC;IAGxB,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IAGvB,IAAI,EAAG,MAAM,GAAG,IAAI,CAAC;IAGrB,QAAQ,EAAG,MAAM,GAAG,IAAI,CAAC;IAEzB,sDAAsD;IAEtD,IAAI,EAAG,MAAM,GAAG,IAAI,CAAC;IAUrB,SAAS,EAAG,MAAM,GAAG,IAAI,CAAC;IAG1B,SAAS,EAAG,MAAM,GAAG,IAAI,CAAC;IAG1B,WAAW,EAAG,MAAM,GAAG,IAAI,CAAC;IAG5B,OAAO,EAAG,MAAM,GAAG,IAAI,CAAC;IAGxB,UAAU,EAAG,MAAM,GAAG,IAAI,CAAC;IAE3B;;kEAE8D;IAE9D,cAAc,EAAG,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"visitor-event.entity.d.ts","sourceRoot":"","sources":["../src/visitor-event.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG3D;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAMa,YAAa,SAAQ,aAAa;gBAC/B,KAAK,CAAC,EAAE,WAAW,CAAC,YAAY,CAAC;IAG7C,SAAS,EAAG,MAAM,CAAC;IAGnB,SAAS,EAAG,MAAM,CAAC;IAGnB,UAAU,EAAG,MAAM,GAAG,IAAI,CAAC;IAG3B,SAAS,EAAG,MAAM,CAAC;IAGnB,IAAI,EAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAEhD,8EAA8E;IAE9E,GAAG,EAAG,MAAM,CAAC;IAEb;;0DAEsD;IAEtD,KAAK,EAAG,MAAM,GAAG,IAAI,CAAC;IAGtB,QAAQ,EAAG,MAAM,GAAG,IAAI,CAAC;IAEzB;+BAC2B;IAE3B,YAAY,EAAG,MAAM,GAAG,IAAI,CAAC;IAE7B;oDACgD;IAEhD,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IAEvB,qEAAqE;IAErE,EAAE,EAAG,MAAM,GAAG,IAAI,CAAC;IAGnB,SAAS,EAAG,MAAM,GAAG,IAAI,CAAC;IAE1B,2DAA2D;IAE3D,OAAO,EAAG,MAAM,GAAG,IAAI,CAAC;IAGxB,cAAc,EAAG,MAAM,GAAG,IAAI,CAAC;IAG/B,EAAE,EAAG,MAAM,GAAG,IAAI,CAAC;IAGnB,SAAS,EAAG,MAAM,GAAG,IAAI,CAAC;IAG1B,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IAEvB,wCAAwC;IAExC,cAAc,EAAG,MAAM,GAAG,IAAI,CAAC;IAG/B,OAAO,EAAG,MAAM,GAAG,IAAI,CAAC;IAGxB,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;IAGvB,IAAI,EAAG,MAAM,GAAG,IAAI,CAAC;IAGrB,QAAQ,EAAG,MAAM,GAAG,IAAI,CAAC;IAEzB,sDAAsD;IAEtD,IAAI,EAAG,MAAM,GAAG,IAAI,CAAC;IAUrB,SAAS,EAAG,MAAM,GAAG,IAAI,CAAC;IAG1B,SAAS,EAAG,MAAM,GAAG,IAAI,CAAC;IAG1B,WAAW,EAAG,MAAM,GAAG,IAAI,CAAC;IAG5B,OAAO,EAAG,MAAM,GAAG,IAAI,CAAC;IAGxB,UAAU,EAAG,MAAM,GAAG,IAAI,CAAC;IAE3B;;kEAE8D;IAE9D,cAAc,EAAG,MAAM,GAAG,IAAI,CAAC;IAE/B;;;kBAGc;IAGd,KAAK,EAAG,OAAO,CAAC;IAEhB;0CACsC;IAGtC,MAAM,EAAG,MAAM,GAAG,IAAI,CAAC;CAC1B"}
|
|
@@ -151,6 +151,16 @@ __decorate([
|
|
|
151
151
|
(0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
|
|
152
152
|
__metadata("design:type", Object)
|
|
153
153
|
], VisitorEvent.prototype, "referrerDomain", void 0);
|
|
154
|
+
__decorate([
|
|
155
|
+
(0, typeorm_1.Index)(),
|
|
156
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: false }),
|
|
157
|
+
__metadata("design:type", Boolean)
|
|
158
|
+
], VisitorEvent.prototype, "isBot", void 0);
|
|
159
|
+
__decorate([
|
|
160
|
+
(0, typeorm_1.Index)(),
|
|
161
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
162
|
+
__metadata("design:type", Object)
|
|
163
|
+
], VisitorEvent.prototype, "goalId", void 0);
|
|
154
164
|
exports.VisitorEvent = VisitorEvent = __decorate([
|
|
155
165
|
(0, typeorm_1.Entity)(),
|
|
156
166
|
(0, typeorm_1.Index)('visitor_event_visitor_idx', ['visitorId', 'createdAt']),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor-event.entity.js","sourceRoot":"","sources":["../src/visitor-event.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2D;AAC3D,qCAAgD;AAEhD;;;;;;;;;;;;;;;;;;GAkBG;AAOI,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,oBAAa;IAC3C,YAAY,KAAiC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"visitor-event.entity.js","sourceRoot":"","sources":["../src/visitor-event.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,5 +62,20 @@ export declare class VisitorTrackingController {
|
|
|
62
62
|
profile(ctx: RequestContext, visitorIdRaw: string, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
63
63
|
private applyCors;
|
|
64
64
|
private parseCookies;
|
|
65
|
+
/** Admin: plugin health + update availability. Read by the admin UI
|
|
66
|
+
* banner so the operator sees when a new version is on npm. */
|
|
67
|
+
status(ctx: RequestContext, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
68
|
+
/** Admin: list goals for a channel. */
|
|
69
|
+
listGoals(ctx: RequestContext, req: Request, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
70
|
+
/** Admin: create a goal. */
|
|
71
|
+
createGoal(ctx: RequestContext, body: any, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
72
|
+
/** Admin: update a goal. */
|
|
73
|
+
updateGoal(ctx: RequestContext, idParam: string, body: any, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
74
|
+
/** Admin: delete a goal. */
|
|
75
|
+
deleteGoal(ctx: RequestContext, idParam: string, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
76
|
+
/** Admin: per-goal stats over the last N days (default 30). */
|
|
77
|
+
goalsStats(ctx: RequestContext, req: Request, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
78
|
+
/** Admin: CSV export of recent visitor events with all enrichment. */
|
|
79
|
+
exportCsv(ctx: RequestContext, req: Request, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
65
80
|
}
|
|
66
81
|
//# sourceMappingURL=visitor-tracking.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor-tracking.controller.d.ts","sourceRoot":"","sources":["../src/visitor-tracking.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,cAAc,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"visitor-tracking.controller.d.ts","sourceRoot":"","sources":["../src/visitor-tracking.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,cAAc,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AA4BpE,qBACa,yBAAyB;IAE9B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;gBADR,UAAU,EAAE,uBAAuB,EACnC,QAAQ,EAAE,sBAAsB;IAG5C;;;;;;;;;;;;;;;;;OAiBG;IAEG,KAAK,CAAS,IAAI,EAAE,GAAG,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAgFxE,iEAAiE;IAE3D,OAAO,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IA0CnF;;wCAEoC;IAE9B,OAAO,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAuDnF,0DAA0D;IAEpD,QAAQ,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAoCpF,oEAAoE;IAE9D,MAAM,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAsBlF;+CAC2C;IAErC,SAAS,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAuCrF;;uCAEmC;IAE7B,SAAS,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAmCrF;;;;;;;;OAQG;IAEG,IAAI,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAgDhF,+DAA+D;IAEzD,OAAO,CAAQ,GAAG,EAAE,cAAc,EAAsB,SAAS,EAAE,MAAM,EAAS,GAAG,EAAE,QAAQ;IAUrG,mDAAmD;IAE7C,MAAM,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IA+ClF;;;yCAGqC;IAE/B,OAAO,CAAQ,GAAG,EAAE,cAAc,EAAsB,YAAY,EAAE,MAAM,EAAS,GAAG,EAAE,QAAQ;IAyGxG,OAAO,CAAC,SAAS;IAYjB,OAAO,CAAC,YAAY;IAapB;mEAC+D;IAEzD,MAAM,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,QAAQ;IAc7D,uCAAuC;IAEjC,SAAS,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAQrF,4BAA4B;IAEtB,UAAU,CAAQ,GAAG,EAAE,cAAc,EAAU,IAAI,EAAE,GAAG,EAAS,GAAG,EAAE,QAAQ;IAkBpF,4BAA4B;IAEtB,UAAU,CAAQ,GAAG,EAAE,cAAc,EAAe,OAAO,EAAE,MAAM,EAAU,IAAI,EAAE,GAAG,EAAS,GAAG,EAAE,QAAQ;IAelH,4BAA4B;IAEtB,UAAU,CAAQ,GAAG,EAAE,cAAc,EAAe,OAAO,EAAE,MAAM,EAAS,GAAG,EAAE,QAAQ;IAS/F,+DAA+D;IAEzD,UAAU,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;IAuBtF,sEAAsE;IAEhE,SAAS,CAAQ,GAAG,EAAE,cAAc,EAAS,GAAG,EAAE,OAAO,EAAS,GAAG,EAAE,QAAQ;CAkCxF"}
|
|
@@ -15,6 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.VisitorTrackingController = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const core_1 = require("@vendure/core");
|
|
18
|
+
const conversion_goal_entity_1 = require("./conversion-goal.entity");
|
|
19
|
+
const plugin_1 = require("./plugin");
|
|
18
20
|
const visitor_event_entity_1 = require("./visitor-event.entity");
|
|
19
21
|
const visitor_tracking_service_1 = require("./visitor-tracking.service");
|
|
20
22
|
const COOKIE_VISITOR = 'ees_vid';
|
|
@@ -69,7 +71,24 @@ let VisitorTrackingController = class VisitorTrackingController {
|
|
|
69
71
|
this.applyCors(req, res);
|
|
70
72
|
if (req.method === 'OPTIONS')
|
|
71
73
|
return res.status(204).end();
|
|
74
|
+
const opts = (0, plugin_1.getOptions)();
|
|
75
|
+
// Privacy: honour Do-Not-Track when configured. We still return 200
|
|
76
|
+
// so the storefront can't tell the difference between "stored" and
|
|
77
|
+
// "skipped" — keeps the wire shape stable.
|
|
78
|
+
if (opts.honorDoNotTrack) {
|
|
79
|
+
const dnt = String(req.headers['dnt'] || req.headers['sec-gpc'] || '').trim();
|
|
80
|
+
if (dnt === '1') {
|
|
81
|
+
return res.json({ stored: 0, skipped: 'dnt' });
|
|
82
|
+
}
|
|
83
|
+
}
|
|
72
84
|
const cookies = this.parseCookies(req);
|
|
85
|
+
// Privacy: optional consent gate.
|
|
86
|
+
if (opts.requireConsent) {
|
|
87
|
+
const consented = (body === null || body === void 0 ? void 0 : body.consent) === true || cookies['ees_consent'] === '1';
|
|
88
|
+
if (!consented) {
|
|
89
|
+
return res.json({ stored: 0, skipped: 'no-consent' });
|
|
90
|
+
}
|
|
91
|
+
}
|
|
73
92
|
let visitorId = String(cookies[COOKIE_VISITOR] || '').slice(0, 64);
|
|
74
93
|
let sessionId = String(cookies[COOKIE_SESSION] || '').slice(0, 64);
|
|
75
94
|
let issuedVisitor = false;
|
|
@@ -549,6 +568,135 @@ let VisitorTrackingController = class VisitorTrackingController {
|
|
|
549
568
|
}
|
|
550
569
|
return out;
|
|
551
570
|
}
|
|
571
|
+
/** Admin: plugin health + update availability. Read by the admin UI
|
|
572
|
+
* banner so the operator sees when a new version is on npm. */
|
|
573
|
+
async status(ctx, res) {
|
|
574
|
+
if (!requireAdmin(ctx, res))
|
|
575
|
+
return;
|
|
576
|
+
const updater = plugin_1.VisitorAnalyticsPlugin.getUpdateChecker();
|
|
577
|
+
const update = updater ? updater.getStatus() : null;
|
|
578
|
+
return res.json({
|
|
579
|
+
packageName: plugin_1.VisitorAnalyticsPlugin.getPackageName(),
|
|
580
|
+
version: plugin_1.VisitorAnalyticsPlugin.getPackageVersion(),
|
|
581
|
+
update,
|
|
582
|
+
uptimeSec: Math.round(process.uptime()),
|
|
583
|
+
});
|
|
584
|
+
}
|
|
585
|
+
// ── Conversion goals ────────────────────────────────────────────────
|
|
586
|
+
/** Admin: list goals for a channel. */
|
|
587
|
+
async listGoals(ctx, req, res) {
|
|
588
|
+
if (!requireAdmin(ctx, res))
|
|
589
|
+
return;
|
|
590
|
+
const channelId = parseInt(String(req.query.channelId || '1'), 10) || 1;
|
|
591
|
+
const repo = this.connection.rawConnection.getRepository(conversion_goal_entity_1.ConversionGoal);
|
|
592
|
+
const rows = await repo.find({ where: { channelId }, order: { id: 'ASC' } });
|
|
593
|
+
return res.json({ goals: rows });
|
|
594
|
+
}
|
|
595
|
+
/** Admin: create a goal. */
|
|
596
|
+
async createGoal(ctx, body, res) {
|
|
597
|
+
if (!requireAdmin(ctx, res))
|
|
598
|
+
return;
|
|
599
|
+
const repo = this.connection.rawConnection.getRepository(conversion_goal_entity_1.ConversionGoal);
|
|
600
|
+
const row = repo.create({
|
|
601
|
+
channelId: Number(body === null || body === void 0 ? void 0 : body.channelId) || 1,
|
|
602
|
+
name: String((body === null || body === void 0 ? void 0 : body.name) || '').slice(0, 128).trim(),
|
|
603
|
+
urlPattern: String((body === null || body === void 0 ? void 0 : body.urlPattern) || '').slice(0, 256).trim(),
|
|
604
|
+
valueMinor: Math.max(0, parseInt(body === null || body === void 0 ? void 0 : body.valueMinor, 10) || 0),
|
|
605
|
+
enabled: (body === null || body === void 0 ? void 0 : body.enabled) !== false,
|
|
606
|
+
});
|
|
607
|
+
if (!row.name || !row.urlPattern) {
|
|
608
|
+
return res.status(400).json({ error: 'name and urlPattern required' });
|
|
609
|
+
}
|
|
610
|
+
const saved = await repo.save(row);
|
|
611
|
+
this.tracking.invalidateGoalCache();
|
|
612
|
+
return res.json({ goal: saved });
|
|
613
|
+
}
|
|
614
|
+
/** Admin: update a goal. */
|
|
615
|
+
async updateGoal(ctx, idParam, body, res) {
|
|
616
|
+
if (!requireAdmin(ctx, res))
|
|
617
|
+
return;
|
|
618
|
+
const id = parseInt(idParam, 10);
|
|
619
|
+
const repo = this.connection.rawConnection.getRepository(conversion_goal_entity_1.ConversionGoal);
|
|
620
|
+
const row = await repo.findOne({ where: { id } });
|
|
621
|
+
if (!row)
|
|
622
|
+
return res.status(404).json({ error: 'Not found' });
|
|
623
|
+
if (typeof (body === null || body === void 0 ? void 0 : body.name) === 'string')
|
|
624
|
+
row.name = body.name.slice(0, 128);
|
|
625
|
+
if (typeof (body === null || body === void 0 ? void 0 : body.urlPattern) === 'string')
|
|
626
|
+
row.urlPattern = body.urlPattern.slice(0, 256);
|
|
627
|
+
if (typeof (body === null || body === void 0 ? void 0 : body.valueMinor) === 'number')
|
|
628
|
+
row.valueMinor = Math.max(0, body.valueMinor);
|
|
629
|
+
if (typeof (body === null || body === void 0 ? void 0 : body.enabled) === 'boolean')
|
|
630
|
+
row.enabled = body.enabled;
|
|
631
|
+
const saved = await repo.save(row);
|
|
632
|
+
this.tracking.invalidateGoalCache();
|
|
633
|
+
return res.json({ goal: saved });
|
|
634
|
+
}
|
|
635
|
+
/** Admin: delete a goal. */
|
|
636
|
+
async deleteGoal(ctx, idParam, res) {
|
|
637
|
+
if (!requireAdmin(ctx, res))
|
|
638
|
+
return;
|
|
639
|
+
const id = parseInt(idParam, 10);
|
|
640
|
+
const repo = this.connection.rawConnection.getRepository(conversion_goal_entity_1.ConversionGoal);
|
|
641
|
+
const result = await repo.delete({ id });
|
|
642
|
+
this.tracking.invalidateGoalCache();
|
|
643
|
+
return res.json({ ok: !!(result.affected && result.affected > 0) });
|
|
644
|
+
}
|
|
645
|
+
/** Admin: per-goal stats over the last N days (default 30). */
|
|
646
|
+
async goalsStats(ctx, req, res) {
|
|
647
|
+
if (!requireAdmin(ctx, res))
|
|
648
|
+
return;
|
|
649
|
+
const days = Math.min(Math.max(parseInt(String(req.query.days || '30'), 10) || 30, 1), 365);
|
|
650
|
+
const channelId = parseInt(String(req.query.channelId || '1'), 10) || 1;
|
|
651
|
+
const rows = await this.connection.rawConnection.query(`SELECT g.id, g.name, g.urlPattern, g.valueMinor, g.enabled,
|
|
652
|
+
COUNT(DISTINCT v.visitorId) AS uniqueVisitors,
|
|
653
|
+
COUNT(*) AS completions
|
|
654
|
+
FROM conversion_goal g
|
|
655
|
+
LEFT JOIN visitor_event v
|
|
656
|
+
ON v.goalId = g.id
|
|
657
|
+
AND v.createdAt >= DATE_SUB(NOW(), INTERVAL ? DAY)
|
|
658
|
+
AND v.isBot = 0
|
|
659
|
+
WHERE g.channelId = ?
|
|
660
|
+
GROUP BY g.id`, [days, channelId]);
|
|
661
|
+
return res.json({ days, channelId, goals: rows.map((r) => ({
|
|
662
|
+
...r,
|
|
663
|
+
valueMinor: Number(r.valueMinor) * Number(r.completions || 0),
|
|
664
|
+
})) });
|
|
665
|
+
}
|
|
666
|
+
/** Admin: CSV export of recent visitor events with all enrichment. */
|
|
667
|
+
async exportCsv(ctx, req, res) {
|
|
668
|
+
if (!requireAdmin(ctx, res))
|
|
669
|
+
return;
|
|
670
|
+
const days = Math.min(Math.max(parseInt(String(req.query.days || '7'), 10) || 7, 1), 90);
|
|
671
|
+
const rows = await this.connection.rawConnection.query(`SELECT createdAt, visitorId, sessionId, customerId, channelId,
|
|
672
|
+
type, url, title, referrerDomain,
|
|
673
|
+
country, region, city, browser, os, device,
|
|
674
|
+
isBot, goalId, utmSource, utmMedium, utmCampaign
|
|
675
|
+
FROM visitor_event
|
|
676
|
+
WHERE createdAt >= DATE_SUB(NOW(), INTERVAL ? DAY)
|
|
677
|
+
ORDER BY createdAt DESC
|
|
678
|
+
LIMIT 200000`, [days]);
|
|
679
|
+
res.setHeader('Content-Type', 'text/csv; charset=utf-8');
|
|
680
|
+
res.setHeader('Content-Disposition', `attachment; filename="visitors-${new Date().toISOString().slice(0, 10)}.csv"`);
|
|
681
|
+
const esc = (v) => {
|
|
682
|
+
if (v === null || v === undefined)
|
|
683
|
+
return '';
|
|
684
|
+
const s = String(v).replace(/"/g, '""');
|
|
685
|
+
return /[",\n]/.test(s) ? `"${s}"` : s;
|
|
686
|
+
};
|
|
687
|
+
res.write('createdAt,visitorId,sessionId,customerId,channelId,type,url,title,referrerDomain,country,region,city,browser,os,device,isBot,goalId,utmSource,utmMedium,utmCampaign\n');
|
|
688
|
+
for (const r of rows) {
|
|
689
|
+
res.write([
|
|
690
|
+
esc(r.createdAt instanceof Date ? r.createdAt.toISOString() : r.createdAt),
|
|
691
|
+
esc(r.visitorId), esc(r.sessionId), esc(r.customerId), esc(r.channelId),
|
|
692
|
+
esc(r.type), esc(r.url), esc(r.title), esc(r.referrerDomain),
|
|
693
|
+
esc(r.country), esc(r.region), esc(r.city), esc(r.browser), esc(r.os), esc(r.device),
|
|
694
|
+
esc(r.isBot), esc(r.goalId),
|
|
695
|
+
esc(r.utmSource), esc(r.utmMedium), esc(r.utmCampaign),
|
|
696
|
+
].join(',') + '\n');
|
|
697
|
+
}
|
|
698
|
+
return res.end();
|
|
699
|
+
}
|
|
552
700
|
};
|
|
553
701
|
exports.VisitorTrackingController = VisitorTrackingController;
|
|
554
702
|
__decorate([
|
|
@@ -650,6 +798,69 @@ __decorate([
|
|
|
650
798
|
__metadata("design:paramtypes", [core_1.RequestContext, String, Object]),
|
|
651
799
|
__metadata("design:returntype", Promise)
|
|
652
800
|
], VisitorTrackingController.prototype, "profile", null);
|
|
801
|
+
__decorate([
|
|
802
|
+
(0, common_1.Get)('visitors/status'),
|
|
803
|
+
__param(0, (0, core_1.Ctx)()),
|
|
804
|
+
__param(1, (0, common_1.Res)()),
|
|
805
|
+
__metadata("design:type", Function),
|
|
806
|
+
__metadata("design:paramtypes", [core_1.RequestContext, Object]),
|
|
807
|
+
__metadata("design:returntype", Promise)
|
|
808
|
+
], VisitorTrackingController.prototype, "status", null);
|
|
809
|
+
__decorate([
|
|
810
|
+
(0, common_1.Get)('goals'),
|
|
811
|
+
__param(0, (0, core_1.Ctx)()),
|
|
812
|
+
__param(1, (0, common_1.Req)()),
|
|
813
|
+
__param(2, (0, common_1.Res)()),
|
|
814
|
+
__metadata("design:type", Function),
|
|
815
|
+
__metadata("design:paramtypes", [core_1.RequestContext, Object, Object]),
|
|
816
|
+
__metadata("design:returntype", Promise)
|
|
817
|
+
], VisitorTrackingController.prototype, "listGoals", null);
|
|
818
|
+
__decorate([
|
|
819
|
+
(0, common_1.Post)('goals'),
|
|
820
|
+
__param(0, (0, core_1.Ctx)()),
|
|
821
|
+
__param(1, (0, common_1.Body)()),
|
|
822
|
+
__param(2, (0, common_1.Res)()),
|
|
823
|
+
__metadata("design:type", Function),
|
|
824
|
+
__metadata("design:paramtypes", [core_1.RequestContext, Object, Object]),
|
|
825
|
+
__metadata("design:returntype", Promise)
|
|
826
|
+
], VisitorTrackingController.prototype, "createGoal", null);
|
|
827
|
+
__decorate([
|
|
828
|
+
(0, common_1.Put)('goals/:id'),
|
|
829
|
+
__param(0, (0, core_1.Ctx)()),
|
|
830
|
+
__param(1, (0, common_1.Param)('id')),
|
|
831
|
+
__param(2, (0, common_1.Body)()),
|
|
832
|
+
__param(3, (0, common_1.Res)()),
|
|
833
|
+
__metadata("design:type", Function),
|
|
834
|
+
__metadata("design:paramtypes", [core_1.RequestContext, String, Object, Object]),
|
|
835
|
+
__metadata("design:returntype", Promise)
|
|
836
|
+
], VisitorTrackingController.prototype, "updateGoal", null);
|
|
837
|
+
__decorate([
|
|
838
|
+
(0, common_1.Delete)('goals/:id'),
|
|
839
|
+
__param(0, (0, core_1.Ctx)()),
|
|
840
|
+
__param(1, (0, common_1.Param)('id')),
|
|
841
|
+
__param(2, (0, common_1.Res)()),
|
|
842
|
+
__metadata("design:type", Function),
|
|
843
|
+
__metadata("design:paramtypes", [core_1.RequestContext, String, Object]),
|
|
844
|
+
__metadata("design:returntype", Promise)
|
|
845
|
+
], VisitorTrackingController.prototype, "deleteGoal", null);
|
|
846
|
+
__decorate([
|
|
847
|
+
(0, common_1.Get)('goals/stats'),
|
|
848
|
+
__param(0, (0, core_1.Ctx)()),
|
|
849
|
+
__param(1, (0, common_1.Req)()),
|
|
850
|
+
__param(2, (0, common_1.Res)()),
|
|
851
|
+
__metadata("design:type", Function),
|
|
852
|
+
__metadata("design:paramtypes", [core_1.RequestContext, Object, Object]),
|
|
853
|
+
__metadata("design:returntype", Promise)
|
|
854
|
+
], VisitorTrackingController.prototype, "goalsStats", null);
|
|
855
|
+
__decorate([
|
|
856
|
+
(0, common_1.Get)('visitors/export.csv'),
|
|
857
|
+
__param(0, (0, core_1.Ctx)()),
|
|
858
|
+
__param(1, (0, common_1.Req)()),
|
|
859
|
+
__param(2, (0, common_1.Res)()),
|
|
860
|
+
__metadata("design:type", Function),
|
|
861
|
+
__metadata("design:paramtypes", [core_1.RequestContext, Object, Object]),
|
|
862
|
+
__metadata("design:returntype", Promise)
|
|
863
|
+
], VisitorTrackingController.prototype, "exportCsv", null);
|
|
653
864
|
exports.VisitorTrackingController = VisitorTrackingController = __decorate([
|
|
654
865
|
(0, common_1.Controller)('ees'),
|
|
655
866
|
__metadata("design:paramtypes", [core_1.TransactionalConnection,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor-tracking.controller.js","sourceRoot":"","sources":["../src/visitor-tracking.controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"visitor-tracking.controller.js","sourceRoot":"","sources":["../src/visitor-tracking.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,11 @@ export declare class VisitorTrackingService {
|
|
|
30
30
|
ingest(input: IngestInput): Promise<{
|
|
31
31
|
stored: number;
|
|
32
32
|
}>;
|
|
33
|
+
private goalCache;
|
|
34
|
+
/** Goals change rarely — cache for 60s per ingest path. */
|
|
35
|
+
private loadGoals;
|
|
36
|
+
/** Public so the controller can invalidate after CRUD. */
|
|
37
|
+
invalidateGoalCache(): void;
|
|
33
38
|
/** Build the full enrichment context — UA parsing + MaxMind geo + IP
|
|
34
39
|
* hash. Errors anywhere here collapse to null so a bad lookup never
|
|
35
40
|
* drops the event itself. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor-tracking.service.d.ts","sourceRoot":"","sources":["../src/visitor-tracking.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"visitor-tracking.service.d.ts","sourceRoot":"","sources":["../src/visitor-tracking.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAUxD,UAAU,WAAW;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,CAAC;QACV,IAAI,EAAE,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;QAC/C,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC,CAAC;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B;;;wCAGoC;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAqBD,qBACa,sBAAsB;IACnB,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,uBAAuB;IAEvD,sDAAsD;IAChD,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA4D7D,OAAO,CAAC,SAAS,CAA6F;IAE9G,2DAA2D;YAC7C,SAAS;IAiBvB,0DAA0D;IAC1D,mBAAmB,IAAI,IAAI;IAI3B;;kCAE8B;YAChB,aAAa;IA0D3B,OAAO,CAAC,MAAM;IAKd,KAAK,IAAI,MAAM;CAClB"}
|
|
@@ -46,6 +46,10 @@ exports.VisitorTrackingService = void 0;
|
|
|
46
46
|
const common_1 = require("@nestjs/common");
|
|
47
47
|
const core_1 = require("@vendure/core");
|
|
48
48
|
const crypto_1 = require("crypto");
|
|
49
|
+
const conversion_goal_entity_1 = require("./conversion-goal.entity");
|
|
50
|
+
const detect_bot_1 = require("./detect-bot");
|
|
51
|
+
const plugin_1 = require("./plugin");
|
|
52
|
+
const url_pattern_1 = require("./url-pattern");
|
|
49
53
|
const visitor_event_entity_1 = require("./visitor-event.entity");
|
|
50
54
|
const loggerCtx = 'VisitorTrackingService';
|
|
51
55
|
let _maxmindReader = null;
|
|
@@ -53,16 +57,33 @@ let _maxmindInit = null;
|
|
|
53
57
|
let VisitorTrackingService = class VisitorTrackingService {
|
|
54
58
|
constructor(connection) {
|
|
55
59
|
this.connection = connection;
|
|
60
|
+
this.goalCache = { ts: 0, byChannel: new Map() };
|
|
56
61
|
}
|
|
57
62
|
/** Persist a batch of events with full enrichment. */
|
|
58
63
|
async ingest(input) {
|
|
59
64
|
var _a;
|
|
60
65
|
if (!((_a = input === null || input === void 0 ? void 0 : input.events) === null || _a === void 0 ? void 0 : _a.length))
|
|
61
66
|
return { stored: 0 };
|
|
67
|
+
const opts = (0, plugin_1.getOptions)();
|
|
68
|
+
const isBot = (0, detect_bot_1.isBotUa)(input.userAgent);
|
|
69
|
+
// Drop bot events entirely when the option is on. Otherwise we
|
|
70
|
+
// ingest them but flag the row so dashboards can exclude them.
|
|
71
|
+
if (isBot && opts.dropBotEvents)
|
|
72
|
+
return { stored: 0 };
|
|
62
73
|
const repo = this.connection.rawConnection.getRepository(visitor_event_entity_1.VisitorEvent);
|
|
63
74
|
const enriched = await this.enrichContext(input);
|
|
75
|
+
// Anonymise the stored IP when the option is on (default). Hash
|
|
76
|
+
// is still computed from the raw IP so "unique visitor" counts
|
|
77
|
+
// stay accurate.
|
|
78
|
+
if (opts.anonymizeIp !== false) {
|
|
79
|
+
enriched.ip = (0, detect_bot_1.anonymizeIp)(enriched.ip);
|
|
80
|
+
}
|
|
81
|
+
const goals = await this.loadGoals(input.channelId);
|
|
64
82
|
const rows = input.events.map(e => {
|
|
65
83
|
const utm = parseUtm(e.url);
|
|
84
|
+
const matchingGoal = e.type === 'pageview'
|
|
85
|
+
? goals.find(g => (0, url_pattern_1.matchUrl)(g.urlPattern, e.url || ''))
|
|
86
|
+
: undefined;
|
|
66
87
|
return repo.create({
|
|
67
88
|
visitorId: input.visitorId,
|
|
68
89
|
sessionId: input.sessionId,
|
|
@@ -83,6 +104,8 @@ let VisitorTrackingService = class VisitorTrackingService {
|
|
|
83
104
|
utmCampaign: utm.campaign,
|
|
84
105
|
utmTerm: utm.term,
|
|
85
106
|
utmContent: utm.content,
|
|
107
|
+
isBot,
|
|
108
|
+
goalId: matchingGoal ? (Number(matchingGoal.id) || null) : null,
|
|
86
109
|
});
|
|
87
110
|
});
|
|
88
111
|
try {
|
|
@@ -94,6 +117,29 @@ let VisitorTrackingService = class VisitorTrackingService {
|
|
|
94
117
|
}
|
|
95
118
|
return { stored: rows.length };
|
|
96
119
|
}
|
|
120
|
+
/** Goals change rarely — cache for 60s per ingest path. */
|
|
121
|
+
async loadGoals(channelId) {
|
|
122
|
+
const now = Date.now();
|
|
123
|
+
if (now - this.goalCache.ts > 60000) {
|
|
124
|
+
this.goalCache = { ts: now, byChannel: new Map() };
|
|
125
|
+
}
|
|
126
|
+
const cached = this.goalCache.byChannel.get(channelId);
|
|
127
|
+
if (cached)
|
|
128
|
+
return cached;
|
|
129
|
+
try {
|
|
130
|
+
const repo = this.connection.rawConnection.getRepository(conversion_goal_entity_1.ConversionGoal);
|
|
131
|
+
const rows = await repo.find({ where: { channelId, enabled: true } });
|
|
132
|
+
this.goalCache.byChannel.set(channelId, rows);
|
|
133
|
+
return rows;
|
|
134
|
+
}
|
|
135
|
+
catch {
|
|
136
|
+
return [];
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
/** Public so the controller can invalidate after CRUD. */
|
|
140
|
+
invalidateGoalCache() {
|
|
141
|
+
this.goalCache = { ts: 0, byChannel: new Map() };
|
|
142
|
+
}
|
|
97
143
|
/** Build the full enrichment context — UA parsing + MaxMind geo + IP
|
|
98
144
|
* hash. Errors anywhere here collapse to null so a bad lookup never
|
|
99
145
|
* drops the event itself. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor-tracking.service.js","sourceRoot":"","sources":["../src/visitor-tracking.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,wCAAwD;AACxD,mCAAgD;AAChD,iEAAsD;AAEtD,MAAM,SAAS,GAAG,wBAAwB,CAAC;AA2C3C,IAAI,cAAc,GAAe,IAAI,CAAC;AACtC,IAAI,YAAY,GAAyB,IAAI,CAAC;AAGvC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAC/B,YAAoB,UAAmC;QAAnC,eAAU,GAAV,UAAU,CAAyB;
|
|
1
|
+
{"version":3,"file":"visitor-tracking.service.js","sourceRoot":"","sources":["../src/visitor-tracking.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@huloglobal/vendure-plugin-visitor-analytics",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.1",
|
|
4
4
|
"description": "Full-funnel visitor analytics for Vendure storefronts — pageviews, time-on-page, session journey, exit pages, funnel drop-off, and per-visitor profile drawer with parsed user-agent + MaxMind GeoLite2 enrichment. Auto-issues visitor + session cookies on first request; logs guest and signed-in events against the same visitor id so the journey survives login.",
|
|
5
5
|
"license": "SEE LICENSE IN LICENSE",
|
|
6
6
|
"author": "Wayne Garrison <wayne@garrison.me.uk>",
|
|
@@ -57,6 +57,20 @@ interface VisitorProfile {
|
|
|
57
57
|
</vdr-action-bar>
|
|
58
58
|
</vdr-page-block>
|
|
59
59
|
|
|
60
|
+
<vdr-page-block *ngIf="updateBanner">
|
|
61
|
+
<div class="update-banner" [class.major]="updateBanner.isMajor">
|
|
62
|
+
<div>
|
|
63
|
+
<strong>📦 Update available</strong>
|
|
64
|
+
{{ updateBanner.packageName }} {{ updateBanner.current }} → <strong>{{ updateBanner.latest }}</strong>
|
|
65
|
+
<span *ngIf="updateBanner.isMajor" class="major-pill">major</span>
|
|
66
|
+
</div>
|
|
67
|
+
<div class="actions">
|
|
68
|
+
<a [href]="'https://github.com/exceeded/vendure-plugin-visitor-analytics/releases/tag/v' + updateBanner.latest" target="_blank" class="btn btn-sm btn-link">Release notes ↗</a>
|
|
69
|
+
<button class="btn btn-sm" (click)="dismissUpdate()">Dismiss</button>
|
|
70
|
+
</div>
|
|
71
|
+
</div>
|
|
72
|
+
</vdr-page-block>
|
|
73
|
+
|
|
60
74
|
<vdr-page-block>
|
|
61
75
|
<div class="summary-row">
|
|
62
76
|
<div class="summary-card live-card">
|
|
@@ -383,6 +397,18 @@ interface VisitorProfile {
|
|
|
383
397
|
`,
|
|
384
398
|
styles: [`
|
|
385
399
|
:host { color: var(--color-text-100, inherit); display: block; }
|
|
400
|
+
|
|
401
|
+
.update-banner {
|
|
402
|
+
display: flex; gap: 12px; align-items: center; justify-content: space-between; flex-wrap: wrap;
|
|
403
|
+
padding: 12px 16px; border-radius: 8px;
|
|
404
|
+
background: #ecfeff; border: 1px solid #67e8f9;
|
|
405
|
+
color: #155e75; font-size: 13px;
|
|
406
|
+
}
|
|
407
|
+
.update-banner.major { background: #fef3c7; border-color: #fde68a; color: #92400e; }
|
|
408
|
+
.update-banner strong { font-weight: 700; }
|
|
409
|
+
.update-banner .major-pill { display: inline-block; margin-left: 6px; padding: 1px 8px; border-radius: 8px; background: #f59e0b; color: #fff; font-size: 10px; font-weight: 700; text-transform: uppercase; }
|
|
410
|
+
.update-banner .actions { display: flex; gap: 8px; align-items: center; }
|
|
411
|
+
|
|
386
412
|
.range { font-size: 12px; color: var(--color-component-color-300); margin-right: 8px; }
|
|
387
413
|
.range .btn { padding: 2px 8px; min-width: 0; }
|
|
388
414
|
.range .btn.active { font-weight: 700; color: var(--color-primary-500, #1d4ed8); }
|
|
@@ -537,6 +563,9 @@ export class VisitorsComponent implements OnInit, OnDestroy {
|
|
|
537
563
|
journey: JourneyEvent[] = [];
|
|
538
564
|
profileLoading = false;
|
|
539
565
|
|
|
566
|
+
updateBanner: { packageName: string; current: string; latest: string; isMajor: boolean } | null = null;
|
|
567
|
+
private dismissKey = 'huloglobal-visitor-analytics-update-dismissed';
|
|
568
|
+
|
|
540
569
|
constructor(
|
|
541
570
|
private http: HttpClient,
|
|
542
571
|
private notify: NotificationService,
|
|
@@ -547,6 +576,28 @@ export class VisitorsComponent implements OnInit, OnDestroy {
|
|
|
547
576
|
ngOnInit() {
|
|
548
577
|
this.loadAll();
|
|
549
578
|
this.connectLive();
|
|
579
|
+
this.loadStatus();
|
|
580
|
+
}
|
|
581
|
+
|
|
582
|
+
loadStatus() {
|
|
583
|
+
this.http.get<any>('/ees/visitors/status').subscribe({
|
|
584
|
+
next: (s) => {
|
|
585
|
+
const u = s?.update;
|
|
586
|
+
if (!u?.updateAvailable || !u.latest) return;
|
|
587
|
+
let dismissed = '';
|
|
588
|
+
try { dismissed = localStorage.getItem(this.dismissKey) || ''; } catch {}
|
|
589
|
+
if (dismissed === u.latest) return;
|
|
590
|
+
this.updateBanner = { packageName: u.packageName, current: u.current, latest: u.latest, isMajor: !!u.isMajor };
|
|
591
|
+
this.cdr.markForCheck();
|
|
592
|
+
},
|
|
593
|
+
error: () => { /* nice-to-have */ },
|
|
594
|
+
});
|
|
595
|
+
}
|
|
596
|
+
|
|
597
|
+
dismissUpdate() {
|
|
598
|
+
if (!this.updateBanner) return;
|
|
599
|
+
try { localStorage.setItem(this.dismissKey, this.updateBanner.latest); } catch {}
|
|
600
|
+
this.updateBanner = null;
|
|
550
601
|
}
|
|
551
602
|
|
|
552
603
|
ngOnDestroy() {
|