@comapeo/core 3.0.0 → 3.1.0

package/src/member-api.js

@@ -19,7 +19,12 @@ import { isHostnameIpAddress } from './lib/is-hostname-ip-address.js'
 import { ErrorWithCode, getErrorMessage } from './lib/error.js'
 import { InviteAbortedError } from './errors.js'
 import { wsCoreReplicator } from './lib/ws-core-replicator.js'
-import { MEMBER_ROLE_ID, ROLES, isRoleIdForNewInvite } from './roles.js'
+import {
+  BLOCKED_ROLE_ID,
+  MEMBER_ROLE_ID,
+  ROLES,
+  isRoleIdForNewInvite,
+} from './roles.js'
 /**
  * @import {
  *   DeviceInfo,
@@ -57,6 +62,7 @@ export class MemberApi extends TypedEmitter {
   #getProjectName
   #projectKey
   #rpc
+  #makeWebsocket
   #getReplicationStream
   #waitForInitialSyncWithPeer
   #dataTypes
@@ -73,6 +79,7 @@ export class MemberApi extends TypedEmitter {
    * @param {() => Promisable<undefined | string>} opts.getProjectName
    * @param {Buffer} opts.projectKey
    * @param {import('./local-peers.js').LocalPeers} opts.rpc
+   * @param {(url: string) => WebSocket} [opts.makeWebsocket]
    * @param {() => ReplicationStream} opts.getReplicationStream
    * @param {(deviceId: string, abortSignal: AbortSignal) => Promise<void>} opts.waitForInitialSyncWithPeer
    * @param {Object} opts.dataTypes
@@ -87,6 +94,7 @@ export class MemberApi extends TypedEmitter {
     getProjectName,
     projectKey,
     rpc,
+    makeWebsocket = (url) => new WebSocket(url),
     getReplicationStream,
     waitForInitialSyncWithPeer,
     dataTypes,
@@ -99,6 +107,7 @@ export class MemberApi extends TypedEmitter {
     this.#getProjectName = getProjectName
     this.#projectKey = projectKey
     this.#rpc = rpc
+    this.#makeWebsocket = makeWebsocket
     this.#getReplicationStream = getReplicationStream
     this.#waitForInitialSyncWithPeer = waitForInitialSyncWithPeer
     this.#dataTypes = dataTypes
@@ -157,12 +166,17 @@ export class MemberApi extends TypedEmitter {
       const projectName = project.name
       assert(projectName, 'Project must have a name to invite people')
 
+      const projectColor = project.projectColor
+      const projectDescription = project.projectDescription
+
       abortSignal.throwIfAborted()
 
       const invite = {
         inviteId,
         projectInviteId,
         projectName,
+        projectColor,
+        projectDescription,
         roleName,
         roleDescription,
         invitorName,
@@ -186,18 +200,16 @@ export class MemberApi extends TypedEmitter {
         case InviteResponse_Decision.DECISION_UNSPECIFIED:
           return InviteResponse_Decision.REJECT
         case InviteResponse_Decision.ACCEPT:
-          // We should assign the role locally *before* sharing the project details
-          // so that they're part of the project even if they don't receive the
-          // project details message.
-
-          await this.#roles.assignRole(deviceId, roleId)
-
           await this.#rpc.sendProjectJoinDetails(deviceId, {
             inviteId,
             projectKey: this.#projectKey,
             encryptionKeys: this.#encryptionKeys,
           })
 
+          // Only add after we know they got the details
+          // Otherwise the joiner will be stuck unable to join
+          await this.#roles.assignRole(deviceId, roleId)
+
           return inviteResponse.decision
         default:
           throw new ExhaustivenessError(inviteResponse.decision)
@@ -314,6 +326,46 @@ export class MemberApi extends TypedEmitter {
     })
   }
 
+  /**
+   * Remove a server peer. Only works when the peer is reachable
+   *
+   * @param {string} serverDeviceId
+   * @param {object} [options]
+   * @param {boolean} [options.dangerouslyAllowInsecureConnections] Allow insecure network connections. Should only be used in tests.
+   * @returns {Promise<void>}
+   */
+  async removeServerPeer(
+    serverDeviceId,
+    { dangerouslyAllowInsecureConnections = false } = {}
+  ) {
+    // Get device ID for URL
+    // Parse through URL to ensure end pathname if missing
+    const member = await this.getById(serverDeviceId)
+
+    if (!member.selfHostedServerDetails) {
+      throw new ErrorWithCode(
+        'DEVICE_ID_NOT_FOR_SERVER',
+        'DeviceId is not for a server peer'
+      )
+    }
+
+    if (member.role.roleId === BLOCKED_ROLE_ID) {
+      throw new ErrorWithCode('ALREADY_BLOCKED', 'Server peer already blocked')
+    }
+
+    const { baseUrl } = member.selfHostedServerDetails
+
+    // Add blocked role to project
+    await this.#roles.assignRole(serverDeviceId, BLOCKED_ROLE_ID)
+
+    // TODO: Catch fail and sync with server after
+    await this.#waitForInitialSyncWithServer({
+      baseUrl,
+      serverDeviceId,
+      dangerouslyAllowInsecureConnections,
+    })
+  }
+
   /**
    * @param {string} baseUrl Server base URL. Should already be validated.
    * @returns {Promise<{ serverDeviceId: string }>}
@@ -378,7 +430,7 @@ export class MemberApi extends TypedEmitter {
         ? 'ws:'
         : 'wss:'
 
-    const websocket = new WebSocket(websocketUrl)
+    const websocket = this.#makeWebsocket(websocketUrl.href)
 
     try {
       await pEvent(websocket, 'open', { rejectionEvents: ['error'] })
@@ -400,7 +452,7 @@ export class MemberApi extends TypedEmitter {
     const onErrorPromise = pEvent(websocket, 'error')
 
     const replicationStream = this.#getReplicationStream()
-    wsCoreReplicator(websocket, replicationStream)
+    const streamPromise = wsCoreReplicator(websocket, replicationStream)
 
     const syncAbortController = new AbortController()
     const syncPromise = this.#waitForInitialSyncWithPeer(
@@ -408,7 +460,11 @@ export class MemberApi extends TypedEmitter {
       syncAbortController.signal
     )
 
-    const errorEvent = await Promise.race([onErrorPromise, syncPromise])
+    const errorEvent = await Promise.race([
+      onErrorPromise,
+      syncPromise,
+      streamPromise,
+    ])
 
     if (errorEvent) {
       syncAbortController.abort()
@@ -445,6 +501,7 @@ export class MemberApi extends TypedEmitter {
       result.name = deviceInfo.name
       result.deviceType = deviceInfo.deviceType
       result.joinedAt = deviceInfo.createdAt
+      result.selfHostedServerDetails = deviceInfo.selfHostedServerDetails
     } catch (err) {
       // Attempting to get someone else may throw because sync hasn't occurred or completed
       // Only throw if attempting to get themself since the relevant information should be available

package/src/schema/client.js

@@ -7,9 +7,10 @@ import { jsonSchemaToDrizzleColumns as toColumns } from './schema-to-drizzle.js'
 import { backlinkTable, customJson } from './utils.js'
 
 /**
+ * @import { ProjectSettings } from '@comapeo/schema'
+ *
  * @internal
- * @typedef {object} ProjectInfo
- * @prop {string} [name]
+ * @typedef {Pick<ProjectSettings, 'name' | 'projectColor' | 'projectDescription'>} ProjectInfo
  */
 
 const projectInfoColumn =

