Merge branch 'main' into test-cancel-then-invite-again

digidem · Sep 9, 2024 · 4c18caf · 4c18caf
2 parents 669747c + 9b72be8
commit 4c18caf
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 48 deletions.
diff --git a/drizzle/client/0000_cultured_nick_fury.sql → drizzle/client/0000_chemical_star_brand.sql b/drizzle/client/0000_cultured_nick_fury.sql → drizzle/client/0000_chemical_star_brand.sql
diff --git a/drizzle/client/meta/0000_snapshot.json b/drizzle/client/meta/0000_snapshot.json
@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "efbe54ff-5195-4127-b634-76e303657276",
+  "id": "41e23fc3-463e-432a-9a5f-7c20366d6294",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "localDeviceInfo": {

diff --git a/drizzle/client/meta/_journal.json b/drizzle/client/meta/_journal.json
@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1724972191819,
-      "tag": "0000_cultured_nick_fury",
+      "when": 1725381616476,
+      "tag": "0000_chemical_star_brand",
       "breakpoints": true
     }
   ]

diff --git a/drizzle/project/0000_woozy_stryfe.sql → drizzle/project/0000_tan_glorian.sql b/drizzle/project/0000_woozy_stryfe.sql → drizzle/project/0000_tan_glorian.sql
@@ -61,7 +61,7 @@ CREATE TABLE `field` (
 	`appearance` text,
 	`snakeCase` integer,
 	`options` text,
-	`universal` integer DEFAULT false NOT NULL,
+	`universal` integer,
 	`placeholder` text,
 	`helperText` text,
 	`forks` text NOT NULL
@@ -126,7 +126,7 @@ CREATE TABLE `preset` (
 	`addTags` text NOT NULL,
 	`removeTags` text NOT NULL,
 	`fieldRefs` text NOT NULL,
-	`iconRef` text NOT NULL,
+	`iconRef` text,
 	`terms` text NOT NULL,
 	`color` text NOT NULL,
 	`forks` text 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": "2be32705-ddce-45ee-97c1-c6f2fc748568",
+  "id": "b06de2c5-6a4c-4578-a8f0-d15f9f20e902",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "coreOwnership_backlink": {
@@ -373,9 +373,8 @@
           "name": "universal",
           "type": "integer",
           "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
+          "notNull": false,
+          "autoincrement": false
         },
         "placeholder": {
           "name": "placeholder",
@@ -757,7 +756,7 @@
           "name": "iconRef",
           "type": "text",
           "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
           "autoincrement": false
         },
         "terms": {

diff --git a/drizzle/project/meta/_journal.json b/drizzle/project/meta/_journal.json
@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1724972190927,
-      "tag": "0000_woozy_stryfe",
+      "when": 1725381611574,
+      "tag": "0000_tan_glorian",
       "breakpoints": true
     }
   ]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mapeo/core",
-  "version": "9.0.0-alpha.20",
+  "version": "9.0.0-alpha.23",
   "description": "Offline p2p mapping library",
   "main": "src/index.js",
   "types": "dist/index.d.ts",
@@ -107,10 +107,11 @@
   "devDependencies": {
     "@bufbuild/buf": "^1.26.1",
     "@mapeo/default-config": "4.0.0-alpha.8",
-    "@mapeo/mock-data": "^1.0.3-alpha.4",
+    "@mapeo/mock-data": "^1.0.3-alpha.5",
     "@sinonjs/fake-timers": "^10.0.2",
     "@types/b4a": "^1.6.0",
     "@types/bogon": "^1.0.2",
+    "@types/compact-encoding": "^2.15.0",
     "@types/debug": "^4.1.8",
     "@types/json-schema": "^7.0.11",
     "@types/json-stable-stringify": "^1.0.36",
@@ -155,7 +156,7 @@
     "@fastify/type-provider-typebox": "^4.0.0",
     "@hyperswarm/secret-stream": "^6.1.2",
     "@mapeo/crypto": "1.0.0-alpha.10",
-    "@mapeo/schema": "^3.0.0-next.23",
+    "@mapeo/schema": "^3.0.0-next.26",
     "@mapeo/sqlite-indexer": "1.0.0-alpha.9",
     "@sinclair/typebox": "^0.29.6",
     "b4a": "^1.6.3",

diff --git a/src/mapeo-manager.js b/src/mapeo-manager.js
@@ -699,7 +699,14 @@ export class MapeoManager extends TypedEmitter {
   }
 
   /**
-   * @template {import('type-fest').Exact<import('./schema/client.js').DeviceInfoParam, T>} T
+   * @typedef {Exclude<
+   * import('./schema/client.js').DeviceInfoParam['deviceType'],
+   * 'selfHostedServer'>} RPCDeviceType
+   */
+
+  /**
+   * @template {import('type-fest').Exact<
+   * import('./schema/client.js').DeviceInfoParam & {deviceType?: RPCDeviceType}, T>} T
    * @param {T} deviceInfo
    */
   async setDeviceInfo(deviceInfo) {

diff --git a/types/compact-encoding.d.ts b/types/compact-encoding.d.ts
diff --git a/types/protomux.d.ts b/types/protomux.d.ts
@@ -1,30 +1,13 @@
 declare module 'protomux' {
   import { Duplex } from 'streamx'
   import { Duplex as NodeDuplex } from 'stream'
-
-  interface PreEncodingState {
-    buffer: null
-    start: number
-    end: number
-  }
-
-  interface EncodingState {
-    buffer: null | Buffer
-    start: number
-    end: number
-  }
-
-  interface Encoding {
-    preencode(state: PreEncodingState, value: any): void
-    encode(state: EncodingState, value: any): void
-    decode(state: EncodingState): any
-  }
+  import type cenc from 'compact-encoding'
 
   interface Message {
     type: number
     send(msg: any): void
     onmessage: (message: any) => void
-    encoding: Encoding
+    encoding: cenc.Encoder
   }
 
   type MessageOptions = Partial<Pick<Message, 'onmessage' | 'encoding'>>
@@ -65,7 +48,7 @@ declare module 'protomux' {
       aliases?: string[]
       id?: null | Buffer
       unique?: boolean
-      handshake?: Encoding
+      handshake?: cenc.Encoder
       messages: MessageOptions[]
       onopen?(handshake?: any): Promise<void> | void
       onclose?(): Promise<void> | void