@huloglobal/vendure-plugin-visitor-analytics 0.18.2 → 0.18.4

package/dist/ingest-hardening.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"ingest-hardening.test.js","sourceRoot":"","sources":["../src/ingest-hardening.test.ts"],"names":[],"mappings":";;AAAA,mCAA8C;AAC9C,yEAAuE;AACvE,mDAA4C;AAE5C,IAAA,iBAAQ,EAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,IAAA,WAAE,EAAC,sEAAsE,EAAE,GAAG,EAAE;QAC5E,IAAA,eAAM,EAAC,IAAA,uCAAY,EAAC,8CAA8C,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClG,IAAA,eAAM,EAAC,IAAA,uCAAY,EAAC,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACtF,IAAA,eAAM,EAAC,IAAA,uCAAY,EAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAA,iBAAQ,EAAC,aAAa,EAAE,GAAG,EAAE;IACzB,IAAA,WAAE,EAAC,yFAAyF,EAAE,GAAG,EAAE;QAC/F,IAAA,eAAM,EAAC,IAAA,sCAAW,EAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1G,MAAM,GAAG,GAAG,IAAA,sCAAW,EAAC,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAM,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAA,eAAM,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,KAAM,CAAC,CAAC;QAC/C,IAAA,eAAM,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAA,eAAM,EAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAA,iBAAQ,EAAC,WAAW,EAAE,GAAG,EAAE;IACvB,MAAM,GAAG,GAAG,CAAC,OAA+B,EAAE,EAAE,GAAG,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAU,CAAA,CAAC;IAC3F,IAAA,WAAE,EAAC,sCAAsC,EAAE,GAAG,EAAE;QAC5C,IAAA,eAAM,EAAC,IAAA,yBAAS,EAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/E,IAAA,eAAM,EAAC,IAAA,yBAAS,EAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAClH,IAAA,eAAM,EAAC,IAAA,yBAAS,EAAC,GAAG,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ingest-hardening.test.js","sourceRoot":"","sources":["../src/ingest-hardening.test.ts"],"names":[],"mappings":";;AAAA,mCAA8C;AAC9C,iDAA2D;AAC3D,mDAA4C;AAE5C,IAAA,iBAAQ,EAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,IAAA,WAAE,EAAC,sEAAsE,EAAE,GAAG,EAAE;QAC5E,IAAA,eAAM,EAAC,IAAA,2BAAY,EAAC,8CAA8C,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClG,IAAA,eAAM,EAAC,IAAA,2BAAY,EAAC,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACtF,IAAA,eAAM,EAAC,IAAA,2BAAY,EAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAA,iBAAQ,EAAC,aAAa,EAAE,GAAG,EAAE;IACzB,IAAA,WAAE,EAAC,yFAAyF,EAAE,GAAG,EAAE;QAC/F,IAAA,eAAM,EAAC,IAAA,0BAAW,EAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1G,MAAM,GAAG,GAAG,IAAA,0BAAW,EAAC,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAM,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAA,eAAM,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,KAAM,CAAC,CAAC;QAC/C,IAAA,eAAM,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAA,eAAM,EAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAA,iBAAQ,EAAC,WAAW,EAAE,GAAG,EAAE;IACvB,MAAM,GAAG,GAAG,CAAC,OAA+B,EAAE,EAAE,GAAG,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAU,CAAA,CAAC;IAC3F,IAAA,WAAE,EAAC,sCAAsC,EAAE,GAAG,EAAE;QAC5C,IAAA,eAAM,EAAC,IAAA,yBAAS,EAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/E,IAAA,eAAM,EAAC,IAAA,yBAAS,EAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAClH,IAAA,eAAM,EAAC,IAAA,yBAAS,EAAC,GAAG,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/ingest-utils.d.ts

@@ -0,0 +1,6 @@
+/** Pure helpers for the ingest path (kept decorator-free so unit tests can import them). */
+/** hulo.js sends `location.href`; reports, funnels and goals expect a path (`/products/x?y=1`). */
+export declare function normaliseUrl(raw: unknown): string;
+/** JSON for the `meta` TEXT column: never cut mid-document (a truncated cart snapshot is unparseable). */
+export declare function boundedMeta(meta: any, max?: number): string;
+//# sourceMappingURL=ingest-utils.d.ts.map

package/dist/ingest-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest-utils.d.ts","sourceRoot":"","sources":["../src/ingest-utils.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAE5F,mGAAmG;AACnG,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAMjD;AAED,0GAA0G;AAC1G,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,SAAS,GAAG,MAAM,CAU3D"}

package/dist/ingest-utils.js