package/src/sync/sync-api.js

@@ -99,12 +99,14 @@ export class SyncApi extends TypedEmitter {
   #getReplicationStream
   /** @type {Map<string, WebSocket>} */
   #serverWebsockets = new Map()
+  #makeWebsocket
 
   /**
    * @param {object} opts
    * @param {import('../core-manager/index.js').CoreManager} opts.coreManager
    * @param {CoreOwnership} opts.coreOwnership
    * @param {import('../roles.js').Roles} opts.roles
+   * @param {(url: string) => WebSocket} [opts.makeWebsocket]
    * @param {() => Promise<Iterable<string>>} opts.getServerWebsocketUrls
    * @param {() => ReplicationStream} opts.getReplicationStream
    * @param {import('../blob-store/index.js').BlobStore} opts.blobStore
@@ -115,6 +117,7 @@ export class SyncApi extends TypedEmitter {
     coreManager,
     throttleMs = 200,
     roles,
+    makeWebsocket = (url) => new WebSocket(url),
     getServerWebsocketUrls,
     getReplicationStream,
     logger,
@@ -126,6 +129,7 @@ export class SyncApi extends TypedEmitter {
     this.#coreManager = coreManager
     this.#coreOwnership = coreOwnership
     this.#roles = roles
+    this.#makeWebsocket = makeWebsocket
     this.#getServerWebsocketUrls = getServerWebsocketUrls
     this.#getReplicationStream = getReplicationStream
     this[kSyncState] = new SyncState({
@@ -332,7 +336,7 @@ export class SyncApi extends TypedEmitter {
             continue
           }
 
-          const websocket = new WebSocket(url)
+          const websocket = this.#makeWebsocket(url)
 
           /** @param {Error} err */
           const onWebsocketError = (err) => {
@@ -354,7 +358,7 @@ export class SyncApi extends TypedEmitter {
           websocket.on('unexpected-response', onWebsocketUnexpectedResponse)
 
           const replicationStream = this.#getReplicationStream()
-          wsCoreReplicator(websocket, replicationStream)
+          wsCoreReplicator(websocket, replicationStream).catch(noop)
 
           this.#serverWebsockets.set(url, websocket)
           websocket.once('close', () => {