ogi-addon 3.0.0 → 4.0.0

package/build/extraction.cjs

@@ -0,0 +1,80 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_chunk = require('./chunk-C0xms8kb.cjs');
+let child_process = require("child_process");
+
+//#region src/extraction.ts
+const s7ZipPath = "C:\\Program Files\\7-Zip\\7z.exe";
+function waitForChildProcess(childProcess, errorMessage) {
+	return new Promise((resolve, reject) => {
+		childProcess.once("error", reject);
+		childProcess.once("close", (code) => {
+			if (code !== 0) {
+				reject(new Error(errorMessage));
+				return;
+			}
+			resolve();
+		});
+	});
+}
+async function detectUnrarType() {
+	const childProcess = (0, child_process.spawn)("unrar");
+	return await new Promise((resolve, reject) => {
+		let output = "";
+		const collectOutput = (data) => {
+			output += data.toString();
+		};
+		childProcess.stdout.on("data", collectOutput);
+		childProcess.stderr.on("data", collectOutput);
+		childProcess.once("error", reject);
+		childProcess.once("close", () => {
+			if (output.includes("unrar-free")) {
+				resolve("unrar-free");
+				return;
+			}
+			if (output.includes("unrar-nonfree")) {
+				resolve("unrar-nonfree");
+				return;
+			}
+			resolve("unknown");
+		});
+	});
+}
+async function extraction(filePath, outputDir) {
+	const lowerCaseFilePath = filePath.toLowerCase();
+	if (process.platform === "win32") return await waitForChildProcess((0, child_process.spawn)(s7ZipPath, [
+		"x",
+		filePath,
+		"-o",
+		outputDir
+	]), "Failed to extract file");
+	else if (process.platform === "linux" || process.platform === "darwin") {
+		if (lowerCaseFilePath.endsWith(".zip")) return await waitForChildProcess((0, child_process.spawn)("unzip", [
+			"-o",
+			filePath,
+			"-d",
+			outputDir
+		]), "Failed to unzip file");
+		else if (lowerCaseFilePath.endsWith(".rar")) {
+			const unrarType = await detectUnrarType();
+			if (unrarType === "unrar-free") return await waitForChildProcess((0, child_process.spawn)("unrar", [
+				"-f",
+				"-x",
+				filePath,
+				outputDir
+			]), "Failed to unrar file");
+			else if (unrarType === "unrar-nonfree") return await waitForChildProcess((0, child_process.spawn)("unrar", [
+				"-o",
+				filePath,
+				"-d",
+				outputDir
+			]), "Failed to unrar file");
+			else throw new Error("Unknown unrar type");
+		}
+		throw new Error(`Unsupported archive type: ${filePath}`);
+	}
+	throw new Error(`Unsupported platform: ${process.platform}`);
+}
+
+//#endregion
+exports.extraction = extraction;
+//# sourceMappingURL=extraction.cjs.map

