@jaypie/express 1.2.34 → 1.2.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -337,8 +337,9 @@ declare const EXPRESS: {
337
337
  };
338
338
  };
339
339
 
340
+ type CorsOrigin = string | RegExp | Array<string | RegExp>;
340
341
  interface CorsConfig {
341
- origin?: string | string[];
342
+ origin?: CorsOrigin;
342
343
  overrides?: Record<string, unknown>;
343
344
  }
344
345
  /**
@@ -473,4 +474,4 @@ declare const notFoundRoute: (req: express.Request, res: express.Response) => Pr
473
474
  declare const notImplementedRoute: (req: express.Request, res: express.Response, ...params: unknown[]) => Promise<unknown>;
474
475
 
475
476
  export { EXPRESS, LambdaRequest, LambdaResponseBuffered, LambdaResponseStreaming, badRequestRoute, _default as cors, createLambdaHandler, createLambdaStreamHandler, echoRoute, expressHandler, httpHandler as expressHttpCodeHandler, expressStreamHandler, fabricApiResponse, forbiddenRoute, getCurrentInvoke, getCurrentInvokeUuid, goneRoute, methodNotAllowedRoute, noContentRoute, notFoundRoute, notImplementedRoute };
476
- export type { ApiGatewayV1Event, CorsConfig, CreateLambdaHandlerOptions, ExpressHandlerLocals, ExpressHandlerOptions, ExpressStreamHandler, ExpressStreamHandlerLocals, ExpressStreamHandlerOptions, FunctionUrlEvent, JaypieHandlerSetup, JaypieHandlerTeardown, JaypieHandlerValidate, JaypieStreamHandlerSetup, JaypieStreamHandlerTeardown, JaypieStreamHandlerValidate, LambdaContext, LambdaEvent, LambdaHandler, LambdaResponse, LambdaStreamHandler, ResponseStream };
477
+ export type { ApiGatewayV1Event, CorsConfig, CorsOrigin, CreateLambdaHandlerOptions, ExpressHandlerLocals, ExpressHandlerOptions, ExpressStreamHandler, ExpressStreamHandlerLocals, ExpressStreamHandlerOptions, FunctionUrlEvent, JaypieHandlerSetup, JaypieHandlerTeardown, JaypieHandlerValidate, JaypieStreamHandlerSetup, JaypieStreamHandlerTeardown, JaypieStreamHandlerValidate, LambdaContext, LambdaEvent, LambdaHandler, LambdaResponse, LambdaStreamHandler, ResponseStream };
@@ -2,7 +2,7 @@ export { createLambdaHandler, createLambdaStreamHandler, getCurrentInvoke, Lambd
2
2
  export type { ApiGatewayV1Event, CreateLambdaHandlerOptions, FunctionUrlEvent, LambdaContext, LambdaEvent, LambdaHandler, LambdaResponse, LambdaStreamHandler, ResponseStream, } from "./adapter/index.js";
3
3
  export { EXPRESS } from "./constants.js";
4
4
  export { default as cors } from "./cors.helper.js";
5
- export type { CorsConfig } from "./cors.helper.js";
5
+ export type { CorsConfig, CorsOrigin } from "./cors.helper.js";
6
6
  export { default as fabricApiResponse } from "./fabricApiResponse.js";
7
7
  export { default as expressHandler } from "./expressHandler.js";
8
8
  export type { ExpressHandlerLocals, ExpressHandlerOptions, JaypieHandlerSetup, JaypieHandlerTeardown, JaypieHandlerValidate, } from "./expressHandler.js";
@@ -1,10 +1,11 @@
1
1
  import type { Request, Response, NextFunction } from "express";
2
+ export type CorsOrigin = string | RegExp | Array<string | RegExp>;
2
3
  export interface CorsConfig {
3
- origin?: string | string[];
4
+ origin?: CorsOrigin;
4
5
  overrides?: Record<string, unknown>;
5
6
  }
6
7
  type CorsCallback = (err: Error | null, allow?: boolean) => void;
7
- export declare const dynamicOriginCallbackHandler: (origin?: string | string[]) => ((requestOrigin: string | undefined, callback: CorsCallback) => void);
8
+ export declare const dynamicOriginCallbackHandler: (origin?: CorsOrigin) => ((requestOrigin: string | undefined, callback: CorsCallback) => void);
8
9
  /**
9
10
  * CORS middleware with Lambda streaming support.
10
11
  *
@@ -337,8 +337,9 @@ declare const EXPRESS: {
337
337
  };
338
338
  };
339
339
 
340
+ type CorsOrigin = string | RegExp | Array<string | RegExp>;
340
341
  interface CorsConfig {
341
- origin?: string | string[];
342
+ origin?: CorsOrigin;
342
343
  overrides?: Record<string, unknown>;
343
344
  }
344
345
  /**
@@ -473,4 +474,4 @@ declare const notFoundRoute: (req: express.Request, res: express.Response) => Pr
473
474
  declare const notImplementedRoute: (req: express.Request, res: express.Response, ...params: unknown[]) => Promise<unknown>;
474
475
 
475
476
  export { EXPRESS, LambdaRequest, LambdaResponseBuffered, LambdaResponseStreaming, badRequestRoute, _default as cors, createLambdaHandler, createLambdaStreamHandler, echoRoute, expressHandler, httpHandler as expressHttpCodeHandler, expressStreamHandler, fabricApiResponse, forbiddenRoute, getCurrentInvoke, getCurrentInvokeUuid, goneRoute, methodNotAllowedRoute, noContentRoute, notFoundRoute, notImplementedRoute };
476
- export type { ApiGatewayV1Event, CorsConfig, CreateLambdaHandlerOptions, ExpressHandlerLocals, ExpressHandlerOptions, ExpressStreamHandler, ExpressStreamHandlerLocals, ExpressStreamHandlerOptions, FunctionUrlEvent, JaypieHandlerSetup, JaypieHandlerTeardown, JaypieHandlerValidate, JaypieStreamHandlerSetup, JaypieStreamHandlerTeardown, JaypieStreamHandlerValidate, LambdaContext, LambdaEvent, LambdaHandler, LambdaResponse, LambdaStreamHandler, ResponseStream };
477
+ export type { ApiGatewayV1Event, CorsConfig, CorsOrigin, CreateLambdaHandlerOptions, ExpressHandlerLocals, ExpressHandlerOptions, ExpressStreamHandler, ExpressStreamHandlerLocals, ExpressStreamHandlerOptions, FunctionUrlEvent, JaypieHandlerSetup, JaypieHandlerTeardown, JaypieHandlerValidate, JaypieStreamHandlerSetup, JaypieStreamHandlerTeardown, JaypieStreamHandlerValidate, LambdaContext, LambdaEvent, LambdaHandler, LambdaResponse, LambdaStreamHandler, ResponseStream };
package/dist/esm/index.js CHANGED
@@ -2,7 +2,7 @@ import { flushLlmObs, hasDatadogEnv, submitMetric, DATADOG, loadDatadogApiKey }
2
2
  import { Readable, Writable } from 'node:stream';
3
3
  import { ServerResponse } from 'node:http';
4
4
  import { CorsError, BadRequestError, UnhandledError, GatewayTimeoutError, UnavailableError, BadGatewayError, InternalError, TeapotError, GoneError, MethodNotAllowedError, NotFoundError, ForbiddenError, UnauthorizedError, NotImplementedError } from '@jaypie/errors';
5
- import { force, envBoolean, JAYPIE, HTTP, getHeaderFrom, jaypieHandler } from '@jaypie/kit';
5
+ import { force, isLocalEnv, envBoolean, JAYPIE, HTTP, getHeaderFrom, jaypieHandler } from '@jaypie/kit';
6
6
  import expressCors from 'cors';
7
7
  import { loadEnvVariables, loadEnvSecrets, getContentTypeForFormat, formatStreamError } from '@jaypie/aws';
8
8
  import { log, redactAuth } from '@jaypie/logger';
@@ -1299,8 +1299,9 @@ const dynamicOriginCallbackHandler = (origin) => {
1299
1299
  const additionalOrigins = force.array(origin);
1300
1300
  allowedOrigins.push(...additionalOrigins);
1301
1301
  }
1302
- // Add localhost origins in sandbox
1303
- if (process.env.PROJECT_ENV === SANDBOX_ENV ||
1302
+ // Add localhost origins in local and sandbox environments
1303
+ if (isLocalEnv() ||
1304
+ process.env.PROJECT_ENV === SANDBOX_ENV ||
1304
1305
  envBoolean("PROJECT_SANDBOX_MODE")) {
1305
1306
  allowedOrigins.push("http://localhost");
1306
1307
  allowedOrigins.push(/^http:\/\/localhost:\d+$/);