@socialgouv/matomo-postgres 2.0.1 → 2.0.2

package/dist/PiwikClient.js

@@ -0,0 +1,117 @@
+"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;
+};
+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"));
+class PiwikClient {
+    constructor(baseURL, token) {
+        const parsedUrl = url.parse(baseURL, true);
+        this.settings = {
+            apihost: parsedUrl.hostname || '',
+            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;
+                break;
+            case 'https:':
+                this.http = https;
+                this.settings.apiport = parsedUrl.port ? parseInt(parsedUrl.port, 10) : 443;
+                break;
+            default:
+                this.http = http;
+                this.settings.apiport = 80;
+        }
+        // Set token from URL query or constructor parameter
+        if (parsedUrl.query && parsedUrl.query.token_auth) {
+            this.settings.token = parsedUrl.query.token_auth;
+        }
+        if (token) {
+            this.settings.token = token;
+        }
+    }
+    api(vars, cb) {
+        if (typeof vars !== 'object') {
+            vars = {};
+        }
+        // Set default values
+        vars.module = 'API';
+        vars.format = 'JSON';
+        // Set token if not provided in vars
+        if (vars.token_auth == null) {
+            vars.token_auth = this.settings.token;
+        }
+        // Extract token_auth for POST body
+        const token_auth = vars.token_auth;
+        const postData = querystring.stringify({ token_auth });
+        // Remove token_auth from URL query params
+        const queryVars = Object.assign({}, vars);
+        delete queryVars.token_auth;
+        // Prepare request options
+        const options = {
+            host: this.settings.apihost,
+            port: this.settings.apiport,
+            path: this.settings.apipath + '?' + querystring.stringify(queryVars),
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded'
+            }
+        };
+        // Make HTTP POST request
+        const req = this.http.request(options, (response) => {
+            let data = '';
+            // Collect data chunks
+            response.on('data', (chunk) => {
+                data += chunk;
+            });
+            // Process complete response
+            response.on('end', () => {
+                try {
+                    const resObj = JSON.parse(data);
+                    if (resObj.result === 'error') {
+                        return cb(new Error(resObj.message), null);
+                    }
+                    return cb(null, resObj);
+                }
+                catch (error) {
+                    return cb(error instanceof Error ? error : new Error(String(error)), null);
+                }
+            });
+        });
+        // Handle request errors
+        req.on('error', (error) => {
+            cb(error, null);
+        });
+        // Write POST data and end request
+        req.write(postData);
+        req.end();
+        return req;
+    }
+}
+exports.default = PiwikClient;

package/dist/__tests__/run.test.js

@@ -49,7 +49,7 @@ afterEach(() => {
     jest.clearAllMocks();
 });
 let piwikApiCalls = [];
-jest.mock("piwik-client", () => {
+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 }),

package/dist/index.js

@@ -16,7 +16,7 @@ const kysely_1 = require("kysely");
 const p_all_1 = __importDefault(require("p-all"));
 const debug_1 = __importDefault(require("debug"));
 const eachDayOfInterval_1 = __importDefault(require("date-fns/eachDayOfInterval"));
-const piwik_client_1 = __importDefault(require("piwik-client"));
+const PiwikClient_1 = __importDefault(require("./PiwikClient"));
 const db_1 = require("./db");
 const config_1 = require("./config");
 const importDate_1 = require("./importDate");
@@ -24,7 +24,7 @@ const debug = (0, debug_1.default)("index");
 function run(date) {
     return __awaiter(this, void 0, void 0, function* () {
         debug("run, date=" + date);
-        const piwik = new piwik_client_1.default(config_1.MATOMO_URL, config_1.MATOMO_KEY);
+        const piwik = new PiwikClient_1.default(config_1.MATOMO_URL, config_1.MATOMO_KEY);
         // priority:
         //  - optional parameter date
         //  - last event in the table

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@socialgouv/matomo-postgres",
   "description": "Extract visitor events from Matomo API and push to Postgres",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "types": "types/index.d.ts",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -32,8 +32,7 @@
     "dotenv": "^16.0.3",
     "kysely": "^0.23.4",
     "p-all": "^3",
-    "pg": "^8.9.0",
-    "piwik-client": "^0.2.2"
+    "pg": "^8.9.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",