@audius/sdk 1.0.16 → 1.0.18

package/dist/services/solana/padBNToUint8Array.d.ts

@@ -2,6 +2,6 @@ import type BN from 'bn.js';
 /**
  * Converts a BN to a Uint8Array of length 8, in little endian notation.
  * Useful for when Rust wants a u64 (8 * 8) represented as a byte array.
- * Ex: https://github.com/AudiusProject/audius-protocol/blob/master/solana-programs/reward-manager/program/src/processor.rs#L389
+ * Ex: https://github.com/AudiusProject/audius-protocol/blob/main/solana-programs/reward-manager/program/src/processor.rs#L389
  */
 export declare const padBNToUint8Array: (bn: BN) => number[];

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@audius/sdk",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "audius": {
-    "releaseSHA": "e0b7ce2e170d45ba8be2a30623688bd77cf6b4b4"
+    "releaseSHA": "cc52bcb636e5a70a3e50f6fe3b7eccc8f1f0c479"
   },
   "description": "",
   "main": "dist/index.cjs.js",
@@ -133,7 +133,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/AudiusProject/audius-protocol/tree/master/libs"
+    "url": "git+https://github.com/AudiusProject/audius-protocol/tree/main/libs"
   },
   "engines": {
     "node": ">=14.0.0"
@@ -143,5 +143,5 @@
   "bugs": {
     "url": "https://github.com/AudiusProject/audius-protocol/issues"
   },
-  "homepage": "https://github.com/AudiusProject/audius-protocol/tree/master/libs"
+  "homepage": "https://github.com/AudiusProject/audius-protocol/tree/main/libs"
 }

package/scripts/release.sh

@@ -33,27 +33,27 @@ function commit-message () {
 ${CHANGE_LOG}"
 }
 
-# Pull in master, ensure commit is on master, ensure clean build environment
+# Pull in main, ensure commit is on main, ensure clean build environment
 function git-reset () {
     (
         # Configure git client
         git config --global user.email "audius-infra@audius.co"
         git config --global user.name "audius-infra"
 
-        # Make sure master is up to date
-        git checkout master -f
+        # Make sure main is up to date
+        git checkout main -f
         git pull
 
-        if [[ "${GIT_COMMIT}" == "master" ]]; then
-            echo "Commit cannot be 'master'."
+        if [[ "${GIT_COMMIT}" == "main" ]]; then
+            echo "Commit cannot be 'main'."
             exit 1
         fi
 
-        # only allow commits found on master or release branches to be deployed
-        echo "commit has to be on master or a release branch"
+        # only allow commits found on main or release branches to be deployed
+        echo "commit has to be on main or a release branch"
         git branch -a --contains ${GIT_COMMIT} \
             | tee /dev/tty \
-            | grep -Eq 'remotes/origin/master|remotes/origin/release' \
+            | grep -Eq 'remotes/origin/main|remotes/origin/release' \
             || exit 1
 
         # Ensure working directory clean
@@ -88,10 +88,10 @@ function bump-version () {
     )
 }
 
-# Merge the created branch into master, then delete the branch
+# Merge the created branch into main, then delete the branch
 function merge-bump () {
     (
-        git checkout master -f
+        git checkout main -f
 
         # pull in any additional commits that may have trickled in
         git pull
@@ -105,7 +105,7 @@ function merge-bump () {
         git push origin --tags || exit 1
 
         # if pushing fails, ensure we cleanup()
-        git push -u origin master || exit 1
+        git push -u origin main || exit 1
         git push origin :${STUB}-${VERSION}
     )
 }
@@ -118,7 +118,7 @@ function publish () {
 # informative links
 function info () {
     echo "Released to:
-      https://github.com/AudiusProject/audius-protocol/commits/master
+      https://github.com/AudiusProject/audius-protocol/commits/main
       https://github.com/AudiusProject/audius-protocol/tags
       https://www.npmjs.com/package/@audius/sdk?activeTab=versions"
 }
@@ -134,7 +134,7 @@ function cleanup () {
 STUB=sdk
 cd ${PROTOCOL_DIR}/libs
 
-# pull in master
+# pull in main
 git-reset
 
 # grab change log early, before the version bump

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/services/schemaValidator/schemas/trackSchema.json

@@ -275,7 +275,7 @@
             "title": "CID"
         },
         "PremiumConditions": {
-            "type": "object",
+            "type": ["object", "null"],
             "additionalProperties": false,
             "properties": {
                 "nft_collection": {

package/src/services/solana/padBNToUint8Array.ts

@@ -2,6 +2,6 @@ import type BN from 'bn.js'
 /**
  * Converts a BN to a Uint8Array of length 8, in little endian notation.
  * Useful for when Rust wants a u64 (8 * 8) represented as a byte array.
- * Ex: https://github.com/AudiusProject/audius-protocol/blob/master/solana-programs/reward-manager/program/src/processor.rs#L389
+ * Ex: https://github.com/AudiusProject/audius-protocol/blob/main/solana-programs/reward-manager/program/src/processor.rs#L389
  */
 export const padBNToUint8Array = (bn: BN): number[] => bn.toArray('le', 8)