replace queries opt in MemberAPI with dataType

digidem · Sep 18, 2023 · a97da05 · a97da05
1 parent 350ccc5
commit a97da05
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/src/mapeo-project.js b/src/mapeo-project.js
@@ -219,14 +219,9 @@ export class MapeoProject {
       encryptionKeys,
       projectKey,
       rpc,
-      queries: {
-        getProjectInfo: async () => {
-          const settings = await this.$getProjectSettings()
-          return { name: settings.name }
-        },
-      },
       dataTypes: {
         deviceInfo: this.#dataTypes.deviceInfo,
+        project: this.#dataTypes.project,
       },
     })
 

diff --git a/src/member-api.js b/src/member-api.js
@@ -1,7 +1,9 @@
 import { TypedEmitter } from 'tiny-typed-emitter'
 import { InviteResponse_Decision } from './generated/rpc.js'
+import { projectKeyToId } from './utils.js'
 
 /** @typedef {import('./datatype/index.js').DataType<import('./datastore/index.js').DataStore<'config'>, typeof import('./schema/project.js').deviceInfoTable, "deviceInfo", import('@mapeo/schema').DeviceInfo, import('@mapeo/schema').DeviceInfoValue>} DeviceInfoDataType */
+/** @typedef {import('./datatype/index.js').DataType<import('./datastore/index.js').DataStore<'config'>, typeof import('./schema/client.js').projectTable, "project", import('@mapeo/schema').Project, import('@mapeo/schema').ProjectValue>} ProjectDataType */
 /** @typedef {{ deviceId: string, name: import('@mapeo/schema').DeviceInfo['name'] }} MemberInfo */
 
 export class MemberApi extends TypedEmitter {
@@ -10,31 +12,21 @@ export class MemberApi extends TypedEmitter {
   #projectKey
   #rpc
   #dataTypes
-  #queries
 
   /**
    * @param {Object} opts
    * @param {import('./capabilities.js').Capabilities} opts.capabilities
    * @param {import('./generated/keys.js').EncryptionKeys} opts.encryptionKeys
    * @param {Buffer} opts.projectKey
    * @param {import('./rpc/index.js').MapeoRPC} opts.rpc
-   * @param {Object} opts.queries
-   * @param {() => Promise<import('./generated/rpc.js').Invite_ProjectInfo>} opts.queries.getProjectInfo
    * @param {Object} opts.dataTypes
    * @param {Pick<DeviceInfoDataType, 'getByDocId' | 'getMany'>} opts.dataTypes.deviceInfo
+   * @param {Pick<ProjectDataType, 'getByDocId'>} opts.dataTypes.project
    */
-  constructor({
-    capabilities,
-    encryptionKeys,
-    projectKey,
-    rpc,
-    queries,
-    dataTypes,
-  }) {
+  constructor({ capabilities, encryptionKeys, projectKey, rpc, dataTypes }) {
     super()
     this.#capabilities = capabilities
     this.#encryptionKeys = encryptionKeys
-    this.#queries = queries
     this.#projectKey = projectKey
     this.#rpc = rpc
     this.#dataTypes = dataTypes
@@ -50,12 +42,14 @@ export class MemberApi extends TypedEmitter {
    * @returns {Promise<import('./generated/rpc.js').InviteResponse_Decision>}
    */
   async invite(deviceId, { roleId, timeout }) {
-    const projectInfo = await this.#queries.getProjectInfo()
+    const projectId = projectKeyToId(this.#projectKey)
+
+    const project = await this.#dataTypes.project.getByDocId(projectId)
 
     const response = await this.#rpc.invite(deviceId, {
       projectKey: this.#projectKey,
       encryptionKeys: this.#encryptionKeys,
-      projectInfo,
+      projectInfo: { name: project.name },
       timeout,
     })
 

diff --git a/tests/member-api.js b/tests/member-api.js
@@ -21,9 +21,14 @@ test('invite() sends expected project-related details', async (t) => {
     encryptionKeys,
     projectKey,
     rpc: r1,
-    queries: { getProjectInfo: async () => projectInfo },
+    dataTypes: {
+      project: {
+        async getByDocId() {
+          return projectInfo
+        },
+      },
+    },
   })
-
   r1.on('peers', async (peers) => {
     const response = await memberApi.invite(peers[0].id, {
       roleId: randomBytes(8).toString('hex'),
@@ -69,7 +74,13 @@ test('invite() assigns role to invited device after invite accepted', async (t)
     encryptionKeys: { auth: randomBytes(32) },
     projectKey: KeyManager.generateProjectKeypair().publicKey,
     rpc: r1,
-    queries: { getProjectInfo: async () => {} },
+    dataTypes: {
+      project: {
+        async getByDocId() {
+          return { name: 'mapeo' }
+        },
+      },
+    },
   })
 
   r1.on('peers', async (peers) => {
@@ -118,7 +129,13 @@ test('invite() does not assign role to invited device if invite is not accepted'
         encryptionKeys: { auth: randomBytes(32) },
         projectKey: KeyManager.generateProjectKeypair().publicKey,
         rpc: r1,
-        queries: { getProjectInfo: async () => {} },
+        dataTypes: {
+          project: {
+            async getByDocId() {
+              return { name: 'mapeo' }
+            },
+          },
+        },
       })
 
       r1.on('peers', async (peers) => {
@@ -158,7 +175,6 @@ test('getById() works', async (t) => {
     encryptionKeys,
     projectKey,
     rpc,
-    queries: { getProjectInfo: async () => {} },
     dataTypes: {
       deviceInfo: {
         async getByDocId(deviceId) {