@hahnpro/hpc-api 3.7.0 → 3.8.0

package/dist/api.d.ts

@@ -16,6 +16,7 @@ import { FlowModuleService } from './flow-module.service';
 import { FlowDeploymentService } from './flow-deployment.service';
 import { LabelService } from './label.service';
 import { VaultService } from './vault.service';
+import { NotificationService } from './notification.service';
 export declare class API {
     httpClient: HttpClient;
     assets: AssetService;
@@ -34,6 +35,7 @@ export declare class API {
     timeSeries: TimeSeriesService;
     users: UserService;
     vault: VaultService;
+    notifications: NotificationService;
     /**
      * @deprecated use "assets" instead
      */

package/dist/api.js

@@ -19,6 +19,7 @@ const flow_module_service_1 = require("./flow-module.service");
 const flow_deployment_service_1 = require("./flow-deployment.service");
 const label_service_1 = require("./label.service");
 const vault_service_1 = require("./vault.service");
+const notification_service_1 = require("./notification.service");
 class API {
     constructor() {
         const normalizePath = (value = '', defaultValue = '') => value.replace(/(?:^\/+)|(?:\/+$)/g, '') || defaultValue;
@@ -53,6 +54,7 @@ class API {
         this.timeSeries = new timeseries_service_1.TimeSeriesService(this.httpClient);
         this.users = new user_service_1.UserService(this.httpClient);
         this.vault = new vault_service_1.VaultService(this.httpClient);
+        this.notifications = new notification_service_1.NotificationService(this.httpClient);
         this.assetManager = this.assets;
         this.contentManager = this.contents;
         this.endpointManager = this.endpoints;

package/dist/http.service.d.ts

@@ -30,7 +30,7 @@ export declare class HttpClient {
     addEventSource(url: string, listener: (event: MessageEvent) => void, errorListener?: (event: MessageEvent) => void): Promise<any>;
     destroyEventSource(id: string): void;
     destroyAllEventSources(): void;
-    getAccessToken: () => Promise<string>;
+    getAccessToken: (forceRefresh?: boolean) => Promise<string>;
     private validateIssuer;
     private discoverIssuer;
     private requestAccessToken;

package/dist/http.service.js

@@ -9,7 +9,6 @@ const jose_1 = require("jose");
 const Queue_1 = require("./Queue");
 const token_set_1 = require("./token-set");
 const querystring_1 = require("querystring");
-const TOKEN_EXPIRATION_BUFFER = 30;
 class HttpClient {
     constructor(baseURL, authBaseURL, realm, clientId, clientSecret) {
         this.baseURL = baseURL;
@@ -34,11 +33,11 @@ class HttpClient {
                     .catch(reject);
             }));
         };
-        this.getAccessToken = async () => {
-            if (!this.tokenSet || this.tokenSet.expired() || this.tokenSet.expiresAt < Date.now() / 1000 + TOKEN_EXPIRATION_BUFFER) {
+        this.getAccessToken = async (forceRefresh = false) => {
+            if (forceRefresh || !this.tokenSet || this.tokenSet.isExpired()) {
                 return this.requestAccessToken();
             }
-            return this.tokenSet.access_token;
+            return this.tokenSet.accessToken;
         };
         this.axiosInstance = axios_1.default.create({ baseURL, timeout: 60000 });
         this.authAxiosInstance = axios_1.default.create({ baseURL: authBaseURL || baseURL, timeout: 10000 });

package/dist/index.d.ts

@@ -17,4 +17,5 @@ export * from './flow.interface';
 export * from './resource.interface';
 export * from './schema.interface';
 export * from './vault.interface';
+export * from './notification.interface';
 export * as SiDrive from './sidriveiq.interface';

package/dist/index.js

@@ -21,4 +21,5 @@ tslib_1.__exportStar(require("./flow.interface"), exports);
 tslib_1.__exportStar(require("./resource.interface"), exports);
 tslib_1.__exportStar(require("./schema.interface"), exports);
 tslib_1.__exportStar(require("./vault.interface"), exports);
+tslib_1.__exportStar(require("./notification.interface"), exports);
 exports.SiDrive = tslib_1.__importStar(require("./sidriveiq.interface"));

package/dist/mock/api.mock.d.ts

@@ -28,6 +28,8 @@ import { LabelMockService } from './label.mock.service';
 import { Label } from '../label.interface';
 import { VaultSecret } from '../vault.interface';
 import { VaultMockService } from './vault.mock.service';
+import { Notification } from '../notification.interface';
+import { NotificationMockService } from './notification.mock.service';
 export declare class MockAPI implements API {
     httpClient: any;
     assets: AssetMockService;
@@ -46,6 +48,7 @@ export declare class MockAPI implements API {
     timeSeries: TimeseriesMockService;
     users: UserMockService;
     vault: VaultMockService;
+    notifications: NotificationMockService;
     assetManager: AssetMockService;
     contentManager: ContentMockService;
     endpointManager: EndpointMockService;
@@ -74,6 +77,7 @@ export declare class MockAPI implements API {
         diagrams?: FlowDiagramInit[];
         labels?: LabelInit[];
         vault?: VaultSecretInit[];
+        notifications?: NotificationInit[];
     });
 }
 export type Identity<T> = {
@@ -109,6 +113,7 @@ export type ArtifactInit = AtLeast<Artifact & {
 export type FlowDiagramInit = AtLeast<FlowDiagram, 'id' | 'flow'>;
 export type LabelInit = AtLeast<Label, 'id' | 'name'>;
 export type VaultSecretInit = AtLeast<VaultSecret, 'name' | 'secret'>;
+export type NotificationInit = AtLeast<Notification, 'id' | 'name' | 'userId' | 'notificationType'>;
 export interface UserInit {
     roles: string[];
 }

package/dist/mock/api.mock.js

@@ -18,12 +18,13 @@ const flow_modules_mock_service_1 = require("./flow-modules.mock.service");
 const crypto_1 = require("crypto");
 const label_mock_service_1 = require("./label.mock.service");
 const vault_mock_service_1 = require("./vault.mock.service");
+const notification_mock_service_1 = require("./notification.mock.service");
 class MockAPI {
     constructor(initData) {
         this.httpClient = null;
         this.proxy = null;
         this.siDrive = null;
-        const { assets = [], assetRevisions = [], contents = [], endpoints = [], secrets = [], timeSeries = [], tasks = [], events = [], users, flows = [], flowRevisions = [], deployments = [], functions = [], functionRevisions = [], modules = [], diagrams = [], labels = [], vault = [], } = initData;
+        const { assets = [], assetRevisions = [], contents = [], endpoints = [], secrets = [], timeSeries = [], tasks = [], events = [], users, flows = [], flowRevisions = [], deployments = [], functions = [], functionRevisions = [], modules = [], diagrams = [], labels = [], vault = [], notifications = [], } = initData;
         const assetTypes = assets
             .map((v) => v.type)
             .map((v) => {
@@ -113,6 +114,7 @@ class MockAPI {
         });
         const labels1 = labels.map((label) => (Object.assign(Object.assign({}, label), { color: '', description: '', readPermissions: [], readWritePermissions: [] })));
         const vaultSecrets1 = vault.map((v) => (Object.assign(Object.assign({}, v), { readPermissions: [], readWritePermissions: [] })));
+        const notifications1 = notifications.map((n) => (Object.assign(Object.assign({}, n), { link: '', description: '', read: false })));
         this.assets = new asset_mock_service_1.AssetMockService(this, assets1, assetRevisions1);
         this.contents = new content_mock_service_1.ContentMockService(contents1, contentData);
         this.endpoints = new endpoint_mock_service_1.EndpointMockService(endpoint1);
@@ -127,6 +129,7 @@ class MockAPI {
         this.flowModules = new flow_modules_mock_service_1.FlowModulesMockService(modules1);
         this.labels = new label_mock_service_1.LabelMockService(labels1);
         this.vault = new vault_mock_service_1.VaultMockService(vaultSecrets1);
+        this.notifications = new notification_mock_service_1.NotificationMockService(notifications1);
         this.assetManager = this.assets;
         this.contentManager = this.contents;
         this.endpointManager = this.endpoints;

package/dist/mock/index.d.ts

@@ -8,3 +8,4 @@ export * from './timeseries.mock.service';
 export * from './task.mock.service';
 export * from './events.mock.service';
 export * from './vault.mock.service';
+export * from './notification.mock.service';

package/dist/mock/index.js

@@ -11,3 +11,4 @@ tslib_1.__exportStar(require("./timeseries.mock.service"), exports);
 tslib_1.__exportStar(require("./task.mock.service"), exports);
 tslib_1.__exportStar(require("./events.mock.service"), exports);
 tslib_1.__exportStar(require("./vault.mock.service"), exports);
+tslib_1.__exportStar(require("./notification.mock.service"), exports);

package/dist/mock/notification.mock.service.d.ts

@@ -0,0 +1,6 @@
+import { DataMockService } from './data.mock.service';
+import { Notification } from '../notification.interface';
+import { NotificationService } from '../notification.service';
+export declare class NotificationMockService extends DataMockService<Notification> implements NotificationService {
+    constructor(notifications: Notification[]);
+}

package/dist/mock/notification.mock.service.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotificationMockService = void 0;
+const data_mock_service_1 = require("./data.mock.service");
+class NotificationMockService extends data_mock_service_1.DataMockService {
+    constructor(notifications) {
+        super();
+        this.data = notifications;
+    }
+}
+exports.NotificationMockService = NotificationMockService;

package/dist/notification.interface.d.ts

@@ -0,0 +1,10 @@
+export type NotificationType = 'INFO' | 'WARNING' | 'CRITICAL';
+export interface Notification {
+    id?: string;
+    name: string;
+    description: string;
+    userId: string;
+    read?: boolean;
+    link: string;
+    notificationType: NotificationType;
+}

package/dist/notification.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/notification.service.d.ts

@@ -0,0 +1,6 @@
+import { DataService } from './data.service';
+import { Notification } from './notification.interface';
+import { HttpClient } from './http.service';
+export declare class NotificationService extends DataService<Notification> {
+    constructor(httpClient: HttpClient);
+}

package/dist/notification.service.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotificationService = void 0;
+const data_service_1 = require("./data.service");
+class NotificationService extends data_service_1.DataService {
+    constructor(httpClient) {
+        super(httpClient, '/notifications');
+    }
+}
+exports.NotificationService = NotificationService;

package/dist/token-set.d.ts

@@ -1,8 +1,9 @@
 export declare class TokenSet {
-    expiresAt: number;
-    access_token: string;
+    private readonly _accessToken;
+    private readonly _expiresAt;
     constructor(access_token: string, expires_in: number);
-    set expires_in(value: number);
-    get expires_in(): number;
-    expired(): boolean;
+    get accessToken(): string;
+    get expiresAt(): number;
+    get expiresIn(): number;
+    isExpired(): boolean;
 }

package/dist/token-set.js

@@ -1,19 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenSet = void 0;
+const TOKEN_EXPIRATION_BUFFER = 20;
 class TokenSet {
     constructor(access_token, expires_in) {
-        this.expires_in = expires_in;
-        this.access_token = access_token;
+        this._accessToken = access_token;
+        this._expiresAt = Math.floor(Date.now() / 1000) + Number(expires_in);
     }
-    set expires_in(value) {
-        this.expiresAt = Date.now() + Number(value);
+    get accessToken() {
+        return this._accessToken;
     }
-    get expires_in() {
-        return Math.max(this.expiresAt - Date.now(), 0);
+    get expiresAt() {
+        return this._expiresAt;
     }
-    expired() {
-        return this.expires_in === 0;
+    get expiresIn() {
+        return Math.max(this.expiresAt - Math.ceil(Date.now() / 1000), 0);
+    }
+    isExpired() {
+        return this.expiresIn <= TOKEN_EXPIRATION_BUFFER;
     }
 }
 exports.TokenSet = TokenSet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/hpc-api",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "Module for easy access to the HahnPRO API",
   "license": "MIT",
   "author": {
@@ -24,10 +24,10 @@
     "access": "public"
   },
   "dependencies": {
-    "axios": "~1.3.3",
+    "axios": "~1.3.5",
     "eventsource": "^2.0.2",
     "form-data": "^4.0.0",
-    "jose": "^4.12.0",
+    "jose": "^4.13.1",
     "jwt-decode": "^3.1.2",
     "p-queue": "^6.6.2",
     "ts-mixer": "^6.0.3",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@types/eventsource": "1.1.10",
-    "axios-mock-adapter": "^1.21.2"
+    "axios-mock-adapter": "^1.21.4"
   },
   "engines": {
     "node": ">=v14.13"