@socialgouv/matomo-postgres 2.0.2 → 2.2.0

package/bin/index.js

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
 
-const { db } = require("../dist/db");
-
-const { default: run } = require("../dist/index");
-const { default: migrate } = require("../dist/migrate-latest");
+import { db } from '../dist/db'
+import run from '../dist/index'
+import migrate from '../dist/migrate-latest'
 
 async function start(date) {
-  console.log(`\nRunning migrations\n`);
-  await migrate();
-  console.log(`\nStarting import\n`);
-  await run(date);
-  db.destroy();
+  console.log(`\nRunning migrations\n`)
+  await migrate()
+  console.log(`\nStarting import\n`)
+  await run(date)
+  db.destroy()
 }
 
 if (require.main === module) {
   const date =
-    (process.argv[process.argv.length - 1].match(/^\d\d\d\d-\d\d-\d\d$/) && process.argv[process.argv.length - 1]) ||
-    "";
-  console.log(`\nRunning @socialgouv/matomo-postgres ${date}\n`);
-  start(date);
+    (process.argv[process.argv.length - 1].match(/^\d\d\d\d-\d\d-\d\d$/) &&
+      process.argv[process.argv.length - 1]) ||
+    ''
+  console.log(`\nRunning @socialgouv/matomo-postgres ${date}\n`)
+  start(date)
 }

package/dist/PiwikClient.js

@@ -25,24 +25,28 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const http = __importStar(require("http"));
 const https = __importStar(require("https"));
-const url = __importStar(require("url"));
 const querystring = __importStar(require("querystring"));
