@shapediver/sdk.geometry-api-sdk-v2 1.8.3 → 1.9.0

package/src/resources/ShapeDiverFileApi.ts

@@ -1,123 +1,151 @@
-import { ShapeDiverRequestFileUpload, ShapeDiverResponseDto } from "@shapediver/api.geometry-api-dto-v2"
-import { BaseResourceApi, ShapeDiverSdkApi, ShapeDiverSdkApiResponseType } from "@shapediver/sdk.geometry-api-sdk-core"
-import { sendRequest } from "../utils/utils"
+import {
+  ShapeDiverRequestFileUpload,
+  ShapeDiverResponseDto,
+} from "@shapediver/api.geometry-api-dto-v2";
+import {
+  BaseResourceApi,
+  ShapeDiverSdkApi,
+  ShapeDiverSdkApiResponseType,
+} from "@shapediver/sdk.geometry-api-sdk-core";
+import { sendRequest } from "../utils/utils";
+
+const contentDisposition = require("content-disposition");
 
 export interface ShapeDiverResponseFileInfo {
-    filename?: string,
-    size?: number,
+  filename?: string;
+  size?: number;
 }
 
 export class ShapeDiverFileApi extends BaseResourceApi {
+  constructor(api: ShapeDiverSdkApi) {
+    super(api);
+  }
 
-    constructor (api: ShapeDiverSdkApi) {
-        super(api)
-    }
+  /**
+   * List all file-assets of the given parameter.
+   *
+   * @param sessionId
+   * @param paramId
+   */
+  async list(
+    sessionId: string,
+    paramId: string,
+  ): Promise<ShapeDiverResponseDto> {
+    return await sendRequest(
+      async () =>
+        (
+          await this.api.get<ShapeDiverResponseDto>(
+            `${this.buildSessionUri(sessionId)}/file/${paramId}/list`,
+          )
+        )[1],
+    );
+  }
 
-    /**
-     * List all file-assets of the given parameter.
-     *
-     * @param sessionId
-     * @param paramId
-     */
-    async list (sessionId: string, paramId: string): Promise<ShapeDiverResponseDto> {
-        return await sendRequest(async () =>
-            (await this.api.get<ShapeDiverResponseDto>(
-                `${ this.buildSessionUri(sessionId) }/file/${ paramId }/list`,
-            ))[1],
+  /**
+   * Get information about a file-asset of a parameter.
+   *
+   * @param sessionId
+   * @param paramId
+   */
+  async info(
+    sessionId: string,
+    paramId: string,
+    fileId: string,
+  ): Promise<ShapeDiverResponseFileInfo> {
+    return await sendRequest(async () => {
+      const headers = (
+        await this.api.head(
+          `${this.buildSessionUri(sessionId)}/file/${paramId}/${fileId}`,
         )
-    }
-
-    /**
-     * Get information about a file-asset of a parameter.
-     *
-     * @param sessionId
-     * @param paramId
-     */
-    async info (
-        sessionId: string,
-        paramId: string,
-        fileId: string,
-    ): Promise<ShapeDiverResponseFileInfo> {
-        return await sendRequest(async () => {
-            const headers = (await this.api.head(
-                `${ this.buildSessionUri(sessionId) }/file/${ paramId }/${ fileId }`,
-            ))[0]
-
-            const res: ShapeDiverResponseFileInfo = {
-                size: Number(headers.get("Content-Length") || headers.get("content-length")),
-            }
+      )[0];
 
-            // Extract filename from Content-Disposition header if available
-            const contentDisposition = headers.get("Content-Disposition")
-                || headers.get("content-disposition")
-            if (
-                typeof contentDisposition === "string" &&
-                contentDisposition.indexOf("=") > 0
-            ) {
-                res.filename = contentDisposition
-                    .split("=")[1] // Extract filename
-                    .slice(1, -1)  // remove leading and trailing double quotes
-            }
+      const res: ShapeDiverResponseFileInfo = {
+        size: Number(
+          headers.get("Content-Length") || headers.get("content-length"),
+        ),
+      };
 
-            return res
-    })
-    }
+      // Extract filename from Content-Disposition header if available
+      const contentDispositionHeader =
+        headers.get("Content-Disposition") ||
+        headers.get("content-disposition");
+      if (typeof contentDispositionHeader === "string") {
+        try {
+          res.filename = contentDisposition.parse(
+            contentDispositionHeader,
+          ).parameters.filename;
+        } catch (_) {
+          res.filename = undefined;
+        }
+      }
 
-    /**
-     * Download a file-asset.
-     *
-     * @param sessionId
-     * @param paramId
-     * @param fileId
-     */
-    async get (
-        sessionId: string,
-        paramId: string,
-        fileId: string,
-    ): Promise<ArrayBuffer> {
-        return await sendRequest(async () =>
-            (await this.api.get<ArrayBuffer>(
-                `${ this.buildSessionUri(sessionId) }/file/${ paramId }/${ fileId }`,
-                { responseType: ShapeDiverSdkApiResponseType.DATA },
-            ))[1],
-        )
-    }
+      return res;
+    });
+  }
 
-    /**
-     * Delete a file-asset.
-     *
-     * @param sessionId
-     * @param paramId
-     * @param fileId
-     */
-    async delete (
-        sessionId: string,
-        paramId: string,
-        fileId: string,
-    ): Promise<ShapeDiverResponseDto> {
-        return await sendRequest(async () =>
-            (await this.api.delete<ShapeDiverResponseDto>(
-                `${ this.buildSessionUri(sessionId) }/file/${ paramId }/${ fileId }`,
-            ))[1],
-        )
-    }
+  /**
+   * Download a file-asset.
+   *
+   * @param sessionId
+   * @param paramId
+   * @param fileId
+   */
+  async get(
+    sessionId: string,
+    paramId: string,
+    fileId: string,
+  ): Promise<ArrayBuffer> {
+    return await sendRequest(
+      async () =>
+        (
+          await this.api.get<ArrayBuffer>(
+            `${this.buildSessionUri(sessionId)}/file/${paramId}/${fileId}`,
+            { responseType: ShapeDiverSdkApiResponseType.DATA },
+          )
+        )[1],
+    );
+  }
 
-    /**
-     * Request an Upload-URL for a file.
-     *
-     * @param sessionId
-     * @param body
-     */
-    async requestUpload (
-        sessionId: string,
-        body: ShapeDiverRequestFileUpload,
-    ): Promise<ShapeDiverResponseDto> {
-        return await sendRequest(async () =>
-            (await this.api.post<ShapeDiverResponseDto>(
-                this.buildSessionUri(sessionId) + "/file/upload",
-                body
-            ))[1],
-        )
-    }
+  /**
+   * Delete a file-asset.
+   *
+   * @param sessionId
+   * @param paramId
+   * @param fileId
+   */
+  async delete(
+    sessionId: string,
+    paramId: string,
+    fileId: string,
+  ): Promise<ShapeDiverResponseDto> {
+    return await sendRequest(
+      async () =>
+        (
+          await this.api.delete<ShapeDiverResponseDto>(
+            `${this.buildSessionUri(sessionId)}/file/${paramId}/${fileId}`,
+          )
+        )[1],
+    );
+  }
 
+  /**
+   * Request an Upload-URL for a file.
+   *
+   * @param sessionId
+   * @param body
+   */
+  async requestUpload(
+    sessionId: string,
+    body: ShapeDiverRequestFileUpload,
+  ): Promise<ShapeDiverResponseDto> {
+    return await sendRequest(
+      async () =>
+        (
+          await this.api.post<ShapeDiverResponseDto>(
+            this.buildSessionUri(sessionId) + "/file/upload",
+            body,
+          )
+        )[1],
+    );
+  }
 }

package/src/resources/ShapeDiverGltfApi.ts

@@ -1,34 +1,45 @@
-import { ShapeDiverRequestGltfUploadQueryConversion, ShapeDiverResponseDto } from "@shapediver/api.geometry-api-dto-v2"
-import { BaseResourceApi, ShapeDiverSdkApi, ShapeDiverSdkApiResponseType } from "@shapediver/sdk.geometry-api-sdk-core"
-import { sendRequest } from "../utils/utils"
+import {
+  ShapeDiverRequestGltfUploadQueryConversion,
+  ShapeDiverResponseDto,
+} from "@shapediver/api.geometry-api-dto-v2";
+import {
+  BaseResourceApi,
+  ShapeDiverSdkApi,
+  ShapeDiverSdkApiResponseType,
+} from "@shapediver/sdk.geometry-api-sdk-core";
+import { sendRequest } from "../utils/utils";
 
 export class ShapeDiverGltfApi extends BaseResourceApi {
+  constructor(api: ShapeDiverSdkApi) {
+    super(api);
+  }
 
-    constructor (api: ShapeDiverSdkApi) {
-        super(api)
-    }
-
-    /**
-     * Upload a glTF file.
-     *
-     * @param sessionId
-     * @param body
-     * @param type
-     * @param queryConvert
-     */
-    async upload (
-        sessionId: string,
-        body: ArrayBuffer,
-        type: string,
-        queryConvert: ShapeDiverRequestGltfUploadQueryConversion = ShapeDiverRequestGltfUploadQueryConversion.NONE,
-    ): Promise<ShapeDiverResponseDto> {
-        return await sendRequest(async () =>
-            (await this.api.post<ShapeDiverResponseDto>(
-                `${ this.buildSessionUri(sessionId) }/gltf?conversion=${ queryConvert }`,
-                body,
-                { contentType: type, responseType: ShapeDiverSdkApiResponseType.JSON },
-            ))[1],
-        )
-    }
-
+  /**
+   * Upload a glTF file.
+   *
+   * @param sessionId
+   * @param body
+   * @param type
+   * @param queryConvert
+   */
+  async upload(
+    sessionId: string,
+    body: ArrayBuffer,
+    type: string,
+    queryConvert: ShapeDiverRequestGltfUploadQueryConversion = ShapeDiverRequestGltfUploadQueryConversion.NONE,
+  ): Promise<ShapeDiverResponseDto> {
+    return await sendRequest(
+      async () =>
+        (
+          await this.api.post<ShapeDiverResponseDto>(
+            `${this.buildSessionUri(sessionId)}/gltf?conversion=${queryConvert}`,
+            body,
+            {
+              contentType: type,
+              responseType: ShapeDiverSdkApiResponseType.JSON,
+            },
+          )
+        )[1],
+    );
+  }
 }