From 579511051a930e7b998b3f6d5e65948f892fee14 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Tue, 19 May 2026 15:06:30 -0700 Subject: [PATCH 1/6] Revert "Don't await finalize" (#783) Reverts adobecom/unity#782 --- .../workflow-acrobat/upload-handler.js | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js index 638faaa9..ba04bef4 100644 --- a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js +++ b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js @@ -211,13 +211,46 @@ export default class UploadHandler { this.actionBinder.getAdditionalHeaders() || {}, { body: JSON.stringify(finalAssetData), signal }, ); - finalizeOpts.keepalive = true; - this.networkUtils.fetchFromServiceWithRetry( + const finalizeJson = await this.networkUtils.fetchFromServiceWithRetry( this.actionBinder.acrobatApiConfig.acrobatEndpoint.finalizeAsset, finalizeOpts, this.actionBinder.workflowCfg.targetCfg.fetchApiConfig.finalizeAsset, - ).catch(() => {}); - } catch (e) { /* fire-and-forget */ } + ); + if (!finalizeJson || Object.keys(finalizeJson).length !== 0) { + if (this.actionBinder.MULTI_FILE) { + await this.actionBinder.dispatchErrorToast('upload_error_finalize_asset', 500, `Unexpected response from finalize call: ${assetData.id}, ${JSON.stringify(finalizeJson || {})}`, false, true, { + code: 'upload_error_finalize_asset', + desc: `Unexpected response from finalize call: ${assetData.id}, ${JSON.stringify(finalizeJson || {})}`, + }); + return false; + } + await this.showSplashScreen(); + await this.actionBinder.dispatchErrorToast('upload_error_finalize_asset', 500, `Unexpected response from finalize call: ${assetData.id}, ${JSON.stringify(finalizeJson)}`, false, true, { + code: 'upload_error_finalize_asset', + desc: `Unexpected response from finalize call: ${assetData.id}, ${JSON.stringify(finalizeJson)}`, + }); + this.actionBinder.operations = []; + return false; + } + } catch (e) { + if (e.name === 'AbortError') return false; + if (this.actionBinder.MULTI_FILE) { + await this.actionBinder.dispatchErrorToast('upload_error_finalize_asset', e.status || 500, `Exception thrown when verifying content: ${e.message}, ${assetData.id}`, false, e.showError, { + code: 'upload_error_finalize_asset', + subCode: e.status, + desc: `Exception thrown when verifying content: ${e.message}, ${assetData.id}`, + }); + return false; + } + await this.showSplashScreen(); + await this.actionBinder.dispatchErrorToast('upload_error_finalize_asset', e.status || 500, `Exception thrown when verifying content: ${e.message}, ${assetData.id}`, false, e.showError, { + code: 'upload_error_finalize_asset', + subCode: e.status, + desc: `Exception thrown when verifying content: ${e.message}, ${assetData.id}`, + }); + this.actionBinder.operations = []; + return false; + } return true; } From fa96cabae3a699a804ddf51e2c24ce3e82e8835b Mon Sep 17 00:00:00 2001 From: Ruchika Sinha Date: Thu, 21 May 2026 21:29:56 -0700 Subject: [PATCH 2/6] conditional finalize await --- .../workflow/workflow-acrobat/target-config.json | 1 + .../workflow/workflow-acrobat/upload-handler.js | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/unitylibs/core/workflow/workflow-acrobat/target-config.json b/unitylibs/core/workflow/workflow-acrobat/target-config.json index ab7f56ad..dae8c8e3 100644 --- a/unitylibs/core/workflow/workflow-acrobat/target-config.json +++ b/unitylibs/core/workflow/workflow-acrobat/target-config.json @@ -14,6 +14,7 @@ }, "sendSplunkAnalytics": true, "verbsWithoutMfuToSfuFallback": ["compress-pdf"], + "fireAndForgetFinalize": ["word-to-pdf"], "nonpdfMfuFeedbackScreenTypeNonpdf": ["combine-pdf"], "nonpdfSfuProductScreen": ["word-to-pdf", "jpg-to-pdf", "ppt-to-pdf", "excel-to-pdf", "png-to-pdf", "createpdf", "chat-pdf", "chat-pdf-student", "summarize-pdf", "pdf-ai", "heic-to-pdf", "quiz-maker", "flashcard-maker", "mindmap-maker"], "mfuUploadAllowed": ["combine-pdf", "rotate-pages", "chat-pdf", "chat-pdf-student", "summarize-pdf", "pdf-ai", "quiz-maker", "flashcard-maker", "mindmap-maker"], diff --git a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js index ba04bef4..e41ca416 100644 --- a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js +++ b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js @@ -199,6 +199,9 @@ export default class UploadHandler { } async verifyContent(assetData, signal) { + const verb = this.actionBinder.workflowCfg.enabledFeatures[0]; + const fireAndForgetVerbs = this.actionBinder.workflowCfg.targetCfg.fireAndForgetFinalize || []; + const isFireAndForget = fireAndForgetVerbs.includes(verb); try { const finalAssetData = { surfaceId: unityConfig.surfaceId, @@ -211,6 +214,15 @@ export default class UploadHandler { this.actionBinder.getAdditionalHeaders() || {}, { body: JSON.stringify(finalAssetData), signal }, ); + if (isFireAndForget) { + finalizeOpts.keepalive = true; + this.networkUtils.fetchFromServiceWithRetry( + this.actionBinder.acrobatApiConfig.acrobatEndpoint.finalizeAsset, + finalizeOpts, + this.actionBinder.workflowCfg.targetCfg.fetchApiConfig.finalizeAsset, + ).catch(() => {}); + return true; + } const finalizeJson = await this.networkUtils.fetchFromServiceWithRetry( this.actionBinder.acrobatApiConfig.acrobatEndpoint.finalizeAsset, finalizeOpts, @@ -233,6 +245,7 @@ export default class UploadHandler { return false; } } catch (e) { + if (isFireAndForget) return true; if (e.name === 'AbortError') return false; if (this.actionBinder.MULTI_FILE) { await this.actionBinder.dispatchErrorToast('upload_error_finalize_asset', e.status || 500, `Exception thrown when verifying content: ${e.message}, ${assetData.id}`, false, e.showError, { From 87a9a9eb6ed4f5582cf75ee5239ab036c17e8076 Mon Sep 17 00:00:00 2001 From: Sanjay Saravanan Date: Fri, 22 May 2026 16:42:29 -0700 Subject: [PATCH 3/6] =?UTF-8?q?Direct=20upload=20for=20small=20files=20(wo?= =?UTF-8?q?rd-to-pdf,=20=E2=89=A41MB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For files at or under 1MB on the word-to-pdf verb, skip the createAsset → chunkPdf → finalize chain and instead POST the file directly as multipart to /asset/upload, then call /asset/connector. Reduces upload round-trips from 4 to 2 for small files. Also incorporates verb-finalize optimization: verifyContent is conditional fire-and-forget for verbs in fireAndForgetFinalize. Points stage environment at unity-dev for testing the new API. Co-Authored-By: Claude Sonnet 4.6 --- .../workflow-acrobat/action-binder.js | 2 + .../workflow-acrobat/target-config.json | 2 + .../workflow-acrobat/upload-handler.js | 73 +++++++++++++++++++ unitylibs/scripts/utils.js | 6 +- 4 files changed, 80 insertions(+), 3 deletions(-) diff --git a/unitylibs/core/workflow/workflow-acrobat/action-binder.js b/unitylibs/core/workflow/workflow-acrobat/action-binder.js index 2c50b7db..649a8d75 100644 --- a/unitylibs/core/workflow/workflow-acrobat/action-binder.js +++ b/unitylibs/core/workflow/workflow-acrobat/action-binder.js @@ -91,6 +91,7 @@ export default class ActionBinder { pre_upload_error_create_asset: -55, pre_upload_error_missing_verb_config: -56, pre_upload_error_transition_screen: -57, + pre_upload_error_direct_upload: -58, validation_error_validate_files: -100, validation_error_unsupported_type: -101, validation_error_empty_file: -102, @@ -234,6 +235,7 @@ export default class ActionBinder { createAsset: `${base}/asset`, finalizeAsset: `${base}/asset/finalize`, getMetadata: `${base}/asset/metadata`, + directUpload: `${base}/asset/upload`, }; unityConfig.connectorApiEndPoint = `${base}/asset/connector`; return unityConfig; diff --git a/unitylibs/core/workflow/workflow-acrobat/target-config.json b/unitylibs/core/workflow/workflow-acrobat/target-config.json index dae8c8e3..c6803787 100644 --- a/unitylibs/core/workflow/workflow-acrobat/target-config.json +++ b/unitylibs/core/workflow/workflow-acrobat/target-config.json @@ -15,6 +15,8 @@ "sendSplunkAnalytics": true, "verbsWithoutMfuToSfuFallback": ["compress-pdf"], "fireAndForgetFinalize": ["word-to-pdf"], + "directUploadVerbs": ["word-to-pdf"], + "directUploadMaxSize": 1048576, "nonpdfMfuFeedbackScreenTypeNonpdf": ["combine-pdf"], "nonpdfSfuProductScreen": ["word-to-pdf", "jpg-to-pdf", "ppt-to-pdf", "excel-to-pdf", "png-to-pdf", "createpdf", "chat-pdf", "chat-pdf-student", "summarize-pdf", "pdf-ai", "heic-to-pdf", "quiz-maker", "flashcard-maker", "mindmap-maker"], "mfuUploadAllowed": ["combine-pdf", "rotate-pages", "chat-pdf", "chat-pdf-student", "summarize-pdf", "pdf-ai", "quiz-maker", "flashcard-maker", "mindmap-maker"], diff --git a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js index e41ca416..b7fad8cb 100644 --- a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js +++ b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js @@ -19,6 +19,74 @@ export default class UploadHandler { return feature === 'pdf-ai' ? 'chat-pdf-pdf-ai' : feature; } + isDirectUpload(file) { + const verb = this.actionBinder.workflowCfg.enabledFeatures[0]; + const directUploadVerbs = this.actionBinder.workflowCfg.targetCfg.directUploadVerbs || []; + const directUploadMaxSize = this.actionBinder.workflowCfg.targetCfg.directUploadMaxSize || 0; + return directUploadVerbs.includes(verb) && file.size <= directUploadMaxSize; + } + + async directUploadAsset(file, signal, workflowId = null) { + const formData = new FormData(); + formData.append('surfaceId', unityConfig.surfaceId); + formData.append('targetProduct', this.actionBinder.workflowCfg.productName); + formData.append('name', file.name); + formData.append('size', file.size); + formData.append('format', 'application/pdf'); + formData.append('file', file); + if (workflowId) formData.append('workflowId', workflowId); + const opts = await getApiCallOptions( + 'POST', + unityConfig.apiKey, + this.actionBinder.getAdditionalHeaders() || {}, + { body: formData, signal }, + ); + delete opts.headers['Content-Type']; + const { response, attempt } = await this.networkUtils.fetchFromServiceWithRetry( + this.actionBinder.acrobatApiConfig.acrobatEndpoint.directUpload, + opts, + this.actionBinder.workflowCfg.targetCfg.fetchApiConfig.default, + ); + return { ...response, attempt }; + } + + async directUploadSingleFile(file, fileData, isPdf = true) { + const abortSignal = this.actionBinder.getAbortSignal(); + let assetData; + try { + assetData = await this.directUploadAsset(file, abortSignal); + } catch (error) { + this.initSplashScreen(); + await this.transitionScreen.showSplashScreen(); + this.handleUploadError(error, 'pre_upload_error_direct_upload'); + return false; + } + fileData.assetId = assetData.id; + this.actionBinder.setAssetId(assetData.id); + const effectiveFileType = await this.getEffectiveFileType(file); + const cOpts = { + assetId: assetData.id, + targetProduct: this.actionBinder.workflowCfg.productName, + payload: { + languageRegion: this.actionBinder.workflowCfg.langRegion, + languageCode: this.actionBinder.workflowCfg.langCode, + verb: this.getVerbForFeature(), + assetMetadata: { [assetData.id]: { name: file.name, size: file.size, type: effectiveFileType } }, + ...(!isPdf ? { feedback: 'nonpdf' } : {}), + }, + }; + const redirectSuccess = await this.actionBinder.handleRedirect(cOpts, fileData); + if (!redirectSuccess) return false; + + this.actionBinder.uploadTimestamp = Date.now(); + this.actionBinder.dispatchAnalyticsEvent('uploaded', { + ...fileData, + assetId: assetData.id, + maxRetryCount: assetData.attempt || 0, + }); + return true; + } + async getEffectiveFileType(file) { const { getExtension } = await import('../../../utils/FileUtils.js'); const isHeicWithoutMimeType = this.actionBinder.workflowCfg.enabledFeatures[0] === 'heic-to-pdf' @@ -351,6 +419,11 @@ export default class UploadHandler { } async uploadSingleFile(file, fileData, isPdf = true) { + if (this.isDirectUpload(file)) { + const success = await this.directUploadSingleFile(file, fileData, isPdf); + if (success) return; + } + const { maxConcurrentChunks } = this.getConcurrentLimits(); const abortSignal = this.actionBinder.getAbortSignal(); let cOpts = {}; diff --git a/unitylibs/scripts/utils.js b/unitylibs/scripts/utils.js index 8e573d33..551a21fd 100644 --- a/unitylibs/scripts/utils.js +++ b/unitylibs/scripts/utils.js @@ -312,9 +312,9 @@ export const unityConfig = (() => { ...commoncfg, }, stage: { - apiEndPoint: 'https://unity-stage.adobe.io/api/v1', - connectorApiEndPoint: 'https://unity-stage.adobe.io/api/v1/asset/connector', - pageConfigEndPoint: 'https://cdn-unity.stage.adobe.com/api/v1/pageConfig', + apiEndPoint: 'https://unity-dev.adobe.io/api/v1', + connectorApiEndPoint: 'https://unity-dev.adobe.io/api/v1/asset/connector', + pageConfigEndPoint: 'https://cdn-unity.dev.adobe.com/api/v1/pageConfig', env: 'stage', ...commoncfg, }, From f82cd58cc20117b430c32b847b58032b48d71c32 Mon Sep 17 00:00:00 2001 From: Sanjay Saravanan Date: Fri, 22 May 2026 17:02:02 -0700 Subject: [PATCH 4/6] Fix: directUploadSingleFile stuck on transition screen at 95% continueInApp() guards on operations.length before navigating; directUploadSingleFile never pushed to operations so the guard always failed and window.location.href was never set. Also adds 'uploading' analytics event and setIsUploading(true) to match the standard upload flow sequence. Co-Authored-By: Claude Sonnet 4.6 --- unitylibs/core/workflow/workflow-acrobat/upload-handler.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js index b7fad8cb..2a1462c9 100644 --- a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js +++ b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js @@ -52,6 +52,8 @@ export default class UploadHandler { async directUploadSingleFile(file, fileData, isPdf = true) { const abortSignal = this.actionBinder.getAbortSignal(); + this.actionBinder.dispatchAnalyticsEvent('uploading', fileData); + this.actionBinder.setIsUploading(true); let assetData; try { assetData = await this.directUploadAsset(file, abortSignal); @@ -78,6 +80,7 @@ export default class UploadHandler { const redirectSuccess = await this.actionBinder.handleRedirect(cOpts, fileData); if (!redirectSuccess) return false; + this.actionBinder.operations.push(assetData.id); this.actionBinder.uploadTimestamp = Date.now(); this.actionBinder.dispatchAnalyticsEvent('uploaded', { ...fileData, From 16c69606b22b43bbbf0a0688d691fc3f76b99580 Mon Sep 17 00:00:00 2001 From: Arushi Gupta Date: Mon, 25 May 2026 18:25:20 +0530 Subject: [PATCH 5/6] no polling + direct upload --- .../workflow-acrobat/target-config.json | 2 +- .../workflow-acrobat/upload-handler.js | 29 ++++++++++--------- unitylibs/utils/NetworkUtils.js | 10 ++++++- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/unitylibs/core/workflow/workflow-acrobat/target-config.json b/unitylibs/core/workflow/workflow-acrobat/target-config.json index c6803787..13d07591 100644 --- a/unitylibs/core/workflow/workflow-acrobat/target-config.json +++ b/unitylibs/core/workflow/workflow-acrobat/target-config.json @@ -14,7 +14,7 @@ }, "sendSplunkAnalytics": true, "verbsWithoutMfuToSfuFallback": ["compress-pdf"], - "fireAndForgetFinalize": ["word-to-pdf"], + "awaitFinalizeVerbs": ["word-to-pdf"], "directUploadVerbs": ["word-to-pdf"], "directUploadMaxSize": 1048576, "nonpdfMfuFeedbackScreenTypeNonpdf": ["combine-pdf"], diff --git a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js index 2a1462c9..3f2fbf2c 100644 --- a/unitylibs/core/workflow/workflow-acrobat/upload-handler.js +++ b/unitylibs/core/workflow/workflow-acrobat/upload-handler.js @@ -269,10 +269,22 @@ export default class UploadHandler { return { failedFiles, attemptMap }; } + isAwaitFinalizeVerb(verb) { + const awaitFinalizeVerbs = this.actionBinder.workflowCfg.targetCfg.awaitFinalizeVerbs || []; + return awaitFinalizeVerbs.includes(verb); + } + + getFinalizeRetryConfig(verb) { + const baseConfig = this.actionBinder.workflowCfg.targetCfg.fetchApiConfig.finalizeAsset; + if (this.isAwaitFinalizeVerb(verb)) { + return { ...baseConfig, retryOn202: false }; + } + return baseConfig; + } + async verifyContent(assetData, signal) { const verb = this.actionBinder.workflowCfg.enabledFeatures[0]; - const fireAndForgetVerbs = this.actionBinder.workflowCfg.targetCfg.fireAndForgetFinalize || []; - const isFireAndForget = fireAndForgetVerbs.includes(verb); + const finalizeRetryConfig = this.getFinalizeRetryConfig(verb); try { const finalAssetData = { surfaceId: unityConfig.surfaceId, @@ -285,19 +297,11 @@ export default class UploadHandler { this.actionBinder.getAdditionalHeaders() || {}, { body: JSON.stringify(finalAssetData), signal }, ); - if (isFireAndForget) { - finalizeOpts.keepalive = true; - this.networkUtils.fetchFromServiceWithRetry( - this.actionBinder.acrobatApiConfig.acrobatEndpoint.finalizeAsset, - finalizeOpts, - this.actionBinder.workflowCfg.targetCfg.fetchApiConfig.finalizeAsset, - ).catch(() => {}); - return true; - } const finalizeJson = await this.networkUtils.fetchFromServiceWithRetry( this.actionBinder.acrobatApiConfig.acrobatEndpoint.finalizeAsset, finalizeOpts, - this.actionBinder.workflowCfg.targetCfg.fetchApiConfig.finalizeAsset, + finalizeRetryConfig, + (responseJson) => responseJson, ); if (!finalizeJson || Object.keys(finalizeJson).length !== 0) { if (this.actionBinder.MULTI_FILE) { @@ -316,7 +320,6 @@ export default class UploadHandler { return false; } } catch (e) { - if (isFireAndForget) return true; if (e.name === 'AbortError') return false; if (this.actionBinder.MULTI_FILE) { await this.actionBinder.dispatchErrorToast('upload_error_finalize_asset', e.status || 500, `Exception thrown when verifying content: ${e.message}, ${assetData.id}`, false, e.showError, { diff --git a/unitylibs/utils/NetworkUtils.js b/unitylibs/utils/NetworkUtils.js index 555628b9..20f7dff1 100644 --- a/unitylibs/utils/NetworkUtils.js +++ b/unitylibs/utils/NetworkUtils.js @@ -122,6 +122,14 @@ export default class NetworkUtils { } } + shouldRetryPollingRequest(status, retryConfig, customRetryCheckResult) { + if (customRetryCheckResult) return true; + if (status >= 500 && status < 600) return true; + if (status === 429) return true; + if (status === 202 && retryConfig.retryOn202 !== false) return true; + return false; + } + async fetchFromServiceWithServerPollingRetry(url, options, retryConfig, onSuccess, onError) { const maxRetryDelay = retryConfig.retryParams?.maxRetryDelay || 300000; let timeLapsed = 0; @@ -133,7 +141,7 @@ export default class NetworkUtils { const { status, headers } = response; const responseJson = await this.getResponseJson(response); const customRetryCheckResult = retryConfig.extraRetryCheck && await retryConfig.extraRetryCheck(status, responseJson); - if (customRetryCheckResult || status === 202 || (status >= 500 && status < 600) || status === 429) { + if (this.shouldRetryPollingRequest(status, retryConfig, customRetryCheckResult)) { const retryDelay = (parseInt(headers.get('retry-after'), 10) * 1000) || retryConfig.retryParams?.defaultRetryDelay || 5000; await new Promise((resolve) => { setTimeout(resolve, retryDelay); }); timeLapsed += retryDelay; From bb40c53ee9bc38984e9909c05f39234f18bf5918 Mon Sep 17 00:00:00 2001 From: Arushi Gupta Date: Tue, 26 May 2026 12:43:46 +0530 Subject: [PATCH 6/6] Removed redirection to dev endpoint --- unitylibs/scripts/utils.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unitylibs/scripts/utils.js b/unitylibs/scripts/utils.js index 551a21fd..8e573d33 100644 --- a/unitylibs/scripts/utils.js +++ b/unitylibs/scripts/utils.js @@ -312,9 +312,9 @@ export const unityConfig = (() => { ...commoncfg, }, stage: { - apiEndPoint: 'https://unity-dev.adobe.io/api/v1', - connectorApiEndPoint: 'https://unity-dev.adobe.io/api/v1/asset/connector', - pageConfigEndPoint: 'https://cdn-unity.dev.adobe.com/api/v1/pageConfig', + apiEndPoint: 'https://unity-stage.adobe.io/api/v1', + connectorApiEndPoint: 'https://unity-stage.adobe.io/api/v1/asset/connector', + pageConfigEndPoint: 'https://cdn-unity.stage.adobe.com/api/v1/pageConfig', env: 'stage', ...commoncfg, },