@edgestore/server 0.2.0 → 0.2.1

package/dist/adapters/express/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/express/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAgB1D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACnE,CAAC,CAAC;AAMP,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,SAMnD,OAAO,OAAO,QAAQ,mBAgH1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/express/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAiB1D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACnE,CAAC,CAAC;AAMP,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,SAMnD,OAAO,OAAO,QAAQ,mBAiH1C"}

package/dist/adapters/express/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var shared = require('@edgestore/shared');
-var logger = require('../../logger-dcb682ae.js');
+var utils = require('../../utils-5819d5e1.js');
 var providers_edgestore_index = require('../../providers/edgestore/index.js');
 var shared$1 = require('../../shared-7c700083.js');
 require('../../index-4491caf0.js');
@@ -14,14 +14,15 @@ require('uuid');
 
 function createEdgeStoreExpressHandler(config) {
     const { provider = providers_edgestore_index.EdgeStoreProvider() } = config;
-    const log = new logger.Logger(config.logLevel);
+    const log = new utils.Logger(config.logLevel);
     globalThis._EDGE_STORE_LOGGER = log;
     log.debug('Creating Edge Store Express handler');
     return async (req, res)=>{
         try {
-            if (req.url?.includes?.('/health')) {
+            const pathname = req.url ?? '';
+            if (utils.matchPath(pathname, '/health')) {
                 res.send('OK');
-            } else if (req.url?.includes?.('/init')) {
+            } else if (utils.matchPath(pathname, '/init')) {
                 let ctx = {};
                 try {
                     ctx = 'createContext' in config ? await config.createContext({
@@ -45,21 +46,21 @@ function createEdgeStoreExpressHandler(config) {
                     token,
                     baseUrl
                 });
-            } else if (req.url?.includes?.('/request-upload')) {
+            } else if (utils.matchPath(pathname, '/request-upload')) {
                 res.json(await shared$1.requestUpload({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/request-upload-parts')) {
+            } else if (utils.matchPath(pathname, '/request-upload-parts')) {
                 res.json(await shared$1.requestUploadParts({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/complete-multipart-upload')) {
+            } else if (utils.matchPath(pathname, '/complete-multipart-upload')) {
                 await shared$1.completeMultipartUpload({
                     provider,
                     router: config.router,
@@ -67,21 +68,21 @@ function createEdgeStoreExpressHandler(config) {
                     ctxToken: req.cookies['edgestore-ctx']
                 });
                 res.status(200).end();
-            } else if (req.url?.includes?.('/confirm-upload')) {
+            } else if (utils.matchPath(pathname, '/confirm-upload')) {
                 res.json(await shared$1.confirmUpload({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/delete-file')) {
+            } else if (utils.matchPath(pathname, '/delete-file')) {
                 res.json(await shared$1.deleteFile({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/proxy-file')) {
+            } else if (utils.matchPath(pathname, '/proxy-file')) {
                 const { url } = req.query;
                 if (typeof url === 'string') {
                     const proxyRes = await fetch(url, {

package/dist/adapters/express/index.mjs

@@ -1,5 +1,5 @@
 import { EdgeStoreError, EDGE_STORE_ERROR_CODES } from '@edgestore/shared';
-import { L as Logger } from '../../logger-09f43a75.mjs';
+import { L as Logger, m as matchPath } from '../../utils-f6f56d38.mjs';
 import { EdgeStoreProvider } from '../../providers/edgestore/index.mjs';
 import { i as init, r as requestUpload, a as requestUploadParts, c as completeMultipartUpload, d as confirmUpload, e as deleteFile } from '../../shared-039276af.mjs';
 import '../../index-28efdacf.mjs';
@@ -15,9 +15,10 @@ function createEdgeStoreExpressHandler(config) {
     log.debug('Creating Edge Store Express handler');
     return async (req, res)=>{
         try {
-            if (req.url?.includes?.('/health')) {
+            const pathname = req.url ?? '';
+            if (matchPath(pathname, '/health')) {
                 res.send('OK');
-            } else if (req.url?.includes?.('/init')) {
+            } else if (matchPath(pathname, '/init')) {
                 let ctx = {};
                 try {
                     ctx = 'createContext' in config ? await config.createContext({
@@ -41,21 +42,21 @@ function createEdgeStoreExpressHandler(config) {
                     token,
                     baseUrl
                 });
-            } else if (req.url?.includes?.('/request-upload')) {
+            } else if (matchPath(pathname, '/request-upload')) {
                 res.json(await requestUpload({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/request-upload-parts')) {
+            } else if (matchPath(pathname, '/request-upload-parts')) {
                 res.json(await requestUploadParts({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/complete-multipart-upload')) {
+            } else if (matchPath(pathname, '/complete-multipart-upload')) {
                 await completeMultipartUpload({
                     provider,
                     router: config.router,
@@ -63,21 +64,21 @@ function createEdgeStoreExpressHandler(config) {
                     ctxToken: req.cookies['edgestore-ctx']
                 });
                 res.status(200).end();
-            } else if (req.url?.includes?.('/confirm-upload')) {
+            } else if (matchPath(pathname, '/confirm-upload')) {
                 res.json(await confirmUpload({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/delete-file')) {
+            } else if (matchPath(pathname, '/delete-file')) {
                 res.json(await deleteFile({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/proxy-file')) {
+            } else if (matchPath(pathname, '/proxy-file')) {
                 const { url } = req.query;
                 if (typeof url === 'string') {
                     const proxyRes = await fetch(url, {

package/dist/adapters/next/app/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapters/next/app/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAgB7D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,WAAW,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACnE,CAAC,CAAC;AAMP,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,SAMhD,WAAW,uBAqK/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapters/next/app/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAiB7D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,WAAW,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACnE,CAAC,CAAC;AAMP,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,SAMhD,WAAW,uBAwK/B"}

package/dist/adapters/next/app/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var shared = require('@edgestore/shared');
-var logger = require('../../../logger-dcb682ae.js');
+var utils = require('../../../utils-5819d5e1.js');
 var providers_edgestore_index = require('../../../providers/edgestore/index.js');
 var shared$1 = require('../../../shared-7c700083.js');
 require('../../../index-4491caf0.js');
@@ -14,7 +14,7 @@ require('uuid');
 
 function createEdgeStoreNextHandler(config) {
     const { provider = providers_edgestore_index.EdgeStoreProvider() } = config;
-    const log = new logger.Logger(config.logLevel);
+    const log = new utils.Logger(config.logLevel);
     globalThis._EDGE_STORE_LOGGER = log;
     log.debug('Creating Edge Store Next handler (app adapter)');
     return async (req)=>{
@@ -23,11 +23,12 @@ function createEdgeStoreNextHandler(config) {
                 message: 'Error running the app adapter. Make sure you are importing the correct adapter in your router configuration',
                 code: 'SERVER_ERROR'
             });
-            if (req.nextUrl.pathname.endsWith('/health')) {
+            const pathname = req.nextUrl.pathname;
+            if (utils.matchPath(pathname, '/health')) {
                 return new Response('OK', {
                     status: 200
                 });
-            } else if (req.nextUrl.pathname.endsWith('/init')) {
+            } else if (utils.matchPath(pathname, '/init')) {
                 let ctx = {};
                 try {
                     ctx = 'createContext' in config ? await config.createContext({
@@ -58,7 +59,7 @@ function createEdgeStoreNextHandler(config) {
                     res.headers.append('Set-Cookie', cookie);
                 }
                 return res;
-            } else if (req.nextUrl.pathname.endsWith('/request-upload')) {
+            } else if (utils.matchPath(pathname, '/request-upload')) {
                 const res = await shared$1.requestUpload({
                     provider,
                     router: config.router,
@@ -71,7 +72,7 @@ function createEdgeStoreNextHandler(config) {
                         'Content-Type': 'application/json'
                     }
                 });
-            } else if (req.nextUrl.pathname.endsWith('/request-upload-parts')) {
+            } else if (utils.matchPath(pathname, '/request-upload-parts')) {
                 const res = await shared$1.requestUploadParts({
                     provider,
                     router: config.router,
@@ -84,7 +85,7 @@ function createEdgeStoreNextHandler(config) {
                         'Content-Type': 'application/json'
                     }
                 });
-            } else if (req.nextUrl.pathname.endsWith('/complete-multipart-upload')) {
+            } else if (utils.matchPath(pathname, '/complete-multipart-upload')) {
                 await shared$1.completeMultipartUpload({
                     provider,
                     router: config.router,
@@ -94,7 +95,7 @@ function createEdgeStoreNextHandler(config) {
                 return new Response(null, {
                     status: 200
                 });
-            } else if (req.nextUrl.pathname.endsWith('/confirm-upload')) {
+            } else if (utils.matchPath(pathname, '/confirm-upload')) {
                 const res = await shared$1.confirmUpload({
                     provider,
                     router: config.router,
@@ -107,7 +108,7 @@ function createEdgeStoreNextHandler(config) {
                         'Content-Type': 'application/json'
                     }
                 });
-            } else if (req.nextUrl.pathname.endsWith('/delete-file')) {
+            } else if (utils.matchPath(pathname, '/delete-file')) {
                 const res = await shared$1.deleteFile({
                     provider,
                     router: config.router,
@@ -120,7 +121,7 @@ function createEdgeStoreNextHandler(config) {
                         'Content-Type': 'application/json'
                     }
                 });
-            } else if (req.nextUrl.pathname.endsWith('/proxy-file')) {
+            } else if (utils.matchPath(pathname, '/proxy-file')) {
                 const url = req.nextUrl.searchParams.get('url');
                 if (typeof url === 'string') {
                     const proxyRes = await fetch(url, {

package/dist/adapters/next/app/index.mjs

@@ -1,5 +1,5 @@
 import { EdgeStoreError, EDGE_STORE_ERROR_CODES } from '@edgestore/shared';
-import { L as Logger } from '../../../logger-09f43a75.mjs';
+import { L as Logger, m as matchPath } from '../../../utils-f6f56d38.mjs';
 import { EdgeStoreProvider } from '../../../providers/edgestore/index.mjs';
 import { i as init, r as requestUpload, a as requestUploadParts, c as completeMultipartUpload, d as confirmUpload, e as deleteFile } from '../../../shared-039276af.mjs';
 import '../../../index-28efdacf.mjs';
@@ -19,11 +19,12 @@ function createEdgeStoreNextHandler(config) {
                 message: 'Error running the app adapter. Make sure you are importing the correct adapter in your router configuration',
                 code: 'SERVER_ERROR'
             });
-            if (req.nextUrl.pathname.endsWith('/health')) {
+            const pathname = req.nextUrl.pathname;
+            if (matchPath(pathname, '/health')) {
                 return new Response('OK', {
                     status: 200
                 });
-            } else if (req.nextUrl.pathname.endsWith('/init')) {
+            } else if (matchPath(pathname, '/init')) {
                 let ctx = {};
                 try {
                     ctx = 'createContext' in config ? await config.createContext({
@@ -54,7 +55,7 @@ function createEdgeStoreNextHandler(config) {
                     res.headers.append('Set-Cookie', cookie);
                 }
                 return res;
-            } else if (req.nextUrl.pathname.endsWith('/request-upload')) {
+            } else if (matchPath(pathname, '/request-upload')) {
                 const res = await requestUpload({
                     provider,
                     router: config.router,
@@ -67,7 +68,7 @@ function createEdgeStoreNextHandler(config) {
                         'Content-Type': 'application/json'
                     }
                 });
-            } else if (req.nextUrl.pathname.endsWith('/request-upload-parts')) {
+            } else if (matchPath(pathname, '/request-upload-parts')) {
                 const res = await requestUploadParts({
                     provider,
                     router: config.router,
@@ -80,7 +81,7 @@ function createEdgeStoreNextHandler(config) {
                         'Content-Type': 'application/json'
                     }
                 });
-            } else if (req.nextUrl.pathname.endsWith('/complete-multipart-upload')) {
+            } else if (matchPath(pathname, '/complete-multipart-upload')) {
                 await completeMultipartUpload({
                     provider,
                     router: config.router,
@@ -90,7 +91,7 @@ function createEdgeStoreNextHandler(config) {
                 return new Response(null, {
                     status: 200
                 });
-            } else if (req.nextUrl.pathname.endsWith('/confirm-upload')) {
+            } else if (matchPath(pathname, '/confirm-upload')) {
                 const res = await confirmUpload({
                     provider,
                     router: config.router,
@@ -103,7 +104,7 @@ function createEdgeStoreNextHandler(config) {
                         'Content-Type': 'application/json'
                     }
                 });
-            } else if (req.nextUrl.pathname.endsWith('/delete-file')) {
+            } else if (matchPath(pathname, '/delete-file')) {
                 const res = await deleteFile({
                     provider,
                     router: config.router,
@@ -116,7 +117,7 @@ function createEdgeStoreNextHandler(config) {
                         'Content-Type': 'application/json'
                     }
                 });
-            } else if (req.nextUrl.pathname.endsWith('/proxy-file')) {
+            } else if (matchPath(pathname, '/proxy-file')) {
                 const url = req.nextUrl.searchParams.get('url');
                 if (typeof url === 'string') {
                     const proxyRes = await fetch(url, {

package/dist/adapters/next/pages/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapters/next/pages/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AACvE,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAgB7D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACnE,CAAC,CAAC;AAMP,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,SAMhD,cAAc,OAAO,eAAe,mBAsHxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/adapters/next/pages/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AACvE,OAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAiB7D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,IAAI,IAAI;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,GAAG,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnC,MAAM,GACN;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACnE,CAAC,CAAC;AAMP,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,SAMhD,cAAc,OAAO,eAAe,mBAuHxD"}

package/dist/adapters/next/pages/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var shared = require('@edgestore/shared');
-var logger = require('../../../logger-dcb682ae.js');
+var utils = require('../../../utils-5819d5e1.js');
 var providers_edgestore_index = require('../../../providers/edgestore/index.js');
 var shared$1 = require('../../../shared-7c700083.js');
 require('../../../index-4491caf0.js');
@@ -14,7 +14,7 @@ require('uuid');
 
 function createEdgeStoreNextHandler(config) {
     const { provider = providers_edgestore_index.EdgeStoreProvider() } = config;
-    const log = new logger.Logger(config.logLevel);
+    const log = new utils.Logger(config.logLevel);
     globalThis._EDGE_STORE_LOGGER = log;
     log.debug('Creating Edge Store Next handler (pages adapter)');
     return async (req, res)=>{
@@ -23,9 +23,10 @@ function createEdgeStoreNextHandler(config) {
                 message: 'Error running the pages adapter. Make sure you are importing the correct adapter in your router configuration',
                 code: 'SERVER_ERROR'
             });
-            if (req.url?.includes?.('/health')) {
+            const pathname = req.url ?? '';
+            if (utils.matchPath(pathname, '/health')) {
                 res.send('OK');
-            } else if (req.url?.includes?.('/init')) {
+            } else if (utils.matchPath(pathname, '/init')) {
                 let ctx = {};
                 try {
                     ctx = 'createContext' in config ? await config.createContext({
@@ -49,21 +50,21 @@ function createEdgeStoreNextHandler(config) {
                     token,
                     baseUrl
                 });
-            } else if (req.url?.includes?.('/request-upload')) {
+            } else if (utils.matchPath(pathname, '/request-upload')) {
                 res.json(await shared$1.requestUpload({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/request-upload-parts')) {
+            } else if (utils.matchPath(pathname, '/request-upload-parts')) {
                 res.json(await shared$1.requestUploadParts({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/complete-multipart-upload')) {
+            } else if (utils.matchPath(pathname, '/complete-multipart-upload')) {
                 await shared$1.completeMultipartUpload({
                     provider,
                     router: config.router,
@@ -71,21 +72,21 @@ function createEdgeStoreNextHandler(config) {
                     ctxToken: req.cookies['edgestore-ctx']
                 });
                 res.status(200).end();
-            } else if (req.url?.includes?.('/confirm-upload')) {
+            } else if (utils.matchPath(pathname, '/confirm-upload')) {
                 res.json(await shared$1.confirmUpload({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/delete-file')) {
+            } else if (utils.matchPath(pathname, '/delete-file')) {
                 res.json(await shared$1.deleteFile({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/proxy-file')) {
+            } else if (utils.matchPath(pathname, '/proxy-file')) {
                 const { url } = req.query;
                 if (typeof url === 'string') {
                     const proxyRes = await fetch(url, {

package/dist/adapters/next/pages/index.mjs

@@ -1,5 +1,5 @@
 import { EdgeStoreError, EDGE_STORE_ERROR_CODES } from '@edgestore/shared';
-import { L as Logger } from '../../../logger-09f43a75.mjs';
+import { L as Logger, m as matchPath } from '../../../utils-f6f56d38.mjs';
 import { EdgeStoreProvider } from '../../../providers/edgestore/index.mjs';
 import { i as init, r as requestUpload, a as requestUploadParts, c as completeMultipartUpload, d as confirmUpload, e as deleteFile } from '../../../shared-039276af.mjs';
 import '../../../index-28efdacf.mjs';
@@ -19,9 +19,10 @@ function createEdgeStoreNextHandler(config) {
                 message: 'Error running the pages adapter. Make sure you are importing the correct adapter in your router configuration',
                 code: 'SERVER_ERROR'
             });
-            if (req.url?.includes?.('/health')) {
+            const pathname = req.url ?? '';
+            if (matchPath(pathname, '/health')) {
                 res.send('OK');
-            } else if (req.url?.includes?.('/init')) {
+            } else if (matchPath(pathname, '/init')) {
                 let ctx = {};
                 try {
                     ctx = 'createContext' in config ? await config.createContext({
@@ -45,21 +46,21 @@ function createEdgeStoreNextHandler(config) {
                     token,
                     baseUrl
                 });
-            } else if (req.url?.includes?.('/request-upload')) {
+            } else if (matchPath(pathname, '/request-upload')) {
                 res.json(await requestUpload({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/request-upload-parts')) {
+            } else if (matchPath(pathname, '/request-upload-parts')) {
                 res.json(await requestUploadParts({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/complete-multipart-upload')) {
+            } else if (matchPath(pathname, '/complete-multipart-upload')) {
                 await completeMultipartUpload({
                     provider,
                     router: config.router,
@@ -67,21 +68,21 @@ function createEdgeStoreNextHandler(config) {
                     ctxToken: req.cookies['edgestore-ctx']
                 });
                 res.status(200).end();
-            } else if (req.url?.includes?.('/confirm-upload')) {
+            } else if (matchPath(pathname, '/confirm-upload')) {
                 res.json(await confirmUpload({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/delete-file')) {
+            } else if (matchPath(pathname, '/delete-file')) {
                 res.json(await deleteFile({
                     provider,
                     router: config.router,
                     body: req.body,
                     ctxToken: req.cookies['edgestore-ctx']
                 }));
-            } else if (req.url?.includes?.('/proxy-file')) {
+            } else if (matchPath(pathname, '/proxy-file')) {
                 const { url } = req.query;
                 if (typeof url === 'string') {
                     const proxyRes = await fetch(url, {

package/dist/libs/utils.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Check if a route matches the current path.
+ */
+export declare function matchPath(pathname: string, route: string): boolean;
+//# sourceMappingURL=utils.d.ts.map

package/dist/libs/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/libs/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAKxD"}

package/dist/{logger-e0066db9.js → utils-461a2e3b.js}

@@ -30,4 +30,14 @@ class Logger {
     }
 }
 
-export { Logger as L };
+/**
+ * Check if a route matches the current path.
+ */
+function matchPath(pathname, route) {
+    // Allow trailing slash
+    // Allow query string
+    const regex = new RegExp(`${route}/?(\\?.*)?$`);
+    return regex.test(pathname);
+}
+
+export { Logger as L, matchPath as m };

package/dist/{logger-dcb682ae.js → utils-5819d5e1.js}

@@ -50,4 +50,14 @@ class Logger {
     }
 }
 
+/**
+ * Check if a route matches the current path.
+ */ function matchPath(pathname, route) {
+    // Allow trailing slash
+    // Allow query string
+    const regex = new RegExp(`${route}/?(\\?.*)?$`);
+    return regex.test(pathname);
+}
+
 exports.Logger = Logger;
+exports.matchPath = matchPath;

package/dist/{logger-09f43a75.mjs → utils-f6f56d38.mjs}

@@ -48,4 +48,13 @@ class Logger {
     }
 }
 
-export { Logger as L };
+/**
+ * Check if a route matches the current path.
+ */ function matchPath(pathname, route) {
+    // Allow trailing slash
+    // Allow query string
+    const regex = new RegExp(`${route}/?(\\?.*)?$`);
+    return regex.test(pathname);
+}
+
+export { Logger as L, matchPath as m };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgestore/server",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edgestore.git",
@@ -84,7 +84,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@edgestore/shared": "0.2.0",
+    "@edgestore/shared": "0.2.1",
     "@panva/hkdf": "^1.0.4",
     "cookie": "^0.5.0",
     "jose": "^4.13.1",
@@ -123,5 +123,5 @@
     "typescript": "^5.1.6",
     "zod": "3.21.4"
   },
-  "gitHead": "a5ecda9ba69eaada4624556dd9422ce49e5dfb66"
+  "gitHead": "821e2f3e366a83a75aa7b84d4750e6d3e32c992d"
 }

package/src/adapters/express/index.ts

@@ -8,6 +8,7 @@ import {
 } from '@edgestore/shared';
 import { type Request, type Response } from 'express';
 import Logger, { type LogLevel } from '../../libs/logger';
+import { matchPath } from '../../libs/utils';
 import { EdgeStoreProvider } from '../../providers/edgestore';
 import {
   completeMultipartUpload,
@@ -52,9 +53,10 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
 
   return async (req: Request, res: Response) => {
     try {
-      if (req.url?.includes?.('/health')) {
+      const pathname = req.url ?? '';
+      if (matchPath(pathname, '/health')) {
         res.send('OK');
-      } else if (req.url?.includes?.('/init')) {
+      } else if (matchPath(pathname, '/init')) {
         let ctx = {} as TCtx;
         try {
           ctx =
@@ -78,7 +80,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
           token,
           baseUrl,
         });
-      } else if (req.url?.includes?.('/request-upload')) {
+      } else if (matchPath(pathname, '/request-upload')) {
         res.json(
           await requestUpload({
             provider,
@@ -87,7 +89,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
             ctxToken: req.cookies['edgestore-ctx'],
           }),
         );
-      } else if (req.url?.includes?.('/request-upload-parts')) {
+      } else if (matchPath(pathname, '/request-upload-parts')) {
         res.json(
           await requestUploadParts({
             provider,
@@ -96,7 +98,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
             ctxToken: req.cookies['edgestore-ctx'],
           }),
         );
-      } else if (req.url?.includes?.('/complete-multipart-upload')) {
+      } else if (matchPath(pathname, '/complete-multipart-upload')) {
         await completeMultipartUpload({
           provider,
           router: config.router,
@@ -104,7 +106,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
           ctxToken: req.cookies['edgestore-ctx'],
         });
         res.status(200).end();
-      } else if (req.url?.includes?.('/confirm-upload')) {
+      } else if (matchPath(pathname, '/confirm-upload')) {
         res.json(
           await confirmUpload({
             provider,
@@ -113,7 +115,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
             ctxToken: req.cookies['edgestore-ctx'],
           }),
         );
-      } else if (req.url?.includes?.('/delete-file')) {
+      } else if (matchPath(pathname, '/delete-file')) {
         res.json(
           await deleteFile({
             provider,
@@ -122,7 +124,7 @@ export function createEdgeStoreExpressHandler<TCtx>(config: Config<TCtx>) {
             ctxToken: req.cookies['edgestore-ctx'],
           }),
         );
-      } else if (req.url?.includes?.('/proxy-file')) {
+      } else if (matchPath(pathname, '/proxy-file')) {
         const { url } = req.query;
         if (typeof url === 'string') {
           const proxyRes = await fetch(url, {

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

@@ -8,6 +8,7 @@ import {
 } from '@edgestore/shared';
 import { type NextRequest } from 'next/server';
 import Logger, { type LogLevel } from '../../../libs/logger';
+import { matchPath } from '../../../libs/utils';
 import { EdgeStoreProvider } from '../../../providers/edgestore';
 import {
   completeMultipartUpload,
@@ -57,11 +58,14 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             'Error running the app adapter. Make sure you are importing the correct adapter in your router configuration',
           code: 'SERVER_ERROR',
         });
-      if (req.nextUrl.pathname.endsWith('/health')) {
+
+      const pathname = req.nextUrl.pathname;
+
+      if (matchPath(pathname, '/health')) {
         return new Response('OK', {
           status: 200,
         });
-      } else if (req.nextUrl.pathname.endsWith('/init')) {
+      } else if (matchPath(pathname, '/init')) {
         let ctx = {} as TCtx;
         try {
           ctx =
@@ -96,7 +100,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           res.headers.append('Set-Cookie', cookie);
         }
         return res;
-      } else if (req.nextUrl.pathname.endsWith('/request-upload')) {
+      } else if (matchPath(pathname, '/request-upload')) {
         const res = await requestUpload({
           provider,
           router: config.router,
@@ -109,7 +113,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             'Content-Type': 'application/json',
           },
         });
-      } else if (req.nextUrl.pathname.endsWith('/request-upload-parts')) {
+      } else if (matchPath(pathname, '/request-upload-parts')) {
         const res = await requestUploadParts({
           provider,
           router: config.router,
@@ -122,7 +126,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             'Content-Type': 'application/json',
           },
         });
-      } else if (req.nextUrl.pathname.endsWith('/complete-multipart-upload')) {
+      } else if (matchPath(pathname, '/complete-multipart-upload')) {
         await completeMultipartUpload({
           provider,
           router: config.router,
@@ -132,7 +136,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
         return new Response(null, {
           status: 200,
         });
-      } else if (req.nextUrl.pathname.endsWith('/confirm-upload')) {
+      } else if (matchPath(pathname, '/confirm-upload')) {
         const res = await confirmUpload({
           provider,
           router: config.router,
@@ -145,7 +149,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             'Content-Type': 'application/json',
           },
         });
-      } else if (req.nextUrl.pathname.endsWith('/delete-file')) {
+      } else if (matchPath(pathname, '/delete-file')) {
         const res = await deleteFile({
           provider,
           router: config.router,
@@ -158,7 +162,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             'Content-Type': 'application/json',
           },
         });
-      } else if (req.nextUrl.pathname.endsWith('/proxy-file')) {
+      } else if (matchPath(pathname, '/proxy-file')) {
         const url = req.nextUrl.searchParams.get('url');
         if (typeof url === 'string') {
           const proxyRes = await fetch(url, {

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

@@ -8,6 +8,7 @@ import {
 } from '@edgestore/shared';
 import { type NextApiRequest, type NextApiResponse } from 'next/types';
 import Logger, { type LogLevel } from '../../../libs/logger';
+import { matchPath } from '../../../libs/utils';
 import { EdgeStoreProvider } from '../../../providers/edgestore';
 import {
   completeMultipartUpload,
@@ -58,9 +59,10 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             'Error running the pages adapter. Make sure you are importing the correct adapter in your router configuration',
           code: 'SERVER_ERROR',
         });
-      if (req.url?.includes?.('/health')) {
+      const pathname = req.url ?? '';
+      if (matchPath(pathname, '/health')) {
         res.send('OK');
-      } else if (req.url?.includes?.('/init')) {
+      } else if (matchPath(pathname, '/init')) {
         let ctx = {} as TCtx;
         try {
           ctx =
@@ -84,7 +86,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           token,
           baseUrl,
         });
-      } else if (req.url?.includes?.('/request-upload')) {
+      } else if (matchPath(pathname, '/request-upload')) {
         res.json(
           await requestUpload({
             provider,
@@ -93,7 +95,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             ctxToken: req.cookies['edgestore-ctx'],
           }),
         );
-      } else if (req.url?.includes?.('/request-upload-parts')) {
+      } else if (matchPath(pathname, '/request-upload-parts')) {
         res.json(
           await requestUploadParts({
             provider,
@@ -102,7 +104,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             ctxToken: req.cookies['edgestore-ctx'],
           }),
         );
-      } else if (req.url?.includes?.('/complete-multipart-upload')) {
+      } else if (matchPath(pathname, '/complete-multipart-upload')) {
         await completeMultipartUpload({
           provider,
           router: config.router,
@@ -110,7 +112,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
           ctxToken: req.cookies['edgestore-ctx'],
         });
         res.status(200).end();
-      } else if (req.url?.includes?.('/confirm-upload')) {
+      } else if (matchPath(pathname, '/confirm-upload')) {
         res.json(
           await confirmUpload({
             provider,
@@ -119,7 +121,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             ctxToken: req.cookies['edgestore-ctx'],
           }),
         );
-      } else if (req.url?.includes?.('/delete-file')) {
+      } else if (matchPath(pathname, '/delete-file')) {
         res.json(
           await deleteFile({
             provider,
@@ -128,7 +130,7 @@ export function createEdgeStoreNextHandler<TCtx>(config: Config<TCtx>) {
             ctxToken: req.cookies['edgestore-ctx'],
           }),
         );
-      } else if (req.url?.includes?.('/proxy-file')) {
+      } else if (matchPath(pathname, '/proxy-file')) {
         const { url } = req.query;
         if (typeof url === 'string') {
           const proxyRes = await fetch(url, {

package/src/libs/utils.ts

@@ -0,0 +1,9 @@
+/**
+ * Check if a route matches the current path.
+ */
+export function matchPath(pathname: string, route: string) {
+  // Allow trailing slash
+  // Allow query string
+  const regex = new RegExp(`${route}/?(\\?.*)?$`);
+  return regex.test(pathname);
+}