@git.zone/tsdocker 1.17.0 → 1.17.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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/tsdocker',
6
- version: '1.17.0',
6
+ version: '1.17.1',
7
7
  description: 'develop npm modules cross platform with docker'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxvQkFBb0I7SUFDMUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGdEQUFnRDtDQUM5RCxDQUFBIn0=
@@ -9,6 +9,12 @@ interface IRegistryCredentials {
9
9
  */
10
10
  export declare class RegistryCopy {
11
11
  private tokenCache;
12
+ /**
13
+ * Wraps fetch() with timeout (via AbortSignal) and retry with exponential backoff.
14
+ * Retries on network errors and 5xx; does NOT retry on 4xx client errors.
15
+ * On 401, clears the token cache entry so the next attempt re-authenticates.
16
+ */
17
+ private fetchWithRetry;
12
18
  /**
13
19
  * Reads Docker credentials from ~/.docker/config.json for a given registry.
14
20
  * Supports base64-encoded "auth" field in the config.
@@ -9,6 +9,38 @@ import { logger } from './tsdocker.logging.js';
9
9
  */
10
10
  export class RegistryCopy {
11
11
  tokenCache = {};
12
+ /**
13
+ * Wraps fetch() with timeout (via AbortSignal) and retry with exponential backoff.
14
+ * Retries on network errors and 5xx; does NOT retry on 4xx client errors.
15
+ * On 401, clears the token cache entry so the next attempt re-authenticates.
16
+ */
17
+ async fetchWithRetry(url, options, timeoutMs = 300_000, maxRetries = 3) {
18
+ let lastError = null;
19
+ for (let attempt = 1; attempt <= maxRetries; attempt++) {
20
+ try {
21
+ const resp = await fetch(url, {
22
+ ...options,
23
+ signal: AbortSignal.timeout(timeoutMs),
24
+ });
25
+ // Retry on 5xx server errors (but not 4xx)
26
+ if (resp.status >= 500 && attempt < maxRetries) {
27
+ logger.log('warn', `Request to ${url} returned ${resp.status}, retrying (${attempt}/${maxRetries})...`);
28
+ await new Promise(r => setTimeout(r, 1000 * Math.pow(2, attempt - 1)));
29
+ continue;
30
+ }
31
+ return resp;
32
+ }
33
+ catch (err) {
34
+ lastError = err;
35
+ if (attempt < maxRetries) {
36
+ const delay = 1000 * Math.pow(2, attempt - 1);
37
+ logger.log('warn', `fetch failed (attempt ${attempt}/${maxRetries}): ${lastError.message}, retrying in ${delay}ms...`);
38
+ await new Promise(r => setTimeout(r, delay));
39
+ }
40
+ }
41
+ }
42
+ throw lastError;
43
+ }
12
44
  /**
13
45
  * Reads Docker credentials from ~/.docker/config.json for a given registry.
14
46
  * Supports base64-encoded "auth" field in the config.
@@ -79,7 +111,7 @@ export class RegistryCopy {
79
111
  return null;
80
112
  }
81
113
  try {
82
- const checkResp = await fetch(`${apiBase}/v2/`, { method: 'GET' });
114
+ const checkResp = await this.fetchWithRetry(`${apiBase}/v2/`, { method: 'GET' }, 30_000);
83
115
  if (checkResp.ok)
84
116
  return null; // No auth needed
85
117
  const wwwAuth = checkResp.headers.get('www-authenticate') || '';
@@ -98,7 +130,7 @@ export class RegistryCopy {
98
130
  if (creds) {
99
131
  headers['Authorization'] = 'Basic ' + Buffer.from(`${creds.username}:${creds.password}`).toString('base64');
100
132
  }
101
- const tokenResp = await fetch(tokenUrl.toString(), { headers });
133
+ const tokenResp = await this.fetchWithRetry(tokenUrl.toString(), { headers }, 30_000);
102
134
  if (!tokenResp.ok) {
103
135
  const body = await tokenResp.text();
104
136
  throw new Error(`Token request failed (${tokenResp.status}): ${body}`);
@@ -138,7 +170,13 @@ export class RegistryCopy {
138
170
  fetchOptions.body = options.body;
139
171
  fetchOptions.duplex = 'half'; // Required for streaming body in Node
140
172
  }
141
- return fetch(url, fetchOptions);
173
+ const resp = await this.fetchWithRetry(url, fetchOptions, 300_000);
174
+ // Token expired — clear cache so next call re-authenticates
175
+ if (resp.status === 401 && token) {
176
+ const cacheKey = `${registry}/${`repository:${repo}:${actions}`}`;
177
+ delete this.tokenCache[cacheKey];
178
+ }
179
+ return resp;
142
180
  }
143
181
  /**
144
182
  * Gets a manifest from a registry (supports both manifest lists and single manifests).
@@ -234,11 +272,11 @@ export class RegistryCopy {
234
272
  if (token) {
235
273
  putHeaders['Authorization'] = `Bearer ${token}`;
236
274
  }
237
- const putResp = await fetch(putUrl, {
275
+ const putResp = await this.fetchWithRetry(putUrl, {
238
276
  method: 'PUT',
239
277
  headers: putHeaders,
240
278
  body: blobData,
241
- });
279
+ }, 300_000);
242
280
  if (!putResp.ok) {
243
281
  const body = await putResp.text();
244
282
  throw new Error(`Failed to upload blob ${digest} to ${destRegistry}/${destRepo}: ${putResp.status} ${body}`);
@@ -356,4 +394,4 @@ export class RegistryCopy {
356
394
  return `sha256:${hash}`;
357
395
  }
358
396
  }
359
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.registrycopy.js","sourceRoot":"","sources":["../ts/classes.registrycopy.ts"],"names":[],"mappings":"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"}
397
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.registrycopy.js","sourceRoot":"","sources":["../ts/classes.registrycopy.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@git.zone/tsdocker",
3
- "version": "1.17.0",
3
+ "version": "1.17.1",
4
4
  "private": false,
5
5
  "description": "develop npm modules cross platform with docker",
6
6
  "main": "dist_ts/index.js",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/tsdocker',
6
- version: '1.17.0',
6
+ version: '1.17.1',
7
7
  description: 'develop npm modules cross platform with docker'
8
8
  }
@@ -20,6 +20,43 @@ interface ITokenCache {
20
20
  export class RegistryCopy {
21
21
  private tokenCache: ITokenCache = {};
22
22
 
23
+ /**
24
+ * Wraps fetch() with timeout (via AbortSignal) and retry with exponential backoff.
25
+ * Retries on network errors and 5xx; does NOT retry on 4xx client errors.
26
+ * On 401, clears the token cache entry so the next attempt re-authenticates.
27
+ */
28
+ private async fetchWithRetry(
29
+ url: string,
30
+ options: RequestInit & { duplex?: string },
31
+ timeoutMs: number = 300_000,
32
+ maxRetries: number = 3,
33
+ ): Promise<Response> {
34
+ let lastError: Error | null = null;
35
+ for (let attempt = 1; attempt <= maxRetries; attempt++) {
36
+ try {
37
+ const resp = await fetch(url, {
38
+ ...options,
39
+ signal: AbortSignal.timeout(timeoutMs),
40
+ });
41
+ // Retry on 5xx server errors (but not 4xx)
42
+ if (resp.status >= 500 && attempt < maxRetries) {
43
+ logger.log('warn', `Request to ${url} returned ${resp.status}, retrying (${attempt}/${maxRetries})...`);
44
+ await new Promise(r => setTimeout(r, 1000 * Math.pow(2, attempt - 1)));
45
+ continue;
46
+ }
47
+ return resp;
48
+ } catch (err) {
49
+ lastError = err as Error;
50
+ if (attempt < maxRetries) {
51
+ const delay = 1000 * Math.pow(2, attempt - 1);
52
+ logger.log('warn', `fetch failed (attempt ${attempt}/${maxRetries}): ${lastError.message}, retrying in ${delay}ms...`);
53
+ await new Promise(r => setTimeout(r, delay));
54
+ }
55
+ }
56
+ }
57
+ throw lastError!;
58
+ }
59
+
23
60
  /**
24
61
  * Reads Docker credentials from ~/.docker/config.json for a given registry.
25
62
  * Supports base64-encoded "auth" field in the config.
@@ -109,7 +146,7 @@ export class RegistryCopy {
109
146
  }
110
147
 
111
148
  try {
112
- const checkResp = await fetch(`${apiBase}/v2/`, { method: 'GET' });
149
+ const checkResp = await this.fetchWithRetry(`${apiBase}/v2/`, { method: 'GET' }, 30_000);
113
150
  if (checkResp.ok) return null; // No auth needed
114
151
 
115
152
  const wwwAuth = checkResp.headers.get('www-authenticate') || '';
@@ -131,7 +168,7 @@ export class RegistryCopy {
131
168
  headers['Authorization'] = 'Basic ' + Buffer.from(`${creds.username}:${creds.password}`).toString('base64');
132
169
  }
133
170
 
134
- const tokenResp = await fetch(tokenUrl.toString(), { headers });
171
+ const tokenResp = await this.fetchWithRetry(tokenUrl.toString(), { headers }, 30_000);
135
172
  if (!tokenResp.ok) {
136
173
  const body = await tokenResp.text();
137
174
  throw new Error(`Token request failed (${tokenResp.status}): ${body}`);
@@ -189,7 +226,15 @@ export class RegistryCopy {
189
226
  fetchOptions.duplex = 'half'; // Required for streaming body in Node
190
227
  }
191
228
 
192
- return fetch(url, fetchOptions);
229
+ const resp = await this.fetchWithRetry(url, fetchOptions, 300_000);
230
+
231
+ // Token expired — clear cache so next call re-authenticates
232
+ if (resp.status === 401 && token) {
233
+ const cacheKey = `${registry}/${`repository:${repo}:${actions}`}`;
234
+ delete this.tokenCache[cacheKey];
235
+ }
236
+
237
+ return resp;
193
238
  }
194
239
 
195
240
  /**
@@ -320,11 +365,11 @@ export class RegistryCopy {
320
365
  putHeaders['Authorization'] = `Bearer ${token}`;
321
366
  }
322
367
 
323
- const putResp = await fetch(putUrl, {
368
+ const putResp = await this.fetchWithRetry(putUrl, {
324
369
  method: 'PUT',
325
370
  headers: putHeaders,
326
371
  body: blobData,
327
- });
372
+ }, 300_000);
328
373
 
329
374
  if (!putResp.ok) {
330
375
  const body = await putResp.text();