ringcentral-softphone 1.1.7 → 1.1.8

package/README.md

@@ -19,11 +19,11 @@ yarn install ringcentral-softphone
 1. Login to https://service.ringcentral.com
 2. Find the user/extension you want to use
 3. Check the user's "Devices & Numbers"
-4. Find a phone/device that you want to use
-5. if there is none, you need to create one. Check steps below for more details
-6. Click the "Set Up and Provision" button
-7. Click the link "Set up manually using SIP"
-8. You will find "SIP Domain", "Outbound Proxy", "User Name", "Password" and
+4. Find a phone/device that you want to use (Phone type **must** be "Existing
+   Phone"), if there is none, you need to create one.
+5. Click the "Set Up and Provision" button
+6. Click the link "Set up manually using SIP"
+7. You will find "SIP Domain", "Outbound Proxy", "User Name", "Password" and
    "Authorization ID"
 
 Please note that, "SIP Domain" name should come without port number. I don't

package/dist/cjs/call-session/inbound.js

@@ -29,7 +29,7 @@ a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:${utils_js_1.localKey}
 `.trim();
         const newMessage = new index_js_2.OutboundMessage("SIP/2.0 200 OK", {
             Via: this.sipMessage.headers.Via,
-            "Call-ID": this.sipMessage.headers["Call-ID"],
+            "Call-ID": this.sipMessage.getHeader("Call-ID"),
             From: this.sipMessage.headers.From,
             To: this.sipMessage.headers.To,
             CSeq: this.sipMessage.headers.CSeq,

package/dist/cjs/call-session/index.js

@@ -50,7 +50,7 @@ class CallSession extends node_events_1.default {
         });
     }
     get callId() {
-        return this.sipMessage.headers["Call-ID"];
+        return this.sipMessage.getHeader("Call-ID");
     }
     send(data) {
         this.socket.send(data, this.remotePort, this.remoteIP);
@@ -143,7 +143,7 @@ class CallSession extends node_events_1.default {
         // send a message to remote server so that it knows where to reply
         this.send("hello");
         const byeHandler = (inboundMessage) => {
-            if (inboundMessage.headers["Call-ID"] !== this.callId) {
+            if (inboundMessage.getHeader("Call-ID") !== this.callId) {
                 return;
             }
             if (inboundMessage.headers.CSeq.endsWith(" BYE")) {

package/dist/cjs/index.js

@@ -80,8 +80,7 @@ class Softphone extends node_events_1.default {
                 // sometimes the server will return 200 OK directly
                 return;
             }
-            const wwwAuth = inboundMessage.headers["Www-Authenticate"] ||
-                inboundMessage.headers["WWW-Authenticate"];
+            const wwwAuth = inboundMessage.getHeader("Www-Authenticate");
             const nonce = wwwAuth.match(/, nonce="(.+?)"/)[1];
             const newMessage = requestMessage.fork();
             newMessage.headers.Authorization = (0, utils_js_1.generateAuthorization)(this.sipInfo, nonce, "REGISTER");
@@ -97,7 +96,7 @@ class Softphone extends node_events_1.default {
             }
             const outboundMessage = new index_js_1.OutboundMessage("SIP/2.0 100 Trying", {
                 Via: inboundMessage.headers.Via,
-                "Call-ID": inboundMessage.headers["Call-ID"],
+                "Call-ID": inboundMessage.getHeader("Call-ID"),
                 From: inboundMessage.headers.From,
                 To: inboundMessage.headers.To,
                 CSeq: inboundMessage.headers.CSeq,
@@ -181,7 +180,7 @@ a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:${utils_js_1.localKey}
             "Content-Type": "application/sdp",
         }, offerSDP);
         const inboundMessage = await this.send(inviteMessage, true);
-        const proxyAuthenticate = inboundMessage.headers["Proxy-Authenticate"];
+        const proxyAuthenticate = inboundMessage.getHeader("Proxy-Authenticate");
         const nonce = proxyAuthenticate.match(/, nonce="(.+?)"/)[1];
         const newMessage = inviteMessage.fork();
         newMessage.headers["Proxy-Authorization"] = (0, utils_js_1.generateAuthorization)(this.sipInfo, nonce, "INVITE");

package/dist/cjs/sip-message/sip-message.d.ts

@@ -6,5 +6,6 @@ declare class SipMessage {
     body: string;
     constructor(subject?: string, headers?: {}, body?: string);
     toString(): string;
+    getHeader(key: string): string | undefined;
 }
 export default SipMessage;

package/dist/cjs/sip-message/sip-message.js

@@ -24,5 +24,11 @@ class SipMessage {
         ].join("\r\n");
         return r;
     }
+    getHeader(key) {
+        const foundKey = Object.keys(this.headers).find((k) => k.toLowerCase() === key.toLowerCase());
+        if (foundKey) {
+            return this.headers[foundKey];
+        }
+    }
 }
 exports.default = SipMessage;

package/dist/esm/call-session/inbound.js

@@ -24,7 +24,7 @@ a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:${localKey}
 `.trim();
         const newMessage = new OutboundMessage("SIP/2.0 200 OK", {
             Via: this.sipMessage.headers.Via,
-            "Call-ID": this.sipMessage.headers["Call-ID"],
+            "Call-ID": this.sipMessage.getHeader("Call-ID"),
             From: this.sipMessage.headers.From,
             To: this.sipMessage.headers.To,
             CSeq: this.sipMessage.headers.CSeq,

package/dist/esm/call-session/index.js

@@ -45,7 +45,7 @@ class CallSession extends EventEmitter {
         });
     }
     get callId() {
-        return this.sipMessage.headers["Call-ID"];
+        return this.sipMessage.getHeader("Call-ID");
     }
     send(data) {
         this.socket.send(data, this.remotePort, this.remoteIP);
@@ -138,7 +138,7 @@ class CallSession extends EventEmitter {
         // send a message to remote server so that it knows where to reply
         this.send("hello");
         const byeHandler = (inboundMessage) => {
-            if (inboundMessage.headers["Call-ID"] !== this.callId) {
+            if (inboundMessage.getHeader("Call-ID") !== this.callId) {
                 return;
             }
             if (inboundMessage.headers.CSeq.endsWith(" BYE")) {

package/dist/esm/index.js

@@ -75,8 +75,7 @@ class Softphone extends EventEmitter {
                 // sometimes the server will return 200 OK directly
                 return;
             }
-            const wwwAuth = inboundMessage.headers["Www-Authenticate"] ||
-                inboundMessage.headers["WWW-Authenticate"];
+            const wwwAuth = inboundMessage.getHeader("Www-Authenticate");
             const nonce = wwwAuth.match(/, nonce="(.+?)"/)[1];
             const newMessage = requestMessage.fork();
             newMessage.headers.Authorization = generateAuthorization(this.sipInfo, nonce, "REGISTER");
@@ -92,7 +91,7 @@ class Softphone extends EventEmitter {
             }
             const outboundMessage = new OutboundMessage("SIP/2.0 100 Trying", {
                 Via: inboundMessage.headers.Via,
-                "Call-ID": inboundMessage.headers["Call-ID"],
+                "Call-ID": inboundMessage.getHeader("Call-ID"),
                 From: inboundMessage.headers.From,
                 To: inboundMessage.headers.To,
                 CSeq: inboundMessage.headers.CSeq,
@@ -176,7 +175,7 @@ a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:${localKey}
             "Content-Type": "application/sdp",
         }, offerSDP);
         const inboundMessage = await this.send(inviteMessage, true);
-        const proxyAuthenticate = inboundMessage.headers["Proxy-Authenticate"];
+        const proxyAuthenticate = inboundMessage.getHeader("Proxy-Authenticate");
         const nonce = proxyAuthenticate.match(/, nonce="(.+?)"/)[1];
         const newMessage = inviteMessage.fork();
         newMessage.headers["Proxy-Authorization"] = generateAuthorization(this.sipInfo, nonce, "INVITE");

package/dist/esm/sip-message/sip-message.d.ts

@@ -6,5 +6,6 @@ declare class SipMessage {
     body: string;
     constructor(subject?: string, headers?: {}, body?: string);
     toString(): string;
+    getHeader(key: string): string | undefined;
 }
 export default SipMessage;

package/dist/esm/sip-message/sip-message.js

@@ -22,5 +22,11 @@ class SipMessage {
         ].join("\r\n");
         return r;
     }
+    getHeader(key) {
+        const foundKey = Object.keys(this.headers).find((k) => k.toLowerCase() === key.toLowerCase());
+        if (foundKey) {
+            return this.headers[foundKey];
+        }
+    }
 }
 export default SipMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ringcentral-softphone",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "homepage": "https://github.com/ringcentral/ringcentral-softphone-ts",
   "license": "MIT",
   "types": "dist/esm/index.d.ts",