@wix/ditto-codegen-public 1.0.454 → 1.0.455

package/dist/out.js

@@ -11049,7 +11049,7 @@ var require_CodeGenService = __commonJS({
   "dist/services/CodeGenService.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.CodeGenService = exports2.FETCH_TIMEOUT_MS = exports2.REQUEST_TIMEOUT_MS = exports2.JobsSortOrder = exports2.TaskKind = exports2.Status = void 0;
+    exports2.CodeGenService = exports2.AUTH_REFRESH_COOLDOWN_MS = exports2.FETCH_TIMEOUT_MS = exports2.REQUEST_TIMEOUT_MS = exports2.JobsSortOrder = exports2.TaskKind = exports2.Status = void 0;
     exports2.createCodeGenErrorHandler = createCodeGenErrorHandler;
     var http_client_1 = require_index_node();
     var http_1 = require_http_impl();
@@ -11141,6 +11141,8 @@ var require_CodeGenService = __commonJS({
     }
     exports2.REQUEST_TIMEOUT_MS = 12e4;
     exports2.FETCH_TIMEOUT_MS = 3e4;
+    var AUTH_FAILURE_STATUSES = /* @__PURE__ */ new Set([401, 403]);
+    exports2.AUTH_REFRESH_COOLDOWN_MS = 6e4;
     function isNotFound(error) {
       return http_client_1.HttpClient.isHttpError(error) && error.response?.status === 404;
     }
@@ -11151,21 +11153,25 @@ var require_CodeGenService = __commonJS({
       constructor(projectId, httpClient) {
         this.projectId = projectId;
         this.accessToken = process.env.WIX_ACCESS_TOKEN;
+        this.lastAuthRefreshAt = 0;
+        this.isAuthRefreshFailing = false;
         this.sandboxId = process.env.SANDBOX_ID;
         this.refreshAccessToken = async () => {
-          const token = await (0, wixTokenRefresh_1.refreshWixAccessToken)();
-          this.setAccessToken(token);
-          return token;
+          if (!this.inFlightRefresh) {
+            this.inFlightRefresh = this.mintAccessToken();
+          }
+          return this.inFlightRefresh;
         };
         this.request = async (req, timeout) => {
           const build = () => this.withTimeout(this.withAuth(req), timeout);
+          const attemptedToken = this.accessToken;
           try {
             return await this.httpClient.request(build());
           } catch (err) {
-            if (!this.isUnauthorized(err))
+            if (!this.isAuthFailure(err))
+              throw err;
+            if (!await this.prepareAuthRetry(attemptedToken))
               throw err;
-            logger_12.logger.warn("[CodeGenService] 401 received, refreshing token and retrying once");
-            await this.refreshAccessToken();
             return await this.httpClient.request(build());
           }
         };
@@ -11379,13 +11385,49 @@ var require_CodeGenService = __commonJS({
       }
       setAccessToken(token) {
         this.accessToken = token;
+        this.onAccessTokenChanged?.(token);
+      }
+      /** Inverted wiring: `opencode-integration/config` imports this module. */
+      setAccessTokenListener(listener) {
+        this.onAccessTokenChanged = listener;
+      }
+      async mintAccessToken() {
+        this.lastAuthRefreshAt = Date.now();
+        try {
+          const token = await (0, wixTokenRefresh_1.refreshWixAccessToken)();
+          this.isAuthRefreshFailing = false;
+          this.setAccessToken(token);
+          return token;
+        } catch (err) {
+          this.isAuthRefreshFailing = true;
+          throw err;
+        } finally {
+          this.inFlightRefresh = void 0;
+        }
       }
-      isUnauthorized(error) {
+      isAuthFailure(error) {
         if (!http_client_1.HttpClient.isHttpError(error))
           return false;
         if (this.httpClient.isCancel(error))
           return false;
-        return error.response?.status === 401;
+        const status = error.response?.status;
+        return status !== void 0 && AUTH_FAILURE_STATUSES.has(status);
+      }
+      async prepareAuthRetry(attemptedToken) {
+        if (this.accessToken !== attemptedToken)
+          return true;
+        if (this.inFlightRefresh) {
+          await this.inFlightRefresh;
+          return true;
+        }
+        const tokenAgeMs = Date.now() - this.lastAuthRefreshAt;
+        if (tokenAgeMs < exports2.AUTH_REFRESH_COOLDOWN_MS) {
+          logger_12.logger.warn(this.isAuthRefreshFailing ? "[CodeGenService] auth failure while token refresh is failing, not retrying" : "[CodeGenService] auth failure on a freshly refreshed token, not retrying", { tokenAgeMs });
+          return false;
+        }
+        logger_12.logger.info("[CodeGenService] auth failure received, refreshing token and retrying once", { tokenAgeMs });
+        await this.refreshAccessToken();
+        return true;
       }
       withAuth(req) {
         return mapRequest(req, (r) => ({
@@ -24676,8 +24718,7 @@ var runPendingJob = async (job, logPrefix) => {
   }
   const jobId = job.id;
   logger_1.logger.info(`${logPrefix} Selected job`, { jobId });
-  const freshToken = await codeGenerationService_1.codeGenerationService.refreshAccessToken();
-  (0, config_1.setCurrentAccessToken)(freshToken);
+  await codeGenerationService_1.codeGenerationService.refreshAccessToken();
   await codeGenerationService_1.codeGenerationService.markJobAsRuninng(jobId);
   await processJob(job);
   await codeGenerationService_1.codeGenerationService.markJobAsCompleted(jobId);
@@ -24741,6 +24782,7 @@ async function main(ctx) {
     codeIdentifier: ctx.codeIdentifier,
     metasiteId: ctx.metasiteId
   });
+  codeGenerationService_1.codeGenerationService.setAccessTokenListener(config_1.setCurrentAccessToken);
   await initOpenCode();
   const nudgeListenerServer = new nudge_listener_server_1.NudgeListenerServer({
     fetchPendingJobs: () => codeGenerationService_1.codeGenerationService.fetchPendingJobs(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.454",
+  "version": "1.0.455",
   "description": "AI-powered Wix CLI app generator - standalone executable",
   "scripts": {
     "build": "node build.mjs",
@@ -29,5 +29,5 @@
     "esbuild": "^0.27.2",
     "vitest": "^4.0.16"
   },
-  "falconPackageHash": "00be7bc54d1f2483b05b7e95eb088652073949d7346708269bf89b49"
+  "falconPackageHash": "a0edc9a2e794342c1e253db70cf53c1ae6cd0ee627c755489f57a591"
 }