@edgestore/server 0.1.5-alpha.0 → 0.1.5-alpha.10

package/dist/{shared-6dea9e91.mjs → shared-d7ea66fb.mjs}

@@ -2,22 +2,7 @@ import { hkdf } from '@panva/hkdf';
 import { serialize } from 'cookie';
 import { EncryptJWT, jwtDecrypt } from 'jose';
 import { v4 } from 'uuid';
-import { _ } from '@swc/helpers/_/_define_property';
-
-const EDGE_STORE_ERROR_CODES = {
-    BAD_REQUEST: 400,
-    UNAUTHORIZED: 401
-};
-class EdgeStoreError extends Error {
-    constructor(opts){
-        super(opts.message);
-        _(this, "cause", void 0);
-        _(this, "code", void 0);
-        this.name = 'EdgeStoreError';
-        this.code = opts.code;
-        this.cause = opts.cause;
-    }
-}
+import { E as EdgeStoreError } from './index-23d1ede9.mjs';
 
 const IMAGE_MIME_TYPES = [
     'image/jpeg',
@@ -33,7 +18,11 @@ const IMAGE_MIME_TYPES = [
 // TODO: change it to 1 hour when we have a way to refresh the token
 const DEFAULT_MAX_AGE = 30 * 24 * 60 * 60; // 30 days
 async function init(params) {
+    const log = globalThis._EDGE_STORE_LOGGER;
     const { ctx, provider, router } = params;
+    log.debug('Running [init]', {
+        ctx
+    });
     const ctxToken = await encryptJWT(ctx);
     const { token } = await provider.init({
         ctx,
@@ -52,6 +41,12 @@ async function init(params) {
         }));
     }
     const baseUrl = await provider.getBaseUrl();
+    log.debug('Finished [init]', {
+        ctx,
+        newCookies,
+        token,
+        baseUrl
+    });
     return {
         newCookies,
         token,
@@ -60,6 +55,12 @@ async function init(params) {
 }
 async function requestUpload(params) {
     const { provider, router, ctxToken, body: { bucketName, input, fileInfo } } = params;
+    const log = globalThis._EDGE_STORE_LOGGER;
+    log.debug('Running [requestUpload]', {
+        bucketName,
+        input,
+        fileInfo
+    });
     if (!ctxToken) {
         throw new EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
@@ -67,11 +68,18 @@ async function requestUpload(params) {
         });
     }
     const ctx = await getContext(ctxToken);
+    log.debug('Decrypted Context', {
+        ctx
+    });
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST'
+        });
     }
     if (bucket._def.beforeUpload) {
+        log.debug('Running [beforeUpload]');
         const canUpload = await bucket._def.beforeUpload?.({
             ctx,
             input,
@@ -84,23 +92,37 @@ async function requestUpload(params) {
                 temporary: fileInfo.temporary
             }
         });
+        log.debug('Finished [beforeUpload]', {
+            canUpload
+        });
         if (!canUpload) {
-            throw new Error('Upload not allowed');
+            throw new EdgeStoreError({
+                message: 'Upload not allowed for the current context',
+                code: 'UPLOAD_NOT_ALLOWED'
+            });
         }
     }
     if (bucket._def.type === 'IMAGE') {
         if (!IMAGE_MIME_TYPES.includes(fileInfo.type)) {
             throw new EdgeStoreError({
-                code: 'BAD_REQUEST',
-                message: 'Only images are allowed in this bucket'
+                code: 'MIME_TYPE_NOT_ALLOWED',
+                message: 'Only images are allowed in this bucket',
+                details: {
+                    allowedMimeTypes: IMAGE_MIME_TYPES,
+                    mimeType: fileInfo.type
+                }
             });
         }
     }
     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}`
+                code: 'FILE_TOO_LARGE',
+                message: `File size is too big. Max size is ${bucket._def.bucketConfig.maxSize}`,
+                details: {
+                    maxFileSize: bucket._def.bucketConfig.maxSize,
+                    fileSize: fileInfo.size
+                }
             });
         }
     }
@@ -121,8 +143,12 @@ async function requestUpload(params) {
         }
         if (!accepted) {
             throw new EdgeStoreError({
-                code: 'BAD_REQUEST',
-                message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`
+                code: 'MIME_TYPE_NOT_ALLOWED',
+                message: `"${fileInfo.type}" is not allowed. Accepted types are ${JSON.stringify(accept)}`,
+                details: {
+                    allowedMimeTypes: accept,
+                    mimeType: fileInfo.type
+                }
             });
         }
     }
