From 95959101269b6afdae4c1e5466fe80b32383d683 Mon Sep 17 00:00:00 2001 From: nicnacnic Date: Mon, 29 Aug 2022 15:02:46 -0400 Subject: [PATCH] Multi server RTMP added --- configschema.json | 54 +- dashboard/sceneControl/sceneControl.css | 7 +- dashboard/sceneControl/sceneControl.html | 24 + dashboard/sceneControl/sceneControl.js | 11 + graphics/streamPlayer/streamPlayer.js | 5 +- package-lock.json | 1149 ++-------------------- 6 files changed, 153 insertions(+), 1097 deletions(-) diff --git a/configschema.json b/configschema.json index c0ed7bf..66ded2a 100644 --- a/configschema.json +++ b/configschema.json @@ -1,70 +1,62 @@ { + "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "http://example.com/example.json", - "$schema": "http://json-schema.org/draft-07/schema", + "type": "object", "default": { "address": "localhost:4444", "password": "password", - "baseRtmpUrl": "https://rtmp.example.live/hls/", + "RTMPServers": {}, "botToken": "" }, - "description": "The root schema comprises the entire JSON document.", - "examples": [ - { - "address": "localhost:4444", - "password": "password", - "baseRtmpUrl": "https://rtmp.example.live/hls/", - "botToken": "" - } - ], + "title": "Root Schema", "required": [ "address", "password", - "baseRtmpUrl", + "RTMPServers", "botToken" ], - "title": "The root schema", - "type": "object", "properties": { "address": { - "$id": "#/properties/address", "type": "string", - "title": "The address schema", - "description": "An explanation about the purpose of this instance.", "default": "", + "title": "The address Schema", "examples": [ "localhost:4444" ] }, "password": { - "$id": "#/properties/password", "type": "string", - "title": "The password schema", - "description": "An explanation about the purpose of this instance.", "default": "", + "title": "The password Schema", "examples": [ "password" ] }, - "baseRtmpUrl": { - "$id": "#/properties/baseRtmpUrl", - "type": "string", - "title": "The baseRtmpUrl schema", - "description": "An explanation about the purpose of this instance.", - "default": "", + "RTMPServers": { + "type": "object", + "default": {}, + "title": "The RTMPServers Schema", + "required": [], + "properties": {}, "examples": [ - "https://rtmp.example.live/hls/" + {} ] }, "botToken": { - "$id": "#/properties/botToken", "type": "string", - "title": "The botToken schema", - "description": "An explanation about the purpose of this instance.", "default": "", + "title": "The botToken Schema", "examples": [ "" ] } }, - "additionalProperties": true + "examples": [ + { + "address": "localhost:4444", + "password": "password", + "RTMPServers": {}, + "botToken": "" + } + ] } \ No newline at end of file diff --git a/dashboard/sceneControl/sceneControl.css b/dashboard/sceneControl/sceneControl.css index 339ecc5..6caa65f 100644 --- a/dashboard/sceneControl/sceneControl.css +++ b/dashboard/sceneControl/sceneControl.css @@ -26,7 +26,7 @@ body { } .playerDiv .input { - width: 292px; + width: 204px; margin: 0; margin-right: 8px; } @@ -46,4 +46,9 @@ body { width: calc(100% - 8px); margin-top: -2px; margin-bottom: 20px; +} + +#runnerInfo .select { + width: 80px; + margin-right: 8px; } \ No newline at end of file diff --git a/dashboard/sceneControl/sceneControl.html b/dashboard/sceneControl/sceneControl.html index 71092a8..56106bb 100644 --- a/dashboard/sceneControl/sceneControl.html +++ b/dashboard/sceneControl/sceneControl.html @@ -25,6 +25,12 @@
+
+ + +
+