@testrigor/testrigor-cli 0.0.46-beta → 0.0.49-beta

package/dist/util/trtc.d.ts

@@ -1,2 +1 @@
-export declare const BINARY_NAME: string;
-export declare function download(dir: string): Promise<string | null>;
+export declare function download(dir: string): Promise<string>;

package/dist/util/trtc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.download = exports.BINARY_NAME = void 0;
+exports.download = void 0;
 const Fs = require("@supercharge/fs");
 const fs = require("fs");
 const node_fetch_commonjs_1 = require("node-fetch-commonjs");
@@ -28,7 +28,7 @@ const VERSION = "2.3.15";
 const WIN32_PLATFORM = "win32";
 const WIN32_BINARY = "trtc.exe";
 const UNIX_BINARY = "trtc";
-exports.BINARY_NAME = os.platform() === WIN32_PLATFORM ? WIN32_BINARY : UNIX_BINARY;
+const BINARY_NAME = os.platform() === WIN32_PLATFORM ? WIN32_BINARY : UNIX_BINARY;
 function getFolderName() {
     const platform = os.platform();
     const architecture = os.arch();
@@ -39,6 +39,13 @@ function getFolderName() {
     }
     throw new Error(`Unsupported platform ${platform} or architecture ${architecture}`);
 }
+// The Windows zip wraps its contents in a versioned top-level folder;
+// the tarballs are flat.
+function getBinaryPath(dir) {
+    return os.platform() === WIN32_PLATFORM
+        ? path.join(dir, getFolderName(), BINARY_NAME)
+        : path.join(dir, BINARY_NAME);
+}
 function getUrl() {
     const platform = os.platform();
     const architecture = os.arch();
@@ -53,7 +60,7 @@ async function extractZip(dir, stream) {
     return new Promise((resolve, reject) => {
         stream
             .pipe(unzip.Extract({ path: dir }))
-            .on("close", () => resolve(path.join(dir, getFolderName())))
+            .on("close", () => resolve(getBinaryPath(dir)))
             .on("error", reject);
     });
 }
@@ -92,7 +99,7 @@ async function extractTar(dir, stream) {
             stream.resume();
             stream.on("end", next);
         });
-        extract.on("finish", () => resolve(path.join(dir, getFolderName())));
+        extract.on("finish", () => resolve(getBinaryPath(dir)));
         stream.pipe(zlib.createGunzip()).pipe(extract);
     });
 }
@@ -105,7 +112,7 @@ async function download(dir) {
     if (stream == null) {
         throw new Error("unexpected null response body");
     }
-    if (os.platform() === "win32") {
+    if (os.platform() === WIN32_PLATFORM) {
         return extractZip(dir, stream);
     }
     return extractTar(dir, stream);

package/dist/util/tunnel.js

@@ -20,16 +20,14 @@ type = "http_proxy"`;
     await Fs.writeFile(configPath, newConfigContent);
     return configPath;
 }
-async function startTrtc(trtc, command, configPath) {
+async function startTrtc(trtc, configPath) {
     return new Promise((resolve, reject) => {
-        const binaryPath = path.join(path.dirname(trtc), command);
-        const workingDir = path.dirname(trtc);
-        if (!Fs.pathExistsSync(binaryPath)) {
-            reject(new Error(`Binary not found at ${binaryPath}`));
+        if (!Fs.pathExistsSync(trtc)) {
+            reject(new Error(`Binary not found at ${trtc}`));
             return;
         }
-        const tunnelProcess = childProcess.spawn(binaryPath, ["-c", configPath], {
-            cwd: workingDir,
+        const tunnelProcess = childProcess.spawn(trtc, ["-c", configPath], {
+            cwd: path.dirname(trtc),
         });
         tunnelProcess.stdout.on("data", (data) => {
             const dataString = data.toString();
@@ -68,21 +66,22 @@ class Tunnel {
         if (this.binaryPath == null) {
             throw new Error("Could not download the trtc binary");
         }
-        const command = trtc_1.BINARY_NAME;
+        let lastError;
         let maxTries = 40;
         while (maxTries > 0) {
             try {
                 this.port = randomPort(minPort, maxPort);
                 this.configPath = await updateConfig(this.binaryPath, this.port);
-                this.process = await startTrtc(this.binaryPath, command, this.configPath);
+                this.process = await startTrtc(this.binaryPath, this.configPath);
                 break;
             }
             catch (e) {
+                lastError = e;
                 maxTries--;
             }
         }
         if (maxTries === 0) {
-            throw new Error("Could not start trtc process");
+            throw new Error(`Could not start trtc process: ${lastError instanceof Error ? lastError.message : String(lastError)}`);
         }
         this.running = true;
     }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.46-beta",
+  "version": "0.0.49-beta",
   "commands": {
     "authenticate": {
       "id": "authenticate",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testrigor/testrigor-cli",
-  "version": "0.0.46-beta",
+  "version": "0.0.49-beta",
   "description": "TestRigor Command Line",
   "author": "Ivo Parun Rua @parunruaivo",
   "bin": {