[DVRL-11] Move client history requests to sdk

packages/common/src/services/audius-api-client/AudiusAPIClient.ts

@@ -101,7 +101,6 @@ const FULL_ENDPOINT_MAP = {
  getRemixing: (trackId: OpaqueID) => `/tracks/${trackId}/remixing`,
  searchFull: `/search/full`,
  searchAutocomplete: `/search/autocomplete`,
- getUserTrackHistory: (userId: OpaqueID) => `/users/${userId}/history/tracks`,
  getUserSupporter: (userId: OpaqueID, supporterUserId: OpaqueID) =>
  `/users/${userId}/supporters/${supporterUserId}`,
  getUserSupporting: (userId: OpaqueID, supporterUserId: OpaqueID) =>
@@ -431,14 +430,6 @@ export type GetSocialFeedArgs = QueryParams & {
 
 type GetSocialFeedResponse = {}
 
-type GetUserTrackHistoryArgs = {
- userId: ID
- currentUserId: Nullable<ID>
- limit?: number
- offset?: number
- sortMethod?: string
-}
-
 type GetReactionArgs = {
  reactedToIds: string[]
 }
@@ -1627,37 +1618,6 @@ export class AudiusAPIClient {
  return response.data
  }
 
- async getUserTrackHistory({
- currentUserId,
- userId,
- offset = 0,
- limit = 100,
- sortMethod
- }: GetUserTrackHistoryArgs) {
- const encodedUserId = this._encodeOrThrow(userId)
- const encodedCurrentUserId = encodeHashId(currentUserId)
- this._assertInitialized()
- const params = {
- user_id: encodedCurrentUserId || undefined,
- limit,
- offset,
- sort_method: sortMethod
- }
-
- const response = await this._getResponse<APIResponse<APIActivity[]>>(
- FULL_ENDPOINT_MAP.getUserTrackHistory(encodedUserId),
- params
- )
-
- if (!response) return []
-
- const adapted = response.data.map(({ item, ...props }) => ({
- timestamp: props.timestamp,
- track: adapter.makeTrack(item as APITrack)
- }))
- return adapted
- }
-
  async getUserSupporter({
  currentUserId,
  userId,

packages/common/src/services/audius-backend/AudiusBackend.ts

@@ -1792,7 +1792,13 @@ export const audiusBackend = ({
  }
  }
 
- function getDiscoveryEntityType({ type, is_album }: { type: string, is_album?: boolean}) {
+ function getDiscoveryEntityType({
+ type,
+ is_album
+ }: {
+ type: string
+ is_album?: boolean
+ }) {
  if (type === 'track') {
  return Entity.Track
  } else if (is_album === true) {

packages/common/src/services/explore/Explore.ts

@@ -1,3 +1,5 @@
+import { AudiusSdk } from '@audius/sdk'
+
 import {
  Collection,
  FeedFilter,
@@ -8,6 +10,7 @@ import {
 } from '../../models'
 import { encodeHashId, removeNullable } from '../../utils'
 import {
+ APIActivityV2,
  APIPlaylist,
  APITrack,
  AudiusAPIClient,
@@ -28,15 +31,18 @@ type TopUserListen = {
 type ExploreConfig = {
  audiusBackendInstance: AudiusBackend
  apiClient: AudiusAPIClient
+ audiusSdk: () => Promise<AudiusSdk>
 }
 
 export class Explore {
  audiusBackendInstance: AudiusBackend
  apiClient: AudiusAPIClient
+ audiusSdk: () => Promise<AudiusSdk>
 
  constructor(config: ExploreConfig) {
  this.audiusBackendInstance = config.audiusBackendInstance
  this.apiClient = config.apiClient
+ this.audiusSdk = config.audiusSdk
  }
 
  /** TRACKS ENDPOINTS */
@@ -83,6 +89,7 @@ export class Explore {
  }
 
  async getFeedNotListenedTo(currentUserId: ID, limit = 25) {
+ const sdk = await this.audiusSdk()
  try {
  const lineupItems = (await this.apiClient.getSocialFeed({
  offset: 0,
@@ -97,18 +104,27 @@ export class Explore {
  const tracks = lineupItems.filter(
  (lineupItem): lineupItem is UserTrack => 'track_id' in lineupItem
  )
+ const { data, signature } =
+ await this.audiusBackendInstance.signDiscoveryNodeRequest()
+ const history = await sdk.full.users.getUsersTrackHistory({
+ id: encodeHashId(currentUserId),
+ encodedDataMessage: data,
+ encodedDataSignature: signature,
+ limit: 100
+ })
+ const activityData = history.data as APIActivityV2[]
+ const listenedToTracks = activityData
+ .map(responseAdapter.makeActivity)
+ .filter(removeNullable) as UserTrackMetadata[]
 
  // Imperfect solution. Ideally we use an endpoint that gives us true/false
  // if a user has listened to a passed in array of tracks.
- const history = await this.apiClient.getUserTrackHistory({
- currentUserId,
- userId: currentUserId,
- limit: 50
- })
- const listens = history.map((item) => item.track?.track_id)
+ const listenendToTrackIds = listenedToTracks.map(
+ (track) => track.track_id
+ )
 
  const notListenedToTracks = tracks.filter(
- (track) => !listens[track.track_id]
+ (track) => !listenendToTrackIds[track.track_id]
  )
  return notListenedToTracks.slice(0, limit)
  } catch (e) {

packages/common/src/store/upload/reducer.ts

@@ -1,5 +1,7 @@
 import { cloneDeep } from 'lodash'
 
+import { StemUploadWithFile } from '~/models'
+
 import {
  TOGGLE_MULTI_TRACK_NOTIFICATION,
  UPLOAD_TRACKS_REQUESTED,
@@ -16,7 +18,6 @@ import {
  uploadSingleTrackFailed
 } from './actions'
 import { ProgressStatus, UploadState, UploadTrack } from './types'
-import { StemUploadWithFile } from '~/models'
 
 const initialState: UploadState = {
  openMultiTrackNotification: true,

packages/common/src/store/upload/selectors.ts

@@ -1,6 +1,7 @@
 import { floor, clamp } from 'lodash'
 
 import { CommonState } from '../commonStore'
+
 import { ProgressStatus } from './types'
 
 export const getStems = (state: CommonState) => state.upload.stems

packages/mobile/src/services/explore.ts

@@ -2,8 +2,10 @@ import { Explore } from '@audius/common/services'
 
 import { apiClient } from './audius-api-client'
 import { audiusBackendInstance } from './audius-backend-instance'
+import { audiusSdk } from './sdk/audius-sdk'
 
 export const explore = new Explore({
  audiusBackendInstance,
- apiClient
+ apiClient,
+ audiusSdk
 })

packages/web/src/common/store/pages/history/lineups/sagas.ts

@@ -1,10 +1,15 @@
 import { LineupEntry, Track, UserTrackMetadata } from '@audius/common/models'
+import { responseAdapter } from '@audius/common/services'
 import {
  accountSelectors,
  getContext,
  historyPageTracksLineupActions as tracksActions
 } from '@audius/common/store'
-import { removeNullable } from '@audius/common/utils'
+import {
+ decodeHashId,
+ encodeHashId,
+ removeNullable
+} from '@audius/common/utils'
 import { keyBy } from 'lodash'
 import { call, select } from 'typed-redux-saga'
 
@@ -17,28 +22,40 @@ const { prefix: PREFIX } = tracksActions
 function* getHistoryTracks() {
  yield* waitForRead()
 
- const apiClient = yield* getContext('apiClient')
+ const audiusSdk = yield* getContext('audiusSdk')
+ const audiusBackendInstance = yield* getContext('audiusBackendInstance')
+ const sdk = yield* call(audiusSdk)
  try {
  const currentUserId = yield* select(getUserId)
  if (!currentUserId) return []
 
- const activity = yield* call([apiClient, apiClient.getUserTrackHistory], {
- currentUserId,
- userId: currentUserId,
- limit: 100
- })
+ const { data, signature } = yield* call([
+ audiusBackendInstance,
+ audiusBackendInstance.signDiscoveryNodeRequest
+ ])
+ const activity = yield* call(
+ [sdk.full.users, sdk.full.users.getUsersTrackHistory],
+ {
+ id: encodeHashId(currentUserId),
+ encodedDataMessage: data,
+ encodedDataSignature: signature,
+ limit: 100
+ }
+ )
+ const activityData = activity.data
+ if (!activityData) return []
 
- const activityTracks: UserTrackMetadata[] = activity
- .map((a) => a.track)
- .filter(removeNullable)
+ const tracks = activityData
+ .map(responseAdapter.makeActivity)
+ .filter(removeNullable) as UserTrackMetadata[]
 
- const processedTracks = yield* call(processAndCacheTracks, activityTracks)
+ const processedTracks = yield* call(processAndCacheTracks, tracks)
  const processedTracksMap = keyBy(processedTracks, 'track_id')
 
  const lineupTracks: Track[] = []
-activity.forEach((activity) => {
- const trackMetadata = activity.track
- ? processedTracksMap[activity.track.track_id]
+activityData.forEach((activity) => {
+ const trackMetadata = activity.item
+ ? processedTracksMap[decodeHashId(activity.item.id)!]
  : null
  // Prevent history for invalid tracks from getting into the lineup.
  if (trackMetadata) {

packages/web/src/common/store/smart-collection/sagas.ts

@@ -4,14 +4,15 @@ import {
  UserTrackMetadata,
  UserTrack
 } from '@audius/common/models'
+import { responseAdapter } from '@audius/common/services'
 import {
  accountSelectors,
  smartCollectionPageActions,
  collectionPageLineupActions,
  collectionPageActions,
  getContext
 } from '@audius/common/store'
-import { removeNullable } from '@audius/common/utils'
+import { encodeHashId, removeNullable } from '@audius/common/utils'
 import { takeEvery, put, call, select } from 'typed-redux-saga'
 
 import { processAndCacheTracks } from 'common/store/cache/tracks/utils'
@@ -38,22 +39,34 @@ const { getUserId } = accountSelectors
 const COLLECTIONS_LIMIT = 25
 
 function* fetchHeavyRotation() {
+ yield* waitForRead()
+
  const currentUserId = yield* select(getUserId)
- const apiClient = yield* getContext('apiClient')
- const userListeningHistoryMostListenedByUser = yield* call(
- [apiClient, apiClient.getUserTrackHistory],
+ const audiusSdk = yield* getContext('audiusSdk')
+ const audiusBackendInstance = yield* getContext('audiusBackendInstance')
+ const sdk = yield* call(audiusSdk)
+
+ const { data, signature } = yield* call([
+ audiusBackendInstance,
+ audiusBackendInstance.signDiscoveryNodeRequest
+ ])
+ if (!currentUserId) return { ...HEAVY_ROTATION }
+ const activity = yield* call(
+ [sdk.full.users, sdk.full.users.getUsersTrackHistory],
  {
-userId: currentUserId!,
-currentUserId,
-limit: 20,
-offset: 0,
-sortMethod: 'most_listens_by_user'
+id: encodeHashId(currentUserId),
+encodedDataMessage: data,
+encodedDataSignature: signature,
+sortMethod: 'most_listens_by_user',
+limit: 20
  }
  )
+ const activityData = activity.data
+ if (!activityData) return { ...HEAVY_ROTATION }
 
- const mostListenedTracks = userListeningHistoryMostListenedByUser
- .map((listeningHistoryWithTrack) => listeningHistoryWithTrack.track)
- .filter(removeNullable)
+ const mostListenedTracks = activityData
+ .map(responseAdapter.makeActivity)
+ .filter(removeNullable) as UserTrackMetadata[]
 
  const users = yield* call(
  retrieveUsers,
@@ -80,8 +93,8 @@ function* fetchHeavyRotation() {
 }
 
 function* fetchBestNewReleases() {
- const explore = yield* getContext('explore')
  yield* waitForRead()
+ const explore = yield* getContext('explore')
  const currentUserId = yield* select(getUserId)
  if (currentUserId == null) {
  return
@@ -110,6 +123,7 @@ function* fetchBestNewReleases() {
 }
 
 function* fetchUnderTheRadar() {
+ yield* waitForRead()
  const explore = yield* getContext('explore')
  const currentUserId = yield* select(getUserId)
  if (currentUserId == null) {
@@ -183,8 +197,8 @@ function* fetchFeelingLucky() {
 }
 
 function* fetchRemixables() {
- const explore = yield* getContext('explore')
  yield* waitForRead()
+ const explore = yield* getContext('explore')
  const currentUserId = yield* select(getUserId)
  if (currentUserId == null) {
  return

packages/web/src/services/explore.ts

@@ -2,8 +2,10 @@ import { Explore } from '@audius/common/services'
 
 import { apiClient } from './audius-api-client'
 import { audiusBackendInstance } from './audius-backend/audius-backend-instance'
+import { audiusSdk } from './audius-sdk'
 
 export const explore = new Explore({
  audiusBackendInstance,
- apiClient
+ apiClient,
+ audiusSdk
 })