@dxos/signal 2.33.9-dev.9246a07b → 2.33.9-dev.a2586ac4

package/src/presence.test.js

@@ -1,67 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import crypto from 'crypto';
-import debug from 'debug';
-import pEvent from 'p-event';
-
-import { createBroker } from './broker';
-
-const log = debug('dxos:test:presence');
-
-// TODO(burdon): A worker process has failed to exit gracefully and has been force exited.
-jest.setTimeout(100 * 1000);
-
-const complete = (nodeID, graph, max) => {
-  if (graph.nodes().length !== max) {
-    return false;
-  }
-
-  const nodes = graph.nodes().filter(id => id !== nodeID);
-
-  const edges = [];
-  for (const edge of graph.edgeEntries(nodeID)) {
-    const source = edge[2];
-    const target = edge[3];
-    edges.push(source === nodeID ? target : source);
-  }
-
-  if (edges.length < (max - 1)) {
-    return false;
-  }
-
-  for (const id of nodes) {
-    if (!edges.includes(id)) {
-      return false;
-    }
-  }
-
-  return true;
-};
-
-test('5 brokers full network connected', async () => {
-  const MAX_BROKERS = 5;
-
-  const topic = crypto.randomBytes(32);
-
-  const brokers = [...Array(MAX_BROKERS).keys()].map(i => createBroker(topic, { port: 6000 + i, logger: false, hyperswarm: { bootstrap: false } }));
-
-  const waitForPresenceGraph = Promise.all(brokers.map(async (broker) => pEvent(broker.localBus, '$broker.presence-update', (graph) => complete(broker.nodeID, graph, MAX_BROKERS))));
-
-  const waitForConnected = Promise.all(brokers.map(broker => {
-    const nodes = brokers.filter(b => b.nodeID !== broker.nodeID).map(b => b.nodeID);
-    return Promise.all(nodes.map(nodeID => pEvent(broker.localBus, '$node.connected', ({ node }) => node.id === nodeID)));
-  }));
-
-  log('Starting brokers...');
-  await Promise.all(brokers.map(b => b.start()));
-
-  await waitForConnected;
-
-  log('Waiting for the nodes to be fully connected...');
-  await waitForPresenceGraph;
-
-  log('Stopping brokers...');
-  return Promise.all(brokers.map(b => b.stop()));
-});

package/src/serializer.js

@@ -1,17 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import jsonCodec from 'buffer-json-encoding';
-
-const { Serializers: { Base: BaseSerializer } } = require('moleculer'); // eslint-disable-line @typescript-eslint/no-var-requires
-
-export class Serializer extends BaseSerializer {
-  serialize (obj) {
-    return jsonCodec.encode(obj);
-  }
-
-  deserialize (buf) {
-    return jsonCodec.decode(buf);
-  }
-}

package/src/services/discovery.js

@@ -1,101 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import debounce from 'lodash.debounce';
-import pLimit from 'p-limit';
-
-export const DiscoveryService = {
-  name: 'discovery',
-  events: {
-    '$node.disconnected' (ctx) {
-      const { peerMap } = this.broker.shared;
-
-      peerMap.deletePeersByOwner(Buffer.from(ctx.params.node.id, 'hex'));
-    },
-    '$node.connected' () {
-      const { peerMap } = this.broker.shared;
-      const owner = Buffer.from(this.broker.nodeID, 'hex');
-      const peers = peerMap
-        .peers
-        .filter(p => p.owner.equals(owner))
-        .map(peerMap.encode);
-
-      if (peers.length === 0) {
-        return;
-      }
-      return this.broker.broadcast('discovery.update', { peers }).catch(() => {});
-    },
-    'discovery.update' (ctx) {
-      const { peerMap } = this.broker.shared;
-      const { peers } = ctx.params;
-
-      if (ctx.nodeID === this.broker.nodeID) {
-        this._discoveryUpdate();
-        return;
-      }
-
-      peerMap.updatePeersByOwner(Buffer.from(ctx.nodeID, 'hex'), peers.map(peerMap.decode));
-      this._discoveryUpdate();
-    }
-  },
-  actions: {
-    offer (ctx) {
-      this.logger.debug('offer', ctx.params);
-
-      const { peerMap } = this.broker.shared;
-      const { remoteId } = ctx.params;
-
-      const peer = peerMap.peers.find(p => p.id.equals(remoteId) && p.rpc);
-      if (!peer) {
-        throw new Error('rpc not found');
-      }
-
-      return peer.rpc.call('offer', ctx.params);
-    },
-    signal (ctx) {
-      this.logger.debug('signal', ctx.params);
-
-      const { peerMap } = this.broker.shared;
-      const { remoteId } = ctx.params;
-
-      const peer = peerMap.peers.find(p => p.id.equals(remoteId) && p.rpc);
-      if (!peer) {
-        throw new Error('rpc not found');
-      }
-
-      return peer.rpc.emit('signal', ctx.params);
-    }
-  },
-  created () {
-    const { peerMap } = this.broker.shared;
-    const owner = Buffer.from(this.broker.nodeID, 'hex');
-
-    this._limit = pLimit(1);
-
-    this._updatePeers = debounce(() => {
-      this._limit(() => {
-        this._limit.clearQueue();
-        const peers = peerMap
-          .peers
-          .filter(p => p.owner.equals(owner))
-          .map(peerMap.encode);
-        return this.broker.broadcast('discovery.update', { peers }).catch(() => {});
-      }).catch(() => {});
-    }, 1000);
-
-    this._discoveryUpdate = debounce(() => {
-      this.broker.broadcastLocal('$broker.discovery-update');
-    }, 1000);
-  },
-  async started () {
-    const { peerMap } = this.broker.shared;
-    peerMap.on('peer-added', this._updatePeers);
-    peerMap.on('peer-deleted', this._updatePeers);
-  },
-  async stopped () {
-    const { peerMap } = this.broker.shared;
-    peerMap.off('peer-added', this._updatePeers);
-    peerMap.off('peer-deleted', this._updatePeers);
-  }
-};

