diff --git a/plugins/ontime/icon.png b/plugins/ontime/icon.png new file mode 100644 index 0000000..134b5d3 Binary files /dev/null and b/plugins/ontime/icon.png differ diff --git a/plugins/ontime/info.html b/plugins/ontime/info.html new file mode 100644 index 0000000..c093405 --- /dev/null +++ b/plugins/ontime/info.html @@ -0,0 +1,3 @@ +

Connects to Ontime via WebSocket.

+

Default port: 4001

+

Displays the current timer, playback state, and event information from the active rundown.

diff --git a/plugins/ontime/main.js b/plugins/ontime/main.js new file mode 100644 index 0000000..5349433 --- /dev/null +++ b/plugins/ontime/main.js @@ -0,0 +1,60 @@ +exports.config = { + defaultName: 'Ontime', + connectionType: 'websocket', + remotePort: 4001, + mayChangePorts: true, + heartbeatInterval: 500, + heartbeatTimeout: 15000, + fields: [ + { + key: 'wsPath', + label: 'WS Path', + type: 'textinput', + value: '/ws', + action: () => {}, + }, + ], +}; + +exports.ready = function ready(device) { + const d = device; + d.data = { + timer: { current: null, playback: 'stop', addedTime: 0, duration: null, elapsed: null }, + eventNow: null, + eventNext: null, + clock: null, + }; + d.send({ tag: 'poll' }); +}; + +exports.data = function data(_device, msg) { + const device = _device; + + if (!device.data) { + device.data = { + timer: { current: null, playback: 'stop', addedTime: 0, duration: null, elapsed: null }, + eventNow: null, + eventNext: null, + clock: null, + }; + } + + // Ontime v4 sends all state updates as { tag: "runtime-data", payload: Partial } + // Poll responses arrive as { tag: "poll", payload: Partial } + if (msg.tag !== 'runtime-data' && msg.tag !== 'poll') return; + + const p = msg.payload; + if (!p) return; + if (p.timer !== undefined) device.data.timer = p.timer; + if (p.eventNow !== undefined) device.data.eventNow = p.eventNow; + if (p.eventNext !== undefined) device.data.eventNext = p.eventNext; + if (p.clock !== undefined) device.data.clock = p.clock; + + device.draw(); +}; + +exports.heartbeat = function heartbeat(device) { + device.send({ tag: 'poll' }); +}; + +exports.update = function update(_device, _doc, _updateType, _data) {}; diff --git a/plugins/ontime/styles.css b/plugins/ontime/styles.css new file mode 100644 index 0000000..4420ac1 --- /dev/null +++ b/plugins/ontime/styles.css @@ -0,0 +1,177 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: url(../../src/assets/font/OpenSans-Light.ttf) format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url(../../src/assets/font/OpenSans-Regular.ttf) format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: url(../../src/assets/font/OpenSans-SemiBold.ttf) format('truetype'); +} + +body { + background-color: #161616; + color: #e0e0e0; + font-family: 'Open Sans', sans-serif; +} + +.ontime-top-bar { + display: flex; + justify-content: space-between; + align-items: flex-start; + padding: 10px 14px; + background-color: #222; + border-bottom: 2px solid #333; +} + +.ontime-top-bar.play { + border-bottom-color: #4caf50; +} + +.ontime-top-bar.pause { + border-bottom-color: #ff9800; +} + +.ontime-top-bar.armed { + border-bottom-color: #2196f3; +} + +.ontime-top-bar.roll { + border-bottom-color: #9c27b0; +} + +.ontime-top-bar.overtime { + border-bottom-color: #f44336; +} + +.ontime-top-section { + display: flex; + flex-direction: column; +} + +.ontime-top-clock { + align-items: flex-end; +} + +.ontime-top-label { + font-size: 11px; + text-transform: uppercase; + letter-spacing: 0.1em; + color: #666; + margin-bottom: 2px; +} + +.ontime-timer-value { + font-size: 52px; + font-weight: 300; + line-height: 1; + font-variant-numeric: tabular-nums; + color: #ffffff; +} + +.ontime-top-bar.overtime .ontime-timer-value { + color: #f44336; +} + +.ontime-top-bar.stop .ontime-timer-value, +.ontime-top-bar.armed .ontime-timer-value { + color: #888; +} + +.ontime-clock-value { + font-size: 52px; + font-weight: 300; + line-height: 1; + font-variant-numeric: tabular-nums; + color: #888; +} + +.ontime-progress-bar { + height: 3px; + background-color: #333; + margin: 0; +} + +.ontime-progress-fill { + height: 100%; + background-color: #4caf50; + transition: width 0.5s linear; +} + +.ontime-added-time { + font-size: 12px; + color: #ff9800; + margin-top: 4px; +} + +.ontime-event { + margin: 8px 0; + padding: 10px 12px; + border-radius: 4px; + background-color: #1e1e1e; + border-left: 3px solid #444; +} + +.ontime-event-now { + border-left-color: #4caf50; +} + +.ontime-event-next { + border-left-color: #444; + opacity: 0.7; +} + +.ontime-event-header { + display: flex; + justify-content: space-between; + align-items: baseline; + margin-bottom: 4px; +} + +.ontime-event-cue { + font-size: 11px; + color: #aaa; + font-family: monospace; +} + +.ontime-event-label { + font-size: 10px; + text-transform: uppercase; + letter-spacing: 0.08em; + color: #666; +} + +.ontime-event-title { + font-size: 16px; + color: #fff; + font-weight: 400; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.ontime-event-note { + font-size: 12px; + color: #888; + margin-top: 4px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.ontime-event-times { + font-size: 11px; + color: #666; + margin-top: 3px; + font-variant-numeric: tabular-nums; +} + + diff --git a/plugins/ontime/template.ejs b/plugins/ontime/template.ejs new file mode 100644 index 0000000..0606824 --- /dev/null +++ b/plugins/ontime/template.ejs @@ -0,0 +1,81 @@ +<% +function formatMs(ms) { + if (ms === null || ms === undefined) return '--:--'; + var neg = ms < 0; + var abs = Math.abs(ms); + var h = Math.floor(abs / 3600000); + var m = Math.floor((abs % 3600000) / 60000); + var s = Math.floor((abs % 60000) / 1000); + var result = h > 0 + ? h + ':' + String(m).padStart(2, '0') + ':' + String(s).padStart(2, '0') + : m + ':' + String(s).padStart(2, '0'); + return (neg ? '-' : '') + result; +} +function formatClock(ms) { + if (ms === null || ms === undefined) return ''; + var h = Math.floor(ms / 3600000) % 24; + var m = Math.floor((ms % 3600000) / 60000); + return String(h).padStart(2, '0') + ':' + String(m).padStart(2, '0'); +} +var playback = data.timer ? data.timer.playback : 'stop'; +var current = data.timer ? data.timer.current : null; +var duration = data.timer ? data.timer.duration : null; +var overtime = current !== null && current < 0; +%> + +
+

<%= listName %>

+
+ +
+
+
Running timer
+
<%= formatMs(current) %>
+ <% if (data.timer && data.timer.addedTime && data.timer.addedTime !== 0) { %> +
<%= data.timer.addedTime > 0 ? '+' : '' %><%= Math.round(data.timer.addedTime / 1000) %>s
+ <% } %> +
+ <% if (data.clock !== null && data.clock !== undefined) { %> +
+
Time now
+
<%= formatClock(data.clock) %>
+
+ <% } %> +
+<% if (duration !== null && duration !== undefined && duration > 0) { %> +<% var elapsed = data.timer && data.timer.elapsed !== null && data.timer.elapsed !== undefined ? data.timer.elapsed : null; %> +<% var pct = elapsed !== null ? Math.max(0, Math.min(100, (elapsed / duration) * 100)) : 0; %> +
+<% } %> + +<% if (data.eventNow) { %> +
+
+ <%= data.eventNow.cue || '' %> + Now +
+
<%= data.eventNow.title || '' %>
+ <% if (data.eventNow.timeStart !== undefined && data.eventNow.timeEnd !== undefined) { %> +
<%= formatClock(data.eventNow.timeStart) %> – <%= formatClock(data.eventNow.timeEnd) %>
+ <% } %> + <% if (data.eventNow.note) { %> +
<%= data.eventNow.note %>
+ <% } %> +
+<% } %> + +<% if (data.eventNext) { %> +
+
+ <%= data.eventNext.cue || '' %> + Next +
+
<%= data.eventNext.title || '' %>
+ <% if (data.eventNext.timeStart !== undefined && data.eventNext.timeEnd !== undefined) { %> +
<%= formatClock(data.eventNext.timeStart) %> – <%= formatClock(data.eventNext.timeEnd) %>
+ <% } %> + <% if (data.eventNext.note) { %> +
<%= data.eventNext.note %>
+ <% } %> +
+<% } %> diff --git a/src/assets/css/index.css b/src/assets/css/index.css index e67750c..dd0179f 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -347,6 +347,24 @@ select.button:focus { outline: none; } +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: url(../font/OpenSans-Light.ttf) format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url(../font/OpenSans-Regular.ttf) format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: url(../font/OpenSans-SemiBold.ttf) format('truetype'); +} @font-face { font-family: 'Material Icons'; font-style: normal; diff --git a/src/assets/font/Lato-Bold.ttf b/src/assets/font/Lato-Bold.ttf new file mode 100644 index 0000000..1d23c70 Binary files /dev/null and b/src/assets/font/Lato-Bold.ttf differ diff --git a/src/assets/font/Lato-Light.ttf b/src/assets/font/Lato-Light.ttf new file mode 100644 index 0000000..c3f3cb5 Binary files /dev/null and b/src/assets/font/Lato-Light.ttf differ diff --git a/src/assets/font/Lato-OFL.txt b/src/assets/font/Lato-OFL.txt new file mode 100644 index 0000000..98383e3 --- /dev/null +++ b/src/assets/font/Lato-OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/assets/font/Lato-Regular.ttf b/src/assets/font/Lato-Regular.ttf new file mode 100644 index 0000000..0f3d0f8 Binary files /dev/null and b/src/assets/font/Lato-Regular.ttf differ diff --git a/src/assets/font/MaterialIcons-LICENSE.txt b/src/assets/font/MaterialIcons-LICENSE.txt new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/src/assets/font/MaterialIcons-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/src/assets/font/OpenSans-Light.ttf b/src/assets/font/OpenSans-Light.ttf new file mode 100755 index 0000000..e2d5717 Binary files /dev/null and b/src/assets/font/OpenSans-Light.ttf differ diff --git a/src/assets/font/OpenSans-OFL.txt b/src/assets/font/OpenSans-OFL.txt new file mode 100644 index 0000000..d762c3c --- /dev/null +++ b/src/assets/font/OpenSans-OFL.txt @@ -0,0 +1,92 @@ +Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/assets/font/OpenSans-Regular.ttf b/src/assets/font/OpenSans-Regular.ttf new file mode 100755 index 0000000..134d225 Binary files /dev/null and b/src/assets/font/OpenSans-Regular.ttf differ diff --git a/src/assets/font/OpenSans-SemiBold.ttf b/src/assets/font/OpenSans-SemiBold.ttf new file mode 100755 index 0000000..2310e8a Binary files /dev/null and b/src/assets/font/OpenSans-SemiBold.ttf differ diff --git a/src/device.js b/src/device.js index 3658f33..50101ee 100644 --- a/src/device.js +++ b/src/device.js @@ -243,6 +243,46 @@ function initDeviceConnection(id) { }); infoUpdate(device, 'status', 'ok'); }); + } else if (plugins[type].config.connectionType === 'websocket') { + const wsPath = (device.fields && device.fields.wsPath) ? device.fields.wsPath : '/ws'; + const wsUrl = `ws://${device.addresses[0]}:${device.remotePort}${wsPath}`; + device.connection = new WebSocket(wsUrl); + + device.connection.onopen = () => { + device.lastMessage = Date.now(); + infoUpdate(device, 'status', 'ok'); + plugins[type].ready(device); + if (Object.keys(devices).length === 1) { + VIEW.switchDevice(device.id); + } + }; + + device.connection.onmessage = (event) => { + try { + const msg = JSON.parse(event.data); + plugins[type].data(device, msg); + } catch (err) { + console.error(err); + } + device.lastMessage = Date.now(); + device.trafficSignal(device); + infoUpdate(device, 'status', 'ok'); + }; + + device.connection.onerror = () => {}; + + device.connection.onclose = () => { + device.lastMessage = 0; + }; + + device.send = (data) => { + device.sendQueue.push(data); + }; + device.sendNow = (data) => { + if (device.connection.readyState === WebSocket.OPEN) { + device.connection.send(JSON.stringify(data)); + } + }; } return true; @@ -264,6 +304,8 @@ module.exports.deleteActive = function deleteActive() { device.connection?.close(); } else if (device.plugin.config.connectionType.startsWith('osc')) { device.connection?.close(); + } else if (device.plugin.config.connectionType === 'websocket') { + device.connection?.close(); } VIEW.removeDeviceFromList(device); delete devices[device.id];