@sanity/export 2.22.6-next.102 → 2.23.1

package/lib/AssetHandler.js

@@ -14,9 +14,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 

package/lib/getDocumentsStream.js

@@ -1,8 +1,8 @@
 "use strict";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/lib/requestStream.js

@@ -1,8 +1,8 @@
 "use strict";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -10,45 +10,23 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var simpleGet = require('simple-get');
+var getIt = require('get-it');
 
-var HttpAgent = require('agentkeepalive');
+var _require = require('get-it/middleware'),
+    keepAlive = _require.keepAlive,
+    promise = _require.promise;
 
 var debug = require('./debug');
 
-var HttpsAgent = HttpAgent.HttpsAgent;
-var httpAgent = new HttpAgent();
-var httpsAgent = new HttpsAgent();
+var request = getIt([keepAlive(), promise({
+  onlyBody: true
+})]);
 var socketsWithTimeout = new WeakSet();
 var CONNECTION_TIMEOUT = 15 * 1000; // 15 seconds
 
 var READ_TIMEOUT = 3 * 60 * 1000; // 3 minutes
 
-var MAX_RETRIES = 5; // Just a promisified simpleGet
-
-function getStream(options) {
-  return new Promise((resolve, reject) => {
-    var rejected = false;
-    var openTimeout = setTimeout(() => {
-      rejected = true;
-      reject(new Error("Connection timed out after ".concat(CONNECTION_TIMEOUT, " ms")));
-    }, CONNECTION_TIMEOUT);
-    simpleGet(options, (err, res) => {
-      clearTimeout(openTimeout);
-
-      if (rejected) {
-        return;
-      }
-
-      if (err) {
-        reject(err);
-        return;
-      }
-
-      resolve(res);
-    });
-  });
-}
+var MAX_RETRIES = 5;
 
 function delay(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
@@ -58,19 +36,19 @@ function delay(ms) {
 
 module.exports = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(function* (options) {
-    var agent = options.url.startsWith('https:') ? httpsAgent : httpAgent;
-
-    var reqOptions = _objectSpread(_objectSpread({}, options), {}, {
-      followRedirects: false,
-      agent
-    });
-
     var error;
 
     for (var i = 0; i < MAX_RETRIES; i++) {
       try {
         var _ret = yield* function* () {
-          var response = yield getStream(reqOptions);
+          var response = yield request(_objectSpread(_objectSpread({}, options), {}, {
+            stream: true,
+            maxRedirects: 0,
+            timeout: {
+              connect: CONNECTION_TIMEOUT,
+              socket: READ_TIMEOUT
+            }
+          }));
 
           if (response.connection && typeof response.connection.setTimeout === 'function' && !socketsWithTimeout.has(response.connection)) {
             socketsWithTimeout.add(response.connection);
@@ -88,7 +66,7 @@ module.exports = /*#__PURE__*/function () {
       } catch (err) {
         error = err;
 
-        if (err.statusCode && err.statusCode < 500) {
+        if (err.response && err.response.statusCode && err.response.statusCode < 500) {
           break;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/export",
-  "version": "2.22.6-next.102+c465ed5b97",
+  "version": "2.23.1",
   "description": "Export Sanity documents and assets",
   "main": "lib/export.js",
   "engines": {
@@ -24,14 +24,13 @@
     "ndjson"
   ],
   "dependencies": {
-    "agentkeepalive": "^4.1.0",
     "archiver": "^5.0.0",
     "debug": "^3.2.7",
     "fs-extra": "^7.0.0",
+    "get-it": "^5.2.1",
     "lodash": "^4.17.15",
     "mississippi": "^4.0.0",
     "p-queue": "^2.3.0",
-    "simple-get": "^4.0.0",
     "split2": "^3.2.2"
   },
   "devDependencies": {
@@ -50,5 +49,5 @@
     "url": "https://github.com/sanity-io/sanity/issues"
   },
   "homepage": "https://www.sanity.io/",
-  "gitHead": "c465ed5b97780687fca692fe5ca3fd4a34e76d2a"
+  "gitHead": "3e1066159c73ffd9020200626a1e48860dc2d0ef"
 }

package/src/requestStream.js

@@ -1,53 +1,29 @@
-const simpleGet = require('simple-get')
-const HttpAgent = require('agentkeepalive')
+const getIt = require('get-it')
+const {keepAlive, promise} = require('get-it/middleware')
 const debug = require('./debug')
 
-const HttpsAgent = HttpAgent.HttpsAgent
-const httpAgent = new HttpAgent()
-const httpsAgent = new HttpsAgent()
+const request = getIt([keepAlive(), promise({onlyBody: true})])
 const socketsWithTimeout = new WeakSet()
 
 const CONNECTION_TIMEOUT = 15 * 1000 // 15 seconds
 const READ_TIMEOUT = 3 * 60 * 1000 // 3 minutes
 const MAX_RETRIES = 5
 
-// Just a promisified simpleGet
-function getStream(options) {
-  return new Promise((resolve, reject) => {
-    let rejected = false
-    const openTimeout = setTimeout(() => {
-      rejected = true
-      reject(new Error(`Connection timed out after ${CONNECTION_TIMEOUT} ms`))
-    }, CONNECTION_TIMEOUT)
-
-    simpleGet(options, (err, res) => {
-      clearTimeout(openTimeout)
-      if (rejected) {
-        return
-      }
-
-      if (err) {
-        reject(err)
-        return
-      }
-
-      resolve(res)
-    })
-  })
-}
-
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
 /* eslint-disable no-await-in-loop, max-depth */
 module.exports = async (options) => {
-  const agent = options.url.startsWith('https:') ? httpsAgent : httpAgent
-  const reqOptions = {...options, followRedirects: false, agent}
   let error
   for (let i = 0; i < MAX_RETRIES; i++) {
     try {
-      const response = await getStream(reqOptions)
+      const response = await request({
+        ...options,
+        stream: true,
+        maxRedirects: 0,
+        timeout: {connect: CONNECTION_TIMEOUT, socket: READ_TIMEOUT},
+      })
 
       if (
         response.connection &&
@@ -66,7 +42,7 @@ module.exports = async (options) => {
     } catch (err) {
       error = err
 
-      if (err.statusCode && err.statusCode < 500) {
+      if (err.response && err.response.statusCode && err.response.statusCode < 500) {
         break
       }