ozone-typescript-client 6.1.6 → 6.1.7
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.
|
@@ -14,12 +14,12 @@ export declare class TaskHandlerImpl<T = any> implements TaskHandler {
|
|
|
14
14
|
onFinish?: (taskExecution: TaskExecution) => void;
|
|
15
15
|
onError?: (taskExecution: TaskExecution) => void;
|
|
16
16
|
onProgress?: (taskExecution: TaskExecution) => void;
|
|
17
|
-
private subTaskinterval?;
|
|
18
17
|
private pollInterval;
|
|
19
|
-
private
|
|
18
|
+
private timeout?;
|
|
19
|
+
private subTimeout?;
|
|
20
20
|
private rejectPromise?;
|
|
21
21
|
stopWaiting(): void;
|
|
22
|
-
|
|
22
|
+
_clearPullTimeout(): void;
|
|
23
23
|
private executeCallback;
|
|
24
24
|
readonly waitResult: Promise<T | undefined>;
|
|
25
25
|
constructor(taskId: string, client: OzoneClient, baseUrl: string, options: TaskHandlerOption);
|
|
@@ -17,7 +17,7 @@ export class TaskClientImpl {
|
|
|
17
17
|
return new TaskHandlerImpl(taskId, this.client, this.baseUrl, options || {});
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
const waitingTime =
|
|
20
|
+
const waitingTime = 10000; // ms
|
|
21
21
|
export class TaskHandlerImpl {
|
|
22
22
|
constructor(taskId, client, baseUrl, options) {
|
|
23
23
|
this.client = client;
|
|
@@ -27,14 +27,14 @@ export class TaskHandlerImpl {
|
|
|
27
27
|
this.waitResult = this._waitForTask(taskId);
|
|
28
28
|
}
|
|
29
29
|
stopWaiting() {
|
|
30
|
-
this.
|
|
30
|
+
this._clearPullTimeout();
|
|
31
31
|
const stopWaitingErrorMessage = { error: 'Wait for task canceled' };
|
|
32
32
|
this.executeCallback(this.onError, stopWaitingErrorMessage);
|
|
33
33
|
this.executeCallback(this.rejectPromise, stopWaitingErrorMessage);
|
|
34
34
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
_clearPullTimeout() {
|
|
36
|
+
clearTimeout(this.timeout);
|
|
37
|
+
clearTimeout(this.subTimeout);
|
|
38
38
|
}
|
|
39
39
|
executeCallback(callback, param) {
|
|
40
40
|
if (callback) {
|
|
@@ -43,51 +43,63 @@ export class TaskHandlerImpl {
|
|
|
43
43
|
}
|
|
44
44
|
_waitForSubTasks(asyncTasksGroupId) {
|
|
45
45
|
return (new Promise((resolve, reject) => {
|
|
46
|
-
|
|
47
|
-
this.
|
|
48
|
-
.
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
46
|
+
const wait = () => {
|
|
47
|
+
this.subTimeout = window.setTimeout(() => {
|
|
48
|
+
this._awaitTask(asyncTasksGroupId)
|
|
49
|
+
.then((data) => {
|
|
50
|
+
if (data.stepsCount !== data.stepsDone) {
|
|
51
|
+
wait();
|
|
52
|
+
}
|
|
53
|
+
else if (data.hasErrors) {
|
|
54
|
+
reject('One of the processing sub tasks as an error');
|
|
55
|
+
}
|
|
56
|
+
else if (data.stepsDone === data.stepsCount) {
|
|
57
|
+
this._clearPullTimeout();
|
|
58
|
+
resolve();
|
|
59
|
+
}
|
|
60
|
+
})
|
|
61
|
+
.catch((error) => {
|
|
62
|
+
this._clearPullTimeout();
|
|
63
|
+
reject(error);
|
|
64
|
+
});
|
|
65
|
+
}, this.pollInterval);
|
|
66
|
+
};
|
|
67
|
+
wait();
|
|
62
68
|
}));
|
|
63
69
|
}
|
|
64
70
|
_waitForTask(taskId) {
|
|
65
71
|
let primaryTaskResult;
|
|
66
72
|
return (new Promise((resolve, reject) => {
|
|
67
73
|
this.rejectPromise = reject;
|
|
68
|
-
|
|
69
|
-
this.
|
|
70
|
-
.
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
74
|
+
const wait = () => {
|
|
75
|
+
this.timeout = window.setTimeout(() => {
|
|
76
|
+
this._awaitTask(taskId)
|
|
77
|
+
.then((data) => {
|
|
78
|
+
if (data && data.taskExecutions) {
|
|
79
|
+
const taskExecution = data.taskExecutions[taskId];
|
|
80
|
+
this.executeCallback(this.onProgress, taskExecution);
|
|
81
|
+
if (data.hasErrors) {
|
|
82
|
+
this.executeCallback(this.onError, taskExecution);
|
|
83
|
+
clearTimeout(this.timeout);
|
|
84
|
+
reject(Error(taskExecution.error || 'Error in ozone task'));
|
|
85
|
+
}
|
|
86
|
+
else if (data.stepsDone === data.stepsCount) {
|
|
87
|
+
this._clearPullTimeout();
|
|
88
|
+
primaryTaskResult = taskExecution;
|
|
89
|
+
resolve(taskExecution);
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
wait();
|
|
93
|
+
}
|
|
83
94
|
}
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
});
|
|
90
|
-
}
|
|
95
|
+
})
|
|
96
|
+
.catch((error) => {
|
|
97
|
+
clearTimeout(this.timeout);
|
|
98
|
+
reject(error);
|
|
99
|
+
});
|
|
100
|
+
}, this.pollInterval);
|
|
101
|
+
};
|
|
102
|
+
wait();
|
|
91
103
|
}))
|
|
92
104
|
.then((taskResult) => {
|
|
93
105
|
if (!this.options.skipWaitingOnSubTask
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taskClientImpl.js","sourceRoot":"","sources":["../../../src/taskClient/taskClientImpl.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAEhD,MAAM,OAAO,cAAc;IAC1B,YAAoB,MAAmB,EAAU,OAAe;QAA5C,WAAM,GAAN,MAAM,CAAa;QAAU,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IAEpE,WAAW,CAAI,MAAY,EAAE,OAA2B;QACvD,OAAO,IAAI,eAAe,CAAI,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC,CAAA;IAChF,CAAC;CACD;AACD,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"taskClientImpl.js","sourceRoot":"","sources":["../../../src/taskClient/taskClientImpl.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ozone-typescript-client",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.7",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/sockjs-client": "^1.1.1"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "b8447395a9e9d7f0dc7474fba8658bfdad6c78a9"
|
|
41
41
|
}
|