@squiz/optimization-utils 1.0.0 → 1.1.1

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# @squiz/optimization-utils
+
+## 1.1.1
+
+### Patch Changes
+
+- 2a5e0fe: Changed entry points
+
+## 1.1.0
+
+### Minor Changes
+
+- afea2f1: Added the logs lambda handler

package/dist/{package.d.ts → index.d.ts}

@@ -9,6 +9,7 @@ export * from './logger/SquizRemoteLogger';
 export * from './logger/RemoteLogger';
 export * from './logger/LoggerMessage';
 export * from './logger/Logger';
+export * from './logger/LogsLambdaHandler';
 export * from './httpClient/HttpRequestBuilder';
 export * from './httpClient/HttpClient';
 export * from './httpClient/FetchHttpClient';
@@ -17,7 +18,7 @@ export * from './event/DynamoDBEventMapper';
 export * from './event/DomainEvent';
 export * from './event/AggregateRoot';
 export * from './date/DateManipulator';
+export * from './event/EventHandler';
 export * from './config/ConfigurationLoader';
 export * from './cloudflare/ImplCloudflareKVHttpService';
 export * from './cloudflare/CloudflareKVHttpService';
-export * from './event/EventHandler';

package/dist/{package.js → index.js}

@@ -25,6 +25,7 @@ __exportStar(require("./logger/SquizRemoteLogger"), exports);
 __exportStar(require("./logger/RemoteLogger"), exports);
 __exportStar(require("./logger/LoggerMessage"), exports);
 __exportStar(require("./logger/Logger"), exports);
+__exportStar(require("./logger/LogsLambdaHandler"), exports);
 __exportStar(require("./httpClient/HttpRequestBuilder"), exports);
 __exportStar(require("./httpClient/HttpClient"), exports);
 __exportStar(require("./httpClient/FetchHttpClient"), exports);
@@ -33,8 +34,8 @@ __exportStar(require("./event/DynamoDBEventMapper"), exports);
 __exportStar(require("./event/DomainEvent"), exports);
 __exportStar(require("./event/AggregateRoot"), exports);
 __exportStar(require("./date/DateManipulator"), exports);
+__exportStar(require("./event/EventHandler"), exports);
 __exportStar(require("./config/ConfigurationLoader"), exports);
 __exportStar(require("./cloudflare/ImplCloudflareKVHttpService"), exports);
 __exportStar(require("./cloudflare/CloudflareKVHttpService"), exports);
-__exportStar(require("./event/EventHandler"), exports);
-//# sourceMappingURL=package.js.map
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AAEvC,gEAA8C;AAE9C,yDAAuC;AACvC,wDAAsC;AAEtC,iDAA+B;AAE/B,wDAAsC;AACtC,mEAAiD;AAEjD,6DAA2C;AAC3C,wDAAsC;AACtC,yDAAuC;AACvC,kDAAgC;AAChC,6DAA2C;AAE3C,kEAAgD;AAChD,0DAAwC;AACxC,+DAA6C;AAE7C,8DAA4C;AAE5C,8DAA4C;AAC5C,sDAAoC;AACpC,wDAAsC;AAEtC,yDAAuC;AACvC,uDAAqC;AAErC,+DAA6C;AAE7C,2EAAyD;AACzD,uEAAqD"}

package/dist/logger/LoggerMessage.d.ts

