@audius/sdk 2.0.3-beta.4 → 2.0.3-beta.5

package/dist/services/creatorNode/CreatorNode.d.ts

@@ -272,9 +272,9 @@ export declare class CreatorNode {
      */
     syncSecondary(secondary: string, primary?: string, immediate?: boolean, validate?: boolean): Promise<import("axios").AxiosResponse<any> | undefined>;
     /**
-   * Makes an axios request to the connected creator node
-   * @return response body
-   */
+     * Makes an axios request to the connected creator node
+     * @return response body
+     */
     _makeRequestV2(axiosRequestObj: AxiosRequestConfig): Promise<import("axios").AxiosResponse<any>>;
     /**
      * Signs up a creator node user with a wallet address

package/dist/services/discoveryProvider/DiscoveryProvider.d.ts

@@ -93,6 +93,7 @@ export declare class DiscoveryProvider {
     isInitialized: boolean;
     discoveryNodeSelector?: DiscoveryNodeSelector;
     discoveryNodeMiddleware?: Middleware;
+    selectionCallback?: DiscoveryProviderSelectionConfig['selectionCallback'];
     constructor({ whitelist, blacklist, userStateManager, ethContracts, web3Manager, reselectTimeout, selectionCallback, monitoringCallbacks, selectionRequestTimeout, selectionRequestRetries, localStorage, unhealthySlotDiffPlays, unhealthyBlockDiff, discoveryNodeSelector }: DiscoveryProviderConfig);
     init(): Promise<void>;
     setEndpoint(endpoint: string): void;
@@ -541,7 +542,7 @@ export declare class DiscoveryProvider {
         latest_chain_slot_plays: number;
         data: Response;
     } | undefined | null>;
-    _makeRequestInternalNext<Response>(requestObj: Record<string, unknown>, throwError?: boolean): Promise<DiscoveryResponse<Response> | null | undefined>;
+    _makeRequestInternalNext<Response>(requestObj: Record<string, unknown>, throwError?: boolean, blockNumber?: number): Promise<DiscoveryResponse<Response> | null | undefined>;
     /**
      * Gets the healthy discovery provider endpoint used in creating the axios request later.
      * If the number of retries is over the max count for retires, clear the cache and reselect

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@audius/sdk",
-  "version": "2.0.3-beta.4",
+  "version": "2.0.3-beta.5",
   "audius": {
-    "releaseSHA": "42c56a1bf4cc52d52da7df738ace6822a91b0fce"
+    "releaseSHA": "29b38fb1a75d58b32ce4c98a46dc035540b43e1a"
   },
   "description": "",
   "main": "dist/index.cjs.js",

package/src/api/Track.ts

@@ -409,12 +409,13 @@ export class Track extends Base {
     this._validateTrackMetadata(metadata)
 
     // Upload track audio and cover art to storage node
-    const updatedMetadata = await this.creatorNode.uploadTrackAudioAndCoverArtV2(
-      trackFile,
-      coverArtFile,
-      metadata,
-      onProgress
-    )
+    const updatedMetadata =
+      await this.creatorNode.uploadTrackAudioAndCoverArtV2(
+        trackFile,
+        coverArtFile,
+        metadata,
+        onProgress
+      )
 
     // Write metadata to chain
     const trackId = await this._generateTrackId()

package/src/services/creatorNode/CreatorNode.ts

@@ -397,20 +397,30 @@ export class CreatorNode {
     trackFile: File,
     coverArtFile: File,
     metadata: TrackMetadata,
-    onProgress: ProgressCB = () => { }
+    onProgress: ProgressCB = () => {}
   ) {
     const updatedMetadata = { ...metadata }
 
     // Upload audio and cover art
     const [audioResp, coverArtResp] = await Promise.all([
-      this._retry3(async () => this.uploadTrackAudioV2(trackFile, onProgress), (e) => { console.log('Retrying uploadTrackAudioV2', e) }),
-      this._retry3(async () => this.uploadTrackCoverArtV2(coverArtFile, onProgress), (e) => { console.log('Retrying uploadTrackCoverArtV2', e) })
+      this._retry3(
+        async () => await this.uploadTrackAudioV2(trackFile, onProgress),
+        (e) => {
+          console.log('Retrying uploadTrackAudioV2', e)
+        }
+      ),
+      this._retry3(
+        async () => await this.uploadTrackCoverArtV2(coverArtFile, onProgress),
+        (e) => {
+          console.log('Retrying uploadTrackCoverArtV2', e)
+        }
+      )
     ])
 
     // Update metadata to include uploaded CIDs
     // TODO: Make sure discovery and elsewhere accept 0-length array. Some checks in CN currently fail if there's not at least 1 valid segment
     updatedMetadata.track_segments = []
-    updatedMetadata.track_cid = audioResp.results["320"]
+    updatedMetadata.track_cid = audioResp.results['320']
     if (updatedMetadata.download?.is_downloadable) {
       updatedMetadata.download.cid = updatedMetadata.track_cid
     }
@@ -420,14 +430,18 @@ export class CreatorNode {
   }
 
   async uploadTrackAudioV2(file: File, onProgress: ProgressCB) {
-    return this.uploadFileV2(file, onProgress, 'audio')
+    return await this.uploadFileV2(file, onProgress, 'audio')
   }
 
   async uploadTrackCoverArtV2(file: File, onProgress: ProgressCB) {
-    return this.uploadFileV2(file, onProgress, 'img_square')
+    return await this.uploadFileV2(file, onProgress, 'img_square')
   }
 
-  async uploadFileV2(file: File, onProgress: ProgressCB, template: 'audio' | 'img_square' | 'img_backdrop') {
+  async uploadFileV2(
+    file: File,
+    onProgress: ProgressCB,
+    template: 'audio' | 'img_square' | 'img_backdrop'
+  ) {
     const formData = new FormData()
     formData.append('template', template)
     formData.append('files', file, file.name)
@@ -436,11 +450,14 @@ export class CreatorNode {
       url: '/mediorum/uploads',
       data: formData,
       headers: { 'Content-Type': 'multipart/form-data' },
-      onUploadProgress: (progressEvent) => onProgress(progressEvent.loaded, progressEvent.total)
+      onUploadProgress: (progressEvent) =>
+        onProgress(progressEvent.loaded, progressEvent.total)
     })
-    return this.pollProcessingStatusV2(
+    return await this.pollProcessingStatusV2(
       response.data[0].id,
-      template === 'audio' ? MAX_TRACK_TRANSCODE_TIMEOUT : MAX_IMAGE_RESIZE_TIMEOUT_MS
+      template === 'audio'
+        ? MAX_TRACK_TRANSCODE_TIMEOUT
+        : MAX_IMAGE_RESIZE_TIMEOUT_MS
     )
   }
 
@@ -457,7 +474,9 @@ export class CreatorNode {
         const resp = await this.getProcessingStatusV2(id)
         if (resp?.status === 'done') return resp
         if (resp?.status === 'error') {
-          throw new Error(`Upload failed: id=${id}, resp=${JSON.stringify(resp)}`)
+          throw new Error(
+            `Upload failed: id=${id}, resp=${JSON.stringify(resp)}`
+          )
         }
       } catch (e) {
         // Swallow errors caused by failure to establish connection to node so we can retry polling
@@ -760,16 +779,14 @@ export class CreatorNode {
   /* ------- INTERNAL FUNCTIONS ------- */
 
   /**
- * Makes an axios request to the connected creator node
- * @return response body
- */
-  async _makeRequestV2(
-    axiosRequestObj: AxiosRequestConfig
-  ) {
+   * Makes an axios request to the connected creator node
+   * @return response body
+   */
+  async _makeRequestV2(axiosRequestObj: AxiosRequestConfig) {
     // TODO: This might want to have other error handling, request UUIDs, etc...
     //       But I didn't want to pull in all the chaos and incompatiblity of the old _makeRequest
     axiosRequestObj.baseURL = this.creatorNodeEndpoint
-    return axios(axiosRequestObj)
+    return await axios(axiosRequestObj)
   }
 
   /**
@@ -1244,15 +1261,13 @@ export class CreatorNode {
   /**
    * Calls fn and then retries once after 500ms, again after 1500ms, and again after 4000ms
    */
-  async _retry3(fn: () => Promise<any>, onRetry = (_err: any) => { }) {
-    return retry(fn,
-      {
-        minTimeout: 500,
-        maxTimeout: 4000,
-        factor: 3,
-        retries: 3,
-        onRetry
-      }
-    )
+  async _retry3(fn: () => Promise<any>, onRetry = (_err: any) => {}) {
+    return await retry(fn, {
+      minTimeout: 500,
+      maxTimeout: 4000,
+      factor: 3,
+      retries: 3,
+      onRetry
+    })
   }
 }

package/src/services/dataContracts/AudiusContracts.ts

@@ -50,7 +50,7 @@ export class AudiusContracts {
   }
 
   getEmptyRegistryAddress: GetRegistryAddress = async () => {
-    return Promise.resolve('')
+    return await Promise.resolve('')
   }
 
   async init() {

package/src/services/discoveryProvider/DiscoveryProvider.ts

@@ -117,6 +117,7 @@ export class DiscoveryProvider {
   isInitialized = false
   discoveryNodeSelector?: DiscoveryNodeSelector
   discoveryNodeMiddleware?: Middleware
+  selectionCallback?: DiscoveryProviderSelectionConfig['selectionCallback']
 
   constructor({
     whitelist,
@@ -139,6 +140,7 @@ export class DiscoveryProvider {
     this.userStateManager = userStateManager
     this.ethContracts = ethContracts
     this.web3Manager = web3Manager
+    this.selectionCallback = selectionCallback
 
     this.unhealthyBlockDiff = unhealthyBlockDiff ?? DEFAULT_UNHEALTHY_BLOCK_DIFF
     this.serviceSelector = new DiscoveryProviderSelection(
@@ -177,6 +179,7 @@ export class DiscoveryProvider {
         'change',
         (endpoint: string) => {
           this.setEndpoint(endpoint)
+          this.selectionCallback?.(endpoint, [])
         }
       )
 
@@ -1251,7 +1254,8 @@ export class DiscoveryProvider {
     if (this.discoveryNodeSelector) {
       return await this._makeRequestInternalNext<Response>(
         requestObj,
-        throwError
+        throwError,
+        blockNumber
       )
     }
 
@@ -1412,7 +1416,8 @@ export class DiscoveryProvider {
 
   async _makeRequestInternalNext<Response>(
     requestObj: Record<string, unknown>,
-    throwError = false
+    throwError = false,
+    blockNumber?: number
   ) {
     if (!this.discoveryProviderEndpoint || !this.discoveryNodeMiddleware) return
 
@@ -1465,6 +1470,13 @@ export class DiscoveryProvider {
       })) ?? response
 
     const responseBody: DiscoveryResponse<Response> = await response.json()
+
+    if (blockNumber && responseBody.latest_indexed_block < blockNumber) {
+      throw new Error(
+        `Requested blocknumber ${blockNumber}, but discovery is behind at ${responseBody.latest_indexed_block}`
+      )
+    }
+
     return responseBody
   }
 

package/src/utils/fileHasher.ts

@@ -237,7 +237,7 @@ export const fileHasher = {
     logger: any = console
   ): Promise<string> {
     const buffer = await fileHasher.convertToBuffer(content, logger)
-    return fileHasher.hashNonImages(buffer)
+    return await fileHasher.hashNonImages(buffer)
   },
 
   /**
@@ -250,6 +250,6 @@ export const fileHasher = {
     content: ImportCandidate,
     _: any = console
   ): Promise<HashedImage[]> {
-    return fileHasher.hashImages(content)
+    return await fileHasher.hashImages(content)
   }
 }

package/src/api/Users.test.js

@@ -1,3 +0,0 @@
-const assert = require('assert')
-
-const { Users } = require('./Users')