@tscircuit/core 0.0.209 → 0.0.211

package/dist/index.d.ts

@@ -40,7 +40,7 @@ declare abstract class Renderable implements IRenderable {
     private _asyncEffects;
     constructor(props: any);
     protected _markDirty(phase: RenderPhase): void;
-    protected _queueAsyncEffect(effect: () => Promise<void>): void;
+    protected _queueAsyncEffect(effectName: string, effect: () => Promise<void>): void;
     protected _emitRenderLifecycleEvent(phase: RenderPhase, eventType: "start" | "end"): void;
     getString(): string;
     _hasIncompleteAsyncEffects(): boolean;
@@ -930,14 +930,17 @@ declare class Board extends Group<typeof boardProps> {
             autorouter: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
                 serverUrl: z.ZodOptional<z.ZodString>;
                 inputFormat: z.ZodOptional<z.ZodEnum<["simplified", "circuit-json"]>>;
+                serverMode: z.ZodOptional<z.ZodEnum<["job", "solve-endpoint"]>>;
                 cache: z.ZodOptional<z.ZodType<_tscircuit_props.PcbRouteCache, z.ZodTypeDef, _tscircuit_props.PcbRouteCache>>;
             }, "strip", z.ZodTypeAny, {
                 serverUrl?: string | undefined;
                 inputFormat?: "simplified" | "circuit-json" | undefined;
+                serverMode?: "job" | "solve-endpoint" | undefined;
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
             }, {
                 serverUrl?: string | undefined;
                 inputFormat?: "simplified" | "circuit-json" | undefined;
+                serverMode?: "job" | "solve-endpoint" | undefined;
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
             }>, z.ZodLiteral<"sequential-trace">, z.ZodLiteral<"subcircuit">, z.ZodLiteral<"auto">, z.ZodLiteral<"auto-local">, z.ZodLiteral<"auto-cloud">]>>;
         }>, {
@@ -975,6 +978,7 @@ declare class Board extends Group<typeof boardProps> {
             autorouter?: "sequential-trace" | "subcircuit" | "auto" | "auto-local" | "auto-cloud" | {
                 serverUrl?: string | undefined;
                 inputFormat?: "simplified" | "circuit-json" | undefined;
+                serverMode?: "job" | "solve-endpoint" | undefined;
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
             } | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
@@ -1007,6 +1011,7 @@ declare class Board extends Group<typeof boardProps> {
             autorouter?: "sequential-trace" | "subcircuit" | "auto" | "auto-local" | "auto-cloud" | {
                 serverUrl?: string | undefined;
                 inputFormat?: "simplified" | "circuit-json" | undefined;
+                serverMode?: "job" | "solve-endpoint" | undefined;
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
             } | undefined;
             schAutoLayoutEnabled?: boolean | undefined;

package/dist/index.js

@@ -114,11 +114,12 @@ var Renderable = class {
       this.renderPhaseStates[orderedRenderPhases[i]].dirty = true;
     }
   }
-  _queueAsyncEffect(effect) {
+  _queueAsyncEffect(effectName, effect) {
     const asyncEffect = {
       promise: effect(),
       // TODO don't start effects until end of render cycle
       phase: this._currentRenderPhase,
+      effectName,
       complete: false
     };
     this._asyncEffects.push(asyncEffect);
@@ -127,18 +128,24 @@ var Renderable = class {
       if ("root" in this && this.root) {
         ;
         this.root.emit("asyncEffectComplete", {
-          component: this,
-          asyncEffect
+          effectName,
+          componentDisplayName: this.getString(),
+          phase: asyncEffect.phase
         });
       }
     }).catch((error) => {
-      console.error(`Async effect error in ${asyncEffect.phase}:`, error);
+      console.error(
+        `Async effect error in ${asyncEffect.phase} "${effectName}":
+${error.stack}`
+      );
       asyncEffect.complete = true;
       if ("root" in this && this.root) {
         ;
         this.root.emit("asyncEffectComplete", {
-          component: this,
-          asyncEffect
+          effectName,
+          componentDisplayName: this.getString(),
+          phase: asyncEffect.phase,
+          error: error.toString()
         });
       }
     });
@@ -3214,7 +3221,7 @@ var NormalComponent = class extends PrimitiveComponent {
       });
       return;
     }
-    this._queueAsyncEffect(async () => {
+    this._queueAsyncEffect("get-supplier-part-numbers", async () => {
       this._asyncSupplierPartNumbers = await supplierPartNumbersMaybePromise;
       this._markDirty("PartsEngineRender");
     });
@@ -3363,6 +3370,7 @@ var getSimpleRouteJsonFromTracesAndDb = ({
 };
 
 // lib/components/primitive-components/Group/Group.ts
+import Debug4 from "debug";
 var Group = class extends NormalComponent {
   _asyncAutoroutingResult = null;
   get config() {
@@ -3427,42 +3435,92 @@ var Group = class extends NormalComponent {
   }
   doInitialPcbTraceRender() {
     if (this._shouldUseTraceByTraceRouting()) return;
-    let serverUrl = this.props.autorouter?.serverUrl;
-    if (this.props.autorouter === "auto-cloud") {
-      serverUrl = "https://registry-api.tscircuit.com/autorouting/solve";
-    }
-    if (serverUrl) {
-      this._queueAsyncEffect(async () => {
+    const serverUrl = this.props.autorouter?.serverUrl ?? "https://registry-api.tscircuit.com";
+    const serverMode = this.props.autorouter?.serverMode ?? "job";
+    const debug3 = Debug4("tscircuit:core:autorouting");
+    const fetchWithDebug = (url, options) => {
+      debug3("fetching", url);
+      return fetch(url, options);
+    };
+    this._queueAsyncEffect("make-http-autorouting-request", async () => {
+      if (serverMode === "solve-endpoint") {
         if (this.props.autorouter?.inputFormat === "simplified") {
-          const { autorouting_result: autorouting_result2 } = await fetch(serverUrl, {
-            method: "POST",
-            body: JSON.stringify({
-              input_simple_route_json: this._getSimpleRouteJsonFromPcbTraces()
-            }),
-            headers: {
-              "Content-Type": "application/json"
+          const { autorouting_result: autorouting_result2 } = await fetchWithDebug(
+            `${serverUrl}/autorouting/solve`,
+            {
+              method: "POST",
+              body: JSON.stringify({
+                input_simple_route_json: this._getSimpleRouteJsonFromPcbTraces()
+              }),
+              headers: { "Content-Type": "application/json" }
             }
-          }).then((r) => r.json());
+          ).then((r) => r.json());
           this._asyncAutoroutingResult = autorouting_result2;
           this._markDirty("PcbTraceRender");
+          return;
         }
-        const arRes = await fetch(serverUrl, {
+        const { autorouting_result } = await fetchWithDebug(
+          `${serverUrl}/autorouting/solve`,
+          {
+            method: "POST",
+            body: JSON.stringify({
+              input_circuit_json: this.root.db.toArray()
+            }),
+            headers: { "Content-Type": "application/json" }
+          }
+        ).then((r) => r.json());
+        this._asyncAutoroutingResult = autorouting_result;
+        this._markDirty("PcbTraceRender");
+        return;
+      }
+      const { autorouting_job } = await fetchWithDebug(
+        `${serverUrl}/autorouting/jobs/create`,
+        {
           method: "POST",
           body: JSON.stringify({
-            // TODO filter such that we're only using this subcircuit's
-            // components
-            input_circuit_json: this.root.db.toArray()
+            input_circuit_json: this.root.db.toArray(),
+            provider: "freerouting",
+            autostart: true
           }),
-          headers: {
-            "Content-Type": "application/json"
+          headers: { "Content-Type": "application/json" }
+        }
+      ).then((r) => r.json());
+      while (true) {
+        const { autorouting_job: job } = await fetchWithDebug(
+          `${serverUrl}/autorouting/jobs/get`,
+          {
+            method: "POST",
+            body: JSON.stringify({
+              autorouting_job_id: autorouting_job.autorouting_job_id
+            }),
+            headers: { "Content-Type": "application/json" }
           }
-        });
-        const resultText = await arRes.text();
-        const { autorouting_result } = JSON.parse(resultText);
-        this._asyncAutoroutingResult = autorouting_result;
-        this._markDirty("PcbTraceRender");
-      });
-    }
+        ).then((r) => r.json());
+        if (job.is_finished) {
+          const { autorouting_job_output } = await fetchWithDebug(
+            `${serverUrl}/autorouting/jobs/get_output`,
+            {
+              method: "POST",
+              body: JSON.stringify({
+                autorouting_job_id: autorouting_job.autorouting_job_id
+              }),
+              headers: { "Content-Type": "application/json" }
+            }
+          ).then((r) => r.json());
+          this._asyncAutoroutingResult = {
+            output_pcb_traces: autorouting_job_output.output_pcb_traces
+          };
+          this._markDirty("PcbTraceRender");
+          break;
+        }
+        if (job.has_error) {
+          throw new Error(
+            `Autorouting job failed: ${JSON.stringify(job.error)}`
+          );
+        }
+        await new Promise((resolve) => setTimeout(resolve, 100));
+      }
+    });
   }
   updatePcbTraceRender() {
     if (!this._asyncAutoroutingResult) return;
@@ -3532,7 +3590,10 @@ var Group = class extends NormalComponent {
    * or if using a "fullview" or "rip and replace" autorouting mode
    */
   _shouldUseTraceByTraceRouting() {
-    if (this.props.autorouter) return false;
+    const props = this._parsedProps;
+    if (props.autorouter === "auto-local") return true;
+    if (props.autorouter === "sequential-trace") return true;
+    if (props.autorouter) return false;
     return true;
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.209",
+  "version": "0.0.211",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -41,11 +41,11 @@
     "@tscircuit/footprinter": "^0.0.89",
     "@tscircuit/infgrid-ijump-astar": "^0.0.24",
     "@tscircuit/math-utils": "^0.0.5",
-    "circuit-json": "^0.0.108",
-    "circuit-json-to-connectivity-map": "^0.0.17",
-    "@tscircuit/props": "^0.0.106",
+    "@tscircuit/props": "^0.0.107",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/soup-util": "^0.0.41",
+    "circuit-json": "^0.0.108",
+    "circuit-json-to-connectivity-map": "^0.0.17",
     "circuit-to-svg": "0.0.84",
     "format-si-unit": "^0.0.2",
     "nanoid": "^5.0.7",