@comapeo/core 1.0.1 → 2.0.0

package/dist/utils.d.ts

@@ -1,22 +1,9 @@
-/**
- * @param {String|Buffer} id
- * @returns {Buffer | Uint8Array}
- */
-export function idToKey(id: string | Buffer): Buffer | Uint8Array;
 /**
  *
  * @param {Buffer|String} key
  * @returns {String}
  */
 export function keyToId(key: Buffer | string): string;
-/**
- * @param {String} version
- * @returns {{coreId: String, blockIndex: Number}}
- */
-export function parseVersion(version: string): {
-    coreId: string;
-    blockIndex: number;
-};
 /**
  * @returns {void}
  */

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH,4BAHW,SAAO,MAAM,GACX,MAAM,GAAG,UAAU,CAQ/B;AAED;;;;GAIG;AACH,6BAHW,MAAM,SAAO,UASvB;AAED;;;GAGG;AACH,+CAFa;IAAC,MAAM,SAAS;IAAC,UAAU,SAAQ;CAAC,CAQhD;AAUD;;GAEG;AACH,wBAFa,IAAI,CAEQ;AAEzB;;;;GAIG;AACH,kCAJW,OAAO,WACP,MAAM,GACJ,QAAQ,SAAS,CAI7B;AAED;;;;;;;;;;;;;GAaG;AACH,uBATa,CAAC,OACH,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAUd,OAAO,KACL,KAAK,IAAI,CAAC,CAGxB;AAED;;;;GAIG;AACH,0BAJa,CAAC,SACH,SAAS,GAAG,CAAC,GACX,KAAK,IAAI,CAAC,CAItB;AAED;;;;;;;GAOG;AAEH,0BALkB,CAAC,SAAN,EAAI,OACN,CAAC,GACC,OAAO,YAAY,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAUtD;AAED;;;;GAIG;AACH,wBAJyE,CAAC,SAA5D,OAAO,iBAAiB,EAAE,QAAQ,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CAAG,OAC7D,CAAC,GACC,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,WAAW,GAAG,mBAAmB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAAC,CAiB5H;AAED;;;;GAIG;AACH,2CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;;GAIG;AACH,iDAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;;GAIG;AACH,wDAHW,QAAQ,CAAC,MAAM,CAAC,GACd,MAAM,CAMlB;AAED;;;GAGG;AACH,4CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,wCAHW,2CAAkC,GAChC,MAAM,CAIlB;AAED;;;;;;;2DAO2D;AAC3D,0BALsB,CAAC,SAAV,MAAQ,EACF,CAAC,wBACT,aAAa,CAAC,CAAC,CAAC,SAChB,CAAC,GACC,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAOtD;AAED;;;;GAIG;AACH,gCAHW,MAAM,UAQhB;AApKD;IACE,2BAA2B;IAC3B,mBADY,KAAK,EAIhB;CACF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":"AAOA;;;;GAIG;AACH,6BAHW,MAAM,SAAO,UASvB;AAUD;;GAEG;AACH,wBAFa,IAAI,CAEQ;AAEzB;;;;GAIG;AACH,kCAJW,OAAO,WACP,MAAM,GACJ,QAAQ,SAAS,CAI7B;AAED;;;;;;;;;;;;;GAaG;AACH,uBATa,CAAC,OACH,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAUd,OAAO,KACL,KAAK,IAAI,CAAC,CAGxB;AAED;;;;GAIG;AACH,0BAJa,CAAC,SACH,SAAS,GAAG,CAAC,GACX,KAAK,IAAI,CAAC,CAItB;AAED;;;;;;;GAOG;AAEH,0BALkB,CAAC,SAAN,EAAI,OACN,CAAC,GACC,OAAO,YAAY,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAUtD;AAED;;;;GAIG;AACH,wBAJyE,CAAC,SAA5D,OAAO,iBAAiB,EAAE,QAAQ,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CAAG,OAC7D,CAAC,GACC,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,WAAW,GAAG,mBAAmB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAAC,CAiB5H;AAED;;;;GAIG;AACH,2CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;;GAIG;AACH,iDAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;;GAIG;AACH,wDAHW,QAAQ,CAAC,MAAM,CAAC,GACd,MAAM,CAMlB;AAED;;;GAGG;AACH,4CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,wCAHW,2CAAkC,GAChC,MAAM,CAIlB;AAED;;;;;;;2DAO2D;AAC3D,0BALsB,CAAC,SAAV,MAAQ,EACF,CAAC,wBACT,aAAa,CAAC,CAAC,CAAC,SAChB,CAAC,GACC,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAOtD;AAED;;;;GAIG;AACH,gCAHW,MAAM,UAQhB;AApKD;IACE,2BAA2B;IAC3B,mBADY,KAAK,EAIhB;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comapeo/core",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "Offline p2p mapping library",
   "main": "src/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,7 @@
     "test": "npm-run-all lint test:prettier build:types type test:buildConfigs test:unit test:e2e test:types",
     "test:prettier": "prettier --check .",
     "test:buildConfigs": "node scripts/build-config-fixtures.js",
