fix(tokowaka-client): fold blocked back into edgeOptimizeEnabled

Reverts the previous commit's raw-signal approach per explicit
direction: edgeOptimizeEnabled should reflect both routing AND WAF
status, accepting that persistEdgeConfig's routingEnabled stamping in
spacecat-import-worker will not fire for a routing-confirmed-but-
WAF-blocked site until that job is separately updated to read routing
and WAF as independent signals.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: jindaliiita

packages/spacecat-shared-tokowaka-client/src/index.js

@@ -1345,14 +1345,17 @@ class TokowakaClient {
    * Fetches the customer's own domain directly (no proxy) and checks the response for
    * BOTH the routing signal (x-tokowaka-request-id / x-edgeoptimize-request-id header)
    * and a WAF/bot-block (via classifyProbeResponse, on the same fetched response — no
-   * second request).
+   * second request). `edgeOptimizeEnabled` folds both together: it is only `true` when
+   * the request-id header is present AND the response isn't classified as blocked —
+   * routing alone is not sufficient.
    *
-   * `edgeOptimizeEnabled` is still the raw routing signal only (unchanged from before —
-   * `blocked` does NOT factor into it yet), to stay fully backward compatible with
-   * existing consumers (e.g. the import-worker's routingEnabled stamping). `blocked`/
-   * `statusCode` are returned (and logged) purely for visibility for now; consuming them
-   * on the frontend, and eventually retiring the separate checkWafConnectivity call in
-   * favor of this, is follow-up work.
+   * NOTE: this changes what `edgeOptimizeEnabled` means for existing consumers. The
+   * import-worker's `persistEdgeConfig` stamps `routingEnabled` based on this value
+   * (via `isEdgeLive`) — a site with routing confirmed but WAF-blocked will now get
+   * `edgeOptimizeEnabled: false`, and so will NOT have `routingEnabled` stamped until
+   * it clears the WAF block. This is an accepted, intentional tradeoff for now, pending
+   * a follow-up update to the import-worker job to read routing and WAF status as
+   * separate signals if that gap needs closing sooner.
    *
    * @param {Object} site - Site entity
    * @param {string} path - Path to check (e.g., '/products/chair')
@@ -1412,15 +1415,12 @@ class TokowakaClient {
         this.log.info(`[edge-optimize-status] Edge optimize headers found: ${requestIdPresent} for ${targetUrl}`);
 
         // Classify the same response already fetched above for a WAF/bot-block — no second
-        // request. Logged/returned for visibility only for now — edgeOptimizeEnabled stays
-        // the raw routing signal (does NOT fold in `blocked` yet) so this stays fully
-        // backward compatible: persistEdgeConfig's routingEnabled stamping (and everything
-        // downstream of it) is untouched. Consuming `blocked`/`statusCode` on the frontend,
-        // and eventually retiring the separate checkWafConnectivity call, is follow-up work.
+        // request. edgeOptimizeEnabled folds both signals together: routing alone isn't
+        // enough if the customer's own WAF is blocking us.
         // eslint-disable-next-line no-await-in-loop
         const { blocked, statusCode } = await classifyProbeResponse(response, targetHost, this.log);
         this.log.info(`[edge-optimize-status] WAF classification for ${targetUrl}: blocked=${blocked}, statusCode=${statusCode}`);
-        const edgeOptimizeEnabled = requestIdPresent;
+        const edgeOptimizeEnabled = requestIdPresent && !blocked;
 
         return {
           edgeOptimizeEnabled,

packages/spacecat-shared-tokowaka-client/test/index.test.js

@@ -5783,7 +5783,7 @@ describe('TokowakaClient', () => {
       });
     });
 
-    describe('WAF classification alongside routing check (logged/returned, not gating yet)', () => {
+    describe('WAF classification merged into routing check', () => {
       let site;
 
       beforeEach(() => {
@@ -5795,7 +5795,7 @@ describe('TokowakaClient', () => {
         };
       });
 
-      it('routing confirmed but hard-blocked (403) → edgeOptimizeEnabled stays true (raw routing signal), blocked: true reported separately', async () => {
+      it('routing confirmed but hard-blocked (403) → edgeOptimizeEnabled: false, blocked: true', async () => {
         const headersMap = new Map([
           ['x-tokowaka-request-id', 'abc123'],
         ]);
@@ -5809,13 +5809,13 @@ describe('TokowakaClient', () => {
         const result = await esmockClient.checkEdgeOptimizeStatus(site, '/');
 
         expect(result).to.deep.equal({
-          edgeOptimizeEnabled: true,
+          edgeOptimizeEnabled: false,
           blocked: true,
           statusCode: 403,
         });
       });
 
-      it('routing confirmed but soft-blocked (challenge page body) → edgeOptimizeEnabled stays true (raw routing signal), blocked: true reported separately', async () => {
+      it('routing confirmed but soft-blocked (challenge page body) → edgeOptimizeEnabled: false, blocked: true', async () => {
         const headersMap = new Map([
           ['x-tokowaka-request-id', 'abc123'],
           ['content-type', 'text/html'],
@@ -5831,7 +5831,7 @@ describe('TokowakaClient', () => {
         const result = await esmockClient.checkEdgeOptimizeStatus(site, '/');
 
         expect(result).to.deep.equal({
-          edgeOptimizeEnabled: true,
+          edgeOptimizeEnabled: false,
           blocked: true,
           statusCode: 200,
         });