Add server webplayer and track page

packages/common/package.json

@@ -17,6 +17,7 @@
     "./schemas": "./src/schemas/index.ts",
     "./services": "./src/services/index.ts",
     "./store": "./src/store/index.ts",
+    "./serverStore": "./src/serverStore/index.ts",
     "./utils": "./src/utils/index.ts"
   },
   "repository": {

packages/common/src/api/library.ts

@@ -3,7 +3,7 @@ import type { full } from '@audius/sdk'
 import { AudiusQueryContextType, createApi } from '~/audius-query'
 import { UserCollectionMetadata } from '~/models/Collection'
 import { Kind } from '~/models/Kind'
-import { makeActivity } from '~/services/audius-api-client/ResponseAdapter'
+import { makeActivity } from '~/services/audius-api-client'
 import { APIActivityV2 } from '~/services/audius-api-client/types'
 import { encodeHashId } from '~/utils/hashIds'
 import { removeNullable } from '~/utils/typeUtils'

packages/common/src/models/SsrPageProps.ts

@@ -1,8 +1,11 @@
-import type { full as FullSdk } from '@audius/sdk'
+// import type { full as FullSdk } from '@audius/sdk'
 
 export type SsrPageProps = {
-  track?: FullSdk.TrackFull
-  user?: FullSdk.UserFull
-  collection?: FullSdk.PlaylistFull
+  // track?: FullSdk.TrackFull
+  // user?: FullSdk.UserFull
+  // collection?: FullSdk.PlaylistFull
+  track?: any
+  user?: any
+  collection?: any
   error?: { isErrorPageOpen: boolean }
 }

packages/common/src/serverStore/index.ts

@@ -0,0 +1 @@
+export * from './serverReducers'

packages/common/src/serverStore/serverReducers.ts

@@ -0,0 +1,48 @@
+import { History } from 'history'
+import { combineReducers } from 'redux'
+import type { Storage } from 'redux-persist'
+
+import account from '~/store/account/slice'
+import collectionsReducer from '~/store/cache/collections/reducer'
+import { asCache } from '~/store/cache/reducer'
+import tracksReducer from '~/store/cache/tracks/reducer'
+import usersReducer from '~/store/cache/users/reducer'
+// import collection from '~/store/pages/collection/reducer'
+// import profileReducer from '~/store/pages/profile/reducer'
+import track from '~/store/pages/track/reducer'
+import theme from '~/store/ui/theme/slice'
+
+import { Kind, SsrPageProps } from '../models'
+
+/**
+ * A function that creates common reducers.
+ * @returns an object of all reducers to be used with `combineReducers`
+ */
+export const serverReducers = (
+  _storage: Storage,
+  ssrPageProps?: SsrPageProps,
+  _isServerSide?: boolean,
+  _history?: History
+) => ({
+  account,
+
+  // Cache
+  // @ts-ignore
+  collections: asCache(collectionsReducer(ssrPageProps), Kind.COLLECTIONS),
+  // @ts-ignore
+  tracks: asCache(tracksReducer(ssrPageProps), Kind.TRACKS),
+  // @ts-ignore
+  users: asCache(usersReducer(ssrPageProps), Kind.USERS),
+
+  // UI
+  ui: combineReducers({
+    theme
+  }),
+
+  // Pages
+  pages: combineReducers({
+    // collection: collection(ssrPageProps),
+    // profile: profileReducer(ssrPageProps),
+    track: track(ssrPageProps)
+  })
+})

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

@@ -20,6 +20,7 @@ import { IntKeys, StringKeys, RemoteConfigInstance } from '../remote-config'
 
 import * as adapter from './ResponseAdapter'
 import { processSearchResults } from './helper'
+import { makeActivity } from './makeActivity'
 import {
   APIActivity,
   APIBlockConfirmation,
@@ -1239,9 +1240,7 @@ export class AudiusAPIClient {
 
     if (!response) return []
 
-    const adapted = response.data
-      .map(adapter.makeActivity)
-      .filter(removeNullable)
+    const adapted = response.data.map(makeActivity).filter(removeNullable)
     return adapted
   }
 

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

@@ -1,5 +1,3 @@
-import { full } from '@audius/sdk'
-
 import dayjs from '~/utils/dayjs'
 
 import {
@@ -19,7 +17,6 @@ import { decodeHashId } from '../../utils/hashIds'
 import { removeNullable } from '../../utils/typeUtils'
 
 import {
-  APIActivity,
   APIFavorite,
   APIRemix,
   APIRepost,
@@ -32,9 +29,7 @@ import {
   APISearch,
   APISearchTrack,
   APISearchAutocomplete,
-  APISearchPlaylist,
-  APIActivityV2,
-  isApiActivityV2
+  APISearchPlaylist
 } from './types'
 
 export const makeUser = (
@@ -401,30 +396,6 @@ export const makePlaylist = (
   return marshalled as unknown as UserCollectionMetadata
 }
 
-export const makeActivity = (
-  activity: APIActivity | APIActivityV2
-): UserTrackMetadata | UserCollectionMetadata | undefined => {
-  if (isApiActivityV2(activity)) {
-    if (!activity.item) {
-      return undefined
-    }
-    if (activity.itemType === 'track') {
-      return makeTrack(full.TrackFullToJSON(activity.item as full.TrackFull))
-    } else if (activity.itemType === 'playlist') {
-      return makePlaylist(
-        full.PlaylistFullWithoutTracksToJSON(
-          activity.item as full.PlaylistFullWithoutTracks
-        )
-      )
-    }
-    return undefined
-  } else {
-    return activity.item_type === 'track'
-      ? makeTrack(activity.item)
-      : makePlaylist(activity.item)
-  }
-}
-
 export const makeStemTrack = (stem: APIStem): StemTrackMetadata | undefined => {
   const [id, parentId, ownerId] = [stem.id, stem.parent_id, stem.user_id].map(
     decodeHashId

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

@@ -1,3 +1,4 @@
 export * from './AudiusAPIClient'
 export * as responseAdapter from './ResponseAdapter'
+export { makeActivity } from './makeActivity'
 export * from './types'

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

@@ -0,0 +1,30 @@
+import { full } from '@audius/sdk'
+
+import { UserTrackMetadata, UserCollectionMetadata } from '~/models'
+
+import { makePlaylist, makeTrack } from './ResponseAdapter'
+import { APIActivity, APIActivityV2, isApiActivityV2 } from './types'
+
+export const makeActivity = (
+  activity: APIActivity | APIActivityV2
+): UserTrackMetadata | UserCollectionMetadata | undefined => {
+  if (isApiActivityV2(activity)) {
+    if (!activity.item) {
+      return undefined
+    }
+    if (activity.itemType === 'track') {
+      return makeTrack(full.TrackFullToJSON(activity.item as full.TrackFull))
+    } else if (activity.itemType === 'playlist') {
+      return makePlaylist(
+        full.PlaylistFullWithoutTracksToJSON(
+          activity.item as full.PlaylistFullWithoutTracks
+        )
+      )
+    }
+    return undefined
+  } else {
+    return activity.item_type === 'track'
+      ? makeTrack(activity.item)
+      : makePlaylist(activity.item)
+  }
+}

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

@@ -14,7 +14,8 @@ import {
   APIPlaylist,
   APITrack,
   AudiusAPIClient,
-  responseAdapter
+  responseAdapter,
+  makeActivity
 } from '../audius-api-client'
 import { AudiusBackend, AuthHeaders } from '../audius-backend'
 
@@ -110,7 +111,7 @@ export class Explore {
       })
       const activityData = history.data as APIActivityV2[]
       const listenedToTracks = activityData
-        .map(responseAdapter.makeActivity)
+        .map(makeActivity)
         .filter(removeNullable) as UserTrackMetadata[]
 
       // Imperfect solution. Ideally we use an endpoint that gives us true/false

packages/common/src/store/cache/collections/reducer.ts

@@ -2,7 +2,7 @@ import snakecaseKeys from 'snakecase-keys'
 
 import { makePlaylist } from '~/services/audius-api-client/ResponseAdapter'
 import { initialCacheState } from '~/store/cache/reducer'
-import { makeUid } from '~/utils'
+import { makeUid } from '~/utils/uid'
 
 import {
   Collection,

packages/common/src/utils/timeUtil.ts

@@ -6,6 +6,10 @@ const MINUTES_PER_HOUR = 60
 const SECONDS_PER_HOUR = SECONDS_PER_MINUTE * MINUTES_PER_HOUR
 dayjs.extend(advancedFormat)
 
+export const formatDateWithTimezoneOffset = (date: string): string => {
+  return dayjs.utc(date).local().format('M/D/YY')
+}
+
 export const formatSeconds = (seconds: number): string => {
   const time = dayjs.duration(seconds, 'seconds')
   if (seconds >= SECONDS_PER_HOUR) {
@@ -53,10 +57,6 @@ export const formatDate = (date: string, format?: string): string => {
   return dayjs(date).format(dayjsFormat)
 }
 
-export const formatDateWithTimezoneOffset = (date: string): string => {
-  return dayjs.utc(date).local().format('M/D/YY')
-}
-
 export const utcToLocalTime = (date: string) => {
   return dayjs.utc(date).local()
 }

packages/web/package.json

@@ -122,6 +122,7 @@
     "client-zip": "2.4.4",
     "connected-react-router": "6.9.3",
     "cross-fetch": "^4.0.0",
+    "dayjs": "1.10.7",
     "electron-log": "5.0.3",
     "electron-updater": "6.1.7",
     "exif-parser": "0.1.12",

packages/web/src/app/ServerReduxProvider.tsx

@@ -0,0 +1,62 @@
+import { ReactNode, useRef } from 'react'
+
+import { Provider } from 'react-redux'
+import { Persistor, persistStore } from 'redux-persist'
+import { PersistGate } from 'redux-persist/integration/react'
+import { PartialDeep } from 'type-fest'
+
+import { useIsMobile } from 'hooks/useIsMobile'
+import { configureStore } from 'store/configureServerStore'
+import { AppState } from 'store/types'
+import logger from 'utils/logger'
+
+import { useSsrContext } from '../ssr/SsrContext'
+
+import { useHistoryContext } from './HistoryProvider'
+
+export const ServerReduxProvider = ({
+  children,
+  initialStoreState
+}: {
+  children: ReactNode
+  // Sets up an initial store state
+  initialStoreState?: PartialDeep<AppState>
+}) => {
+  const { pageProps, isServerSide } = useSsrContext()
+  const { history } = useHistoryContext()
+  const isMobile = useIsMobile()
+
+  const storeRef = useRef<ReturnType<typeof configureStore>>()
+  const persistorRef = useRef<Persistor>()
+
+  if (!storeRef.current) {
+    const store = configureStore(
+      history,
+      isMobile,
+      pageProps,
+      isServerSide,
+      initialStoreState
+    )
+    storeRef.current = store
+    const persistor = persistStore(store)
+    persistorRef.current = persistor
+
+    // Mount store to window for easy access
+    if (typeof window !== 'undefined') {
+      window.store = store
+    }
+
+    // Set up logger on store
+    if (!isServerSide) {
+      logger(store)
+    }
+  }
+
+  return (
+    <Provider store={storeRef.current}>
+      <PersistGate loading={null} persistor={persistorRef.current!}>
+        {() => children}
+      </PersistGate>
+    </Provider>
+  )
+}

packages/web/src/app/ThemeProvider.tsx

@@ -1,13 +1,20 @@
 import { ReactNode } from 'react'
 
 import { Theme, SystemAppearance } from '@audius/common/models'
-import { themeSelectors } from '@audius/common/store'
 import { ThemeProvider as HarmonyThemeProvider } from '@audius/harmony'
 
 import { AppState } from 'store/types'
 import { useSelector } from 'utils/reducer'
 
-const { getTheme, getSystemAppearance } = themeSelectors
+const getBaseState = (state: AppState) => state.ui.theme
+
+const getTheme = (state: AppState) => {
+  return getBaseState(state).theme
+}
+
+const getSystemAppearance = (state: AppState) => {
+  return getBaseState(state).systemAppearance
+}
 
 const selectHarmonyTheme = (state: AppState) => {
   const theme = getTheme(state)