@adtrackify/at-service-common 1.1.7 → 1.1.9

package/jest.config.ts

@@ -1,41 +1,41 @@
-/*eslint-disable */
-
-export default {
-  globals: {
-    'ts-jest': {
-      isolatedModules: true
-    },
-    '@swc/jest': {
-      isolatedModules: true
-    }
-
-  },
-  roots: [ '<rootDir>/src' ],
-  testRegex: '\\.spec\\.(js|ts)$',
-  transform: {
-    "^.+\\.(t|j)sx?$": [ "@swc/jest" ],
-  },
-  moduleFileExtensions: [ 'js', 'json', 'ts' ],
-  transformIgnorePatterns: [],
-  runner: 'groups',
-  verbose: false,
-  coverageThreshold: {
-    global: {
-      branches: 0,
-      functions: 0,
-      lines: 0,
-      statements: 0
-    }
-  },
-  coverageReporters: [ 'html', 'text', 'text-summary', 'cobertura' ],
-  reporters: [ 'default', 'jest-junit' ],
-  collectCoverageFrom: [
-    'src/**/*.ts',
-    '!src/**/*.spec.js',
-    'src/**/*.js',
-    '!src/**/*.spec.ts',
-    '!src/**/tests/**'
-  ],
-  setupFilesAfterEnv: [],
-};
+/*eslint-disable */
+
+export default {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true
+    },
+    '@swc/jest': {
+      isolatedModules: true
+    }
+
+  },
+  roots: [ '<rootDir>/src' ],
+  testRegex: '\\.spec\\.(js|ts)$',
+  transform: {
+    "^.+\\.(t|j)sx?$": [ "@swc/jest" ],
+  },
+  moduleFileExtensions: [ 'js', 'json', 'ts' ],
+  transformIgnorePatterns: [],
+  runner: 'groups',
+  verbose: false,
+  coverageThreshold: {
+    global: {
+      branches: 0,
+      functions: 0,
+      lines: 0,
+      statements: 0
+    }
+  },
+  coverageReporters: [ 'html', 'text', 'text-summary', 'cobertura' ],
+  reporters: [ 'default', 'jest-junit' ],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.spec.js',
+    'src/**/*.js',
+    '!src/**/*.spec.ts',
+    '!src/**/tests/**'
+  ],
+  setupFilesAfterEnv: [],
+};
 /*eslint-enable */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adtrackify/at-service-common",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "",
   "module": "./dist/index.js",
   "main": "./dist/index.js",
