3dviewer-sdk 1.0.13 → 1.0.15

package/dist/index.d.mts

@@ -270,6 +270,7 @@ declare class NodeModule {
 
 type FilesConfig = {
     baseUrl?: string;
+    conversionUrl?: string;
     viewerPath?: string;
     uploadPath?: string;
 };
@@ -280,6 +281,8 @@ type ConvertV2Options = {
     filename: string;
     originalFilePath: string;
     downloadUrl: string;
+    workflowId: string;
+    taskId: string;
     baseFileId: string;
     baseMajorRev?: number;
     baseMinorRev?: number;
@@ -356,7 +359,7 @@ declare class FilesModule {
     render(file?: File, options?: ConvertOptions): Promise<PreparedViewerData>;
     private resolveFile;
     private normalizeBaseUrl;
-    private resolveBaseUrl;
+    private resolveConversionUrl;
     private resolveViewerPath;
     private normalizeSdkViewerPath;
     private resolveViewerOrigin;
@@ -522,6 +525,7 @@ type Viewer3DOptions = {
     container: HTMLElement | string;
     url?: string;
     baseUrl?: string;
+    conversionUrl?: string;
     viewerPath?: string;
     uploadPath?: string;
     file?: File;

package/dist/index.d.ts

@@ -270,6 +270,7 @@ declare class NodeModule {
 
 type FilesConfig = {
     baseUrl?: string;
+    conversionUrl?: string;
     viewerPath?: string;
     uploadPath?: string;
 };
@@ -280,6 +281,8 @@ type ConvertV2Options = {
     filename: string;
     originalFilePath: string;
     downloadUrl: string;
+    workflowId: string;
+    taskId: string;
     baseFileId: string;
     baseMajorRev?: number;
     baseMinorRev?: number;
@@ -356,7 +359,7 @@ declare class FilesModule {
     render(file?: File, options?: ConvertOptions): Promise<PreparedViewerData>;
     private resolveFile;
     private normalizeBaseUrl;
-    private resolveBaseUrl;
+    private resolveConversionUrl;
     private resolveViewerPath;
     private normalizeSdkViewerPath;
     private resolveViewerOrigin;
@@ -522,6 +525,7 @@ type Viewer3DOptions = {
     container: HTMLElement | string;
     url?: string;
     baseUrl?: string;
+    conversionUrl?: string;
     viewerPath?: string;
     uploadPath?: string;
     file?: File;

package/dist/index.js

@@ -145,8 +145,8 @@ var NodeModule = class {
 };
 
 // src/modules/files.module.ts
-var DEFAULT_API_BASE_URL = "https://dev.3dviewer.anybim.vn";
-var DEFAULT_VIEWER_ORIGIN = "http://localhost:3000";
+var DEFAULT_CONVERSION_URL = "https://dev.3dviewer.anybim.vn/service/conversion";
+var DEFAULT_VIEWER_BASE_URL = "https://dev.3dviewer.anybim.vn";
 var SDK_VIEWER_PATH = "/mainviewer-sdk";
 var LEGACY_VIEWER_PATH = "/mainviewer";
 var FilesModule = class {
@@ -293,9 +293,9 @@ var FilesModule = class {
   normalizeBaseUrl(input) {
     return input.trim().replace(/\/+$/, "");
   }
-  // Resolve API base URL with default fallback.
-  resolveBaseUrl() {
-    const raw = this.config.baseUrl || this.viewer.getOptions().baseUrl || DEFAULT_API_BASE_URL;
+  // Resolve conversion API URL with default fallback.
+  resolveConversionUrl() {
+    const raw = this.config.conversionUrl || this.viewer.getOptions().conversionUrl || DEFAULT_CONVERSION_URL;
     return this.normalizeBaseUrl(raw);
   }
   // Resolve viewer route path for all SDK flows.
@@ -321,31 +321,26 @@ var FilesModule = class {
   }
   // Viewer host used to open iframe after conversion completes.
   resolveViewerOrigin() {
-    const viewerUrl = this.viewer.getOptions().url;
-    if (viewerUrl) {
+    const configuredViewerBaseUrl = this.config.baseUrl || this.viewer.getOptions().baseUrl;
+    if (configuredViewerBaseUrl) {
       try {
-        return this.normalizeBaseUrl(new URL(viewerUrl, window.location.href).origin);
+        return this.normalizeBaseUrl(new URL(configuredViewerBaseUrl, window.location.href).origin);
       } catch {
       }
     }
-    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 {
       }
     }
-    return this.normalizeBaseUrl(DEFAULT_VIEWER_ORIGIN);
+    return this.normalizeBaseUrl(DEFAULT_VIEWER_BASE_URL);
   }
-  // Build conversion service root from API base URL.
+  // Resolve conversion service root from configured conversion URL.
+  // Do not auto-append path segments (e.g. "/service/conversion").
   resolveHostConversion() {
-    const baseUrl = this.resolveBaseUrl();
-    try {
-      const parsed = new URL(baseUrl, window.location.href);
-      if (parsed.hostname.includes("conversion")) return baseUrl;
-    } catch {
-    }
-    return baseUrl.endsWith("/service/conversion") ? baseUrl : `${baseUrl}/service/conversion`;
+    return this.resolveConversionUrl();
   }
   // Resolve upload path sent to conversion APIs.
   getUploadPath() {
@@ -463,6 +458,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
@@ -506,7 +503,7 @@ var FilesModule = class {
       params.set("project", options.project);
     }
     const query = params.toString();
-    const url = `${hostConversion}/api/StreamFile${query ? `?${query}` : ""}`;
+    const url = `${hostConversion}/api/StreamFile/convert${query ? `?${query}` : ""}`;
     const payload = this.buildConvertV2Payload(options);
     const response = await fetch(url, {
       method: "POST",

package/dist/index.mjs

@@ -119,8 +119,8 @@ var NodeModule = class {
 };
 
 // src/modules/files.module.ts
-var DEFAULT_API_BASE_URL = "https://dev.3dviewer.anybim.vn";
-var DEFAULT_VIEWER_ORIGIN = "http://localhost:3000";
+var DEFAULT_CONVERSION_URL = "https://dev.3dviewer.anybim.vn/service/conversion";
+var DEFAULT_VIEWER_BASE_URL = "https://dev.3dviewer.anybim.vn";
 var SDK_VIEWER_PATH = "/mainviewer-sdk";
 var LEGACY_VIEWER_PATH = "/mainviewer";
 var FilesModule = class {
@@ -267,9 +267,9 @@ var FilesModule = class {
   normalizeBaseUrl(input) {
     return input.trim().replace(/\/+$/, "");
   }
-  // Resolve API base URL with default fallback.
-  resolveBaseUrl() {
-    const raw = this.config.baseUrl || this.viewer.getOptions().baseUrl || DEFAULT_API_BASE_URL;
+  // Resolve conversion API URL with default fallback.
+  resolveConversionUrl() {
+    const raw = this.config.conversionUrl || this.viewer.getOptions().conversionUrl || DEFAULT_CONVERSION_URL;
     return this.normalizeBaseUrl(raw);
   }
   // Resolve viewer route path for all SDK flows.
@@ -295,31 +295,26 @@ var FilesModule = class {
   }
   // Viewer host used to open iframe after conversion completes.
   resolveViewerOrigin() {
-    const viewerUrl = this.viewer.getOptions().url;
-    if (viewerUrl) {
+    const configuredViewerBaseUrl = this.config.baseUrl || this.viewer.getOptions().baseUrl;
+    if (configuredViewerBaseUrl) {
       try {
-        return this.normalizeBaseUrl(new URL(viewerUrl, window.location.href).origin);
+        return this.normalizeBaseUrl(new URL(configuredViewerBaseUrl, window.location.href).origin);
       } catch {
       }
     }
-    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 {
       }
     }
-    return this.normalizeBaseUrl(DEFAULT_VIEWER_ORIGIN);
+    return this.normalizeBaseUrl(DEFAULT_VIEWER_BASE_URL);
   }
-  // Build conversion service root from API base URL.
+  // Resolve conversion service root from configured conversion URL.
+  // Do not auto-append path segments (e.g. "/service/conversion").
   resolveHostConversion() {
-    const baseUrl = this.resolveBaseUrl();
-    try {
-      const parsed = new URL(baseUrl, window.location.href);
-      if (parsed.hostname.includes("conversion")) return baseUrl;
-    } catch {
-    }
-    return baseUrl.endsWith("/service/conversion") ? baseUrl : `${baseUrl}/service/conversion`;
+    return this.resolveConversionUrl();
   }
   // Resolve upload path sent to conversion APIs.
   getUploadPath() {
@@ -437,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
@@ -480,7 +477,7 @@ var FilesModule = class {
       params.set("project", options.project);
     }
     const query = params.toString();
-    const url = `${hostConversion}/api/StreamFile${query ? `?${query}` : ""}`;
+    const url = `${hostConversion}/api/StreamFile/convert${query ? `?${query}` : ""}`;
     const payload = this.buildConvertV2Payload(options);
     const response = await fetch(url, {
       method: "POST",

package/package.json

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