lambda-toolkit 0.0.13-beta → 0.0.14-beta

package/dist/index.js

@@ -473,6 +473,37 @@ const methods = {
 module.exports = createInstance( clientProvider.bind( null, S3Client ), methods );
 
 
+/***/ }),
+
+/***/ 739:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+const { GetQueryResultsCommand } = __webpack_require__( 7493 );
+const pollingDelay = __webpack_require__( 2549 );
+const sleep = t => new Promise( r => setTimeout( () => r(), t ) );
+
+const getResults = async ( { client, command } ) => {
+  const { results, status } = await client.send( command );
+
+  if ( [ 'Cancelled', 'Failed', 'Timeout', 'Unknown' ].includes( status ) ) {
+    throw new Error( `Query status is "${status}"` );
+  }
+
+  if ( status === 'Complete' ) {
+    return results;
+  }
+
+  // Running, Scheduled
+  await sleep( pollingDelay );
+  return getResults( { client, command } );
+};
+
+module.exports = async ( { client, queryId } ) => {
+  const command = new GetQueryResultsCommand( { queryId } );
+  return getResults( { client, command } );
+};
+
+
 /***/ }),
 
 /***/ 748:
@@ -833,6 +864,14 @@ const defaultArgs = {
 module.exports = createInstance( args => clientProvider( TimestreamWriteClient, [ Object.assign( {}, defaultArgs, args ) ] ), methods );
 
 
+/***/ }),
+
+/***/ 2549:
+/***/ ((module) => {
+
+module.exports = 500;
+
+
 /***/ }),
 
 /***/ 2705:
@@ -843,6 +882,23 @@ const LambdaApi = __webpack_require__( 321 );
 module.exports = { LambdaApi };
 
 
+/***/ }),
+
+/***/ 2710:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+const { CloudWatchLogsClient } = __webpack_require__( 7493 );
+const clientProvider = __webpack_require__( 9039 );
+const query = __webpack_require__( 4338 );
+const createInstance = __webpack_require__( 5438 );
+
+const methods = {
+  query
+};
+
+module.exports = createInstance( clientProvider.bind( null, CloudWatchLogsClient ), methods );
+
+
 /***/ }),
 
 /***/ 2736:
@@ -866,6 +922,57 @@ module.exports = values => {
 module.exports = ( ...args ) => [ ...new Set( args.filter( Array.isArray ).flat() ) ];
 
 
+/***/ }),
+
+/***/ 2847:
+/***/ ((module) => {
+
+const parseInteger = value => {
+  const number = parseInt( value, 10 );
+  return number <= Number.MAX_SAFE_INTEGER && number >= Number.MIN_SAFE_INTEGER ? number : value;
+};
+
+const parseFloatingPoint = value => {
+  if ( value.replace( /[^\d]/g, '' ).length > 16 ) {
+    return value;
+  }
+  const number = parseFloat( value, 10 );
+  return number <= Number.MAX_SAFE_INTEGER && number >= Number.MIN_SAFE_INTEGER ? number : value;
+};
+
+/* eslint-disable consistent-return */
+module.exports = value => {
+  if ( [ null, undefined ].includes( value ) ) {
+    return undefined;
+  }
+
+  if ( /^\d{4}-\d\d-\d\d((T| )\d\d:\d\d:\d\d(.\d{3})?(Z|\+\d\d:?\d\d)?)?$/.test( value ) ) {
+    return new Date( value );
+  }
+
+  // integer
+  if ( /^-?\d+$/.test( value ) ) {
+    return parseInteger( value );
+  }
+
+  // float
+  if ( /^-?(\d+\.|\.\d+|\d+\.\d+)$/.test( value ) ) {
+    return parseFloatingPoint( value );
+  }
+
+  // boolean
+  if ( /^true$/.test( value ) ) {
+    return true;
+  }
+
+  if ( /^false$/.test( value ) ) {
+    return false;
+  }
+
+  return value;
+};
+
+
 /***/ }),
 
 /***/ 2966:
