Fix minor bugs

Author: pirropirro

src/client/ArduinoCloudClient.ts

@@ -111,30 +111,10 @@ export class ArduinoCloudClient implements IArduinoCloudClient {
     }
   }
 
-  public subscribe<T extends CloudMessageValue>(topic: string, cb: OnMessageCallback<T>): Promise<void> {
-    return new Promise((resolve, reject) => {
-      try {
-        this.callbacks[topic] = this.callbacks[topic] = [];
-        this.callbacks[topic].push(cb);
-
-        this.subscriptions[topic] = this.subscriptions[topic] = [];
-        this.subscriptions[topic].push(
-          this.messagesFrom(topic)
-            .subscribe(v => cb(v.value as T)));
+  public getToken(): string {
+    if (!this.connection) throw new Error('send message failed: no connection found');
 
-        return resolve();
-      } catch (err) {
-        reject(err);
-      }
-    });
-  }
-
-  public unsubscribe(topic: string): Promise<void> {
-    return new Promise((resolve, reject) => {
-      if (!this.connection) return reject(new Error('unsubscribe failed: no connection found'));
-
-      return this.connection.unsubscribe(topic, null, (err) => err ? reject() : resolve());
-    });
+    return this.connection.token;
   }
 
   public sendMessage(topic: string, message: string | ArrayBuffer): Promise<void> {
@@ -162,7 +142,7 @@ export class ArduinoCloudClient implements IArduinoCloudClient {
   public async sendProperty<T extends CloudMessageValue>(thingId: string, name: string, value: T, timestamp: number = new Date().getTime()): Promise<void> {
     const topic = `/a/t/${thingId}/e/i`;
     const values = SenML.parse(name, value, timestamp, this.options.useCloudProtocolV2, null);
-    return this.sendMessage(topic, SenML.CBOR.encode(Utils.isArray(values) ? values : [values], true));
+    return this.sendMessage(topic, SenML.CBOR.encode(Utils.isArray(values) ? values : [values], this.options.useCloudProtocolV2));
   }
 
   public async onPropertyValue<T extends CloudMessageValue>(thingId: string, name: string, cb: OnMessageCallback<T>): Promise<void> {
@@ -181,6 +161,32 @@ export class ArduinoCloudClient implements IArduinoCloudClient {
         .subscribe(v => cb(v.value as T)));
   }
 
+  private subscribe<T extends CloudMessageValue>(topic: string, cb: OnMessageCallback<T>): Promise<void> {
+    return new Promise((resolve, reject) => {
+      try {
+        this.callbacks[topic] = this.callbacks[topic] = [];
+        this.callbacks[topic].push(cb);
+
+        this.subscriptions[topic] = this.subscriptions[topic] = [];
+        this.subscriptions[topic].push(
+          this.messagesFrom(topic)
+            .subscribe(v => cb(v.value as T)));
+
+        return resolve();
+      } catch (err) {
+        reject(err);
+      }
+    });
+  }
+
+  private unsubscribe(topic: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+      if (!this.connection) return reject(new Error('unsubscribe failed: no connection found'));
+
+      return this.connection.unsubscribe(topic, null, (err) => err ? reject() : resolve());
+    });
+  }
+
   private messagesFrom(topic: string): Observable<CloudMessage> {
     if (!this.connection) throw new Error('subscription failed: no connection found');
 

src/client/IArduinoCloudClient.ts

@@ -34,10 +34,10 @@ export interface IArduinoCloudClient {
   connect(options: CloudOptions): Promise<IConnection>;
   reconnect(): Promise<void>;
   disconnect(): Promise<void>;
+
   updateToken(newToken: string): Promise<void>;
+  getToken(): string;
 
-  subscribe<T extends CloudMessageValue>(topic: string, cb: OnMessageCallback<T>): Promise<void>;
-  unsubscribe(topic: string): Promise<void>;
   sendMessage(topic: string, message: string): Promise<void>;
   sendMessage(topic: string, message: ArrayBuffer): Promise<void>;
 

src/connection/Connection.ts

@@ -16,9 +16,10 @@ const BaseConnectionOptions: Partial<ConnectionOptions> = {
 }
 
 export class Connection implements IConnection {
-  public messages?: Observable<CloudMessage>;
+  public token: string;
+  public messages: Observable<CloudMessage>;
+  
   private _client: mqtt.MqttClient;
-
   private get client(): mqtt.MqttClient {
     return this._client;
   }
@@ -46,6 +47,7 @@ export class Connection implements IConnection {
 
     const connection = new Connection();
     connection.client = mqtt.connect(`wss://${host}:${port}/mqtt`, { ...BaseConnectionOptions, ...options });
+    connection.token = token;
     return connection
   }
 

src/connection/IConnection.ts

@@ -1,13 +1,19 @@
 
 import { Observable } from "rxjs";
-import { MqttClient, IClientOptions, OnConnectCallback, OnMessageCallback, OnPacketCallback, OnErrorCallback, CloseCallback, IClientReconnectOptions, PacketCallback, IClientPublishOptions, IClientSubscribeOptions, ClientSubscribeCallback } from 'mqtt';
+import {
+  IClientOptions, OnConnectCallback, OnMessageCallback, OnPacketCallback,
+  OnErrorCallback, CloseCallback, IClientReconnectOptions, PacketCallback, IClientPublishOptions
+} from 'mqtt';
 
 import { CloudMessageValue } from "../client/IArduinoCloudClient";
 
 export type ConnectionOptions = IClientOptions;
 export type CloudMessage = { topic: string; propertyName?: string; value: CloudMessageValue };
 
 export interface IConnection {
+  token?: string;
+  messages?: Observable<CloudMessage>;
+
   on(event: "connect", cb: OnConnectCallback): IConnection;
   on(event: "message", cb: OnMessageCallback): IConnection;
   on(event: "packetsend" | "packetreceive", cb: OnPacketCallback): IConnection;
@@ -26,7 +32,5 @@ export interface IConnection {
   publish(topic: any, message: any, opts?: any, callback?: any): IConnection;
 
   subscribe(topic: any, callback?: any): IConnection;
-
-  messages?: Observable<CloudMessage>
 }
 

src/senML/index.ts

@@ -17,8 +17,8 @@ function nameFrom(property: SenML | string[]): string {
   return isPropertyValue(property) ? property.n : property[0]
 }
 
-function toString(value: SenML[]): string {
-  const encoded = CBOR.encode(value);
+function toString(value: SenML[], numericKeys?: boolean): string {
+  const encoded = CBOR.encode(value, numericKeys);
   return Utils.arrayBufferToBase64(encoded);
 };