fix: write own device info when creating and adding projects

src/mapeo-manager.js

@@ -219,10 +219,16 @@ export class MapeoManager {
     // 5. Write project name and any other relevant metadata to project instance
     await project.$setProjectSettings(settings)
 
+    // 6. Write device info into project
+    const deviceInfo = await this.getDeviceInfo()
+    if (deviceInfo.name) {
+      await project.$setOwnDeviceInfo({ name: deviceInfo.name })
+    }
+
     // TODO: Close the project instance instead of keeping it around
     this.#activeProjects.set(projectPublicId, project)
 
-    // 6. Return project public id
+    // 7. Return project public id
     return projectPublicId
   }
 
@@ -365,6 +371,14 @@ export class MapeoManager {
       projectInfo,
     })
 
+    // 5. Write device info into project
+    const deviceInfo = await this.getDeviceInfo()
+
+    if (deviceInfo.name) {
+      const project = await this.getProject(projectPublicId)
+      await project.$setOwnDeviceInfo({ name: deviceInfo.name })
+    }
+
     return projectPublicId
   }
 
@@ -382,6 +396,15 @@ export class MapeoManager {
         set: values,
       })
       .run()
+
+    const listedProjects = await this.listProjects()
+
+    await Promise.all(
+      listedProjects.map(async ({ projectId }) => {
+        const project = await this.getProject(projectId)
+        await project.$setOwnDeviceInfo(deviceInfo)
+      })
+    )
   }
 
   /**

src/mapeo-project.js

@@ -106,13 +106,15 @@ export class MapeoProject {
       storage: coreManagerStorage,
       sqlite,
     })
+
     const indexWriter = new IndexWriter({
       tables: [
         observationTable,
         presetTable,
         fieldTable,
         coreOwnershipTable,
         roleTable,
+        deviceInfoTable,
       ],
       sqlite,
       getWinner,
@@ -220,6 +222,7 @@ export class MapeoProject {
 
     this.#memberApi = new MemberApi({
       capabilities: this.#capabilities,
+      coreOwnership: this.#coreOwnership,
       // @ts-expect-error
       encryptionKeys,
       projectKey,
@@ -267,6 +270,10 @@ export class MapeoProject {
     return this.#capabilities
   }
 
+  get deviceId() {
+    return this.#deviceId
+  }
+
   /**
    * Resolves when hypercores have all loaded
    */
@@ -370,6 +377,32 @@ export class MapeoProject {
   async $getOwnCapabilities() {
     return this.#capabilities.getCapabilities(this.#deviceId)
   }
+
+  /**
+   * @param {Pick<import('@mapeo/schema').DeviceInfoValue, 'name'>} value
+   * @returns {Promise<import('@mapeo/schema').DeviceInfo>}
+   */
+  async $setOwnDeviceInfo(value) {
+    const { deviceInfo } = this.#dataTypes
+
+    const configCoreId = this.#coreManager
+      .getWriterCore('config')
+      .key.toString('hex')
+
+    const existingDoc = await deviceInfo.getByDocId(configCoreId)
+
+    if (existingDoc) {
+      return deviceInfo.update(existingDoc.versionId, {
+        ...value,
+        schemaName: 'deviceInfo',
+      })
+    }
+
+    return await deviceInfo[kCreateWithDocId](configCoreId, {
+      ...value,
+      schemaName: 'deviceInfo',
+    })
+  }
 }
 
 /**

src/member-api.js

@@ -8,6 +8,7 @@ import { projectKeyToId } from './utils.js'
 
 export class MemberApi extends TypedEmitter {
   #capabilities
+  #coreOwnership
   #encryptionKeys
   #projectKey
   #rpc
@@ -16,16 +17,25 @@ export class MemberApi extends TypedEmitter {
   /**
    * @param {Object} opts
    * @param {import('./capabilities.js').Capabilities} opts.capabilities
+   * @param {import('./core-ownership.js').CoreOwnership} opts.coreOwnership
    * @param {import('./generated/keys.js').EncryptionKeys} opts.encryptionKeys
    * @param {Buffer} opts.projectKey
    * @param {import('./rpc/index.js').MapeoRPC} opts.rpc
    * @param {Object} opts.dataTypes
    * @param {Pick<DeviceInfoDataType, 'getByDocId' | 'getMany'>} opts.dataTypes.deviceInfo
    * @param {Pick<ProjectDataType, 'getByDocId'>} opts.dataTypes.project
    */
