3dviewer-sdk 1.0.12 → 1.0.14

package/dist/index.mjs

@@ -119,8 +119,10 @@ var NodeModule = class {
 };
 
 // src/modules/files.module.ts
-var DEFAULT_API_BASE_URL = "https://dev.3dviewer.anybim.vn";
+var DEFAULT_API_BASE_URL = "https://dev.3dviewer.anybim.vn/service/conversion";
 var DEFAULT_VIEWER_ORIGIN = "http://localhost:3000";
+var SDK_VIEWER_PATH = "/mainviewer-sdk";
+var LEGACY_VIEWER_PATH = "/mainviewer";
 var FilesModule = class {
   constructor(viewer) {
     this.viewer = viewer;
@@ -270,12 +272,7 @@ var FilesModule = class {
     const raw = this.config.baseUrl || this.viewer.getOptions().baseUrl || DEFAULT_API_BASE_URL;
     return this.normalizeBaseUrl(raw);
   }
-  // Resolve conversion API base URL with legacy baseUrl fallback.
-  resolveConversionBaseUrl() {
-    const raw = this.config.conversionBaseUrl || this.viewer.getOptions().conversionBaseUrl;
-    return (raw == null ? void 0 : raw.trim()) ? this.normalizeBaseUrl(raw) : this.resolveBaseUrl();
-  }
-  // Resolve viewer route path (e.g. /mainviewer).
+  // Resolve viewer route path for all SDK flows.
   resolveViewerPath() {
     const configuredPath = this.config.viewerPath || this.viewer.getOptions().viewerPath;
     if (!configuredPath) {
@@ -283,36 +280,41 @@ var FilesModule = class {
       if (viewerUrl) {
         try {
           const pathname = new URL(viewerUrl, window.location.href).pathname;
-          if (pathname && pathname !== "/") return pathname;
+          if (pathname && pathname !== "/") return this.normalizeSdkViewerPath(pathname);
         } catch {
         }
       }
     }
-    const p = (configuredPath || "/mainviewer").trim();
-    if (!p) return "/mainviewer";
-    return p.startsWith("/") ? p : `/${p}`;
+    return this.normalizeSdkViewerPath(configuredPath || SDK_VIEWER_PATH);
+  }
+  normalizeSdkViewerPath(path) {
+    const p = path.trim();
+    if (!p || p === LEGACY_VIEWER_PATH) return SDK_VIEWER_PATH;
+    const normalized = p.startsWith("/") ? p : `/${p}`;
+    return normalized === LEGACY_VIEWER_PATH ? SDK_VIEWER_PATH : normalized;
   }
   // Viewer host used to open iframe after conversion completes.
   resolveViewerOrigin() {
-    const configuredBaseUrl = this.config.baseUrl || this.viewer.getOptions().baseUrl;
-    if (configuredBaseUrl) {
+    const viewerUrl = this.viewer.getOptions().url;
+    if (viewerUrl) {
       try {
-        return this.normalizeBaseUrl(new URL(configuredBaseUrl, window.location.href).origin);
+        return this.normalizeBaseUrl(new URL(viewerUrl, window.location.href).origin);
       } catch {
       }
     }
-    const viewerUrl = this.viewer.getOptions().url;
-    if (viewerUrl) {
+    const configuredBaseUrl = this.config.baseUrl || this.viewer.getOptions().baseUrl;
+    if (configuredBaseUrl) {
       try {
-        return this.normalizeBaseUrl(new URL(viewerUrl, window.location.href).origin);
+        return this.normalizeBaseUrl(new URL(configuredBaseUrl, window.location.href).origin);
       } catch {
       }
     }
     return this.normalizeBaseUrl(DEFAULT_VIEWER_ORIGIN);
   }
-  // Use the configured conversion API root as-is.
+  // Resolve conversion service root from configured API base URL.
+  // Do not auto-append path segments (e.g. "/service/conversion").
   resolveHostConversion() {
-    return this.resolveConversionBaseUrl();
+    return this.resolveBaseUrl();
   }
   // Resolve upload path sent to conversion APIs.
   getUploadPath() {
@@ -430,6 +432,8 @@ var FilesModule = class {
       originalFilePath: options.originalFilePath,
       convertOptions,
       downloadUrl: options.downloadUrl,
+      workflowId: options.workflowId,
+      taskId: options.taskId,
       baseFileId: options.baseFileId,
       baseMajorRev: (_a = options.baseMajorRev) != null ? _a : 0,
       baseMinorRev: (_b = options.baseMinorRev) != null ? _b : 0
@@ -464,11 +468,11 @@ var FilesModule = class {
   }
   // Submit conversion request to the newer downloadUrl-based endpoint.
   async cacheFileV2(options) {
+    var _a;
     const hostConversion = await this.resolveHostConversion();
     const params = new URLSearchParams();
-    if (typeof options.overwrite === "boolean") {
-      params.set("overwrite", String(options.overwrite));
-    }
+    params.set("overwrite", String((_a = options.overwrite) != null ? _a : true));
+    params.set("ignore_line_weight", "1");
     if (options.project) {
       params.set("project", options.project);
     }
@@ -561,8 +565,8 @@ var FilesModule = class {
 };
 
 // src/modules/toolbar.module.ts
-function createRequestId() {
-  return `sheets_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
+function createRequestId(prefix) {
+  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
 }
 var ALL_3D_TOOLBAR_OPERATORS = [
   "home",
@@ -648,90 +652,78 @@ var ToolbarModule = class {
   enableAllPdf() {
     this.clearDisabledPdf();
   }
-  hideToolbar() {
-    this.setToolbarVisible(false);
+  useToolbar(target = "all") {
+    this.postToolbarUse({ target });
   }
-  showToolbar() {
-    this.setToolbarVisible(true);
+  useLeftToolbar() {
+    this.useToolbar("left");
   }
-  setToolbarVisible(visible, target = "all") {
-    this.postToolbarVisibility({ visible, target });
+  useCenterToolbar() {
+    this.useToolbar("center");
   }
-  hideLeftToolbar() {
-    this.setToolbarVisible(false, "left");
+  useRightToolbar() {
+    this.useToolbar("right");
   }
-  showLeftToolbar() {
-    this.setToolbarVisible(true, "left");
-  }
-  hideCenterToolbar() {
-    this.setToolbarVisible(false, "center");
-  }
-  showCenterToolbar() {
-    this.setToolbarVisible(true, "center");
-  }
-  hideRightToolbar() {
-    this.setToolbarVisible(false, "right");
-  }
-  showRightToolbar() {
-    this.setToolbarVisible(true, "right");
+  usePanel(panel, format) {
+    this.postPanelOpen({ panel, format });
   }
   openClippingPlanes() {
-    this.postPanelOpen({ panel: "clipping-commands", format: "3d" });
+    this.usePanel("clipping-commands", "3d");
   }
   closeClippingPlanes() {
     this.postPanelClose({ panel: "clipping-commands", format: "3d" });
   }
   openSetting() {
-    this.postPanelOpen({ panel: "setting" });
+    this.usePanel("setting");
   }
   closeSetting() {
     this.postPanelClose({ panel: "setting" });
   }
   openSetting3D() {
-    this.postPanelOpen({ panel: "setting", format: "3d" });
+    this.usePanel("setting", "3d");
   }
   closeSetting3D() {
     this.postPanelClose({ panel: "setting", format: "3d" });
   }
   openSettingPdf() {
-    this.postPanelOpen({ panel: "setting", format: "pdf" });
+    this.usePanel("setting", "pdf");
   }
   closeSettingPdf() {
     this.postPanelClose({ panel: "setting", format: "pdf" });
   }
   openStatesObjects() {
-    this.postPanelOpen({ panel: "statesObjects", format: "3d" });
+    this.usePanel("statesObjects", "3d");
   }
   closeStatesObjects() {
     this.postPanelClose({ panel: "statesObjects", format: "3d" });
   }
   openLinkedObjects() {
-    this.postPanelOpen({ panel: "linkedObjects", format: "3d" });
+    this.usePanel("linkedObjects", "3d");
   }
   closeLinkedObjects() {
     this.postPanelClose({ panel: "linkedObjects", format: "3d" });
   }
   openModelTree() {
-    this.postPanelOpen({ panel: "model-tree", format: "3d" });
+    this.usePanel("model-tree", "3d");
   }
   closeModelTree() {
     this.postPanelClose({ panel: "model-tree", format: "3d" });
   }
   openObjectProperties() {
-    this.postPanelOpen({ panel: "object-properties", format: "3d" });
+    this.usePanel("object-properties", "3d");
   }
   closeObjectProperties() {
     this.postPanelClose({ panel: "object-properties", format: "3d" });
   }
   openSheets() {
-    this.postPanelOpen({ panel: "sheets", format: "3d" });
+    this.usePanel("sheets", "3d");
   }
   closeSheets() {
     this.postPanelClose({ panel: "sheets", format: "3d" });
   }
   getSheets(options) {
     var _a;
-    const requestId = createRequestId();
+    const requestId = createRequestId("sheets");
     const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 1e4);
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
@@ -747,6 +739,60 @@ var ToolbarModule = class {
       this.postSheetsGetList({ requestId });
     });
   }
+  getObjectProperties(options) {
+    var _a;
+    const requestId = createRequestId("object_properties");
+    const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 1e4);
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        off();
+        reject(new Error("Timeout while getting object properties list from viewer"));
+      }, timeoutMs);
+      const off = this.viewer._on("object-properties:list", (payload) => {
+        if (payload.requestId !== requestId) return;
+        clearTimeout(timer);
+        off();
+        resolve(payload.properties);
+      });
+      this.postObjectPropertiesGetList({ requestId });
+    });
+  }
+  getLinkedObjects(options) {
+    var _a;
+    const requestId = createRequestId("linked_objects");
+    const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 1e4);
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        off();
+        reject(new Error("Timeout while getting linked objects list from viewer"));
+      }, timeoutMs);
+      const off = this.viewer._on("linked-objects:list", (payload) => {
+        if (payload.requestId !== requestId) return;
+        clearTimeout(timer);
+        off();
+        resolve(payload.linkedObjects);
+      });
+      this.postLinkedObjectsGetList({ requestId });
+    });
+  }
+  getStatesObjects(options) {
+    var _a;
+    const requestId = createRequestId("states_objects");
+    const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 1e4);
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        off();
+        reject(new Error("Timeout while getting states objects list from viewer"));
+      }, timeoutMs);
+      const off = this.viewer._on("states-objects:list", (payload) => {
+        if (payload.requestId !== requestId) return;
+        clearTimeout(timer);
+        off();
+        resolve(payload.statesObjects);
+      });
+      this.postStatesObjectsGetList({ requestId });
+    });
+  }
   applySheet(sheetId) {
     this.postSheetsApply({ sheetId });
   }
@@ -789,8 +835,8 @@ var ToolbarModule = class {
   postConfig(payload) {
     this.viewer.postToViewer("viewer-toolbar-config" /* TOOLBAR_CONFIG */, payload);
   }
-  postToolbarVisibility(payload) {
-    this.viewer.postToViewer("viewer-toolbar-visibility" /* TOOLBAR_VISIBILITY */, payload);
+  postToolbarUse(payload) {
+    this.viewer.postToViewer("viewer-toolbar-use" /* TOOLBAR_USE */, payload);
   }
   postPanelOpen(payload) {
     this.viewer.postToViewer("viewer-panel-open" /* PANEL_OPEN */, payload);
@@ -807,6 +853,15 @@ var ToolbarModule = class {
   postSheetsApply(payload) {
     this.viewer.postToViewer("viewer-sheets-apply" /* SHEETS_APPLY */, payload);
   }
+  postObjectPropertiesGetList(payload) {
+    this.viewer.postToViewer("viewer-object-properties-get-list" /* OBJECT_PROPERTIES_GET_LIST */, payload);
+  }
+  postLinkedObjectsGetList(payload) {
+    this.viewer.postToViewer("viewer-linked-objects-get-list" /* LINKED_OBJECTS_GET_LIST */, payload);
+  }
+  postStatesObjectsGetList(payload) {
+    this.viewer.postToViewer("viewer-states-objects-get-list" /* STATES_OBJECTS_GET_LIST */, payload);
+  }
 };
 
 // src/modules/model-tree.module.ts
@@ -963,6 +1018,8 @@ var LanguageModule = class {
 };
 
 // src/viewer.ts
+var SDK_VIEWER_PATH2 = "/mainviewer-sdk";
+var LEGACY_VIEWER_PATH2 = "/mainviewer";
 var Viewer3D = class {
   constructor(options) {
     this.options = options;
@@ -1067,6 +1124,54 @@ var Viewer3D = class {
           });
           break;
         }
+        case "viewer-object-properties-list" /* OBJECT_PROPERTIES_LIST */: {
+          const payload = data.payload;
+          if (!payload || !payload.requestId || !Array.isArray(payload.properties)) break;
+          this._emit("object-properties:list", {
+            requestId: String(payload.requestId),
+            properties: payload.properties.filter((item) => item && typeof item === "object").map((item) => ({ ...item })),
+            timestamp: Number(payload.timestamp) || Date.now()
+          });
+          break;
+        }
+        case "viewer-linked-objects-list" /* LINKED_OBJECTS_LIST */: {
+          const payload = data.payload;
+          if (!payload || !payload.requestId || !Array.isArray(payload.linkedObjects)) break;
+          this._emit("linked-objects:list", {
+            requestId: String(payload.requestId),
+            linkedObjects: payload.linkedObjects.filter((item) => item && typeof item === "object").map((item) => ({ ...item })),
+            timestamp: Number(payload.timestamp) || Date.now()
+          });
+          break;
+        }
+        case "viewer-states-objects-list" /* STATES_OBJECTS_LIST */: {
+          const payload = data.payload;
+          if (!payload || !payload.requestId || !Array.isArray(payload.statesObjects)) break;
+          this._emit("states-objects:list", {
+            requestId: String(payload.requestId),
+            statesObjects: payload.statesObjects.map((item) => {
+              var _a2, _b2, _c2, _d2, _e, _f, _g;
+              return {
+                id: String((_a2 = item.id) != null ? _a2 : ""),
+                name: String((_b2 = item.name) != null ? _b2 : ""),
+                char: String((_c2 = item.char) != null ? _c2 : ""),
+                object: Array.isArray(item.object) ? item.object.map((objectItem) => {
+                  var _a3;
+                  return {
+                    name: String((_a3 = objectItem == null ? void 0 : objectItem.name) != null ? _a3 : ""),
+                    id: Number(objectItem == null ? void 0 : objectItem.id) || 0
+                  };
+                }) : [],
+                states: {
+                  color: String((_e = (_d2 = item.states) == null ? void 0 : _d2.color) != null ? _e : ""),
+                  type: String((_g = (_f = item.states) == null ? void 0 : _f.type) != null ? _g : "")
+                }
+              };
+            }),
+            timestamp: Number(payload.timestamp) || Date.now()
+          });
+          break;
+        }
         case "viewer-markup-list" /* MARKUP_LIST */: {
           const payload = data.payload;
           if (!payload || !payload.requestId || !Array.isArray(payload.markups)) break;
@@ -1186,18 +1291,39 @@ var Viewer3D = class {
     if (!this.initialized) throw new Error("Call viewer.init() before using viewer");
   }
   withInitialOptions(url) {
-    if (!this.options.initialToolbarVisibility) return url;
     try {
       const parsedUrl = new URL(url, window.location.href);
-      parsedUrl.searchParams.set(
-        "toolbarVisibility",
-        JSON.stringify(this.options.initialToolbarVisibility)
-      );
+      if (parsedUrl.pathname === LEGACY_VIEWER_PATH2) {
+        parsedUrl.pathname = SDK_VIEWER_PATH2;
+      }
+      const initialToolbar = this.normalizeInitialToolbar();
+      if (initialToolbar) {
+        parsedUrl.searchParams.set("useToolbar", JSON.stringify(initialToolbar));
+      }
       return parsedUrl.toString();
     } catch {
       return url;
     }
   }
+  normalizeInitialToolbar() {
+    const initialToolbar = this.options.initialToolbar;
+    if (!initialToolbar) return null;
+    if (typeof initialToolbar === "string") {
+      return { [initialToolbar]: true };
+    }
+    if (Array.isArray(initialToolbar)) {
+      return initialToolbar.reduce((result, target) => {
+        result[target] = true;
+        return result;
+      }, {});
+    }
+    const entries = Object.entries(initialToolbar).filter(([, enabled]) => enabled === true);
+    if (entries.length === 0) return null;
+    return entries.reduce((result, [target]) => {
+      result[target] = true;
+      return result;
+    }, {});
+  }
   // ===== typed internal events used by modules =====
   _on(event, cb) {
     return this.emitter.on(event, cb);

package/package.json

@@ -1,16 +1,21 @@
 {
   "name": "3dviewer-sdk",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format cjs,esm --dts --no-splitting"
+    "build": "tsup src/index.ts --format cjs,esm --dts --no-splitting",
+    "test": "vitest run tests",
+    "test:watch": "vitest tests"
   },
   "devDependencies": {
+    "@vitest/coverage-v8": "^4.1.4",
+    "jsdom": "^29.0.2",
     "tsup": "^8.5.1",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.4"
   }
 }

package/dist/contracts/events.d.ts

@@ -1,97 +0,0 @@
-import type { MarkupListItem, MarkupOperationResultPayload, PdfCurrentPagePayload, PdfModeEventPayload, PdfToolbarActionEventPayload } from "./messages";
-export declare type ViewerEventMap = {
-    "camera:home": {
-        timestamp: number;
-    };
-    "node:select": {
-        nodeId: string;
-        timestamp: number;
-    };
-    "interaction:pan-change": {
-        enabled: boolean;
-    };
-    "toolbar:pdf-plan-mode": PdfModeEventPayload;
-    "toolbar:pdf-document-mode": PdfModeEventPayload;
-    "toolbar:pdf-first-page": PdfToolbarActionEventPayload;
-    "toolbar:pdf-previous-page": PdfToolbarActionEventPayload;
-    "toolbar:pdf-next-page": PdfToolbarActionEventPayload;
-    "toolbar:pdf-last-page": PdfToolbarActionEventPayload;
-    "toolbar:pdf-current-page": PdfCurrentPagePayload;
-    "modelTree:node-ids": {
-        requestId: string;
-        nodeIds: string[];
-        timestamp: number;
-    };
-    "sheets:list": {
-        requestId: string;
-        sheets: {
-            id: string | number;
-            name: string;
-            is3D?: boolean;
-            viewId?: string;
-        }[];
-        activeSheetId?: string | number | null;
-        timestamp: number;
-    };
-    "markup:list": {
-        requestId: string;
-        markups: MarkupListItem[];
-        timestamp: number;
-    };
-    "markup:save": MarkupOperationResultPayload;
-    "markup:cancel": MarkupOperationResultPayload;
-};
-export declare type LoadStage = "idle" | "uploading" | "converting" | "rendering" | "completed" | "error";
-export declare type LoadStatePayload = {
-    isLoading: boolean;
-    stage: LoadStage;
-    message?: string;
-    elapsedMs?: number;
-};
-export declare type PreparedViewerData = {
-    baseFileId: string;
-    baseMajorRev: number;
-    baseMinorRev: number;
-    fileName: string;
-    query: string;
-    url: string;
-};
-export declare type FilesEventMap = {
-    "files:state": LoadStatePayload;
-    "files:upload:start": {
-        fileName: string;
-    };
-    "files:upload:success": {
-        fileName: string;
-        baseFileId: string;
-    };
-    "files:upload:error": {
-        fileName: string;
-        error: string;
-    };
-    "files:conversion:start": {
-        fileName: string;
-    };
-    "files:conversion:success": PreparedViewerData;
-    "files:conversion:error": {
-        fileName: string;
-        error: string;
-    };
-    "files:render:start": {
-        url: string;
-    };
-    "files:render:success": {
-        url: string;
-    };
-    "files:render:error": {
-        url?: string;
-        error: string;
-    };
-    "files:load:success": PreparedViewerData;
-    "files:load:error": {
-        error: string;
-    };
-};
-export declare type SdkEventMap = ViewerEventMap & FilesEventMap;
-export declare type SdkEventKey = keyof SdkEventMap;
-export declare type SdkEventPayload<K extends SdkEventKey> = SdkEventMap[K];

package/dist/contracts/events.js

@@ -1 +0,0 @@
-export {};