@comapeo/core 1.0.1 → 2.0.1

package/src/fastify-plugins/maps.js

@@ -0,0 +1,130 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { fetch } from 'undici'
+import { ReaderWatch, Server as SMPServerPlugin } from 'styled-map-package'
+
+import { noop } from '../utils.js'
+import { NotFoundError, ENOENTError } from './utils.js'
+
+/** @import { FastifyPluginAsync } from 'fastify' */
+/** @import { Stats } from 'node:fs' */
+
+export const CUSTOM_MAP_PREFIX = 'custom'
+export const FALLBACK_MAP_PREFIX = 'fallback'
+
+/**
+ * @typedef {Object} MapsPluginOpts
+ *
+ * @property {string | URL} defaultOnlineStyleUrl
+ * @property {string} [customMapPath]
+ * @property {string} fallbackMapPath
+ */
+
+/** @type {FastifyPluginAsync<MapsPluginOpts>} */
+export async function plugin(fastify, opts) {
+  if (opts.customMapPath) {
+    const { customMapPath } = opts
+
+    const customMapReader = new ReaderWatch(customMapPath)
+
+    fastify.addHook('onClose', () => customMapReader.close().catch(noop))
+
+    fastify.get(`/${CUSTOM_MAP_PREFIX}/info`, async () => {
+      const baseUrl = new URL(fastify.prefix, fastify.listeningOrigin)
+
+      if (!baseUrl.href.endsWith('/')) {
+        baseUrl.href += '/'
+      }
+
+      const customStyleJsonUrl = new URL(
+        `${CUSTOM_MAP_PREFIX}/style.json`,
+        baseUrl
+      )
+      const response = await fetch(customStyleJsonUrl)
+
+      if (response.status === 404) {
+        throw new NotFoundError(customStyleJsonUrl.href)
+      }
+
+      if (!response.ok) {
+        throw new Error(`Failed to get style from ${customStyleJsonUrl.href}`)
+      }
+
+      /** @type {Stats | undefined} */
+      let stats
+
+      try {
+        stats = await fs.stat(customMapPath)
+      } catch (err) {
+        if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
+          throw new ENOENTError(customMapPath)
+        }
+
+        throw err
+      }
+
+      const style = await response.json()
+
+      const styleJsonName =
+        typeof style === 'object' &&
+        style &&
+        'name' in style &&
+        typeof style.name === 'string'
+          ? style.name
+          : undefined
+
+      return {
+        created: stats.ctime,
+        size: stats.size,
+        name: styleJsonName || path.parse(customMapPath).name,
+      }
+    })
+
+    fastify.register(SMPServerPlugin, {
+      prefix: CUSTOM_MAP_PREFIX,
+      reader: customMapReader,
+    })
+  }
+
+  const fallbackMapReader = new ReaderWatch(opts.fallbackMapPath)
+
+  fastify.addHook('onClose', () => fallbackMapReader.close().catch(noop))
+
+  fastify.register(SMPServerPlugin, {
+    prefix: FALLBACK_MAP_PREFIX,
+    reader: fallbackMapReader,
+  })
+
+  fastify.get('/style.json', async (_request, reply) => {
+    const baseUrl = new URL(fastify.prefix, fastify.listeningOrigin)
+
+    // Important for using as a base for creating new URL objects
+    if (!baseUrl.href.endsWith('/')) {
+      baseUrl.href += '/'
+    }
+
+    /** @type {Array<string | URL>}*/
+    const styleUrls = [
+      opts.defaultOnlineStyleUrl,
+      new URL(`${FALLBACK_MAP_PREFIX}/style.json`, baseUrl),
+    ]
+
+    if (opts.customMapPath) {
+      styleUrls.unshift(new URL(`${CUSTOM_MAP_PREFIX}/style.json`, baseUrl))
+    }
+
+    for (const url of styleUrls) {
+      const resp = await fetch(url, { method: 'HEAD' }).catch(noop)
+
+      if (resp && resp.status === 200) {
+        return reply
+          .headers({
+            'cache-control': 'no-cache',
+          })
+          .redirect(url.toString())
+      }
+    }
+
+    return reply.status(404).send()
+  })
+}

package/src/fastify-plugins/utils.js

@@ -7,6 +7,12 @@ export const NotFoundError = createError(
   404
 )
 
