@dxos/messaging 0.6.9 → 0.6.10-main.3cfcc89
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/index.mjs +71 -48
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +84 -61
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/types/src/messenger.d.ts.map +1 -1
- package/dist/types/src/signal-client/signal-rpc-client.d.ts.map +1 -1
- package/dist/types/src/signal-manager/edge-signal-manager.d.ts +1 -0
- package/dist/types/src/signal-manager/edge-signal-manager.d.ts.map +1 -1
- package/dist/types/src/testing/test-messages.d.ts +1 -1
- package/dist/types/src/testing/test-messages.d.ts.map +1 -1
- package/package.json +14 -14
- package/src/messenger.test.ts +1 -1
- package/src/messenger.ts +2 -1
- package/src/signal-client/signal-client.test.ts +1 -1
- package/src/signal-client/signal-rpc-client.test.ts +1 -1
- package/src/signal-client/signal-rpc-client.ts +2 -1
- package/src/signal-manager/edge-signal-manager.test.ts +1 -1
- package/src/signal-manager/edge-signal-manager.ts +17 -6
- package/src/signal-manager/memory-signal-manager.ts +1 -1
- package/src/testing/test-messages.ts +1 -1
- package/src/testing/utils.ts +2 -2
package/dist/lib/node/meta.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/core/mesh/messaging/src/messenger-monitor.ts":{"bytes":2072,"imports":[{"path":"@dxos/tracing","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/timeouts.ts":{"bytes":692,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/messenger.ts":{"bytes":37509,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/messenger-monitor.ts","kind":"import-statement","original":"./messenger-monitor"},{"path":"packages/core/mesh/messaging/src/timeouts.ts","kind":"import-statement","original":"./timeouts"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-client-monitor.ts":{"bytes":11042,"imports":[{"path":"@dxos/tracing","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-local-state.ts":{"bytes":22542,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client-monitor.ts":{"bytes":1610,"imports":[{"path":"@dxos/tracing","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts":{"bytes":25921,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-client/signal-rpc-client-monitor.ts","kind":"import-statement","original":"./signal-rpc-client-monitor"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-client.ts":{"bytes":44005,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/mesh/signal","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-client/signal-client-monitor.ts","kind":"import-statement","original":"./signal-client-monitor"},{"path":"packages/core/mesh/messaging/src/signal-client/signal-local-state.ts","kind":"import-statement","original":"./signal-local-state"},{"path":"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts","kind":"import-statement","original":"./signal-rpc-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/index.ts":{"bytes":527,"imports":[{"path":"packages/core/mesh/messaging/src/signal-client/signal-client.ts","kind":"import-statement","original":"./signal-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-methods.ts":{"bytes":3541,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts":{"bytes":24011,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-methods.ts","kind":"import-statement","original":"../signal-methods"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/signal-manager.ts":{"bytes":1062,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager-monitor.ts":{"bytes":2226,"imports":[{"path":"@dxos/tracing","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts":{"bytes":29352,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager-monitor.ts","kind":"import-statement","original":"./websocket-signal-manager-monitor"},{"path":"packages/core/mesh/messaging/src/signal-client/index.ts","kind":"import-statement","original":"../signal-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts":{"bytes":22827,"imports":[{"path":"@bufbuild/protobuf/wkt","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/edge-client","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-methods.ts","kind":"import-statement","original":"../signal-methods"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/utils.ts":{"bytes":5247,"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/client/services","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/index.ts":{"bytes":982,"imports":[{"path":"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts","kind":"import-statement","original":"./memory-signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/signal-manager.ts","kind":"import-statement","original":"./signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts","kind":"import-statement","original":"./websocket-signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts","kind":"import-statement","original":"./edge-signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"packages/core/mesh/messaging/src/index.ts":{"bytes":818,"imports":[{"path":"packages/core/mesh/messaging/src/messenger.ts","kind":"import-statement","original":"./messenger"},{"path":"packages/core/mesh/messaging/src/signal-client/index.ts","kind":"import-statement","original":"./signal-client"},{"path":"packages/core/mesh/messaging/src/signal-manager/index.ts","kind":"import-statement","original":"./signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-methods.ts","kind":"import-statement","original":"./signal-methods"}],"format":"esm"}},"outputs":{"packages/core/mesh/messaging/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":106775},"packages/core/mesh/messaging/dist/lib/node/index.cjs":{"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/tracing","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/mesh/signal","kind":"import-statement","external":true},{"path":"@dxos/tracing","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true},{"path":"@dxos/tracing","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/tracing","kind":"import-statement","external":true},{"path":"@bufbuild/protobuf/wkt","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/edge-client","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/client/services","kind":"import-statement","external":true}],"exports":["EdgeSignalManager","MemorySignalManager","MemorySignalManagerContext","Messenger","PeerInfoHash","SignalClient","WebsocketSignalManager","setIdentityTags"],"entryPoint":"packages/core/mesh/messaging/src/index.ts","inputs":{"packages/core/mesh/messaging/src/messenger.ts":{"bytesInOutput":10544},"packages/core/mesh/messaging/src/messenger-monitor.ts":{"bytesInOutput":392},"packages/core/mesh/messaging/src/timeouts.ts":{"bytesInOutput":27},"packages/core/mesh/messaging/src/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-client/signal-client.ts":{"bytesInOutput":12280},"packages/core/mesh/messaging/src/signal-client/signal-client-monitor.ts":{"bytesInOutput":2827},"packages/core/mesh/messaging/src/signal-client/signal-local-state.ts":{"bytesInOutput":5016},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts":{"bytesInOutput":6789},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client-monitor.ts":{"bytesInOutput":283},"packages/core/mesh/messaging/src/signal-client/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts":{"bytesInOutput":6544},"packages/core/mesh/messaging/src/signal-methods.ts":{"bytesInOutput":45},"packages/core/mesh/messaging/src/signal-manager/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts":{"bytesInOutput":9271},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager-monitor.ts":{"bytesInOutput":436},"packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts":{"bytesInOutput":6278},"packages/core/mesh/messaging/src/signal-manager/utils.ts":{"bytesInOutput":1597}},"bytes":63847}}}
|
|
1
|
+
{"inputs":{"packages/core/mesh/messaging/src/messenger-monitor.ts":{"bytes":2072,"imports":[{"path":"@dxos/tracing","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/timeouts.ts":{"bytes":692,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/messenger.ts":{"bytes":37629,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/messenger-monitor.ts","kind":"import-statement","original":"./messenger-monitor"},{"path":"packages/core/mesh/messaging/src/timeouts.ts","kind":"import-statement","original":"./timeouts"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-client-monitor.ts":{"bytes":11042,"imports":[{"path":"@dxos/tracing","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-local-state.ts":{"bytes":22542,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client-monitor.ts":{"bytes":1610,"imports":[{"path":"@dxos/tracing","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts":{"bytes":26041,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-client/signal-rpc-client-monitor.ts","kind":"import-statement","original":"./signal-rpc-client-monitor"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/signal-client.ts":{"bytes":44005,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/mesh/signal","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-client/signal-client-monitor.ts","kind":"import-statement","original":"./signal-client-monitor"},{"path":"packages/core/mesh/messaging/src/signal-client/signal-local-state.ts","kind":"import-statement","original":"./signal-local-state"},{"path":"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts","kind":"import-statement","original":"./signal-rpc-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-client/index.ts":{"bytes":527,"imports":[{"path":"packages/core/mesh/messaging/src/signal-client/signal-client.ts","kind":"import-statement","original":"./signal-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-methods.ts":{"bytes":3541,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts":{"bytes":24025,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-methods.ts","kind":"import-statement","original":"../signal-methods"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/signal-manager.ts":{"bytes":1062,"imports":[],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager-monitor.ts":{"bytes":2226,"imports":[{"path":"@dxos/tracing","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts":{"bytes":29352,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager-monitor.ts","kind":"import-statement","original":"./websocket-signal-manager-monitor"},{"path":"packages/core/mesh/messaging/src/signal-client/index.ts","kind":"import-statement","original":"../signal-client"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts":{"bytes":24777,"imports":[{"path":"@bufbuild/protobuf/wkt","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/edge-client","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/messaging/src/signal-methods.ts","kind":"import-statement","original":"../signal-methods"}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/utils.ts":{"bytes":5247,"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/client/services","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/messaging/src/signal-manager/index.ts":{"bytes":982,"imports":[{"path":"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts","kind":"import-statement","original":"./memory-signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/signal-manager.ts","kind":"import-statement","original":"./signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts","kind":"import-statement","original":"./websocket-signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts","kind":"import-statement","original":"./edge-signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-manager/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"packages/core/mesh/messaging/src/index.ts":{"bytes":818,"imports":[{"path":"packages/core/mesh/messaging/src/messenger.ts","kind":"import-statement","original":"./messenger"},{"path":"packages/core/mesh/messaging/src/signal-client/index.ts","kind":"import-statement","original":"./signal-client"},{"path":"packages/core/mesh/messaging/src/signal-manager/index.ts","kind":"import-statement","original":"./signal-manager"},{"path":"packages/core/mesh/messaging/src/signal-methods.ts","kind":"import-statement","original":"./signal-methods"}],"format":"esm"}},"outputs":{"packages/core/mesh/messaging/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":107715},"packages/core/mesh/messaging/dist/lib/node/index.cjs":{"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/tracing","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/mesh/signal","kind":"import-statement","external":true},{"path":"@dxos/tracing","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true},{"path":"@dxos/tracing","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/tracing","kind":"import-statement","external":true},{"path":"@bufbuild/protobuf/wkt","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/edge-client","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/client/services","kind":"import-statement","external":true}],"exports":["EdgeSignalManager","MemorySignalManager","MemorySignalManagerContext","Messenger","PeerInfoHash","SignalClient","WebsocketSignalManager","setIdentityTags"],"entryPoint":"packages/core/mesh/messaging/src/index.ts","inputs":{"packages/core/mesh/messaging/src/messenger.ts":{"bytesInOutput":10584},"packages/core/mesh/messaging/src/messenger-monitor.ts":{"bytesInOutput":392},"packages/core/mesh/messaging/src/timeouts.ts":{"bytesInOutput":27},"packages/core/mesh/messaging/src/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-client/signal-client.ts":{"bytesInOutput":12280},"packages/core/mesh/messaging/src/signal-client/signal-client-monitor.ts":{"bytesInOutput":2827},"packages/core/mesh/messaging/src/signal-client/signal-local-state.ts":{"bytesInOutput":5016},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts":{"bytesInOutput":6829},"packages/core/mesh/messaging/src/signal-client/signal-rpc-client-monitor.ts":{"bytesInOutput":283},"packages/core/mesh/messaging/src/signal-client/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts":{"bytesInOutput":6550},"packages/core/mesh/messaging/src/signal-methods.ts":{"bytesInOutput":45},"packages/core/mesh/messaging/src/signal-manager/index.ts":{"bytesInOutput":0},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts":{"bytesInOutput":9271},"packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager-monitor.ts":{"bytesInOutput":436},"packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts":{"bytesInOutput":6801},"packages/core/mesh/messaging/src/signal-manager/utils.ts":{"bytesInOutput":1597}},"bytes":64456}}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messenger.d.ts","sourceRoot":"","sources":["../../../src/messenger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"messenger.d.ts","sourceRoot":"","sources":["../../../src/messenger.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG/D,MAAM,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;IACnD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEzB;IAGF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqC;IAEvE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyD;IAEzF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6C;IAE/E;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6C;IAEtE,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,EAAE,aAAa,EAAE,UAAgB,EAAE,EAAE,gBAAgB;IAOjE,IAAI;IA6BE,KAAK;IAQL,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6DzE;;;OAGG;IACG,MAAM,CAAC,EACX,IAAI,EACJ,WAAW,EACX,SAAS,GACV,EAAE;QACD,IAAI,EAAE,QAAQ,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,SAAS,CAAC;KACtB,GAAG,OAAO,CAAC,eAAe,CAAC;YA8Bd,cAAc;YAmBd,cAAc;YAad,sBAAsB;YA+BtB,sBAAsB;YAKtB,oBAAoB;YAqBpB,cAAc;IAwB5B,OAAO,CAAC,UAAU;CAgBnB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signal-rpc-client.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-rpc-client.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG7D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"signal-rpc-client.d.ts","sourceRoot":"","sources":["../../../../src/signal-client/signal-rpc-client.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG7D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,KAAK,OAAO,IAAI,aAAa,EAAe,MAAM,wCAAwC,CAAC;AAWpG,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAE5B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyB;IAC9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,OAAO,CAAC,aAAa,CAAC,CAAU;IAEhC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAEhD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;gBAE7C,EAAE,GAAG,EAAE,SAAc,EAAE,EAAE,qBAAqB;IA2FpD,KAAK;IAsBL,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IAa/D,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAWlE,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE;YAY7F,aAAa;CAQ5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/edge-signal-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,KAAK,cAAc,EAAY,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAWvC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAE/F,qBAAa,iBAAkB,SAAQ,QAAS,YAAW,aAAa;IAC/D,UAAU,oBAA2B;IACrC,SAAS,iBAAwB;IAExC;;OAEG;IAEH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmE;IAC/F,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;gBAErC,EAAE,cAAc,EAAE,EAAE;QAAE,cAAc,EAAE,cAAc,CAAA;KAAE;cAKzC,KAAK;
|
|
1
|
+
{"version":3,"file":"edge-signal-manager.d.ts","sourceRoot":"","sources":["../../../../src/signal-manager/edge-signal-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,KAAK,cAAc,EAAY,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAWvC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAE/F,qBAAa,iBAAkB,SAAQ,QAAS,YAAW,aAAa;IAC/D,UAAU,oBAA2B;IACrC,SAAS,iBAAwB;IAExC;;OAEG;IAEH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmE;IAC/F,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;gBAErC,EAAE,cAAc,EAAE,EAAE;QAAE,cAAc,EAAE,cAAc,CAAA;KAAE;cAKzC,KAAK;IAM9B;;OAEG;IACG,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB1E,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3E,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpD,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,qBAAqB;IAqC7B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,kBAAkB;YAMZ,gBAAgB;CAU/B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type TaggedType } from '@dxos/codec-protobuf';
|
|
2
|
-
import { type TYPES } from '@dxos/protocols';
|
|
2
|
+
import { type TYPES } from '@dxos/protocols/proto';
|
|
3
3
|
export declare const PAYLOAD_1: TaggedType<TYPES, 'google.protobuf.Any'>;
|
|
4
4
|
export declare const PAYLOAD_2: TaggedType<TYPES, 'google.protobuf.Any'>;
|
|
5
5
|
export declare const PAYLOAD_3: TaggedType<TYPES, 'google.protobuf.Any'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-messages.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-messages.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"test-messages.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-messages.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,qBAAqB,CAI9D,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,qBAAqB,CAI9D,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,qBAAqB,CAI9D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/messaging",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.10-main.3cfcc89",
|
|
4
4
|
"description": "Messaging",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -28,25 +28,25 @@
|
|
|
28
28
|
"@bufbuild/protobuf": "^2.0.0",
|
|
29
29
|
"isomorphic-ws": "^5.0.0",
|
|
30
30
|
"ws": "^8.14.2",
|
|
31
|
-
"@dxos/async": "0.6.
|
|
32
|
-
"@dxos/
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/
|
|
35
|
-
"@dxos/
|
|
36
|
-
"@dxos/keys": "0.6.
|
|
37
|
-
"@dxos/log": "0.6.
|
|
38
|
-
"@dxos/node-std": "0.6.
|
|
39
|
-
"@dxos/protocols": "0.6.
|
|
40
|
-
"@dxos/rpc": "0.6.
|
|
41
|
-
"@dxos/
|
|
42
|
-
"@dxos/
|
|
31
|
+
"@dxos/async": "0.6.10-main.3cfcc89",
|
|
32
|
+
"@dxos/context": "0.6.10-main.3cfcc89",
|
|
33
|
+
"@dxos/edge-client": "0.6.10-main.3cfcc89",
|
|
34
|
+
"@dxos/codec-protobuf": "0.6.10-main.3cfcc89",
|
|
35
|
+
"@dxos/invariant": "0.6.10-main.3cfcc89",
|
|
36
|
+
"@dxos/keys": "0.6.10-main.3cfcc89",
|
|
37
|
+
"@dxos/log": "0.6.10-main.3cfcc89",
|
|
38
|
+
"@dxos/node-std": "0.6.10-main.3cfcc89",
|
|
39
|
+
"@dxos/protocols": "0.6.10-main.3cfcc89",
|
|
40
|
+
"@dxos/rpc": "0.6.10-main.3cfcc89",
|
|
41
|
+
"@dxos/tracing": "0.6.10-main.3cfcc89",
|
|
42
|
+
"@dxos/util": "0.6.10-main.3cfcc89"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
45
|
"@types/node": "^18.11.9",
|
|
46
46
|
"earljs": "~0.1.10",
|
|
47
47
|
"typescript": "^5.5.4",
|
|
48
48
|
"wait-for-expect": "^3.0.2",
|
|
49
|
-
"@dxos/signal": "0.6.
|
|
49
|
+
"@dxos/signal": "0.6.10-main.3cfcc89"
|
|
50
50
|
},
|
|
51
51
|
"publishConfig": {
|
|
52
52
|
"access": "public"
|
package/src/messenger.test.ts
CHANGED
|
@@ -52,7 +52,7 @@ describe('Messenger with WebsocketSignalManager', () => {
|
|
|
52
52
|
// TODO(mykola): Expects wrangler dev in edge repo to run. Skip to pass CI.
|
|
53
53
|
describe.skip('Messenger with EdgeSignalManager', () => {
|
|
54
54
|
const edgeSignalFactory = async (identityKey: PublicKey, deviceKey: PublicKey) => {
|
|
55
|
-
const client = new EdgeClient(identityKey, deviceKey, { socketEndpoint: 'ws://localhost:8787' });
|
|
55
|
+
const client = new EdgeClient(identityKey.toHex(), deviceKey.toHex(), { socketEndpoint: 'ws://localhost:8787' });
|
|
56
56
|
await openAndClose(client);
|
|
57
57
|
|
|
58
58
|
return new EdgeSignalManager({ edgeConnection: client });
|
package/src/messenger.ts
CHANGED
|
@@ -8,7 +8,8 @@ import { Context } from '@dxos/context';
|
|
|
8
8
|
import { invariant } from '@dxos/invariant';
|
|
9
9
|
import { PublicKey } from '@dxos/keys';
|
|
10
10
|
import { log } from '@dxos/log';
|
|
11
|
-
import { TimeoutError as ProtocolTimeoutError,
|
|
11
|
+
import { TimeoutError as ProtocolTimeoutError, trace } from '@dxos/protocols';
|
|
12
|
+
import { schema } from '@dxos/protocols/proto';
|
|
12
13
|
import { type ReliablePayload } from '@dxos/protocols/proto/dxos/mesh/messaging';
|
|
13
14
|
import { ComplexMap, ComplexSet } from '@dxos/util';
|
|
14
15
|
|
|
@@ -8,7 +8,7 @@ import { expect } from 'earljs';
|
|
|
8
8
|
import { asyncTimeout, waitForCondition } from '@dxos/async';
|
|
9
9
|
import { type Any, type TaggedType } from '@dxos/codec-protobuf';
|
|
10
10
|
import { PublicKey } from '@dxos/keys';
|
|
11
|
-
import { type TYPES } from '@dxos/protocols';
|
|
11
|
+
import { type TYPES } from '@dxos/protocols/proto';
|
|
12
12
|
import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
|
|
13
13
|
import { afterAll, beforeAll, describe, test, afterTest } from '@dxos/test';
|
|
14
14
|
import { ComplexSet, range } from '@dxos/util';
|
|
@@ -7,7 +7,7 @@ import { expect } from 'earljs';
|
|
|
7
7
|
import { type Any } from '@dxos/codec-protobuf';
|
|
8
8
|
import { PublicKey } from '@dxos/keys';
|
|
9
9
|
import { log } from '@dxos/log';
|
|
10
|
-
import { schema } from '@dxos/protocols';
|
|
10
|
+
import { schema } from '@dxos/protocols/proto';
|
|
11
11
|
import { type Message as SignalMessage, type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
|
|
12
12
|
import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
|
|
13
13
|
import { afterAll, afterTest, beforeAll, describe, test } from '@dxos/test';
|
|
@@ -10,7 +10,8 @@ import { Context } from '@dxos/context';
|
|
|
10
10
|
import { invariant } from '@dxos/invariant';
|
|
11
11
|
import { PublicKey } from '@dxos/keys';
|
|
12
12
|
import { log } from '@dxos/log';
|
|
13
|
-
import {
|
|
13
|
+
import { trace } from '@dxos/protocols';
|
|
14
|
+
import { schema } from '@dxos/protocols/proto';
|
|
14
15
|
import { type Message as SignalMessage, type Signal } from '@dxos/protocols/proto/dxos/mesh/signal';
|
|
15
16
|
import { createProtoRpcPeer, type ProtoRpcPeer } from '@dxos/rpc';
|
|
16
17
|
|
|
@@ -11,7 +11,7 @@ import { createMessage, expectReceivedMessage, TestBuilder, type TestBuilderOpti
|
|
|
11
11
|
// TODO(mykola): Expects wrangler dev in edge repo to run. Skip to pass CI.
|
|
12
12
|
describe.skip('EdgeSignalManager', () => {
|
|
13
13
|
const edgeSignalFactory: TestBuilderOptions['signalManagerFactory'] = async (identityKey, deviceKey) => {
|
|
14
|
-
const client = new EdgeClient(identityKey, deviceKey, { socketEndpoint: 'ws://localhost:8787' });
|
|
14
|
+
const client = new EdgeClient(identityKey.toHex(), deviceKey.toHex(), { socketEndpoint: 'ws://localhost:8787' });
|
|
15
15
|
await openAndClose(client);
|
|
16
16
|
|
|
17
17
|
return new EdgeSignalManager({ edgeConnection: client });
|
|
@@ -40,6 +40,8 @@ export class EdgeSignalManager extends Resource implements SignalManager {
|
|
|
40
40
|
|
|
41
41
|
protected override async _open() {
|
|
42
42
|
this._ctx.onDispose(this._edgeConnection.addListener((message) => this._onMessage(message)));
|
|
43
|
+
this._edgeConnection.reconnect.on(this._ctx, () => this._rejoinAllSwarms());
|
|
44
|
+
await this._rejoinAllSwarms();
|
|
43
45
|
}
|
|
44
46
|
|
|
45
47
|
/**
|
|
@@ -51,8 +53,8 @@ export class EdgeSignalManager extends Resource implements SignalManager {
|
|
|
51
53
|
log.warn('ignoring peer info on join request', {
|
|
52
54
|
peer,
|
|
53
55
|
expected: {
|
|
54
|
-
peerKey: this._edgeConnection.
|
|
55
|
-
identityKey: this._edgeConnection.identityKey
|
|
56
|
+
peerKey: this._edgeConnection.peerKey,
|
|
57
|
+
identityKey: this._edgeConnection.identityKey,
|
|
56
58
|
},
|
|
57
59
|
});
|
|
58
60
|
}
|
|
@@ -81,7 +83,7 @@ export class EdgeSignalManager extends Resource implements SignalManager {
|
|
|
81
83
|
// NOTE: Could only join swarm with the same peer info as the edge connection.
|
|
82
84
|
log.warn('ignoring author on send request', {
|
|
83
85
|
author: message.author,
|
|
84
|
-
expected: { peerKey: this._edgeConnection.
|
|
86
|
+
expected: { peerKey: this._edgeConnection.peerKey, identityKey: this._edgeConnection.identityKey },
|
|
85
87
|
});
|
|
86
88
|
}
|
|
87
89
|
|
|
@@ -171,9 +173,18 @@ export class EdgeSignalManager extends Resource implements SignalManager {
|
|
|
171
173
|
|
|
172
174
|
private _matchSelfPeerInfo(peer: PeerInfo) {
|
|
173
175
|
return (
|
|
174
|
-
peer &&
|
|
175
|
-
(peer.peerKey === this._edgeConnection.deviceKey.toHex() ||
|
|
176
|
-
peer.identityKey === this._edgeConnection.identityKey.toHex())
|
|
176
|
+
peer && (peer.peerKey === this._edgeConnection.peerKey || peer.identityKey === this._edgeConnection.identityKey)
|
|
177
177
|
);
|
|
178
178
|
}
|
|
179
|
+
|
|
180
|
+
private async _rejoinAllSwarms() {
|
|
181
|
+
log('rejoin swarms', { swarms: Array.from(this._swarmPeers.keys()) });
|
|
182
|
+
// Clear all swarms. But leave keys in the map.
|
|
183
|
+
for (const topic of this._swarmPeers.keys()) {
|
|
184
|
+
await this.join({
|
|
185
|
+
topic,
|
|
186
|
+
peer: { peerKey: this._edgeConnection.peerKey, identityKey: this._edgeConnection.identityKey },
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
}
|
|
179
190
|
}
|
|
@@ -8,7 +8,7 @@ import { Context } from '@dxos/context';
|
|
|
8
8
|
import { invariant } from '@dxos/invariant';
|
|
9
9
|
import { PublicKey } from '@dxos/keys';
|
|
10
10
|
import { log } from '@dxos/log';
|
|
11
|
-
import { schema } from '@dxos/protocols';
|
|
11
|
+
import { schema } from '@dxos/protocols/proto';
|
|
12
12
|
import { ComplexMap, ComplexSet } from '@dxos/util';
|
|
13
13
|
|
|
14
14
|
import { type SignalManager } from './signal-manager';
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { type TaggedType } from '@dxos/codec-protobuf';
|
|
6
|
-
import { type TYPES } from '@dxos/protocols';
|
|
6
|
+
import { type TYPES } from '@dxos/protocols/proto';
|
|
7
7
|
|
|
8
8
|
export const PAYLOAD_1: TaggedType<TYPES, 'google.protobuf.Any'> = {
|
|
9
9
|
'@type': 'google.protobuf.Any',
|
package/src/testing/utils.ts
CHANGED
|
@@ -15,7 +15,7 @@ export const expectPeerAvailable = (client: SignalMethods, expectedTopic: Public
|
|
|
15
15
|
({ peerAvailable, topic }) =>
|
|
16
16
|
!!peerAvailable && peer.peerKey === peerAvailable.peer.peerKey && expectedTopic.equals(topic),
|
|
17
17
|
),
|
|
18
|
-
|
|
18
|
+
6000,
|
|
19
19
|
);
|
|
20
20
|
|
|
21
21
|
export const expectPeerLeft = (client: SignalMethods, expectedTopic: PublicKey, peer: PeerInfo) =>
|
|
@@ -23,7 +23,7 @@ export const expectPeerLeft = (client: SignalMethods, expectedTopic: PublicKey,
|
|
|
23
23
|
client.swarmEvent.waitFor(
|
|
24
24
|
({ peerLeft, topic }) => !!peerLeft && peer.peerKey === peerLeft.peer.peerKey && expectedTopic.equals(topic),
|
|
25
25
|
),
|
|
26
|
-
|
|
26
|
+
6000,
|
|
27
27
|
);
|
|
28
28
|
|
|
29
29
|
export const expectReceivedMessage = (event: Event<Message>, expectedMessage: Message) => {
|