Gitea_Action/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-11-20 15:24:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactored code based on Copilot suggestions

Browse Source
This commit is contained in:
priya-kinthali 2025-11-07 09:40:56 +05:30
parent 07e4e83111
commit bf96286433
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dist/setup/index.js vendored
View File

@ -129864,17 +129864,19 @@ class JavaBase {
} }
else { else {
core.info('Trying to resolve the latest version from remote'); core.info('Trying to resolve the latest version from remote');
let retries = 4; const MAX_RETRIES = 4;
const RETRY_DELAY_MS = 2000;
const retryableCodes = [ const retryableCodes = [
'ETIMEDOUT', 'ETIMEDOUT',
'ECONNRESET', 'ECONNRESET',
'ENOTFOUND', 'ENOTFOUND',
'ECONNREFUSED' 'ECONNREFUSED'
]; ];
let retries = MAX_RETRIES;
while (retries > 0) { while (retries > 0) {
try { try {
// Clear console timers before each attempt to prevent conflicts // Clear console timers before each attempt to prevent conflicts
if (retries < 4 && core.isDebug()) { if (retries < MAX_RETRIES && core.isDebug()) {
const consoleAny = console; const consoleAny = console;
(_b = (_a = consoleAny._times) === null || _a === void 0 ? void 0 : _a.clear) === null || _b === void 0 ? void 0 : _b.call(_a); (_b = (_a = consoleAny._times) === null || _a === void 0 ? void 0 : _a.clear) === null || _b === void 0 ? void 0 : _b.call(_a);
} }
@ -129902,7 +129904,7 @@ class JavaBase {
error.errors.some((err) => retryableCodes.includes(err === null || err === void 0 ? void 0 : err.code))); error.errors.some((err) => retryableCodes.includes(err === null || err === void 0 ? void 0 : err.code)));
if (retries > 0 && isRetryable) { if (retries > 0 && isRetryable) {
core.debug(`Attempt failed due to network or timeout issues, initiating retry... (${retries} attempts left)`); core.debug(`Attempt failed due to network or timeout issues, initiating retry... (${retries} attempts left)`);
yield new Promise(r => setTimeout(r, 2000)); yield new Promise(r => setTimeout(r, RETRY_DELAY_MS));
continue; continue;
} }
if (error instanceof tc.HTTPError) { if (error instanceof tc.HTTPError) {
@ -129925,7 +129927,13 @@ class JavaBase {
const endpoint = (err === null || err === void 0 ? void 0 : err.address) || (err === null || err === void 0 ? void 0 : err.hostname) || ''; const endpoint = (err === null || err === void 0 ? void 0 : err.address) || (err === null || err === void 0 ? void 0 : err.hostname) || '';
const port = (err === null || err === void 0 ? void 0 : err.port) ? `:${err.port}` : ''; const port = (err === null || err === void 0 ? void 0 : err.port) ? `:${err.port}` : '';
const message = (err === null || err === void 0 ? void 0 : err.message) || 'Aggregate error'; const message = (err === null || err === void 0 ? void 0 : err.message) || 'Aggregate error';
const logMessage = `${message}${!message.includes(endpoint) ? ` ${endpoint}${port}` : ''}${err.localAddress && err.localPort ? ` - Local (${err.localAddress}:${err.localPort})` : ''}`; const endpointInfo = !message.includes(endpoint)
? ` ${endpoint}${port}`
: '';
const localInfo = err.localAddress && err.localPort
? ` - Local (${err.localAddress}:${err.localPort})`
: '';
const logMessage = `${message}${endpointInfo}${localInfo}`;
core.error(logMessage); core.error(logMessage);
core.debug(`${err.stack || err.message}`); core.debug(`${err.stack || err.message}`);
Object.entries(err).forEach(([key, value]) => { Object.entries(err).forEach(([key, value]) => {
@ -129941,7 +129949,10 @@ class JavaBase {
} }
const errorDetails = Object.assign({ name: error.name, message: error.message }, Object.getOwnPropertyNames(error) const errorDetails = Object.assign({ name: error.name, message: error.message }, Object.getOwnPropertyNames(error)
.filter(prop => !['name', 'message', 'stack'].includes(prop)) .filter(prop => !['name', 'message', 'stack'].includes(prop))
.reduce((acc, prop) => (Object.assign(Object.assign({}, acc), { [prop]: error[prop] })), {})); .reduce((acc, prop) => {
acc[prop] = error[prop];
return acc;
}, {}));
Object.entries(errorDetails).forEach(([key, value]) => { Object.entries(errorDetails).forEach(([key, value]) => {
core.debug(`"${key}": ${JSON.stringify(value)}`); core.debug(`"${key}": ${JSON.stringify(value)}`);
}); });

22
src/distributions/base-installer.ts
View File

@ -51,17 +51,19 @@ export abstract class JavaBase {
core.info(`Resolved Java ${foundJava.version} from tool-cache`); core.info(`Resolved Java ${foundJava.version} from tool-cache`);
} else { } else {
core.info('Trying to resolve the latest version from remote'); core.info('Trying to resolve the latest version from remote');
let retries = 4; const MAX_RETRIES = 4;
const RETRY_DELAY_MS = 2000;
const retryableCodes = [ const retryableCodes = [
'ETIMEDOUT', 'ETIMEDOUT',
'ECONNRESET', 'ECONNRESET',
'ENOTFOUND', 'ENOTFOUND',
'ECONNREFUSED' 'ECONNREFUSED'
]; ];
let retries = MAX_RETRIES;
while (retries > 0) { while (retries > 0) {
try { try {
// Clear console timers before each attempt to prevent conflicts // Clear console timers before each attempt to prevent conflicts
if (retries < 4 && core.isDebug()) { if (retries < MAX_RETRIES && core.isDebug()) {
const consoleAny = console as any; const consoleAny = console as any;
consoleAny._times?.clear?.(); consoleAny._times?.clear?.();
} }
@ -92,7 +94,7 @@ export abstract class JavaBase {
core.debug( core.debug(
`Attempt failed due to network or timeout issues, initiating retry... (${retries} attempts left)` `Attempt failed due to network or timeout issues, initiating retry... (${retries} attempts left)`
); );
await new Promise(r => setTimeout(r, 2000)); await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
continue; continue;
} }
if (error instanceof tc.HTTPError) { if (error instanceof tc.HTTPError) {
@ -116,7 +118,14 @@ export abstract class JavaBase {
const endpoint = err?.address || err?.hostname || ''; const endpoint = err?.address || err?.hostname || '';
const port = err?.port ? `:${err.port}` : ''; const port = err?.port ? `:${err.port}` : '';
const message = err?.message || 'Aggregate error'; const message = err?.message || 'Aggregate error';
const logMessage = `${message}${!message.includes(endpoint) ? ` ${endpoint}${port}` : ''}${err.localAddress && err.localPort ? ` - Local (${err.localAddress}:${err.localPort})` : ''}`; const endpointInfo = !message.includes(endpoint)
? ` ${endpoint}${port}`
: '';
const localInfo =
err.localAddress && err.localPort
? ` - Local (${err.localAddress}:${err.localPort})`
: '';
const logMessage = `${message}${endpointInfo}${localInfo}`;
core.error(logMessage); core.error(logMessage);
core.debug(`${err.stack || err.message}`); core.debug(`${err.stack || err.message}`);
Object.entries(err).forEach(([key, value]) => { Object.entries(err).forEach(([key, value]) => {
@ -135,7 +144,10 @@ export abstract class JavaBase {
message: error.message, message: error.message,
...Object.getOwnPropertyNames(error) ...Object.getOwnPropertyNames(error)
.filter(prop => !['name', 'message', 'stack'].includes(prop)) .filter(prop => !['name', 'message', 'stack'].includes(prop))
.reduce((acc, prop) => ({...acc, [prop]: error[prop]}), {}) .reduce<{[key: string]: any}>((acc, prop) => {
acc[prop] = error[prop];
return acc;
}, {})
}; };
Object.entries(errorDetails).forEach(([key, value]) => { Object.entries(errorDetails).forEach(([key, value]) => {
core.debug(`"${key}": ${JSON.stringify(value)}`); core.debug(`"${key}": ${JSON.stringify(value)}`);