@kronos-integration/service-swarm 1.9.86 → 1.9.87

package/LICENSE

@@ -1,23 +1,12 @@
-Copyright (c) 2020-2021 by Kronos-Integration
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (C) 2020-2025 by arlac77
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

package/README.md

@@ -1,7 +1,4 @@
-[![npm](https://img.shields.io/npm/v/@kronos-integration/service-swarm.svg)](https://www.npmjs.com/package/@kronos-integration/service-swarm)
-[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
-[![minified size](https://badgen.net/bundlephobia/min/@kronos-integration/service-swarm)](https://bundlephobia.com/result?p=@kronos-integration/service-swarm)
-[![downloads](http://img.shields.io/npm/dm/@kronos-integration/service-swarm.svg?style=flat-square)](https://npmjs.org/package/@kronos-integration/service-swarm)
+[![License](https://img.shields.io/badge/License-0BSD-blue.svg)](https://spdx.org/licenses/0BSD.html)
 [![GitHub Issues](https://img.shields.io/github/issues/Kronos-Integration/service-swarm.svg?style=flat-square)](https://github.com/Kronos-Integration/service-swarm/issues)
 [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2FKronos-Integration%2Fservice-swarm%2Fbadge\&style=flat)](https://actions-badge.atrox.dev/Kronos-Integration/service-swarm/goto)
 [![Styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
@@ -19,7 +16,7 @@ Manage a set of remote services
 
 ### Table of Contents
 
-*   [PEERS_NAME_PREFIX](#peers_name_prefix)
+*   [PEERS\_NAME\_PREFIX](#peers_name_prefix)
 *   [PeersEndpoint](#peersendpoint)
     *   [Parameters](#parameters)
     *   [Properties](#properties)
@@ -27,7 +24,7 @@ Manage a set of remote services
     *   [endpointFactoryFromConfig](#endpointfactoryfromconfig)
         *   [Parameters](#parameters-1)
     *   [name](#name)
-*   [TOPIC_NAME_PREFIX](#topic_name_prefix)
+*   [TOPIC\_NAME\_PREFIX](#topic_name_prefix)
 *   [TopicEndpoint](#topicendpoint)
     *   [Parameters](#parameters-2)
     *   [Properties](#properties-1)
@@ -35,7 +32,7 @@ Manage a set of remote services
     *   [Parameters](#parameters-3)
     *   [Properties](#properties-2)
 
-## PEERS_NAME_PREFIX
+## PEERS\_NAME\_PREFIX
 
 Endpoint name prefix for peers endpoints.
 
@@ -51,13 +48,13 @@ Endpoint to link against a swarm topic.
 
 *   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** endpoint name
 *   `owner` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** owner of the endpoint
-*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `{}`)
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
-    *   `options.topic` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** defaults to endpoint name (without @see PEERS_NAME_PREFIX)
+    *   `options.topic` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** defaults to endpoint name (without @see PEERS\_NAME\_PREFIX)
 
 ### Properties
 
-*   `topic` **[Topic](#topic)** 
+*   `topic` **[Topic](#topic)** 
 
 ## ServiceSwarm
 
@@ -71,9 +68,9 @@ On demand create topic endpoints.
 
 #### Parameters
 
-*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-*   `definition` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))** 
-*   `ic`  
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `definition` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))** 
+*   `ic`  
 
 Returns **Class** TopicEndpoint if name starts with 'topic.'
 
@@ -81,7 +78,7 @@ Returns **Class** TopicEndpoint if name starts with 'topic.'
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 'swarm'
 
-## TOPIC_NAME_PREFIX
+## TOPIC\_NAME\_PREFIX
 
 Endpoint name prefix for topic endpoints.
 
@@ -97,30 +94,30 @@ Endpoint to link against a swarm topic.
 
 *   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** endpoint name
 *   `owner` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** owner of the endpoint
-*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `{}`)
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
-    *   `options.topic` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** defaults to endpoint name (without @see TOPIC_NAME_PREFIX)
+    *   `options.topic` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** defaults to endpoint name (without @see TOPIC\_NAME\_PREFIX)
 
 ### Properties
 
-*   `topic` **[Topic](#topic)** 
+*   `topic` **[Topic](#topic)** 
 
 ## Topic
 
 ### Parameters
 
-*   `service` **[ServiceSwarm](#serviceswarm)** 
-*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `{}`)
+*   `service` **[ServiceSwarm](#serviceswarm)** 
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
 ### Properties
 
-*   `service` **[ServiceSwarm](#serviceswarm)** 
-*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
-*   `key` **[Buffer](https://nodejs.org/api/buffer.html)** 
-*   `topicEndpoints` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)\<TopicEndppoint>** 
-*   `peerEndpoints` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)\<PeerEndpoint>** 
+*   `service` **[ServiceSwarm](#serviceswarm)**&#x20;
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**&#x20;
+*   `key` **[Buffer](https://nodejs.org/api/buffer.html)**&#x20;
+*   `topicEndpoints` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)\<TopicEndppoint>**&#x20;
+*   `peerEndpoints` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)\<PeerEndpoint>**&#x20;
 
 # install
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@kronos-integration/service-swarm",
-  "version": "1.9.86",
+  "version": "1.9.87",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
-  "sideEffects": false,
   "exports": {
     ".": "./src/service-swarm.mjs"
   },
@@ -22,34 +22,34 @@
   ],
   "license": "BSD-2-Clause",
   "scripts": {
-    "test": "npm run test:ava",
-    "test:ava": "ava --timeout 2m tests/*.mjs",
-    "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 2m tests/*.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
+    "test": "node --run test:ava",
+    "test:ava": "ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs",
+    "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
     "docs": "documentation readme --section=API ./src/**/*.mjs",
-    "lint": "npm run lint:docs",
+    "lint": "node --run lint:docs",
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "@kronos-integration/endpoint": "^9.4.14",
-    "@kronos-integration/service": "^10.4.7",
-    "hyperswarm": "^2.15.3",
-    "length-prefix-framed-stream": "^2.0.3",
-    "model-attributes": "^4.1.12"
+    "@kronos-integration/endpoint": "^9.5.7",
+    "@kronos-integration/service": "^11.2.8",
+    "hyperswarm": "^4.11.7",
+    "length-prefix-framed-stream": "^2.0.12",
+    "model-attributes": "^4.2.4"
   },
   "devDependencies": {
-    "@hyperswarm/dht": "^4.0.1",
-    "ava": "^3.15.0",
-    "c8": "^7.8.0",
-    "documentation": "^13.2.5",
+    "@hyperswarm/dht": "^6.5.1",
+    "ava": "^6.3.0",
+    "c8": "^10.1.3",
+    "documentation": "^14.0.3",
     "nonsynchronous": "^1.2.0",
-    "semantic-release": "^17.4.4"
+    "semantic-release": "^24.2.4"
   },
   "engines": {
-    "node": ">=14.17.4"
+    "node": ">=22.16.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/Kronos-Integration/service-swarm.git"
+    "url": "git+https://github.com/Kronos-Integration/service-swarm.git"
   },
   "bugs": {
     "url": "https://github.com/Kronos-Integration/service-swarm/issues"

package/send.mjs

@@ -1,16 +1,25 @@
-import hyperswarm from "hyperswarm";
-import { createHash } from "crypto";
+#!/usr/bin/env node
 
-const swarm = hyperswarm();
+import Hyperswarm from "hyperswarm";
+import { createHash } from "node:crypto";
 
-const topic = createHash("sha256").update("sdlfjksdfjdflk56kj5jk5jk54lk6sdcfffmgdfklf" + "uptime").digest();
+const isServer = process.argv.at(-1) === "server";
 
-swarm.join(topic, {
-  lookup: true, // find & connect to peers
-  announce: true // optional- announce self as a connection target
-},() => {
-    console.log("joined");
-});
+const swarm = new Hyperswarm();
+
+const topic = createHash("sha256")
+  .update("sdlfjksdfjdflk56kj5jk5jk54lk6sdcfffmgdfklf")
+  .digest();
+
+const discovery = swarm.join(
+  topic,
+  isServer
+    ? {
+        server: true,
+        client: false
+      }
+    : { server: false, client: true }
+);
 
 swarm.on("connection", (socket, info) => {
   console.log("new connection!", info);
@@ -18,3 +27,8 @@ swarm.on("connection", (socket, info) => {
   // you can now use the socket as a stream, eg:
   process.stdin.pipe(socket).pipe(process.stdout);
 });
+
+await discovery.flushed();
+
+
+console.log("flushed",isServer);

package/src/peers-endpoint.mjs

@@ -19,18 +19,12 @@ export class PeersEndpoint extends MultiSendEndpoint {
     return name.startsWith(PEERS_NAME_PREFIX);
   }
 
-  constructor(name, owner, options = {}) {
+  constructor(name, owner, options) {
     super(name, owner, options);
 
-    const topicName = options.topic
-      ? options.topic
-      : name.replace(PEERS_NAME_PREFIX, "");
+    const topicName = options?.topic || name.replace(PEERS_NAME_PREFIX, "");
 
-    Object.defineProperties(this, {
-      topic: {
-        value: owner.createTopic(topicName, options)
-      }
-    });
+    this.topic = owner.createTopic(topicName, options);
 
     this.topic.addPeersEndpoint(this);
   }

package/src/service-swarm.mjs

@@ -1,5 +1,5 @@
-import { pipeline } from "stream";
-import hyperswarm from "hyperswarm";
+import { pipeline } from "node:stream";
+import Hyperswarm from "hyperswarm";
 import { Decode, Encode } from "length-prefix-framed-stream";
 import { mergeAttributes, createAttributes } from "model-attributes";
 import { Service } from "@kronos-integration/service";
@@ -11,7 +11,8 @@ import { PeersEndpoint } from "./peers-endpoint.mjs";
  * Swarm detecting sync service.
  */
 export class ServiceSwarm extends Service {
-  //topics = new Map();
+  _topics; // = new Map();
+  _topicsByName; // = new Map();
 
   /**
    * @return {string} 'swarm'
@@ -23,42 +24,27 @@ export class ServiceSwarm extends Service {
   static get configurationAttributes() {
     return mergeAttributes(
       createAttributes({
-        bootstrap: {
-          description: "well known peer addresses",
+        server: {
           needsRestart: true,
-          type: "string"
+          default: false,
+          type: "boolean"
         },
-        maxPeers: {
-          description: "total amount of peers that this peer will connect to",
-          default: 10,
+        client: {
           needsRestart: true,
-          type: "integer"
+          default: false,
+          type: "boolean"
         },
-        maxServerSockets: {
+        dht: {
+          description: "well known dht addresses",
           needsRestart: true,
-          type: "integer"
+          type: "object"
         },
-        maxClientSockets: {
+        maxPeers: {
+          description: "total amount of peers that this peer will connect to",
+          default: 10,
           needsRestart: true,
           type: "integer"
         },
-        
-        /*
-        "node-id": {
-          description: "id of our node",
-          needsRestart: true,
-          type: "string"
-        },
-        */
-        ephemeral: {
-          description: `Set to false if this is a long running instance on a server
-When running in ephemeral mode you don't join the DHT but just 
-query it instead. If unset, or set to a non-boolean (default undefined)
-then the node will start in short-lived (ephemeral) mode and switch 
-to long-lived (non-ephemeral) mode after a certain period of uptime`,
-          needsRestart: true,
-          type: "boolean"
-        },
         key: {
           description: "topic initial key",
           needsRestart: true,
@@ -70,17 +56,28 @@ to long-lived (non-ephemeral) mode after a certain period of uptime`,
     );
   }
 
-  createTopic(name, options) {
-    if (!this.topics) {
-      this.topics = new Map(); // TODO why ?
-      this.topicsByName = new Map(); // TODO why ?
-    }
+  get topics()
+  {
+  	if(!this._topics) {
+  		this._topics = new Map();
+  	}
+  	return this._topics;
+  }
 
+  get topicsByName()
+  {
+    if(!this._topicsByName) {
+       this._topicsByName = new Map(); 	
+    }
+    return this._topicsByName;
+  }
+  
+  createTopic(name, options) {
     let topic = this.topicsByName.get(name);
     if (!topic) {
       topic = new Topic(this, name, options);
       this.topicsByName.set(name, topic);
-      this.topics.set(topic.key, topic, options);
+      this.topics.set(topic.key, topic);
     }
 
     return topic;
@@ -105,55 +102,40 @@ to long-lived (non-ephemeral) mode after a certain period of uptime`,
   }
 
   async _start() {
-    const swarm = hyperswarm({
-      bootstrap: this.bootstrap,
-      ephemeral: this.ephemeral,
-      maxPeers: this.maxPeers,
-      maxServerSockets: this.maxServerSockets,
-      maxClientSockets: this.maxClientSockets,
-      multiplex: true,
-      /*validatePeer: (peer) => {
-        this.trace(`validatePeer ${JSON.stringify(peer)}`);
-        return true;
-      }*/
-    });
-
-    this.swarm = swarm;
-
-    await Promise.all(
-      [...this.topics.values()].map(topic => {
-        this.trace(`join topic ${topic.name} ${JSON.stringify(topic.options)}`);
-        return new Promise(resolve => {
-          this.swarm.join(topic.key, topic.options, () => {
-            this.trace(`joined topic ${topic.name}`);
-            resolve();
-          });
-        });
-      })
+    const swarm = this.swarm = new Hyperswarm({
+      dht: this.dht,
+      maxPeers: this.maxPeers});
+
+      /*
+    this.discovery = swarm.join(
+      topic,
+        ? {
+            server: this.server,
+            client: this.client
+          }
     );
+    */
+
+    swarm.on("update", () => {
+      console.log("Hyperswarm update", swarm);
+    });
 
     swarm.on("peer", peer => {
       const topic = this.topics.get(peer.topic);
       topic.addPeer(peer);
     });
 
-    swarm.on("peer-rejected", peer => {
-      this.trace(`peer-rejected: ${JSON.stringify(peer)}`);
-    });
-
-    /*swarm.on("updated", key => {
-      this.info(`updated: ${JSON.stringify(key)}`);
-    });*/
-
-    swarm.on("connection", async (socket, info) => {
+    swarm.on("connection", async (socket, peerInfo) => {
+      console.log(socket, peerInfo);
+      /*
       this.trace(
         `connection: peer=${info.peer ? "true" : "false"} client=${
           info.client ? "true" : "false"
         } ${JSON.stringify(socket.address())} ${socket.remoteAddress}`
-      );
+      );*/
 
-      if (info.peer) {
-        const topic = this.topics.get(info.peer.topic);
+      if (peerInfo) {
+        const topic = this.topics.get(peerInfo.peer.topic);
 
         this.trace(`Connection for topic ${topic.name}`);
 
@@ -164,29 +146,18 @@ to long-lived (non-ephemeral) mode after a certain period of uptime`,
 
         const encode = new Encode();
 
-        /*
-        setInterval(() => {
-          encode.write(`hello from ${hostname()}`);
-        }, 5 * 60 * 1000);*/
-
-        pipeline(encode, socket, e => {
-          this.trace(`Encoding pipeline end ${e}`);
-        });
+        pipeline(encode, socket, e => this.trace(`Encoding pipeline end ${e}`));
 
         this.trace(`Encoding pipeline established ${topic.name}`);
       }
 
       const decode = new Decode({ objectMode: true, encoding: "utf8" });
 
-      pipeline(socket, decode, e => {
-        this.trace(`Decoding pipeline end ${e}`);
-      });
+      pipeline(socket, decode, e => this.trace(`Decoding pipeline end ${e}`));
 
       this.trace(`Decoding pipeline established`);
 
-      decode.on("data", data => {
-        this.trace(`got ${data}`);
-      });
+      decode.on("data", data => this.trace(`got ${data}`));
     });
 
     swarm.on("disconnection", (socket, info) => {
@@ -200,6 +171,18 @@ to long-lived (non-ephemeral) mode after a certain period of uptime`,
         }
       }
     });
+
+    await Promise.all(
+      [...this.topics.values()].map(topic => {
+        this.trace(`join topic ${topic.name} ${JSON.stringify(topic.options)}`);
+        return new Promise(resolve => {
+          this.swarm.join(topic.key, topic.options, () => {
+            this.trace(`joined topic ${topic.name}`);
+            resolve();
+          });
+        });
+      })
+    );
   }
 
   async _stop() {

package/src/topic-endpoint.mjs

@@ -1,4 +1,4 @@
-import { pipeline } from "stream";
+import { pipeline } from "node:stream";
 import { MultiSendEndpoint } from "@kronos-integration/endpoint";
 import { Encode } from "length-prefix-framed-stream";
 
@@ -20,20 +20,15 @@ export class TopicEndpoint extends MultiSendEndpoint {
     return name.startsWith(TOPIC_NAME_PREFIX);
   }
 
-  constructor(name, owner, options = {}) {
+  sockets = new Set();
+  encode = new Encode();
+
+  constructor(name, owner, options) {
     super(name, owner, options);
 
-    const topicName = options.topic
-      ? options.topic
-      : name.replace(TOPIC_NAME_PREFIX, "");
+    const topicName = options?.topic || name.replace(TOPIC_NAME_PREFIX, "");
 
-    Object.defineProperties(this, {
-      topic: {
-        value: owner.createTopic(topicName, options)
-      },
-      sockets: { value: new Set() },
-      encode: { value: new Encode() }
-    });
+    this.topic = owner.createTopic(topicName, options);
 
     this.topic.addTopicEndpoint(this);
   }

package/src/topic.mjs

@@ -1,4 +1,4 @@
-import { createHash } from "crypto";
+import { createHash } from "node:crypto";
 
 /**
  * @param {ServiceSwarm} service
@@ -13,25 +13,26 @@ import { createHash } from "crypto";
  * @property {Set<PeerEndpoint>} peerEndpoints
  */
 export class Topic {
-  constructor(service, name, options = {}) {
-    Object.defineProperties(this, {
-      service: { value: service },
-      peers: { value: new Map() },
-      sockets: { value: new Set() },
-      topicEndpoints: { value: new Set() },
-      peersEndpoints: { value: new Set() },
-      name: { value: name },
-      options: { value: { lookup: true, announce: true, ...options } },
-      key: {
-        value: createHash("sha256")
-          .update(service.key + name)
-          .digest()
-      }
-    });
+  peers = new Map();
+  sockets = new Set();
+  topicEndpoints = new Set();
+  peersEndpoints = new Set();
+
+  constructor(service, name, options) {
+    this.service = service;
+    this.name = name;
+    this.options = { server: false, client: true, ...options };
+    this.key = createHash("sha256")
+      .update(service.key + name)
+      .digest();
+  }
+
+  join() {
+    return this.service.swarm.join(this.key, this.options);
   }
 
   addSocket(socket) {
-    if(this.sockets.has(socket)) {
+    if (this.sockets.has(socket)) {
       this.service.error(`socket already present`);
       return;
     }
@@ -68,7 +69,7 @@ export class Topic {
   }
 
   addPeer(peer) {
-/*
+    /*
 port: 45505
 host: '10.0.6.2'
 local: true
@@ -111,8 +112,8 @@ referrer: {
         return { host: p.host, port: p.port, local: p.local };
       }),
       sockets: this.sockets.size,
-      announce: this.options.announce,
-      lookup: this.options.lookup
+      server: this.options.server,
+      client: this.options.client
     };
   }
 }

package/update.sh

@@ -1,16 +0,0 @@
-
-
-
-SERVERS="odroid0 odroid1 odroid2 odroid3 odroid4 odroid5 pine1 rpi1 xhyve2.private"
-SERVERS="odroid0 odroid1 odroid2 odroid3 odroid4 odroid5 pine1 rpi1"
-SERVERS="odroid odroid1  odroid2 pine1"
-SERVERS="odroid1  pine1"
-
-
-for server in $SERVERS
-do
-    echo "*** " $server
-    scp src/* root@$server:/services/system-dashboard/node_modules/@kronos-integration/service-swarm/src
-    ssh -l root -A $server "systemctl restart system-dashboard"
-    ssh -l root -A $server "systemctl status system-dashboard"
-done