3dviewer-sdk 1.0.3 → 1.0.6

package/dist/index.d.mts

@@ -236,6 +236,23 @@ type FilesConfig = {
 type ConvertOptions = {
     downloadUrl?: string;
 };
+type ConvertV2Options = {
+    filename: string;
+    originalFilePath: string;
+    downloadUrl: string;
+    baseFileId: string;
+    baseMajorRev?: number;
+    baseMinorRev?: number;
+    overwrite?: boolean;
+    project?: string;
+    convertOptions?: Partial<StreamConvertOptions>;
+};
+type StreamConvertOptions = {
+    convert3DModel: number;
+    convert2DSheet: number;
+    extractProperties: number;
+    childModels: number;
+};
 declare class FilesModule {
     private viewer;
     on: {
@@ -287,6 +304,7 @@ declare class FilesModule {
     }>;
     convert(file?: File, options?: ConvertOptions): Promise<PreparedViewerData>;
     prepare(file?: File, options?: ConvertOptions): Promise<PreparedViewerData>;
+    convertV2(options: ConvertV2Options): Promise<PreparedViewerData>;
     open(input: PreparedViewerData | {
         url: string;
     }): void;
@@ -297,6 +315,7 @@ declare class FilesModule {
     private resolveViewerPath;
     private resolveViewerOrigin;
     private resolveHostConversion;
+    private resolveApiRoot;
     private getUploadPath;
     private fileSignature;
     private createBaseFileId;
@@ -304,8 +323,11 @@ declare class FilesModule {
     private getUploadSessionForFile;
     private uploadInternal;
     private buildCachePayload;
+    private buildConvertV2Payload;
     private cacheFile;
+    private cacheFileV2;
     private convertInternal;
+    private convertV2Internal;
     private updateState;
     private withOperation;
     private toErrorMessage;
@@ -478,4 +500,4 @@ declare class Viewer3D {
     private handleMessage;
 }
 
-export { type ConvertOptions, type FilesConfig, type LanguageCode, type LoadStage, type LoadStatePayload, type MarkupAction, type MarkupListItem, type MarkupOperationResultPayload, type PreparedViewerData, Viewer3D };
+export { type ConvertOptions, type ConvertV2Options, type FilesConfig, type LanguageCode, type LoadStage, type LoadStatePayload, type MarkupAction, type MarkupListItem, type MarkupOperationResultPayload, type PreparedViewerData, Viewer3D };

package/dist/index.d.ts

@@ -236,6 +236,23 @@ type FilesConfig = {
 type ConvertOptions = {
     downloadUrl?: string;
 };
+type ConvertV2Options = {
+    filename: string;
+    originalFilePath: string;
+    downloadUrl: string;
+    baseFileId: string;
+    baseMajorRev?: number;
+    baseMinorRev?: number;
+    overwrite?: boolean;
+    project?: string;
+    convertOptions?: Partial<StreamConvertOptions>;
+};
+type StreamConvertOptions = {
+    convert3DModel: number;
+    convert2DSheet: number;
+    extractProperties: number;
+    childModels: number;
+};
 declare class FilesModule {
     private viewer;
     on: {
@@ -287,6 +304,7 @@ declare class FilesModule {
     }>;
     convert(file?: File, options?: ConvertOptions): Promise<PreparedViewerData>;
     prepare(file?: File, options?: ConvertOptions): Promise<PreparedViewerData>;
+    convertV2(options: ConvertV2Options): Promise<PreparedViewerData>;
     open(input: PreparedViewerData | {
         url: string;
     }): void;
@@ -297,6 +315,7 @@ declare class FilesModule {
     private resolveViewerPath;
     private resolveViewerOrigin;
     private resolveHostConversion;
+    private resolveApiRoot;
     private getUploadPath;
     private fileSignature;
     private createBaseFileId;
@@ -304,8 +323,11 @@ declare class FilesModule {
     private getUploadSessionForFile;
     private uploadInternal;
     private buildCachePayload;
+    private buildConvertV2Payload;
     private cacheFile;
+    private cacheFileV2;
     private convertInternal;
+    private convertV2Internal;
     private updateState;
     private withOperation;
     private toErrorMessage;
@@ -478,4 +500,4 @@ declare class Viewer3D {
     private handleMessage;
 }
 
-export { type ConvertOptions, type FilesConfig, type LanguageCode, type LoadStage, type LoadStatePayload, type MarkupAction, type MarkupListItem, type MarkupOperationResultPayload, type PreparedViewerData, Viewer3D };
+export { type ConvertOptions, type ConvertV2Options, type FilesConfig, type LanguageCode, type LoadStage, type LoadStatePayload, type MarkupAction, type MarkupListItem, type MarkupOperationResultPayload, type PreparedViewerData, Viewer3D };

package/dist/index.js

@@ -217,6 +217,20 @@ var FilesModule = class {
       return prepared;
     });
   }
+  // Trigger the newer downloadUrl-based conversion flow.
+  async convertV2(options) {
+    return this.withOperation({ stage: "converting", message: "Converting file..." }, async () => {
+      this.viewer._emit("files:conversion:start", { fileName: options.filename });
+      try {
+        const prepared = await this.convertV2Internal(options);
+        this.viewer._emit("files:conversion:success", prepared);
+        return prepared;
+      } catch (e) {
+        this.viewer._emit("files:conversion:error", { fileName: options.filename, error: this.toErrorMessage(e) });
+        throw e;
+      }
+    });
+  }
   // Open iframe with an already prepared viewer URL.
   open(input) {
     const url = input.url;
@@ -273,6 +287,10 @@ var FilesModule = class {
     const baseUrl = this.resolveBaseUrl();
     return baseUrl.endsWith("/service/conversion") ? baseUrl : `${baseUrl}/service/conversion`;
   }
+  // Newer convert endpoint is served from the API root, not /service/conversion.
+  resolveApiRoot() {
+    return this.resolveBaseUrl();
+  }
   // Resolve upload path sent to conversion APIs.
   getUploadPath() {
     return this.config.uploadPath || this.viewer.getOptions().uploadPath || ".";
@@ -374,6 +392,26 @@ var FilesModule = class {
       attemptedConvertTimes: 0
     };
   }
+  // Build payload for POST /api/StreamFile/convert.
+  buildConvertV2Payload(options) {
+    var _a, _b;
+    const convertOptions = {
+      convert3DModel: 1,
+      convert2DSheet: 1,
+      extractProperties: 1,
+      childModels: 0,
+      ...options.convertOptions
+    };
+    return {
+      filename: options.filename,
+      originalFilePath: options.originalFilePath,
+      convertOptions,
+      downloadUrl: options.downloadUrl,
+      baseFileId: options.baseFileId,
+      baseMajorRev: (_a = options.baseMajorRev) != null ? _a : 0,
+      baseMinorRev: (_b = options.baseMinorRev) != null ? _b : 0
+    };
+  }
   // Submit conversion/caching request and return service response.
   async cacheFile(file, baseFileId, options = {}) {
     const hostConversion = await this.resolveHostConversion();
@@ -394,6 +432,34 @@ var FilesModule = class {
     }
     return await response.json();
   }
+  // Submit conversion request to the newer downloadUrl-based endpoint.
+  async cacheFileV2(options) {
+    const apiRoot = await this.resolveApiRoot();
+    const params = new URLSearchParams();
+    if (typeof options.overwrite === "boolean") {
+      params.set("overwrite", String(options.overwrite));
+    }
+    if (options.project) {
+      params.set("project", options.project);
+    }
+    const query = params.toString();
+    const url = `${apiRoot}/api/StreamFile/convert${query ? `?${query}` : ""}`;
+    const payload = this.buildConvertV2Payload(options);
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json"
+      },
+      body: JSON.stringify(payload)
+    });
+    if (!response.ok) {
+      throw new Error(
+        `Cache/convert v2 failed (${response.status} ${response.statusText})`
+      );
+    }
+    return await response.json();
+  }
   // Convert file and generate final iframe URL with query string.
   async convertInternal(file, options = {}) {
     var _a, _b, _c, _d;
@@ -404,7 +470,7 @@ var FilesModule = class {
     const baseFileId = (_a = cacheResult.baseFileId) != null ? _a : seedBaseFileId;
     const baseMajorRev = (_b = cacheResult.baseMajorRev) != null ? _b : 0;
     const baseMinorRev = (_c = cacheResult.baseMinorRev) != null ? _c : 0;
-    const fileName = cacheResult.filename || file.name;
+    const fileName = cacheResult.filename || cacheResult.fileName || file.name;
     const cacheListItem = { baseFileId, baseMajorRev, baseMinorRev, fileName };
     if (cacheResult.cacheStatus !== 2) {
       throw new Error(`Conversion not ready after first request (cacheStatus=${(_d = cacheResult.cacheStatus) != null ? _d : "unknown"})`);
@@ -415,6 +481,24 @@ var FilesModule = class {
     const url = `${viewerBase}${viewerPath}?${query}`;
     return { baseFileId, baseMajorRev, baseMinorRev, fileName, query, url };
   }
+  async convertV2Internal(options) {
+    var _a, _b, _c, _d, _e;
+    this.updateState({ stage: "converting", message: "Converting file..." });
+    const cacheResult = await this.cacheFileV2(options);
+    const baseFileId = (_a = cacheResult.baseFileId) != null ? _a : options.baseFileId;
+    const baseMajorRev = (_c = (_b = cacheResult.baseMajorRev) != null ? _b : options.baseMajorRev) != null ? _c : 0;
+    const baseMinorRev = (_e = (_d = cacheResult.baseMinorRev) != null ? _d : options.baseMinorRev) != null ? _e : 0;
+    const fileName = cacheResult.filename || cacheResult.fileName || options.filename;
+    if (cacheResult.cacheStatus !== void 0 && cacheResult.cacheStatus !== 2) {
+      throw new Error(`Conversion not ready after v2 request (cacheStatus=${cacheResult.cacheStatus})`);
+    }
+    const cacheListItem = { baseFileId, baseMajorRev, baseMinorRev, fileName };
+    const query = new URLSearchParams({ fileList: JSON.stringify([cacheListItem]) }).toString();
+    const viewerBase = this.resolveViewerOrigin();
+    const viewerPath = this.resolveViewerPath();
+    const url = `${viewerBase}${viewerPath}?${query}`;
+    return { baseFileId, baseMajorRev, baseMinorRev, fileName, query, url };
+  }
   // Update internal loading state and emit state event.
   updateState(next) {
     const elapsedMs = this.operationStartTime > 0 ? Date.now() - this.operationStartTime : 0;

package/dist/index.mjs

@@ -191,6 +191,20 @@ var FilesModule = class {
       return prepared;
     });
   }
+  // Trigger the newer downloadUrl-based conversion flow.
+  async convertV2(options) {
+    return this.withOperation({ stage: "converting", message: "Converting file..." }, async () => {
+      this.viewer._emit("files:conversion:start", { fileName: options.filename });
+      try {
+        const prepared = await this.convertV2Internal(options);
+        this.viewer._emit("files:conversion:success", prepared);
+        return prepared;
+      } catch (e) {
+        this.viewer._emit("files:conversion:error", { fileName: options.filename, error: this.toErrorMessage(e) });
+        throw e;
+      }
+    });
+  }
   // Open iframe with an already prepared viewer URL.
   open(input) {
     const url = input.url;
@@ -247,6 +261,10 @@ var FilesModule = class {
     const baseUrl = this.resolveBaseUrl();
     return baseUrl.endsWith("/service/conversion") ? baseUrl : `${baseUrl}/service/conversion`;
   }
+  // Newer convert endpoint is served from the API root, not /service/conversion.
+  resolveApiRoot() {
+    return this.resolveBaseUrl();
+  }
   // Resolve upload path sent to conversion APIs.
   getUploadPath() {
     return this.config.uploadPath || this.viewer.getOptions().uploadPath || ".";
@@ -348,6 +366,26 @@ var FilesModule = class {
       attemptedConvertTimes: 0
     };
   }
+  // Build payload for POST /api/StreamFile/convert.
+  buildConvertV2Payload(options) {
+    var _a, _b;
+    const convertOptions = {
+      convert3DModel: 1,
+      convert2DSheet: 1,
+      extractProperties: 1,
+      childModels: 0,
+      ...options.convertOptions
+    };
+    return {
+      filename: options.filename,
+      originalFilePath: options.originalFilePath,
+      convertOptions,
+      downloadUrl: options.downloadUrl,
+      baseFileId: options.baseFileId,
+      baseMajorRev: (_a = options.baseMajorRev) != null ? _a : 0,
+      baseMinorRev: (_b = options.baseMinorRev) != null ? _b : 0
+    };
+  }
   // Submit conversion/caching request and return service response.
   async cacheFile(file, baseFileId, options = {}) {
     const hostConversion = await this.resolveHostConversion();
@@ -368,6 +406,34 @@ var FilesModule = class {
     }
     return await response.json();
   }
+  // Submit conversion request to the newer downloadUrl-based endpoint.
+  async cacheFileV2(options) {
+    const apiRoot = await this.resolveApiRoot();
+    const params = new URLSearchParams();
+    if (typeof options.overwrite === "boolean") {
+      params.set("overwrite", String(options.overwrite));
+    }
+    if (options.project) {
+      params.set("project", options.project);
+    }
+    const query = params.toString();
+    const url = `${apiRoot}/api/StreamFile/convert${query ? `?${query}` : ""}`;
+    const payload = this.buildConvertV2Payload(options);
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json"
+      },
+      body: JSON.stringify(payload)
+    });
+    if (!response.ok) {
+      throw new Error(
+        `Cache/convert v2 failed (${response.status} ${response.statusText})`
+      );
+    }
+    return await response.json();
+  }
   // Convert file and generate final iframe URL with query string.
   async convertInternal(file, options = {}) {
     var _a, _b, _c, _d;
@@ -378,7 +444,7 @@ var FilesModule = class {
     const baseFileId = (_a = cacheResult.baseFileId) != null ? _a : seedBaseFileId;
     const baseMajorRev = (_b = cacheResult.baseMajorRev) != null ? _b : 0;
     const baseMinorRev = (_c = cacheResult.baseMinorRev) != null ? _c : 0;
-    const fileName = cacheResult.filename || file.name;
+    const fileName = cacheResult.filename || cacheResult.fileName || file.name;
     const cacheListItem = { baseFileId, baseMajorRev, baseMinorRev, fileName };
     if (cacheResult.cacheStatus !== 2) {
       throw new Error(`Conversion not ready after first request (cacheStatus=${(_d = cacheResult.cacheStatus) != null ? _d : "unknown"})`);
@@ -389,6 +455,24 @@ var FilesModule = class {
     const url = `${viewerBase}${viewerPath}?${query}`;
     return { baseFileId, baseMajorRev, baseMinorRev, fileName, query, url };
   }
+  async convertV2Internal(options) {
+    var _a, _b, _c, _d, _e;
+    this.updateState({ stage: "converting", message: "Converting file..." });
+    const cacheResult = await this.cacheFileV2(options);
+    const baseFileId = (_a = cacheResult.baseFileId) != null ? _a : options.baseFileId;
+    const baseMajorRev = (_c = (_b = cacheResult.baseMajorRev) != null ? _b : options.baseMajorRev) != null ? _c : 0;
+    const baseMinorRev = (_e = (_d = cacheResult.baseMinorRev) != null ? _d : options.baseMinorRev) != null ? _e : 0;
+    const fileName = cacheResult.filename || cacheResult.fileName || options.filename;
+    if (cacheResult.cacheStatus !== void 0 && cacheResult.cacheStatus !== 2) {
+      throw new Error(`Conversion not ready after v2 request (cacheStatus=${cacheResult.cacheStatus})`);
+    }
+    const cacheListItem = { baseFileId, baseMajorRev, baseMinorRev, fileName };
+    const query = new URLSearchParams({ fileList: JSON.stringify([cacheListItem]) }).toString();
+    const viewerBase = this.resolveViewerOrigin();
+    const viewerPath = this.resolveViewerPath();
+    const url = `${viewerBase}${viewerPath}?${query}`;
+    return { baseFileId, baseMajorRev, baseMinorRev, fileName, query, url };
+  }
   // Update internal loading state and emit state event.
   updateState(next) {
     const elapsedMs = this.operationStartTime > 0 ? Date.now() - this.operationStartTime : 0;

package/dist/modules/files.module.d.ts

@@ -8,6 +8,23 @@ export declare type FilesConfig = {
 export declare type ConvertOptions = {
     downloadUrl?: string;
 };
+export declare type ConvertV2Options = {
+    filename: string;
+    originalFilePath: string;
+    downloadUrl: string;
+    baseFileId: string;
+    baseMajorRev?: number;
+    baseMinorRev?: number;
+    overwrite?: boolean;
+    project?: string;
+    convertOptions?: Partial<StreamConvertOptions>;
+};
+declare type StreamConvertOptions = {
+    convert3DModel: number;
+    convert2DSheet: number;
+    extractProperties: number;
+    childModels: number;
+};
 export declare class FilesModule {
     private viewer;
     on: {
@@ -59,6 +76,7 @@ export declare class FilesModule {
     }>;
     convert(file?: File, options?: ConvertOptions): Promise<PreparedViewerData>;
     prepare(file?: File, options?: ConvertOptions): Promise<PreparedViewerData>;
+    convertV2(options: ConvertV2Options): Promise<PreparedViewerData>;
     open(input: PreparedViewerData | {
         url: string;
     }): void;
@@ -69,6 +87,7 @@ export declare class FilesModule {
     private resolveViewerPath;
     private resolveViewerOrigin;
     private resolveHostConversion;
+    private resolveApiRoot;
     private getUploadPath;
     private fileSignature;
     private createBaseFileId;
@@ -76,9 +95,13 @@ export declare class FilesModule {
     private getUploadSessionForFile;
     private uploadInternal;
     private buildCachePayload;
+    private buildConvertV2Payload;
     private cacheFile;
+    private cacheFileV2;
     private convertInternal;
+    private convertV2Internal;
     private updateState;
     private withOperation;
     private toErrorMessage;
 }
+export {};

package/dist/modules/files.module.js

@@ -72,6 +72,21 @@ export class FilesModule {
             return prepared;
         });
     }
+    // Trigger the newer downloadUrl-based conversion flow.
+    async convertV2(options) {
+        return this.withOperation({ stage: "converting", message: "Converting file..." }, async () => {
+            this.viewer._emit("files:conversion:start", { fileName: options.filename });
+            try {
+                const prepared = await this.convertV2Internal(options);
+                this.viewer._emit("files:conversion:success", prepared);
+                return prepared;
+            }
+            catch (e) {
+                this.viewer._emit("files:conversion:error", { fileName: options.filename, error: this.toErrorMessage(e) });
+                throw e;
+            }
+        });
+    }
     // Open iframe with an already prepared viewer URL.
     open(input) {
         const url = input.url;
@@ -133,6 +148,10 @@ export class FilesModule {
         const baseUrl = this.resolveBaseUrl();
         return baseUrl.endsWith("/service/conversion") ? baseUrl : `${baseUrl}/service/conversion`;
     }
+    // Newer convert endpoint is served from the API root, not /service/conversion.
+    resolveApiRoot() {
+        return this.resolveBaseUrl();
+    }
     // Resolve upload path sent to conversion APIs.
     getUploadPath() {
         return this.config.uploadPath || this.viewer.getOptions().uploadPath || ".";
@@ -239,6 +258,26 @@ export class FilesModule {
             attemptedConvertTimes: 0,
         };
     }
+    // Build payload for POST /api/StreamFile/convert.
+    buildConvertV2Payload(options) {
+        var _a, _b;
+        const convertOptions = {
+            convert3DModel: 1,
+            convert2DSheet: 1,
+            extractProperties: 1,
+            childModels: 0,
+            ...options.convertOptions,
+        };
+        return {
+            filename: options.filename,
+            originalFilePath: options.originalFilePath,
+            convertOptions,
+            downloadUrl: options.downloadUrl,
+            baseFileId: options.baseFileId,
+            baseMajorRev: (_a = options.baseMajorRev) !== null && _a !== void 0 ? _a : 0,
+            baseMinorRev: (_b = options.baseMinorRev) !== null && _b !== void 0 ? _b : 0,
+        };
+    }
     // Submit conversion/caching request and return service response.
     async cacheFile(file, baseFileId, options = {}) {
         const hostConversion = await this.resolveHostConversion();
@@ -257,6 +296,32 @@ export class FilesModule {
         }
         return (await response.json());
     }
+    // Submit conversion request to the newer downloadUrl-based endpoint.
+    async cacheFileV2(options) {
+        const apiRoot = await this.resolveApiRoot();
+        const params = new URLSearchParams();
+        if (typeof options.overwrite === "boolean") {
+            params.set("overwrite", String(options.overwrite));
+        }
+        if (options.project) {
+            params.set("project", options.project);
+        }
+        const query = params.toString();
+        const url = `${apiRoot}/api/StreamFile/convert${query ? `?${query}` : ""}`;
+        const payload = this.buildConvertV2Payload(options);
+        const response = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            },
+            body: JSON.stringify(payload),
+        });
+        if (!response.ok) {
+            throw new Error(`Cache/convert v2 failed (${response.status} ${response.statusText})`);
+        }
+        return (await response.json());
+    }
     // Convert file and generate final iframe URL with query string.
     async convertInternal(file, options = {}) {
         var _a, _b, _c, _d;
@@ -268,7 +333,7 @@ export class FilesModule {
         const baseFileId = (_a = cacheResult.baseFileId) !== null && _a !== void 0 ? _a : seedBaseFileId;
         const baseMajorRev = (_b = cacheResult.baseMajorRev) !== null && _b !== void 0 ? _b : 0;
         const baseMinorRev = (_c = cacheResult.baseMinorRev) !== null && _c !== void 0 ? _c : 0;
-        const fileName = cacheResult.filename || file.name;
+        const fileName = cacheResult.filename || cacheResult.fileName || file.name;
         const cacheListItem = { baseFileId, baseMajorRev, baseMinorRev, fileName };
         // Single-shot mode: one conversion request only, no polling retry.
         if (cacheResult.cacheStatus !== 2) {
@@ -281,6 +346,24 @@ export class FilesModule {
         const url = `${viewerBase}${viewerPath}?${query}`;
         return { baseFileId, baseMajorRev, baseMinorRev, fileName, query, url };
     }
+    async convertV2Internal(options) {
+        var _a, _b, _c, _d, _e;
+        this.updateState({ stage: "converting", message: "Converting file..." });
+        const cacheResult = await this.cacheFileV2(options);
+        const baseFileId = (_a = cacheResult.baseFileId) !== null && _a !== void 0 ? _a : options.baseFileId;
+        const baseMajorRev = (_c = (_b = cacheResult.baseMajorRev) !== null && _b !== void 0 ? _b : options.baseMajorRev) !== null && _c !== void 0 ? _c : 0;
+        const baseMinorRev = (_e = (_d = cacheResult.baseMinorRev) !== null && _d !== void 0 ? _d : options.baseMinorRev) !== null && _e !== void 0 ? _e : 0;
+        const fileName = cacheResult.filename || cacheResult.fileName || options.filename;
+        if (cacheResult.cacheStatus !== undefined && cacheResult.cacheStatus !== 2) {
+            throw new Error(`Conversion not ready after v2 request (cacheStatus=${cacheResult.cacheStatus})`);
+        }
+        const cacheListItem = { baseFileId, baseMajorRev, baseMinorRev, fileName };
+        const query = new URLSearchParams({ fileList: JSON.stringify([cacheListItem]) }).toString();
+        const viewerBase = this.resolveViewerOrigin();
+        const viewerPath = this.resolveViewerPath();
+        const url = `${viewerBase}${viewerPath}?${query}`;
+        return { baseFileId, baseMajorRev, baseMinorRev, fileName, query, url };
+    }
     // Update internal loading state and emit state event.
     updateState(next) {
         const elapsedMs = this.operationStartTime > 0 ? Date.now() - this.operationStartTime : 0;

package/package.json

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