@hahnpro/hpc-api 1.0.1 → 1.0.2

package/dist/api.js

@@ -15,19 +15,22 @@ const timeseries_service_1 = require("./timeseries.service");
 const user_service_1 = require("./user.service");
 class API {
     constructor() {
+        const normalizePath = (value = '', defaultValue = '') => value.replace(/^\/+|\/+$/g, '') || defaultValue;
         let apiBaseUrl = process.env.API_BASE_URL || 'https://testing.hahnpro.com';
         if (!apiBaseUrl.startsWith('https') && !apiBaseUrl.startsWith('http')) {
             console.info('no protocol specified - using HTTPS');
             apiBaseUrl = `https://${apiBaseUrl}`;
         }
+        const apiUrl = apiBaseUrl + '/' + normalizePath(process.env.API_BASE_PATH, 'api');
         const authBaseUrl = process.env.AUTH_BASE_URL || apiBaseUrl;
+        const authUrl = authBaseUrl + '/' + normalizePath(process.env.AUTH_BASE_PATH, 'auth');
         const realm = process.env.AUTH_REALM || 'hpc';
         const client = process.env.API_USER || 'flow-executor-service';
         const secret = process.env.AUTH_SECRET;
         if (!secret) {
             throw new Error('"API_BASE_URL", "API_USER", "AUTH_REALM" and "AUTH_SECRET" environment variables must be set');
         }
-        this.httpClient = new http_service_1.HttpClient(apiBaseUrl, authBaseUrl, realm, client, secret);
+        this.httpClient = new http_service_1.HttpClient(apiUrl, authUrl, realm, client, secret);
         this.assets = new asset_service_1.AssetService(this.httpClient);
         this.assetTypes = new assettypes_service_1.AssetTypesService(this.httpClient);
         this.contents = new content_service_1.ContentService(this.httpClient);

package/dist/asset.service.js

@@ -4,7 +4,7 @@ exports.AssetService = void 0;
 const data_service_1 = require("./data.service");
 class AssetService extends data_service_1.DataService {
     constructor(httpClient) {
-        super(httpClient, process.env.DEBUG_ASSET_URL || 'api/assets');
+        super(httpClient, '/assets');
         this.addAttachment = (id, form) => {
             const headers = Object.assign({}, form.getHeaders());
             return this.httpClient.post(`${this.basePath}/${id}/attachment`, form, {

package/dist/assettypes.service.js

@@ -4,7 +4,7 @@ exports.AssetTypesService = void 0;
 const data_service_1 = require("./data.service");
 class AssetTypesService extends data_service_1.DataService {
     constructor(httpClient) {
-        super(httpClient, 'api/assettypes');
+        super(httpClient, '/assettypes');
     }
 }
 exports.AssetTypesService = AssetTypesService;

package/dist/content.service.js

@@ -5,7 +5,7 @@ const content_interface_1 = require("./content.interface");
 const data_service_1 = require("./data.service");
 class ContentService extends data_service_1.DataService {
     constructor(httpClient) {
-        super(httpClient, process.env.DEBUG_CONTENT_URL || 'api/contents');
+        super(httpClient, '/contents');
         this.upload = (form) => {
             const headers = Object.assign({}, form.getHeaders());
             return this.httpClient.post(`${this.basePath}`, form, { headers, maxBodyLength: Infinity, maxContentLength: Infinity });

package/dist/endpoint.service.js

@@ -4,7 +4,7 @@ exports.EndpointService = void 0;
 const data_service_1 = require("./data.service");
 class EndpointService extends data_service_1.DataService {
     constructor(httpClient) {
-        super(httpClient, process.env.DEBUG_ENDPOINT_URL || 'api/notification/endpoints');
+        super(httpClient, '/notification/endpoints');
     }
     sendNotification(endpointId, subject, message, group, eventLink, assetLink) {
         const body = Object.assign(Object.assign({ subject, message, group }, (eventLink && { eventLink })), (assetLink && { assetLink }));

package/dist/events.service.js

@@ -4,7 +4,7 @@ exports.EventsService = void 0;
 const data_service_1 = require("./data.service");
 class EventsService extends data_service_1.DataService {
     constructor(httpClient) {
-        super(httpClient, process.env.DEBUG_EVENTS_URL || 'api/events');
+        super(httpClient, '/events');
     }
     getLastEventByAssetAndGroup(assetId, group) {
         return this.httpClient.get(`${this.basePath}/last/${assetId}/${group}`);

package/dist/http.service.d.ts

@@ -8,7 +8,7 @@ export declare class HttpClient {
     private readonly requestQueue;
     private accessToken;
     private accessTokenExpiration;
-    constructor(apiBaseUrl: string, authBaseUrl: string, realm: string, client: string, secret: string);
+    constructor(baseURL: string, authbaseURL: string, realm: string, client: string, secret: string);
     getQueueStats: () => {
         peak: number;
         pending: number;

package/dist/http.service.js

@@ -6,7 +6,7 @@ const axios_1 = (0, tslib_1.__importDefault)(require("axios"));
 const Queue_1 = require("./Queue");
 const EXPIRATION_BUFFER = 30 * 1000;
 class HttpClient {
-    constructor(apiBaseUrl, authBaseUrl, realm, client, secret) {
+    constructor(baseURL, authbaseURL, realm, client, secret) {
         this.realm = realm;
         this.client = client;
         this.secret = secret;
@@ -50,7 +50,7 @@ class HttpClient {
                 ]);
                 const headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
                 this.authAxiosInstance
-                    .post(`/auth/realms/${this.realm}/protocol/openid-connect/token`, params.toString(), { headers })
+                    .post(`/realms/${this.realm}/protocol/openid-connect/token`, params.toString(), { headers })
                     .then((res) => {
                     var _a;
                     if (((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.access_token) && res.data.expires_in) {
@@ -65,9 +65,8 @@ class HttpClient {
                     .catch(reject);
             });
         };
-        authBaseUrl = authBaseUrl || apiBaseUrl;
-        this.axiosInstance = axios_1.default.create({ baseURL: apiBaseUrl, timeout: 60000 });
-        this.authAxiosInstance = axios_1.default.create({ baseURL: authBaseUrl, timeout: 10000 });
+        this.axiosInstance = axios_1.default.create({ baseURL, timeout: 60000 });
+        this.authAxiosInstance = axios_1.default.create({ baseURL: authbaseURL || baseURL, timeout: 10000 });
         this.requestQueue = new Queue_1.Queue({ concurrency: 1, timeout: 70000, throwOnTimeout: true });
     }
 }

package/dist/proxy.service.js

@@ -11,7 +11,7 @@ class ProxyService {
     }
     url(proxyId, path = '/') {
         path = path.startsWith('/') ? path : `/${path}`;
-        return `api/${proxyId}${path}`;
+        return `/proxy/${proxyId}${path}`;
     }
 }
 exports.ProxyService = ProxyService;

package/dist/secret.service.js

@@ -4,7 +4,7 @@ exports.SecretService = void 0;
 const data_service_1 = require("./data.service");
 class SecretService extends data_service_1.DataService {
     constructor(httpClient) {
-        super(httpClient, process.env.DEBUG_SECRET_URL || '/api/secrets');
+        super(httpClient, '/secrets');
     }
 }
 exports.SecretService = SecretService;

package/dist/sidriveiq.service.js

@@ -4,7 +4,7 @@ exports.SiDriveIqService = void 0;
 class SiDriveIqService {
     constructor(httpClient) {
         this.httpClient = httpClient;
-        this.basePath = 'api/sidrive/api/v0';
+        this.basePath = '/proxy/sidrive/api/v0';
     }
     getAssets(params = {}) {
         return this.httpClient.get(`${this.basePath}/assets`, { params });

package/dist/task.service.js

@@ -4,7 +4,7 @@ exports.TaskService = void 0;
 const data_service_1 = require("./data.service");
 class TaskService extends data_service_1.DataService {
     constructor(httpClient) {
-        super(httpClient, process.env.DEBUG_TSK_URL || 'api/tasks');
+        super(httpClient, '/tasks');
     }
     createTaskAttachedToAsset(dto) {
         return this.httpClient.post(this.basePath, dto);

package/dist/timeseries.service.js

@@ -4,7 +4,7 @@ exports.TimeSeriesService = void 0;
 const data_service_1 = require("./data.service");
 class TimeSeriesService extends data_service_1.DataService {
     constructor(httpClient) {
-        super(httpClient, process.env.DEBUG_TSM_URL || 'api/tsm');
+        super(httpClient, '/tsm');
     }
     addValue(id, value) {
         return this.httpClient.post(`${this.basePath}/${id}`, value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/hpc-api",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Module for easy access to the HahnPRO API",
   "license": "MIT",
   "author": {