Merge branch 'dev' of https://github.com/gravwell/js-client into fix/…

…extractor

src/functions/kits/delete-one-archive.ts

@@ -6,17 +6,16 @@
  * MIT license. See the LICENSE file for details.
  **************************************************************************/
 
-import { APIContext, buildHTTPRequestWithAuthFromContext, buildURL } from '../utils';
+import { APIContext, buildHTTPRequestWithAuthFromContext, buildURL, parseJSONResponse } from '../utils';
 
 export const makeDeleteOneKitArchive = (context: APIContext) => {
-	return async (archiveID: string): Promise<boolean> => {
-		const path = '/api/kits/build/history/' + archiveID;
-		const url = buildURL(path, { ...context, protocol: 'http' });
+	return async (archiveID: string): Promise<void> => {
+		const templatePath = '/api/kits/build/history/{archiveID}';
+		const url = buildURL(templatePath, { ...context, protocol: 'http', pathParams: { archiveID } });
 
 		const req = buildHTTPRequestWithAuthFromContext(context);
 
-		const respnse = await context.fetch(url, { ...req, method: 'DELETE' });
-		// The API response is empty so we just check on status
-		return respnse.status === 200;
+		const raw = await context.fetch(url, { ...req, method: 'DELETE' });
+		return parseJSONResponse(raw, { expect: 'void' });
 	};
 };

src/functions/logs/create-one-log.ts

@@ -16,18 +16,24 @@ import {
 } from '../utils';
 
 export const makeCreateOneLog = (context: APIContext) => {
+	const templatePath = '/api/logging/{lowerCaseRawLogLevel}';
+
 	return async (level: LogLevel, message: string): Promise<void> => {
-		const templatePath = '/api/logging/{lowerCaseRawLogLevel}';
-		const lowerCaseRawLogLevel = toRawLogLevel(level).toLowerCase();
-		const url = buildURL(templatePath, { ...context, protocol: 'http', pathParams: { lowerCaseRawLogLevel } });
+		try {
+			const lowerCaseRawLogLevel = toRawLogLevel(level).toLowerCase();
+			const url = buildURL(templatePath, { ...context, protocol: 'http', pathParams: { lowerCaseRawLogLevel } });
 
-		const baseRequestOptions: HTTPRequestOptions = {
-			body: JSON.stringify({ Body: message }),
-		};
-		const req = buildHTTPRequestWithAuthFromContext(context, baseRequestOptions);
+			const baseRequestOptions: HTTPRequestOptions = {
+				body: JSON.stringify({ Body: message }),
+			};
+			const req = buildHTTPRequestWithAuthFromContext(context, baseRequestOptions);
 
-		const raw = await context.fetch(url, { ...req, method: 'POST' });
-		const success = await parseJSONResponse<boolean>(raw);
-		if (!success) throw Error(`Couldn't create the log`);
+			const raw = await context.fetch(url, { ...req, method: 'POST' });
+			const success = await parseJSONResponse<boolean>(raw);
+			if (!success) throw Error(`Couldn't create the log`);
+		} catch (err) {
+			if (err instanceof Error) throw err;
+			throw Error('Unknown error');
+		}
 	};
 };

src/services/kits/service.ts

@@ -55,7 +55,7 @@ export interface KitsService {
 			readonly all: () => Promise<Array<KitArchive>>;
 		};
 		readonly delete: {
-			readonly one: (archiveID: string) => Promise<boolean>;
+			readonly one: (archiveID: string) => Promise<void>;
 		};
 	};
 }