3dviewer-sdk 1.0.24 → 1.0.25

package/dist/index.d.mts

@@ -31,10 +31,6 @@ declare enum ViewerMessageType {
     SHEETS_APPLY = "viewer-sheets-apply",
     OBJECT_PROPERTIES_GET_LIST = "viewer-object-properties-get-list",
     OBJECT_PROPERTIES_LIST = "viewer-object-properties-list",
-    OBJECT_PROPERTIES_WATCH = "viewer-object-properties-watch",
-    OBJECT_PROPERTIES_UNWATCH = "viewer-object-properties-unwatch",
-    OBJECT_PROPERTIES_GET_CURRENT = "viewer-object-properties-get-current",
-    OBJECT_PROPERTIES_CHANGED = "viewer-object-properties-changed",
     LINKED_OBJECTS_GET_LIST = "viewer-linked-objects-get-list",
     LINKED_OBJECTS_LIST = "viewer-linked-objects-list",
     STATES_OBJECTS_GET_LIST = "viewer-states-objects-get-list",
@@ -91,8 +87,8 @@ type SheetListItem = {
     viewId?: string;
 };
 type ObjectPropertyItem = Record<string, unknown>;
-type ObjectPropertiesChangedPayload = {
-    requestId?: string;
+type ObjectPropertiesListPayload = {
+    requestId: string;
     selectionKey: string;
     nodeIds: string[];
     persistentIds: string[];
@@ -181,12 +177,7 @@ type ViewerEventMap = {
         activeSheetId?: string | number | null;
         timestamp: number;
     };
-    "object-properties:list": {
-        requestId: string;
-        properties: ObjectPropertyItem[];
-        timestamp: number;
-    };
-    "object-properties:changed": ObjectPropertiesChangedPayload;
+    "object-properties:list": ObjectPropertiesListPayload;
     "linked-objects:list": {
         requestId: string;
         linkedObjects: LinkedObjectItem[];
@@ -339,10 +330,17 @@ type ConvertV2Options = {
     project?: string;
     convertOptions?: Partial<StreamConvertOptions>;
 };
-type FileInfoCheckInput = string | string[];
 type FileInfoCheckPayloadItem = {
     baseFileId: string;
+    baseMajorRev: number;
+    baseMinorRev: number;
 };
+type FileInfoCheckInputItem = string | {
+    baseFileId: string;
+    baseMajorRev?: number;
+    baseMinorRev?: number;
+};
+type FileInfoCheckInput = FileInfoCheckInputItem | FileInfoCheckInputItem[];
 type StreamConvertOptions = {
     convert3DModel: number;
     convert2DSheet: number;
@@ -435,6 +433,9 @@ type ToolbarFormat = "3d" | "pdf";
 type GetSheetsOptions = {
     timeoutMs?: number;
 };
+type GetObjectPropertiesOptions = GetSheetsOptions & {
+    nodeIds?: Array<string | number>;
+};
 declare class ToolbarModule {
     private viewer;
     on: {
@@ -497,7 +498,7 @@ declare class ToolbarModule {
     openSheets(): void;
     closeSheets(): void;
     getSheets(options?: GetSheetsOptions): Promise<SheetListItem[]>;
-    getObjectProperties(options?: GetSheetsOptions): Promise<ObjectPropertyItem[]>;
+    getObjectProperties(options?: GetObjectPropertiesOptions): Promise<ObjectPropertyItem[]>;
     getLinkedObjects(options?: GetSheetsOptions): Promise<LinkedObjectItem[]>;
     getStatesObjects(options?: GetSheetsOptions): Promise<StateObjectItem[]>;
     applySheet(sheetId: string | number): void;
@@ -587,24 +588,17 @@ declare class LanguageModule {
     set(language: LanguageCode): void;
 }
 
-type ObjectPropertiesWatchOptions = {
-    debounceMs?: number;
-    includeSelectionMeta?: boolean;
-};
-type ObjectPropertiesGetCurrentOptions = ObjectPropertiesWatchOptions & {
+type ObjectPropertiesGetOptions = {
     timeoutMs?: number;
+    expandToRealNodes?: boolean;
+    includeSelectionMeta?: boolean;
 };
-type ObjectPropertiesChangedEvent = ObjectPropertiesChangedPayload;
+type ObjectPropertiesResult = ObjectPropertiesListPayload;
 declare class ObjectPropertiesModule {
     private viewer;
-    private pendingGetCurrent;
-    on: {
-        change: (cb: (payload: ObjectPropertiesChangedEvent) => void) => () => void;
-    };
     constructor(viewer: Viewer3D);
-    watch(options?: ObjectPropertiesWatchOptions): void;
-    unwatch(): void;
-    getCurrent(options?: ObjectPropertiesGetCurrentOptions): Promise<ObjectPropertiesChangedEvent>;
+    get(nodeIds: Array<string | number>, options?: ObjectPropertiesGetOptions): Promise<ObjectPropertiesResult>;
+    getByNodeIds(nodeIds: Array<string | number>, options?: ObjectPropertiesGetOptions): Promise<ObjectPropertiesResult>;
 }
 
 type InitialToolbarUse = ToolbarUseTarget | ToolbarUseTarget[] | Partial<Record<ToolbarUseTarget, boolean>>;
@@ -655,4 +649,4 @@ declare class Viewer3D {
     private handleMessage;
 }
 
-export { type CameraZoomPayload, type ConvertOptions, type ConvertV2Options, type FileInfoCheckInput, type FileInfoCheckPayloadItem, type FilesConfig, type InitialToolbarUse, type LanguageCode, type LoadStage, type LoadStatePayload, type MarkupAction, type MarkupListItem, type MarkupOperationResultPayload, type ObjectPropertiesChangedEvent, type ObjectPropertiesGetCurrentOptions, type ObjectPropertiesWatchOptions, type PreparedViewerData, Viewer3D };
+export { type CameraZoomPayload, type ConvertOptions, type ConvertV2Options, type FileInfoCheckInput, type FileInfoCheckPayloadItem, type FilesConfig, type InitialToolbarUse, type LanguageCode, type LoadStage, type LoadStatePayload, type MarkupAction, type MarkupListItem, type MarkupOperationResultPayload, type ObjectPropertiesGetOptions, type ObjectPropertiesResult, type PreparedViewerData, Viewer3D };

package/dist/index.d.ts

@@ -31,10 +31,6 @@ declare enum ViewerMessageType {
     SHEETS_APPLY = "viewer-sheets-apply",
     OBJECT_PROPERTIES_GET_LIST = "viewer-object-properties-get-list",
     OBJECT_PROPERTIES_LIST = "viewer-object-properties-list",
-    OBJECT_PROPERTIES_WATCH = "viewer-object-properties-watch",
-    OBJECT_PROPERTIES_UNWATCH = "viewer-object-properties-unwatch",
-    OBJECT_PROPERTIES_GET_CURRENT = "viewer-object-properties-get-current",
-    OBJECT_PROPERTIES_CHANGED = "viewer-object-properties-changed",
     LINKED_OBJECTS_GET_LIST = "viewer-linked-objects-get-list",
     LINKED_OBJECTS_LIST = "viewer-linked-objects-list",
     STATES_OBJECTS_GET_LIST = "viewer-states-objects-get-list",
@@ -91,8 +87,8 @@ type SheetListItem = {
     viewId?: string;
 };
 type ObjectPropertyItem = Record<string, unknown>;
-type ObjectPropertiesChangedPayload = {
-    requestId?: string;
+type ObjectPropertiesListPayload = {
+    requestId: string;
     selectionKey: string;
     nodeIds: string[];
     persistentIds: string[];
@@ -181,12 +177,7 @@ type ViewerEventMap = {
         activeSheetId?: string | number | null;
         timestamp: number;
     };
-    "object-properties:list": {
-        requestId: string;
-        properties: ObjectPropertyItem[];
-        timestamp: number;
-    };
-    "object-properties:changed": ObjectPropertiesChangedPayload;
+    "object-properties:list": ObjectPropertiesListPayload;
     "linked-objects:list": {
         requestId: string;
         linkedObjects: LinkedObjectItem[];
@@ -339,10 +330,17 @@ type ConvertV2Options = {
     project?: string;
     convertOptions?: Partial<StreamConvertOptions>;
 };
-type FileInfoCheckInput = string | string[];
 type FileInfoCheckPayloadItem = {
     baseFileId: string;
+    baseMajorRev: number;
+    baseMinorRev: number;
 };
+type FileInfoCheckInputItem = string | {
+    baseFileId: string;
+    baseMajorRev?: number;
+    baseMinorRev?: number;
+};
+type FileInfoCheckInput = FileInfoCheckInputItem | FileInfoCheckInputItem[];
 type StreamConvertOptions = {
     convert3DModel: number;
     convert2DSheet: number;
@@ -435,6 +433,9 @@ type ToolbarFormat = "3d" | "pdf";
 type GetSheetsOptions = {
     timeoutMs?: number;
 };
+type GetObjectPropertiesOptions = GetSheetsOptions & {
+    nodeIds?: Array<string | number>;
+};
 declare class ToolbarModule {
     private viewer;
     on: {
@@ -497,7 +498,7 @@ declare class ToolbarModule {
     openSheets(): void;
     closeSheets(): void;
     getSheets(options?: GetSheetsOptions): Promise<SheetListItem[]>;
-    getObjectProperties(options?: GetSheetsOptions): Promise<ObjectPropertyItem[]>;
+    getObjectProperties(options?: GetObjectPropertiesOptions): Promise<ObjectPropertyItem[]>;
     getLinkedObjects(options?: GetSheetsOptions): Promise<LinkedObjectItem[]>;
     getStatesObjects(options?: GetSheetsOptions): Promise<StateObjectItem[]>;
     applySheet(sheetId: string | number): void;
@@ -587,24 +588,17 @@ declare class LanguageModule {
     set(language: LanguageCode): void;
 }
 
-type ObjectPropertiesWatchOptions = {
-    debounceMs?: number;
-    includeSelectionMeta?: boolean;
-};
-type ObjectPropertiesGetCurrentOptions = ObjectPropertiesWatchOptions & {
+type ObjectPropertiesGetOptions = {
     timeoutMs?: number;
+    expandToRealNodes?: boolean;
+    includeSelectionMeta?: boolean;
 };
-type ObjectPropertiesChangedEvent = ObjectPropertiesChangedPayload;
+type ObjectPropertiesResult = ObjectPropertiesListPayload;
 declare class ObjectPropertiesModule {
     private viewer;
-    private pendingGetCurrent;
-    on: {
-        change: (cb: (payload: ObjectPropertiesChangedEvent) => void) => () => void;
-    };
     constructor(viewer: Viewer3D);
-    watch(options?: ObjectPropertiesWatchOptions): void;
-    unwatch(): void;
-    getCurrent(options?: ObjectPropertiesGetCurrentOptions): Promise<ObjectPropertiesChangedEvent>;
+    get(nodeIds: Array<string | number>, options?: ObjectPropertiesGetOptions): Promise<ObjectPropertiesResult>;
+    getByNodeIds(nodeIds: Array<string | number>, options?: ObjectPropertiesGetOptions): Promise<ObjectPropertiesResult>;
 }
 
 type InitialToolbarUse = ToolbarUseTarget | ToolbarUseTarget[] | Partial<Record<ToolbarUseTarget, boolean>>;
@@ -655,4 +649,4 @@ declare class Viewer3D {
     private handleMessage;
 }
 
-export { type CameraZoomPayload, type ConvertOptions, type ConvertV2Options, type FileInfoCheckInput, type FileInfoCheckPayloadItem, type FilesConfig, type InitialToolbarUse, type LanguageCode, type LoadStage, type LoadStatePayload, type MarkupAction, type MarkupListItem, type MarkupOperationResultPayload, type ObjectPropertiesChangedEvent, type ObjectPropertiesGetCurrentOptions, type ObjectPropertiesWatchOptions, type PreparedViewerData, Viewer3D };
+export { type CameraZoomPayload, type ConvertOptions, type ConvertV2Options, type FileInfoCheckInput, type FileInfoCheckPayloadItem, type FilesConfig, type InitialToolbarUse, type LanguageCode, type LoadStage, type LoadStatePayload, type MarkupAction, type MarkupListItem, type MarkupOperationResultPayload, type ObjectPropertiesGetOptions, type ObjectPropertiesResult, type PreparedViewerData, Viewer3D };

package/dist/index.js

@@ -488,11 +488,25 @@ var FilesModule = class {
     };
   }
   buildFileInfoPayload(baseFileIds) {
-    const ids = (Array.isArray(baseFileIds) ? baseFileIds : [baseFileIds]).map((baseFileId) => String(baseFileId).trim()).filter(Boolean);
-    if (ids.length === 0) {
+    const payload = (Array.isArray(baseFileIds) ? baseFileIds : [baseFileIds]).map((item) => {
+      var _a, _b, _c;
+      if (typeof item === "string") {
+        return {
+          baseFileId: item.trim(),
+          baseMajorRev: 0,
+          baseMinorRev: 0
+        };
+      }
+      return {
+        baseFileId: String((_a = item.baseFileId) != null ? _a : "").trim(),
+        baseMajorRev: (_b = item.baseMajorRev) != null ? _b : 0,
+        baseMinorRev: (_c = item.baseMinorRev) != null ? _c : 0
+      };
+    }).filter((item) => item.baseFileId);
+    if (payload.length === 0) {
       throw new Error("No baseFileId provided");
     }
-    return ids.map((baseFileId) => ({ baseFileId }));
+    return payload;
   }
   // Submit conversion/caching request and return service response.
   async cacheFile(file, baseFileId, options = {}) {
@@ -792,6 +806,7 @@ var ToolbarModule = class {
     const requestId = createRequestId2("object_properties");
     const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 1e4);
     return new Promise((resolve, reject) => {
+      var _a2;
       const timer = setTimeout(() => {
         off();
         reject(new Error("Timeout while getting object properties list from viewer"));
@@ -802,7 +817,10 @@ var ToolbarModule = class {
         off();
         resolve(payload.properties);
       });
-      this.postObjectPropertiesGetList({ requestId });
+      this.postObjectPropertiesGetList({
+        requestId,
+        nodeIds: Array.from(new Set(((_a2 = options == null ? void 0 : options.nodeIds) != null ? _a2 : []).map(String).filter(Boolean)))
+      });
     });
   }
   getLinkedObjects(options) {
@@ -1161,8 +1179,7 @@ var LanguageModule = class {
 };
 
 // src/modules/object-properties.module.ts
-var OBJECT_PROPERTIES_CANCELLED_ERROR = "Object properties request cancelled";
-var OBJECT_PROPERTIES_TIMEOUT_ERROR = "No object properties";
+var OBJECT_PROPERTIES_TIMEOUT_ERROR = "Timeout while getting object properties from viewer";
 function createObjectPropertiesError(message, errorStatus) {
   const error = new Error(message);
   error.name = "ObjectPropertiesError";
@@ -1172,57 +1189,55 @@ function createObjectPropertiesError(message, errorStatus) {
 function createRequestId5(prefix) {
   return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
 }
+function normalizeNodeIds(nodeIds) {
+  return Array.from(new Set(
+    nodeIds.map((nodeId) => String(nodeId).trim()).filter((nodeId) => nodeId !== "")
+  ));
+}
 var ObjectPropertiesModule = class {
   constructor(viewer) {
     this.viewer = viewer;
-    this.on = {
-      change: (cb) => this.viewer._on("object-properties:changed", cb)
-    };
   }
-  watch(options) {
-    const payload = {};
-    if (typeof (options == null ? void 0 : options.debounceMs) === "number" && Number.isFinite(options.debounceMs)) {
-      payload.debounceMs = options.debounceMs;
-    }
-    if (typeof (options == null ? void 0 : options.includeSelectionMeta) === "boolean") {
-      payload.includeSelectionMeta = options.includeSelectionMeta;
-    }
-    this.viewer.postToViewer("viewer-object-properties-watch" /* OBJECT_PROPERTIES_WATCH */, payload);
-  }
-  unwatch() {
-    this.viewer.postToViewer("viewer-object-properties-unwatch" /* OBJECT_PROPERTIES_UNWATCH */, {});
+  get(nodeIds, options) {
+    return this.getByNodeIds(nodeIds, options);
   }
-  getCurrent(options) {
+  getByNodeIds(nodeIds, options) {
     var _a;
-    if (this.pendingGetCurrent) {
-      clearTimeout(this.pendingGetCurrent.timer);
-      this.pendingGetCurrent.off();
-      this.pendingGetCurrent.reject(
-        createObjectPropertiesError(OBJECT_PROPERTIES_CANCELLED_ERROR, "CANCELLED")
-      );
-      this.pendingGetCurrent = void 0;
+    const normalizedNodeIds = normalizeNodeIds(nodeIds);
+    const requestId = createRequestId5("object_properties");
+    if (normalizedNodeIds.length === 0) {
+      return Promise.resolve({
+        requestId,
+        selectionKey: "",
+        nodeIds: [],
+        persistentIds: [],
+        properties: [],
+        timestamp: Date.now()
+      });
     }
-    const requestId = createRequestId5("object_properties_current");
-    const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 1e4);
+    const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 12e4);
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
-        this.pendingGetCurrent = void 0;
         off();
         reject(createObjectPropertiesError(OBJECT_PROPERTIES_TIMEOUT_ERROR, "TIMEOUT"));
       }, timeoutMs);
-      const off = this.viewer._on("object-properties:changed", (payload2) => {
+      const off = this.viewer._on("object-properties:list", (payload2) => {
         if (payload2.requestId !== requestId) return;
         clearTimeout(timer);
-        this.pendingGetCurrent = void 0;
         off();
         resolve(payload2);
       });
-      this.pendingGetCurrent = { requestId, off, timer, reject };
-      const payload = { requestId };
+      const payload = {
+        requestId,
+        nodeIds: normalizedNodeIds
+      };
+      if (typeof (options == null ? void 0 : options.expandToRealNodes) === "boolean") {
+        payload.expandToRealNodes = options.expandToRealNodes;
+      }
       if (typeof (options == null ? void 0 : options.includeSelectionMeta) === "boolean") {
         payload.includeSelectionMeta = options.includeSelectionMeta;
       }
-      this.viewer.postToViewer("viewer-object-properties-get-current" /* OBJECT_PROPERTIES_GET_CURRENT */, payload);
+      this.viewer.postToViewer("viewer-object-properties-get-list" /* OBJECT_PROPERTIES_GET_LIST */, payload);
     });
   }
 };
@@ -1374,16 +1389,6 @@ var Viewer3D = class {
           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-object-properties-changed" /* OBJECT_PROPERTIES_CHANGED */: {
-          const payload = data.payload;
-          if (!payload || !Array.isArray(payload.properties)) break;
-          this._emit("object-properties:changed", {
-            requestId: payload.requestId ? String(payload.requestId) : void 0,
             selectionKey: String((_e = payload.selectionKey) != null ? _e : ""),
             nodeIds: Array.isArray(payload.nodeIds) ? payload.nodeIds.map(String) : [],
             persistentIds: Array.isArray(payload.persistentIds) ? payload.persistentIds.map(String) : [],

package/dist/index.mjs

@@ -462,11 +462,25 @@ var FilesModule = class {
     };
   }
   buildFileInfoPayload(baseFileIds) {
-    const ids = (Array.isArray(baseFileIds) ? baseFileIds : [baseFileIds]).map((baseFileId) => String(baseFileId).trim()).filter(Boolean);
-    if (ids.length === 0) {
+    const payload = (Array.isArray(baseFileIds) ? baseFileIds : [baseFileIds]).map((item) => {
+      var _a, _b, _c;
+      if (typeof item === "string") {
+        return {
+          baseFileId: item.trim(),
+          baseMajorRev: 0,
+          baseMinorRev: 0
+        };
+      }
+      return {
+        baseFileId: String((_a = item.baseFileId) != null ? _a : "").trim(),
+        baseMajorRev: (_b = item.baseMajorRev) != null ? _b : 0,
+        baseMinorRev: (_c = item.baseMinorRev) != null ? _c : 0
+      };
+    }).filter((item) => item.baseFileId);
+    if (payload.length === 0) {
       throw new Error("No baseFileId provided");
     }
-    return ids.map((baseFileId) => ({ baseFileId }));
+    return payload;
   }
   // Submit conversion/caching request and return service response.
   async cacheFile(file, baseFileId, options = {}) {
@@ -766,6 +780,7 @@ var ToolbarModule = class {
     const requestId = createRequestId2("object_properties");
     const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 1e4);
     return new Promise((resolve, reject) => {
+      var _a2;
       const timer = setTimeout(() => {
         off();
         reject(new Error("Timeout while getting object properties list from viewer"));
@@ -776,7 +791,10 @@ var ToolbarModule = class {
         off();
         resolve(payload.properties);
       });
-      this.postObjectPropertiesGetList({ requestId });
+      this.postObjectPropertiesGetList({
+        requestId,
+        nodeIds: Array.from(new Set(((_a2 = options == null ? void 0 : options.nodeIds) != null ? _a2 : []).map(String).filter(Boolean)))
+      });
     });
   }
   getLinkedObjects(options) {
@@ -1135,8 +1153,7 @@ var LanguageModule = class {
 };
 
 // src/modules/object-properties.module.ts
-var OBJECT_PROPERTIES_CANCELLED_ERROR = "Object properties request cancelled";
-var OBJECT_PROPERTIES_TIMEOUT_ERROR = "No object properties";
+var OBJECT_PROPERTIES_TIMEOUT_ERROR = "Timeout while getting object properties from viewer";
 function createObjectPropertiesError(message, errorStatus) {
   const error = new Error(message);
   error.name = "ObjectPropertiesError";
@@ -1146,57 +1163,55 @@ function createObjectPropertiesError(message, errorStatus) {
 function createRequestId5(prefix) {
   return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
 }
+function normalizeNodeIds(nodeIds) {
+  return Array.from(new Set(
+    nodeIds.map((nodeId) => String(nodeId).trim()).filter((nodeId) => nodeId !== "")
+  ));
+}
 var ObjectPropertiesModule = class {
   constructor(viewer) {
     this.viewer = viewer;
-    this.on = {
-      change: (cb) => this.viewer._on("object-properties:changed", cb)
-    };
   }
-  watch(options) {
-    const payload = {};
-    if (typeof (options == null ? void 0 : options.debounceMs) === "number" && Number.isFinite(options.debounceMs)) {
-      payload.debounceMs = options.debounceMs;
-    }
-    if (typeof (options == null ? void 0 : options.includeSelectionMeta) === "boolean") {
-      payload.includeSelectionMeta = options.includeSelectionMeta;
-    }
-    this.viewer.postToViewer("viewer-object-properties-watch" /* OBJECT_PROPERTIES_WATCH */, payload);
-  }
-  unwatch() {
-    this.viewer.postToViewer("viewer-object-properties-unwatch" /* OBJECT_PROPERTIES_UNWATCH */, {});
+  get(nodeIds, options) {
+    return this.getByNodeIds(nodeIds, options);
   }
-  getCurrent(options) {
+  getByNodeIds(nodeIds, options) {
     var _a;
-    if (this.pendingGetCurrent) {
-      clearTimeout(this.pendingGetCurrent.timer);
-      this.pendingGetCurrent.off();
-      this.pendingGetCurrent.reject(
-        createObjectPropertiesError(OBJECT_PROPERTIES_CANCELLED_ERROR, "CANCELLED")
-      );
-      this.pendingGetCurrent = void 0;
+    const normalizedNodeIds = normalizeNodeIds(nodeIds);
+    const requestId = createRequestId5("object_properties");
+    if (normalizedNodeIds.length === 0) {
+      return Promise.resolve({
+        requestId,
+        selectionKey: "",
+        nodeIds: [],
+        persistentIds: [],
+        properties: [],
+        timestamp: Date.now()
+      });
     }
-    const requestId = createRequestId5("object_properties_current");
-    const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 1e4);
+    const timeoutMs = Math.max(1e3, (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : 12e4);
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
-        this.pendingGetCurrent = void 0;
         off();
         reject(createObjectPropertiesError(OBJECT_PROPERTIES_TIMEOUT_ERROR, "TIMEOUT"));
       }, timeoutMs);
-      const off = this.viewer._on("object-properties:changed", (payload2) => {
+      const off = this.viewer._on("object-properties:list", (payload2) => {
         if (payload2.requestId !== requestId) return;
         clearTimeout(timer);
-        this.pendingGetCurrent = void 0;
         off();
         resolve(payload2);
       });
-      this.pendingGetCurrent = { requestId, off, timer, reject };
-      const payload = { requestId };
+      const payload = {
+        requestId,
+        nodeIds: normalizedNodeIds
+      };
+      if (typeof (options == null ? void 0 : options.expandToRealNodes) === "boolean") {
+        payload.expandToRealNodes = options.expandToRealNodes;
+      }
       if (typeof (options == null ? void 0 : options.includeSelectionMeta) === "boolean") {
         payload.includeSelectionMeta = options.includeSelectionMeta;
       }
-      this.viewer.postToViewer("viewer-object-properties-get-current" /* OBJECT_PROPERTIES_GET_CURRENT */, payload);
+      this.viewer.postToViewer("viewer-object-properties-get-list" /* OBJECT_PROPERTIES_GET_LIST */, payload);
     });
   }
 };
@@ -1348,16 +1363,6 @@ var Viewer3D = class {
           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-object-properties-changed" /* OBJECT_PROPERTIES_CHANGED */: {
-          const payload = data.payload;
-          if (!payload || !Array.isArray(payload.properties)) break;
-          this._emit("object-properties:changed", {
-            requestId: payload.requestId ? String(payload.requestId) : void 0,
             selectionKey: String((_e = payload.selectionKey) != null ? _e : ""),
             nodeIds: Array.isArray(payload.nodeIds) ? payload.nodeIds.map(String) : [],
             persistentIds: Array.isArray(payload.persistentIds) ? payload.persistentIds.map(String) : [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3dviewer-sdk",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [