@clockworkdog/cogs-client 2.4.0 → 2.5.0

package/dist/CogsConnection.d.ts

@@ -20,14 +20,6 @@ export default class CogsConnection<Manifest extends CogsPluginManifest, DataT e
     get showPhase(): ShowPhase;
     private _timerState;
     get timerState(): TimerState | null;
-    /**
-     * Track the support for HTTP/2 assets on the client and server side
-     * Client side is dictated by the environment we're connecting from (and the media cogs-av-box version)
-     * Server side is dictated by the COGS version which added the HTTP/2 assets server itself
-     */
-    private clientSupportsHttp2Assets;
-    private serverSupportsHttp2Assets;
-    get supportsHttp2Assets(): boolean;
     /**
      * Return asset URLs using the information about the client and server support for HTTP/2
      */

package/dist/CogsConnection.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CogsIncomingEvent = exports.CogsStateChangedEvent = exports.CogsConfigChangedEvent = exports.CogsMessageEvent = exports.CogsConnectionCloseEvent = exports.CogsConnectionOpenEvent = void 0;
-const compare_versions_1 = require("compare-versions");
 const ShowPhase_1 = __importDefault(require("./types/ShowPhase"));
 const reconnecting_websocket_1 = __importDefault(require("reconnecting-websocket"));
 const urls_1 = require("./helpers/urls");
