Fixed test

Author: pirropirro

package-lock.json

@@ -27,6 +27,7 @@
     "@rollup/plugin-node-resolve": "^8.0.1",
     "@rollup/plugin-url": "^5.0.1",
     "@types/expect.js": "~0.3.29",
+    "@types/jest": "^26.0.0",
     "@types/jws": "^3.2.2",
     "@types/mqtt": "^2.5.0",
     "@types/node-fetch": "^2.5.7",
@@ -47,7 +48,7 @@
     "test": "npm run build && jest --config ./jest.config.js",
     "lint": "./node_modules/.bin/eslint src",
     "lint-fix": "./node_modules/.bin/eslint --fix src --ext .js",
-    "clean": "rimraf lib es",
+    "clean": "rimraf lib es dist",
     "build": "npm run clean && rollup -c && rollup -c ./rollup.config.lib.js"
   },
   "repository": {
@@ -62,6 +63,7 @@
     "iot"
   ],
   "contributors": [
-    "Fabrizio Mirabito <[email protected]>"
+    "Fabrizio Mirabito <[email protected]>",
+    "Francesco Pirrotta <[email protected]>"
   ]
 }

package.json

@@ -1,4 +1,4 @@
-import { encode, decode, CBORValue }  from '@arduino/cbor-js';
+import { encode, decode, CBORValue } from '@arduino/cbor-js';
 
 import Utils from "../utils";
 import { CloudMessageValue } from "../client/IArduinoCloudClient";
