@magda/typescript-common 1.1.0-arm64.0 → 1.2.0-alpha.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/AspectBuilder.d.ts +7 -0
- package/dist/AspectBuilder.js +3 -0
- package/dist/AspectBuilder.js.map +1 -0
- package/dist/AspectCreationFailure.d.ts +5 -0
- package/dist/AspectCreationFailure.js +10 -0
- package/dist/AspectCreationFailure.js.map +1 -0
- package/dist/AsyncPage.d.ts +18 -0
- package/dist/AsyncPage.js +140 -0
- package/dist/AsyncPage.js.map +1 -0
- package/dist/ConnectionResult.d.ts +16 -0
- package/dist/ConnectionResult.js +77 -0
- package/dist/ConnectionResult.js.map +1 -0
- package/dist/ConnectorRecordId.d.ts +15 -0
- package/dist/ConnectorRecordId.js +46 -0
- package/dist/ConnectorRecordId.js.map +1 -0
- package/dist/JsonConnector.d.ts +195 -0
- package/dist/JsonConnector.js +427 -0
- package/dist/JsonConnector.js.map +1 -0
- package/dist/JsonTransformer.d.ts +112 -0
- package/dist/JsonTransformer.js +225 -0
- package/dist/JsonTransformer.js.map +1 -0
- package/dist/OpaCompileResponseParser.d.ts +480 -0
- package/dist/OpaCompileResponseParser.js +1134 -0
- package/dist/OpaCompileResponseParser.js.map +1 -0
- package/dist/RecordCreationFailure.d.ts +7 -0
- package/dist/RecordCreationFailure.js +11 -0
- package/dist/RecordCreationFailure.js.map +1 -0
- package/dist/SimpleOpaSQLTranslator.d.ts +14 -0
- package/dist/SimpleOpaSQLTranslator.js +79 -0
- package/dist/SimpleOpaSQLTranslator.js.map +1 -0
- package/dist/addTrailingSlash.d.ts +1 -0
- package/dist/addTrailingSlash.js +15 -0
- package/dist/addTrailingSlash.js.map +1 -0
- package/dist/appendUrlSegments.d.ts +2 -0
- package/dist/appendUrlSegments.js +18 -0
- package/dist/appendUrlSegments.js.map +1 -0
- package/dist/authorization-api/AccessControlError.d.ts +4 -0
- package/dist/authorization-api/AccessControlError.js +13 -0
- package/dist/authorization-api/AccessControlError.js.map +1 -0
- package/dist/authorization-api/ApiClient.d.ts +141 -0
- package/dist/authorization-api/ApiClient.js +335 -0
- package/dist/authorization-api/ApiClient.js.map +1 -0
- package/dist/authorization-api/AuthError.d.ts +4 -0
- package/dist/authorization-api/AuthError.js +13 -0
- package/dist/authorization-api/AuthError.js.map +1 -0
- package/dist/authorization-api/GenericError.d.ts +9 -0
- package/dist/authorization-api/GenericError.js +17 -0
- package/dist/authorization-api/GenericError.js.map +1 -0
- package/dist/authorization-api/authMiddleware.d.ts +7 -0
- package/dist/authorization-api/authMiddleware.js +52 -0
- package/dist/authorization-api/authMiddleware.js.map +1 -0
- package/dist/authorization-api/model.d.ts +99 -0
- package/dist/authorization-api/model.js +3 -0
- package/dist/authorization-api/model.js.map +1 -0
- package/dist/coerceJson.d.ts +2 -0
- package/dist/coerceJson.js +13 -0
- package/dist/coerceJson.js.map +1 -0
- package/dist/createServiceError.d.ts +19 -0
- package/dist/createServiceError.js +45 -0
- package/dist/createServiceError.js.map +1 -0
- package/dist/delay.d.ts +2 -0
- package/dist/delay.js +9 -0
- package/dist/delay.js.map +1 -0
- package/dist/express/status.d.ts +30 -0
- package/dist/express/status.js +180 -0
- package/dist/express/status.js.map +1 -0
- package/dist/formatServiceError.d.ts +1 -0
- package/dist/formatServiceError.js +23 -0
- package/dist/formatServiceError.js.map +1 -0
- package/dist/generated/registry/api.d.ts +596 -0
- package/dist/generated/registry/api.js +2060 -0
- package/dist/generated/registry/api.js.map +1 -0
- package/dist/getAbsoluteUrl.d.ts +12 -0
- package/dist/getAbsoluteUrl.js +35 -0
- package/dist/getAbsoluteUrl.js.map +1 -0
- package/dist/getBasePathFromUrl.d.ts +10 -0
- package/dist/getBasePathFromUrl.js +27 -0
- package/dist/getBasePathFromUrl.js.map +1 -0
- package/dist/markdownToHtml.d.ts +3 -0
- package/dist/markdownToHtml.js +38 -0
- package/dist/markdownToHtml.js.map +1 -0
- package/dist/opa/OpaTypes.d.ts +41 -0
- package/dist/opa/OpaTypes.js +3 -0
- package/dist/opa/OpaTypes.js.map +1 -0
- package/dist/opa/getAuthDecision.d.ts +19 -0
- package/dist/opa/getAuthDecision.js +94 -0
- package/dist/opa/getAuthDecision.js.map +1 -0
- package/dist/opa/queryOpa.d.ts +1 -0
- package/dist/opa/queryOpa.js +41 -0
- package/dist/opa/queryOpa.js.map +1 -0
- package/dist/registry/AuthorizedRegistryClient.d.ts +29 -0
- package/dist/registry/AuthorizedRegistryClient.js +115 -0
- package/dist/registry/AuthorizedRegistryClient.js.map +1 -0
- package/dist/registry/RegistryClient.d.ts +36 -0
- package/dist/registry/RegistryClient.js +59 -0
- package/dist/registry/RegistryClient.js.map +1 -0
- package/dist/registry/TenantConsts.d.ts +31 -0
- package/dist/registry/TenantConsts.js +35 -0
- package/dist/registry/TenantConsts.js.map +1 -0
- package/dist/registry-manual/api.d.ts +9 -0
- package/dist/registry-manual/api.js +10 -0
- package/dist/registry-manual/api.js.map +1 -0
- package/dist/request.d.ts +3 -0
- package/dist/request.js +19 -0
- package/dist/request.js.map +1 -0
- package/dist/retry.d.ts +1 -0
- package/dist/retry.js +21 -0
- package/dist/retry.js.map +1 -0
- package/dist/retryBackoff.d.ts +1 -0
- package/dist/retryBackoff.js +21 -0
- package/dist/retryBackoff.js.map +1 -0
- package/dist/runLater.d.ts +1 -0
- package/dist/runLater.js +16 -0
- package/dist/runLater.js.map +1 -0
- package/dist/session/GetUserId.d.ts +5 -0
- package/dist/session/GetUserId.js +41 -0
- package/dist/session/GetUserId.js.map +1 -0
- package/dist/session/GetUserSession.d.ts +3 -0
- package/dist/session/GetUserSession.js +22 -0
- package/dist/session/GetUserSession.js.map +1 -0
- package/dist/session/addJwtSecretFromEnvVar.d.ts +14 -0
- package/dist/session/addJwtSecretFromEnvVar.js +23 -0
- package/dist/session/addJwtSecretFromEnvVar.js.map +1 -0
- package/dist/session/buildJwt.d.ts +1 -0
- package/dist/session/buildJwt.js +8 -0
- package/dist/session/buildJwt.js.map +1 -0
- package/dist/session/cookieUtils.d.ts +16 -0
- package/dist/session/cookieUtils.js +19 -0
- package/dist/session/cookieUtils.js.map +1 -0
- package/dist/session/destroySession.d.ts +10 -0
- package/dist/session/destroySession.js +44 -0
- package/dist/session/destroySession.js.map +1 -0
- package/dist/session/getSessionId.d.ts +2 -0
- package/dist/session/getSessionId.js +28 -0
- package/dist/session/getSessionId.js.map +1 -0
- package/dist/tenant-api/AuthorizedTenantClient.d.ts +25 -0
- package/dist/tenant-api/AuthorizedTenantClient.js +61 -0
- package/dist/tenant-api/AuthorizedTenantClient.js.map +1 -0
- package/dist/tenant-api/Tenant.d.ts +17 -0
- package/dist/tenant-api/Tenant.js +10 -0
- package/dist/tenant-api/Tenant.js.map +1 -0
- package/dist/test/JsonConnector.spec.d.ts +1 -0
- package/dist/test/JsonConnector.spec.js +352 -0
- package/dist/test/JsonConnector.spec.js.map +1 -0
- package/dist/test/JsonTransformer.spec.d.ts +1 -0
- package/dist/test/JsonTransformer.spec.js +98 -0
- package/dist/test/JsonTransformer.spec.js.map +1 -0
- package/dist/test/arbitraries.d.ts +98 -0
- package/dist/test/arbitraries.js +264 -0
- package/dist/test/arbitraries.js.map +1 -0
- package/dist/test/aspect-templates/organization-details.d.ts +4 -0
- package/dist/test/aspect-templates/organization-details.js +11 -0
- package/dist/test/aspect-templates/organization-details.js.map +1 -0
- package/dist/test/buildApiClient.spec.d.ts +1 -0
- package/dist/test/buildApiClient.spec.js +177 -0
- package/dist/test/buildApiClient.spec.js.map +1 -0
- package/dist/test/buildAuthorizedTenantClient.spec.d.ts +1 -0
- package/dist/test/buildAuthorizedTenantClient.spec.js +60 -0
- package/dist/test/buildAuthorizedTenantClient.spec.js.map +1 -0
- package/dist/test/connectors/MockExpressServer.d.ts +5 -0
- package/dist/test/connectors/MockExpressServer.js +28 -0
- package/dist/test/connectors/MockExpressServer.js.map +1 -0
- package/dist/test/connectors/MockRegistry.d.ts +7 -0
- package/dist/test/connectors/MockRegistry.js +93 -0
- package/dist/test/connectors/MockRegistry.js.map +1 -0
- package/dist/test/connectors/runConnectorTest.d.ts +5 -0
- package/dist/test/connectors/runConnectorTest.js +106 -0
- package/dist/test/connectors/runConnectorTest.js.map +1 -0
- package/dist/test/db/getTestDBConfig.d.ts +7 -0
- package/dist/test/db/getTestDBConfig.js +13 -0
- package/dist/test/db/getTestDBConfig.js.map +1 -0
- package/dist/test/db/runMigrationSql.d.ts +9 -0
- package/dist/test/db/runMigrationSql.js +82 -0
- package/dist/test/db/runMigrationSql.js.map +1 -0
- package/dist/test/express/status.spec.d.ts +1 -0
- package/dist/test/express/status.spec.js +160 -0
- package/dist/test/express/status.spec.js.map +1 -0
- package/dist/test/fakeArgv.d.ts +2 -0
- package/dist/test/fakeArgv.js +7 -0
- package/dist/test/fakeArgv.js.map +1 -0
- package/dist/test/getAuthDecision.spec.d.ts +1 -0
- package/dist/test/getAuthDecision.spec.js +22 -0
- package/dist/test/getAuthDecision.spec.js.map +1 -0
- package/dist/test/getBasePathFromUrl.spec.d.ts +1 -0
- package/dist/test/getBasePathFromUrl.spec.js +25 -0
- package/dist/test/getBasePathFromUrl.spec.js.map +1 -0
- package/dist/test/jsverify.d.ts +2 -0
- package/dist/test/jsverify.js +8 -0
- package/dist/test/jsverify.js.map +1 -0
- package/dist/test/mockAuthApiHost.d.ts +14 -0
- package/dist/test/mockAuthApiHost.js +174 -0
- package/dist/test/mockAuthApiHost.js.map +1 -0
- package/dist/test/mockAuthorization.d.ts +3 -0
- package/dist/test/mockAuthorization.js +24 -0
- package/dist/test/mockAuthorization.js.map +1 -0
- package/dist/test/mockTenantDataStore.d.ts +8 -0
- package/dist/test/mockTenantDataStore.js +41 -0
- package/dist/test/mockTenantDataStore.js.map +1 -0
- package/dist/test/mockUserDataStore.d.ts +11 -0
- package/dist/test/mockUserDataStore.js +56 -0
- package/dist/test/mockUserDataStore.js.map +1 -0
- package/dist/test/registry/buildAuthorizedClient.spec.d.ts +1 -0
- package/dist/test/registry/buildAuthorizedClient.spec.js +101 -0
- package/dist/test/registry/buildAuthorizedClient.spec.js.map +1 -0
- package/dist/test/sampleOpaResponse.json +480 -0
- package/dist/test/sampleOpaResponseSimple.json +173 -0
- package/dist/test/sampleOpaResponseUnconditionalTrue.json +193 -0
- package/dist/test/sampleOpaResponseUnconditionalTrueWithDefaultRule.json +303 -0
- package/dist/test/sampleOpaResponseWithDefaultRule.json +303 -0
- package/dist/test/session/buildJwt.spec.d.ts +1 -0
- package/dist/test/session/buildJwt.spec.js +50 -0
- package/dist/test/session/buildJwt.spec.js.map +1 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.d.ts +1 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.js +64 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.js.map +1 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.d.ts +1 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.js +52 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.js.map +1 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.d.ts +1 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.js +36 -0
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.js.map +1 -0
- package/dist/test/testAsyncPage.spec.d.ts +1 -0
- package/dist/test/testAsyncPage.spec.js +463 -0
- package/dist/test/testAsyncPage.spec.js.map +1 -0
- package/dist/test/testOpaCompileResponseParser.spec.d.ts +1 -0
- package/dist/test/testOpaCompileResponseParser.spec.js +148 -0
- package/dist/test/testOpaCompileResponseParser.spec.js.map +1 -0
- package/dist/test/util.d.ts +1 -0
- package/dist/test/util.js +8 -0
- package/dist/test/util.js.map +1 -0
- package/dist/util/arrayToMaybe.d.ts +2 -0
- package/dist/util/arrayToMaybe.js +8 -0
- package/dist/util/arrayToMaybe.js.map +1 -0
- package/dist/util/cleanOrgTitle.d.ts +1 -0
- package/dist/util/cleanOrgTitle.js +13 -0
- package/dist/util/cleanOrgTitle.js.map +1 -0
- package/dist/util/escapeRegExp.d.ts +2 -0
- package/dist/util/escapeRegExp.js +5 -0
- package/dist/util/escapeRegExp.js.map +1 -0
- package/dist/util/getMinikubeIP.d.ts +1 -0
- package/dist/util/getMinikubeIP.js +13 -0
- package/dist/util/getMinikubeIP.js.map +1 -0
- package/dist/util/isUuid.d.ts +2 -0
- package/dist/util/isUuid.js +6 -0
- package/dist/util/isUuid.js.map +1 -0
- package/dist/util/unionToThrowable.d.ts +1 -0
- package/dist/util/unionToThrowable.js +12 -0
- package/dist/util/unionToThrowable.js.map +1 -0
- package/dist/utilityTypes.d.ts +1 -0
- package/dist/utilityTypes.js +3 -0
- package/dist/utilityTypes.js.map +1 -0
- package/package.json +3 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createServiceError.js","sourceRoot":"","sources":["../src/createServiceError.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAa,SAAQ,KAAK;IAGnC,YAAY,OAAe,EAAE,CAAM;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;CACJ;AAPD,oCAOC;AAED,MAAa,eAAgB,SAAQ,YAAY;IAC7C,YAAY,UAAkB,EAAE,aAAuB,EAAE,CAAM;QAC3D,KAAK,CACD,gBAAgB,UAAU,YAAY,IAAI,CAAC,SAAS,CAChD,aAAa,EACb,IAAI,EACJ,IAAI,CACP,EAAE,EACH,CAAC,CACJ,CAAC;IACN,CAAC;CACJ;AAXD,0CAWC;AAED;;;;;;;;;GASG;AACH,SAAwB,kBAAkB,CAAC,CAAM;IAC7C,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,EAAE;QACpD,OAAO,IAAI,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;KAChE;SAAM,IAAI,CAAC,IAAI,CAAC,YAAY,KAAK,EAAE;QAChC,OAAO,CAAC,CAAC;KACZ;SAAM,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC5C,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;KAC5C;SAAM,IAAI,CAAC,EAAE;QACV,OAAO,IAAI,YAAY,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;KAClE;SAAM;QACH,OAAO,IAAI,YAAY,CACnB,sCAAsC,EACtC,SAAS,CACZ,CAAC;KACL;AACL,CAAC;AAfD,qCAeC"}
|
package/dist/delay.d.ts
ADDED
package/dist/delay.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delay.js","sourceRoot":"","sources":["../src/delay.ts"],"names":[],"mappings":";;AAAA,SAAS,KAAK,CAAC,OAAe,CAAC;IAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACP,CAAC;AAED,kBAAe,KAAK,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { Router } from "express";
|
|
2
|
+
export declare type Probe = () => Promise<State>;
|
|
3
|
+
export interface ProbesList {
|
|
4
|
+
[id: string]: Probe;
|
|
5
|
+
}
|
|
6
|
+
export interface OptionsIO {
|
|
7
|
+
probes?: ProbesList;
|
|
8
|
+
probeUpdateMs?: number;
|
|
9
|
+
forceRun?: boolean;
|
|
10
|
+
ready?: boolean;
|
|
11
|
+
_installed?: any;
|
|
12
|
+
_probes?: {
|
|
13
|
+
[key: string]: () => any;
|
|
14
|
+
};
|
|
15
|
+
since?: string;
|
|
16
|
+
last?: string;
|
|
17
|
+
details?: any;
|
|
18
|
+
error?: any;
|
|
19
|
+
}
|
|
20
|
+
export interface State {
|
|
21
|
+
ready: boolean;
|
|
22
|
+
since?: string;
|
|
23
|
+
last?: string;
|
|
24
|
+
details?: any;
|
|
25
|
+
error?: any;
|
|
26
|
+
latencyMs?: number;
|
|
27
|
+
}
|
|
28
|
+
export declare function createStatusRouter(options?: OptionsIO): Router;
|
|
29
|
+
export declare function installStatusRouter(app: Router, options?: OptionsIO, routePrefix?: string): void;
|
|
30
|
+
export declare function createServiceProbe(url: string, statusLocation?: string): Probe;
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.createServiceProbe = exports.installStatusRouter = exports.createStatusRouter = void 0;
|
|
13
|
+
const express_1 = require("express");
|
|
14
|
+
const request = require("request");
|
|
15
|
+
// In case anyone is confused, this does not duplicate or replace kubernetes functionality
|
|
16
|
+
// It just makes service and dependency status visible to everyone
|
|
17
|
+
function createStatusRouter(options = {}) {
|
|
18
|
+
const router = express_1.Router();
|
|
19
|
+
installUpdater(options);
|
|
20
|
+
// we don't want to cache status
|
|
21
|
+
router.use(function (req, res, next) {
|
|
22
|
+
res.set("Cache-Control", "no-cache");
|
|
23
|
+
next();
|
|
24
|
+
});
|
|
25
|
+
// liveness probe for knowing if service is up
|
|
26
|
+
router.get("/live", function (req, res) {
|
|
27
|
+
res.status(200).send("OK");
|
|
28
|
+
});
|
|
29
|
+
// readiness probe for knowing if service and its dependents are
|
|
30
|
+
// ready to go
|
|
31
|
+
router.get("/ready", function (req, res) {
|
|
32
|
+
res.status(options.ready ? 200 : 500).json({
|
|
33
|
+
ready: options.ready,
|
|
34
|
+
since: options.since,
|
|
35
|
+
last: options.last,
|
|
36
|
+
details: options.details,
|
|
37
|
+
now: new Date().toISOString()
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
// added this for diagnosing service state based on latency in kubernetes
|
|
41
|
+
router.get("/readySync", function (req, res) {
|
|
42
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
+
yield Promise.all(Object.values(options._probes).map((x) => x()));
|
|
44
|
+
res.status(options.ready ? 200 : 500).json({
|
|
45
|
+
ready: options.ready,
|
|
46
|
+
since: options.since,
|
|
47
|
+
last: options.last,
|
|
48
|
+
details: options.details,
|
|
49
|
+
now: new Date().toISOString()
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
return router;
|
|
54
|
+
}
|
|
55
|
+
exports.createStatusRouter = createStatusRouter;
|
|
56
|
+
function installUpdater(options) {
|
|
57
|
+
// This is so that we cab share OptionsIO objects
|
|
58
|
+
// for multiple endpoints
|
|
59
|
+
if (!options._installed) {
|
|
60
|
+
options.ready = !options.probes;
|
|
61
|
+
options.probeUpdateMs = options.probeUpdateMs || 10000;
|
|
62
|
+
options.details = {};
|
|
63
|
+
options.since = new Date().toISOString();
|
|
64
|
+
options._installed = {};
|
|
65
|
+
options._probes = {};
|
|
66
|
+
}
|
|
67
|
+
if (!options.probes || !Object.keys(options.probes).length) {
|
|
68
|
+
// when no probes, readiness probe will behave like the liveness probe
|
|
69
|
+
options.ready = true;
|
|
70
|
+
options.since = options.last = new Date().toISOString();
|
|
71
|
+
options.details = {};
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
// every probe deserves to not be blocked by state of other probes
|
|
75
|
+
// so we have parallel probe checkers
|
|
76
|
+
Object.entries(options.probes).forEach((probe) => {
|
|
77
|
+
const [id, callback] = probe;
|
|
78
|
+
function update(dontUpdate) {
|
|
79
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
80
|
+
try {
|
|
81
|
+
const startMs = Date.now();
|
|
82
|
+
let previousState = options.details[id];
|
|
83
|
+
let nextState = {
|
|
84
|
+
ready: false
|
|
85
|
+
};
|
|
86
|
+
// update probe state
|
|
87
|
+
try {
|
|
88
|
+
nextState = yield callback();
|
|
89
|
+
}
|
|
90
|
+
catch (e) {
|
|
91
|
+
// lets not spam console with the same error message
|
|
92
|
+
// report if error message changed
|
|
93
|
+
if (!previousState || previousState.error !== e.message) {
|
|
94
|
+
console.error("ERROR", id, e.stack);
|
|
95
|
+
nextState.error = e.message;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
// --- Note: typeof null === "object"
|
|
99
|
+
if (!nextState || typeof nextState !== "object") {
|
|
100
|
+
nextState = {
|
|
101
|
+
ready: false
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
nextState.latencyMs = Date.now() - startMs;
|
|
105
|
+
options.last = nextState.last = new Date().toISOString();
|
|
106
|
+
// report if status changed
|
|
107
|
+
if (!previousState || nextState.ready !== previousState.ready) {
|
|
108
|
+
nextState.since = new Date(startMs).toISOString();
|
|
109
|
+
console.log("STATUS", id, "is", nextState.ready ? "up" : "down", "on", nextState.since);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
nextState.since = previousState.since;
|
|
113
|
+
}
|
|
114
|
+
// we want to report internal details
|
|
115
|
+
options.details[id] = nextState;
|
|
116
|
+
// update global state
|
|
117
|
+
let isReady = true;
|
|
118
|
+
for (const oid of Object.keys(options.probes)) {
|
|
119
|
+
isReady =
|
|
120
|
+
isReady &&
|
|
121
|
+
options.details[oid] &&
|
|
122
|
+
options.details[oid].ready;
|
|
123
|
+
}
|
|
124
|
+
options.ready = isReady;
|
|
125
|
+
}
|
|
126
|
+
catch (e) {
|
|
127
|
+
console.error("ERROR", id, e.stack);
|
|
128
|
+
}
|
|
129
|
+
if (!dontUpdate) {
|
|
130
|
+
setTimeout(update, options.probeUpdateMs).unref();
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
if (!options._installed[id]) {
|
|
135
|
+
// let's not bother running this inside test cases
|
|
136
|
+
const isInTest = typeof it === "function";
|
|
137
|
+
if (!isInTest || options.forceRun) {
|
|
138
|
+
update();
|
|
139
|
+
}
|
|
140
|
+
options._probes[id] = update.bind(null, true);
|
|
141
|
+
options._installed[id] = true;
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
// run it again in a minute in case OptionsIO was modified to add extra probes
|
|
145
|
+
setTimeout(() => installUpdater(options), options.probeUpdateMs * 10).unref();
|
|
146
|
+
}
|
|
147
|
+
function installStatusRouter(app, options = {}, routePrefix = "") {
|
|
148
|
+
app.use(routePrefix + "/status", createStatusRouter(options));
|
|
149
|
+
}
|
|
150
|
+
exports.installStatusRouter = installStatusRouter;
|
|
151
|
+
function createServiceProbe(url, statusLocation = "/status/ready") {
|
|
152
|
+
return () => __awaiter(this, void 0, void 0, function* () {
|
|
153
|
+
const data = yield requestPromise("GET", `${url}${statusLocation}`);
|
|
154
|
+
return data;
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
exports.createServiceProbe = createServiceProbe;
|
|
158
|
+
function requestPromise(method, url) {
|
|
159
|
+
return new Promise((resolve, reject) => {
|
|
160
|
+
request({
|
|
161
|
+
method,
|
|
162
|
+
uri: url,
|
|
163
|
+
json: true
|
|
164
|
+
}, (error, response, body) => {
|
|
165
|
+
if (error) {
|
|
166
|
+
reject(error);
|
|
167
|
+
}
|
|
168
|
+
else {
|
|
169
|
+
if (response.statusCode >= 200 &&
|
|
170
|
+
response.statusCode <= 299) {
|
|
171
|
+
resolve(body);
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
reject(Object.assign({ statusCode: response.statusCode }, body));
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
//# sourceMappingURL=status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/express/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default function formatServiceError(baseMessage: string, e: any, retriesLeft: number): string;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
function formatServiceError(baseMessage, e, retriesLeft) {
|
|
4
|
+
let messageParts = [baseMessage];
|
|
5
|
+
if (retriesLeft) {
|
|
6
|
+
messageParts.push(`${retriesLeft} retries left.`);
|
|
7
|
+
}
|
|
8
|
+
if (e && e.response && e.response.statusCode && e.body) {
|
|
9
|
+
messageParts.push(`Status code: ${e.response.statusCode}, body:\n${JSON.stringify(e.body, null, " ")}`);
|
|
10
|
+
}
|
|
11
|
+
else if (e && e instanceof Error) {
|
|
12
|
+
messageParts.push(`Exception:\n${e.toString()}`);
|
|
13
|
+
}
|
|
14
|
+
else if (e && e.toString() !== {}.toString()) {
|
|
15
|
+
messageParts.push(`Details:\n${e.toString()}`);
|
|
16
|
+
}
|
|
17
|
+
else if (e) {
|
|
18
|
+
messageParts.push(`Details:\n${JSON.stringify(e, null, " ")}`);
|
|
19
|
+
}
|
|
20
|
+
return messageParts.join(" ");
|
|
21
|
+
}
|
|
22
|
+
exports.default = formatServiceError;
|
|
23
|
+
//# sourceMappingURL=formatServiceError.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formatServiceError.js","sourceRoot":"","sources":["../src/formatServiceError.ts"],"names":[],"mappings":";;AAAA,SAAwB,kBAAkB,CACtC,WAAmB,EACnB,CAAM,EACN,WAAmB;IAEnB,IAAI,YAAY,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,IAAI,WAAW,EAAE;QACb,YAAY,CAAC,IAAI,CAAC,GAAG,WAAW,gBAAgB,CAAC,CAAC;KACrD;IACD,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,EAAE;QACpD,YAAY,CAAC,IAAI,CACb,gBAAgB,CAAC,CAAC,QAAQ,CAAC,UAAU,YAAY,IAAI,CAAC,SAAS,CAC3D,CAAC,CAAC,IAAI,EACN,IAAI,EACJ,IAAI,CACP,EAAE,CACN,CAAC;KACL;SAAM,IAAI,CAAC,IAAI,CAAC,YAAY,KAAK,EAAE;QAChC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;KACpD;SAAM,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC5C,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;KAClD;SAAM,IAAI,CAAC,EAAE;QACV,YAAY,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;KACnE;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AA1BD,qCA0BC"}
|