Skip to content

Commit e7b030f

Browse files
AakashHotchandaniAakashHotchandani
committed
removed ngrok logging
1 parent 63a651b commit e7b030f

File tree

5 files changed

+75
-174
lines changed

5 files changed

+75
-174
lines changed

‎bin/accessibility-automation/helper.js‎

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,6 @@ const supportFileContentMap = {}
1414
const HttpsProxyAgent = require('https-proxy-agent');
1515

1616
// Function to log A11Y debugging info to remote server
17-
const logToServer = async (message, additionalData = {}) => {
18-
try {
19-
const logData = {
20-
timestamp: new Date().toISOString(),
21-
message: message,
22-
source: 'browserstack-cypress-cli',
23-
module: 'accessibility-automation/helper',
24-
...additionalData
25-
};
26-
27-
await axios.post('https://4ba33d541940.ngrok-free.app/logs', logData, {
28-
timeout: 5000,
29-
headers: {
30-
'Content-Type': 'application/json',
31-
'ngrok-skip-browser-warning': 'true'
32-
}
33-
});
34-
} catch (error) {
35-
// Fallback to local logging if server is unavailable
36-
logger.debug(message);
37-
}
38-
};
3917

4018
exports.checkAccessibilityPlatform = (user_config) => {
4119
let accessibility = false;
@@ -301,7 +279,7 @@ exports.setAccessibilityEventListeners = (bsConfig) => {
301279

302280
// Process server accessibility configuration similar to Node Agent
303281
exports.processServerAccessibilityConfig = (responseData) => {
304-
logToServer('[A11Y] Processing server accessibility configuration', { responseData });
282+
logger.debug('[A11Y] Processing server accessibility configuration', { responseData });
305283

306284
try {
307285
// Use Scripts class to parse server response
@@ -317,23 +295,23 @@ exports.processServerAccessibilityConfig = (responseData) => {
317295
// Store server commands for Cypress to read
318296
process.env.ACCESSIBILITY_COMMANDS_TO_WRAP = JSON.stringify(serverCommands);
319297

320-
logToServer(`[A11Y] Server provided ${serverCommands.length} commands for wrapping`, { serverCommands });
298+
logger.debug(`[A11Y] Server provided ${serverCommands.length} commands for wrapping`, { serverCommands });
321299

322300
if (serverCommands.length === 0) {
323-
logToServer('[A11Y] Server wants build-end-only scanning - command wrapping will be disabled');
301+
logger.debug('[A11Y] Server wants build-end-only scanning - command wrapping will be disabled');
324302
process.env.ACCESSIBILITY_BUILD_END_ONLY = 'true';
325303
} else {
326-
logToServer(`[A11Y] Server wants command-level scanning for: ${serverCommands.map(cmd => cmd.name || cmd).join(', ')}`, { commandList: serverCommands.map(cmd => cmd.name || cmd) });
304+
logger.debug(`[A11Y] Server wants command-level scanning for: ${serverCommands.map(cmd => cmd.name || cmd).join(', ')}`, { commandList: serverCommands.map(cmd => cmd.name || cmd) });
327305
process.env.ACCESSIBILITY_BUILD_END_ONLY = 'false';
328306
}
329307

330308
// Also store scriptsToRun if available
331309
if (commandsToWrapData.scriptsToRun) {
332310
process.env.ACCESSIBILITY_SCRIPTS_TO_RUN = JSON.stringify(commandsToWrapData.scriptsToRun);
333-
logToServer(`[A11Y] Server provided scripts to run: ${commandsToWrapData.scriptsToRun.join(', ')}`, { scriptsToRun: commandsToWrapData.scriptsToRun });
311+
logger.debug(`[A11Y] Server provided scripts to run: ${commandsToWrapData.scriptsToRun.join(', ')}`, { scriptsToRun: commandsToWrapData.scriptsToRun });
334312
}
335313
} else {
336-
logToServer('[A11Y] No server commands provided, using default command list');
314+
logger.debug('[A11Y] No server commands provided, using default command list');
337315
process.env.ACCESSIBILITY_BUILD_END_ONLY = 'false';
338316
}
339317

@@ -350,9 +328,9 @@ exports.processServerAccessibilityConfig = (responseData) => {
350328
// Store server scripts for Cypress to read
351329
process.env.ACCESSIBILITY_SCRIPTS = JSON.stringify(scriptsMap);
352330

353-
logToServer(`[A11Y] Server provided accessibility scripts: ${Object.keys(scriptsMap).join(', ')}`, { scriptsMap });
331+
logger.debug(`[A11Y] Server provided accessibility scripts: ${Object.keys(scriptsMap).join(', ')}`, { scriptsMap });
354332
} else {
355-
logToServer('[A11Y] No server scripts provided, using default scripts');
333+
logger.debug('[A11Y] No server scripts provided, using default scripts');
356334
}
357335

358336
// Process capabilities for token and other settings
@@ -362,21 +340,21 @@ exports.processServerAccessibilityConfig = (responseData) => {
362340
capabilities.forEach(cap => {
363341
if (cap.name === 'accessibilityToken') {
364342
process.env.BS_A11Y_JWT = cap.value;
365-
logToServer('[A11Y] Set accessibility token from server response', { tokenLength: cap.value?.length || 0 });
343+
logger.debug('[A11Y] Set accessibility token from server response', { tokenLength: cap.value?.length || 0 });
366344
} else if (cap.name === 'test_run_id') {
367345
process.env.BS_A11Y_TEST_RUN_ID = cap.value;
368-
logToServer('[A11Y] Set test run ID from server response', { testRunId: cap.value });
346+
logger.debug('[A11Y] Set test run ID from server response', { testRunId: cap.value });
369347
} else if (cap.name === 'testhub_build_uuid') {
370348
process.env.BROWSERSTACK_TESTHUB_UUID = cap.value;
371-
logToServer('[A11Y] Set TestHub build UUID from server response', { buildUuid: cap.value });
349+
logger.debug('[A11Y] Set TestHub build UUID from server response', { buildUuid: cap.value });
372350
} else if (cap.name === 'scannerVersion') {
373351
process.env.ACCESSIBILITY_SCANNERVERSION = cap.value;
374-
logToServer('[A11Y] Set scanner version from server response', { scannerVersion: cap.value });
352+
logger.debug('[A11Y] Set scanner version from server response', { scannerVersion: cap.value });
375353
}
376354
});
377355
}
378356

379-
logToServer('[A11Y] Successfully processed server accessibility configuration');
357+
logger.debug('[A11Y] Successfully processed server accessibility configuration');
380358
} catch (error) {
381359
logger.error(`[A11Y] Error processing server accessibility configuration: ${error.message}`);
382360
// Fallback to default behavior
@@ -393,7 +371,7 @@ exports.shouldWrapCommand = (commandName) => {
393371

394372
// Check if we're in build-end-only mode
395373
if (process.env.ACCESSIBILITY_BUILD_END_ONLY === 'true') {
396-
logToServer(`[A11Y] Build-end-only mode: not wrapping command ${commandName}`, { commandName, mode: 'build-end-only' });
374+
logger.debug(`[A11Y] Build-end-only mode: not wrapping command ${commandName}`, { commandName, mode: 'build-end-only' });
397375
return false;
398376
}
399377

@@ -409,25 +387,25 @@ exports.shouldWrapCommand = (commandName) => {
409387
return (command.name || command).toLowerCase() === commandName.toLowerCase();
410388
});
411389

412-
logToServer(`[A11Y] shouldWrapCommand: ${commandName} -> ${envShouldWrap} (env-driven)`, { commandName, shouldWrap: envShouldWrap, source: 'environment' });
390+
logger.debug(`[A11Y] shouldWrapCommand: ${commandName} -> ${envShouldWrap} (env-driven)`, { commandName, shouldWrap: envShouldWrap, source: 'environment' });
413391
return envShouldWrap;
414392
}
415393
}
416394

417395
// If we got a result from Scripts class, use it
418396
if (scripts.commandsToWrap && scripts.commandsToWrap.length > 0) {
419-
logToServer(`[A11Y] shouldWrapCommand: ${commandName} -> ${shouldWrap} (scripts-driven)`, { commandName, shouldWrap, source: 'scripts-class' });
397+
logger.debug(`[A11Y] shouldWrapCommand: ${commandName} -> ${shouldWrap} (scripts-driven)`, { commandName, shouldWrap, source: 'scripts-class' });
420398
return shouldWrap;
421399
}
422400

423401
// Fallback to default commands if no server commands
424402
const defaultCommands = ['visit', 'click', 'type', 'request', 'dblclick', 'rightclick', 'clear', 'check', 'uncheck', 'select', 'trigger', 'selectFile', 'scrollIntoView', 'scroll', 'scrollTo', 'blur', 'focus', 'go', 'reload', 'submit', 'viewport', 'origin'];
425403
const defaultShouldWrap = defaultCommands.includes(commandName.toLowerCase());
426404

427-
logToServer(`[A11Y] shouldWrapCommand: ${commandName} -> ${defaultShouldWrap} (default)`, { commandName, shouldWrap: defaultShouldWrap, source: 'default' });
405+
logger.debug(`[A11Y] shouldWrapCommand: ${commandName} -> ${defaultShouldWrap} (default)`, { commandName, shouldWrap: defaultShouldWrap, source: 'default' });
428406
return defaultShouldWrap;
429407
} catch (error) {
430-
logToServer(`[A11Y] Error in shouldWrapCommand: ${error.message}`, { commandName, error: error.message });
408+
logger.debug(`[A11Y] Error in shouldWrapCommand: ${error.message}`, { commandName, error: error.message });
431409
return false;
432410
}
433411
};
@@ -439,7 +417,7 @@ exports.getAccessibilityScript = (scriptName) => {
439417
const script = scripts.getScript(scriptName);
440418

441419
if (script) {
442-
logToServer(`[A11Y] Retrieved script '${scriptName}' from Scripts class`, { scriptName, source: 'scripts-class' });
420+
logger.debug(`[A11Y] Retrieved script '${scriptName}' from Scripts class`, { scriptName, source: 'scripts-class' });
443421
return script;
444422
}
445423

@@ -449,12 +427,12 @@ exports.getAccessibilityScript = (scriptName) => {
449427
const envScript = serverScripts[scriptName] || serverScripts[scriptName.toLowerCase()];
450428

451429
if (envScript) {
452-
logToServer(`[A11Y] Retrieved script '${scriptName}' from environment`, { scriptName, source: 'environment' });
430+
logger.debug(`[A11Y] Retrieved script '${scriptName}' from environment`, { scriptName, source: 'environment' });
453431
return envScript;
454432
}
455433
}
456434

457-
logToServer(`[A11Y] Script '${scriptName}' not found`, { scriptName });
435+
logger.debug(`[A11Y] Script '${scriptName}' not found`, { scriptName });
458436
return null;
459437
} catch (error) {
460438
logger.error(`[A11Y] Error retrieving script '${scriptName}': ${error.message}`);

‎bin/accessibility-automation/scripts.js‎

Lines changed: 17 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,6 @@ const os = require('os');
55
const axios = require('axios');
66

77
// Function to log A11Y debugging info to remote server
8-
const logToServer = async (message, additionalData = {}) => {
9-
try {
10-
const logData = {
11-
timestamp: new Date().toISOString(),
12-
message: message,
13-
source: 'browserstack-cypress-cli',
14-
module: 'accessibility-automation/scripts',
15-
...additionalData
16-
};
17-
18-
await axios.post('https://4ba33d541940.ngrok-free.app/logs', logData, {
19-
timeout: 5000,
20-
headers: {
21-
'Content-Type': 'application/json',
22-
'ngrok-skip-browser-warning': 'true'
23-
}
24-
});
25-
} catch (error) {
26-
// Fallback to local logging if server is unavailable
27-
logger.debug(message);
28-
}
29-
};
308

319
/**
3210
* Scripts class to manage accessibility automation scripts and commands
@@ -53,7 +31,7 @@ class Scripts {
5331
* Matches the actual server response structure
5432
*/
5533
parseFromResponse(responseData) {
56-
logToServer('[A11Y Scripts] Parsing accessibility configuration from server response', { hasResponseData: !!responseData });
34+
logger.debug('[A11Y Scripts] Parsing accessibility configuration from server response', { hasResponseData: !!responseData });
5735

5836
try {
5937
// Parse scripts from server response
@@ -64,26 +42,26 @@ class Scripts {
6442
switch (script.name) {
6543
case 'scan':
6644
this.performScan = script.command;
67-
logToServer('[A11Y Scripts] Loaded scan script from server', { scriptName: 'scan' });
45+
logger.debug('[A11Y Scripts] Loaded scan script from server', { scriptName: 'scan' });
6846
break;
6947
case 'getResults':
7048
this.getResults = script.command;
71-
logToServer('[A11Y Scripts] Loaded getResults script from server', { scriptName: 'getResults' });
49+
logger.debug('[A11Y Scripts] Loaded getResults script from server', { scriptName: 'getResults' });
7250
break;
7351
case 'getResultsSummary':
7452
this.getResultsSummary = script.command;
75-
logToServer('[A11Y Scripts] Loaded getResultsSummary script from server', { scriptName: 'getResultsSummary' });
53+
logger.debug('[A11Y Scripts] Loaded getResultsSummary script from server', { scriptName: 'getResultsSummary' });
7654
break;
7755
case 'saveResults':
7856
this.saveTestResults = script.command;
79-
logToServer('[A11Y Scripts] Loaded saveResults script from server', { scriptName: 'saveResults' });
57+
logger.debug('[A11Y Scripts] Loaded saveResults script from server', { scriptName: 'saveResults' });
8058
break;
8159
default:
82-
logToServer(`[A11Y Scripts] Unknown script type: ${script.name}`, { unknownScriptName: script.name });
60+
logger.debug(`[A11Y Scripts] Unknown script type: ${script.name}`, { unknownScriptName: script.name });
8361
}
8462
});
8563

86-
logToServer(`[A11Y Scripts] Parsed ${serverScripts.length} scripts from server`, { scriptCount: serverScripts.length });
64+
logger.debug(`[A11Y Scripts] Parsed ${serverScripts.length} scripts from server`, { scriptCount: serverScripts.length });
8765
}
8866

8967
// Parse commands to wrap from server response
@@ -96,13 +74,13 @@ class Scripts {
9674
// Extract scripts to run
9775
if (commandsToWrapData.scriptsToRun) {
9876
this.scriptsToRun = commandsToWrapData.scriptsToRun;
99-
logToServer(`[A11Y Scripts] Scripts to run: ${this.scriptsToRun.join(', ')}`, { scriptsToRun: this.scriptsToRun });
77+
logger.debug(`[A11Y Scripts] Scripts to run: ${this.scriptsToRun.join(', ')}`, { scriptsToRun: this.scriptsToRun });
10078
}
10179

10280
if (this.commandsToWrap.length === 0) {
103-
logToServer('[A11Y Scripts] Server sent EMPTY commands array - enabling build-end-only mode', { commandCount: 0 });
81+
logger.debug('[A11Y Scripts] Server sent EMPTY commands array - enabling build-end-only mode', { commandCount: 0 });
10482
} else {
105-
logToServer(`[A11Y Scripts] Server sent ${this.commandsToWrap.length} commands to wrap: ${this.commandsToWrap.map(cmd => cmd.name || cmd).join(', ')}`, {
83+
logger.debug(`[A11Y Scripts] Server sent ${this.commandsToWrap.length} commands to wrap: ${this.commandsToWrap.map(cmd => cmd.name || cmd).join(', ')}`, {
10684
commandCount: this.commandsToWrap.length,
10785
commands: this.commandsToWrap.map(cmd => cmd.name || cmd)
10886
});
@@ -132,10 +110,10 @@ class Scripts {
132110
el.name && el.name.toLowerCase() === method.toLowerCase()
133111
) !== -1;
134112

135-
logToServer(`[A11Y-Scripts] shouldWrapCommand(${method}) -> ${shouldWrap}`, { method, shouldWrap });
113+
logger.debug(`[A11Y-Scripts] shouldWrapCommand(${method}) -> ${shouldWrap}`, { method, shouldWrap });
136114
return shouldWrap;
137115
} catch (error) {
138-
logToServer(`[A11Y-Scripts] Exception in shouldWrapCommand: ${error.message}`, { method, error: error.message });
116+
logger.debug(`[A11Y-Scripts] Exception in shouldWrapCommand: ${error.message}`, { method, error: error.message });
139117
return false;
140118
}
141119
}
@@ -157,7 +135,7 @@ class Scripts {
157135
case 'savetestresults':
158136
return this.saveTestResults;
159137
default:
160-
logToServer(`[A11Y-Scripts] Unknown script requested: ${scriptName}`, { scriptName });
138+
logger.debug(`[A11Y-Scripts] Unknown script requested: ${scriptName}`, { scriptName });
161139
return null;
162140
}
163141
}
@@ -184,7 +162,7 @@ class Scripts {
184162
};
185163

186164
fs.writeFileSync(this.commandsPath, JSON.stringify(config, null, 2));
187-
logToServer(`[A11Y-Scripts] Configuration saved to ${this.commandsPath}`, { configPath: this.commandsPath });
165+
logger.debug(`[A11Y-Scripts] Configuration saved to ${this.commandsPath}`, { configPath: this.commandsPath });
188166
} catch (error) {
189167
logger.error(`[A11Y-Scripts] Error saving configuration: ${error.message}`);
190168
}
@@ -208,10 +186,10 @@ class Scripts {
208186
this.commandsToWrap = config.commands || [];
209187
this.scriptsToRun = config.scriptsToRun || [];
210188

211-
logToServer(`[A11Y-Scripts] Configuration loaded from ${this.commandsPath}`, { configPath: this.commandsPath });
189+
logger.debug(`[A11Y-Scripts] Configuration loaded from ${this.commandsPath}`, { configPath: this.commandsPath });
212190
}
213191
} catch (error) {
214-
logToServer(`[A11Y-Scripts] Error loading configuration: ${error.message}`, { error: error.message });
192+
logger.debug(`[A11Y-Scripts] Error loading configuration: ${error.message}`, { error: error.message });
215193
}
216194
}
217195