@@ -22,15 +21,12 @@ class CogsConnection {
     get timerState() {
         return this._timerState ? { ...this._timerState } : null;
     }
-    get supportsHttp2Assets() {
-        return this.clientSupportsHttp2Assets && this.serverSupportsHttp2Assets;
-    }
     /**
      * Return asset URLs using the information about the client and server support for HTTP/2
      */
     getAssetUrl(path) {
         var _a, _b;
-        return `${(0, urls_1.assetUrl)(path, this.supportsHttp2Assets)}?${(_b = (_a = this.urlParams) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''}`;
+        return `${(0, urls_1.assetUrl)(path)}?${(_b = (_a = this.urlParams) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''}`;
     }
     get selectedAudioOutput() {
         return this._selectedAudioOutput;
@@ -43,13 +39,6 @@ class CogsConnection {
         this.currentState = {}; // Received on open connection - TODO: set initial state from manifest?
         this._showPhase = ShowPhase_1.default.Setup;
         this._timerState = null;
-        /**
-         * Track the support for HTTP/2 assets on the client and server side
-         * Client side is dictated by the environment we're connecting from (and the media cogs-av-box version)
-         * Server side is dictated by the COGS version which added the HTTP/2 assets server itself
-         */
-        this.clientSupportsHttp2Assets = false;
-        this.serverSupportsHttp2Assets = false;
         /**
          * Cached audio outputs use to look up the device/sink ID when a different device label is requested
          */
@@ -57,7 +46,7 @@ class CogsConnection {
         this._selectedAudioOutput = '';
         this.currentState = { ...initialClientState };
         this.store = new DataStore_1.default(initialDataStoreData !== null && initialDataStoreData !== void 0 ? initialDataStoreData : {});
-        const { useReconnectingWebsocket, path, pathParams, supportsHttp2Assets } = websocketParametersFromUrl(document.location.href);
+        const { useReconnectingWebsocket, path, pathParams } = websocketParametersFromUrl(document.location.href);
         // Store the URL parameters for use in asset URLs
         // and add screen dimensions which COGS can use to determine the best asset quality to serve
         //
@@ -69,13 +58,9 @@ class CogsConnection {
         this.urlParams.set('screenPixelRatio', window.devicePixelRatio.toString());
         const socketUrl = `ws://${hostname}:${port}${path}?${this.urlParams}`;
         this.websocket = useReconnectingWebsocket ? new reconnecting_websocket_1.default(socketUrl) : new WebSocket(socketUrl);
-        this.clientSupportsHttp2Assets = !!supportsHttp2Assets;
         this.websocket.onopen = () => {
             this.currentConfig = {}; // Received on open connection
             this.currentState = {}; // Received on open connection
-            // Reset this flag as we might have just connected to an old COGS version which doesn't support HTTP/2
-            // The flag will be set when COGS sends a "cogs_environment" message
-            this.serverSupportsHttp2Assets = false;
             this.dispatchEvent(new CogsConnectionOpenEvent());
             this.setState(this.currentState); // TODO: Remove this because you should set it manually...??
         };
@@ -110,9 +95,6 @@ class CogsConnection {
                             case 'show_phase':
                                 this._showPhase = message.phase;
                                 break;
-                            case 'cogs_environment':
-                                this.serverSupportsHttp2Assets = message.http2AssetsServer;
-                                break;
                             case 'media_config_update':
                                 for (const optionName of ['preferOptimizedAudio', 'preferOptimizedVideo', 'preferOptimizedImages']) {
                                     const optionEnabled = message[optionName];
@@ -227,66 +209,52 @@ class CogsConnection {
 }
 exports.default = CogsConnection;
 function websocketParametersFromUrl(url) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e;
     const parsedUrl = new URL(url);
     const pathParams = new URLSearchParams(parsedUrl.searchParams);
     const localClientId = pathParams.get('local_id');
     const isSimulator = pathParams.get('simulator') === 'true';
     const display = (_a = pathParams.get('display')) !== null && _a !== void 0 ? _a : '';
     const pluginId = parsedUrl.pathname.startsWith('/plugin/') ? decodeURIComponent(parsedUrl.pathname.split('/')[2]) : undefined;
-    // Allow explicitly disabling HTTP/2 assets. This is useful in situations where we know the self-signed certificate cannot be
-    // supported such as the native mobile app
-    const disableHttp2Assets = ((_b = pathParams.get('http2Assets')) !== null && _b !== void 0 ? _b : '') === 'false';
     if (localClientId) {
-        const type = (_c = pathParams.get('t')) !== null && _c !== void 0 ? _c : '';
+        const type = (_b = pathParams.get('t')) !== null && _b !== void 0 ? _b : '';
         pathParams.delete('local_id');
         return {
             path: `/local/${encodeURIComponent(localClientId)}`,
             pathParams: new URLSearchParams({ t: type }),
             useReconnectingWebsocket: true,
-            supportsHttp2Assets: !disableHttp2Assets,
         };
     }
     else if (isSimulator) {
-        const supportsHttp2Assets = ((_d = pathParams.get('http2Assets')) !== null && _d !== void 0 ? _d : '') === 'true';
-        pathParams.delete('http2Assets');
-        const name = (_e = pathParams.get('name')) !== null && _e !== void 0 ? _e : '';
+        const name = (_c = pathParams.get('name')) !== null && _c !== void 0 ? _c : '';
         pathParams.delete('simulator');
         pathParams.delete('name');
         return {
             path: `/simulator/${encodeURIComponent(name)}`,
             pathParams,
             useReconnectingWebsocket: true,
-            supportsHttp2Assets: !disableHttp2Assets && supportsHttp2Assets,
         };
     }
     else if (display) {
-        const displayIdIndex = (_f = pathParams.get('displayIdIndex')) !== null && _f !== void 0 ? _f : '';
+        const displayIdIndex = (_d = pathParams.get('displayIdIndex')) !== null && _d !== void 0 ? _d : '';
         pathParams.delete('display');
         pathParams.delete('displayIdIndex');
         return {
             path: `/display/${encodeURIComponent(display)}/${encodeURIComponent(displayIdIndex)}`,
-            supportsHttp2Assets: !disableHttp2Assets,
         };
     }
     else if (pluginId) {
         return {
             path: `/plugin/${encodeURIComponent(pluginId)}`,
             useReconnectingWebsocket: true,
-            supportsHttp2Assets: !disableHttp2Assets,
         };
     }
     else {
-        const serial = (_g = pathParams.get('serial')) !== null && _g !== void 0 ? _g : '';
+        const serial = (_e = pathParams.get('serial')) !== null && _e !== void 0 ? _e : '';
         pathParams.delete('serial');
-        // Check if cogs-box-av is a version which added support for ignoring HTTP/2 self-signed certificates
-        const firmwareVersion = ((_h = pathParams.get('f')) !== null && _h !== void 0 ? _h : '').replace(/^v/, '');
-        const isCogsBoxAvDevBuild = firmwareVersion === '0.0.0'; // We assume dev firmware builds have HTTP/2 assets support - Added in 2024-03
-        const supportsHttp2Assets = isCogsBoxAvDevBuild || ((0, compare_versions_1.validate)(firmwareVersion) && (0, compare_versions_1.satisfies)(firmwareVersion, '>=4.9.0'));
         return {
             path: `/client/${encodeURIComponent(serial)}`,
             pathParams,
-            supportsHttp2Assets: !disableHttp2Assets && supportsHttp2Assets,
         };
     }
 }