@cero-base/core 0.5.2 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cero-base/core",
-  "version": "0.5.2",
+  "version": "0.7.0",
   "description": "cero p2p primitives — identity, storage, network, database, blobs, rpc, pairing.",
   "type": "module",
   "main": "./src/index.js",

package/src/database/bootstrap.js

@@ -1,5 +1,6 @@
 import Hypercore from 'hypercore'
 import { Identity } from '../identity/index.js'
+import { toId } from '../lib/utils.js'
 
 /**
  * First-run device provisioning: mint a device writer keypair, persist it as a
@@ -45,7 +46,13 @@ async function saveWriter(db, writerKey, { name, isMobile }) {
       {
         master: db.identity.publicKey,
         writer: writerKey,
-        sig: db.identity.sign(writerKey),
+        sig: db.identity.sign(writerKey)
+      }
+    ],
+    [
+      'set-device',
+      {
+        id: toId(writerKey),
         name: name || null,
         isMobile: isMobile === true
       }

package/src/database/dispatch.js

@@ -37,6 +37,11 @@ export function makeDispatcher(spec, ns, routes) {
     if (kind === COLLECTION) await insert(ctx.view, name, col, op)
     else await ctx.view.insert(col, op)
   }
+  const update = (name, col) => async (op, ctx) => {
+    const existing = await ctx.view.get(col, { id: op.id })
+    if (!existing) return
+    await insert(ctx.view, name, col, { ...existing, ...op })
+  }
   const remove = (col) => async (op, ctx) => ctx.view.delete(col, op)
   const add = (verb, fn) => dispatcher.add(`@${ns}/${verb}`, fn)
 
@@ -47,8 +52,6 @@ export function makeDispatcher(spec, ns, routes) {
     await insert(ctx.view, 'devices', `@${ns}/devices`, {
       id: toId(op.writer),
       memberId: toId(op.master),
-      name: op.name || null,
-      isMobile: op.isMobile === true,
       createdAt: ts,
       updatedAt: ts
     })
@@ -69,8 +72,6 @@ export function makeDispatcher(spec, ns, routes) {
     await insert(ctx.view, 'devices', `@${ns}/devices`, {
       id: toId(op.writer),
       memberId,
-      name: op.name || null,
-      isMobile: op.isMobile === true,
       createdAt: ts,
       updatedAt: ts
     })
@@ -120,12 +121,18 @@ export function makeDispatcher(spec, ns, routes) {
       })
       add(`set-${b.verb}`, async (op, ctx) => {
         const existing = await device(ctx.view, op.id)
-        await insert(ctx.view, b.name, col, { ...op, memberId: existing?.memberId ?? null })
+        const ts = Date.now()
+        await insert(ctx.view, b.name, col, {
+          ...op,
+          memberId: existing?.memberId ?? op.memberId ?? null,
+          createdAt: existing?.createdAt ?? ts,
+          updatedAt: ts
+        })
       })
       continue
     }
     add(`add-${b.verb}`, upsert(b.name, col, COLLECTION))
-    add(`set-${b.verb}`, upsert(b.name, col, COLLECTION))
+    add(`set-${b.verb}`, update(b.name, col))
     add(`del-${b.verb}`, remove(col))
   }
 
@@ -138,7 +145,7 @@ export function makeDispatcher(spec, ns, routes) {
     }
     const col = `@${ns}/${name}`
     const kind = info.kind === SINGLE ? SINGLE : COLLECTION
-    add(`set-${name}`, upsert(name, col, kind))
+    add(`set-${name}`, kind === SINGLE ? upsert(name, col, kind) : update(name, col))
     if (info.kind === SINGLE) continue
     add(`add-${name}`, upsert(name, col, COLLECTION))
     add(`del-${name}`, remove(col))

package/src/database/index.js

@@ -243,13 +243,16 @@ export class Database extends ReadyResource {
   }
 
   /**
-   * Upsert by merging with the existing row, preserving `createdAt`.
+   * Upsert by merging with the existing row, preserving `createdAt`. Pass
+   * `{ upsert: false }` to update-only — a missing row is left untouched
+   * (checked atomically in the dispatch, so it never resurrects a deleted row).
    *
    * @param {string} name
    * @param {Record<string, any>} row
+   * @param {{ upsert?: boolean }} [opts]
    * @returns {Promise<SingleResult | null>}
    */