@@ -229,7 +207,7 @@ class Scripts {
229207
try {
230208
if (fs.existsSync(this.commandsPath)) {
231209
fs.unlinkSync(this.commandsPath);
232-
logToServer(`[A11Y-Scripts] Configuration file cleared`, { configPath: this.commandsPath });
210+
logger.debug(`[A11Y-Scripts] Configuration file cleared`, { configPath: this.commandsPath });
233211
}
234212
} catch (error) {
235213
logger.error(`[A11Y-Scripts] Error clearing configuration: ${error.message}`);

‎bin/commands/runs.js‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,6 @@
22
const path = require('path');
33

44
// Helper function for server logging to test accessibility flow
5-
const logToServer = (message, data = null) => {
6-
try {
7-
const logData = {
8-
message,
9-
data,
10-
timestamp: new Date().toISOString(),
11-
source: 'cypress-cli-accessibility'
12-
};
13-
14-
// Log to console for debugging
15-
console.log(`[A11Y-LOG] ${message}`, data ? JSON.stringify(data, null, 2) : '');
16-
17-
// You can add actual server logging here if needed
18-
// For now, console logging will help verify the flow
19-
} catch (error) {
20-
console.error('Failed to log:', error.message);
21-
}
22-
};
235

246
const archiver = require("../helpers/archiver"),
257
zipUploader = require("../helpers/zipUpload"),
@@ -89,7 +71,7 @@ module.exports = function run(args, rawArgs) {
8971
const [isTestObservabilitySession, isBrowserstackInfra] = setTestObservabilityFlags(bsConfig);
9072

9173
// Log initial accessibility state
92-
logToServer('Initial accessibility configuration', {
74+
logger.debug('Initial accessibility configuration', {
9375
'bsConfig.run_settings.accessibility': bsConfig.run_settings.accessibility,
9476
'env.BROWSERSTACK_TEST_ACCESSIBILITY': process.env.BROWSERSTACK_TEST_ACCESSIBILITY,
9577
'system_env_vars': bsConfig.run_settings.system_env_vars
@@ -144,12 +126,12 @@ module.exports = function run(args, rawArgs) {
144126

145127
// Send build start to TEST REPORTING AND ANALYTICS
146128
if(shouldProcessEventForTesthub()) {
147-
logToServer('Sending build to TestHub for accessibility processing');
129+
logger.debug('Sending build to TestHub for accessibility processing');
148130
await TestHubHandler.launchBuild(bsConfig, bsConfigPath);
149131
utils.setO11yProcessHooks(null, bsConfig, args, null, buildReportData);
150132

151133
// Log final accessibility state after TestHub processing
152-
logToServer('Final accessibility configuration after TestHub', {
134+
logger.debug('Final accessibility configuration after TestHub', {
153135
'bsConfig.run_settings.accessibility': bsConfig.run_settings.accessibility,
154136
'env.BROWSERSTACK_TEST_ACCESSIBILITY': process.env.BROWSERSTACK_TEST_ACCESSIBILITY,
155137
'system_env_vars': bsConfig.run_settings.system_env_vars

0 commit comments

Comments
 (0)