@agoric/network 0.1.1-dev-fbd8633.0 → 0.1.1-dev-e456308.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/network",
-  "version": "0.1.1-dev-fbd8633.0+fbd8633",
+  "version": "0.1.1-dev-e456308.0+e456308",
   "description": "Agoric's network protocol API",
   "type": "module",
   "main": "./src/index.js",
@@ -21,19 +21,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-fbd8633.0+fbd8633",
-    "@agoric/internal": "0.3.3-dev-fbd8633.0+fbd8633",
-    "@agoric/store": "0.9.3-dev-fbd8633.0+fbd8633",
-    "@agoric/vat-data": "0.5.3-dev-fbd8633.0+fbd8633",
+    "@agoric/assert": "0.6.1-dev-e456308.0+e456308",
+    "@agoric/internal": "0.3.3-dev-e456308.0+e456308",
+    "@agoric/store": "0.9.3-dev-e456308.0+e456308",
+    "@agoric/vat-data": "0.5.3-dev-e456308.0+e456308",
     "@endo/base64": "^1.0.4",
     "@endo/far": "^1.1.1",
     "@endo/patterns": "^1.3.1",
     "@endo/promise-kit": "^1.1.1"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-fbd8633.0+fbd8633",
-    "@agoric/swingset-vat": "0.32.3-dev-fbd8633.0+fbd8633",
-    "@agoric/zone": "0.2.3-dev-fbd8633.0+fbd8633",
+    "@agoric/swingset-liveslots": "0.10.3-dev-e456308.0+e456308",
+    "@agoric/swingset-vat": "0.32.3-dev-e456308.0+e456308",
+    "@agoric/zone": "0.2.3-dev-e456308.0+e456308",
     "@endo/bundle-source": "^3.2.2",
     "ava": "^5.3.0",
     "c8": "^9.1.0"
@@ -70,5 +70,5 @@
   "typeCoverage": {
     "atLeast": 89.73
   },
-  "gitHead": "fbd8633ae9f8420a589dd9bc32925418f2dde060"
+  "gitHead": "e4563081e57304520ee75f85aff490fcdb640c20"
 }

package/src/bytes.d.ts

@@ -5,14 +5,14 @@
  * @param {ByteSource} byteSource
  * @returns {Bytes}
  */
-export function toBytes(byteSource: ByteSource): Bytes;
+export function toBytes(byteSource: ByteSource): string;
 /**
  * Convert bytes to a String.
  *
  * @param {Bytes} bytes
  * @returns {string}
  */
-export function bytesToString(bytes: Bytes): string;
+export function bytesToString(bytes: string): string;
 /**
  * Base64, as specified in https://tools.ietf.org/html/rfc4648#section-4
  *
@@ -26,6 +26,6 @@ export function dataToBase64(byteSource: ByteSource): string;
  * @param {string} string Base64-encoded string
  * @returns {Bytes} decoded bytes
  */
-export function base64ToBytes(string: string): Bytes;
-export type ByteSource = Bytes | Buffer | Uint8Array | Iterable<number>;
+export function base64ToBytes(string: string): string;
+export type ByteSource = string | Buffer | Uint8Array | Iterable<number>;
 //# sourceMappingURL=bytes.d.ts.map

package/src/bytes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bytes.d.ts","sourceRoot":"","sources":["bytes.js"],"names":[],"mappings":"AA4BA;;;;;;GAMG;AACH,oCAHW,UAAU,GACR,KAAK,CAOjB;AAED;;;;;GAKG;AACH,qCAHW,KAAK,GACH,MAAM,CAIlB;AAED;;;;;GAKG;AACH,yCAHW,UAAU,GACR,MAAM,CAKlB;AAED;;;;;GAKG;AACH,sCAHW,MAAM,GACJ,KAAK,CAIjB;yBAlEa,KAAK,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC"}
+{"version":3,"file":"bytes.d.ts","sourceRoot":"","sources":["bytes.js"],"names":[],"mappings":"AAgCA;;;;;;GAMG;AACH,oCAHW,UAAU,UAQpB;AAED;;;;;GAKG;AACH,8CAFa,MAAM,CAIlB;AAED;;;;;GAKG;AACH,yCAHW,UAAU,GACR,MAAM,CAKlB;AAED;;;;;GAKG;AACH,sCAHW,MAAM,UAKhB"}

package/src/bytes.js

@@ -3,6 +3,10 @@
 import { Fail } from '@agoric/assert';
 import { encodeBase64, decodeBase64 } from '@endo/base64';
 
+/**
+ * @import {Bytes} from './types.js';
+ */
+
 /** @typedef {Bytes | Buffer | Uint8Array | Iterable<number>} ByteSource */
 
 /**

package/src/index.d.ts

@@ -2,5 +2,6 @@ export * from "./network.js";
 export * from "./shapes.js";
 export * from "./multiaddr.js";
 export * from "./bytes.js";
+export * from "./types.js";
 export { prepareRouter, prepareRouterProtocol } from "./router.js";
 //# sourceMappingURL=index.d.ts.map

package/src/index.js

@@ -3,3 +3,5 @@ export * from './shapes.js';
 export { prepareRouter, prepareRouterProtocol } from './router.js';
 export * from './multiaddr.js';
 export * from './bytes.js';
+// eslint-disable-next-line import/export -- doesn't know types
+export * from './types.js';

package/src/network.d.ts

@@ -26,27 +26,48 @@ export function prepareLoopbackProtocolHandler(zone: import("@agoric/base-zone")
      * @param {*} _port
      * @param {Endpoint} localAddr
      * @param {Endpoint} remoteAddr
-     * @returns {PromiseVow<AttemptDescription>}}
+     * @returns {import('@agoric/vow').PromiseVow<AttemptDescription>}}
      */