-    "test:unit": "node --test tests/*.js tests/**/*.js",
+    "test:unit": "node --test",
     "test:e2e": "node --test test-e2e/*.js test-e2e/**/*.js",
     "test:types": "tsc -p test-types/tsconfig.json",
     "build:types": "tsc -p tsconfig.npm.json && cpy 'src/**/*.d.ts' dist",
@@ -118,7 +118,7 @@
     "@types/json-schema": "^7.0.11",
     "@types/json-stable-stringify": "^1.0.36",
     "@types/nanobench": "^3.0.0",
-    "@types/node": "^18.19.33",
+    "@types/node": "^18.19.54",
     "@types/sinonjs__fake-timers": "^8.1.2",
     "@types/streamx": "^2.9.5",
     "@types/sub-encoder": "^2.1.0",
@@ -126,7 +126,7 @@
     "@types/varint": "^6.0.1",
     "@types/yauzl-promise": "^4.0.0",
     "@types/yazl": "^2.4.5",
-    "bitfield": "^4.1.0",
+    "bitfield": "^4.2.0",
     "cpy": "^10.1.0",
     "cpy-cli": "^5.0.0",
     "drizzle-kit": "^0.20.14",
@@ -142,22 +142,22 @@
     "random-access-file": "^4.0.7",
     "random-access-memory": "^6.2.1",
     "rimraf": "^5.0.5",
+    "supports-color": "^9.4.0",
     "tempy": "^3.1.0",
     "ts-proto": "^1.156.7",
-    "typedoc": "^0.26.6",
-    "typedoc-plugin-markdown": "^4.2.5",
+    "typedoc": "^0.26.7",
+    "typedoc-plugin-markdown": "^4.2.7",
     "typedoc-plugin-missing-exports": "^3.0.0",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.2",
     "yazl": "^2.5.1"
   },
   "dependencies": {
+    "@comapeo/fallback-smp": "^1.0.0",
     "@comapeo/schema": "1.0.0",
     "@digidem/types": "^2.3.0",
-    "@electron/asar": "^3.2.8",
     "@fastify/error": "^3.4.1",
-    "@fastify/static": "^7.0.3",
-    "@fastify/type-provider-typebox": "^4.0.0",
-    "@hyperswarm/secret-stream": "^6.1.2",
+    "@fastify/type-provider-typebox": "^4.1.0",
+    "@hyperswarm/secret-stream": "^6.6.3",
     "@mapeo/crypto": "1.0.0-alpha.10",
     "@mapeo/sqlite-indexer": "1.0.0-alpha.9",
     "@sinclair/typebox": "^0.29.6",
@@ -191,6 +191,7 @@
     "sodium-universal": "^4.0.0",
     "start-stop-state-machine": "^1.2.0",
     "streamx": "^2.19.0",
+    "styled-map-package": "^1.1.0",
     "sub-encoder": "^2.1.1",
     "throttle-debounce": "^5.0.0",
     "tiny-typed-emitter": "^2.1.0",

package/src/core-manager/index.js

@@ -33,8 +33,8 @@ export const kCoreManagerReplicate = Symbol('replicate core manager')
 export class CoreManager extends TypedEmitter {
   #corestore
   #coreIndex
-  /** @type {Core} */
-  #creatorCore
+  /** @type {CoreRecord} */
+  #creatorCoreRecord
   #projectKey
   #queries
   #encryptionKeys
@@ -128,12 +128,12 @@ export class CoreManager extends TypedEmitter {
       }
       const writer = this.#addCore(keyPair, namespace)
       if (namespace === 'auth' && projectSecretKey) {
-        this.#creatorCore = writer.core
+        this.#creatorCoreRecord = writer
       }
     }
 
     // For anyone other than the project creator, creatorCore is readonly
-    this.#creatorCore ??= this.#addCore({ publicKey: projectKey }, 'auth').core
+    this.#creatorCoreRecord ??= this.#addCore({ publicKey: projectKey }, 'auth')
 
     // Load persisted cores
     const rows = db.select().from(coresTable).all()
@@ -141,7 +141,7 @@ export class CoreManager extends TypedEmitter {
       this.#addCore({ publicKey }, namespace)
     }
 
-    this.#projectExtension = this.#creatorCore.registerExtension(
+    this.#projectExtension = this.creatorCore.registerExtension(
       'mapeo/project',
       {
         encoding: ProjectExtensionCodec,
@@ -151,14 +151,14 @@ export class CoreManager extends TypedEmitter {
       }
     )
 
-    this.#haveExtension = this.#creatorCore.registerExtension('mapeo/have', {
+    this.#haveExtension = this.creatorCore.registerExtension('mapeo/have', {
       encoding: HaveExtensionCodec,
       onmessage: (msg, peer) => {
         this.#handleHaveMessage(msg, peer)
       },
     })
 
