@agoric/notifier 0.6.3-other-dev-3eb1a1d.0 → 0.6.3-other-dev-d15096d.0.d15096d

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@agoric/notifier",
-  "version": "0.6.3-other-dev-3eb1a1d.0+3eb1a1d",
+  "version": "0.6.3-other-dev-d15096d.0.d15096d",
   "description": "Notifier allows services to update clients about state changes using a stream of promises",
   "type": "module",
   "main": "src/index.js",
   "engines": {
-    "node": "^18.12 || ^20.9"
+    "node": "^20.9 || ^22.11"
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
+    "prepack": "yarn run -T tsc --build tsconfig.build.json",
+    "postpack": "git clean -f '*.d.*ts*' '*.tsbuildinfo'",
     "test": "ava",
-    "test:c8": "c8 --all $C8_OPTIONS ava",
+    "test:c8": "c8 --all ${C8_OPTIONS:-} ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:eslint": "eslint .",
-    "lint:types": "tsc"
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:eslint": "yarn run -T eslint .",
+    "lint:types": "yarn run -T tsc"
   },
   "repository": {
     "type": "git",
@@ -33,23 +33,23 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/vat-data": "0.5.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/errors": "^1.2.8",
-    "@endo/far": "^1.1.9",
-    "@endo/marshal": "^1.6.2",
-    "@endo/patterns": "^1.4.7",
-    "@endo/promise-kit": "^1.1.8"
+    "@agoric/internal": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/vat-data": "0.5.3-other-dev-d15096d.0.d15096d",
+    "@endo/errors": "^1.2.13",
+    "@endo/far": "^1.1.14",
+    "@endo/marshal": "^1.8.0",
+    "@endo/patterns": "^1.7.0",
+    "@endo/promise-kit": "^1.1.13"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/swing-store": "0.9.2-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/swingset-liveslots": "0.10.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/swingset-vat": "0.32.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/init": "^1.1.7",
-    "@endo/ses-ava": "^1.2.8",
+    "@agoric/kmarshal": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/swing-store": "0.9.2-other-dev-d15096d.0.d15096d",
+    "@agoric/swingset-liveslots": "0.10.3-other-dev-d15096d.0.d15096d",
+    "@agoric/swingset-vat": "0.32.3-other-dev-d15096d.0.d15096d",
+    "@endo/init": "^1.1.12",
+    "@endo/ses-ava": "^1.3.2",
     "ava": "^5.3.0",
-    "c8": "^10.1.2"
+    "c8": "^10.1.3"
   },
   "exports": {
     ".": "./src/index.js",
@@ -76,7 +76,7 @@
     "timeout": "2m"
   },
   "typeCoverage": {
-    "atLeast": 90.77
+    "atLeast": 90.92
   },
-  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/src/index.js

@@ -1,5 +1,5 @@
 // @jessie-check
