@agoric/network 0.1.1-dev-7ffae88.0 → 0.1.1-orchestration-dev-096c4e8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/network",
-  "version": "0.1.1-dev-7ffae88.0+7ffae88",
+  "version": "0.1.1-orchestration-dev-096c4e8.0+096c4e8",
   "description": "Agoric's network protocol API",
   "type": "module",
   "main": "./src/index.js",
@@ -21,16 +21,20 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-7ffae88.0+7ffae88",
-    "@agoric/internal": "0.3.3-dev-7ffae88.0+7ffae88",
-    "@agoric/store": "0.9.3-dev-7ffae88.0+7ffae88",
-    "@endo/base64": "^1.0.1",
-    "@endo/far": "^1.0.2",
-    "@endo/promise-kit": "^1.0.2"
+    "@agoric/assert": "0.6.1-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/internal": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/store": "0.9.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/vat-data": "0.5.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@endo/base64": "^1.0.2",
+    "@endo/far": "^1.0.4",
+    "@endo/patterns": "^1.1.0",
+    "@endo/promise-kit": "^1.0.4"
   },
   "devDependencies": {
-    "@agoric/swingset-vat": "0.32.3-dev-7ffae88.0+7ffae88",
-    "@endo/bundle-source": "^3.0.2",
+    "@agoric/swingset-liveslots": "0.10.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/swingset-vat": "0.32.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/zone": "0.2.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@endo/bundle-source": "^3.1.0",
     "ava": "^5.3.0",
     "c8": "^7.13.0"
   },
@@ -66,5 +70,5 @@
   "typeCoverage": {
     "atLeast": 76.57
   },
-  "gitHead": "7ffae88ae37df782d5ffe3cf92261a498b0f636c"
+  "gitHead": "096c4e8fce80e9a509b0e1a30fda11736c4570e1"
 }

package/src/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./network.js";
 export * from "./multiaddr.js";
 export * from "./bytes.js";
-export { default as makeRouter, makeRouterProtocol } from "./router.js";
+export { prepareRouter, prepareRouterProtocol } from "./router.js";
 //# sourceMappingURL=index.d.ts.map

package/src/index.js

@@ -1,4 +1,4 @@
 export * from './network.js';
-export { default as makeRouter, makeRouterProtocol } from './router.js';
+export { prepareRouter, prepareRouterProtocol } from './router.js';
 export * from './multiaddr.js';
 export * from './bytes.js';

package/src/network.d.ts

@@ -1,44 +1,146 @@
-/**
- * @param {ConnectionHandler} handler0
- * @param {Endpoint} addr0
- * @param {ConnectionHandler} handler1
- * @param {Endpoint} addr1
- * @param {WeakSet<Connection>} [current]
- * @returns {[Connection, Connection]}
- */
-export function crossoverConnection(handler0: ConnectionHandler, addr0: Endpoint, handler1: ConnectionHandler, addr1: Endpoint, current?: WeakSet<Connection> | undefined): [Connection, Connection];
 /**
  * Get the list of prefixes from longest to shortest.
  *
  * @param {string} addr
  */
 export function getPrefixes(addr: string): string[];
-/**
- * Create a protocol that has a handler.
- *
- * @param {ProtocolHandler} protocolHandler
- * @returns {Protocol} the local capability for connecting and listening
- */
-export function makeNetworkProtocol(protocolHandler: ProtocolHandler): Protocol;
-/**
- * Create a ConnectionHandler that just echoes its packets.
- *
- * @returns {ConnectionHandler}
- */
-export function makeEchoConnectionHandler(): ConnectionHandler;
-export function makeNonceMaker(prefix?: string, suffix?: string): () => Promise<string>;
 /**
  * Create a protocol handler that just connects to itself.
  *
- * @param {ProtocolHandler['onInstantiate']} [onInstantiate]
- * @returns {ProtocolHandler} The localhost handler
+ * @param {import('@agoric/base-zone').Zone} zone
+ * @param {ReturnType<import('@agoric/vow').prepareVowTools>} powers
  */
