@reticulum/dacar 1.2.2 → 1.4.0

package/README.md

@@ -19,9 +19,9 @@ This is a modern ES-module package with JSDoc type annotations that runs on
 | HMAC-SHA256 / SHA-256 (§3.3, §6.1) | Web Crypto `crypto.subtle` | Standard, runtime-portable |
 | MessagePack (§5.3) | `@reticulum/core` `MsgPack` | Reuses the canonical stack's encoder |
 
-`@reticulum/core` is the only dependency (for both the core and the optional
-transport adapters — which additionally use its `Destination`, `Link`,
-`LXMRouter`, and `RFedClient`).
+`@reticulum/core` is the base dependency of the pure core; the optional
+transport adapters additionally use `@reticulum/lxmf` (the `LXMRouter`),
+`@reticulum/rfed` (the `RFedClient`), and core's `Destination`/`Link`.
 
 > **Note on MessagePack + 64-bit HLCs:** a packed HLC (`physical_ms << 16`)
 > exceeds `Number.MAX_SAFE_INTEGER`, so it is represented as a `bigint`. The HLC
@@ -112,8 +112,9 @@ console.log(await engine.evaluate("sensor:wind", "read", ROOT)); // true
 
 The pure core has no transport: it is wired to the Reticulum transports by the
 optional `@reticulum/dacar/transport` subpath. Importing the core
-(`@reticulum/dacar`) never pulls it in, and every adapter depends only on
-`@reticulum/core` (already a core dependency), so it adds **no new dependency**.
+(`@reticulum/dacar`) never pulls it in. The transport adapters build on
+`@reticulum/core`, `@reticulum/lxmf`, and `@reticulum/rfed` (since reticulum-js
+0.8.2, LXMF and rfed are packages of their own rather than core subpaths).
 
 Every transport funnels received bytes through the same verify-on-ingest seam
 (`DeltaReceiver.applyPayload()`, §11.2.4): a Delta is decoded, authenticated by
