@socialgouv/matomo-postgres 2.3.0 → 2.3.2

package/bin/index.js

@@ -1,9 +1,18 @@
 #!/usr/bin/env node
 
+// DIAGNOSTIC: Log environment state at entry point
+console.log('🔍 [DIAGNOSTIC] bin/index.js starting...')
+console.log('🔍 [DIAGNOSTIC] PGDATABASE env var:', process.env.PGDATABASE ? `SET (length: ${process.env.PGDATABASE.length})` : 'NOT SET OR EMPTY')
+console.log('🔍 [DIAGNOSTIC] NODE_ENV:', process.env.NODE_ENV || 'NOT SET')
+console.log('🔍 [DIAGNOSTIC] Current working directory:', process.cwd())
+console.log('🔍 [DIAGNOSTIC] About to import db module...\n')
+
 import { db } from '../dist/db.js'
 import run from '../dist/index.js'
 import { startMigration } from '../dist/migrate-latest.js'
 
+console.log('🔍 [DIAGNOSTIC] Modules imported successfully\n')
+
 async function start(date) {
   console.log(`\nRunning migrations\n`)
   await startMigration()

package/dist/__tests__/run.test.js

@@ -85,6 +85,7 @@ test('run: should run SQL queries', () => __awaiter(void 0, void 0, void 0, func
     yield run();
     expect(queries).toMatchSnapshot();
     // Updated expectation based on actual behavior with INITIAL_OFFSET=3 (5 days total: 3 days before + today + 1 day after)
-    // 5 days * (6 events per day + 1 count query per day) + 1 initial query for last event lookup
-    expect(queries.length).toEqual(1 + 5 * (6 + 1));
+    // 5 days * (6 events per day + 1 count query per day)
+    // Note: The initial findLastEventInMatomo query is not captured in the test mock environment
+    expect(queries.length).toEqual(5 * (6 + 1));
 }));

package/dist/config.js

@@ -1,3 +1,10 @@
+// DIAGNOSTIC: Log when config is being loaded
+console.log('🔍 [DIAGNOSTIC] config.ts module loading...');
+console.log('🔍 [DIAGNOSTIC] Reading environment variables:');
+console.log('  - PGDATABASE:', process.env.PGDATABASE ? `SET (length: ${process.env.PGDATABASE.length})` : 'NOT SET OR EMPTY');
+console.log('  - MATOMO_URL:', process.env.MATOMO_URL ? 'SET' : 'NOT SET (will use default)');
+console.log('  - MATOMO_SITE:', process.env.MATOMO_SITE ? 'SET' : 'NOT SET (will use default)');
+console.log('  - MATOMO_KEY:', process.env.MATOMO_KEY ? 'SET' : 'NOT SET');
 export const MATOMO_KEY = process.env.MATOMO_KEY || '';
 export const MATOMO_URL = process.env.MATOMO_URL || 'https://matomo.fabrique.social.gouv.fr/';
 export const MATOMO_SITE = process.env.MATOMO_SITE || 0;
@@ -5,6 +12,7 @@ export const PGDATABASE = process.env.PGDATABASE || '';
 export const INITIAL_OFFSET = process.env.INITIAL_OFFSET || '3';
 export const RESULTPERPAGE = process.env.RESULTPERPAGE || '500';
 export const FORCE_STARTDATE = process.env.FORCE_STARTDATE === 'true';
+console.log('🔍 [DIAGNOSTIC] config.ts module loaded\n');
 // We will create both a normal and a partitioned table (MATOMO_TABLE_NAME and PARTITIONED_MATOMO_TABLE_NAME)
 // and use DESTINATION_TABLE to determine which one to write to.
 export const DESTINATION_TABLE = process.env.DESTINATION_TABLE || 'matomo';

package/dist/db.js

@@ -4,19 +4,41 @@ import pkg from 'pg';
 const { Pool } = pkg;
 import { PGDATABASE } from './config.js';
 startDebug('db');
