@comapeo/core 3.0.0 → 3.1.1

package/src/generated/rpc.js

@@ -85,6 +85,36 @@ export function deviceInfo_DeviceTypeToNumber(object) {
             return -1;
     }
 }
+export var DeviceInfo_RPCFeatures = {
+    features_unspecified: "features_unspecified",
+    ack: "ack",
+    UNRECOGNIZED: "UNRECOGNIZED",
+};
+export function deviceInfo_RPCFeaturesFromJSON(object) {
+    switch (object) {
+        case 0:
+        case "features_unspecified":
+            return DeviceInfo_RPCFeatures.features_unspecified;
+        case 1:
+        case "ack":
+            return DeviceInfo_RPCFeatures.ack;
+        case -1:
+        case "UNRECOGNIZED":
+        default:
+            return DeviceInfo_RPCFeatures.UNRECOGNIZED;
+    }
+}
+export function deviceInfo_RPCFeaturesToNumber(object) {
+    switch (object) {
+        case DeviceInfo_RPCFeatures.features_unspecified:
+            return 0;
+        case DeviceInfo_RPCFeatures.ack:
+            return 1;
+        case DeviceInfo_RPCFeatures.UNRECOGNIZED:
+        default:
+            return -1;
+    }
+}
 function createBaseInvite() {
     return { inviteId: Buffer.alloc(0), projectInviteId: Buffer.alloc(0), projectName: "", invitorName: "" };
 }
