Skip to content

Send files directly between devices over the internet - no cloud storage, no size limits.

pick nearest relay by utc offset instead of random selection

Denis Lupookov5ebf7b6e00c9
diff --git a/packages/core/src/worklet/relay/conf.ts b/packages/core/src/worklet/relay/conf.ts
index a038b53..8fa0eb7 100644
--- a/packages/core/src/worklet/relay/conf.ts
+++ b/packages/core/src/worklet/relay/conf.ts
@@ -23,6 +23,12 @@ export function startRelayConf(pubkeyHex: string | undefined): void {
interface RelayRecordEntry {
key: string
host: string
+ utc?: number
+}
+
+function recordUtcOffset(entry: RelayRecordEntry): number | undefined {
+ if (typeof entry.utc === 'number' && Number.isFinite(entry.utc)) return entry.utc
+ return undefined
}
function isValidEntry(entry: unknown): entry is RelayRecordEntry {
@@ -81,7 +87,9 @@ async function tryFetch(dht: DHT): Promise<boolean> {
parsed.relays.every(isValidEntry)
) {
const relays = parsed.relays as RelayRecordEntry[]
- configureRelay({ relays: relays.map((r) => ({ keyHex: r.key, host: r.host })) })
+ configureRelay({
+ relays: relays.map((r) => ({ keyHex: r.key, host: r.host, utcOffset: recordUtcOffset(r) }))
+ })
return true
}
} catch (err) {
diff --git a/packages/core/src/worklet/relay/config.test.ts b/packages/core/src/worklet/relay/config.test.ts
index e3214af..260dec0 100644
--- a/packages/core/src/worklet/relay/config.test.ts
+++ b/packages/core/src/worklet/relay/config.test.ts
@@ -1,5 +1,5 @@
import b4a from 'b4a'
-import { beforeEach, describe, expect, it } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { configureRelay, isRelayHost, relayConfigSummary, relayThrough } from './config'
const KEY_A = 'a'.repeat(64)
@@ -7,10 +7,21 @@ const HOST_A = '1.2.3.4'
const KEY_B = 'b'.repeat(64)
const HOST_B = '5.6.7.8'
+const UTC_PLUS_8 = -480
+const UTC_PLUS_1 = -60
+
+function mockUtcOffset(minutes: number): void {
+ vi.spyOn(Date.prototype, 'getTimezoneOffset').mockReturnValue(minutes)
+}
+
beforeEach(() => {
configureRelay({ enabled: false, relays: [] })
})
+afterEach(() => {
+ vi.restoreAllMocks()
+})
+
describe('relay/config', () => {
it('relayThrough returns null when disabled, even with relays configured', () => {
configureRelay({ relays: [{ keyHex: KEY_A, host: HOST_A }] })
@@ -35,6 +46,48 @@ describe('relay/config', () => {
expect(keys?.map((k) => b4a.toString(k, 'hex'))).toEqual([KEY_A, KEY_B])
})
+ it('relayThrough returns the relay with the closest utc offset', () => {
+ configureRelay({
+ enabled: true,
+ relays: [
+ { keyHex: KEY_A, host: HOST_A, utcOffset: 1 },
+ { keyHex: KEY_B, host: HOST_B, utcOffset: 8 }
+ ]
+ })
+
+ mockUtcOffset(UTC_PLUS_8)
+ expect(relayThrough(false)?.map((k) => b4a.toString(k, 'hex'))).toEqual([KEY_B])
+
+ mockUtcOffset(UTC_PLUS_1)
+ expect(relayThrough(false)?.map((k) => b4a.toString(k, 'hex'))).toEqual([KEY_A])
+ })
+
+ it('relayThrough measures offset distance around the date line', () => {
+ configureRelay({
+ enabled: true,
+ relays: [
+ { keyHex: KEY_A, host: HOST_A, utcOffset: 1 },
+ { keyHex: KEY_B, host: HOST_B, utcOffset: 8 }
+ ]
+ })
+
+ mockUtcOffset(600)
+ expect(relayThrough(false)?.map((k) => b4a.toString(k, 'hex'))).toEqual([KEY_B])
+ })
+
+ it('relayThrough returns all relays when entries carry no utc offset', () => {
+ configureRelay({
+ enabled: true,
+ relays: [
+ { keyHex: KEY_A, host: HOST_A },
+ { keyHex: KEY_B, host: HOST_B }
+ ]
+ })
+
+ mockUtcOffset(UTC_PLUS_8)
+ expect(relayThrough(false)).toHaveLength(2)
+ })
+
it('isRelayHost matches configured hosts only', () => {
configureRelay({ enabled: true, relays: [{ keyHex: KEY_A, host: HOST_A }] })
expect(isRelayHost(HOST_A)).toBe(true)
diff --git a/packages/core/src/worklet/relay/config.ts b/packages/core/src/worklet/relay/config.ts
index 6914c0e..3e6d7cf 100644
--- a/packages/core/src/worklet/relay/config.ts
+++ b/packages/core/src/worklet/relay/config.ts
@@ -3,6 +3,7 @@ import b4a from 'b4a'
interface RelayEntry {
key: Uint8Array
host: string
+ utcOffset: number | null
}
interface RelayState {
@@ -24,6 +25,7 @@ export function registerRelayLoader(load: () => void): void {
interface RelayEntryInput {
keyHex: string
host: string
+ utcOffset?: number
}
export interface RelayConfigInput {
@@ -31,8 +33,8 @@ export interface RelayConfigInput {
relays?: readonly RelayEntryInput[]
}
-function toRelayEntry({ keyHex, host }: RelayEntryInput): RelayEntry {
- return { key: b4a.from(keyHex, 'hex'), host }
+function toRelayEntry({ keyHex, host, utcOffset }: RelayEntryInput): RelayEntry {
+ return { key: b4a.from(keyHex, 'hex'), host, utcOffset: utcOffset ?? null }
}
export function configureRelay(input: RelayConfigInput): void {
@@ -51,9 +53,23 @@ export function relayConfigSummary(): { enabled: boolean; keyCount: number } {
return { enabled: state.enabled, keyCount: state.relays.length }
}
+function offsetDistance(a: number, b: number): number {
+ const diff = Math.abs(a - b)
+ return Math.min(diff, 24 - diff)
+}
+
+function nearestRelays(relays: RelayEntry[]): RelayEntry[] {
+ const local = -new Date().getTimezoneOffset() / 60
+ const tagged = relays.filter((r) => r.utcOffset !== null)
+ if (tagged.length === 0) return relays
+
+ const best = Math.min(...tagged.map((r) => offsetDistance(r.utcOffset!, local)))
+ return tagged.filter((r) => offsetDistance(r.utcOffset!, local) === best)
+}
+
export function relayThrough(_force: boolean, _swarm?: unknown): Uint8Array[] | null {
if (!state.enabled || state.relays.length === 0) return null
- return state.relays.map((r) => r.key)
+ return nearestRelays(state.relays).map((r) => r.key)
}
export function isRelayHost(host: string | null | undefined): boolean {