package/build/extraction.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"extraction.cjs","names":[],"sources":["../src/extraction.ts"],"sourcesContent":["import { spawn } from 'child_process';\n\nconst s7ZipPath = 'C:\\\\Program Files\\\\7-Zip\\\\7z.exe';\n\nfunction waitForChildProcess(\n  childProcess: ReturnType<typeof spawn>,\n  errorMessage: string\n): Promise<void> {\n  return new Promise<void>((resolve, reject) => {\n    childProcess.once('error', reject);\n    childProcess.once('close', (code) => {\n      if (code !== 0) {\n        reject(new Error(errorMessage));\n        return;\n      }\n\n      resolve();\n    });\n  });\n}\n\nasync function detectUnrarType(): Promise<\n  'unrar-free' | 'unrar-nonfree' | 'unknown'\n> {\n  const childProcess = spawn('unrar');\n\n  return await new Promise((resolve, reject) => {\n    let output = '';\n\n    const collectOutput = (data: Buffer) => {\n      output += data.toString();\n    };\n\n    childProcess.stdout.on('data', collectOutput);\n    childProcess.stderr.on('data', collectOutput);\n    childProcess.once('error', reject);\n    childProcess.once('close', () => {\n      if (output.includes('unrar-free')) {\n        resolve('unrar-free');\n        return;\n      }\n\n      if (output.includes('unrar-nonfree')) {\n        resolve('unrar-nonfree');\n        return;\n      }\n\n      resolve('unknown');\n    });\n  });\n}\n\nexport async function extraction(filePath: string, outputDir: string) {\n  const lowerCaseFilePath = filePath.toLowerCase();\n\n  if (process.platform === 'win32') {\n    // expect 7zip to be installed, and use 7zip to unrar\n    const childProcess = spawn(s7ZipPath, ['x', filePath, '-o', outputDir]);\n    return await waitForChildProcess(childProcess, 'Failed to extract file');\n  } else if (process.platform === 'linux' || process.platform === 'darwin') {\n    if (lowerCaseFilePath.endsWith('.zip')) {\n      // expect unzip to be installed, and use unzip to unzip\n      const childProcess = spawn('unzip', ['-o', filePath, '-d', outputDir]);\n      return await waitForChildProcess(childProcess, 'Failed to unzip file');\n    } else if (lowerCaseFilePath.endsWith('.rar')) {\n      // check if unrar-nonfree is installed or unrar is installed\n      const unrarType = await detectUnrarType();\n\n      // now use the according unrar version to unrar\n      if (unrarType === 'unrar-free') {\n        // use unrar-free to unrar\n        const childProcess = spawn('unrar', ['-f', '-x', filePath, outputDir]);\n        return await waitForChildProcess(childProcess, 'Failed to unrar file');\n      } else if (unrarType === 'unrar-nonfree') {\n        // use unrar-nonfree to unrar\n        const childProcess = spawn('unrar', ['-o', filePath, '-d', outputDir]);\n        return await waitForChildProcess(childProcess, 'Failed to unrar file');\n      } else {\n        throw new Error('Unknown unrar type');\n      }\n    }\n\n    throw new Error(`Unsupported archive type: ${filePath}`);\n  }\n\n  throw new Error(`Unsupported platform: ${process.platform}`);\n}\n"],"mappings":";;;;;AAEA,MAAM,YAAY;AAElB,SAAS,oBACP,cACA,cACe;AACf,QAAO,IAAI,SAAe,SAAS,WAAW;AAC5C,eAAa,KAAK,SAAS,OAAO;AAClC,eAAa,KAAK,UAAU,SAAS;AACnC,OAAI,SAAS,GAAG;AACd,WAAO,IAAI,MAAM,aAAa,CAAC;AAC/B;;AAGF,YAAS;IACT;GACF;;AAGJ,eAAe,kBAEb;CACA,MAAM,wCAAqB,QAAQ;AAEnC,QAAO,MAAM,IAAI,SAAS,SAAS,WAAW;EAC5C,IAAI,SAAS;EAEb,MAAM,iBAAiB,SAAiB;AACtC,aAAU,KAAK,UAAU;;AAG3B,eAAa,OAAO,GAAG,QAAQ,cAAc;AAC7C,eAAa,OAAO,GAAG,QAAQ,cAAc;AAC7C,eAAa,KAAK,SAAS,OAAO;AAClC,eAAa,KAAK,eAAe;AAC/B,OAAI,OAAO,SAAS,aAAa,EAAE;AACjC,YAAQ,aAAa;AACrB;;AAGF,OAAI,OAAO,SAAS,gBAAgB,EAAE;AACpC,YAAQ,gBAAgB;AACxB;;AAGF,WAAQ,UAAU;IAClB;GACF;;AAGJ,eAAsB,WAAW,UAAkB,WAAmB;CACpE,MAAM,oBAAoB,SAAS,aAAa;AAEhD,KAAI,QAAQ,aAAa,QAGvB,QAAO,MAAM,6CADc,WAAW;EAAC;EAAK;EAAU;EAAM;EAAU,CAAC,EACxB,yBAAyB;UAC/D,QAAQ,aAAa,WAAW,QAAQ,aAAa,UAAU;AACxE,MAAI,kBAAkB,SAAS,OAAO,CAGpC,QAAO,MAAM,6CADc,SAAS;GAAC;GAAM;GAAU;GAAM;GAAU,CAAC,EACvB,uBAAuB;WAC7D,kBAAkB,SAAS,OAAO,EAAE;GAE7C,MAAM,YAAY,MAAM,iBAAiB;AAGzC,OAAI,cAAc,aAGhB,QAAO,MAAM,6CADc,SAAS;IAAC;IAAM;IAAM;IAAU;IAAU,CAAC,EACvB,uBAAuB;YAC7D,cAAc,gBAGvB,QAAO,MAAM,6CADc,SAAS;IAAC;IAAM;IAAU;IAAM;IAAU,CAAC,EACvB,uBAAuB;OAEtE,OAAM,IAAI,MAAM,qBAAqB;;AAIzC,QAAM,IAAI,MAAM,6BAA6B,WAAW;;AAG1D,OAAM,IAAI,MAAM,yBAAyB,QAAQ,WAAW"}

package/build/extraction.d.cts

