[C-2812] Use storageNodeSelector in libs, fix mobile images (#3667)

AudiusProject · Jun 28, 2023 · e26986f · e26986f
1 parent 5daea08
commit e26986f
Show file tree

Hide file tree

Showing 28 changed files with 359 additions and 528 deletions.
diff --git a/packages/common/package-lock.json b/packages/common/package-lock.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -28,7 +28,7 @@
     "url": "https://github.com/AudiusProject/audius-client/issues"
   },
   "dependencies": {
-    "@audius/sdk": "3.0.3-beta.56",
+    "@audius/sdk": "3.0.3-beta.60",
     "@fingerprintjs/fingerprintjs-pro": "3.5.6",
     "@metaplex-foundation/mpl-token-metadata": "2.5.2",
     "@optimizely/optimizely-sdk": "4.0.0",

diff --git a/packages/common/src/services/audius-backend/AudiusBackend.ts b/packages/common/src/services/audius-backend/AudiusBackend.ts
@@ -1,6 +1,7 @@
-import type {
-  AudiusLibs as AudiusLibsType,
-  DiscoveryNodeSelector
+import {
+  type AudiusLibs as AudiusLibsType,
+  type DiscoveryNodeSelector,
+  type StorageNodeSelectorService
 } from '@audius/sdk'
 import { DiscoveryAPI } from '@audius/sdk/dist/core'
 import type { HedgehogConfig } from '@audius/sdk/dist/services/hedgehog'
@@ -78,7 +79,7 @@ import {
   Nullable,
   removeNullable
 } from '../../utils'
-import type { DiscoveryNodeSelectorService } from '../discovery-node-selector'
+import type { DiscoveryNodeSelectorService } from '../sdk/discovery-node-selector'
 
 import { MonitoringCallbacks } from './types'
 
@@ -232,6 +233,7 @@ type AudiusBackendParams = {
   ) => Promise<boolean | null> | null | boolean
   getHostUrl: () => Nullable<string>
   getLibs: () => Promise<any>
+  getStorageNodeSelector: () => Promise<StorageNodeSelectorService>
   getWeb3Config: (
     libs: any,
     registryAddress: Maybe<string>,
@@ -286,6 +288,7 @@ export const audiusBackend = ({
   getFeatureEnabled,
   getHostUrl,
   getLibs,
+  getStorageNodeSelector,
   getWeb3Config,
   hedgehogConfig,
   identityServiceUrl,
@@ -700,6 +703,17 @@ export const audiusBackend = ({
       })
     }
 
+    const baseCreatorNodeConfig = AudiusLibs.configCreatorNode(
+      userNodeUrl,
+      /* lazyConnect */ true,
+      /* passList */ null,
+      contentNodeBlockList,
+      monitoringCallbacks.contentNode,
+      /* writeQuorumEnabled */ await getFeatureEnabled(
+        FeatureFlags.WRITE_QUORUM_ENABLED
+      )
+    )
+
     try {
       audiusLibs = new AudiusLibs({
         localStorage,
@@ -732,16 +746,10 @@ export const audiusBackend = ({
         },
         identityServiceConfig:
           AudiusLibs.configIdentityService(identityServiceUrl),
-        creatorNodeConfig: AudiusLibs.configCreatorNode(
-          userNodeUrl,
-          /* lazyConnect */ true,
-          /* passList */ null,
-          contentNodeBlockList,
-          monitoringCallbacks.contentNode,
-          /* writeQuorumEnabled */ await getFeatureEnabled(
-            FeatureFlags.WRITE_QUORUM_ENABLED
-          )
-        ),
+        creatorNodeConfig: {
+          ...baseCreatorNodeConfig,
+          storageNodeSelector: await getStorageNodeSelector()
+        },
         // Electron cannot use captcha until it serves its assets from
         // a "domain" (e.g. localhost) rather than the file system itself.
         // i.e. there is no way to instruct captcha that the domain is "file://"

diff --git a/packages/common/src/services/index.ts b/packages/common/src/services/index.ts
@@ -13,4 +13,4 @@ export * from './solana-client'
 export * from './track-download'
 export * from './oauth'
 export * from './location'
-export * from './discovery-node-selector'
+export * from './sdk/discovery-node-selector'
diff --git a/...-selector/DiscoveryNodeSelectorService.ts → ...-selector/DiscoveryNodeSelectorService.ts b/...-selector/DiscoveryNodeSelectorService.ts → ...-selector/DiscoveryNodeSelectorService.ts
@@ -5,13 +5,13 @@ import {
   stagingConfig
 } from '@audius/sdk'
 
-import { Env } from '../env'
+import { Env } from '../../env'
 import {
   BooleanKeys,
   IntKeys,
   RemoteConfigInstance,
   StringKeys
-} from '../remote-config'
+} from '../../remote-config'
 
 type DiscoveryNodeSelectorConfig = {
   env: Env

diff --git a/...services/discovery-node-selector/index.ts → ...ices/sdk/discovery-node-selector/index.ts b/...services/discovery-node-selector/index.ts → ...ices/sdk/discovery-node-selector/index.ts
diff --git a/packages/embed/package-lock.json b/packages/embed/package-lock.json
diff --git a/packages/embed/package.json b/packages/embed/package.json
@@ -34,7 +34,7 @@
     "webpack-cli": "4.5.0"
   },
   "dependencies": {
-    "@audius/sdk": "3.0.3-beta.56",
+    "@audius/sdk": "3.0.3-beta.60",
     "@audius/stems": "1.5.30",
     "amplitude-js": "8.11.1",
     "axios": "0.19.2",