@edgestore/server 0.4.0 → 0.5.0

package/src/adapters/shared.ts

@@ -434,7 +434,7 @@ export async function deleteFile<TCtx>(params: {
 
 async function encryptJWT(ctx: any) {
   const secret =
-    process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
+    getEnv('EDGE_STORE_JWT_SECRET') ?? getEnv('EDGE_STORE_SECRET_KEY');
   if (!secret) {
     throw new EdgeStoreError({
       message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
@@ -452,7 +452,7 @@ async function encryptJWT(ctx: any) {
 
 async function decryptJWT(token: string) {
   const secret =
-    process.env.EDGE_STORE_JWT_SECRET ?? process.env.EDGE_STORE_SECRET_KEY;
+    getEnv('EDGE_STORE_JWT_SECRET') ?? getEnv('EDGE_STORE_SECRET_KEY');
   if (!secret) {
     throw new EdgeStoreError({
       message: 'EDGE_STORE_JWT_SECRET or EDGE_STORE_SECRET_KEY is not defined',
@@ -539,7 +539,7 @@ async function getContext(token: string) {
  * so that we can delete or confirm the upload.
  */
 function unproxyUrl(url: string) {
-  if (process.env.NODE_ENV === 'development' && url.startsWith('http://')) {
+  if (isDev() && url.startsWith('http://')) {
     // get the url param from the query string
     const urlParam = new URL(url).searchParams.get('url');
     if (urlParam) {
@@ -548,3 +548,20 @@ function unproxyUrl(url: string) {
   }
   return url;
 }
+
+export function getEnv(key: string): string | undefined {
+  if (typeof process !== 'undefined' && process.env) {
+    // @ts-expect-error - In Vite/Astro, the env variables are available on `import.meta`.
+    return process.env[key] ?? import.meta.env?.[key];
+  }
+  // @ts-expect-error - In Vite/Astro, the env variables are available on `import.meta`.
+  return import.meta.env?.[key];
+}
+
+export function isDev(): boolean {
+  return (
+    process?.env?.NODE_ENV === 'development' ||
+    // @ts-expect-error - In Vite/Astro, the env variables are available on `import.meta`.
+    import.meta.env?.DEV
+  );
+}

package/src/core/client/index.ts

@@ -10,7 +10,7 @@ import {
 } from '@edgestore/shared';
 import { type z, type ZodNever } from 'zod';
 import { type Comparison } from '..';
-import { buildPath, parsePath } from '../../adapters/shared';
+import { buildPath, isDev, parsePath } from '../../adapters/shared';
 import { initEdgeStoreSdk } from '../sdk';
 
 export type GetFileRes<TBucket extends AnyBuilder> = {
@@ -408,7 +408,7 @@ export function initEdgeStoreClient<TRouter extends AnyRouter>(config: {
  * we need to proxy the file through the server.
  */
 function getUrl(url: string, baseUrl?: string) {
-  if (process.env.NODE_ENV === 'development' && !url.includes('/_public/')) {
+  if (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.',

package/src/core/sdk/index.ts

@@ -4,10 +4,11 @@ import {
   type AnyMetadata,
   type AnyRouter,
 } from '@edgestore/shared';
+import { getEnv } from '../../adapters/shared';
 import EdgeStoreCredentialsError from '../../libs/errors/EdgeStoreCredentialsError';
 
 const API_ENDPOINT =
-  process.env.EDGE_STORE_API_ENDPOINT ?? 'https://api.edgestore.dev';
+  getEnv('EDGE_STORE_API_ENDPOINT') ?? 'https://api.edgestore.dev';
 
 type FileInfoForUpload = {
   size: number;
@@ -359,8 +360,8 @@ export function initEdgeStoreSdk(params: {
   secretKey?: string;
 }) {
   const {
-    accessKey = process.env.EDGE_STORE_ACCESS_KEY,
-    secretKey = process.env.EDGE_STORE_SECRET_KEY,
+    accessKey = getEnv('EDGE_STORE_ACCESS_KEY'),
+    secretKey = getEnv('EDGE_STORE_SECRET_KEY'),
   } = params ?? {};
 
   if (!accessKey || !secretKey) {

package/src/libs/logger.ts

@@ -1,15 +1,16 @@
 /* eslint-disable no-console */
 
+import { isDev } from '../adapters/shared';
+
 const logLevel = ['debug', 'info', 'warn', 'error', 'none'] as const;
 
-export type LogLevel = typeof logLevel[number];
+export type LogLevel = (typeof logLevel)[number];
 
 class Logger {
   private logLevel: LogLevel;
 
   constructor(logLevel?: LogLevel) {
-    this.logLevel =
-      logLevel ?? (process.env.NODE_ENV === 'production' ? 'error' : 'info');
+    this.logLevel = logLevel ?? (isDev() ? 'info' : 'error');
   }
 
   private shouldLog(level: LogLevel): boolean {

package/src/providers/aws/index.ts

@@ -7,6 +7,7 @@ import {
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { type Provider } from '@edgestore/shared';
 import { v4 as uuidv4 } from 'uuid';
+import { getEnv } from '../../adapters/shared';
 
 export type AWSProviderOptions = {
   /**
@@ -62,17 +63,17 @@ export type AWSProviderOptions = {
 
 export function AWSProvider(options?: AWSProviderOptions): Provider {
   const {
-    accessKeyId = process.env.ES_AWS_ACCESS_KEY_ID,
-    secretAccessKey = process.env.ES_AWS_SECRET_ACCESS_KEY,
-    region = process.env.ES_AWS_REGION,
-    bucketName = process.env.ES_AWS_BUCKET_NAME,
-    endpoint = process.env.ES_AWS_ENDPOINT,
-    forcePathStyle = process.env.ES_AWS_FORCE_PATH_STYLE === 'true',
+    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',
   } = options ?? {};
 
   const baseUrl =
     options?.baseUrl ??
-    process.env.EDGE_STORE_BASE_URL ??
+    getEnv('EDGE_STORE_BASE_URL') ??
     (endpoint
       ? `${endpoint}/${bucketName}`
       : `https://${bucketName}.s3.${region}.amazonaws.com`);

package/src/providers/azure/index.ts

@@ -1,6 +1,7 @@
 import { BlobServiceClient } from '@azure/storage-blob';
 import { type Provider } from '@edgestore/shared';
 import { v4 as uuidv4 } from 'uuid';
+import { getEnv } from '../../adapters/shared';
 
 /**
  * Options for the Azure provider. Compatible with Azure Blob Storage and Azurite.
@@ -41,10 +42,10 @@ export type AzureProviderOptions = {
 
 export function AzureProvider(options?: AzureProviderOptions): Provider {
   const {
-    storageAccountName = process.env.ES_AZURE_ACCOUNT_NAME,
-    sasToken = process.env.ES_AZURE_SAS_TOKEN,
-    containerName = process.env.ES_AZURE_CONTAINER_NAME,
-    customBaseUrl = process.env.ES_AZURE_BASE_URL,
+    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 ?? {};
 
   const baseUrl =

package/src/providers/edgestore/index.ts

@@ -3,6 +3,7 @@ import {
   type Provider,
   type RequestUploadRes,
 } from '@edgestore/shared';
+import { getEnv } from '../../adapters/shared';
 import { initEdgeStoreSdk } from '../../core/sdk';
 import EdgeStoreCredentialsError from '../../libs/errors/EdgeStoreCredentialsError';
 
@@ -29,11 +30,15 @@ export function EdgeStoreProvider(
   options?: EdgeStoreProviderOptions,
 ): Provider {
   const {
-    accessKey = process.env.EDGE_STORE_ACCESS_KEY,
-    secretKey = process.env.EDGE_STORE_SECRET_KEY,
+    accessKey = getEnv('EDGE_STORE_ACCESS_KEY') ??
+      // @ts-expect-error - In Vite/Astro, the env variables are available on `import.meta`.
+      import.meta.env?.EDGE_STORE_ACCESS_KEY,
+    secretKey = getEnv('EDGE_STORE_SECRET_KEY') ??
+      // @ts-expect-error - In Vite/Astro, the env variables are available on `import.meta`.
+      import.meta.env?.EDGE_STORE_SECRET_KEY,
   } = options ?? {};
 
-  const baseUrl = process.env.EDGE_STORE_BASE_URL ?? DEFAULT_BASE_URL;
+  const baseUrl = getEnv('EDGE_STORE_BASE_URL') ?? DEFAULT_BASE_URL;
 
   if (!accessKey || !secretKey) {
     throw new EdgeStoreCredentialsError();

package/adapters/index.d.ts

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

package/adapters/index.js

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

package/providers/index.d.ts

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

package/providers/index.js

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