@ceeblue/web-utils 2.4.0 → 2.5.0

package/dist/web-utils.d.ts

@@ -731,6 +731,12 @@ declare function getExtension(path: string): string;
  * @returns the file name
  */
 declare function getFile(path: string): string;
+/**
+ * Get Base File part from path, without extension
+ * @param path path to parse
+ * @returns the base file name
+ */
+declare function getBaseFile(path: string): string;
 /**
  * String Trim function with customizable chars
  * @param value string to trim
@@ -756,6 +762,7 @@ declare function trimEnd(value: string, chars?: string): string;
 declare const Util_EMPTY_FUNCTION: typeof EMPTY_FUNCTION;
 declare const Util_equal: typeof equal;
 declare const Util_fetch: typeof fetch;
+declare const Util_getBaseFile: typeof getBaseFile;
 declare const Util_getExtension: typeof getExtension;
 declare const Util_getFile: typeof getFile;
 declare const Util_objectEntries: typeof objectEntries;
@@ -771,7 +778,7 @@ declare const Util_trim: typeof trim;
 declare const Util_trimEnd: typeof trimEnd;
 declare const Util_trimStart: typeof trimStart;
 declare namespace Util {
-  export { Util_EMPTY_FUNCTION as EMPTY_FUNCTION, Util_equal as equal, Util_fetch as fetch, Util_getExtension as getExtension, Util_getFile as getFile, Util_objectEntries as objectEntries, Util_objectFrom as objectFrom, Util_options as options, Util_safePromise as safePromise, Util_sleep as sleep, Util_stringify as stringify, Util_time as time, Util_timeOrigin as timeOrigin, Util_toBin as toBin, Util_trim as trim, Util_trimEnd as trimEnd, Util_trimStart as trimStart };
+  export { Util_EMPTY_FUNCTION as EMPTY_FUNCTION, Util_equal as equal, Util_fetch as fetch, Util_getBaseFile as getBaseFile, Util_getExtension as getExtension, Util_getFile as getFile, Util_objectEntries as objectEntries, Util_objectFrom as objectFrom, Util_options as options, Util_safePromise as safePromise, Util_sleep as sleep, Util_stringify as stringify, Util_time as time, Util_timeOrigin as timeOrigin, Util_toBin as toBin, Util_trim as trim, Util_trimEnd as trimEnd, Util_trimStart as trimStart };
 }
 
 /**
@@ -833,19 +840,22 @@ type WebSocketReliableError =
  */
 declare class WebSocketReliable extends EventEmitter {
     /**
-     * @event `open` fired when socket is connected
+     * Fired when socket is connected
+     * @event
      */
     onOpen(): void;
     /**
-     * @event `message` fired on message reception
+     * Fired on message reception
      * @param message can be binary or string.
      * If you subscribe to the event with message as string type (and not union),
      * it means that you know that all your messages are distributed in a string format
+     * @event
      */
     onMessage(message: ArrayBuffer | string): void;
     /**
-     * @event `close` fired on websocket close
+     * Fired on websocket close
      * @param error error description on an improper closure
+     * @event
      */
     onClose(error?: WebSocketReliableError): void;
     /**
@@ -919,7 +929,6 @@ declare class WebSocketReliable extends EventEmitter {
     /**
      * Close websocket
      * @param error the error reason if is not a proper close
-     * @param detail detail of the error
      */
     close(error?: WebSocketReliableError): void;
     private _send;

package/dist/web-utils.js

@@ -633,10 +633,11 @@ function fetch(input, init) {
     return __awaiter(this, void 0, void 0, function* () {
         const response = yield self.fetch(input, init);
         if (response.status >= 300) {
+            let error;
             if (response.body) {
-                throw (yield response.text()) || response.statusText;
+                error = yield response.text();
             }
-            throw response.statusText;
+            throw (error || response.statusText || response.status).toString();
         }
         return response;
     });
@@ -659,6 +660,16 @@ function getExtension(path) {
 function getFile(path) {
     return path.substring(path.lastIndexOf('/') + 1);
 }
+/**
+ * Get Base File part from path, without extension
+ * @param path path to parse
+ * @returns the base file name
+ */
+function getBaseFile(path) {
+    const dot = path.lastIndexOf('.');
+    const file = path.lastIndexOf('/') + 1;
+    return dot >= 0 && dot >= file ? path.substring(file, dot) : path.substring(file);
+}
 function codesFromString(value) {
     const codes = [];
     for (let i = 0; i < value.length; ++i) {
@@ -711,7 +722,7 @@ function trimEnd(value, chars = ' ') {
         --i;
     }
     return value.substring(0, i);
-}var Util=/*#__PURE__*/Object.freeze({__proto__:null,EMPTY_FUNCTION:EMPTY_FUNCTION,equal:equal,fetch:fetch,getExtension:getExtension,getFile:getFile,objectEntries:objectEntries,objectFrom:objectFrom,options:options,safePromise:safePromise,sleep:sleep,stringify:stringify,time:time,timeOrigin:timeOrigin,toBin:toBin,trim:trim,trimEnd:trimEnd,trimStart:trimStart});/**
+}var Util=/*#__PURE__*/Object.freeze({__proto__:null,EMPTY_FUNCTION:EMPTY_FUNCTION,equal:equal,fetch:fetch,getBaseFile:getBaseFile,getExtension:getExtension,getFile:getFile,objectEntries:objectEntries,objectFrom:objectFrom,options:options,safePromise:safePromise,sleep:sleep,stringify:stringify,time:time,timeOrigin:timeOrigin,toBin:toBin,trim:trim,trimEnd:trimEnd,trimStart:trimStart});/**
  * Copyright 2024 Ceeblue B.V.
  * 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.
@@ -900,10 +911,6 @@ var Type;
  * @param params The parameters for which the media extension is to be defined
  */
 function defineMediaExt(type, params) {
-    // Fix mediaExt in removing the possible '.' prefix
-    if (params.mediaExt) {
-        params.mediaExt = trimStart(params.mediaExt, '.');
-    }
     // Compute appropriate mediaExt out parameter
     switch (type) {
         case Type.HESP:
@@ -917,7 +924,7 @@ function defineMediaExt(type, params) {
                 const url = new URL(params.endPoint);
                 const ext = getExtension(getFile(url.pathname));
                 // set extension just if not json, json means a manifest file endPoint
-                if (ext && ext !== 'json') {
+                if (ext && ext.toLowerCase() !== '.json') {
                     params.mediaExt = ext;
                 }
             }
@@ -941,6 +948,8 @@ function defineMediaExt(type, params) {
             console.warn('Unknown params type ' + type);
             break;
     }
+    // Fix mediaExt in removing the possible '.' prefix
+    trimStart(params.mediaExt, '.');
 }
 /**
  * Build an URL from {@link Type | type} and {@link Params | params}
@@ -962,7 +971,7 @@ function buildURL(type, params, protocol = 'wss') {
                 url.pathname = '/webrtc/' + params.streamName;
                 break;
             case Type.WRTS:
-                url.pathname = '/wrts/' + params.streamName;
+                url.pathname = '/wrts/' + params.streamName + '.' + params.mediaExt;
                 break;
             case Type.META:
                 url.pathname = '/json_' + params.streamName + '.js';
@@ -1701,21 +1710,31 @@ Object.freeze(SDP);/**
  */
 class WebSocketReliable extends EventEmitter {
     /**
-     * @event `open` fired when socket is connected
+     * Fired when socket is connected
+     * @event
      */
     onOpen() { }
     /**
-     * @event `message` fired on message reception
+     * Fired on message reception
      * @param message can be binary or string.
      * If you subscribe to the event with message as string type (and not union),
      * it means that you know that all your messages are distributed in a string format
+     * @event
      */
     onMessage(message) { }
     /**
-     * @event `close` fired on websocket close
+     * Fired on websocket close
      * @param error error description on an improper closure
+     * @event
      */
-    onClose(error) { }
+    onClose(error) {
+        if (error) {
+            this.log('onClose', error).error();
+        }
+        else {
+            this.log('onClose').info();
+        }
+    }
     /**
      * binaryType, fix binary type to arrayBuffer
      */
@@ -1882,7 +1901,6 @@ class WebSocketReliable extends EventEmitter {
     /**
      * Close websocket
      * @param error the error reason if is not a proper close
-     * @param detail detail of the error
      */
     close(error) {
         if (!this._ws || this._closed) {
@@ -1894,9 +1912,6 @@ class WebSocketReliable extends EventEmitter {
         // release resources!
         this._queueing.length = 0;
         this._queueingBytes = 0;
-        if (error) {
-            this.log(error).error();
-        }
         this.onClose(error);
         // Reset _opened in last to allow to differenciate in onClose an error while connecting OR while connected
         this._opened = false;
@@ -1913,4 +1928,4 @@ class WebSocketReliable extends EventEmitter {
  * 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 = '2.4.0';export{BinaryReader,BinaryWriter,BitReader,ByteRate,Connect,EventEmitter,FixMap,Log,LogType,Loggable,NetAddress,Numbers,Queue,SDP,Util,VERSION,WebSocketReliable,log};//# sourceMappingURL=web-utils.js.map
+const VERSION = '2.5.0';export{BinaryReader,BinaryWriter,BitReader,ByteRate,Connect,EventEmitter,FixMap,Log,LogType,Loggable,NetAddress,Numbers,Queue,SDP,Util,VERSION,WebSocketReliable,log};//# sourceMappingURL=web-utils.js.map