package/src/services/index.ts

@@ -1,9 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-export * from './discovery';
-export * from './network';
-export * from './presence';
-export * from './status';
-export * from './web';

package/src/services/network.ts

@@ -1,129 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import { EventEmitter } from 'events';
-import Graph from 'graphology';
-import debounce from 'lodash.debounce';
-import timestamp from 'monotonic-timestamp';
-import pLimit from 'p-limit';
-import lru, { Lru } from 'tiny-lru';
-
-const MAX_WAIT = 2 * 1000;
-
-export interface Connection {
-  key: string,
-  target: string
-}
-
-export class Network extends EventEmitter {
-  private readonly _owner: string
-  private readonly _graph: Graph;
-  private readonly _limit: pLimit.Limit;
-  private readonly _lastUpdate: Lru;
-  readonly publish: ReturnType<typeof debounce>;
-
-  constructor (owner: string, publish: ReturnType<typeof debounce>) {
-    super();
-
-    this._owner = owner;
-    this._graph = new Graph({ multi: true, type: 'undirected' });
-    this._graph.addNode(owner);
-    this._limit = pLimit(1);
-    this._lastUpdate = lru(1000);
-
-    this.publish = debounce(() => {
-      void this._limit(() => {
-        this._limit.clearQueue();
-        return publish({ timestamp: timestamp(), connections: this.getConnections() });
-      });
-    }, MAX_WAIT);
-
-    const onChange = debounce(() => this.emit('change', this._graph), MAX_WAIT);
-    ['nodeAdded', 'edgeAdded', 'nodeDropped', 'edgeDropped'].forEach(ev => this._graph.on(ev, onChange));
-  }
-
-  get graph () {
-    return this._graph;
-  }
-
-  getConnections (id = this._owner) {
-    const connections: Connection[] = [];
-    if (!this._graph.hasNode(id)) {
-      return [];
-    }
-
-    this._graph.forEachEdge(id, (key, attr, source, target) => {
-      if (source === id) {
-        connections.push({ key, target });
-      }
-    });
-
-    return connections;
-  }
-
-  update (id: string, timestamp: number, connections: Connection[] = []) {
-    // ignore old messages
-    const lastTimestamp = this._lastUpdate.get(id) || 0;
-    if (lastTimestamp > timestamp) {
-      return;
-    }
-    this._lastUpdate.set(id, timestamp);
-
-    if (!this._graph.hasNode(id)) {
-      this._graph.addNode(id);
-    }
-
-    this._graph.forEachEdge(id, (key, attr, source) => {
-      if (source === id) {
-        this._graph.dropEdge(key);
-      }
-    });
-
-    this._graph.import({
-      edges: connections.map(conn => ({
-        key: conn.key,
-        source: id,
-        target: conn.target,
-        undirected: true
-      })),
-      nodes: Array.from(new Set(
-        connections.reduce((acc, { key, target }) => [...acc, key, target], [] as string[])).values()
-      ).map(key => ({ key }))
-    });
-  }
-
-  addPeer (id: string) {
-    if (!this._graph.hasNode(id)) {
-      this._graph.addNode(id);
-    }
-  }
-
-  deletePeer (id: string) {
-    if (this._graph.hasNode(id)) {
-      this._graph.dropNode(id);
-    }
-  }
-
-  addConnection (initiator: any, sessionKey: string, peerId: string) {
-    if (!this._graph.hasNode(peerId)) {
-      this._graph.addNode(peerId);
-    }
-
-    if (initiator) {
-      this._graph.addEdgeWithKey(sessionKey, this._owner, peerId);
-    } else {
-      this._graph.addEdgeWithKey(sessionKey, peerId, this._owner);
-    }
-
-    this.publish();
-  }
-
-  deleteConnection (peer1: string, peer2: string) {
-    if (!this._graph.hasEdge(peer1, peer2)) {
-      return;
-    }
-    this._graph.dropEdge(peer1, peer2);
-    this.publish();
-  }
-}

