Skip to content

Commit

Permalink
Merge branch 'develop' into feat/node22
Browse files Browse the repository at this point in the history
# Conflicts:
#	companion/lib/Instance/Host.ts
#	companion/package.json
#	tools/yarn.sh
#	yarn.lock
  • Loading branch information
Julusian committed Sep 17, 2024
2 parents 01a29a8 + 07f5dc7 commit 2f0636b
Show file tree
Hide file tree
Showing 268 changed files with 11,144 additions and 23,329 deletions.
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ Dockerfile
.prettier*
dist
*/dist
module-legacy/entrypoints
module-legacy/manifests
.cache
10 changes: 5 additions & 5 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
uses: actions/cache@v4
with:
path: .cache
key: linux-x64-build-cache
key: linux-x64-build-cache-${{ hashFiles('.node-version') }}

- name: build & package
run: |
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
uses: actions/cache@v4
with:
path: .cache
key: linux-arm64-build-cache
key: linux-arm64-build-cache-${{ hashFiles('.node-version') }}

- name: build & package
run: |
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
uses: actions/cache@v4
with:
path: .cache
key: macos-x64-build-cache
key: macos-x64-build-cache-${{ hashFiles('.node-version') }}

- name: build & package
run: |
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
uses: actions/cache@v4
with:
path: .cache
key: macos-arm64-build-cache
key: macos-arm64-build-cache-${{ hashFiles('.node-version') }}

- name: yarn update
run: |
Expand Down Expand Up @@ -340,7 +340,7 @@ jobs:
uses: actions/cache@v4
with:
path: .cache
key: windows-x64-build-cache
key: windows-x64-build-cache-${{ hashFiles('.node-version') }}

- name: build & package
shell: bash
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,3 @@ typings/
!.yarn/releases
!.yarn/sdks
*/.yarn/*
module-legacy/.yarnrc
5 changes: 0 additions & 5 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,5 @@ webui/public/legacy
/LICENSE.md
docs/*

module-legacy/image/Font.js
module-legacy/manifests
module-legacy/dist
module-legacy/entrypoints

module-local-dev
bundled-modules
38 changes: 38 additions & 0 deletions .yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
diff --git a/index.ts b/index.ts
deleted file mode 100644
index 10d7278164a7f5491685454a8f483c78702b501b..0000000000000000000000000000000000000000
--- a/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-export * from './src/core';
-export * from './src/duplex';
-export {
- PatchError as JsonPatchError,
- _deepClone as deepClone,
- escapePathComponent,
- unescapePathComponent
-} from './src/helpers';
-
-
-/**
- * Default export for backwards compat
- */
-
-import * as core from './src/core';
-import * as duplex from './src/duplex';
-import {
- PatchError as JsonPatchError,
- _deepClone as deepClone,
- escapePathComponent,
- unescapePathComponent
-} from './src/helpers';
-
-export default {
- ...core,
- ...duplex,
- JsonPatchError,
- deepClone,
- escapePathComponent,
- unescapePathComponent
-}
\ No newline at end of file
165 changes: 164 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,29 @@
- Add time expression functions
- Allow comments
- Intermediate value variables
- Objects and arrays can be mutated
- Add install name user config and show in header
- Support per-user install on windows
- Support for Stream Deck Studio
- Support for VEC footpedal as a surface
- Support for Blackmagic Atem Micro Panel
- Support for 203 Systems Mystrix panel
- Allow surfaces larger than 32 buttons in satellite api
- Add text color, css colors and row/columns in satellite api
- Support variables in satellite api
- Fuzzy match results when searching for actions/feedbacks
- Update UI to updated framework. This includes small visual changes
- Various UI tweaks and improvements
- UI to discover, list and setup Satellite installations
- Move variables tab to the top level
- Long values in variables table are collapsed for readability
- Use url parameters in some more pages, to allow for better bookmarks/links
- Add row and column to bank_bg_change TCP messages
- Improve render quality of blank buttons
- Add variables for machine hostname
- Allow changing page by surface index from variable
- Add new local variables
- Option to duplicate steps on a button
- Various module api enhancements

### 🐞 BUG FIXES
Expand All @@ -38,10 +47,164 @@
- Avoid flickering when draging actions or feedbacks around the editor
- Avoid ui crash when action/feedback is missing name
- Importing triggers fails to append due to duplicate ids
- Improved error handling
- Font sizes sometimes show as invalid
-

### 🧩 NEW & UPDATED MODULES