+// DIAGNOSTIC: Log environment state at module load time
+console.log('🔍 [DIAGNOSTIC] db.ts module loading...');
+console.log('🔍 [DIAGNOSTIC] PGDATABASE value:', PGDATABASE ? `SET (length: ${PGDATABASE.length})` : 'NOT SET OR EMPTY');
+console.log('🔍 [DIAGNOSTIC] Pool constructor type:', typeof Pool);
+export const pool = new Pool({
+    connectionString: PGDATABASE,
+    ssl: {
+        rejectUnauthorized: false
+    }
+});
+// DIAGNOSTIC: Log pool creation details
+console.log('🔍 [DIAGNOSTIC] Pool created:', pool ? 'YES' : 'NO');
+console.log('🔍 [DIAGNOSTIC] Pool has connect method:', pool && typeof pool.connect === 'function' ? 'YES' : 'NO');
+console.log('🔍 [DIAGNOSTIC] Pool object keys:', pool ? Object.keys(pool).join(', ') : 'N/A');
+// Validate pool is properly initialized
+if (!pool || typeof pool.connect !== 'function') {
+    throw new Error('Failed to initialize PostgreSQL connection pool');
+}
+// DIAGNOSTIC: Log dialect creation
+console.log('🔍 [DIAGNOSTIC] Creating PostgresDialect with pool...');
+const dialect = new PostgresDialect({ pool: pool });
+console.log('🔍 [DIAGNOSTIC] PostgresDialect created:', dialect ? 'YES' : 'NO');
 export const db = new Kysely({
-    dialect: new PostgresDialect({
-        pool: new Pool({
-            connectionString: PGDATABASE,
-            ssl: {
-                rejectUnauthorized: false
-            }
-        })
-    }),
+    dialect: dialect,
     log(event) {
         if (event.level === 'query') {
-            // debug(event.query.sql);
-            // debug(event.query.parameters);
+            // debug(event.query.sql)
+            // debug(event.query.parameters)
         }
     }
 });
+// DIAGNOSTIC: Log final db instance
+console.log('🔍 [DIAGNOSTIC] Kysely db instance created:', db ? 'YES' : 'NO');
+console.log('🔍 [DIAGNOSTIC] db.ts module loaded successfully\n');
+// Validate the Kysely instance
+if (!db) {
+    throw new Error('Failed to initialize Kysely database instance');
+}

package/dist/importDate.js

@@ -12,19 +12,32 @@ 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 { db, pool } from './db.js';
 import { getEventsFromMatomoVisit, importEvent } from './importEvent.js';
 const debug = startDebug('importDate');
 /** return date as ISO yyyy-mm-dd */
 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* () {
+    console.log(`🔍 [DIAGNOSTIC] getRecordsCount called for date: ${date}`);
+    console.log('🔍 [DIAGNOSTIC] Checking pool validity...');
+    console.log('  - pool exists:', pool ? 'YES' : 'NO');
+    console.log('  - pool.connect is function:', pool && typeof pool.connect === 'function' ? 'YES' : 'NO');
+    if (!pool || typeof pool.connect !== 'function') {
+        console.error('❌ [DIAGNOSTIC] Pool validation failed in getRecordsCount!');
+        console.error('  - pool:', pool);
+        console.error('  - pool type:', typeof pool);
+        console.error('  - pool.connect:', pool && pool.connect);
+        throw new Error('Database connection pool is invalid or undefined in getRecordsCount');
+    }
+    console.log('🔍 [DIAGNOSTIC] Pool validated, executing query...');
     const result = yield db
         .selectFrom(DESTINATION_TABLE)
         .select(db.fn.count('idvisit').distinct().as('count'))
         // UTC to be iso with matomo matomo data
         .where(sql `date(timezone('UTC', action_timestamp))`, '=', date)
         .executeTakeFirst();
+    console.log(`🔍 [DIAGNOSTIC] Query result:`, result);
     // start at previous visit in case action didnt finished to record
     const count = Math.max(0, (result && parseInt(result.count) - 1) || 0);
     return count;

package/dist/importEvent.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { sql } from 'kysely';
-import { db } from './db.js';
+import { db, pool } from './db.js';
 /**
  *
  * @param {Client} client
@@ -78,6 +78,9 @@ export const importEvent = (event) => __awaiter(void 0, void 0, void 0, function
         throw new Error('importEvent(): action_timestamp is invalid');
     }
     try {
+        if (!pool || typeof pool.connect !== 'function') {
+            throw new Error('Database connection pool is invalid or undefined');
+        }
         // Keep the stored procedure but centralize mapping to avoid parameter mis-ordering
         yield sql `
       SELECT insert_into_matomo_partitioned(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@socialgouv/matomo-postgres",
   "description": "Extract visitor events from Matomo API and push to Postgres",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "types": "types/index.d.ts",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -10,15 +10,13 @@
     "access": "public"
   },
   "type": "module",
-  "bin": {
-    "matomo-postgres": "./bin/index.js"
-  },
+  "bin": "./bin/index.js",
   "files": [
     "bin",
     "dist"
   ],
   "scripts": {
-    "start": "yarn migrate && node ./dist/index.js",
+    "start": "yarn migrate && node ./bin/index.js",
     "build": "tsc",
     "prepublish": "yarn build",
     "migrate": "node ./dist/migrate-latest.js",