removed a bunch of unused code

AlCalzone · Dec 18, 2017 · 7a45de2 · 7a45de2
1 parent 662005b
commit 7a45de2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/build/CoapClient.d.ts b/build/CoapClient.d.ts
@@ -40,8 +40,6 @@ export declare class CoapClient {
     private static pendingRequestsByUrl;
     /** Queue of the messages waiting to be sent */
     private static sendQueue;
-    /** Number of message we expect an answer for */
-    private static concurrency;
     /**
      * Sets the security params to be used for the given hostname
      */

diff --git a/build/CoapClient.js b/build/CoapClient.js
@@ -184,14 +184,12 @@ class CoapClient {
                 options.retransmit = true;
             // retrieve or create the connection we're going to use
             const origin = Origin_1.Origin.fromUrl(url);
-            const originString = origin.toString();
             const connection = yield CoapClient.getConnection(origin);
             // find all the message parameters
             const type = options.confirmable ? Message_1.MessageType.CON : Message_1.MessageType.NON;
             const code = Message_1.MessageCodes.request[method];
             const messageId = connection.lastMsgId = incrementMessageID(connection.lastMsgId);
             const token = connection.lastToken = incrementToken(connection.lastToken);
-            const tokenString = token.toString("hex");
             payload = payload || Buffer.from([]);
             // create message options, be careful to order them by code, no sorting is implemented yet
             const msgOptions = [];
@@ -368,14 +366,12 @@ class CoapClient {
                 options.retransmit = true;
             // retrieve or create the connection we're going to use
             const origin = Origin_1.Origin.fromUrl(url);
-            const originString = origin.toString();
             const connection = yield CoapClient.getConnection(origin);
             // find all the message parameters
             const type = options.confirmable ? Message_1.MessageType.CON : Message_1.MessageType.NON;
             const code = Message_1.MessageCodes.request[method];
             const messageId = connection.lastMsgId = incrementMessageID(connection.lastMsgId);
             const token = connection.lastToken = incrementToken(connection.lastToken);
-            const tokenString = token.toString("hex");
             payload = payload || Buffer.from([]);
             // create message options, be careful to order them by code, no sorting is implemented yet
             const msgOptions = [];
@@ -393,8 +389,8 @@ class CoapClient {
             msgOptions.push(...pathParts.map(part => Option_1.Options.UriPath(part)));
             // [12] content format
             msgOptions.push(Option_1.Options.ContentFormat(ContentFormats_1.ContentFormats.application_json));
-            // create the promise we're going to return
-            const response = DeferredPromise_1.createDeferredPromise();
+            // In contrast to requests, we don't work with a deferred promise when observing
+            // Instead, we invoke a callback for *every* response.
             // create the message we're going to send
             const message = CoapClient.createMessage(type, code, messageId, token, msgOptions, payload);
             // create the retransmission info
@@ -733,7 +729,6 @@ class CoapClient {
                 target = Origin_1.Origin.fromUrl(target);
             }
             // retrieve or create the connection we're going to use
-            const originString = target.toString();
             try {
                 yield CoapClient.getConnection(target);
                 return true;
@@ -876,6 +871,4 @@ CoapClient.pendingRequestsByMsgID = {};
 CoapClient.pendingRequestsByUrl = {};
 /** Queue of the messages waiting to be sent */
 CoapClient.sendQueue = [];
-/** Number of message we expect an answer for */
-CoapClient.concurrency = 0;
 exports.CoapClient = CoapClient;
diff --git a/src/CoapClient.ts b/src/CoapClient.ts
@@ -179,8 +179,6 @@ export class CoapClient {
 	private static pendingRequestsByUrl: { [url: string]: PendingRequest } = {};
 	/** Queue of the messages waiting to be sent */
 	private static sendQueue: QueuedMessage[] = [];
-	/** Number of message we expect an answer for */
-	private static concurrency: number = 0;
 
 	/**
 	 * Sets the security params to be used for the given hostname
@@ -273,15 +271,13 @@ export class CoapClient {
 
 		// retrieve or create the connection we're going to use
 		const origin = Origin.fromUrl(url);
-		const originString = origin.toString();
 		const connection = await CoapClient.getConnection(origin);
 
 		// find all the message parameters
 		const type = options.confirmable ? MessageType.CON : MessageType.NON;
 		const code = MessageCodes.request[method];
 		const messageId = connection.lastMsgId = incrementMessageID(connection.lastMsgId);
 		const token = connection.lastToken = incrementToken(connection.lastToken);
-		const tokenString = token.toString("hex");
 		payload = payload || Buffer.from([]);
 
 		// create message options, be careful to order them by code, no sorting is implemented yet
@@ -482,15 +478,13 @@ export class CoapClient {
 
 		// retrieve or create the connection we're going to use
 		const origin = Origin.fromUrl(url);
-		const originString = origin.toString();
 		const connection = await CoapClient.getConnection(origin);
 
 		// find all the message parameters
 		const type = options.confirmable ? MessageType.CON : MessageType.NON;
 		const code = MessageCodes.request[method];
 		const messageId = connection.lastMsgId = incrementMessageID(connection.lastMsgId);
 		const token = connection.lastToken = incrementToken(connection.lastToken);
-		const tokenString = token.toString("hex");
 		payload = payload || Buffer.from([]);
 
 		// create message options, be careful to order them by code, no sorting is implemented yet
@@ -508,8 +502,8 @@ export class CoapClient {
 		// [12] content format
 		msgOptions.push(Options.ContentFormat(ContentFormats.application_json));
 
-		// create the promise we're going to return
-		const response = createDeferredPromise<CoapResponse>();
+		// In contrast to requests, we don't work with a deferred promise when observing
+		// Instead, we invoke a callback for *every* response.
 
 		// create the message we're going to send
 		const message = CoapClient.createMessage(type, code, messageId, token, msgOptions, payload);
@@ -929,7 +923,6 @@ export class CoapClient {
 		}
 
 		// retrieve or create the connection we're going to use
-		const originString = target.toString();
 		try {
 			await CoapClient.getConnection(target);
 			return true;

diff --git a/src/Message.ts b/src/Message.ts
@@ -1,5 +1,4 @@
 import { Option } from "./Option";
-import { fail } from "assert";
 
 export enum MessageType {
 	CON = 0, // Confirmable