Change destroySession to string. Check if shared library exists. Dest…

…roy session immediately to prevent memory leaks when an error is thrown.
AzureFlow · Sep 9, 2023 · 57dbf80 · 57dbf80
1 parent a7212d8
commit 57dbf80
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/http_client/TLSClient.ts b/src/http_client/TLSClient.ts
@@ -12,6 +12,7 @@ import {
 } from "./types.js";
 import { execSync } from "child_process";
 import createDebugMessages from "debug";
+import { existsSync } from "fs";
 
 const debug = createDebugMessages("tls-client:client");
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -38,12 +39,18 @@ export default class TLSClient implements TLSClientInstance {
 		});
 	}
 
-	destroySession(payload: TLSClientReleaseSessionPayload): TLSClientReleaseSessionResponse {
+	destroySession(sessionId: string): TLSClientReleaseSessionResponse {
+		const payload: TLSClientReleaseSessionPayload = {
+			sessionId,
+		};
 		const resp = this.wrapper.destroySession(JSON.stringify(payload));
 		return JSON.parse(resp) as TLSClientReleaseSessionResponse;
 	}
 
-	async destroySessionAsync(payload: TLSClientReleaseSessionPayload): Promise<TLSClientReleaseSessionResponse> {
+	async destroySessionAsync(sessionId: string): Promise<TLSClientReleaseSessionResponse> {
+		const payload: TLSClientReleaseSessionPayload = {
+			sessionId,
+		};
 		return new Promise((resolve) => {
 			this.wrapper.destroySession.async(JSON.stringify(payload), (error: Error, response: string) => {
 				const clientResponse: TLSClientReleaseSessionResponse = JSON.parse(response);
@@ -98,9 +105,13 @@ const createWrapper = (libVersion: string): LibraryObject<never> => {
 		throw new Error("Invalid platform!");
 	}
 
-	debug(`Loading shared library: "${sharedLibraryFilename}"`);
+	const libFile = join(__dirname, "../../lib", sharedLibraryFilename);
+	debug(`Loading shared library: "${libFile}"`);
+	if (!existsSync(libFile)) {
+		throw new Error("Shared library not found!");
+	}
 
-	return Library(join(__dirname, "../../lib", sharedLibraryFilename), {
+	return Library(libFile, {
 		request: ["string", ["string"]],
 		getCookiesFromSession: ["string", ["string"]],
 		addCookiesToSession: ["string", ["string"]],

diff --git a/src/http_client/fetch_compat.ts b/src/http_client/fetch_compat.ts
@@ -59,6 +59,9 @@ export default async function fetch(url: string, init?: FetchInit): Promise<Resp
 	const resp = await tlsClient.requestAsync(payload);
 	debug("response: %O", resp);
 
+	// Free request
+	tlsClient.destroySession(sessionId);
+
 	// Return result
 	if (resp.status === 0) {
 		if (resp.body.includes("No connection could be made because the target machine actively refused it.")) {
@@ -85,11 +88,6 @@ export default async function fetch(url: string, init?: FetchInit): Promise<Resp
 		}
 	}
 
-	// Free request
-	tlsClient.destroySession({
-		sessionId: sessionId,
-	});
-
 	return new Response(resp.body, {
 		headers: headers,
 		status: resp.status,

diff --git a/src/http_client/types.ts b/src/http_client/types.ts
@@ -54,8 +54,8 @@ export interface TLSClientInstance {
 	getCookiesFromSessionAsync: (
 		payload: TLSClientFetchCookiesForSessionRequestPayload,
 	) => Promise<TLSClientFetchCookiesForSessionResponse>;
-	destroySession: (payload: TLSClientReleaseSessionPayload) => TLSClientReleaseSessionResponse;
-	destroySessionAsync: (payload: TLSClientReleaseSessionPayload) => Promise<TLSClientReleaseSessionResponse>;
+	destroySession: (sessionId: string) => TLSClientReleaseSessionResponse;
+	destroySessionAsync: (sessionId: string) => Promise<TLSClientReleaseSessionResponse>;
 }
 
 export interface TLSClientRequestPayload {