@cadenza.io/service 2.17.3 → 2.17.4
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/browser/index.js +49 -51
- package/dist/browser/index.js.map +1 -1
- package/dist/browser/index.mjs +49 -51
- package/dist/browser/index.mjs.map +1 -1
- package/dist/index.d.mts +26 -2
- package/dist/index.d.ts +26 -2
- package/dist/index.js +54 -60
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +54 -60
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
package/dist/index.mjs
CHANGED
|
@@ -1573,50 +1573,10 @@ var ServiceRegistry = class _ServiceRegistry {
|
|
|
1573
1573
|
"meta.service_registry.selected_instance_for_fetch",
|
|
1574
1574
|
"meta.service_registry.socket_failed"
|
|
1575
1575
|
);
|
|
1576
|
-
this.getStatusTask = CadenzaService.createMetaTask(
|
|
1577
|
-
|
|
1578
|
-
|
|
1579
|
-
|
|
1580
|
-
__error: "No service name defined",
|
|
1581
|
-
errored: true
|
|
1582
|
-
};
|
|
1583
|
-
}
|
|
1584
|
-
if (!this.serviceInstanceId) {
|
|
1585
|
-
return {
|
|
1586
|
-
__status: "error",
|
|
1587
|
-
__error: "No service instance id defined",
|
|
1588
|
-
errored: true
|
|
1589
|
-
};
|
|
1590
|
-
}
|
|
1591
|
-
const report = this.buildLocalRuntimeStatusReport("full");
|
|
1592
|
-
if (!report) {
|
|
1593
|
-
return {
|
|
1594
|
-
...ctx,
|
|
1595
|
-
__status: "error",
|
|
1596
|
-
__error: "No local service instance available for status check",
|
|
1597
|
-
errored: true
|
|
1598
|
-
};
|
|
1599
|
-
}
|
|
1600
|
-
return {
|
|
1601
|
-
...ctx,
|
|
1602
|
-
__status: "ok",
|
|
1603
|
-
__serviceName: report.serviceName,
|
|
1604
|
-
__serviceInstanceId: report.serviceInstanceId,
|
|
1605
|
-
__numberOfRunningGraphs: report.numberOfRunningGraphs,
|
|
1606
|
-
__health: report.health ?? {},
|
|
1607
|
-
__active: report.isActive,
|
|
1608
|
-
reportedAt: report.reportedAt,
|
|
1609
|
-
serviceName: report.serviceName,
|
|
1610
|
-
serviceInstanceId: report.serviceInstanceId,
|
|
1611
|
-
numberOfRunningGraphs: report.numberOfRunningGraphs,
|
|
1612
|
-
health: report.health ?? {},
|
|
1613
|
-
isActive: report.isActive,
|
|
1614
|
-
isNonResponsive: report.isNonResponsive,
|
|
1615
|
-
isBlocked: report.isBlocked,
|
|
1616
|
-
state: report.state,
|
|
1617
|
-
acceptingWork: report.acceptingWork
|
|
1618
|
-
};
|
|
1619
|
-
}).doOn(
|
|
1576
|
+
this.getStatusTask = CadenzaService.createMetaTask(
|
|
1577
|
+
"Get status",
|
|
1578
|
+
(ctx) => this.resolveLocalStatusCheck(ctx)
|
|
1579
|
+
).doOn(
|
|
1620
1580
|
"meta.socket.status_check_requested",
|
|
1621
1581
|
"meta.rest.status_check_requested"
|
|
1622
1582
|
);
|
|
@@ -2328,6 +2288,50 @@ var ServiceRegistry = class _ServiceRegistry {
|
|
|
2328
2288
|
}
|
|
2329
2289
|
return this.getInstance(this.serviceName, this.serviceInstanceId);
|
|
2330
2290
|
}
|
|
2291
|
+
resolveLocalStatusCheck(ctx = {}) {
|
|
2292
|
+
if (!this.serviceName) {
|
|
2293
|
+
return {
|
|
2294
|
+
__status: "error",
|
|
2295
|
+
__error: "No service name defined",
|
|
2296
|
+
errored: true
|
|
2297
|
+
};
|
|
2298
|
+
}
|
|
2299
|
+
if (!this.serviceInstanceId) {
|
|
2300
|
+
return {
|
|
2301
|
+
__status: "error",
|
|
2302
|
+
__error: "No service instance id defined",
|
|
2303
|
+
errored: true
|
|
2304
|
+
};
|
|
2305
|
+
}
|
|
2306
|
+
const report = this.buildLocalRuntimeStatusReport("full");
|
|
2307
|
+
if (!report) {
|
|
2308
|
+
return {
|
|
2309
|
+
...ctx,
|
|
2310
|
+
__status: "error",
|
|
2311
|
+
__error: "No local service instance available for status check",
|
|
2312
|
+
errored: true
|
|
2313
|
+
};
|
|
2314
|
+
}
|
|
2315
|
+
return {
|
|
2316
|
+
...ctx,
|
|
2317
|
+
__status: "ok",
|
|
2318
|
+
__serviceName: report.serviceName,
|
|
2319
|
+
__serviceInstanceId: report.serviceInstanceId,
|
|
2320
|
+
__numberOfRunningGraphs: report.numberOfRunningGraphs,
|
|
2321
|
+
__health: report.health ?? {},
|
|
2322
|
+
__active: report.isActive,
|
|
2323
|
+
reportedAt: report.reportedAt,
|
|
2324
|
+
serviceName: report.serviceName,
|
|
2325
|
+
serviceInstanceId: report.serviceInstanceId,
|
|
2326
|
+
numberOfRunningGraphs: report.numberOfRunningGraphs,
|
|
2327
|
+
health: report.health ?? {},
|
|
2328
|
+
isActive: report.isActive,
|
|
2329
|
+
isNonResponsive: report.isNonResponsive,
|
|
2330
|
+
isBlocked: report.isBlocked,
|
|
2331
|
+
state: report.state,
|
|
2332
|
+
acceptingWork: report.acceptingWork
|
|
2333
|
+
};
|
|
2334
|
+
}
|
|
2331
2335
|
resolveTransportProtocolOrder(ctx) {
|
|
2332
2336
|
const explicit = ctx.__preferredTransportProtocol === "rest" || ctx.__preferredTransportProtocol === "socket" ? ctx.__preferredTransportProtocol : void 0;
|
|
2333
2337
|
const preferred = explicit ?? (this.useSocket ? "socket" : "rest");
|
|
@@ -3207,15 +3211,11 @@ var RestController = class _RestController {
|
|
|
3207
3211
|
CadenzaService.emit(ctx2.__signalName, ctx2);
|
|
3208
3212
|
});
|
|
3209
3213
|
app.get("/status", (req, res) => {
|
|
3210
|
-
|
|
3211
|
-
|
|
3212
|
-
|
|
3213
|
-
|
|
3214
|
-
|
|
3215
|
-
).doAfter(CadenzaService.serviceRegistry.getStatusTask);
|
|
3216
|
-
CadenzaService.emit(
|
|
3217
|
-
"meta.rest.status_check_requested",
|
|
3218
|
-
req.body.query
|
|
3214
|
+
const statusCheckQuery = req?.body?.query && typeof req.body.query === "object" ? req.body.query : req?.query && typeof req.query === "object" ? { ...req.query } : {};
|
|
3215
|
+
res.json(
|
|
3216
|
+
CadenzaService.serviceRegistry.resolveLocalStatusCheck(
|
|
3217
|
+
statusCheckQuery
|
|
3218
|
+
)
|
|
3219
3219
|
);
|
|
3220
3220
|
});
|
|
3221
3221
|
return true;
|
|
@@ -4287,13 +4287,7 @@ var SocketController = class _SocketController {
|
|
|
4287
4287
|
ws.on(
|
|
4288
4288
|
"status_check",
|
|
4289
4289
|
(ctx, callback) => {
|
|
4290
|
-
CadenzaService.
|
|
4291
|
-
"Resolve status check",
|
|
4292
|
-
callback,
|
|
4293
|
-
"Resolves a status check request",
|
|
4294
|
-
{ register: false }
|
|
4295
|
-
).doAfter(CadenzaService.serviceRegistry.getStatusTask);
|
|
4296
|
-
CadenzaService.emit("meta.socket.status_check_requested", ctx);
|
|
4290
|
+
callback(CadenzaService.serviceRegistry.resolveLocalStatusCheck(ctx));
|
|
4297
4291
|
}
|
|
4298
4292
|
);
|
|
4299
4293
|
ws.on("disconnect", () => {
|