@whook/gcp-functions 13.0.0 → 13.1.2

package/src/wrappers/{googleHTTPFunction.ts → wrapHandlerForGoogleHTTPFunction.ts}

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { printStackTrace } from 'yerror';
+import { YError, printStackTrace } from 'yerror';
 import {
   DEFAULT_DEBUG_NODE_ENVS,
   DEFAULT_BUFFER_LIMIT,
@@ -10,7 +10,7 @@ import {
   extractOperationSecurityParameters,
   castParameters,
 } from '@whook/http-router';
-import { reuseSpecialProps, alsoInject } from 'knifecycle';
+import { autoService } from 'knifecycle';
 import Ajv from 'ajv';
 import addAJVFormats from 'ajv-formats';
 import bytes from 'bytes';
@@ -30,106 +30,119 @@ import {
   getBody,
   sendBody,
 } from '@whook/http-router';
-import { noop, compose, identity, lowerCaseHeaders } from '@whook/whook';
+import { noop, identity, lowerCaseHeaders } from '@whook/whook';
 import stream from 'stream';
 import type { WhookQueryStringParser } from '@whook/http-router';
-import type { ServiceInitializer, Dependencies, Service } from 'knifecycle';
 import type {
   WhookRequest,
   WhookResponse,
   WhookHandler,
-  ObfuscatorService,
+  WhookObfuscatorService,
   WhookOperation,
   WhookWrapper,
+  WhookErrorHandler,
 } from '@whook/whook';
-import type { TimeService, LogService } from 'common-services';
+import type { LogService } from 'common-services';
 import type { OpenAPIV3 } from 'openapi-types';
 import type { Readable } from 'stream';
-import type { CORSConfig } from '@whook/cors';
+import type { AppEnvVars } from 'application-services';
 
-type HTTPWrapperDependencies = {
-  NODE_ENV: string;
+const SEARCH_SEPARATOR = '?';
+const PATH_SEPARATOR = '/';
+
+export type WhookWrapHTTPFunctionDependencies = {
+  OPERATION_API: OpenAPIV3.Document;
+  ENV: AppEnvVars;
   DEBUG_NODE_ENVS?: string[];
-  OPERATION: WhookOperation;
   DECODERS?: typeof DEFAULT_DECODERS;
   ENCODERS?: typeof DEFAULT_ENCODERS;
   PARSERS?: typeof DEFAULT_PARSERS;
   STRINGIFYERS?: typeof DEFAULT_STRINGIFYERS;
   QUERY_PARSER: WhookQueryStringParser;
   BUFFER_LIMIT?: string;
-  obfuscator: ObfuscatorService;
-  time?: TimeService;
+  obfuscator: WhookObfuscatorService;
+  errorHandler: WhookErrorHandler;
   log?: LogService;
-  WRAPPERS: WhookWrapper<Dependencies, Service>[];
 };
 
-const SEARCH_SEPARATOR = '?';
-const PATH_SEPARATOR = '/';
-
-export default function wrapHandlerForAWSHTTPFunction<
-  D extends Dependencies,
-  S extends WhookHandler,
->(
-  initHandler: ServiceInitializer<D, S>,
-): ServiceInitializer<D & HTTPWrapperDependencies, S> {
-  return alsoInject<HTTPWrapperDependencies, D, S>(
-    [
-      'OPERATION_API',
-      'WRAPPERS',
-      '?DEBUG_NODE_ENVS',
-      'NODE_ENV',
-      '?DECODERS',
-      '?ENCODERS',
-      '?PARSERS',
-      '?STRINGIFYERS',
-      '?BUFFER_LIMIT',
-      'QUERY_PARSER',
-      'obfuscator',
-      '?log',
-      '?time',
-    ],
-    reuseSpecialProps(
-      initHandler,
-      (initHandlerForAWSHTTPFunction as any).bind(
-        null,
-        initHandler,
-      ) as ServiceInitializer<D, S>,
-    ),
-  );
-}
+/**
+ * Wrap an handler to make it work with GCP Functions.
+ * @param  {Object}   services
+ * The services the wrapper depends on
+ * @param  {Object}   services.OPERATION_API
+ * An OpenAPI definitition for that handler
+ * @param  {Object}   services.ENV
+ * The process environment
+ * @param  {Object}   services.DEBUG_NODE_ENVS
+ * The NODE_ENV values that trigger debugging
+ * @param  {Object}   services.DECODERS
+ * Request body decoders available
+ * @param  {Object}   services.ENCODERS
+ * Response body encoders available
+ * @param  {Object}   services.PARSERS
+ * Request body parsers available
+ * @param  {Object}   services.STRINGIFYERS
+ * Response body stringifyers available
+ * @param  {Object}   services.BUFFER_LIMIT
+ * The buffer size limit
+ * @param  {Object}   services.QUERY_PARSER
+ * The query parser to use
+ * @param  {Object}   services.obfuscator
+ * A service to hide sensible values
+ * @param  {Object}   services.errorHandler
+ * A service that changes any error to Whook response
+ * @param  {Object}   [services.log=noop]
+ * An optional logging service
+ * @return {Promise<Object>}
+ * A promise of an object containing the reshaped env vars.
+ */
+
+async function initWrapHandlerForGoogleHTTPFunction<S extends WhookHandler>({
+  OPERATION_API,
+  ENV,
+  DEBUG_NODE_ENVS = DEFAULT_DEBUG_NODE_ENVS,
+  DECODERS = DEFAULT_DECODERS,
+  ENCODERS = DEFAULT_ENCODERS,
+  PARSERS = DEFAULT_PARSERS,
+  STRINGIFYERS = DEFAULT_STRINGIFYERS,
+  BUFFER_LIMIT = DEFAULT_BUFFER_LIMIT,
+  QUERY_PARSER,
+  obfuscator,
+  errorHandler,
+  log = noop,
+}: WhookWrapHTTPFunctionDependencies): Promise<WhookWrapper<S>> {
+  log('debug', '📥 - Initializing the AWS Lambda cron wrapper.');
 
-async function initHandlerForAWSHTTPFunction(
-  initHandler: ServiceInitializer<Dependencies, WhookHandler>,
-  {
-    OPERATION_API,
-    WRAPPERS,
-    NODE_ENV,
-    DEBUG_NODE_ENVS = DEFAULT_DEBUG_NODE_ENVS,
-    DECODERS = DEFAULT_DECODERS,
-    ENCODERS = DEFAULT_ENCODERS,
-    log = noop,
-    time = Date.now.bind(Date),
-    ...services
-  },
-) {
   const path = Object.keys(OPERATION_API.paths)[0];
-  const method = Object.keys(OPERATION_API.paths[path])[0];
-  const OPERATION: WhookOperation = {
+  const pathObject = OPERATION_API.paths[path];
+
+  if (typeof pathObject === 'undefined' || '$ref' in pathObject) {
+    throw new YError('E_BAD_OPERATION', 'pathObject', pathObject);
+  }
+
+  const method = Object.keys(pathObject)[0];
+  const operationObject = pathObject[method];
+
+  if (typeof operationObject === 'undefined' || '$ref' in operationObject) {
+    throw new YError('E_BAD_OPERATION', 'operationObject', operationObject);
+  }
+
+  const operation: WhookOperation = {
     path,
     method,
-    ...OPERATION_API.paths[path][method],
+    ...operationObject,
   };
   const consumableCharsets = Object.keys(DECODERS);
   const produceableCharsets = Object.keys(ENCODERS);
-  const consumableMediaTypes = extractConsumableMediaTypes(OPERATION);
-  const produceableMediaTypes = extractProduceableMediaTypes(OPERATION);
+  const consumableMediaTypes = extractConsumableMediaTypes(operation);
+  const produceableMediaTypes = extractProduceableMediaTypes(operation);
   const ajv = new Ajv.default({
-    verbose: DEBUG_NODE_ENVS.includes(NODE_ENV),
+    verbose: DEBUG_NODE_ENVS.includes(ENV.NODE_ENV),
     strict: true,
     logger: {
-      log: (...args) => log?.('debug', ...args),
-      warn: (...args) => log?.('warning', ...args),
-      error: (...args) => log?.('error', ...args),
+      log: (...args: string[]) => log?.('debug', ...args),
+      warn: (...args: string[]) => log?.('warning', ...args),
+      error: (...args: string[]) => log?.('error', ...args),
     },
     useDefaults: true,
     coerceTypes: true,
@@ -137,71 +150,63 @@ async function initHandlerForAWSHTTPFunction(
   addAJVFormats.default(ajv);
   const ammendedParameters = extractOperationSecurityParameters(
     OPERATION_API,
-    OPERATION,
+    operation,
   );
   const validators = prepareParametersValidators(
     ajv,
-    OPERATION.operationId,
-    ((OPERATION.parameters || []) as OpenAPIV3.ParameterObject[]).concat(
+    operation.operationId,
+    ((operation.parameters || []) as OpenAPIV3.ParameterObject[]).concat(
       ammendedParameters,
     ),
   );
-  const bodyValidator = prepareBodyValidator(ajv, OPERATION);
-  const applyWrappers = compose(...WRAPPERS) as WhookWrapper<
-    Dependencies,
-    Service
-  >;
-
-  const handler = await (
-    applyWrappers(initHandler) as ServiceInitializer<Dependencies, Service>
-  )({
-    OPERATION,
-    DEBUG_NODE_ENVS,
-    NODE_ENV,
-    ...services,
-    time,
-    log,
-  });
+  const bodyValidator = prepareBodyValidator(ajv, operation);
+  const wrapper = async (handler: S): Promise<S> => {
+    const wrappedHandler = handleForAWSHTTPFunction.bind(
+      null,
+      {
+        DECODERS,
+        ENCODERS,
+        PARSERS,
+        STRINGIFYERS,
+        BUFFER_LIMIT,
+        QUERY_PARSER,
+        obfuscator,
+        errorHandler,
+        log,
+      },
+      {
+        consumableMediaTypes,
+        produceableMediaTypes,
+        consumableCharsets,
+        produceableCharsets,
+        validators,
+        bodyValidator,
+        operation,
+      },
+      handler as any,
+    );
 
-  return handleForAWSHTTPFunction.bind(
-    null,
-    {
-      OPERATION,
-      NODE_ENV,
-      DEBUG_NODE_ENVS,
-      DECODERS,
-      ENCODERS,
-      log,
-      time,
-      ...services,
-    } as unknown as HTTPWrapperDependencies & { CORS: CORSConfig },
-    {
-      consumableMediaTypes,
-      produceableMediaTypes,
-      consumableCharsets,
-      produceableCharsets,
-      validators,
-      bodyValidator,
-    },
-    handler,
-  );
+    return wrappedHandler as unknown as S;
+  };
+
+  return wrapper;
 }
 
 async function handleForAWSHTTPFunction(
   {
-    OPERATION,
-    DEBUG_NODE_ENVS,
-    NODE_ENV,
-    ENCODERS,
     DECODERS,
-    PARSERS = DEFAULT_PARSERS,
-    STRINGIFYERS = DEFAULT_STRINGIFYERS,
-    BUFFER_LIMIT = DEFAULT_BUFFER_LIMIT,
+    ENCODERS,
+    PARSERS,
+    STRINGIFYERS,
+    BUFFER_LIMIT,
     QUERY_PARSER,
-    CORS,
-    log,
     obfuscator,
-  }: HTTPWrapperDependencies & { CORS: CORSConfig },
+    errorHandler,
+    log,
+  }: Omit<
+    Required<WhookWrapHTTPFunctionDependencies>,
+    'time' | 'OPERATION_API' | 'ENV' | 'DEBUG_NODE_ENVS'
+  >,
   {
     consumableMediaTypes,
     produceableMediaTypes,
@@ -209,12 +214,26 @@ async function handleForAWSHTTPFunction(
     produceableCharsets,
     validators,
     bodyValidator,
+    operation,
+  }: {
+    consumableMediaTypes: string[];
+    produceableMediaTypes: string[];
+    consumableCharsets: string[];
+    produceableCharsets: string[];
+    validators: {
+      [name: string]: Ajv.ValidateFunction<unknown>;
+    };
+    bodyValidator: (
+      operation: WhookOperation,
+      contentType: string,
+      value: unknown,
+    ) => void;
+    operation: WhookOperation;
   },
   handler: WhookHandler,
   req,
   res,
 ) {
-  const debugging = (DEBUG_NODE_ENVS || []).includes(NODE_ENV);
   const bufferLimit = bytes.parse(BUFFER_LIMIT);
 
   log?.(
@@ -246,7 +265,6 @@ async function handleForAWSHTTPFunction(
   );
 
   try {
-    const operation = OPERATION;
     const bodySpec = extractBodySpec(
       request,
       consumableMediaTypes,
@@ -278,7 +296,7 @@ async function handleForAWSHTTPFunction(
       );
 
       const pathParameters = (
-        OPERATION.path
+        operation.path
           .split(PATH_SEPARATOR)
           .filter(identity)
           .map((part, index) => {
@@ -302,7 +320,7 @@ async function handleForAWSHTTPFunction(
         );
 
       // TODO: Update strictQS to handle OpenAPI 3
-      const retroCompatibleQueryParameters = (OPERATION.parameters || [])
+      const retroCompatibleQueryParameters = (operation.parameters || [])
         .filter((p) => p.in === 'query')
         .map((p) => ({ ...p, ...p.schema }));
 
@@ -371,31 +389,23 @@ async function handleForAWSHTTPFunction(
     };
     log?.('debug', JSON.stringify(responseLog));
   } catch (err) {
-    const castedError = YHTTPError.cast(err as Error);
-
+    response = await errorHandler('none', responseSpec, err as Error);
     responseLog = {
       type: 'error',
-      code: castedError.code,
-      statusCode: castedError.httpCode,
-      params: castedError.params || [],
-      stack: printStackTrace(castedError),
+      code: (err as YError)?.code || 'E_UNEXPECTED',
+      statusCode: response.status,
+      params: (err as YError)?.params || [],
+      stack: printStackTrace(err as Error),
     };
 
     log?.('error', JSON.stringify(responseLog));
+
     response = {
-      status: castedError.httpCode,
+      ...response,
       headers: {
-        ...lowerCaseHeaders(CORS),
-        ...(castedError.headers ?? {}),
+        ...response.headers,
         'content-type': 'application/json',
       },
-      body: {
-        error: {
-          code: castedError.code,
-          stack: debugging ? responseLog.stack : undefined,
-          params: debugging ? responseLog.params : undefined,
-        },
-      },
     };
   }
 
@@ -468,3 +478,5 @@ function obfuscateEventBody(obfuscator, rawBody) {
   }
   return rawBody;
 }
+
+export default autoService(initWrapHandlerForGoogleHTTPFunction);

package/dist/services/log.test.js

@@ -1,8 +0,0 @@
-import { describe, it } from '@jest/globals';
-import initLogService from './log.js';
-describe('initLogService', () => {
-    it('should work', async () => {
-        await initLogService({});
-    });
-});
-//# sourceMappingURL=log.test.js.map

package/dist/services/log.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"log.test.js","sourceRoot":"","sources":["../../src/services/log.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,cAAc,MAAM,UAAU,CAAC;AAEtC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QAC3B,MAAM,cAAc,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/wrappers/googleHTTPFunction.d.ts

@@ -1,22 +0,0 @@
-import { DEFAULT_PARSERS, DEFAULT_STRINGIFYERS, DEFAULT_DECODERS, DEFAULT_ENCODERS } from '@whook/http-router';
-import type { WhookQueryStringParser } from '@whook/http-router';
-import type { ServiceInitializer, Dependencies, Service } from 'knifecycle';
-import type { WhookHandler, ObfuscatorService, WhookOperation, WhookWrapper } from '@whook/whook';
-import type { TimeService, LogService } from 'common-services';
-type HTTPWrapperDependencies = {
-    NODE_ENV: string;
-    DEBUG_NODE_ENVS?: string[];
-    OPERATION: WhookOperation;
-    DECODERS?: typeof DEFAULT_DECODERS;
-    ENCODERS?: typeof DEFAULT_ENCODERS;
-    PARSERS?: typeof DEFAULT_PARSERS;
-    STRINGIFYERS?: typeof DEFAULT_STRINGIFYERS;
-    QUERY_PARSER: WhookQueryStringParser;
-    BUFFER_LIMIT?: string;
-    obfuscator: ObfuscatorService;
-    time?: TimeService;
-    log?: LogService;
-    WRAPPERS: WhookWrapper<Dependencies, Service>[];
-};
-export default function wrapHandlerForAWSHTTPFunction<D extends Dependencies, S extends WhookHandler>(initHandler: ServiceInitializer<D, S>): ServiceInitializer<D & HTTPWrapperDependencies, S>;
-export {};

package/dist/wrappers/googleHTTPFunction.js.map

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

package/src/services/log.test.ts

@@ -1,8 +0,0 @@
-import { describe, it } from '@jest/globals';
-import initLogService from './log.js';
-
-describe('initLogService', () => {
-  it('should work', async () => {
-    await initLogService({});
-  });
-});