-  constructor({ capabilities, encryptionKeys, projectKey, rpc, dataTypes }) {
+  constructor({
+    capabilities,
+    coreOwnership,
+    encryptionKeys,
+    projectKey,
+    rpc,
+    dataTypes,
+  }) {
     super()
     this.#capabilities = capabilities
+    this.#coreOwnership = coreOwnership
     this.#encryptionKeys = encryptionKeys
     this.#projectKey = projectKey
     this.#rpc = rpc
@@ -55,6 +65,7 @@ export class MemberApi extends TypedEmitter {
 
     if (response === InviteResponse_Decision.ACCEPT) {
       await this.#capabilities.assignRole(deviceId, roleId)
+      // TODO: Write device info record
     }
 
     return response
@@ -65,7 +76,8 @@ export class MemberApi extends TypedEmitter {
    * @returns {Promise<MemberInfo>}
    */
   async getById(deviceId) {
-    const { name } = await this.#dataTypes.deviceInfo.getByDocId(deviceId)
+    const configCoreId = await this.#coreOwnership.getCoreId(deviceId, 'config')
+    const { name } = await this.#dataTypes.deviceInfo.getByDocId(configCoreId)
     const capabilities = await this.#capabilities.getCapabilities(deviceId)
     return { deviceId, name, capabilities }
   }
@@ -77,9 +89,10 @@ export class MemberApi extends TypedEmitter {
     const devices = await this.#dataTypes.deviceInfo.getMany()
     return Promise.all(
       devices.map(async ({ docId, name }) => {
-        const capabilities = await this.#capabilities.getCapabilities(docId)
+        const deviceId = await this.#coreOwnership.getOwner(docId)
+        const capabilities = await this.#capabilities.getCapabilities(deviceId)
         return {
-          deviceId: docId,
+          deviceId,
           name,
           capabilities,
         }

test-e2e/device-info.js

@@ -1,8 +1,10 @@
 import { test } from 'brittle'
+import { randomBytes } from 'crypto'
 import { KeyManager } from '@mapeo/crypto'
-import { MapeoManager } from '../src/mapeo-manager.js'
 import RAM from 'random-access-memory'
 
+import { MapeoManager } from '../src/mapeo-manager.js'
+
 test('write and read deviceInfo', async (t) => {
   const rootKey = KeyManager.generateRootKey()
   const manager = new MapeoManager({
@@ -19,3 +21,106 @@ test('write and read deviceInfo', async (t) => {
   const readInfo2 = await manager.getDeviceInfo()
   t.alike(readInfo2, info2)
 })
+
+test('device info written to projects', async (t) => {
+  t.test('when creating project', async (st) => {
+    const manager = new MapeoManager({
+      rootKey: KeyManager.generateRootKey(),
+      dbFolder: ':memory:',
+      coreStorage: () => new RAM(),
+    })
+
+    await manager.setDeviceInfo({ name: 'mapeo' })
+
+    const projectId = await manager.createProject()
+    const project = await manager.getProject(projectId)
+
+    await project.ready()
+
+    const members = await project.$member.getMany()
+
+    const me = members.find(({ deviceId }) => deviceId === project.deviceId)
+
+    st.ok(me)
+    st.is(me?.deviceId, project.deviceId)
+    st.alike({ name: me?.name }, { name: 'mapeo' })
+  })
+
+  t.test('when adding project', async (st) => {
+    const manager = new MapeoManager({
+      rootKey: KeyManager.generateRootKey(),
+      dbFolder: ':memory:',
+      coreStorage: () => new RAM(),
+    })
+
+    await manager.setDeviceInfo({ name: 'mapeo' })
+
+    const projectId = await manager.addProject({
+      projectKey: randomBytes(32),
+      encryptionKeys: { auth: randomBytes(32) },
+    })
+
+    const project = await manager.getProject(projectId)
+
+    await project.ready()
+
+    const ownMemberInfo = await getOwnMemberInfo(project)
+
+    st.alike({ name: ownMemberInfo.name }, { name: 'mapeo' })
+  })
+
+  t.test('after updating global device info', async (st) => {
+    const manager = new MapeoManager({
+      rootKey: KeyManager.generateRootKey(),
+      dbFolder: ':memory:',
+      coreStorage: () => new RAM(),
+    })
+
+    await manager.setDeviceInfo({ name: 'before' })
+
+    const projectIds = await Promise.all([
+      manager.createProject(),
+      manager.createProject(),
+      manager.createProject(),
+    ])
+
+    const projects = await Promise.all(
+      projectIds.map(async (projectId) => {
+        const project = await manager.getProject(projectId)
+        await project.ready()
+        return project
+      })
+    )
+
+    {
+      const ownMemberInfos = await Promise.all(projects.map(getOwnMemberInfo))
+
+      for (const info of ownMemberInfos) {
+        st.alike({ name: info.name }, { name: 'before' })
+      }
+    }
+
+    await manager.setDeviceInfo({ name: 'after' })
+
+    {
+      const ownMemberInfos = await Promise.all(projects.map(getOwnMemberInfo))
+
+      for (const info of ownMemberInfos) {
+        st.alike({ name: info.name }, { name: 'after' })
+      }
+    }
+  })
+
+  // TODO: Test closing project, changing name, and getting project to see if device info for project is updated
+
+  /**
+   * @param {import('../src/mapeo-project.js').MapeoProject} project
+   *
+   */
+  async function getOwnMemberInfo(project) {
+    const members = await project.$member.getMany()
+    const me = members.find(({ deviceId }) => deviceId === project.deviceId)
+    if (!me) throw Error('Could not get own member info')
+    return me
+  }
+})