@@ -0,0 +1,5 @@
+//#region src/extraction.d.ts
+declare function extraction(filePath: string, outputDir: string): Promise<void>;
+//#endregion
+export { extraction };
+//# sourceMappingURL=extraction.d.cts.map

package/build/extraction.d.mts

@@ -0,0 +1,5 @@
+//#region src/extraction.d.ts
+declare function extraction(filePath: string, outputDir: string): Promise<void>;
+//#endregion
+export { extraction };
+//# sourceMappingURL=extraction.d.mts.map

package/build/extraction.mjs

@@ -0,0 +1,78 @@
+import { spawn } from "child_process";
+
+//#region src/extraction.ts
+const s7ZipPath = "C:\\Program Files\\7-Zip\\7z.exe";
+function waitForChildProcess(childProcess, errorMessage) {
+	return new Promise((resolve, reject) => {
+		childProcess.once("error", reject);
+		childProcess.once("close", (code) => {
+			if (code !== 0) {
+				reject(new Error(errorMessage));
+				return;
+			}
+			resolve();
+		});
+	});
+}
+async function detectUnrarType() {
+	const childProcess = spawn("unrar");
+	return await new Promise((resolve, reject) => {
+		let output = "";
+		const collectOutput = (data) => {
+			output += data.toString();
+		};
+		childProcess.stdout.on("data", collectOutput);
+		childProcess.stderr.on("data", collectOutput);
+		childProcess.once("error", reject);
+		childProcess.once("close", () => {
+			if (output.includes("unrar-free")) {
+				resolve("unrar-free");
+				return;
+			}
+			if (output.includes("unrar-nonfree")) {
+				resolve("unrar-nonfree");
+				return;
+			}
+			resolve("unknown");
+		});
+	});
+}
+async function extraction(filePath, outputDir) {
+	const lowerCaseFilePath = filePath.toLowerCase();
+	if (process.platform === "win32") return await waitForChildProcess(spawn(s7ZipPath, [
+		"x",
+		filePath,
+		"-o",
+		outputDir
+	]), "Failed to extract file");
+	else if (process.platform === "linux" || process.platform === "darwin") {
+		if (lowerCaseFilePath.endsWith(".zip")) return await waitForChildProcess(spawn("unzip", [
+			"-o",
+			filePath,
+			"-d",
+			outputDir
+		]), "Failed to unzip file");
+		else if (lowerCaseFilePath.endsWith(".rar")) {
+			const unrarType = await detectUnrarType();
+			if (unrarType === "unrar-free") return await waitForChildProcess(spawn("unrar", [
+				"-f",
+				"-x",
+				filePath,
+				outputDir
+			]), "Failed to unrar file");
+			else if (unrarType === "unrar-nonfree") return await waitForChildProcess(spawn("unrar", [
+				"-o",
+				filePath,
+				"-d",
+				outputDir
+			]), "Failed to unrar file");
+			else throw new Error("Unknown unrar type");
+		}
+		throw new Error(`Unsupported archive type: ${filePath}`);
+	}
+	throw new Error(`Unsupported platform: ${process.platform}`);
+}
+
+//#endregion
+export { extraction };
+//# sourceMappingURL=extraction.mjs.map

