@socialgouv/matomo-postgres 2.2.0 → 2.2.1

package/dist/importDate.js

@@ -1,4 +1,3 @@
-"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) {
@@ -8,36 +7,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.importDate = void 0;
-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 debug = (0, debug_1.default)('importDate');
+import { formatISO } from 'date-fns';
+import startDebug from 'debug';
+import { sql } from 'kysely';
+import pAll from 'p-all';
+import { DESTINATION_TABLE, MATOMO_SITE, RESULTPERPAGE } from './config.js';
+import { db } from './db.js';
+import { getEventsFromMatomoVisit, importEvent } from './importEvent.js';
+const debug = startDebug('importDate');
 /** return date as ISO yyyy-mm-dd */
-const isoDate = (date) => (0, formatISO_1.default)(date, { representation: 'date' });
+const isoDate = (date) => formatISO(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'))
+    const result = yield db
+        .selectFrom(DESTINATION_TABLE)
+        .select(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(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);
     return count;
 });
 /** import all event from givent date */
-const importDate = (piwikApi, date, filterOffset = 0) => __awaiter(void 0, void 0, void 0, function* () {
-    const limit = parseInt(config_1.RESULTPERPAGE);
+export const importDate = (piwikApi_1, date_1, ...args_1) => __awaiter(void 0, [piwikApi_1, date_1, ...args_1], void 0, function* (piwikApi, date, filterOffset = 0) {
+    const limit = parseInt(RESULTPERPAGE);
     const offset = filterOffset || (yield getRecordsCount(isoDate(date)));
     if (!offset) {
         debug(`${isoDate(date)}: load ${limit} visits`);
@@ -54,7 +48,7 @@ const importDate = (piwikApi, date, filterOffset = 0) => __awaiter(void 0, void
         filter_limit: limit,
         filter_offset: offset,
         filter_sort_order: 'asc',
-        idSite: config_1.MATOMO_SITE
+        idSite: MATOMO_SITE
     }, (err, visits = []) => {
         if (err) {
             console.error('err', err);
@@ -64,7 +58,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 eventsFromVisits = visits.flatMap(getEventsFromMatomoVisit);
     const allEvents = eventsFromVisits.filter((_event) => {
         return true;
     });
@@ -74,15 +68,13 @@ const importDate = (piwikApi, date, filterOffset = 0) => __awaiter(void 0, void
     }
     debug(`import ${allEvents.length} events`);
     // serial-import events into PG
-    yield (0, p_all_1.default)(allEvents.map((event) => () => (0, importEvent_1.importEvent)(event)), { concurrency: 10, stopOnError: true });
+    yield pAll(allEvents.map((event) => () => 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);
+        const nextEvents = yield importDate(piwikApi, date, nextOffset);
         return [...allEvents, ...(nextEvents || [])];
     }
     debug(`finished importing ${isoDate(date)}, offset ${offset}`);
     return allEvents;
 });
-exports.importDate = importDate;
-module.exports = { importDate: exports.importDate };

package/dist/importEvent.js

@@ -1,4 +1,3 @@
-"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) {
@@ -8,10 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEventsFromMatomoVisit = exports.importEvent = void 0;
-const kysely_1 = require("kysely");
-const db_1 = require("./db");
+import { sql } from 'kysely';
+import { db } from './db.js';
 /**
  *
  * @param {Client} client
@@ -19,59 +16,130 @@ const db_1 = require("./db");
  *
  * @return {Promise<void>}
  */
-const importEvent = (event) => __awaiter(void 0, void 0, void 0, function* () {
+export 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);
+    // Build a sanitized, typed data object to reduce drift and ensure defaults in one place
+    const eventData = {
+        action_id: (_a = event.action_id) !== null && _a !== void 0 ? _a : '',
+        action_timestamp: event.action_timestamp
+            ? new Date(event.action_timestamp)
+            : new Date(),
+        idsite: (_b = event.idsite) !== null && _b !== void 0 ? _b : '',
+        idvisit: (_c = event.idvisit) !== null && _c !== void 0 ? _c : '',
+        actions: (_d = event.actions) !== null && _d !== void 0 ? _d : null,
+        country: (_e = event.country) !== null && _e !== void 0 ? _e : null,
+        region: (_f = event.region) !== null && _f !== void 0 ? _f : null,
+        city: (_g = event.city) !== null && _g !== void 0 ? _g : null,
+        operatingsystemname: (_h = event.operatingsystemname) !== null && _h !== void 0 ? _h : null,
+        devicemodel: (_j = event.devicemodel) !== null && _j !== void 0 ? _j : null,
+        devicebrand: (_k = event.devicebrand) !== null && _k !== void 0 ? _k : null,
+        visitduration: (_l = event.visitduration) !== null && _l !== void 0 ? _l : null,
+        dayssincefirstvisit: (_m = event.dayssincefirstvisit) !== null && _m !== void 0 ? _m : null,
+        visitortype: (_o = event.visitortype) !== null && _o !== void 0 ? _o : null,
+        sitename: (_p = event.sitename) !== null && _p !== void 0 ? _p : null,
+        userid: (_q = event.userid) !== null && _q !== void 0 ? _q : null,
+        serverdateprettyfirstaction: event.serverdateprettyfirstaction
+            ? new Date(event.serverdateprettyfirstaction)
+            : null,
+        action_type: (_r = event.action_type) !== null && _r !== void 0 ? _r : '',
+        action_eventcategory: (_s = event.action_eventcategory) !== null && _s !== void 0 ? _s : '',
+        action_eventaction: (_t = event.action_eventaction) !== null && _t !== void 0 ? _t : '',
+        action_eventname: (_u = event.action_eventname) !== null && _u !== void 0 ? _u : '',
+        action_eventvalue: event.action_eventvalue
+            ? Number(event.action_eventvalue)
+            : 0,
+        action_timespent: (_v = event.action_timespent) !== null && _v !== void 0 ? _v : '0',
+        usercustomproperties: (_w = event.usercustomproperties) !== null && _w !== void 0 ? _w : null,
+        usercustomdimensions: (_x = event.usercustomdimensions) !== null && _x !== void 0 ? _x : null,
+        dimension1: (_y = event.dimension1) !== null && _y !== void 0 ? _y : null,
+        dimension2: (_z = event.dimension2) !== null && _z !== void 0 ? _z : null,
+        dimension3: (_0 = event.dimension3) !== null && _0 !== void 0 ? _0 : null,
+        dimension4: (_1 = event.dimension4) !== null && _1 !== void 0 ? _1 : null,
+        dimension5: (_2 = event.dimension5) !== null && _2 !== void 0 ? _2 : null,
+        dimension6: (_3 = event.dimension6) !== null && _3 !== void 0 ? _3 : null,
+        dimension7: (_4 = event.dimension7) !== null && _4 !== void 0 ? _4 : null,
+        dimension8: (_5 = event.dimension8) !== null && _5 !== void 0 ? _5 : null,
+        dimension9: (_6 = event.dimension9) !== null && _6 !== void 0 ? _6 : null,
+        dimension10: (_7 = event.dimension10) !== null && _7 !== void 0 ? _7 : null,
+        action_url: (_8 = event.action_url) !== null && _8 !== void 0 ? _8 : null,
+        sitesearchkeyword: (_9 = event.sitesearchkeyword) !== null && _9 !== void 0 ? _9 : null,
+        action_title: (_10 = event.action_title) !== null && _10 !== void 0 ? _10 : null,
+        visitorid: (_11 = event.visitorid) !== null && _11 !== void 0 ? _11 : null,
+        referrertype: (_12 = event.referrertype) !== null && _12 !== void 0 ? _12 : null,
+        referrername: (_13 = event.referrername) !== null && _13 !== void 0 ? _13 : null,
+        resolution: (_14 = event.resolution) !== null && _14 !== void 0 ? _14 : null
+    };
+    // Minimal runtime validation for required fields
+    if (!eventData.action_id || eventData.action_id.trim().length === 0) {
+        throw new Error('importEvent(): action_id is required and cannot be empty');
+    }
+    if (!(eventData.action_timestamp instanceof Date) ||
+        isNaN(eventData.action_timestamp.getTime())) {
+        throw new Error('importEvent(): action_timestamp is invalid');
+    }
+    try {
+        // Keep the stored procedure but centralize mapping to avoid parameter mis-ordering
+        yield sql `
+      SELECT insert_into_matomo_partitioned(
+        ${eventData.action_id},
+        ${eventData.action_timestamp},
+        ${eventData.idsite},
+        ${eventData.idvisit},
+        ${eventData.actions},
+        ${eventData.country},
+        ${eventData.region},
+        ${eventData.city},
+        ${eventData.operatingsystemname},
+        ${eventData.devicemodel},
+        ${eventData.devicebrand},
+        ${eventData.visitduration},
+        ${eventData.dayssincefirstvisit},
+        ${eventData.visitortype},
+        ${eventData.sitename},
+        ${eventData.userid},
+        ${eventData.serverdateprettyfirstaction},
+        ${eventData.action_type},
+        ${eventData.action_eventcategory},
+        ${eventData.action_eventaction},
+        ${eventData.action_eventname},
+        ${eventData.action_eventvalue},
+        ${eventData.action_timespent},
+        ${eventData.usercustomproperties},
+        ${eventData.usercustomdimensions},
+        ${eventData.dimension1},
+        ${eventData.dimension2},
+        ${eventData.dimension3},
+        ${eventData.dimension4},
+        ${eventData.dimension5},
+        ${eventData.dimension6},
+        ${eventData.dimension7},
+        ${eventData.dimension8},
+        ${eventData.dimension9},
+        ${eventData.dimension10},
+        ${eventData.action_url},
+        ${eventData.sitesearchkeyword},
+        ${eventData.action_title},
+        ${eventData.visitorid},
+        ${eventData.referrertype},
+        ${eventData.referrername},
+        ${eventData.resolution}
+      )
+    `.execute(db);
+    }
+    catch (err) {
+        // Add context for troubleshooting
+        const minimalContext = {
+            action_id: eventData.action_id,
+            action_timestamp: eventData.action_timestamp,
+            idsite: eventData.idsite,
+            idvisit: eventData.idvisit
+        };
+        console.error('importEvent(): failed to insert event', minimalContext);
+        // Log error details but avoid exposing sensitive information
+        console.error('importEvent(): error', err instanceof Error ? err.message : 'Unknown error');
+        throw err;
+    }
 });
-exports.importEvent = importEvent;
 const matomoProps = [
     'idSite',
     'idVisit',
@@ -105,11 +173,12 @@ const actionProps = {
     action_url: (action) => action.url,
     sitesearchkeyword: (action) => action.siteSearchKeyword
 };
-const getEventsFromMatomoVisit = (matomoVisit) => {
+export const getEventsFromMatomoVisit = (matomoVisit) => {
     return matomoVisit.actionDetails.map((actionDetail, actionIndex) => {
+        var _a;
         const usercustomproperties = {};
         for (let k = 1; k < 10; k++) {
-            const property = actionDetail.customVariables && actionDetail.customVariables[k];
+            const property = (_a = actionDetail.customVariables) === null || _a === void 0 ? void 0 : _a[k];
             if (!property)
                 continue; // max 10 custom variables
             //@ts-expect-error implicit any type
@@ -140,4 +209,3 @@ const getEventsFromMatomoVisit = (matomoVisit) => {
         return event;
     });
 };
-exports.getEventsFromMatomoVisit = getEventsFromMatomoVisit;

package/dist/index.js

@@ -1,4 +1,3 @@
-"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) {
@@ -8,27 +7,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const eachDayOfInterval_1 = __importDefault(require("date-fns/eachDayOfInterval"));
-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 importDate_1 = require("./importDate");
-const PiwikClient_1 = __importDefault(require("./PiwikClient"));
-const debug = (0, debug_1.default)('index');
+import { eachDayOfInterval } from 'date-fns';
+import startDebug from 'debug';
+import { sql } from 'kysely';
+import pAll from 'p-all';
+import { DESTINATION_TABLE, INITIAL_OFFSET, MATOMO_KEY, MATOMO_SITE, MATOMO_URL } from './config.js';
+import { db } from './db.js';
+import { importDate } from './importDate.js';
+import PiwikClient from './PiwikClient.js';
+const debug = startDebug('index');
 function run(date) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log(`🚀 Starting data import process`);
         debug('run, date=' + date);
         console.log(`🔗 Initializing Matomo client`);
-        console.log(`  - Matomo URL: ${config_1.MATOMO_URL}`);
-        console.log(`  - Matomo Site ID: ${config_1.MATOMO_SITE}`);
-        const piwik = new PiwikClient_1.default(config_1.MATOMO_URL, config_1.MATOMO_KEY);
+        console.log(`  - Matomo URL: ${MATOMO_URL}`);
+        console.log(`  - Matomo Site ID: ${MATOMO_SITE}`);
+        const piwik = new PiwikClient(MATOMO_URL, MATOMO_KEY);
         console.log(`📅 Determining reference date for import...`);
         // priority:
         //  - optional parameter date
@@ -40,13 +35,9 @@ function run(date) {
             referenceDate = new Date(date);
             console.log(`✅ Using provided date parameter: ${referenceDate.toISOString()}`);
         }
-        if (!referenceDate && process.env.STARTDATE) {
-            referenceDate = new Date(process.env.STARTDATE);
-            console.log(`✅ Using STARTDATE environment variable: ${referenceDate.toISOString()}`);
-        }
         if (!referenceDate) {
             console.log(`🔍 Looking for last event in database...`);
-            referenceDate = yield findLastEventInMatomo(db_1.db);
+            referenceDate = yield findLastEventInMatomo(db);
             if (referenceDate) {
                 console.log(`✅ Found last event, starting from: ${referenceDate.toISOString()}`);
             }
@@ -54,12 +45,16 @@ function run(date) {
                 console.log(`ℹ️ No previous events found in database`);
             }
         }
+        if (!referenceDate && process.env.STARTDATE) {
+            referenceDate = new Date(process.env.STARTDATE);
+            console.log(`✅ Using STARTDATE environment variable: ${referenceDate.toISOString()}`);
+        }
         if (!referenceDate) {
-            referenceDate = new Date(new Date().getTime() - +config_1.INITIAL_OFFSET * 24 * 60 * 60 * 1000);
-            console.log(`✅ Using default offset (${config_1.INITIAL_OFFSET} days ago): ${referenceDate.toISOString()}`);
+            referenceDate = new Date(new Date().getTime() - +INITIAL_OFFSET * 24 * 60 * 60 * 1000);
+            console.log(`✅ Using default offset (${INITIAL_OFFSET} days ago): ${referenceDate.toISOString()}`);
         }
         const endDate = new Date(new Date().getTime() + 24 * 60 * 60 * 1000);
-        const dates = (0, eachDayOfInterval_1.default)({
+        const dates = eachDayOfInterval({
             start: referenceDate,
             end: endDate
         });
@@ -70,9 +65,9 @@ function run(date) {
         debug(`import starting at : ${dates[0].toISOString()}`);
         console.log(`🔄 Starting sequential import for each date...`);
         // for each date, serial-import data
-        const res = yield (0, p_all_1.default)(dates.map((date, index) => () => {
+        const res = yield pAll(dates.map((date, index) => () => {
             console.log(`📅 Processing date ${index + 1}/${dates.length}: ${date.toISOString().split('T')[0]}`);
-            return (0, importDate_1.importDate)(piwik.api.bind(piwik), date);
+            return importDate(piwik.api.bind(piwik), date);
         }), { concurrency: 1, stopOnError: true });
         const totalEvents = res.flat().length;
         console.log(`✅ Import process completed`);
@@ -83,26 +78,11 @@ function run(date) {
         return res;
     });
 }
-exports.default = run;
-if (require.main === module) {
-    ;
-    (() => __awaiter(void 0, void 0, void 0, function* () {
-        if (!config_1.MATOMO_SITE)
-            return console.error('Missing env MATOMO_SITE');
-        if (!config_1.MATOMO_KEY)
-            return console.error('Missing env MATOMO_KEY');
-        if (!config_1.PGDATABASE)
-            return console.error('Missing env PGDATABASE');
-        yield run();
-        debug('run finished');
-        db_1.db.destroy();
-    }))();
-}
 function findLastEventInMatomo(db) {
     return __awaiter(this, void 0, void 0, function* () {
         const latest = yield db
-            .selectFrom(config_1.DESTINATION_TABLE)
-            .select((0, kysely_1.sql) `action_timestamp at time zone 'UTC'`.as('action_timestamp'))
+            .selectFrom(DESTINATION_TABLE)
+            .select(sql `action_timestamp at time zone 'UTC'`.as('action_timestamp'))
             .orderBy('action_timestamp', 'desc')
             .limit(1)
             .executeTakeFirst();
@@ -114,3 +94,4 @@ function findLastEventInMatomo(db) {
         return null;
     });
 }
+export default run;

package/dist/migrate-down.js

@@ -1,27 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -31,19 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
-const kysely_1 = require("kysely");
-const path = __importStar(require("path"));
-const db_1 = require("./db");
+import { promises as fs } from 'fs';
+import { FileMigrationProvider, Migrator } from 'kysely';
+import * as path from 'path';
+import { db } from './db.js';
 function migrateDown() {
     return __awaiter(this, void 0, void 0, function* () {
-        const migrator = new kysely_1.Migrator({
-            db: db_1.db,
-            provider: new kysely_1.FileMigrationProvider({
-                fs: fs_1.promises,
+        const migrator = new Migrator({
+            db,
+            provider: new FileMigrationProvider({
+                fs,
                 path,
-                migrationFolder: __dirname + '/migrations'
+                migrationFolder: path.join(path.dirname(new URL(import.meta.url).pathname), 'migrations')
             })
         });
         const { error, results } = yield migrator.migrateDown();
@@ -60,7 +35,7 @@ function migrateDown() {
             console.error(error);
             process.exit(1);
         }
-        yield db_1.db.destroy();
+        yield db.destroy();
     });
 }
 migrateDown();

package/dist/migrate-latest.js

@@ -1,27 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -31,53 +7,61 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
-const kysely_1 = require("kysely");
-const path = __importStar(require("path"));
-const config_1 = require("./config");
-const db_1 = require("./db");
+import { promises as fs } from 'fs';
+import { FileMigrationProvider, Migrator } from 'kysely';
+import * as path from 'path';
+import { MATOMO_TABLE_NAME } from './config.js';
+import { db } from './db.js';
 function migrateToLatest() {
     return __awaiter(this, void 0, void 0, function* () {
-        const migrator = new kysely_1.Migrator({
-            db: db_1.db,
-            provider: new kysely_1.FileMigrationProvider({
-                fs: fs_1.promises,
-                path,
-                migrationFolder: __dirname + '/migrations'
-            }),
-            // allow to have mutliple migratable instances in a single schema
-            migrationTableName: `${config_1.MATOMO_TABLE_NAME}_migration`,
-            migrationLockTableName: `${config_1.MATOMO_TABLE_NAME}_migration_lock`
-        });
-        const { error, results } = yield migrator.migrateToLatest();
-        results === null || results === void 0 ? void 0 : results.forEach((it) => {
-            if (it.status === 'Success') {
-                console.log(`migration "${it.migrationName}" was executed successfully`);
-            }
-            else if (it.status === 'Error') {
-                console.error(`failed to execute migration "${it.migrationName}"`);
+        console.log(`Starting migrate to latest`);
+        try {
+            const migrator = new Migrator({
+                db,
+                provider: new FileMigrationProvider({
+                    fs,
+                    path,
+                    migrationFolder: path.join(path.dirname(new URL(import.meta.url).pathname), 'migrations')
+                }),
+                // allow to have mutliple migratable instances in a single schema
+                migrationTableName: `${MATOMO_TABLE_NAME}_migration`,
+                migrationLockTableName: `${MATOMO_TABLE_NAME}_migration_lock`
+            });
+            const { error, results } = yield migrator.migrateToLatest();
+            results === null || results === void 0 ? void 0 : results.forEach((it) => {
+                if (it.status === 'Success') {
+                    console.log(`migration "${it.migrationName}" was executed successfully`);
+                }
+                else if (it.status === 'Error') {
+                    console.error(`failed to execute migration "${it.migrationName}"`);
+                }
+            });
+            if (error) {
+                console.error('failed to migrate');
+                console.error(error);
+                process.exit(1);
             }
-        });
-        if (error) {
-            console.error('failed to migrate');
-            console.error(error);
-            process.exit(1);
-        }
-        else {
-            if (!(results === null || results === void 0 ? void 0 : results.length)) {
+            else if (!(results === null || results === void 0 ? void 0 : results.length)) {
                 console.log('No migration to run');
             }
         }
+        catch (uncaughtError) {
+            console.error('UNCAUGHT ERROR during migration:');
+            console.error('Error message:', uncaughtError instanceof Error
+                ? uncaughtError.message
+                : String(uncaughtError));
+            console.error('Error stack:', uncaughtError instanceof Error
+                ? uncaughtError.stack
+                : 'No stack trace available');
+            console.error('Full error object:', uncaughtError);
+            process.exit(1);
+        }
     });
 }
-exports.default = migrateToLatest;
-function start() {
+export default migrateToLatest;
+export function startMigration() {
     return __awaiter(this, void 0, void 0, function* () {
         yield migrateToLatest();
-        yield db_1.db.destroy();
+        // Don't destroy the db connection here since the main application will need it
     });
 }
-if (require.main === module) {
-    start();
-}