@8ms/helpers 1.1.81 → 1.1.84

package/aws/lambda/initClient.js

@@ -11,9 +11,9 @@ global.awsLambdaClient = null;
  */
 const initClient = ({ config }) => {
     if (!global.awsLambdaClient) {
-        const { S3Client } = require('@aws-sdk/client-lambda');
+        const { LambdaClient } = require('@aws-sdk/client-lambda');
         const formattedConfig = (0, getConfig_1.default)({ config });
-        global.awsLambdaClient = new S3Client(formattedConfig);
+        global.awsLambdaClient = new LambdaClient(formattedConfig);
     }
 };
 exports.default = initClient;

package/aws/lambda/invoke.d.ts

@@ -1,12 +1,13 @@
 declare type Invoke = {
+    awaitResponse?: boolean;
     functionName: string;
+    isJson?: boolean;
     payload?: object;
-    response?: boolean;
 };
 /**
  * Invoke a AWS Lambda function by passing in the Function name and optional Payload data.
  * Runs asynchronously, doesn't wait for function to fully end.
  * Library: @aws-sdk/client-lambda
  */
-declare const invoke: ({ functionName, payload, response }: Invoke) => Promise<any>;
+declare const invoke: ({ awaitResponse, functionName, isJson, payload }: Invoke) => Promise<any>;
 export default invoke;

package/aws/lambda/invoke.js

@@ -9,10 +9,11 @@ const isResponse200_1 = __importDefault(require("../isResponse200"));
  * Runs asynchronously, doesn't wait for function to fully end.
  * Library: @aws-sdk/client-lambda
  */