@@ -0,0 +1,34 @@
+"use strict";
+/** Pure helpers for the ingest path (kept decorator-free so unit tests can import them). */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normaliseUrl = normaliseUrl;
+exports.boundedMeta = boundedMeta;
+/** hulo.js sends `location.href`; reports, funnels and goals expect a path (`/products/x?y=1`). */
+function normaliseUrl(raw) {
+    const u = String(raw || '');
+    if (/^https?:\/\//i.test(u)) {
+        try {
+            const p = new URL(u);
+            return (p.pathname + p.search).slice(0, 2048);
+        }
+        catch {
+            return u.slice(0, 2048);
+        }
+    }
+    return u.slice(0, 2048);
+}
+/** JSON for the `meta` TEXT column: never cut mid-document (a truncated cart snapshot is unparseable). */
+function boundedMeta(meta, max = 60000) {
+    let s = JSON.stringify(meta);
+    if (s.length <= max)
+        return s;
+    if (meta && typeof meta === 'object' && Array.isArray(meta.items)) {
+        for (let n = 50; n >= 5; n = Math.floor(n / 2)) {
+            s = JSON.stringify({ ...meta, items: meta.items.slice(0, n), itemsTruncated: true });
+            if (s.length <= max)
+                return s;
+        }
+    }
+    return JSON.stringify({ truncated: true, type: (meta === null || meta === void 0 ? void 0 : meta.eventType) || (meta === null || meta === void 0 ? void 0 : meta.type) || null });
+}
+//# sourceMappingURL=ingest-utils.js.map

package/dist/ingest-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest-utils.js","sourceRoot":"","sources":["../src/ingest-utils.ts"],"names":[],"mappings":";AAAA,4FAA4F;;AAG5F,oCAMC;AAGD,kCAUC;AApBD,mGAAmG;AACnG,SAAgB,YAAY,CAAC,GAAY;IACrC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IAC5B,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC;YAAC,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;YAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAAC,CAAC;IACnH,CAAC;IACD,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AAC5B,CAAC;AAED,0GAA0G;AAC1G,SAAgB,WAAW,CAAC,IAAS,EAAE,GAAG,GAAG,KAAM;IAC/C,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,CAAC,CAAC;IAC9B,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,KAAK,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC7C,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;YACrF,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG;gBAAE,OAAO,CAAC,CAAC;QAClC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,MAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAA,IAAI,IAAI,EAAE,CAAC,CAAC;AAC5F,CAAC"}

package/dist/journey-buffs.service.js

