test: cross-version sync with @comapeo/[email protected]

src/mapeo-manager.js

@@ -45,14 +45,14 @@ import { LocalPeers } from './local-peers.js'
 import { InviteApi } from './invite-api.js'
 import { LocalDiscovery } from './discovery/local-discovery.js'
 import { Roles } from './roles.js'
-import NoiseSecretStream from '@hyperswarm/secret-stream'
 import { Logger } from './logger.js'
 import {
   kSyncState,
   kRequestFullStop,
   kRescindFullStopRequest,
 } from './sync/sync-api.js'
 /** @import { ProjectSettingsValue as ProjectValue } from '@comapeo/schema' */
+/** @import NoiseSecretStream from '@hyperswarm/secret-stream' */
 /** @import { SetNonNullable } from 'type-fest' */
 /** @import { CoreStorage, Namespace } from './types.js' */
 /** @import { DeviceInfoParam } from './schema/client.js' */
@@ -80,9 +80,6 @@ export const DEFAULT_FALLBACK_MAP_FILE_PATH = require.resolve(
 export const DEFAULT_ONLINE_STYLE_URL =
   'https://demotiles.maplibre.org/style.json'
 
-export const kRPC = Symbol('rpc')
-export const kManagerReplicate = Symbol('replicate manager')
-
 /**
  * @typedef {Omit<import('./local-peers.js').PeerInfo, 'protomux'>} PublicPeerInfo
  */
@@ -222,33 +219,10 @@ export class MapeoManager extends TypedEmitter {
     this.#localDiscovery.on('connection', this.#replicate.bind(this))
   }
 
-  /**
-   * MapeoRPC instance, used for tests
-   */
-  get [kRPC]() {
-    return this.#localPeers
-  }
-
   get deviceId() {
     return this.#deviceId
   }
 
-  /**
-   * Create a Mapeo replication stream. This replication connects the Mapeo RPC
-   * channel and allows invites. All active projects will sync automatically to
-   * this replication stream. Only use for local (trusted) connections, because
-   * the RPC channel key is public. To sync a specific project without
-   * connecting RPC, use project[kProjectReplication].
-   *
-   * @param {boolean} isInitiator
-   */
-  [kManagerReplicate](isInitiator) {
-    const noiseStream = new NoiseSecretStream(isInitiator, undefined, {
-      keyPair: this.#keyManager.getIdentityKeypair(),
-    })
-    return this.#replicate(noiseStream)
-  }
-
   /**
    * @param {'blobs' | 'icons' | 'maps'} mediaType
    * @returns {Promise<string>}

src/mapeo-project.js

@@ -596,8 +596,7 @@ export class MapeoProject extends TypedEmitter {
   /**
    * Replicate a project to a @hyperswarm/secret-stream. Invites will not
    * function because the RPC channel is not connected for project replication,
-   * and only this project will replicate (to replicate multiple projects you
-   * need to replicate the manager instance via manager[kManagerReplicate])
+   * and only this project will replicate.
    *
    * @param {(
    *   boolean |

test-e2e/cross-version-sync.js

@@ -0,0 +1,79 @@
+import { valueOf } from '@comapeo/schema'
+import { generate } from '@mapeo/mock-data'
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import {
+  connectPeers,
+  createManager,
+  createOldManagerOnVersion2_0_1,
+  invite,
+  waitForPeers,
+} from './utils.js'
+
+test('syncing @comapeo/[email protected] with the current version', async (t) => {
+  const oldManager = await createOldManagerOnVersion2_0_1('old')
+  await oldManager.setDeviceInfo({ name: 'old', deviceType: 'mobile' })
+
+  const newManager = createManager('new', t)
+  await newManager.setDeviceInfo({ name: 'new', deviceType: 'desktop' })
+
+  const managers = [oldManager, newManager]
+
+  const disconnect = connectPeers(managers)
+  t.after(disconnect)
+  await waitForPeers(managers)
+
+  const [oldManagerPeers, newManagerPeers] = await Promise.all(
+    managers.map((manager) => manager.listLocalPeers())
+  )
+  assert.equal(oldManagerPeers.length, 1, 'old manager sees 1 peer')
+  assert.equal(newManagerPeers.length, 1, 'new manager sees 1 peer')
+  assert(
+    oldManagerPeers.some((p) => p.deviceId === newManager.deviceId),
+    'old manager sees new manager'
+  )
+  assert(
+    newManagerPeers.some((p) => p.deviceId === oldManager.deviceId),
+    'new manager sees old manager'
+  )
+
+  const projectId = await oldManager.createProject({ name: 'foo bar' })
+
+  await invite({
+    projectId,
+    invitor: oldManager,
+    invitees: [newManager],
+  })
+
+  const projects = await Promise.all(
+    managers.map((manager) => manager.getProject(projectId))
+  )
+  const [oldProject, newProject] = projects
+  assert.equal(
+    (await newProject.$getProjectSettings()).name,
+    'foo bar',
+    'new manager sees the project'
+  )
+
+  oldProject.$sync.start()
+  newProject.$sync.start()
+
+  const [oldObservation, newObservation] = await Promise.all(
+    projects.map((project) =>
+      project.observation.create(valueOf(generate('observation')[0]))
+    )
+  )
+
+  await Promise.all(
+    projects.map((project) => project.$sync.waitForSync('full'))
+  )
+
+  assert(
+    await oldProject.observation.getByDocId(newObservation.docId),
+    'old project gets observation from new project'
+  )
+  assert(
+    await newProject.observation.getByDocId(oldObservation.docId),
+    'new project gets observation from old project'
+  )
+})

test-e2e/device-info.js

@@ -151,7 +151,7 @@ test('device info written to projects', async (t) => {
 
 test('device info sent to peers', async (t) => {
   const managers = await createManagers(3, t)
-  const disconnectPeers = connectPeers(managers, { discovery: true })
+  const disconnectPeers = connectPeers(managers)
   t.after(disconnectPeers)
   await waitForPeers(managers, { waitForDeviceInfo: true })
 

test-e2e/local-peers.js

@@ -6,7 +6,7 @@ test('Local peers discovery each other and share device info', async (t) => {
   const mobileManagers = await createManagers(5, t, 'mobile')
   const desktopManagers = await createManagers(5, t, 'desktop')
   const managers = [...mobileManagers, ...desktopManagers]
-  const disconnectPeers = connectPeers(managers, { discovery: true })
+  const disconnectPeers = connectPeers(managers)
   t.after(disconnectPeers)
   await waitForPeers(managers, { waitForDeviceInfo: true })
   const deviceInfos = [...mobileManagers, ...desktopManagers].map((m) =>

test-e2e/migration.js

@@ -1,39 +1,25 @@
 import test from 'node:test'
 import { KeyManager } from '@mapeo/crypto'
-import { MapeoManager as MapeoManagerPreMigration } from '@comapeo/core2.0.1'
 import RAM from 'random-access-memory'
 import { MapeoManager } from '../src/mapeo-manager.js'
 import Fastify from 'fastify'
 import assert from 'node:assert/strict'
-import { fileURLToPath } from 'node:url'
 import fsPromises from 'node:fs/promises'
 import { temporaryDirectory } from 'tempy'
+import { createOldManagerOnVersion2_0_1 } from './utils.js'
 
 const projectMigrationsFolder = new URL('../drizzle/project', import.meta.url)
   .pathname
 const clientMigrationsFolder = new URL('../drizzle/client', import.meta.url)
   .pathname
 
 test('migration of localDeviceInfo table', async (t) => {
-  const comapeoCorePreMigrationUrl = await import.meta.resolve?.(
-    '@comapeo/core2.0.1'
-  )
-  assert(comapeoCorePreMigrationUrl, 'Could not resolve @comapeo/core2.0.1')
-  const clientMigrationsFolderPreMigration = fileURLToPath(
-    new URL('../drizzle/client', comapeoCorePreMigrationUrl)
-  )
-  const projectMigrationsFolderPreMigration = fileURLToPath(
-    new URL('../drizzle/project', comapeoCorePreMigrationUrl)
-  )
-
   const dbFolder = temporaryDirectory()
   const rootKey = KeyManager.generateRootKey()
   t.after(() => fsPromises.rm(dbFolder, { recursive: true }))
 
-  const managerPreMigration = new MapeoManagerPreMigration({
+  const managerPreMigration = await createOldManagerOnVersion2_0_1('seed', {
     rootKey,
-    projectMigrationsFolder: projectMigrationsFolderPreMigration,
-    clientMigrationsFolder: clientMigrationsFolderPreMigration,
     dbFolder,
     coreStorage: () => new RAM(),
     fastify: Fastify(),

test-e2e/sync-fuzz.js

@@ -85,7 +85,7 @@ test('sync fuzz tests', { concurrency: true, timeout: 2 ** 30 }, async (t) => {
         const managers = await createManagers(managerCount, t)
         const [invitor, ...invitees] = managers
 
-        const disconnect = connectPeers(managers, { discovery: false })
+        const disconnect = connectPeers(managers)
         t.after(disconnect)
 
         const projectId = await invitor.createProject({ name: 'Mapeo' })

test-e2e/sync.js

@@ -35,7 +35,7 @@ test('Create and sync data', { timeout: 100_000 }, async (t) => {
   const COUNT = 10
   const managers = await createManagers(COUNT, t)
   const [invitor, ...invitees] = managers
-  const disconnect = connectPeers(managers, { discovery: false })
+  const disconnect = connectPeers(managers)
   const projectId = await invitor.createProject({ name: 'Mapeo' })
   await invite({ invitor, invitees, projectId })
   await disconnect()
@@ -50,7 +50,7 @@ test('Create and sync data', { timeout: 100_000 }, async (t) => {
     return acc
   }, new Set())
 
-  const disconnectPeers = connectPeers(managers, { discovery: false })
+  const disconnectPeers = connectPeers(managers)
   t.after(disconnectPeers)
   await waitForSync(projects, 'initial')
 
@@ -125,7 +125,7 @@ test('syncing blobs', async (t) => {
     fastifyController.start(),
   ])
 
-  let disconnectPeers = connectPeers(managers, { discovery: false })
+  let disconnectPeers = connectPeers(managers)
   t.after(() => disconnectPeers())
   const projectId = await invitor.createProject({ name: 'Mapeo' })
   await invite({ invitor, invitees: [invitee], projectId })
@@ -147,7 +147,7 @@ test('syncing blobs', async (t) => {
     blobMetadata({ mimeType: 'image/jpeg' })
   )
 
-  disconnectPeers = connectPeers(managers, { discovery: false })
+  disconnectPeers = connectPeers(managers)
   await waitForSync(projects, 'initial')
 
   invitorProject.$sync.start()
@@ -174,7 +174,7 @@ test('start and stop sync', async function (t) {
   const COUNT = 2
   const managers = await createManagers(COUNT, t)
   const [invitor, ...invitees] = managers
-  const disconnect = connectPeers(managers, { discovery: false })
+  const disconnect = connectPeers(managers)
   const projectId = await invitor.createProject({ name: 'Mapeo' })
   await invite({ invitor, invitees, projectId })
 
@@ -240,7 +240,7 @@ test('sync only happens if both sides are enabled', async (t) => {
   const managers = await createManagers(2, t)
   const [invitor, ...invitees] = managers
 
-  const disconnect = connectPeers(managers, { discovery: false })
+  const disconnect = connectPeers(managers)
   t.after(disconnect)
 
   const projectId = await invitor.createProject({ name: 'Mapeo' })
@@ -310,7 +310,7 @@ test('auto-stop', async (t) => {
   ])
   t.after(() => fastifyController.stop())
 
-  const disconnect = connectPeers(managers, { discovery: false })
+  const disconnect = connectPeers(managers)
   t.after(disconnect)
 
   const projectId = await invitor.createProject({ name: 'mapeo' })
@@ -472,7 +472,7 @@ test('disabling auto-stop timeout', async (t) => {
   const managers = await createManagers(2, t)
   const [invitor, ...invitees] = managers
 
-  const disconnect = connectPeers(managers, { discovery: false })
+  const disconnect = connectPeers(managers)
   t.after(disconnect)
 
   const projectId = await invitor.createProject({ name: 'mapeo' })
@@ -531,7 +531,7 @@ test('gracefully shutting down sync for all projects when backgrounded', async f
   const managers = await createManagers(2, t)
   const [invitor, ...invitees] = managers
 
-  const disconnect = connectPeers(managers, { discovery: false })
+  const disconnect = connectPeers(managers)
   t.after(disconnect)
 
   const projectGroupsAfterFirstStep = await Promise.all(
@@ -625,7 +625,7 @@ test('shares cores', async function (t) {
   const COUNT = 5
   const managers = await createManagers(COUNT, t)
   const [invitor, ...invitees] = managers
-  const disconnectPeers = connectPeers(managers, { discovery: false })
+  const disconnectPeers = connectPeers(managers)
   t.after(disconnectPeers)
   const projectId = await invitor.createProject({ name: 'Mapeo' })
   await invite({ invitor, invitees, projectId })
@@ -670,7 +670,7 @@ test('no sync capabilities === no namespaces sync apart from auth', async (t) =>
   const COUNT = 3
   const managers = await createManagers(COUNT, t)
   const [invitor, invitee, blocked] = managers
-  const disconnect1 = connectPeers(managers, { discovery: false })
+  const disconnect1 = connectPeers(managers)
   const projectId = await invitor.createProject({ name: 'Mapeo' })
   await invite({
     invitor,
@@ -752,7 +752,7 @@ test('Sync state emitted when starting and stopping sync', async function (t) {
   /** @type {State[]} */ let states = statesBeforeStart
   project.$sync.on('sync-state', (state) => states.push(state))
 
-  const disconnect = connectPeers(managers, { discovery: false })
+  const disconnect = connectPeers(managers)
   t.after(disconnect)
   await invite({ invitor, invitees, projectId })
 
@@ -809,7 +809,7 @@ test('updates sync state when peers are added', async (t) => {
     'data sync state is correct at start'
   )
 
-  const disconnectPeers = connectPeers(managers, { discovery: false })
+  const disconnectPeers = connectPeers(managers)
   t.after(disconnectPeers)
   await invite({ invitor, invitees, projectId })
 
@@ -835,7 +835,7 @@ test('Correct sync state prior to data sync', async function (t) {
   const [invitor, ...invitees] = managers
   const projectId = await invitor.createProject({ name: 'Mapeo' })
 
-  const disconnect1 = connectPeers(managers, { discovery: false })
+  const disconnect1 = connectPeers(managers)
 
   await invite({ invitor, invitees, projectId })
 
@@ -849,7 +849,7 @@ test('Correct sync state prior to data sync', async function (t) {
   // Disconnect and reconnect, because currently pre-have messages about data
   // sync state are only shared on first connection
   await disconnect1()
-  const disconnect2 = connectPeers(managers, { discovery: false })
+  const disconnect2 = connectPeers(managers)
   await waitForPeers(managers)
 
   const expected = managers.map((manager, index) => {
@@ -1122,7 +1122,7 @@ test(
 
     const managers = await createManagers(3, t)
     const [invitor, inviteeA, inviteeB] = managers
-    const disconnectA = connectPeers([invitor, inviteeA], { discovery: false })
+    const disconnectA = connectPeers([invitor, inviteeA])
     const projectId = await invitor.createProject({ name: 'Mapeo' })
     await invite({ invitor, invitees: [inviteeA], projectId })
 
@@ -1138,7 +1138,7 @@ test(
 
     await disconnectA()
 
-    const disconnectB = connectPeers([invitor, inviteeB], { discovery: false })
+    const disconnectB = connectPeers([invitor, inviteeB])
     await invite({ invitor, invitees: [inviteeB], projectId })
     await pTimeout(invitorProject.$sync.waitForSync('initial'), {
       milliseconds: 1000,
@@ -1162,8 +1162,8 @@ test(
 
     const managers = await createManagers(3, t)
     const [invitor, inviteeA, inviteeB] = managers
-    const disconnectA = connectPeers([invitor, inviteeA], { discovery: false })
-    const disconnectB = connectPeers([invitor, inviteeB], { discovery: false })
+    const disconnectA = connectPeers([invitor, inviteeA])
+    const disconnectB = connectPeers([invitor, inviteeB])
     const projectId = await invitor.createProject({ name: 'Mapeo' })
     await invite({ invitor, invitees: [inviteeA, inviteeB], projectId })