@shapediver/sdk.geometry-api-sdk-v2 1.11.0 → 1.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"ShapeDiverAssetApi.d.ts","sourceRoot":"","sources":["../../src/resources/ShapeDiverAssetApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,gBAAgB,EAEjB,MAAM,uCAAuC,CAAC;AAY/C,qBAAa,kBAAmB,SAAQ,eAAe;gBACzC,GAAG,EAAE,gBAAgB;IAU3B,SAAS,CACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAkB3B,SAAS,CACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAkB3B,kBAAkB,CACtB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAsBzB,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAkB3B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAmBnE,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAoBnE,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAwC3B,QAAQ,CACZ,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC;CAwBnE"}
1
+ {"version":3,"file":"ShapeDiverAssetApi.d.ts","sourceRoot":"","sources":["../../src/resources/ShapeDiverAssetApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,gBAAgB,EAEjB,MAAM,uCAAuC,CAAC;AAe/C,qBAAa,kBAAmB,SAAQ,eAAe;gBACzC,GAAG,EAAE,gBAAgB;IAU3B,SAAS,CACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAkB3B,SAAS,CACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAkB3B,kBAAkB,CACtB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAsBzB,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAkB3B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAmBnE,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAoBnE,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAmD3B,QAAQ,CACZ,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC;CA0BnE"}
@@ -19,6 +19,7 @@ const cdnAssetUri = /.+\/cdn-asset-(exports|outputs|textures)\/.+/;
19
19
  const cdnAssetExportUri = /.+\/cdn-asset-exports\/.+/;
20
20
  const cdnAssetOutputUri = /.+\/cdn-asset-outputs\/.+/;
21
21
  const cdnAssetTextureUri = /.+\/cdn-asset-textures\/.+/;
22
+ const directDownloadUri = /^(http[s]?:\/\/)?(viewer|textures|downloads)\.shapediver\.com(\/.*)?$/;
22
23
  class ShapeDiverAssetApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
23
24
  constructor(api) {
24
25
  super(api);
@@ -80,7 +81,9 @@ class ShapeDiverAssetApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
80
81
  downloadImage(sessionId, url) {
81
82
  return __awaiter(this, void 0, void 0, function* () {
82
83
  let targetUrl, queries;
83
- if (apiAssetTextureUri.test(url) || cdnAssetTextureUri.test(url)) {
84
+ if (apiAssetTextureUri.test(url) ||
85
+ cdnAssetTextureUri.test(url) ||
86
+ directDownloadUri.test(url)) {
84
87
  targetUrl = url;
85
88
  queries = [];
86
89
  }
@@ -92,7 +95,8 @@ class ShapeDiverAssetApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
92
95
  var _a;
93
96
  const [header, data] = yield this.api.get(targetUrl, queries, {
94
97
  responseType: sdk_geometry_api_sdk_core_1.ShapeDiverSdkApiResponseType.DATA,
95
- disableAuthorization: cdnAssetUri.test(url),
98
+ disableAuthorization: cdnAssetUri.test(url) || directDownloadUri.test(url),
99
+ disableCustomHeaders: cdnAssetUri.test(url) || directDownloadUri.test(url),
96
100
  });
97
101
  const contentType = (_a = header["Content-Type"]) !== null && _a !== void 0 ? _a : header["content-type"];
98
102
  return [data, contentType];
@@ -115,6 +119,7 @@ class ShapeDiverAssetApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
115
119
  const [header, data] = yield this.api.get(url, undefined, {
116
120
  responseType: sdk_geometry_api_sdk_core_1.ShapeDiverSdkApiResponseType.DATA,
117
121
  disableAuthorization: cdnAssetUri.test(url),
122
+ disableCustomHeaders: cdnAssetUri.test(url),
118
123
  });
119
124
  const contentType = (_a = header["Content-Type"]) !== null && _a !== void 0 ? _a : header["content-type"];
120
125
  return [data, contentType, type];
@@ -1 +1 @@
1
- {"version":3,"file":"ShapeDiverAssetApi.js","sourceRoot":"","sources":["../../src/resources/ShapeDiverAssetApi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ShapeDiverAssetApi.js","sourceRoot":"","sources":["../../src/resources/ShapeDiverAssetApi.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shapediver/sdk.geometry-api-sdk-v2",
3
- "version": "1.11.0",
3
+ "version": "1.12.1",
4
4
  "description": "SDK to communicate with the Geometry API version 2",
5
5
  "keywords": [
6
6
  "shapediver",
@@ -15,6 +15,9 @@ const cdnAssetExportUri = /.+\/cdn-asset-exports\/.+/;
15
15
  const cdnAssetOutputUri = /.+\/cdn-asset-outputs\/.+/;
16
16
  const cdnAssetTextureUri = /.+\/cdn-asset-textures\/.+/;
17
17
 
18
+ const directDownloadUri =
19
+ /^(http[s]?:\/\/)?(viewer|textures|downloads)\.shapediver\.com(\/.*)?$/;
20
+
18
21
  export class ShapeDiverAssetApi extends BaseResourceApi {
19
22
  constructor(api: ShapeDiverSdkApi) {
20
23
  super(api);
@@ -159,7 +162,11 @@ export class ShapeDiverAssetApi extends BaseResourceApi {
159
162
  ): Promise<[ArrayBuffer, string]> {
160
163
  let targetUrl: string, queries: string[];
161
164
 
162
- if (apiAssetTextureUri.test(url) || cdnAssetTextureUri.test(url)) {
165
+ if (
166
+ apiAssetTextureUri.test(url) ||
167
+ cdnAssetTextureUri.test(url) ||
168
+ directDownloadUri.test(url)
169
+ ) {
163
170
  // Call ShapeDiver texture-asset URLs directly
164
171
  targetUrl = url;
165
172
  queries = [];
@@ -175,7 +182,14 @@ export class ShapeDiverAssetApi extends BaseResourceApi {
175
182
  queries,
176
183
  {
177
184
  responseType: ShapeDiverSdkApiResponseType.DATA,
178
- disableAuthorization: cdnAssetUri.test(url), // disable for CDN URLs
185
+ /*
186
+ * Disable authorization and custom headers for CDN and direct download URLs to preserve
187
+ * simple GETs whenever possible (do not require preflight requests).
188
+ */
189
+ disableAuthorization:
190
+ cdnAssetUri.test(url) || directDownloadUri.test(url),
191
+ disableCustomHeaders:
192
+ cdnAssetUri.test(url) || directDownloadUri.test(url),
179
193
  },
180
194
  );
181
195
  const contentType = header["Content-Type"] ?? header["content-type"];
@@ -216,7 +230,9 @@ export class ShapeDiverAssetApi extends BaseResourceApi {
216
230
  return await sendRequest(async () => {
217
231
  const [header, data] = await this.api.get<ArrayBuffer>(url, undefined, {
218
232
  responseType: ShapeDiverSdkApiResponseType.DATA,
219
- disableAuthorization: cdnAssetUri.test(url), // disable for CDN URLs
233
+ /* Disable authorization and custom headers for CDN URLs to preserve simple GETs. */
234
+ disableAuthorization: cdnAssetUri.test(url),
235
+ disableCustomHeaders: cdnAssetUri.test(url),
220
236
  });
221
237
  const contentType = header["Content-Type"] ?? header["content-type"];
222
238
  return [data, contentType, type];