From 71ebf28aaf509930bff9cf8e9ededf6f7d442002 Mon Sep 17 00:00:00 2001
From: Igor Abdrakhimov <octosyllabic@gmail.com>
Date: Mon, 30 Dec 2024 15:15:29 -0800
Subject: [PATCH] Set client ID in samples (#541)

---
 samples/browser/pub_sub_mqtt5/index.ts       |  4 ++++
 samples/browser/react_sample/src/PubSub5.tsx |  3 +++
 samples/node/pub_sub_electron_node/Main.ts   |  2 +-
 samples/node/pub_sub_mqtt5/index.ts          | 12 ++++++++++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/samples/browser/pub_sub_mqtt5/index.ts b/samples/browser/pub_sub_mqtt5/index.ts
index 1b40e6fd..4fc2093f 100644
--- a/samples/browser/pub_sub_mqtt5/index.ts
+++ b/samples/browser/pub_sub_mqtt5/index.ts
@@ -78,6 +78,10 @@ function createClient(provider: AWSCognitoCredentialsProvider) : mqtt5.Mqtt5Clie
         wsConfig
     )
 
+    builder.withConnectProperties({
+        clientId: "test-" + Math.floor(Math.random() * 100000000)
+    });
+
     let client : mqtt5.Mqtt5Client = new mqtt5.Mqtt5Client(builder.build());
 
     client.on('error', (error) => {
diff --git a/samples/browser/react_sample/src/PubSub5.tsx b/samples/browser/react_sample/src/PubSub5.tsx
index 2013715e..ab5df18d 100644
--- a/samples/browser/react_sample/src/PubSub5.tsx
+++ b/samples/browser/react_sample/src/PubSub5.tsx
@@ -78,6 +78,9 @@ function createClient(provider: AWSCognitoCredentialsProvider) : mqtt5.Mqtt5Clie
         AWS_IOT_ENDPOINT,
         wsConfig
     )
+    builder.withConnectProperties({
+        clientId: "test-" + Math.floor(Math.random() * 100000000)
+    });
 
     let client : mqtt5.Mqtt5Client = new mqtt5.Mqtt5Client(builder.build());
 
diff --git a/samples/node/pub_sub_electron_node/Main.ts b/samples/node/pub_sub_electron_node/Main.ts
index 94c3fbbd..b8a68c9b 100644
--- a/samples/node/pub_sub_electron_node/Main.ts
+++ b/samples/node/pub_sub_electron_node/Main.ts
@@ -94,7 +94,7 @@ function createClientConfig(isWebsocket: boolean): mqtt5.Mqtt5ClientConfig {
 
   builder.withConnectProperties({
     keepAliveIntervalSeconds: 1200,
-    clientId: "test-client"
+    clientId: "test-client" + Math.floor(Math.random() * 100000000)
   });
 
   return builder.build();
diff --git a/samples/node/pub_sub_mqtt5/index.ts b/samples/node/pub_sub_mqtt5/index.ts
index 2fb8a002..5bf57213 100644
--- a/samples/node/pub_sub_mqtt5/index.ts
+++ b/samples/node/pub_sub_mqtt5/index.ts
@@ -37,9 +37,15 @@ yargs.command('*', false, (yargs: any) => {
         type: 'string',
         required: false
     })
+    .option('client_id', {
+        alias: 'C',
+        description: 'Client ID for MQTT connection.',
+        type: 'string',
+        required: false
+    })
 }, main).parse();
 
-function creatClientConfig(args : any) : mqtt5.Mqtt5ClientConfig {
+function createClientConfig(args : any) : mqtt5.Mqtt5ClientConfig {
     let builder : iot.AwsIotMqtt5ClientConfigBuilder | undefined = undefined;
 
     if (args.key && args.cert) {
@@ -61,7 +67,9 @@ function creatClientConfig(args : any) : mqtt5.Mqtt5ClientConfig {
         );
     }
 
+
     builder.withConnectProperties({
+        clientId: args.client_id || "test-" + Math.floor(Math.random() * 100000000),
         keepAliveIntervalSeconds: 1200
     });
 
@@ -70,7 +78,7 @@ function creatClientConfig(args : any) : mqtt5.Mqtt5ClientConfig {
 
 function createClient(args: any) : mqtt5.Mqtt5Client {
 
-    let config : mqtt5.Mqtt5ClientConfig = creatClientConfig(args);
+    let config : mqtt5.Mqtt5ClientConfig = createClientConfig(args);
 
     console.log("Creating client for " + config.hostName);
     let client : mqtt5.Mqtt5Client = new mqtt5.Mqtt5Client(config);