refactor: generate unique names/urls locally (#1375)

* refactor: generate unique names/urls locally

* refactor: add counter to differentiate instead of infinite underscores

Author: danielpeintner

packages/binding-coap/src/coap-server.ts

@@ -158,10 +158,16 @@ export default class CoapServer implements ProtocolServer {
     }
 
     private createThingUrlPath(thing: ExposedThing) {
-        const urlPath = slugify(thing.title, { lower: true });
+        let urlPath = slugify(thing.title, { lower: true });
 
+        // avoid URL clashes
         if (this.things.has(urlPath)) {
-            return Helpers.generateUniqueName(urlPath);
+            let uniqueUrlPath;
+            let nameClashCnt = 2;
+            do {
+                uniqueUrlPath = urlPath + "_" + nameClashCnt++;
+            } while (this.things.has(uniqueUrlPath));
+            urlPath = uniqueUrlPath;
         }
 
         return urlPath;

packages/binding-http/src/http-server.ts

@@ -269,8 +269,14 @@ export default class HttpServer implements ProtocolServer {
     public async expose(thing: ExposedThing, tdTemplate: WoT.ExposedThingInit = {}): Promise<void> {
         let urlPath = slugify(thing.title, { lower: true });
 
+        // avoid URL clashes
         if (this.things.has(urlPath)) {
-            urlPath = Helpers.generateUniqueName(urlPath);
+            let uniqueUrlPath;
+            let nameClashCnt = 2;
+            do {
+                uniqueUrlPath = urlPath + "_" + nameClashCnt++;
+            } while (this.things.has(uniqueUrlPath));
+            urlPath = uniqueUrlPath;
         }
 
         if (this.getPort() !== -1) {

packages/binding-websockets/src/ws-server.ts

@@ -158,8 +158,14 @@ export default class WebSocketServer implements ProtocolServer {
     public expose(thing: ExposedThing): Promise<void> {
         let urlPath = slugify(thing.title, { lower: true });
 
+        // avoid name clashes
         if (this.thingNames.has(urlPath)) {
-            urlPath = Helpers.generateUniqueName(urlPath);
+            let uniqueUrlPath;
+            let nameClashCnt = 2;
+            do {
+                uniqueUrlPath = urlPath + "_" + nameClashCnt++;
+            } while (this.thingNames.has(uniqueUrlPath));
+            urlPath = uniqueUrlPath;
         }
 
         if (this.getPort() !== -1) {

packages/core/src/helpers.ts

@@ -124,6 +124,7 @@ export default class Helpers implements Resolver {
         return address;
     }
 
+    /** @deprecated see https://github.com/eclipse-thingweb/node-wot/issues/1351 */
     public static generateUniqueName(name: string): string {
         const suffix = name.match(/.+_([0-9]+)$/);
         if (suffix !== null) {