@@ -159,7 +160,7 @@ import {
 ### RFed convergence
 
 ```js
-import { RFedClient } from "@reticulum/core";
+import { RFedClient } from "@reticulum/rfed";
 import { DeltaReceiver, StateVector } from "@reticulum/dacar";
 import { RfedDeltaSync } from "@reticulum/dacar/transport";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reticulum/dacar",
-  "version": "1.2.2",
+  "version": "1.4.0",
   "description": "JavaScript implementation of Dacar, a Decentralized Access Control system for Reticulum",
   "type": "module",
   "main": "src/index.js",
@@ -44,8 +44,10 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@reticulum/core": "^0.6.5",
-    "@reticulum/node": "^0.6.5",
+    "@reticulum/core": "^0.8.2",
+    "@reticulum/lxmf": "^0.8.2",
+    "@reticulum/node": "^0.8.2",
+    "@reticulum/rfed": "^0.8.2",
     "@types/node": "^26.2.0"
   },
   "publishConfig": {

package/src/cli/dacar.js

@@ -35,7 +35,7 @@ import process from "node:process";
 import { Identity, toHex } from "@reticulum/core";
 import { MemoryStorageAdapter } from "@reticulum/core";
 import { DacarFileAdapter } from "./fileStore.js";
-import { RFedClient } from "@reticulum/core/src/rfed/index.js";
+import { RFedClient } from "@reticulum/rfed";
 import { bootRns } from "./rns_boot.js";
 
 import { Action, Operation, Tuple, Engine } from "../index.js";

package/src/index.js

@@ -9,7 +9,7 @@
  * (§4.1), and the state is bounded by Time-Horizon Tombstone Pruning (§9).
  */
 
-export const __version__ = "1.0.0";
+export const __version__ = "1.4.0";
 export const __specVersion__ = "1.0-RC7";
 
 // HLC (§5.1)

package/src/transport/index.js

@@ -3,7 +3,9 @@
  *
  * These wire the pure, transport-agnostic core — the §8 `Challenge`/
  * `AuthoritativeServer`/`ChallengeClient` and the §11 `DeltaReceiver` — to the
- * concrete Reticulum transports from `@reticulum/core`:
+ * concrete Reticulum transports from `@reticulum/core`, `@reticulum/lxmf`, and
+ * `@reticulum/rfed` (since reticulum-js 0.8.2, LXMF and rfed are packages of
+ * their own rather than core subpaths):
  *
  *   - {@link RnsIdentityResolver}      §3.1, §11.2.4  recall → verify key
  *   - {@link RnsChallengeServer} &c.   §8             Challenge over an RNS Link
@@ -11,9 +13,8 @@
  *   - {@link RfedDeltaSync}            §11.1          RFed many-to-many convergence
  *
  * Importing the pure core (`@reticulum/dacar`) does **not** import this
- * subpath: it is opt-in via `@reticulum/dacar/transport`. Every adapter depends
- * only on `@reticulum/core`, which the core already depends on, so the
- * transport layer adds no new dependency.
+ * subpath: it is opt-in via `@reticulum/dacar/transport`. The adapters build
+ * on the `@reticulum/*` reticulum-js packages (core, lxmf, rfed).
  */
 
 export { RnsIdentityResolver } from "./rnsIdentity.js";

package/src/transport/lxmfSync.js

@@ -15,10 +15,10 @@
  * through the router.
  *
  * This module is part of the optional transport layer: importing the pure core
- * never pulls it in. It depends only on `@reticulum/core`, which the core
- * already depends on, so no new dependency is added.
+ * never pulls it in. It depends on `@reticulum/lxmf` (which itself builds on
+ * `@reticulum/core`).
  *
- * Typical use (receiver, wired to a {@link import("@reticulum/core/src/lxmf/index.js").LXMRouter
+ * Typical use (receiver, wired to a {@link import("@reticulum/lxmf").LXMRouter
  * LXMRouter}):
  *
  * ```js
@@ -38,7 +38,7 @@
  * await delivery.handleMessage(event.detail.message);
  */
 
-import { LXMessage as LXMFMessage } from "@reticulum/core/src/lxmf/index.js";
+import { LXMessage as LXMFMessage } from "@reticulum/lxmf";
 import { LXMF_DELIVERY_TITLE } from "../naming.js";
 
 /**
@@ -60,7 +60,7 @@ export function messageTitle(message) {
 /**
  * Best-effort content of an LXMF message as raw bytes (the §5.3 Delta payload).
  *
- * `@reticulum/core`'s `Message.deserialize()` UTF-8-decodes the content element
+ * `@reticulum/lxmf`'s `Message.deserialize()` UTF-8-decodes the content element
  * into `message.content`, which corrupts arbitrary binary Deltas. The raw bytes
  * are preserved on `_decodedPayload[2]` (the same field the library uses
  * internally for §5.6 signature re-verification), so this helper recovers the
@@ -99,13 +99,13 @@ export class LxmfDeltaDelivery {
    * @param {import("../delta.js").DeltaReceiver | null} [opts.receiver]
    *   The shared DeltaReceiver (state + key resolver). May be omitted on a
    *   send-only node (then `handleMessage` throws if called).
-   * @param {import("@reticulum/core/src/lxmf/index.js").LXMRouter | null} [opts.router]
+   * @param {import("@reticulum/lxmf").LXMRouter | null} [opts.router]
    *   Optional bound `LXMRouter` for `deliver` / `ingestPaperUri`.
    */
   constructor({ receiver = null, router = null } = {}) {
     /** @type {import("../delta.js").DeltaReceiver | null} */
     this._receiver = receiver;
-    /** @type {import("@reticulum/core/src/lxmf/index.js").LXMRouter | null} */
+    /** @type {import("@reticulum/lxmf").LXMRouter | null} */
     this._router = router;
   }
 
@@ -121,7 +121,7 @@ export class LxmfDeltaDelivery {
    * @param {Uint8Array} deltaPayload
    * @param {Uint8Array} destinationHash The recipient `lxmf.delivery` hash.
    * @param {Uint8Array} sourceHash The sender's `lxmf.delivery` hash.
-   * @returns {import("@reticulum/core/src/lxmf/index.js").LXMessage}
+   * @returns {import("@reticulum/lxmf").LXMessage}
    */
   makeMessage(deltaPayload, destinationHash, sourceHash) {
     if (!(deltaPayload instanceof Uint8Array)) {
@@ -145,7 +145,7 @@ export class LxmfDeltaDelivery {
    * @param {Uint8Array} destinationHash The recipient `lxmf.delivery` hash.
    * @param {Object} [opts]
    * @param {Uint8Array | null} [opts.linkId] Reuse an existing DIRECT link id.
-   * @returns {Promise<import("@reticulum/core/src/lxmf/index.js").LXMessage>}
+   * @returns {Promise<import("@reticulum/lxmf").LXMessage>}
    */
   async deliver(deltaPayload, destinationHash, { linkId = null } = {}) {
     if (!this._router) {
@@ -210,7 +210,7 @@ export class LxmfDeltaDelivery {
    * ingest result (the reconstructed message, or `null` if it was not for this
    * node / already ingested).
    * @param {string} uri
-   * @returns {Promise<import("@reticulum/core/src/lxmf/index.js").LXMessage | null>}
+   * @returns {Promise<import("@reticulum/lxmf").LXMessage | null>}
    */
   async ingestPaperUri(uri) {
     if (!this._router) {

package/src/transport/rfedSync.js

@@ -10,7 +10,7 @@
  * delivery — **never** through the unauthenticated `StateVector.merge()` path.
  * A forged or stale Delta is simply dropped before it can mutate state.
  *
- * `RfedDeltaSync` wraps a `@reticulum/core` `RFedClient`. A Delta travels in
+ * `RfedDeltaSync` wraps a `@reticulum/rfed` `RFedClient`. A Delta travels in
  * Dacar's **compact inner format** (§11.1.1): the raw §5.3 payload is placed
  * straight after the RTID source-identity prelude and EC-encrypted to the
  * derived channel identity — no LXMF envelope, which would only duplicate the
@@ -19,7 +19,7 @@
  * discriminator (every message on it is a Dacar Delta), and the recovered Delta
  * bytes are fed to `DeltaReceiver`.
  *
- * The compact format is built on `@reticulum/core`'s raw RFed primitives —
+ * The compact format is built on `@reticulum/rfed`'s raw RFed primitives —
  * `subscribeRaw` / `publishRaw` / `unwrapRawChannelMessage` — which carry an
  * arbitrary self-authenticating payload in place of the LXMF tail. The Delta's
  * own Ed25519 signature (§5.3 field [7]) is the authenticity check at
@@ -31,8 +31,8 @@
  * channel uses the compact format.
  *
  * This module is part of the optional transport layer: importing the pure core
- * never pulls it in. It depends only on `@reticulum/core`, which the core
- * already depends on, so no new dependency is added. It mirrors
+ * never pulls it in. It depends on `@reticulum/rfed` (which itself builds on
+ * `@reticulum/core`). It mirrors
  * `python/dacar/transport/rfed_sync.py` (the canonical implementation).
  *
  * Typical use:
@@ -46,17 +46,16 @@
  * ```
  */
 
-import { Destination } from "@reticulum/core/src/core/destination.js";
+import { Destination, MsgPack } from "@reticulum/core";
 import {
   deriveChannel,
   unwrapRawChannelMessage,
-} from "@reticulum/core/src/rfed/index.js";
-import { MicroMsgPack } from "@reticulum/core/src/utils/msgpack.js";
+} from "@reticulum/rfed";
 import { RFED_TOPIC } from "../naming.js";
 
 /**
  * The minimal `RFedClient` surface this adapter relies on. The real client from
- * `@reticulum/core` satisfies it; tests inject a fake. The raw-publish API
+ * `@reticulum/rfed` satisfies it; tests inject a fake. The raw-publish API
  * (`subscribeRaw` / `publishRaw`) carries a self-authenticating payload in the
  * RTID prelude instead of an LXMF envelope (§11.1.1).
  *
@@ -82,7 +81,7 @@ import { RFED_TOPIC } from "../naming.js";
  * @typedef {Object} RfedDecodedRaw
  * @property {"raw"|"lxmf"} kind
  * @property {Uint8Array} [payload] Raw application payload (`kind === "raw"`).
- * @property {import("@reticulum/core/src/core/identity.js").Identity} [senderIdentity]
+ * @property {import("@reticulum/core").Identity} [senderIdentity]
  * @property {Uint8Array} [senderPub]
  * @property {Uint8Array} [channelHash]
  * @property {string} [channelName]
@@ -100,7 +99,7 @@ export class RfedDeltaSync {
    * @param {import("../delta.js").DeltaReceiver | null} [opts.receiver]
    *   The shared DeltaReceiver (state + key resolver). May be omitted on a
    *   publish-only node (then `listen`/`pull` throw if called).
-   * @param {RFedClientLike} opts.client A `@reticulum/core` `RFedClient`.
+   * @param {RFedClientLike} opts.client A `@reticulum/rfed` `RFedClient`.
    * @param {string} [opts.topic] RFed channel name (default `dacar.policy.v1`).
    */
   constructor({ receiver = null, client, topic = RFED_TOPIC }) {
@@ -191,7 +190,7 @@ export class RfedDeltaSync {
       // needing an announce. Best-effort: decode must still succeed without it.
       try {
         // Extract issuer_hash (field [0]) from the delta to map identity.
-        const decodedDelta = MicroMsgPack.decode(decoded.payload);
+        const decodedDelta = MsgPack.decode(decoded.payload);
         if (Array.isArray(decodedDelta) && decodedDelta.length > 0) {
           const issuerHash = decodedDelta[0];
           if (issuerHash instanceof Uint8Array && issuerHash.length === 16) {
@@ -252,7 +251,7 @@ export class RfedDeltaSync {
           // needing an announce. Best-effort: decode must still succeed without it.
           try {
             // Extract issuer_hash (field [0]) from the delta to map identity.
-            const decodedDelta = MicroMsgPack.decode(decoded.payload);
+            const decodedDelta = MsgPack.decode(decoded.payload);
             if (Array.isArray(decodedDelta) && decodedDelta.length > 0) {
               const issuerHash = decodedDelta[0];
               if (issuerHash instanceof Uint8Array && issuerHash.length === 16) {

package/src/transport/rnsIdentity.js

@@ -21,9 +21,8 @@
  * identities always win.
  *
  * This module is part of the optional transport layer: importing the pure
- * core (`@reticulum/dacar`) never pulls it in. It depends only on
- * `@reticulum/core`'s `Destination.recall`, which the core already depends on
- * for `Identity` / `MsgPack`, so it adds no new dependency.
+ * core (`@reticulum/dacar`) never pulls it in. It uses only `@reticulum/core`'s
+ * `Destination.recall`.
  */
 
 import { Destination } from "@reticulum/core";