contentful-export 7.14.58 → 7.15.0

package/dist/tasks/download-assets.js

@@ -13,7 +13,11 @@ var _figures = _interopRequireDefault(require("figures"));
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _request = _interopRequireDefault(require("request"));
+var _nodeFetch = _interopRequireDefault(require("node-fetch"));
+
+var _stream = require("stream");
+
+var _util = require("util");
 
 var _embargoedAssets = require("../utils/embargoedAssets");
 
@@ -21,38 +25,37 @@ var _getEntityName = _interopRequireDefault(require("contentful-batch-libs/dist/
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function downloadAsset({
+const streamPipeline = (0, _util.promisify)(_stream.pipeline);
+
+async function downloadAsset({
   url,
   directory
 }) {
-  return new _bluebird.default(function (resolve, reject) {
-    // handle urls without protocol
-    if (url.startsWith('//')) {
-      url = 'https:' + url;
-    } // build local file path from the url for the download
+  // handle urls without protocol
+  if (url.startsWith('//')) {
+    url = 'https:' + url;
+  } // build local file path from the url for the download
 
 
-    const parsedUrl = new URL(url);
+  const parsedUrl = new URL(url);
 
-    const localFile = _path.default.join(directory, parsedUrl.host, parsedUrl.pathname); // ensure directory exists and create file stream
+  const localFile = _path.default.join(directory, parsedUrl.host, parsedUrl.pathname); // ensure directory exists and create file stream
 
 
-    _fsExtra.default.mkdirsSync(_path.default.dirname(localFile));
+  _fsExtra.default.mkdirsSync(_path.default.dirname(localFile));
 
-    const file = _fsExtra.default.createWriteStream(localFile); // download asset
+  const file = _fsExtra.default.createWriteStream(localFile); // download asset
 
 
-    const assetRequest = _request.default.get(url); // pipe response content to file
+  const assetRequest = await (0, _nodeFetch.default)(url);
 
+  if (!assetRequest.ok) {
+    throw new Error(`error response status: ${assetRequest.status}`);
+  } // Wait for stream to be consumed before returning local file
 
-    assetRequest.on('error', err => {
-      reject(err);
-    }).on('response', response => {
-      if (response.statusCode >= 400) {
-        reject(new Error('error response status: ' + response.statusCode));
-      }
-    }).pipe(file).on('finish', () => resolve(localFile));
-  });
+
+  await streamPipeline(assetRequest.body, file);
+  return localFile;
 }
 
 function downloadAssets(options) {

package/dist/utils/embargoedAssets.js

@@ -7,32 +7,30 @@ exports.calculateExpiryTimestamp = calculateExpiryTimestamp;
 exports.isEmbargoedAsset = isEmbargoedAsset;
 exports.signUrl = signUrl;
 
-var _requestPromise = _interopRequireDefault(require("request-promise"));
-
 var _jsonwebtoken = _interopRequireDefault(require("jsonwebtoken"));
 
+var _nodeFetch = _interopRequireDefault(require("node-fetch"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const SIX_HOURS_IN_MS = 6 * 60 * 60 * 1000;
 const assetKeyCache = new Map();
 
 function createAssetKey(host, accessToken, spaceId, environmentId, expiresAtMs) {
-  const options = {
+  return (0, _nodeFetch.default)(`https://${host}/spaces/${spaceId}/environments/${environmentId}/asset_keys`, {
     method: 'POST',
-    uri: `https://${host}/spaces/${spaceId}/environments/${environmentId}/asset_keys`,
-    body: {
+    body: JSON.stringify({
       expiresAt: Math.floor(expiresAtMs / 1000) // in seconds
 
-    },
+    }),
     headers: {
-      Authorization: `Bearer ${accessToken}`
-    },
-    json: true
-  };
-  return (0, _requestPromise.default)(options);
+      Authorization: `Bearer ${accessToken}`,
+      'Content-Type': 'application/json'
+    }
+  });
 }
 
-function createCachedAssetKey(host, accessToken, spaceId, environmentId, minExpiresAtMs) {
+async function createCachedAssetKey(host, accessToken, spaceId, environmentId, minExpiresAtMs) {
   const cacheKey = `${host}:${spaceId}:${environmentId}`;
   let cacheItem = assetKeyCache.get(cacheKey);
 
@@ -43,7 +41,14 @@ function createCachedAssetKey(host, accessToken, spaceId, environmentId, minExpi
       throw new Error(`Cannot fetch an asset key so far in the future: ${minExpiresAtMs} > ${expiresAtMs}`);
     }
 
-    const promise = createAssetKey(host, accessToken, spaceId, environmentId, expiresAtMs).catch(err => {
+    try {
+      const assetKeyPromise = createAssetKey(host, accessToken, spaceId, environmentId, expiresAtMs);
+      cacheItem = {
+        expiresAtMs,
+        promise: assetKeyPromise
+      };
+      assetKeyCache.set(cacheKey, cacheItem);
+    } catch (err) {
       // If we encounter an error, make sure to clear the cache item if this is the most recent fetch.
       const curCacheItem = assetKeyCache.get(cacheKey);
 
@@ -52,15 +57,12 @@ function createCachedAssetKey(host, accessToken, spaceId, environmentId, minExpi
       }
 
       return Promise.reject(err);
-    });
-    cacheItem = {
-      expiresAtMs,
-      promise
-    };
-    assetKeyCache.set(cacheKey, cacheItem);
-  }
+    }
+  } // cacheItem.promise is the return type of node-fetch.
+
 
-  return cacheItem.promise;
+  const response = await cacheItem.promise;
+  return response.json();
 }
 
 function generateSignedToken(secret, urlWithoutQueryParams, expiresAtMs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-export",
-  "version": "7.14.58",
+  "version": "7.15.0",
   "description": "this tool allows you to export a space to a JSON dump",
   "main": "dist/index.js",
   "types": "types.d.ts",
@@ -58,8 +58,7 @@
     "lodash": "^4.17.10",
     "mkdirp": "^1.0.3",
     "moment": "^2.22.2",
-    "request": "^2.87.0",
-    "request-promise": "^4.2.6",
+    "node-fetch": "^2.6.7",
     "yargs": "^17.1.1"
   },
   "devDependencies": {