@edgestore/react 0.1.2 → 0.1.3-alpha.0

package/dist/contextProvider.d.ts

@@ -4,10 +4,12 @@ import { type BucketFunctions } from './createNextProxy';
 type EdgeStoreContextValue<TRouter extends AnyRouter> = {
     edgestore: BucketFunctions<TRouter>;
     /**
-     * In development, if this is a protected file, this function will add the token as a query param to the url.
-     * This is needed because third party cookies don't work with http urls.
+     * This will re-run the Edge Store initialization process,
+     * which will run the `createContext` function again.
+     *
+     * Can be used after a sign-in or sign-out, for example.
      */
-    getSrc: (url: string) => string;
+    reset: () => Promise<void>;
 };
 export declare function createEdgeStoreProvider<TRouter extends AnyRouter>(opts?: {
     /**

package/dist/contextProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contextProvider.d.ts","sourceRoot":"","sources":["../src/contextProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAK1E,KAAK,qBAAqB,CAAC,OAAO,SAAS,SAAS,IAAI;IACtD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IACpC;;;OAGG;IACH,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CACjC,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,SAAS,SAAS,EAAE,IAAI,CAAC,EAAE;IACxE;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;;kBASa,MAAM,SAAS;QACzB;;;;;;WAMG;;;;EAgCN"}
+{"version":3,"file":"contextProvider.d.ts","sourceRoot":"","sources":["../src/contextProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAK1E,KAAK,qBAAqB,CAAC,OAAO,SAAS,SAAS,IAAI;IACtD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IACpC;;;;;OAKG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,SAAS,SAAS,EAAE,IAAI,CAAC,EAAE;IACxE;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;;kBASa,MAAM,SAAS;QACzB;;;;;;WAMG;;;;EAgCN"}

package/dist/index.js

@@ -110,9 +110,7 @@ async function uploadFile({ file, input, onProgressChange, options }, { apiPath,
             thumbnailUrl: json.thumbnailUrl ? getUrl(json.thumbnailUrl, apiPath) : null,
             size: json.size,
             uploadedAt: new Date(json.uploadedAt),
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
             path: json.path,
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
             metadata: json.metadata
         };
     } catch (e) {
@@ -321,38 +319,28 @@ function createEdgeStoreProvider(opts) {
 }
 function EdgeStoreProviderInner({ children, context, basePath, maxConcurrentUploads }) {
     const apiPath = basePath ? `${basePath}` : '/api/edgestore';
-    const [token, setToken] = React__namespace.useState(null);
     const uploadingCountRef = React__namespace.useRef(0);
     React__namespace.useEffect(()=>{
-        void fetch(`${apiPath}/init`, {
-            method: 'POST'
-        }).then(async (res)=>{
-            if (res.ok) {
-                const json = await res.json();
-                setToken(json.token);
-                await fetch(`${DEFAULT_BASE_URL}/_init`, {
-                    method: 'GET',
-                    headers: {
-                        'x-edgestore-token': json.token
-                    }
-                });
-            }
-        });
+        void init();
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    function getSrc(url) {
-        if (// in production we use cookies, so we don't need a token
-        process.env.NODE_ENV === 'production' || // public urls don't need a token
-        // e.g. https://files.edgestore.dev/project/bucket/_public/...
-        url.match(/^https?:\/\/[^\/]+\/[^\/]+\/[^\/]+\/_public\/.+/)) {
-            return `${url}`;
-        } else {
-            // in development, third party cookies don't work, so we need to pass the token as a query param
-            const uri = new URL(url);
-            uri.searchParams.set('token', token ?? '');
-            return `${uri}`;
+    async function init() {
+        const res = await fetch(`${apiPath}/init`, {
+            method: 'POST'
+        });
+        if (res.ok) {
+            const json = await res.json();
+            await fetch(`${DEFAULT_BASE_URL}/_init`, {
+                method: 'GET',
+                headers: {
+                    'x-edgestore-token': json.token
+                }
+            });
         }
     }
+    async function reset() {
+        await init();
+    }
     return /*#__PURE__*/ React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/ React__namespace.createElement(context.Provider, {
         value: {
             edgestore: createNextProxy({
@@ -360,7 +348,7 @@ function EdgeStoreProviderInner({ children, context, basePath, maxConcurrentUplo
                 uploadingCountRef,
                 maxConcurrentUploads
             }),
-            getSrc
+            reset
         }
     }, children));
 }

package/dist/index.mjs

@@ -86,9 +86,7 @@ async function uploadFile({ file, input, onProgressChange, options }, { apiPath,
             thumbnailUrl: json.thumbnailUrl ? getUrl(json.thumbnailUrl, apiPath) : null,
             size: json.size,
             uploadedAt: new Date(json.uploadedAt),
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
             path: json.path,
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
             metadata: json.metadata
         };
     } catch (e) {
@@ -297,38 +295,28 @@ function createEdgeStoreProvider(opts) {
 }
 function EdgeStoreProviderInner({ children, context, basePath, maxConcurrentUploads }) {
     const apiPath = basePath ? `${basePath}` : '/api/edgestore';
-    const [token, setToken] = React.useState(null);
     const uploadingCountRef = React.useRef(0);
     React.useEffect(()=>{
-        void fetch(`${apiPath}/init`, {
-            method: 'POST'
-        }).then(async (res)=>{
-            if (res.ok) {
-                const json = await res.json();
-                setToken(json.token);
-                await fetch(`${DEFAULT_BASE_URL}/_init`, {
-                    method: 'GET',
-                    headers: {
-                        'x-edgestore-token': json.token
-                    }
-                });
-            }
-        });
+        void init();
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    function getSrc(url) {
-        if (// in production we use cookies, so we don't need a token
-        process.env.NODE_ENV === 'production' || // public urls don't need a token
-        // e.g. https://files.edgestore.dev/project/bucket/_public/...
-        url.match(/^https?:\/\/[^\/]+\/[^\/]+\/[^\/]+\/_public\/.+/)) {
-            return `${url}`;
-        } else {
-            // in development, third party cookies don't work, so we need to pass the token as a query param
-            const uri = new URL(url);
-            uri.searchParams.set('token', token ?? '');
-            return `${uri}`;
+    async function init() {
+        const res = await fetch(`${apiPath}/init`, {
+            method: 'POST'
+        });
+        if (res.ok) {
+            const json = await res.json();
+            await fetch(`${DEFAULT_BASE_URL}/_init`, {
+                method: 'GET',
+                headers: {
+                    'x-edgestore-token': json.token
+                }
+            });
         }
     }
+    async function reset() {
+        await init();
+    }
     return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(context.Provider, {
         value: {
             edgestore: createNextProxy({
@@ -336,7 +324,7 @@ function EdgeStoreProviderInner({ children, context, basePath, maxConcurrentUplo
                 uploadingCountRef,
                 maxConcurrentUploads
             }),
-            getSrc
+            reset
         }
     }, children));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgestore/react",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.0",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edgestore.git",
@@ -54,14 +54,14 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@edgestore/server": "0.1.2",
+    "@edgestore/server": "0.1.3-alpha.0",
     "next": "*",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
     "zod": ">=3.0.0"
   },
   "devDependencies": {
-    "@edgestore/server": "0.1.2",
+    "@edgestore/server": "0.1.3-alpha.0",
     "@types/cookie": "^0.5.1",
     "@types/node": "^18.11.18",
     "@types/uuid": "^9.0.1",
@@ -71,5 +71,5 @@
     "typescript": "^5.1.6",
     "zod": "^3.21.4"
   },
-  "gitHead": "99519b57aa7a5cbbe5cab16b85a70d437cb87435"
+  "gitHead": "3ed23e543ee1ed151685884bb0983c2471e03880"
 }

package/src/contextProvider.tsx

@@ -8,10 +8,12 @@ const DEFAULT_BASE_URL =
 type EdgeStoreContextValue<TRouter extends AnyRouter> = {
   edgestore: BucketFunctions<TRouter>;
   /**
-   * In development, if this is a protected file, this function will add the token as a query param to the url.
-   * This is needed because third party cookies don't work with http urls.
+   * This will re-run the Edge Store initialization process,
+   * which will run the `createContext` function again.
+   *
+   * Can be used after a sign-in or sign-out, for example.
    */
-  getSrc: (url: string) => string;
+  reset: () => Promise<void>;
 };
 
 export function createEdgeStoreProvider<TRouter extends AnyRouter>(opts?: {
@@ -85,43 +87,31 @@ function EdgeStoreProviderInner<TRouter extends AnyRouter>({
   maxConcurrentUploads?: number;
 }) {
   const apiPath = basePath ? `${basePath}` : '/api/edgestore';
-  const [token, setToken] = React.useState<string | null>(null);
   const uploadingCountRef = React.useRef(0);
   React.useEffect(() => {
-    void fetch(`${apiPath}/init`, {
-      method: 'POST',
-    }).then(async (res) => {
-      if (res.ok) {
-        const json = await res.json();
-        setToken(json.token);
-        await fetch(`${DEFAULT_BASE_URL}/_init`, {
-          method: 'GET',
-          headers: {
-            'x-edgestore-token': json.token,
-          },
-        });
-      }
-    });
+    void init();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  function getSrc(url: string) {
-    if (
-      // in production we use cookies, so we don't need a token
-      process.env.NODE_ENV === 'production' ||
-      // public urls don't need a token
-      // e.g. https://files.edgestore.dev/project/bucket/_public/...
-      url.match(/^https?:\/\/[^\/]+\/[^\/]+\/[^\/]+\/_public\/.+/)
-    ) {
-      return `${url}`;
-    } else {
-      // in development, third party cookies don't work, so we need to pass the token as a query param
-      const uri = new URL(url);
-      uri.searchParams.set('token', token ?? '');
-      return `${uri}`;
+  async function init() {
+    const res = await fetch(`${apiPath}/init`, {
+      method: 'POST',
+    });
+    if (res.ok) {
+      const json = await res.json();
+      await fetch(`${DEFAULT_BASE_URL}/_init`, {
+        method: 'GET',
+        headers: {
+          'x-edgestore-token': json.token,
+        },
+      });
     }
   }
 
+  async function reset() {
+    await init();
+  }
+
   return (
     <>
       <context.Provider
@@ -131,7 +121,7 @@ function EdgeStoreProviderInner<TRouter extends AnyRouter>({
             uploadingCountRef,
             maxConcurrentUploads,
           }),
-          getSrc,
+          reset,
         }}
       >
         {children}

package/src/createNextProxy.ts

@@ -193,9 +193,7 @@ async function uploadFile(
         : null,
       size: json.size,
       uploadedAt: new Date(json.uploadedAt),
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
       path: json.path as any,
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
       metadata: json.metadata as any,
     };
   } catch (e) {