@meshmakers/octo-services 3.4.1170 → 3.4.1200

package/fesm2022/meshmakers-octo-services.mjs

@@ -4676,18 +4676,49 @@ class TusUploadService {
     httpClient = inject(HttpClient);
     configurationService = inject(CONFIGURATION_SERVICE);
     authorizeService = inject(AuthorizeService);
+    /**
+     * Delays between retries of a restore-job start that answered 403 (AB#5227). The bot service's
+     * tenant gate authorizes a parent administrator against an EXISTING child tenant, and its
+     * hierarchy answer is cached for up to 60 seconds — so a restore right after (re-)creating the
+     * tenant can be refused although the tenant is there. The ladder spans ~75s, one TTL plus slack.
+     * A genuine permission denial still fails, after the ladder, with the server's own reason.
+     * Overridable so specs don't wait.
+     */
+    restoreForbiddenRetryDelaysMs = [5_000, 10_000, 15_000, 20_000, 25_000];
     async startUpload(options) {
         const botServicesUrl = this.configurationService.config?.botServices;
         if (!botServicesUrl) {
             throw new Error('Bot services URL not configured');
         }
         const tusFileId = await this.performTusUpload(botServicesUrl, options);
-        const jobResponse = await this.startRestoreJob(botServicesUrl, tusFileId, options);
+        const jobResponse = await this.startRestoreJobWithForbiddenRetry(botServicesUrl, tusFileId, options);
         if (!jobResponse?.jobId) {
             throw new Error('Failed to start restore job');
         }
         return { jobId: jobResponse.jobId };
     }
+    /**
+     * Starts the restore job, retrying a 403 across the tenant-hierarchy cache TTL (see
+     * {@link restoreForbiddenRetryDelaysMs}). Only the job start is retried — the uploaded artifact
+     * is already staged, so no bytes are re-transferred. Every other error propagates immediately.
+     */
+    async startRestoreJobWithForbiddenRetry(botServicesUrl, tusFileId, options) {
+        for (let attempt = 0;; attempt++) {
+            try {
+                return await this.startRestoreJob(botServicesUrl, tusFileId, options);
+            }
+            catch (error) {
+                const isForbidden = error instanceof HttpErrorResponse && error.status === 403;
+                if (!isForbidden || attempt >= this.restoreForbiddenRetryDelaysMs.length) {
+                    throw error;
+                }
+                const delayMs = this.restoreForbiddenRetryDelaysMs[attempt];
+                options.onStatus?.(`Waiting for tenant authorization to propagate (retry ${attempt + 1} of ` +
+                    `${this.restoreForbiddenRetryDelaysMs.length} in ${Math.round(delayMs / 1000)}s)...`);
+                await new Promise(resolve => setTimeout(resolve, delayMs));
+            }
+        }
+    }
     performTusUpload(botServicesUrl, options) {
         return new Promise((resolve, reject) => {
             const metadata = {