Merge pull request #11 from CeeblueTV/dev

getFile/getExtension/mediaExt/trim

Author: MathieuPOUX

src/Connect.ts

@@ -3,8 +3,8 @@
  * 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.
  */
-import { NetAddress } from './NetAddress';
 import * as Util from './Util';
+import { NetAddress } from './NetAddress';
 
 /**
  * Parameters of connections
@@ -27,6 +27,11 @@ export type Params = {
      * iceServer to use while connecting to a WebRTC stream
      */
     iceServer?: RTCIceServer; // Authentication value
+    /**
+     * Optional media extension (mp4, flv, ts, rts), usefull for protocol like WebRTS which supports different container type.
+     * When not set, it's also an output parameter to indicate what is the media type selected
+     */
+    mediaExt?: string;
     /**
      * Optional query to add into the generated url of connection
      */
@@ -48,6 +53,56 @@ export enum Type {
  * Some connection utility functions
  */
 
+/**
+ * Defines the {@link Params.mediaExt} based on the type of parameters and its endpoint.
+ * This method always assigns a value to params.mediaExt, defaulting to an empty string if indeterminable,
+ * allowing detection of whether the function has been applied to the parameters.
+ * @param type The type of parameters to define.
+ * @param params The parameters for which the media extension is to be defined
+ */
+export function defineMediaExt(type: Type, params: Params) {
+    // Fix mediaExt in removing the possible '.' prefix
+    if (params.mediaExt) {
+        params.mediaExt = Util.trimStart(params.mediaExt, '.');
+    }
+    // Compute appropriate mediaExt out parameter
+    switch (type) {
+        case Type.HESP:
+            params.mediaExt = 'mp4';
+            break;
+        case Type.WEBRTC:
+            params.mediaExt = 'rtp';
+            break;
+        case Type.WRTS: {
+            try {
+                const url = new URL(params.endPoint);
+                const ext = Util.getExtension(Util.getFile(url.pathname));
+                // set extension just if not json, json means a manifest file endPoint
+                if (ext && ext !== 'json') {
+                    params.mediaExt = ext;
+                }
+            } catch (_) {
+                // not an URL, it's only a host => keep mediaExt unchanged to build the URL
+            }
+            if (!params.mediaExt) {
+                // set to its default rts value => always set for WRTS!
+                params.mediaExt = 'rts';
+            }
+            break;
+        }
+        case Type.META:
+            params.mediaExt = 'js';
+            break;
+        case Type.DATA:
+            params.mediaExt = 'json';
+            break;
+        default:
+            params.mediaExt = ''; // set always a value to know that the parameters have been fixed
+            console.warn('Unknown params type ' + type);
+            break;
+    }
+}
+
 /**
  * Build an URL from {@link Type | type} and {@link Params | params}
  * @param type Type of the connection wanted
@@ -56,11 +111,9 @@ export enum Type {
  * @returns The URL of connection
  */
 export function buildURL(type: Type, params: Params, protocol: string = 'wss'): URL {
-    const url = new URL(NetAddress.fixProtocol(protocol, params.endPoint));
+    defineMediaExt(type, params);
 
-    // Remove possible extension of streamName put sometimes to decide format when multiple choices are possible like with WRTS
-    const ext = Util.parseExtension(params.streamName);
-    params.streamName = params.streamName.substring(0, params.streamName.length - ext.length);
+    const url = new URL(NetAddress.fixProtocol(protocol, params.endPoint));
 
     if (url.pathname.length <= 1) {
         // build ceeblue path!
@@ -72,7 +125,7 @@ export function buildURL(type: Type, params: Params, protocol: string = 'wss'):
                 url.pathname = '/webrtc/' + params.streamName;
                 break;
             case Type.WRTS:
-                url.pathname = '/wrts/' + params.streamName + ext;
+                url.pathname = '/wrts/' + params.streamName;
                 break;
             case Type.META:
                 url.pathname = '/json_' + params.streamName + '.js';

src/Util.ts

@@ -272,12 +272,78 @@ export async function fetch(input: RequestInfo | URL, init?: RequestInit): Promi
 }
 
 /**
- * Extension parser
+ * Get Extension part from path
  * @param path path to parse
  * @returns the extension
  */
-export function parseExtension(path: string): string {
+export function getExtension(path: string): string {
     const dot = path.lastIndexOf('.');
     const ext = dot >= 0 && dot > path.lastIndexOf('/') ? path.substring(dot) : '';
     return ext;
 }
+
+/**
+ * Get File part from path
+ * @param path path to parse
+ * @returns the file name
+ */
+export function getFile(path: string): string {
+    return path.substring(path.lastIndexOf('/') + 1);
+}
+
+function codesFromString(value: string): Array<number> {
+    const codes = [];
+    for (let i = 0; i < value.length; ++i) {
+        codes.push(value.charCodeAt(i));
+    }
+    return codes;
+}
+
+/**
+ * String Trim function with customizable chars
+ * @param value string to trim
+ * @param chars chars to use to trim
+ * @returns string trimmed
+ */
+export function trim(value: string, chars: string = ' '): string {
+    const codes = codesFromString(chars);
+    let start = 0;
+    while (start < value.length && codes.includes(value.charCodeAt(start))) {
+        ++start;
+    }
+    let end = value.length;
+    while (end > 0 && codes.includes(value.charCodeAt(end - 1))) {
+        --end;
+    }
+    return value.substring(start, end);
+}
+
+/**
+ * String Trim Start function with customizable chars
+ * @param value string to trim start
+ * @param chars chars to use to trim start
+ * @returns string trimmed
+ */
+export function trimStart(value: string, chars: string = ' '): string {
+    const codes = codesFromString(chars);
+    let i = 0;
+    while (i < value.length && codes.includes(value.charCodeAt(i))) {
+        ++i;
+    }
+    return value.substring(i);
+}
+
+/**
+ * String Trim End function with customizable chars
+ * @param value string to trim end
+ * @param chars chars to use to trim end
+ * @returns string trimmed
+ */
+export function trimEnd(value: string, chars: string = ' '): string {
+    const codes = codesFromString(chars);
+    let i = value.length;
+    while (i > 0 && codes.includes(value.charCodeAt(i - 1))) {
+        --i;
+    }
+    return value.substring(0, i);
+}