@@ -1199,28 +1306,16 @@ module.exports = createInstance( clientProvider.bind( null, LambdaClient ), meth
 /***/ 3649:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-const { QueryCommand } = __webpack_require__( 1671 );
-const { camelize } = __webpack_require__( 5762 );
-const parseItems = __webpack_require__( 7261 );
-
-const query = async ( client, queryString, { prevItems = [], recursive, paginationToken, maxRows, rawResponse } ) => {
-  const response = await client.send( new QueryCommand( { QueryString: queryString, NextToken: paginationToken, MaxRows: maxRows } ) );
-  if ( !recursive && rawResponse ) {
-    return response;
-  }
+const { StartQueryCommand } = __webpack_require__( 7493 );
 
-  const nextToken = response.NextToken;
-  if ( nextToken && recursive ) {
-    return query( client, queryString, { prevItems: parseItems( response ), recursive, paginationToken: nextToken, maxRows } );
-  }
+module.exports = async ( { client, nativeArgs, range } ) => {
+  const startTime = range?.from ? Math.trunc( range.from / 1000 ) : nativeArgs.startTime;
+  const endTime = range?.to ? Math.trunc( range.to / 1000 ) : nativeArgs.endTime;
 
-  const items = prevItems.concat( parseItems( response ) );
-  return { nextToken, count: items.length, items, queryStatus: camelize( response.QueryStatus ) };
+  const { queryId } = await client.send( new StartQueryCommand( { ...nativeArgs, startTime, endTime } ) );
+  return queryId;
 };
 
-module.exports = async ( client, queryString, { recursive = false, paginationToken = undefined, maxRows = undefined, rawResponse = false } = {} ) =>
-  query( client, queryString, { recursive, paginationToken, maxRows, rawResponse } );
-
 
 /***/ }),
 
@@ -1402,7 +1497,7 @@ module.exports = {
 /***/ 4225:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-const query = __webpack_require__( 3649 );
+const query = __webpack_require__( 6030 );
 const { TimestreamQueryClient } = __webpack_require__( 1671 );
 const { Agent } = __webpack_require__( 5692 );
 const clientProvider = __webpack_require__( 9039 );
@@ -1471,6 +1566,40 @@ module.exports = async ( closure, { limit = 0, delay = 0, retryHook = null } = {
   execWithRetry( closure, { limit, delay, retryHook } );
 
 
+/***/ }),
+
+/***/ 4338:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+const startQuery = __webpack_require__( 3649 );
+const getResults = __webpack_require__( 739 );
+const parseResults = __webpack_require__( 9552 );
+
+/**
+ * @class Result
+ * @type {Object}
+ * @property {Object[]} items Each query result row, parsed to a camelized js object
+ * @property {Number} count Total number of results
+ */
+
+/**
+ * Executes an Athena Query
+ * @param {*} client The native client
+ * @param {Object} nativeArgs The native args to start the Cloudwatch Query
+ * @param {Object=} options Extra options for this command
+ * @param {Object=} options.range Since the nativeArgs "startTime" and "endTime" are second based epochs, the "range" argument accepts milliseconds based epochs for convenience, thus overwriting the "nativeArgs"
+ * @param {Number} options.range.from The beginning of the time range to query, overwrites "startTime"
+ * @param {Number} options.range.to The end of the time range to query, overwrites "endTime"
+ * @returns {Result} The query result
+ */
+module.exports = async ( client, nativeArgs, { range = {} } = {} ) => {
+  const queryId = await startQuery( { client, nativeArgs, range } );
+  const results = await getResults( { client, queryId } );
+  const items = parseResults( results );
+  return { items, count: items.length };
+};
+
+
 /***/ }),
 
 /***/ 4348:
@@ -1530,6 +1659,7 @@ module.exports = ( items, size ) => items.reduce( ( arrs, item ) =>
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 const athena = __webpack_require__( 228 );
+const cwLogs = __webpack_require__( 2710 );
 const dynamo = __webpack_require__( 1505 );
 const lambda = __webpack_require__( 3544 );
 const s3 = __webpack_require__( 645 );
@@ -1542,6 +1672,7 @@ const timestreamWrite = __webpack_require__( 2538 );
 
 module.exports = {
   athena,
+  cwLogs,
   dynamo,
   lambda,
   s3,
@@ -1827,6 +1958,34 @@ module.exports = async ( client, name, payload = {}, type = 'RequestResponse' )
 };
 
 
+/***/ }),
+
+/***/ 6030:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+const { QueryCommand } = __webpack_require__( 1671 );
+const { camelize } = __webpack_require__( 5762 );
+const parseItems = __webpack_require__( 7261 );
+
+const query = async ( client, queryString, { prevItems = [], recursive, paginationToken, maxRows, rawResponse } ) => {
+  const response = await client.send( new QueryCommand( { QueryString: queryString, NextToken: paginationToken, MaxRows: maxRows } ) );
+  if ( !recursive && rawResponse ) {
+    return response;
+  }
+
+  const nextToken = response.NextToken;
+  if ( nextToken && recursive ) {
+    return query( client, queryString, { prevItems: parseItems( response ), recursive, paginationToken: nextToken, maxRows } );
+  }
+
+  const items = prevItems.concat( parseItems( response ) );
+  return { nextToken, count: items.length, items, queryStatus: camelize( response.QueryStatus ) };
+};
+
+module.exports = async ( client, queryString, { recursive = false, paginationToken = undefined, maxRows = undefined, rawResponse = false } = {} ) =>
+  query( client, queryString, { recursive, paginationToken, maxRows, rawResponse } );
+
+
 /***/ }),
 
 /***/ 6089:
@@ -2080,6 +2239,14 @@ module.exports = getResults;
 module.exports = v => Math.ceil( v / 1000 );
 
 
+/***/ }),
+
+/***/ 7493:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("@aws-sdk/client-cloudwatch-logs");
+
 /***/ }),
 
 /***/ 7572:
@@ -2400,8 +2567,6 @@ module.exports = ( constructor, args = [] ) => {
   const cacheKey = `${constructor.name}(${args.map( arg => JSON.stringify( arg ) ).join( ',' )})`;
   return cache.get( cacheKey ) ?? ( () => {
     const client = Reflect.construct( constructor, args );
-    // console.log( 'client', client );
-    // const client = new constructor( ...args );
     cache.set( cacheKey, client );
     return client;
   } )();
@@ -2456,6 +2621,30 @@ module.exports = ( v, type ) => {
 };
 
 
+/***/ }),
+
+/***/ 9179:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+const parseValue = __webpack_require__( 2847 );
+
+module.exports = item =>
+  item.reduce( ( row, { field, value } ) =>
+    Object.assign( row, {
+      [field]: parseValue( value )
+    } ), {} );
+
+
+/***/ }),
+
+/***/ 9552:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+const parseItem = __webpack_require__( 9179 );
+
+module.exports = results => results.map( item => parseItem( item ) );
+
+
 /***/ }),
 
 /***/ 9556:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-toolkit",
-  "version": "0.0.13-beta",
+  "version": "0.0.14-beta",
   "description": "A set of tools to help and simplify Node Js code development for AWS Lambdas",
   "files": [
     "./license",
@@ -25,6 +25,7 @@
   "homepage": "https://github.com/szanata/lambda-toolkit",
   "dependencies": {
     "@aws-sdk/client-athena": "^3.758.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.774.0",
     "@aws-sdk/client-dynamodb": "^3.758.0",
     "@aws-sdk/client-lambda": "^3.758.0",
     "@aws-sdk/client-s3": "^3.758.0",