bdy 1.16.11-sbs-1 → 1.16.11-sbs-2
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/distTs/package.json +1 -1
- package/distTs/src/command/agent/install.js +11 -17
- package/distTs/src/command/login.js +19 -1
- package/distTs/src/command/tunnel/http.js +4 -3
- package/distTs/src/command/tunnel/tcp.js +4 -3
- package/distTs/src/command/tunnel/tls.js +4 -3
- package/distTs/src/input.js +9 -0
- package/distTs/src/texts.js +12 -10
- package/distTs/src/tunnel/cfg.js +15 -4
- package/package.json +1 -1
package/distTs/package.json
CHANGED
|
@@ -61,19 +61,20 @@ const installService = async (options) => {
|
|
|
61
61
|
id = options.id;
|
|
62
62
|
token = options.token;
|
|
63
63
|
try {
|
|
64
|
-
|
|
64
|
+
const host = cfg_1.default.getTokenHost(token);
|
|
65
|
+
agent = await buddy_1.default.fetchAgent(id, host, token);
|
|
65
66
|
}
|
|
66
67
|
catch {
|
|
67
68
|
output_1.default.exitError(texts_1.ERR_AGENT_NOT_FOUND);
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
|
-
else
|
|
71
|
-
//
|
|
72
|
-
|
|
71
|
+
else {
|
|
72
|
+
// Use fallback logic for token
|
|
73
|
+
token = input_1.default.tunnelToken(options.token);
|
|
73
74
|
}
|
|
74
|
-
const host = cfg_1.default.getTokenHost();
|
|
75
|
+
const host = cfg_1.default.getTokenHost(token);
|
|
75
76
|
if (!agent) {
|
|
76
|
-
agent = await buddy_1.default.register(true, target, host,
|
|
77
|
+
agent = await buddy_1.default.register(true, target, host, token, (region) => {
|
|
77
78
|
cfg_1.default.setRegionIfNotSet(region);
|
|
78
79
|
});
|
|
79
80
|
id = agent.id;
|
|
@@ -128,21 +129,16 @@ const installApp = async (options) => {
|
|
|
128
129
|
}
|
|
129
130
|
let id;
|
|
130
131
|
let host;
|
|
131
|
-
let token;
|
|
132
|
+
let token = input_1.default.tunnelToken(options.token);
|
|
132
133
|
const port = input_1.default.port(options.port);
|
|
133
134
|
if (options.id) {
|
|
134
135
|
id = options.id;
|
|
135
136
|
}
|
|
136
|
-
if (!token) {
|
|
137
|
-
token = options.token;
|
|
138
|
-
}
|
|
139
137
|
if (!id) {
|
|
140
|
-
|
|
141
|
-
cfg_1.default.setToken(token);
|
|
142
|
-
host = cfg_1.default.getTokenHost();
|
|
138
|
+
host = cfg_1.default.getTokenHost(token);
|
|
143
139
|
try {
|
|
144
140
|
output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERING, false);
|
|
145
|
-
const agent = await buddy_1.default.register(true, !!options.target, host,
|
|
141
|
+
const agent = await buddy_1.default.register(true, !!options.target, host, token, (region) => {
|
|
146
142
|
cfg_1.default.setRegionIfNotSet(region);
|
|
147
143
|
});
|
|
148
144
|
logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERED);
|
|
@@ -159,9 +155,7 @@ const installApp = async (options) => {
|
|
|
159
155
|
}
|
|
160
156
|
}
|
|
161
157
|
else {
|
|
162
|
-
|
|
163
|
-
host = cfg_1.default.getTokenHost();
|
|
164
|
-
}
|
|
158
|
+
host = cfg_1.default.getTokenHost(token);
|
|
165
159
|
try {
|
|
166
160
|
logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHING);
|
|
167
161
|
output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHING, false);
|
|
@@ -88,6 +88,15 @@ async function inputToken() {
|
|
|
88
88
|
});
|
|
89
89
|
});
|
|
90
90
|
}
|
|
91
|
+
async function inputTunnelToken() {
|
|
92
|
+
terminal(`${texts_1.TXT_LOGIN_ENTER_TUNNEL_TOKEN} `);
|
|
93
|
+
return new Promise((resolve) => {
|
|
94
|
+
terminal.inputField((error, input) => {
|
|
95
|
+
terminal('\n');
|
|
96
|
+
resolve(input?.trim() || '');
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
}
|
|
91
100
|
async function selectWorkspace(workspaces) {
|
|
92
101
|
terminal(`${texts_1.TXT_LOGIN_SELECT_WORKSPACE}\n`);
|
|
93
102
|
const items = workspaces.map((w) => `${w.name} (${w.domain})`);
|
|
@@ -133,6 +142,7 @@ async function verifyTokenAndGetWorkspaces(apiUrl, token) {
|
|
|
133
142
|
}
|
|
134
143
|
const commandLogin = (0, utils_1.newCommand)('login', texts_1.DESC_COMMAND_LOGIN);
|
|
135
144
|
commandLogin.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
|
|
145
|
+
commandLogin.option('--tunnel-token <token>', 'tunnel token for agent operations');
|
|
136
146
|
commandLogin.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
|
|
137
147
|
commandLogin.option('--region <region>', texts_1.OPTION_REST_API_REGION);
|
|
138
148
|
commandLogin.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
|
|
@@ -207,6 +217,9 @@ commandLogin.action(async (options) => {
|
|
|
207
217
|
if (selectedProject) {
|
|
208
218
|
cfg_1.default.setProject(selectedProject.name);
|
|
209
219
|
}
|
|
220
|
+
if (options.tunnelToken) {
|
|
221
|
+
cfg_1.default.setTunnelToken(options.tunnelToken);
|
|
222
|
+
}
|
|
210
223
|
if (region === 'onprem' && baseUrl) {
|
|
211
224
|
cfg_1.default.setBaseUrl(apiUrl);
|
|
212
225
|
}
|
|
@@ -258,13 +271,18 @@ commandLogin.action(async (options) => {
|
|
|
258
271
|
if (projects.length > 0) {
|
|
259
272
|
selectedProject = await selectProject(projects);
|
|
260
273
|
}
|
|
261
|
-
// Step 7:
|
|
274
|
+
// Step 7: Optionally ask for tunnel token
|
|
275
|
+
const tunnelToken = await inputTunnelToken();
|
|
276
|
+
// Step 8: Save to config
|
|
262
277
|
cfg_1.default.clearLogin();
|
|
263
278
|
cfg_1.default.setToken(token);
|
|
264
279
|
cfg_1.default.setWorkspace(selectedWorkspace.domain);
|
|
265
280
|
if (selectedProject) {
|
|
266
281
|
cfg_1.default.setProject(selectedProject.name);
|
|
267
282
|
}
|
|
283
|
+
if (tunnelToken) {
|
|
284
|
+
cfg_1.default.setTunnelToken(tunnelToken);
|
|
285
|
+
}
|
|
268
286
|
if (region === 'onprem' && baseUrl) {
|
|
269
287
|
cfg_1.default.setBaseUrl(apiUrl);
|
|
270
288
|
}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const utils_1 = require("../../utils");
|
|
7
7
|
const cfg_1 = __importDefault(require("../../tunnel/cfg"));
|
|
8
8
|
const output_1 = __importDefault(require("../../output"));
|
|
9
|
+
const input_1 = __importDefault(require("../../input"));
|
|
9
10
|
const texts_1 = require("../../texts");
|
|
10
11
|
const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
|
|
11
12
|
const tunnel_1 = require("../../types/tunnel");
|
|
@@ -15,11 +16,11 @@ commandHttp.option('-s, --serve <directory>', texts_1.OPTION_SERVE);
|
|
|
15
16
|
commandHttp.option('--token <token>', texts_1.OPTION_TOKEN);
|
|
16
17
|
commandHttp.argument('[protocol://host:port]', texts_1.OPTION_TARGET);
|
|
17
18
|
commandHttp.action(async (target, options) => {
|
|
18
|
-
|
|
19
|
-
cfg_1.default.setToken(options.token);
|
|
19
|
+
const token = input_1.default.tunnelToken(options.token);
|
|
20
20
|
const prepared = await cfg_1.default.prepareTunnel(tunnel_1.TUNNEL_TYPE.HTTP, target, options, true);
|
|
21
21
|
await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
|
|
22
|
-
const
|
|
22
|
+
const host = cfg_1.default.getTokenHost(token);
|
|
23
|
+
const agent = await buddy_1.default.register(false, false, host, token, (region) => {
|
|
23
24
|
cfg_1.default.setRegionIfNotSet(region);
|
|
24
25
|
});
|
|
25
26
|
await agent.start();
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const utils_1 = require("../../utils");
|
|
7
7
|
const cfg_1 = __importDefault(require("../../tunnel/cfg"));
|
|
8
8
|
const output_1 = __importDefault(require("../../output"));
|
|
9
|
+
const input_1 = __importDefault(require("../../input"));
|
|
9
10
|
const texts_1 = require("../../texts");
|
|
10
11
|
const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
|
|
11
12
|
const tunnel_1 = require("../../types/tunnel");
|
|
@@ -14,11 +15,11 @@ commandTcp.description(texts_1.DESC_COMMAND_TCP);
|
|
|
14
15
|
commandTcp.option('--token <token>', texts_1.OPTION_TOKEN);
|
|
15
16
|
commandTcp.argument('[host:port]', texts_1.OPTION_TARGET);
|
|
16
17
|
commandTcp.action(async (target, options) => {
|
|
17
|
-
|
|
18
|
-
cfg_1.default.setToken(options.token);
|
|
18
|
+
const token = input_1.default.tunnelToken(options.token);
|
|
19
19
|
const prepared = await cfg_1.default.prepareTunnel(tunnel_1.TUNNEL_TYPE.TCP, target, options, true);
|
|
20
20
|
await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
|
|
21
|
-
const
|
|
21
|
+
const host = cfg_1.default.getTokenHost(token);
|
|
22
|
+
const agent = await buddy_1.default.register(false, false, host, token, (region) => {
|
|
22
23
|
cfg_1.default.setRegionIfNotSet(region);
|
|
23
24
|
});
|
|
24
25
|
await agent.start();
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const utils_1 = require("../../utils");
|
|
7
7
|
const cfg_1 = __importDefault(require("../../tunnel/cfg"));
|
|
8
8
|
const output_1 = __importDefault(require("../../output"));
|
|
9
|
+
const input_1 = __importDefault(require("../../input"));
|
|
9
10
|
const texts_1 = require("../../texts");
|
|
10
11
|
const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
|
|
11
12
|
const tunnel_1 = require("../../types/tunnel");
|
|
@@ -14,11 +15,11 @@ commandTls.description(texts_1.DESC_COMMAND_TLS);
|
|
|
14
15
|
commandTls.option('--token <token>', texts_1.OPTION_TOKEN);
|
|
15
16
|
commandTls.argument('[host:port]', texts_1.OPTION_TARGET);
|
|
16
17
|
commandTls.action(async (target, options) => {
|
|
17
|
-
|
|
18
|
-
cfg_1.default.setToken(options.token);
|
|
18
|
+
const token = input_1.default.tunnelToken(options.token);
|
|
19
19
|
const prepared = await cfg_1.default.prepareTunnel(tunnel_1.TUNNEL_TYPE.TLS, target, options, true);
|
|
20
20
|
await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
|
|
21
|
-
const
|
|
21
|
+
const host = cfg_1.default.getTokenHost(token);
|
|
22
|
+
const agent = await buddy_1.default.register(false, false, host, token, (region) => {
|
|
22
23
|
cfg_1.default.setRegionIfNotSet(region);
|
|
23
24
|
});
|
|
24
25
|
await agent.start();
|
package/distTs/src/input.js
CHANGED
|
@@ -237,6 +237,15 @@ class Input {
|
|
|
237
237
|
}
|
|
238
238
|
return t;
|
|
239
239
|
}
|
|
240
|
+
static tunnelToken(token) {
|
|
241
|
+
let t = token;
|
|
242
|
+
if (!t)
|
|
243
|
+
t = cfg_1.default.getTunnelToken();
|
|
244
|
+
if (!t) {
|
|
245
|
+
output_1.default.exitError(texts_1.ERR_TUNNEL_TOKEN);
|
|
246
|
+
}
|
|
247
|
+
return t;
|
|
248
|
+
}
|
|
240
249
|
static pipelineRunPriority(priority) {
|
|
241
250
|
if (!priority)
|
|
242
251
|
return null;
|
package/distTs/src/texts.js
CHANGED
|
@@ -1,21 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
exports.
|
|
6
|
-
exports.
|
|
7
|
-
exports.
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
10
|
-
exports.
|
|
11
|
-
exports.
|
|
12
|
-
exports.ERR_PROJECT_NO_PROJECTS = exports.ERR_PROJECT_NOT_FOUND = exports.TXT_LOGIN_SELECT_PROJECT = exports.TXT_PROJECT_SELECT_OPTIONAL = exports.TXT_PROJECT_SELECT = exports.TXT_PROJECT_NONE = exports.TXT_PROJECT_SET_SUCCESS = exports.TXT_PROJECT_CURRENT = exports.DESC_COMMAND_PROJECT_SET = exports.DESC_COMMAND_PROJECT_LIST = exports.DESC_COMMAND_PROJECT = exports.ERR_LOGIN_INVALID_BASE_URL = exports.ERR_LOGIN_NO_WORKSPACES = exports.ERR_LOGIN_INVALID_TOKEN = exports.TXT_LOGIN_VERIFYING = exports.TXT_LOGIN_SUCCESS = exports.TXT_LOGIN_SELECT_WORKSPACE = exports.TXT_LOGIN_ENTER_TOKEN = exports.TXT_LOGIN_TOKEN_INFO = void 0;
|
|
3
|
+
exports.ERR_AGENT_REMOVED = exports.ERR_FAILED_TO_CONNECT = exports.ERR_TUNNEL_ALREADY_EXISTS = exports.ERR_AGENT_NOT_SUPPORTED = exports.ERR_AGENT_ADMIN_RIGHTS = exports.ERR_SWW_AGENT_UPDATING = exports.ERR_SWW_AGENT_ENABLING = exports.ERR_AGENT_NOT_FOUND = exports.ERR_AGENT_NOT_RUNNING = exports.ERR_AGENT_NOT_INSTALLED = exports.ERR_TUNNEL_NOT_FOUND = exports.ERR_WHITELIST_IS_NOT_VALID = exports.ERR_USER_AGENT_IS_NOT_VALID = exports.ERR_BA_IS_NOT_VALID = exports.ERR_BA_LOGIN_NOT_PROVIDED = exports.ERR_BA_PASSWORD_NOT_PROVIDED = exports.ERR_CB_THRESHOLD_IS_NOT_VALID = exports.ERR_CERT_PATH_IS_NOT_VALID = exports.ERR_KEY_PATH_IS_NOT_VALID = exports.ERR_CA_PATH_IS_NOT_VALID = exports.ERR_WRONG_CA = exports.ERR_WRONG_KEY_CERT = exports.ERR_NAME_WITHOUT_ASTERISK = exports.ERR_PORT_IS_NOT_VALID = exports.ERR_REGION_IS_NOT_VALID = exports.ERR_PATH_IS_NOT_DIRECTORY = exports.ERR_DIRECTORY_DOES_NOT_EXISTS = exports.ERR_TERMINATE_IS_NOT_VALID = exports.ERR_TIMEOUT_IS_NOT_VALID = exports.ERR_TYPE_IS_NOT_VALID = exports.ERR_TARGET_IS_NOT_VALID = exports.ERR_SAVING_AGENT_CONFIG = exports.ERR_AGENT_NOT_REGISTERED = exports.ERR_RUN_PIPELINE_WRONG_VARIABLE = exports.ERR_RUN_PIPELINE_WRONG_ACTION = exports.ERR_RUN_PIPELINE_WRONG_DELAY = exports.ERR_RUN_PIPELINE_WRONG_PRIORITY = exports.ERR_RUN_PIPELINE_WAIT_TIMEOUT = exports.ERR_RUN_PIPELINE_NOT_FOUND = exports.ERR_RUN_PIPELINE_PROJECT_NOT_FOUND = exports.ERR_RUN_PIPELINE_WORKSPACE_NOT_FOUND = exports.ERR_REST_API_PROJECT = exports.ERR_REST_API_WORKSPACE = exports.ERR_REST_API_URL = exports.ERR_TUNNEL_TOKEN = exports.ERR_REST_API_TOKEN = exports.ERR_REST_API_RATE_LIMIT = exports.ERR_REST_API_RESOURCE_NOT_FOUND = exports.ERR_REST_API_WRONG_TOKEN = exports.ERR_REST_API_GENERAL_ERROR = void 0;
|
|
4
|
+
exports.TXT_AGENT_TARGET_DISABLED = exports.TXT_AGENT_TARGET_ENABLED = exports.TXT_AGENT_RESTARTED = exports.TXT_AGENT_DEBUG_OFF = exports.TXT_AGENT_DEBUG_ON = exports.TXT_AGENT_STARTED = exports.TXT_AGENT_STOPPED = exports.WARN_BROWSER_VERSION = exports.ERR_RESOURCE_DISCOVERY = exports.ERR_NO_SNAPSHOTS_TO_SEND = exports.ERR_INVALID_SNAPSHOT = exports.ERR_TEST_EXECUTION = exports.ERR_INVALID_JSON = exports.ERR_INVALID_DOWNLOAD_RESPONSE = exports.ERR_INVALID_SCRAPE_RESPONSE = exports.ERR_INVALID_COMPARE_LINKS_RESPONSE = exports.ERR_INVALID_STORYBOOK_RESPONSE = exports.ERR_INVALID_DEFAULT_SETTINGS_RESPONSE = exports.ERR_INVALID_CLOSE_SESSION_RESPONSE = exports.ERR_INVALID_SNAPSHOTS_RESPONSE = exports.ERR_INVALID_SNAPSHOT_RESPONSE = exports.ERR_MISSING_URLS = exports.ERR_RESOURCE_NOT_FOUND = exports.ERR_MISSING_EXEC_COMMAND = exports.ERR_PARSING_STORIES = exports.ERR_UNSUPPORTED_STORYBOOK = exports.ERR_MISSING_STORYBOOK_INDEX_FILE = exports.ERR_WRONG_STORYBOOK_DIRECTORY = exports.ERR_MISSING_BUILD_ID = exports.ERR_MISSING_UT_TOKEN = exports.ERR_MISSING_VT_TOKEN = exports.ERR_CONFIG_CORRUPTED = exports.ERR_WRONG_TOKEN = exports.ERR_TOKEN_NOT_PROVIDED = exports.ERR_CANT_CREATE_DIR_IN_HOME = exports.ERR_CONNECTION_ERROR = exports.ERR_CONNECTION_TIMEOUT = exports.ERR_WRONG_STREAM = exports.ERR_WRONG_HANDSHAKE = exports.ERR_FETCH_VERSION = exports.ERR_SWW = exports.ERR_NOT_FOUND = exports.ERR_FAILED_TO_CONNECT_TO_AGENT = exports.ERR_TUNNEL_REMOVED = exports.ERR_TUNNELS_DISABLED = exports.ERR_AGENT_LIMIT_REACHED = exports.ERR_TUNNEL_TARGET_INVALID = exports.ERR_WORKSPACE_FLAGGED = exports.ERR_TUNNEL_LIMIT_REACHED = exports.ERR_DOMAIN_RESTRICTED = void 0;
|
|
5
|
+
exports.DESC_COMMAND_AGENT_ENABLE = exports.DESC_COMMAND_AGENT_DEBUG = exports.DESC_COMMAND_AGENT_DISABLE = exports.DESC_COMMAND_AGENT_START = exports.DESC_COMMAND_AGENT_INSTALL = exports.DESC_COMMAND_AGENT_UNINSTALL = exports.DESC_COMMAND_AGENT_TUNNEL_REMOVE = exports.DESC_COMMAND_AGENT_TUNNEL_STATUS = exports.DESC_COMMAND_AGENT_TUNNEL_LIST = exports.DESC_COMMAND_CONFIG_SET = exports.DESC_COMMAND_CONFIG_REMOVE = exports.DESC_COMMAND_CONFIG_GET = exports.DESC_COMMAND_CONFIG_ADD = exports.DESC_COMMAND_CONFIG_SET_WHITELIST = exports.DESC_COMMAND_CONFIG_SET_TOKEN = exports.DESC_COMMAND_CONFIG_SET_TIMEOUT = exports.DESC_COMMAND_CONFIG_SET_REGION = exports.DESC_COMMAND_CONFIG_REMOVE_TUNNEL = exports.DESC_COMMAND_CONFIG_GET_WHITELIST = exports.DESC_COMMAND_CONFIG_GET_TUNNELS = exports.DESC_COMMAND_CONFIG_GET_TUNNEL = exports.DESC_COMMAND_CONFIG_GET_TOKEN = exports.DESC_COMMAND_CONFIG_GET_TIMEOUT = exports.DESC_COMMAND_CONFIG_GET_REGION = exports.DESC_COMMAND_CONFIG_ADD_TLS = exports.DESC_COMMAND_CONFIG_ADD_TCP = exports.DESC_COMMAND_CONFIG_ADD_HTTP = exports.AGENT_FETCH_RETRY = exports.NO_TUNNELS_STARTED = exports.TXT_AGENT_STANDALONE_EXITING = exports.TXT_AGENT_STANDALONE_STARTED = exports.TXT_AGENT_STANDALONE_AGENT_REGISTER_ERROR = exports.TXT_AGENT_STANDALONE_AGENT_REGISTERED = exports.TXT_AGENT_STANDALONE_AGENT_REGISTERING = exports.TXT_AGENT_STANDALONE_AGENT_FETCH_ERROR = exports.TXT_AGENT_STANDALONE_AGENT_FETCHED = exports.TXT_AGENT_STANDALONE_AGENT_FETCHING = exports.TXT_TUNNEL_ADDED = exports.TXT_TUNNEL_REMOVED = exports.TXT_REGION_SAVED = exports.TXT_TIMEOUT_SAVED = exports.TXT_TOKEN_REMOVED = exports.TXT_TOKEN_SAVED = exports.TXT_WHITELIST_SAVED = exports.TXT_TUNNEL_STOPPED = exports.TXT_TUNNEL_STARTED = exports.TXT_AGENT_DISABLED = exports.TXT_AGENT_ALREADY_INSTALLED = exports.TXT_AGENT_UPDATED = exports.TXT_AGENT_INSTALLED = void 0;
|
|
6
|
+
exports.OPTION_PIPELINE_RUN_TAG = exports.OPTION_PIPELINE_RUN_BRANCH = exports.OPTION_REST_API_REGION = exports.OPTION_REST_API_ENDPOINT = exports.OPTION_DEFAULT_REGION = exports.OPTION_REGION = exports.TXT_PIPELINE_RUN_FINISH_FAILED = exports.TXT_PIPELINE_RUN_FINISH_SUCCESSFULLY = exports.TXT_STORIES_AMOUNT = exports.TXT_PIPELINE_RUN_STILL_WAITING = exports.TXT_PIPELINE_RUN_WAIT = exports.TXT_PIPELINE_RUN_SUCCESS = exports.TXT_OPENING_TUNNEL = exports.TXT_UPDATING_AGENT = exports.TXT_ENABLING_AGENT = exports.TXT_NEW_AGENT_VERSION = exports.TXT_NEW_CLI_VERSION = exports.TXT_NEW_CLI_DOCKER_VERSION = exports.OPTION_UPLOAD_DRY_RUN = exports.OPTION_UPLOAD_REPORT_FORMAT = exports.OPTION_UPLOAD_REPORT_GLOB = exports.DESC_COMMAND_UT_UPLOAD = exports.DESC_COMMAND_UT = exports.DESC_COMMAND_VT_INSTALL_BROWSER = exports.DESC_COMMAND_VT_EXEC = exports.DESC_COMMAND_VT_SCRAPE = exports.DESC_COMMAND_VT_COMPARE = exports.DESC_COMMAND_VT_STORYBOOK = exports.DESC_COMMAND_VT_CLOSE = exports.DESC_COMMAND_VT = exports.DESC_COMMAND_PIPELINE_RUN = exports.DESC_COMMAND_PIPELINE = exports.DESC_PROGRAM = exports.DESC_COMMAND_TLS = exports.DESC_COMMAND_TCP = exports.DESC_COMMAND_START = exports.DESC_COMMAND_TUNNEL = exports.DESC_COMMAND_AGENT = exports.DESC_COMMAND_HTTP = exports.DESC_COMMAND_CONFIG = exports.DESC_COMMAND_AGENT_VERSION = exports.DESC_COMMAND_AGENT_UPDATE = exports.DESC_COMMAND_AGENT_TARGET = exports.DESC_COMMAND_AGENT_TUNNEL = exports.DESC_COMMAND_AGENT_STOP = exports.DESC_COMMAND_AGENT_TARGET_DISABLE = exports.DESC_COMMAND_AGENT_TARGET_ENABLE = exports.DESC_COMMAND_AGENT_TARGET_STATUS = exports.DESC_COMMAND_AGENT_STATUS = exports.DESC_COMMAND_AGENT_RESTART = void 0;
|
|
7
|
+
exports.OPTION_EXEC_ONE_BY_ONE = exports.OPTION_EXEC_SKIP_DISCOVERY = exports.OPTION_EXEC_COMMAND = exports.OPTION_AGENT_DEBUG = exports.OPTION_AGENT_PORT = exports.OPTION_AGENT_TARGET = exports.OPTION_PASS = exports.OPTION_APP = exports.OPTION_USER = exports.OPTION_AGENT_TOKEN = exports.OPTION_AGENT_START = exports.OPTION_AGENT_ID = exports.OPTION_ID = exports.OPTION_NAME = exports.OPTION_TARGET = exports.OPTION_TLS_TERMINATE = exports.OPTION_TLS_CA = exports.OPTION_TLS_CERT = exports.OPTION_TLS_KEY = exports.OPTION_HTTP_CIRCUIT_BREAKER = exports.OPTION_HTTP_COMPRESSION = exports.OPTION_HTTP_2 = exports.OPTION_HTTP_VERIFY = exports.OPTION_HTTP_LOG = exports.OPTION_HTTP_AUTH_BUDDY = exports.OPTION_HTTP_AUTH = exports.OPTION_HTTP_HOST = exports.OPTION_FORCE = exports.OPTION_TOKEN = exports.OPTION_TIMEOUT = exports.OPTION_FOLLOW = exports.OPTION_SERVE = exports.OPTION_HEADER_USER_AGENT = exports.OPTION_RESPONSE_HEADER = exports.OPTION_HEADER = exports.OPTION_WHITELIST = exports.OPTION_REST_API_PROJECT = exports.OPTION_REST_API_WORKSPACE = exports.OPTION_PIPELINE_RUN_WAIT = exports.OPTION_PIPELINE_RUN_ACTION = exports.OPTION_REST_API_TOKEN = exports.OPTION_PIPELINE_RUN_ARGUMENT = exports.OPTION_PIPELINE_RUN_DELAY = exports.OPTION_PIPELINE_RUN_VAR = exports.OPTION_PIPELINE_RUN_PRIORITY = exports.OPTION_PIPELINE_RUN_CLEAR_CACHE = exports.OPTION_PIPELINE_RUN_REFRESH = exports.OPTION_PIPELINE_RUN_COMMENT = exports.OPTION_PIPELINE_RUN_PULL_REQUEST = exports.OPTION_PIPELINE_RUN_REVISION = void 0;
|
|
8
|
+
exports.LOG_AGENT_REGISTERED = exports.LOG_SOCKET_DISCONNECTED = exports.LOG_SOCKET_CONNECTED = exports.LOG_AGENT_NSSM_CLEARING = exports.LOG_AGENT_NSSM_EXTRACTING = exports.LOG_AGENT_NSSM_DOWNLOADING = exports.LOG_AGENT_ENABLED = exports.LOG_AGENT_STARTING_SYSTEM = exports.LOG_AGENT_STOPPING_SYSTEM = exports.LOG_AGENT_ENABLING_SYSTEM = exports.LOG_AGENT_SYSTEM_SERVICE_CONFIG = exports.LOG_AGENT_EXTRACTING_ARCHIVE = exports.LOG_AGENT_DOWNLOADING_ARCHIVE = exports.LOG_AGENT_SYSTEM_DIR = exports.LOG_ERROR_SAVING_AGENT_LOCAL_CONFIG = exports.LOG_ERROR_REMOVING_AGENT_STANDALONE_LOCK_FILE = exports.LOG_ERROR_SAVING_AGENT_STANDALONE_CONFIG = exports.LOG_ERROR_SAVING_AGENT_SYSTEM_CONFIG = exports.LOG_SAVING_AGENT_LOCAL_CONFIG = exports.LOG_REMOVING_AGENT_PROC_ID = exports.LOG_SAVING_AGENT_PROC_ID = exports.LOG_SAVING_AGENT_SYSTEM_CONFIG = exports.LOG_REGISTERING_AGENT = exports.OPTION_SCRAPE_OUTPUT_DIR = exports.OPTION_SCRAPE_DELAY = exports.OPTION_SCRAPE_DARK_MODE = exports.OPTION_SCRAPE_WAIT_FOR_ELEMENT = exports.OPTION_SCRAPE_DEVICE_PIXEL_RATIO = exports.OPTION_SCRAPE_VIEWPORT = exports.OPTION_SCRAPE_BROWSER = exports.OPTION_SCRAPE_XPATH_SELECTOR = exports.OPTION_SCRAPE_CSS_SELECTOR = exports.OPTION_SCRAPE_FULL_PAGE = exports.OPTION_SCRAPE_QUALITY = exports.OPTION_SCRAPE_OUTPUT_TYPE = exports.OPTION_SCRAPE_FOLLOW = exports.OPTION_SCRAPE_URL = exports.OPTION_COMPARE_WAIT_FOR = exports.OPTION_COMPARE_DELAY = exports.OPTION_COMPARE_HEADER = exports.OPTION_COMPARE_COOKIE = exports.OPTION_COMPARE_IGNORE = exports.OPTION_COMPARE_IGNORE_URLS = exports.OPTION_COMPARE_DRY_RUN = exports.OPTION_COMPARE_URLS_FILE = exports.OPTION_COMPARE_SITEMAP = exports.OPTION_COMPARE_URLS = exports.OPTION_COMPARE_RESPECT_ROBOTS = exports.OPTION_COMPARE_FOLLOW = exports.OPTION_EXEC_PARALLEL = void 0;
|
|
9
|
+
exports.DEBUG_AUTO_WIDTH = exports.DEBUG_AUTO_SCROLL = exports.DEBUG_RESOURCE_SCRAPPING_URL = exports.DEBUG_SNAPSHOT_PROCESSING = exports.DEBUG_SNAPSHOTS_PROCESSING = exports.DEBUG_EXEC_COMMAND = exports.DEBUG_EXEC_TEST_COMMAND = exports.LOG_INSTALLED_BROWSER = exports.LOG_SESSION_LINK = exports.LOG_SENDING_DATA = exports.LOG_SENDING_REQUEST = exports.LOG_PROCESSING_SNAPSHOTS = exports.LOG_RUNNING_EXEC_COMMAND = exports.LOG_TUNNEL_SSH_STREAM = exports.LOG_TUNNEL_TLS_AGENT_STREAM = exports.LOG_TUNNEL_TLS_REGION_STREAM = exports.LOG_TUNNEL_TLS_TARGET_STREAM = exports.LOG_TUNNEL_HTTP2_STREAM = exports.LOG_TUNNEL_HTTP1_STREAM = exports.LOG_TUNNEL_TCP_STREAM = exports.LOG_TUNNEL_HTTP_WRONG_USER_AGENTS = exports.LOG_TUNNEL_HTTP_CIRCUIT_BREAKER_OPEN = exports.LOG_TUNNEL_HTTP_RATE_LIMIT = exports.LOG_TUNNEL_HTTP_WRON_AUTH = exports.LOG_TUNNEL_IDENTIFIED = exports.LOG_TUNNEL_DISCONNECTED = exports.LOG_TUNNEL_FAILED = exports.LOG_TUNNEL_CONNECTED = exports.LOG_AGENT_STARTED = exports.LOG_AGENT_SERVER_STARTED = exports.LOG_ERROR_STARTING_AGENT_SERVER = exports.LOG_SSH_CONNECTION = exports.LOG_WRONG_STREAM = exports.LOG_DETECTED_STREAM = exports.LOG_HTTP2_REQUEST = exports.LOG_HTTP2_CONNECTION = exports.LOG_HTTP1_REQUEST = exports.LOG_HTTP1_CONNECTION = exports.LOG_ERROR = exports.LOG_STOPPING_TUNNEL = exports.LOG_STARTING_TUNNEL = exports.LOG_ENABLING_AGENT_TARGET = exports.LOG_DISABLING_AGENT_TARGET = exports.LOG_REMOVING_TUNNEL = exports.LOG_TUNNEL_REGISTERED = exports.LOG_ERROR_WHILE_REFRESHING_AGENT = exports.LOG_REGISTERING_TUNNEL = exports.LOG_GETTING_AGENT = exports.LOG_UNREGISTERING_AGENT = exports.LOG_REGION_DETECTED = void 0;
|
|
10
|
+
exports.DESC_COMMAND_SANDBOX_SNAPSHOT_CREATE = exports.DESC_COMMAND_SANDBOX_SNAPSHOT_LIST = exports.DESC_COMMAND_SANDBOX_SNAPSHOT = exports.ERR_SANDBOX_NO_COMMANDS = exports.TXT_SANDBOX_COMMAND_KILLED = exports.OPTION_SANDBOX_COMMAND_LAST = exports.OPTION_SANDBOX_COMMAND_FOLLOW = exports.OPTION_SANDBOX_COMMAND_ID = exports.DESC_COMMAND_SANDBOX_COMMAND_KILL = exports.DESC_COMMAND_SANDBOX_COMMAND_LOGS = exports.DESC_COMMAND_SANDBOX_COMMAND_STATUS = exports.DESC_COMMAND_SANDBOX_COMMAND_LIST = exports.DESC_COMMAND_SANDBOX_COMMAND = exports.TXT_SANDBOX_EXEC_FINISHED = exports.TXT_SANDBOX_WAITING = exports.TXT_SANDBOX_RESTARTED = exports.TXT_SANDBOX_STOPPED = exports.TXT_SANDBOX_STARTED = exports.TXT_SANDBOX_DESTROYED = exports.TXT_SANDBOX_CREATED = exports.ERR_SANDBOX_STOP_TIMEOUT = exports.ERR_SANDBOX_START_TIMEOUT = exports.ERR_SANDBOX_SETUP_FAILED = exports.ERR_SANDBOX_INVALID_RUNTIME = exports.ERR_SANDBOX_INVALID_RESOURCES = exports.ERR_SANDBOX_COMMAND_REQUIRED = exports.ERR_SANDBOX_IDENTIFIER_REQUIRED = exports.ERR_SANDBOX_NOT_FOUND = exports.OPTION_SANDBOX_COMMAND = exports.OPTION_SANDBOX_DETACHED = exports.OPTION_SANDBOX_RUNTIME = exports.OPTION_SANDBOX_RUN_COMMAND = exports.OPTION_SANDBOX_INSTALL_COMMANDS = exports.OPTION_SANDBOX_RESOURCES = exports.OPTION_SANDBOX_OS = exports.OPTION_SANDBOX_NAME = exports.OPTION_SANDBOX_IDENTIFIER = exports.DESC_COMMAND_SANDBOX_EXEC = exports.DESC_COMMAND_SANDBOX_STATUS = exports.DESC_COMMAND_SANDBOX_RESTART = exports.DESC_COMMAND_SANDBOX_STOP = exports.DESC_COMMAND_SANDBOX_START = exports.DESC_COMMAND_SANDBOX_DESTROY = exports.DESC_COMMAND_SANDBOX_GET = exports.DESC_COMMAND_SANDBOX_LIST = exports.DESC_COMMAND_SANDBOX_CREATE = exports.DESC_COMMAND_SANDBOX = exports.DEBUG_WAIT_FOR_IDLE_TIMEOUT = exports.DEBUG_WAIT_FOR_IDLE = exports.DEBUG_RESOURCE_DISCOVERY_TIMEOUT = void 0;
|
|
11
|
+
exports.TXT_LOGIN_SELECT_REGION = exports.ERR_WORKSPACE_NOT_LOGGED_IN = exports.TXT_WORKSPACE_NONE = exports.TXT_WORKSPACE_SET_SUCCESS = exports.TXT_WORKSPACE_CURRENT = exports.DESC_COMMAND_WORKSPACE_SET = exports.DESC_COMMAND_WORKSPACE_LIST = exports.DESC_COMMAND_WORKSPACE = exports.TXT_LOGOUT_SUCCESS = exports.DESC_COMMAND_LOGOUT = exports.DESC_COMMAND_LOGIN = exports.ERR_SANDBOX_CP_INVALID_DEST = exports.ERR_SANDBOX_CP_SOURCE_NOT_FOUND = exports.TXT_SANDBOX_CP_DONE = exports.TXT_SANDBOX_CP_PROGRESS = exports.OPTION_SANDBOX_CP_SILENT = exports.OPTION_SANDBOX_CP_DEST = exports.OPTION_SANDBOX_CP_SOURCE = exports.DESC_COMMAND_SANDBOX_CP = exports.ERR_SANDBOX_ENDPOINT_NOT_FOUND = exports.ERR_SANDBOX_ENDPOINT_EXISTS = exports.TXT_SANDBOX_ENDPOINT_DELETED = exports.TXT_SANDBOX_ENDPOINT_UPDATED = exports.TXT_SANDBOX_ENDPOINT_ADDED = exports.OPTION_SANDBOX_ENDPOINT_PASSWORD = exports.OPTION_SANDBOX_ENDPOINT_USERNAME = exports.OPTION_SANDBOX_ENDPOINT_AUTH = exports.OPTION_SANDBOX_ENDPOINT_WHITELIST = exports.OPTION_SANDBOX_ENDPOINT_REGION = exports.OPTION_SANDBOX_ENDPOINT_TYPE = exports.OPTION_SANDBOX_ENDPOINT_PORT = exports.OPTION_SANDBOX_ENDPOINT_NAME_ARG = exports.OPTION_SANDBOX_ENDPOINT_NAME = exports.DESC_COMMAND_SANDBOX_ENDPOINT_DELETE = exports.DESC_COMMAND_SANDBOX_ENDPOINT_UPDATE = exports.DESC_COMMAND_SANDBOX_ENDPOINT_ADD = exports.DESC_COMMAND_SANDBOX_ENDPOINT_GET = exports.DESC_COMMAND_SANDBOX_ENDPOINT_LIST = exports.DESC_COMMAND_SANDBOX_ENDPOINT = exports.ERR_SANDBOX_SNAPSHOT_NOT_FOUND = exports.ERR_SANDBOX_SNAPSHOT_FAILED = exports.TXT_SANDBOX_SNAPSHOT_WAITING = exports.TXT_SANDBOX_SNAPSHOT_DELETED = exports.TXT_SANDBOX_SNAPSHOT_CREATED = exports.OPTION_SANDBOX_FROM_SNAPSHOT = exports.OPTION_SANDBOX_SNAPSHOT_DESCRIPTION = exports.OPTION_SANDBOX_SNAPSHOT_NAME_ARG = exports.OPTION_SANDBOX_SNAPSHOT_NAME = exports.DESC_COMMAND_SANDBOX_SNAPSHOT_DELETE = exports.DESC_COMMAND_SANDBOX_SNAPSHOT_GET = void 0;
|
|
12
|
+
exports.ERR_PROJECT_NO_PROJECTS = exports.ERR_PROJECT_NOT_FOUND = exports.TXT_LOGIN_ENTER_TUNNEL_TOKEN = exports.TXT_LOGIN_SELECT_PROJECT = exports.TXT_PROJECT_SELECT_OPTIONAL = exports.TXT_PROJECT_SELECT = exports.TXT_PROJECT_NONE = exports.TXT_PROJECT_SET_SUCCESS = exports.TXT_PROJECT_CURRENT = exports.DESC_COMMAND_PROJECT_SET = exports.DESC_COMMAND_PROJECT_LIST = exports.DESC_COMMAND_PROJECT = exports.ERR_LOGIN_INVALID_BASE_URL = exports.ERR_LOGIN_NO_WORKSPACES = exports.ERR_LOGIN_INVALID_TOKEN = exports.TXT_LOGIN_VERIFYING = exports.TXT_LOGIN_SUCCESS = exports.TXT_LOGIN_SELECT_WORKSPACE = exports.TXT_LOGIN_ENTER_TOKEN = exports.TXT_LOGIN_TOKEN_INFO = exports.TXT_LOGIN_ENTER_BASE_URL = void 0;
|
|
13
13
|
const utils_1 = require("./utils");
|
|
14
14
|
exports.ERR_REST_API_GENERAL_ERROR = 'Something went wrong';
|
|
15
15
|
exports.ERR_REST_API_WRONG_TOKEN = 'Valid token with proper scopes is required';
|
|
16
16
|
exports.ERR_REST_API_RESOURCE_NOT_FOUND = 'Resource not found';
|
|
17
17
|
exports.ERR_REST_API_RATE_LIMIT = 'Rate limit exceeded';
|
|
18
18
|
exports.ERR_REST_API_TOKEN = 'Personal access token is required (--token)';
|
|
19
|
+
exports.ERR_TUNNEL_TOKEN = 'Tunnel token is required (--token). Set it via: bdy login';
|
|
19
20
|
exports.ERR_REST_API_URL = 'Valid rest api endpoint is required (--api)';
|
|
20
21
|
exports.ERR_REST_API_WORKSPACE = 'Workspace domain is required (--workspace)';
|
|
21
22
|
exports.ERR_REST_API_PROJECT = 'Project name is required (--project)';
|
|
@@ -580,6 +581,7 @@ exports.TXT_PROJECT_NONE = 'No project configured.';
|
|
|
580
581
|
exports.TXT_PROJECT_SELECT = 'Select project:';
|
|
581
582
|
exports.TXT_PROJECT_SELECT_OPTIONAL = 'Select project (optional):';
|
|
582
583
|
exports.TXT_LOGIN_SELECT_PROJECT = 'Select project (optional):';
|
|
584
|
+
exports.TXT_LOGIN_ENTER_TUNNEL_TOKEN = 'Enter tunnel token (optional, press Enter to skip):';
|
|
583
585
|
const ERR_PROJECT_NOT_FOUND = (project) => `Project "${project}" not found`;
|
|
584
586
|
exports.ERR_PROJECT_NOT_FOUND = ERR_PROJECT_NOT_FOUND;
|
|
585
587
|
exports.ERR_PROJECT_NO_PROJECTS = 'No projects found in this workspace';
|
package/distTs/src/tunnel/cfg.js
CHANGED
|
@@ -182,12 +182,12 @@ class Cfg {
|
|
|
182
182
|
getToken() {
|
|
183
183
|
return this.json.token || '';
|
|
184
184
|
}
|
|
185
|
-
getTokenHost() {
|
|
186
|
-
const
|
|
187
|
-
if (!
|
|
185
|
+
getTokenHost(token) {
|
|
186
|
+
const t = token || this.getToken();
|
|
187
|
+
if (!t) {
|
|
188
188
|
throw new Error(texts_1.ERR_TOKEN_NOT_PROVIDED);
|
|
189
189
|
}
|
|
190
|
-
const d = (0, jsonwebtoken_1.decode)(
|
|
190
|
+
const d = (0, jsonwebtoken_1.decode)(t);
|
|
191
191
|
if (d === null) {
|
|
192
192
|
throw new Error(texts_1.ERR_WRONG_TOKEN);
|
|
193
193
|
}
|
|
@@ -196,6 +196,16 @@ class Cfg {
|
|
|
196
196
|
}
|
|
197
197
|
return d.host;
|
|
198
198
|
}
|
|
199
|
+
setTunnelToken(token) {
|
|
200
|
+
if (!token)
|
|
201
|
+
delete this.json.tunnelToken;
|
|
202
|
+
else
|
|
203
|
+
this.json.tunnelToken = token;
|
|
204
|
+
this.save();
|
|
205
|
+
}
|
|
206
|
+
getTunnelToken() {
|
|
207
|
+
return this.json.tunnelToken || '';
|
|
208
|
+
}
|
|
199
209
|
getRegion() {
|
|
200
210
|
return (this.json.region || '').toUpperCase();
|
|
201
211
|
}
|
|
@@ -224,6 +234,7 @@ class Cfg {
|
|
|
224
234
|
}
|
|
225
235
|
clearLogin() {
|
|
226
236
|
delete this.json.token;
|
|
237
|
+
delete this.json.tunnelToken;
|
|
227
238
|
delete this.json.workspace;
|
|
228
239
|
delete this.json.project;
|
|
229
240
|
delete this.json.baseUrl;
|