-    this.#creatorCore.on('peer-add', (peer) => {
+    this.creatorCore.on('peer-add', (peer) => {
       this.#sendHaves(peer, this.#coreIndex).catch(() => {
         this.#l.log('Failed to send pre-haves to newly-connected peer')
       })
@@ -179,7 +179,11 @@ export class CoreManager extends TypedEmitter {
   }
 
   get creatorCore() {
-    return this.#creatorCore
+    return this.#creatorCoreRecord.core
+  }
+
+  get creatorCoreRecord() {
+    return this.#creatorCoreRecord
   }
 
   /**
@@ -255,7 +259,6 @@ export class CoreManager extends TypedEmitter {
    * @returns {CoreRecord}
    */
   addCore(key, namespace) {
-    this.#l.log('Adding remote core %k to %s', key, namespace)
     return this.#addCore({ publicKey: key }, namespace, true)
   }
 
@@ -298,7 +301,7 @@ export class CoreManager extends TypedEmitter {
 
     if (writer) {
       const sendHaves = debounce(WRITER_CORE_PREHAVES_DEBOUNCE_DELAY, () => {
-        for (const peer of this.#creatorCore.peers) {
+        for (const peer of this.creatorCore.peers) {
           this.#sendHaves(peer, [{ core, namespace }]).catch(() => {
             this.#l.log('Failed to send new pre-haves to other peers')
           })

package/src/datastore/README.md

@@ -10,7 +10,7 @@ The `DataStore` class is an API over a CoreManager namespace, responsible for re
 
 The `DataStore` class is used internally by the [`DataType`](../datatype/) class.
 
-An example of `DataStore` usage taken from the [datastore tests](../../tests/datastore.js):
+An example of `DataStore` usage taken from the [datastore tests](../../test/datastore.js):
 
 ```js
 const datastore = new DataStore({
@@ -43,4 +43,4 @@ TODO!
 
 ## Tests
 
-Tests for this module are in [tests/datastore.js](../../tests/datastore.js)
+Tests for this module are in [test/datastore.js](../../test/datastore.js)

package/src/datatype/README.md

@@ -30,4 +30,4 @@ TODO!
 
 ## Tests
 
-Tests for this module are in [tests/datatype.js](../../tests/datatype.js)
+Tests for this module are in [test/datatype.js](../../test/datatype.js)

package/src/fastify-controller.js

@@ -64,7 +64,13 @@ export class FastifyController {
 
   async #stopServer() {
     const { server } = this.#fastify
-    await promisify(server.close.bind(server))()
+
+    const closePromise = promisify(server.close.bind(server))()
+
+    // We call this after `server.close()` as recommended by the Node docs (see https://nodejs.org/docs/latest-v20.x/api/http.html#servercloseidleconnections)
+    server.closeIdleConnections()
+
+    await closePromise
   }
 
   /**

package/src/fastify-plugins/maps.js

@@ -0,0 +1,122 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { fetch } from 'undici'
+import { 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
+
+    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,
+      filepath: customMapPath,
+    })
+  }
+
+  fastify.register(SMPServerPlugin, {
+    prefix: FALLBACK_MAP_PREFIX,
+    filepath: opts.fallbackMapPath,
+  })
+
+  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/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 {
@@ -36,6 +37,7 @@ import { openedNoiseSecretStream } from './lib/noise-secret-stream-helpers.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 +54,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 +68,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 +123,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 +135,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 +206,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 +264,10 @@ export class MapeoManager extends TypedEmitter {
         prefix = ICONS_PREFIX
         break
       }
+      case 'maps': {
+        prefix = MAPS_PREFIX
+        break
+      }
       default: {
         throw new Error(`Unsupported media type ${mediaType}`)
       }
@@ -675,6 +701,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 +900,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'
   }
 }
 

package/src/mapeo-project.js

@@ -345,7 +345,6 @@ export class MapeoProject extends TypedEmitter {
 
     this.#translationApi = new TranslationApi({
       dataType: this.#dataTypes.translation,
-      table: translationTable,
     })
 
     ///////// 4. Replicate local peers automatically
@@ -553,7 +552,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)
     }
   }