Skip to content

Commit 4a91208

Browse files
authored
Merge pull request #206 from svrooij/feature/certificates
Feature/certificates
2 parents 351fe5d + 9cebf38 commit 4a91208

File tree

17 files changed

+809
-723
lines changed

17 files changed

+809
-723
lines changed
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us fix something unexpected from happening.
4+
title: 'BUG: '
5+
labels: bug
6+
assignees: 'svrooij'
7+
8+
---
9+
10+
### What happened
11+
12+
<!--Add a brief description what happend-->
13+
14+
### What did you expect to happen
15+
16+
<!--Add a brief description what you expected to happen-->
17+
18+
### How to reproduce it (minimal and precise)
19+
20+
<!--Add executed example or minimal code to reproduce-->
21+
22+
1. Step 1
23+
2. ...
24+
25+
<!-- or -->
26+
27+
```js
28+
29+
```
30+
31+
### Debug logging
32+
33+
<!--
34+
You can get a lot of logging when you set the loglevel to debug.
35+
Paste the logs in the code block (if applicable)
36+
-->
37+
38+
```plain
39+
40+
```
41+
42+
### Environment
43+
44+
- sonos2mqtt version:
45+
- OS:
46+
- node version (`node -v`):
47+
48+
### Checklist
49+
50+
Please confirm the following before creating the issue.
51+
52+
- [ ] Environment specified
53+
- [ ] Checked [issues](https://github.com/svrooij/sonos2mqtt/issues?q=is%3Aissue) for duplicates
54+
- [ ] Debug log added

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Questions
4+
url: https://github.com/svrooij/sonos2mqtt/discussions/categories/q-a
5+
about: For quick answers to your questions check out our community.
6+
- name: Documentation
7+
url: https://sonos2mqtt.svrooij.io
8+
about: There is a lot of documentation available, make sure to check it out.
9+
- name: Sonos library
10+
url: https://github.com/svrooij/node-sonos-ts
11+
about: Sonos2mqtt is just a mqtt wrapper around sonos-ts, documentation might overlap.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for sonos2mqtt
4+
title: ''
5+
labels: feature request
6+
assignees: 'svrooij'
7+
8+
---
9+
10+
## Is your feature request related to a problem? Please describe
11+
12+
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
13+
14+
## Describe the solution you'd like
15+
16+
<!-- A clear and concise description of what you want to happen. -->
17+
18+
## Describe alternatives you've considered
19+
20+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
21+
22+
## Additional context
23+
24+
<!-- Add any other context or screenshots about the feature request here. -->

.github/workflows/build-and-release.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
runs-on: ubuntu-latest
3232
strategy:
3333
matrix:
34-
node: [16, 18]
34+
node: [18, 20]
3535
steps:
36-
- uses: actions/checkout@v3
37-
- uses: actions/setup-node@v3
36+
- uses: actions/checkout@v4
37+
- uses: actions/setup-node@v4
3838
with:
3939
node-version: ${{ matrix.node }}
4040
- name: Install depencencies
@@ -56,16 +56,16 @@ jobs:
5656
released: ${{ steps.semantic.outputs.new_release_published }}
5757
version: ${{ steps.semantic.outputs.new_release_version }}
5858
steps:
59-
- uses: actions/checkout@v3
60-
- uses: actions/setup-node@v3
59+
- uses: actions/checkout@v4
60+
- uses: actions/setup-node@v4
6161
with:
62-
node-version: 16
62+
node-version: 20
6363
- name: Install depencencies
6464
run: npm ci
6565
- name: Build library
6666
run: npm run build
6767
- name: Semantic Release
68-
uses: cycjimmy/semantic-release-action@v3
68+
uses: cycjimmy/semantic-release-action@v4
6969
id: semantic
7070
env:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
7474
if: steps.semantic.outputs.new_release_published == 'true'
7575
uses: actions/setup-node@v3
7676
with:
77-
node-version: 16
77+
node-version: 20
7878
registry-url: 'https://npm.pkg.github.com'
7979
scope: 'svrooij'
8080
- name: Publish To GitHub Package Registry
@@ -92,31 +92,31 @@ jobs:
9292
needs: [npm-release]
9393
if: needs.npm-release.outputs.released == 'true'
9494
steps:
95-
- uses: actions/checkout@v3
95+
- uses: actions/checkout@v4
9696

9797
-
9898
name: Set up QEMU (multi platform)
99-
uses: docker/setup-qemu-action@v2
99+
uses: docker/setup-qemu-action@v3
100100
with:
101101
platforms: all
102102

103103
-
104104
name: Set up Docker Buildx
105105
id: buildx
106-
uses: docker/setup-buildx-action@v2
106+
uses: docker/setup-buildx-action@v3
107107
with:
108108
version: latest
109109

110110
-
111111
name: Login to DockerHub
112-
uses: docker/login-action@v2
112+
uses: docker/login-action@v3
113113
with:
114114
username: ${{ secrets.DOCKER_USERNAME }}
115115
password: ${{ secrets.DOCKER_PASSWORD }}
116116

117117
-
118118
name: Login to GitHub Container Registry
119-
uses: docker/login-action@v2
119+
uses: docker/login-action@v3
120120
with:
121121
registry: ghcr.io
122122
username: ${{ github.actor }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM node:16-alpine3.15 as build
1+
FROM node:lts-alpine as build
22
WORKDIR /usr/src/app
33
COPY package*.json tsconfig.json ./
44
RUN npm ci
55
COPY ./src ./src
66
RUN npm run build
77

8-
FROM node:16-alpine3.15 as prod
8+
FROM node:lts-alpine as prod
99
ARG BUILD_DATE=unknown
1010
ARG BUILD_VERSION=0.0.0-development
1111
ARG VCS_REF=not-set

Dockerfile.npm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# COPY ./src ./src
66
# RUN npm run build
77

8-
FROM node:16-alpine3.15 as prod
8+
FROM node:lts-alpine as prod
99
ENV SONOS2MQTT_RUNNING_IN_CONTAINER=true
1010
WORKDIR /usr/src/app
1111

README.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[![Sonos api documentation][badge_sonos-docs]][link_sonos-docs]
66
[![Sonos typescript this library][badge_sonos-typescript]][link_sonos-typescript]
77
[![Sonos cli][badge_sonos-cli]][link_sonos-cli]
8-
[![Join us on Discord][badge_discord]][link_discord]
98

109
[![github issues][badge_issues]][link_issues]
1110
[![docker pulls][badge_docker]][link_docker]
@@ -31,7 +30,7 @@ Check out the other bridges in the [software list](https://github.com/mqtt-smart
3130

3231
## Documentation
3332

34-
See: [https://svrooij.github.io/sonos2mqtt](https://svrooij.github.io/sonos2mqtt)
33+
See: [https://sonos2mqtt.svrooij.io/](https://sonos2mqtt.svrooij.io)
3534

3635
## Node-sonos-ts
3736

@@ -80,10 +79,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
8079
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification.
8180
Contributions of any kind welcome!
8281

83-
[badge_build]: https://github.com/svrooij/sonos2mqtt/workflows/Run%20tests%20and%20release%20npm%20package/badge.svg
8482
[badge_contrib]: https://img.shields.io/github/all-contributors/svrooij/sonos2mqtt?style=for-the-badge
8583
[badge_docker]: https://img.shields.io/docker/pulls/svrooij/sonos2mqtt?style=for-the-badge
86-
[badge_discord]: https://img.shields.io/discord/782374564054564875?style=for-the-badge
8784
[badge_issues]: https://img.shields.io/github/issues/svrooij/sonos2mqtt?style=for-the-badge
8885
[badge_npm]: https://img.shields.io/npm/v/sonos2mqtt?style=for-the-badge
8986
[badge_sonos-cli]: https://img.shields.io/badge/sonos-cli-blue?style=for-the-badge
@@ -93,13 +90,11 @@ Contributions of any kind welcome!
9390
[badge_sponsor]: https://img.shields.io/github/sponsors/svrooij?style=for-the-badge&logo=github
9491

9592

96-
[link_build]: https://github.com/svrooij/sonos2mqtt/actions
97-
[link_discord]: https://discord.gg/VMtG6Ft36J
9893
[link_docker]: https://hub.docker.com/r/svrooij/sonos2mqtt
9994
[link_issues]: https://github.com/svrooij/sonos2mqtt/issues
10095
[link_npm]: https://www.npmjs.com/package/sonos2mqtt
10196
[link_sonos-cli]: https://github.com/svrooij/sonos-cli
102-
[link_sonos-docs]: https://svrooij.io/sonos-api-docs
103-
[link_sonos-mqtt]: https://svrooij.io/sonos2mqtt
104-
[link_sonos-typescript]: https://svrooij.io/node-sonos-ts
97+
[link_sonos-docs]: https://sonos.svrooij.io/
98+
[link_sonos-mqtt]: https://sonos2mqtt.svrooij.io/
99+
[link_sonos-typescript]: https://sonos-ts.svrooij.io/
105100
[link_sponsor]: https://github.com/sponsors/svrooij

docs/getting-started.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ services:
105105
- SONOS2MQTT_DEVICE=192.168.50.4 # Service discovery doesn't work very well inside docker, so start with one device.
106106
- SONOS2MQTT_MQTT=mqtt://emqx:1883 # EMQX is a nice mqtt broker
107107
# - SONOS2MQTT_DISTINCT=true # if your want distinct topics
108+
# - SONOS2MQTT_MQTT_CA_PATH=/path/to/ca.crt # If you use a self-signed certificate
109+
# - SONOS2MQTT_MQTT_CERT_PATH=/path/to/cert.crt # If you want a secure connection
110+
# - SONOS2MQTT_MQTT_KEY_PATH=/path/to/key.key # If you want a secure connection
111+
# - SONOS2MQTT_MQTT_REJECT_UNAUTHORIZED=true # If you use official signed certificates
108112
- SONOS_LISTENER_HOST=192.168.50.44 # Docker host IP
109113
- SONOS_TTS_ENDPOINT=http://sonos-tts:5601/api/generate # If you deployed the TTS with the same docker-compose
110114
depends_on:

docs/index.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ permalink: /
1515
[![Sonos api documentation][badge_sonos-docs]][link_sonos-docs]
1616
[![Sonos typescript this library][badge_sonos-typescript]][link_sonos-typescript]
1717
[![Sonos cli][badge_sonos-cli]][link_sonos-cli]
18-
[![Join us on Discord][badge_discord]][link_discord]
1918

2019
[![github issues][badge_issues]][link_issues]
2120
[![docker pulls][badge_docker]][link_docker]
@@ -108,7 +107,6 @@ Contributions of any kind welcome!
108107

109108
[badge_contrib]: https://img.shields.io/github/all-contributors/svrooij/sonos2mqtt?style=for-the-badge
110109
[badge_docker]: https://img.shields.io/docker/pulls/svrooij/sonos2mqtt?style=for-the-badge&logo=docker
111-
[badge_discord]: https://img.shields.io/discord/782374564054564875?style=for-the-badge&logo=discord
112110
[badge_issues]: https://img.shields.io/github/issues/svrooij/sonos2mqtt?style=for-the-badge&logo=github
113111
[badge_npm]: https://img.shields.io/npm/v/sonos2mqtt?style=for-the-badge
114112
[badge_sonos-cli]: https://img.shields.io/badge/sonos-cli-blue?style=for-the-badge&logo=sonos
@@ -117,12 +115,11 @@ Contributions of any kind welcome!
117115
[badge_sonos-typescript]: https://img.shields.io/badge/sonos-typescript-blue?style=for-the-badge&logo=sonos
118116
[badge_sponsor]: https://img.shields.io/github/sponsors/svrooij?style=for-the-badge&logo=github
119117

120-
[link_discord]: https://discord.gg/VMtG6Ft36J
121118
[link_docker]: https://hub.docker.com/r/svrooij/sonos2mqtt
122119
[link_issues]: https://github.com/svrooij/sonos2mqtt/issues
123120
[link_npm]: https://www.npmjs.com/package/sonos2mqtt
124121
[link_sonos-cli]: https://github.com/svrooij/sonos-cli
125-
[link_sonos-docs]: https://svrooij.io/sonos-api-docs
126-
[link_sonos-mqtt]: https://svrooij.io/sonos2mqtt
127-
[link_sonos-typescript]: https://svrooij.io/node-sonos-ts
122+
[link_sonos-docs]: https://sonos.svrooij.io/
123+
[link_sonos-mqtt]: https://sonos2mqtt.svrooij.io/
124+
[link_sonos-typescript]: https://sonos-ts.svrooij.io/
128125
[link_sponsor]: https://github.com/sponsors/svrooij

0 commit comments

Comments
 (0)