@@ -139,6 +165,12 @@ async function requestUpload(params) {
         input
     });
     const isPublic = bucket._def.accessControl === undefined;
+    log.debug('upload info', {
+        path,
+        metadata,
+        isPublic,
+        bucketType: bucket._def.type
+    });
     const requestUploadRes = await provider.requestUpload({
         bucketName,
         bucketType: bucket._def.type,
@@ -149,11 +181,8 @@ async function requestUpload(params) {
             metadata
         }
     });
-    const parsedPath = path.reduce((acc, curr)=>{
-        acc[curr.key] = curr.value;
-        return acc;
-    }, {});
-    const pathOrder = path.map((p)=>p.key);
+    const { parsedPath, pathOrder } = parsePath(path);
+    log.debug('Finished [requestUpload]');
     return {
         ...requestUploadRes,
         size: fileInfo.size,
@@ -164,7 +193,12 @@ async function requestUpload(params) {
     };
 }
 async function requestUploadParts(params) {
-    const { provider, router, ctxToken, body: { multipart, path } } = params;
+    const { provider, ctxToken, body: { multipart, path } } = params;
+    const log = globalThis._EDGE_STORE_LOGGER;
+    log.debug('Running [requestUploadParts]', {
+        multipart,
+        path
+    });
     if (!ctxToken) {
         throw new EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
@@ -172,17 +206,21 @@ async function requestUploadParts(params) {
         });
     }
     await getContext(ctxToken); // just to check if the token is valid