-/// <reference types="@agoric/internal/exported" />
+/// <reference types="@agoric/internal/exported.js" />
 
 export {
   makePublishKit,

package/src/publish-kit.d.ts

@@ -26,19 +26,7 @@ export const IterableLatestTopicI: import("@endo/patterns").InterfaceGuard<{
     [Symbol.asyncIterator]: import("@endo/patterns").MethodGuard;
 }>;
 export function makePublishKit<T>(): PublishKit<T>;
-export function prepareDurablePublishKit(baggage: import("@agoric/swingset-liveslots").Baggage, kindName: string): (options?: {
-    valueDurability?: "mandatory" | undefined;
-} | undefined) => import("@endo/exo").GuardedKit<{
-    publisher: {
-        publish(value: any): void;
-        finish(finalValue: any): void;
-        fail(reason: any): void;
-    };
-    subscriber: {
-        subscribeAfter(publishCount?: bigint): Promise<any>;
-        getUpdateSince(updateCount: any): any;
-    };
-}>;
+export function prepareDurablePublishKit(baggage: Baggage, kindName: string): <T>(options?: Parameters<typeof initDurablePublishKitState>[0]) => PublishKit<T>;
 export const SubscriberShape: import("@endo/patterns").Matcher;
 export type DurablePublishKitEphemeralKey = Publisher<any>;
 export type DurablePublishKitEphemeralData = {
@@ -58,5 +46,16 @@ export type DurablePublishKitEphemeralData = {
     tailR: ((value: any) => void) | undefined;
 };
 import type { PublishKit } from '../src/types.js';
+import type { Baggage } from '@agoric/swingset-liveslots';
+/**
+ * @param {object} [options]
+ * @param {DurablePublishKitValueDurability & 'mandatory'} [options.valueDurability]
+ * @returns {DurablePublishKitState}
+ */
+declare function initDurablePublishKitState(options?: {
+    valueDurability?: "mandatory" | undefined;
+}): DurablePublishKitState;
 import type { Publisher } from '../src/types.js';
+import type { DurablePublishKitState } from '../src/types.js';
+export {};
 //# sourceMappingURL=publish-kit.d.ts.map

package/src/publish-kit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish-kit.d.ts","sourceRoot":"","sources":["publish-kit.js"],"names":[],"mappings":"AAuBA;;;;GAIG;AAGH,gEAA6D;AAC7D;;;GAGG;;;;;AAMH;;;;GAOE;AAEF;;;GAMG;AAEH;;;GAMG;AA+CI,+BA2CQ,CAAC,KA7CH,WAAW,CAAC,CAAC,CA4FzB;AA6MM,kDAHI,OAAO,4BAA4B,EAAE,OAAO,YAC5C,MAAM;;;;;;;;;;;;GA2EhB;AAGD,+DAAyD;4CAlP3C,UAAU,GAAC,CAAC;;;;;;cASZ,OAAO,CAAC,GAAC,CAAC,GAAG,SAAS;;;;WAEtB,OAAO,CAAC,GAAC,CAAC;;;;;WACV,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,SAAS;;gCAjPsI,iBAAiB;+BAAjB,iBAAiB"}
+{"version":3,"file":"publish-kit.d.ts","sourceRoot":"","sources":["publish-kit.js"],"names":[],"mappings":"AAwBA;;;;GAIG;AAGH,gEAA6D;AAC7D;;;GAGG;;;;;AAMH;;;;GAOE;AAEF;;;GAMG;AAEH;;;GAMG;AA+CI,+BA2CQ,CAAC,KA7CH,WAAW,CAAC,CAAC,CA4FzB;AA8MM,kDAJI,OAAO,YACP,MAAM,GACJ,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAwE5F;AAGD,+DAAyD;4CAhP3C,UAAU,GAAC,CAAC;;;;;;cASZ,OAAO,CAAC,GAAC,CAAC,GAAG,SAAS;;;;WAEtB,OAAO,CAAC,GAAC,CAAC;;;;;WACV,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,SAAS;;gCAlPsI,iBAAiB;6BAC7K,4BAA4B;AA2MtD;;;;GAIG;AACH,sDAHG;IAAiE,eAAe;CAChF,GAAU,sBAAsB,CAmBlC;+BAlOqL,iBAAiB;4CAAjB,iBAAiB"}

package/src/publish-kit.js

@@ -9,6 +9,7 @@ import { canBeDurable, prepareExoClassKit } from '@agoric/vat-data';
 /**
  * @import {ERef} from '@endo/far';
  * @import {DurablePublishKitState, DurablePublishKitValueDurability, LatestTopic, Notifier, NotifierRecord, PublicationRecord, Publisher, PublishKit, Subscriber, UpdateRecord} from '../src/types.js';
+ * @import {Baggage} from '@agoric/swingset-liveslots';
  */
 
 const sink = () => {};
@@ -400,17 +401,15 @@ const advanceDurablePublishKit = (context, value, targetStatus = 'live') => {
 };
 
 /**
- * @param {import('@agoric/swingset-liveslots').Baggage} baggage
+ * @param {Baggage} baggage
  * @param {string} kindName
+ * @returns {<T>(options?: Parameters<typeof initDurablePublishKitState>[0]) => PublishKit<T>}
  */
 export const prepareDurablePublishKit = (baggage, kindName) => {
   // TODO: Once we unify with makePublishKit, we will use a Zone-compatible weak
   // map for memoization.
   const makeMemoizedUpdateRecord = makeUpdateRecordFromPublicationRecord;
 
-  /**
-   * @returns {() => PublishKit<*>}
-   */
   return prepareExoClassKit(
     baggage,
     kindName,

package/src/stored-notifier.d.ts

@@ -1,10 +1,11 @@
-export function makeStoredNotifier<T extends PassableCap>(notifier: ERef<Notifier<T>>, storageNode: ERef<StorageNode>, marshaller: ERef<Marshaller>): StoredNotifier<T>;
+export function makeStoredNotifier<T extends PassableCap>(notifier: ERef<Notifier<T>>, storageNode: ERemote<StorageNode>, marshaller: ERemote<EMarshaller>): StoredNotifier<T>;
 export type StoredNotifier<T> = BaseNotifier<T> & Omit<StoredFacet, "getStoreKey">;
 import type { PassableCap } from '@endo/pass-style';
 import type { Notifier } from './types.js';
 import type { ERef } from '@endo/far';
 import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
-import type { Marshaller } from '@agoric/internal/src/lib-chainStorage.js';
+import type { ERemote } from '@agoric/internal';
+import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import type { BaseNotifier } from './types.js';
 import type { StoredFacet } from '@agoric/internal/src/lib-chainStorage.js';
 //# sourceMappingURL=stored-notifier.d.ts.map

package/src/stored-notifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stored-notifier.d.ts","sourceRoot":"","sources":["stored-notifier.js"],"names":[],"mappings":"AAkCO,mCANoB,CAAC,SAAf,WAAa,YACf,KAAK,SAAS,CAAC,CAAC,CAAC,eACjB,KAAK,WAAW,CAAC,cACjB,KAAK,UAAU,CAAC,GACd,cAAc,CAAC,CAAC,CAAC,CAiC7B;2BAlDY,CAAC,IACD,aAAa,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC;iCALhB,kBAAkB;8BAFxB,YAAY;0BAD9B,WAAW;iCAEmC,0CAA0C;gCAA1C,0CAA0C;kCADtE,YAAY;iCACgB,0CAA0C"}
+{"version":3,"file":"stored-notifier.d.ts","sourceRoot":"","sources":["stored-notifier.js"],"names":[],"mappings":"AAoCO,mCANoB,CAAC,SAAf,WAAa,YACf,KAAK,SAAS,CAAC,CAAC,CAAC,eACjB,QAAQ,WAAW,CAAC,cACpB,QAAQ,WAAW,CAAC,GAClB,cAAc,CAAC,CAAC,CAAC,CAiC7B;2BAlDY,CAAC,IACD,aAAa,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC;iCALjC,kBAAkB;8BAJP,YAAY;0BAD9B,WAAW;iCAIuB,0CAA0C;6BAFzE,kBAAkB;iCACd,iDAAiD;kCAFtC,YAAY;iCAGI,0CAA0C"}

package/src/stored-notifier.js

@@ -8,8 +8,10 @@ import { observeNotifier } from './asyncIterableAdaptor.js';
 /**
  * @import {ERef} from '@endo/far';
  * @import {BaseNotifier, Notifier} from './types.js';
- * @import {Marshaller, StoredFacet, StorageNode, Unserializer} from '@agoric/internal/src/lib-chainStorage.js';
- * @import {PassableCap, RemotableObject} from '@endo/pass-style';
+ * @import {ERemote} from '@agoric/internal';
+ * @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
+ * @import {StoredFacet, StorageNode, Unserializer} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {PassableCap} from '@endo/pass-style';
  */
 
 /**
@@ -28,8 +30,8 @@ import { observeNotifier } from './asyncIterableAdaptor.js';
  *
  * @template {PassableCap} T
  * @param {ERef<Notifier<T>>} notifier
- * @param {ERef<StorageNode>} storageNode
- * @param {ERef<Marshaller>} marshaller
+ * @param {ERemote<StorageNode>} storageNode
+ * @param {ERemote<EMarshaller>} marshaller
  * @returns {StoredNotifier<T>}
  */
 export const makeStoredNotifier = (notifier, storageNode, marshaller) => {

package/src/storesub.d.ts

@@ -1,30 +1,20 @@
 export function forEachPublicationRecord<T>(subscriber: Subscriber<T>, consumeValue: (v: T) => void): Promise<void>;
-export function makeStoredSubscriber<T extends import("@endo/marshal").PassableCap>(subscriber: Subscriber<T>, storageNode: ERef<StorageNode>, marshaller: ERef<ReturnType<typeof makeMarshal>>): StoredSubscriber<T>;
-export function makeStoredSubscription<T>(subscription: Subscription<T>, storageNode?: ERef<StorageNode> | undefined, marshaller?: ERef<{
-    toCapData: import("@endo/marshal").ToCapData<unknown>;
-    fromCapData: import("@endo/marshal").FromCapData<unknown>;
-    serialize: import("@endo/marshal").ToCapData<unknown>;
-    unserialize: import("@endo/marshal").FromCapData<unknown>;
-}> | undefined): StoredSubscription<T>;
-export function makeStoredPublisherKit<T = unknown>(storageNode?: ERef<StorageNode> | undefined, marshaller?: ERef<{
-    toCapData: import("@endo/marshal").ToCapData<unknown>;
-    fromCapData: import("@endo/marshal").FromCapData<unknown>;
-    serialize: import("@endo/marshal").ToCapData<unknown>;
-    unserialize: import("@endo/marshal").FromCapData<unknown>;
-}> | undefined, childPath?: string | undefined): StoredPublisherKit<T>;
-export function makeStoredPublishKit<T = unknown>(storageNode: ERef<StorageNode>, marshaller: ERef<Marshaller>): StoredPublishKit<T>;
+export function makeStoredSubscriber<T extends PassableCap>(subscriber: Subscriber<T>, storageNode: ERemote<StorageNode>, marshaller: ERemote<EMarshaller>): StoredSubscriber<T>;
+export function makeStoredSubscription<T>(subscription: Subscription<T>, storageNode?: ERemote<StorageNode> | null, marshaller?: ERemote<EMarshaller>): StoredSubscription<T>;
+export function makeStoredPublisherKit<T = unknown>(storageNode?: ERemote<StorageNode> | null, marshaller?: ERemote<EMarshaller>, childPath?: string): StoredPublisherKit<T>;
+export function makeStoredPublishKit<T = unknown>(storageNode: ERemote<StorageNode>, marshaller: ERemote<EMarshaller>): StoredPublishKit<T>;
 export type StoredPublisherKit<T> = {
     subscriber: StoredSubscription<T>;
     publisher: IterationObserver<T>;
 };
 import type { Subscriber } from '../src/types.js';
+import type { PassableCap } from '@endo/marshal';
 import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
-import type { ERef } from '@endo/far';
-import { makeMarshal } from '@endo/marshal';
+import type { ERemote } from '@agoric/internal';
+import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import type { StoredSubscriber } from '../src/types.js';
 import type { Subscription } from '../src/types.js';
 import type { StoredSubscription } from '../src/types.js';
-import type { Marshaller } from '@agoric/internal/src/lib-chainStorage.js';
 import type { StoredPublishKit } from '../src/types.js';
 import type { IterationObserver } from '../src/types.js';
 //# sourceMappingURL=storesub.d.ts.map

package/src/storesub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storesub.d.ts","sourceRoot":"","sources":["storesub.js"],"names":[],"mappings":"AAuBO,yCAJM,CAAC,cACH,WAAW,CAAC,CAAC,gBACb,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,iBAcxB;AAiBM,qCAN4C,CAAC,SAAvC,OAAQ,eAAe,EAAE,WAAY,cACvC,WAAW,CAAC,CAAC,eACb,KAAK,WAAW,CAAC,cACjB,KAAK,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,GAClC,iBAAiB,CAAC,CAAC,CA6B/B;AAkBM,uCANM,CAAC,gBACH,aAAa,CAAC,CAAC;;;;;iBAGb,mBAAmB,CAAC,CAAC,CAqEjC;AAoBM,uCANO,CAAC;;;;;iDAIF,kBAAkB,CAAC,CAAC,CAAC,CAoBjC;AAgBM,qCALO,CAAC,yBACJ,KAAK,WAAW,CAAC,cACjB,KAAK,UAAU,CAAC,GACd,iBAAiB,CAAC,CAAC,CAU/B;+BAzDY,CAAC;gBAEA,mBAAmB,CAAC,CAAC;eACrB,kBAAkB,CAAC,CAAC;;gCAjKmL,iBAAiB;iCAC9K,0CAA0C;0BAF3E,WAAW;4BATN,eAAe;sCAU0K,iBAAiB;kCAAjB,iBAAiB;wCAAjB,iBAAiB;gCAC9K,0CAA0C;sCADmH,iBAAiB;uCAAjB,iBAAiB"}
+{"version":3,"file":"storesub.d.ts","sourceRoot":"","sources":["storesub.js"],"names":[],"mappings":"AA0BO,yCAJM,CAAC,cACH,WAAW,CAAC,CAAC,gBACb,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,iBAcxB;AAiBM,qCANoB,CAAC,SAAf,WAAa,cACf,WAAW,CAAC,CAAC,eACb,QAAQ,WAAW,CAAC,cACpB,QAAQ,WAAW,CAAC,GAClB,iBAAiB,CAAC,CAAC,CA6B/B;AAkBM,uCANM,CAAC,gBACH,aAAa,CAAC,CAAC,gBACf,QAAQ,WAAW,CAAC,GAAG,IAAI,eAC3B,QAAQ,WAAW,CAAC,GAClB,mBAAmB,CAAC,CAAC,CAqEjC;AAoBM,uCANO,CAAC,0BACJ,QAAQ,WAAW,CAAC,GAAG,IAAI,eAC3B,QAAQ,WAAW,CAAC,cACpB,MAAM,GACJ,kBAAkB,CAAC,CAAC,CAAC,CAoBjC;AAgBM,qCALO,CAAC,yBACJ,QAAQ,WAAW,CAAC,cACpB,QAAQ,WAAW,CAAC,GAClB,iBAAiB,CAAC,CAAC,CAU/B;+BAzDY,CAAC;gBAEA,mBAAmB,CAAC,CAAC;eACrB,kBAAkB,CAAC,CAAC;;gCAnKmL,iBAAiB;iCAGxM,eAAe;iCAFD,0CAA0C;6BAH5D,kBAAkB;iCAId,iDAAiD;sCAFsI,iBAAiB;kCAAjB,iBAAiB;wCAAjB,iBAAiB;sCAAjB,iBAAiB;uCAAjB,iBAAiB"}

package/src/storesub.js

@@ -8,9 +8,12 @@ import { makeSubscriptionKit } from './subscriber.js';
 import { subscribeEach } from './subscribe.js';
 
 /**
+ * @import {ERemote} from '@agoric/internal';
  * @import {ERef} from '@endo/far';
  * @import {IterationObserver, LatestTopic, Notifier, NotifierRecord, PublicationRecord, Publisher, PublishKit, StoredPublishKit, StoredSubscription, StoredSubscriber, Subscriber, Subscription, UpdateRecord} from '../src/types.js';
- * @import {Marshaller, StorageNode, Unserializer} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {StorageNode, Unserializer} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
+ * @import {PassableCap} from '@endo/marshal';
  */
 
 /**
@@ -44,10 +47,10 @@ export const forEachPublicationRecord = async (subscriber, consumeValue) => {
  * the iteration themselves, or obtain information to subscribe to the stored
  * data out-of-band.
  *
- * @template {import('@endo/marshal').PassableCap} T
+ * @template {PassableCap} T
  * @param {Subscriber<T>} subscriber
- * @param {ERef<StorageNode>} storageNode
- * @param {ERef<ReturnType<typeof makeMarshal>>} marshaller
+ * @param {ERemote<StorageNode>} storageNode
+ * @param {ERemote<EMarshaller>} marshaller
  * @returns {StoredSubscriber<T>}
  */
 export const makeStoredSubscriber = (subscriber, storageNode, marshaller) => {
@@ -91,8 +94,8 @@ export const makeStoredSubscriber = (subscriber, storageNode, marshaller) => {
  *
  * @template T
  * @param {Subscription<T>} subscription
- * @param {ERef<StorageNode>} [storageNode]
- * @param {ERef<ReturnType<typeof makeMarshal>>} [marshaller]
+ * @param {ERemote<StorageNode> | null} [storageNode]
+ * @param {ERemote<EMarshaller>} [marshaller]
  * @returns {StoredSubscription<T>}
  */
 export const makeStoredSubscription = (
@@ -103,7 +106,7 @@ export const makeStoredSubscription = (
     serializeBodyFormat: 'smallcaps',
   }),
 ) => {
-  /** @type {import('@agoric/internal/src/lib-chainStorage.js').Unserializer} */
+  /** @type {Unserializer} */
   const unserializer = Far('unserializer', {
     fromCapData: data => E(marshaller).fromCapData(data),
     unserialize: data => E(marshaller).fromCapData(data),
@@ -177,8 +180,8 @@ harden(makeStoredSubscription);
  * @deprecated incompatible with durability; instead handle vstorage ephemerally on a durable PublishKit
  *
  * @template [T=unknown]
- * @param {ERef<StorageNode>} [storageNode]
- * @param {ERef<Marshaller>} [marshaller]
+ * @param {ERemote<StorageNode> | null} [storageNode]
+ * @param {ERemote<EMarshaller>} [marshaller]
  * @param {string} [childPath]
  * @returns {StoredPublisherKit<T>}
  */
@@ -212,8 +215,8 @@ export const makeStoredPublisherKit = (storageNode, marshaller, childPath) => {
  * What's different is `subscriber` tees records, writing out to storageNode.
  *
  * @template [T=unknown]
- * @param {ERef<StorageNode>} storageNode
- * @param {ERef<Marshaller>} marshaller
+ * @param {ERemote<StorageNode>} storageNode
+ * @param {ERemote<EMarshaller>} marshaller
  * @returns {StoredPublishKit<T>}
  */
 export const makeStoredPublishKit = (storageNode, marshaller) => {

package/src/subscribe.d.ts

@@ -1,17 +1,17 @@
 export function subscribe<T>(itP: ERef<AsyncIterableIterator<T>>): {
     [Symbol.asyncIterator]: () => {
-        [Symbol.asyncIterator]: () => any & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, any>;
+        [Symbol.asyncIterator]: () => /*elided*/ any & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, /*elided*/ any>;
         next: () => Promise<IteratorResult<T, any>>;
     } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-        [Symbol.asyncIterator]: () => any & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, any>;
+        [Symbol.asyncIterator]: () => /*elided*/ any & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, /*elided*/ any>;
         next: () => Promise<IteratorResult<T, any>>;
     }>;
 } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
     [Symbol.asyncIterator]: () => {
-        [Symbol.asyncIterator]: () => any & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, any>;
+        [Symbol.asyncIterator]: () => /*elided*/ any & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, /*elided*/ any>;
         next: () => Promise<IteratorResult<T, any>>;
     } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-        [Symbol.asyncIterator]: () => any & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, any>;
+        [Symbol.asyncIterator]: () => /*elided*/ any & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, /*elided*/ any>;
         next: () => Promise<IteratorResult<T, any>>;
     }>;
 }>;

package/src/subscribe.js

@@ -1,6 +1,6 @@
 import { X, Fail, annotateError } from '@endo/errors';
 import { E, Far } from '@endo/far';
-import { isObject } from '@endo/marshal';
+import { isPrimitive } from '@endo/marshal';
 import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 
 /**
@@ -46,7 +46,7 @@ const reconnectAsNeeded = async (getter, seed = []) => {
       // if `err` is an (Error) object, we can try to associate it with
       // information about the disconnection that prompted the request
       // for which it is a result.
-      if (isObject(err) && disconnection && disconnection !== err) {
+      if (!isPrimitive(err) && disconnection && disconnection !== err) {
         try {
           annotateError(
             err,

package/tools/testSupports.d.ts

@@ -1,5 +1,5 @@
 export { eventLoopIteration } from "@agoric/internal/src/testing-utils.js";
-export function makeFakeStorage(path: string, publication?: IterationObserver<unknown> | undefined): StorageNode & {
+export function makeFakeStorage(path: string, publication?: IterationObserver<unknown>): StorageNode & {
     countSetValueCalls: () => number;
 };
 export function makeFakeMarshaller(): {

package/tools/testSupports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testSupports.d.ts","sourceRoot":"","sources":["testSupports.js"],"names":[],"mappings":";AAaO,sCAHI,MAAM;wBAWgC,MAAM,MAAM;EAe5D;AAGM;;;;;EAGH;uCAvCgC,iBAAiB;iCACvB,0CAA0C"}
+{"version":3,"file":"testSupports.d.ts","sourceRoot":"","sources":["testSupports.js"],"names":[],"mappings":";AAaO,sCAHI,MAAM,gBACN,kBAAkB,OAAO,CAAC;wBAUY,MAAM,MAAM;EAe5D;AAGM;;;;;EAGH;uCAvCgC,iBAAiB;iCACvB,0CAA0C"}