@edgestore/react 0.4.0 → 0.5.0

package/dist/errors/index.js

@@ -1,14 +1,2 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var shared = require('@edgestore/shared');
-var uploadAbortedError = require('../uploadAbortedError-fbfcc57b.js');
-
-
-
-Object.defineProperty(exports, 'EdgeStoreApiClientError', {
-	enumerable: true,
-	get: function () { return shared.EdgeStoreApiClientError; }
-});
-exports.UploadAbortedError = uploadAbortedError.UploadAbortedError;
+export { EdgeStoreApiClientError } from '@edgestore/shared';
+export { U as UploadAbortedError } from '../uploadAbortedError-a628b025.js';

package/dist/index.js

@@ -1,33 +1,9 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var React = require('react');
-var shared = require('@edgestore/shared');
-var uploadAbortedError = require('./uploadAbortedError-fbfcc57b.js');
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
-
-var React__namespace = /*#__PURE__*/_interopNamespace(React);
+import * as React from 'react';
+import { EdgeStoreApiClientError } from '@edgestore/shared';
+import { U as UploadAbortedError } from './uploadAbortedError-a628b025.js';
 
 class EdgeStoreClientError extends Error {
-    constructor(message){
+    constructor(message) {
         super(message);
         this.name = 'EdgeStoreError';
     }
@@ -37,73 +13,72 @@ async function handleError(res) {
     let json = {};
     try {
         json = await res.json();
-    } catch (err) {
+    }
+    catch (err) {
         throw new EdgeStoreClientError(`Failed to parse response. Make sure the api is correctly configured at ${res.url}`);
     }
-    throw new shared.EdgeStoreApiClientError({
-        response: json
-    });
+    throw new EdgeStoreApiClientError({ response: json });
 }
 
-function createNextProxy({ apiPath, uploadingCountRef, maxConcurrentUploads = 5 }) {
+function createNextProxy({ apiPath, uploadingCountRef, maxConcurrentUploads = 5, }) {
     return new Proxy({}, {
-        get (_, prop) {
+        get(_, prop) {
             const bucketName = prop;
             const bucketFunctions = {
-                upload: async (params)=>{
+                upload: async (params) => {
                     try {
                         params.onProgressChange?.(0);
                         // This handles the case where the user cancels the upload while it's waiting in the queue
-                        const abortPromise = new Promise((resolve)=>{
-                            params.signal?.addEventListener('abort', ()=>{
+                        const abortPromise = new Promise((resolve) => {
+                            params.signal?.addEventListener('abort', () => {
                                 resolve();
-                            }, {
-                                once: true
-                            });
+                            }, { once: true });
                         });
-                        while(uploadingCountRef.current >= maxConcurrentUploads && uploadingCountRef.current > 0){
+                        while (uploadingCountRef.current >= maxConcurrentUploads &&
+                            uploadingCountRef.current > 0) {
                             await Promise.race([
-                                new Promise((resolve)=>setTimeout(resolve, 300)),
-                                abortPromise
+                                new Promise((resolve) => setTimeout(resolve, 300)),
+                                abortPromise,
                             ]);
                             if (params.signal?.aborted) {
-                                throw new uploadAbortedError.UploadAbortedError('File upload aborted');
+                                throw new UploadAbortedError('File upload aborted');
                             }
                         }
                         uploadingCountRef.current++;
                         const fileInfo = await uploadFile(params, {
                             bucketName: bucketName,
-                            apiPath
+                            apiPath,
                         });
                         return fileInfo;
-                    } finally{
+                    }
+                    finally {
                         uploadingCountRef.current--;
                     }
                 },
-                confirmUpload: async (params)=>{
+                confirmUpload: async (params) => {
                     const { success } = await confirmUpload(params, {
                         bucketName: bucketName,
-                        apiPath
+                        apiPath,
                     });
                     if (!success) {
                         throw new EdgeStoreClientError('Failed to confirm upload');
                     }
                 },
-                delete: async (params)=>{
+                delete: async (params) => {
                     const { success } = await deleteFile(params, {
                         bucketName: bucketName,
-                        apiPath
+                        apiPath,
                     });
                     if (!success) {
                         throw new EdgeStoreClientError('Failed to delete file');
                     }
-                }
+                },
             };
             return bucketFunctions;
-        }
+        },
     });
 }
-async function uploadFile({ file, signal, input, onProgressChange, options }, { apiPath, bucketName }) {
+async function uploadFile({ file, signal, input, onProgressChange, options, }, { apiPath, bucketName, }) {
     try {
         onProgressChange?.(0);
         const res = await fetch(`${apiPath}/request-upload`, {
@@ -119,17 +94,17 @@ async function uploadFile({ file, signal, input, onProgressChange, options }, {
                     size: file.size,
                     fileName: options?.manualFileName,
                     replaceTargetUrl: options?.replaceTargetUrl,
-                    temporary: options?.temporary
-                }
+                    temporary: options?.temporary,
+                },
             }),
             headers: {
-                'Content-Type': 'application/json'
-            }
+                'Content-Type': 'application/json',
+            },
         });
         if (!res.ok) {
             await handleError(res);
         }
-        const json = await res.json();
+        const json = (await res.json());
         if ('multipart' in json) {
             await multipartUpload({
                 bucketName,
@@ -137,32 +112,37 @@ async function uploadFile({ file, signal, input, onProgressChange, options }, {
                 onProgressChange,
                 signal,
                 file,
-                apiPath
+                apiPath,
             });
-        } else if ('uploadUrl' in json) {
+        }
+        else if ('uploadUrl' in json) {
             // Single part upload
             // Upload the file to the signed URL and get the progress
             await uploadFileInner({
                 file,
                 uploadUrl: json.uploadUrl,
                 onProgressChange,
-                signal
+                signal,
             });
-        } else {
+        }
+        else {
             throw new EdgeStoreClientError('An error occurred');
         }
         return {
             url: getUrl(json.accessUrl, apiPath),
-            thumbnailUrl: json.thumbnailUrl ? getUrl(json.thumbnailUrl, apiPath) : null,
+            thumbnailUrl: json.thumbnailUrl
+                ? getUrl(json.thumbnailUrl, apiPath)
+                : null,
             size: json.size,
             uploadedAt: new Date(json.uploadedAt),
             path: json.path,
             pathOrder: json.pathOrder,
-            metadata: json.metadata
+            metadata: json.metadata,
         };
-    } catch (e) {
+    }
+    catch (e) {
         if (e instanceof Error && e.name === 'AbortError') {
-            throw new uploadAbortedError.UploadAbortedError('File upload aborted');
+            throw new UploadAbortedError('File upload aborted');
         }
         onProgressChange?.(0);
         throw e;
@@ -172,13 +152,19 @@ async function uploadFile({ file, signal, input, onProgressChange, options }, {
  * Protected files need third-party cookies to work.
  * Since third party cookies don't work on localhost,
  * we need to proxy the file through the server.
- */ function getUrl(url, apiPath) {
-    const mode = typeof process !== 'undefined' ? process.env.NODE_ENV : undefined?.DEV ? 'development' : 'production';
+ */
+function getUrl(url, apiPath) {
+    const mode = typeof process !== 'undefined'
+        ? process.env.NODE_ENV
+        : // @ts-expect-error - DEV is injected by Vite
+            import.meta.env?.DEV
+                ? 'development'
+                : 'production';
     if (mode === 'development' && !url.includes('/_public/')) {
         const proxyUrl = new URL(window.location.origin);
         proxyUrl.pathname = `${apiPath}/proxy-file`;
         proxyUrl.search = new URLSearchParams({
-            url
+            url,
         }).toString();
         return proxyUrl.toString();
     }
@@ -186,37 +172,37 @@ async function uploadFile({ file, signal, input, onProgressChange, options }, {
 }
 async function uploadFileInner(props) {
     const { file, uploadUrl, onProgressChange, signal } = props;
-    const promise = new Promise((resolve, reject)=>{
+    const promise = new Promise((resolve, reject) => {
         if (signal?.aborted) {
-            reject(new uploadAbortedError.UploadAbortedError('File upload aborted'));
+            reject(new UploadAbortedError('File upload aborted'));
             return;
         }
         const request = new XMLHttpRequest();
         request.open('PUT', uploadUrl);
         // This is for Azure provider. Specifies the blob type
         request.setRequestHeader('x-ms-blob-type', 'BlockBlob');
-        request.addEventListener('loadstart', ()=>{
+        request.addEventListener('loadstart', () => {
             onProgressChange?.(0);
         });
-        request.upload.addEventListener('progress', (e)=>{
+        request.upload.addEventListener('progress', (e) => {
             if (e.lengthComputable) {
                 // 2 decimal progress
-                const progress = Math.round(e.loaded / e.total * 10000) / 100;
+                const progress = Math.round((e.loaded / e.total) * 10000) / 100;
                 onProgressChange?.(progress);
             }
         });
-        request.addEventListener('error', ()=>{
+        request.addEventListener('error', () => {
             reject(new Error('Error uploading file'));
         });
-        request.addEventListener('abort', ()=>{
-            reject(new uploadAbortedError.UploadAbortedError('File upload aborted'));
+        request.addEventListener('abort', () => {
+            reject(new UploadAbortedError('File upload aborted'));
         });
-        request.addEventListener('loadend', ()=>{
+        request.addEventListener('loadend', () => {
             // Return the ETag header (needed to complete multipart upload)
             resolve(request.getResponseHeader('ETag'));
         });
         if (signal) {
-            signal.addEventListener('abort', ()=>{
+            signal.addEventListener('abort', () => {
                 request.abort();
             });
         }
@@ -228,44 +214,46 @@ async function multipartUpload(params) {
     const { bucketName, multipartInfo, onProgressChange, file, signal, apiPath } = params;
     const { partSize, parts, totalParts, uploadId, key } = multipartInfo;
     const uploadingParts = [];
-    const uploadPart = async (params)=>{
+    const uploadPart = async (params) => {
         const { part, chunk } = params;
         const { uploadUrl } = part;
         const eTag = await uploadFileInner({
             file: chunk,
             uploadUrl,
             signal,
-            onProgressChange: (progress)=>{
-                const uploadingPart = uploadingParts.find((p)=>p.partNumber === part.partNumber);
+            onProgressChange: (progress) => {
+                const uploadingPart = uploadingParts.find((p) => p.partNumber === part.partNumber);
                 if (uploadingPart) {
                     uploadingPart.progress = progress;
-                } else {
+                }
+                else {
                     uploadingParts.push({
                         partNumber: part.partNumber,
-                        progress
+                        progress,
                     });
                 }
-                const totalProgress = Math.round(uploadingParts.reduce((acc, p)=>acc + p.progress * 100, 0) / totalParts) / 100;
+                const totalProgress = Math.round(uploadingParts.reduce((acc, p) => acc + p.progress * 100, 0) /
+                    totalParts) / 100;
                 onProgressChange?.(totalProgress);
-            }
+            },
         });
         if (!eTag) {
             throw new EdgeStoreClientError('Could not get ETag from multipart response');
         }
         return {
             partNumber: part.partNumber,
-            eTag
+            eTag,
         };
     };
     // Upload the parts in parallel
     const completedParts = await queuedPromises({
-        items: parts.map((part)=>({
-                part,
-                chunk: file.slice((part.partNumber - 1) * partSize, part.partNumber * partSize)
-            })),
+        items: parts.map((part) => ({
+            part,
+            chunk: file.slice((part.partNumber - 1) * partSize, part.partNumber * partSize),
+        })),
         fn: uploadPart,
         maxParallel: 5,
-        maxRetries: 10
+        maxRetries: 10, // retry 10 times per part
     });
     // Complete multipart upload
     const res = await fetch(`${apiPath}/complete-multipart-upload`, {
@@ -275,100 +263,107 @@ async function multipartUpload(params) {
             bucketName,
             uploadId,
             key,
-            parts: completedParts
+            parts: completedParts,
         }),
         headers: {
-            'Content-Type': 'application/json'
-        }
+            'Content-Type': 'application/json',
+        },
     });
     if (!res.ok) {
         await handleError(res);
     }
 }
-async function confirmUpload({ url }, { apiPath, bucketName }) {
+async function confirmUpload({ url, }, { apiPath, bucketName, }) {
     const res = await fetch(`${apiPath}/confirm-upload`, {
         method: 'POST',
         credentials: 'include',
         body: JSON.stringify({
             url,
-            bucketName
+            bucketName,
         }),
         headers: {
-            'Content-Type': 'application/json'
-        }
+            'Content-Type': 'application/json',
+        },
     });
     if (!res.ok) {
         await handleError(res);
     }
     return res.json();
 }
-async function deleteFile({ url }, { apiPath, bucketName }) {
+async function deleteFile({ url, }, { apiPath, bucketName, }) {
     const res = await fetch(`${apiPath}/delete-file`, {
         method: 'POST',
         credentials: 'include',
         body: JSON.stringify({
             url,
-            bucketName
+            bucketName,
         }),
         headers: {
-            'Content-Type': 'application/json'
-        }
+            'Content-Type': 'application/json',
+        },
     });
     if (!res.ok) {
         await handleError(res);
     }
     return res.json();
 }
-async function queuedPromises({ items, fn, maxParallel, maxRetries = 0 }) {
+async function queuedPromises({ items, fn, maxParallel, maxRetries = 0, }) {
     const results = new Array(items.length);
-    const executeWithRetry = async (func, retries)=>{
+    const executeWithRetry = async (func, retries) => {
         try {
             return await func();
-        } catch (error) {
-            if (error instanceof uploadAbortedError.UploadAbortedError) {
+        }
+        catch (error) {
+            if (error instanceof UploadAbortedError) {
                 throw error;
             }
             if (retries > 0) {
-                await new Promise((resolve)=>setTimeout(resolve, 5000));
+                await new Promise((resolve) => setTimeout(resolve, 5000));
                 return executeWithRetry(func, retries - 1);
-            } else {
+            }
+            else {
                 throw error;
             }
         }
     };
     const semaphore = {
         count: maxParallel,
-        async wait () {
+        async wait() {
             // If we've reached our maximum concurrency, or it's the last item, wait
-            while(this.count <= 0)await new Promise((resolve)=>setTimeout(resolve, 500));
+            while (this.count <= 0)
+                await new Promise((resolve) => setTimeout(resolve, 500));
             this.count--;
         },
-        signal () {
+        signal() {
             this.count++;
-        }
+        },
     };
-    const tasks = items.map((item, i)=>(async ()=>{
-            await semaphore.wait();
-            try {
-                const result = await executeWithRetry(()=>fn(item), maxRetries);
-                results[i] = result;
-            } finally{
-                semaphore.signal();
-            }
-        })());
+    const tasks = items.map((item, i) => (async () => {
+        await semaphore.wait();
+        try {
+            const result = await executeWithRetry(() => fn(item), maxRetries);
+            results[i] = result;
+        }
+        finally {
+            semaphore.signal();
+        }
+    })());
     await Promise.all(tasks);
     return results;
 }
 
-const DEFAULT_BASE_URL = (typeof process !== 'undefined' ? process.env.NEXT_PUBLIC_EDGE_STORE_BASE_URL : undefined?.EDGE_STORE_BASE_URL) ?? 'https://files.edgestore.dev';
+const DEFAULT_BASE_URL = (typeof process !== 'undefined'
+    ? process.env.NEXT_PUBLIC_EDGE_STORE_BASE_URL
+    : // @ts-expect-error - In Vite, the env variables are available on `import.meta`.
+        import.meta.env?.EDGE_STORE_BASE_URL) ?? 'https://files.edgestore.dev';
 function createEdgeStoreProvider(opts) {
-    const EdgeStoreContext = /*#__PURE__*/ React__namespace.createContext(undefined);
-    const EdgeStoreProvider = ({ children, basePath })=>{
+    const EdgeStoreContext = React.createContext(undefined);
+    const EdgeStoreProvider = ({ children, basePath, }) => {
         return EdgeStoreProviderInner({
             children,
             context: EdgeStoreContext,
             basePath,
-            maxConcurrentUploads: opts?.maxConcurrentUploads
+            maxConcurrentUploads: opts?.maxConcurrentUploads,
         });
     };
     function useEdgeStore() {
@@ -376,7 +371,7 @@ function createEdgeStoreProvider(opts) {
             throw new Error('React Context is unavailable in Server Components');
         }
         // @ts-expect-error - We know that the context value should not be undefined
-        const value = React__namespace.useContext(EdgeStoreContext);
+        const value = React.useContext(EdgeStoreContext);
         if (!value && process.env.NODE_ENV !== 'production') {
             throw new Error('[edgestore]: `useEdgeStore` must be wrapped in a <EdgeStoreProvider />');
         }
@@ -384,37 +379,37 @@ function createEdgeStoreProvider(opts) {
     }
     return {
         EdgeStoreProvider,
-        useEdgeStore
+        useEdgeStore,
     };
 }
-function EdgeStoreProviderInner({ children, context, basePath, maxConcurrentUploads }) {
+function EdgeStoreProviderInner({ children, context, basePath, maxConcurrentUploads, }) {
     const apiPath = basePath ? `${basePath}` : '/api/edgestore';
-    const [state, setState] = React__namespace.useState({
+    const [state, setState] = React.useState({
         loading: true,
         initialized: false,
-        error: false
+        error: false,
     });
-    const uploadingCountRef = React__namespace.useRef(0);
-    const initExecuted = React__namespace.useRef(false); // to make sure we don't run init twice
-    React__namespace.useEffect(()=>{
+    const uploadingCountRef = React.useRef(0);
+    const initExecuted = React.useRef(false); // to make sure we don't run init twice
+    React.useEffect(() => {
         if (!initExecuted.current) {
             void init();
         }
-        return ()=>{
+        return () => {
             initExecuted.current = true;
         };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     async function init() {
         try {
             setState({
                 loading: true,
                 initialized: false,
-                error: false
+                error: false,
             });
             const res = await fetch(`${apiPath}/init`, {
                 method: 'POST',
-                credentials: 'include'
+                credentials: 'include',
             });
             if (res.ok) {
                 const json = await res.json();
@@ -422,37 +417,40 @@ function EdgeStoreProviderInner({ children, context, basePath, maxConcurrentUplo
                     method: 'GET',
                     credentials: 'include',
                     headers: {
-                        'x-edgestore-token': json.token
-                    }
+                        'x-edgestore-token': json.token,
+                    },
                 });
                 if (innerRes.ok) {
                     // update state
                     setState({
                         loading: false,
                         initialized: true,
-                        error: false
+                        error: false,
                     });
-                } else {
+                }
+                else {
                     setState({
                         loading: false,
                         initialized: false,
-                        error: true
+                        error: true,
                     });
                     throw new EdgeStoreClientError("Couldn't initialize EdgeStore.");
                 }
-            } else {
+            }
+            else {
                 setState({
                     loading: false,
                     initialized: false,
-                    error: true
+                    error: true,
                 });
                 await handleError(res);
             }
-        } catch (err) {
+        }
+        catch (err) {
             setState({
                 loading: false,
                 initialized: false,
-                error: true
+                error: true,
             });
             throw err;
         }
@@ -460,17 +458,16 @@ function EdgeStoreProviderInner({ children, context, basePath, maxConcurrentUplo
     async function reset() {
         await init();
     }
-    return /*#__PURE__*/ React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/ React__namespace.createElement(context.Provider, {
-        value: {
-            edgestore: createNextProxy({
-                apiPath,
-                uploadingCountRef,
-                maxConcurrentUploads
-            }),
-            reset,
-            state
-        }
-    }, children));
+    return (React.createElement(React.Fragment, null,
+        React.createElement(context.Provider, { value: {
+                edgestore: createNextProxy({
+                    apiPath,
+                    uploadingCountRef,
+                    maxConcurrentUploads,
+                }),
+                reset,
+                state,
+            } }, children)));
 }
 
-exports.createEdgeStoreProvider = createEdgeStoreProvider;
+export { createEdgeStoreProvider };

package/dist/shared/index.js

@@ -1,13 +1,10 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var shared = require('@edgestore/shared');
+import { EdgeStoreApiClientError as EdgeStoreApiClientError$1 } from '@edgestore/shared';
 
 // TODO: delete this file on next major release (moved to "errors")
 /**
  * @deprecated import from `@edgestore/react/errors` instead.
- */ class EdgeStoreApiClientError extends shared.EdgeStoreApiClientError {
+ */
+class EdgeStoreApiClientError extends EdgeStoreApiClientError$1 {
 }
 
-exports.EdgeStoreApiClientError = EdgeStoreApiClientError;
+export { EdgeStoreApiClientError };

package/dist/utils/index.js

@@ -1,13 +1,10 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
 /**
  * This will add the necessary query param to the url
  * to make the browser download the file instead of opening it.
  *
  * You can also override the name of the file by passing the name param.
- */ function getDownloadUrl(url, name) {
+ */
+function getDownloadUrl(url, name) {
     const urlObj = new URL(url);
     urlObj.searchParams.set('download', name ?? 'true');
     return urlObj.toString();
@@ -16,24 +13,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
  * This will format the file size to a human-readable format.
  *
  * @example 1024 => 1 KB
- */ function formatFileSize(bytes) {
-    if (!bytes) return '0 B';
+ */
+function formatFileSize(bytes) {
+    if (!bytes)
+        return '0 B';
     const k = 1024;
     const dm = 2;
-    const sizes = [
-        'B',
-        'KB',
-        'MB',
-        'GB',
-        'TB',
-        'PB',
-        'EB',
-        'ZB',
-        'YB'
-    ];
+    const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
     const i = Math.floor(Math.log(bytes) / Math.log(k));
     return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`;
 }
 
-exports.formatFileSize = formatFileSize;
-exports.getDownloadUrl = getDownloadUrl;
+export { formatFileSize, getDownloadUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgestore/react",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edgestore.git",
@@ -66,7 +66,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.294.0",
     "@aws-sdk/s3-request-presigner": "^3.294.0",
-    "@edgestore/shared": "0.4.0",
+    "@edgestore/shared": "0.5.0",
     "@panva/hkdf": "^1.0.4",
     "cookie": "^0.5.0",
     "jose": "^4.13.1",
@@ -88,5 +88,5 @@
     "typescript": "^5",
     "zod": "3.21.4"
   },
-  "gitHead": "63d6ba86e038a61bfbf506385183482c91e80842"
+  "gitHead": "1bc997b2797e026d6661b9964e74c6e117dba352"
 }