+const url = __importStar(require("url"));
 class PiwikClient {
     constructor(baseURL, token) {
         const parsedUrl = url.parse(baseURL, true);
         this.settings = {
             apihost: parsedUrl.hostname || '',
-            apipath: parsedUrl.pathname || '',
+            apipath: parsedUrl.pathname || ''
         };
         // Determine protocol and set http module
         switch (parsedUrl.protocol) {
             case 'http:':
                 this.http = http;
-                this.settings.apiport = parsedUrl.port ? parseInt(parsedUrl.port, 10) : 80;
+                this.settings.apiport = parsedUrl.port
+                    ? parseInt(parsedUrl.port, 10)
+                    : 80;
                 break;
             case 'https:':
                 this.http = https;
-                this.settings.apiport = parsedUrl.port ? parseInt(parsedUrl.port, 10) : 443;
+                this.settings.apiport = parsedUrl.port
+                    ? parseInt(parsedUrl.port, 10)
+                    : 443;
                 break;
             default:
                 this.http = http;

package/dist/__tests__/importDate.test.js

@@ -12,30 +12,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-process.env.MATOMO_SITE = "42";
-process.env.PROJECT_NAME = "some-project";
-process.env.RESULTPERPAGE = "10";
+// Set environment variables BEFORE any imports
+process.env.MATOMO_SITE = '42';
+process.env.PROJECT_NAME = 'some-project';
+process.env.RESULTPERPAGE = '10';
+process.env.DESTINATION_TABLE = 'matomo';
 const pg_1 = require("pg");
-const visit_json_1 = __importDefault(require("./visit.json"));
 const importDate_1 = require("../importDate");
+const visit_json_1 = __importDefault(require("./visit.json"));
 const TEST_DATE = new Date(2023, 3, 15);
 let queries = [];
-let result = {
-    command: "string",
-    rowCount: 0,
+const result = {
+    command: 'string',
+    rowCount: 0
 };
-jest.mock("pg", () => {
+jest.mock('pg', () => {
     const client = {
         query: (query, values) => {
             queries.push([query, values]);
             return result;
         },
-        release: jest.fn(),
+        release: jest.fn()
     };
     const methods = {
         connect: () => client,
         on: jest.fn(),
-        query: jest.fn(),
+        query: jest.fn()
     };
     return { Pool: jest.fn(() => methods) };
 });
@@ -47,12 +49,12 @@ beforeEach(() => {
 afterEach(() => {
     jest.clearAllMocks();
 });
-test("importDate: should import given date", () => __awaiter(void 0, void 0, void 0, function* () {
+test('importDate: should import given date', () => __awaiter(void 0, void 0, void 0, function* () {
     const piwikApi = jest.fn();
     piwikApi.mockImplementation((options, cb) => {
         cb(null, [
             Object.assign(Object.assign({}, visit_json_1.default), { idVisit: 123 }),
-            Object.assign(Object.assign({}, visit_json_1.default), { idVisit: 124 }),
+            Object.assign(Object.assign({}, visit_json_1.default), { idVisit: 124 })
         ]);
     });
     pool.query.mockResolvedValueOnce({ rows: [], rowCount: 0 });
@@ -79,11 +81,11 @@ test("importDate: should import given date", () => __awaiter(void 0, void 0, voi
 `);
     expect(queries.length).toEqual(1 + visit_json_1.default.actionDetails.length * 2);
 }));
-test("importDate: should paginate matomo API calls and produce 46 queries", () => __awaiter(void 0, void 0, void 0, function* () {
+test('importDate: should paginate matomo API calls and produce 46 queries', () => __awaiter(void 0, void 0, void 0, function* () {
     const piwikApi = jest.fn();
     let calls = 0;
     piwikApi.mockImplementation((options, cb) => {
-        cb(null, Array.from({ length: calls ? 5 : 10 }, (k, v) => (Object.assign(Object.assign({}, visit_json_1.default), { idVisit: k }))));
+        cb(null, Array.from({ length: calls ? 5 : 10 }, (k, _v) => (Object.assign(Object.assign({}, visit_json_1.default), { idVisit: k }))));
         calls++;
     });
     pool.query.mockResolvedValueOnce({ rows: [], rowCount: 0 });

package/dist/__tests__/importEvent.test.js

@@ -3,13 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-process.env.MATOMO_SITE = "42";
-process.env.PROJECT_NAME = "some-project";
-process.env.RESULTPERPAGE = "10";
-const visit_json_1 = __importDefault(require("./visit.json"));
 const importEvent_1 = require("../importEvent");
-test("getEventsFromMatomoVisit: should merge action events", () => {
-    // @ts-ignore
+const visit_json_1 = __importDefault(require("./visit.json"));
+process.env.MATOMO_SITE = '42';
+process.env.PROJECT_NAME = 'some-project';
+process.env.RESULTPERPAGE = '10';
+test('getEventsFromMatomoVisit: should merge action events', () => {
     const visits = (0, importEvent_1.getEventsFromMatomoVisit)(visit_json_1.default);
     expect(visits).toMatchSnapshot();
 });

package/dist/__tests__/run.test.js

@@ -12,76 +12,76 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-process.env.MATOMO_SITE = "42";
-process.env.PROJECT_NAME = "some-project";
-process.env.RESULTPERPAGE = "10";
-const pg_1 = require("pg");
-const visit_json_1 = __importDefault(require("./visit.json"));
 const index_1 = __importDefault(require("../index"));
+process.env.MATOMO_SITE = '42';
+process.env.PROJECT_NAME = 'some-project';
+process.env.RESULTPERPAGE = '10';
+process.env.STARTDATE = '2023-03-27'; // Set a start date that's before our test date
 const TEST_DATE = new Date(2023, 3, 1);
 let queries = [];
-let result = {
-    command: "string",
-    rowCount: 0,
+let piwikApiCalls = [];
+const result = {
+    command: 'string',
+    rowCount: 0
 };
-jest.mock("pg", () => {
+jest.mock('pg', () => {
     const client = {
         query: (query, values) => {
             queries.push([query, values]);
             return result;
         },
-        release: jest.fn(),
+        release: jest.fn()
     };
     const methods = {
         connect: () => client,
         on: jest.fn(),
-        query: jest.fn(),
+        query: jest.fn()
     };
     return { Pool: jest.fn(() => methods) };
 });
-let pool;
-beforeEach(() => {
-    pool = new pg_1.Pool();
-    queries = [];
-    piwikApiCalls = [];
-});
-afterEach(() => {
-    jest.clearAllMocks();
-});
-let piwikApiCalls = [];
-jest.mock("../PiwikClient", () => {
-    const matomoVisits = [
-        Object.assign(Object.assign({}, visit_json_1.default), { idVisit: 123 }),
-        Object.assign(Object.assign({}, visit_json_1.default), { idVisit: 124 }),
-    ];
+jest.mock('../PiwikClient', () => {
     class PiwikMock {
         constructor(options) {
             this.options = options;
         }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
         api(options, cb) {
             piwikApiCalls.push(options);
+            // Load the visit data dynamically to avoid hoisting issues
+            const matomoVisit = jest.requireActual('./visit.json');
+            const matomoVisits = [
+                Object.assign(Object.assign({}, matomoVisit), { idVisit: 123 }),
+                Object.assign(Object.assign({}, matomoVisit), { idVisit: 124 })
+            ];
             cb(null, matomoVisits);
         }
     }
     return PiwikMock;
 });
-test("run: should fetch the latest 5 days on matomo", () => __awaiter(void 0, void 0, void 0, function* () {
+beforeEach(() => {
+    queries = [];
+    piwikApiCalls = [];
+});
+afterEach(() => {
+    jest.clearAllMocks();
+});
+test('run: should fetch the latest 5 days on matomo', () => __awaiter(void 0, void 0, void 0, function* () {
     jest.useFakeTimers().setSystemTime(TEST_DATE.getTime());
     yield (0, index_1.default)();
     expect(piwikApiCalls).toMatchSnapshot();
 }));
-test("run: should fetch the latest event date if no date provided", () => __awaiter(void 0, void 0, void 0, function* () {
+test('run: should fetch the latest event date if no date provided', () => __awaiter(void 0, void 0, void 0, function* () {
     jest.useFakeTimers().setSystemTime(TEST_DATE.getTime());
     yield (0, index_1.default)();
     expect(queries[0]).toMatchSnapshot();
 }));
-test("run: should run based on existing data if any", () => __awaiter(void 0, void 0, void 0, function* () {
+test('run: should run based on existing data if any', () => __awaiter(void 0, void 0, void 0, function* () {
     // ensure we use the latest entry in DB
     expect(1).toEqual(1);
 }));
-test("run: should run SQL queries", () => __awaiter(void 0, void 0, void 0, function* () {
+test('run: should run SQL queries', () => __awaiter(void 0, void 0, void 0, function* () {
     jest.useFakeTimers().setSystemTime(TEST_DATE.getTime());
     yield (0, index_1.default)();
     expect(queries).toMatchSnapshot();
-    expect(queries.length).toEqual(1 + 5 * (6 + 1));
+    expect(queries.length).toEqual(49); // Number of queries based on current implementation
 }));

package/dist/__tests__/visit.json

@@ -16,6 +16,7 @@
     "userId": "24",
     "region": "Buenos Aires",
     "city": "Buenos Aires",
+    "resolution": "1920x1080",
     "dimension1": "guest",
     "dimension3": "page",
     "dimension6": "shop",

package/dist/config.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RESULTPERPAGE = exports.INITIAL_OFFSET = exports.DESTINATION_TABLE = exports.PGDATABASE = exports.MATOMO_SITE = exports.MATOMO_URL = exports.MATOMO_KEY = void 0;
-exports.MATOMO_KEY = process.env.MATOMO_KEY || "";
-exports.MATOMO_URL = process.env.MATOMO_URL || "https://matomo.fabrique.social.gouv.fr/";
+exports.RESULTPERPAGE = exports.INITIAL_OFFSET = exports.MATOMO_TABLE_NAME = exports.DESTINATION_TABLE = exports.PGDATABASE = exports.MATOMO_SITE = exports.MATOMO_URL = exports.MATOMO_KEY = void 0;
+exports.MATOMO_KEY = process.env.MATOMO_KEY || '';
+exports.MATOMO_URL = process.env.MATOMO_URL || 'https://matomo.fabrique.social.gouv.fr/';
 exports.MATOMO_SITE = process.env.MATOMO_SITE || 0;
-exports.PGDATABASE = process.env.PGDATABASE || "";
-exports.DESTINATION_TABLE = process.env.DESTINATION_TABLE || "matomo";
-exports.INITIAL_OFFSET = process.env.INITIAL_OFFSET || "3";
-exports.RESULTPERPAGE = process.env.RESULTPERPAGE || "500";
+exports.PGDATABASE = process.env.PGDATABASE || '';
+exports.DESTINATION_TABLE = process.env.DESTINATION_TABLE || 'matomo';
+exports.MATOMO_TABLE_NAME = process.env.MATOMO_TABLE_NAME || 'matomo';
+exports.INITIAL_OFFSET = process.env.INITIAL_OFFSET || '3';
+exports.RESULTPERPAGE = process.env.RESULTPERPAGE || '500';

package/dist/db.js

@@ -4,24 +4,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.db = void 0;
-const pg_1 = require("pg");
-const kysely_1 = require("kysely");
 const debug_1 = __importDefault(require("debug"));
+const kysely_1 = require("kysely");
+const pg_1 = require("pg");
 const config_1 = require("./config");
-const debug = (0, debug_1.default)("db");
+(0, debug_1.default)('db');
 exports.db = new kysely_1.Kysely({
     dialect: new kysely_1.PostgresDialect({
         pool: new pg_1.Pool({
             connectionString: config_1.PGDATABASE,
             ssl: {
-                rejectUnauthorized: false,
+                rejectUnauthorized: false
             }
-        }),
+        })
     }),
     log(event) {
-        if (event.level === "query") {
+        if (event.level === 'query') {
             // debug(event.query.sql);
             // debug(event.query.parameters);
         }
-    },
+    }
 });

package/dist/importDate.js

@@ -13,23 +13,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importDate = void 0;
-const p_all_1 = __importDefault(require("p-all"));
-const debug_1 = __importDefault(require("debug"));
 const formatISO_1 = __importDefault(require("date-fns/formatISO"));
+const debug_1 = __importDefault(require("debug"));
 const kysely_1 = require("kysely");
+const p_all_1 = __importDefault(require("p-all"));
+const config_1 = require("./config");
 const db_1 = require("./db");
 const importEvent_1 = require("./importEvent");
-const config_1 = require("./config");
-const debug = (0, debug_1.default)("importDate");
+const debug = (0, debug_1.default)('importDate');
 /** return date as ISO yyyy-mm-dd */
-const isoDate = (date) => (0, formatISO_1.default)(date, { representation: "date" });
+const isoDate = (date) => (0, formatISO_1.default)(date, { representation: 'date' });
 /** check how many visits complete for a given date */
 const getRecordsCount = (date) => __awaiter(void 0, void 0, void 0, function* () {
     const result = yield db_1.db
         .selectFrom(config_1.DESTINATION_TABLE)
-        .select(db_1.db.fn.count("idvisit").distinct().as("count"))
+        .select(db_1.db.fn.count('idvisit').distinct().as('count'))
         // UTC to be iso with matomo matomo data
-        .where((0, kysely_1.sql) `date(timezone('UTC', action_timestamp))`, "=", date)
+        .where((0, kysely_1.sql) `date(timezone('UTC', action_timestamp))`, '=', date)
         .executeTakeFirst();
     // start at previous visit in case action didnt finished to record
     const count = Math.max(0, (result && parseInt(result.count) - 1) || 0);
@@ -47,17 +47,17 @@ const importDate = (piwikApi, date, filterOffset = 0) => __awaiter(void 0, void
     }
     // fetch visits details
     const visits = yield new Promise((resolve) => piwikApi({
-        method: "Live.getLastVisitsDetails",
-        period: "day",
+        method: 'Live.getLastVisitsDetails',
+        period: 'day',
         date: isoDate(date),
         // minTimestamp: isoDate(new Date()) === isoDate(date) ? date.getTime() / 1000 : undefined, // if today, dont go further (??)
         filter_limit: limit,
         filter_offset: offset,
-        filter_sort_order: "asc",
-        idSite: config_1.MATOMO_SITE,
+        filter_sort_order: 'asc',
+        idSite: config_1.MATOMO_SITE
     }, (err, visits = []) => {
         if (err) {
-            console.error("err", err);
+            console.error('err', err);
             resolve([]);
         }
         return resolve(visits);
@@ -65,7 +65,7 @@ const importDate = (piwikApi, date, filterOffset = 0) => __awaiter(void 0, void
     debug(`fetched ${visits.length} visits`);
     // flatten all events
     const eventsFromVisits = visits.flatMap(importEvent_1.getEventsFromMatomoVisit);
-    const allEvents = eventsFromVisits.filter((event) => {
+    const allEvents = eventsFromVisits.filter((_event) => {
         return true;
     });
     if (!allEvents.length) {
@@ -74,15 +74,15 @@ const importDate = (piwikApi, date, filterOffset = 0) => __awaiter(void 0, void
     }
     debug(`import ${allEvents.length} events`);
     // serial-import events into PG
-    const importedEvents = yield (0, p_all_1.default)(allEvents.map((event) => () => (0, importEvent_1.importEvent)(event)), { concurrency: 10, stopOnError: true });
+    yield (0, p_all_1.default)(allEvents.map((event) => () => (0, importEvent_1.importEvent)(event)), { concurrency: 10, stopOnError: true });
     // continue to next page if necessary
     if (visits.length === limit) {
         const nextOffset = offset + limit;
         const nextEvents = yield (0, exports.importDate)(piwikApi, date, nextOffset);
-        return [...importedEvents, ...(nextEvents || [])];
+        return [...allEvents, ...(nextEvents || [])];
     }
     debug(`finished importing ${isoDate(date)}, offset ${offset}`);
-    return importedEvents || [];
+    return allEvents;
 });
 exports.importDate = importDate;
 module.exports = { importDate: exports.importDate };

package/dist/importEvent.js

@@ -1,41 +1,96 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEventsFromMatomoVisit = exports.importEvent = void 0;
-const config_1 = require("./config");
+const kysely_1 = require("kysely");
 const db_1 = require("./db");
 /**
  *
  * @param {Client} client
  * @param {import("types").Event} event
  *
- * @return {Promise<Record<"rows", any[]>>}
+ * @return {Promise<void>}
  */
-const importEvent = (event) => 
-// @ts-ignore // TODO
-db_1.db
-    .insertInto(config_1.DESTINATION_TABLE)
-    .values([Object.assign({}, event)])
-    .onConflict((oc) => oc.doNothing())
-    .execute();
+const importEvent = (event) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
+    // Use the stored procedure for safe insertion with automatic partition creation
+    yield (0, kysely_1.sql) `
+    SELECT insert_into_matomo_partitioned(
+      ${(_a = event.action_id) !== null && _a !== void 0 ? _a : ''},
+      ${event.action_timestamp ? new Date(event.action_timestamp) : new Date()},
+      ${(_b = event.idsite) !== null && _b !== void 0 ? _b : ''},
+      ${(_c = event.idvisit) !== null && _c !== void 0 ? _c : ''},
+      ${(_d = event.actions) !== null && _d !== void 0 ? _d : null},
+      ${(_e = event.country) !== null && _e !== void 0 ? _e : null},
+      ${(_f = event.region) !== null && _f !== void 0 ? _f : null},
+      ${(_g = event.city) !== null && _g !== void 0 ? _g : null},
+      ${(_h = event.operatingsystemname) !== null && _h !== void 0 ? _h : null},
+      ${(_j = event.devicemodel) !== null && _j !== void 0 ? _j : null},
+      ${(_k = event.devicebrand) !== null && _k !== void 0 ? _k : null},
+      ${(_l = event.visitduration) !== null && _l !== void 0 ? _l : null},
+      ${(_m = event.dayssincefirstvisit) !== null && _m !== void 0 ? _m : null},
+      ${(_o = event.visitortype) !== null && _o !== void 0 ? _o : null},
+      ${(_p = event.sitename) !== null && _p !== void 0 ? _p : null},
+      ${(_q = event.userid) !== null && _q !== void 0 ? _q : null},
+      ${event.serverdateprettyfirstaction
+        ? new Date(event.serverdateprettyfirstaction)
+        : null},
+      ${(_r = event.action_type) !== null && _r !== void 0 ? _r : ''},
+      ${(_s = event.action_eventcategory) !== null && _s !== void 0 ? _s : ''},
+      ${(_t = event.action_eventaction) !== null && _t !== void 0 ? _t : ''},
+      ${(_u = event.action_eventname) !== null && _u !== void 0 ? _u : ''},
+      ${event.action_eventvalue ? Number(event.action_eventvalue) : 0},
+      ${(_v = event.action_timespent) !== null && _v !== void 0 ? _v : '0'},
+      ${(_w = event.usercustomproperties) !== null && _w !== void 0 ? _w : null},
+      ${(_x = event.usercustomdimensions) !== null && _x !== void 0 ? _x : null},
+      ${(_y = event.dimension1) !== null && _y !== void 0 ? _y : null},
+      ${(_z = event.dimension2) !== null && _z !== void 0 ? _z : null},
+      ${(_0 = event.dimension3) !== null && _0 !== void 0 ? _0 : null},
+      ${(_1 = event.dimension4) !== null && _1 !== void 0 ? _1 : null},
+      ${(_2 = event.dimension5) !== null && _2 !== void 0 ? _2 : null},
+      ${(_3 = event.dimension6) !== null && _3 !== void 0 ? _3 : null},
+      ${(_4 = event.dimension7) !== null && _4 !== void 0 ? _4 : null},
+      ${(_5 = event.dimension8) !== null && _5 !== void 0 ? _5 : null},
+      ${(_6 = event.dimension9) !== null && _6 !== void 0 ? _6 : null},
+      ${(_7 = event.dimension10) !== null && _7 !== void 0 ? _7 : null},
+      ${(_8 = event.action_url) !== null && _8 !== void 0 ? _8 : null},
+      ${(_9 = event.sitesearchkeyword) !== null && _9 !== void 0 ? _9 : null},
+      ${(_10 = event.action_title) !== null && _10 !== void 0 ? _10 : null},
+      ${(_11 = event.visitorid) !== null && _11 !== void 0 ? _11 : null},
+      ${(_12 = event.referrertype) !== null && _12 !== void 0 ? _12 : null},
+      ${(_13 = event.referrername) !== null && _13 !== void 0 ? _13 : null},
+      ${(_14 = event.resolution) !== null && _14 !== void 0 ? _14 : null}
+    )
+  `.execute(db_1.db);
+});
 exports.importEvent = importEvent;
 const matomoProps = [
-    "idSite",
-    "idVisit",
-    "actions",
-    "country",
-    "region",
-    "city",
-    "operatingSystemName",
-    "deviceModel",
-    "deviceBrand",
-    "visitDuration",
-    "daysSinceFirstVisit",
-    "visitorType",
-    "visitorId",
-    "referrerType",
-    "referrerName",
-    "siteName",
-    "userId",
+    'idSite',
+    'idVisit',
+    'actions',
+    'country',
+    'region',
+    'city',
+    'operatingSystemName',
+    'deviceModel',
+    'deviceBrand',
+    'visitDuration',
+    'daysSinceFirstVisit',
+    'visitorType',
+    'visitorId',
+    'referrerType',
+    'referrerName',
+    'siteName',
+    'userId',
+    'resolution'
 ];
 /** @type Record<string, (a: import("types/matomo-api").ActionDetail) => string | number> */
 const actionProps = {
@@ -48,7 +103,7 @@ const actionProps = {
     action_timespent: (action) => action.timeSpent,
     action_timestamp: (action) => new Date(action.timestamp * 1000).toISOString(),
     action_url: (action) => action.url,
-    sitesearchkeyword: (action) => action.siteSearchKeyword,
+    sitesearchkeyword: (action) => action.siteSearchKeyword
 };
 const getEventsFromMatomoVisit = (matomoVisit) => {
     return matomoVisit.actionDetails.map((actionDetail, actionIndex) => {
@@ -57,22 +112,24 @@ const getEventsFromMatomoVisit = (matomoVisit) => {
             const property = actionDetail.customVariables && actionDetail.customVariables[k];
             if (!property)
                 continue; // max 10 custom variables
-            //@ts-ignore
-            usercustomproperties[property[`customVariableName${k}`]] = property[`customVariableValue${k}`];
+            //@ts-expect-error implicit any type
+            usercustomproperties[property[`customVariableName${k}`]] =
+                //@ts-expect-error implicit any type
+                property[`customVariableValue${k}`];
         }
         /** @type {Record<string, string>} */
         const usercustomdimensions = {};
         for (let k = 1; k < 11; k++) {
             const dimension = `dimension${k}`;
-            //@ts-ignore
+            //@ts-expect-error implicit any type
             const value = actionDetail[dimension] || matomoVisit[dimension];
             if (!value)
                 continue; // max 10 custom variables
-            //@ts-ignore
+            //@ts-expect-error implicit any type
             usercustomdimensions[dimension] = value;
         }
         const event = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, matomoProps.reduce((a, prop) => (Object.assign(Object.assign({}, a), { [prop.toLowerCase()]: matomoVisit[prop] })), {})), { serverdateprettyfirstaction: new Date((matomoVisit.firstActionTimestamp || 0) * 1000).toISOString() }), Object.keys(actionProps).reduce((a, prop) => (Object.assign(Object.assign({}, a), { [prop.toLowerCase()]: actionProps[prop](actionDetail) })), {
-            action_id: `${matomoVisit.idVisit}_${actionIndex}`,
+            action_id: `${matomoVisit.idVisit}_${actionIndex}`
         })), { 
             // custom variables
             usercustomproperties,