@shapediver/viewer.session-engine.session-engine 1.8.12 → 1.10.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.
- package/dist/implementation/OutputLoader.d.ts +4 -4
- package/dist/implementation/OutputLoader.d.ts.map +1 -1
- package/dist/implementation/OutputLoader.js +38 -37
- package/dist/implementation/OutputLoader.js.map +1 -1
- package/dist/implementation/Session.d.ts +27 -29
- package/dist/implementation/Session.d.ts.map +1 -1
- package/dist/implementation/Session.js +209 -267
- package/dist/implementation/Session.js.map +1 -1
- package/dist/implementation/SessionData.d.ts +4 -4
- package/dist/implementation/SessionData.d.ts.map +1 -1
- package/dist/implementation/SessionData.js +10 -10
- package/dist/implementation/SessionData.js.map +1 -1
- package/dist/implementation/SessionOutputData.d.ts +4 -4
- package/dist/implementation/SessionOutputData.d.ts.map +1 -1
- package/dist/implementation/SessionOutputData.js +10 -10
- package/dist/implementation/SessionOutputData.js.map +1 -1
- package/dist/interfaces/ISession.d.ts +19 -13
- package/dist/interfaces/ISession.d.ts.map +1 -1
- package/package.json +7 -7
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { ShapeDiverResponseBase as ShapeDiverResponse, ShapeDiverResponseOutput } from '@shapediver/api.geometry-api-dto-v1';
|
|
2
1
|
import { SessionTreeNode } from './SessionTreeNode';
|
|
2
|
+
import { ShapeDiverResponseDto, ShapeDiverResponseOutput } from '@shapediver/sdk.geometry-api-sdk-v2';
|
|
3
3
|
export declare class OutputLoader {
|
|
4
4
|
private readonly _dataEngine;
|
|
5
|
-
private readonly _performanceEvaluator;
|
|
6
5
|
private readonly _lastOutputNodes;
|
|
6
|
+
private readonly _performanceEvaluator;
|
|
7
7
|
constructor();
|
|
8
|
-
loadOutputs(
|
|
8
|
+
loadOutputs(responseDto: ShapeDiverResponseDto, outputs?: {
|
|
9
9
|
[key: string]: ShapeDiverResponseOutput;
|
|
10
10
|
}): Promise<SessionTreeNode>;
|
|
11
|
-
private mergeContentNodes;
|
|
12
11
|
private assignMaterials;
|
|
12
|
+
private mergeContentNodes;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=OutputLoader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputLoader.d.ts","sourceRoot":"","sources":["../../src/implementation/OutputLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OutputLoader.d.ts","sourceRoot":"","sources":["../../src/implementation/OutputLoader.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAGnD,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAA;AAErG,qBAAa,YAAY;IAGrB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAI1B;IACP,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAuF;;IAwBhH,WAAW,CAAC,WAAW,EAAE,qBAAqB,EAAE,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,wBAAwB,CAAC;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAyE9I,OAAO,CAAC,eAAe;IA4GvB,OAAO,CAAC,iBAAiB;CAqC5B"}
|
|
@@ -21,13 +21,14 @@ const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
|
|
|
21
21
|
class OutputLoader {
|
|
22
22
|
constructor() {
|
|
23
23
|
this._dataEngine = tsyringe_1.container.resolve(viewer_data_engine_data_engine_1.DataEngine);
|
|
24
|
-
this._performanceEvaluator = tsyringe_1.container.resolve(viewer_shared_services_1.PerformanceEvaluator);
|
|
25
24
|
this._lastOutputNodes = {};
|
|
25
|
+
this._performanceEvaluator = tsyringe_1.container.resolve(viewer_shared_services_1.PerformanceEvaluator);
|
|
26
26
|
}
|
|
27
|
-
loadOutputs(
|
|
27
|
+
loadOutputs(responseDto, outputs) {
|
|
28
|
+
var _a;
|
|
28
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
30
|
this._performanceEvaluator.startSection('outputLoading');
|
|
30
|
-
const node = new SessionTreeNode_1.SessionTreeNode(
|
|
31
|
+
const node = new SessionTreeNode_1.SessionTreeNode((_a = responseDto.model) === null || _a === void 0 ? void 0 : _a.name);
|
|
31
32
|
let currentNodes = {};
|
|
32
33
|
let promises = [];
|
|
33
34
|
let promisesNodes = [];
|
|
@@ -80,37 +81,6 @@ class OutputLoader {
|
|
|
80
81
|
return node;
|
|
81
82
|
});
|
|
82
83
|
}
|
|
83
|
-
mergeContentNodes(node) {
|
|
84
|
-
if (!(node.children.length > 1))
|
|
85
|
-
return;
|
|
86
|
-
const children = [];
|
|
87
|
-
while (node.children.length > 0) {
|
|
88
|
-
children.push(node.children[0]);
|
|
89
|
-
node.removeChild(node.children[0]);
|
|
90
|
-
}
|
|
91
|
-
const mergeNodes = (node1, node2) => {
|
|
92
|
-
for (let i = 0; i < node1.data.length; i++)
|
|
93
|
-
node2.data.push(node1.data[i]);
|
|
94
|
-
for (let i = 0; i < node1.children.length; i++) {
|
|
95
|
-
let childNode;
|
|
96
|
-
for (let j = 0; j < node2.children.length; j++) {
|
|
97
|
-
if (node1.children[i].name === node2.children[j].name) {
|
|
98
|
-
childNode = node2.children[j];
|
|
99
|
-
break;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
if (!childNode) {
|
|
103
|
-
childNode = new viewer_shared_node_tree_1.TreeNode(node1.children[i].name);
|
|
104
|
-
node2.addChild(childNode);
|
|
105
|
-
}
|
|
106
|
-
mergeNodes(node1.children[i], childNode);
|
|
107
|
-
}
|
|
108
|
-
};
|
|
109
|
-
const newChild = new viewer_shared_node_tree_1.TreeNode('content_array');
|
|
110
|
-
node.addChild(newChild);
|
|
111
|
-
for (let i = 0; i < children.length; i++)
|
|
112
|
-
mergeNodes(children[i], newChild);
|
|
113
|
-
}
|
|
114
84
|
assignMaterials(node) {
|
|
115
85
|
const addMaterialToGeometry = (node, material) => {
|
|
116
86
|
for (let i = 0; i < node.data.length; i++)
|
|
@@ -154,13 +124,13 @@ class OutputLoader {
|
|
|
154
124
|
if (!(outputNode.data[i] instanceof SessionOutputData_1.SessionOutputData))
|
|
155
125
|
continue;
|
|
156
126
|
const sessionOutputData = outputNode.data[i];
|
|
157
|
-
if (sessionOutputData.
|
|
127
|
+
if (sessionOutputData.responseOutput.material) {
|
|
158
128
|
let materialNodes = [];
|
|
159
129
|
for (let n = 0; n < node.children.length; n++) {
|
|
160
130
|
const materialNode = node.children[n];
|
|
161
131
|
if (!materialNode)
|
|
162
132
|
continue;
|
|
163
|
-
if (materialNode.name === sessionOutputData.
|
|
133
|
+
if (materialNode.name === sessionOutputData.responseOutput.material)
|
|
164
134
|
materialNodes = materialNode.children;
|
|
165
135
|
}
|
|
166
136
|
const geometryNodes = outputNode.children;
|
|
@@ -177,7 +147,7 @@ class OutputLoader {
|
|
|
177
147
|
}
|
|
178
148
|
}
|
|
179
149
|
else {
|
|
180
|
-
const sessionOutputContent = sessionOutputData.
|
|
150
|
+
const sessionOutputContent = sessionOutputData.responseOutput.content;
|
|
181
151
|
if (sessionOutputContent === undefined)
|
|
182
152
|
continue;
|
|
183
153
|
const materialNodes = [];
|
|
@@ -205,6 +175,37 @@ class OutputLoader {
|
|
|
205
175
|
}
|
|
206
176
|
}
|
|
207
177
|
}
|
|
178
|
+
mergeContentNodes(node) {
|
|
179
|
+
if (!(node.children.length > 1))
|
|
180
|
+
return;
|
|
181
|
+
const children = [];
|
|
182
|
+
while (node.children.length > 0) {
|
|
183
|
+
children.push(node.children[0]);
|
|
184
|
+
node.removeChild(node.children[0]);
|
|
185
|
+
}
|
|
186
|
+
const mergeNodes = (node1, node2) => {
|
|
187
|
+
for (let i = 0; i < node1.data.length; i++)
|
|
188
|
+
node2.data.push(node1.data[i]);
|
|
189
|
+
for (let i = 0; i < node1.children.length; i++) {
|
|
190
|
+
let childNode;
|
|
191
|
+
for (let j = 0; j < node2.children.length; j++) {
|
|
192
|
+
if (node1.children[i].name === node2.children[j].name) {
|
|
193
|
+
childNode = node2.children[j];
|
|
194
|
+
break;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
if (!childNode) {
|
|
198
|
+
childNode = new viewer_shared_node_tree_1.TreeNode(node1.children[i].name);
|
|
199
|
+
node2.addChild(childNode);
|
|
200
|
+
}
|
|
201
|
+
mergeNodes(node1.children[i], childNode);
|
|
202
|
+
}
|
|
203
|
+
};
|
|
204
|
+
const newChild = new viewer_shared_node_tree_1.TreeNode('content_array');
|
|
205
|
+
node.addChild(newChild);
|
|
206
|
+
for (let i = 0; i < children.length; i++)
|
|
207
|
+
mergeNodes(children[i], newChild);
|
|
208
|
+
}
|
|
208
209
|
}
|
|
209
210
|
exports.OutputLoader = OutputLoader;
|
|
210
211
|
//# sourceMappingURL=OutputLoader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputLoader.js","sourceRoot":"","sources":["../../src/implementation/OutputLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAoC;AACpC,yEAA4E;AAC5E,+FAAuE;AACvE,iFAAoE;
|
|
1
|
+
{"version":3,"file":"OutputLoader.js","sourceRoot":"","sources":["../../src/implementation/OutputLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { AxiosResponse } from 'axios';
|
|
2
|
-
import { ShapeDiverResponseBase, ShapeDiverResponseExport, ShapeDiverResponseOutput, ShapeDiverResponseParameter } from '@shapediver/api.geometry-api-dto-v1';
|
|
3
1
|
import { SessionTreeNode } from './SessionTreeNode';
|
|
4
2
|
import { ISession } from '../interfaces/ISession';
|
|
3
|
+
import { ShapeDiverRequestGltfUploadQueryConversion, ShapeDiverResponseExport, ShapeDiverResponseOutput, ShapeDiverResponseParameter } from '@shapediver/sdk.geometry-api-sdk-v2';
|
|
5
4
|
export declare class Session implements ISession {
|
|
6
5
|
private readonly _exports;
|
|
7
6
|
private readonly _httpClient;
|
|
@@ -10,19 +9,21 @@ export declare class Session implements ISession {
|
|
|
10
9
|
private readonly _modelViewUrl;
|
|
11
10
|
private readonly _outputLoader;
|
|
12
11
|
private readonly _outputs;
|
|
13
|
-
private readonly _parameters;
|
|
14
12
|
private readonly _parameterValues;
|
|
13
|
+
private readonly _parameters;
|
|
15
14
|
private readonly _performanceEvaluator;
|
|
16
15
|
private readonly _sessionEngineId;
|
|
17
16
|
private readonly _ticket;
|
|
18
|
-
private _authorTicket?;
|
|
19
17
|
private _bearerToken?;
|
|
20
18
|
private _closed;
|
|
21
19
|
private _headers;
|
|
22
20
|
private _initialized;
|
|
23
|
-
private
|
|
24
|
-
private
|
|
25
|
-
private
|
|
21
|
+
private _modelId?;
|
|
22
|
+
private _refreshBearerToken?;
|
|
23
|
+
private _responseDto?;
|
|
24
|
+
private _sdk;
|
|
25
|
+
private _sessionId?;
|
|
26
|
+
private _viewerSettings?;
|
|
26
27
|
constructor(properties: {
|
|
27
28
|
id: string;
|
|
28
29
|
ticket: string;
|
|
@@ -32,10 +33,9 @@ export declare class Session implements ISession {
|
|
|
32
33
|
bearerToken?: string;
|
|
33
34
|
primarySession?: boolean;
|
|
34
35
|
});
|
|
35
|
-
get authorTicket(): boolean | undefined;
|
|
36
|
-
set authorTicket(value: boolean | undefined);
|
|
37
36
|
get bearerToken(): string | undefined;
|
|
38
37
|
set bearerToken(value: string | undefined);
|
|
38
|
+
get canUploadGLTF(): boolean;
|
|
39
39
|
get exports(): {
|
|
40
40
|
[key: string]: ShapeDiverResponseExport;
|
|
41
41
|
};
|
|
@@ -45,28 +45,26 @@ export declare class Session implements ISession {
|
|
|
45
45
|
get outputs(): {
|
|
46
46
|
[key: string]: ShapeDiverResponseOutput;
|
|
47
47
|
};
|
|
48
|
-
get parameters(): {
|
|
49
|
-
[key: string]: ShapeDiverResponseParameter;
|
|
50
|
-
};
|
|
51
48
|
get parameterValues(): {
|
|
52
49
|
[key: string]: string;
|
|
53
50
|
};
|
|
51
|
+
get parameters(): {
|
|
52
|
+
[key: string]: ShapeDiverResponseParameter;
|
|
53
|
+
};
|
|
54
54
|
set refreshBearerToken(value: () => string);
|
|
55
|
-
get sessionResponse(): ShapeDiverResponseBase;
|
|
56
|
-
get settingsConfig(): any;
|
|
57
55
|
get ticket(): string;
|
|
56
|
+
get viewerSettings(): object | undefined;
|
|
58
57
|
close(): Promise<boolean>;
|
|
59
58
|
customize(cancelRequest: () => boolean): Promise<SessionTreeNode>;
|
|
60
|
-
init(
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}): ShapeDiverResponseBase;
|
|
59
|
+
init(parameterValues?: {
|
|
60
|
+
[key: string]: string;
|
|
61
|
+
}): Promise<void>;
|
|
62
|
+
loadOutputs(cancelRequest?: () => boolean): Promise<SessionTreeNode>;
|
|
63
|
+
requestExport(exportId: string, parameters: {
|
|
64
|
+
[key: string]: string;
|
|
65
|
+
}): Promise<ShapeDiverResponseExport>;
|
|
68
66
|
saveDefaultParameters(): Promise<boolean>;
|
|
69
|
-
|
|
67
|
+
saveExportProperties(exports: {
|
|
70
68
|
[key: string]: {
|
|
71
69
|
displayname: string;
|
|
72
70
|
hidden: boolean;
|
|
@@ -74,7 +72,7 @@ export declare class Session implements ISession {
|
|
|
74
72
|
tooltip: string;
|
|
75
73
|
};
|
|
76
74
|
}): Promise<boolean>;
|
|
77
|
-
|
|
75
|
+
saveOutputProperties(outputs: {
|
|
78
76
|
[key: string]: {
|
|
79
77
|
displayname: string;
|
|
80
78
|
hidden: boolean;
|
|
@@ -82,7 +80,7 @@ export declare class Session implements ISession {
|
|
|
82
80
|
tooltip: string;
|
|
83
81
|
};
|
|
84
82
|
}): Promise<boolean>;
|
|
85
|
-
|
|
83
|
+
saveParameterProperties(parameters: {
|
|
86
84
|
[key: string]: {
|
|
87
85
|
displayname: string;
|
|
88
86
|
hidden: boolean;
|
|
@@ -91,11 +89,11 @@ export declare class Session implements ISession {
|
|
|
91
89
|
};
|
|
92
90
|
}): Promise<boolean>;
|
|
93
91
|
saveSettings(json: any): Promise<boolean>;
|
|
94
|
-
|
|
92
|
+
uploadFile(parameterId: string, data: File, type: string): Promise<string>;
|
|
93
|
+
uploadGLTF(blob: Blob, conversion?: ShapeDiverRequestGltfUploadQueryConversion): Promise<string>;
|
|
94
|
+
private checkAvailability;
|
|
95
95
|
private customizeSession;
|
|
96
|
-
loadOutputs(parameters: {
|
|
97
|
-
[key: string]: string;
|
|
98
|
-
}, cancelRequest?: () => boolean): Promise<SessionTreeNode>;
|
|
99
96
|
private timeout;
|
|
97
|
+
private updateResponseDto;
|
|
100
98
|
}
|
|
101
99
|
//# sourceMappingURL=Session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../src/implementation/Session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../src/implementation/Session.ts"],"names":[],"mappings":"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"}
|