-export function makeLoopbackProtocolHandler(onInstantiate?: ProtocolHandler['onInstantiate']): ProtocolHandler;
+export function prepareLoopbackProtocolHandler(zone: import('@agoric/base-zone').Zone, { when }: 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;
+} | undefined) => {
+    when: <T = any, TResult1 = import("@agoric/vow/src/E.js").Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("@agoric/vow/src/E.js").Unwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
+    watch: <T_1 = any, TResult1_1 = T_1, TResult2_1 = T_1>(specimenP: import("@agoric/vow").ERef<T_1 | import("@agoric/vow").Vow<T_1>>, watcher?: import("@agoric/vow").Watcher<T_1, TResult1_1, TResult2_1> | undefined, watcherContext?: unknown) => import("@agoric/vow").Vow<TResult1_1 | TResult2_1>;
+    makeVowKit: <T_2>() => import("@agoric/vow").VowKit<T_2>;
+}>): (instancePrefix?: string | undefined) => import("@endo/exo/src/exo-makers.js").Guarded<{
+    onCreate(_impl: any, _protocolHandler: any): Promise<void>;
+    generatePortID(_localAddr: any, _protocolHandler: any): Promise<string>;
+    onBind(_port: any, _localAddr: any, _protocolHandler: any): Promise<void>;
+    onConnect(_port: any, localAddr: any, remoteAddr: any, _chandler: any, protocolHandler: any): Promise<{
+        remoteInstance: any;
+        handler: ConnectionHandler;
+    }>;
+    onInstantiate(_port: any, _localAddr: any, _remote: any, _protocol: any): Promise<string>;
+    onListen(port: any, localAddr: any, listenHandler: any, _protocolHandler: any): Promise<void>;
+    /**
+     * @param {Port} port
+     * @param {Endpoint} localAddr
+     * @param {ListenHandler} listenHandler
+     * @param {*} _protocolHandler
+     */
+    onListenRemove(port: Port, localAddr: Endpoint, listenHandler: ListenHandler, _protocolHandler: any): Promise<void>;
+    onRevoke(_port: any, _localAddr: any, _protocolHandler: any): Promise<void>;
+}>;
 /**
  * Compatibility note: this must match what our peers use, so don't change it
  * casually.
  */
 export const ENDPOINT_SEPARATOR: "/";
-export function rethrowUnlessMissing(err: any): undefined;
-export function makeConnection(handler: ConnectionHandler, localAddr: Endpoint, remoteAddr: Endpoint, current?: Set<Closable> | undefined): Connection;
+export namespace Shape {
+    let ConnectionI: import("@endo/patterns").InterfaceGuard<{
+        send: import("@endo/patterns").MethodGuard;
+        close: import("@endo/patterns").MethodGuard;
+        getLocalAddress: import("@endo/patterns").MethodGuard;
+        getRemoteAddress: import("@endo/patterns").MethodGuard;
+    }>;
+    let InboundAttemptI: import("@endo/patterns").InterfaceGuard<{
+        accept: import("@endo/patterns").MethodGuard;
+        getLocalAddress: import("@endo/patterns").MethodGuard;
+        getRemoteAddress: import("@endo/patterns").MethodGuard;
+        close: import("@endo/patterns").MethodGuard;
+    }>;
+    let PortI: import("@endo/patterns").InterfaceGuard<{
+        getLocalAddress: import("@endo/patterns").MethodGuard;
+        addListener: import("@endo/patterns").MethodGuard;
+        connect: import("@endo/patterns").MethodGuard;
+        removeListener: import("@endo/patterns").MethodGuard;
+        revoke: import("@endo/patterns").MethodGuard;
+    }>;
+    let ProtocolHandlerI: import("@endo/patterns").InterfaceGuard<{
+        onCreate: import("@endo/patterns").MethodGuard;
+        generatePortID: import("@endo/patterns").MethodGuard;
+        onBind: import("@endo/patterns").MethodGuard;
+        onListen: import("@endo/patterns").MethodGuard;
+        onListenRemove: import("@endo/patterns").MethodGuard;
+        onInstantiate: import("@endo/patterns").MethodGuard;
+        onConnect: import("@endo/patterns").MethodGuard;
+        onRevoke: import("@endo/patterns").MethodGuard;
+    }>;
+    let ProtocolImplI: import("@endo/patterns").InterfaceGuard<{
+        bind: import("@endo/patterns").MethodGuard;
+        inbound: import("@endo/patterns").MethodGuard;
+        outbound: import("@endo/patterns").MethodGuard;
+    }>;
+    function Vow$(shape: any): import("@endo/patterns").Matcher;
+    let AttemptDescription: import("@endo/patterns").Matcher;
+    let Opts: import("@endo/patterns").Matcher;
+    let Data: import("@endo/patterns").Matcher;
+    let Bytes: import("@endo/patterns").Matcher;
+    let Endpoint: import("@endo/patterns").Matcher;
+    let Vow: import("@endo/patterns").Matcher;
+    let ConnectionHandler: import("@endo/patterns").Matcher;
+    let Connection: import("@endo/patterns").Matcher;
+    let InboundAttempt: import("@endo/patterns").Matcher;
+    let Listener: import("@endo/patterns").Matcher;
+    let ListenHandler: import("@endo/patterns").Matcher;
+    let Port: import("@endo/patterns").Matcher;
+    let ProtocolHandler: import("@endo/patterns").Matcher;
+    let ProtocolImpl: import("@endo/patterns").Matcher;
+}
+export function rethrowUnlessMissing(err: unknown): undefined;
+export function crossoverConnection(zone: import('@agoric/zone').Zone, handler0: ConnectionHandler, addr0: Endpoint, handler1: ConnectionHandler, addr1: Endpoint, makeConnection: (opts: ConnectionOpts) => Connection, current?: WeakSetStore<Closable>): 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;
+} | undefined) => {
+    when: <T = any, TResult1 = import("@agoric/vow/src/E.js").Unwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("@agoric/vow/src/E.js").Unwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;
+    watch: <T_1 = any, TResult1_1 = T_1, TResult2_1 = T_1>(specimenP: import("@agoric/vow").ERef<T_1 | import("@agoric/vow").Vow<T_1>>, watcher?: import("@agoric/vow").Watcher<T_1, TResult1_1, TResult2_1> | undefined, watcherContext?: unknown) => import("@agoric/vow").Vow<TResult1_1 | TResult2_1>;
+    makeVowKit: <T_2>() => import("@agoric/vow").VowKit<T_2>;
+}>): (protocolHandler: ProtocolHandler) => Protocol;
+export function prepareEchoConnectionKit(zone: import('@agoric/base-zone').Zone): () => import("@endo/exo/src/exo-makers.js").GuardedKit<{
+    handler: {
+        /**
+         * @param {Connection} _connection
+         * @param {Bytes} bytes
+         * @param {ConnectionHandler} _connectionHandler
+         */
+        onReceive(_connection: Connection, bytes: Bytes, _connectionHandler: ConnectionHandler): Promise<string>;
+        /**
+         * @param {Connection} _connection
+         * @param {CloseReason} [_reason]
+         * @param {ConnectionHandler} [_connectionHandler]
+         */
+        onClose(_connection: Connection, _reason?: CloseReason, _connectionHandler?: ConnectionHandler | undefined): Promise<void>;
+    };
+    listener: {
+        onAccept(_port: any, _localAddr: any, _remoteAddr: any, _listenHandler: any): Promise<import("@endo/exo/src/exo-makers.js").Guarded<{
+            /**
+             * @param {Connection} _connection
+             * @param {Bytes} bytes
+             * @param {ConnectionHandler} _connectionHandler
+             */
+            onReceive(_connection: Connection, bytes: Bytes, _connectionHandler: ConnectionHandler): Promise<string>;
+            /**
+             * @param {Connection} _connection
+             * @param {CloseReason} [_reason]
+             * @param {ConnectionHandler} [_connectionHandler]
+             */
+            onClose(_connection: Connection, _reason?: CloseReason, _connectionHandler?: ConnectionHandler | undefined): Promise<void>;
+        }>>;
+        onListen(port: any, _listenHandler: any): Promise<void>;
+    };
+}>;
+export type ConnectionOpts = {
+    addrs: Endpoint[];
+    handlers: ConnectionHandler[];
+    conns: MapStore<number, Connection>;
+    current: WeakSetStore<Closable>;
+    l: 0 | 1;
+    r: 0 | 1;
+};
 //# 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":"AAuGA;;;;;;;GAOG;AACH,8CAPW,iBAAiB,SACjB,QAAQ,YACR,iBAAiB,SACjB,QAAQ,8CAEN,CAAC,UAAU,EAAE,UAAU,CAAC,CAkEpC;AAED;;;;GAIG;AACH,kCAFW,MAAM,YAahB;AAED;;;;;GAKG;AACH,qDAHW,eAAe,GACb,QAAQ,CA2RpB;AAED;;;;GAIG;AACH,6CAFa,iBAAiB,CAmB7B;AAED,wFAMC;AAED;;;;;GAKG;AACH,4DAHW,eAAe,CAAC,eAAe,CAAC,GAC9B,eAAe,CA2D3B;AAzjBD;;;GAGG;AACH,qCAAsC;AAE/B,0DAUN;AAWM,wCANI,iBAAiB,aACjB,QAAQ,cACR,QAAQ,wCAEN,UAAU,CAkEtB"}
