fix: Allow setting the client id

Fixes #95

README.md

@@ -101,11 +101,12 @@ A smarthome bridge between your sonos system and a mqtt server.
 Usage: index.js [options]
 
 Options:
-  --prefix           instance name. used as mqtt client id and as prefix for
-                     connected topic                          [default: "sonos"]
+  --prefix           instance name. used as prefix for all topics
+                                                              [default: "sonos"]
   --mqtt             mqtt broker url. See
                      https://github.com/svrooij/sonos2mqtt#mqtt-url
                                                    [default: "mqtt://127.0.0.1"]
+  --clientid         Specify the client id to be used
   --log              Set the loglevel
            [choices: "warning", "information", "debug"] [default: "information"]
   --distinct         Publish distinct track states    [boolean] [default: false]

src/config.ts

@@ -14,6 +14,7 @@ export interface Config {
   discovery: boolean;
   discoveryprefix: string;
   log: string;
+  clientid?: string;
 }
 
 const defaultConfig: Config = {
@@ -56,8 +57,9 @@ export class ConfigLoader {
     const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json')).toString())
     return yargs
       .usage(pkg.name + ' ' + pkg.version + '\n' + pkg.description + '\n\nUsage: $0 [options]')
-      .describe('prefix', 'instance name. used as mqtt client id and as prefix for connected topic')
+      .describe('prefix', 'instance name. used as prefix for all topics')
       .describe('mqtt', 'mqtt broker url. See https://github.com/svrooij/sonos2mqtt#mqtt-url')
+      .describe('clientid', 'Specify the client id to be used')
       .describe('log', 'Set the loglevel')
       .describe('d', 'Publish distinct track states')
       .describe('h', 'show help')

src/smarthome-mqtt.ts

@@ -16,7 +16,7 @@ export class SmarthomeMqtt{
   private readonly uri: URL
   private mqttClient?: MqttClient;
   public readonly Events: StrictEventEmitter<EventEmitter, MqttEvents> = new EventEmitter();
-  constructor(mqttUrl: string, private readonly prefix: string = 'sonos') {
+  constructor(mqttUrl: string, private readonly prefix: string = 'sonos', private readonly clientId?: string) {
     this.uri = new URL(mqttUrl)
   }
 
@@ -28,7 +28,8 @@ export class SmarthomeMqtt{
         qos: 0,
         retain: true
       },
-      keepalive: 60000
+      keepalive: 60000,
+      clientId: this.clientId
     });
     this.mqttClient.on('connect',() => {
       this.log.debug('Connected to server {server}', this.uri.host)

src/sonos-to-mqtt.ts

@@ -14,7 +14,7 @@ export class SonosToMqtt {
   private readonly stateTimers: {[key: string]: NodeJS.Timeout} = {};
   constructor(private config: Config) {
     this.sonosManager = new SonosManager();
-    this.mqtt = new SmarthomeMqtt(config.mqtt, config.prefix);
+    this.mqtt = new SmarthomeMqtt(config.mqtt, config.prefix, config.clientid);
   }
 
   async start(): Promise<boolean> {