-    onConnect(_port: any, localAddr: Endpoint, remoteAddr: Endpoint): PromiseVow<AttemptDescription>;
+    onConnect(_port: any, localAddr: string, remoteAddr: string): import("@agoric/vow").PromiseVow<AttemptDescription>;
     onInstantiate(_port: any, _localAddr: any, _remote: any, _protocol: any): Promise<string>;
     onListen(port: any, localAddr: any, listenHandler: any, _protocolHandler: any): Promise<void>;
     /**
-     * @param {Remote<Port>} port
+     * @param {import('@agoric/vow').Remote<Port>} port
      * @param {Endpoint} localAddr
-     * @param {Remote<ListenHandler>} listenHandler
+     * @param {import('@agoric/vow').Remote<ListenHandler>} listenHandler
      * @param {*} _protocolHandler
      */
-    onListenRemove(port: Remote<Port>, localAddr: Endpoint, listenHandler: Remote<ListenHandler>, _protocolHandler: any): Promise<void>;
+    onListenRemove(port: import("@agoric/vow").Remote<Port, {}>, localAddr: string, listenHandler: import("@agoric/vow").Remote<ListenHandler, {
+        /**
+         * The listener has been registered
+         */
+        onListen?: undefined;
+        /**
+         * The connection was rejected
+         */
+        onReject?: undefined;
+        /**
+         * There was an error while listening
+         */
+        onError?: undefined;
+        /**
+         * The
+         * listener has been removed
+         */
+        onRemove?: undefined;
+    }>, _protocolHandler: any): Promise<void>;
     onRevoke(_port: any, _localAddr: any, _protocolHandler: any): Promise<void>;
 }>;
+/**
+ * @import {AttemptDescription, Bytes, Closable, CloseReason, Connection, ConnectionHandler, Endpoint, ListenHandler, Port, Protocol, ProtocolHandler, ProtocolImpl} from './types.js';
+ */
 /**
  * Compatibility note: this must match what our peers use, so don't change it
  * casually.
  */
 export const ENDPOINT_SEPARATOR: "/";
 export function rethrowUnlessMissing(err: unknown): undefined;
