@shapediver/viewer.shared.services 3.2.7 → 3.2.8
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.
|
@@ -2,6 +2,7 @@ import { AxiosRequestConfig } from 'axios';
|
|
|
2
2
|
import { ShapeDiverError as ShapeDiverBackendError } from '@shapediver/sdk.geometry-api-sdk-v2';
|
|
3
3
|
import { HttpResponse } from './HttpResponse';
|
|
4
4
|
export declare class HttpClient {
|
|
5
|
+
private readonly _logger;
|
|
5
6
|
private static _instance;
|
|
6
7
|
private _dataCache;
|
|
7
8
|
private _enableCaching;
|
|
@@ -51,14 +52,15 @@ export declare class HttpClient {
|
|
|
51
52
|
get(href: string, config?: AxiosRequestConfig, textureLoading?: boolean): Promise<HttpResponse<unknown>>;
|
|
52
53
|
/**
|
|
53
54
|
* Get the requested texture either as a download or from the cache.
|
|
55
|
+
* If the texture is not available, undefined is returned.
|
|
54
56
|
*
|
|
55
|
-
* @param href
|
|
56
|
-
* @returns
|
|
57
|
+
* @param href The URL of the texture to load.
|
|
58
|
+
* @returns Either the texture as a buffer and blob or undefined if the texture could not be loaded.
|
|
57
59
|
*/
|
|
58
60
|
loadTexture(href: string): Promise<HttpResponse<{
|
|
59
61
|
buffer: ArrayBuffer;
|
|
60
62
|
blob: Blob;
|
|
61
|
-
}
|
|
63
|
+
}> | undefined>;
|
|
62
64
|
/**
|
|
63
65
|
* Add the data loading options from a session.
|
|
64
66
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,eAAe,IAAI,sBAAsB,EAAkD,MAAM,qCAAqC,CAAC;AAEhJ,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,qBAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,eAAe,IAAI,sBAAsB,EAAkD,MAAM,qCAAqC,CAAC;AAEhJ,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,qBAAa,UAAU;IAGnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,OAAO,CAAC,MAAM,CAAC,SAAS,CAAa;IAErC,OAAO,CAAC,UAAU,CAOC;IACnB,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,wBAAwB,CAAqD;IACrF,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,eAAe,CAKhB;IAOP,OAAO;IAMP,WAAkB,QAAQ,eAEzB;IAMD,IAAW,aAAa,IAAI,OAAO,CAElC;IAED,IAAW,aAAa,CAAC,KAAK,EAAE,OAAO,EAItC;IAED,IAAW,uBAAuB,IAAI,MAAM,EAAE,CAE7C;IAED,IAAW,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,EAEjD;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,YAAY,CAAC,KAAK,EAAE,MAAM,EAEpC;IAMD;;;;;OAKG;IACI,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE;QAChD,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAClE,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;KACvF;IAID;;;;;;;;OAQG;IACI,YAAY,CAAC,CAAC,EAAE,sBAAsB,GAAG,KAAK,GAAG,OAAO;IAY/D;;;;;;;;;;;OAWG;IACU,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,kBAAoD,EAAE,cAAc,GAAE,OAAe,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAgF7J;;;;;;OAMG;IACU,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,IAAI,EAAE,IAAI,CAAA;KAAE,CAAC,GAAG,SAAS,CAAC;IA4B9G;;;;OAIG;IACI,iBAAiB,CAAC,SAAS,EAAE,MAAM;IAQ1C;;;;;OAKG;IACH,OAAO,CAAC,UAAU;IAmBlB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAMpB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAepB;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAkBxB"}
|
|
@@ -17,11 +17,14 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
17
17
|
const sdk_geometry_api_sdk_v2_1 = require("@shapediver/sdk.geometry-api-sdk-v2");
|
|
18
18
|
const ShapeDiverBackendErrors_1 = require("../logger/ShapeDiverBackendErrors");
|
|
19
19
|
const base64_1 = require("../utilities/base64");
|
|
20
|
+
const Logger_1 = require("../logger/Logger");
|
|
20
21
|
class HttpClient {
|
|
21
22
|
// #endregion Properties (7)
|
|
22
23
|
// #region Constructors (1)
|
|
23
24
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
24
25
|
constructor() {
|
|
26
|
+
// #region Properties (7)
|
|
27
|
+
this._logger = Logger_1.Logger.instance;
|
|
25
28
|
this._dataCache = new Map();
|
|
26
29
|
this._enableCaching = true;
|
|
27
30
|
this._excludedQueryParameters = ['Expires', 'Signature', 'Key-Pair-Id'];
|
|
@@ -29,12 +32,12 @@ class HttpClient {
|
|
|
29
32
|
this._sessionLoading = {};
|
|
30
33
|
}
|
|
31
34
|
// #endregion Constructors (1)
|
|
32
|
-
// #region Public Static
|
|
35
|
+
// #region Public Static Getters And Setters (1)
|
|
33
36
|
static get instance() {
|
|
34
37
|
return this._instance || (this._instance = new this());
|
|
35
38
|
}
|
|
36
|
-
// #endregion Public Static
|
|
37
|
-
// #region Public
|
|
39
|
+
// #endregion Public Static Getters And Setters (1)
|
|
40
|
+
// #region Public Getters And Setters (6)
|
|
38
41
|
get enableCaching() {
|
|
39
42
|
return this._enableCaching;
|
|
40
43
|
}
|
|
@@ -55,7 +58,7 @@ class HttpClient {
|
|
|
55
58
|
set maxCacheSize(value) {
|
|
56
59
|
this._maxCacheSize = value;
|
|
57
60
|
}
|
|
58
|
-
// #endregion Public
|
|
61
|
+
// #endregion Public Getters And Setters (6)
|
|
59
62
|
// #region Public Methods (5)
|
|
60
63
|
/**
|
|
61
64
|
* Add the data loading options from a session.
|
|
@@ -177,24 +180,36 @@ class HttpClient {
|
|
|
177
180
|
}
|
|
178
181
|
/**
|
|
179
182
|
* Get the requested texture either as a download or from the cache.
|
|
183
|
+
* If the texture is not available, undefined is returned.
|
|
180
184
|
*
|
|
181
|
-
* @param href
|
|
182
|
-
* @returns
|
|
185
|
+
* @param href The URL of the texture to load.
|
|
186
|
+
* @returns Either the texture as a buffer and blob or undefined if the texture could not be loaded.
|
|
183
187
|
*/
|
|
184
188
|
loadTexture(href) {
|
|
185
189
|
return __awaiter(this, void 0, void 0, function* () {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
190
|
+
let result;
|
|
191
|
+
try {
|
|
192
|
+
const response = yield this.get(href, undefined, true);
|
|
193
|
+
const buffer = response.data;
|
|
194
|
+
const arrayBufferView = new Uint8Array(response.data);
|
|
195
|
+
const blob = new Blob([arrayBufferView], { type: response.headers['content-type'] });
|
|
196
|
+
// assign the result
|
|
197
|
+
result = {
|
|
198
|
+
data: {
|
|
199
|
+
buffer,
|
|
200
|
+
blob
|
|
201
|
+
},
|
|
202
|
+
size: response.data.byteLength,
|
|
203
|
+
headers: response.headers
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
catch (e) {
|
|
207
|
+
// log the error and return undefined
|
|
208
|
+
this._logger.error(`Failed to load texture: ${e}`);
|
|
209
|
+
}
|
|
210
|
+
// return undefined if the texture could not be loaded
|
|
211
|
+
// that way the loading can be continued without the texture
|
|
212
|
+
return result;
|
|
198
213
|
});
|
|
199
214
|
}
|
|
200
215
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAkD;AAClD,iFAAgJ;AAChJ,+EAAkK;
|
|
1
|
+
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.shared.services",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.8",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"@ctrl/tinycolor": "^3.4.0",
|
|
43
43
|
"@shapediver/sdk.geometry-api-sdk-v2": "1.10.0",
|
|
44
44
|
"@shapediver/viewer.settings": "1.0.2",
|
|
45
|
-
"@shapediver/viewer.shared.build-data": "3.2.
|
|
45
|
+
"@shapediver/viewer.shared.build-data": "3.2.8",
|
|
46
46
|
"@types/dompurify": "^2.3.1",
|
|
47
47
|
"@types/ua-parser-js": "^0.7.36",
|
|
48
48
|
"@types/uuid": "^9.0.0",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"ua-parser-js": "^0.7.28",
|
|
53
53
|
"uuid": "^9.0.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "a8c27c745498812d103635aeec6d5311d6e8c8e3"
|
|
56
56
|
}
|
|
@@ -2,11 +2,14 @@ import axios, { AxiosRequestConfig } from 'axios';
|
|
|
2
2
|
import { ShapeDiverError as ShapeDiverBackendError, isGBResponseError, isGBRequestError, isGBError } from '@shapediver/sdk.geometry-api-sdk-v2';
|
|
3
3
|
import { ShapeDiverGeometryBackendError, ShapeDiverGeometryBackendRequestError, ShapeDiverGeometryBackendResponseError } from '../logger/ShapeDiverBackendErrors';
|
|
4
4
|
import { HttpResponse } from './HttpResponse';
|
|
5
|
-
import { Converter } from '../converter/Converter';
|
|
6
5
|
import { btoaCustom } from '../utilities/base64';
|
|
6
|
+
import { Logger } from '../logger/Logger';
|
|
7
7
|
|
|
8
8
|
export class HttpClient {
|
|
9
9
|
// #region Properties (7)
|
|
10
|
+
|
|
11
|
+
private readonly _logger: Logger = Logger.instance;
|
|
12
|
+
|
|
10
13
|
private static _instance: HttpClient;
|
|
11
14
|
|
|
12
15
|
private _dataCache: Map<
|
|
@@ -36,15 +39,15 @@ export class HttpClient {
|
|
|
36
39
|
|
|
37
40
|
// #endregion Constructors (1)
|
|
38
41
|
|
|
39
|
-
// #region Public Static
|
|
42
|
+
// #region Public Static Getters And Setters (1)
|
|
40
43
|
|
|
41
44
|
public static get instance() {
|
|
42
45
|
return this._instance || (this._instance = new this());
|
|
43
46
|
}
|
|
44
47
|
|
|
45
|
-
// #endregion Public Static
|
|
48
|
+
// #endregion Public Static Getters And Setters (1)
|
|
46
49
|
|
|
47
|
-
// #region Public
|
|
50
|
+
// #region Public Getters And Setters (6)
|
|
48
51
|
|
|
49
52
|
public get enableCaching(): boolean {
|
|
50
53
|
return this._enableCaching;
|
|
@@ -72,7 +75,7 @@ export class HttpClient {
|
|
|
72
75
|
this._maxCacheSize = value;
|
|
73
76
|
}
|
|
74
77
|
|
|
75
|
-
// #endregion Public
|
|
78
|
+
// #endregion Public Getters And Setters (6)
|
|
76
79
|
|
|
77
80
|
// #region Public Methods (5)
|
|
78
81
|
|
|
@@ -122,7 +125,7 @@ export class HttpClient {
|
|
|
122
125
|
* @param textureConversion
|
|
123
126
|
* @returns
|
|
124
127
|
*/
|
|
125
|
-
public async get(href: string, config: AxiosRequestConfig = { responseType: 'arraybuffer' }, textureLoading: boolean = false): Promise<HttpResponse<unknown>> {
|
|
128
|
+
public async get(href: string, config: AxiosRequestConfig = { responseType: 'arraybuffer' }, textureLoading: boolean = false): Promise<HttpResponse<unknown>> {
|
|
126
129
|
const dataKey = this.hrefToDataKey(href);
|
|
127
130
|
|
|
128
131
|
// return element if it exists in cache
|
|
@@ -204,23 +207,37 @@ export class HttpClient {
|
|
|
204
207
|
|
|
205
208
|
/**
|
|
206
209
|
* Get the requested texture either as a download or from the cache.
|
|
210
|
+
* If the texture is not available, undefined is returned.
|
|
207
211
|
*
|
|
208
|
-
* @param href
|
|
209
|
-
* @returns
|
|
212
|
+
* @param href The URL of the texture to load.
|
|
213
|
+
* @returns Either the texture as a buffer and blob or undefined if the texture could not be loaded.
|
|
210
214
|
*/
|
|
211
|
-
public async loadTexture(href: string): Promise<HttpResponse<{ buffer: ArrayBuffer, blob: Blob }
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
data
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
215
|
+
public async loadTexture(href: string): Promise<HttpResponse<{ buffer: ArrayBuffer, blob: Blob }> | undefined> {
|
|
216
|
+
let result: HttpResponse<{ buffer: ArrayBuffer, blob: Blob }> | undefined;
|
|
217
|
+
|
|
218
|
+
try {
|
|
219
|
+
const response = await this.get(href, undefined, true) as HttpResponse<ArrayBuffer>;
|
|
220
|
+
const buffer = response.data;
|
|
221
|
+
const arrayBufferView = new Uint8Array(response.data);
|
|
222
|
+
const blob = new Blob([arrayBufferView], { type: response.headers['content-type'] });
|
|
223
|
+
|
|
224
|
+
// assign the result
|
|
225
|
+
result = {
|
|
226
|
+
data: {
|
|
227
|
+
buffer,
|
|
228
|
+
blob
|
|
229
|
+
},
|
|
230
|
+
size: response.data.byteLength,
|
|
231
|
+
headers: response.headers
|
|
232
|
+
};
|
|
233
|
+
} catch (e) {
|
|
234
|
+
// log the error and return undefined
|
|
235
|
+
this._logger.error(`Failed to load texture: ${e}`);
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
// return undefined if the texture could not be loaded
|
|
239
|
+
// that way the loading can be continued without the texture
|
|
240
|
+
return result;
|
|
224
241
|
}
|
|
225
242
|
|
|
226
243
|
/**
|