feat(connectors): Remove http timeout not properly taken into account…

… by fetch spec

backend/src/north/north-oianalytics/manifest.ts

@@ -25,14 +25,6 @@ const manifest: NorthConnectorManifest = {
       defaultValue: 'https://instance_name.oianalytics.fr',
       displayInViewMode: true
     },
-    {
-      key: 'timeout',
-      type: 'OibNumber',
-      label: 'Timeout',
-      defaultValue: 30,
-      unitLabel: 's',
-      validators: [{ key: 'required' }]
-    },
     {
       key: 'acceptUnauthorized',
       type: 'OibCheckbox',

backend/src/north/north-oianalytics/north-oianalytics.spec.ts

@@ -96,7 +96,6 @@ describe('NorthOIAnalytics without proxy', () => {
     enabled: true,
     settings: {
       host: 'https://hostname/',
-      timeout: 1000,
       acceptUnauthorized: false,
       accessKey: 'anyUser',
       secretKey: 'anypass',
@@ -144,7 +143,6 @@ describe('NorthOIAnalytics without proxy', () => {
         'Content-Type': 'application/json'
       },
       body: JSON.stringify(values),
-      timeout: configuration.settings.timeout * 1000,
       agent: undefined
     };
 
@@ -201,7 +199,6 @@ describe('NorthOIAnalytics without proxy', () => {
         'Content-Type': 'application/json'
       },
       body: JSON.stringify(values),
-      timeout: configuration.settings.timeout * 1000,
       agent: undefined
     };
 
@@ -234,7 +231,6 @@ describe('NorthOIAnalytics without proxy', () => {
         'content-type': expect.stringContaining('multipart/form-data; boundary=')
       },
       body: expect.anything(),
-      timeout: configuration.settings.timeout * 1000,
       agent: undefined
     };
 
@@ -292,7 +288,6 @@ describe('NorthOIAnalytics without proxy', () => {
         'content-type': expect.stringContaining('multipart/form-data; boundary=')
       },
       body: expect.anything(),
-      timeout: configuration.settings.timeout * 1000,
       agent: undefined
     };
 
@@ -322,8 +317,7 @@ describe('NorthOIAnalytics without proxy', () => {
     await expect(north.testConnection()).rejects.toThrow(`Fetch error ${new Error('Timeout error')}`);
     expect(fetch).toHaveBeenCalledWith('https://hostname/info', {
       headers: { authorization: 'Basic YW55VXNlcjphbnlwYXNz' },
-      method: 'POST',
-      timeout: 10000
+      method: 'POST'
     });
     expect(logger.error).toHaveBeenCalledWith(`Fetch error ${new Error('Timeout error')}`);
   });
@@ -360,7 +354,6 @@ describe('NorthOIAnalytics without proxy but with acceptUnauthorized', () => {
     enabled: true,
     settings: {
       host: 'https://hostname',
-      timeout: 1000,
       acceptUnauthorized: true,
       accessKey: 'anyUser',
       secretKey: null,
@@ -408,7 +401,6 @@ describe('NorthOIAnalytics without proxy but with acceptUnauthorized', () => {
         'Content-Type': 'application/json'
       },
       body: JSON.stringify(values),
-      timeout: configuration.settings.timeout * 1000,
       agent: expect.any(https.Agent)
     };
 
@@ -431,7 +423,6 @@ describe('NorthOIAnalytics without proxy but with acceptUnauthorized', () => {
         'content-type': expect.stringContaining('multipart/form-data; boundary=')
       },
       body: expect.anything(),
-      timeout: configuration.settings.timeout * 1000,
       agent: expect.any(https.Agent)
     };
 
@@ -453,7 +444,6 @@ describe('NorthOIAnalytics with proxy', () => {
     enabled: true,
     settings: {
       host: 'https://hostname',
-      timeout: 1000,
       acceptUnauthorized: false,
       accessKey: 'anyUser',
       secretKey: 'anypass',
@@ -509,7 +499,6 @@ describe('NorthOIAnalytics with proxy but without proxy password', () => {
     enabled: true,
     settings: {
       host: 'https://hostname',
-      timeout: 1000,
       acceptUnauthorized: false,
       accessKey: 'anyUser',
       secretKey: 'anypass',

backend/src/north/north-oianalytics/north-oianalytics.ts

@@ -10,7 +10,7 @@ import pino from 'pino';
 import { createReadStream } from 'node:fs';
 import FormData from 'form-data';
 import path from 'node:path';
-import fetch from 'node-fetch';
+import fetch, { HeadersInit, RequestInit } from 'node-fetch';
 import https from 'node:https';
 import { HandlesFile, HandlesValues } from '../north-interface';
 import { filesExists } from '../../service/utils';
@@ -65,16 +65,15 @@ export default class NorthOIAnalytics extends NorthConnector<NorthOIAnalyticsSet
   override async testConnection(): Promise<void> {
     this.logger.info(`Testing connection on "${this.connector.settings.host}"`);
 
-    const headers: Record<string, string | number> = {};
+    const headers: HeadersInit = {};
     const basic = Buffer.from(
       `${this.connector.settings.accessKey}:${await this.encryptionService.decryptText(this.connector.settings.secretKey!)}`
     ).toString('base64');
     headers.authorization = `Basic ${basic}`;
-    const fetchOptions: Record<string, any> = {
+    const fetchOptions: RequestInit = {
       method: 'POST',
       headers,
-      agent: this.proxyAgent,
-      timeout: 10000
+      agent: this.proxyAgent
     };
     const requestUrl = `${this.connector.settings.host}/info`;
 
@@ -96,7 +95,7 @@ export default class NorthOIAnalytics extends NorthConnector<NorthOIAnalyticsSet
    * Handle values by sending them to OIAnalytics
    */
   async handleValues(values: Array<OIBusDataValue>): Promise<void> {
-    const headers: Record<string, string> = {
+    const headers: HeadersInit = {
       'Content-Type': 'application/json'
     };
 
@@ -113,7 +112,6 @@ export default class NorthOIAnalytics extends NorthConnector<NorthOIAnalyticsSet
         method: 'POST',
         headers,
         body: JSON.stringify(values),
-        timeout: this.connector.settings.timeout * 1000,
         agent: this.proxyAgent
       });
     } catch (fetchError) {
@@ -135,7 +133,7 @@ export default class NorthOIAnalytics extends NorthConnector<NorthOIAnalyticsSet
    * Handle the file by sending it to OIAnalytics.
    */
   async handleFile(filePath: string): Promise<void> {
-    const headers: Record<string, string> = {};
+    const headers: HeadersInit = {};
     headers.authorization = `Basic ${Buffer.from(
       `${this.connector.settings.accessKey}:${
         this.connector.settings.secretKey ? await this.encryptionService.decryptText(this.connector.settings.secretKey) : ''
@@ -164,7 +162,6 @@ export default class NorthOIAnalytics extends NorthConnector<NorthOIAnalyticsSet
         method: 'POST',
         headers,
         body,
-        timeout: this.connector.settings.timeout * 1000,
         agent: this.proxyAgent
       });
       readStream.close();

backend/src/north/north-oibus/manifest.ts

@@ -24,7 +24,6 @@ const manifest: NorthConnectorManifest = {
       ],
       displayInViewMode: true
     },
-    { key: 'timeout', type: 'OibNumber', label: 'Timeout', unitLabel: 's', defaultValue: 30, validators: [{ key: 'required' }] },
     {
       key: 'acceptUnauthorized',
       type: 'OibCheckbox',

backend/src/north/north-oibus/north-oibus.spec.ts

@@ -97,7 +97,6 @@ describe('NorthOIConnect with proxy', () => {
     settings: {
       host: 'https://hostname/',
       acceptUnauthorized: false,
-      timeout: 10,
       useProxy: true,
       proxyUrl: 'http://localhost',
       proxyUsername: 'my username',
@@ -158,7 +157,6 @@ describe('NorthOIConnect with proxy', () => {
         'Content-Type': 'application/json'
       },
       body: JSON.stringify(values),
-      timeout: configuration.settings.timeout * 1000,
       agent: {}
     };
 
@@ -212,7 +210,6 @@ describe('NorthOIConnect with proxy', () => {
         'Content-Type': 'application/json'
       },
       body: JSON.stringify(values),
-      timeout: configuration.settings.timeout * 1000,
       agent: {}
     };
 
@@ -242,7 +239,6 @@ describe('NorthOIConnect with proxy', () => {
         'content-type': expect.stringContaining('multipart/form-data; boundary=')
       },
       body: expect.anything(),
-      timeout: configuration.settings.timeout * 1000,
       agent: {}
     };
 
@@ -295,7 +291,6 @@ describe('NorthOIConnect with proxy', () => {
         'content-type': expect.stringContaining('multipart/form-data; boundary=')
       },
       body: expect.anything(),
-      timeout: configuration.settings.timeout * 1000,
       agent: {}
     };
 
@@ -323,8 +318,7 @@ describe('NorthOIConnect with proxy', () => {
     expect(fetch).toHaveBeenCalledWith('https://hostname/api/info', {
       agent: {},
       headers: { authorization: 'Basic dXNlcjpwYXNz' },
-      method: 'GET',
-      timeout: 10000
+      method: 'GET'
     });
     expect(logger.error).toHaveBeenCalledWith(`Fetch error ${new Error('Timeout error')}`);
   });
@@ -362,7 +356,6 @@ describe('NorthOIConnect with proxy but without proxy password', () => {
     settings: {
       host: 'https://hostname',
       acceptUnauthorized: false,
-      timeout: 10,
       useProxy: true,
       proxyUrl: 'http://localhost',
       proxyUsername: 'my username',
@@ -416,7 +409,6 @@ describe('NorthOIConnect without proxy with acceptUnauthorized', () => {
     settings: {
       host: 'https://hostname',
       acceptUnauthorized: true,
-      timeout: 10,
       useProxy: false,
       username: 'user',
       password: 'pass'
@@ -462,7 +454,6 @@ describe('NorthOIConnect without proxy with acceptUnauthorized', () => {
         'Content-Type': 'application/json'
       },
       body: JSON.stringify(values),
-      timeout: configuration.settings.timeout * 1000,
       agent: expect.any(https.Agent)
     };
 
@@ -482,7 +473,6 @@ describe('NorthOIConnect without proxy with acceptUnauthorized', () => {
         'content-type': expect.stringContaining('multipart/form-data; boundary=')
       },
       body: expect.anything(),
-      timeout: configuration.settings.timeout * 1000,
       agent: expect.any(https.Agent)
     };
 

backend/src/north/north-oibus/north-oibus.ts

@@ -4,7 +4,7 @@ import { NorthConnectorDTO } from '../../../../shared/model/north-connector.mode
 import EncryptionService from '../../service/encryption.service';
 import RepositoryService from '../../service/repository.service';
 import pino from 'pino';
-import fetch from 'node-fetch';
+import fetch, { HeadersInit, RequestInit } from 'node-fetch';
 import { createReadStream } from 'node:fs';
 import path from 'node:path';
 import FormData from 'form-data';
@@ -62,16 +62,15 @@ export default class NorthOibus extends NorthConnector<NorthOIBusSettings> imple
   override async testConnection(): Promise<void> {
     this.logger.info(`Testing connection on "${this.connector.settings.host}"`);
 
-    const headers: Record<string, string | number> = {};
+    const headers: HeadersInit = {};
     const basic = Buffer.from(
       `${this.connector.settings.username}:${await this.encryptionService.decryptText(this.connector.settings.password!)}`
     ).toString('base64');
     headers.authorization = `Basic ${basic}`;
-    const fetchOptions: Record<string, any> = {
+    const fetchOptions: RequestInit = {
       method: 'GET',
       headers,
-      agent: this.proxyAgent,
-      timeout: 10000
+      agent: this.proxyAgent
     };
     const requestUrl = `${this.connector.settings.host}/api/info`;
 
@@ -93,7 +92,7 @@ export default class NorthOibus extends NorthConnector<NorthOIBusSettings> imple
    * Handle values by sending them to the specified endpoint
    */
   async handleValues(values: Array<OIBusDataValue>): Promise<void> {
-    const headers: Record<string, string> = {
+    const headers: HeadersInit = {
       'Content-Type': 'application/json'
     };
     headers.authorization = `Basic ${Buffer.from(
@@ -107,7 +106,6 @@ export default class NorthOibus extends NorthConnector<NorthOIBusSettings> imple
         method: 'POST',
         headers,
         body: JSON.stringify(values),
-        timeout: this.connector.settings.timeout * 1000,
         agent: this.proxyAgent
       });
     } catch (fetchError) {
@@ -129,7 +127,7 @@ export default class NorthOibus extends NorthConnector<NorthOIBusSettings> imple
    * Handle the file by sending it to the specified endpoint
    */
   async handleFile(filePath: string): Promise<void> {
-    const headers: Record<string, string> = {};
+    const headers: HeadersInit = {};
     headers.authorization = `Basic ${Buffer.from(
       `${this.connector.settings.username}:${await this.encryptionService.decryptText(this.connector.settings.password!)}`
     ).toString('base64')}`;
@@ -156,7 +154,6 @@ export default class NorthOibus extends NorthConnector<NorthOIBusSettings> imple
         method: 'POST',
         headers,
         body,
-        timeout: this.connector.settings.timeout * 1000,
         agent: this.proxyAgent
       });
       readStream.close();

backend/src/north/north-rest-api/manifest.ts

@@ -50,7 +50,6 @@ const manifest: NorthConnectorManifest = {
       validators: [{ key: 'required' }],
       displayInViewMode: true
     },
-    { key: 'timeout', type: 'OibNumber', label: 'Timeout', newRow: true, validators: [{ key: 'required' }] },
     ...proxy,
     {
       key: 'authentication',