@interop/was-react 0.6.0 → 0.7.0

package/dist/storage/wasSync.js

@@ -22,12 +22,12 @@ import { SharedCollectionReader } from './sharedCollectionReader.js';
  * @param [options.identityKeys.keyResolver] {IKeyResolver}
  * @param [options.onAuthError] {() => void}   fired when replication hits a
  *   401/403 (expired/revoked access) -- wired to the reconnect banner
- * @param [options.onMarkersFetched] {(markers) => void | Promise<void>}   given
- *   the freshly fetched per-collection encryption markers (by WAS collection
- *   id), to refresh the offline marker cache
+ * @param [options.onDescriptorsFetched] {(descriptors) => void | Promise<void>}   given
+ *   the freshly fetched per-collection encryption descriptors (by WAS collection
+ *   id), to refresh the offline descriptor cache
  * @returns {Promise<WasSyncBootstrap>}
  */
-export async function startWasSync({ parsed, zcapClient, collections, localStore, syncController, onRemoteChange, sharedCollections = [], identityKeys, onAuthError, onMarkersFetched }) {
+export async function startWasSync({ parsed, zcapClient, collections, localStore, syncController, onRemoteChange, sharedCollections = [], identityKeys, onAuthError, onDescriptorsFetched }) {
     const remoteStore = WasRemoteStore.fromGrants({
         parsed,
         zcapClient,
@@ -37,43 +37,43 @@ export async function startWasSync({ parsed, zcapClient, collections, localStore
     // replicate into an unmarked collection just the same, and a query against
     // undeclared indexes fails with a descriptive 400). Each helper skips the
     // collections it does not apply to (reported ok + skipped): the encryption
-    // marker skips public collections, the indexes declaration skips private
+    // descriptor skips public collections, the indexes declaration skips private
     // ones and public ones with no declared indexes.
     const sharedIds = new Set(sharedCollections.map(entry => entry.id));
     await Promise.all(Object.keys(parsed.byCollectionId)
         .filter(collectionId => !sharedIds.has(collectionId))
         .map(async (collectionId) => {
-        const marker = await remoteStore.markCollectionEncrypted(collectionId);
-        if (!marker.ok) {
-            console.warn(`Encryption marker PUT not authorized for "${collectionId}" (status ${marker.status ?? 'n/a'}).`);
+        const declared = await remoteStore.markCollectionEncrypted(collectionId);
+        if (!declared.ok) {
+            console.warn(`Encryption descriptor PUT not authorized for "${collectionId}" (status ${declared.status ?? 'n/a'}).`);
         }
         const indexes = await remoteStore.declareCollectionIndexes(collectionId);
         if (!indexes.ok) {
             console.warn(`Indexes declaration PUT not authorized for "${collectionId}" (status ${indexes.status ?? 'n/a'}).`);
         }
     }));
-    // Fetch each granted private collection's encryption marker: rebuild that
+    // Fetch each granted private collection's encryption descriptor: rebuild that
     // collection's cipher when its epoch roster differs from what the local store
     // opened with (a wallet-side rotation, or first-ever epochs), and hand the
-    // fresh set to the marker-cache refresher so an offline session can rebuild
+    // fresh set to the descriptor-cache refresher so an offline session can rebuild
     // its epoch-aware ciphers without a live read.
     const privateIds = collections
         .filter(collection => collection.visibility !== 'public')
         .map(collection => collection.id)
         .filter(id => parsed.byCollectionId[id] !== undefined);
-    const markers = {};
+    const descriptors = {};
     await Promise.all(privateIds.map(async (collectionId) => {
         const encryption = await remoteStore.readCollectionEncryption(collectionId);
         if (encryption) {
-            markers[collectionId] = encryption;
-            await localStore.applyRemoteMarker({ collectionId, encryption });
+            descriptors[collectionId] = encryption;
+            await localStore.applyRemoteDescriptor({ collectionId, encryption });
         }
     }));
     // Install the one-shot epoch refresher so a decrypt that meets an unseen epoch
-    // (a rotation on another device) re-reads the marker and rebuilds the cipher.
+    // (a rotation on another device) re-reads the descriptor and rebuilds the cipher.
     localStore.setEpochRefresher(collectionId => remoteStore.readCollectionEncryption(collectionId));
-    if (onMarkersFetched) {
-        await onMarkersFetched(markers);
+    if (onDescriptorsFetched) {
+        await onDescriptorsFetched(descriptors);
     }
     // Shared collections stay entirely out of replication: one read-only reader
     // each, opened over the delegated read zcap and the collection's epoch

package/dist/storage/wasSync.js.map

@@ -1 +1 @@
-{"version":3,"file":"wasSync.js","sourceRoot":"","sources":["../../src/storage/wasSync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wasSync.js","sourceRoot":"","sources":["../../src/storage/wasSync.ts"],"names":[],"mappings":"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"}

package/dist/sync/docCipher.d.ts

@@ -79,10 +79,10 @@ export declare function createPlaintextDocCodec({ collectionId }: {
  * (constant bump / toggle / re-categorize edits).
  *
  * Delegates to `@interop/was-client`'s `createEdvDocCipher`: with no
- * `encryption` marker (or a marker with no key epochs) the cipher is
+ * `encryption` descriptor (or a descriptor with no key epochs) the cipher is
  * single-recipient (the key-agreement key encrypts and decrypts directly, the
- * behavior every collection has had); with epochs on the marker the cipher
- * becomes multi-recipient -- writes stamp the marker's current epoch and reads
+ * behavior every collection has had); with epochs on the descriptor the cipher
+ * becomes multi-recipient -- writes stamp the descriptor's current epoch and reads
  * route by the envelope's recipient key id, while a pre-epoch envelope still
  * decrypts through the single-key path (a permanent tolerance, not a migration
  * shim). The returned cipher's shape matches {@link DocCipher} exactly; only the
@@ -93,7 +93,7 @@ export declare function createPlaintextDocCodec({ collectionId }: {
  * @param options.keyResolver {IKeyResolver}
  * @param options.collectionId {string}   labels errors; the codec is agnostic
  * @param [options.encryption] {CollectionEncryption}   the collection's
- *   encryption marker; when it carries key epochs the cipher becomes
+ *   encryption descriptor; when it carries key epochs the cipher becomes
  *   multi-recipient
  * @returns {Promise<DocCipher>}
  */

package/dist/sync/docCipher.js

@@ -65,10 +65,10 @@ export function createPlaintextDocCodec({ collectionId }) {
  * (constant bump / toggle / re-categorize edits).
  *
  * Delegates to `@interop/was-client`'s `createEdvDocCipher`: with no
- * `encryption` marker (or a marker with no key epochs) the cipher is
+ * `encryption` descriptor (or a descriptor with no key epochs) the cipher is
  * single-recipient (the key-agreement key encrypts and decrypts directly, the
- * behavior every collection has had); with epochs on the marker the cipher
- * becomes multi-recipient -- writes stamp the marker's current epoch and reads
+ * behavior every collection has had); with epochs on the descriptor the cipher
+ * becomes multi-recipient -- writes stamp the descriptor's current epoch and reads
  * route by the envelope's recipient key id, while a pre-epoch envelope still
  * decrypts through the single-key path (a permanent tolerance, not a migration
  * shim). The returned cipher's shape matches {@link DocCipher} exactly; only the
@@ -79,7 +79,7 @@ export function createPlaintextDocCodec({ collectionId }) {
  * @param options.keyResolver {IKeyResolver}
  * @param options.collectionId {string}   labels errors; the codec is agnostic
  * @param [options.encryption] {CollectionEncryption}   the collection's
- *   encryption marker; when it carries key epochs the cipher becomes
+ *   encryption descriptor; when it carries key epochs the cipher becomes
  *   multi-recipient
  * @returns {Promise<DocCipher>}
  */

package/dist/sync/wasSyncPort.d.ts

@@ -30,7 +30,7 @@ import { type WasSyncBasePort } from './types.js';
  * Extracts an HTTP status from a raw ky/ezcap error. `was.request()` rejects on
  * any non-2xx with `err.status` set (see `@interop/http-client`'s error
  * normaliser); this reads it defensively from either location. Shared with the
- * remote store's marker PUT and the dev-grant provisioner, which need the raw
+ * remote store's descriptor PUT and the dev-grant provisioner, which need the raw
  * status for diagnostics rather than the mapped sync error.
  *
  * @param err {unknown}
@@ -40,7 +40,7 @@ export declare function errorStatus(err: unknown): number | undefined;
 /**
  * Normalizes an unknown caught error into a display string: the `Error`'s
  * `message` when it is one, else its `String(...)` coercion. Shared by the
- * remote store's marker PUT and the session activation error path.
+ * remote store's descriptor PUT and the session activation error path.
  *
  * @param err {unknown}
  * @returns {string}

package/dist/sync/wasSyncPort.js

@@ -29,7 +29,7 @@ import { WasSyncAuthError, WasSyncConflictError } from './types.js';
  * Extracts an HTTP status from a raw ky/ezcap error. `was.request()` rejects on
  * any non-2xx with `err.status` set (see `@interop/http-client`'s error
  * normaliser); this reads it defensively from either location. Shared with the
- * remote store's marker PUT and the dev-grant provisioner, which need the raw
+ * remote store's descriptor PUT and the dev-grant provisioner, which need the raw
  * status for diagnostics rather than the mapped sync error.
  *
  * @param err {unknown}
@@ -42,7 +42,7 @@ export function errorStatus(err) {
 /**
  * Normalizes an unknown caught error into a display string: the `Error`'s
  * `message` when it is one, else its `String(...)` coercion. Shared by the
- * remote store's marker PUT and the session activation error path.
+ * remote store's descriptor PUT and the session activation error path.
  *
  * @param err {unknown}
  * @returns {string}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@interop/was-react",
   "description": "React library for building 'Bring Your Own Everything' (BYOE) apps on Wallet Attached Storage: DID Auth login via CHAPI wallet, local-first encrypted storage, and background sync to a WAS server.",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "type": "module",
   "scripts": {
     "build": "pnpm run clear && tsc",
@@ -53,8 +53,8 @@
     "@interop/security-document-loader": "^9.5.0",
     "@interop/vc": "^11.0.6",
     "@interop/verifier-core": "^3.5.0",
-    "@interop/wallet-core": "^0.5.0",
-    "@interop/was-client": "^0.22.0",
+    "@interop/wallet-core": "^0.8.0",
+    "@interop/was-client": "^0.23.0",
     "@interop/webkms-client": "^14.7.1",
     "@interop/x25519-key-agreement-key": "^5.2.1",
     "@scure/base": "^2.2.0",
@@ -110,7 +110,7 @@
     "typescript-eslint": "^8.59.4",
     "vite": "^8.0.14",
     "vitest": "^4.1.7",
-    "was-teaching-server": "^0.14.0",
+    "was-teaching-server": "^0.16.0",
     "zustand": "^5.0.12"
   },
   "publishConfig": {