package/src/services/presence.js

@@ -1,77 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import { Network } from './network';
-
-export const PresenceService = {
-  name: 'presence',
-  events: {
-    '$node.disconnected' (ctx) {
-      const { node } = ctx.params;
-      this._network.deletePeer(node.id);
-    },
-    '$node.connected' (ctx) {
-      const { node } = ctx.params;
-      this._network.addPeer(node.id);
-      this._network.publish();
-    },
-    'presence.update' (ctx) {
-      if (ctx.nodeID === this.broker.nodeID) {
-        return;
-      }
-
-      const { timestamp, connections } = ctx.params;
-      return this._network.update(ctx.nodeID, timestamp, connections);
-    }
-  },
-  actions: {
-    network () {
-      return this._network.graph.export();
-    }
-  },
-  created () {
-    const { transporter } = this.broker.options;
-
-    this._network = new Network(this.broker.nodeID, data => {
-      return this.broker.broadcast('presence.update', data);
-    });
-
-    this.broker.shared.network = this._network;
-
-    this._network.on('change', (graph) => {
-      this.broker.broadcastLocal('$broker.presence-update', graph);
-    });
-
-    transporter.peers.forEach(peer => {
-      try {
-        this._network.addConnection(peer.initiator, peer.sessionKey.toString('hex'), peer.id.toString('hex'));
-      } catch (err) {
-        this.logger.error(err);
-      }
-    });
-
-    transporter.on('peer-added', ({ initiator, sessionKey, peerId }) => {
-      try {
-        this._network.addConnection(initiator, sessionKey.toString('hex'), peerId.toString('hex'));
-      } catch (err) {
-        this.logger.error(err);
-      }
-    });
-
-    transporter.on('peer-deleted', ({ sessionKey }) => {
-      if (!sessionKey) {
-        return;
-      }
-
-      try {
-        this._network.deleteConnection(sessionKey.toString('hex'));
-      } catch (err) {
-        this.logger.error(err);
-      }
-    });
-  },
-  async started () {
-    this._network.publish();
-  }
-};

package/src/services/status.js

