attlaz-client 1.6.10 → 1.7.1

package/dist/Http/HttpClient.d.ts

@@ -8,8 +8,9 @@ export declare class HttpClient {
     static HTTP_NOT_ALLOWED: number;
     static HTTP_UNPROCESSABLE_ENTITY: number;
     static HTTP_INTERNAL_SERVER_ERROR: number;
+    static HTTP_BAD_GATEWAY: number;
     static HTTP_UNAVAILABLE: number;
-    static get(url: string, requestData?: any): Promise<any>;
-    static request(request: HttpClientRequest): Promise<any>;
     static request2(request: HttpClientRequest): Promise<HttpClientResponse>;
+    private static getContentType;
+    private static formatContentType;
 }

package/dist/Http/HttpClient.js

@@ -2,45 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 const popsicle_1 = require("popsicle");
-const Utils_1 = require("../Utils");
-// import {ClientError} from '..';
 const HttpClientResponse_1 = require("./HttpClientResponse");
 const ClientError_1 = require("../Model/Error/ClientError");
-// import {NegotiateHttpVersion} from 'popsicle-transport-http';
+const version_1 = require("../version");
 class HttpClient {
-    static async get(url, requestData = {}) {
-        if (Utils_1.Utils.isNullOrUndefined(requestData)) {
-            requestData = {};
-        }
-        // TODO: how to pass this?
-        // const x: TransportOptions = {
-        //     negotiateHttpVersion: NegotiateHttpVersion.HTTP1_ONLY
-        // }
-        // const controller = new AbortController();
-        const response = await (0, popsicle_1.fetch)(url, requestData);
-        //TODO: validate status
-        const error = ClientError_1.ClientError.byStatus(response.status, response.statusText);
-        if (!Utils_1.Utils.isNullOrUndefined(error)) {
-            // const body: string = await response.text();
-            // console.log('Text' + body);
-            //
-            // console.log(response);
-            throw error;
-        }
-        // TODO: make it possible to do request without parsing the json
-        return await response.json();
-    }
-    static async request(request) {
-        const rawRequest = {
-            url: request.getFullUrl(),
-            method: request.method,
-            headers: request.headers,
-            omitDefaultHeaders: true,
-            body: request.body
-        };
-        return HttpClient.get(request.getFullUrl(), rawRequest);
-    }
+    // public static async get(url: string, requestData: any = {}): Promise<any> {
+    //     if (Utils.isNullOrUndefined(requestData)) {
+    //         requestData = {};
+    //     }
+    //     const response: Response = await fetch(url, requestData);
+    //
+    //     //TODO: validate status
+    //     const error: ClientError | null = ClientError.byStatus(response.status, response.statusText);
+    //     if (!Utils.isNullOrUndefined(error)) {
+    //         throw error;
+    //     }
+    //
+    //     // TODO: make it possible to do request without parsing the json
+    //     return await response.json();
+    // }
     static async request2(request) {
+        if (typeof window === 'undefined') {
+            // Add user agent when running in Node
+            request.headers['User-Agent'] = 'Attlaz Http/' + version_1.VERSION;
+        }
         const rawRequest = {
             url: request.getFullUrl(),
             method: request.method,
@@ -48,49 +33,51 @@ class HttpClient {
             omitDefaultHeaders: true,
             body: request.body
         };
-        // TODO: set user agent
-        // rawRequest.negotiateHttpVersion = NegotiateHttpVersion.HTTP1_ONLY;
         const response = await (0, popsicle_1.fetch)(request.getFullUrl(), rawRequest);
         const httpResponse = new HttpClientResponse_1.HttpClientResponse(response.status, response.statusText);
-        // httpResponse.status = response.status;
-        // httpResponse.statusText = response.statusText;
-        // TODO: should we get JSON immediately?
-        // response.json
-        // httpResponse.body = await response.text();
+        let contentType = this.getContentType(response);
         const rawData = await response.text();
-        let jsonData = null;
-        try {
-            jsonData = JSON.parse(rawData);
+        if (contentType.type === 'application/json') {
+            let jsonData = null;
+            try {
+                jsonData = JSON.parse(rawData);
+            }
+            catch (e) {
+                console.log(httpResponse.statusText);
+                console.error('Unable to parse response data to JSON');
+            }
+            httpResponse.body = jsonData;
         }
-        catch (e) {
-            console.log(httpResponse.statusText);
-            console.error('Unable to parse response data to JSON');
+        else {
+            httpResponse.body = rawData;
         }
-        httpResponse.body = jsonData;
         const error = ClientError_1.ClientError.byStatus(response.status, response.statusText);
-        if (!Utils_1.Utils.isNullOrUndefined(error)) {
-            // const body: string = await response.text();
-            // console.log('Text' + body);
-            //
-            // console.log(response);
+        if (error !== null && error !== undefined) {
+            error.body = httpResponse.body;
             throw error;
         }
-        // //TODO: validate status
-        //
-        // const error: ClientError = ClientError.byStatus(response.status, response.statusText);
-        // if (!Utils.isNullOrUndefined(error)) {
-        //
-        //     // const body: string = await response.text();
-        //     // console.log('Text' + body);
-        //     //
-        //     // console.log(response);
-        //     throw error;
-        // }
-        //
-        // // TODO: make it possible to do request without parsing the json
-        // return await response.json();
         return httpResponse;
     }
+    static getContentType(response) {
+        if (response.headers.has('Content-Type')) {
+            const rawContentType = response.headers.get('Content-Type');
+            if (rawContentType !== null) {
+                return this.formatContentType(rawContentType);
+            }
+        }
+        return { type: 'application/json', options: null };
+    }
+    static formatContentType(input) {
+        const d = input.split(';');
+        if (d.length === 1) {
+            return { type: d[0], options: null };
+        }
+        else if (d.length === 2) {
+            return { type: d[0], options: d[1].trim() };
+        }
+        console.error('Unable to parse content type "' + input + '"');
+        return { type: input, options: null };
+    }
 }
 exports.HttpClient = HttpClient;
 HttpClient.HTTP_BAD_REQUEST = 400;
@@ -100,4 +87,5 @@ HttpClient.HTTP_NOTFOUND = 404;
 HttpClient.HTTP_NOT_ALLOWED = 405;
 HttpClient.HTTP_UNPROCESSABLE_ENTITY = 422;
 HttpClient.HTTP_INTERNAL_SERVER_ERROR = 500;
+HttpClient.HTTP_BAD_GATEWAY = 502;
 HttpClient.HTTP_UNAVAILABLE = 503;

package/dist/Http/OAuthClient.js

@@ -84,19 +84,19 @@ class OAuthClient {
             }
             const requestData = this.createRequestData(action, parameters, method, signWithOauthToken);
             if (this.debug) {
-                console.info('[Client request] ', requestData);
+                console.debug('[Client] REQ: ' + requestData.method.toUpperCase() + ' ' + requestData.getFullUrl());
             }
             try {
                 const response = await HttpClient_1.HttpClient.request2(requestData);
-                if (this.debug) {
-                    console.info('[Client response] ', { body: response.body });
-                }
+                // if (this.debug) {
+                //     console.info('[Client response] ', {body: response.body});
+                // }
                 return response.body;
             }
             catch (error) {
                 const clientError = ClientError_1.ClientError.fromError(error);
                 if (this.debug) {
-                    console.error('[Client error]', { error, clientError });
+                    console.error('[Client] Error:', { error, clientError });
                 }
                 throw clientError;
             }

package/dist/Model/Error/ClientError.d.ts

@@ -3,6 +3,7 @@ export declare class ClientError implements Error {
     name: string;
     code: number | null;
     stack: string;
+    body: string | null;
     constructor(message: string, code?: number | null);
     static fromError(error: Error | any): ClientError;
     static byStatus(statusCode: number, statusText: string): ClientError | null;

package/dist/Model/Error/ClientError.js

@@ -4,6 +4,7 @@ exports.ClientError = void 0;
 const HttpClient_1 = require("../../Http/HttpClient");
 class ClientError {
     constructor(message, code = null) {
+        this.body = null;
         this.message = message;
         this.code = code;
     }
@@ -66,6 +67,9 @@ class ClientError {
             case 500:
                 return new ClientError('Internal Server Error', HttpClient_1.HttpClient.HTTP_INTERNAL_SERVER_ERROR);
                 break;
+            case 502:
+                return new ClientError('Bad gateway', HttpClient_1.HttpClient.HTTP_BAD_GATEWAY);
+                break;
             case 503:
                 return new ClientError('Service not available', HttpClient_1.HttpClient.HTTP_UNAVAILABLE);
                 break;

package/dist/Service/AdapterEndpoint.js

@@ -50,8 +50,8 @@ class AdapterEndpoint extends Endpoint_1.Endpoint {
     }
     async getConnections(projectId) {
         try {
-            let url = '/connections';
-            const result = await this.request(url, { projectId }, 'GET');
+            let url = '/project/' + projectId + '/connections';
+            const result = await this.request(url, null, 'GET');
             result.setData(this.parseCollection(result, AdapterConnection_1.AdapterConnection.parse));
             return result;
         }
@@ -78,10 +78,8 @@ class AdapterEndpoint extends Endpoint_1.Endpoint {
     }
     async saveConnection(projectId, adapter) {
         try {
-            let url = '/connections';
-            const data = adapter;
-            data.projectId = projectId;
-            const result = await this.request(url, data, 'POST');
+            let url = '/project/' + projectId + '/connections';
+            const result = await this.request(url, adapter, 'POST');
             result.setData(AdapterConnection_1.AdapterConnection.parse(result.getData()));
             return result;
         }

package/dist/Service/TaskExecutionEndpoint.d.ts

@@ -6,7 +6,7 @@ import { TaskExecutionStatus } from '../Model/TaskExecutionStatus';
 export declare class TaskExecutionEndpoint extends Endpoint {
     getTaskExecutions(taskId: string): Promise<TaskExecution[]>;
     getTaskExecutionSummaries(taskId: string, from?: Date | null, to?: Date | null, projectEnvironmentId?: string | null): Promise<TaskExecutionSummary[]>;
-    getTaskExecutionSummary(taskExecutionId: string): Promise<TaskExecutionSummary>;
+    getTaskExecutionSummary(taskExecutionId: string): Promise<TaskExecutionSummary | null>;
     getTaskExecutionHistory(taskExecutionId: string): Promise<TaskExecutionHistory[]>;
     updateTaskExecution(taskExecutionId: string, status: TaskExecutionStatus, time?: Date | null): Promise<TaskExecution>;
 }

package/dist/Service/TaskExecutionEndpoint.js

@@ -61,8 +61,8 @@ class TaskExecutionEndpoint extends Endpoint_1.Endpoint {
     async getTaskExecutionSummary(taskExecutionId) {
         try {
             const rawTaskExecution = await this.httpClient.request('/taskexecutions/' + taskExecutionId + '/summaries');
-            if (Utils_1.Utils.isNullOrUndefined(rawTaskExecution)) {
-                throw new Error('Unable to get task execution');
+            if (rawTaskExecution === null || rawTaskExecution === undefined) {
+                return null;
             }
             return TaskExecutionSummary_1.TaskExecutionSummary.parse(rawTaskExecution);
         }

package/dist/test.js

@@ -132,7 +132,7 @@ async function testHTTPAuth() {
     requestData.setJsonHeader();
     requestData.setBasicAuth('attlaz', '4$0x51eIaF9w');
     try {
-        const res = await HttpClient_1.HttpClient.request(requestData);
+        const res = await HttpClient_1.HttpClient.request2(requestData);
         console.log(res);
     }
     catch (e) {

package/dist/version.d.ts

@@ -0,0 +1 @@
+export declare const VERSION = "1.7.1";

package/dist/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.6.10",
+  "version": "1.7.1",
   "description": "Javascript Client to access Attlaz API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,6 +14,7 @@
   "author": "Stijn Duynslaeger <stijn@attlaz.com> (stijn@attlaz.com)",
   "license": "MIT",
   "scripts": {
+    "prebuild": "node -p \"'export const VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
     "prepare": "npm run build",
     "build": "npm run clean && tsc",
     "clean": "rimraf dist",