@tscircuit/3d-viewer 0.0.507 → 0.0.509

package/dist/index.js

@@ -28078,7 +28078,7 @@ function occtMeshesToGroup(meshes) {
   }
   return group;
 }
-async function convertStepUrlToGlbUrl(stepUrl) {
+async function convertStepUrlToGlb(stepUrl) {
   const response = await fetch(stepUrl);
   if (!response.ok) {
     throw new Error(`Failed to fetch STEP file: ${response.statusText}`);
@@ -28107,7 +28107,7 @@ async function convertStepUrlToGlbUrl(stepUrl) {
       { binary: true }
     );
   });
-  return URL.createObjectURL(new Blob([glb], { type: "model/gltf-binary" }));
+  return glb;
 }
 var CACHE_PREFIX = "step-glb-cache:";
 function arrayBufferToBase64(buffer) {
@@ -28148,6 +28148,16 @@ function setCachedGlb(stepUrl, glb) {
     console.warn("Failed to write STEP GLB cache", error);
   }
 }
+function getStepUrlConversionRegistry() {
+  const globalScope = globalThis;
+  if (!globalScope.stepUrlToGltfModelConversions) {
+    globalScope.stepUrlToGltfModelConversions = {
+      inProgress: /* @__PURE__ */ new Map(),
+      completed: /* @__PURE__ */ new Map()
+    };
+  }
+  return globalScope.stepUrlToGltfModelConversions;
+}
 var StepModel = ({
   stepUrl,
   position,
@@ -28162,31 +28172,66 @@ var StepModel = ({
   useEffect10(() => {
     let isActive = true;
     let objectUrl = null;
+    let shouldRevokeObjectUrl = true;
+    const registry = getStepUrlConversionRegistry();
     const cachedGlb = getCachedGlb(stepUrl);
     if (cachedGlb) {
-      objectUrl = URL.createObjectURL(
-        new Blob([cachedGlb], { type: "model/gltf-binary" })
-      );
-      setStepGltfUrl(objectUrl);
+      const cachedConverted = {
+        arrayBuffer: cachedGlb,
+        blobUrl: URL.createObjectURL(
+          new Blob([cachedGlb], { type: "model/gltf-binary" })
+        )
+      };
+      registry.completed.set(stepUrl, cachedConverted);
+      objectUrl = cachedConverted.blobUrl;
+      shouldRevokeObjectUrl = false;
+      setStepGltfUrl(cachedConverted.blobUrl);
       return () => {
         isActive = false;
-        if (objectUrl) {
+        if (objectUrl && shouldRevokeObjectUrl) {
           URL.revokeObjectURL(objectUrl);
         }
       };
     }
-    void convertStepUrlToGlbUrl(stepUrl).then((generatedUrl) => {
+    const existingCompleted = registry.completed.get(stepUrl);
+    if (existingCompleted) {
+      objectUrl = existingCompleted.blobUrl;
+      shouldRevokeObjectUrl = false;
+      setStepGltfUrl(existingCompleted.blobUrl);
+      setCachedGlb(stepUrl, existingCompleted.arrayBuffer);
+      return () => {
+        isActive = false;
+        if (objectUrl && shouldRevokeObjectUrl) {
+          URL.revokeObjectURL(objectUrl);
+        }
+      };
+    }
+    let conversionPromise = registry.inProgress.get(stepUrl);
+    if (!conversionPromise) {
+      conversionPromise = convertStepUrlToGlb(stepUrl).then((glbBuffer) => {
+        const converted = {
+          arrayBuffer: glbBuffer,
+          blobUrl: URL.createObjectURL(
+            new Blob([glbBuffer], { type: "model/gltf-binary" })
+          )
+        };
+        registry.completed.set(stepUrl, converted);
+        registry.inProgress.delete(stepUrl);
+        return converted;
+      }).catch((error) => {
+        registry.inProgress.delete(stepUrl);
+        throw error;
+      });
+      registry.inProgress.set(stepUrl, conversionPromise);
+    }
+    void conversionPromise.then((converted) => {
       if (!isActive) {
-        URL.revokeObjectURL(generatedUrl);
         return;
       }
-      objectUrl = generatedUrl;
-      setStepGltfUrl(generatedUrl);
-      fetch(generatedUrl).then((response) => response.arrayBuffer()).then((glbBuffer) => {
-        setCachedGlb(stepUrl, glbBuffer);
-      }).catch((error) => {
-        console.warn("Failed to cache STEP GLB", error);
-      });
+      objectUrl = converted.blobUrl;
+      shouldRevokeObjectUrl = false;
+      setStepGltfUrl(converted.blobUrl);
+      setCachedGlb(stepUrl, converted.arrayBuffer);
     }).catch((error) => {
       console.error("Failed to convert STEP file to GLB", error);
       if (isActive) {
@@ -28195,7 +28240,7 @@ var StepModel = ({
     });
     return () => {
       isActive = false;
-      if (objectUrl) {
+      if (objectUrl && shouldRevokeObjectUrl) {
         URL.revokeObjectURL(objectUrl);
       }
     };
@@ -28274,12 +28319,11 @@ var AnyCadComponent = ({
   }, [cad_component.rotation, layer]);
   const adjustedPosition = useMemo8(() => {
     if (!cad_component.position) return void 0;
-    const bottomLayerOffset = 0.55;
     let z18;
     if (layer === "top") {
       z18 = pcbThickness / 2;
     } else if (layer === "bottom") {
-      z18 = -(pcbThickness / 2) - bottomLayerOffset;
+      z18 = -(pcbThickness / 2);
     } else {
       z18 = cad_component.position.z;
     }
@@ -28403,7 +28447,7 @@ import * as THREE16 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.506",
+  version: "0.0.508",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.507",
+  "version": "0.0.509",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",