@@ -1,259 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import { AbortController } from '@azure/abort-controller';
-import moment from 'moment';
-
-import { getSystemInfo, getServiceInfo } from '../system-information';
-
-const delay = (ms, signal) => new Promise((resolve, reject) => {
-  const timer = setTimeout(() => {
-    signal.removeEventListener('abort', onAbort);
-    resolve();
-  }, ms);
-
-  const onAbort = () => {
-    signal.removeEventListener('abort', onAbort);
-    clearTimeout(timer);
-    reject(new Error('aborted'));
-  };
-  signal.addEventListener('abort', onAbort);
-});
-
-export const StatusService = {
-  name: 'status',
-  settings: {
-    graphql: {
-      type: `
-        type Status {
-          id: String!
-          updatedAt: Timestamp!
-          version: String!
-          nodes: [Node]!
-        }
-
-        type Node {
-          id: String!
-          kubeStatus: KubeStatus!
-          connections: [Connection]!
-          signal: Signal
-        }
-
-        type Connection {
-          id: String!
-          target: String!
-        }
-
-        type Signal {
-          topics: [Topic]!
-        }
-
-        type Topic {
-          id: String!
-          peers: [String]!
-        }
-
-        type KubeStatus {
-          system: KubeSystemInfo
-          services: [KubeService!]
-        }
-
-        type KubeSystemInfo {
-          version: String
-          cpu: CPUInfo,
-          memory: MemoryInfo,
-          device: DeviceInfo,
-          network: NetworkInfo
-          os: OSInfo
-          time: TimeInfo
-          nodejs: NodeJSInfo
-        }
-
-        type KubeService {
-          name: String!
-          status: String!
-          cpu: Int!
-          memory: Int!
-        }
-
-        type CPUInfo {
-          brand: String!
-          cores: Int!
-          manufacturer: String!
-          vendor: String!
-          speed: String!
-        }
-
-        type MemoryInfo {
-          total: String!
-          free: String!
-          used: String!
-          swaptotal: String!
-        }
-
-        type DeviceInfo {
-          model: String!
-          serial: String!
-          version: String!
-        }
-
-        type NetworkInfo {
-          hostname: String
-          addresses: [String]!
-        }
-
-        type OSInfo {
-          arch: String!
-          platform: String!
-          version: String
-        }
-
-        type TimeInfo {
-          now: Timestamp!
-          up: Timestamp!
-        }
-
-        type NodeJSInfo {
-          version: String!
-        }
-      `
-    }
-  },
-  actions: {
-    status: {
-      graphql: {
-        query: 'status: Status'
-      },
-      handler (ctx) {
-        const status = this.getStatus();
-
-        return {
-          updatedAt: status.updatedAt,
-          id: ctx.nodeID,
-          nodes: Array.from(status.nodes.values()),
-          version: this.broker.metadata.version
-        };
-      }
-    }
-  },
-  events: {
-    '$node.connected' (ctx) {
-      this._status.toUpdate = true;
-    },
-    '$node.disconnected' (ctx) {
-      const { node } = ctx.params;
-      this._status.nodes.delete(node.id);
-      this._status.toUpdate = true;
-    },
-    '$broker.presence-update' (ctx) {
-      this._status.toUpdate = true;
-    },
-    '$broker.discovery-update' (ctx) {
-      this._status.toUpdate = true;
-    },
-    'status.kube-status' (ctx) {
-      this.updateKubeStatus(ctx.nodeID, ctx.params);
-    }
-  },
-  methods: {
-    getStatus () {
-      const { network } = this.broker.shared;
-
-      const nodes = this.broker.registry.getNodeList({ onlyAvailable: true, withServices: true });
-
-      if (!this._status.toUpdate) {
-        return this._status;
-      }
-
-      nodes.forEach(node => {
-        const oldNode = this._status.nodes.get(node.id) || {};
-
-        this._status.nodes.set(node.id, {
-          id: node.id,
-          kubeStatus: oldNode.kubeStatus || { services: [] },
-          connections: network.getConnections(node.id).map(conn => ({
-            id: conn.key,
-            target: conn.target
-          })),
-          signal: {
-            topics: this.getSignalPeers(node.id)
-          }
-        });
-      });
-
-      this._status.toUpdate = false;
-      this._status.updatedAt = moment();
-
-      return this._status;
-    },
-    updateKubeStatus (nodeID, { system, services }) {
-      if (!this._status.nodes.has(nodeID)) {
-        return;
-      }
-
-      const node = this._status.nodes.get(nodeID);
-      node.kubeStatus = { system, services: services || [] };
-
-      this._status.updatedAt = moment();
-    },
-    getSignalPeers (peerId) {
-      const { peerMap } = this.broker.shared;
-      const peerIdBuf = Buffer.from(peerId, 'hex');
-      const peersByTopic = new Map();
-
-      peerMap.topics.forEach(topic => {
-        const topicStr = topic.toString('hex');
-        peerMap.getPeersByTopic(topic)
-          .filter(peer => peer.owner.equals(peerIdBuf))
-          .map(peerMap.encode)
-          .forEach(peer => {
-            let value;
-            if (peersByTopic.has(topicStr)) {
-              value = peersByTopic.get(topicStr);
-            } else {
-              value = { id: topicStr, peers: [] };
-              peersByTopic.set(topicStr, value);
-            }
-
-            if (value.peers.includes(peer.id)) {
-              return;
-            }
-            value.peers.push(peer.id);
-          });
-      });
-
-      return Array.from(peersByTopic.values());
-    }
-  },
-  created () {
-    this._status = {
-      updatedAt: moment(),
-      toUpdate: true,
-      nodes: new Map()
-    };
-  },
-  async started () {
-    this.getStatus();
-
-    this._controller = new AbortController();
-    const signal = this._controller.signal;
-
-    (async () => {
-      while (!signal.aborted) {
-        // TODO(unknown): This could be an option (pollInterval).
-        await delay(10 * 1000, signal);
-        const system = await getSystemInfo().catch(() => {});
-        const services = await getServiceInfo().catch(() => {});
-        if (system || services) {
-          this.broker.broadcast('status.kube-status', { system, services });
-        }
-      }
-    })().catch(() => {});
-  },
-  async stopped () {
-    if (this._controller) {
-      this._controller.abort();
-    }
-  }
-};

package/src/services/web.ts

@@ -1,24 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import MoleculerWebService from 'moleculer-web';
-
-import { SignalServer } from '../signal';
-
-export const WebService = {
-  name: 'web',
-  mixins: [
-    MoleculerWebService as any
-  ],
-  created (this: any) {
-    this.settings.port = this.broker.metadata.port || 4000;
-    this._signal = new SignalServer(this.server, this.broker);
-  },
-  async started (this: any) {
-    return this._signal.open();
-  },
-  async stopped (this: any) {
-    return this._signal.close();
-  }
-};

package/src/shims.d.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-declare module '@koush/wrtc'
-declare module 'monotonic-timestamp';

package/src/signal/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-export * from './peer-map';
-export * from './signal-server';