-    const bucket = router.buckets[multipart.uploadId];
-    if (!bucket) {
-        throw new Error(`Bucket ${multipart.uploadId} not found`);
-    }
-    return await provider.requestUploadParts({
+    const res = await provider.requestUploadParts({
         multipart,
         path
     });
+    log.debug('Finished [requestUploadParts]');
+    return res;
 }
 async function completeMultipartUpload(params) {
     const { provider, router, ctxToken, body: { bucketName, uploadId, key, parts } } = params;
+    const log = globalThis._EDGE_STORE_LOGGER;
+    log.debug('Running [completeMultipartUpload]', {
+        bucketName,
+        uploadId,
+        key
+    });
     if (!ctxToken) {
         throw new EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
@@ -192,16 +230,26 @@ async function completeMultipartUpload(params) {
     await getContext(ctxToken); // just to check if the token is valid
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST'
+        });
     }
-    return await provider.completeMultipartUpload({
+    const res = await provider.completeMultipartUpload({
         uploadId,
         key,
         parts
     });
+    log.debug('Finished [completeMultipartUpload]');
+    return res;
 }
 async function confirmUpload(params) {
     const { provider, router, ctxToken, body: { bucketName, url } } = params;
+    const log = globalThis._EDGE_STORE_LOGGER;
+    log.debug('Running [confirmUpload]', {
+        bucketName,
+        url
+    });
     if (!ctxToken) {
         throw new EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
@@ -211,15 +259,25 @@ async function confirmUpload(params) {
     await getContext(ctxToken); // just to check if the token is valid
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST'
+        });
     }
-    return await provider.confirmUpload({
+    const res = await provider.confirmUpload({
         bucket,
         url: unproxyUrl(url)
     });
+    log.debug('Finished [confirmUpload]');
+    return res;
 }
 async function deleteFile(params) {
     const { provider, router, ctxToken, body: { bucketName, url } } = params;
+    const log = globalThis._EDGE_STORE_LOGGER;
+    log.debug('Running [deleteFile]', {
+        bucketName,
+        url
+    });
     if (!ctxToken) {
         throw new EdgeStoreError({
             message: 'Missing edgestore-ctx cookie',
@@ -229,30 +287,44 @@ async function deleteFile(params) {
     const ctx = await getContext(ctxToken);
     const bucket = router.buckets[bucketName];
     if (!bucket) {
-        throw new Error(`Bucket ${bucketName} not found`);
+        throw new EdgeStoreError({
+            message: `Bucket ${bucketName} not found`,
+            code: 'BAD_REQUEST'
+        });
     }
     if (!bucket._def.beforeDelete) {
-        throw new Error('You need to define beforeDelete if you want to delete files directly from the frontend.');
+        throw new EdgeStoreError({
+            message: 'You need to define beforeDelete if you want to delete files directly from the frontend.',
+            code: 'SERVER_ERROR'
+        });
     }
     const fileInfo = await provider.getFile({
-        url
+        url: unproxyUrl(url)
     });
     const canDelete = await bucket._def.beforeDelete({
         ctx,
         fileInfo
     });
     if (!canDelete) {
-        throw new Error('Delete not allowed');
+        throw new EdgeStoreError({
+            message: 'Delete not allowed for the current context',
+            code: 'DELETE_NOT_ALLOWED'
+        });
     }
-    return await provider.deleteFile({
+    const res = await provider.deleteFile({
         bucket,
         url: unproxyUrl(url)
     });
+    log.debug('Finished [deleteFile]');
+    return res;
 }
 async function encryptJWT(ctx) {
     const secret = process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
     if (!secret) {
-        throw new Error('EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined');
+        throw new EdgeStoreError({
+            message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
+            code: 'SERVER_ERROR'
+        });
     }
     const encryptionSecret = await getDerivedEncryptionKey(secret);
     return await new EncryptJWT(ctx).setProtectedHeader({
@@ -263,7 +335,10 @@ async function encryptJWT(ctx) {
 async function decryptJWT(token) {
     const secret = process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
     if (!secret) {
-        throw new Error('EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not set');
+        throw new EdgeStoreError({
+            message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
+            code: 'SERVER_ERROR'
+        });
     }
     const encryptionSecret = await getDerivedEncryptionKey(secret);
     const { payload } = await jwtDecrypt(token, encryptionSecret, {
@@ -280,13 +355,19 @@ function buildPath(params) {
     const path = pathParams.map((param)=>{
         const paramEntries = Object.entries(param);
         if (paramEntries[0] === undefined) {
-            throw new Error('Missing path param');
+            throw new EdgeStoreError({
+                message: `Empty path param found in: ${JSON.stringify(pathParams)}`,
+                code: 'SERVER_ERROR'
+            });
         }
         const [key, value] = paramEntries[0];
         // this is a string like: "ctx.xxx" or "input.yyy.zzz"
         const currParamVal = value().split('.').reduce((acc2, key)=>{
             if (acc2[key] === undefined) {
-                throw new Error(`Missing key ${key} in ${JSON.stringify(acc2)}`);
+                throw new EdgeStoreError({
+                    message: `Missing key ${key} in ${JSON.stringify(acc2)}`,
+                    code: 'BAD_REQUEST'
+                });
             }
             return acc2[key];
         }, params.pathAttrs);
@@ -297,10 +378,18 @@ function buildPath(params) {
     });
     return path;
 }
+function parsePath(path) {
+    const parsedPath = path.reduce((acc, curr)=>{
+        acc[curr.key] = curr.value;
+        return acc;
+    }, {});
+    const pathOrder = path.map((p)=>p.key);
+    return {
+        parsedPath,
+        pathOrder
+    };
+}
 async function getContext(token) {
-    if (!token) {
-        throw new Error('No token');
-    }
     return await decryptJWT(token);
 }
 /**
@@ -320,4 +409,4 @@ async function getContext(token) {
     return url;
 }
 
-export { EdgeStoreError as E, requestUploadParts as a, confirmUpload as b, completeMultipartUpload as c, deleteFile as d, EDGE_STORE_ERROR_CODES as e, init as i, requestUpload as r };
+export { requestUploadParts as a, buildPath as b, completeMultipartUpload as c, confirmUpload as d, deleteFile as e, init as i, parsePath as p, requestUpload as r };

package/dist/types.d.ts

@@ -35,6 +35,12 @@ export type ThenArg<TType> = TType extends PromiseLike<infer U> ? ThenArg<U> : T
 export type Simplify<TType> = TType extends any[] | Date ? TType : {
     [K in keyof TType]: TType[K];
 };
+/**
+ * @internal
+ */
+export type Prettify<TType> = {
+    [K in keyof TType]: TType[K];
+} & {};
 /**
  * @public
  */

package/dist/types.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgestore/server",
-  "version": "0.1.5-alpha.0",
+  "version": "0.1.5-alpha.10",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edgestore.git",
@@ -42,6 +42,11 @@
       "require": "./dist/adapters/index.js",
       "default": "./dist/adapters/index.js"
     },
+    "./adapters/express": {
+      "import": "./dist/adapters/express/index.mjs",
+      "require": "./dist/adapters/express/index.js",
+      "default": "./dist/adapters/express/index.js"
+    },
     "./adapters/next/pages": {
       "import": "./dist/adapters/next/pages/index.mjs",
       "require": "./dist/adapters/next/pages/index.js",
@@ -57,6 +62,11 @@
       "require": "./dist/providers/aws/index.js",
       "default": "./dist/providers/aws/index.js"
     },
+    "./providers/azure": {
+      "import": "./dist/providers/azure/index.mjs",
+      "require": "./dist/providers/azure/index.js",
+      "default": "./dist/providers/azure/index.js"
+    },
     "./providers/edgestore": {
       "import": "./dist/providers/edgestore/index.mjs",
       "require": "./dist/providers/edgestore/index.js",
@@ -92,6 +102,7 @@
   "peerDependencies": {
     "@aws-sdk/client-s3": ">=3.0.0",
     "@aws-sdk/s3-request-presigner": ">=3.0.0",
+    "@azure/storage-blob": "^12.17.0",
     "zod": ">=3.0.0"
   },
   "peerDependenciesMeta": {
@@ -103,11 +114,15 @@
     },
     "@aws-sdk/s3-request-presigner": {
       "optional": true
+    },
+    "@azure/storage-blob": {
+      "optional": true
     }
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.420.0",
     "@aws-sdk/s3-request-presigner": "^3.420.0",
+    "@azure/storage-blob": "^12.17.0",
     "@types/cookie": "^0.5.1",
     "@types/node": "^18.11.18",
     "@types/uuid": "^9.0.1",
@@ -117,5 +132,5 @@
     "typescript": "^5.1.6",
     "zod": "^3.21.4"
   },
-  "gitHead": "bea31f57147499993eaf25c86f24c211dc86dd91"
+  "gitHead": "6cf9f5bbea5c1cf990b8b8caa70bc4341e046e59"
 }

package/providers/azure/index.d.ts

@@ -0,0 +1 @@
+export * from '../../dist/providers/azure';

package/providers/azure/index.js

@@ -0,0 +1 @@
+module.exports = require('../../dist/providers/azure');

package/src/adapters/express/index.ts

@@ -0,0 +1,164 @@
+import { type Request, type Response } from 'express';
+import { type EdgeStoreRouter } from '../../core/internals/bucketBuilder';
+import EdgeStoreError, {
+  EDGE_STORE_ERROR_CODES,
+  type EdgeStoreErrorCodeKey,
+} from '../../libs/errors/EdgeStoreError';
+import Logger, { type LogLevel } from '../../libs/logger';
+import { EdgeStoreProvider } from '../../providers/edgestore';
+import { type Provider } from '../../providers/types';
+import { type MaybePromise } from '../../types';
+import {
+  completeMultipartUpload,
+  confirmUpload,
+  deleteFile,
+  init,
+  requestUpload,
+  requestUploadParts,
+  type CompleteMultipartUploadBody,
+  type ConfirmUploadBody,
+  type DeleteFileBody,
+  type RequestUploadBody,
+  type RequestUploadPartsParams,
+} from '../shared';
+
+export type CreateContextOptions = {
+  req: Request;
+  res: Response;
+};
+
+export type Config<TCtx> = {
+  provider?: Provider;
+  router: EdgeStoreRouter<TCtx>;
+  logLevel?: LogLevel;
+} & (TCtx extends Record<string, never>
+  ? object
+  : {
+      provider?: Provider;
+      router: EdgeStoreRouter<TCtx>;
+      createContext: (opts: CreateContextOptions) => MaybePromise<TCtx>;
+    });
+
+declare const globalThis: {
+  _EDGE_STORE_LOGGER: Logger;
+};
+
+export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
+  const { provider = EdgeStoreProvider() } = config;
+  const log = new Logger(config.logLevel);
+  globalThis._EDGE_STORE_LOGGER = log;
+  log.debug('Creating Edge Store Express handler');
+
+  return async (req: Request, res: Response) => {
+    try {
+      if (req.url?.includes?.('/health')) {
+        res.send('OK');
+      } else if (req.url?.includes?.('/init')) {
+        let ctx = {} as TCtx;
+        try {
+          ctx =
+            'createContext' in config
+              ? await config.createContext({ req, res })
+              : ({} as TCtx);
+        } catch (err) {
+          throw new EdgeStoreError({
+            message: 'Error creating context',
+            code: 'CREATE_CONTEXT_ERROR',
+            cause: err instanceof Error ? err : undefined,
+          });
+        }
+        const { newCookies, token, baseUrl } = await init({
+          ctx,
+          provider,
+          router: config.router,
+        });
+        res.setHeader('Set-Cookie', newCookies);
+        res.json({
+          token,
+          baseUrl,
+        });
+      } else if (req.url?.includes?.('/request-upload')) {
+        res.json(
+          await requestUpload({
+            provider,
+            router: config.router,
+            body: req.body as RequestUploadBody,
+            ctxToken: req.cookies['edgestore-ctx'],
+          }),
+        );
+      } else if (req.url?.includes?.('/request-upload-parts')) {
+        res.json(
+          await requestUploadParts({
+            provider,
+            router: config.router,
+            body: req.body as RequestUploadPartsParams,
+            ctxToken: req.cookies['edgestore-ctx'],
+          }),
+        );
+      } else if (req.url?.includes?.('/complete-multipart-upload')) {
+        await completeMultipartUpload({
+          provider,
+          router: config.router,
+          body: req.body as CompleteMultipartUploadBody,
+          ctxToken: req.cookies['edgestore-ctx'],
+        });
+        res.status(200).end();
+      } else if (req.url?.includes?.('/confirm-upload')) {
+        res.json(
+          await confirmUpload({
+            provider,
+            router: config.router,
+            body: req.body as ConfirmUploadBody,
+            ctxToken: req.cookies['edgestore-ctx'],
+          }),
+        );
+      } else if (req.url?.includes?.('/delete-file')) {
+        res.json(
+          await deleteFile({
+            provider,
+            router: config.router,
+            body: req.body as DeleteFileBody,
+            ctxToken: req.cookies['edgestore-ctx'],
+          }),
+        );
+      } else if (req.url?.includes?.('/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();
+      }
+    } catch (err) {
+      if (err instanceof EdgeStoreError) {
+        log[err.level](err.formattedMessage());
+        if (err.cause) log[err.level](err.cause);
+        res
+          .status(EDGE_STORE_ERROR_CODES[err.code as EdgeStoreErrorCodeKey])
+          .json(err.formattedJson());
+      } else {
+        log.error(err);
+        res.status(500).send(
+          new EdgeStoreError({
+            message: 'Internal Server Error',
+            code: 'SERVER_ERROR',
+          }).formattedJson(),
+        );
+      }
+    }
+  };
+}