@emailmaker/filemanager 0.10.88 → 0.10.89

package/file-manager.esm.js

@@ -1,2 +1,2 @@
-export{D as FileContent,J as FileManagerApiError,C as FileManagerApp,x as FileManagerAppWithContext,E as FileModals,G as FolderSidebar,P as PixieOnlyApp,B as default,v as init,A as initFileManager,y as initPixieEditor,H as installResizeObserverErrorHandler,K as mapHttpStatusToErrorCode,I as uninstallResizeObserverErrorHandler,w as unmount,z as unmountPixieEditor}from"./file-manager-index-DL8wzCQG.js";import"react/jsx-runtime";import"react";import"react-dom/client";import"antd";import"antd/es/alert/ErrorBoundary";import"@ant-design/icons";import"react-dom";
+export{D as FileContent,J as FileManagerApiError,C as FileManagerApp,x as FileManagerAppWithContext,E as FileModals,G as FolderSidebar,P as PixieOnlyApp,B as default,L as fetchRemoteImageBlobByUrl,v as init,A as initFileManager,y as initPixieEditor,H as installResizeObserverErrorHandler,K as mapHttpStatusToErrorCode,I as uninstallResizeObserverErrorHandler,w as unmount,z as unmountPixieEditor}from"./file-manager-index-D14X20BS.js";import"react/jsx-runtime";import"react";import"react-dom/client";import"antd";import"antd/es/alert/ErrorBoundary";import"@ant-design/icons";import"react-dom";
 //# sourceMappingURL=file-manager.esm.js.map

package/file-manager.js

@@ -27116,6 +27116,110 @@ if (true) {
 "use strict";
 module.exports = __WEBPACK_EXTERNAL_MODULE__5442__;
 
+/***/ }),
+
+/***/ 5597:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  n: () => (/* binding */ fetchRemoteImageBlobByUrl)
+});
+
+// EXTERNAL MODULE: ./src/shared/fileManagerApiError.ts
+var fileManagerApiError = __webpack_require__(7036);
+;// ./src/utils/directResourceFetchError.ts
+/**
+ * Detects a final direct-fetch failure from the host resource proxy engine.
+ * Uses error.name for cross-package compatibility (no instanceof across bundles).
+ */
+function isFinalDirectResourceFetchError(error) {
+    if (typeof error !== 'object' || error === null) {
+        return false;
+    }
+    if ('name' in error && error.name === 'DirectResourceFetchError') {
+        return !('final' in error) || error.final !== false;
+    }
+    return 'final' in error && error.final === true;
+}
+
+;// ./src/utils/remoteFileFetchPipeline.ts
+
+
+function rethrowNonRetryablePipelineError(error) {
+    if (isFinalDirectResourceFetchError(error) || error instanceof fileManagerApiError/* FileManagerApiError */.m) {
+        throw error;
+    }
+}
+/**
+ * ADR-aligned blob fetch ladder for upload-by-URL:
+ * 1. handleFileProxy (plugin Blob)
+ * 2. handleProxyUrl → fetch rewritten URL (outside engine)
+ * 3. fetchWithProxy (host engine / policy v2)
+ * 4. direct fetch — only without `fetchWithProxy` (engine already includes direct fallback in its chain)
+ */
+async function fetchRemoteImageBlobByUrl(normalizedUrl, handlers, fetchBlobFromUrl, validateImageBlob, options) {
+    const { fetchWithProxy, handleFileProxy, handleProxyUrl } = handlers;
+    const fetchInit = Object.assign({ mode: 'cors' }, options === null || options === void 0 ? void 0 : options.fetchInit);
+    let lastError;
+    if (handleFileProxy) {
+        try {
+            const proxiedBlob = await Promise.resolve(handleFileProxy(normalizedUrl));
+            if (proxiedBlob) {
+                return validateImageBlob(proxiedBlob);
+            }
+        }
+        catch (error) {
+            rethrowNonRetryablePipelineError(error);
+            lastError = error;
+            console.warn('handleFileProxy failed, falling back to next strategy', error);
+        }
+    }
+    if (handleProxyUrl) {
+        try {
+            const proxiedUrl = await Promise.resolve(handleProxyUrl(normalizedUrl));
+            if (proxiedUrl && proxiedUrl !== normalizedUrl) {
+                const proxiedBlob = await fetchBlobFromUrl(proxiedUrl);
+                return validateImageBlob(proxiedBlob);
+            }
+        }
+        catch (error) {
+            rethrowNonRetryablePipelineError(error);
+            lastError = error;
+            console.warn('handleProxyUrl fetch failed, falling back to next strategy', error);
+        }
+    }
+    if (fetchWithProxy) {
+        try {
+            const proxiedResponse = await Promise.resolve(fetchWithProxy(normalizedUrl, fetchInit, { intent: 'downloadBlob' }));
+            if (!proxiedResponse.ok) {
+                throw new Error(`HTTP ${proxiedResponse.status}`);
+            }
+            const proxiedBlob = await proxiedResponse.blob();
+            return validateImageBlob(proxiedBlob);
+        }
+        catch (error) {
+            rethrowNonRetryablePipelineError(error);
+            lastError = error;
+            console.warn('fetchWithProxy failed', error);
+        }
+    }
+    if (!fetchWithProxy) {
+        try {
+            const directBlob = await fetchBlobFromUrl(normalizedUrl);
+            return validateImageBlob(directBlob);
+        }
+        catch (error) {
+            rethrowNonRetryablePipelineError(error);
+            lastError = error;
+        }
+    }
+    throw lastError instanceof Error ? lastError : new Error('Failed to download file from the URL');
+}
+
+
 /***/ }),
 
 /***/ 5748:
@@ -31094,6 +31198,8 @@ function isUrlSameOriginAsCurrentPage(url) {
     }
 }
 
+// EXTERNAL MODULE: ./src/utils/remoteFileFetchPipeline.ts + 1 modules
+var remoteFileFetchPipeline = __webpack_require__(5597);
 // EXTERNAL MODULE: ./src/utils/dedupeUploadNamesOnClient.ts
 var dedupeUploadNamesOnClient = __webpack_require__(3795);
 // EXTERNAL MODULE: ./src/utils/resolveUniqueUploadName.ts
@@ -31128,6 +31234,7 @@ var fileManagerApiError = __webpack_require__(7036);
 
 
 
+
 
 
 /**
@@ -31439,66 +31546,21 @@ const useFilesAPI = () => {
         }
         let resolvedBlob;
         let resolvedMimeType;
-        let lastError;
-        const fetchWithProxy = (_a = options === null || options === void 0 ? void 0 : options.config) === null || _a === void 0 ? void 0 : _a.fetchWithProxy;
-        const handleFileProxy = (_b = options === null || options === void 0 ? void 0 : options.config) === null || _b === void 0 ? void 0 : _b.handleFileProxy;
-        const handleProxyUrl = (_c = options === null || options === void 0 ? void 0 : options.config) === null || _c === void 0 ? void 0 : _c.handleProxyUrl;
-        const skipProxy = isUrlSameOriginAsCurrentPage(normalizedUrl);
-        if (!skipProxy && fetchWithProxy) {
-            try {
-                const proxiedResponse = await Promise.resolve(fetchWithProxy(normalizedUrl, { mode: 'cors' }, { intent: 'downloadBlob' }));
-                if (!proxiedResponse.ok) {
-                    throw new fileManagerApiError/* FileManagerApiError */.m(`HTTP ${proxiedResponse.status}`, 'UploadUrlDownloadFailed', proxiedResponse.status);
-                }
-                const proxiedBlob = await proxiedResponse.blob();
-                const validated = validateImageBlob(proxiedBlob, t);
-                resolvedBlob = validated.blob;
-                resolvedMimeType = validated.mimeType;
-            }
-            catch (error) {
-                lastError = error;
-                console.warn('fetchWithProxy failed or returned a non-image blob, falling back to next strategy', error);
-            }
-        }
-        if (!skipProxy && !resolvedBlob && handleFileProxy) {
-            try {
-                const proxiedBlob = await Promise.resolve(handleFileProxy(normalizedUrl));
-                const validated = validateImageBlob(proxiedBlob, t);
-                resolvedBlob = validated.blob;
-                resolvedMimeType = validated.mimeType;
-            }
-            catch (error) {
-                lastError = error;
-                console.warn('handleFileProxy failed or returned a non-image blob, falling back to next strategy', error);
-            }
-        }
-        if (!skipProxy && !resolvedBlob && handleProxyUrl) {
-            try {
-                const proxiedUrl = await Promise.resolve(handleProxyUrl(normalizedUrl));
-                const proxiedBlob = await fetchBlobFromUrl(proxiedUrl);
-                const validated = validateImageBlob(proxiedBlob, t);
-                resolvedBlob = validated.blob;
-                resolvedMimeType = validated.mimeType;
-            }
-            catch (error) {
-                lastError = error;
-                console.warn('handleProxyUrl fetch failed or returned a non-image blob, falling back to direct fetch', error);
-            }
+        try {
+            const validated = await (0,remoteFileFetchPipeline/* fetchRemoteImageBlobByUrl */.n)(normalizedUrl, {
+                fetchWithProxy: (_a = options === null || options === void 0 ? void 0 : options.config) === null || _a === void 0 ? void 0 : _a.fetchWithProxy,
+                handleFileProxy: (_b = options === null || options === void 0 ? void 0 : options.config) === null || _b === void 0 ? void 0 : _b.handleFileProxy,
+                handleProxyUrl: (_c = options === null || options === void 0 ? void 0 : options.config) === null || _c === void 0 ? void 0 : _c.handleProxyUrl,
+            }, fetchBlobFromUrl, (blob) => validateImageBlob(blob, t));
+            resolvedBlob = validated.blob;
+            resolvedMimeType = validated.mimeType;
         }
-        if (!resolvedBlob) {
-            try {
-                const directBlob = await fetchBlobFromUrl(normalizedUrl);
-                const validated = validateImageBlob(directBlob, t);
-                resolvedBlob = validated.blob;
-                resolvedMimeType = validated.mimeType;
-            }
-            catch (error) {
-                lastError = error;
+        catch (error) {
+            if (error instanceof fileManagerApiError/* FileManagerApiError */.m) {
+                throw error;
             }
-        }
-        if (!resolvedBlob || !resolvedMimeType) {
-            throw lastError instanceof Error
-                ? lastError
+            throw error instanceof Error
+                ? error
                 : new fileManagerApiError/* FileManagerApiError */.m(t('Failed to download file from the URL.'), 'UploadUrlDownloadFailed');
         }
         const extension = (0,mimeUtils/* getExtensionFromMime */.wh)(resolvedMimeType);
@@ -34842,7 +34904,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ src)
 });
 
