@matimo/postgres 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matimo/postgres",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Postgres tools for Matimo",
   "type": "module",
   "files": [
@@ -9,12 +9,16 @@
     "definition.yaml"
   ],
   "dependencies": {
-    "pg": "^8.18.0"
+    "pg": "^8.18.0",
+    "@matimo/core": "0.1.4"
   },
   "peerDependencies": {
-    "matimo": "0.1.2"
+    "matimo": "0.1.4"
   },
   "devDependencies": {
     "@types/pg": "^8.6.6"
+  },
+  "scripts": {
+    "build": "tsc"
   }
 }

package/tools/execute-sql/definition.yaml

@@ -19,7 +19,7 @@ parameters:
 execution:
   type: function
   # The function file path is resolved relative to this definition.yaml
-  code: ./execute-sql.ts
+  code: ./execute-sql.js
   timeout: 30000
 
 authentication:

package/tools/execute-sql/execute-sql.js

@@ -0,0 +1,61 @@
+import { Client } from 'pg';
+import { MatimoError, ErrorCode } from '@matimo/core/runtime';
+export default async function (input) {
+    const sql = input.sql || '';
+    const params = input.params;
+    if (!sql || sql.trim().length === 0) {
+        throw new MatimoError('Missing SQL statement', ErrorCode.EXECUTION_FAILED, {
+            toolName: 'postgres-execute-sql',
+        });
+    }
+    // Build connection string from either MATIMO_POSTGRES_URL or separate env vars
+    const envUrl = process.env.MATIMO_POSTGRES_URL;
+    let connectionString = envUrl;
+    if (!connectionString) {
+        const host = process.env.MATIMO_POSTGRES_HOST;
+        const port = process.env.MATIMO_POSTGRES_PORT || '5432';
+        const user = process.env.MATIMO_POSTGRES_USER;
+        const password = process.env.MATIMO_POSTGRES_PASSWORD;
+        const database = process.env.MATIMO_POSTGRES_DB;
+        if (host && user && password && database) {
+            // Build a simple connection string. Do not log secrets.
+            connectionString = `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(password)}@${host}:${port}/${database}`;
+        }
+    }
+    if (!connectionString) {
+        throw new MatimoError('Postgres connection information not provided. Set MATIMO_POSTGRES_URL or MATIMO_POSTGRES_HOST/PORT/USER/PASSWORD/DB', ErrorCode.EXECUTION_FAILED, { toolName: 'postgres-execute-sql' });
+    }
+    const client = new Client({ connectionString });
+    try {
+        await client.connect();
+        const result = await client.query(sql, (params ?? []));
+        return { rows: result.rows, rowCount: result.rowCount };
+    }
+    catch (err) {
+        // Extract meaningful error message
+        const originalError = String(err.message || err);
+        const details = {
+            originalMessage: originalError,
+        };
+        // Check if it's a connection error vs query error
+        if (originalError.includes('ECONNREFUSED')) {
+            details.hint = 'Connection refused - is Postgres running at the configured host/port?';
+        }
+        else if (originalError.includes('role') && originalError.includes('does not exist')) {
+            details.hint = 'Database user does not exist - check MATIMO_POSTGRES_USER env var';
+        }
+        else if (originalError.includes('database') && originalError.includes('does not exist')) {
+            details.hint = 'Database does not exist - check MATIMO_POSTGRES_DB env var';
+        }
+        // Wrap errors to avoid leaking secrets
+        throw new MatimoError(`Postgres query failed: ${originalError}`, ErrorCode.EXECUTION_FAILED, {
+            toolName: 'postgres-execute-sql',
+            details,
+        });
+    }
+    finally {
+        await client.end().catch(() => {
+            // Ignore connection close errors
+        });
+    }
+}

package/tools/execute-sql/execute-sql.ts

@@ -1,5 +1,5 @@
 import { Client } from 'pg';
-import { MatimoError, ErrorCode } from '@matimo/core';
+import { MatimoError, ErrorCode } from '@matimo/core/runtime';
 
 export default async function (input: Record<string, unknown>) {
   const sql = (input.sql as string) || '';