-  async set(name, row) {
+  async set(name, row, { upsert = true } = {}) {
     this.guard()
     const ref = this.ref(name)
     const col = this.col(ref)
@@ -260,6 +263,7 @@ export class Database extends ReadyResource {
         : row?.id
           ? ((await this.view.get(col, { id: row.id })) ?? null)
           : null
+    if (!upsert && !existing) return null
     const stored = {
       ...existing,
       ...row,
@@ -271,7 +275,11 @@ export class Database extends ReadyResource {
     const ctx = { op: 'set', name, row: stored }
     if ((await this.runBefore('set', ctx)) === false) return null
 
-    await this.write([[`set-${ref.verb}`, ctx.row]])
+    // member/device have bespoke set handlers — only generic collections upsert via add-
+    const special = ref.verb === 'member' || ref.verb === 'device'
+    const verb =
+      ref.kind === COLLECTION && upsert && !special ? `add-${ref.verb}` : `set-${ref.verb}`
+    await this.write([[verb, ctx.row]])
 
     const result = { data: ctx.row }
     await this.runAfter('set', { ...ctx, result })
@@ -422,12 +430,12 @@ export class Database extends ReadyResource {
 
   /**
    * Claim writership on an existing room by signing our writer key with the
-   * member identity and appending optimistically.
+   * member identity and appending optimistically. Admission only — the device
+   * is named separately (bootstrap → set-device).
    *
-   * @param {{ name?: string | null, isMobile?: boolean }} [opts]
    * @returns {Promise<void>}
    */
-  async claim({ name = null, isMobile = false } = {}) {
+  async claim() {
     this.guard()
     if (this.bee.writable) return
 
@@ -436,9 +444,7 @@ export class Database extends ReadyResource {
     const encoded = this.spec.dispatch.encode(`@${this.ns}/claim-writer`, {
       identity: this.identity.publicKey,
       writer: writerKey,
-      sig,
-      name,
-      isMobile
+      sig
     })
     await this.bee.append(encoded, { optimistic: true })
     await this.bee.update()
@@ -549,12 +555,7 @@ export class Database extends ReadyResource {
       signers: [{ publicKey }]
     })
     const sig = this.identity.sign(writerKey)
-    await this.write([
-      [
-        verb,
-        { master: this.identity.publicKey, writer: writerKey, sig, name: null, isMobile: false }
-      ]
-    ])
+    await this.write([[verb, { master: this.identity.publicKey, writer: writerKey, sig }]])
     await this.runAfter(hook, ctx)
   }
 }

package/src/lib/schema.js

@@ -2,7 +2,7 @@ import { CeroError } from './errors.js'
 import { SINGLE, COLLECTION, ACTION } from './constants.js'
 
 /**
- * @typedef {{ prim: string }} Prim
+ * @typedef {{ prim: string, required?: boolean }} Prim
  * @typedef {{ kind: 'single' | 'collection' | 'action', fields: Record<string, Prim> }} TypeDef
  * @typedef {{ [name: string]: TypeDef | Record<string, TypeDef> } & { local?: Record<string, TypeDef> }} SchemaDefs
  * @typedef {{ defs: SchemaDefs }} Schema
@@ -25,6 +25,14 @@ export const t = {
   fixed32: prim('fixed32'),
   fixed64: prim('fixed64'),
 
+  /**
+   * Mark a field as required. Fields are optional by default.
+   *
+   * @param {Prim} marker
+   * @returns {Prim}
+   */
+  required: (marker) => ({ ...marker, required: true }),
+
   /**
    * Single-row table (one record, set/get by name).
    *
@@ -53,6 +61,17 @@ export const t = {
    */
   action(fields) {
     return { kind: ACTION, fields }
+  },
+
+  /**
+   * Add fields to a builtin type (members, devices, …). Merged into the
+   * builtin's base fields at build time; redeclaring a base field throws.
+   *
+   * @param {Record<string, Prim>} fields
+   * @returns {{ kind: 'extend', fields: Record<string, Prim> }}
+   */
+  extend(fields) {
+    return { kind: 'extend', fields }
   }
 }
 

package/types/database/index.d.ts

@@ -126,13 +126,18 @@ export class Database extends ReadyResource {
      */
     put(name: string, row: Record<string, any>): Promise<SingleResult | null>;
     /**
-     * Upsert by merging with the existing row, preserving `createdAt`.
+     * Upsert by merging with the existing row, preserving `createdAt`. Pass
+     * `{ upsert: false }` to update-only — a missing row is left untouched
+     * (checked atomically in the dispatch, so it never resurrects a deleted row).
      *
      * @param {string} name
      * @param {Record<string, any>} row
+     * @param {{ upsert?: boolean }} [opts]
      * @returns {Promise<SingleResult | null>}
      */
-    set(name: string, row: Record<string, any>): Promise<SingleResult | null>;
+    set(name: string, row: Record<string, any>, { upsert }?: {
+        upsert?: boolean;
+    }): Promise<SingleResult | null>;
     /**
      * Delete by id (collection) or wipe the whole single-row table.
      *
@@ -210,15 +215,12 @@ export class Database extends ReadyResource {
     }>;
     /**
      * Claim writership on an existing room by signing our writer key with the
-     * member identity and appending optimistically.
+     * member identity and appending optimistically. Admission only — the device
+     * is named separately (bootstrap → set-device).
      *
-     * @param {{ name?: string | null, isMobile?: boolean }} [opts]
      * @returns {Promise<void>}
      */
-    claim({ name, isMobile }?: {
-        name?: string | null;
-        isMobile?: boolean;
-    }): Promise<void>;
+    claim(): Promise<void>;
     /**
      * Resolve once the bee becomes writable, or reject after `timeout` ms.
      *

package/types/lib/schema.d.ts

@@ -14,6 +14,7 @@ export namespace t {
     let json: Prim;
     let fixed32: Prim;
     let fixed64: Prim;
+    function required(marker: Prim): Prim;
     /**
      * Single-row table (one record, set/get by name).
      *
@@ -35,9 +36,21 @@ export namespace t {
      * @returns {TypeDef}
      */
     function action(fields: Record<string, Prim>): TypeDef;
+    /**
+     * Add fields to a builtin type (members, devices, …). Merged into the
+     * builtin's base fields at build time; redeclaring a base field throws.
+     *
+     * @param {Record<string, Prim>} fields
+     * @returns {{ kind: 'extend', fields: Record<string, Prim> }}
+     */
+    function extend(fields: Record<string, Prim>): {
+        kind: "extend";
+        fields: Record<string, Prim>;
+    };
 }
 export type Prim = {
     prim: string;
+    required?: boolean;
 };
 export type TypeDef = {
     kind: "single" | "collection" | "action";