@@ -109,6 +139,12 @@ export var Invite = {
         if (message.invitorName !== "") {
             writer.uint32(50).string(message.invitorName);
         }
+        if (message.projectColor !== undefined) {
+            writer.uint32(58).string(message.projectColor);
+        }
+        if (message.projectDescription !== undefined) {
+            writer.uint32(66).string(message.projectDescription);
+        }
         return writer;
     },
     decode: function (input, length) {
@@ -154,6 +190,18 @@ export var Invite = {
                     }
                     message.invitorName = reader.string();
                     continue;
+                case 7:
+                    if (tag !== 58) {
+                        break;
+                    }
+                    message.projectColor = reader.string();
+                    continue;
+                case 8:
+                    if (tag !== 66) {
+                        break;
+                    }
+                    message.projectDescription = reader.string();
+                    continue;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -166,7 +214,7 @@ export var Invite = {
         return Invite.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial: function (object) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         var message = createBaseInvite();
         message.inviteId = (_a = object.inviteId) !== null && _a !== void 0 ? _a : Buffer.alloc(0);
         message.projectInviteId = (_b = object.projectInviteId) !== null && _b !== void 0 ? _b : Buffer.alloc(0);
@@ -174,6 +222,8 @@ export var Invite = {
         message.roleName = (_d = object.roleName) !== null && _d !== void 0 ? _d : undefined;
         message.roleDescription = (_e = object.roleDescription) !== null && _e !== void 0 ? _e : undefined;
         message.invitorName = (_f = object.invitorName) !== null && _f !== void 0 ? _f : "";
+        message.projectColor = (_g = object.projectColor) !== null && _g !== void 0 ? _g : undefined;
+        message.projectDescription = (_h = object.projectDescription) !== null && _h !== void 0 ? _h : undefined;
         return message;
     },
 };
@@ -336,7 +386,7 @@ export var ProjectJoinDetails = {
     },
 };
 function createBaseDeviceInfo() {
-    return { name: "" };
+    return { name: "", features: [] };
 }
 export var DeviceInfo = {
     encode: function (message, writer) {
@@ -347,6 +397,12 @@ export var DeviceInfo = {
         if (message.deviceType !== undefined) {
             writer.uint32(16).int32(deviceInfo_DeviceTypeToNumber(message.deviceType));
         }
+        writer.uint32(26).fork();
+        for (var _i = 0, _a = message.features; _i < _a.length; _i++) {
+            var v = _a[_i];
+            writer.int32(deviceInfo_RPCFeaturesToNumber(v));
+        }
+        writer.ldelim();
         return writer;
     },
     decode: function (input, length) {
@@ -368,6 +424,19 @@ export var DeviceInfo = {
                     }
                     message.deviceType = deviceInfo_DeviceTypeFromJSON(reader.int32());
                     continue;
+                case 3:
+                    if (tag === 24) {
+                        message.features.push(deviceInfo_RPCFeaturesFromJSON(reader.int32()));
+                        continue;
+                    }
+                    if (tag === 26) {
+                        var end2 = reader.uint32() + reader.pos;
+                        while (reader.pos < end2) {
+                            message.features.push(deviceInfo_RPCFeaturesFromJSON(reader.int32()));
+                        }
+                        continue;
+                    }
+                    break;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -380,10 +449,179 @@ export var DeviceInfo = {
         return DeviceInfo.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial: function (object) {
-        var _a, _b;
+        var _a, _b, _c;
         var message = createBaseDeviceInfo();
         message.name = (_a = object.name) !== null && _a !== void 0 ? _a : "";
         message.deviceType = (_b = object.deviceType) !== null && _b !== void 0 ? _b : undefined;
+        message.features = ((_c = object.features) === null || _c === void 0 ? void 0 : _c.map(function (e) { return e; })) || [];
+        return message;
+    },
+};
+function createBaseInviteAck() {
+    return { inviteId: Buffer.alloc(0) };
+}
+export var InviteAck = {
+    encode: function (message, writer) {
+        if (writer === void 0) { writer = _m0.Writer.create(); }
+        if (message.inviteId.length !== 0) {
+            writer.uint32(10).bytes(message.inviteId);
+        }
+        return writer;
+    },
+    decode: function (input, length) {
+        var reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+        var end = length === undefined ? reader.len : reader.pos + length;
+        var message = createBaseInviteAck();
+        while (reader.pos < end) {
+            var tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    if (tag !== 10) {
+                        break;
+                    }
+                    message.inviteId = reader.bytes();
+                    continue;
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
+        }
+        return message;
+    },
+    create: function (base) {
+        return InviteAck.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial: function (object) {
+        var _a;
+        var message = createBaseInviteAck();
+        message.inviteId = (_a = object.inviteId) !== null && _a !== void 0 ? _a : Buffer.alloc(0);
+        return message;
+    },
+};
+function createBaseInviteCancelAck() {
+    return { inviteId: Buffer.alloc(0) };
+}
+export var InviteCancelAck = {
+    encode: function (message, writer) {
+        if (writer === void 0) { writer = _m0.Writer.create(); }
+        if (message.inviteId.length !== 0) {
+            writer.uint32(10).bytes(message.inviteId);
+        }
+        return writer;
+    },
+    decode: function (input, length) {
+        var reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+        var end = length === undefined ? reader.len : reader.pos + length;
+        var message = createBaseInviteCancelAck();
+        while (reader.pos < end) {
+            var tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    if (tag !== 10) {
+                        break;
+                    }
+                    message.inviteId = reader.bytes();
+                    continue;
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
+        }
+        return message;
+    },
+    create: function (base) {
+        return InviteCancelAck.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial: function (object) {
+        var _a;
+        var message = createBaseInviteCancelAck();
+        message.inviteId = (_a = object.inviteId) !== null && _a !== void 0 ? _a : Buffer.alloc(0);
+        return message;
+    },
+};
+function createBaseInviteResponseAck() {
+    return { inviteId: Buffer.alloc(0) };
+}
+export var InviteResponseAck = {
+    encode: function (message, writer) {
+        if (writer === void 0) { writer = _m0.Writer.create(); }
+        if (message.inviteId.length !== 0) {
+            writer.uint32(10).bytes(message.inviteId);
+        }
+        return writer;
+    },
+    decode: function (input, length) {
+        var reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+        var end = length === undefined ? reader.len : reader.pos + length;
+        var message = createBaseInviteResponseAck();
+        while (reader.pos < end) {
+            var tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    if (tag !== 10) {
+                        break;
+                    }
+                    message.inviteId = reader.bytes();
+                    continue;
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
+        }
+        return message;
+    },
+    create: function (base) {
+        return InviteResponseAck.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial: function (object) {
+        var _a;
+        var message = createBaseInviteResponseAck();
+        message.inviteId = (_a = object.inviteId) !== null && _a !== void 0 ? _a : Buffer.alloc(0);
+        return message;
+    },
+};
+function createBaseProjectJoinDetailsAck() {
+    return { inviteId: Buffer.alloc(0) };
+}
+export var ProjectJoinDetailsAck = {
+    encode: function (message, writer) {
+        if (writer === void 0) { writer = _m0.Writer.create(); }
+        if (message.inviteId.length !== 0) {
+            writer.uint32(10).bytes(message.inviteId);
+        }
+        return writer;
+    },
+    decode: function (input, length) {
+        var reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+        var end = length === undefined ? reader.len : reader.pos + length;
+        var message = createBaseProjectJoinDetailsAck();
+        while (reader.pos < end) {
+            var tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    if (tag !== 10) {
+                        break;
+                    }
+                    message.inviteId = reader.bytes();
+                    continue;
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
+        }
+        return message;
+    },
+    create: function (base) {
+        return ProjectJoinDetailsAck.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial: function (object) {
+        var _a;
+        var message = createBaseProjectJoinDetailsAck();
+        message.inviteId = (_a = object.inviteId) !== null && _a !== void 0 ? _a : Buffer.alloc(0);
         return message;
     },
 };

package/src/generated/rpc.ts

@@ -9,6 +9,8 @@ export interface Invite {
   roleName?: string | undefined;
   roleDescription?: string | undefined;
   invitorName: string;
+  projectColor?: string | undefined;
+  projectDescription?: string | undefined;
 }
 
 export interface InviteCancel {
@@ -76,6 +78,7 @@ export interface ProjectJoinDetails {
 export interface DeviceInfo {
   name: string;
   deviceType?: DeviceInfo_DeviceType | undefined;
+  features: DeviceInfo_RPCFeatures[];
 }
 
 export const DeviceInfo_DeviceType = {
@@ -125,6 +128,57 @@ export function deviceInfo_DeviceTypeToNumber(object: DeviceInfo_DeviceType): nu
   }
 }
 
+export const DeviceInfo_RPCFeatures = {
+  features_unspecified: "features_unspecified",
+  ack: "ack",
+  UNRECOGNIZED: "UNRECOGNIZED",
+} as const;
+
+export type DeviceInfo_RPCFeatures = typeof DeviceInfo_RPCFeatures[keyof typeof DeviceInfo_RPCFeatures];
+
+export function deviceInfo_RPCFeaturesFromJSON(object: any): DeviceInfo_RPCFeatures {
+  switch (object) {
+    case 0:
+    case "features_unspecified":
+      return DeviceInfo_RPCFeatures.features_unspecified;
+    case 1:
+    case "ack":
+      return DeviceInfo_RPCFeatures.ack;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return DeviceInfo_RPCFeatures.UNRECOGNIZED;
+  }
+}
+
+export function deviceInfo_RPCFeaturesToNumber(object: DeviceInfo_RPCFeatures): number {
+  switch (object) {
+    case DeviceInfo_RPCFeatures.features_unspecified:
+      return 0;
+    case DeviceInfo_RPCFeatures.ack:
+      return 1;
+    case DeviceInfo_RPCFeatures.UNRECOGNIZED:
+    default:
+      return -1;
+  }
+}
+
+export interface InviteAck {
+  inviteId: Buffer;
+}
+
+export interface InviteCancelAck {
+  inviteId: Buffer;
+}
+
+export interface InviteResponseAck {
+  inviteId: Buffer;
+}
+
+export interface ProjectJoinDetailsAck {
+  inviteId: Buffer;
+}
+
 function createBaseInvite(): Invite {
   return { inviteId: Buffer.alloc(0), projectInviteId: Buffer.alloc(0), projectName: "", invitorName: "" };
 }
@@ -149,6 +203,12 @@ export const Invite = {
     if (message.invitorName !== "") {
       writer.uint32(50).string(message.invitorName);
     }
+    if (message.projectColor !== undefined) {
+      writer.uint32(58).string(message.projectColor);
+    }
+    if (message.projectDescription !== undefined) {
+      writer.uint32(66).string(message.projectDescription);
+    }
     return writer;
   },
 
@@ -201,6 +261,20 @@ export const Invite = {
 
           message.invitorName = reader.string();
           continue;
+        case 7:
+          if (tag !== 58) {
+            break;
+          }
+
+          message.projectColor = reader.string();
+          continue;
+        case 8:
+          if (tag !== 66) {
+            break;
+          }
+
+          message.projectDescription = reader.string();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -221,6 +295,8 @@ export const Invite = {
     message.roleName = object.roleName ?? undefined;
     message.roleDescription = object.roleDescription ?? undefined;
     message.invitorName = object.invitorName ?? "";
+    message.projectColor = object.projectColor ?? undefined;
+    message.projectDescription = object.projectDescription ?? undefined;
     return message;
   },
 };
@@ -396,7 +472,7 @@ export const ProjectJoinDetails = {
 };
 
 function createBaseDeviceInfo(): DeviceInfo {
-  return { name: "" };
+  return { name: "", features: [] };
 }
 
 export const DeviceInfo = {
@@ -407,6 +483,11 @@ export const DeviceInfo = {
     if (message.deviceType !== undefined) {
       writer.uint32(16).int32(deviceInfo_DeviceTypeToNumber(message.deviceType));
     }
+    writer.uint32(26).fork();
+    for (const v of message.features) {
+      writer.int32(deviceInfo_RPCFeaturesToNumber(v));
+    }
+    writer.ldelim();
     return writer;
   },
 
@@ -431,6 +512,23 @@ export const DeviceInfo = {
 
           message.deviceType = deviceInfo_DeviceTypeFromJSON(reader.int32());
           continue;
+        case 3:
+          if (tag === 24) {
+            message.features.push(deviceInfo_RPCFeaturesFromJSON(reader.int32()));
+
+            continue;
+          }
+
+          if (tag === 26) {
+            const end2 = reader.uint32() + reader.pos;
+            while (reader.pos < end2) {
+              message.features.push(deviceInfo_RPCFeaturesFromJSON(reader.int32()));
+            }
+
+            continue;
+          }
+
+          break;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -447,6 +545,187 @@ export const DeviceInfo = {
     const message = createBaseDeviceInfo();
     message.name = object.name ?? "";
     message.deviceType = object.deviceType ?? undefined;
+    message.features = object.features?.map((e) => e) || [];
+    return message;
+  },
+};
+
+function createBaseInviteAck(): InviteAck {
+  return { inviteId: Buffer.alloc(0) };
+}
+
+export const InviteAck = {
+  encode(message: InviteAck, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.inviteId.length !== 0) {
+      writer.uint32(10).bytes(message.inviteId);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): InviteAck {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseInviteAck();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.inviteId = reader.bytes() as Buffer;
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  create<I extends Exact<DeepPartial<InviteAck>, I>>(base?: I): InviteAck {
+    return InviteAck.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<InviteAck>, I>>(object: I): InviteAck {
+    const message = createBaseInviteAck();
+    message.inviteId = object.inviteId ?? Buffer.alloc(0);
+    return message;
+  },
+};
+
+function createBaseInviteCancelAck(): InviteCancelAck {
+  return { inviteId: Buffer.alloc(0) };
+}
+
+export const InviteCancelAck = {
+  encode(message: InviteCancelAck, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.inviteId.length !== 0) {
+      writer.uint32(10).bytes(message.inviteId);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): InviteCancelAck {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseInviteCancelAck();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.inviteId = reader.bytes() as Buffer;
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  create<I extends Exact<DeepPartial<InviteCancelAck>, I>>(base?: I): InviteCancelAck {
+    return InviteCancelAck.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<InviteCancelAck>, I>>(object: I): InviteCancelAck {
+    const message = createBaseInviteCancelAck();
+    message.inviteId = object.inviteId ?? Buffer.alloc(0);
+    return message;
+  },
+};
+
+function createBaseInviteResponseAck(): InviteResponseAck {
+  return { inviteId: Buffer.alloc(0) };
+}
+
+export const InviteResponseAck = {
+  encode(message: InviteResponseAck, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.inviteId.length !== 0) {
+      writer.uint32(10).bytes(message.inviteId);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): InviteResponseAck {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseInviteResponseAck();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.inviteId = reader.bytes() as Buffer;
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  create<I extends Exact<DeepPartial<InviteResponseAck>, I>>(base?: I): InviteResponseAck {
+    return InviteResponseAck.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<InviteResponseAck>, I>>(object: I): InviteResponseAck {
+    const message = createBaseInviteResponseAck();
+    message.inviteId = object.inviteId ?? Buffer.alloc(0);
+    return message;
+  },
+};
+
+function createBaseProjectJoinDetailsAck(): ProjectJoinDetailsAck {
+  return { inviteId: Buffer.alloc(0) };
+}
+
+export const ProjectJoinDetailsAck = {
+  encode(message: ProjectJoinDetailsAck, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.inviteId.length !== 0) {
+      writer.uint32(10).bytes(message.inviteId);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ProjectJoinDetailsAck {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseProjectJoinDetailsAck();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.inviteId = reader.bytes() as Buffer;
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  create<I extends Exact<DeepPartial<ProjectJoinDetailsAck>, I>>(base?: I): ProjectJoinDetailsAck {
+    return ProjectJoinDetailsAck.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<ProjectJoinDetailsAck>, I>>(object: I): ProjectJoinDetailsAck {
+    const message = createBaseProjectJoinDetailsAck();
+    message.inviteId = object.inviteId ?? Buffer.alloc(0);
     return message;
   },
 };

package/src/invite/invite-api.js

@@ -12,6 +12,7 @@ import {
   InviteSendError,
 } from '../errors.js'
 
+/** @import { ProjectToAddDetails } from '../mapeo-manager.js' */
 /** @import { MapBuffers } from '../types.js' */
 /**
  * @import {
@@ -45,7 +46,7 @@ import {
  */
 
 /**
- * @typedef {(projectDetails: Pick<ProjectJoinDetails, 'projectKey' | 'encryptionKeys'> & { projectName: string }) => Promise<string>} AddProjectQuery
+ * @typedef {(projectDetails: ProjectToAddDetails) => Promise<string>} AddProjectQuery
  */
 
 /**
@@ -119,7 +120,13 @@ export class InviteApi extends TypedEmitter {
    * @param {InviteRpcMessage} inviteRpcMessage
    */
   #handleNewInvite(peerId, inviteRpcMessage) {
-    const { inviteId, projectInviteId, projectName } = inviteRpcMessage
+    const {
+      inviteId,
+      projectInviteId,
+      projectName,
+      projectColor,
+      projectDescription,
+    } = inviteRpcMessage
     const invite = { ...inviteRpcMessage, receivedAt: Date.now() }
 
     this.#l.log('Received invite %h from %S', inviteId, peerId)
@@ -149,7 +156,12 @@ export class InviteApi extends TypedEmitter {
             return this.rpc.sendInviteResponse(peerId, { decision, inviteId })
           }),
           addProject: fromPromise(async ({ input: projectDetails }) => {
-            return this.#addProject({ ...projectDetails, projectName })
+            return this.#addProject({
+              ...projectDetails,
+              projectName,
+              projectColor,
+              projectDescription,
+            })
           }),
         },
         guards: {