@tscircuit/cli 0.0.62 → 0.0.63

package/lib/cmd-fns/dev/fulfill-export-requests.ts

@@ -0,0 +1,56 @@
+import { AppContext } from "../../util/app-context"
+import kleur from "kleur"
+import { exportGerbersToZipBuffer } from "lib/export-gerbers"
+import { AxiosInstance } from "axios"
+
+export const fulfillExportRequests = async (
+  {
+    dev_server_axios,
+  }: {
+    dev_server_axios: AxiosInstance
+  },
+  ctx: AppContext
+) => {
+  const export_requests = await dev_server_axios
+    .post("/api/export_requests/list", {
+      is_complete: false,
+    })
+    .then((r) => r.data.export_requests)
+
+  for (const export_request of export_requests) {
+    console.log(kleur.gray(`Fulfilling export request ${export_request.id}`))
+    console.log(
+      kleur.gray(`  example_file_path: ${export_request.example_file_path}`)
+    )
+
+    console.log(kleur.gray(`\n  exporting gerbers...`))
+    const zip_buffer = await exportGerbersToZipBuffer(
+      {
+        example_file_path: export_request.example_file_path,
+        export_name: export_request.export_name,
+      },
+      ctx
+    )
+
+    console.log(
+      kleur.gray(
+        `  uploading zip "${export_request.export_parameters.gerbers_zip_file_name}" to dev server...`
+      )
+    )
+
+    await dev_server_axios.post("/api/export_files/create", {
+      file_content_base64: zip_buffer.toString("base64"),
+      file_name: export_request.export_parameters.gerbers_zip_file_name,
+      export_request_id: export_request.export_request_id,
+    })
+
+    console.log(kleur.gray(`  marking export request as complete...`))
+
+    await dev_server_axios.post("/api/export_requests/update", {
+      export_request_id: export_request.export_request_id,
+      is_complete: true,
+    })
+
+    console.log(kleur.green(`  done`))
+  }
+}

package/lib/cmd-fns/dev/index.ts

@@ -12,6 +12,7 @@ import { startFsWatcher } from "./start-fs-watcher"
 import { createOrModifyNpmrc } from "../init/create-or-modify-npmrc"
 import { checkIfInitialized } from "./check-if-initialized"
 import { initCmd } from "../init"
