@tmlmobilidade/external 20260604.2309.43 → 20260604.2324.46

package/dist/clients/ml/auth.js

@@ -1,7 +1,6 @@
 /* * */
 import { Logger } from '@tmlmobilidade/logger';
 import { asyncSingletonProxy } from '@tmlmobilidade/utils';
-import { curlFetcher } from './curl-fetcher.js';
 /* * */
 export class MLAuthClient {
     //
@@ -56,7 +55,7 @@ export class MLAuthClient {
             password: process.env.ML_PASSWORD,
             username: process.env.ML_USERNAME,
         }).toString();
-        const data = await curlFetcher(process.env.ML_AUTH_URL, {
+        const response = await fetch(process.env.ML_AUTH_URL, {
             body: requestBody,
             headers: {
                 'Authorization': `Basic ${Buffer.from(`${process.env.ML_CLIENT_ID}:${process.env.ML_CLIENT_SECRET}`).toString('base64')}`,
@@ -64,6 +63,10 @@ export class MLAuthClient {
             },
             method: 'POST',
         });
+        if (!response.ok) {
+            throw new Error(`[MLAuthClient] Token request failed (${response.status}): ${response.statusText}`);
+        }
+        const data = await response.json();
         //
         // With the response data, set the token and calculate the expiration time
         // based on the current time and the expires_in value from the response.

package/dist/clients/ml/index.js

@@ -1,6 +1,5 @@
 /* * */
 import { mlAuthClient } from './auth.js';
-import { curlFetcher } from './curl-fetcher.js';
 import { DESTINATION_MAP } from './types.js';
 /* * */
 const BASE_URL = process.env.ML_API_URL;
@@ -10,11 +9,15 @@ async function fetcher(endpoint) {
         throw new Error('Missing ML_API_URL environment variable.');
     }
     const apiToken = await mlAuthClient.getToken();
-    return await curlFetcher(`${BASE_URL}${endpoint}`, {
+    const response = await fetch(`${BASE_URL}${endpoint}`, {
         headers: {
             Authorization: `Bearer ${apiToken}`,
         },
     });
+    if (!response.ok) {
+        throw new Error(`Request failed (${response.status}): ${response.statusText}`);
+    }
+    return response.json();
 }
 /* * */
 const endpoints = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmlmobilidade/external",
-	"version": "20260604.2309.43",
+	"version": "20260604.2324.46",
 	"author": {
 		"email": "iso@tmlmobilidade.pt",
 		"name": "TML-ISO"

package/dist/clients/ml/curl-fetcher.d.ts

@@ -1,5 +0,0 @@
-export declare function curlFetcher<T>(url: string, options?: {
-    body?: unknown;
-    headers?: Record<string, string>;
-    method?: string;
-}): Promise<T>;

package/dist/clients/ml/curl-fetcher.js

@@ -1,37 +0,0 @@
-// ! THIS IS A TEMPORARY FIX FOR THE ML API CERTIFICATE ISSUE
-import { exec } from 'child_process';
-export async function curlFetcher(url, options) {
-    const method = options?.method ?? 'GET';
-    const headers = options?.headers ?? {};
-    const curlArgs = [
-        'curl',
-        '-sSLf',
-        '-X', method,
-        ...Object.entries(headers).map(([key, value]) => `-H "${key}: ${value}"`),
-    ];
-    if (options?.body !== undefined) {
-        const bodyStr = typeof options.body === 'string' ? options.body : JSON.stringify(options.body);
-        curlArgs.push('--data-raw', `"${bodyStr}"`);
-    }
-    curlArgs.push(`"${url}"`);
-    const curlCommand = curlArgs.join(' ');
-    return await new Promise((resolve, reject) => {
-        exec(curlCommand, (error, stdout, stderr) => {
-            if (error) {
-                console.error(`curl error: ${error.message}`);
-                reject(new Error(`curl error: ${error.message}`));
-                return;
-            }
-            if (stderr) {
-                console.error(`curl stderr: ${stderr}`);
-            }
-            try {
-                const data = JSON.parse(stdout);
-                resolve(data);
-            }
-            catch (parseError) {
-                reject(new Error(`Failed to parse curl response: ${parseError.message}`));
-            }
-        });
-    });
-}