Merge branch 'main' into feat/mdns-discovery

* main: chore: condense setup code in MemberAPI tests (#267) chore: replace queries opt in MemberAPI with dataType (#266) feat: add getMany method to member api (#263) feat: add getById method to member api (#262) chore: Update @digidem/types and remove patch (#269) feat: share all core keys via extension messages (#264) feat: send core "haves" bitfield on first connect (#254) fix: invite.encryptionKeys should be required (#260) feat: Add set & get deviceInfo & datatype (#250) expose member namespace in MapeoProject (#253) blobStore.createReadStream should not wait (#243) update MapeoManager to return and handle project public IDs (#247) return content hash from blobApi.create (#242)
digidem · Sep 19, 2023 · c5d88c4 · c5d88c4
2 parents 8e6e2ea + 09d6ad0
commit c5d88c4
Show file tree

Hide file tree

Showing 52 changed files with 2,798 additions and 172 deletions.
diff --git a/drizzle/client/0000_steady_jackpot.sql → drizzle/client/0000_charming_klaw.sql b/drizzle/client/0000_steady_jackpot.sql → drizzle/client/0000_charming_klaw.sql
@@ -1,9 +1,15 @@
+CREATE TABLE `localDeviceInfo` (
+	`deviceId` text NOT NULL,
+	`deviceInfo` text NOT NULL
+);
+--> statement-breakpoint
 CREATE TABLE `project_backlink` (
 	`versionId` text PRIMARY KEY NOT NULL
 );
 --> statement-breakpoint
 CREATE TABLE `projectKeys` (
 	`projectId` text PRIMARY KEY NOT NULL,
+	`projectPublicId` text NOT NULL,
 	`keysCipher` blob NOT NULL,
 	`projectInfo` text DEFAULT '{}' NOT NULL
 );
@@ -19,3 +25,5 @@ CREATE TABLE `project` (
 	`defaultPresets` text,
 	`forks` text NOT NULL
 );
+--> statement-breakpoint
+CREATE UNIQUE INDEX `localDeviceInfo_deviceId_unique` ON `localDeviceInfo` (`deviceId`);
diff --git a/drizzle/client/meta/0000_snapshot.json b/drizzle/client/meta/0000_snapshot.json
@@ -1,9 +1,40 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "a4afa0b6-5fd1-4c8d-bc09-7e3f3fc1928f",
+  "id": "518b4a6e-b310-4f08-a39e-5a046c1e1da9",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
+    "localDeviceInfo": {
+      "name": "localDeviceInfo",
+      "columns": {
+        "deviceId": {
+          "name": "deviceId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "deviceInfo": {
+          "name": "deviceInfo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "localDeviceInfo_deviceId_unique": {
+          "name": "localDeviceInfo_deviceId_unique",
+          "columns": [
+            "deviceId"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "project_backlink": {
       "name": "project_backlink",
       "columns": {
@@ -30,6 +61,13 @@
           "notNull": true,
           "autoincrement": false
         },
+        "projectPublicId": {
+          "name": "projectPublicId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "keysCipher": {
           "name": "keysCipher",
           "type": "blob",

diff --git a/drizzle/client/meta/_journal.json b/drizzle/client/meta/_journal.json
@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1693337118674,
-      "tag": "0000_steady_jackpot",
+      "when": 1694082554479,
+      "tag": "0000_charming_klaw",
       "breakpoints": true
     }
   ]

diff --git a/drizzle/project/0000_volatile_jackal.sql → drizzle/project/0000_large_wendell_rand.sql b/drizzle/project/0000_volatile_jackal.sql → drizzle/project/0000_large_wendell_rand.sql
@@ -17,6 +17,21 @@ CREATE TABLE `coreOwnership` (
 	`forks` text NOT NULL
 );
 --> statement-breakpoint
+CREATE TABLE `deviceInfo_backlink` (
+	`versionId` text PRIMARY KEY NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `deviceInfo` (
+	`docId` text PRIMARY KEY NOT NULL,
+	`versionId` text NOT NULL,
+	`schemaName` text NOT NULL,
+	`createdAt` text NOT NULL,
+	`updatedAt` text NOT NULL,
+	`links` text NOT NULL,
+	`name` text NOT NULL,
+	`forks` text NOT NULL
+);
+--> statement-breakpoint
 CREATE TABLE `field_backlink` (
 	`versionId` text PRIMARY KEY NOT NULL
 );

diff --git a/drizzle/project/meta/0000_snapshot.json b/drizzle/project/meta/0000_snapshot.json
@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "a4376411-f126-4579-adc2-da4f781d00bb",
+  "id": "c66bf0a9-28c1-446a-bc4b-51d4ec778947",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "coreOwnership_backlink": {
@@ -113,6 +113,87 @@
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
     },
+    "deviceInfo_backlink": {
+      "name": "deviceInfo_backlink",
+      "columns": {
+        "versionId": {
+          "name": "versionId",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "deviceInfo": {
+      "name": "deviceInfo",
+      "columns": {
+        "docId": {
+          "name": "docId",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "versionId": {
+          "name": "versionId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schemaName": {
+          "name": "schemaName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "links": {
+          "name": "links",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "forks": {
+          "name": "forks",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "field_backlink": {
       "name": "field_backlink",
       "columns": {

diff --git a/drizzle/project/meta/_journal.json b/drizzle/project/meta/_journal.json
@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1693481966662,
-      "tag": "0000_volatile_jackal",
+      "when": 1693999502360,
+      "tag": "0000_large_wendell_rand",
       "breakpoints": true
     }
   ]

diff --git a/package-lock.json b/package-lock.json