@shapediver/viewer.shared.services 2.0.6 → 2.0.9
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":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBACa,UAAU;IAGnB,OAAO,CAAC,UAAU,CAEX;IAEP,OAAO,CAAC,eAAe,CAKhB;;IA2BP,OAAO,CAAC,YAAY;IAeb,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;IAIY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,kBAAoD,EAAE,cAAc,GAAE,OAAe,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBACa,UAAU;IAGnB,OAAO,CAAC,UAAU,CAEX;IAEP,OAAO,CAAC,eAAe,CAKhB;;IA2BP,OAAO,CAAC,YAAY;IAeb,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;IAIY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,kBAAoD,EAAE,cAAc,GAAE,OAAe,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAkE5I,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAInE,iBAAiB,CAAC,SAAS,EAAE,MAAM;CAK7C"}
|
|
@@ -99,12 +99,13 @@ let HttpClient = class HttpClient {
|
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
else {
|
|
102
|
-
|
|
102
|
+
if (!sessionLoading) {
|
|
103
103
|
// if there is no session to load from, we use the fallback option
|
|
104
|
-
|
|
105
|
-
|
|
104
|
+
this._dataCache[dataKey] = (0, axios_1.default)(href, Object.assign({ method: 'get' }, config));
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
106
107
|
// all data links where we could somehow find a session to load it with
|
|
107
|
-
this._dataCache[dataKey] = new Promise(resolve => {
|
|
108
|
+
this._dataCache[dataKey] = new Promise((resolve, reject) => {
|
|
108
109
|
sessionLoading.getAsset(href)
|
|
109
110
|
.then((result) => {
|
|
110
111
|
resolve({
|
|
@@ -113,13 +114,13 @@ let HttpClient = class HttpClient {
|
|
|
113
114
|
'content-type': result[1]
|
|
114
115
|
}
|
|
115
116
|
});
|
|
117
|
+
})
|
|
118
|
+
.catch((e) => {
|
|
119
|
+
// if this fails, we just load it directly
|
|
120
|
+
resolve((0, axios_1.default)(href, Object.assign({ method: 'get' }, config)));
|
|
116
121
|
});
|
|
117
122
|
});
|
|
118
123
|
}
|
|
119
|
-
catch (e) {
|
|
120
|
-
// if this fails, we just load it directly
|
|
121
|
-
this._dataCache[dataKey] = (0, axios_1.default)(href, Object.assign({ method: 'get' }, config));
|
|
122
|
-
}
|
|
123
124
|
}
|
|
124
125
|
return this._dataCache[dataKey];
|
|
125
126
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/http-client/HttpClient.ts"],"names":[],"mappings":"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
|
|
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": "2.0.
|
|
3
|
+
"version": "2.0.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
"@ctrl/tinycolor": "^3.4.0",
|
|
43
43
|
"@sentry/browser": "^6.7.2",
|
|
44
44
|
"@sentry/tracing": "^6.7.2",
|
|
45
|
-
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.
|
|
45
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.26",
|
|
46
46
|
"@shapediver/viewer.settings": "0.1.36",
|
|
47
|
-
"@shapediver/viewer.shared.build-data": "2.0.
|
|
47
|
+
"@shapediver/viewer.shared.build-data": "2.0.9",
|
|
48
48
|
"@types/dompurify": "^2.3.1",
|
|
49
49
|
"@types/ua-parser-js": "^0.7.36",
|
|
50
50
|
"@types/uuid": "^8.3.0",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"ua-parser-js": "^0.7.28",
|
|
56
56
|
"uuid": "^8.3.2"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "f0dd0ffe2428fcfd2c71ea2731765c760d09f1eb"
|
|
59
59
|
}
|
|
@@ -105,12 +105,12 @@ export class HttpClient {
|
|
|
105
105
|
this._dataCache[dataKey] = axios(href, Object.assign({ method: 'get' }, config));
|
|
106
106
|
}
|
|
107
107
|
} else {
|
|
108
|
-
|
|
108
|
+
if(!sessionLoading) {
|
|
109
109
|
// if there is no session to load from, we use the fallback option
|
|
110
|
-
|
|
111
|
-
|
|
110
|
+
this._dataCache[dataKey] = axios(href, Object.assign({ method: 'get' }, config));
|
|
111
|
+
} else {
|
|
112
112
|
// all data links where we could somehow find a session to load it with
|
|
113
|
-
this._dataCache[dataKey] = new Promise<HttpResponse<ArrayBuffer>>(resolve => {
|
|
113
|
+
this._dataCache[dataKey] = new Promise<HttpResponse<ArrayBuffer>>((resolve, reject) => {
|
|
114
114
|
sessionLoading!.getAsset(href)
|
|
115
115
|
.then((result) => {
|
|
116
116
|
resolve({
|
|
@@ -120,10 +120,11 @@ export class HttpClient {
|
|
|
120
120
|
}
|
|
121
121
|
})
|
|
122
122
|
})
|
|
123
|
+
.catch((e) => {
|
|
124
|
+
// if this fails, we just load it directly
|
|
125
|
+
resolve(axios(href, Object.assign({ method: 'get' }, config)))
|
|
126
|
+
})
|
|
123
127
|
});
|
|
124
|
-
} catch(e) {
|
|
125
|
-
// if this fails, we just load it directly
|
|
126
|
-
this._dataCache[dataKey] = axios(href, Object.assign({ method: 'get' }, config));
|
|
127
128
|
}
|
|
128
129
|
}
|
|
129
130
|
|