Merge branch 'main' into feat/race-nodes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@filecoin-saturn/js-client",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Filecoin Saturn Client",
   "homepage": "https://github.com/filecoin-saturn/js-client",
   "main": "src/index.js",

src/client.js

@@ -10,6 +10,8 @@ import { getJWT } from './utils/jwt.js'
 import { parseUrl, addHttpPrefix } from './utils/url.js'
 import { isBrowserContext } from './utils/runtime.js'
 
+const MAX_NODE_WEIGHT = 100
+
 export class Saturn {
   static nodesListKey = 'saturn-nodes'
   static defaultRaceCount = 3
@@ -486,6 +488,29 @@ export class Saturn {
     }
   }
 
+  _sortNodes (nodes) {
+    // Determine the maximum distance for normalization
+    const maxDistance = Math.max(...nodes.map(node => node.distance))
+
+    // These weights determine how important each factor is in determining
+    const distanceImportanceFactor = 0.8
+    const weightImportanceFactor = 1 - distanceImportanceFactor
+
+    return nodes.slice().sort((a, b) => {
+      const normalizedDistanceA = a.distance / maxDistance
+      const normalizedDistanceB = b.distance / maxDistance
+      const normalizedWeightA = a.weight / MAX_NODE_WEIGHT
+      const normalizedWeightB = b.weight / MAX_NODE_WEIGHT
+
+      const metricA =
+        distanceImportanceFactor * normalizedDistanceA - weightImportanceFactor * normalizedWeightA
+      const metricB =
+        distanceImportanceFactor * normalizedDistanceB - weightImportanceFactor * normalizedWeightB
+
+      return metricA - metricB
+    })
+  }
+
   async _loadNodes (opts) {
     let origin = opts.orchURL
 
@@ -524,6 +549,7 @@ export class Saturn {
     }
     // we always want to update from the orchestrator regardless.
     nodes = await orchNodesListPromise
+    nodes = this._sortNodes(nodes)
     this.nodes = nodes
     this.storage?.set(Saturn.nodesListKey, nodes)
   }

test/test-utils.js

@@ -37,7 +37,7 @@ export function generateNodes (count, originDomain) {
     const nodeIp = `node${i}`
     const node = {
       ip: nodeIp,
-      weight: i,
+      weight: 50,
       distance: 100,
       url: `https://${nodeIp}.${originDomain}`
     }