@audius/sdk 1.0.17 → 1.0.18

package/dist/api/File.d.ts

@@ -2,9 +2,11 @@ import { ResponseType } from 'axios';
 import { Base, BaseConstructorArgs } from './base';
 import type { Users } from './Users';
 import type { Nullable } from '../utils';
+import type { ServiceProvider } from './ServiceProvider';
 export declare class File extends Base {
     User: Users;
-    constructor(user: Users, ...args: BaseConstructorArgs);
+    ServiceProvider: ServiceProvider;
+    constructor(user: Users, serviceProvider: ServiceProvider, ...args: BaseConstructorArgs);
     /**
      * Fetches a file from Content Node with a given CID.
      * @param cid IPFS content identifier
@@ -14,6 +16,7 @@ export declare class File extends Base {
      *  Can be used for tracking metrics on which gateways were used.
      */
     fetchCID(cid: string, creatorNodeGateways: string[], callback?: Nullable<(url: string) => void>, responseType?: ResponseType, trackId?: null, premiumContentHeaders?: {}): Promise<import("axios").AxiosResponse<any> | undefined>;
+    fetchCIDInternal(cid: string, creatorNodeGateways: string[], callback?: Nullable<(url: string) => void>, responseType?: ResponseType, trackId?: null, premiumContentHeaders?: {}): Promise<import("axios").AxiosResponse<any> | undefined>;
     /**
      * Fetches a file from Content Node with a given CID. Follows the same pattern
      * as fetchCID, but resolves with a download of the file rather than

package/dist/index.cjs.js

@@ -34277,9 +34277,9 @@ var formatProviders = function formatProviders(providers) {
 };
 
 var name = "@audius/sdk";
-var version = "1.0.17";
+var version = "1.0.18";
 var audius = {
-	releaseSHA: "9dc55f08221648a366e060d1f8ad53cd21a651a1"
+	releaseSHA: "cc52bcb636e5a70a3e50f6fe3b7eccc8f1f0c479"
 };
 var description = "";
 var main = "dist/index.cjs.js";
@@ -58305,17 +58305,18 @@ var File = /*#__PURE__*/function (_Base) {
 
   var _super = _createSuper(File);
 
-  function File(user) {
+  function File(user, serviceProvider) {
     var _this;
 
     _classCallCheck(this, File);
 
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
+    for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+      args[_key - 2] = arguments[_key];
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
     _this.User = user;
+    _this.ServiceProvider = serviceProvider;
     return _this;
   }
   /**
@@ -58331,21 +58332,86 @@ var File = /*#__PURE__*/function (_Base) {
   _createClass(File, [{
     key: "fetchCID",
     value: function () {
-      var _fetchCID = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(cid, creatorNodeGateways) {
+      var _fetchCID = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(cid, creatorNodeGateways) {
+        var callback,
+            responseType,
+            trackId,
+            premiumContentHeaders,
+            replicaSetAttempt,
+            allCreatorNodes,
+            allCreatorNodeEndpoints,
+            allNodesAttempt,
+            _args = arguments;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                callback = _args.length > 2 && _args[2] !== undefined ? _args[2] : null;
+                responseType = _args.length > 3 && _args[3] !== undefined ? _args[3] : 'blob';
+                trackId = _args.length > 4 && _args[4] !== undefined ? _args[4] : null;
+                premiumContentHeaders = _args.length > 5 && _args[5] !== undefined ? _args[5] : {};
+                _context.prev = 4;
+                _context.next = 7;
+                return this.fetchCIDInternal(cid, creatorNodeGateways, callback, responseType, trackId, premiumContentHeaders);
+
+              case 7:
+                replicaSetAttempt = _context.sent;
+                return _context.abrupt("return", replicaSetAttempt);
+
+              case 11:
+                _context.prev = 11;
+                _context.t0 = _context["catch"](4);
+                // In the case we can't find the CID from anywhere in the user's replica set,
+                // retry the whole network
+                console.error(_context.t0);
+                _context.next = 16;
+                return this.ServiceProvider.listCreatorNodes();
+
+              case 16:
+                allCreatorNodes = _context.sent;
+                allCreatorNodeEndpoints = allCreatorNodes.map(function (node) {
+                  return urlJoin__default["default"](node.endpoint, 'ipfs');
+                }); // Re-throw whatever error might happen here
+
+                _context.next = 20;
+                return this.fetchCIDInternal(cid, allCreatorNodeEndpoints, callback, responseType, trackId, premiumContentHeaders);
+
+              case 20:
+                allNodesAttempt = _context.sent;
+                return _context.abrupt("return", allNodesAttempt);
+
+              case 22:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this, [[4, 11]]);
+      }));
+
+      function fetchCID(_x, _x2) {
+        return _fetchCID.apply(this, arguments);
+      }
+
+      return fetchCID;
+    }()
+  }, {
+    key: "fetchCIDInternal",
+    value: function () {
+      var _fetchCIDInternal = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(cid, creatorNodeGateways) {
         var callback,
             responseType,
             trackId,
             premiumContentHeaders,
             urls,
-            _args2 = arguments;
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+            _args3 = arguments;
+        return regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
-                callback = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : null;
-                responseType = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : 'blob';
-                trackId = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : null;
-                premiumContentHeaders = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : {};
+                callback = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : null;
+                responseType = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : 'blob';
+                trackId = _args3.length > 4 && _args3[4] !== undefined ? _args3[4] : null;
+                premiumContentHeaders = _args3.length > 5 && _args3[5] !== undefined ? _args3[5] : {};
                 urls = [];
                 creatorNodeGateways.forEach(function (gateway) {
                   var gatewayWithCid = urlJoin__default["default"](gateway, cid);
@@ -58356,17 +58422,17 @@ var File = /*#__PURE__*/function (_Base) {
                   });
                   urls.push(gatewayWithCid);
                 });
-                _context2.next = 8;
+                _context3.next = 8;
                 return retry__default["default"]( /*#__PURE__*/function () {
-                  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(bail) {
+                  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(bail) {
                     var _yield$raceRequests, response, errored, allForbidden, legacyUrls, _yield$raceRequests2, _response;
 
-                    return regeneratorRuntime.wrap(function _callee$(_context) {
+                    return regeneratorRuntime.wrap(function _callee2$(_context2) {
                       while (1) {
-                        switch (_context.prev = _context.next) {
+                        switch (_context2.prev = _context2.next) {
                           case 0:
-                            _context.prev = 0;
-                            _context.next = 3;
+                            _context2.prev = 0;
+                            _context2.next = 3;
                             return raceRequests(urls, callback, _objectSpread2({
                               method: 'get',
                               responseType: responseType
@@ -58375,12 +58441,12 @@ var File = /*#__PURE__*/function (_Base) {
                             null);
 
                           case 3:
-                            _yield$raceRequests = _context.sent;
+                            _yield$raceRequests = _context2.sent;
                             response = _yield$raceRequests.response;
                             errored = _yield$raceRequests.errored;
 
                             if (response) {
-                              _context.next = 12;
+                              _context2.next = 12;
                               break;
                             }
 
@@ -58390,26 +58456,26 @@ var File = /*#__PURE__*/function (_Base) {
                             });
 
                             if (!allForbidden) {
-                              _context.next = 11;
+                              _context2.next = 11;
                               break;
                             }
 
                             // In the case for a 403, do not retry fetching
                             bail(new Error('Forbidden'));
-                            return _context.abrupt("return");
+                            return _context2.abrupt("return");
 
                           case 11:
                             throw new Error("Could not fetch ".concat(cid));
 
                           case 12:
-                            return _context.abrupt("return", response);
+                            return _context2.abrupt("return", response);
 
                           case 15:
-                            _context.prev = 15;
-                            _context.t0 = _context["catch"](0);
+                            _context2.prev = 15;
+                            _context2.t0 = _context2["catch"](0);
 
                             if (!cid.includes('/')) {
-                              _context.next = 33;
+                              _context2.next = 33;
                               break;
                             }
 
@@ -58422,8 +58488,8 @@ var File = /*#__PURE__*/function (_Base) {
                             legacyUrls = creatorNodeGateways.map(function (gateway) {
                               return urlJoin__default["default"](gateway, cid.split('/')[0]);
                             });
-                            _context.prev = 20;
-                            _context.next = 23;
+                            _context2.prev = 20;
+                            _context2.next = 23;
                             return raceRequests(legacyUrls, callback, _objectSpread2({
                               method: 'get',
                               responseType: responseType
@@ -58432,22 +58498,22 @@ var File = /*#__PURE__*/function (_Base) {
                             null);
 
                           case 23:
-                            _yield$raceRequests2 = _context.sent;
+                            _yield$raceRequests2 = _context2.sent;
                             _response = _yield$raceRequests2.response;
 
                             if (_response) {
-                              _context.next = 27;
+                              _context2.next = 27;
                               break;
                             }
 
                             throw new Error("Could not fetch ".concat(cid, " via legacy method"));
 
                           case 27:
-                            return _context.abrupt("return", _response);
+                            return _context2.abrupt("return", _response);
 
                           case 30:
-                            _context.prev = 30;
-                            _context.t1 = _context["catch"](20);
+                            _context2.prev = 30;
+                            _context2.t1 = _context2["catch"](20);
                             throw new Error("Failed to retrieve ".concat(cid, " by legacy method"));
 
                           case 33:
@@ -58455,20 +58521,20 @@ var File = /*#__PURE__*/function (_Base) {
 
                           case 34:
                           case "end":
-                            return _context.stop();
+                            return _context2.stop();
                         }
                       }
-                    }, _callee, null, [[0, 15], [20, 30]]);
+                    }, _callee2, null, [[0, 15], [20, 30]]);
                   }));
 
-                  return function (_x3) {
+                  return function (_x5) {
                     return _ref.apply(this, arguments);
                   };
                 }(), {
                   minTimeout: 500,
                   maxTimeout: 4000,
                   factor: 3,
-                  retries: 5,
+                  retries: 3,
                   onRetry: function onRetry(err, i) {
                     // eslint-disable-next-line no-console
                     console.log("FetchCID attempt ".concat(i, " error: ").concat(err));
@@ -58476,21 +58542,21 @@ var File = /*#__PURE__*/function (_Base) {
                 });
 
               case 8:
-                return _context2.abrupt("return", _context2.sent);
+                return _context3.abrupt("return", _context3.sent);
 
               case 9:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2);
+        }, _callee3);
       }));
 
-      function fetchCID(_x, _x2) {
-        return _fetchCID.apply(this, arguments);
+      function fetchCIDInternal(_x3, _x4) {
+        return _fetchCIDInternal.apply(this, arguments);
       }
 
-      return fetchCID;
+      return fetchCIDInternal;
     }()
     /**
      * Fetches a file from Content Node with a given CID. Follows the same pattern
@@ -58504,12 +58570,12 @@ var File = /*#__PURE__*/function (_Base) {
   }, {
     key: "downloadCID",
     value: function () {
-      var _downloadCID = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(cid, creatorNodeGateways, filename) {
+      var _downloadCID = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(cid, creatorNodeGateways, filename) {
         var urls, _yield$raceRequests3, response;
 
-        return regeneratorRuntime.wrap(function _callee3$(_context3) {
+        return regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 urls = creatorNodeGateways.map(function (gateway) {
                   return urlJoin__default["default"](gateway, cid, {
@@ -58518,8 +58584,8 @@ var File = /*#__PURE__*/function (_Base) {
                     }
                   });
                 });
-                _context3.prev = 1;
-                _context3.next = 4;
+                _context4.prev = 1;
+                _context4.next = 4;
                 return raceRequests(urls, function (url) {
                   return downloadURL(url, filename);
                 }, {
@@ -58529,24 +58595,24 @@ var File = /*#__PURE__*/function (_Base) {
                 10000);
 
               case 4:
-                _yield$raceRequests3 = _context3.sent;
+                _yield$raceRequests3 = _context4.sent;
                 response = _yield$raceRequests3.response;
-                return _context3.abrupt("return", response);
+                return _context4.abrupt("return", response);
 
               case 9:
-                _context3.prev = 9;
-                _context3.t0 = _context3["catch"](1);
+                _context4.prev = 9;
+                _context4.t0 = _context4["catch"](1);
                 throw new Error("Failed to retrieve ".concat(cid));
 
               case 12:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, null, [[1, 9]]);
+        }, _callee4, null, [[1, 9]]);
       }));
 
-      function downloadCID(_x4, _x5, _x6) {
+      function downloadCID(_x6, _x7, _x8) {
         return _downloadCID.apply(this, arguments);
       }
 
@@ -58562,66 +58628,66 @@ var File = /*#__PURE__*/function (_Base) {
   }, {
     key: "checkIfCidAvailable",
     value: function () {
-      var _checkIfCidAvailable = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(cid, creatorNodeGateways) {
+      var _checkIfCidAvailable = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(cid, creatorNodeGateways) {
         var exists;
-        return regeneratorRuntime.wrap(function _callee5$(_context5) {
+        return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
                 exists = {};
-                _context5.next = 3;
+                _context6.next = 3;
                 return Promise.all(creatorNodeGateways.map( /*#__PURE__*/function () {
-                  var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(gateway) {
+                  var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(gateway) {
                     var _yield$axios, status;
 
-                    return regeneratorRuntime.wrap(function _callee4$(_context4) {
+                    return regeneratorRuntime.wrap(function _callee5$(_context5) {
                       while (1) {
-                        switch (_context4.prev = _context4.next) {
+                        switch (_context5.prev = _context5.next) {
                           case 0:
-                            _context4.prev = 0;
-                            _context4.next = 3;
+                            _context5.prev = 0;
+                            _context5.next = 3;
                             return axios__default["default"]({
                               url: urlJoin__default["default"](gateway, cid),
                               method: 'head'
                             });
 
                           case 3:
-                            _yield$axios = _context4.sent;
+                            _yield$axios = _context5.sent;
                             status = _yield$axios.status;
                             exists[gateway] = status === 200;
-                            _context4.next = 11;
+                            _context5.next = 11;
                             break;
 
                           case 8:
-                            _context4.prev = 8;
-                            _context4.t0 = _context4["catch"](0);
+                            _context5.prev = 8;
+                            _context5.t0 = _context5["catch"](0);
                             exists[gateway] = false;
 
                           case 11:
                           case "end":
-                            return _context4.stop();
+                            return _context5.stop();
                         }
                       }
-                    }, _callee4, null, [[0, 8]]);
+                    }, _callee5, null, [[0, 8]]);
                   }));
 
-                  return function (_x9) {
+                  return function (_x11) {
                     return _ref2.apply(this, arguments);
                   };
                 }()));
 
               case 3:
-                return _context5.abrupt("return", exists);
+                return _context6.abrupt("return", exists);
 
               case 4:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5);
+        }, _callee6);
       }));
 
-      function checkIfCidAvailable(_x7, _x8) {
+      function checkIfCidAvailable(_x9, _x10) {
         return _checkIfCidAvailable.apply(this, arguments);
       }
 
@@ -58635,40 +58701,40 @@ var File = /*#__PURE__*/function (_Base) {
   }, {
     key: "uploadImage",
     value: function () {
-      var _uploadImage = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(file, square) {
+      var _uploadImage = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(file, square) {
         var timeoutMs,
             resp,
-            _args6 = arguments;
-        return regeneratorRuntime.wrap(function _callee6$(_context6) {
+            _args7 = arguments;
+        return regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context7.prev = _context7.next) {
               case 0:
-                timeoutMs = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : null;
+                timeoutMs = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : null;
                 this.REQUIRES(Services.CREATOR_NODE);
                 this.FILE_IS_VALID(file); // Assign a creator_node_endpoint to the user if necessary
 
-                _context6.next = 5;
+                _context7.next = 5;
                 return this.User.assignReplicaSetIfNecessary();
 
               case 5:
-                _context6.next = 7;
+                _context7.next = 7;
                 return this.creatorNode.uploadImage(file, square,
                 /* onProgress */
                 undefined, timeoutMs);
 
               case 7:
-                resp = _context6.sent;
-                return _context6.abrupt("return", resp);
+                resp = _context7.sent;
+                return _context7.abrupt("return", resp);
 
               case 9:
               case "end":
-                return _context6.stop();
+                return _context7.stop();
             }
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
 
-      function uploadImage(_x10, _x11) {
+      function uploadImage(_x12, _x13) {
         return _uploadImage.apply(this, arguments);
       }
 
@@ -59817,7 +59883,7 @@ var AudiusLibs = /*#__PURE__*/function () {
                 this.Account = _construct(Account, [this.User].concat(services));
                 this.Track = _construct(Track, services);
                 this.Playlist = _construct(Playlists, services);
-                this.File = _construct(File, [this.User].concat(services));
+                this.File = _construct(File, [this.User, this.ServiceProvider].concat(services));
                 this.Rewards = _construct(Rewards, [this.ServiceProvider].concat(services));
                 this.Reactions = _construct(Reactions, services);
                 this.EntityManager = _construct(EntityManager, services);