@@ -36,15 +36,15 @@ let JourneyBuffsService = class JourneyBuffsService {
         const since = new Date(Date.now() - sinceDays * 86400000);
         const rows = await (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(`SELECT
                 url,
-                COUNT(*) AS rageClicks,
-                COUNT(DISTINCT visitorId) AS uniqueVisitors
+                COUNT(*) AS \`rageClicks\`,
+                COUNT(DISTINCT \`visitorId\`) AS \`uniqueVisitors\`
              FROM visitor_event
              WHERE type = 'event'
                AND meta LIKE '%"eventType":"rage_click"%'
-               AND channelId = ?
-               AND createdAt >= ?
+               AND \`channelId\` = ?
+               AND \`createdAt\` >= ?
              GROUP BY url
-             ORDER BY rageClicks DESC
+             ORDER BY \`rageClicks\` DESC
              LIMIT ?`, [channelId, since, Math.min(Math.max(1, limit), 200)]);
         return rows.map(r => ({
             url: String(r.url || ''),
@@ -62,15 +62,15 @@ let JourneyBuffsService = class JourneyBuffsService {
         const since = new Date(Date.now() - sinceDays * 86400000);
         const rows = await (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(`SELECT
                 url,
-                COUNT(*) AS deadClicks,
-                COUNT(DISTINCT visitorId) AS uniqueVisitors
+                COUNT(*) AS \`deadClicks\`,
+                COUNT(DISTINCT \`visitorId\`) AS \`uniqueVisitors\`
              FROM visitor_event
              WHERE type = 'event'
                AND meta LIKE '%"eventType":"dead_click"%'
-               AND channelId = ?
-               AND createdAt >= ?
+               AND \`channelId\` = ?
+               AND \`createdAt\` >= ?
              GROUP BY url
-             ORDER BY deadClicks DESC
+             ORDER BY \`deadClicks\` DESC
              LIMIT ?`, [channelId, since, Math.min(Math.max(1, limit), 200)]);
         return rows.map(r => ({
             url: String(r.url || ''),
@@ -85,18 +85,18 @@ let JourneyBuffsService = class JourneyBuffsService {
      */
     async sessionSummary(visitorId, limit = 25) {
         const rows = await (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(`SELECT
-                sessionId,
-                MIN(createdAt) AS startedAt,
-                MAX(createdAt) AS endedAt,
-                COUNT(*) AS pageCount,
-                SUM(type = 'event' AND meta LIKE '%"eventType":"add_to_cart"%') > 0        AS addedToCart,
-                SUM(type = 'event' AND meta LIKE '%"eventType":"checkout_completed"%') > 0 AS checkedOut,
-                SUM(type = 'event' AND meta LIKE '%"eventType":"cart_snapshot"%') > 0      AS hadCartSnapshot,
-                SUM(type = 'event' AND meta LIKE '%"eventType":"rage_click"%') > 0         AS rageClicked
+                \`sessionId\`,
+                MIN(\`createdAt\`) AS \`startedAt\`,
+                MAX(\`createdAt\`) AS \`endedAt\`,
+                COUNT(*) AS \`pageCount\`,
+                MAX(CASE WHEN type = 'event' AND meta LIKE '%"eventType":"add_to_cart"%' THEN 1 ELSE 0 END) AS \`addedToCart\`,
+                MAX(CASE WHEN type = 'event' AND meta LIKE '%"eventType":"checkout_completed"%' THEN 1 ELSE 0 END) AS \`checkedOut\`,
+                MAX(CASE WHEN type = 'event' AND meta LIKE '%"eventType":"cart_snapshot"%' THEN 1 ELSE 0 END) AS \`hadCartSnapshot\`,
+                MAX(CASE WHEN type = 'event' AND meta LIKE '%"eventType":"rage_click"%' THEN 1 ELSE 0 END) AS \`rageClicked\`
              FROM visitor_event
-             WHERE visitorId = ?
-             GROUP BY sessionId
-             ORDER BY startedAt DESC
+             WHERE \`visitorId\` = ?
+             GROUP BY \`sessionId\`
+             ORDER BY \`startedAt\` DESC
              LIMIT ?`, [visitorId, Math.min(Math.max(1, limit), 200)]);
         return rows.map(r => {
             const start = new Date(r.startedAt);

package/dist/recommendations.controller.d.ts

@@ -42,12 +42,18 @@ export declare class RecommendationsController {
         items: any[];
     }>;
     /**
-     * Admin-only: manually kick the aggregation cron. Normally runs
-     * nightly, but this is useful for smoke-testing after a data
-     * backfill, or for pushing a big spike through immediately.
+     * Admin-only: run the aggregation now. Idempotent — events up to the
+     * persisted watermark of the last sweep are not counted again, so
+     * calling this right after the 6-hourly cron adds nothing (the
+     * response says `skipped: true`). `?force=1` ignores the watermark,
+     * e.g. after truncating `product_co_view`.
      */
-    aggregateNow(ctx: RequestContext, hRaw?: string): Promise<{
+    aggregateNow(ctx: RequestContext, hRaw?: string, force?: string): Promise<{
         pairs: number;
+        sessions: number;
+        since: string;
+        until: string;
+        skipped: boolean;
         ok: boolean;
         hours: number;
     }>;

package/dist/recommendations.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recommendations.controller.d.ts","sourceRoot":"","sources":["../src/recommendations.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,cAAc,EAAqB,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAYnE,qBACa,yBAAyB;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,sBAAsB;IAE5D;;;OAGG;IAEG,UAAU,CACQ,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM;;;;;;;;;IAUrC;;;;;;OAMG;IAEG,QAAQ,CACU,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM;;;;;;;;;IAUrC;;;OAGG;IAEG,QAAQ,CACU,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM;;;;;IAerC;;;;OAIG;IAGG,YAAY,CAAQ,GAAG,EAAE,cAAc,EAAkB,IAAI,CAAC,EAAE,MAAM;;;;;CAK/E"}
+{"version":3,"file":"recommendations.controller.d.ts","sourceRoot":"","sources":["../src/recommendations.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,cAAc,EAAqB,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAYnE,qBACa,yBAAyB;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,sBAAsB;IAE5D;;;OAGG;IAEG,UAAU,CACQ,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM;;;;;;;;;IAUrC;;;;;;OAMG;IAEG,QAAQ,CACU,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM;;;;;;;;;IAUrC;;;OAGG;IAEG,QAAQ,CACU,KAAK,CAAC,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM;;;;;IAerC;;;;;;OAMG;IAGG,YAAY,CAAQ,GAAG,EAAE,cAAc,EAAkB,IAAI,CAAC,EAAE,MAAM,EAAkB,KAAK,CAAC,EAAE,MAAM;;;;;;;;;CAK/G"}

package/dist/recommendations.controller.js

@@ -78,13 +78,15 @@ let RecommendationsController = class RecommendationsController {
         return { channelId, hours, items };
     }
     /**
-     * Admin-only: manually kick the aggregation cron. Normally runs
-     * nightly, but this is useful for smoke-testing after a data
-     * backfill, or for pushing a big spike through immediately.
+     * Admin-only: run the aggregation now. Idempotent — events up to the
+     * persisted watermark of the last sweep are not counted again, so
+     * calling this right after the 6-hourly cron adds nothing (the
+     * response says `skipped: true`). `?force=1` ignores the watermark,
+     * e.g. after truncating `product_co_view`.
      */
-    async aggregateNow(ctx, hRaw) {
+    async aggregateNow(ctx, hRaw, force) {
         const hours = Math.min(Math.max(1, parseInt(hRaw || '24', 10) || 24), 24 * 30);
-        const result = await this.service.aggregateCoViews(hours);
+        const result = await this.service.aggregateCoViews(hours, { force: force === '1' || force === 'true' });
         return { ok: true, hours, ...result };
     }
 };
@@ -121,8 +123,9 @@ __decorate([
     (0, core_1.Allow)(core_1.Permission.SuperAdmin),
     __param(0, (0, core_1.Ctx)()),
     __param(1, (0, common_1.Query)('hours')),
+    __param(2, (0, common_1.Query)('force')),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [core_1.RequestContext, String]),
+    __metadata("design:paramtypes", [core_1.RequestContext, String, String]),
     __metadata("design:returntype", Promise)
 ], RecommendationsController.prototype, "aggregateNow", null);
 exports.RecommendationsController = RecommendationsController = __decorate([

package/dist/recommendations.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"recommendations.controller.js","sourceRoot":"","sources":["../src/recommendations.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recommendations.controller.js","sourceRoot":"","sources":["../src/recommendations.controller.ts"],"names":[],"mappings":"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"}

package/dist/recommendations.service.d.ts

@@ -38,19 +38,39 @@ export interface RecommendedProduct {
 export declare class RecommendationsService {
     private connection;
     constructor(connection: TransactionalConnection);
+    /** Persisted high-water mark of the last aggregated window (event time). */
+    private static readonly WATERMARK_KEY;
+    private watermark;
+    private aggregating;
+    private store;
     /**
-     * Rebuild the co-view aggregate from `visitor_event`. Idempotent
-     * per (A, B, channelId) — repeated calls over the same window
-     * accumulate, so schedule this as a nightly cron with a rolling
-     * lookback (e.g. last 24h) rather than a full-history rescan.
+     * Rebuild the co-view aggregate from `visitor_event` for the window
+     * `[since, now)`. Idempotent for overlapping calls: the end of the last
+     * aggregated window is persisted, and a later call only counts events
+     * after it (`aggregate-now` after the 6-hourly cron therefore adds
+     * nothing instead of doubling every pair). `force: true` ignores the
+     * watermark (e.g. after truncating `product_co_view`).
      *
-     * Returns the number of pair-triples updated. Uses a bounded
-     * ordered-pair extractor (max 20 events per session) so a single
-     * bot session can't skew the table.
+     * Pairs are accumulated in memory per (A, B, channel) and written as
+     * multi-row upserts in chunks of 500 — the previous version issued one
+     * round trip per ordered pair, so a 20-product session cost 380 statements.
+     *
+     * Bounded to 20 events per session so a single bot session cannot skew
+     * the table.
      */
-    aggregateCoViews(sinceHours?: number): Promise<{
+    aggregateCoViews(sinceHours?: number, opts?: {
+        force?: boolean;
+    }): Promise<{
         pairs: number;
+        sessions: number;
+        since: string;
+        until: string;
+        skipped: boolean;
     }>;
+    private loadWatermark;
+    private saveWatermark;
+    /** Monthly housekeeping (worker): pairs not refreshed for `days` go in batches. */
+    pruneStalePairs(days?: number, batch?: number): Promise<number>;
     /**
      * Read side: "customers who viewed X also viewed Y" for one
      * product, ordered by co-view score, capped at `limit`.

package/dist/recommendations.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recommendations.service.d.ts","sourceRoot":"","sources":["../src/recommendations.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAKxD;;;uDAGuD;AACvD,MAAM,WAAW,kBAAkB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;yDAGqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBACa,sBAAsB;IACnB,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,uBAAuB;IAEvD;;;;;;;;;OASG;IACG,gBAAgB,CAAC,UAAU,SAAK,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IA0DnE;;;OAGG;IACG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,SAAI,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAgB7F;;;;;OAKG;IACG,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,SAAI,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAmC1G;;;;OAIG;IACG,QAAQ,CAAC,SAAS,SAAI,EAAE,UAAU,SAAK,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAwBzF;;;;;;;;OAQG;YACW,gBAAgB;IAuC9B,2DAA2D;YAC7C,eAAe;CAehC"}
+{"version":3,"file":"recommendations.service.d.ts","sourceRoot":"","sources":["../src/recommendations.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAMxD;;;uDAGuD;AACvD,MAAM,WAAW,kBAAkB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;yDAGqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBACa,sBAAsB;IACnB,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,uBAAuB;IAEvD,4EAA4E;IAC5E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAwC;IAC7E,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,WAAW,CAAS;IAE5B,OAAO,CAAC,KAAK;IAIb;;;;;;;;;;;;;;OAcG;IACG,gBAAgB,CAAC,UAAU,SAAK,EAAE,IAAI,GAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;YA4EvJ,aAAa;YAYb,aAAa;IAM3B,mFAAmF;IAC7E,eAAe,CAAC,IAAI,SAAK,EAAE,KAAK,SAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAsB/D;;;OAGG;IACG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,SAAI,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAgB7F;;;;;OAKG;IACG,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,SAAI,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAsC1G;;;;OAIG;IACG,QAAQ,CAAC,SAAS,SAAI,EAAE,UAAU,SAAK,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IA4BzF;;;;;;;;OAQG;YACW,gBAAgB;IAuC9B,2DAA2D;YAC7C,eAAe;CAehC"}

package/dist/recommendations.service.js

@@ -8,11 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var RecommendationsService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecommendationsService = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@vendure/core");
 const vendure_licence_sdk_1 = require("@huloglobal/vendure-licence-sdk");
+const sql_fragments_1 = require("./sql-fragments");
 const loggerCtx = 'HuloRecommendationsService';
 /**
  * Product recommendations driven by observed co-viewing behaviour.
@@ -35,80 +37,155 @@ const loggerCtx = 'HuloRecommendationsService';
  * are still returned so storefronts that prefer their own hydration
  * path can ignore the extra fields.
  */
-let RecommendationsService = class RecommendationsService {
+let RecommendationsService = RecommendationsService_1 = class RecommendationsService {
     constructor(connection) {
         this.connection = connection;
+        this.watermark = null;
+        this.aggregating = false;
+    }
+    store() {
+        return new vendure_licence_sdk_1.LicenceStore((sql, params) => (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(sql, params));
     }
     /**
-     * Rebuild the co-view aggregate from `visitor_event`. Idempotent
-     * per (A, B, channelId) — repeated calls over the same window
-     * accumulate, so schedule this as a nightly cron with a rolling
-     * lookback (e.g. last 24h) rather than a full-history rescan.
+     * Rebuild the co-view aggregate from `visitor_event` for the window
+     * `[since, now)`. Idempotent for overlapping calls: the end of the last
+     * aggregated window is persisted, and a later call only counts events
+     * after it (`aggregate-now` after the 6-hourly cron therefore adds
+     * nothing instead of doubling every pair). `force: true` ignores the
+     * watermark (e.g. after truncating `product_co_view`).
+     *
+     * Pairs are accumulated in memory per (A, B, channel) and written as
+     * multi-row upserts in chunks of 500 — the previous version issued one
+     * round trip per ordered pair, so a 20-product session cost 380 statements.
      *
-     * Returns the number of pair-triples updated. Uses a bounded
-     * ordered-pair extractor (max 20 events per session) so a single
-     * bot session can't skew the table.
+     * Bounded to 20 events per session so a single bot session cannot skew
+     * the table.
      */
-    async aggregateCoViews(sinceHours = 24) {
+    async aggregateCoViews(sinceHours = 24, opts = {}) {
         const conn = (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection);
-        const since = new Date(Date.now() - sinceHours * 3600000);
-        // Extract every session's product-view sequence within the
-        // window. Bounded to 20 events per session to keep pathological
-        // sessions from blowing up the table.
-        const sessions = await conn.query(`SELECT
-                sessionId,
-                channelId,
-                GROUP_CONCAT(
-                    SUBSTRING_INDEX(SUBSTRING_INDEX(meta, '"productId":', -1), ',', 1)
-                    ORDER BY createdAt
-                    SEPARATOR ','
-                ) AS ids
-             FROM visitor_event
-             WHERE type = 'event'
-               AND meta LIKE '%"eventType":"product_view"%'
-               AND createdAt >= ?
-             GROUP BY sessionId, channelId
-             HAVING COUNT(*) BETWEEN 2 AND 20`, [since]);
-        let pairs = 0;
-        for (const s of sessions) {
-            const rawIds = String(s.ids || '')
-                .split(',')
-                .map((x) => parseInt(x.replace(/[^0-9]/g, ''), 10))
-                .filter((n) => Number.isFinite(n) && n > 0);
-            if (rawIds.length < 2)
-                continue;
-            const uniq = Array.from(new Set(rawIds));
-            if (uniq.length < 2)
-                continue;
-            for (let i = 0; i < uniq.length; i++) {
-                for (let j = 0; j < uniq.length; j++) {
-                    if (i === j)
-                        continue;
-                    const a = uniq[i];
-                    const b = uniq[j];
-                    // Upsert-with-increment via ON DUPLICATE KEY UPDATE.
-                    await conn.query(`INSERT INTO product_co_view
-                           (productIdA, productIdB, channelId, viewsTogether, lastUpdated)
-                         VALUES (?, ?, ?, 1, NOW(3))
-                         ON DUPLICATE KEY UPDATE
-                           viewsTogether = viewsTogether + 1,
-                           lastUpdated = NOW(3)`, [a, b, s.channelId || 1], { conflictColumns: ['productIdA', 'productIdB', 'channelId'] });
-                    pairs += 1;
+        const until = new Date();
+        let since = new Date(until.getTime() - sinceHours * 3600000);
+        if (this.aggregating)
+            return { pairs: 0, sessions: 0, since: since.toISOString(), until: until.toISOString(), skipped: true };
+        this.aggregating = true;
+        try {
+            if (!opts.force) {
+                const mark = await this.loadWatermark();
+                if (mark && mark > since)
+                    since = mark;
+            }
+            if (since >= until)
+                return { pairs: 0, sessions: 0, since: since.toISOString(), until: until.toISOString(), skipped: true };
+            const sessions = await conn.query(`SELECT
+                    \`sessionId\`,
+                    \`channelId\`,
+                    GROUP_CONCAT(
+                        ${sql_fragments_1.PRODUCT_ID_TOKEN_LOOSE}
+                        ORDER BY \`createdAt\`
+                        SEPARATOR ','
+                    ) AS ids
+                 FROM visitor_event
+                 WHERE type = 'event'
+                   AND meta LIKE '%"eventType":"product_view"%'
+                   AND \`createdAt\` >= ?
+                   AND \`createdAt\` < ?
+                 GROUP BY \`sessionId\`, \`channelId\`
+                 HAVING COUNT(*) BETWEEN 2 AND 20`, [since, until]);
+            // (a, b, channel) → co-view count for this window.
+            const counts = new Map();
+            for (const s of sessions) {
+                const rawIds = String(s.ids || '')
+                    .split(',')
+                    .map((x) => parseInt(x.replace(/[^0-9]/g, ''), 10))
+                    .filter((n) => Number.isFinite(n) && n > 0);
+                const uniq = Array.from(new Set(rawIds));
+                if (uniq.length < 2)
+                    continue;
+                const ch = Number(s.channelId) || 1;
+                for (const a of uniq) {
+                    for (const b of uniq) {
+                        if (a === b)
+                            continue;
+                        const key = `${a}|${b}|${ch}`;
+                        const hit = counts.get(key);
+                        if (hit)
+                            hit.n += 1;
+                        else
+                            counts.set(key, { a, b, ch, n: 1 });
+                    }
                 }
             }
+            const rows = Array.from(counts.values());
+            const CHUNK = 500;
+            for (let i = 0; i < rows.length; i += CHUNK) {
+                const chunk = rows.slice(i, i + CHUNK);
+                const valuesSql = chunk.map(() => '(?, ?, ?, ?, NOW(3))').join(', ');
+                await conn.query(`INSERT INTO product_co_view
+                       (\`productIdA\`, \`productIdB\`, \`channelId\`, \`viewsTogether\`, \`lastUpdated\`)
+                     VALUES ${valuesSql}
+                     ON DUPLICATE KEY UPDATE
+                       \`viewsTogether\` = product_co_view.\`viewsTogether\` + VALUES(\`viewsTogether\`),
+                       \`lastUpdated\` = NOW(3)`, chunk.flatMap(r => [r.a, r.b, r.ch, r.n]), { conflictColumns: sql_fragments_1.PRODUCT_CO_VIEW_CONFLICT });
+            }
+            await this.saveWatermark(until);
+            common_1.Logger.log(`Co-view aggregation: ${sessions.length} sessions, ${rows.length} pair rows (${since.toISOString()} → ${until.toISOString()})`, loggerCtx);
+            return { pairs: rows.length, sessions: sessions.length, since: since.toISOString(), until: until.toISOString(), skipped: false };
+        }
+        finally {
+            this.aggregating = false;
         }
-        common_1.Logger.log(`Co-view aggregation: ${sessions.length} sessions, ${pairs} pair updates`, loggerCtx);
-        return { pairs };
+    }
+    async loadWatermark() {
+        if (this.watermark)
+            return this.watermark;
+        try {
+            const store = this.store();
+            await store.ensureTable();
+            const raw = await store.load(RecommendationsService_1.WATERMARK_KEY);
+            const d = raw ? new Date(raw) : null;
+            this.watermark = d && Number.isFinite(d.getTime()) ? d : null;
+        }
+        catch {
+            this.watermark = null;
+        }
+        return this.watermark;
+    }
+    async saveWatermark(until) {
+        this.watermark = until;
+        try {
+            await this.store().save(RecommendationsService_1.WATERMARK_KEY, until.toISOString());
+        }
+        catch (e) {
+            common_1.Logger.warn(`co-view watermark not persisted: ${e === null || e === void 0 ? void 0 : e.message}`, loggerCtx);
+        }
+    }
+    /** Monthly housekeeping (worker): pairs not refreshed for `days` go in batches. */
+    async pruneStalePairs(days = 90, batch = 5000) {
+        const conn = (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection);
+        let deleted = 0;
+        for (let round = 0; round < 400; round++) {
+            const rows = await conn.query(`SELECT \`productIdA\`, \`productIdB\`, \`channelId\` FROM product_co_view
+                 WHERE \`lastUpdated\` < DATE_SUB(NOW(), INTERVAL ? DAY)
+                 ORDER BY \`productIdA\`, \`productIdB\`, \`channelId\` LIMIT ?`, [days, batch]);
+            if (!rows.length)
+                break;
+            const tuples = rows.map(() => '(?, ?, ?)').join(', ');
+            await conn.query(`DELETE FROM product_co_view WHERE (\`productIdA\`, \`productIdB\`, \`channelId\`) IN (${tuples})`, rows.flatMap((r) => [Number(r.productIdA), Number(r.productIdB), Number(r.channelId)]));
+            deleted += rows.length;
+            if (rows.length < batch)
+                break;
+        }
+        return deleted;
     }
     /**
      * Read side: "customers who viewed X also viewed Y" for one
      * product, ordered by co-view score, capped at `limit`.
      */
     async alsoViewed(productId, channelId = 1, limit = 10) {
-        const rows = await (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(`SELECT productIdB AS productId, viewsTogether AS score
+        const rows = await (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(`SELECT \`productIdB\` AS \`productId\`, \`viewsTogether\` AS score
              FROM product_co_view
-             WHERE productIdA = ? AND channelId = ?
-             ORDER BY viewsTogether DESC, lastUpdated DESC
+             WHERE \`productIdA\` = ? AND \`channelId\` = ?
+             ORDER BY \`viewsTogether\` DESC, \`lastUpdated\` DESC
              LIMIT ?`, [productId, channelId, Math.min(Math.max(1, limit), 50)]);
         return this.enrichWithNames(rows.map(r => ({
             productId: Number(r.productId),
@@ -124,25 +201,28 @@ let RecommendationsService = class RecommendationsService {
      */
     async personalRecommendations(visitorId, channelId = 1, limit = 10) {
         const conn = (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection);
-        const seeds = await conn.query(`SELECT DISTINCT
-                CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(meta, '"productId":', -1), ',', 1) AS UNSIGNED) AS productId
+        // No DISTINCT + ORDER BY on an unselected column (Postgres rejects it):
+        // group by the extracted id and order by the latest view instead.
+        const seeds = await conn.query(`SELECT CAST(${sql_fragments_1.PRODUCT_ID_TOKEN} AS UNSIGNED) AS \`productId\`, MAX(\`createdAt\`) AS \`lastSeen\`
              FROM visitor_event
-             WHERE visitorId = ?
+             WHERE \`visitorId\` = ?
                AND type = 'event'
                AND meta LIKE '%"eventType":"product_view"%'
-               AND createdAt >= (NOW() - INTERVAL 30 DAY)
-             ORDER BY createdAt DESC
+               AND \`createdAt\` >= DATE_SUB(NOW(), INTERVAL 30 DAY)
+               AND ${(0, sql_fragments_1.digitsOnly)(conn.dialect, sql_fragments_1.PRODUCT_ID_TOKEN)}
+             GROUP BY CAST(${sql_fragments_1.PRODUCT_ID_TOKEN} AS UNSIGNED)
+             ORDER BY \`lastSeen\` DESC
              LIMIT 10`, [visitorId]);
         const seedIds = seeds.map(s => Number(s.productId)).filter(n => n > 0);
         if (!seedIds.length)
             return [];
         const placeholders = seedIds.map(() => '?').join(',');
-        const rows = await conn.query(`SELECT productIdB AS productId, SUM(viewsTogether) AS score
+        const rows = await conn.query(`SELECT \`productIdB\` AS \`productId\`, SUM(\`viewsTogether\`) AS score
              FROM product_co_view
-             WHERE productIdA IN (${placeholders})
-               AND channelId = ?
-               AND productIdB NOT IN (${placeholders})
-             GROUP BY productIdB
+             WHERE \`productIdA\` IN (${placeholders})
+               AND \`channelId\` = ?
+               AND \`productIdB\` NOT IN (${placeholders})
+             GROUP BY \`productIdB\`
              ORDER BY score DESC
              LIMIT ?`, [...seedIds, channelId, ...seedIds, Math.min(Math.max(1, limit), 50)]);
         return this.enrichWithNames(rows.map(r => ({
@@ -157,17 +237,21 @@ let RecommendationsService = class RecommendationsService {
      * reflects real interest, not just search-console clicks.
      */
     async trending(channelId = 1, sinceHours = 24, limit = 10) {
+        const conn = (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection);
         const since = new Date(Date.now() - sinceHours * 3600000);
-        const rows = await (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(`SELECT
-                CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(meta, '"productId":', -1), ',', 1) AS UNSIGNED) AS productId,
+        // The digits guard keeps CAST from raising on Postgres; GROUP BY / HAVING repeat
+        // the expression because Postgres does not resolve output aliases in HAVING.
+        const rows = await conn.query(`SELECT
+                CAST(${sql_fragments_1.PRODUCT_ID_TOKEN} AS UNSIGNED) AS \`productId\`,
                 COUNT(*) AS views
              FROM visitor_event
              WHERE type = 'event'
                AND meta LIKE '%"eventType":"product_view"%'
-               AND channelId = ?
-               AND createdAt >= ?
-             GROUP BY productId
-             HAVING productId > 0
+               AND \`channelId\` = ?
+               AND \`createdAt\` >= ?
+               AND ${(0, sql_fragments_1.digitsOnly)(conn.dialect, sql_fragments_1.PRODUCT_ID_TOKEN)}
+             GROUP BY CAST(${sql_fragments_1.PRODUCT_ID_TOKEN} AS UNSIGNED)
+             HAVING CAST(${sql_fragments_1.PRODUCT_ID_TOKEN} AS UNSIGNED) > 0
              ORDER BY views DESC
              LIMIT ?`, [channelId, since, Math.min(Math.max(1, limit), 50)]);
         return this.enrichWithNames(rows.map(r => ({
@@ -197,11 +281,11 @@ let RecommendationsService = class RecommendationsService {
             // languageCode = 'en' DESC so English wins the tie for
             // multi-locale stores; single-locale installs will
             // naturally land on their only translation.
-            const rows = await (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(`SELECT pt.baseId AS productId, pt.name, pt.slug
+            const rows = await (0, vendure_licence_sdk_1.adapterFor)(this.connection.rawConnection).query(`SELECT pt.\`baseId\` AS \`productId\`, pt.name, pt.slug
                  FROM product_translation pt
-                 JOIN product p ON p.id = pt.baseId AND p.deletedAt IS NULL
-                 WHERE pt.baseId IN (${placeholders})
-                 ORDER BY pt.baseId, pt.languageCode = 'en' DESC`, ids);
+                 JOIN product p ON p.id = pt.\`baseId\` AND p.\`deletedAt\` IS NULL
+                 WHERE pt.\`baseId\` IN (${placeholders})
+                 ORDER BY pt.\`baseId\`, pt.\`languageCode\` = 'en' DESC`, ids);
             for (const r of rows) {
                 const id = Number(r.productId);
                 // First-write wins — the ORDER BY puts English first
@@ -235,7 +319,9 @@ let RecommendationsService = class RecommendationsService {
     }
 };
 exports.RecommendationsService = RecommendationsService;
-exports.RecommendationsService = RecommendationsService = __decorate([
+/** Persisted high-water mark of the last aggregated window (event time). */
+RecommendationsService.WATERMARK_KEY = 'visitor-analytics-coview-watermark';
+exports.RecommendationsService = RecommendationsService = RecommendationsService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.TransactionalConnection])
 ], RecommendationsService);