snyk-broker 4.161.5 → 4.162.1
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/cli/exec.js +5 -2
- package/dist/cli/exec.js.map +1 -1
- package/dist/cli/help.js +4 -2
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/index.js +13 -8
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/init.js +18 -13
- package/dist/cli/init.js.map +1 -1
- package/dist/client-templates/azure-repos/accept.json.sample +10 -0
- package/dist/client-templates/bitbucket-server/accept.json.sample +11 -0
- package/dist/client-templates/github-com/accept.json.sample +6 -0
- package/dist/client-templates/gitlab/accept.json.sample +6 -0
- package/dist/lib/auth-header.js +11 -9
- package/dist/lib/auth-header.js.map +1 -1
- package/dist/lib/axios.js +9 -6
- package/dist/lib/axios.js.map +1 -1
- package/dist/lib/client/checks/api/checks-handler.js +4 -4
- package/dist/lib/client/checks/api/checks-handler.js.map +1 -1
- package/dist/lib/client/checks/http/http-executor.js +10 -7
- package/dist/lib/client/checks/http/http-executor.js.map +1 -1
- package/dist/lib/client/checks/index.js +3 -3
- package/dist/lib/client/checks/index.js.map +1 -1
- package/dist/lib/client/dispatcher/client/api.js +4 -4
- package/dist/lib/client/dispatcher/client/api.js.map +1 -1
- package/dist/lib/client/dispatcher/index.js +4 -4
- package/dist/lib/client/dispatcher/index.js.map +1 -1
- package/dist/lib/client/index.js +82 -70
- package/dist/lib/client/index.js.map +1 -1
- package/dist/lib/client/retry/exponential-backoff.js +3 -3
- package/dist/lib/client/retry/exponential-backoff.js.map +1 -1
- package/dist/lib/client/scm/github/commit.js +2 -2
- package/dist/lib/client/scm/github/commit.js.map +1 -1
- package/dist/lib/client/scm/github/tree.js +2 -2
- package/dist/lib/client/scm/github/tree.js.map +1 -1
- package/dist/lib/client/scm/index.js +5 -5
- package/dist/lib/client/scm/index.js.map +1 -1
- package/dist/lib/client/scm/pgp/sign.js +5 -5
- package/dist/lib/client/scm/pgp/sign.js.map +1 -1
- package/dist/lib/client/socket.js +26 -20
- package/dist/lib/client/socket.js.map +1 -1
- package/dist/lib/config.js +24 -21
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/dispatcher.js +34 -43
- package/dist/lib/dispatcher.js.map +1 -1
- package/dist/lib/filter-rules-loading.js +26 -21
- package/dist/lib/filter-rules-loading.js.map +1 -1
- package/dist/lib/filters.js +49 -44
- package/dist/lib/filters.js.map +1 -1
- package/dist/lib/index.js +48 -30
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/log.js +28 -22
- package/dist/lib/log.js.map +1 -1
- package/dist/lib/metrics.js +15 -14
- package/dist/lib/metrics.js.map +1 -1
- package/dist/lib/patch-https-request-for-proxying.js +23 -17
- package/dist/lib/patch-https-request-for-proxying.js.map +1 -1
- package/dist/lib/relay.js +173 -154
- package/dist/lib/relay.js.map +1 -1
- package/dist/lib/replace-vars.js +5 -4
- package/dist/lib/replace-vars.js.map +1 -1
- package/dist/lib/server/broker-middleware.js +4 -4
- package/dist/lib/server/broker-middleware.js.map +1 -1
- package/dist/lib/server/index.js +67 -57
- package/dist/lib/server/index.js.map +1 -1
- package/dist/lib/server/prometheus-middleware.js +5 -2
- package/dist/lib/server/prometheus-middleware.js.map +1 -1
- package/dist/lib/server/socket.js +35 -30
- package/dist/lib/server/socket.js.map +1 -1
- package/dist/lib/stream-posts.js +34 -27
- package/dist/lib/stream-posts.js.map +1 -1
- package/dist/lib/token.js +5 -2
- package/dist/lib/token.js.map +1 -1
- package/dist/lib/try-json-parse.js +4 -2
- package/dist/lib/try-json-parse.js.map +1 -1
- package/dist/lib/version.js +7 -2
- package/dist/lib/version.js.map +1 -1
- package/dist/lib/webserver.js +31 -28
- package/dist/lib/webserver.js.map +1 -1
- package/dist/package.json +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
package/dist/cli/exec.js
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const index_1 = require("../lib/index");
|
|
1
4
|
const commands = ['server', 'client'];
|
|
2
|
-
|
|
5
|
+
exports.default = async (args) => {
|
|
3
6
|
const command = args._[0] || 'client';
|
|
4
7
|
if (!commands.includes(command)) {
|
|
5
8
|
throw new Error(`unknown command "${command}"`);
|
|
6
9
|
}
|
|
7
10
|
args.client = command === 'client';
|
|
8
|
-
await
|
|
11
|
+
await (0, index_1.app)(args);
|
|
9
12
|
};
|
|
10
13
|
//# sourceMappingURL=exec.js.map
|
package/dist/cli/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../cli/exec.
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../cli/exec.ts"],"names":[],"mappings":";;AAAA,wCAAmC;AAEnC,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAEtC,kBAAe,KAAK,EAAE,IAAI,EAAE,EAAE;IAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IACtC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,GAAG,CAAC,CAAC;KACjD;IAED,IAAI,CAAC,MAAM,GAAG,OAAO,KAAK,QAAQ,CAAC;IAEnC,MAAM,IAAA,WAAG,EAAC,IAAI,CAAC,CAAC;AAClB,CAAC,CAAC"}
|
package/dist/cli/help.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.help = void 0;
|
|
4
|
+
exports.help = `
|
|
2
5
|
Usage:
|
|
3
6
|
|
|
4
7
|
$ broker <command> [flags]
|
|
@@ -36,5 +39,4 @@ $ broker client --port 8000
|
|
|
36
39
|
|
|
37
40
|
For more details on configuration see http://github.com/snyk/broker
|
|
38
41
|
`;
|
|
39
|
-
module.exports = { help };
|
|
40
42
|
//# sourceMappingURL=help.js.map
|
package/dist/cli/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../cli/help.
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../cli/help.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqCnB,CAAC"}
|
package/dist/cli/index.js
CHANGED
|
@@ -1,24 +1,29 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
"use strict";
|
|
3
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
|
+
};
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
const exec_1 = __importDefault(require("./exec"));
|
|
8
|
+
const init_1 = __importDefault(require("./init"));
|
|
9
|
+
const minimist_1 = __importDefault(require("minimist"));
|
|
10
|
+
const help_1 = require("./help");
|
|
11
|
+
const args = (0, minimist_1.default)(process.argv.slice(2), {
|
|
7
12
|
boolean: ['help'],
|
|
8
13
|
alias: {
|
|
9
14
|
h: 'help',
|
|
10
15
|
},
|
|
11
16
|
});
|
|
12
17
|
if (args.help) {
|
|
13
|
-
console.info(help);
|
|
18
|
+
console.info(help_1.help);
|
|
14
19
|
process.exit(0);
|
|
15
20
|
}
|
|
16
21
|
const command = args._[0];
|
|
17
22
|
if (command === 'init') {
|
|
18
23
|
const templateName = args._[1];
|
|
19
|
-
|
|
24
|
+
(0, init_1.default)(templateName).then(() => process.exit(0));
|
|
20
25
|
}
|
|
21
26
|
else {
|
|
22
|
-
|
|
27
|
+
(0, exec_1.default)(args);
|
|
23
28
|
}
|
|
24
29
|
//# sourceMappingURL=index.js.map
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../cli/index.
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../cli/index.ts"],"names":[],"mappings":";;;;;;AACA,kDAA0B;AAC1B,kDAA0B;AAC1B,wDAAgC;AAChC,iCAA8B;AAE9B,MAAM,IAAI,GAAG,IAAA,kBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IAC3C,OAAO,EAAE,CAAC,MAAM,CAAC;IACjB,KAAK,EAAE;QACL,CAAC,EAAE,MAAM;KACV;CACF,CAAC,CAAC;AAEH,IAAI,IAAI,CAAC,IAAI,EAAE;IACb,OAAO,CAAC,IAAI,CAAC,WAAI,CAAC,CAAC;IAEnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB;AAED,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,IAAI,OAAO,KAAK,MAAM,EAAE;IACtB,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAA,cAAI,EAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;CAChD;KAAM;IACL,IAAA,cAAI,EAAC,IAAI,CAAC,CAAC;CACZ"}
|
package/dist/cli/init.js
CHANGED
|
@@ -1,22 +1,27 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const fs_1 = require("fs");
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const root = path_1.default.resolve(__dirname, '../client-templates/');
|
|
9
|
+
const log_1 = require("../lib/log");
|
|
10
|
+
exports.default = async (templateName) => {
|
|
6
11
|
if (!templateName) {
|
|
7
12
|
throw new Error('init requires a template name');
|
|
8
13
|
}
|
|
9
|
-
const templateDir =
|
|
10
|
-
const rootFiles = await
|
|
14
|
+
const templateDir = path_1.default.resolve(root, templateName);
|
|
15
|
+
const rootFiles = await fs_1.promises.readdir(root);
|
|
11
16
|
if (!rootFiles.includes(templateName)) {
|
|
12
17
|
throw new Error(`${templateName} is an invalid template name`);
|
|
13
18
|
}
|
|
14
|
-
const templateFiles = await
|
|
19
|
+
const templateFiles = await fs_1.promises.readdir(templateDir);
|
|
15
20
|
// check if any of the files exist on disk already, and if so, abort.
|
|
16
21
|
const filesWithAccessData = await Promise.all(templateFiles.map(async (file) => {
|
|
17
22
|
file = file.replace(/\.sample$/, '');
|
|
18
23
|
try {
|
|
19
|
-
await
|
|
24
|
+
await fs_1.promises.access(file);
|
|
20
25
|
return { file, exists: true };
|
|
21
26
|
}
|
|
22
27
|
catch (error) {
|
|
@@ -30,11 +35,11 @@ module.exports = async (templateName) => {
|
|
|
30
35
|
}
|
|
31
36
|
await Promise.all(templateFiles.map((file) => new Promise((resolve, reject) => {
|
|
32
37
|
const newfile = file.replace(/\.sample$/, '');
|
|
33
|
-
|
|
34
|
-
const reader = createReadStream(
|
|
35
|
-
const writer = createWriteStream(
|
|
38
|
+
log_1.log.debug({ templateFile: newfile }, 'generating template file');
|
|
39
|
+
const reader = (0, fs_1.createReadStream)(path_1.default.resolve(templateDir, file));
|
|
40
|
+
const writer = (0, fs_1.createWriteStream)(path_1.default.resolve(process.cwd(), newfile));
|
|
36
41
|
reader.pipe(writer).on('finish', resolve).on('error', reject);
|
|
37
42
|
})));
|
|
38
|
-
|
|
43
|
+
log_1.log.info({ templateName }, 'initialisation complete');
|
|
39
44
|
};
|
|
40
45
|
//# sourceMappingURL=init.js.map
|
package/dist/cli/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../cli/init.
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../cli/init.ts"],"names":[],"mappings":";;;;;AAAA,2BAA0E;AAC1E,gDAAwB;AACxB,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AAC7D,oCAA2C;AAE3C,kBAAe,KAAK,EAAE,YAAY,EAAE,EAAE;IACpC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IAED,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,8BAA8B,CAAC,CAAC;KAChE;IAED,MAAM,aAAa,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAErD,qEAAqE;IACrE,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3C,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAErC,IAAI;YACF,MAAM,aAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SAChC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAEzE,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1E,MAAM,IAAI,KAAK,CACb,4EAA4E,iBAAiB,EAAE,CAChG,CAAC;KACH;IAED,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CACf,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC9C,SAAM,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAA,qBAAgB,EAAC,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAA,sBAAiB,EAC9B,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CACrC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC,CACL,CACF,CAAC;IAEF,SAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,EAAE,yBAAyB,CAAC,CAAC;AAC3D,CAAC,CAAC"}
|
|
@@ -285,6 +285,16 @@
|
|
|
285
285
|
"token": "${BROKER_CLIENT_VALIDATION_BASIC_AUTH}"
|
|
286
286
|
}
|
|
287
287
|
},
|
|
288
|
+
{
|
|
289
|
+
"//": "get merge base of two commits for given repository",
|
|
290
|
+
"method": "GET",
|
|
291
|
+
"path": "/:owner/_apis/git/repositories/:repo/commits/:commitId/mergebases",
|
|
292
|
+
"origin": "https://${AZURE_REPOS_HOST}/${AZURE_REPOS_ORG}",
|
|
293
|
+
"auth": {
|
|
294
|
+
"scheme": "basic",
|
|
295
|
+
"token": "${BROKER_CLIENT_VALIDATION_BASIC_AUTH}"
|
|
296
|
+
}
|
|
297
|
+
},
|
|
288
298
|
{
|
|
289
299
|
"//": "update status of given commit",
|
|
290
300
|
"method": "POST",
|
|
@@ -931,6 +931,17 @@
|
|
|
931
931
|
"password": "${BITBUCKET_PASSWORD}"
|
|
932
932
|
}
|
|
933
933
|
},
|
|
934
|
+
{
|
|
935
|
+
"//": "get page of commits between two commits",
|
|
936
|
+
"method": "GET",
|
|
937
|
+
"path": "/rest/api/1.0/projects/:project/repos/:repo/commits",
|
|
938
|
+
"origin": "https://${BITBUCKET}",
|
|
939
|
+
"auth": {
|
|
940
|
+
"scheme": "basic",
|
|
941
|
+
"username": "${BITBUCKET_USERNAME}",
|
|
942
|
+
"password": "${BITBUCKET_PASSWORD}"
|
|
943
|
+
}
|
|
944
|
+
},
|
|
934
945
|
{
|
|
935
946
|
"//": "used to create a Code Insights report",
|
|
936
947
|
"method": "PUT",
|
|
@@ -2025,6 +2025,12 @@
|
|
|
2025
2025
|
"path": "/repos/:name/:repo/git/refs/:ref",
|
|
2026
2026
|
"origin": "https://${GITHUB_TOKEN}@${GITHUB_API}"
|
|
2027
2027
|
},
|
|
2028
|
+
{
|
|
2029
|
+
"//": "compares two commits against each other",
|
|
2030
|
+
"method": "GET",
|
|
2031
|
+
"path": "/repos/:name/:repo/compare/:base...:head",
|
|
2032
|
+
"origin": "https://${GITHUB_TOKEN}@${GITHUB_API}"
|
|
2033
|
+
},
|
|
2028
2034
|
{
|
|
2029
2035
|
"//": "search for open snyk pull requests",
|
|
2030
2036
|
"method": "GET",
|
|
@@ -1539,6 +1539,12 @@
|
|
|
1539
1539
|
"path": "/api/v4/projects/:project/repository/commits/:sha",
|
|
1540
1540
|
"origin": "https://${GITLAB}"
|
|
1541
1541
|
},
|
|
1542
|
+
{
|
|
1543
|
+
"//": "get merge base of two commits for given project.",
|
|
1544
|
+
"method": "GET",
|
|
1545
|
+
"path": "/api/v4/projects/:project/repository/merge_base",
|
|
1546
|
+
"origin": "https://${GITLAB}"
|
|
1547
|
+
},
|
|
1542
1548
|
{
|
|
1543
1549
|
"//": "used to redirect requests to snyk git client",
|
|
1544
1550
|
"method": "any",
|
package/dist/lib/auth-header.js
CHANGED
|
@@ -1,23 +1,25 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const replace_vars_1 = require("./replace-vars");
|
|
4
|
+
const config_1 = require("./config");
|
|
2
5
|
// Not standardized Basic auth format, currently using in Azure Repos API
|
|
3
6
|
function getEncodedTokenBasedBasicAuth(token, config) {
|
|
4
|
-
return Buffer.from(replace(token, config)).toString('base64');
|
|
7
|
+
return Buffer.from((0, replace_vars_1.replace)(token, config)).toString('base64');
|
|
5
8
|
}
|
|
6
9
|
function getEncodedBasicAuth(username, password, config) {
|
|
7
|
-
return Buffer.from(`${replace(username, config)}:${replace(password, config)}`).toString('base64');
|
|
10
|
+
return Buffer.from(`${(0, replace_vars_1.replace)(username, config)}:${(0, replace_vars_1.replace)(password, config)}`).toString('base64');
|
|
8
11
|
}
|
|
9
|
-
|
|
10
|
-
const config = require('./config');
|
|
12
|
+
exports.default = ({ scheme, token = '', username = '', password = '' }) => {
|
|
11
13
|
if (scheme === 'token') {
|
|
12
|
-
return `Token ${replace(token, config)}`;
|
|
14
|
+
return `Token ${(0, replace_vars_1.replace)(token, config_1.config)}`;
|
|
13
15
|
}
|
|
14
16
|
if (scheme === 'bearer') {
|
|
15
|
-
return `Bearer ${replace(token, config)}`;
|
|
17
|
+
return `Bearer ${(0, replace_vars_1.replace)(token, config_1.config)}`;
|
|
16
18
|
}
|
|
17
19
|
if (scheme === 'basic') {
|
|
18
20
|
const basicAuth = token
|
|
19
|
-
? getEncodedTokenBasedBasicAuth(token, config)
|
|
20
|
-
: getEncodedBasicAuth(username, password, config);
|
|
21
|
+
? getEncodedTokenBasedBasicAuth(token, config_1.config)
|
|
22
|
+
: getEncodedBasicAuth(username, password, config_1.config);
|
|
21
23
|
return `Basic ${basicAuth}`;
|
|
22
24
|
}
|
|
23
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-header.js","sourceRoot":"","sources":["../../lib/auth-header.
|
|
1
|
+
{"version":3,"file":"auth-header.js","sourceRoot":"","sources":["../../lib/auth-header.ts"],"names":[],"mappings":";;AAAA,iDAAyC;AACzC,qCAAkC;AAClC,yEAAyE;AACzE,SAAS,6BAA6B,CAAC,KAAK,EAAE,MAAM;IAClD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,sBAAO,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM;IACrD,OAAO,MAAM,CAAC,IAAI,CAChB,GAAG,IAAA,sBAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,IAAA,sBAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAC5D,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACvB,CAAC;AAED,kBAAe,CAAC,EAAE,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,EAAE;IACtE,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,SAAS,IAAA,sBAAO,EAAC,KAAK,EAAE,eAAM,CAAC,EAAE,CAAC;KAC1C;IAED,IAAI,MAAM,KAAK,QAAQ,EAAE;QACvB,OAAO,UAAU,IAAA,sBAAO,EAAC,KAAK,EAAE,eAAM,CAAC,EAAE,CAAC;KAC3C;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,MAAM,SAAS,GAAG,KAAK;YACrB,CAAC,CAAC,6BAA6B,CAAC,KAAK,EAAE,eAAM,CAAC;YAC9C,CAAC,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAM,CAAC,CAAC;QAEpD,OAAO,SAAS,SAAS,EAAE,CAAC;KAC7B;AACH,CAAC,CAAC"}
|
package/dist/lib/axios.js
CHANGED
|
@@ -1,21 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.axiosInstance = void 0;
|
|
4
|
-
const axios_1 = require("axios");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
+
const axios_1 = __importDefault(require("axios"));
|
|
8
|
+
const log_1 = require("./log");
|
|
9
|
+
const axios_retry_1 = __importDefault(require("axios-retry"));
|
|
7
10
|
const axiosInstance = axios_1.default.create({
|
|
8
11
|
timeout: 2500,
|
|
9
12
|
});
|
|
10
13
|
exports.axiosInstance = axiosInstance;
|
|
11
|
-
|
|
14
|
+
(0, axios_retry_1.default)(axiosInstance, {
|
|
12
15
|
retries: 3,
|
|
13
16
|
retryCondition: () => true,
|
|
14
17
|
shouldResetTimeout: true,
|
|
15
|
-
retryDelay:
|
|
18
|
+
retryDelay: axios_retry_1.default.exponentialDelay,
|
|
16
19
|
onRetry: (retryCount, error, requestConfig) => {
|
|
17
20
|
if (retryCount > 2) {
|
|
18
|
-
|
|
21
|
+
log_1.log.warn({
|
|
19
22
|
retryCount,
|
|
20
23
|
errorMessage: error.message,
|
|
21
24
|
url: requestConfig.url,
|
package/dist/lib/axios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../lib/axios.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../lib/axios.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,+BAAsC;AACtC,8DAAqC;AAErC,MAAM,aAAa,GAAG,eAAK,CAAC,MAAM,CAAC;IACjC,OAAO,EAAE,IAAI;CACd,CAAC,CAAC;AAuBM,sCAAa;AArBtB,IAAA,qBAAU,EAAC,aAAa,EAAE;IACxB,OAAO,EAAE,CAAC;IACV,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI;IAC1B,kBAAkB,EAAE,IAAI;IACxB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;IACvC,OAAO,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE;QAC5C,IAAI,UAAU,GAAG,CAAC,EAAE;YAClB,SAAM,CAAC,IAAI,CACT;gBACE,UAAU;gBACV,YAAY,EAAE,KAAK,CAAC,OAAO;gBAC3B,GAAG,EAAE,aAAa,CAAC,GAAG;gBACtB,SAAS,EACP,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,OAAO,CAAC,iBAAiB,CAAC;aACpE,EACD,sBAAsB,UAAU,GAAG,CACpC,CAAC;SACH;IACH,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handleCheckIdsRoutes = exports.handleChecksRoute = void 0;
|
|
4
|
-
const
|
|
4
|
+
const log_1 = require("../../../log");
|
|
5
5
|
const http_1 = require("../http");
|
|
6
6
|
const handleChecksRoute = (config) => {
|
|
7
7
|
return async (_, res) => {
|
|
@@ -14,13 +14,13 @@ const handleChecksRoute = (config) => {
|
|
|
14
14
|
checkResults.push(r.value);
|
|
15
15
|
}
|
|
16
16
|
else {
|
|
17
|
-
|
|
17
|
+
log_1.log.error({ error: r.reason }, 'Unexpected error when executing checks');
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
20
|
res.status(200).json(checkResults);
|
|
21
21
|
}
|
|
22
22
|
catch (error) {
|
|
23
|
-
|
|
23
|
+
log_1.log.error({ error }, 'Error executing http checks');
|
|
24
24
|
res.status(500).json({ error: error });
|
|
25
25
|
}
|
|
26
26
|
};
|
|
@@ -40,7 +40,7 @@ const handleCheckIdsRoutes = (config) => {
|
|
|
40
40
|
res.status(200).json(checkResult);
|
|
41
41
|
}
|
|
42
42
|
catch (error) {
|
|
43
|
-
|
|
43
|
+
log_1.log.error({ error }, `Error executing check with id: ${req.params.checkId}`);
|
|
44
44
|
res.status(500).json({ error: error });
|
|
45
45
|
}
|
|
46
46
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checks-handler.js","sourceRoot":"","sources":["../../../../../lib/client/checks/api/checks-handler.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"checks-handler.js","sourceRoot":"","sources":["../../../../../lib/client/checks/api/checks-handler.ts"],"names":[],"mappings":";;;AAAA,sCAA6C;AAE7C,kCAAwC;AAIjC,MAAM,iBAAiB,GAAG,CAC/B,MAAW,EAC4B,EAAE;IACzC,OAAO,KAAK,EAAE,CAAU,EAAE,GAAa,EAAE,EAAE;QACzC,IAAI;YACF,MAAM,MAAM,GAAG,IAAA,oBAAa,EAAC,MAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAExE,MAAM,YAAY,GAAkB,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CACzC,CAAC;YACF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,CAAC,MAAM,KAAK,WAAW,EAAE;oBAC5B,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;iBAC5B;qBAAM;oBACL,SAAM,CAAC,KAAK,CACV,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EACnB,wCAAwC,CACzC,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACpC;QAAC,OAAO,KAAK,EAAE;YACd,SAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,6BAA6B,CAAC,CAAC;YACvD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;SACxC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B;AAEK,MAAM,oBAAoB,GAAG,CAClC,MAAW,EAC8B,EAAE;IAC3C,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QAC3C,IAAI;YACF,MAAM,KAAK,GAAG,IAAA,oBAAa,EAAC,MAAgB,CAAC;iBAC1C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;iBACxB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAE5C,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpB,OAAO;aACR;YAED,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACnC;QAAC,OAAO,KAAK,EAAE;YACd,SAAM,CAAC,KAAK,CACV,EAAE,KAAK,EAAE,EACT,kCAAkC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CACvD,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;SACxC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,oBAAoB,wBAwB/B"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.convertAxiosResponseToCheckResult = exports.executeHttpRequest = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
7
|
+
const log_1 = require("../../../log");
|
|
8
|
+
const version_1 = __importDefault(require("../../../version"));
|
|
6
9
|
const axios_1 = require("../../../axios");
|
|
7
10
|
const exponential_backoff_1 = require("../../retry/exponential-backoff");
|
|
8
11
|
async function executeHttpRequest(checkOptions, httpOptions) {
|
|
9
|
-
|
|
12
|
+
log_1.log.debug({ checkId: checkOptions.id }, 'executing http check');
|
|
10
13
|
try {
|
|
11
14
|
const response = await (0, exponential_backoff_1.retry)(() => axios_1.axiosInstance.request({
|
|
12
15
|
method: httpOptions.method,
|
|
@@ -14,24 +17,24 @@ async function executeHttpRequest(checkOptions, httpOptions) {
|
|
|
14
17
|
headers: {
|
|
15
18
|
Accept: 'application/json',
|
|
16
19
|
'Content-Type': 'application/json',
|
|
17
|
-
'User-Agent': `broker client/${
|
|
20
|
+
'User-Agent': `broker client/${version_1.default} (http check service)`,
|
|
18
21
|
},
|
|
19
22
|
timeout: httpOptions.timeoutMs,
|
|
20
23
|
validateStatus: () => true,
|
|
21
24
|
}), { retries: 3, operation: `http check ${checkOptions.id}` });
|
|
22
|
-
|
|
25
|
+
log_1.log.trace({ response: response.data }, 'http check raw response data');
|
|
23
26
|
const checkResult = convertAxiosResponseToCheckResult({
|
|
24
27
|
id: checkOptions.id,
|
|
25
28
|
name: checkOptions.name,
|
|
26
29
|
url: httpOptions.url,
|
|
27
30
|
method: httpOptions.method,
|
|
28
31
|
}, response);
|
|
29
|
-
|
|
32
|
+
log_1.log.debug({ checkId: checkOptions.id, status: checkResult.status }, 'completed http check execution');
|
|
30
33
|
return Promise.resolve(checkResult);
|
|
31
34
|
}
|
|
32
35
|
catch (error) {
|
|
33
36
|
const errorMessage = `Error executing check with checkId ${checkOptions.id}`;
|
|
34
|
-
|
|
37
|
+
log_1.log.debug({ error }, errorMessage);
|
|
35
38
|
throw new Error(errorMessage);
|
|
36
39
|
}
|
|
37
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-executor.js","sourceRoot":"","sources":["../../../../../lib/client/checks/http/http-executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-executor.js","sourceRoot":"","sources":["../../../../../lib/client/checks/http/http-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.executePreflightChecks = exports.preflightChecksEnabled = void 0;
|
|
4
|
-
const
|
|
4
|
+
const log_1 = require("../../log");
|
|
5
5
|
const http_1 = require("./http");
|
|
6
6
|
function preflightChecksEnabled(config) {
|
|
7
7
|
// preflight checks are enabled per default
|
|
@@ -13,7 +13,7 @@ function preflightChecksEnabled(config) {
|
|
|
13
13
|
preflightChecksEnabledValue.toLowerCase() === 'true' ||
|
|
14
14
|
preflightChecksEnabledValue.toLowerCase() === 'yes';
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
log_1.log.info({ enabled: preflightChecksEnabled }, 'verifying if preflight checks are enabled');
|
|
17
17
|
return preflightChecksEnabled;
|
|
18
18
|
}
|
|
19
19
|
exports.preflightChecksEnabled = preflightChecksEnabled;
|
|
@@ -28,7 +28,7 @@ async function executePreflightChecks(config) {
|
|
|
28
28
|
preflightCheckResults.push(r.value);
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
-
|
|
31
|
+
log_1.log.error({ error: r.reason }, 'Unexpected error when executing checks');
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
logPreflightCheckResults(preflightCheckResults);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/checks/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/checks/index.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAC1C,iCAAuC;AAIvC,SAAgB,sBAAsB,CAAC,MAAW;IAChD,2CAA2C;IAC3C,IAAI,sBAAsB,GAAG,IAAI,CAAC;IAElC,MAAM,2BAA2B,GAAI,MAAiB;SACnD,wBAAwB,CAAC;IAC5B,IAAI,OAAO,2BAA2B,KAAK,WAAW,EAAE;QACtD,sBAAsB;YACpB,2BAA2B,CAAC,WAAW,EAAE,KAAK,MAAM;gBACpD,2BAA2B,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;KACvD;IAED,SAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,sBAAsB,EAAE,EACnC,2CAA2C,CAC5C,CAAC;IAEF,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAlBD,wDAkBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAW;IAEX,MAAM,eAAe,GAAY,EAAE,CAAC;IACpC,MAAM,UAAU,GAAG,IAAA,oBAAa,EAAC,MAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC5E,eAAe,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IAEpC,MAAM,qBAAqB,GAAkB,EAAE,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAClD,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,IAAI,CAAC,CAAC,MAAM,KAAK,WAAW,EAAE;YAC5B,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SACrC;aAAM;YACL,SAAM,CAAC,KAAK,CACV,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EACnB,wCAAwC,CACzC,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,wBAAwB,CAAC,qBAAqB,CAAC,CAAC;IAEhD,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAChD,CAAC;AAzBD,wDAyBC;AAED,MAAM,wBAAwB,GAAG,CAAC,OAAsB,EAAE,EAAE;IAC1D,OAAO,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;IAC9E,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;IAC5E,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;IAE9E,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACnC,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HttpDispatcherServiceClient = void 0;
|
|
4
4
|
const axios_1 = require("../../../axios");
|
|
5
|
-
const
|
|
5
|
+
const log_1 = require("../../../log");
|
|
6
6
|
class HttpDispatcherServiceClient {
|
|
7
7
|
constructor(baseUrl) {
|
|
8
8
|
this.version = '2022-12-01~experimental';
|
|
@@ -28,16 +28,16 @@ class HttpDispatcherServiceClient {
|
|
|
28
28
|
});
|
|
29
29
|
const apiResponse = response.data.data;
|
|
30
30
|
if (!(apiResponse === null || apiResponse === void 0 ? void 0 : apiResponse.attributes)) {
|
|
31
|
-
|
|
31
|
+
log_1.log.trace({ apiResponse }, 'Unexpected Connection Allocation Server response');
|
|
32
32
|
throw new Error('Unexpected connection allocation server response');
|
|
33
33
|
}
|
|
34
34
|
const snykRequestId = response.headers['snyk-request-id'] || '';
|
|
35
|
-
|
|
35
|
+
log_1.log.trace({ snykRequestId, apiResponse }, 'createConnection API response');
|
|
36
36
|
const serverId = apiResponse.attributes.server_id;
|
|
37
37
|
return serverId;
|
|
38
38
|
}
|
|
39
39
|
catch (err) {
|
|
40
|
-
|
|
40
|
+
log_1.log.trace({ err }, 'Error getting connection allocation.');
|
|
41
41
|
throw new Error('Error getting connection allocation.');
|
|
42
42
|
}
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../lib/client/dispatcher/client/api.ts"],"names":[],"mappings":";;;AAAA,0CAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../lib/client/dispatcher/client/api.ts"],"names":[],"mappings":";;;AAAA,0CAA+C;AAC/C,sCAA6C;AAS7C,MAAa,2BAA2B;IAItC,YAAY,OAAe;QAHV,YAAO,GAAG,yBAAyB,CAAC;QAInD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,MAAqC,EACrC,IAAiC;QAEjC,IAAI;YACF,MAAM,IAAI,GAAG,kBAAkB,MAAM,CAAC,iBAAiB,gBAAgB,MAAM,CAAC,cAAc,EAAE,CAAC;YAE/F,MAAM,QAAQ,GAAG,MAAM,qBAAa,CAAC,IAAI,CACvC,IAAI,EACJ;gBACE,IAAI,EAAE;oBACJ,UAAU,EAAE;wBACV,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;wBAC7C,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;qBACtD;iBACF;aACF,EACD;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE;oBACP,cAAc,EAAE,0BAA0B;iBAC3C;gBACD,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE;gBACjC,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI;aAC3B,CACF,CAAC;YAEF,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YACvC,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,EAAE;gBAC5B,SAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,EACf,kDAAkD,CACnD,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;aACrE;YACD,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAChE,SAAM,CAAC,KAAK,CACV,EAAE,aAAa,EAAE,WAAW,EAAE,EAC9B,+BAA+B,CAChC,CAAC;YAEF,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC;YAClD,OAAO,QAAQ,CAAC;SACjB;QAAC,OAAO,GAAG,EAAE;YACZ,SAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,sCAAsC,CAAC,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;IACH,CAAC;CACF;AAxDD,kEAwDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getServerId = exports.highAvailabilityModeEnabled = exports.defaultBrokerDispatcherBaseUrl = void 0;
|
|
4
|
-
const
|
|
4
|
+
const log_1 = require("../../log");
|
|
5
5
|
const token_1 = require("../../token");
|
|
6
6
|
const api_1 = require("./client/api");
|
|
7
7
|
const dispatcher_service_1 = require("./dispatcher-service");
|
|
@@ -16,13 +16,13 @@ function highAvailabilityModeEnabled(config) {
|
|
|
16
16
|
highAvailabilityModeEnabledValue.toLowerCase() === 'true' ||
|
|
17
17
|
highAvailabilityModeEnabledValue.toLowerCase() === 'yes';
|
|
18
18
|
}
|
|
19
|
-
|
|
19
|
+
log_1.log.info({ enabled: highAvailabilityModeEnabled }, 'checking for HA mode');
|
|
20
20
|
return highAvailabilityModeEnabled;
|
|
21
21
|
}
|
|
22
22
|
exports.highAvailabilityModeEnabled = highAvailabilityModeEnabled;
|
|
23
23
|
async function getServerId(config, brokerClientId) {
|
|
24
24
|
if (!config.BROKER_TOKEN) {
|
|
25
|
-
|
|
25
|
+
log_1.log.error({ token: config.BROKER_TOKEN }, 'missing client token');
|
|
26
26
|
const error = new Error('BROKER_TOKEN is required to successfully identify itself to the server');
|
|
27
27
|
error.name = 'MISSING_BROKER_TOKEN';
|
|
28
28
|
throw error;
|
|
@@ -44,7 +44,7 @@ async function getServerId(config, brokerClientId) {
|
|
|
44
44
|
}
|
|
45
45
|
catch (err) {
|
|
46
46
|
const timeout = 2 ** attempt * 100;
|
|
47
|
-
|
|
47
|
+
log_1.log.warn({ attempt, timeout }, `waiting for ${timeout}ms before next Broker Dispatcher API call`);
|
|
48
48
|
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, timeout);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/dispatcher/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/client/dispatcher/index.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,uCAAwC;AACxC,sCAA2D;AAC3D,6DAA2E;AAE9D,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAEpE,SAAgB,2BAA2B,CAAC,MAAW;IACrD,iDAAiD;IACjD,IAAI,2BAA2B,GAAG,KAAK,CAAC;IAExC,MAAM,gCAAgC,GAAI,MAAiB;SACxD,sBAAsB,CAAC;IAE1B,IAAI,OAAO,gCAAgC,KAAK,WAAW,EAAE;QAC3D,2BAA2B;YACzB,gCAAgC,CAAC,WAAW,EAAE,KAAK,MAAM;gBACzD,gCAAgC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;KAC5D;IAED,SAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,2BAA2B,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAE9E,OAAO,2BAA2B,CAAC;AACrC,CAAC;AAhBD,kEAgBC;AAEM,KAAK,UAAU,WAAW,CAC/B,MAAW,EACX,cAAsB;IAEtB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,SAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE,EAAE,sBAAsB,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,wEAAwE,CACzE,CAAC;QACF,KAAK,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACpC,MAAM,KAAK,CAAC;KACb;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,OAAO,GACX,QAAQ,CAAC,0BAA0B,IAAI,sCAA8B,CAAC;IACxE,MAAM,MAAM,GAAG,IAAI,iCAA2B,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAA,iBAAS,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAEnD,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,EAAE,EAAE;QACtD,IAAI;YACF,OAAO,MAAM,IAAA,8CAAyB,EACpC,MAAM,EACN;gBACE,cAAc,EAAE,cAAc;gBAC9B,iBAAiB,EAAE,WAAW;aAC/B,EACD;gBACE,mBAAmB,EAAE,GACnB,MAAM,CAAC,sBAAsB,IAAI,oBACnC,EAAE;gBACF,uBAAuB,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;aACrD,CACF,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,GAAG,CAAC;YACnC,SAAM,CAAC,IAAI,CACT,EAAE,OAAO,EAAE,OAAO,EAAE,EACpB,eAAe,OAAO,2CAA2C,CAClE,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;SACvE;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA9CD,kCA8CC;AAED,SAAS,WAAW,CAAC,MAAW;IAC9B,OAAO,MAAgB,CAAC;AAC1B,CAAC"}
|