@shapediver/sdk.geometry-api-sdk-v2 1.5.1 → 1.6.0
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/resources/ShapeDiverExportApi.d.ts +1 -1
- package/dist/resources/ShapeDiverExportApi.d.ts.map +1 -1
- package/dist/resources/ShapeDiverExportApi.js +12 -4
- package/dist/resources/ShapeDiverExportApi.js.map +1 -1
- package/dist/resources/ShapeDiverSessionApi.d.ts +8 -1
- package/dist/resources/ShapeDiverSessionApi.d.ts.map +1 -1
- package/dist/resources/ShapeDiverSessionApi.js +23 -4
- package/dist/resources/ShapeDiverSessionApi.js.map +1 -1
- package/dist/resources/ShapeDiverUtilsApi.d.ts +6 -7
- package/dist/resources/ShapeDiverUtilsApi.d.ts.map +1 -1
- package/dist/resources/ShapeDiverUtilsApi.js +21 -20
- package/dist/resources/ShapeDiverUtilsApi.js.map +1 -1
- package/package.json +9 -9
|
@@ -15,7 +15,7 @@ export declare class ShapeDiverExportApi extends BaseResourceApi {
|
|
|
15
15
|
* @param sessionId
|
|
16
16
|
* @param body
|
|
17
17
|
*/
|
|
18
|
-
getCache(sessionId: string, body: ShapeDiverRequestCache): Promise<ShapeDiverResponseDto>;
|
|
18
|
+
getCache(sessionId: string, body: ShapeDiverRequestCache | ShapeDiverRequestExport): Promise<ShapeDiverResponseDto>;
|
|
19
19
|
/**
|
|
20
20
|
* Updates the definitions of the given exports.
|
|
21
21
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShapeDiverExportApi.d.ts","sourceRoot":"","sources":["../../src/resources/ShapeDiverExportApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,uBAAuB,EACvB,iCAAiC,EACjC,qBAAqB,EACxB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAGzF,qBAAa,mBAAoB,SAAQ,eAAe;
|
|
1
|
+
{"version":3,"file":"ShapeDiverExportApi.d.ts","sourceRoot":"","sources":["../../src/resources/ShapeDiverExportApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,uBAAuB,EACvB,iCAAiC,EACjC,qBAAqB,EACxB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAGzF,qBAAa,mBAAoB,SAAQ,eAAe;gBAExC,GAAG,EAAE,gBAAgB;IAIjC;;;;;OAKG;IACG,OAAO,CACT,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,uBAAuB,GAC9B,OAAO,CAAC,qBAAqB,CAAC;IASjC;;;;;OAKG;IACG,QAAQ,CACV,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,sBAAsB,GAAG,uBAAuB,GACvD,OAAO,CAAC,qBAAqB,CAAC;IASjC;;;;;OAKG;IACG,iBAAiB,CACnB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,iCAAiC,GACxC,OAAO,CAAC,qBAAqB,CAAC;IAUjC;;;;;OAKG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAQ1F"}
|
|
@@ -24,7 +24,9 @@ class ShapeDiverExportApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
24
24
|
*/
|
|
25
25
|
compute(sessionId, body) {
|
|
26
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
27
|
+
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
return (yield this.api.put(this.buildSessionUri(sessionId) + "/export", body))[1];
|
|
29
|
+
}));
|
|
28
30
|
});
|
|
29
31
|
}
|
|
30
32
|
/**
|
|
@@ -35,7 +37,9 @@ class ShapeDiverExportApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
35
37
|
*/
|
|
36
38
|
getCache(sessionId, body) {
|
|
37
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
-
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
40
|
+
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
41
|
+
return (yield this.api.put(this.buildSessionUri(sessionId) + "/export/cache", body))[1];
|
|
42
|
+
}));
|
|
39
43
|
});
|
|
40
44
|
}
|
|
41
45
|
/**
|
|
@@ -46,7 +50,9 @@ class ShapeDiverExportApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
46
50
|
*/
|
|
47
51
|
updateDefinitions(modelId, body) {
|
|
48
52
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
-
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
53
|
+
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
return (yield this.api.patch(this.buildModelUri(modelId) + "/export", body))[1];
|
|
55
|
+
}));
|
|
50
56
|
});
|
|
51
57
|
}
|
|
52
58
|
/**
|
|
@@ -57,7 +63,9 @@ class ShapeDiverExportApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
57
63
|
*/
|
|
58
64
|
listVersions(sessionId, exportId) {
|
|
59
65
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
|
-
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
66
|
+
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
return (yield this.api.get(this.buildSessionUri(sessionId) + "/export/" + exportId + "/list"))[1];
|
|
68
|
+
}));
|
|
61
69
|
});
|
|
62
70
|
}
|
|
63
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShapeDiverExportApi.js","sourceRoot":"","sources":["../../src/resources/ShapeDiverExportApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qFAAyF;AACzF,0CAA4C;AAE5C,MAAa,mBAAoB,SAAQ,2CAAe;IAEpD,
|
|
1
|
+
{"version":3,"file":"ShapeDiverExportApi.js","sourceRoot":"","sources":["../../src/resources/ShapeDiverExportApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qFAAyF;AACzF,0CAA4C;AAE5C,MAAa,mBAAoB,SAAQ,2CAAe;IAEpD,YAAY,GAAqB;QAC7B,KAAK,CAAC,GAAG,CAAC,CAAA;IACd,CAAC;IAED;;;;;OAKG;IACG,OAAO,CACT,SAAiB,EACjB,IAA6B;;YAE7B,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE;gBAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CACf,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,SAAS,EAC3C,IAAI,CACP,CAAC,CAAC,CAAC,CAAC,CAAA;cAAA,CACR,CAAA;QACL,CAAC;KAAA;IAED;;;;;OAKG;IACG,QAAQ,CACV,SAAiB,EACjB,IAAsD;;YAEtD,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE;gBAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CACf,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,eAAe,EACjD,IAAI,CACP,CAAC,CAAC,CAAC,CAAC,CAAA;cAAA,CACR,CAAA;QACL,CAAC;KAAA;IAED;;;;;OAKG;IACG,iBAAiB,CACnB,OAAe,EACf,IAAuC;;YAEvC,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE;gBAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CACjB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,SAAS,EACvC,IAAI,CACP,CAAC,CAAC,CAAC,CAAC,CAAA;cAAA,CACR,CAAA;QACL,CAAC;KAAA;IAGD;;;;;OAKG;IACG,YAAY,CAAC,SAAiB,EAAE,QAAgB;;YAClD,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE;gBAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CACf,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,CACpE,CAAC,CAAC,CAAC,CAAC,CAAA;cAAA,CACR,CAAA;QACL,CAAC;KAAA;CAEJ;AA3ED,kDA2EC"}
|
|
@@ -11,12 +11,19 @@ export declare class ShapeDiverSessionApi extends BaseResourceApi {
|
|
|
11
11
|
*/
|
|
12
12
|
ticket(modelId: string, body: ShapeDiverRequestTicket): Promise<ShapeDiverResponseDto>;
|
|
13
13
|
/**
|
|
14
|
-
* Create a new session for a ShapeDiver Model.
|
|
14
|
+
* Create a new session for a ShapeDiver Model via a ticket.
|
|
15
15
|
*
|
|
16
16
|
* @param ticket
|
|
17
17
|
* @param request - Optional customization or export request.
|
|
18
18
|
*/
|
|
19
19
|
init(ticket: string, request?: ShapeDiverRequestCustomization | ShapeDiverRequestExport): Promise<ShapeDiverResponseDto>;
|
|
20
|
+
/**
|
|
21
|
+
* Create a new session for a ShapeDiver Model.
|
|
22
|
+
*
|
|
23
|
+
* @param ticket
|
|
24
|
+
* @param request - Optional customization or export request.
|
|
25
|
+
*/
|
|
26
|
+
initForModel(modelId: string, request?: ShapeDiverRequestCustomization | ShapeDiverRequestExport): Promise<ShapeDiverResponseDto>;
|
|
20
27
|
/**
|
|
21
28
|
* Get the full description of a ShapeDiver Model.
|
|
22
29
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShapeDiverSessionApi.d.ts","sourceRoot":"","sources":["../../src/resources/ShapeDiverSessionApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,8BAA8B,EAC9B,uBAAuB,EACvB,uBAAuB,EACvB,qBAAqB,EACxB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAGzF,qBAAa,oBAAqB,SAAQ,eAAe;
|
|
1
|
+
{"version":3,"file":"ShapeDiverSessionApi.d.ts","sourceRoot":"","sources":["../../src/resources/ShapeDiverSessionApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,8BAA8B,EAC9B,uBAAuB,EACvB,uBAAuB,EACvB,qBAAqB,EACxB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAGzF,qBAAa,oBAAqB,SAAQ,eAAe;gBAEzC,GAAG,EAAE,gBAAgB;IAIjC;;;;;;OAMG;IACG,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAS5F;;;;;OAKG;IACG,IAAI,CACN,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,8BAA8B,GAAG,uBAAuB,GACnE,OAAO,CAAC,qBAAqB,CAAC;IAMjC;;;;;OAKG;IACG,YAAY,CACd,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,8BAA8B,GAAG,uBAAuB,GACnE,OAAO,CAAC,qBAAqB,CAAC;IASjC;;;;OAIG;IACG,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAQhE;;;;OAIG;IACG,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAQjE"}
|
|
@@ -25,11 +25,13 @@ class ShapeDiverSessionApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
25
25
|
*/
|
|
26
26
|
ticket(modelId, body) {
|
|
27
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
-
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
29
|
+
return (yield this.api.post(this.buildModelUri(modelId) + "/ticket", body))[1];
|
|
30
|
+
}));
|
|
29
31
|
});
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
32
|
-
* Create a new session for a ShapeDiver Model.
|
|
34
|
+
* Create a new session for a ShapeDiver Model via a ticket.
|
|
33
35
|
*
|
|
34
36
|
* @param ticket
|
|
35
37
|
* @param request - Optional customization or export request.
|
|
@@ -39,6 +41,19 @@ class ShapeDiverSessionApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
39
41
|
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () { return (yield this.api.post(this.buildTicketUri(ticket), request))[1]; }));
|
|
40
42
|
});
|
|
41
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Create a new session for a ShapeDiver Model.
|
|
46
|
+
*
|
|
47
|
+
* @param ticket
|
|
48
|
+
* @param request - Optional customization or export request.
|
|
49
|
+
*/
|
|
50
|
+
initForModel(modelId, request) {
|
|
51
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
52
|
+
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
53
|
+
return (yield this.api.post(this.buildModelUri(modelId) + "/session", request))[1];
|
|
54
|
+
}));
|
|
55
|
+
});
|
|
56
|
+
}
|
|
42
57
|
/**
|
|
43
58
|
* Get the full description of a ShapeDiver Model.
|
|
44
59
|
*
|
|
@@ -46,7 +61,9 @@ class ShapeDiverSessionApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
46
61
|
*/
|
|
47
62
|
default(sessionId) {
|
|
48
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
-
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
65
|
+
return (yield this.api.get(this.buildSessionUri(sessionId) + "/default"))[1];
|
|
66
|
+
}));
|
|
50
67
|
});
|
|
51
68
|
}
|
|
52
69
|
/**
|
|
@@ -56,7 +73,9 @@ class ShapeDiverSessionApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
56
73
|
*/
|
|
57
74
|
close(sessionId) {
|
|
58
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
59
|
-
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
return yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () {
|
|
77
|
+
return (yield this.api.post(this.buildSessionUri(sessionId) + "/close"))[1];
|
|
78
|
+
}));
|
|
60
79
|
});
|
|
61
80
|
}
|
|
62
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShapeDiverSessionApi.js","sourceRoot":"","sources":["../../src/resources/ShapeDiverSessionApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qFAAyF;AACzF,0CAA4C;AAE5C,MAAa,oBAAqB,SAAQ,2CAAe;IAErD,
|
|
1
|
+
{"version":3,"file":"ShapeDiverSessionApi.js","sourceRoot":"","sources":["../../src/resources/ShapeDiverSessionApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qFAAyF;AACzF,0CAA4C;AAE5C,MAAa,oBAAqB,SAAQ,2CAAe;IAErD,YAAY,GAAqB;QAC7B,KAAK,CAAC,GAAG,CAAC,CAAA;IACd,CAAC;IAED;;;;;;OAMG;IACG,MAAM,CAAC,OAAe,EAAE,IAA6B;;YACvD,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE;gBAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAChB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,SAAS,EACvC,IAAI,CACP,CAAC,CAAC,CAAC,CAAC,CAAA;cAAA,CACR,CAAA;QACL,CAAC;KAAA;IAED;;;;;OAKG;IACG,IAAI,CACN,MAAc,EACd,OAAkE;;YAElE,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE,gDAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAwB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,GAAA,CACxF,CAAA;QACL,CAAC;KAAA;IAED;;;;;OAKG;IACG,YAAY,CACd,OAAe,EACf,OAAkE;;YAElE,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE;gBAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAChB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,UAAU,EACxC,OAAO,CACV,CAAC,CAAC,CAAC,CAAC,CAAA;cAAA,CACR,CAAA;QACL,CAAC;KAAA;IAED;;;;OAIG;IACG,OAAO,CAAC,SAAiB;;YAC3B,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE;gBAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CACf,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,UAAU,CAC/C,CAAC,CAAC,CAAC,CAAC,CAAA;cAAA,CACR,CAAA;QACL,CAAC;KAAA;IAED;;;;OAIG;IACG,KAAK,CAAC,SAAiB;;YACzB,OAAO,MAAM,IAAA,mBAAW,EAAC,GAAS,EAAE;gBAChC,OAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAChB,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,QAAQ,CAC7C,CAAC,CAAC,CAAC,CAAC,CAAA;cAAA,CACR,CAAA;QACL,CAAC;KAAA;CAEJ;AAjFD,oDAiFC"}
|
|
@@ -61,26 +61,25 @@ export declare class ShapeDiverUtilsApi extends BaseResourceApi {
|
|
|
61
61
|
* @param sdk
|
|
62
62
|
* @param sessionId
|
|
63
63
|
* @param dto
|
|
64
|
-
* @param
|
|
64
|
+
* @param exportIds
|
|
65
|
+
* @param outputIds
|
|
65
66
|
* @param maxWaitMsec - Maximum duration to wait for result (in milliseconds), pass value < 0 to disable limit.
|
|
66
67
|
* @returns
|
|
67
68
|
*/
|
|
68
69
|
private static waitForExportResult;
|
|
69
70
|
/**
|
|
70
|
-
* Get the maximum delay
|
|
71
|
+
* Get the maximum delay that was reported for output versions.
|
|
71
72
|
*
|
|
72
|
-
* @param dto
|
|
73
73
|
* @returns maximum delay, -1 in case no delay was reported
|
|
74
74
|
*/
|
|
75
75
|
private static getMaxOutputDelay;
|
|
76
76
|
/**
|
|
77
|
-
* Get the delay
|
|
77
|
+
* Get the maximum delay that was reported for the exports. If outputs have been reported as
|
|
78
|
+
* well, their delay time is included too.
|
|
78
79
|
*
|
|
79
|
-
* @param dto
|
|
80
|
-
* @param exportId
|
|
81
80
|
* @returns delay, -1 in case no delay was reported
|
|
82
81
|
*/
|
|
83
|
-
private static
|
|
82
|
+
private static getMaxExportDelay;
|
|
84
83
|
}
|
|
85
84
|
export {};
|
|
86
85
|
//# sourceMappingURL=ShapeDiverUtilsApi.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShapeDiverUtilsApi.d.ts","sourceRoot":"","sources":["../../src/resources/ShapeDiverUtilsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,8BAA8B,EAC9B,uBAAuB,EACvB,qBAAqB,EAGxB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACH,eAAe,EAEf,gBAAgB,EAChB,4BAA4B,EAC/B,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAIhD,KAAK,8BAA8B,CAAC,CAAC,SAAS,4BAA4B,IACtE,CAAC,SAAS,4BAA4B,CAAC,IAAI,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"ShapeDiverUtilsApi.d.ts","sourceRoot":"","sources":["../../src/resources/ShapeDiverUtilsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,8BAA8B,EAC9B,uBAAuB,EACvB,qBAAqB,EAGxB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACH,eAAe,EAEf,gBAAgB,EAChB,4BAA4B,EAC/B,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAIhD,KAAK,8BAA8B,CAAC,CAAC,SAAS,4BAA4B,IACtE,CAAC,SAAS,4BAA4B,CAAC,IAAI,GAAG,MAAM,GACpD,CAAC,SAAS,4BAA4B,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjE,CAAC,SAAS,4BAA4B,CAAC,IAAI,GAAG,WAAW,GACzD,KAAK,CAAC;AAEV,qBAAa,kBAAmB,SAAQ,eAAe;gBAEvC,GAAG,EAAE,gBAAgB;IAIjC;;;;;;OAMG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAS9G;;;;;;OAMG;IACG,QAAQ,CAAC,CAAC,SAAS,4BAA4B,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC;QAC1F,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;QACnB,8BAA8B,CAAC,CAAC,CAAC;KACpC,CAAC;IASF;;;;;;;;;OASG;IACG,6BAA6B,CAC/B,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,8BAA8B,EACpC,WAAW,SAAK,GACjB,OAAO,CAAC,qBAAqB,CAAC;IAWjC;;;;;;;;;OASG;IACG,sBAAsB,CACxB,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,uBAAuB,EAC7B,WAAW,SAAK,GACjB,OAAO,CAAC,qBAAqB,CAAC;IAWjC;;;;;;;;OAQG;mBACkB,0BAA0B;IAuC/C;;;;;;;;;;OAUG;mBACkB,mBAAmB;IAgCxC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAQhC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAmBnC"}
|
|
@@ -91,7 +91,7 @@ class ShapeDiverUtilsApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
91
91
|
const waitMsec = Date.now() - startMsec;
|
|
92
92
|
// Reduce the total max waiting time by the amount the compute-request took
|
|
93
93
|
maxWaitMsec = (maxWaitMsec < 0) ? maxWaitMsec : Math.max(0, maxWaitMsec - waitMsec);
|
|
94
|
-
return ShapeDiverUtilsApi.waitForExportResult(sdk, sessionId,
|
|
94
|
+
return ShapeDiverUtilsApi.waitForExportResult(sdk, sessionId, body, dto, maxWaitMsec);
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
97
|
/**
|
|
@@ -139,19 +139,14 @@ class ShapeDiverUtilsApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
139
139
|
* @param sdk
|
|
140
140
|
* @param sessionId
|
|
141
141
|
* @param dto
|
|
142
|
-
* @param
|
|
142
|
+
* @param exportIds
|
|
143
|
+
* @param outputIds
|
|
143
144
|
* @param maxWaitMsec - Maximum duration to wait for result (in milliseconds), pass value < 0 to disable limit.
|
|
144
145
|
* @returns
|
|
145
146
|
*/
|
|
146
|
-
static waitForExportResult(sdk, sessionId,
|
|
147
|
+
static waitForExportResult(sdk, sessionId, body, dto, maxWaitMsec = -1) {
|
|
147
148
|
return __awaiter(this, void 0, void 0, function* () {
|
|
148
|
-
|
|
149
|
-
throw new sdk_geometry_api_sdk_core_1.ShapeDiverError("The given DTO does not contain any exports");
|
|
150
|
-
// Build new cache request
|
|
151
|
-
const exportVersion = { [exportId]: dto.exports[exportId].version };
|
|
152
|
-
if (!dto.exports)
|
|
153
|
-
throw new sdk_geometry_api_sdk_core_1.ShapeDiverError(`Could not find any export with the id '${exportId}'`);
|
|
154
|
-
let delay = ShapeDiverUtilsApi.getExportDelay(dto, exportId);
|
|
149
|
+
let delay = ShapeDiverUtilsApi.getMaxExportDelay(dto, body);
|
|
155
150
|
const startMsec = Date.now();
|
|
156
151
|
while (delay > 0) {
|
|
157
152
|
// Check whether maxWaitMsec has been reached
|
|
@@ -166,16 +161,15 @@ class ShapeDiverUtilsApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
166
161
|
}
|
|
167
162
|
yield (0, utils_1.sleep)(delay);
|
|
168
163
|
// Send cache request
|
|
169
|
-
dto = yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () { return sdk.export.getCache(sessionId,
|
|
170
|
-
delay = ShapeDiverUtilsApi.
|
|
164
|
+
dto = yield (0, utils_1.sendRequest)(() => __awaiter(this, void 0, void 0, function* () { return sdk.export.getCache(sessionId, body); }));
|
|
165
|
+
delay = ShapeDiverUtilsApi.getMaxExportDelay(dto, body);
|
|
171
166
|
}
|
|
172
167
|
return dto;
|
|
173
168
|
});
|
|
174
169
|
}
|
|
175
170
|
/**
|
|
176
|
-
* Get the maximum delay
|
|
171
|
+
* Get the maximum delay that was reported for output versions.
|
|
177
172
|
*
|
|
178
|
-
* @param dto
|
|
179
173
|
* @returns maximum delay, -1 in case no delay was reported
|
|
180
174
|
*/
|
|
181
175
|
static getMaxOutputDelay(dto) {
|
|
@@ -184,15 +178,22 @@ class ShapeDiverUtilsApi extends sdk_geometry_api_sdk_core_1.BaseResourceApi {
|
|
|
184
178
|
.map(output => { var _a; return (_a = output.delay) !== null && _a !== void 0 ? _a : -1; }));
|
|
185
179
|
}
|
|
186
180
|
/**
|
|
187
|
-
* Get the delay
|
|
181
|
+
* Get the maximum delay that was reported for the exports. If outputs have been reported as
|
|
182
|
+
* well, their delay time is included too.
|
|
188
183
|
*
|
|
189
|
-
* @param dto
|
|
190
|
-
* @param exportId
|
|
191
184
|
* @returns delay, -1 in case no delay was reported
|
|
192
185
|
*/
|
|
193
|
-
static
|
|
194
|
-
var _a;
|
|
195
|
-
|
|
186
|
+
static getMaxExportDelay(dto, body) {
|
|
187
|
+
var _a, _b, _c;
|
|
188
|
+
const exports = (Array.isArray(body.exports)) ? body.exports : [body.exports.id];
|
|
189
|
+
const outputs = (_a = body.outputs) !== null && _a !== void 0 ? _a : [];
|
|
190
|
+
return Math.max(...Object.values((_b = dto.exports) !== null && _b !== void 0 ? _b : {})
|
|
191
|
+
.filter(e => exports.includes(e.id))
|
|
192
|
+
.map(e => e)
|
|
193
|
+
.map(e => { var _a; return (_a = e.delay) !== null && _a !== void 0 ? _a : -1; }), ...Object.values((_c = dto.outputs) !== null && _c !== void 0 ? _c : {})
|
|
194
|
+
.filter(o => outputs.includes(o.id))
|
|
195
|
+
.map(o => o)
|
|
196
|
+
.map(o => { var _a; return (_a = o.delay) !== null && _a !== void 0 ? _a : -1; }));
|
|
196
197
|
}
|
|
197
198
|
}
|
|
198
199
|
exports.ShapeDiverUtilsApi = ShapeDiverUtilsApi;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShapeDiverUtilsApi.js","sourceRoot":"","sources":["../../src/resources/ShapeDiverUtilsApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAQA,qFAK8C;AAE9C,0CAAmD;AASnD,MAAa,kBAAmB,SAAQ,2CAAe;IAEnD,
|
|
1
|
+
{"version":3,"file":"ShapeDiverUtilsApi.js","sourceRoot":"","sources":["../../src/resources/ShapeDiverUtilsApi.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.
|
|
3
|
+
"version": "1.6.0",
|
|
4
4
|
"description": "SDK to communicate with the Geometry API version 2",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"shapediver",
|
|
@@ -45,15 +45,15 @@
|
|
|
45
45
|
]
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"jest": "~29.
|
|
49
|
-
"lerna": "~
|
|
50
|
-
"typescript": "~
|
|
51
|
-
"webpack": "~5.
|
|
52
|
-
"webpack-cli": "~5.1.
|
|
53
|
-
"webpack-dev-server": "~4.15.
|
|
48
|
+
"jest": "~29.6.2",
|
|
49
|
+
"lerna": "~7.1.5",
|
|
50
|
+
"typescript": "~5.1.6",
|
|
51
|
+
"webpack": "~5.88.2",
|
|
52
|
+
"webpack-cli": "~5.1.4",
|
|
53
|
+
"webpack-dev-server": "~4.15.1"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@shapediver/sdk.geometry-api-sdk-core": "~1.3.
|
|
57
|
-
"@shapediver/api.geometry-api-dto-v2": "~1.
|
|
56
|
+
"@shapediver/sdk.geometry-api-sdk-core": "~1.3.1",
|
|
57
|
+
"@shapediver/api.geometry-api-dto-v2": "~1.11.0"
|
|
58
58
|
}
|
|
59
59
|
}
|