carriera-intern 1.1.119 → 1.1.121

package/fesm2022/carriera-intern.mjs

@@ -177,7 +177,7 @@ const INPUT_CHARACTER_SETS = {
 
 const PDFJS_ASSET_BASE = new InjectionToken('PDFJS_ASSET_BASE', {
     providedIn: 'root',
-    factory: () => '/pdfjs/',
+    factory: () => '/assets/pdfjs/',
 });
 
 class DocumentThumbnailHelper {
@@ -4646,7 +4646,8 @@ class DocumentService {
     workerPool = [];
     workerPoolSize = Math.max(1, Math.min((navigator.hardwareConcurrency || 2) - 1, 3));
     workerCursor = 0;
-    isWorkerSrcConfigured = false;
+    workerSrcReady = null;
+    workerSrcBlobUrl = null;
     constructor() {
         this.destroyRef.onDestroy(() => this.destroyWorkers());
     }
@@ -4700,6 +4701,7 @@ class DocumentService {
      */
     async analyzePdf(file) {
         const data = new Uint8Array(await file.arrayBuffer());
+        await this.ensureWorkerSrc();
         const loadingTask = pdfjsLib.getDocument({
             data,
             worker: this.getWorker(),
@@ -4719,10 +4721,6 @@ class DocumentService {
         }
     }
     getWorker() {
-        if (!this.isWorkerSrcConfigured) {
-            pdfjsLib.GlobalWorkerOptions.workerSrc = `${this.assetBase}pdf.worker.min.mjs`;
-            this.isWorkerSrcConfigured = true;
-        }
         const index = this.workerCursor++ % this.workerPoolSize;
         if (!this.workerPool[index] || this.workerPool[index].destroyed) {
             this.workerPool[index] = pdfjsLib.PDFWorker.create({
@@ -4731,6 +4729,36 @@ class DocumentService {
         }
         return this.workerPool[index];
     }
+    ensureWorkerSrc() {
+        this.workerSrcReady ??= this.configureWorkerSrc();
+        return this.workerSrcReady;
+    }
+    async configureWorkerSrc() {
+        const remoteWorkerUrl = `${this.assetBase}pdf.worker.min.mjs`;
+        pdfjsLib.GlobalWorkerOptions.workerSrc =
+            await this.workerSrcAsJavascriptModule(remoteWorkerUrl);
+    }
+    async workerSrcAsJavascriptModule(url) {
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error(`Failed to load PDF worker (${response.status})`);
+        }
+        const source = await response.text();
+        if (!this.isPdfWorkerSource(source)) {
+            throw new Error(`PDF worker at ${url} was not JavaScript`);
+        }
+        const javascriptBlob = new Blob([source], {
+            type: 'application/javascript',
+        });
+        this.workerSrcBlobUrl = URL.createObjectURL(javascriptBlob);
+        return this.workerSrcBlobUrl;
+    }
+    isPdfWorkerSource(source) {
+        const start = source.trimStart().slice(0, 80);
+        return (start.startsWith('/*') ||
+            start.startsWith('import ') ||
+            start.startsWith('('));
+    }
     destroyWorkers() {
         for (const worker of this.workerPool) {
             if (!worker.destroyed) {
@@ -4738,6 +4766,11 @@ class DocumentService {
             }
         }
         this.workerPool.length = 0;
+        if (this.workerSrcBlobUrl) {
+            URL.revokeObjectURL(this.workerSrcBlobUrl);
+            this.workerSrcBlobUrl = null;
+        }
+        this.workerSrcReady = null;
     }
     async cleanupQuietly(teardown) {
         try {
@@ -4959,6 +4992,28 @@ class DropZoneDocumentsHelper {
             reader.readAsDataURL(file);
         });
     }
+    static mapFileResponseToAppFile(fileResponse, extras) {
+        const fileName = fileResponse.fileName ?? '';
+        const fileExtension = fileName.split('.').pop()?.toLowerCase() || '';
+        const serverFileId = fileResponse.fileId;
+        return {
+            fileName,
+            baseName: fileName.split('.').slice(0, -1).join('.') || '',
+            fileId: serverFileId,
+            uid: serverFileId != null ? String(serverFileId) : crypto.randomUUID(),
+            type: fileExtension,
+            size: fileResponse.fileSize || 0,
+            url: fileResponse.url || '',
+            imagePreviewUrl: fileResponse.thumbnailUrl ?? '',
+            file: fileResponse.file ?? null,
+            pageCount: fileResponse.pageCount ?? undefined,
+            tags: extras.tags,
+            tagChanged: false,
+            fileNameChanged: false,
+            categoryTag: extras.categoryTag,
+            base64Url: null,
+        };
+    }
     static async resolveFile(fileResponse) {
         return (fileResponse.file ??
             (await DropZoneDocumentsHelper.fetchFileAsFile(fileResponse)));
@@ -5226,7 +5281,7 @@ class DropZoneComponent {
     // Variables
     docsRatios = new Map();
     categoryTag = null;
-    clientFileId = 0;
+    nextClientFileId = -1;
     lastFilesSignature = null;
     // Computed Signals
     cropDimensions = computed(() => {
@@ -5283,7 +5338,8 @@ class DropZoneComponent {
             const width = this.drawerViewportWidth();
             const fitted = width <= 0
                 ? 1
-                : Math.max(1, Math.floor((width + DROP_ZONE_CARD_SLIDER.GAP_PX) / DROP_ZONE_CARD_SLIDER_ITEM_WITH_GAP_PX));
+                : Math.max(1, Math.floor((width + DROP_ZONE_CARD_SLIDER.GAP_PX) /
+                    DROP_ZONE_CARD_SLIDER_ITEM_WITH_GAP_PX));
             return this.isCardSlider()
                 ? Math.min(fitted, DROP_ZONE_CARD_SLIDER.MAX_VISIBLE_COUNT)
                 : fitted;
@@ -5469,47 +5525,21 @@ class DropZoneComponent {
             return;
         }
         this.skeletonCount.set(currentFiles.length);
-        const newlyProcessed = await DropZoneConcurrencyHelper.mapWithConcurrency(currentFiles, FILE_PROCESSING_CONCURRENCY, async (fileResp) => {
+        const mappedFiles = await DropZoneConcurrencyHelper.mapWithConcurrency(currentFiles, FILE_PROCESSING_CONCURRENCY, async (fileResp) => {
             if (fileResp.imagePreviewUrl)
                 return fileResp;
-            const fileExtension = fileResp.fileName?.split('.').pop()?.toLowerCase() || 'pdf';
-            let previewUrl = fileResp?.url || '';
-            let pageCount;
-            const file = await DropZoneDocumentsHelper.resolveFile(fileResp);
-            const supportedBase64 = this.isImagePreviewVariant();
-            const base64Url = supportedBase64 && file
-                ? await DropZoneDocumentsHelper.fileToBase64(file)
-                : null;
-            if (file) {
-                const { thumbnailUrl, pageCount: pages } = await this.documentService.generateThumbnail(file);
-                previewUrl = DropZonePreviewUrlsHelper.track(this.previewUrlsState, thumbnailUrl);
-                pageCount = pages;
-            }
-            const serverFileId = fileResp.fileId || 0;
-            return {
-                fileName: fileResp.fileName || '',
-                baseName: fileResp.fileName?.split('.').slice(0, -1).join('.') || '',
-                fileId: serverFileId,
-                uid: serverFileId ? String(serverFileId) : crypto.randomUUID(),
-                type: fileExtension,
-                size: fileResp.fileSize || 0,
-                url: fileResp.url || '',
-                imagePreviewUrl: previewUrl,
-                file: file,
-                pageCount: pageCount,
-                tags: this.getTagIds(fileResp.tags || [], fileResp.tagGeneratedByUser ?? false),
-                tagChanged: false,
-                fileNameChanged: false,
+            const serverFile = fileResp;
+            const appFile = DropZoneDocumentsHelper.mapFileResponseToAppFile(serverFile, {
+                tags: this.getTagIds(serverFile.tags || [], serverFile.tagGeneratedByUser ?? false),
                 categoryTag: this.categoryTag,
-                base64Url,
-            };
+            });
+            if (appFile.imagePreviewUrl)
+                return appFile;
+            return this.hydrateMissingPreview(appFile, serverFile);
         });
-        const validNewFiles = newlyProcessed.filter(Boolean) || [];
-        if (validNewFiles.length > 0) {
-            this.releaseUnusedPreviewUrls(validNewFiles);
-            this.docs.set(validNewFiles);
-            this.setImagePreviewUrl(validNewFiles[0]?.imagePreviewUrl || '');
-        }
+        this.releaseUnusedPreviewUrls(mappedFiles);
+        this.docs.set(mappedFiles);
+        this.setImagePreviewUrl(mappedFiles[0]?.imagePreviewUrl || '');
         if (this.crop()) {
             this.submitCrop(true);
         }
@@ -5521,6 +5551,21 @@ class DropZoneComponent {
             ]);
         }
     }
+    async hydrateMissingPreview(appFile, serverFile) {
+        const file = await DropZoneDocumentsHelper.resolveFile(serverFile);
+        if (!file)
+            return appFile;
+        const { thumbnailUrl, pageCount } = await this.documentService.generateThumbnail(file);
+        return {
+            ...appFile,
+            file,
+            imagePreviewUrl: DropZonePreviewUrlsHelper.track(this.previewUrlsState, thumbnailUrl),
+            pageCount: appFile.pageCount ?? pageCount,
+            base64Url: this.isImagePreviewVariant()
+                ? await DropZoneDocumentsHelper.fileToBase64(file)
+                : appFile.base64Url,
+        };
+    }
     updateRangeBackground(input) {
         if (!input)
             return;
@@ -5652,7 +5697,7 @@ class DropZoneComponent {
             return;
         }
         const processedFiles = await DropZoneConcurrencyHelper.mapWithConcurrency(toProcess, FILE_PROCESSING_CONCURRENCY, async (file) => {
-            const fileId = this.clientFileId++;
+            const fileId = this.nextClientFileId--;
             const fileExtension = file.name.split('.').pop()?.toLowerCase() || '';
             let pageCount;
             const supportedBase64 = this.isImagePreviewVariant();