@adobe/spacecat-shared-tokowaka-client 1.5.7 → 1.5.8
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/CHANGELOG.md +7 -0
- package/package.json +1 -1
- package/src/utils/custom-html-utils.js +7 -7
- package/test/index.test.js +1 -1
- package/test/utils/html-utils.test.js +19 -19
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [@adobe/spacecat-shared-tokowaka-client-v1.5.8](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-tokowaka-client-v1.5.7...@adobe/spacecat-shared-tokowaka-client-v1.5.8) (2026-01-27)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* rename x-edge-optimize to x-edgeoptimize ([#1284](https://github.com/adobe/spacecat-shared/issues/1284)) ([63ba2ac](https://github.com/adobe/spacecat-shared/commit/63ba2ac9141612a5f581b0162cb1b30343c5980c))
|
|
7
|
+
|
|
1
8
|
# [@adobe/spacecat-shared-tokowaka-client-v1.5.7](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-tokowaka-client-v1.5.6...@adobe/spacecat-shared-tokowaka-client-v1.5.7) (2026-01-22)
|
|
2
9
|
|
|
3
10
|
|
package/package.json
CHANGED
|
@@ -52,14 +52,14 @@ async function fetchWithRetry(url, options, maxRetries, retryDelayMs, log, fetch
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
// Check for edge optimize headers
|
|
55
|
-
const cacheHeader = response.headers.get('x-
|
|
56
|
-
const proxyHeader = response.headers.get('x-
|
|
55
|
+
const cacheHeader = response.headers.get('x-edgeoptimize-cache');
|
|
56
|
+
const proxyHeader = response.headers.get('x-edgeoptimize-proxy');
|
|
57
57
|
|
|
58
58
|
log.debug(`Headers - cache: ${cacheHeader || 'none'}, proxy: ${proxyHeader || 'none'}`);
|
|
59
59
|
|
|
60
60
|
// Case 1: Cache header present (regardless of proxy) -> Success
|
|
61
61
|
if (cacheHeader) {
|
|
62
|
-
log.debug(`Cache header found (x-
|
|
62
|
+
log.debug(`Cache header found (x-edgeoptimize-cache: ${cacheHeader}), stopping retry logic`);
|
|
63
63
|
return response;
|
|
64
64
|
}
|
|
65
65
|
|
|
@@ -80,7 +80,7 @@ async function fetchWithRetry(url, options, maxRetries, retryDelayMs, log, fetch
|
|
|
80
80
|
} else {
|
|
81
81
|
// Last attempt - throw error
|
|
82
82
|
log.error(`Max retries (${maxRetries}) exhausted. Proxy header present but cache header not found`);
|
|
83
|
-
throw new Error(`Cache header (x-
|
|
83
|
+
throw new Error(`Cache header (x-edgeoptimize-cache) not found after ${maxRetries} retries`);
|
|
84
84
|
}
|
|
85
85
|
} catch (error) {
|
|
86
86
|
log.warn(`Attempt ${attempt} failed for ${fetchType} HTML, error: ${error.message}`);
|
|
@@ -158,15 +158,15 @@ export async function fetchHtmlWithWarmup(
|
|
|
158
158
|
|
|
159
159
|
const headers = {
|
|
160
160
|
'x-forwarded-host': forwardedHost,
|
|
161
|
-
'x-
|
|
162
|
-
'x-
|
|
161
|
+
'x-edgeoptimize-api-key': apiKey,
|
|
162
|
+
'x-edgeoptimize-url': urlPath,
|
|
163
163
|
'Accept-Encoding': 'identity', // Disable compression to avoid content-length: 0 issue
|
|
164
164
|
};
|
|
165
165
|
|
|
166
166
|
if (isOptimized) {
|
|
167
167
|
// Add tokowakaPreview param for optimized HTML
|
|
168
168
|
fullUrl = `${fullUrl}?tokowakaPreview=true`;
|
|
169
|
-
headers['x-
|
|
169
|
+
headers['x-edgeoptimize-url'] = `${urlPath}?tokowakaPreview=true`;
|
|
170
170
|
}
|
|
171
171
|
|
|
172
172
|
const fetchOptions = {
|
package/test/index.test.js
CHANGED
|
@@ -2692,7 +2692,7 @@ describe('TokowakaClient', () => {
|
|
|
2692
2692
|
status: 200,
|
|
2693
2693
|
statusText: 'OK',
|
|
2694
2694
|
headers: {
|
|
2695
|
-
get: (name) => (name === 'x-
|
|
2695
|
+
get: (name) => (name === 'x-edgeoptimize-cache' ? 'HIT' : null),
|
|
2696
2696
|
},
|
|
2697
2697
|
text: async () => '<html><body>Test HTML</body></html>',
|
|
2698
2698
|
});
|
|
@@ -104,7 +104,7 @@ describe('HTML Utils', () => {
|
|
|
104
104
|
status: 200,
|
|
105
105
|
statusText: 'OK',
|
|
106
106
|
headers: {
|
|
107
|
-
get: (name) => (name === 'x-
|
|
107
|
+
get: (name) => (name === 'x-edgeoptimize-cache' ? 'HIT' : null),
|
|
108
108
|
},
|
|
109
109
|
text: async () => '<html>Test HTML</html>',
|
|
110
110
|
});
|
|
@@ -129,7 +129,7 @@ describe('HTML Utils', () => {
|
|
|
129
129
|
status: 200,
|
|
130
130
|
statusText: 'OK',
|
|
131
131
|
headers: {
|
|
132
|
-
get: (name) => (name === 'x-
|
|
132
|
+
get: (name) => (name === 'x-edgeoptimize-cache' ? 'HIT' : null),
|
|
133
133
|
},
|
|
134
134
|
text: async () => '<html>Optimized HTML</html>',
|
|
135
135
|
});
|
|
@@ -208,7 +208,7 @@ describe('HTML Utils', () => {
|
|
|
208
208
|
status: 200,
|
|
209
209
|
statusText: 'OK',
|
|
210
210
|
headers: {
|
|
211
|
-
get: (name) => (name === 'x-
|
|
211
|
+
get: (name) => (name === 'x-edgeoptimize-proxy' ? 'true' : null),
|
|
212
212
|
},
|
|
213
213
|
text: async () => '<html>Proxy only 1</html>',
|
|
214
214
|
});
|
|
@@ -217,7 +217,7 @@ describe('HTML Utils', () => {
|
|
|
217
217
|
status: 200,
|
|
218
218
|
statusText: 'OK',
|
|
219
219
|
headers: {
|
|
220
|
-
get: (name) => (name === 'x-
|
|
220
|
+
get: (name) => (name === 'x-edgeoptimize-proxy' ? 'true' : null),
|
|
221
221
|
},
|
|
222
222
|
text: async () => '<html>Proxy only 2</html>',
|
|
223
223
|
});
|
|
@@ -226,7 +226,7 @@ describe('HTML Utils', () => {
|
|
|
226
226
|
status: 200,
|
|
227
227
|
statusText: 'OK',
|
|
228
228
|
headers: {
|
|
229
|
-
get: (name) => (name === 'x-
|
|
229
|
+
get: (name) => (name === 'x-edgeoptimize-proxy' ? 'true' : null),
|
|
230
230
|
},
|
|
231
231
|
text: async () => '<html>Proxy only 3</html>',
|
|
232
232
|
});
|
|
@@ -244,7 +244,7 @@ describe('HTML Utils', () => {
|
|
|
244
244
|
expect.fail('Should have thrown error');
|
|
245
245
|
} catch (error) {
|
|
246
246
|
expect(error.message).to.include('Failed to fetch optimized HTML');
|
|
247
|
-
expect(error.message).to.include('Cache header (x-
|
|
247
|
+
expect(error.message).to.include('Cache header (x-edgeoptimize-cache) not found after 2 retries');
|
|
248
248
|
}
|
|
249
249
|
|
|
250
250
|
// Should have tried 3 times (initial + 2 retries) plus warmup
|
|
@@ -268,7 +268,7 @@ describe('HTML Utils', () => {
|
|
|
268
268
|
status: 200,
|
|
269
269
|
statusText: 'OK',
|
|
270
270
|
headers: {
|
|
271
|
-
get: (name) => (name === 'x-
|
|
271
|
+
get: (name) => (name === 'x-edgeoptimize-proxy' ? 'true' : null),
|
|
272
272
|
},
|
|
273
273
|
text: async () => '<html>Proxy only</html>',
|
|
274
274
|
});
|
|
@@ -278,7 +278,7 @@ describe('HTML Utils', () => {
|
|
|
278
278
|
status: 200,
|
|
279
279
|
statusText: 'OK',
|
|
280
280
|
headers: {
|
|
281
|
-
get: (name) => (name === 'x-
|
|
281
|
+
get: (name) => (name === 'x-edgeoptimize-cache' ? 'HIT' : null),
|
|
282
282
|
},
|
|
283
283
|
text: async () => '<html>Cached HTML</html>',
|
|
284
284
|
});
|
|
@@ -483,7 +483,7 @@ describe('HTML Utils', () => {
|
|
|
483
483
|
status: 200,
|
|
484
484
|
statusText: 'OK',
|
|
485
485
|
headers: {
|
|
486
|
-
get: (name) => (name === 'x-
|
|
486
|
+
get: (name) => (name === 'x-edgeoptimize-proxy' ? 'true' : null),
|
|
487
487
|
},
|
|
488
488
|
text: async () => '<html>Proxy only</html>',
|
|
489
489
|
});
|
|
@@ -494,8 +494,8 @@ describe('HTML Utils', () => {
|
|
|
494
494
|
statusText: 'OK',
|
|
495
495
|
headers: {
|
|
496
496
|
get: (name) => {
|
|
497
|
-
if (name === 'x-
|
|
498
|
-
if (name === 'x-
|
|
497
|
+
if (name === 'x-edgeoptimize-cache') return 'HIT';
|
|
498
|
+
if (name === 'x-edgeoptimize-proxy') return 'true';
|
|
499
499
|
return null;
|
|
500
500
|
},
|
|
501
501
|
},
|
|
@@ -534,7 +534,7 @@ describe('HTML Utils', () => {
|
|
|
534
534
|
status: 200,
|
|
535
535
|
statusText: 'OK',
|
|
536
536
|
headers: {
|
|
537
|
-
get: (name) => (name === 'x-
|
|
537
|
+
get: (name) => (name === 'x-edgeoptimize-proxy' ? 'true' : null),
|
|
538
538
|
},
|
|
539
539
|
text: async () => '<html>Proxy only 1</html>',
|
|
540
540
|
});
|
|
@@ -543,7 +543,7 @@ describe('HTML Utils', () => {
|
|
|
543
543
|
status: 200,
|
|
544
544
|
statusText: 'OK',
|
|
545
545
|
headers: {
|
|
546
|
-
get: (name) => (name === 'x-
|
|
546
|
+
get: (name) => (name === 'x-edgeoptimize-proxy' ? 'true' : null),
|
|
547
547
|
},
|
|
548
548
|
text: async () => '<html>Proxy only 2</html>',
|
|
549
549
|
});
|
|
@@ -552,7 +552,7 @@ describe('HTML Utils', () => {
|
|
|
552
552
|
status: 200,
|
|
553
553
|
statusText: 'OK',
|
|
554
554
|
headers: {
|
|
555
|
-
get: (name) => (name === 'x-
|
|
555
|
+
get: (name) => (name === 'x-edgeoptimize-proxy' ? 'true' : null),
|
|
556
556
|
},
|
|
557
557
|
text: async () => '<html>Proxy only 3</html>',
|
|
558
558
|
});
|
|
@@ -570,7 +570,7 @@ describe('HTML Utils', () => {
|
|
|
570
570
|
expect.fail('Should have thrown error');
|
|
571
571
|
} catch (error) {
|
|
572
572
|
expect(error.message).to.include('Failed to fetch original HTML');
|
|
573
|
-
expect(error.message).to.include('Cache header (x-
|
|
573
|
+
expect(error.message).to.include('Cache header (x-edgeoptimize-cache) not found after 2 retries');
|
|
574
574
|
}
|
|
575
575
|
|
|
576
576
|
// Should have tried 3 times (initial + 2 retries) plus warmup
|
|
@@ -594,7 +594,7 @@ describe('HTML Utils', () => {
|
|
|
594
594
|
status: 200,
|
|
595
595
|
statusText: 'OK',
|
|
596
596
|
headers: {
|
|
597
|
-
get: (name) => (name === 'x-
|
|
597
|
+
get: (name) => (name === 'x-edgeoptimize-cache' ? 'HIT' : null),
|
|
598
598
|
},
|
|
599
599
|
text: async () => '<html>Cached HTML</html>',
|
|
600
600
|
});
|
|
@@ -632,8 +632,8 @@ describe('HTML Utils', () => {
|
|
|
632
632
|
statusText: 'OK',
|
|
633
633
|
headers: {
|
|
634
634
|
get: (name) => {
|
|
635
|
-
if (name === 'x-
|
|
636
|
-
if (name === 'x-
|
|
635
|
+
if (name === 'x-edgeoptimize-cache') return 'HIT';
|
|
636
|
+
if (name === 'x-edgeoptimize-proxy') return 'true';
|
|
637
637
|
return null;
|
|
638
638
|
},
|
|
639
639
|
},
|
|
@@ -672,7 +672,7 @@ describe('HTML Utils', () => {
|
|
|
672
672
|
status: 200,
|
|
673
673
|
statusText: 'OK',
|
|
674
674
|
headers: {
|
|
675
|
-
get: (name) => (name === 'x-
|
|
675
|
+
get: (name) => (name === 'x-edgeoptimize-cache' ? 'HIT' : null),
|
|
676
676
|
},
|
|
677
677
|
text: async () => '<html>Cache only HTML</html>',
|
|
678
678
|
});
|