@osaas/client-core 0.17.1 → 0.18.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/lib/platform/maker.d.ts
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import { Platform } from '../platform';
|
|
2
2
|
export interface Order {
|
|
3
3
|
orderId: string;
|
|
4
|
+
status: {
|
|
5
|
+
phase: string;
|
|
6
|
+
};
|
|
4
7
|
}
|
|
5
8
|
export interface OutputOrder {
|
|
6
9
|
order: Order;
|
|
7
10
|
}
|
|
8
11
|
export declare function getOrderIdByName(platform: Platform, orderName: string): Promise<string | undefined>;
|
|
12
|
+
export declare function waitForOrder(platform: Platform, orderId: string): Promise<undefined>;
|
|
9
13
|
export declare function remakeOrder(platform: Platform, orderId: string): Promise<string | undefined>;
|
|
10
14
|
//# sourceMappingURL=maker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maker.d.ts","sourceRoot":"","sources":["../../src/platform/maker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"maker.d.ts","sourceRoot":"","sources":["../../src/platform/maker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,KAAK,CAAC;CACd;AAID,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,+BAwB3E;AAED,wBAAsB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,sBAkCrE;AAED,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,+BAwBpE"}
|
package/lib/platform/maker.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.remakeOrder = exports.getOrderIdByName = void 0;
|
|
3
|
+
exports.remakeOrder = exports.waitForOrder = exports.getOrderIdByName = void 0;
|
|
4
4
|
const errors_1 = require("../errors");
|
|
5
5
|
const fetch_1 = require("../fetch");
|
|
6
6
|
const log_1 = require("../log");
|
|
7
|
+
const delay = (ms) => new Promise((res) => setTimeout(res, ms));
|
|
7
8
|
async function getOrderIdByName(platform, orderName) {
|
|
8
9
|
try {
|
|
9
10
|
const makerUrl = new URL(`https://maker.svc.${platform.getEnvironment()}.osaas.io/maker`);
|
|
@@ -30,6 +31,41 @@ async function getOrderIdByName(platform, orderName) {
|
|
|
30
31
|
}
|
|
31
32
|
}
|
|
32
33
|
exports.getOrderIdByName = getOrderIdByName;
|
|
34
|
+
async function waitForOrder(platform, orderId) {
|
|
35
|
+
try {
|
|
36
|
+
let running = true;
|
|
37
|
+
while (running) {
|
|
38
|
+
const makerUrl = new URL(`https://maker.svc.${platform.getEnvironment()}.osaas.io/maker/${orderId}`);
|
|
39
|
+
const res = await (0, fetch_1.createFetch)(makerUrl, {
|
|
40
|
+
headers: {
|
|
41
|
+
Authorization: `Bearer ${platform.getApiKey()}`,
|
|
42
|
+
'Content-Type': 'application/json'
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
(0, log_1.Log)().debug(res.order.status.phase);
|
|
46
|
+
if (res.order.status.phase === 'NEW' ||
|
|
47
|
+
res.order.status.phase === 'RUNNING' ||
|
|
48
|
+
res.order.status.phase === 'PENDING') {
|
|
49
|
+
running = true;
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
running = false;
|
|
53
|
+
}
|
|
54
|
+
await delay(5000);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
(0, log_1.Log)().debug(err);
|
|
59
|
+
if (err instanceof fetch_1.FetchError && err.httpCode === 401) {
|
|
60
|
+
throw new errors_1.UnauthorizedError();
|
|
61
|
+
}
|
|
62
|
+
else if (err instanceof fetch_1.FetchError && err.httpCode === 404) {
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
65
|
+
throw err;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
exports.waitForOrder = waitForOrder;
|
|
33
69
|
async function remakeOrder(platform, orderId) {
|
|
34
70
|
try {
|
|
35
71
|
const remakerUrl = new URL(`https://maker.svc.${platform.getEnvironment()}.osaas.io/remaker`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maker.js","sourceRoot":"","sources":["../../src/platform/maker.ts"],"names":[],"mappings":";;;AAAA,sCAA8C;AAC9C,oCAAmD;AACnD,gCAA6B;
|
|
1
|
+
{"version":3,"file":"maker.js","sourceRoot":"","sources":["../../src/platform/maker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@osaas/client-core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.18.0",
|
|
4
4
|
"description": "Open Source Cloud Client SDK core library",
|
|
5
5
|
"author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
|
|
6
6
|
"homepage": "https://www.osaas.io",
|
|
@@ -30,5 +30,5 @@
|
|
|
30
30
|
"publishConfig": {
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
|
-
"gitHead": "
|
|
33
|
+
"gitHead": "7f7d862d115c49dbaf48f66d01fc9995e15e7caa"
|
|
34
34
|
}
|