@@ -8,6 +8,9 @@ export declare const TENANT_ID_METADATA: (tenantId: string | ValueOf) => {
 export declare const PROCESSABLE_LOG_METADATA: {
     readonly processable: true;
 };
+export declare const REMOTE_LOG_METADATA: {
+    readonly remote: true;
+};
 export type LogMessage = (message: string | any) => [string | any, Record<string, unknown>];
 export type CreateLog = {
     attachMetadata: (metadata: Record<string, unknown>) => CreateLog;
@@ -17,6 +20,7 @@ export type CreateLog = {
     attachExperimentId: (experimentId: string | ValueOf) => CreateLog;
     attachCaller: <T extends abstract new (...args: any) => any>(caller: InstanceType<T> | string) => CreateLog;
     isProcessable: () => CreateLog;
+    remote: () => CreateLog;
     getMetadata: () => Record<string, unknown>;
     create: <T extends abstract new (...args: any) => any>(caller?: InstanceType<T> | string) => LogMessage;
 };

package/dist/logger/LoggerMessage.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROCESSABLE_LOG_METADATA = exports.TENANT_ID_METADATA = void 0;
+exports.REMOTE_LOG_METADATA = exports.PROCESSABLE_LOG_METADATA = exports.TENANT_ID_METADATA = void 0;
 exports.createLogMessage = createLogMessage;
 exports.createLog = createLog;
 const crypto_1 = require("crypto");
@@ -22,6 +22,7 @@ const TENANT_ID_METADATA = (tenantId) => ({
 });
 exports.TENANT_ID_METADATA = TENANT_ID_METADATA;
 exports.PROCESSABLE_LOG_METADATA = { processable: true };
+exports.REMOTE_LOG_METADATA = { remote: true };
 function createLog(opts) {
     opts = {
         metadata: {
@@ -62,6 +63,9 @@ function createLog(opts) {
     const isProcessable = () => {
         return attachMetadata(exports.PROCESSABLE_LOG_METADATA);
     };
+    const remote = () => {
+        return attachMetadata(exports.REMOTE_LOG_METADATA);
+    };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const attachCaller = (caller) => {
         return attachMetadata({
@@ -88,6 +92,7 @@ function createLog(opts) {
         isProcessable,
         attachCaller,
         getMetadata: () => opts?.metadata ?? {},
+        remote,
         create,
     };
 }

package/dist/logger/LoggerMessage.js.map

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

package/dist/logger/LogsHandler.d.ts

@@ -0,0 +1,11 @@
+import type { CloudWatchLogsEvent } from 'aws-lambda';
+import { RemoteLogger } from './RemoteLogger';
+import { Logger } from './Logger';
+export declare class LogsHandler {
+    private readonly remoteLogger;
+    private readonly logger;
+    constructor(remoteLogger: RemoteLogger, logger: Logger);
+    handle(event: CloudWatchLogsEvent): Promise<void>;
+    private mapLogs;
+    private decodeLogs;
+}

package/dist/logger/LogsHandler.js

@@ -0,0 +1,66 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogsHandler = void 0;
+const zlib_1 = __importDefault(require("zlib"));
+const inversify_1 = require("inversify");
+const util_1 = require("util");
+const RemoteLogger_1 = require("./RemoteLogger");
+const Logger_1 = require("./Logger");
+const LoggerMessage_1 = require("./LoggerMessage");
+let LogsHandler = class LogsHandler {
+    remoteLogger;
+    logger;
+    constructor(remoteLogger, logger) {
+        this.remoteLogger = remoteLogger;
+        this.logger = logger;
+    }
+    async handle(event) {
+        const logMessage = (0, LoggerMessage_1.createLogMessage)(this);
+        this.logger.debug(logMessage(`started mapping CloudWatchLogsEvent`));
+        const remoteLogs = this.mapLogs(event, logMessage);
+        this.logger.debug(logMessage(`finished mapping CloudWatchLogsEvent`));
+        this.logger.debug(logMessage(`started sending logs (count: ${remoteLogs.length}) into the RemoteLogger`));
+        await this.remoteLogger.log(remoteLogs);
+        this.logger.debug(logMessage('finished sending logs into the RemoteLogger'));
+    }
+    mapLogs(event, logMessage) {
+        const logs = this.decodeLogs(event);
+        this.logger.debug(logMessage(`received decoded logs: ${(0, util_1.inspect)(logs, { depth: 4 })}`));
+        const isRemoteLog = (log) => !!log;
+        return logs
+            .map((log) => {
+            const result = RemoteLogger_1.REMOTE_LOG_SCHEMA.safeParse(JSON.parse(log.message));
+            return result.success ? result.data : undefined;
+        })
+            .filter(isRemoteLog);
+    }
+    decodeLogs(event) {
+        const payload = Buffer.from(event.awslogs.data, 'base64');
+        const logs = JSON.parse(zlib_1.default.unzipSync(payload).toString());
+        return logs.logEvents;
+    }
+};
+exports.LogsHandler = LogsHandler;
+exports.LogsHandler = LogsHandler = __decorate([
+    (0, inversify_1.injectable)(),
+    __param(0, (0, inversify_1.inject)(RemoteLogger_1.RemoteLogger)),
+    __param(1, (0, inversify_1.inject)(Logger_1.Logger)),
+    __metadata("design:paramtypes", [RemoteLogger_1.RemoteLogger,
+        Logger_1.Logger])
+], LogsHandler);
+//# sourceMappingURL=LogsHandler.js.map

package/dist/logger/LogsHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LogsHandler.js","sourceRoot":"","sources":["../../src/logger/LogsHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,gDAAwB;AACxB,yCAA+C;AAC/C,+BAA+B;AAE/B,iDAA4E;AAC5E,qCAAkC;AAClC,mDAAmD;AAG5C,IAAM,WAAW,GAAjB,MAAM,WAAW;IAGH;IAEA;IAJnB,YAEmB,YAA0B,EAE1B,MAAc;QAFd,iBAAY,GAAZ,YAAY,CAAc;QAE1B,WAAM,GAAN,MAAM,CAAQ;IAC9B,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,KAA0B;QACrC,MAAM,UAAU,GAAG,IAAA,gCAAgB,EAAC,IAAI,CAAC,CAAC;QAE1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,qCAAqC,CAAC,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,sCAAsC,CAAC,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,UAAU,CACR,gCAAgC,UAAU,CAAC,MAAM,yBAAyB,CAC3E,CACF,CAAC;QACF,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,UAAU,CAAC,6CAA6C,CAAC,CAC1D,CAAC;IACJ,CAAC;IAEO,OAAO,CACb,KAA0B,EAC1B,UAA+C;QAE/C,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,UAAU,CAAC,0BAA0B,IAAA,cAAO,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CACpE,CAAC;QACF,MAAM,WAAW,GAAG,CAAC,GAA0B,EAAoB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAE5E,OAAO,IAAI;aACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,MAAM,MAAM,GAAG,gCAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;YAEpE,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAClD,CAAC,CAAC;aACD,MAAM,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;IAEO,UAAU,CAChB,KAA0B;QAE1B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE5D,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF,CAAA;AAvDY,kCAAW;sBAAX,WAAW;IADvB,IAAA,sBAAU,GAAE;IAGR,WAAA,IAAA,kBAAM,EAAC,2BAAY,CAAC,CAAA;IAEpB,WAAA,IAAA,kBAAM,EAAC,eAAM,CAAC,CAAA;qCADgB,2BAAY;QAElB,eAAM;GALtB,WAAW,CAuDvB"}

package/dist/logger/LogsLambdaHandler.d.ts

@@ -0,0 +1,13 @@
+import { CloudWatchLogsEvent } from 'aws-lambda';
+import { LogsHandler } from './LogsHandler';
+import { Logger } from './Logger';
+import { Container } from 'inversify';
+export declare const CLOUDWATCH_FILTER_PATTERN = "{ $.level = \"info\" || $.level = \"warn\" || ($.level = \"error\" && $.processable IS TRUE) || $.remote IS TRUE }";
+export type LogsLambdaHandler = (event: CloudWatchLogsEvent) => Promise<{
+    status: string;
+}>;
+export declare function createLogsLambdaHandler(instances: {
+    logsHandler: LogsHandler;
+    logger: Logger;
+}): LogsLambdaHandler;
+export declare function createLogsLambdaHandler(container: Container): LogsLambdaHandler;

package/dist/logger/LogsLambdaHandler.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CLOUDWATCH_FILTER_PATTERN = void 0;
+exports.createLogsLambdaHandler = createLogsLambdaHandler;
+const LogsHandler_1 = require("./LogsHandler");
+const Logger_1 = require("./Logger");
+const inversify_1 = require("inversify");
+exports.CLOUDWATCH_FILTER_PATTERN = `{ $.level = "info" || $.level = "warn" || ($.level = "error" && $.processable IS TRUE) || $.remote IS TRUE }`;
+function createLogsLambdaHandler(opts) {
+    let logsHandler;
+    let logger;
+    if (opts instanceof inversify_1.Container) {
+        logsHandler = opts.get(LogsHandler_1.LogsHandler);
+        logger = opts.get(Logger_1.Logger);
+    }
+    else {
+        logsHandler = opts.logsHandler;
+        logger = opts.logger;
+    }
+    return async (event) => {
+        try {
+            await logsHandler.handle(event);
+            return { status: 'ok' };
+        }
+        catch (e) {
+            logger.error(e);
+            throw e;
+        }
+    };
+}
+//# sourceMappingURL=LogsLambdaHandler.js.map

package/dist/logger/LogsLambdaHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LogsLambdaHandler.js","sourceRoot":"","sources":["../../src/logger/LogsLambdaHandler.ts"],"names":[],"mappings":";;;AAkBA,0DAwBC;AAzCD,+CAA4C;AAC5C,qCAAkC;AAClC,yCAAsC;AAEzB,QAAA,yBAAyB,GAAG,8GAA8G,CAAC;AAaxJ,SAAgB,uBAAuB,CACrC,IAA8D;IAE9D,IAAI,WAAwB,CAAC;IAC7B,IAAI,MAAc,CAAC;IAEnB,IAAI,IAAI,YAAY,qBAAS,EAAE,CAAC;QAC9B,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAW,CAAC,CAAC;QACpC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QAC/B,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,OAAO,KAAK,EAAE,KAA0B,EAAE,EAAE;QAC1C,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAEhC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@squiz/optimization-utils",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "",
-  "main": "dist/package.js",
-  "types": "dist/package.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "repository": "https://gitlab.squiz.net/optimization/optimization-utils",
   "scripts": {
     "build": "rm -rf dist && tsc",

package/src/{package.ts → index.ts}

@@ -1,23 +1,35 @@
 export * from './valueObject/TenantId';
+
 export * from './validation/handleValidation';
+
 export * from './typesUtils/utilities';
 export * from './typesUtils/DynamoDB';
+
 export * from './testing/mock';
+
 export * from './scheduler/Scheduler';
 export * from './scheduler/EventBridgeScheduler';
+
 export * from './logger/SquizRemoteLogger';
 export * from './logger/RemoteLogger';
 export * from './logger/LoggerMessage';
 export * from './logger/Logger';
+export * from './logger/LogsLambdaHandler';
+
 export * from './httpClient/HttpRequestBuilder';
 export * from './httpClient/HttpClient';
 export * from './httpClient/FetchHttpClient';
+
 export * from './exception/DomainException';
+
 export * from './event/DynamoDBEventMapper';
 export * from './event/DomainEvent';
 export * from './event/AggregateRoot';
+
 export * from './date/DateManipulator';
+export * from './event/EventHandler';
+
 export * from './config/ConfigurationLoader';
+
 export * from './cloudflare/ImplCloudflareKVHttpService';
 export * from './cloudflare/CloudflareKVHttpService';
-export * from './event/EventHandler';

package/src/logger/LoggerMessage.ts

@@ -35,6 +35,7 @@ export const TENANT_ID_METADATA = (
 });
 
 export const PROCESSABLE_LOG_METADATA = { processable: true } as const;
+export const REMOTE_LOG_METADATA = { remote: true } as const;
 
 export type LogMessage = (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -52,6 +53,7 @@ export type CreateLog = {
     caller: InstanceType<T> | string,
   ) => CreateLog;
   isProcessable: () => CreateLog;
+  remote: () => CreateLog;
   getMetadata: () => Record<string, unknown>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   create: <T extends abstract new (...args: any) => any>(
@@ -112,6 +114,10 @@ export function createLog(opts?: {
     return attachMetadata(PROCESSABLE_LOG_METADATA);
   };
 
+  const remote = (): CreateLog => {
+    return attachMetadata(REMOTE_LOG_METADATA);
+  };
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const attachCaller = <T extends abstract new (...args: any) => any>(
     caller: T | string,
@@ -146,6 +152,7 @@ export function createLog(opts?: {
     isProcessable,
     attachCaller,
     getMetadata: () => opts?.metadata ?? {},
+    remote,
     create,
   };
 }

package/src/logger/LogsHandler.ts

@@ -0,0 +1,66 @@
+import type { CloudWatchLogsEvent } from 'aws-lambda';
+import zlib from 'zlib';
+import { inject, injectable } from 'inversify';
+import { inspect } from 'util';
+import type { CloudWatchLogsLogEvent } from 'aws-lambda/trigger/cloudwatch-logs';
+import { REMOTE_LOG_SCHEMA, RemoteLog, RemoteLogger } from './RemoteLogger';
+import { Logger } from './Logger';
+import { createLogMessage } from './LoggerMessage';
+
+@injectable()
+export class LogsHandler {
+  constructor(
+    @inject(RemoteLogger)
+    private readonly remoteLogger: RemoteLogger,
+    @inject(Logger)
+    private readonly logger: Logger,
+  ) {}
+
+  async handle(event: CloudWatchLogsEvent): Promise<void> {
+    const logMessage = createLogMessage(this);
+
+    this.logger.debug(logMessage(`started mapping CloudWatchLogsEvent`));
+    const remoteLogs = this.mapLogs(event, logMessage);
+
+    this.logger.debug(logMessage(`finished mapping CloudWatchLogsEvent`));
+
+    this.logger.debug(
+      logMessage(
+        `started sending logs (count: ${remoteLogs.length}) into the RemoteLogger`,
+      ),
+    );
+    await this.remoteLogger.log(remoteLogs);
+    this.logger.debug(
+      logMessage('finished sending logs into the RemoteLogger'),
+    );
+  }
+
+  private mapLogs(
+    event: CloudWatchLogsEvent,
+    logMessage: ReturnType<typeof createLogMessage>,
+  ): Array<RemoteLog> {
+    const logs = this.decodeLogs(event);
+
+    this.logger.debug(
+      logMessage(`received decoded logs: ${inspect(logs, { depth: 4 })}`),
+    );
+    const isRemoteLog = (log: undefined | RemoteLog): log is RemoteLog => !!log;
+
+    return logs
+      .map((log) => {
+        const result = REMOTE_LOG_SCHEMA.safeParse(JSON.parse(log.message));
+
+        return result.success ? result.data : undefined;
+      })
+      .filter(isRemoteLog);
+  }
+
+  private decodeLogs(
+    event: CloudWatchLogsEvent,
+  ): Array<CloudWatchLogsLogEvent> {
+    const payload = Buffer.from(event.awslogs.data, 'base64');
+    const logs = JSON.parse(zlib.unzipSync(payload).toString());
+
+    return logs.logEvents;
+  }
+}

package/src/logger/LogsLambdaHandler.ts

@@ -0,0 +1,43 @@
+import { CloudWatchLogsEvent } from 'aws-lambda';
+import { LogsHandler } from './LogsHandler';
+import { Logger } from './Logger';
+import { Container } from 'inversify';
+
+export const CLOUDWATCH_FILTER_PATTERN = `{ $.level = "info" || $.level = "warn" || ($.level = "error" && $.processable IS TRUE) || $.remote IS TRUE }`;
+
+export type LogsLambdaHandler = (
+  event: CloudWatchLogsEvent,
+) => Promise<{ status: string }>;
+
+export function createLogsLambdaHandler(instances: {
+  logsHandler: LogsHandler;
+  logger: Logger;
+}): LogsLambdaHandler;
+export function createLogsLambdaHandler(
+  container: Container,
+): LogsLambdaHandler;
+export function createLogsLambdaHandler(
+  opts: { logsHandler: LogsHandler; logger: Logger } | Container,
+): LogsLambdaHandler {
+  let logsHandler: LogsHandler;
+  let logger: Logger;
+
+  if (opts instanceof Container) {
+    logsHandler = opts.get(LogsHandler);
+    logger = opts.get(Logger);
+  } else {
+    logsHandler = opts.logsHandler;
+    logger = opts.logger;
+  }
+
+  return async (event: CloudWatchLogsEvent) => {
+    try {
+      await logsHandler.handle(event);
+
+      return { status: 'ok' };
+    } catch (e) {
+      logger.error(e);
+      throw e;
+    }
+  };
+}

package/src/logger/__tests__/LogsHandler.spec.ts

@@ -0,0 +1,77 @@
+import { LogsHandler } from '../LogsHandler';
+import zlib from 'zlib';
+import { CloudWatchLogsEvent } from 'aws-lambda';
+import { faker } from '@faker-js/faker';
+import { CloudWatchLogsLogEvent } from 'aws-lambda/trigger/cloudwatch-logs';
+import { RemoteLog, RemoteLogger, RemoteLogLevel } from '../RemoteLogger';
+import { createLoggerMock, createRemoteLoggerMock } from '../../testing/mock';
+import { TenantId } from '../../valueObject/TenantId';
+
+const createCloudWatchEvent = (
+  logs: Array<Record<string, unknown>>,
+): CloudWatchLogsEvent => {
+  const cloudWatchLogsLogEvents: Array<CloudWatchLogsLogEvent> = logs.map(
+    (l) => {
+      return {
+        id: faker.number.bigInt().toString(),
+        timestamp: faker.date.past().valueOf(),
+        message: JSON.stringify(l),
+      };
+    },
+  );
+  const base64 = Buffer.from(
+    JSON.stringify({ logEvents: cloudWatchLogsLogEvents }),
+  );
+  const zipped = zlib.gzipSync(base64);
+
+  return {
+    awslogs: {
+      data: zipped.toString('base64'),
+    },
+  };
+};
+
+describe('LogsHandler', () => {
+  let logsHandler: LogsHandler;
+  let remoteLogger: RemoteLogger;
+  const remoteLog: Omit<RemoteLog, 'tenantId'> & {
+    tenantId: string;
+  } = {
+    level: faker.helpers.arrayElement(Object.values(RemoteLogLevel)),
+    message: faker.word.words(),
+    tenantId: faker.word.words(),
+    timestamp: faker.date.past(),
+  };
+
+  beforeEach(() => {
+    remoteLogger = createRemoteLoggerMock();
+
+    logsHandler = new LogsHandler(remoteLogger, createLoggerMock());
+  });
+
+  it('should decode a CloudWatchLogsEvent and send to the RemoteLogger', async () => {
+    await logsHandler.handle(createCloudWatchEvent([remoteLog]));
+
+    expect(remoteLogger.log).toHaveBeenCalledWith([
+      {
+        ...remoteLog,
+        tenantId: new TenantId(remoteLog.tenantId),
+      },
+    ]);
+  });
+
+  it('should decode a CloudWatchLogsEvent and send only the RemoteLogs to the RemoteLogger', async () => {
+    const otherLog = {
+      test: faker.word.words(),
+    };
+
+    await logsHandler.handle(createCloudWatchEvent([remoteLog, otherLog]));
+
+    expect(remoteLogger.log).toHaveBeenCalledWith([
+      {
+        ...remoteLog,
+        tenantId: new TenantId(remoteLog.tenantId),
+      },
+    ]);
+  });
+});

package/dist/package.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,gEAA8C;AAC9C,yDAAuC;AACvC,wDAAsC;AACtC,iDAA+B;AAC/B,wDAAsC;AACtC,mEAAiD;AACjD,6DAA2C;AAC3C,wDAAsC;AACtC,yDAAuC;AACvC,kDAAgC;AAChC,kEAAgD;AAChD,0DAAwC;AACxC,+DAA6C;AAC7C,8DAA4C;AAC5C,8DAA4C;AAC5C,sDAAoC;AACpC,wDAAsC;AACtC,yDAAuC;AACvC,+DAA6C;AAC7C,2EAAyD;AACzD,uEAAqD;AACrD,uDAAqC"}