zapier-platform-core 15.5.0 → 15.5.2

package/index.d.ts

@@ -3,8 +3,10 @@
 // Definitions by: David Brownman <https://davidbrownman.com>
 
 /// <reference types="node" />
+/// <reference types="node-fetch" />
 
 import { Agent } from 'http';
+import { Headers } from 'node-fetch';
 
 // The EXPORTED OBJECT
 export const version: string;
@@ -101,7 +103,7 @@ export interface HttpRequestOptions {
 
 interface BaseHttpResponse {
   status: number;
-  headers: { [key: string]: string };
+  headers: Headers;
   getHeader(key: string): string | undefined;
   throwForStatus(): void;
   skipThrowForStatus: boolean;
@@ -115,9 +117,10 @@ export interface HttpResponse extends BaseHttpResponse {
 }
 
 export interface RawHttpResponse extends BaseHttpResponse {
-  content: Buffer;
-  json: Promise<object | undefined>;
   body: NodeJS.ReadableStream;
+	buffer(): Promise<Buffer>;
+	json(): Promise<object>;
+	text(): Promise<string>;
 }
 
 type DehydrateFunc = <T>(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapier-platform-core",
-  "version": "15.5.0",
+  "version": "15.5.2",
   "description": "The core SDK for CLI apps in the Zapier Developer Platform.",
   "repository": "zapier/zapier-platform",
   "homepage": "https://platform.zapier.com/",
@@ -51,9 +51,10 @@
     "node-fetch": "2.6.7",
     "oauth-sign": "0.9.0",
     "semver": "7.5.2",
-    "zapier-platform-schema": "15.5.0"
+    "zapier-platform-schema": "15.5.2"
   },
   "devDependencies": {
+    "@types/node-fetch": "^2.6.11",
     "adm-zip": "0.5.10",
     "aws-sdk": "^2.1397.0",
     "dicer": "^0.3.1",

package/src/tools/create-logger.js

@@ -284,27 +284,38 @@ const sendLog = async (logStreamFactory, options, event, message, data) => {
     data.input = truncateData(data.input, MAX_LENGTH);
     data.output = truncateData(data.output, MAX_LENGTH);
   }
+
   // scrub throws an error if there are no secrets
-  const safeMessage = truncateString(
-    sensitiveValues.length ? scrub(message, sensitiveValues) : message
-  );
-  const safeData = recurseReplace(
-    sensitiveValues.length ? scrub(data, sensitiveValues) : data,
-    truncateString
-  );
-  const unsafeData = recurseReplace(data, truncateString);
+  let safeMessage, safeData;
+  if (sensitiveValues.length) {
+    safeMessage = scrub(message, sensitiveValues);
+    safeData = scrub(data, sensitiveValues);
+  } else {
+    safeMessage = message;
+    safeData = data;
+  }
+
+  let safeKeyData = _.pick(data, SAFE_LOG_KEYS);
+
+  if (event.logFieldMaxLength != null && event.logFieldMaxLength >= 0) {
+    const truncate = (s) =>
+      simpleTruncate(s, event.logFieldMaxLength, ' [...]');
+
+    safeMessage = truncate(safeMessage);
+    safeData = recurseReplace(safeData, truncate);
+    safeKeyData = recurseReplace(safeKeyData, truncate);
+  }
+
   // Keep safe log keys uncensored
-  Object.keys(safeData).forEach((key) => {
-    if (SAFE_LOG_KEYS.includes(key)) {
-      safeData[key] = unsafeData[key];
-    }
+  Object.entries(safeKeyData).forEach(([key, value]) => {
+    safeData[key] = value;
   });
 
   safeData.request_headers = formatHeaders(safeData.request_headers);
   safeData.response_headers = formatHeaders(safeData.response_headers);
 
   if (event.logToStdout) {
-    toStdout(event, message, unsafeData);
+    toStdout(event, message, safeData);
   }
 
   if (options.logBuffer && data.log_type === 'console') {