+import { startExportRequestWatcher } from "./start-export-request-watcher"
 
 export const devCmd = async (ctx: AppContext, args: any) => {
   const params = z
@@ -74,7 +75,8 @@ export const devCmd = async (ctx: AppContext, args: any) => {
   await uploadExamplesFromDirectory({ devServerAxios, cwd }, ctx)
 
   // Start watcher
-  const watcher = await startFsWatcher({ cwd, devServerAxios }, ctx)
+  const fs_watcher = await startFsWatcher({ cwd, devServerAxios }, ctx)
+  const er_watcher = await startExportRequestWatcher({ devServerAxios }, ctx)
 
   while (true) {
     const { action } = await prompts({
@@ -97,7 +99,8 @@ export const devCmd = async (ctx: AppContext, args: any) => {
     } else if (!action || action === "stop") {
       if (server.stop) server.stop()
       if (server.close) server.close()
-      watcher.stop()
+      fs_watcher.stop()
+      er_watcher.stop()
       break
     }
   }

package/lib/cmd-fns/dev/start-export-request-watcher.ts

@@ -0,0 +1,39 @@
+import { AxiosInstance } from "axios"
+import kleur from "kleur"
+import { fulfillExportRequests } from "./fulfill-export-requests"
+import { AppContext } from "lib/util/app-context"
+
+export const startExportRequestWatcher = async (
+  {
+    devServerAxios,
+  }: {
+    devServerAxios: AxiosInstance
+  },
+  ctx: AppContext
+) => {
+  if (typeof Bun !== "undefined") {
+    console.log(
+      kleur.yellow(
+        "Bun currently isn't capable of exporting due to an archiver bug, exports will not work."
+      )
+    )
+    return {
+      stop: () => {},
+    }
+  }
+
+  let running = true
+
+  ;(async () => {
+    while (running) {
+      await fulfillExportRequests({ dev_server_axios: devServerAxios }, ctx)
+      await new Promise((resolve) => setTimeout(resolve, 100))
+    }
+  })()
+
+  return {
+    stop: () => {
+      running = false
+    },
+  }
+}

package/lib/cmd-fns/dev/upload-examples-from-directory.ts

@@ -5,6 +5,7 @@ import { readdirSync, readFileSync } from "fs"
 import { soupify } from "lib/soupify"
 import { soupifyAndUploadExampleFile } from "./soupify-and-upload-example-file"
 import { markAllExamplesLoading } from "./mark-all-examples-loading"
+import { readdir } from "fs/promises"
 
 export const uploadExamplesFromDirectory = async (
   {
@@ -17,7 +18,10 @@ export const uploadExamplesFromDirectory = async (
   ctx: { runtime: "node" | "bun" }
 ) => {
   const examplesDir = joinPath(cwd, "examples")
-  const exampleFileNames = readdirSync(examplesDir)
+  const exampleFileNames = await readdir(examplesDir).catch((e) => {
+    console.log(kleur.red(`Error reading examples directory: "${examplesDir}"`))
+    throw e
+  })
 
   // Mark all examples as being "reloaded" in the database
   await markAllExamplesLoading({ devServerAxios })

package/lib/cmd-fns/dev-server-fulfill-export-requests.ts

@@ -0,0 +1,43 @@
+import { AppContext } from "../util/app-context"
+import { z } from "zod"
+import { getDevServerAxios } from "./dev/get-dev-server-axios"
+import kleur from "kleur"
+import { fulfillExportRequests } from "./dev/fulfill-export-requests"
+
+export const devServerFulfillExportRequests = async (
+  ctx: AppContext,
+  args: any
+) => {
+  const params = z.object({}).parse(args)
+
+  let server_url = `http://localhost:3020`
+  let dev_server_axios = getDevServerAxios({ serverUrl: server_url })
+
+  const checkHealth = () =>
+    dev_server_axios
+      .get("/api/health")
+      .then(() => true)
+      .catch((e) => false)
+
+  let is_dev_server_healthy = await checkHealth()
+
+  if (!is_dev_server_healthy) {
+    // attempt to use development-mode port, e.g. if someone ran
+    // npm run start:dev-server:dev
+    const devModeServerUrl = "http://localhost:3021"
+    dev_server_axios = getDevServerAxios({ serverUrl: devModeServerUrl })
+    is_dev_server_healthy = await checkHealth()
+    if (is_dev_server_healthy) server_url = devModeServerUrl
+  }
+
+  if (!is_dev_server_healthy) {
+    console.log(
+      kleur.red(
+        `Dev server doesn't seem to be running at ${server_url}. (Could not ping health)`
+      )
+    )
+    process.exit(1)
+  }
+
+  await fulfillExportRequests({ dev_server_axios }, ctx)
+}

package/lib/cmd-fns/index.ts

@@ -37,3 +37,4 @@ export { configClear } from "./config-clear"
 export { openCmd as open } from "./open"
 export { versionCmd as version } from "./version"
 export { exportGerbersCmd as exportGerbers } from "./export-gerbers"
+export { devServerFulfillExportRequests } from "./dev-server-fulfill-export-requests"

package/lib/export-gerbers.ts

@@ -44,6 +44,13 @@ export const exportGerbersToFile = async (
 
   console.log(kleur.gray("[zipping tmp dir]..."))
   const output = fs.createWriteStream(params.output_zip_path)
+
+  if (typeof Bun !== "undefined") {
+    throw new Error(
+      `Exporting gerbers doesn't currently work with Bun (bug w/ archiver module)`
+    )
+  }
+
   const archive = archiver("zip", {
     zlib: { level: 9 },
   })
@@ -53,7 +60,10 @@ export const exportGerbersToFile = async (
 
   await new Promise((resolve, reject) => {
     output.on("close", resolve)
+    output.on("finish", resolve)
+    output.on("end", resolve)
     output.on("error", reject)
+    archive.finalize()
   })
 }
 

package/lib/get-program.ts

@@ -307,6 +307,10 @@ export const getProgram = (ctx: AppContext) => {
     .option("-p, --port", "Port dev server is running on (default: 3020)")
     .action((args) => CMDFN.devServerUpload(ctx, args))
 
+  devServerCmd
+    .command("fulfill-export-requests")
+    .action((args) => CMDFN.devServerFulfillExportRequests(ctx, args))
+
   cmd
     .command("open")
     .description("Open browser to package on tscircuit registry")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.62",
+  "version": "0.0.63",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",