package/build/extraction.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"extraction.mjs","names":[],"sources":["../src/extraction.ts"],"sourcesContent":["import { spawn } from 'child_process';\n\nconst s7ZipPath = 'C:\\\\Program Files\\\\7-Zip\\\\7z.exe';\n\nfunction waitForChildProcess(\n  childProcess: ReturnType<typeof spawn>,\n  errorMessage: string\n): Promise<void> {\n  return new Promise<void>((resolve, reject) => {\n    childProcess.once('error', reject);\n    childProcess.once('close', (code) => {\n      if (code !== 0) {\n        reject(new Error(errorMessage));\n        return;\n      }\n\n      resolve();\n    });\n  });\n}\n\nasync function detectUnrarType(): Promise<\n  'unrar-free' | 'unrar-nonfree' | 'unknown'\n> {\n  const childProcess = spawn('unrar');\n\n  return await new Promise((resolve, reject) => {\n    let output = '';\n\n    const collectOutput = (data: Buffer) => {\n      output += data.toString();\n    };\n\n    childProcess.stdout.on('data', collectOutput);\n    childProcess.stderr.on('data', collectOutput);\n    childProcess.once('error', reject);\n    childProcess.once('close', () => {\n      if (output.includes('unrar-free')) {\n        resolve('unrar-free');\n        return;\n      }\n\n      if (output.includes('unrar-nonfree')) {\n        resolve('unrar-nonfree');\n        return;\n      }\n\n      resolve('unknown');\n    });\n  });\n}\n\nexport async function extraction(filePath: string, outputDir: string) {\n  const lowerCaseFilePath = filePath.toLowerCase();\n\n  if (process.platform === 'win32') {\n    // expect 7zip to be installed, and use 7zip to unrar\n    const childProcess = spawn(s7ZipPath, ['x', filePath, '-o', outputDir]);\n    return await waitForChildProcess(childProcess, 'Failed to extract file');\n  } else if (process.platform === 'linux' || process.platform === 'darwin') {\n    if (lowerCaseFilePath.endsWith('.zip')) {\n      // expect unzip to be installed, and use unzip to unzip\n      const childProcess = spawn('unzip', ['-o', filePath, '-d', outputDir]);\n      return await waitForChildProcess(childProcess, 'Failed to unzip file');\n    } else if (lowerCaseFilePath.endsWith('.rar')) {\n      // check if unrar-nonfree is installed or unrar is installed\n      const unrarType = await detectUnrarType();\n\n      // now use the according unrar version to unrar\n      if (unrarType === 'unrar-free') {\n        // use unrar-free to unrar\n        const childProcess = spawn('unrar', ['-f', '-x', filePath, outputDir]);\n        return await waitForChildProcess(childProcess, 'Failed to unrar file');\n      } else if (unrarType === 'unrar-nonfree') {\n        // use unrar-nonfree to unrar\n        const childProcess = spawn('unrar', ['-o', filePath, '-d', outputDir]);\n        return await waitForChildProcess(childProcess, 'Failed to unrar file');\n      } else {\n        throw new Error('Unknown unrar type');\n      }\n    }\n\n    throw new Error(`Unsupported archive type: ${filePath}`);\n  }\n\n  throw new Error(`Unsupported platform: ${process.platform}`);\n}\n"],"mappings":";;;AAEA,MAAM,YAAY;AAElB,SAAS,oBACP,cACA,cACe;AACf,QAAO,IAAI,SAAe,SAAS,WAAW;AAC5C,eAAa,KAAK,SAAS,OAAO;AAClC,eAAa,KAAK,UAAU,SAAS;AACnC,OAAI,SAAS,GAAG;AACd,WAAO,IAAI,MAAM,aAAa,CAAC;AAC/B;;AAGF,YAAS;IACT;GACF;;AAGJ,eAAe,kBAEb;CACA,MAAM,eAAe,MAAM,QAAQ;AAEnC,QAAO,MAAM,IAAI,SAAS,SAAS,WAAW;EAC5C,IAAI,SAAS;EAEb,MAAM,iBAAiB,SAAiB;AACtC,aAAU,KAAK,UAAU;;AAG3B,eAAa,OAAO,GAAG,QAAQ,cAAc;AAC7C,eAAa,OAAO,GAAG,QAAQ,cAAc;AAC7C,eAAa,KAAK,SAAS,OAAO;AAClC,eAAa,KAAK,eAAe;AAC/B,OAAI,OAAO,SAAS,aAAa,EAAE;AACjC,YAAQ,aAAa;AACrB;;AAGF,OAAI,OAAO,SAAS,gBAAgB,EAAE;AACpC,YAAQ,gBAAgB;AACxB;;AAGF,WAAQ,UAAU;IAClB;GACF;;AAGJ,eAAsB,WAAW,UAAkB,WAAmB;CACpE,MAAM,oBAAoB,SAAS,aAAa;AAEhD,KAAI,QAAQ,aAAa,QAGvB,QAAO,MAAM,oBADQ,MAAM,WAAW;EAAC;EAAK;EAAU;EAAM;EAAU,CAAC,EACxB,yBAAyB;UAC/D,QAAQ,aAAa,WAAW,QAAQ,aAAa,UAAU;AACxE,MAAI,kBAAkB,SAAS,OAAO,CAGpC,QAAO,MAAM,oBADQ,MAAM,SAAS;GAAC;GAAM;GAAU;GAAM;GAAU,CAAC,EACvB,uBAAuB;WAC7D,kBAAkB,SAAS,OAAO,EAAE;GAE7C,MAAM,YAAY,MAAM,iBAAiB;AAGzC,OAAI,cAAc,aAGhB,QAAO,MAAM,oBADQ,MAAM,SAAS;IAAC;IAAM;IAAM;IAAU;IAAU,CAAC,EACvB,uBAAuB;YAC7D,cAAc,gBAGvB,QAAO,MAAM,oBADQ,MAAM,SAAS;IAAC;IAAM;IAAU;IAAM;IAAU,CAAC,EACvB,uBAAuB;OAEtE,OAAM,IAAI,MAAM,qBAAqB;;AAIzC,QAAM,IAAI,MAAM,6BAA6B,WAAW;;AAG1D,OAAM,IAAI,MAAM,yBAAyB,QAAQ,WAAW"}

