Merge branch 'main' into feat/initial-download

* main:
  chore: fix Brittle type definitions (#383)
  feat: dbMigrationPathOpt - add db migration path to `MapeoProject` and `MapeoManager` (#384)
  [OPTIC-RELEASE-AUTOMATION] release/v9.0.0-alpha.2 (#382)

Author: gmaclennan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapeo/core",
-  "version": "9.0.0-alpha.1",
+  "version": "9.0.0-alpha.2",
   "description": "Offline p2p mapping library",
   "main": "src/index.js",
   "types": "dist/index.d.ts",

src/mapeo-manager.js

@@ -69,6 +69,8 @@ export class MapeoManager extends TypedEmitter {
   /** @type {import('./types.js').CoreStorage} */
   #coreStorage
   #dbFolder
+  /** @type {string} */
+  #projectMigrationsFolder
   #deviceId
   #localPeers
   #invite
@@ -81,25 +83,33 @@ export class MapeoManager extends TypedEmitter {
    * @param {Object} opts
    * @param {Buffer} opts.rootKey 16-bytes of random data that uniquely identify the device, used to derive a 32-byte master key, which is used to derive all the keypairs used for Mapeo
    * @param {string} opts.dbFolder Folder for sqlite Dbs. Folder must exist. Use ':memory:' to store everything in-memory
+   * @param {string} opts.projectMigrationsFolder path for drizzle migrations folder for project database
+   * @param {string} opts.clientMigrationsFolder path for drizzle migrations folder for client database
    * @param {string | import('./types.js').CoreStorage} opts.coreStorage Folder for hypercore storage or a function that returns a RandomAccessStorage instance
    * @param {{ port?: number, logger: import('fastify').FastifyServerOptions['logger'] }} [opts.mediaServerOpts]
    */
-  constructor({ rootKey, dbFolder, coreStorage, mediaServerOpts }) {
+  constructor({
+    rootKey,
+    dbFolder,
+    projectMigrationsFolder,
+    clientMigrationsFolder,
+    coreStorage,
+    mediaServerOpts,
+  }) {
     super()
     this.#keyManager = new KeyManager(rootKey)
     this.#deviceId = getDeviceId(this.#keyManager)
     const logger = (this.#loggerBase = new Logger({ deviceId: this.#deviceId }))
     this.#l = Logger.create('manager', logger)
     this.#dbFolder = dbFolder
+    this.#projectMigrationsFolder = projectMigrationsFolder
     const sqlite = new Database(
       dbFolder === ':memory:'
         ? ':memory:'
         : path.join(dbFolder, CLIENT_SQLITE_FILE_NAME)
     )
     this.#db = drizzle(sqlite)
-    migrate(this.#db, {
-      migrationsFolder: new URL('../drizzle/client', import.meta.url).pathname,
-    })
+    migrate(this.#db, { migrationsFolder: clientMigrationsFolder })
 
     this.#localPeers = new LocalPeers({ logger })
     this.#localPeers.on('peers', (peers) => {
@@ -371,6 +381,7 @@ export class MapeoManager extends TypedEmitter {
     return new MapeoProject({
       ...this.#projectStorage(projectId),
       ...projectKeys,
+      projectMigrationsFolder: this.#projectMigrationsFolder,
       keyManager: this.#keyManager,
       sharedDb: this.#db,
       sharedIndexWriter: this.#projectSettingsIndexWriter,

src/mapeo-project.js

@@ -72,6 +72,7 @@ export class MapeoProject {
   /**
    * @param {Object} opts
    * @param {string} opts.dbPath Path to store project sqlite db. Use `:memory:` for memory storage
+   * @param {string} opts.projectMigrationsFolder path for drizzle migration folder for project
    * @param {import('@mapeo/crypto').KeyManager} opts.keyManager mapeo/crypto KeyManager instance
    * @param {Buffer} opts.projectKey 32-byte public key of the project creator core
    * @param {Buffer} [opts.projectSecretKey] 32-byte secret key of the project creator core
@@ -86,6 +87,7 @@ export class MapeoProject {
    */
   constructor({
     dbPath,
+    projectMigrationsFolder,
     sharedDb,
     sharedIndexWriter,
     coreStorage,
@@ -104,9 +106,7 @@ export class MapeoProject {
     ///////// 1. Setup database
     const sqlite = new Database(dbPath)
     const db = drizzle(sqlite)
-    migrate(db, {
-      migrationsFolder: new URL('../drizzle/project', import.meta.url).pathname,
-    })
+    migrate(db, { migrationsFolder: projectMigrationsFolder })
 
     ///////// 2. Setup random-access-storage functions
 

test-e2e/capabilities.js

@@ -12,10 +12,17 @@ import {
 } from '../src/capabilities.js'
 import { randomBytes } from 'crypto'
 
+const projectMigrationsFolder = new URL('../drizzle/project', import.meta.url)
+  .pathname
+const clientMigrationsFolder = new URL('../drizzle/client', import.meta.url)
+  .pathname
+
 test('Creator capabilities and role assignment', async (t) => {
   const rootKey = KeyManager.generateRootKey()
   const manager = new MapeoManager({
     rootKey,
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })
@@ -44,6 +51,8 @@ test('Creator capabilities and role assignment', async (t) => {
 test('New device without capabilities', async (t) => {
   const rootKey = KeyManager.generateRootKey()
   const manager = new MapeoManager({
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     rootKey,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
@@ -84,6 +93,8 @@ test('getMany() - on invitor device', async (t) => {
   const creatorDeviceId = km.getIdentityKeypair().publicKey.toString('hex')
   const manager = new MapeoManager({
     rootKey,
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })
@@ -121,6 +132,8 @@ test('getMany() - on newly invited device before sync', async (t) => {
   const km = new KeyManager(rootKey)
   const deviceId = km.getIdentityKeypair().publicKey.toString('hex')
   const manager = new MapeoManager({
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     rootKey,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),

test-e2e/core-ownership.js

@@ -11,6 +11,10 @@ test('CoreOwnership', async (t) => {
   const km = new KeyManager(rootKey)
   const manager = new MapeoManager({
     rootKey,
+    projectMigrationsFolder: new URL('../drizzle/project', import.meta.url)
+      .pathname,
+    clientMigrationsFolder: new URL('../drizzle/client', import.meta.url)
+      .pathname,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })

test-e2e/device-info.js

@@ -5,10 +5,17 @@ import RAM from 'random-access-memory'
 
 import { MapeoManager } from '../src/mapeo-manager.js'
 
+const projectMigrationsFolder = new URL('../drizzle/project', import.meta.url)
+  .pathname
+const clientMigrationsFolder = new URL('../drizzle/client', import.meta.url)
+  .pathname
+
 test('write and read deviceInfo', async (t) => {
   const rootKey = KeyManager.generateRootKey()
   const manager = new MapeoManager({
     rootKey,
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })
@@ -27,6 +34,8 @@ test('device info written to projects', (t) => {
   t.test('when creating project', async (st) => {
     const manager = new MapeoManager({
       rootKey: KeyManager.generateRootKey(),
+      projectMigrationsFolder,
+      clientMigrationsFolder,
       dbFolder: ':memory:',
       coreStorage: () => new RAM(),
     })
@@ -47,6 +56,8 @@ test('device info written to projects', (t) => {
   t.test('when adding project', async (st) => {
     const manager = new MapeoManager({
       rootKey: KeyManager.generateRootKey(),
+      projectMigrationsFolder,
+      clientMigrationsFolder,
       dbFolder: ':memory:',
       coreStorage: () => new RAM(),
     })
@@ -73,6 +84,8 @@ test('device info written to projects', (t) => {
   t.test('after updating global device info', async (st) => {
     const manager = new MapeoManager({
       rootKey: KeyManager.generateRootKey(),
+      projectMigrationsFolder,
+      clientMigrationsFolder,
       dbFolder: ':memory:',
       coreStorage: () => new RAM(),
     })

test-e2e/manager-basic.js

@@ -4,9 +4,16 @@ import { KeyManager } from '@mapeo/crypto'
 import RAM from 'random-access-memory'
 import { MapeoManager } from '../src/mapeo-manager.js'
 
+const projectMigrationsFolder = new URL('../drizzle/project', import.meta.url)
+  .pathname
+const clientMigrationsFolder = new URL('../drizzle/client', import.meta.url)
+  .pathname
+
 test('Managing created projects', async (t) => {
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })
@@ -109,6 +116,8 @@ test('Managing created projects', async (t) => {
 test('Managing added projects', async (t) => {
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })
@@ -181,6 +190,8 @@ test('Managing added projects', async (t) => {
 test('Managing both created and added projects', async (t) => {
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })
@@ -222,6 +233,8 @@ test('Managing both created and added projects', async (t) => {
 test('Manager cannot add project that already exists', async (t) => {
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })
@@ -249,6 +262,8 @@ test('Consistent storage folders', async (t) => {
   const storageNames = []
   const manager = new MapeoManager({
     rootKey: randomBytesSeed('root_key').subarray(0, 16),
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: (name) => {
       storageNames.push(name)
@@ -275,6 +290,8 @@ test('Consistent storage folders', async (t) => {
 test('manager.start() and manager.stop()', async (t) => {
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })

test-e2e/media-server.js

@@ -14,12 +14,19 @@ const BLOB_FIXTURES_DIR = fileURLToPath(
   new URL('../tests/fixtures/blob-api/', import.meta.url)
 )
 
+const projectMigrationsFolder = new URL('../drizzle/project', import.meta.url)
+  .pathname
+const clientMigrationsFolder = new URL('../drizzle/client', import.meta.url)
+  .pathname
+
 test('retrieving blobs using url', async (t) => {
   const clock = FakeTimers.install({ shouldAdvanceTime: true })
   t.teardown(() => clock.uninstall())
 
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })
@@ -111,6 +118,8 @@ test('retrieving icons using url', async (t) => {
 
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder,
+    clientMigrationsFolder,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })

test-e2e/project-crud.js

@@ -67,6 +67,10 @@ function getUpdateFixture(value) {
 test('CRUD operations', async (t) => {
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder: new URL('../drizzle/project', import.meta.url)
+      .pathname,
+    clientMigrationsFolder: new URL('../drizzle/client', import.meta.url)
+      .pathname,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })

test-e2e/project-settings.js

@@ -8,6 +8,10 @@ import RAM from 'random-access-memory'
 test('Project settings create, read, and update operations', async (t) => {
   const manager = new MapeoManager({
     rootKey: KeyManager.generateRootKey(),
+    projectMigrationsFolder: new URL('../drizzle/project', import.meta.url)
+      .pathname,
+    clientMigrationsFolder: new URL('../drizzle/client', import.meta.url)
+      .pathname,
     dbFolder: ':memory:',
     coreStorage: () => new RAM(),
   })