@adtrackify/at-service-common 1.1.7 → 1.1.8

package/.editorconfig

@@ -1,12 +1,12 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false

package/.vscode/settings.json

@@ -1,10 +1,10 @@
-{  "eslint.validate": [
-  "javascript",
-  "javascriptreact",
-  "typescript",
-  "typescriptreact"
-],
-"editor.codeActionsOnSave": {
-  "source.fixAll.eslint": true,
-},
+{  "eslint.validate": [
+  "javascript",
+  "javascriptreact",
+  "typescript",
+  "typescriptreact"
+],
+"editor.codeActionsOnSave": {
+  "source.fixAll.eslint": true,
+},
 }

package/bitbucket-pipelines.yml

@@ -1,20 +1,20 @@
-image: node:16.18.0
-
-pipelines:
-  default:
-    - step:
-        caches:
-          - node
-        script:
-          - printf "//`node -p \"require('url').parse(process.env.NPM_REGISTRY_URL || 'https://registry.npmjs.org').host\"`/:_authToken=${NPM_TOKEN}\nregistry=${NPM_REGISTRY_URL:-https://registry.npmjs.org}\n" >> ~/.npmrc
-          - npm install
-          - npm run build:dev
-  branches:
-    master:
-      - step:
-          deployment: prod
-          caches:
-            - node
-          script:
-            - printf "//`node -p \"require('url').parse(process.env.NPM_REGISTRY_URL || 'https://registry.npmjs.org').host\"`/:_authToken=${NPM_TOKEN}\nregistry=${NPM_REGISTRY_URL:-https://registry.npmjs.org}\n" >> ~/.npmrc
-            - npm run push
+image: node:16.18.0
+
+pipelines:
+  default:
+    - step:
+        caches:
+          - node
+        script:
+          - printf "//`node -p \"require('url').parse(process.env.NPM_REGISTRY_URL || 'https://registry.npmjs.org').host\"`/:_authToken=${NPM_TOKEN}\nregistry=${NPM_REGISTRY_URL:-https://registry.npmjs.org}\n" >> ~/.npmrc
+          - npm install
+          - npm run build:dev
+  branches:
+    master:
+      - step:
+          deployment: prod
+          caches:
+            - node
+          script:
+            - printf "//`node -p \"require('url').parse(process.env.NPM_REGISTRY_URL || 'https://registry.npmjs.org').host\"`/:_authToken=${NPM_TOKEN}\nregistry=${NPM_REGISTRY_URL:-https://registry.npmjs.org}\n" >> ~/.npmrc
+            - npm run push

package/build.js

@@ -18,5 +18,5 @@ build({
   format: 'esm',
   platform: 'node',
   sourcemap: 'linked',
-  external: [...Object.keys(dependencies), 'aws-sdk', "@faker-js/faker"]
+  external: [...Object.keys(dependencies), '@aws-sdk/client-dynamodb', '@aws-sdk/client-eventbridge', "@faker-js/faker"]
 })

package/dist/index.d.ts

@@ -1,36 +1,40 @@
+declare module '@adtrackify/at-service-common/__tests__/helpers/subscription-helper.spec' {
+  export {};
+
+}
 declare module '@adtrackify/at-service-common/clients/generic/dynamodb-client' {
-  import AWS from 'aws-sdk';
+  import { GetItemCommandOutput, PutItemCommandOutput, DeleteItemCommandOutput, BatchGetItemCommandOutput, QueryCommandInput, QueryCommandOutput } from '@aws-sdk/client-dynamodb';
   export class DynamoDbClient {
-      static safeGet: (tableName: string, keyName: string, keyValue: any) => Promise<AWS.DynamoDB.DocumentClient.AttributeMap | null>;
-      static safePut: (tableName: string, data: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.PutItemOutput, AWS.AWSError> | null>;
-      static safeDelete: (tableName: string, keyName: string, keyValue: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.DeleteItemOutput, AWS.AWSError> | null>;
+      static safeGet: (tableName: string, keyName: string, keyValue: any) => Promise<Record<string, import("@aws-sdk/client-dynamodb").AttributeValue> | null>;
+      static safePut: (tableName: string, data: any) => Promise<PutItemCommandOutput | null>;
+      static safeDelete: (tableName: string, keyName: string, keyValue: any) => Promise<DeleteItemCommandOutput | null>;
       static safeQueryByGSI: (tableName: string, gsiName: string, keyName: string, keyValue: any) => Promise<any[] | null>;
-      static safeBatchGet: (tableName: string, keys: any) => Promise<AWS.DynamoDB.DocumentClient.ItemList>;
-      static queryAll: (params: any) => Promise<any[] | null>;
-      static batchGet: (params: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.BatchGetItemOutput, AWS.AWSError>>;
-      static get: (params: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.GetItemOutput, AWS.AWSError>>;
-      static put: (params: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.PutItemOutput, AWS.AWSError>>;
-      static query: (params: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.QueryOutput, AWS.AWSError>>;
-      static scan: (params: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.ScanOutput, AWS.AWSError>>;
-      static update: (params: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.UpdateItemOutput, AWS.AWSError>>;
-      static delete: (params: any) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.DeleteItemOutput, AWS.AWSError>>;
+      static safeBatchGet: (tableName: string, keys: any) => Promise<Record<string, import("@aws-sdk/client-dynamodb").AttributeValue>[]>;
+      static queryAll: (params: QueryCommandInput) => Promise<any[] | null>;
+      static batchGet: (params: any) => Promise<BatchGetItemCommandOutput>;
+      static get: (params: any) => Promise<GetItemCommandOutput>;
+      static put: (params: any) => Promise<PutItemCommandOutput>;
+      static query: (params: any) => Promise<QueryCommandOutput>;
+      static scan: (params: any) => Promise<import("@aws-sdk/client-dynamodb").ScanCommandOutput>;
+      static update: (params: any) => Promise<import("@aws-sdk/client-dynamodb").UpdateItemCommandOutput>;
+      static delete: (params: any) => Promise<DeleteItemCommandOutput>;
   }
 
 }
 declare module '@adtrackify/at-service-common/clients/generic/eventbridge-client' {
-  import { EventBridge } from 'aws-sdk';
+  import { EventBridgeClient as EventBridge } from '@aws-sdk/client-eventbridge';
   export class EventBridgeClient {
       eventBridge: EventBridge;
       EVENT_BUS_NAME: string;
       constructor(eventBusName: string);
-      buildAndSendEvent: (eventSource: string, eventType: string, eventData: any) => Promise<import("aws-sdk/lib/request").PromiseResult<EventBridge.PutEventsResponse, import("aws-sdk").AWSError>>;
+      buildAndSendEvent: (eventSource: string, eventType: string, eventData: any) => Promise<import("@aws-sdk/client-eventbridge").PutEventsCommandOutput>;
       buildEvent: (eventType: string, eventData: any, eventId?: string, eventTime?: string) => {
           eventId: string;
           eventType: string;
           eventTime: string;
           eventData: any;
       };
-      putEvent: (source: string, detailType: string, data: any, headers?: any) => Promise<import("aws-sdk/lib/request").PromiseResult<EventBridge.PutEventsResponse, import("aws-sdk").AWSError>>;
+      putEvent: (source: string, detailType: string, data: any, headers?: any) => Promise<import("@aws-sdk/client-eventbridge").PutEventsCommandOutput>;
   }
 
 }
@@ -657,8 +661,8 @@ declare module '@adtrackify/at-service-common/services/eventbridge-integration-s
       eventBridgeClient: EventBridgeClient;
       EVENT_BUS_NAME: string;
       constructor(eventBusName: string);
-      sendPostmarkEmailEvent: (eventSource: string, postmarkMessage: Message, postmarkServerToken: string) => Promise<import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/eventbridge").PutEventsResponse, import("aws-sdk").AWSError>>;
-      sendPostmarkTemplatedEmailEvent: (eventSource: string, postmarkMessage: TemplatedMessage, postmarkServerToken: string) => Promise<import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/eventbridge").PutEventsResponse, import("aws-sdk").AWSError>>;
+      sendPostmarkEmailEvent: (eventSource: string, postmarkMessage: Message, postmarkServerToken: string) => Promise<import("@aws-sdk/client-eventbridge").PutEventsCommandOutput>;
+      sendPostmarkTemplatedEmailEvent: (eventSource: string, postmarkMessage: TemplatedMessage, postmarkServerToken: string) => Promise<import("@aws-sdk/client-eventbridge").PutEventsCommandOutput>;
   }
 
 }
@@ -694,10 +698,6 @@ declare module '@adtrackify/at-service-common/types/internal-events/event-detail
 declare module '@adtrackify/at-service-common/types/internal-events/index' {
   export * from '@adtrackify/at-service-common/types/internal-events/event-detail-types';
 
-}
-declare module '@adtrackify/at-service-common/__tests__/helpers/subscription-helper.spec' {
-  export {};
-
 }
 declare module '@adtrackify/at-service-common' {
   import main = require('@adtrackify/at-service-common/src/index');

package/dist/index.js

@@ -6,9 +6,9 @@ var __publicField = (obj, key, value) => {
 };
 
 // src/clients/generic/dynamodb-client.ts
-import AWS from "aws-sdk";
+import { DynamoDBClient, GetItemCommand, PutItemCommand, DeleteItemCommand, BatchGetItemCommand, QueryCommand, ScanCommand, UpdateItemCommand } from "@aws-sdk/client-dynamodb";
 import * as log from "lambda-log";
-var client = new AWS.DynamoDB.DocumentClient();
+var client = new DynamoDBClient({});
 var _DynamoDbClient = class {
 };
 var DynamoDbClient = _DynamoDbClient;
@@ -20,7 +20,8 @@ __publicField(DynamoDbClient, "safeGet", async (tableName, keyName, keyValue) =>
         [keyName]: keyValue
       }
     };
-    const res = await client.get(params).promise();
+    const getItemCommand = new GetItemCommand(params);
+    const res = await client.send(getItemCommand);
     return res?.Item ?? null;
   } catch (e) {
     log.error(e, { message: "Dynamo Client Get Failed" });
@@ -33,7 +34,8 @@ __publicField(DynamoDbClient, "safePut", async (tableName, data) => {
       TableName: tableName,
       Item: data
     };
-    const res = await client.put(params).promise();
+    const putItemCommand = new PutItemCommand(params);
+    const res = await client.send(putItemCommand);
     return res;
   } catch (e) {
     log.error(e, { message: "Dynamo failed simplePut" });
@@ -48,7 +50,8 @@ __publicField(DynamoDbClient, "safeDelete", async (tableName, keyName, keyValue)
         [keyName]: keyValue
       }
     };
-    const res = await client.delete(params).promise();
+    const deleteItemCommand = new DeleteItemCommand(params);
+    const res = await client.send(deleteItemCommand);
     return res;
   } catch (e) {
     log.error(e, { message: "Dynamo failed safeDelete" });
@@ -70,12 +73,14 @@ __publicField(DynamoDbClient, "safeQueryByGSI", async (tableName, gsiName, keyNa
 __publicField(DynamoDbClient, "safeBatchGet", async (tableName, keys) => {
   try {
     const params = {
-      RequestItems: {}
-    };
-    params.RequestItems[tableName] = {
-      Keys: keys
+      RequestItems: {
+        [tableName]: {
+          Keys: keys
+        }
+      }
     };
-    const res = await client.batchGet(params).promise();
+    const batchGetItemCommand = new BatchGetItemCommand(params);
+    const res = await client.send(batchGetItemCommand);
     log.info("batchget res", { batchGetRes: res });
     if (res?.Responses?.[tableName]) {
       return res?.Responses?.[tableName];
@@ -94,7 +99,8 @@ __publicField(DynamoDbClient, "queryAll", async (params) => {
     do {
       params.ExclusiveStartKey = exclusiveStartKey;
       params.Limit = 200;
-      currentResult = await client.query(params).promise();
+      const queryCommand = new QueryCommand(params);
+      currentResult = await client.send(queryCommand);
       if (currentResult.Items) {
         exclusiveStartKey = currentResult.LastEvaluatedKey;
         accumulatedResults = [...accumulatedResults, ...currentResult.Items];
@@ -106,16 +112,16 @@ __publicField(DynamoDbClient, "queryAll", async (params) => {
     return null;
   }
 });
-__publicField(DynamoDbClient, "batchGet", (params) => client.batchGet(params).promise());
-__publicField(DynamoDbClient, "get", (params) => client.get(params).promise());
-__publicField(DynamoDbClient, "put", (params) => client.put(params).promise());
-__publicField(DynamoDbClient, "query", (params) => client.query(params).promise());
-__publicField(DynamoDbClient, "scan", (params) => client.scan(params).promise());
-__publicField(DynamoDbClient, "update", (params) => client.update(params).promise());
-__publicField(DynamoDbClient, "delete", (params) => client.delete(params).promise());
+__publicField(DynamoDbClient, "batchGet", (params) => client.send(new BatchGetItemCommand(params)));
+__publicField(DynamoDbClient, "get", (params) => client.send(new GetItemCommand(params)));
+__publicField(DynamoDbClient, "put", (params) => client.send(new PutItemCommand(params)));
+__publicField(DynamoDbClient, "query", (params) => client.send(new QueryCommand(params)));
+__publicField(DynamoDbClient, "scan", (params) => client.send(new ScanCommand(params)));
+__publicField(DynamoDbClient, "update", (params) => client.send(new UpdateItemCommand(params)));
+__publicField(DynamoDbClient, "delete", (params) => client.send(new DeleteItemCommand(params)));
 
 // src/clients/generic/eventbridge-client.ts
-import { EventBridge } from "aws-sdk";
+import { EventBridgeClient as EventBridge, PutEventsCommand } from "@aws-sdk/client-eventbridge";
 import { v4 as uuidv4 } from "uuid";
 
 // src/libs/dates.ts
@@ -136,7 +142,7 @@ var EventBridgeClient = class {
   eventBridge;
   EVENT_BUS_NAME;
   constructor(eventBusName) {
-    this.eventBridge = new EventBridge();
+    this.eventBridge = new EventBridge({});
     this.EVENT_BUS_NAME = eventBusName;
   }
   buildAndSendEvent = async (eventSource, eventType, eventData) => {
@@ -161,7 +167,8 @@ var EventBridgeClient = class {
         Time: new Date()
       }]
     };
-    const response = await this.eventBridge.putEvents(params).promise();
+    const putEventscommand = new PutEventsCommand(params);
+    const response = await this.eventBridge.send(putEventscommand);
     log2.debug(
       "EventBus Event Published",
       {