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

package/dist/index.js

@@ -46,12 +46,14 @@ function createBuilder(opts, initDef) {
         type: opts.type,
         input: zod.z.never(),
         path: [],
+        metadata: ()=>({}),
         ...initDef
     };
     return {
         $config: {
             ctx: undefined
         },
+        // @ts-expect-error - I think it would be too much work to make this type correct.
         _def,
         input (input) {
             return createNewBuilder(_def, {
@@ -108,19 +110,26 @@ function createRouterFactory() {
         };
     };
 }
+function initBucket(type, config) {
+    return createBuilder({
+        type
+    }, {
+        bucketConfig: config
+    });
+}
 function createEdgeStoreInner() {
     return function initEdgeStoreInner() {
         return {
             /**
        * Builder object for creating an image bucket
-       */ imageBucket: createBuilder({
-                type: 'IMAGE'
-            }),
+       */ imageBucket (config) {
+                return initBucket('IMAGE', config);
+            },
             /**
        * Builder object for creating a file bucket
-       */ fileBucket: createBuilder({
-                type: 'FILE'
-            }),
+       */ fileBucket (config) {
+                return initBucket('FILE', config);
+            },
             /**
        * Create a router
        */ router: createRouterFactory()
@@ -135,7 +144,7 @@ function createEdgeStoreInner() {
  //   userRole: 'admin' | 'visitor';
  // };
  // const es = initEdgeStore.context<Context>().create();
- // const imagesBucket = es.imageBucket
+ // const imagesBucket = es.imageBucket()
  //   .input(
  //     z.object({
  //       type: z.enum(['profile', 'post']),
@@ -150,7 +159,7 @@ function createEdgeStoreInner() {
  //   .beforeUpload(() => {
  //     return true;
  //   });
- // const a = es.imageBucket
+ // const a = es.imageBucket()
  //   .input(z.object({ type: z.string(), someMeta: z.string().optional() }))
  //   .path(({ ctx, input }) => [{ author: ctx.userId }, { type: input.type }])
  //   .metadata(({ ctx, input }) => ({
@@ -173,7 +182,7 @@ function createEdgeStoreInner() {
  //   .beforeDelete(({ ctx, file }) => {
  //     return true;
  //   });
- // const b = es.imageBucket.path(({ ctx }) => [{ author: ctx.userId }]);
+ // const b = es.imageBucket().path(({ ctx }) => [{ author: ctx.userId }]);
  // const router = es.router({
  //   original: imagesBucket,
  //   imageBucket: a,

package/dist/index.mjs

@@ -42,12 +42,14 @@ function createBuilder(opts, initDef) {
         type: opts.type,
         input: z.never(),
         path: [],
+        metadata: ()=>({}),
         ...initDef
     };
     return {
         $config: {
             ctx: undefined
         },
+        // @ts-expect-error - I think it would be too much work to make this type correct.
         _def,
         input (input) {
             return createNewBuilder(_def, {
@@ -104,19 +106,26 @@ function createRouterFactory() {
         };
     };
 }
+function initBucket(type, config) {
+    return createBuilder({
+        type
+    }, {
+        bucketConfig: config
+    });
+}
 function createEdgeStoreInner() {
     return function initEdgeStoreInner() {
         return {
             /**
        * Builder object for creating an image bucket
-       */ imageBucket: createBuilder({
-                type: 'IMAGE'
-            }),
+       */ imageBucket (config) {
+                return initBucket('IMAGE', config);
+            },
             /**
        * Builder object for creating a file bucket
-       */ fileBucket: createBuilder({
-                type: 'FILE'
-            }),
+       */ fileBucket (config) {
+                return initBucket('FILE', config);
+            },
             /**
        * Create a router
        */ router: createRouterFactory()
@@ -131,7 +140,7 @@ function createEdgeStoreInner() {
  //   userRole: 'admin' | 'visitor';
  // };
  // const es = initEdgeStore.context<Context>().create();
- // const imagesBucket = es.imageBucket
+ // const imagesBucket = es.imageBucket()
  //   .input(
  //     z.object({
  //       type: z.enum(['profile', 'post']),
@@ -146,7 +155,7 @@ function createEdgeStoreInner() {
  //   .beforeUpload(() => {
  //     return true;
  //   });
- // const a = es.imageBucket
+ // const a = es.imageBucket()
  //   .input(z.object({ type: z.string(), someMeta: z.string().optional() }))
  //   .path(({ ctx, input }) => [{ author: ctx.userId }, { type: input.type }])
  //   .metadata(({ ctx, input }) => ({
@@ -169,7 +178,7 @@ function createEdgeStoreInner() {
  //   .beforeDelete(({ ctx, file }) => {
  //     return true;
  //   });
- // const b = es.imageBucket.path(({ ctx }) => [{ author: ctx.userId }]);
+ // const b = es.imageBucket().path(({ ctx }) => [{ author: ctx.userId }]);
  // const router = es.router({
  //   original: imagesBucket,
  //   imageBucket: a,

package/dist/providers/edgestore/index.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../index-3999aae6.js');
+var index = require('../../index-62d969e5.js');
 
-const DEFAULT_BASE_URL = process.env.EDGE_STORE_BASE_URL ?? 'https://files.edge-store.com';
+const DEFAULT_BASE_URL = process.env.EDGE_STORE_BASE_URL ?? 'https://files.edgestore.dev';
 function EdgeStoreProvider(options) {
     const { accessKey = process.env.EDGE_STORE_ACCESS_KEY, secretKey = process.env.EDGE_STORE_SECRET_KEY, baseUrl = process.env.EDGE_STORE_BASE_URL ?? DEFAULT_BASE_URL } = options ?? {};
     if (!accessKey || !secretKey) {

package/dist/providers/edgestore/index.mjs

@@ -1,6 +1,6 @@
-import { E as EdgeStoreCredentialsError, i as initEdgeStoreSdk } from '../../index-ca41982b.mjs';
+import { E as EdgeStoreCredentialsError, i as initEdgeStoreSdk } from '../../index-579b8015.mjs';
 
-const DEFAULT_BASE_URL = process.env.EDGE_STORE_BASE_URL ?? 'https://files.edge-store.com';
+const DEFAULT_BASE_URL = process.env.EDGE_STORE_BASE_URL ?? 'https://files.edgestore.dev';
 function EdgeStoreProvider(options) {
     const { accessKey = process.env.EDGE_STORE_ACCESS_KEY, secretKey = process.env.EDGE_STORE_SECRET_KEY, baseUrl = process.env.EDGE_STORE_BASE_URL ?? DEFAULT_BASE_URL } = options ?? {};
     if (!accessKey || !secretKey) {

package/dist/providers/types.d.ts

@@ -1,4 +1,4 @@
-import { AnyBuilder, EdgeStoreRouter } from '../core/internals/bucketBuilder';
+import { AnyBuilder, AnyMetadata, EdgeStoreRouter } from '../core/internals/bucketBuilder';
 import { MaybePromise } from '../types';
 export type InitParams = {
     ctx: any;
@@ -36,9 +36,7 @@ export type RequestUploadParams = {
             key: string;
             value: string;
         }[];
-        metadata?: {
-            [key: string]: string;
-        };
+        metadata: AnyMetadata;
         replaceTargetUrl?: string;
     };
 };

package/dist/providers/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/providers/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/providers/types.ts"],"names":[],"mappings":"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"}

package/dist/{shared-6bef8919.js → shared-10685370.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,

package/dist/{shared-43667670.mjs → shared-59c74ca7.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,

package/dist/{shared-f7607e44.js → shared-5ed6e18e.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,

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@edgestore/server",
-  "version": "0.0.0-alpha.12",
+  "version": "0.0.0-alpha.13",
   "description": "Image Handling for React/Next.js",
-  "homepage": "https://edge-store.com",
+  "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edge-store.git",
   "author": "Ravi <me@ravi.com>",
   "main": "dist/index.js",
@@ -92,5 +92,5 @@
     "typescript": "^5.1.6",
     "zod": "^3.21.4"
   },
-  "gitHead": "bec47f77e223a231f5e04070aa8da6a609838e6b"
+  "gitHead": "f89bcb0360feec96fb842ad447d86a0e5c58900d"
 }

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,

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,

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,
@@ -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

@@ -38,18 +38,26 @@ 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: {
+          [TKey in InferBucketPathKeys<TBucket>]: string;
+        };
+      }[]
+    : {
+        url: string;
+        size: number;
+        uploadedAt: Date;
+        metadata: InferMetadataObject<TBucket>;
+        path: {
+          [TKey in InferBucketPathKeys<TBucket>]: string;
+        };
+      }[];
   pagination: {
     currentPage: number;
     totalPages: number;