-
- aimedia-icap
- aimedia-lexilive
- allenheath-ahm
- analogway-awj
- aten-matrix
- audiotechnica-digitalmixer
- avmediatools-protimer
- avstumpfl-pixera
- aws-elementallive
- aws-medialive
- axeltechnology-xplayout
- axeltechnology-xradio
- barco-eventmaster
- baserow-baserow
- behringer-x32
- behringer-xair
- birddog-central
- birddog-cloud
- birddog-converters
- birddog-ptz
- blackbox-boxilla
- bmd-atem
- bmd-hyperdeck
- bmd-teranex
- bmd-ultimatte
- bss-soundweb
- canon-ptz
- casparcg-server
- chamsys-magicq-osc
- chamsys-magicq-udp
- chamsys-quickq
- chyronhego-lyric
- dan-dugan-automixer
- dataton-watchout-json
- evertz-symphony
- extron-smp351
- figure53-qlab-advance
- figure53-qview
- generic-blink
- generic-dataentry
- generic-filereader
- generic-http
- generic-osc
- generic-pjlink
- generic-snmp
- generic-speedtest
- generic-ssh
- generic-stopwatch
- generic-swp02
- generic-swp08
- generic-tcp-serial
- generic-tcp-udp
- generic-webtable
- getontime-ontime
- google-sheets
- h2r-graphics
- hdtv-wolfpackgreen
- highend-hog4
- homeassistant-server
- ibm-watson
- imagine-lrc
- imimot-mitti
- ioversal-vertex
- ipl-ocp
- justmacros-lua
- kiloview-ndi
- klang-app
- klang-immersive
- kramer-matrix
- leonreucher-vstopowerpoint
- lost-cause-photographic-controlroom
- ltn-schedule
- middleman-breaktime
- monteiro-pptvideo
- moxa-e2200series
- netgear-avline
- newblue-captivate
- newtek-tricaster
- nexo-nxamp
- noismada-octopusshowcontrol
- novastar-mediaserver
- novastar-mxreal3
- nrk-sofie-chef
- ntp-technology-dot
- obs-studio
- optimalaudio-zone
- panasonic-cameras
- peavy-ratc
- pixelhue-mediaserver
- presentationtools-aps
- presentationtools-cuetimer
- ptzoptics-visca
- radiodj-rest
- raspberry-gpio
- resi-decoders
- rgblink-mini
- riedel-rrcs
- rogueamoeba-farrago
- roku-tv
- roland-v160hd
- roland-v600uhd
- rossvideo-xpression
- samsung-smarttv
- sennheiser-digital6000
- shure-mxa910
- shure-mxcw
- shure-mxn5
- shure-mxw
- shure-psm1000
- shure-scm820
- shure-wireless
- simonhyde-piclock
- singularlive-studio
- slack-webhooks
- smodetech-smodelive
- socialstream-ninja
- softron-movierecorder
- songbeamer-osc
- sony-bravia
- sony-serialtally
- soundcraft-ui
- sounddevices-pixnet
- spacecommz-intercom
- spotify-remote
- stagetec-xci
- stagetimerio-api
- studiocoast-vmix
- symetrix-dsp
- tascam-cd
- tascam-cd400u
- tascam-da-6400
- tasmota-http
- techministry-tallyarbiter
- telestream-prism
- tellyo-streamstudio
- teradek-prism
- tieline-gateway
- timemachines-clock
- tinkerlist-cuez-automator
- toolsonair-justincapture
- tplink-kasasmartplug
- vaddio-ptz
- vbaudio-voicemeeter
- vdo-ninja
- vicreo-display
- videolan-vlc
- vitec-avediaplayer9300-series
- yamaha-rcp
- zenvideo-ndirouter
- zerodensity-realityhub
- zinc-oscpoint
- zoom-osc-iso

## Companion v3.3.1 - Release Notes

Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ FROM debian:bookworm-slim
WORKDIR /app
COPY --from=companion-builder /app/dist /app/
COPY --from=companion-builder /app/docker-entrypoint.sh /docker-entrypoint.sh
COPY --from=companion-builder /app/module-legacy/manifests /app/module-legacy/manifests

# Install curl for the health check
RUN apt update && apt install -y \
Expand Down
Binary file added assets/Fonts/NotoSansGurmukhi-Regular.ttf
Binary file not shown.
Binary file added assets/Fonts/NotoSansSC-Regular.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion bundled-modules
Submodule bundled-modules updated 691 files
1 change: 1 addition & 0 deletions companion/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dist
40 changes: 40 additions & 0 deletions companion/lib/@types/shuttle-control-usb.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
declare module 'shuttle-control-usb' {
import type { EventEmitter } from 'events'
import type { HID } from 'node-hid'

export interface ShuttleEvents {
error: [Error]
buttondown: [index: number, deviceId: string]
buttonup: [index: number, deviceId: string]
'jog-dir': [delta: number, deviceId: string]
'shuttle-trans': [previous: number, current: number, deviceId: string]
disconnected: [deviceId: string]
}

export interface ShuttleDeviceInfo {
id: string
path: string
name: string
hasShuttle: boolean
hasJog: boolean
numButtons: number
}

class Shuttle extends EventEmitter<ShuttleEvents> {
readonly vids: Record<string, number>
readonly pids: Record<string, number>

start(watchUsb = true): void
stop(): void

getDeviceList(): ShuttleDeviceInfo[]

getDeviceById(deviceId: string): ShuttleDeviceInfo | undefined
getDeviceByPath(devicePath: string): ShuttleDeviceInfo | undefined
getRawHidDevice(deviceId: string): HID | undefined

connect(devicePath: string): void
}

export default new Shuttle()
}
36 changes: 36 additions & 0 deletions companion/lib/@types/vec-footpedal.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
declare module 'vec-footpedal' {
import type { EventEmitter } from 'events'
import type { HID } from 'node-hid'

export interface VecFootpedalEvents {
error: [Error]
buttondown: [index: number, deviceId: string]
buttonup: [index: number, deviceId: string]
disconnected: [deviceId: string]
}

export interface VecFootpedalDeviceInfo {
id: string
path: string
name: string
numButtons: number
}

class VecFootpedal extends EventEmitter<VecFootpedalEvents> {
readonly vids: Record<string, number>
readonly pids: Record<string, number>

start(watchUsb = true): void
stop(): void

getDeviceList(): VecFootpedalDeviceInfo[]

getDeviceById(deviceId: string): VecFootpedalDeviceInfo | undefined
getDeviceByPath(devicePath: string): VecFootpedalDeviceInfo | undefined
getRawHidDevice(deviceId: string): HID | undefined

connect(devicePath: string): void
}

export default new VecFootpedal()
}
Loading

0 comments on commit 2f0636b

Please sign in to comment.