zapier-platform-core 15.6.2 → 15.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapier-platform-core",
-  "version": "15.6.2",
+  "version": "15.7.0",
   "description": "The core SDK for CLI apps in the Zapier Developer Platform.",
   "repository": "zapier/zapier-platform",
   "homepage": "https://platform.zapier.com/",
@@ -52,7 +52,7 @@
     "node-fetch": "2.6.7",
     "oauth-sign": "0.9.0",
     "semver": "7.5.2",
-    "zapier-platform-schema": "15.6.2"
+    "zapier-platform-schema": "15.7.0"
   },
   "devDependencies": {
     "@types/node-fetch": "^2.6.11",

package/src/constants.js

@@ -11,6 +11,9 @@ const KILL_MAX_LIMIT = 450 * 1000 * 1000;
 
 const RESPONSE_SIZE_LIMIT = 6291456;
 
+const UPLOAD_MAX_SIZE = 1000 * 1000 * 1000 * 1; // 1GB, in zapier backend too
+const NON_STREAM_UPLOAD_MAX_SIZE = 1000 * 1000 * 150;
+
 const HYDRATE_DIRECTIVE_HOIST = '$HOIST$';
 
 const RENDER_ONLY_METHODS = [
@@ -66,4 +69,6 @@ module.exports = {
   RESPONSE_SIZE_LIMIT,
   SAFE_LOG_KEYS,
   STATUSES,
+  UPLOAD_MAX_SIZE,
+  NON_STREAM_UPLOAD_MAX_SIZE,
 };

package/src/tools/create-file-stasher.js

@@ -3,7 +3,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { pipeline } = require('stream');
+const { pipeline, Readable } = require('stream');
 const { promisify } = require('util');
 const { randomBytes } = require('crypto');
 
@@ -13,8 +13,7 @@ const FormData = require('form-data');
 const mime = require('mime-types');
 
 const request = require('./request-client-internal');
-
-const UPLOAD_MAX_SIZE = 1000 * 1000 * 150; // 150mb, in zapier backend too
+const { UPLOAD_MAX_SIZE, NON_STREAM_UPLOAD_MAX_SIZE } = require('../constants');
 
 const LENGTH_ERR_MESSAGE =
   'We could not calculate the length of your file - please ' +
@@ -183,9 +182,6 @@ const uploader = async (
   filename,
   contentType
 ) => {
-  if (knownLength && knownLength > UPLOAD_MAX_SIZE) {
-    throw new Error(`${knownLength} is too big, ${UPLOAD_MAX_SIZE} is the max`);
-  }
   filename = path.basename(filename).replace('"', '');
 
   const fields = {
@@ -237,6 +233,19 @@ const uploader = async (
   throw new Error(`Got ${response.status} - ${response.content}`);
 };
 
+const ensureUploadMaxSizeNotExceeded = (streamOrData, length) => {
+  let uploadMaxSize = NON_STREAM_UPLOAD_MAX_SIZE;
+  let uploadMethod = 'non-streaming';
+  if (streamOrData instanceof Readable) {
+    uploadMaxSize = UPLOAD_MAX_SIZE;
+    uploadMethod = 'streaming';
+  }
+
+  if (length && length > uploadMaxSize) {
+    throw new Error(`${length} bytes is too big, ${uploadMaxSize} is the max for ${uploadMethod} data.`);
+  }
+};
+
 // Designed to be some user provided function/api.
 const createFileStasher = (input) => {
   const rpc = _.get(input, '_zapier.rpc');
@@ -295,10 +304,13 @@ const createFileStasher = (input) => {
       filename: _filename,
     } = await resolveToBufferStringStream(responseOrData);
 
+    const finalLength = knownLength || length;
+    ensureUploadMaxSizeNotExceeded(streamOrData, finalLength);
+
     return uploader(
       signedPostData,
       streamOrData,
-      knownLength || length,
+      finalLength,
       filename || _filename,
       contentType || _contentType
     );