@@ -19,7 +19,7 @@ function nameFrom(property: CBORValue | string[]): string {
 
 function toString(value: CBORValue[]): string {
   const encoded = encode(value);
-  return this.arrayBufferToBase64(encoded);
+  return Utils.arrayBufferToBase64(encoded);
 };
 
 function toCloudProtocolV2(cborValue: CBORValue): CBORValue {
@@ -53,10 +53,8 @@ function toCloudProtocolV2(cborValue: CBORValue): CBORValue {
 }
 
 function parse(value: CloudMessageValue, name: string, timestamp: number, deviceId: string): CBORValue {
-  const parsed: CBORValue = {
-    n: name,
-    bt: timestamp !== -1 ? (timestamp || new Date().getTime()) : undefined,
-  };
+  const parsed: CBORValue = { n: name };
+  if (timestamp !== -1) parsed.bt = timestamp || new Date().getTime()
 
   if (Utils.isNumber(value)) parsed.v = value;
   if (Utils.isString(value)) parsed.vs = value;

src/cbor/index.ts

@@ -5,7 +5,7 @@ import CBOR from "../cbor";
 import Utils from "../utils";
 import { IConnectionBuilder } from '../builder/IConnectionBuilder';
 import { IConnection, CloudMessage } from "../connection/IConnection";
-import { IArduinoCloudClient, CloudOptions, OnMessageCallback, CloudMessageValue, isBrowserOptions } from "./IArduinoCloudClient";
+import { IArduinoCloudClient, CloudOptions, OnMessageCallback, CloudMessageValue } from "./IArduinoCloudClient";
 
 const NOOP = () => null;
 export class ArduinoCloudClient implements IArduinoCloudClient {
@@ -137,11 +137,12 @@ export class ArduinoCloudClient implements IArduinoCloudClient {
     });
   }
 
-  public sendMessage(topic: string, message: ArrayBuffer): Promise<void> {
+  public sendMessage(topic: string, message: string | ArrayBuffer): Promise<void> {
     return new Promise((resolve, reject) => {
       if (!this.connection) return reject(new Error('send message failed: no connection found'));
 
-      this.connection.publish(topic, Utils.toBuffer(message), { qos: 1, retain: false });
+      const body = Utils.isString(message) ? Buffer.from(message, 'utf8') : message;
+      this.connection.publish(topic, Utils.toBuffer(body), { qos: 1, retain: false });
       return resolve();
     });
   }
@@ -150,15 +151,15 @@ export class ArduinoCloudClient implements IArduinoCloudClient {
     return this.subscribe(`/a/d/${deviceId}/s/o`, cb);
   }
 
-  public writeCloudMonitor(deviceId: string, message: ArrayBuffer): Promise<void> {
+  public writeCloudMonitor(deviceId: string, message: string | ArrayBuffer): Promise<void> {
     return this.sendMessage(`/a/d/${deviceId}/s/i`, message);
   }
 
-  public closeCloudMonitor<T>(deviceId: string): Promise<void> {
+  public closeCloudMonitor(deviceId: string): Promise<void> {
     return this.unsubscribe(`/a/d/${deviceId}/s/o`);
   }
 
-  public async sendProperty<T extends CloudMessageValue>(thingId: string, name: string, value: T, timestamp: number): Promise<void> {
+  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 = CBOR.getSenML(name, value, timestamp, this.options.useCloudProtocolV2, null);
     return this.sendMessage(topic, CBOR.encode(Utils.isArray(values) ? values : [values], true));
@@ -185,7 +186,6 @@ export class ArduinoCloudClient implements IArduinoCloudClient {
 
     let subscription: Subscription;
     const subject = new Subject<CloudMessage>();
-
     this.connection.subscribe(topic, (err) => {
       if (err) throw new Error(`subscription failed: ${err.toString()}`);
 
@@ -196,7 +196,6 @@ export class ArduinoCloudClient implements IArduinoCloudClient {
 
     const originalMethod = subject.unsubscribe;
     subject.unsubscribe = () => {
-
       subscription.unsubscribe();
       originalMethod();
     }

src/client/ArduinoCloudClient.ts

@@ -38,12 +38,14 @@ export interface IArduinoCloudClient {
 
   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>;
 
   openCloudMonitor<T extends CloudMessageValue>(deviceId: string, cb: OnMessageCallback<T>): Promise<void>;
+  writeCloudMonitor(deviceId: string, message: string): Promise<void>;
   writeCloudMonitor(deviceId: string, message: ArrayBuffer): Promise<void>;
   closeCloudMonitor(deviceId: string): Promise<void>;
 
-  sendProperty<T extends CloudMessageValue>(thingId: string, name: string, value: T, timestamp: number): Promise<void>;
+  sendProperty<T extends CloudMessageValue>(thingId: string, name: string, value: T, timestamp?: number): Promise<void>;
   onPropertyValue<T extends CloudMessageValue>(thingId: string, name: string, cb: OnMessageCallback<T>): Promise<void>;
 }

src/client/IArduinoCloudClient.ts

@@ -18,6 +18,7 @@
 *
 */
 
+import CBOR from './cbor';
 import fetch from "node-fetch";
 import { HttpClientFactory } from './http/HttpClientFactory';
 import { ArduinoCloudClient } from "./client/ArduinoCloudClient";
@@ -27,4 +28,5 @@ import { TokenConnectionBuilder } from "./builder/TokenConnectionBuilder";
 const builders = [new TokenConnectionBuilder(), new APIConnectionBuilder(HttpClientFactory.Create(fetch))];
 const DefaultClient = new ArduinoCloudClient(builders);
 
+export { CBOR };
 export default DefaultClient;

src/index.lib.ts

@@ -19,6 +19,7 @@
 */
 
 import "whatwg-fetch";
+import CBOR from './cbor';
 import { HttpClientFactory } from './http/HttpClientFactory';
 import { ArduinoCloudClient } from "./client/ArduinoCloudClient";
 import { APIConnectionBuilder } from "./builder/APIConnectionBuilder";
@@ -27,4 +28,5 @@ import { TokenConnectionBuilder } from "./builder/TokenConnectionBuilder";
 const builders = [new TokenConnectionBuilder(), new APIConnectionBuilder(HttpClientFactory.Create(fetch))];
 const DefaultClient = new ArduinoCloudClient(builders);
 
+export { CBOR };
 export default DefaultClient;

src/index.ts

@@ -49,7 +49,7 @@ function toBuffer(ab: ArrayBuffer): Buffer {
   return buffer;
 }
 
-function arrayBufferToBase64(buf: Buffer): string {
+function arrayBufferToBase64(buf: ArrayBuffer): string {
   let binary = '';
   const bytes = new Uint8Array(buf);
   const len = bytes.byteLength;