refactor: generate new unique name until unknown

eclipse-thingweb · Feb 18, 2025 · 22fbf6b · 22fbf6b
1 parent 4d083fc
commit 22fbf6b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/packages/binding-coap/src/coap-server.ts b/packages/binding-coap/src/coap-server.ts
@@ -158,10 +158,10 @@ export default class CoapServer implements ProtocolServer {
     }
 
     private createThingUrlPath(thing: ExposedThing) {
-        const urlPath = slugify(thing.title, { lower: true });
+        let urlPath = slugify(thing.title, { lower: true });
 
-        if (this.things.has(urlPath)) {
-            return Helpers.generateUniqueName(urlPath);
+        while (this.things.has(urlPath)) {
+            urlPath = Helpers.generateUniqueName(urlPath);
         }
 
         return urlPath;

diff --git a/packages/binding-http/src/http-server.ts b/packages/binding-http/src/http-server.ts
@@ -269,7 +269,7 @@ export default class HttpServer implements ProtocolServer {
     public async expose(thing: ExposedThing, tdTemplate: WoT.ExposedThingInit = {}): Promise<void> {
         let urlPath = slugify(thing.title, { lower: true });
 
-        if (this.things.has(urlPath)) {
+        while (this.things.has(urlPath)) {
             urlPath = Helpers.generateUniqueName(urlPath);
         }
 

diff --git a/packages/binding-websockets/src/ws-server.ts b/packages/binding-websockets/src/ws-server.ts
@@ -158,7 +158,7 @@ export default class WebSocketServer implements ProtocolServer {
     public expose(thing: ExposedThing): Promise<void> {
         let urlPath = slugify(thing.title, { lower: true });
 
-        if (this.thingNames.has(urlPath)) {
+        while (this.thingNames.has(urlPath)) {
             urlPath = Helpers.generateUniqueName(urlPath);
         }
 

diff --git a/packages/core/src/helpers.ts b/packages/core/src/helpers.ts
@@ -129,7 +129,7 @@ export default class Helpers implements Resolver {
         if (suffix !== null) {
             return name.slice(0, -suffix[1].length) + (1 + parseInt(suffix[1]));
         } else {
-            return name + "_2";
+            return name + "_";
         }
     }
 

diff --git a/packages/core/test/HelpersTest.ts b/packages/core/test/HelpersTest.ts
@@ -199,4 +199,14 @@ class HelperTest {
             expect.fail("not properly set-up");
         }
     }
+
+    @test "should generate unique names over and over again"() {
+        let urlPath = "bla";
+        let paths = [urlPath];
+        for (let i = 0; i < 5; i++) {
+            urlPath = Helpers.generateUniqueName(urlPath);
+            expect(paths.includes(urlPath)).to.equal(false);
+            paths.push(urlPath);
+        }
+    }
 }