@cero-base/cero 0.8.1 → 0.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cero-base/cero",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "The ideal p2p API — everything is a handle, handles contain refs, refs contain rows.",
   "type": "module",
   "main": "./src/index.js",
@@ -64,6 +64,10 @@
     "crypto": {
       "bare": "bare-crypto",
       "default": "crypto"
+    },
+    "abort-controller": {
+      "bare": "bare-abort-controller",
+      "default": "bare-abort-controller"
     }
   },
   "scripts": {
@@ -74,8 +78,9 @@
     "test": "ls test/*.test.js | xargs -P1 -n1 brittle-node"
   },
   "dependencies": {
-    "@cero-base/core": "^0.8.1",
+    "@cero-base/core": "^0.8.3",
     "b4a": "^1.8.1",
+    "bare-abort-controller": "^1.1.2",
     "bare-crypto": "^1.13.7",
     "bare-fs": "^4.7.1",
     "bare-path": "^3.0.0",

package/src/handle/index.js

@@ -1,3 +1,4 @@
+import AbortController from 'abort-controller'
 import b4a from 'b4a'
 import Hypercore from 'hypercore'
 import { discoveryKey } from 'hypercore-crypto'
@@ -110,6 +111,7 @@ export class Handle extends ReadyResource {
     this._opts = opts.opts || {}
     this._onerror = this._opts.onerror || safetyCatch
     this.children = parent ? null : new Set()
+    this._loading = parent ? null : new Map()
     this._owned = new Set()
 
     this.store = new Database({
@@ -458,9 +460,9 @@ export class Handle extends ReadyResource {
   }
 
   /**
-   * Re-open an existing child handle by id. Reuses the stored writer
-   * keypair if available; otherwise generates a fresh one and claims
-   * writer capability.
+   * Get an open child by id, or re-open it. Concurrent calls for the same id
+   * share one in-flight load, so the child is built — and `handle` emitted —
+   * exactly once.
    *
    * @param {string} type
    * @param {string} id
@@ -468,6 +470,26 @@ export class Handle extends ReadyResource {
    */
   async _load(type, id) {
     for (const c of this.children) if (c.id === id) return c
+    const existing = this._loading.get(id)
+    if (existing) return existing
+    const loading = this._reopen(type, id)
+    this._loading.set(id, loading)
+    try {
+      return await loading
+    } finally {
+      this._loading.delete(id)
+    }
+  }
+
+  /**
+   * Reconstruct a child handle by id. Reuses the stored writer keypair if
+   * available; otherwise generates a fresh one and claims writer capability.
+   *
+   * @param {string} type
+   * @param {string} id
+   * @returns {Promise<Handle>}
+   */
+  async _reopen(type, id) {
     const { data } = await this.store.get('handles', id)
     if (!data) throw CeroError.UNKNOWN('handle', id)
     if (data.type !== type) throw new Error(`handle ${id} is type ${data.type}, not ${type}`)

package/src/index.js

@@ -113,9 +113,14 @@ export async function cero(dir, spec, opts = {}) {
   }
   if (opts.recovery) await me.recover({ timeout: opts.recoveryTimeout })
 
-  for (const ext of internal.extensions) {
-    const off = await ext.setup?.(me)
-    if (typeof off === 'function') me.once('close', off)
+  try {
+    for (const ext of internal.extensions) {
+      const off = await ext.setup?.(me)
+      if (typeof off === 'function') me.once('close', off)
+    }
+  } catch (err) {
+    await me.close().catch(() => {}) // a failed setup must not leak the half-built instance
+    throw err
   }
 
   return me

package/types/handle/index.d.ts

@@ -86,6 +86,7 @@ export class Handle extends ReadyResource {
     _opts: any;
     _onerror: any;
     children: Set<any>;
+    _loading: Map<any, any>;
     _owned: Set<any>;
     store: Database;
     pair: Pairing;
@@ -215,15 +216,24 @@ export class Handle extends ReadyResource {
      */
     _join(invite: string, type: string, { routes, timeout }?: JoinChildOpts): Promise<Handle>;
     /**
-     * Re-open an existing child handle by id. Reuses the stored writer
-     * keypair if available; otherwise generates a fresh one and claims
-     * writer capability.
+     * Get an open child by id, or re-open it. Concurrent calls for the same id
+     * share one in-flight load, so the child is built — and `handle` emitted —
+     * exactly once.
      *
      * @param {string} type
      * @param {string} id
      * @returns {Promise<Handle>}
      */
     _load(type: string, id: string): Promise<Handle>;
+    /**
+     * Reconstruct a child handle by id. Reuses the stored writer keypair if
+     * available; otherwise generates a fresh one and claims writer capability.
+     *
+     * @param {string} type
+     * @param {string} id
+     * @returns {Promise<Handle>}
+     */
+    _reopen(type: string, id: string): Promise<Handle>;
     /**
      * Pause networking + storage. Idempotent; no-op on child handles.
      *
@@ -379,4 +389,5 @@ export type Child = Handle & HandleExtra;
 import ReadyResource from 'ready-resource';
 import { Database } from '@cero-base/core/database';
 import { Pairing } from '@cero-base/core/pairing';
+import AbortController from 'abort-controller';
 import { Identity } from '@cero-base/core/identity';