@kubun/store-p2p 0.18.1 → 0.20.0

package/lib/scope.js

@@ -0,0 +1,8 @@
+import { withKeyLocks } from '@kubun/db';
+export const runP2PScope = Symbol('runP2PScope');
+export async function withP2PKeyLocks(context, table, keys, run) {
+    return await withKeyLocks(context.provider, table, keys, async (provider)=>{
+        const store = await provider.getStore('p2p');
+        return await store[runP2PScope](run);
+    });
+}

package/lib/tables.d.ts

@@ -1,6 +1,7 @@
 import type { CreatedAtColumn, UpdatedAtColumn } from '@kubun/db-adapter';
 import type { AnchorSlot, AppOutboxEntry, CommitCursor } from '@kumiai/rpc';
 import type { ColumnType, Insertable, Selectable, Updateable } from 'kysely';
+import type { CatalogCursorBounds } from './ops/catalog-sync.js';
 type DefaultedStringColumn = ColumnType<string, string | undefined, string>;
 type DefaultedNumberColumn = ColumnType<number, number | undefined, number>;
 type NullableStringColumn = ColumnType<string | null, string | null | undefined, string | null>;
@@ -86,7 +87,7 @@ export type CatalogCursorTable = {
     last_token: NullableStringColumn;
     cycle_clear: DefaultedNumberColumn;
     /** JSON object: bound-free rule key to its absolute `{ from, to }`. */
-    bounds: string;
+    bounds: JSONValueColumn<Record<string, CatalogCursorBounds>>;
 };
 export type DocumentRepairTable = {
     group_id: string;
@@ -157,7 +158,7 @@ export type GroupMLSStateTable = {
     group_id: string;
     device_id: string;
     mls_state: Uint8Array;
-    credential: string;
+    credential: JSONValueColumn<unknown>;
     epoch: number;
     /** Orders secret-tree mutations within one MLS epoch. */
     state_version: DefaultedNumberColumn;
@@ -171,12 +172,21 @@ export type GroupMLSStateTable = {
      * held before: without them the fold reverts to the genesis anchor alone and
      * every admin but the creator loses authority across a restart.
      */
-    ledger_entries: DefaultedStringColumn;
+    ledger_entries: JSONArrayColumn<string>;
     updated_at: UpdatedAtColumn;
 };
-export type GroupMLSState = Selectable<GroupMLSStateTable>;
-export type InsertGroupMLSState = Insertable<GroupMLSStateTable>;
-export type UpdateGroupMLSState = Updateable<GroupMLSStateTable>;
+export type GroupMLSState = Omit<Selectable<GroupMLSStateTable>, 'credential' | 'ledger_entries'> & {
+    credential: unknown;
+    ledger_entries: Array<string>;
+};
+export type InsertGroupMLSState = Omit<Insertable<GroupMLSStateTable>, 'credential' | 'ledger_entries'> & {
+    credential: string;
+    ledger_entries?: string;
+};
+export type UpdateGroupMLSState = Omit<Updateable<GroupMLSStateTable>, 'credential' | 'ledger_entries'> & {
+    credential?: string;
+    ledger_entries?: string;
+};
 export type SyncPeerTable = {
     id: string;
     peer_did: string;
@@ -390,44 +400,44 @@ export type BindingEvidenceTable = {
     first_seen_at: CreatedAtColumn;
 };
 export type P2PStoreTables = {
-    kubun_p2p_access_default_revocations: {
+    p2p_access_default_revocations: {
         controller_did: string;
         device_did: string;
     };
-    kubun_p2p_binding_evidence: BindingEvidenceTable;
-    kubun_p2p_own_agents_records: OwnAgentsRecordTable;
-    kubun_p2p_own_agents_grants: OwnAgentsGrantTable;
-    kubun_p2p_own_agents_join_capabilities: OwnAgentsJoinCapabilityTable;
-    kubun_p2p_groups: GroupTable;
-    kubun_p2p_group_members: GroupMemberTable;
-    kubun_p2p_catalog_offers: CatalogOfferTable;
-    kubun_p2p_catalog_routes: CatalogRouteTable;
-    kubun_p2p_unserved_groups: UnservedGroupTable;
-    kubun_p2p_catalog_cursors: CatalogCursorTable;
-    kubun_p2p_document_repairs: DocumentRepairTable;
-    kubun_p2p_document_repair_answers: DocumentRepairAnswerTable;
-    kubun_p2p_observation_repairs: ObservationRepairScheduleTable;
-    kubun_p2p_observation_repair_peers: ObservationRepairPeerTable;
-    kubun_p2p_group_leave_requests: GroupLeaveRequestTable;
-    kubun_p2p_circles: CircleTable;
-    kubun_p2p_circle_members: CircleMemberTable;
-    kubun_p2p_group_delegation: GroupDelegationTable;
-    kubun_p2p_group_mls_state: GroupMLSStateTable;
-    kubun_p2p_sync_peers: SyncPeerTable;
-    kubun_p2p_sync_checkpoints: SyncCheckpointTable;
-    kubun_p2p_broadcast_log: BroadcastLogTable;
-    kubun_p2p_log_handler_completion: LogHandlerCompletionTable;
-    kubun_p2p_control_requests: ControlRequestTable;
-    kubun_p2p_commit_journal: CommitJournalEntryTable;
-    kubun_p2p_group_anchor: GroupAnchorTable;
-    kubun_p2p_app_outbox: AppOutboxTable;
-    kubun_p2p_app_outbox_state: AppOutboxStateTable;
-    kubun_p2p_app_cursor: AppCursorTable;
-    kubun_p2p_app_pending: PendingAppFrameTable;
-    kubun_p2p_hubs: HubTable;
-    kubun_p2p_group_hubs: GroupHubTable;
-    kubun_p2p_peer_announcements: PeerAnnouncementTable;
-    kubun_p2p_local_peer_profile: LocalPeerProfileTable;
-    kubun_p2p_pending_join_requests: PendingJoinRequestTable;
+    p2p_binding_evidence: BindingEvidenceTable;
+    p2p_own_agents_records: OwnAgentsRecordTable;
+    p2p_own_agents_grants: OwnAgentsGrantTable;
+    p2p_own_agents_join_capabilities: OwnAgentsJoinCapabilityTable;
+    p2p_groups: GroupTable;
+    p2p_group_members: GroupMemberTable;
+    p2p_catalog_offers: CatalogOfferTable;
+    p2p_catalog_routes: CatalogRouteTable;
+    p2p_unserved_groups: UnservedGroupTable;
+    p2p_catalog_cursors: CatalogCursorTable;
+    p2p_document_repairs: DocumentRepairTable;
+    p2p_document_repair_answers: DocumentRepairAnswerTable;
+    p2p_observation_repairs: ObservationRepairScheduleTable;
+    p2p_observation_repair_peers: ObservationRepairPeerTable;
+    p2p_group_leave_requests: GroupLeaveRequestTable;
+    p2p_circles: CircleTable;
+    p2p_circle_members: CircleMemberTable;
+    p2p_group_delegation: GroupDelegationTable;
+    p2p_group_mls_state: GroupMLSStateTable;
+    p2p_sync_peers: SyncPeerTable;
+    p2p_sync_checkpoints: SyncCheckpointTable;
+    p2p_broadcast_log: BroadcastLogTable;
+    p2p_log_handler_completion: LogHandlerCompletionTable;
+    p2p_control_requests: ControlRequestTable;
+    p2p_commit_journal: CommitJournalEntryTable;
+    p2p_group_anchor: GroupAnchorTable;
+    p2p_app_outbox: AppOutboxTable;
+    p2p_app_outbox_state: AppOutboxStateTable;
+    p2p_app_cursor: AppCursorTable;
+    p2p_app_pending: PendingAppFrameTable;
+    p2p_hubs: HubTable;
+    p2p_group_hubs: GroupHubTable;
+    p2p_peer_announcements: PeerAnnouncementTable;
+    p2p_local_peer_profile: LocalPeerProfileTable;
+    p2p_pending_join_requests: PendingJoinRequestTable;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/store-p2p",
-  "version": "0.18.1",
+  "version": "0.20.0",
   "keywords": [],
   "license": "see LICENSE.md",
   "sideEffects": false,
@@ -15,22 +15,23 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "@kokuin/capability": "^0.4.2",
-    "@kokuin/controller": "^0.1.0",
-    "@kokuin/token": "^0.5.1",
-    "@kubun/db": "^0.18.0",
-    "@kubun/db-adapter": "^0.18.0",
-    "@kubun/logger": "^0.18.0",
-    "@kubun/records": "^0.18.0",
-    "@kumiai/rpc": "^0.10.9",
+    "@kokuin/capability": "^0.7.0",
+    "@kokuin/controller": "^0.7.0",
+    "@kokuin/crypto": "^0.7.0",
+    "@kokuin/records": "^0.7.1",
+    "@kokuin/token": "^0.7.0",
+    "@kubun/db": "^0.20.0",
+    "@kubun/db-adapter": "^0.20.0",
+    "@kubun/logger": "^0.20.0",
+    "@kumiai/rpc": "^0.13.1",
     "@noble/ciphers": "^2.4.0",
     "@sozai/runtime": "^0.1.0",
-    "kysely": "^0.29.7"
+    "kysely": "^0.29.8"
   },
   "devDependencies": {
-    "@kubun/db-better-sqlite": "^0.18.0",
-    "@kubun/db-postgres": "^0.18.0",
-    "@kubun/hlc": "^0.18.0",
+    "@hozon/node-sqlite": "^0.3.0",
+    "@hozon/postgres": "^0.2.1",
+    "@sozai/hlc": "^0.1.0",
     "@testcontainers/postgresql": "^12.2.1"
   },
   "publishConfig": {