-// UNUSED EXPORTS: FileContent, FileManagerApiError, FileManagerApp, FileManagerAppWithContext, FileModals, FolderSidebar, PixieOnlyApp, init, initFileManager, initPixieEditor, installResizeObserverErrorHandler, mapHttpStatusToErrorCode, uninstallResizeObserverErrorHandler, unmount, unmountPixieEditor
+// UNUSED EXPORTS: FileContent, FileManagerApiError, FileManagerApp, FileManagerAppWithContext, FileModals, FolderSidebar, PixieOnlyApp, fetchRemoteImageBlobByUrl, init, initFileManager, initPixieEditor, installResizeObserverErrorHandler, mapHttpStatusToErrorCode, uninstallResizeObserverErrorHandler, unmount, unmountPixieEditor
 
 // EXTERNAL MODULE: ./node_modules/react/jsx-runtime.js
 var jsx_runtime = __webpack_require__(4848);
@@ -91165,7 +91227,13 @@ const ImageGif = ({ setImageGifList, imageGifList = [], currentReqGif, setCurren
     }, []); // eslint-disable-line react-hooks/exhaustive-deps
     const handleProxyUrl = config === null || config === void 0 ? void 0 : config.handleProxyUrl;
     const fetchWithProxy = config === null || config === void 0 ? void 0 : config.fetchWithProxy;