@@ -8,7 +8,7 @@
   "modules": "esm",
   "engines": {
     "npm": ">=8.0.0 <9.0.0",
-    "node": ">=16.0.0 <17.0.0"
+    "node": ">=16.0.0 <18.14.2"
   },
   "scripts": {
     "clean": "rimraf dist",
@@ -47,6 +47,9 @@
   },
   "devDependencies": {
     "@adtrackify/at-tracking-event-types": "^1.1.2",
+    "@aws-sdk/client-dynamodb": "^3.278.0",
+    "@aws-sdk/client-eventbridge": "^3.278.0",
+    "@aws-sdk/lib-dynamodb": "^3.279.0",
     "@babel/cli": "^7.13.16",
     "@babel/core": "^7.19.1",
     "@babel/plugin-proposal-optional-chaining": "^7.13.8",
@@ -61,7 +64,6 @@
     "@types/node": "^17.0.8",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
-    "aws-sdk": "^2.1217.0",
     "core-js": "^3.25.1",
     "cross-env": "^7.0.3",
     "esbuild": "^0.14.54",

package/src/__tests__/helpers/subscription-helper.spec.ts

@@ -1,41 +1,41 @@
-
-/**
- * @group unit
- */
-
-/* eslint-disable */
-
-jest.mock('lambda-log');
-import * as Logger from 'lambda-log';
-import { getPlanDetails } from '../../helpers';
-
-describe('postmark service email test', () => {
-  jest.spyOn(Logger, 'warn').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'info').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'debug').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'error').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-
-  beforeEach(async () => {
-
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-
-  it('should call send email message', async () => {
-    const plan = getPlanDetails(2, 'dev');
-    console.log(plan);
-    expect(plan).not.toEqual(null);
-  });
-
+
+/**
+ * @group unit
+ */
+
+/* eslint-disable */
+
+jest.mock('lambda-log');
+import * as Logger from 'lambda-log';
+import { getPlanDetails } from '../../helpers';
+
+describe('postmark service email test', () => {
+  jest.spyOn(Logger, 'warn').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'info').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'debug').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'error').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+
+  beforeEach(async () => {
+
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+
+  it('should call send email message', async () => {
+    const plan = getPlanDetails(2, 'dev');
+    console.log(plan);
+    expect(plan).not.toEqual(null);
+  });
+
 });

package/src/clients/generic/axios.d.ts

@@ -1,8 +1,8 @@
-declare module 'axios/lib/adapters/http' {
-  import { AxiosAdapter } from 'axios';
-
-  const httpAdapter: AxiosAdapter;
-  namespace httpAdapter { }
-
-  export = httpAdapter;
+declare module 'axios/lib/adapters/http' {
+  import { AxiosAdapter } from 'axios';
+
+  const httpAdapter: AxiosAdapter;
+  namespace httpAdapter { }
+
+  export = httpAdapter;
 }

package/src/clients/generic/dynamodb-client.ts

@@ -1,114 +1,127 @@
-import AWS from 'aws-sdk';
-import { BatchGetItemInput, QueryOutput } from 'aws-sdk/clients/dynamodb';
-import * as log from 'lambda-log';
-const client = new AWS.DynamoDB.DocumentClient();
-
-export class DynamoDbClient {
-  static safeGet = async (tableName: string, keyName: string, keyValue: any) => {
-    try {
-      const params = {
-        TableName: tableName,
-        Key: {
-          [ keyName ]: keyValue
-        }
-      };
-      const res = await client.get(params).promise();
-      return res?.Item ?? null;
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo Client Get Failed' });
-      return null;
-    }
-  };
-
-  static safePut = async (tableName: string, data: any) => {
-    try {
-      const params = {
-        TableName: tableName,
-        Item: data
-      };
-      const res = await client.put(params).promise();
-      return res;
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo failed simplePut' });
-      return null;
-    }
-  };
-
-  static safeDelete = async (tableName: string, keyName: string, keyValue: any) => {
-    try {
-      const params = {
-        TableName: tableName,
-        Key: {
-          [ keyName ]: keyValue
-        }
-      };
-      const res = await client.delete(params).promise();
-      return res;
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo failed safeDelete' });
-      return null;
-    }
-  };
-
-  static safeQueryByGSI = async (tableName: string, gsiName: string, keyName: string, keyValue: any) => {
-    const query = {
-      TableName: tableName,
-      IndexName: gsiName,
-      KeyConditionExpression: `${keyName} = :value`,
-      ExpressionAttributeValues: {
-        ':value': keyValue
-      }
-    };
-    const results = await DynamoDbClient.queryAll(query);
-    return results;
-  };
-
-  static safeBatchGet = async (tableName: string, keys: any) => {
-    try {
-      const params: BatchGetItemInput = {
-        RequestItems: {}
-      };
-      params.RequestItems[ tableName ] = {
-        Keys: keys
-      };
-      const res = await client.batchGet(params).promise();
-      log.info('batchget res', { batchGetRes: res });
-      if (res?.Responses?.[ tableName ]) {
-        return res?.Responses?.[ tableName ];
-      }
-      return [];
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo failed safeBatchGet' });
-      return [];
-    }
-  };
-
-  static queryAll = async (params: any) => {
-    try {
-      log.info('Invoke Query All', { params });
-      let currentResult: QueryOutput, exclusiveStartKey;
-      let accumulatedResults: any[] = [];
-      do {
-        params.ExclusiveStartKey = exclusiveStartKey;
-        params.Limit = 200;
-        currentResult = await client.query(params).promise();
-        if (currentResult.Items) {
-          exclusiveStartKey = currentResult.LastEvaluatedKey;
-          accumulatedResults = [ ...accumulatedResults, ...currentResult.Items ];
-        }
-      } while (currentResult.Items && currentResult.Items.length > 0 && currentResult.LastEvaluatedKey);
-      return accumulatedResults;
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo failed queryAll' });
-      return null;
-    }
-  };
-
-  static batchGet = (params: any) => client.batchGet(params).promise();
-  static get = (params: any) => client.get(params).promise();
-  static put = (params: any) => client.put(params).promise();
-  static query = (params: any) => client.query(params).promise();
-  static scan = (params: any) => client.scan(params).promise();
-  static update = (params: any) => client.update(params).promise();
-  static delete = (params: any) => client.delete(params).promise();
+import { DynamoDBClient, QueryOutput } from '@aws-sdk/client-dynamodb';
+import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb'; 
+import * as log from 'lambda-log';
+
+const marshallOptions = {
+  convertEmptyValues: false,
+  removeUndefinedValues: false,
+  convertClassInstanceToMap: false
+};
+
+const unmarshallOptions = {
+  wrapNumbers: false,
+};
+
+const translateConfig = { marshallOptions, unmarshallOptions };
+const ddbClient = new DynamoDBClient({});
+const client = DynamoDBDocument.from(ddbClient, translateConfig);
+
+export class DynamoDbClient {
+  static safeGet = async (tableName: string, keyName: string, keyValue: any) => {
+    try {
+      const params = {
+        TableName: tableName,
+        Key: {
+          [ keyName ]: keyValue
+        }
+      };
+      const res = await client.get(params);
+      return res?.Item ?? null;
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo Client Get Failed' });
+      return null;
+    }
+  };
+
+  static safePut = async (tableName: string, data: any) => {
+    try {
+      const params = {
+        TableName: tableName,
+        Item: data
+      };
+      const res = await client.put(params);
+      return res;
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo failed simplePut' });
+      return null;
+    }
+  };
+
+  static safeDelete = async (tableName: string, keyName: string, keyValue: any) => {
+    try {
+      const params = {
+        TableName: tableName,
+        Key: {
+          [ keyName ]: keyValue
+        }
+      };
+      const res = await client.delete(params);
+      return res;
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo failed safeDelete' });
+      return null;
+    }
+  };
+
+  static safeQueryByGSI = async (tableName: string, gsiName: string, keyName: string, keyValue: any) => {
+    const query = {
+      TableName: tableName,
+      IndexName: gsiName,
+      KeyConditionExpression: `${keyName} = :value`,
+      ExpressionAttributeValues: {
+        ':value': keyValue
+      }
+    };
+    const results = await DynamoDbClient.queryAll(query);
+    return results;
+  };
+
+  static safeBatchGet = async (tableName: string, keys: any) => {
+    try {
+      const params: any = {
+        RequestItems: {}
+      };
+      params.RequestItems[ tableName ] = {
+        Keys: keys
+      };
+      const res = await client.batchGet(params);
+      log.info('batchget res', { batchGetRes: res });
+      if (res?.Responses?.[ tableName ]) {
+        return res?.Responses?.[ tableName ];
+      }
+      return [];
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo failed safeBatchGet' });
+      return [];
+    }
+  };
+
+  static queryAll = async (params: any) => {
+    try {
+      log.info('Invoke Query All', { params });
+      let currentResult: QueryOutput, exclusiveStartKey;
+      let accumulatedResults: any[] = [];
+      do {
+        params.ExclusiveStartKey = exclusiveStartKey;
+        params.Limit = 200;
+        currentResult = await client.query(params);
+        if (currentResult.Items) {
+          exclusiveStartKey = currentResult.LastEvaluatedKey;
+          accumulatedResults = [ ...accumulatedResults, ...currentResult.Items ];
+        }
+      } while (currentResult.Items && currentResult.Items.length > 0 && currentResult.LastEvaluatedKey);
+      return accumulatedResults;
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo failed queryAll' });
+      return null;
+    }
+  };
+
+  static batchGet = (params: any) => client.batchGet(params);
+  static get = (params: any) => client.get(params);
+  static put = (params: any) => client.put(params);
+  static query = (params: any) => client.query(params);
+  static scan = (params: any) => client.scan(params);
+  static update = (params: any) => client.update(params);
+  static delete = (params: any) => client.delete(params);
 }

package/src/clients/generic/eventbridge-client.ts

@@ -1,52 +1,53 @@
-import { EventBridge } from 'aws-sdk';
-import { v4 as uuidv4 } from 'uuid';
-import { getCurrentTimestamp } from '../../libs/dates';
-import * as log from 'lambda-log';
-
-export class EventBridgeClient {
-  public eventBridge: EventBridge;
-  public EVENT_BUS_NAME: string;
-
-  constructor (eventBusName: string) {
-    this.eventBridge = new EventBridge();
-    this.EVENT_BUS_NAME = eventBusName;
-  }
-
-  public buildAndSendEvent = async (eventSource: string, eventType: string, eventData: any) => {
-    const event = this.buildEvent(eventType, eventData);
-    return await this.putEvent(eventSource, eventType, event);
-  };
-
-  public buildEvent = (eventType: string, eventData: any, eventId: string = uuidv4(), eventTime: string = getCurrentTimestamp()) => {
-    return {
-      eventId,
-      eventType,
-      eventTime,
-      eventData
-    };
-  };
-
-  public putEvent = async (source: string, detailType: string, data: any, headers: any = null) => {
-    const params = {
-      Entries: [ {
-        Detail: JSON.stringify({ headers, data }),
-        DetailType: detailType,
-        EventBusName: this.EVENT_BUS_NAME,
-        Source: source,
-        Time: new Date(),
-      } ],
-    };
-    const response = await this.eventBridge.putEvents(params).promise();
-    log.debug('EventBus Event Published',
-      {
-        eventBusName: this.EVENT_BUS_NAME,
-        eventSource: source,
-        eventType: detailType,
-        event: data,
-        response
-      });
-    return response;
-  };
-
-}
-
+import { EventBridgeClient as EventBridge, PutEventsCommand, PutEventsCommandInput } from '@aws-sdk/client-eventbridge';
+import { v4 as uuidv4 } from 'uuid';
+import { getCurrentTimestamp } from '../../libs/dates';
+import * as log from 'lambda-log';
+
+export class EventBridgeClient {
+  public eventBridge: EventBridge;
+  public EVENT_BUS_NAME: string;
+
+  constructor (eventBusName: string) {
+    this.eventBridge = new EventBridge({});
+    this.EVENT_BUS_NAME = eventBusName;
+  }
+
+  public buildAndSendEvent = async (eventSource: string, eventType: string, eventData: any) => {
+    const event = this.buildEvent(eventType, eventData);
+    return await this.putEvent(eventSource, eventType, event);
+  };
+
+  public buildEvent = (eventType: string, eventData: any, eventId: string = uuidv4(), eventTime: string = getCurrentTimestamp()) => {
+    return {
+      eventId,
+      eventType,
+      eventTime,
+      eventData
+    };
+  };
+
+  public putEvent = async (source: string, detailType: string, data: any, headers: any = null) => {
+    const params: PutEventsCommandInput = {
+      Entries: [ {
+        Detail: JSON.stringify({ headers, data }),
+        DetailType: detailType,
+        EventBusName: this.EVENT_BUS_NAME,
+        Source: source,
+        Time: new Date(),
+      } ],
+    };
+    const putEventscommand = new PutEventsCommand(params);
+    const response = await this.eventBridge.send(putEventscommand);
+    log.debug('EventBus Event Published',
+      {
+        eventBusName: this.EVENT_BUS_NAME,
+        eventSource: source,
+        eventType: detailType,
+        event: data,
+        response
+      });
+    return response;
+  };
+
+}
+