@audius/sdk 1.0.17 → 1.0.19

package/dist/services/dataContracts/EntityManagerClient.d.ts

@@ -5,7 +5,13 @@ export declare enum Action {
     CREATE = "Create",
     UPDATE = "Update",
     DELETE = "Delete",
-    VERIFY = "Verify"
+    VERIFY = "Verify",
+    FOLLOW = "Follow",
+    UNFOLLOW = "Unfollow",
+    SAVE = "Save",
+    UNSAVE = "Unsave",
+    REPOST = "Repost",
+    UNREPOST = "Unrepost"
 }
 export declare enum EntityType {
     PLAYLIST = "Playlist",

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@audius/sdk",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "audius": {
-    "releaseSHA": "9dc55f08221648a366e060d1f8ad53cd21a651a1"
+    "releaseSHA": "0a307f67af9a7dc7a6128b181bce45d92d9492df"
   },
   "description": "",
   "main": "dist/index.cjs.js",

package/src/AudiusLibs.ts

@@ -654,7 +654,7 @@ export class AudiusLibs {
     this.Account = new Account(this.User, ...services)
     this.Track = new Track(...services)
     this.Playlist = new Playlists(...services)
-    this.File = new File(this.User, ...services)
+    this.File = new File(this.User, this.ServiceProvider, ...services)
     this.Rewards = new Rewards(this.ServiceProvider, ...services)
     this.Reactions = new Reactions(...services)
     this.EntityManager = new EntityManager(...services)

package/src/NativeAudiusLibs.ts

@@ -600,7 +600,7 @@ export class AudiusLibs {
     this.Account = new Account(this.User, ...services)
     this.Track = new Track(...services)
     this.Playlist = new Playlists(...services)
-    this.File = new File(this.User, ...services)
+    this.File = new File(this.User, this.ServiceProvider, ...services)
     this.Rewards = new Rewards(this.ServiceProvider, ...services)
     this.Reactions = new Reactions(...services)
     this.EntityManager = new EntityManager(...services)

package/src/api/File.ts

@@ -6,6 +6,7 @@ import { raceRequests } from '../utils/network'
 import retry from 'async-retry'
 import type { Users } from './Users'
 import type { Nullable } from '../utils'
+import type { ServiceProvider } from './ServiceProvider'
 
 /**
  * Downloads a file using an element in the DOM
@@ -24,11 +25,17 @@ const downloadURL = (url: string, filename: string) => {
 
 export class File extends Base {
   User: Users
+  ServiceProvider: ServiceProvider
 
-  constructor(user: Users, ...args: BaseConstructorArgs) {
+  constructor(
+    user: Users,
+    serviceProvider: ServiceProvider,
+    ...args: BaseConstructorArgs
+  ) {
     super(...args)
 
     this.User = user
+    this.ServiceProvider = serviceProvider
   }
 
   /**
@@ -46,6 +53,45 @@ export class File extends Base {
     responseType: ResponseType = 'blob',
     trackId = null,
     premiumContentHeaders = {}
+  ) {
+    try {
+      const replicaSetAttempt = await this.fetchCIDInternal(
+        cid,
+        creatorNodeGateways,
+        callback,
+        responseType,
+        trackId,
+        premiumContentHeaders
+      )
+      return replicaSetAttempt
+    } catch (e) {
+      // In the case we can't find the CID from anywhere in the user's replica set,
+      // retry the whole network
+      console.error(e)
+      const allCreatorNodes = await this.ServiceProvider.listCreatorNodes()
+      const allCreatorNodeEndpoints = allCreatorNodes.map((node) =>
+        urlJoin(node.endpoint, 'ipfs')
+      )
+      // Re-throw whatever error might happen here
+      const allNodesAttempt = await this.fetchCIDInternal(
+        cid,
+        allCreatorNodeEndpoints,
+        callback,
+        responseType,
+        trackId,
+        premiumContentHeaders
+      )
+      return allNodesAttempt
+    }
+  }
+
+  async fetchCIDInternal(
+    cid: string,
+    creatorNodeGateways: string[],
+    callback: Nullable<(url: string) => void> = null,
+    responseType: ResponseType = 'blob',
+    trackId = null,
+    premiumContentHeaders = {}
   ) {
     const urls: string[] = []
 
@@ -123,7 +169,7 @@ export class File extends Base {
         minTimeout: 500,
         maxTimeout: 4000,
         factor: 3,
-        retries: 5,
+        retries: 3,
         onRetry: (err: any, i) => {
           // eslint-disable-next-line no-console
           console.log(`FetchCID attempt ${i} error: ${err}`)

package/src/api/entityManager.ts

@@ -1,23 +1,9 @@
 import { Base, Services } from './base'
 import type { PlaylistMetadata } from '../services/creatorNode'
-
-export enum Action {
-  CREATE = 'Create',
-  UPDATE = 'Update',
-  DELETE = 'Delete',
-  FOLLOW = 'Follow',
-  UNFOLLOW = 'Unfollow',
-  SAVE = 'Save',
-  UNSAVE = 'Unsave',
-  REPOST = 'Repost',
-  UNREPOST = 'Unrepost'
-}
-
-export enum EntityType {
-  TRACK = 'Track',
-  PLAYLIST = 'Playlist',
-  USER = 'User'
-}
+import {
+  Action,
+  EntityType
+} from '../services/dataContracts/EntityManagerClient'
 
 export type EntityManagerSuccessResponse = {
   blockHash: string
@@ -111,6 +97,11 @@ export class EntityManager extends Base {
   unsavePlaylist = this.createSocialMethod(EntityType.PLAYLIST, Action.UNSAVE)
   repostTrack = this.createSocialMethod(EntityType.TRACK, Action.REPOST)
   unrepostTrack = this.createSocialMethod(EntityType.TRACK, Action.UNREPOST)
+  repostPlaylist = this.createSocialMethod(EntityType.PLAYLIST, Action.REPOST)
+  unrepostPlaylist = this.createSocialMethod(
+    EntityType.PLAYLIST,
+    Action.UNREPOST
+  )
 
   /** Playlist */
 

package/src/services/dataContracts/EntityManagerClient.ts

@@ -10,7 +10,13 @@ export enum Action {
   CREATE = 'Create',
   UPDATE = 'Update',
   DELETE = 'Delete',
-  VERIFY = 'Verify'
+  VERIFY = 'Verify',
+  FOLLOW = 'Follow',
+  UNFOLLOW = 'Unfollow',
+  SAVE = 'Save',
+  UNSAVE = 'Unsave',
+  REPOST = 'Repost',
+  UNREPOST = 'Unrepost'
 }
 
 export enum EntityType {