-const invoke = async ({ functionName, payload, response }) => {
+const invoke = async ({ awaitResponse, functionName, isJson, payload }) => {
+    let response = false;
     const params = {
         FunctionName: functionName,
-        InvocationType: true === response ? 'RequestResponse' : 'Event',
+        InvocationType: true === awaitResponse ? 'RequestResponse' : 'Event',
     };
     // Payload is defined add to parameters
     if (undefined !== payload) {
@@ -26,17 +27,23 @@ const invoke = async ({ functionName, payload, response }) => {
     // Success
     if ((0, isResponse200_1.default)({ apiResponse })) {
         // Return the data
-        if (response && undefined !== apiResponse['Payload']) {
+        if (awaitResponse && undefined !== apiResponse.Payload) {
             const asciiDecoder = new TextDecoder('ascii');
-            const decoded = asciiDecoder.decode(apiResponse['Payload']);
-            const decodedJson = JSON.parse(decoded);
-            if (undefined !== decodedJson['body']) {
-                return decodedJson['body'];
+            response = asciiDecoder.decode(apiResponse.Payload);
+            // Decode string as JSON object
+            if (true === isJson) {
+                response = JSON.parse(response);
+                // If it's still a string, double decode it
+                if ('string' === typeof response) {
+                    response = JSON.parse(response);
+                }
             }
-            return decodedJson;
         }
-        return true;
+        // Success but not waiting for response
+        else {
+            response = true;
+        }
     }
-    return false;
+    return response;
 };
 exports.default = invoke;

package/google/keywordPlanner/request.d.ts

@@ -13,7 +13,7 @@ export declare type Request = {
     includeAdultKeywords?: boolean;
     keywordPlanNetwork?: Network;
     keywords: string[];
-    language: null;
+    language?: null;
 };
 declare const request: Request;
 export default request;

package/google/keywordPlanner/response.d.ts

@@ -12,7 +12,6 @@ declare type Keyword = {
     competition: number;
     competitionIndex: number;
     months: Month[];
-    monthsAll: number;
     topOfPageBidHigh: number;
     topOfPageBidLow: number;
     totalSearchVolume: number;

package/initClients.d.ts

@@ -33,5 +33,5 @@ declare type InitClients = {
 /**
  * Function to simplify initialising the clients.
  */
-declare const initClients: ({ athenaExpress, awsConfig, awsGlue, awsS3, awsSes, awsSsm, deepCrawl, googleAds, googleConfig, googleBigQuery, googleSheets, googleStorage, prisma, }: InitClients) => Promise<void>;
+declare const initClients: ({ athenaExpress, awsConfig, awsGlue, awsLambda, awsS3, awsSes, awsSsm, deepCrawl, googleAds, googleConfig, googleBigQuery, googleSheets, googleStorage, prisma, }: InitClients) => Promise<void>;
 export default initClients;

package/initClients.js

@@ -5,20 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const initClient_1 = __importDefault(require("./aws/athenaExpress/initClient"));
 const initClient_2 = __importDefault(require("./aws/glue/initClient"));
-const initClient_3 = __importDefault(require("./aws/s3/initClient"));
-const initClient_4 = __importDefault(require("./aws/ses/initClient"));
+const initClient_3 = __importDefault(require("./aws/lambda/initClient"));
+const initClient_4 = __importDefault(require("./aws/s3/initClient"));
+const initClient_5 = __importDefault(require("./aws/ses/initClient"));
 const getParameter_1 = __importDefault(require("./aws/ssm/getParameter"));
-const initClient_5 = __importDefault(require("./aws/ssm/initClient"));
-const initClient_6 = __importDefault(require("./deepCrawl/initClient"));
-const initClient_7 = __importDefault(require("./google/bigQuery/initClient"));
-const initClient_8 = __importDefault(require("./google/sheets/initClient"));
-const initClient_9 = __importDefault(require("./google/storage/initClient"));
-const initClient_10 = __importDefault(require("./googleAds/initClient"));
-const initClient_11 = __importDefault(require("./prisma/initClient"));
+const initClient_6 = __importDefault(require("./aws/ssm/initClient"));
+const initClient_7 = __importDefault(require("./deepCrawl/initClient"));
+const initClient_8 = __importDefault(require("./google/bigQuery/initClient"));
+const initClient_9 = __importDefault(require("./google/sheets/initClient"));
+const initClient_10 = __importDefault(require("./google/storage/initClient"));
+const initClient_11 = __importDefault(require("./googleAds/initClient"));
+const initClient_12 = __importDefault(require("./prisma/initClient"));
 /**
  * Function to simplify initialising the clients.
  */
-const initClients = async ({ athenaExpress, awsConfig, awsGlue, awsS3, awsSes, awsSsm, deepCrawl, googleAds, googleConfig, googleBigQuery, googleSheets, googleStorage, prisma, }) => {
+const initClients = async ({ athenaExpress, awsConfig, awsGlue, awsLambda, awsS3, awsSes, awsSsm, deepCrawl, googleAds, googleConfig, googleBigQuery, googleSheets, googleStorage, prisma, }) => {
     if (athenaExpress) {
         (0, initClient_1.default)({
             config: awsConfig,
@@ -32,27 +33,32 @@ const initClients = async ({ athenaExpress, awsConfig, awsGlue, awsS3, awsSes, a
             config: awsConfig,
         });
     }
-    if (awsS3) {
+    if (awsLambda) {
         (0, initClient_3.default)({
             config: awsConfig,
         });
     }
-    if (awsSes) {
+    if (awsS3) {
         (0, initClient_4.default)({
             config: awsConfig,
         });
     }
-    if (awsSsm || deepCrawl || googleAds || googleConfig) {
+    if (awsSes) {
         (0, initClient_5.default)({
             config: awsConfig,
         });
     }
+    if (awsSsm || deepCrawl || googleAds || googleConfig) {
+        (0, initClient_6.default)({
+            config: awsConfig,
+        });
+    }
     // Deepcrawl authentication using SSM Parameter
     if (deepCrawl) {
         const deepcrawlParameter = await (0, getParameter_1.default)({
             name: deepCrawl.parameterName,
         });
-        await (0, initClient_6.default)({ auth: deepcrawlParameter });
+        await (0, initClient_7.default)({ auth: deepcrawlParameter });
     }
     // Google authentication using SSM
     if (googleConfig) {
@@ -62,20 +68,20 @@ const initClients = async ({ athenaExpress, awsConfig, awsGlue, awsS3, awsSes, a
         });
         // BigQuery
         if (googleBigQuery && googleConfig.projectId) {
-            (0, initClient_7.default)({
+            (0, initClient_8.default)({
                 parameter: googleParameter,
                 projectId: googleConfig.projectId,
             });
         }
         // Google Sheets
         if (googleSheets) {
-            (0, initClient_8.default)({
+            (0, initClient_9.default)({
                 parameter: googleParameter,
             });
         }
         // Google Storage
         if (googleStorage && googleConfig.projectId) {
-            (0, initClient_9.default)({
+            (0, initClient_10.default)({
                 parameter: googleParameter,
                 projectId: googleConfig.projectId,
             });
@@ -86,13 +92,13 @@ const initClients = async ({ athenaExpress, awsConfig, awsGlue, awsS3, awsSes, a
         const googleAdsParameter = await (0, getParameter_1.default)({
             name: googleAds.parameterName,
         });
-        await (0, initClient_10.default)({
+        await (0, initClient_11.default)({
             parameter: googleAdsParameter,
         });
     }
     // Initialise Prisma
     if (prisma) {
-        (0, initClient_11.default)({
+        (0, initClient_12.default)({
             debug: prisma ? false : prisma.debug || false,
         });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name":            "@8ms/helpers",
   "license":         "UNLICENSED",
-  "version":         "1.1.81",
+  "version":         "1.1.84",
   "repository":      {
 	"type": "git",
 	"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"