+{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["network.js"],"names":[],"mappings":"AAyJA;;;;GAIG;AACH,kCAFW,MAAM,YAahB;AAgvBD;;;;;GAKG;AACH,qDAHW,OAAO,mBAAmB,EAAE,IAAI,YAChC;;;;;;;EAAiD;;;;;;;;;;IA4EtD;;;;;OAKG;yBAJQ,IAAI,aACJ,QAAQ,iBACR,aAAa;;GAkB7B;AAn/BD;;;GAGG;AACH,qCAAsC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8B9B,4DAAgC;;;;;;;;;;;;;;;;AAgGjC,0CADK,OAAO,aAWlB;AA2GM,0CARI,OAAO,cAAc,EAAE,IAAI,YAC3B,iBAAiB,SACjB,QAAQ,YACR,iBAAiB,SACjB,QAAQ,yBACD,cAAc,KAAK,UAAU,YACpC,aAAa,QAAQ,CAAC,gBA+ChC;AAofM,6CAHI,OAAO,mBAAmB,EAAE,IAAI,UAChC;;;;;;;EAAiD,qBAM/C,eAAe,KACb,QAAQ,CA2BtB;AAOM,+CAFI,OAAO,mBAAmB,EAAE,IAAI;;QAuCnC;;;;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;;WA1uBa,QAAQ,EAAE;cACV,iBAAiB,EAAE;WACnB,SAAS,MAAM,EAAE,UAAU,CAAC;aAC5B,aAAa,QAAQ,CAAC;OACtB,CAAC,GAAC,CAAC;OACH,CAAC,GAAC,CAAC"}