Type fixes and imports

Author: shirish87

src/__tests__/local-cli.test.ts

@@ -1,7 +1,7 @@
 import { main } from "@/cli/browserstack-local.ts";
 import { env } from "@/env.ts";
 import { beforeAll, beforeEach, describe, expect, test } from "vitest";
-import { BrowserStackTestContext } from "./setup";
+import { BrowserStackTestContext } from "./setup.ts";
 
 describe("LocalCLI", () => {
   beforeAll(() => {

src/__tests__/local.test.ts

@@ -3,6 +3,7 @@ import { components } from "@/generated/openapi.ts";
 import { LocalTestingBinary } from "@/local-testing-binary.ts";
 import { unlink } from "node:fs/promises";
 import { join } from "node:path";
+import process from "node:process";
 import { beforeAll, describe, expect, expectTypeOf, test } from "vitest";
 import type { BrowserStackTestContext } from "./setup.ts";
 
@@ -59,4 +60,14 @@ describe("LocalClient", () => {
     // expect(data).toMatch(/successfully disconnected/i);
     expectTypeOf(data).toMatchTypeOf<string>();
   });
+
+  test.skip<BrowserStackTestContext>("downloadBinary-darwin-x64", async ({
+    localTesting: { client },
+  }) => {
+    const { content, filename } = await client.downloadBinary("darwin-x64");
+    expect(content).toBeDefined();
+    expect(content).toBeInstanceOf(Uint8Array);
+    expect(content.length).toBeGreaterThan(0);
+    expectTypeOf(filename).toMatchTypeOf<string>();
+  });
 }, 30_000);

src/__tests__/setup.ts

@@ -14,6 +14,7 @@ import {
 } from "@/local-testing-binary.ts";
 import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
+import process from "node:process";
 import { assert, beforeEach } from "vitest";
 
 export interface BrowserStackTestContext {

src/cli/browserstack-app-automate.ts

@@ -1,17 +1,18 @@
 #!/usr/bin/env node
 
-import { ensureKeyExists, ensureUsernameExists } from "@/cli/cli-utils";
-import { BrowserStackError } from "@/error";
-import { components } from "@/generated/openapi";
+import { ensureKeyExists, ensureUsernameExists } from "@/cli/cli-utils.ts";
+import { BrowserStackError } from "@/error.ts";
+import { components } from "@/generated/openapi.ts";
 import {
   AppAutomateClient,
   BrowserStackOptions,
   FlutterPlatform,
-} from "@/index";
+} from "@/index.ts";
 import { randomBytes } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { basename, resolve } from "node:path";
+import process from "node:process";
 
 const require = createRequire(import.meta.url);
 

src/cli/browserstack-local.ts

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
-
-import { env } from "@/env";
-import { BrowserStackError } from "@/error";
-import { ensureDirExists } from "@/fs-utils";
-import { BrowserStack, LocalTestingBinaryOptions } from "@/index.node";
-import { writeFileAtomic } from "@/write-file-atomic";
+import { env } from "@/env.ts";
+import { BrowserStackError } from "@/error.ts";
+import { ensureDirExists } from "@/fs-utils.ts";
+import { LocalTestingBinary, LocalTestingBinaryOptions } from "@/index.node.ts";
+import { BufferEncoding, writeFileAtomic } from "@/write-file-atomic.ts";
 import cp from "node:child_process";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
+import process from "node:process";
 import { onExit } from "signal-exit";
 
 const require = createRequire(import.meta.url);
@@ -44,10 +44,7 @@ async function start(
     statusPath
   );
 
-  const localTestingBinary = new BrowserStack.LocalTestingBinary({
-    ...options,
-  });
-
+  const localTestingBinary = new LocalTestingBinary(options);
   const localIdentifier = localTestingBinary.localIdentifier;
   let status: string | undefined;
 
@@ -79,7 +76,7 @@ async function stopInstance(
   options: Omit<LocalTestingBinaryOptions, "localIdentifier">,
   logger: Logger = globalThis.console
 ) {
-  const localTestingBinary = new BrowserStack.LocalTestingBinary({
+  const localTestingBinary = new LocalTestingBinary({
     ...options,
     localIdentifier,
   });
@@ -315,7 +312,7 @@ async function readOrCreateStatusFile(
 ): Promise<{ localIdentifiers: string[] } & Record<string, unknown>> {
   try {
     const contents = await readFile(statusPath, fileEncoding).then((data) =>
-      data.trim()
+      data.toString().trim()
     );
 
     if (contents.length) {
@@ -406,8 +403,9 @@ export async function main(
     const localIdentifier =
       resolveEnvLocalIdentifier() ??
       (args[1] === cmdSeparator ? undefined : args[1]);
-
-    const key = ensureKeyExists(args[2] === cmdSeparator ? undefined : args[2]);
+    const key = ensureKeyExists(
+      action === BrowserStackLocalAction.runWith ? undefined : args[2]
+    );
     const binHome = await ensureBinHomeExists();
     const statusPath = join(binHome, "status.json");
 

src/cli/cli-utils.ts

@@ -1,5 +1,5 @@
-import { env } from "@/env";
-import { BrowserStackError } from "@/error";
+import { env } from "@/env.ts";
+import { BrowserStackError } from "@/error.ts";
 
 /**
  * Ensures that a key exists and returns it.

src/fs-utils.ts

@@ -1,7 +1,8 @@
 import { currentArch, currentPlatform } from "@/env.ts";
 import { BrowserStackError } from "@/error.ts";
 import { operations } from "@/generated/openapi.ts";
-import { writeFileAtomic } from "@/write-file-atomic";
+import { writeFileAtomic } from "@/write-file-atomic.ts";
+import { Buffer } from "node:buffer";
 import { spawnSync } from "node:child_process";
 import {
   chmod,
@@ -12,6 +13,7 @@ import {
   unlink,
 } from "node:fs/promises";
 import { join, resolve } from "node:path";
+import process from "node:process";
 
 export async function binaryPath(
   binHome: string,

src/write-file-atomic.ts

@@ -10,12 +10,27 @@
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-import fs from "fs";
+import { Buffer } from "node:buffer";
 import { randomBytes } from "node:crypto";
+import fs from "node:fs";
 import path from "node:path";
+import process from "node:process";
 import { promisify } from "node:util";
 import { onExit } from "signal-exit";
 
+export type BufferEncoding =
+  | "ascii"
+  | "utf8"
+  | "utf-8"
+  | "utf16le"
+  | "ucs2"
+  | "ucs-2"
+  | "base64"
+  | "base64url"
+  | "latin1"
+  | "binary"
+  | "hex";
+
 interface ActiveFiles {
   [key: string]: (() => void)[];
 }