package/build/main.cjs

@@ -1,21 +1,18 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
 const require_chunk = require('./chunk-C0xms8kb.cjs');
 const require_EventResponse = require('./EventResponse.cjs');
+const require_extraction = require('./extraction.cjs');
 const require_config_ConfigurationBuilder = require('./config/ConfigurationBuilder.cjs');
 const require_config_Configuration = require('./config/Configuration.cjs');
-let ws = require("ws");
-ws = require_chunk.__toESM(ws);
+let _ogi_sdk_connect = require("@ogi-sdk/connect");
 let node_events = require("node:events");
 node_events = require_chunk.__toESM(node_events);
 let zod = require("zod");
 let fuse_js = require("fuse.js");
 fuse_js = require_chunk.__toESM(fuse_js);
-let node_child_process = require("node:child_process");
-let node_fs = require("node:fs");
-node_fs = require_chunk.__toESM(node_fs);
 
 //#region package.json
-var version = "3.0.0";
+var version = "4.0.0";
 
 //#endregion
 //#region src/main.ts
@@ -50,8 +47,8 @@ var OGIAddon = class {
 	}
 	/**
 	* Register an event listener for the addon. (See EventListenerTypes)
-	* @param event {OGIAddonEvent}
-	* @param listener {EventListenerTypes[OGIAddonEvent]}
+	* @param event {OGIAddonSDKEventListener}
+	* @param listener {EventListenerTypes[OGIAddonSDKEventListener]}
 	*/
 	on(event, listener) {
 		this.eventEmitter.on(event, listener);
@@ -83,18 +80,16 @@ var OGIAddon = class {
 	* @returns {Promise<StoreData>}
 	*/
 	async getAppDetails(appID, storefront) {
-		const id = this.addonWSListener.send("get-app-details", {
+		return await this.addonWSListener.requestResponse("get-app-details", {
 			appID,
 			storefront
 		});
-		return await this.addonWSListener.waitForResponseFromServer(id);
 	}
 	async searchGame(query, storefront) {
-		const id = this.addonWSListener.send("search-app-name", {
+		return await this.addonWSListener.requestResponse("search-app-name", {
 			query,
 			storefront
 		});
-		return await this.addonWSListener.waitForResponseFromServer(id);
 	}
 	/**
 	* Notify the OGI Addon Server that you are performing a background task. This can be used to help users understand what is happening in the background.
@@ -152,83 +147,10 @@ var OGIAddon = class {
 	* Extract a file using 7-Zip on Windows, unzip on Linux/Mac.
 	* @param path {string}
 	* @param outputPath {string}
-	* @param type {'unrar' | 'unzip'}
 	* @returns {Promise<void>}
 	*/
-	async extractFile(path, outputPath, type) {
-		return new Promise((resolve, reject) => {
-			if (!node_fs.default.existsSync(outputPath)) node_fs.default.mkdirSync(outputPath, { recursive: true });
-			if (type === "unzip") if (process.platform === "win32") (0, node_child_process.exec)(`"C:\\Program Files\\7-Zip\\7z.exe" x "${path}" -o"${outputPath}"`, (err, stdout, stderr) => {
-				if (err) {
-					console.error(err);
-					console.log(stderr);
-					reject(/* @__PURE__ */ new Error("Failed to extract ZIP file"));
-					return;
-				}
-				console.log(stdout);
-				console.log(stderr);
-				resolve();
-			});
-			else {
-				const unzipProcess = (0, node_child_process.spawn)("unzip", [
-					"-o",
-					path,
-					"-d",
-					outputPath
-				], { env: {
-					...process.env,
-					UNZIP_DISABLE_ZIPBOMB_DETECTION: "TRUE"
-				} });
-				unzipProcess.stdout.on("data", (data) => {
-					console.log(`[unzip stdout]: ${data}`);
-				});
-				unzipProcess.stderr.on("data", (data) => {
-					console.error(`[unzip stderr]: ${data}`);
-				});
-				unzipProcess.on("close", (code) => {
-					if (code !== 0) {
-						console.error(`unzip process exited with code ${code}`);
-						reject(/* @__PURE__ */ new Error("Failed to extract ZIP file"));
-						return;
-					}
-					resolve();
-				});
-			}
-			else if (type === "unrar") if (process.platform === "win32") (0, node_child_process.exec)(`"C:\\Program Files\\7-Zip\\7z.exe" x "${path}" -o"${outputPath}"`, (err, stdout, stderr) => {
-				if (err) {
-					console.error(err);
-					console.log(stderr);
-					reject(/* @__PURE__ */ new Error("Failed to extract RAR file"));
-					return;
-				}
-				console.log(stdout);
-				console.log(stderr);
-				resolve();
-			});
-			else {
-				const unrarProcess = (0, node_child_process.spawn)("unrar", [
-					"x",
-					"-y",
-					path,
-					outputPath
-				]);
-				unrarProcess.stdout.on("data", (data) => {
-					console.log(`[unrar stdout]: ${data}`);
-				});
-				unrarProcess.stderr.on("data", (data) => {
-					console.error(`[unrar stderr]: ${data}`);
-				});
-				unrarProcess.on("close", (code) => {
-					if (code !== 0) {
-						console.error(`unrar process exited with code ${code}`);
-						reject(/* @__PURE__ */ new Error("Failed to extract RAR file"));
-						return;
-					}
-					resolve();
-				});
-			}
-			else reject(/* @__PURE__ */ new Error("Unknown extraction type"));
-		});
+	async extractFile(path, outputPath) {
+		return await require_extraction.extraction(path, outputPath);
 	}
 };
 /**
@@ -385,81 +307,86 @@ const ZodLibraryInfo = zod.z.object({
 });
 var OGIAddonWSListener = class {
 	socket;
+	transport;
 	eventEmitter;
 	addon;
 	constructor(ogiAddon, eventEmitter) {
-		if (process.argv[process.argv.length - 1].split("=")[0] !== "--addonSecret") throw new Error("No secret provided. This usually happens because the addon was not started by the OGI Addon Server.");
+		const secret = process.argv.find((arg) => arg.startsWith("--addonSecret="))?.split("=")[1];
+		if (!secret) throw new Error("No secret provided. This usually happens because the addon was not started by the OGI Addon Server.");
+		let port = process.argv.find((arg) => arg.startsWith("--addonPort="))?.split("=")[1];
+		if (!port) port = defaultPort.toString();
 		this.addon = ogiAddon;
 		this.eventEmitter = eventEmitter;
-		this.socket = new ws.default("ws://localhost:" + defaultPort);
-		this.socket.on("open", () => {
+		const WebSocketConstructor = globalThis.WebSocket;
+		if (!WebSocketConstructor) throw new Error("WebSocket is not available in this runtime");
+		this.socket = new WebSocketConstructor("ws://localhost:" + port);
+		this.transport = new _ogi_sdk_connect.EventResponseSocket(this.socket);
+		this.socket.addEventListener("open", () => {
 			console.log("Connected to OGI Addon Server");
 			console.log("OGI Addon Server Version:", VERSION);
 			this.send("authenticate", {
 				...this.addon.addonInfo,
-				secret: process.argv[process.argv.length - 1].split("=")[1],
+				secret,
 				ogiVersion: VERSION
 			});
 			let configBuilder = new require_config_ConfigurationBuilder.ConfigurationBuilder();
 			this.eventEmitter.emit("configure", configBuilder);
 			this.send("configure", configBuilder.build(false));
 			this.addon.config = new require_config_Configuration.Configuration(configBuilder.build(true));
-			const configListener = (event) => {
-				if (event === void 0) return;
-				let data;
-				if (typeof event === "string") data = event;
-				else if (event instanceof Buffer) data = event.toString();
-				else if (event && typeof event.data === "string") data = event.data;
-				else if (event && event.data instanceof Buffer) data = event.data.toString();
-				else data = event.toString();
-				if (JSON.parse(data).event === "config-update") {
-					console.log("Config update received");
-					this.socket.off("message", configListener);
-					this.eventEmitter.emit("connect", new require_EventResponse((screen, name, description) => {
-						return this.userInputAsked(screen, name, description, this.socket);
-					}));
-				}
-			};
-			this.socket.on("message", configListener);
+			const unsubscribeConfigListener = this.transport.on("config-update", () => {
+				console.log("Config update received");
+				unsubscribeConfigListener();
+				this.eventEmitter.emit("connect", new require_EventResponse((screen, name, description) => {
+					return this.userInputAsked(screen, name, description);
+				}));
+			});
 		});
-		this.socket.on("error", (error) => {
-			if (error.message.includes("Failed to connect")) throw new Error("OGI Addon Server is not running/is unreachable. Please start the server and try again.");
-			console.error("An error occurred:", error);
+		this.socket.addEventListener("error", (event) => {
+			this.transport.rejectPendingResponses("Websocket error");
+			if ((event instanceof ErrorEvent ? event.message : event.type).includes("Failed to connect")) throw new Error("OGI Addon Server is not running/is unreachable. Please start the server and try again.");
+			console.error("An error occurred:", event);
 		});
-		this.socket.on("close", (code, reason) => {
-			if (code === 1008) {
-				console.error("Authentication failed:", reason);
+		this.socket.addEventListener("close", (event) => {
+			this.transport.rejectPendingResponses("Websocket closed");
+			if (event.code === 1008) {
+				console.error("Authentication failed:", event.reason);
 				return;
 			}
-			this.eventEmitter.emit("disconnect", reason);
+			this.eventEmitter.emit("disconnect", event.reason);
 			console.log("Disconnected from OGI Addon Server");
-			console.error(reason.toString());
+			console.error(event.reason);
 			this.eventEmitter.emit("exit");
 			this.socket.close();
 		});
 		this.registerMessageReceiver();
 	}
-	async userInputAsked(configBuilt, name, description, socket) {
+	async userInputAsked(configBuilt, name, description) {
 		const config = configBuilt.build(false);
-		const id = Math.random().toString(36).substring(7);
-		if (!socket) throw new Error("Socket is not connected");
-		socket.send(JSON.stringify({
+		return (await this.transport.send({
 			event: "input-asked",
 			args: {
 				config,
 				name,
 				description
-			},
-			id
-		}));
-		return await this.waitForResponseFromServer(id);
+			}
+		}, { expectResponse: true })).args;
 	}
 	/**
 	* Registers the message receiver for the socket. This is used to receive messages from the server and handle them.
 	*/
 	registerMessageReceiver() {
-		this.socket.on("message", async (data) => {
-			const message = JSON.parse(data);
+		for (const event of [
+			"config-update",
+			"search",
+			"setup",
+			"library-search",
+			"game-details",
+			"check-for-updates",
+			"request-dl",
+			"catalog",
+			"task-run",
+			"launch-app"
+		]) this.transport.on(event, async (message) => {
 			switch (message.event) {
 				case "config-update":
 					const result = this.addon.config.updateConfig(message.args);
@@ -473,7 +400,7 @@ var OGIAddonWSListener = class {
 					await this.handleEventWithResponse(message, (event) => this.eventEmitter.emit("search", message.args, event));
 					break;
 				case "setup": {
-					let setupEvent = new require_EventResponse((screen, name, description) => this.userInputAsked(screen, name, description, this.socket));
+					let setupEvent = new require_EventResponse((screen, name, description) => this.userInputAsked(screen, name, description));
 					this.eventEmitter.emit("setup", message.args, setupEvent);
 					const interval = setInterval(() => {
 						if (setupEvent.resolved) {
@@ -482,7 +409,7 @@ var OGIAddonWSListener = class {
 						}
 						this.send("defer-update", {
 							logs: setupEvent.logs,
-							deferID: message.args.deferID,
+							deferID: message.args,
 							progress: setupEvent.progress,
 							failed: setupEvent.failed
 						});
@@ -504,12 +431,13 @@ var OGIAddonWSListener = class {
 					await this.handleEventWithResponse(message, (event) => this.eventEmitter.emit("check-for-updates", message.args, event));
 					break;
 				case "request-dl":
-					let requestDLEvent = new require_EventResponse((screen, name, description) => this.userInputAsked(screen, name, description, this.socket));
+					let requestDLEvent = new require_EventResponse((screen, name, description) => this.userInputAsked(screen, name, description));
 					if (this.eventEmitter.listenerCount("request-dl") === 0) {
 						this.respondToMessage(message.id, { error: "No event listener for request-dl" }, requestDLEvent);
 						break;
 					}
-					this.eventEmitter.emit("request-dl", message.args.appID, message.args.info, requestDLEvent);
+					const { appID, info } = message.args;
+					this.eventEmitter.emit("request-dl", appID, info, requestDLEvent);
 					const requestDLResult = await this.waitForEventToRespond(requestDLEvent);
 					if (requestDLEvent.failed) {
 						this.respondToMessage(message.id, void 0, requestDLEvent);
@@ -522,34 +450,36 @@ var OGIAddonWSListener = class {
 					await this.handleEventWithResponseNoInput(message, (event) => this.eventEmitter.emit("catalog", event));
 					break;
 				case "task-run": {
-					let taskRunEvent = new require_EventResponse((screen, name, description) => this.userInputAsked(screen, name, description, this.socket));
-					const taskName = message.args.taskName && typeof message.args.taskName === "string" ? message.args.taskName : message.args.manifest && typeof message.args.manifest === "object" ? message.args.manifest.__taskName : void 0;
+					let taskRunEvent = new require_EventResponse((screen, name, description) => this.userInputAsked(screen, name, description));
+					const args = message.args;
+					const taskName = args.taskName && typeof args.taskName === "string" ? args.taskName : args.manifest && typeof args.manifest === "object" ? args.manifest.__taskName : void 0;
 					if (taskName && typeof taskName === "string" && this.addon.hasTaskHandler(taskName)) {
 						const handler = this.addon.getTaskHandler(taskName);
 						const task = new Task(taskRunEvent);
+						const interval = setInterval(() => {
+							if (taskRunEvent.resolved) {
+								clearInterval(interval);
+								return;
+							}
+							this.send("defer-update", {
+								logs: taskRunEvent.logs,
+								deferID: args.deferID ?? "",
+								progress: taskRunEvent.progress,
+								failed: taskRunEvent.failed
+							});
+						}, 100);
 						try {
-							const interval = setInterval(() => {
-								if (taskRunEvent.resolved) {
-									clearInterval(interval);
-									return;
-								}
-								this.send("defer-update", {
-									logs: taskRunEvent.logs,
-									deferID: message.args.deferID,
-									progress: taskRunEvent.progress,
-									failed: taskRunEvent.failed
-								});
-							}, 100);
 							const result = handler(task, {
-								manifest: message.args.manifest || {},
-								downloadPath: message.args.downloadPath || "",
-								name: message.args.name || "",
-								libraryInfo: message.args.libraryInfo
+								manifest: args.manifest || {},
+								downloadPath: args.downloadPath || "",
+								name: args.name || "",
+								libraryInfo: args.libraryInfo
 							});
 							if (result instanceof Promise) await result;
-							clearInterval(interval);
 						} catch (error) {
 							taskRunEvent.fail(error instanceof Error ? error.message : String(error));
+						} finally {
+							clearInterval(interval);
 						}
 					} else taskRunEvent.fail(taskName ? `No task handler registered for task name: ${taskName}` : "No task name provided");
 					const taskRunResult = await this.waitForEventToRespond(taskRunEvent);
@@ -588,7 +518,7 @@ var OGIAddonWSListener = class {
 	* If options.requireListener is set and that event has no listeners, responds with options.noListenerError and returns.
 	*/
 	async handleEventWithResponse(message, emit, options) {
-		const event = new require_EventResponse((screen, name, description) => this.userInputAsked(screen, name, description, this.socket));
+		const event = new require_EventResponse((screen, name, description) => this.userInputAsked(screen, name, description));
 		if (options && this.eventEmitter.listenerCount(options.requireListener) === 0) {
 			this.respondToMessage(message.id, { error: options.noListenerError }, event);
 			return;
@@ -607,36 +537,27 @@ var OGIAddonWSListener = class {
 		this.respondToMessage(message.id, result.data, event);
 	}
 	respondToMessage(messageID, response, originalEvent) {
-		this.socket.send(JSON.stringify({
+		this.transport.send({
 			event: "response",
 			id: messageID,
 			args: response,
 			statusError: originalEvent ? originalEvent.failed : void 0
-		}));
+		}, { expectResponse: false });
 		console.log("dispatched response to " + messageID);
 	}
-	waitForResponseFromServer(messageID) {
-		return new Promise((resolve) => {
-			const waiter = (data) => {
-				const message = JSON.parse(data);
-				if (message.event !== "response") {
-					this.socket.once("message", waiter);
-					return;
-				}
-				console.log("received response from " + messageID);
-				if (message.id === messageID) resolve(message.args);
-				else this.socket.once("message", waiter);
-			};
-			this.socket.once("message", waiter);
-		});
+	async requestResponse(event, args) {
+		return (await this.transport.send({
+			event,
+			args
+		}, { expectResponse: true })).args;
 	}
 	send(event, args) {
-		const id = Math.random().toString(36).substring(7);
-		this.socket.send(JSON.stringify({
+		const id = (0, _ogi_sdk_connect.randomMessageId)();
+		this.transport.send({
 			event,
 			args,
 			id
-		}));
+		}, { expectResponse: false });
 		return id;
 	}
 	close() {
@@ -653,4 +574,5 @@ exports.Task = Task;
 exports.VERSION = VERSION;
 exports.ZodLibraryInfo = ZodLibraryInfo;
 exports.default = OGIAddon;
+exports.extraction = require_extraction.extraction;
 //# sourceMappingURL=main.cjs.map