-export function crossoverConnection(zone: import("@agoric/zone").Zone, handler0: import("@agoric/vow").Remote<Required<ConnectionHandler>>, addr0: Endpoint, handler1: import("@agoric/vow").Remote<Required<ConnectionHandler>>, addr1: Endpoint, makeConnection: (opts: ConnectionOpts) => Connection, current?: globalThis.WeakSetStore<Closable> | undefined): Connection[];
+export function crossoverConnection(zone: import("@agoric/zone").Zone, handler0: import("@agoric/vow").Remote<Required<ConnectionHandler>, {}>, addr0: string, handler1: import("@agoric/vow").Remote<Required<ConnectionHandler>, {}>, addr1: string, makeConnection: (opts: ConnectionOpts) => Connection, current?: globalThis.WeakSetStore<Closable> | undefined): Connection[];
 export function prepareNetworkProtocol(zone: import("@agoric/base-zone").Zone, powers: ReturnType<(zone: import("@agoric/base-zone").Zone, powers?: {
     isRetryableReason?: ((reason: any) => boolean) | undefined;
     watchPromise?: ((p: PromiseLike<any>, watcher: import("@agoric/vow/src/watch-promise.js").PromiseWatcher, ...args: unknown[]) => void) | undefined;
@@ -55,7 +76,12 @@ export function prepareNetworkProtocol(zone: import("@agoric/base-zone").Zone, p
     watch: <T_1 = unknown, TResult1_1 = T_1, TResult2_1 = T_1, C = unknown>(specimenP: import("@agoric/vow/src/types.js").ERef<T_1 | import("@agoric/vow/src/types.js").Vow<T_1>>, watcher?: import("@agoric/vow").Watcher<T_1, TResult1_1, TResult2_1, any> | undefined, watcherContext?: C | undefined) => import("@agoric/vow").Vow<TResult1_1 | TResult2_1>;
     makeVowKit: <T_2>() => import("@agoric/vow").VowKit<T_2>;
     allVows: (vows: any) => import("@agoric/vow").Vow<any>;
-}>): (protocolHandler: Remote<ProtocolHandler>) => Protocol;
+}>): (protocolHandler: import("@agoric/vow").Remote<ProtocolHandler, {
+    /**
+     * Return unique suffix for local address
+     */
+    onInstantiate?: undefined;
+}>) => Protocol;
 export function prepareEchoConnectionKit(zone: import("@agoric/base-zone").Zone): () => import("@endo/exo").GuardedKit<{
     handler: {
         /**
@@ -63,13 +89,13 @@ export function prepareEchoConnectionKit(zone: import("@agoric/base-zone").Zone)
          * @param {Bytes} bytes
          * @param {ConnectionHandler} _connectionHandler
          */
-        onReceive(_connection: Connection, bytes: Bytes, _connectionHandler: ConnectionHandler): Promise<string>;
+        onReceive(_connection: Connection, bytes: string, _connectionHandler: ConnectionHandler): Promise<string>;
         /**
          * @param {Connection} _connection
          * @param {CloseReason} [_reason]
          * @param {ConnectionHandler} [_connectionHandler]
          */
-        onClose(_connection: Connection, _reason?: CloseReason, _connectionHandler?: ConnectionHandler | undefined): Promise<void>;
+        onClose(_connection: Connection, _reason?: any, _connectionHandler?: ConnectionHandler | undefined): Promise<void>;
     };
     listener: {
         onAccept(_port: any, _localAddr: any, _remoteAddr: any, _listenHandler: any): Promise<import("@endo/exo").Guarded<{
@@ -78,13 +104,13 @@ export function prepareEchoConnectionKit(zone: import("@agoric/base-zone").Zone)
              * @param {Bytes} bytes
              * @param {ConnectionHandler} _connectionHandler
              */
-            onReceive(_connection: Connection, bytes: Bytes, _connectionHandler: ConnectionHandler): Promise<string>;
+            onReceive(_connection: Connection, bytes: string, _connectionHandler: ConnectionHandler): Promise<string>;
             /**
              * @param {Connection} _connection
              * @param {CloseReason} [_reason]
              * @param {ConnectionHandler} [_connectionHandler]
              */
-            onClose(_connection: Connection, _reason?: CloseReason, _connectionHandler?: ConnectionHandler | undefined): Promise<void>;
+            onClose(_connection: Connection, _reason?: any, _connectionHandler?: ConnectionHandler | undefined): Promise<void>;
         }>>;
         onListen(port: any, _listenHandler: any): Promise<void>;
     };
@@ -103,11 +129,19 @@ export function preparePortAllocator(zone: import("@agoric/base-zone").Zone, { w
     allocateCustomLocalPort(specifiedName?: string): import("@agoric/vow").Vow<any>;
 }>;
 export type ConnectionOpts = {
-    addrs: Endpoint[];
-    handlers: import("@agoric/vow").Remote<Required<ConnectionHandler>>[];
-    conns: MapStore<number, Connection>;
-    current: WeakSetStore<Closable>;
+    addrs: string[];
+    handlers: import("@agoric/vow").Remote<Required<ConnectionHandler>, {}>[];
+    conns: globalThis.MapStore<number, Connection>;
+    current: globalThis.WeakSetStore<Closable>;
     l: 0 | 1;
     r: 0 | 1;
 };
+import type { AttemptDescription } from './types.js';
+import type { Port } from './types.js';
+import type { ListenHandler } from './types.js';
+import type { ConnectionHandler } from './types.js';
+import type { Connection } from './types.js';
+import type { Closable } from './types.js';
+import type { ProtocolHandler } from './types.js';
+import type { Protocol } from './types.js';
 //# sourceMappingURL=network.d.ts.map

package/src/network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["network.js"],"names":[],"mappings":"AA8BA;;;;GAIG;AACH,kCAFW,MAAM,YAahB;AAstCD;;;;;GAKG;AACH,qDAHW,OAAO,mBAAmB,EAAE,IAAI,sBAChC,UAAU,QAhwCX,OAAO,mBACjB,EAAE,IAAI;;wBAIL,gBAED,WAAU,OAAQ,kCAAoB,EAGtC,cADc,WAAW,SACnB;;uFAHY,CAAC,yBAGnB,OAAO,0BAAY,EAAE,MAAM,CAAC,CAAC,CAAC;uFA8IxB,OAAM,0BACJ,EAAE,IACT,CAAK,GAAH,GAAG,OAAO,0BAEZ,EAAK,GAAA,CAAC,GAAC,CACR,CAAC;;;EAmmC2D;;;;IAmCpD;;;;;OAKG;qCAHQ,QAAQ,cACR,QAAQ;;;IAgEnB;;;;;OAKG;kDAHQ,QAAQ;;GAiD1B;AAt5CD;;;GAGG;AACH,qCAAsC;AAG/B,0CADK,OAAO,aAWlB;AAyJM,0CARI,OAAO,cAAc,EAAE,IAAI,YAC3B,OAAO,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SACzD,QAAQ,YACR,OAAO,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SACzD,QAAQ,kBACR,CAAC,IAAI,EAAE,cAAc,KAAK,UAAU,yEAgD9C;AA66BM,6CAHI,OAAO,mBAAmB,EAAE,IAAI,UAChC,UAAU,oCApoCnB,IAAI;;8FASN,cADc;;oJACO,MAAM;0HA+IjB,IACT,0CAEK,GAAA;;;EAy+BsD,iDAO7C,QAAQ,CA2BtB;AAOM,+CAFI,OAAO,mBAAmB,EAAE,IAAI;;QAsCnC;;;;WAIG;+BAHQ,UAAU,SACV,KAAK,sBACL,iBAAiB;QAU5B;;;;WAIG;6BAHQ,UAAU,YACV,WAAW;;;;YAftB;;;;eAIG;mCAHQ,UAAU,SACV,KAAK,sBACL,iBAAiB;YAU5B;;;;eAIG;iCAHQ,UAAU,YACV,WAAW;;;;GAyB7B;AAsKM,2CAHI,OAAO,mBAAmB,EAAE,IAAI,aAChC,UAAU,oCA75CnB,IAAI;;8FASN,cADc;;oJACO,MAAM;0HA+IjB,IACT,0CAEK,GAAA;;;EAkwCsD;;;;GAqDzD;;WA35CW,QAAQ,EAAE;cACV,OAAO,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,EAAE;WAC3D,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;aAC5B,YAAY,CAAC,QAAQ,CAAC;OACtB,CAAC,GAAC,CAAC;OACH,CAAC,GAAC,CAAC"}
+{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["network.js"],"names":[],"mappings":"AAiCA;;;;GAIG;AACH,kCAFW,MAAM,YAahB;AA0tCD;;;;;GAKG;AACH,qDAHW,OAAO,mBAAmB,EAAE,IAAI,sBAChC,UAAU,QAvwCX,OAAO,mBACjB,EAAE,IAAI;;wBAEyE,gBAAiB,WAAU,OAAQ,kCAAoB,EAAE,cAAc,WAAU,SAAU;;uFAAxD,CAAC,yBAAgD,OAAQ,0BAAY,EACtL,MAEC,CACD,CAAD,CAAC;uFA2IgB,OAAM,0BAChB,EAAE,IACP,CAAI,GAAF,GAAE,OACD,0BAGD,EAAE,GAAG,CAAC,GAAC,CAAC,CAAC;;;EA+mC+C;;;;IAmCpD;;;;;OAKG;;;;IAgEH;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;GA8CV;AAh6CD;;GAEG;AAEH;;;GAGG;AACH,qCAAsC;AAG/B,0CADK,OAAO,aAWlB;AAyJM,0CARI,OAAO,cAAc,EAAE,IAAI,yMAKpB,cAAc,wFAgD/B;AAi7BM,6CAHI,OAAO,mBAAmB,EAAE,IAAI,UAChC,UAAU,oCA3oCnB,IAAI;;8FAEkI,cAAc;;oJACrJ,MAEC;0HA6IO,IACP,0CAII,GAAG;;;EAo/BmD;;;;;gBAkC3D;AAOM,+CAFI,OAAO,mBAAmB,EAAE,IAAI;;QAsCnC;;;;WAIG;;QASH;;;;WAIG;;;;;YAjBH;;;;eAIG;;YASH;;;;eAIG;;;;;GAuBV;AAwKM,2CAHI,OAAO,mBAAmB,EAAE,IAAI,aAChC,UAAU,oCAt6CnB,IAAI;;8FAEkI,cAAc;;oJACrJ,MAEC;0HA6IO,IACP,0CAII,GAAG;;;EA+wCmD;;;;GAqDzD;;;;;;OA75CW,CAAC,GAAC,CAAC;OACH,CAAC,GAAC,CAAC;;wCA7DyJ,YAAY;0BAAZ,YAAY;mCAAZ,YAAY;uCAAZ,YAAY;gCAAZ,YAAY;8BAAZ,YAAY;qCAAZ,YAAY;8BAAZ,YAAY"}

package/src/network.js

@@ -8,6 +8,9 @@ import { Shape } from './shapes.js';
 
 import '@agoric/store/exported.js';
 /// <reference path="./types.js" />
+/**
+ * @import {AttemptDescription, Bytes, Closable, CloseReason, Connection, ConnectionHandler, Endpoint, ListenHandler, Port, Protocol, ProtocolHandler, ProtocolImpl} from './types.js';
+ */
 
 /**
  * Compatibility note: this must match what our peers use, so don't change it
@@ -409,7 +412,7 @@ const preparePort = (zone, powers) => {
    * @param {MapStore<Port, SetStore<Closable>>} opts.currentConnections
    * @param {MapStore<string, Port>} opts.boundPorts
    * @param {import('@agoric/vow').Remote<ProtocolHandler>} opts.protocolHandler
-   * @param {Remote<ProtocolImpl>} opts.protocolImpl
+   * @param {import('@agoric/vow').Remote<ProtocolImpl>} opts.protocolImpl
    */
   const initPort = ({
     localAddr,
@@ -454,7 +457,9 @@ const preparePort = (zone, powers) => {
           }
           listening.set(localAddr, [
             this.facets.port,
-            /** @type {Remote<Required<ListenHandler>>} */ (listenHandler),
+            /** @type {import('@agoric/vow').Remote<Required<ListenHandler>>} */ (
+              listenHandler
+            ),
           ]);
           E(lhandler).onRemove(lport, lhandler).catch(rethrowUnlessMissing);
         } else {
@@ -462,7 +467,9 @@ const preparePort = (zone, powers) => {
             localAddr,
             harden([
               this.facets.port,
-              /** @type {Remote<Required<ListenHandler>>} */ (listenHandler),
+              /** @type {import('@agoric/vow').Remote<Required<ListenHandler>>} */ (
+                listenHandler
+              ),
             ]),
           );
         }
@@ -481,7 +488,7 @@ const preparePort = (zone, powers) => {
         );
         return watch(innerVow, this.facets.rethrowUnlessMissingWatcher);
       },
-      /** @param {Remote<ListenHandler>} listenHandler */
+      /** @param {import('@agoric/vow').Remote<ListenHandler>} listenHandler */
       async removeListener(listenHandler) {
         const { listening, localAddr, protocolHandler } = this.state;
         listening.has(localAddr) || Fail`Port ${localAddr} is not listening`;
@@ -503,11 +510,11 @@ const preparePort = (zone, powers) => {
       },
       /**
        * @param {Endpoint} remotePort
-       * @param {Remote<ConnectionHandler>} [connectionHandler]
+       * @param {import('@agoric/vow').Remote<ConnectionHandler>} [connectionHandler]
        */
       async connect(
         remotePort,
-        connectionHandler = /** @type {Remote<ConnectionHandler>} */ (
+        connectionHandler = /** @type {import('@agoric/vow').Remote<ConnectionHandler>} */ (
           makeIncapable()
         ),
       ) {
@@ -724,8 +731,8 @@ const prepareBinder = (zone, powers) => {
      * @param {object} opts
      * @param {MapStore<Port, SetStore<Closable>>} opts.currentConnections
      * @param {MapStore<string, Port>} opts.boundPorts
-     * @param {MapStore<Endpoint, [Port, Remote<Required<ListenHandler>>]>} opts.listening
-     * @param {Remote<ProtocolHandler>} opts.protocolHandler
+     * @param {MapStore<Endpoint, [Port, import('@agoric/vow').Remote<Required<ListenHandler>>]>} opts.listening
+     * @param {import('@agoric/vow').Remote<ProtocolHandler>} opts.protocolHandler
      */
     ({ currentConnections, boundPorts, listening, protocolHandler }) => {
       /** @type {SetStore<Connection>} */
@@ -771,7 +778,7 @@ const prepareBinder = (zone, powers) => {
 
           const innerVow = watch(
             E(
-              /** @type {Remote<Required<ProtocolHandler>>} */ (
+              /** @type {import('@agoric/vow').Remote<Required<ProtocolHandler>>} */ (
                 protocolHandler
               ),
             ).onInstantiate(
@@ -813,7 +820,7 @@ const prepareBinder = (zone, powers) => {
           // Allocate a local address.
           const instantiateInnerVow = watch(
             E(
-              /** @type {Remote<Required<ProtocolHandler>>} */ (
+              /** @type {import('@agoric/vow').Remote<Required<ProtocolHandler>>} */ (
                 protocolHandler
               ),
             ).onInstantiate(port, localAddr, remoteAddr, protocolHandler),
@@ -939,7 +946,7 @@ const prepareBinder = (zone, powers) => {
 
           const innerVow = watch(
             E(
-              /** @type {Remote<Required<ProtocolHandler>>} */ (
+              /** @type {import('@agoric/vow').Remote<Required<ProtocolHandler>>} */ (
                 protocolHandler
               ),
             ).onInstantiate(
@@ -1169,7 +1176,7 @@ export const prepareNetworkProtocol = (zone, powers) => {
   const makeBinderKit = prepareBinder(zone, powers);
 
   /**
-   * @param {Remote<ProtocolHandler>} protocolHandler
+   * @param {import('@agoric/vow').Remote<ProtocolHandler>} protocolHandler
    * @returns {Protocol}
    */
   const makeNetworkProtocol = protocolHandler => {
@@ -1181,7 +1188,7 @@ export const prepareNetworkProtocol = (zone, powers) => {
     /** @type {MapStore<string, Port>} */
     const boundPorts = detached.mapStore('addrToPort');
 
-    /** @type {MapStore<Endpoint, [Port, Remote<Required<ListenHandler>>]>} */
+    /** @type {MapStore<Endpoint, [Port, import('@agoric/vow').Remote<Required<ListenHandler>>]>} */
     const listening = detached.mapStore('listening');
 
     const { binder, protocolImpl } = makeBinderKit({
@@ -1293,7 +1300,7 @@ export function prepareLoopbackProtocolHandler(zone, { watch, allVows }) {
 
   /** @param {string} [instancePrefix] */
   const initHandler = (instancePrefix = 'nonce/') => {
-    /** @type {MapStore<string, [Remote<Port>, Remote<Required<ListenHandler>>]>} */
+    /** @type {MapStore<string, [import('@agoric/vow').Remote<Port>, import('@agoric/vow').Remote<Required<ListenHandler>>]>} */
     const listeners = detached.mapStore('localAddr');
 
     return {
@@ -1325,7 +1332,7 @@ export function prepareLoopbackProtocolHandler(zone, { watch, allVows }) {
          * @param {*} _port
          * @param {Endpoint} localAddr
          * @param {Endpoint} remoteAddr
-         * @returns {PromiseVow<AttemptDescription>}}
+         * @returns {import('@agoric/vow').PromiseVow<AttemptDescription>}}
          */
         async onConnect(_port, localAddr, remoteAddr) {
           const { listeners } = this.state;
@@ -1372,7 +1379,7 @@ export function prepareLoopbackProtocolHandler(zone, { watch, allVows }) {
                 localAddr,
                 harden([
                   port,
-                  /** @type {Remote<Required<ListenHandler>>} */ (
+                  /** @type {import('@agoric/vow').Remote<Required<ListenHandler>>} */ (
                     listenHandler
                   ),
                 ]),
@@ -1383,15 +1390,17 @@ export function prepareLoopbackProtocolHandler(zone, { watch, allVows }) {
               localAddr,
               harden([
                 port,
-                /** @type {Remote<Required<ListenHandler>>} */ (listenHandler),
+                /** @type {import('@agoric/vow').Remote<Required<ListenHandler>>} */ (
+                  listenHandler
+                ),
               ]),
             );
           }
         },
         /**
-         * @param {Remote<Port>} port
+         * @param {import('@agoric/vow').Remote<Port>} port
          * @param {Endpoint} localAddr
-         * @param {Remote<ListenHandler>} listenHandler
+         * @param {import('@agoric/vow').Remote<ListenHandler>} listenHandler
          * @param {*} _protocolHandler
          */
         async onListenRemove(port, localAddr, listenHandler, _protocolHandler) {

package/src/router.d.ts

@@ -1,3 +1,7 @@
+/**
+ * @import {AttemptDescription, Bytes, Closable, CloseReason, Connection, ConnectionHandler, Endpoint, ListenHandler, Port, Protocol, ProtocolHandler, ProtocolImpl} from './types.js';
+ * @import {PromiseVow, Remote, VowKit, VowResolver, VowTools} from '@agoric/vow';
+ */
 /**
  * @template T
  * @typedef {object} Router A delimited string router implementation
@@ -15,7 +19,7 @@ export const RouterI: import("@endo/patterns").InterfaceGuard<{
 }>;
 export function prepareRouter<T>(zone: import("@agoric/base-zone").Zone): () => import("@endo/exo").Guarded<{
     /** @param {Endpoint} addr */
-    getRoutes(addr: Endpoint): [string, T][];
+    getRoutes(addr: string): [string, T][];
     /**
      * @param {string} prefix
      * @param {T} route
@@ -29,17 +33,22 @@ export function prepareRouter<T>(zone: import("@agoric/base-zone").Zone): () =>
 }>;
 export function prepareRouterProtocol(zone: import("@agoric/base-zone").Zone, powers: ReturnType<(zone: import("@agoric/base-zone").Zone, powers?: {
     isRetryableReason?: ((reason: any) => boolean) | undefined;
-    watchPromise?: ((p: PromiseLike<any>, watcher: import("@agoric/vow/src/watch-promise.js").PromiseWatcher, ...args: unknown[]) => void) | undefined;
+    watchPromise?: ((p: PromiseLike<any>, watcher: import("@agoric/vow/src/watch-promise.js").
+    /**
+     * @template T
+     * @typedef {object} Router A delimited string router implementation
+     * @property {(addr: string) => [string, T][]} getRoutes Return the match and
+     *   route in order of preference
+     * @property {(prefix: string, route: T) => void} register Add a prefix->route
+     *   to the database
+     * @property {(prefix: string, route: T) => void} unregister Remove a
+     *   prefix->route from the database
+     */
+    PromiseWatcher, ...args: unknown[]) => void) | undefined;
 } | undefined) => {
     when: <T, TResult1 = import("@agoric/vow").Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("@agoric/vow/src/types.js").Unwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
-    watch: <T_1 = unknown, TResult1_1 = T_1, TResult2_1 = T_1, C = unknown>(specimenP: import("@agoric/vow/src/types.js").ERef<T_1 | import("@agoric/vow/src/types.js" /**
-     * @param {string[]} paths
-     * @param {Remote<ProtocolHandler>} protocolHandler
-     */).Vow /**
-     * @param {string[]} paths
-     * @param {Remote<ProtocolHandler>} protocolHandler
-     */<T_1>>, watcher?: import("@agoric/vow").Watcher<T_1, TResult1_1, TResult2_1, any> | undefined, watcherContext?: C | undefined) => import("@agoric/vow").Vow<TResult1_1 | TResult2_1>;
-    makeVowKit: <T_2>() => import("@agoric/vow").VowKit<T_2>;
+    watch: <T_1 = unknown, TResult1_1 = T_1, TResult2_1 = T_1, C = unknown>(specimenP: import("@agoric/vow/src/types.js" /** @type {Router<Protocol>} */).ERef<T_1 | import("@agoric/vow/src/types.js").Vow<T_1>>, watcher?: import("@agoric/vow").Watcher<T_1, TResult1_1, TResult2_1, any> | undefined, watcherContext?: C | undefined) => import("@agoric/vow").Vow<TResult1_1 | TResult2_1>;
+    makeVowKit: <T_2>() => VowKit<T_2>;
     allVows: (vows: any) => import("@agoric/vow").Vow<any>;
 }>, E?: ((<T_3>(x: T_3) => import("../../../node_modules/@endo/eventual-send/src/E.js").ECallableOrMethods<import("@endo/eventual-send").RemoteFunctions<T_3>>) & {
     readonly get: <T_1_1>(x: T_1_1) => import("../../../node_modules/@endo/eventual-send/src/E.js").EGetters<import("@endo/eventual-send").LocalRecord<T_1_1>>;
@@ -62,7 +71,7 @@ export function prepareRouterProtocol(zone: import("@agoric/base-zone").Zone, po
      */
     unregisterProtocolHandler(prefix: string, protocolHandler: Remote<ProtocolHandler>): void;
     /** @param {Endpoint} localAddr */
-    bindPort(localAddr: Endpoint): Promise<Port | import("@agoric/vow").Vow<Port>>;
+    bindPort(localAddr: string): Promise<Port | import("@agoric/vow").Vow<Port>>;
 }>;
 /**
  * A delimited string router implementation
@@ -89,4 +98,9 @@ export type RouterProtocol = {
     registerProtocolHandler: (paths: string[], protocolHandler: ProtocolHandler) => void;
     unregisterProtocolHandler: (prefix: string, protocolHandler: ProtocolHandler) => void;
 };
+import type { VowKit } from '@agoric/vow';
+import type { ProtocolHandler } from './types.js';
+import type { Remote } from '@agoric/vow';
+import type { Port } from './types.js';
+import type { PromiseVow } from '@agoric/vow';
 //# sourceMappingURL=router.d.ts.map

package/src/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["router.js"],"names":[],"mappings":"AAUA;;;;;;;;;GASG;AAEH;;;;GAIG;AAMI,8BAiDU,CAAC,QAnDP,OAAO,mBAAmB,EAAE,IAAI;IAiBrC,6BAA6B;oBAAjB,QAAQ;IAyBpB;;;OAGG;qBAFQ,MAAM,SAQN,CAAC,AAPA;IAKZ;;;OAGG;uBAFQ,MAAM,SACN,CAAC;GAWjB;AAgBM,4CAJI,OAAO,mBAAmB,EAAE,IAAI,UAChC,UAAU,QAnGrB,OAAO,mBAAmB,EAAE,IAAI;;wBAOjB,gBAAiB,WAAU,OAAQ,kCACjD,EAAE,cAAc,WAAU,SAAU;;uFADa,CAAC,yBACrB,OAAQ,0BAAY,EAAE,MAAM,CAAC,CAAC,CAAC;uFA0H1C,OACX,0BAAI,EAAE,IAAI,CACZ,GAAL,GAAK,OACF,0BAEH,CAAK;;;OAGG,EACH,GAJA,CAAA;;;OAGG,CAHF,GAAC,CAAC,CACT;;;EArC4D,iBAvGjD,GAAC;6BAGT,KAAI;;;uBAGyB,KAChC;uBAGK,KAAI,GAAE,YACF,KAAG,CAAC;;gCACL,GAAI;qCAEa,GAAI,GAAE,YAAa,GAAG,CAAC,gBAAe,CAAE,CAAC,OAAM,GAAI,KAC3E,OAAQ,oDAAQ,EAAE,IACjB,CAAC,CAAC,CAAC,CAAC,YAAY,eAAc,CAAE,CAAC,WAAW,KAAI,OAAQ,oDAAQ,EAAE,IAClE,CAAG,CAAD,CAAC,CAAC,YAAY;;IA0HZ;;;OAGG;mCAFQ,MAAM,EAAE;IAanB;;;OAGG;sCAFQ,MAAM;IAejB,kCAAkC;wBAAtB,QAAQ;GAUzB;;;;mBAnKqC,CAAC;;;;;eAJzB,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,MAAM,EAID,CAAC,AAJG,CAAC,EAAE;;;;;cAE/B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAEE,CAAC,AAFA,KAAK,IAAI;;;;;gBAElC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI;;;uBA8EzB,MAAM;6BACf,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,eAAe,KAAK,IAAI;+BAC3D,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,KAAK,IAAI"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["router.js"],"names":[],"mappings":"AAUA;;;GAGG;AAEH;;;;;;;;;GASG;AAEH;;;;GAIG;AAMI,8BAiDU,CAAC,QAnDP,OAAO,mBAAmB,EAAE,IAAI;IAiBrC,6BAA6B;;IAyB7B;;;OAGG;qBAFQ,MAAM,SAQN,CAAC,AAPA;IAKZ;;;OAGG;uBAFQ,MAAM,SACN,CAAC;GAWjB;AAgBM,4CAJI,OAAO,mBAAmB,EAAE,IAAI,UAChC,UAAU,QAxGrB,OAAO,mBAAmB,EAAE,IAAI;;wBAGjB,gBAAiB,WAC1B,OAAS,kCAAmB;IAMlC;;;;;;;;;OASG;IAEH,cAfU,WAAU,SAAU;;uFAFf,CAAA,yBAEQ,OAAS,0BAAW,EAAE,MAAM,CAAC,CAAC,CAAC;uFAoHlD,OACA,0BACF,CAAI,+BAA+B,EAC/B,IADE,CAAE,GAAA,GAAE,OAAQ,0BAAY,EAAG,GAAE,CAC/B,GAAL,CAAC,CAAC;;;EArByD,iBA5GjD,GAAC;6BAGT,KAAI;;;uBAGyB,KAAI;uBAA8C,KAAI,GAAE,YAC/E,KAAG,CAAC;;gCAGZ,GAAI;qCAA6H,GAAI,GAAE,YAAa,GAAG,CAAC,gBAAe,CAAE,CAAC,OAAM,GAAI,KACpL,OAAQ,oDAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,eAAc,CAAE,CAAC,WAAW,KAAI,OAAQ,oDAE/E,EACC,IACA,CAAE,CAAA,CAAC,CAAC,YACH;;IAgII;;;OAGG;mCAFQ,MAAM,EAAE;IAanB;;;OAGG;sCAFQ,MAAM;IAejB,kCAAkC;;GAUvC;;;;mBAnKqC,CAAC;;;;;eAJzB,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,MAAM,EAID,CAAC,AAJG,CAAC,EAAE;;;;;cAE/B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAEE,CAAC,AAFA,KAAK,IAAI;;;;;gBAElC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI;;;uBA8EzB,MAAM;qCACP,MAAM,EAAE,uCAAuC,IAAI;wCAClD,MAAM,uCAAuC,IAAI;;4BA1FJ,aAAa;qCADyF,YAAY;4BAClH,aAAa;0BADyF,YAAY;gCAClH,aAAa"}

package/src/router.js

@@ -5,8 +5,13 @@ import { Fail } from '@agoric/assert';
 import { ENDPOINT_SEPARATOR, prepareNetworkProtocol } from './network.js';
 import { Shape } from './shapes.js';
 
+// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512
 import '@agoric/store/exported.js';
 /// <reference path="./types.js" />
+/**
+ * @import {AttemptDescription, Bytes, Closable, CloseReason, Connection, ConnectionHandler, Endpoint, ListenHandler, Port, Protocol, ProtocolHandler, ProtocolImpl} from './types.js';
+ * @import {PromiseVow, Remote, VowKit, VowResolver, VowTools} from '@agoric/vow';
+ */
 
 /**
  * @template T

package/src/types.d.ts

@@ -1,23 +1,23 @@
 /**
  * Rearrange the exo types to make a cast of the methods (M) and init function (I) to a specific type.
  */
-type ExoClassMethods<M extends import("@endo/exo").Methods, I extends (...args: any[]) => any> = M & ThisType<{
+export type ExoClassMethods<M extends import("@endo/exo").Methods, I extends (...args: any[]) => any> = M & ThisType<{
     self: import("@endo/exo").Guarded<M>;
     state: ReturnType<I>;
 }>;
 /**
  * Each character code carries 8-bit octets.  Eventually we want to use passable Uint8Arrays.
  */
-type Bytes = string;
+export type Bytes = string;
 /**
  * A local or remote address See multiaddr.js for an
  *   opinionated router implementation
  */
-type Endpoint = string;
+export type Endpoint = string;
 /**
  * A closable object
  */
-type Closable = {
+export type Closable = {
     /**
      * Terminate the object
      */
@@ -26,7 +26,7 @@ type Closable = {
 /**
  * The network Protocol
  */
-type Protocol = {
+export type Protocol = {
     /**
      * Claim a port, or if
      * ending in ENDPOINT_SEPARATOR, a fresh name
@@ -36,7 +36,7 @@ type Protocol = {
 /**
  * A port that has been bound to a protocol
  */
-type Port = {
+export type Port = {
     /**
      * Get the locally bound name of this
      * port
@@ -63,7 +63,7 @@ type Port = {
 /**
  * A handler for incoming connections
  */
-type ListenHandler = {
+export type ListenHandler = {
     /**
      * The listener has been registered
      */
@@ -86,7 +86,7 @@ type ListenHandler = {
      */
     onRemove?: ((port: Remote<Port>, l: Remote<ListenHandler>) => PromiseVow<void>) | undefined;
 };
-type Connection = {
+export type Connection = {
     /**
      *   Send a packet on the connection
      */
@@ -108,7 +108,7 @@ type Connection = {
 /**
  * A handler for a given Connection
  */
-type ConnectionHandler = {
+export type ConnectionHandler = {
     /**
      * The connection has been opened
      */
@@ -125,8 +125,8 @@ type ConnectionHandler = {
 /**
  * The reason a connection was closed
  */
-type CloseReason = any | null;
-type AttemptDescription = {
+export type CloseReason = any | null;
+export type AttemptDescription = {
     handler: Remote<ConnectionHandler>;
     remoteAddress?: string | undefined;
     localAddress?: string | undefined;
@@ -135,7 +135,7 @@ type AttemptDescription = {
  * A handler for things the protocol
  *   implementation will invoke
  */
-type ProtocolHandler = {
+export type ProtocolHandler = {
     /**
      *   This protocol is created
      */
@@ -172,7 +172,7 @@ type ProtocolHandler = {
 /**
  * An inbound connection attempt
  */
-type InboundAttempt = {
+export type InboundAttempt = {
     /**
      *   Establish the connection
      */
@@ -195,7 +195,7 @@ type InboundAttempt = {
 /**
  * Things the protocol can do for us
  */
-type ProtocolImpl = {
+export type ProtocolImpl = {
     /**
      * Claim a port, or if
      * ending in ENDPOINT_SEPARATOR, a fresh name
@@ -210,7 +210,7 @@ type ProtocolImpl = {
      */
     outbound: (port: Remote<Port>, remoteAddr: Endpoint, connectionHandler: Remote<ConnectionHandler>) => PromiseVow<Connection>;
 };
-type PortAllocator = ReturnType<ReturnType<typeof import("@agoric/network").preparePortAllocator>>;
+export type PortAllocator = ReturnType<ReturnType<typeof import("@agoric/network").preparePortAllocator>>;
 import type { PromiseVow } from '@agoric/vow';
 import type { Remote } from '@agoric/vow';
 //# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;qBAO8D,CAAC,sCAAqB,CAAC,mBAD7D,GAAG,EAAE,KAAK,GAAG,IACyB,CAAC,AAAjD,GAAG,QAAQ,CAAC;IAAE,IAAI,EAAE,OAAO,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC;;;;aAK5E,MAAM;;;;;gBAIN,MAAM;;;;;;;;;;;;;;;;;;uBAWI,QAAQ;;;;;;;;;;qBAMjB,MAAM,QAAQ;;;;;;;;sBAKf,QAAQ;;;;;;;;;;;;;;;;;;;;;;8CAeL,QAAQ,cACP,QAAQ;;;;gDAMT,QAAQ,cACP,QAAQ;;;;yCAIe,GAAG;;;;;;;;;;;wBASzB,KAAK,SACX,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;;;;;;qBAIjB,MAAM,QAAQ;;;;sBAEd,MAAM,QAAQ;;;;;;;;;0DAOZ,QAAQ,cACP,QAAQ;;;;uDAMf,KAAK,uCAEH,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;yDAKjB,WAAW;;;;;mBAKZ,GAAG,GAAG,IAAI;;;;;;;;;;;;;;;;;;gCAeG,QAAQ;;;;4CAIlB,QAAQ;;;;8CAMR,QAAQ;;;;oDAOR,QAAQ;;;;qDAOR,QAAQ,UACX,QAAQ;;;;+CAML,QAAQ,UACX,QAAQ;;;;8CAOL,QAAQ;;;;;;;;;mBAMH,kBAAkB;;;;;qBAEzB,MAAM,QAAQ;;;;;sBAEd,MAAM,QAAQ;;;;;;;;;;;;;;uBAKL,QAAQ;;;;0BAGd,QAAQ,cACR,QAAQ;;;;+CAKR,QAAQ;;qBAMX,UAAU,CAAC,UAAU,CAAC,cAAc,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;gCA7LrD,aAAa;4BAAb,aAAa"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;4BAU8D,CAAC,sCAAqB,CAAC,mBAD7D,GAAG,EAAE,KAAK,GAAG,IACyB,CAAC,AAAjD,GAAG,QAAQ,CAAC;IAAE,IAAI,EAAE,OAAO,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC;;;;oBAK5E,MAAM;;;;;uBAIN,MAAM;;;;;;;;;;;;;;;;;;uBAWI,QAAQ;;;;;;;;;;qBAMjB,MAAM,QAAQ;;;;;;;;sBAKf,QAAQ;;;;;;;;;;;;;;;;;;;;;;8CAeL,QAAQ,cACP,QAAQ;;;;gDAMT,QAAQ,cACP,QAAQ;;;;yCAIe,GAAG;;;;;;;;;;;wBASzB,KAAK,SACX,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;;;;;;qBAIjB,MAAM,QAAQ;;;;sBAEd,MAAM,QAAQ;;;;;;;;;0DAOZ,QAAQ,cACP,QAAQ;;;;uDAMf,KAAK,uCAEH,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;yDAKjB,WAAW;;;;;0BAKZ,GAAG,GAAG,IAAI;;;;;;;;;;;;;;;;;;gCAeG,QAAQ;;;;4CAIlB,QAAQ;;;;8CAMR,QAAQ;;;;oDAOR,QAAQ;;;;qDAOR,QAAQ,UACX,QAAQ;;;;+CAML,QAAQ,UACX,QAAQ;;;;8CAOL,QAAQ;;;;;;;;;mBAMH,kBAAkB;;;;;qBAEzB,MAAM,QAAQ;;;;;sBAEd,MAAM,QAAQ;;;;;;;;;;;;;;uBAKL,QAAQ;;;;0BAGd,QAAQ,cACR,QAAQ;;;;+CAKR,QAAQ;;4BAMX,UAAU,CAAC,UAAU,CAAC,cAAc,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;gCA7LrD,aAAa;4BAAb,aAAa"}

package/src/types.js

@@ -1,5 +1,8 @@
 // @ts-check
 
+// Ensure this is a module.
+export {};
+
 /** @import {PromiseVow, Remote} from '@agoric/vow' */
 
 /**