Skip to content

Fix device appearing offline #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfarseneau merged 1 commit into from
Jun 16, 2018
Merged

Fix device appearing offline #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
tvheadend_url: http://admin:test@192.168.0.1:9981
antennas_url: http://127.0.0.1:5004
tuner_count: 6 # numbers of tuners in tvheadend
device_uuid: 2f70c0d7-90a3-4429-8275-cbeeee9cd605
2 changes: 2 additions & 0 deletions src/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module.exports = function() {
tvheadendUrl = process.env.TVHEADEND_URL || config.tvheadend_url;
antennasUrl = process.env.ANTENNAS_URL || config.antennas_url;
tunerCount = process.env.TUNER_COUNT || config.tuner_count;
DeviceUuid = process.env.DEVICE_UUID || config.device_uuid;
let parsedTvheadendURI = parseTvheadendURI(tvheadendUrl);
return {
tvheadend_parsed_uri: parsedTvheadendURI.uri,
Expand All @@ -34,5 +35,6 @@ module.exports = function() {
tvheadend_url: tvheadendUrl,
antennas_url: antennasUrl,
tuner_count: tunerCount,
device_uuid: DeviceUuid
}
}
4 changes: 2 additions & 2 deletions src/device.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ const config = require('./config');

module.exports = function() {
return {
FriendlyName: "Antennas",
FriendlyName: "HDHomerun (Antennas)",
Manufacturer: "Silicondust",
ManufacturerURL: "https://github.com/thejf/antennas",
ModelNumber: "HDTC-2US",
FirmwareName: "hdhomeruntc_atsc",
TunerCount: config().tuner_count,
FirmwareVersion: "20170930",
DeviceID: "12345670",
DeviceID: config().device_uuid,
DeviceAuth: "test1234",
BaseURL: config().antennas_url,
LineupURL: `${config().antennas_url}/lineup.json`
Expand Down
9 changes: 5 additions & 4 deletions src/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ module.exports = function() {
<major>1</major>
<minor>0</minor>
</specVersion>
<URLBase>${device().BaseURL}</URLBase>
<device>
<dlna:X_DLNADOC>DMS-1.50</dlna:X_DLNADOC>
<pnpx:X_hardwareId>VEN_0115&amp;DEV_1040&amp;SUBSYS_0001&amp;REV_0004 VEN_0115&amp;DEV_1040&amp;SUBSYS_0001 VEN_0115&amp;DEV_1040</pnpx:X_hardwareId>
Expand All @@ -66,15 +67,15 @@ module.exports = function() {
<serviceType>urn:schemas-upnp-org:service:ConnectionManager:1</serviceType>
<serviceId>urn:upnp-org:serviceId:ConnectionManager</serviceId>
<SCPDURL>/ConnectionManager.xml</SCPDURL>
<controlURL>${device().BaseURL}/ConnectionManager</controlURL>
<eventSubURL>${device().BaseURL}/ConnectionManager</eventSubURL>
<controlURL>${device().BaseURL}/ConnectionManager.xml</controlURL>
<eventSubURL>${device().BaseURL}/ConnectionManager.xml</eventSubURL>
</service>
<service>
<serviceType>urn:schemas-upnp-org:service:ContentDirectory:1</serviceType>
<serviceId>urn:upnp-org:serviceId:ContentDirectory</serviceId>
<SCPDURL>/ContentDirectory.xml</SCPDURL>
<controlURL>${device().BaseURL}/ContentDirectory</controlURL>
<eventSubURL>${device().BaseURL}/ContentDirectory</eventSubURL>
<controlURL>${device().BaseURL}/ContentDirectory.xml</controlURL>
<eventSubURL>${device().BaseURL}/ContentDirectory.xml</eventSubURL>
</service>
</serviceList>
<iconList>
Expand Down
3 changes: 3 additions & 0 deletions src/ssdp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
const device = require('./device');

const SSDP = require('node-ssdp').Server
, server = new SSDP({
location: {
port: 5004,
path: '/device.xml'
},
udn: `uuid:${device().DeviceID}`,
allowWildcards: true,
ssdpSig: 'Antennas/3.0 UPnP/1.0'
})
Expand Down