attlaz-client 1.8.12 → 1.8.15

package/dist/Http/HttpClient.js

@@ -43,8 +43,7 @@ class HttpClient {
                 jsonData = JSON.parse(rawData);
             }
             catch (e) {
-                console.log(httpResponse.statusText);
-                console.error('Unable to parse response data to JSON');
+                console.error('Unable to parse response data to JSON', { statusText: httpResponse.statusText, error: e });
             }
             httpResponse.body = jsonData;
         }

package/dist/Http/OAuthClient.d.ts

@@ -9,6 +9,7 @@ export declare class OAuthClient {
     constructor(options: OAuthClientOptions);
     authenticate(username: string, password: string): Promise<boolean>;
     authenticate(): Promise<boolean>;
+    private refreshTokenPromise;
     refreshToken(): Promise<void>;
     isTokenExpires(): boolean;
     request(action: string, parameters?: any, method?: string, signWithOauthToken?: boolean): Promise<any>;

package/dist/Http/OAuthClient.js

@@ -15,6 +15,7 @@ class OAuthClient {
         this.debug = false;
         this.oauthToken = null;
         this.oathClientToken = null;
+        this.refreshTokenPromise = null;
         this.options = options;
         //
         this.oauthClient = new client_oauth2_1.default({
@@ -44,11 +45,16 @@ class OAuthClient {
             return true;
         }
         catch (e) {
-            console.log(e);
+            if (this.debug) {
+                console.debug('[Client] Error during authentication', e);
+            }
             throw ClientError_1.ClientError.fromError(e);
         }
     }
     async refreshToken() {
+        if (this.debug) {
+            console.debug('[OAuthClient] refresh token');
+        }
         if (this.oauthToken === null) {
             throw new Error('unable to refresh token, auth token not set');
         }
@@ -58,8 +64,7 @@ class OAuthClient {
                 this.oathClientToken = this.tokenToOauthClientToken(this.oauthToken);
             }
             catch (e) {
-                const error = ClientError_1.ClientError.fromError(e);
-                throw error;
+                throw ClientError_1.ClientError.fromError(e);
             }
         }
         else {
@@ -82,12 +87,19 @@ class OAuthClient {
                     throw new ClientError_1.ClientError('Unable to perform request, access token not provided');
                 }
                 if (signWithOauthToken && this.oauthToken.expired()) {
-                    await this.refreshToken();
+                    if (this.refreshTokenPromise === null) {
+                        this.refreshTokenPromise = this.refreshToken();
+                        await this.refreshTokenPromise;
+                        this.refreshTokenPromise = null;
+                    }
+                    else {
+                        await this.refreshTokenPromise;
+                    }
                 }
             }
             const requestData = this.createRequestData(action, parameters, method, signWithOauthToken);
             if (this.debug) {
-                console.debug('[Client] REQ: ' + requestData.method.toUpperCase() + ' ' + requestData.getFullUrl());
+                console.debug('[OAuthClient] Request: ' + requestData.method.toUpperCase() + ' ' + requestData.getFullUrl());
             }
             try {
                 const response = await HttpClient_1.HttpClient.request2(requestData);

package/dist/Model/Error/ClientError.js

@@ -9,7 +9,14 @@ class ClientError {
         this.code = code;
     }
     static fromError(error) {
-        let clientError = new ClientError(error.message);
+        if (error.body !== undefined && error.body !== null && error.body.error !== undefined && error.body.error !== null) {
+            error = error.body.error;
+        }
+        let message = error;
+        if (error.message !== undefined && error.message !== null) {
+            message = error.message;
+        }
+        let clientError = new ClientError(message);
         //console.error(error);
         if (error.status !== null && error.status !== undefined) {
             const statusCode = error.status;

package/dist/Model/Storage/StorageItem.d.ts

@@ -2,4 +2,5 @@ export declare class StorageItem {
     key: string;
     value: string | number | boolean | null | any;
     expiration: Date | null;
+    static parse(raw: any): StorageItem;
 }

package/dist/Model/Storage/StorageItem.js

@@ -2,5 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageItem = void 0;
 class StorageItem {
+    static parse(raw) {
+        let storageItem = new StorageItem();
+        storageItem.key = raw.key;
+        storageItem.value = raw.value;
+        storageItem.expiration = new Date(raw.expiration);
+        return storageItem;
+    }
 }
 exports.StorageItem = StorageItem;

package/dist/Model/Storage/StorageItemInformation.d.ts

@@ -2,4 +2,5 @@ export declare class StorageItemInformation {
     key: string;
     bytes: number;
     expiration: Date | null;
+    static parse(raw: any): StorageItemInformation;
 }

package/dist/Model/Storage/StorageItemInformation.js

@@ -2,5 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageItemInformation = void 0;
 class StorageItemInformation {
+    static parse(raw) {
+        let storageItemInformation = new StorageItemInformation();
+        storageItemInformation.key = raw.id;
+        storageItemInformation.bytes = raw.bytes;
+        storageItemInformation.expiration = new Date(raw.expiration);
+        return storageItemInformation;
+    }
 }
 exports.StorageItemInformation = StorageItemInformation;

package/dist/Model/Worker/WorkerConfig.d.ts

@@ -6,6 +6,9 @@ export declare class WorkerConfig {
     static KEY_CPU_LIMIT: string;
     static KEY_PLATFORM: string;
     static KEY_WORKER_VERSION: string;
+    static KEY_API_ENDPOINT: string;
+    static KEY_API_CLIENT_ID: string;
+    static KEY_CLIENT_SECRET: string;
     projectEnvironment: string;
     key: string;
     value: DataValueValue | null;

package/dist/Model/Worker/WorkerConfig.js

@@ -18,3 +18,6 @@ WorkerConfig.KEY_MEMORY_LIMIT = 'memory_limit';
 WorkerConfig.KEY_CPU_LIMIT = 'cpu_limit';
 WorkerConfig.KEY_PLATFORM = 'platform';
 WorkerConfig.KEY_WORKER_VERSION = 'worker_version';
+WorkerConfig.KEY_API_ENDPOINT = 'api_endpoint';
+WorkerConfig.KEY_API_CLIENT_ID = 'api_client_id';
+WorkerConfig.KEY_CLIENT_SECRET = 'api_client_secret';

package/dist/Service/ProjectDeployEndpoint.js

@@ -40,7 +40,6 @@ class ProjectDeployEndpoint extends Endpoint_1.Endpoint {
         try {
             const projectDeploy = await this.httpClient.request('/projectenvironments/' + projectEnvironmentId + '/deploys', {}, 'POST');
             // TODO: parse deploy
-            console.log('Parse deploy', projectDeploy);
             return projectDeploy;
         }
         catch (error) {

package/dist/Service/StorageEndpoint.d.ts

@@ -8,7 +8,7 @@ export declare class StorageEndpoint extends Endpoint {
     getInformation(projectEnvironmentId: string, storageType: StorageType): Promise<DataResult<StorageInformation>>;
     clearPool(projectEnvironmentId: string, storageType: StorageType, poolKey: string): Promise<DataResult<any>>;
     getPoolItemsInformation(projectEnvironmentId: string, storageType: StorageType, poolKey: string): Promise<DataResult<StorageItemInformation[]>>;
-    getItem(projectEnvironmentId: string, storageType: StorageType, poolKey: string, storageItemKey: string): Promise<DataResult<StorageItem>>;
-    setItem(projectEnvironmentId: string, storageType: StorageType, poolKey: string, storageItem: StorageItem): Promise<DataResult<StorageItem>>;
+    getItem(projectEnvironmentId: string, storageType: StorageType, poolKey: string, storageItemKey: string): Promise<StorageItem | null>;
+    setItem(projectEnvironmentId: string, storageType: StorageType, poolKey: string, storageItem: StorageItem): Promise<void>;
     deleteItem(projectEnvironmentId: string, storageType: StorageType, poolKey: string, storageItemKey: string): Promise<DataResult<StorageItem>>;
 }

package/dist/Service/StorageEndpoint.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageEndpoint = void 0;
 const Endpoint_1 = require("./Endpoint");
+const StorageItem_1 = require("../Model/Storage/StorageItem");
+const StorageItemInformation_1 = require("../Model/Storage/StorageItemInformation");
 class StorageEndpoint extends Endpoint_1.Endpoint {
     async getInformation(projectEnvironmentId, storageType) {
         let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType;
@@ -33,6 +35,7 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
         let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType + '/' + poolKey + '/items';
         try {
             const result = await this.request(cmd, null, 'GET');
+            result.setData(this.parseCollection(result, StorageItemInformation_1.StorageItemInformation.parse));
             return result;
         }
         catch (ex) {
@@ -46,11 +49,16 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
         let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType + '/' + poolKey + '/items/' + storageItemKey;
         try {
             const result = await this.request(cmd, null, 'GET');
-            return result;
+            if (result.getData() === null) {
+                return null;
+            }
+            else {
+                return StorageItem_1.StorageItem.parse(result.getData());
+            }
         }
         catch (ex) {
             if (this.httpClient.isDebugEnabled()) {
-                console.error('Failed to get storage information', ex);
+                console.error('Failed to get storage item', ex);
             }
             throw ex;
         }
@@ -59,7 +67,7 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
         let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType + '/' + poolKey + '/items/' + storageItem.key;
         try {
             const result = await this.request(cmd, { 'storage_item': storageItem }, 'POST');
-            return result;
+            return;
         }
         catch (ex) {
             if (this.httpClient.isDebugEnabled()) {

package/dist/Service/TaskExecutionRequestEndpoint.js

@@ -11,7 +11,7 @@ class TaskExecutionRequestEndpoint extends Endpoint_1.Endpoint {
         try {
             // TODO: parse
             const result = await this.httpClient.request(url, params, 'POST');
-            console.log('TODO: parse postTaskExecutionRequest result', result);
+            // console.log('TODO: parse postTaskExecutionRequest result', result);
             return result;
         }
         catch (ex) {

package/dist/Service/WorkerConfigEndpoint.js

@@ -33,7 +33,7 @@ class WorkerConfigEndpoint extends Endpoint_1.Endpoint {
         try {
             let url = '/projectenvironments/' + workerConfig.projectEnvironment + '/workerconfiguration';
             const result = await this.request(url, workerConfig, 'POST');
-            console.log(result);
+            // console.log(result);
             return WorkerConfig_1.WorkerConfig.parse(result);
         }
         catch (error) {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.8.12";
+export declare const VERSION = "1.8.15";

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = "1.8.12";
+exports.VERSION = "1.8.15";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.8.12",
+  "version": "1.8.15",
   "description": "Javascript Client to access Attlaz API",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -30,16 +30,16 @@
     "popsicle": "^12.1.0"
   },
   "devDependencies": {
-    "@types/jest": "^27.4.1",
-    "@types/node": "^17.0.21",
-    "jest": "^27.5.1",
+    "@types/jest": "^28.1.6",
+    "@types/node": "^18.7.2",
+    "jest": "^28.1.3",
     "rimraf": "^3.0.2",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-typescript": "^1.0.1",
-    "ts-jest": "^27.1.3",
-    "typescript": "^4.6.2",
-    "dotenv": "^16.0.0"
+    "ts-jest": "^28.0.7",
+    "typescript": "^4.7.4",
+    "dotenv": "^16.0.1"
   },
   "directories": {
     "test": "test"