@edgestore/server 0.6.0-canary.2 → 0.6.0

package/dist/core/index.mjs

@@ -1,181 +1,2 @@
-import { b as buildPath, p as parsePath, i as isDev } from '../shared-c6527780.mjs';
-import { i as initEdgeStoreSdk } from '../index-a36b09a6.mjs';
-export { e as edgeStoreRawSdk, i as initEdgeStoreSdk } from '../index-a36b09a6.mjs';
-import '@edgestore/shared';
-import '@panva/hkdf';
-import 'cookie';
-import 'jose';
-import 'uuid';
-
-// type guard for `content`
-function isTextContent(content) {
-    return typeof content === 'string';
-}
-function isBlobContent(content) {
-    return typeof content !== 'string' && 'blob' in content;
-}
-function initEdgeStoreClient(config) {
-    const sdk = initEdgeStoreSdk({
-        accessKey: config.accessKey,
-        secretKey: config.secretKey
-    });
-    return new Proxy({}, {
-        get (_target, key) {
-            const bucketName = key;
-            const bucket = config.router.buckets[bucketName];
-            if (!bucket) {
-                throw new Error(`Bucket ${bucketName} not found`);
-            }
-            const client = {
-                async upload (params) {
-                    const content = params.content;
-                    const ctx = 'ctx' in params ? params.ctx : {};
-                    const input = 'input' in params ? params.input : {};
-                    const { blob, extension } = await (async ()=>{
-                        if (isTextContent(content)) {
-                            return {
-                                blob: new Blob([
-                                    content
-                                ], {
-                                    type: 'text/plain'
-                                }),
-                                extension: 'txt'
-                            };
-                        } else if (isBlobContent(content)) {
-                            return {
-                                blob: content.blob,
-                                extension: content.extension
-                            };
-                        } else {
-                            return {
-                                blob: await getBlobFromUrl(content.url),
-                                extension: content.extension
-                            };
-                        }
-                    })();
-                    const path = buildPath({
-                        bucket,
-                        pathAttrs: {
-                            ctx,
-                            input
-                        },
-                        fileInfo: {
-                            type: blob.type,
-                            size: blob.size,
-                            extension,
-                            temporary: false,
-                            fileName: params.options?.manualFileName,
-                            replaceTargetUrl: params.options?.replaceTargetUrl
-                        }
-                    });
-                    const metadata = await bucket._def.metadata({
-                        ctx,
-                        input
-                    });
-                    const requestUploadRes = await sdk.requestUpload({
-                        bucketName,
-                        bucketType: bucket._def.type,
-                        fileInfo: {
-                            fileName: params.options?.manualFileName,
-                            replaceTargetUrl: params.options?.replaceTargetUrl,
-                            type: blob.type,
-                            size: blob.size,
-                            extension,
-                            isPublic: bucket._def.accessControl === undefined,
-                            temporary: params.options?.temporary ?? false,
-                            path,
-                            metadata
-                        }
-                    });
-                    const { signedUrl, multipart } = requestUploadRes;
-                    if (multipart) {
-                        // TODO
-                        throw new Error('Multipart upload not implemented');
-                    } else if (signedUrl) {
-                        const uploadResponse = await fetch(signedUrl, {
-                            method: 'PUT',
-                            body: blob
-                        });
-                        if (!uploadResponse.ok) {
-                            throw new Error(`Upload failed with status ${uploadResponse.status}: ${uploadResponse.statusText}`);
-                        }
-                    } else {
-                        throw new Error('Missing signedUrl');
-                    }
-                    const { parsedPath, pathOrder } = parsePath(path);
-                    return {
-                        url: requestUploadRes.accessUrl,
-                        ...{
-                            thumbnailUrl: requestUploadRes.thumbnailUrl
-                        },
-                        size: blob.size,
-                        metadata,
-                        path: parsedPath,
-                        pathOrder
-                    };
-                },
-                async getFile (params) {
-                    const res = await sdk.getFile(params);
-                    return {
-                        url: getUrl(res.url, config.baseUrl),
-                        size: res.size,
-                        uploadedAt: new Date(res.uploadedAt),
-                        metadata: res.metadata,
-                        path: res.path
-                    };
-                },
-                async confirmUpload (params) {
-                    return await sdk.confirmUpload(params);
-                },
-                async deleteFile (params) {
-                    return await sdk.deleteFile(params);
-                },
-                async listFiles (params) {
-                    const res = await sdk.listFiles({
-                        bucketName,
-                        ...params
-                    });
-                    const files = res.data.map((file)=>{
-                        return {
-                            url: getUrl(file.url, config.baseUrl),
-                            thumbnailUrl: file.thumbnailUrl,
-                            size: file.size,
-                            uploadedAt: new Date(file.uploadedAt),
-                            metadata: file.metadata,
-                            path: file.path
-                        };
-                    });
-                    return {
-                        data: files,
-                        pagination: res.pagination
-                    };
-                }
-            };
-            return client;
-        }
-    });
-}
-/**
- * Protected files need third-party cookies to work.
- * Since third party cookies don't work on localhost,
- * we need to proxy the file through the server.
- */ function getUrl(url, baseUrl) {
-    if (isDev() && !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;
-}
-async function getBlobFromUrl(url) {
-    const res = await fetch(url);
-    return await res.blob();
-}
-
-export { initEdgeStoreClient };
+export { initEdgeStoreClient } from './client/index.mjs';
+export { edgeStoreRawSdk, initEdgeStoreSdk } from './sdk/index.mjs';

package/dist/{index-1e7b1b93.js → core/sdk/index.js}

@@ -1,16 +1,8 @@
 'use strict';
 
 var shared$1 = require('@edgestore/shared');
-var shared = require('./shared-4ec2dc90.js');
-
-const DEFAULT_MESSAGE = `Missing EDGE_STORE_ACCESS_KEY or EDGE_STORE_SECRET_KEY. 
-This can happen if you are trying to import something related to the backend of EdgeStore in a client component.`;
-class EdgeStoreCredentialsError extends Error {
-    constructor(message = DEFAULT_MESSAGE){
-        super(message);
-        this.name = 'EdgeStoreCredentialsError';
-    }
-}
+var shared = require('../../adapters/shared.js');
+var EdgeStoreCredentialsError = require('../../libs/errors/EdgeStoreCredentialsError.js');
 
 const API_ENDPOINT = shared.getEnv('EDGE_STORE_API_ENDPOINT') ?? 'https://api.edgestore.dev';
 async function makeRequest(params) {
@@ -230,6 +222,5 @@ function initEdgeStoreSdk(params) {
     };
 }
 
-exports.EdgeStoreCredentialsError = EdgeStoreCredentialsError;
 exports.edgeStoreRawSdk = edgeStoreRawSdk;
 exports.initEdgeStoreSdk = initEdgeStoreSdk;

package/dist/{index-a36b09a6.mjs → core/sdk/index.mjs}

@@ -1,14 +1,6 @@
 import { EdgeStoreError } from '@edgestore/shared';
-import { g as getEnv } from './shared-c6527780.mjs';
-
-const DEFAULT_MESSAGE = `Missing EDGE_STORE_ACCESS_KEY or EDGE_STORE_SECRET_KEY. 
-This can happen if you are trying to import something related to the backend of EdgeStore in a client component.`;
-class EdgeStoreCredentialsError extends Error {
-    constructor(message = DEFAULT_MESSAGE){
-        super(message);
-        this.name = 'EdgeStoreCredentialsError';
-    }
-}
+import { getEnv } from '../../adapters/shared.mjs';
+import EdgeStoreCredentialsError from '../../libs/errors/EdgeStoreCredentialsError.mjs';
 
 const API_ENDPOINT = getEnv('EDGE_STORE_API_ENDPOINT') ?? 'https://api.edgestore.dev';
 async function makeRequest(params) {
@@ -228,4 +220,4 @@ function initEdgeStoreSdk(params) {
     };
 }
 
-export { EdgeStoreCredentialsError as E, edgeStoreRawSdk as e, initEdgeStoreSdk as i };
+export { edgeStoreRawSdk, initEdgeStoreSdk };

package/dist/index.js

@@ -1,12 +1,10 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var shared = require('@edgestore/shared');
 
 
 
-Object.defineProperty(exports, 'initEdgeStore', {
+Object.defineProperty(exports, "initEdgeStore", {
 	enumerable: true,
 	get: function () { return shared.initEdgeStore; }
 });

package/dist/libs/errors/EdgeStoreCredentialsError.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const DEFAULT_MESSAGE = `Missing EDGE_STORE_ACCESS_KEY or EDGE_STORE_SECRET_KEY. 
+This can happen if you are trying to import something related to the backend of EdgeStore in a client component.`;
+class EdgeStoreCredentialsError extends Error {
+    constructor(message = DEFAULT_MESSAGE){
+        super(message);
+        this.name = 'EdgeStoreCredentialsError';
+    }
+}
+
+module.exports = EdgeStoreCredentialsError;

package/dist/libs/errors/EdgeStoreCredentialsError.mjs

@@ -0,0 +1,10 @@
+const DEFAULT_MESSAGE = `Missing EDGE_STORE_ACCESS_KEY or EDGE_STORE_SECRET_KEY. 
+This can happen if you are trying to import something related to the backend of EdgeStore in a client component.`;
+class EdgeStoreCredentialsError extends Error {
+    constructor(message = DEFAULT_MESSAGE){
+        super(message);
+        this.name = 'EdgeStoreCredentialsError';
+    }
+}
+
+export { EdgeStoreCredentialsError as default };

package/dist/{utils-26113e02.js → libs/logger.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var shared = require('./shared-4ec2dc90.js');
+var shared = require('../adapters/shared.js');
 
 /* eslint-disable no-console */ function _define_property(obj, key, value) {
     if (key in obj) {
@@ -52,14 +52,4 @@ 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;
+module.exports = Logger;

package/dist/{utils-cba23eef.mjs → libs/logger.mjs}

@@ -1,4 +1,4 @@
-import { i as isDev } from './shared-c6527780.mjs';
+import { isDev } from '../adapters/shared.mjs';
 
 /* eslint-disable no-console */ function _define_property(obj, key, value) {
     if (key in obj) {
@@ -50,13 +50,4 @@ 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);
-}
-
-export { Logger as L, matchPath as m };
+export { Logger as default };

package/dist/libs/utils.js

@@ -0,0 +1,12 @@
+'use strict';
+
+/**
+ * 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.matchPath = matchPath;

package/dist/libs/utils.mjs

@@ -0,0 +1,10 @@
+/**
+ * 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 { matchPath };

package/dist/providers/aws/index.js

@@ -1,15 +1,9 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var clientS3 = require('@aws-sdk/client-s3');
 var s3RequestPresigner = require('@aws-sdk/s3-request-presigner');
 var uuid = require('uuid');
-var shared = require('../../shared-4ec2dc90.js');
-require('@edgestore/shared');
-require('@panva/hkdf');
-require('cookie');
-require('jose');
+var shared = require('../../adapters/shared.js');
 
 function AWSProvider(options) {
     const { accessKeyId = shared.getEnv('ES_AWS_ACCESS_KEY_ID'), secretAccessKey = shared.getEnv('ES_AWS_SECRET_ACCESS_KEY'), region = shared.getEnv('ES_AWS_REGION'), bucketName = shared.getEnv('ES_AWS_BUCKET_NAME'), endpoint = shared.getEnv('ES_AWS_ENDPOINT'), forcePathStyle = shared.getEnv('ES_AWS_FORCE_PATH_STYLE') === 'true', overwritePath } = options ?? {};

package/dist/providers/aws/index.mjs

@@ -1,11 +1,7 @@
-import { S3Client, HeadObjectCommand, PutObjectCommand, DeleteObjectCommand } from '@aws-sdk/client-s3';
+import { S3Client, DeleteObjectCommand, PutObjectCommand, HeadObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { v4 } from 'uuid';
-import { g as getEnv } from '../../shared-c6527780.mjs';
-import '@edgestore/shared';
-import '@panva/hkdf';
-import 'cookie';
-import 'jose';
+import { getEnv } from '../../adapters/shared.mjs';
 
 function AWSProvider(options) {
     const { accessKeyId = getEnv('ES_AWS_ACCESS_KEY_ID'), secretAccessKey = getEnv('ES_AWS_SECRET_ACCESS_KEY'), region = getEnv('ES_AWS_REGION'), bucketName = getEnv('ES_AWS_BUCKET_NAME'), endpoint = getEnv('ES_AWS_ENDPOINT'), forcePathStyle = getEnv('ES_AWS_FORCE_PATH_STYLE') === 'true', overwritePath } = options ?? {};

package/dist/providers/azure/index.js

@@ -1,14 +1,8 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var storageBlob = require('@azure/storage-blob');
 var uuid = require('uuid');
-var shared = require('../../shared-4ec2dc90.js');
-require('@edgestore/shared');
-require('@panva/hkdf');
-require('cookie');
-require('jose');
+var shared = require('../../adapters/shared.js');
 
 function AzureProvider(options) {
     const { storageAccountName = shared.getEnv('ES_AZURE_ACCOUNT_NAME'), sasToken = shared.getEnv('ES_AZURE_SAS_TOKEN'), containerName = shared.getEnv('ES_AZURE_CONTAINER_NAME'), customBaseUrl = shared.getEnv('ES_AZURE_BASE_URL') } = options ?? {};

package/dist/providers/azure/index.mjs

@@ -1,10 +1,6 @@
 import { BlobServiceClient } from '@azure/storage-blob';
 import { v4 } from 'uuid';
-import { g as getEnv } from '../../shared-c6527780.mjs';
-import '@edgestore/shared';
-import '@panva/hkdf';
-import 'cookie';
-import 'jose';
+import { getEnv } from '../../adapters/shared.mjs';
 
 function AzureProvider(options) {
     const { storageAccountName = getEnv('ES_AZURE_ACCOUNT_NAME'), sasToken = getEnv('ES_AZURE_SAS_TOKEN'), containerName = getEnv('ES_AZURE_CONTAINER_NAME'), customBaseUrl = getEnv('ES_AZURE_BASE_URL') } = options ?? {};

package/dist/providers/edgestore/index.js

@@ -1,14 +1,9 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var shared$1 = require('@edgestore/shared');
-var shared = require('../../shared-4ec2dc90.js');
-var index = require('../../index-1e7b1b93.js');
-require('@panva/hkdf');
-require('cookie');
-require('jose');
-require('uuid');
+var shared = require('../../adapters/shared.js');
+var index = require('../../core/sdk/index.js');
+var EdgeStoreCredentialsError = require('../../libs/errors/EdgeStoreCredentialsError.js');
 
 const DEFAULT_BASE_URL = 'https://files.edgestore.dev';
 function EdgeStoreProvider(options) {
@@ -17,7 +12,7 @@ function EdgeStoreProvider(options) {
     undefined?.EDGE_STORE_SECRET_KEY } = options ?? {};
     const baseUrl = shared.getEnv('EDGE_STORE_BASE_URL') ?? DEFAULT_BASE_URL;
     if (!accessKey || !secretKey) {
-        throw new index.EdgeStoreCredentialsError();
+        throw new EdgeStoreCredentialsError();
     }
     const edgeStoreSdk = index.initEdgeStoreSdk({
         accessKey,

package/dist/providers/edgestore/index.mjs

@@ -1,10 +1,7 @@
 import { EdgeStoreError } from '@edgestore/shared';
-import { g as getEnv } from '../../shared-c6527780.mjs';
-import { E as EdgeStoreCredentialsError, i as initEdgeStoreSdk } from '../../index-a36b09a6.mjs';
-import '@panva/hkdf';
-import 'cookie';
-import 'jose';
-import 'uuid';
+import { getEnv } from '../../adapters/shared.mjs';
+import { initEdgeStoreSdk } from '../../core/sdk/index.mjs';
+import EdgeStoreCredentialsError from '../../libs/errors/EdgeStoreCredentialsError.mjs';
 
 const DEFAULT_BASE_URL = 'https://files.edgestore.dev';
 function EdgeStoreProvider(options) {

package/package.json

@@ -1,13 +1,22 @@
 {
   "name": "@edgestore/server",
-  "version": "0.6.0-canary.2",
+  "version": "0.6.0",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
-  "repository": "https://github.com/edgestorejs/edgestore.git",
+  "license": "MIT",
+  "sideEffects": false,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/edgestorejs/edgestore.git",
+    "directory": "packages/server"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "author": "Ravi <me@ravi.com>",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "keywords": [
     "react",
     "nodejs",
@@ -26,11 +35,6 @@
       "require": "./dist/index.js",
       "default": "./dist/index.js"
     },
-    "./core": {
-      "import": "./dist/core/index.mjs",
-      "require": "./dist/core/index.js",
-      "default": "./dist/core/index.js"
-    },
     "./adapters/astro": {
       "import": "./dist/adapters/astro/index.mjs",
       "require": "./dist/adapters/astro/index.js",
@@ -51,16 +55,16 @@
       "require": "./dist/adapters/hono/index.js",
       "default": "./dist/adapters/hono/index.js"
     },
-    "./adapters/next/pages": {
-      "import": "./dist/adapters/next/pages/index.mjs",
-      "require": "./dist/adapters/next/pages/index.js",
-      "default": "./dist/adapters/next/pages/index.js"
-    },
     "./adapters/next/app": {
       "import": "./dist/adapters/next/app/index.mjs",
       "require": "./dist/adapters/next/app/index.js",
       "default": "./dist/adapters/next/app/index.js"
     },
+    "./adapters/next/pages": {
+      "import": "./dist/adapters/next/pages/index.mjs",
+      "require": "./dist/adapters/next/pages/index.js",
+      "default": "./dist/adapters/next/pages/index.js"
+    },
     "./adapters/remix": {
       "import": "./dist/adapters/remix/index.mjs",
       "require": "./dist/adapters/remix/index.js",
@@ -71,6 +75,11 @@
       "require": "./dist/adapters/start/index.js",
       "default": "./dist/adapters/start/index.js"
     },
+    "./core": {
+      "import": "./dist/core/index.mjs",
+      "require": "./dist/core/index.js",
+      "default": "./dist/core/index.js"
+    },
     "./providers/aws": {
       "import": "./dist/providers/aws/index.mjs",
       "require": "./dist/providers/aws/index.js",
@@ -93,18 +102,14 @@
     "README.md",
     "LICENSE",
     "package.json",
-    "core",
     "adapters",
+    "core",
     "providers",
-    "!**/*.test.*"
+    "!**/*.test.*",
+    "!**/__tests__"
   ],
-  "private": false,
-  "publishConfig": {
-    "access": "public"
-  },
-  "license": "MIT",
   "dependencies": {
-    "@edgestore/shared": "0.6.0-canary.2",
+    "@edgestore/shared": "0.6.0",
     "@panva/hkdf": "^1.0.4",
     "cookie": "^0.7.0",
     "jose": "^4.13.1",