@allthings/cloud-toolkit 2.3.0-dev.8 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/lib.cjs.js CHANGED
@@ -93,7 +93,7 @@ const decodeBase64Body = (request) => request.isBase64Encoded && typeof request.
93
93
 
94
94
  const parseCookiePair = (pair) => {
95
95
  const indexOfEqualCharacter = pair.indexOf('=');
96
- const looksLikeKeyValue = indexOfEqualCharacter >= 0;
96
+ const looksLikeKeyValue = indexOfEqualCharacter !== -1;
97
97
  const key = looksLikeKeyValue &&
98
98
  pair.slice(0, Math.max(0, indexOfEqualCharacter)).trim();
99
99
  const value = looksLikeKeyValue &&
@@ -107,12 +107,12 @@ const parseCookieHeader = (cookieHeader) => {
107
107
  };
108
108
  const cookies = (request) => ({
109
109
  ...request,
110
- cookies: parseCookieHeader((request.headers && request.headers.cookie) || ''),
110
+ cookies: parseCookieHeader(request.headers?.cookie || ''),
111
111
  });
112
112
 
113
113
  const setHostname = (request) => ({
114
114
  ...request,
115
- hostname: (request.headers && request.headers.host) || undefined,
115
+ hostname: request.headers?.host || undefined,
116
116
  });
117
117
 
118
118
  const parseJson = (stringified) => {
@@ -165,7 +165,12 @@ const normalizeHeaders = ({ headers = {}, ...request }) => ({
165
165
 
166
166
  const normalizeProgrammingModel = (request) => ({
167
167
  ...request,
168
- method: request.httpMethod || '',
168
+ method: request.httpMethod ??
169
+ request.requestContext?.http?.method ??
170
+ '',
171
+ path: request.path ??
172
+ request.requestContext?.http?.path ??
173
+ '',
169
174
  provider: 'aws',
170
175
  query: request.queryStringParameters || {},
171
176
  source: request.requestContext ? 'api-gateway' : request.source,
@@ -211,7 +216,7 @@ const makeResponseObject = (responseData, body = '', statusCode = 200, { headers
211
216
  ...responseData,
212
217
  body: body || '',
213
218
  headers: {
214
- ...(responseData && responseData.headers),
219
+ ...responseData?.headers,
215
220
  'content-type': contentType,
216
221
  ...headers,
217
222
  },
@@ -507,7 +512,8 @@ const aws = (request) => {
507
512
  return {
508
513
  apig: {
509
514
  requestId: requestContext.requestId,
510
- resourcePath: requestContext.resourcePath,
515
+ resourcePath: requestContext.resourcePath ??
516
+ '',
511
517
  },
512
518
  awsAccountId: requestContext.accountId,
513
519
  cloudfront: {
@@ -521,10 +527,12 @@ const aws = (request) => {
521
527
  lambda: {
522
528
  functionName: context.functionName,
523
529
  memoryLimit: Number(context.memoryLimitInMB),
524
- remainingExecutionTime: context.getRemainingTimeInMillis && context.getRemainingTimeInMillis(),
530
+ remainingExecutionTime: context.getRemainingTimeInMillis?.(),
525
531
  requestId: context.awsRequestId,
526
532
  },
527
- sourceIp: requestContext.identity.sourceIp,
533
+ sourceIp: requestContext.identity
534
+ ?.sourceIp ??
535
+ requestContext?.http?.sourceIp,
528
536
  };
529
537
  };
530
538
  const logger$1 = (request, response) => {
@@ -535,7 +543,7 @@ const logger$1 = (request, response) => {
535
543
  eventSource: source,
536
544
  hostname,
537
545
  httpMethod: requestContext.httpMethod,
538
- httpProtocol: requestHeaders.via && requestHeaders.via.split(' ')[0],
546
+ httpProtocol: requestHeaders.via?.split(' ')[0],
539
547
  httpReferrer: requestHeaders.referer,
540
548
  httpUserAgent: requestHeaders['user-agent'],
541
549
  requestContentLength: (body && body.length > 0) || 0,
package/dist/lib.esm.js CHANGED
@@ -70,7 +70,7 @@ const decodeBase64Body = (request) => request.isBase64Encoded && typeof request.
70
70
 
71
71
  const parseCookiePair = (pair) => {
72
72
  const indexOfEqualCharacter = pair.indexOf('=');
73
- const looksLikeKeyValue = indexOfEqualCharacter >= 0;
73
+ const looksLikeKeyValue = indexOfEqualCharacter !== -1;
74
74
  const key = looksLikeKeyValue &&
75
75
  pair.slice(0, Math.max(0, indexOfEqualCharacter)).trim();
76
76
  const value = looksLikeKeyValue &&
@@ -84,12 +84,12 @@ const parseCookieHeader = (cookieHeader) => {
84
84
  };
85
85
  const cookies = (request) => ({
86
86
  ...request,
87
- cookies: parseCookieHeader((request.headers && request.headers.cookie) || ''),
87
+ cookies: parseCookieHeader(request.headers?.cookie || ''),
88
88
  });
89
89
 
90
90
  const setHostname = (request) => ({
91
91
  ...request,
92
- hostname: (request.headers && request.headers.host) || undefined,
92
+ hostname: request.headers?.host || undefined,
93
93
  });
94
94
 
95
95
  const parseJson = (stringified) => {
@@ -142,7 +142,12 @@ const normalizeHeaders = ({ headers = {}, ...request }) => ({
142
142
 
143
143
  const normalizeProgrammingModel = (request) => ({
144
144
  ...request,
145
- method: request.httpMethod || '',
145
+ method: request.httpMethod ??
146
+ request.requestContext?.http?.method ??
147
+ '',
148
+ path: request.path ??
149
+ request.requestContext?.http?.path ??
150
+ '',
146
151
  provider: 'aws',
147
152
  query: request.queryStringParameters || {},
148
153
  source: request.requestContext ? 'api-gateway' : request.source,
@@ -188,7 +193,7 @@ const makeResponseObject = (responseData, body = '', statusCode = 200, { headers
188
193
  ...responseData,
189
194
  body: body || '',
190
195
  headers: {
191
- ...(responseData && responseData.headers),
196
+ ...responseData?.headers,
192
197
  'content-type': contentType,
193
198
  ...headers,
194
199
  },
@@ -484,7 +489,8 @@ const aws = (request) => {
484
489
  return {
485
490
  apig: {
486
491
  requestId: requestContext.requestId,
487
- resourcePath: requestContext.resourcePath,
492
+ resourcePath: requestContext.resourcePath ??
493
+ '',
488
494
  },
489
495
  awsAccountId: requestContext.accountId,
490
496
  cloudfront: {
@@ -498,10 +504,12 @@ const aws = (request) => {
498
504
  lambda: {
499
505
  functionName: context.functionName,
500
506
  memoryLimit: Number(context.memoryLimitInMB),
501
- remainingExecutionTime: context.getRemainingTimeInMillis && context.getRemainingTimeInMillis(),
507
+ remainingExecutionTime: context.getRemainingTimeInMillis?.(),
502
508
  requestId: context.awsRequestId,
503
509
  },
504
- sourceIp: requestContext.identity.sourceIp,
510
+ sourceIp: requestContext.identity
511
+ ?.sourceIp ??
512
+ requestContext?.http?.sourceIp,
505
513
  };
506
514
  };
507
515
  const logger$1 = (request, response) => {
@@ -512,7 +520,7 @@ const logger$1 = (request, response) => {
512
520
  eventSource: source,
513
521
  hostname,
514
522
  httpMethod: requestContext.httpMethod,
515
- httpProtocol: requestHeaders.via && requestHeaders.via.split(' ')[0],
523
+ httpProtocol: requestHeaders.via?.split(' ')[0],
516
524
  httpReferrer: requestHeaders.referer,
517
525
  httpUserAgent: requestHeaders['user-agent'],
518
526
  requestContentLength: (body && body.length > 0) || 0,