Merge pull request #107 from open-voip-alliance/log-for-invalid-dialo…

…g-node

Added logging when a subscription dialog is invalid

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webphone-lib",
-  "version": "0.2.19",
+  "version": "0.2.19-beta.1",
   "description": "Webphone Lib",
   "author": "Open VoIP Alliance",
   "license": "MIT",

src/client.ts

@@ -240,8 +240,7 @@ export class ClientImpl extends EventEmitter implements IClient {
 
     return new Promise<void>((resolve, reject) => {
       if (this.subscriptions[uri]) {
-        log.info('Already subscribed', this.constructor.name);
-
+        log.debug(`[blf] Already subscribed to ${uri}`, this.constructor.name);
         resolve();
         return;
       }
@@ -251,24 +250,32 @@ export class ClientImpl extends EventEmitter implements IClient {
       this.subscriptions[uri].delegate = {
         onNotify: (notification: Notification) => {
           notification.accept();
-          this.emit('subscriptionNotify', uri, statusFromDialog(notification));
+          const status = statusFromDialog(notification);
+          log.debug(
+            `[blf] ${notification}  \n accepted, emitting notify event with status ${status}`,
+            'client.subscriptions.delegate.onNotify'
+          );
+          this.emit('subscriptionNotify', uri, status);
         }
       };
 
       this.subscriptions[uri].stateChange.on((newState: SubscriptionState) => {
         switch (newState) {
           case SubscriptionState.Subscribed:
+            log.debug(`[blf] Already subscribed to ${uri}`, this.constructor.name);
             resolve();
             break;
           case SubscriptionState.Terminated:
             delete this.subscriptions[uri];
+            log.debug(`[blf] subscription terminated for ${uri}`, this.constructor.name);
             this.emit('subscriptionTerminated', uri);
             break;
         }
       });
 
       this.subscriptions[uri].on('failed', (response: Core.IncomingResponseMessage) => {
         if (!response) {
+          log.error(`[blf] subscription failed for ${uri}`, this.constructor.name);
           this.removeSubscription({ uri });
           reject();
           return;
@@ -296,6 +303,7 @@ export class ClientImpl extends EventEmitter implements IClient {
       this.subscriptions[uri].subscribe();
     });
   }
+
   public async resubscribe(uri: string): Promise<void> {
     if (!this.subscriptions[uri]) {
       throw new Error('Cannot resubscribe to nonexistent subscription.');

src/subscription.ts

@@ -2,6 +2,8 @@ import { SubscriptionStatus } from './enums';
 
 export { Subscription } from 'sip.js';
 
+import { log } from './logger';
+
 /**
  * Parse an incoming dialog XML request body and return
  * the account state from it.
@@ -14,6 +16,10 @@ export function statusFromDialog(notification: any): SubscriptionStatus | string
   const dialogNode = xmlDoc ? xmlDoc.getElementsByTagName('dialog-info')[0] : null;
   // Skip; an invalid dialog.
   if (!dialogNode) {
+    log.error(
+      `[blf] ${notification}  \n did not result in a valid dialogNode`,
+      'subscription.statusFromDialog'
+    );
     return null;
   }