@ceeblue/web-utils 4.1.0 → 4.2.0

package/dist/web-utils.d.ts

@@ -496,6 +496,10 @@ declare class NetAddress {
      * console.log(NetAddress.fixProtocol('wss','http://domain/path')) // 'ws://domain/path'
      */
     static fixProtocol(protocol: string, address: string): string;
+    /**
+     * The host part from address `(http://)domain:port/path)`
+     */
+    get host(): string;
     /**
      * The domain part from address `(http://)domain(:port/path)`
      */
@@ -504,9 +508,6 @@ declare class NetAddress {
      * The port part from address `(http://)domain(:port/path)`, or defaultPort if passed in NetAddress constructor
      */
     get port(): number | undefined;
-    /**
-     * @returns the string address as passed in the constructor
-     */
     toString(): string;
     /**
      * @returns the string address as passed in the constructor
@@ -515,6 +516,7 @@ declare class NetAddress {
     valueOf(): string;
     private _address;
     private _domain;
+    private _host;
     private _port?;
     /**
      * Build a NetAddress object and parse address

package/dist/web-utils.js

@@ -1053,6 +1053,12 @@ class NetAddress {
         }
         return protocol + '://' + address;
     }
+    /**
+     * The host part from address `(http://)domain:port/path)`
+     */
+    get host() {
+        return this._host;
+    }
     /**
      * The domain part from address `(http://)domain(:port/path)`
      */
@@ -1065,9 +1071,6 @@ class NetAddress {
     get port() {
         return this._port;
     }
-    /**
-     * @returns the string address as passed in the constructor
-     */
     toString() {
         return this._address;
     }
@@ -1107,24 +1110,24 @@ class NetAddress {
                 address = address.substring(1);
             } // else something else #/
         }
+        // Remove Path!
+        pos = address.indexOf('/');
+        if (pos >= 0) {
+            address = address.substring(0, pos);
+        }
+        this._host = address;
         this._domain = address;
         this._port = defaultPort;
         // Parse Port
-        pos = address.lastIndexOf(':');
-        if (pos >= 0) {
+        pos = this._host.lastIndexOf(':');
+        const endOfBrace = this._host.lastIndexOf(']'); // to support IPv6
+        if (pos > endOfBrace) {
             const port = parseInt(address.substring(pos + 1));
-            if (port && port <= 0xffff) {
+            if (port >= 0 && port <= 0xffff) {
                 this._port = port;
                 this._domain = address.substring(0, pos);
             }
         }
-        else {
-            // Remove Path!
-            pos = address.indexOf('/');
-            if (pos >= 0) {
-                this._domain = address.substring(0, pos);
-            }
-        }
     }
 }/**
  * Copyright 2024 Ceeblue B.V.
@@ -1232,7 +1235,7 @@ function buildURL(type, params, protocol = 'wss') {
         if (!params.streamName) {
             // extract the second part of the URL's path (the first part being the protocol name), or the first path if no other part exists
             const parts = url.pathname.split('/');
-            params.streamName = parts[2] || parts[1] || parts[0];
+            params.streamName = getBaseFile(parts[2] || parts[1] || parts[0]);
         }
     }
     if (params.accessToken) {
@@ -2431,4 +2434,4 @@ class UIMetrics {
  * This file is part of https://github.com/CeeblueTV/web-utils which is released under GNU Affero General Public License.
  * See file LICENSE or go to https://spdx.org/licenses/AGPL-3.0-or-later.html for full license details.
  */
-const VERSION = '4.1.0';export{BinaryReader,BinaryWriter,BitReader,ByteRate,Connect,EpochTime,EventEmitter,FixMap,Log,LogLevel,Loggable,NetAddress,Numbers,Queue,SDP,UIMetrics,Util,VERSION,WebSocketReliable,log};//# sourceMappingURL=web-utils.js.map
+const VERSION = '4.2.0';export{BinaryReader,BinaryWriter,BitReader,ByteRate,Connect,EpochTime,EventEmitter,FixMap,Log,LogLevel,Loggable,NetAddress,Numbers,Queue,SDP,UIMetrics,Util,VERSION,WebSocketReliable,log};//# sourceMappingURL=web-utils.js.map