-    const proxy = async (url) => (handleProxyUrl ? Promise.resolve(handleProxyUrl(url)) : url);
+    const proxy = async (url) => {
+        if (!handleProxyUrl) {
+            return url;
+        }
+        const proxied = await Promise.resolve(handleProxyUrl(url));
+        return proxied !== null && proxied !== void 0 ? proxied : url;
+    };
     const fetchJson = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(async (url) => {
         if (fetchWithProxy) {
             return Promise.resolve(fetchWithProxy(url, undefined, { intent: 'metadata' }));
@@ -91481,7 +91549,13 @@ const ImageStock = ({ imageStockList, setImageStockList, currentReq, setCurrentR
     const searchSeqRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(0);
     const nextPageRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(1);
     const inFlightRequestKeysRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(new Set());
-    const proxy = async (url) => (handleProxyUrl ? Promise.resolve(handleProxyUrl(url)) : url);
+    const proxy = async (url) => {
+        if (!handleProxyUrl) {
+            return url;
+        }
+        const proxied = await Promise.resolve(handleProxyUrl(url));
+        return proxied !== null && proxied !== void 0 ? proxied : url;
+    };
     const fetchJson = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(async (url) => {
         if (fetchWithProxy) {
             return Promise.resolve(fetchWithProxy(url, undefined, { intent: 'metadata' }));
@@ -94499,6 +94573,8 @@ const initFileManager = (options) => {
 
 // EXTERNAL MODULE: ./src/shared/fileManagerApiError.ts
 var fileManagerApiError = __webpack_require__(7036);
+// EXTERNAL MODULE: ./src/utils/remoteFileFetchPipeline.ts + 1 modules
+var remoteFileFetchPipeline = __webpack_require__(5597);
 ;// ./src/index.ts
 
 
@@ -94511,6 +94587,7 @@ var fileManagerApiError = __webpack_require__(7036);
 
 
 
+
 })();
 
 __webpack_exports__ = __webpack_exports__["default"];

package/index.d.ts

@@ -20,4 +20,5 @@ export { installResizeObserverErrorHandler, uninstallResizeObserverErrorHandler
 export { type Folder, type File, type PathItem, type MenuItem, type FileManagerOptions, type FileManagerHookReturn, type FileManagerErrorCode, type IFileManagerApiError, type SortOptionType, type FileManagerItemMeta, } from './types';
 export { FileManagerApiError } from './shared/fileManagerApiError';
 export { mapHttpStatusToErrorCode } from './shared/mapHttpStatusToErrorCode';
+export { fetchRemoteImageBlobByUrl, type FetchRemoteImageBlobOptions, type RemoteFileFetchHandlers, type RemoteFileFetchIntent, } from './utils/remoteFileFetchPipeline';
 export { type InitPixieEditorOptions, type Options as FileManagerInitOptions, type UniversalInitOptions, } from './file-manager';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emailmaker/filemanager",
-  "version": "0.10.88",
+  "version": "0.10.89",
   "main": "./file-manager.js",
   "module": "./file-manager.esm.js",
   "types": "./index.d.ts",

package/types.d.ts

@@ -507,8 +507,11 @@ export interface Config {
      * Запрос уходит только для строк с кириллицей. При 404/ошибке сети поиск продолжается по исходной строке (локальный RU-словарь).
      */
     iconStockTranslateUrl?: string;
-    /** Единый хендлер: принимает оригинальный URL, возвращает проксированный (sync или async). Используется для Unsplash, Giphy. */
-    handleProxyUrl?: (url: string) => string | Promise<string>;
+    /**
+     * Plugin URL override (PROXY_URL). Возвращает переписанный URL или undefined — тогда
+     * upload/metadata идут через `fetchWithProxy` / `getProxiedUrl`, не через display-default proxy.
+     */
+    handleProxyUrl?: (url: string) => string | null | undefined | Promise<string | null | undefined>;
     /** Display-controller для `<img src>` через общий proxy runtime-state хоста. */
     getProxiedUrl?: (url: string) => {
         src: string;

package/utils/directResourceFetchError.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Detects a final direct-fetch failure from the host resource proxy engine.
+ * Uses error.name for cross-package compatibility (no instanceof across bundles).
+ */
+export declare function isFinalDirectResourceFetchError(error: unknown): boolean;

package/utils/directResourceFetchError.test.d.ts

@@ -0,0 +1 @@
+export {};

package/utils/remoteFileFetchPipeline.d.ts

@@ -0,0 +1,25 @@
+export type RemoteFileFetchIntent = 'display' | 'downloadBlob' | 'metadata';
+export type RemoteFileFetchHandlers = {
+    fetchWithProxy?: (url: string, init?: RequestInit, options?: {
+        intent?: RemoteFileFetchIntent;
+    }) => Response | Promise<Response>;
+    handleFileProxy?: (url: string) => Blob | Promise<Blob | null | undefined>;
+    handleProxyUrl?: (url: string) => string | null | undefined | Promise<string | null | undefined>;
+};
+export type FetchBlobFromUrl = (url: string) => Promise<Blob>;
+export type ValidateImageBlobResult = {
+    blob: Blob;
+    mimeType: string;
+};
+export type ValidateImageBlob = (blob: Blob) => ValidateImageBlobResult;
+export type FetchRemoteImageBlobOptions = {
+    fetchInit?: RequestInit;
+};
+/**
+ * ADR-aligned blob fetch ladder for upload-by-URL:
+ * 1. handleFileProxy (plugin Blob)
+ * 2. handleProxyUrl → fetch rewritten URL (outside engine)
+ * 3. fetchWithProxy (host engine / policy v2)
+ * 4. direct fetch — only without `fetchWithProxy` (engine already includes direct fallback in its chain)
+ */
+export declare function fetchRemoteImageBlobByUrl(normalizedUrl: string, handlers: RemoteFileFetchHandlers, fetchBlobFromUrl: FetchBlobFromUrl, validateImageBlob: ValidateImageBlob, options?: FetchRemoteImageBlobOptions): Promise<ValidateImageBlobResult>;

package/utils/remoteFileFetchPipeline.test.d.ts

@@ -0,0 +1 @@
+export {};