+export const ENOENTError = createError(
+  'FST_ENOENT',
+  "ENOENT: no such file or directory '%s'",
+  404
+)
+
 /**
  * @param {import('node:http').Server} server
  * @param {{ timeout?: number }} [options]

package/src/index-writer/index.js

@@ -97,7 +97,7 @@ export class IndexWriter {
       const indexer = this.#indexers.get(schemaName)
       if (!indexer) continue // Won't happen, but TS doesn't know that
       indexer.batch(docs)
-      if (this.#l.enabled) {
+      if (this.#l.log.enabled) {
         for (const doc of docs) {
           this.#l.log(
             'Indexed %s %S @ %S',

package/src/index.js

@@ -3,9 +3,7 @@ import {
   COORDINATOR_ROLE_ID,
   MEMBER_ROLE_ID,
 } from './roles.js'
-export { plugin as MapeoStaticMapsFastifyPlugin } from './fastify-plugins/maps/static-maps.js'
-export { plugin as MapeoOfflineFallbackMapFastifyPlugin } from './fastify-plugins/maps/offline-fallback-map.js'
-export { plugin as MapeoMapsFastifyPlugin } from './fastify-plugins/maps/index.js'
+export { plugin as CoMapeoMapsFastifyPlugin } from './fastify-plugins/maps.js'
 export { FastifyController } from './fastify-controller.js'
 export { MapeoManager } from './mapeo-manager.js'
 

package/src/lib/hashmap.js

@@ -1,4 +1,4 @@
-/** @typedef {string | number | bigint | boolean | undefined | symbol | null} Primitive */
+/** @import { Primitive } from 'type-fest' */
 
 /**
  * `Map` uses same-value-zero equality for keys, which makes it more difficult

package/src/lib/key-by.js

@@ -0,0 +1,24 @@
+/**
+ * Like [`Map.groupBy`][0], but the result's values aren't arrays.
+ *
+ * If multiple values resolve to the same key, an error is thrown.
+ *
+ * [0]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/groupBy
+ *
+ * @template T
+ * @template K
+ * @param {Iterable<T>} items
+ * @param {(item: T) => K} callbackFn
+ * @returns {Map<K, T>}
+ */
+export function keyBy(items, callbackFn) {
+  /** @type {Map<K, T>} */ const result = new Map()
+  for (const item of items) {
+    const key = callbackFn(item)
+    if (result.has(key)) {
+      throw new Error(`keyBy found duplicate key ${JSON.stringify(key)}`)
+    }
+    result.set(key, item)
+  }
+  return result
+}

package/src/lib/omit.js

@@ -0,0 +1,28 @@
+/**
+ * Returns a new object with the own enumerable keys of `obj` that are not in `keys`.
+ *
+ * In other words, remove some keys from an object.
+ *
+ * @template {object} T
+ * @template {keyof T} K
+ * @param {T} obj
+ * @param {ReadonlyArray<K>} keys
+ * @returns {Omit<T, K>}
+ * @example
+ * const obj = { foo: 1, bar: 2, baz: 3 }
+ * omit(obj, ['foo', 'bar'])
+ * // => { baz: 3 }
+ */
+export function omit(obj, keys) {
+  /** @type {Partial<T>} */ const result = {}
+
+  /** @type {Set<unknown>} */ const toOmit = new Set(keys)
+
+  for (const key in obj) {
+    if (!Object.hasOwn(obj, key)) continue
+    if (toOmit.has(key)) continue
+    result[key] = obj[key]
+  }
+
+  return /** @type {Omit<T, K>} */ (result)
+}

package/src/local-peers.js

