@edgestore/server 0.0.0-alpha.12 → 0.0.0-alpha.14

package/dist/{shared-43667670.mjs → shared-2a9c8307.mjs}

@@ -51,7 +51,7 @@ async function init(params) {
             maxAge: DEFAULT_MAX_AGE
         }));
     }
-    const baseUrl = provider.getBaseUrl();
+    const baseUrl = await provider.getBaseUrl();
     return {
         newCookies,
         token,
@@ -78,6 +78,7 @@ async function requestUpload(params) {
             fileInfo: {
                 size: fileInfo.size,
                 type: fileInfo.type,
+                fileName: fileInfo.fileName,
                 extension: fileInfo.extension,
                 replaceTargetUrl: fileInfo.replaceTargetUrl
             }
@@ -94,6 +95,36 @@ async function requestUpload(params) {
             });
         }
     }
+    if (bucket._def.bucketConfig?.maxSize) {
+        if (fileInfo.size > bucket._def.bucketConfig.maxSize) {
+            throw new EdgeStoreError({
+                code: 'BAD_REQUEST',
+                message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`
+            });
+        }
+    }
+    if (bucket._def.bucketConfig?.accept) {
+        const accept = bucket._def.bucketConfig.accept;
+        let accepted = false;
+        for (const acceptedMimeType of accept){
+            if (acceptedMimeType.endsWith('/*')) {
+                const mimeType = acceptedMimeType.replace('/*', '');
+                if (fileInfo.type.startsWith(mimeType)) {
+                    accepted = true;
+                    break;
+                }
+            } else if (fileInfo.type === acceptedMimeType) {
+                accepted = true;
+                break;
+            }
+        }
+        if (!accepted) {
+            throw new EdgeStoreError({
+                code: 'BAD_REQUEST',
+                message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`
+            });
+        }
+    }
     const path = buildPath({
         fileInfo,
         bucket,
@@ -159,12 +190,12 @@ async function deleteFile(params) {
     if (!bucket._def.beforeDelete) {
         throw new Error('You need to define beforeDelete if you want to delete files directly from the frontend.');
     }
-    const file = await provider.getFile({
+    const fileInfo = await provider.getFile({
         url
     });
     const canDelete = await bucket._def.beforeDelete({
         ctx,
-        file
+        fileInfo
     });
     if (!canDelete) {
         throw new Error('Delete not allowed');

package/dist/{shared-f7607e44.js → shared-ae739a04.js}

@@ -53,7 +53,7 @@ async function init(params) {
             maxAge: DEFAULT_MAX_AGE
         }));
     }
-    const baseUrl = provider.getBaseUrl();
+    const baseUrl = await provider.getBaseUrl();
     return {
         newCookies,
         token,
@@ -80,6 +80,7 @@ async function requestUpload(params) {
             fileInfo: {
                 size: fileInfo.size,
                 type: fileInfo.type,
+                fileName: fileInfo.fileName,
                 extension: fileInfo.extension,
                 replaceTargetUrl: fileInfo.replaceTargetUrl
             }
@@ -96,6 +97,36 @@ async function requestUpload(params) {
             });
         }
     }
+    if (bucket._def.bucketConfig?.maxSize) {
+        if (fileInfo.size > bucket._def.bucketConfig.maxSize) {
+            throw new EdgeStoreError({
+                code: 'BAD_REQUEST',
+                message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`
+            });
+        }
+    }
+    if (bucket._def.bucketConfig?.accept) {
+        const accept = bucket._def.bucketConfig.accept;
+        let accepted = false;
+        for (const acceptedMimeType of accept){
+            if (acceptedMimeType.endsWith('/*')) {
+                const mimeType = acceptedMimeType.replace('/*', '');
+                if (fileInfo.type.startsWith(mimeType)) {
+                    accepted = true;
+                    break;
+                }
+            } else if (fileInfo.type === acceptedMimeType) {
+                accepted = true;
+                break;
+            }
+        }
+        if (!accepted) {
+            throw new EdgeStoreError({
+                code: 'BAD_REQUEST',
+                message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`
+            });
+        }
+    }
     const path = buildPath({
         fileInfo,
         bucket,
@@ -161,12 +192,12 @@ async function deleteFile(params) {
     if (!bucket._def.beforeDelete) {
         throw new Error('You need to define beforeDelete if you want to delete files directly from the frontend.');
     }
-    const file = await provider.getFile({
+    const fileInfo = await provider.getFile({
         url
     });
     const canDelete = await bucket._def.beforeDelete({
         ctx,
-        file
+        fileInfo
     });
     if (!canDelete) {
         throw new Error('Delete not allowed');

package/dist/{shared-6bef8919.js → shared-fac1b0a0.js}

@@ -48,7 +48,7 @@ async function init(params) {
             maxAge: DEFAULT_MAX_AGE,
         }));
     }
-    const baseUrl = provider.getBaseUrl();
+    const baseUrl = await provider.getBaseUrl();
     return {
         newCookies,
         token,
@@ -75,6 +75,7 @@ async function requestUpload(params) {
             fileInfo: {
                 size: fileInfo.size,
                 type: fileInfo.type,
+                fileName: fileInfo.fileName,
                 extension: fileInfo.extension,
                 replaceTargetUrl: fileInfo.replaceTargetUrl,
             },
@@ -91,6 +92,37 @@ async function requestUpload(params) {
             });
         }
     }
+    if (bucket._def.bucketConfig?.maxSize) {
+        if (fileInfo.size > bucket._def.bucketConfig.maxSize) {
+            throw new EdgeStoreError({
+                code: 'BAD_REQUEST',
+                message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`,
+            });
+        }
+    }
+    if (bucket._def.bucketConfig?.accept) {
+        const accept = bucket._def.bucketConfig.accept;
+        let accepted = false;
+        for (const acceptedMimeType of accept) {
+            if (acceptedMimeType.endsWith('/*')) {
+                const mimeType = acceptedMimeType.replace('/*', '');
+                if (fileInfo.type.startsWith(mimeType)) {
+                    accepted = true;
+                    break;
+                }
+            }
+            else if (fileInfo.type === acceptedMimeType) {
+                accepted = true;
+                break;
+            }
+        }
+        if (!accepted) {
+            throw new EdgeStoreError({
+                code: 'BAD_REQUEST',
+                message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`,
+            });
+        }
+    }
     const path = buildPath({
         fileInfo,
         bucket,
@@ -150,12 +182,12 @@ async function deleteFile(params) {
     if (!bucket._def.beforeDelete) {
         throw new Error('You need to define beforeDelete if you want to delete files directly from the frontend.');
     }
-    const file = await provider.getFile({
+    const fileInfo = await provider.getFile({
         url,
     });
     const canDelete = await bucket._def.beforeDelete({
         ctx,
-        file,
+        fileInfo,
     });
     if (!canDelete) {
         throw new Error('Delete not allowed');

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@edgestore/server",
-  "version": "0.0.0-alpha.12",
-  "description": "Image Handling for React/Next.js",
-  "homepage": "https://edge-store.com",
-  "repository": "https://github.com/edgestorejs/edge-store.git",
+  "version": "0.0.0-alpha.14",
+  "description": "The best DX for uploading files from your Next.js app",
+  "homepage": "https://edgestore.dev",
+  "repository": "https://github.com/edgestorejs/edgestore.git",
   "author": "Ravi <me@ravi.com>",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -12,6 +12,8 @@
     "react",
     "nodejs",
     "nextjs",
+    "upload",
+    "file",
     "image",
     "cdn",
     "edgestore",
@@ -92,5 +94,5 @@
     "typescript": "^5.1.6",
     "zod": "^3.21.4"
   },
-  "gitHead": "bec47f77e223a231f5e04070aa8da6a609838e6b"
+  "gitHead": "6e0044e7fcb252014e5a4fc9257d54e897f42b84"
 }

package/src/adapters/next/app/index.ts

@@ -20,18 +20,26 @@ export type CreateContextOptions = {
   req: NextRequest;
 };
 
-export type Config<TCtx> = {
-  provider?: Provider;
-  router: EdgeStoreRouter<TCtx>;
-  createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
-};
+export type Config<TCtx> = TCtx extends Record<string, never>
+  ? {
+      provider?: Provider;
+      router: EdgeStoreRouter<TCtx>;
+    }
+  : {
+      provider?: Provider;
+      router: EdgeStoreRouter<TCtx>;
+      createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
+    };
 
 export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
   const { provider = EdgeStoreProvider() } = config;
   return async (req: NextRequest) => {
     try {
       if (req.nextUrl.pathname === '/api/edgestore/init') {
-        const ctx = await config.createContext({ req });
+        const ctx =
+          'createContext' in config
+            ? await config.createContext({ req })
+            : ({} as TCtx);
         const { newCookies, token, baseUrl } = await init({
           ctx,
           provider,
@@ -88,6 +96,29 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
         return new Response(null, {
           status: 200,
         });
+      } else if (req.nextUrl.pathname === '/api/edgestore/proxy-file') {
+        const url = req.nextUrl.searchParams.get('url');
+        if (typeof url === 'string') {
+          const proxyRes = await fetch(url, {
+            headers: {
+              cookie: req.cookies.toString() ?? '',
+            },
+          });
+
+          const data = await proxyRes.arrayBuffer();
+          return new Response(data, {
+            status: proxyRes.status,
+            headers: {
+              'Content-Type':
+                proxyRes.headers.get('Content-Type') ??
+                'application/octet-stream',
+            },
+          });
+        } else {
+          return new Response(null, {
+            status: 400,
+          });
+        }
       } else {
         return new Response(null, {
           status: 404,

package/src/adapters/next/pages/index.ts

@@ -21,18 +21,26 @@ export type CreateContextOptions = {
   res: NextApiResponse;
 };
 
-export type Config<TCtx> = {
-  provider?: Provider;
-  router: EdgeStoreRouter<TCtx>;
-  createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
-};
+export type Config<TCtx> = TCtx extends Record<string, never>
+  ? {
+      provider?: Provider;
+      router: EdgeStoreRouter<TCtx>;
+    }
+  : {
+      provider?: Provider;
+      router: EdgeStoreRouter<TCtx>;
+      createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
+    };
 
 export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
   const { provider = EdgeStoreProvider() } = config;
   return async (req: NextApiRequest, res: NextApiResponse) => {
     try {
       if (req.url === '/api/edgestore/init') {
-        const ctx = await config.createContext({ req, res });
+        const ctx =
+          'createContext' in config
+            ? await config.createContext({ req, res })
+            : ({} as TCtx);
         const { newCookies, token, baseUrl } = await init({
           ctx,
           provider,
@@ -69,6 +77,25 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           ctxToken: req.cookies['edgestore-ctx'],
         });
         res.status(200).end();
+      } else if (req.url?.startsWith('/api/edgestore/proxy-file')) {
+        const { url } = req.query;
+        if (typeof url === 'string') {
+          const proxyRes = await fetch(url, {
+            headers: {
+              cookie: req.headers.cookie ?? '',
+            },
+          });
+
+          const data = await proxyRes.arrayBuffer();
+          res.setHeader(
+            'Content-Type',
+            proxyRes.headers.get('Content-Type') ?? 'application/octet-stream',
+          );
+
+          res.end(Buffer.from(data));
+        } else {
+          res.status(400).end();
+        }
       } else {
         res.status(404).end();
       }

package/src/adapters/shared.ts

@@ -2,11 +2,7 @@ import { hkdf } from '@panva/hkdf';
 import { serialize } from 'cookie';
 import { EncryptJWT, jwtDecrypt } from 'jose';
 import { v4 as uuidv4 } from 'uuid';
-import {
-  AnyBuilder,
-  AnyPath,
-  EdgeStoreRouter,
-} from '../core/internals/bucketBuilder';
+import { AnyBuilder, EdgeStoreRouter } from '../core/internals/bucketBuilder';
 import EdgeStoreError from '../libs/errors/EdgeStoreError';
 import { Provider } from '../providers/types';
 import { IMAGE_MIME_TYPES } from './imageTypes';
@@ -39,7 +35,7 @@ export async function init<TCtx>(params: {
       }),
     );
   }
-  const baseUrl = provider.getBaseUrl();
+  const baseUrl = await provider.getBaseUrl();
 
   return {
     newCookies,
@@ -55,6 +51,7 @@ export type RequestUploadBody = {
     size: number;
     type: string;
     extension: string;
+    fileName?: string;
     replaceTargetUrl?: string;
   };
 };
@@ -90,6 +87,7 @@ export async function requestUpload<TCtx>(params: {
       fileInfo: {
         size: fileInfo.size,
         type: fileInfo.type,
+        fileName: fileInfo.fileName,
         extension: fileInfo.extension,
         replaceTargetUrl: fileInfo.replaceTargetUrl,
       },
@@ -108,6 +106,40 @@ export async function requestUpload<TCtx>(params: {
     }
   }
 
+  if (bucket._def.bucketConfig?.maxSize) {
+    if (fileInfo.size > bucket._def.bucketConfig.maxSize) {
+      throw new EdgeStoreError({
+        code: 'BAD_REQUEST',
+        message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`,
+      });
+    }
+  }
+
+  if (bucket._def.bucketConfig?.accept) {
+    const accept = bucket._def.bucketConfig.accept;
+    let accepted = false;
+    for (const acceptedMimeType of accept) {
+      if (acceptedMimeType.endsWith('/*')) {
+        const mimeType = acceptedMimeType.replace('/*', '');
+        if (fileInfo.type.startsWith(mimeType)) {
+          accepted = true;
+          break;
+        }
+      } else if (fileInfo.type === acceptedMimeType) {
+        accepted = true;
+        break;
+      }
+    }
+    if (!accepted) {
+      throw new EdgeStoreError({
+        code: 'BAD_REQUEST',
+        message: `"${
+          fileInfo.type
+        }" is not allowed. Accepted types are ${JSON.stringify(accept)}`,
+      });
+    }
+  }
+
   const path = buildPath({
     fileInfo,
     bucket,
@@ -207,12 +239,12 @@ export async function deleteFile<TCtx>(params: {
     );
   }
 
-  const file = await provider.getFile({
+  const fileInfo = await provider.getFile({
     url,
   });
   const canDelete = await bucket._def.beforeDelete({
     ctx,
-    file,
+    fileInfo,
   });
   if (!canDelete) {
     throw new Error('Delete not allowed');
@@ -274,7 +306,7 @@ function buildPath(params: {
   };
 }) {
   const { bucket } = params;
-  const pathParams = bucket._def.path as AnyPath;
+  const pathParams = bucket._def.path;
   const path = pathParams.map((param) => {
     const paramEntries = Object.entries(param);
     if (paramEntries[0] === undefined) {

package/src/core/client/index.ts

@@ -3,6 +3,7 @@ import { Simplify } from '../../types';
 import {
   AnyBuilder,
   InferBucketPathKeys,
+  InferBucketPathObject,
   InferMetadataObject,
 } from '../internals/bucketBuilder';
 import { initEdgeStoreSdk } from '../sdk';
@@ -12,9 +13,7 @@ export type GetFileRes<TBucket extends AnyBuilder> = {
   size: number;
   uploadedAt: Date;
   metadata: InferMetadataObject<TBucket>;
-  path: {
-    [TKey in InferBucketPathKeys<TBucket>]: string;
-  };
+  path: InferBucketPathObject<TBucket>;
 };
 
 type Filter<TBucket extends AnyBuilder> = {
@@ -38,18 +37,22 @@ export type ListFilesRequest<TBucket extends AnyBuilder> = {
 };
 
 export type ListFilesResponse<TBucket extends AnyBuilder> = {
-  data: {
-    url: string;
-    thumbnailUrl: TBucket['_def']['type'] extends 'IMAGE'
-      ? string | null
-      : never;
-    size: number;
-    uploadedAt: Date;
-    metadata: InferMetadataObject<TBucket>;
-    path: {
-      [TKey in InferBucketPathKeys<TBucket>]: string;
-    };
-  }[];
+  data: TBucket['_def']['type'] extends 'IMAGE'
+    ? {
+        url: string;
+        thumbnailUrl: string | null;
+        size: number;
+        uploadedAt: Date;
+        metadata: InferMetadataObject<TBucket>;
+        path: InferBucketPathObject<TBucket>;
+      }[]
+    : {
+        url: string;
+        size: number;
+        uploadedAt: Date;
+        metadata: InferMetadataObject<TBucket>;
+        path: InferBucketPathObject<TBucket>;
+      }[];
   pagination: {
     currentPage: number;
     totalPages: number;
@@ -96,6 +99,14 @@ export function initEdgeStoreClient<TRouter extends AnyRouter>(config: {
   router: TRouter;
   accessKey?: string;
   secretKey?: string;
+  /**
+   * The base URL of your application.
+   *
+   * This is only needed for getting protected files on a development environment.
+   *
+   * @example http://localhost:3000/api/edgestore
+   */
+  baseUrl?: string;
 }) {
   const sdk = initEdgeStoreSdk({
     accessKey: config.accessKey,
@@ -112,7 +123,7 @@ export function initEdgeStoreClient<TRouter extends AnyRouter>(config: {
         async getFile(params) {
           const res = await sdk.getFile(params);
           return {
-            url: res.url,
+            url: getUrl(res.url, config.baseUrl),
             size: res.size,
             uploadedAt: new Date(res.uploadedAt),
             metadata: res.metadata,
@@ -171,7 +182,7 @@ export function initEdgeStoreClient<TRouter extends AnyRouter>(config: {
 
           const files = res.data.map((file) => {
             return {
-              url: file.url,
+              url: getUrl(file.url, config.baseUrl),
               thumbnailUrl: file.thumbnailUrl,
               size: file.size,
               uploadedAt: new Date(file.uploadedAt),
@@ -193,6 +204,28 @@ export function initEdgeStoreClient<TRouter extends AnyRouter>(config: {
   });
 }
 
+/**
+ * Protected files need third-party cookies to work.
+ * Since third party cookies doesn't work on localhost,
+ * we need to proxy the file through the server.
+ */
+function getUrl(url: string, baseUrl?: string) {
+  if (process.env.NODE_ENV === 'development' && !url.includes('/_public/')) {
+    if (!baseUrl) {
+      throw new Error(
+        'Missing baseUrl. You need to pass the baseUrl to `initEdgeStoreClient` to get protected files in development.',
+      );
+    }
+    const proxyUrl = new URL(baseUrl);
+    proxyUrl.pathname = `${proxyUrl.pathname}/proxy-file`;
+    proxyUrl.search = new URLSearchParams({
+      url,
+    }).toString();
+    return proxyUrl.toString();
+  }
+  return url;
+}
+
 export type InferClientResponse<TRouter extends AnyRouter> = {
   [TBucketName in keyof TRouter['buckets']]: {
     [TClienFn in keyof EdgeStoreClient<TRouter>[TBucketName]]: Simplify<

package/src/core/index.ts

@@ -4,6 +4,7 @@ export * from './client';
 export * from './sdk';
 export type {
   InferBucketPathKeys,
+  InferBucketPathObject,
   InferMetadataObject,
 } from './internals/bucketBuilder';