@@ -13,6 +13,7 @@ import {
 import pDefer from 'p-defer'
 import { Logger } from './logger.js'
 import pTimeout, { TimeoutError } from 'p-timeout'
+/** @import NoiseStream from '@hyperswarm/secret-stream' */
 /** @import { OpenedNoiseStream } from './lib/noise-secret-stream-helpers.js' */
 
 // Unique identifier for the mapeo rpc protocol
@@ -329,7 +330,7 @@ export class LocalPeers extends TypedEmitter {
   /**
    * Connect to a peer over an existing NoiseSecretStream
    *
-   * @param {import('./types.js').NoiseStream<any>} stream a NoiseSecretStream from @hyperswarm/secret-stream
+   * @param {NoiseStream<any>} stream
    * @returns {import('./types.js').ReplicationStream}
    */
   connect(stream) {

package/src/logger.js

@@ -5,6 +5,32 @@ import util from 'util'
 
 const TRIM = 7
 
+const selectColorOriginal = createDebug.selectColor
+
+/**
+ * Selects a color for a debug namespace (warning: overrides private api).
+ * Rather than the default behaviour of creating a unique color for each
+ * namespace, we only hash the last 7 characters of the namespace, which is the
+ * deviceId. This results in debug output where each deviceId has a different
+ * colour, which is more useful for debugging.
+ * @param {string} namespace The namespace string for the debug instance to be colored
+ * @return {number|string} An ANSI color code for the given namespace
+ */
+createDebug.selectColor = function (namespace) {
+  if (!namespace.startsWith('mapeo:')) {
+    return selectColorOriginal(namespace)
+  }
+  let hash = 0
+
+  for (let i = namespace.length - TRIM - 1; i < namespace.length; i++) {
+    hash = (hash << 5) - hash + namespace.charCodeAt(i)
+    hash |= 0 // Convert to 32bit integer
+  }
+
+  // @ts-expect-error - private debug api
+  return createDebug.colors[Math.abs(hash) % createDebug.colors.length]
+}
+
 createDebug.formatters.h = function (v) {
   if (!Buffer.isBuffer(v)) return '[undefined]'
   return v.toString('hex').slice(0, TRIM)
@@ -56,13 +82,14 @@ export class Logger {
   /**
    * @param {string} ns
    * @param {Logger} [logger]
+   * @param {{ prefix?: string }} [opts]
    */
-  static create(ns, logger) {
-    if (logger) return logger.extend(ns)
+  static create(ns, logger, opts) {
+    if (logger) return logger.extend(ns, opts)
     const i = (counts.get(ns) || 0) + 1
     counts.set(ns, i)
     const deviceId = String(i).padStart(TRIM, '0')
-    return new Logger({ deviceId, ns })
+    return new Logger({ deviceId, ns, prefix: opts?.prefix })
   }
 
   /**
@@ -70,30 +97,39 @@ export class Logger {
    * @param {string} opts.deviceId
    * @param {createDebug.Debugger} [opts.baseLogger]
    * @param {string} [opts.ns]
+   * @param {string} [opts.prefix] optional prefix to add to the start of each log message. Used to add context e.g. the core ID that is syncing. Use this as an alternative to the debug namespace.
    */
-  constructor({ deviceId, baseLogger, ns }) {
+  constructor({ deviceId, baseLogger, ns, prefix }) {
     this.deviceId = deviceId
     this.#baseLogger = baseLogger || createDebug('mapeo' + (ns ? `:${ns}` : ''))
-    this.#log = this.#baseLogger.extend(this.deviceId.slice(0, TRIM))
-  }
-  get enabled() {
-    return this.#log.enabled
+    const log = this.#baseLogger.extend(this.deviceId.slice(0, TRIM))
+    if (prefix) {
+      this.#log = Object.assign(
+        /**
+         * @param {any} formatter
+         * @param  {...any} args
+         */
+        (formatter, ...args) => {
+          return log.apply(null, [`${prefix}${formatter}`, ...args])
+        },
+        log
+      )
+    } else {
+      this.#log = log
+    }
   }
-
-  /**
-   * @param  {Parameters<createDebug.Debugger>} args
-   */
-  log = (...args) => {
-    this.#log.apply(this, args)
+  get log() {
+    return this.#log
   }
   /**
-   *
    * @param {string} ns
+   * @param {{ prefix?: string }} [opts]
    */
-  extend(ns) {
+  extend(ns, { prefix } = {}) {
     return new Logger({
       deviceId: this.deviceId,
       baseLogger: this.#baseLogger.extend(ns),
+      prefix,
     })
   }
 }

package/src/mapeo-manager.js

@@ -8,6 +8,7 @@ import { migrate } from 'drizzle-orm/better-sqlite3/migrator'
 import Hypercore from 'hypercore'
 import { TypedEmitter } from 'tiny-typed-emitter'
 import pTimeout from 'p-timeout'
+import { createRequire } from 'module'
 
 import { IndexWriter } from './index-writer/index.js'
 import {
@@ -33,9 +34,11 @@ import {
   projectKeyToPublicId,
 } from './utils.js'
 import { openedNoiseSecretStream } from './lib/noise-secret-stream-helpers.js'
+import { omit } from './lib/omit.js'
 import { RandomAccessFilePool } from './core-manager/random-access-file-pool.js'
 import BlobServerPlugin from './fastify-plugins/blobs.js'
 import IconServerPlugin from './fastify-plugins/icons.js'
+import { plugin as MapServerPlugin } from './fastify-plugins/maps.js'
 import { getFastifyServerAddress } from './fastify-plugins/utils.js'
 import { LocalPeers } from './local-peers.js'
 import { InviteApi } from './invite-api.js'
@@ -52,7 +55,6 @@ import {
 /** @import { SetNonNullable } from 'type-fest' */
 /** @import { CoreStorage, Namespace } from './types.js' */
 /** @import { DeviceInfoParam } from './schema/client.js' */
-/** @import { OpenedNoiseStream } from './lib/noise-secret-stream-helpers.js' */
 
 /** @typedef {SetNonNullable<ProjectKeys, 'encryptionKeys'>} ValidatedProjectKeys */
 
@@ -67,6 +69,15 @@ const MAX_FILE_DESCRIPTORS = 768
 // Prefix names for routes registered with http server
 const BLOBS_PREFIX = 'blobs'
 const ICONS_PREFIX = 'icons'
+const MAPS_PREFIX = 'maps'
+
+const require = createRequire(import.meta.url)
+export const DEFAULT_FALLBACK_MAP_FILE_PATH = require.resolve(
+  '@comapeo/fallback-smp'
+)
+
+export const DEFAULT_ONLINE_STYLE_URL =
+  'https://demotiles.maplibre.org/style.json'
 
 export const kRPC = Symbol('rpc')
 export const kManagerReplicate = Symbol('replicate manager')
@@ -113,6 +124,9 @@ export class MapeoManager extends TypedEmitter {
    * @param {string | CoreStorage} opts.coreStorage Folder for hypercore storage or a function that returns a RandomAccessStorage instance
    * @param {import('fastify').FastifyInstance} opts.fastify Fastify server instance
    * @param {String} [opts.defaultConfigPath]
+   * @param {string} [opts.customMapPath] File path to a locally stored Styled Map Package (SMP).
+   * @param {string} [opts.fallbackMapPath] File path to a locally stored Styled Map Package (SMP)
+   * @param {string} [opts.defaultOnlineStyleUrl] URL for an online-hosted StyleJSON asset.
    */
   constructor({
     rootKey,
@@ -122,6 +136,9 @@ export class MapeoManager extends TypedEmitter {
     coreStorage,
     fastify,
     defaultConfigPath,
+    customMapPath,
+    fallbackMapPath = DEFAULT_FALLBACK_MAP_FILE_PATH,
+    defaultOnlineStyleUrl = DEFAULT_ONLINE_STYLE_URL,
   }) {
     super()
     this.#keyManager = new KeyManager(rootKey)
@@ -190,6 +207,12 @@ export class MapeoManager extends TypedEmitter {
       prefix: ICONS_PREFIX,
       getProject: this.getProject.bind(this),
     })
+    this.#fastify.register(MapServerPlugin, {
+      prefix: MAPS_PREFIX,
+      customMapPath,
+      defaultOnlineStyleUrl,
+      fallbackMapPath,
+    })
 
     this.#localDiscovery = new LocalDiscovery({
       identityKeypair: this.#keyManager.getIdentityKeypair(),
@@ -242,6 +265,10 @@ export class MapeoManager extends TypedEmitter {
         prefix = ICONS_PREFIX
         break
       }
+      case 'maps': {
+        prefix = MAPS_PREFIX
+        break
+      }
       default: {
         throw new Error(`Unsupported media type ${mediaType}`)
       }
@@ -416,9 +443,10 @@ export class MapeoManager extends TypedEmitter {
 
     // 7. Load config, if relevant
     // TODO: see how to expose warnings to frontend
-    /* eslint-disable no-unused-vars */
+    // eslint-disable-next-line no-unused-vars
     let warnings
     if (configPath) {
+      // eslint-disable-next-line no-unused-vars
       warnings = await project.importConfig({ configPath })
     }
 
@@ -675,6 +703,14 @@ export class MapeoManager extends TypedEmitter {
       isConfigSynced
     ) {
       return true
+    } else {
+      this.#l.log(
+        'Pending initial sync: role %s, projectSettings %o, auth %o, config %o',
+        isRoleSynced,
+        isProjectSettingsSynced,
+        isAuthSynced,
+        isConfigSynced
+      )
     }
     return new Promise((resolve, reject) => {
       /** @param {import('./sync/sync-state.js').State} syncState */
@@ -866,7 +902,7 @@ export class MapeoManager extends TypedEmitter {
 
   async getMapStyleJsonUrl() {
     await pTimeout(this.#fastify.ready(), { milliseconds: 1000 })
-    return this.#fastify.mapeoMaps.getStyleJsonUrl()
+    return (await this.#getMediaBaseUrl('maps')) + '/style.json'
   }
 }
 
@@ -883,15 +919,8 @@ export class MapeoManager extends TypedEmitter {
  * @returns {PublicPeerInfo[]}
  */
 function omitPeerProtomux(peers) {
-  return peers.map(
-    ({
-      // @ts-ignore
-      // eslint-disable-next-line no-unused-vars
-      protomux,
-      ...publicPeerInfo
-    }) => {
-      return publicPeerInfo
-    }
+  return peers.map((peer) =>
+    'protomux' in peer ? omit(peer, ['protomux']) : peer
   )
 }
 

package/src/mapeo-project.js

@@ -43,6 +43,7 @@ import {
   projectKeyToPublicId,
   valueOf,
 } from './utils.js'
+import { omit } from './lib/omit.js'
 import { MemberApi } from './member-api.js'
 import { SyncApi, kHandleDiscoveryKey } from './sync/sync-api.js'
 import { Logger } from './logger.js'
@@ -345,7 +346,6 @@ export class MapeoProject extends TypedEmitter {
 
     this.#translationApi = new TranslationApi({
       dataType: this.#dataTypes.translation,
-      table: translationTable,
     })
 
     ///////// 4. Replicate local peers automatically
@@ -553,7 +553,6 @@ export class MapeoProject extends TypedEmitter {
         await this.#dataTypes.projectSettings.getByDocId(this.#projectId)
       )
     } catch (e) {
-      this.#l.log('No project settings')
       return /** @type {EditableProjectSettings} */ (EMPTY_PROJECT_SETTINGS)
     }
   }
@@ -889,9 +888,7 @@ export class MapeoProject extends TypedEmitter {
  * @returns {EditableProjectSettings}
  */
 function extractEditableProjectSettings(projectDoc) {
-  // eslint-disable-next-line no-unused-vars
-  const { schemaName, ...result } = valueOf(projectDoc)
-  return result
+  return omit(valueOf(projectDoc), ['schemaName'])
 }
 
 /**

package/src/member-api.js

@@ -9,6 +9,7 @@ import {
   projectKeyToId,
   projectKeyToProjectInviteId,
 } from './utils.js'
+import { keyBy } from './lib/key-by.js'
 import { abortSignalAny } from './lib/ponyfills.js'
 import timingSafeEqual from './lib/timing-safe-equal.js'
 import { ROLES, isRoleIdForNewInvite } from './roles.js'
@@ -89,6 +90,7 @@ export class MemberApi extends TypedEmitter {
    * @param {import('./roles.js').RoleIdForNewInvite} opts.roleId
    * @param {string} [opts.roleName]
    * @param {string} [opts.roleDescription]
+   * @param {Buffer} [opts.__testOnlyInviteId] Hard-code the invite ID. Only for tests.
    * @returns {Promise<(
    *   typeof InviteResponse_Decision.ACCEPT |
    *   typeof InviteResponse_Decision.REJECT |
@@ -97,7 +99,12 @@ export class MemberApi extends TypedEmitter {
    */
   async invite(
     deviceId,
-    { roleId, roleName = ROLES[roleId]?.name, roleDescription }
+    {
+      roleId,
+      roleName = ROLES[roleId]?.name,
+      roleDescription,
+      __testOnlyInviteId,
+    }
   ) {
     assert(isRoleIdForNewInvite(roleId), 'Invalid role ID for new invite')
     assert(
@@ -120,7 +127,7 @@ export class MemberApi extends TypedEmitter {
 
       abortSignal.throwIfAborted()
 
-      const inviteId = crypto.randomBytes(32)
+      const inviteId = __testOnlyInviteId || crypto.randomBytes(32)
       const projectId = projectKeyToId(this.#projectKey)
       const projectInviteId = projectKeyToProjectInviteId(this.#projectKey)
       const project = await this.#dataTypes.project.getByDocId(projectId)
@@ -279,6 +286,8 @@ export class MemberApi extends TypedEmitter {
       this.#dataTypes.deviceInfo.getMany(),
     ])
 
+    const deviceInfoByConfigCoreId = keyBy(allDeviceInfo, ({ docId }) => docId)
+
     return Promise.all(
       [...allRoles.entries()].map(async ([deviceId, role]) => {
         /** @type {MemberInfo} */
@@ -290,9 +299,7 @@ export class MemberApi extends TypedEmitter {
             'config'
           )
 
-          const deviceInfo = allDeviceInfo.find(
-            ({ docId }) => docId === configCoreId
-          )
+          const deviceInfo = deviceInfoByConfigCoreId.get(configCoreId)
 
           memberInfo.name = deviceInfo?.name
           memberInfo.deviceType = deviceInfo?.deviceType

package/src/sync/core-sync-state.js

@@ -2,6 +2,7 @@ import { keyToId } from '../utils.js'
 import RemoteBitfield, {
   BITS_PER_PAGE,
 } from '../core-manager/remote-bitfield.js'
+import { Logger } from '../logger.js'
 /** @import { HypercorePeer, HypercoreRemoteBitfield, Namespace } from '../types.js' */
 
 /**
@@ -22,7 +23,7 @@ import RemoteBitfield, {
  * @typedef {object} LocalCoreState
  * @property {number} have blocks we have
  * @property {number} want unique blocks we want from any other peer
- * @property {number} wanted blocks we want from this peer
+ * @property {number} wanted unique blocks any other peer wants from us
  */
 /**
  * @typedef {object} PeerNamespaceState
@@ -71,14 +72,18 @@ export class CoreSyncState {
   #update
   #peerSyncControllers
   #namespace
+  #l
 
   /**
    * @param {object} opts
    * @param {() => void} opts.onUpdate Called when a state update is available (via getState())
    * @param {Map<string, import('./peer-sync-controller.js').PeerSyncController>} opts.peerSyncControllers
    * @param {Namespace} opts.namespace
+   * @param {Logger} [opts.logger]
    */
-  constructor({ onUpdate, peerSyncControllers, namespace }) {
+  constructor({ onUpdate, peerSyncControllers, namespace, logger }) {
+    // The logger parameter is already namespaced by NamespaceSyncState
+    this.#l = logger || Logger.create('css')
     this.#peerSyncControllers = peerSyncControllers
     this.#namespace = namespace
     // Called whenever the state changes, so we clear the cache because next
@@ -150,12 +155,24 @@ export class CoreSyncState {
    * @param {Uint32Array} bitfield
    */
   insertPreHaves(peerId, start, bitfield) {
-    const peerState = this.#getPeerState(peerId)
+    const peerState = this.#getOrCreatePeerState(peerId)
     peerState.insertPreHaves(start, bitfield)
+    const previousLength = Math.max(
+      this.#preHavesLength,
+      this.#core?.length || 0
+    )
     this.#preHavesLength = Math.max(
       this.#preHavesLength,
       peerState.preHavesBitfield.lastSet(start + bitfield.length * 32) + 1
     )
+    if (this.#preHavesLength > previousLength) {
+      this.#l.log(
+        'Updated peer %S pre-haves length from %d to %d',
+        peerId,
+        previousLength,
+        this.#preHavesLength
+      )
+    }
     this.#update()
   }
 
@@ -168,7 +185,7 @@ export class CoreSyncState {
    * @param {Array<{ start: number, length: number }>} ranges
    */
   setPeerWants(peerId, ranges) {
-    const peerState = this.#getPeerState(peerId)
+    const peerState = this.#getOrCreatePeerState(peerId)
     for (const { start, length } of ranges) {
       peerState.setWantRange({ start, length })
     }
@@ -187,7 +204,17 @@ export class CoreSyncState {
   /**
    * @param {PeerId} peerId
    */
-  #getPeerState(peerId) {
+  disconnectPeer(peerId) {
+    const wasRemoved = this.#remoteStates.delete(peerId)
+    if (wasRemoved) {
+      this.#update()
+    }
+  }
+
+  /**
+   * @param {PeerId} peerId
+   */
+  #getOrCreatePeerState(peerId) {
     let peerState = this.#remoteStates.get(peerId)
     if (!peerState) {
       peerState = new PeerState()
@@ -207,7 +234,7 @@ export class CoreSyncState {
     const peerId = keyToId(peer.remotePublicKey)
 
     // Update state to ensure this peer is in the state correctly
-    const peerState = this.#getPeerState(peerId)
+    const peerState = this.#getOrCreatePeerState(peerId)
     peerState.status = 'starting'
 
     this.#core?.update({ wait: true }).then(() => {
@@ -243,7 +270,8 @@ export class CoreSyncState {
    */
   #onPeerRemove = (peer) => {
     const peerId = keyToId(peer.remotePublicKey)
-    const peerState = this.#getPeerState(peerId)
+    const peerState = this.#remoteStates.get(peerId)
+    if (!peerState) return
     peerState.status = 'stopped'
     this.#update()
   }