homebridge-stream-triggers 1.0.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +31 -9
- package/config.schema.json +20 -4
- package/lib/channels.d.ts +9 -0
- package/lib/channels.d.ts.map +1 -0
- package/lib/channels.js +26 -0
- package/lib/channels.js.map +1 -0
- package/lib/config.d.ts +5 -0
- package/lib/config.d.ts.map +1 -1
- package/lib/config.js +16 -2
- package/lib/config.js.map +1 -1
- package/lib/exec.d.ts.map +1 -1
- package/lib/exec.js +8 -3
- package/lib/exec.js.map +1 -1
- package/lib/launcher.d.ts +0 -8
- package/lib/launcher.d.ts.map +1 -1
- package/lib/launcher.js +17 -1
- package/lib/launcher.js.map +1 -1
- package/lib/platform.d.ts +16 -1
- package/lib/platform.d.ts.map +1 -1
- package/lib/platform.js +96 -14
- package/lib/platform.js.map +1 -1
- package/lib/ytdlp.d.ts.map +1 -1
- package/lib/ytdlp.js +7 -3
- package/lib/ytdlp.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -23,22 +23,42 @@ When a switch flips on (e.g. via a "Stream Destiny" HomeKit scene):
|
|
|
23
23
|
video id. If the channel isn't live, the launch stops there (TV awake, nothing playing).
|
|
24
24
|
4. **Launch** — `atvremote launch_app=youtube://www.youtube.com/watch?v=<id>` for YouTube,
|
|
25
25
|
or `launch_app=tv.twitch` for Twitch (the tvOS Twitch app has no deep links; opening
|
|
26
|
-
the app is the intended behavior).
|
|
26
|
+
the app is the intended behavior). For Kick, the channel's universal link
|
|
27
|
+
(`https://kick.com/<user>`) is tried as a deep link — kick.com's app-site-association
|
|
28
|
+
claims all its URLs for the app, but tvOS handling is unverified — and if the command
|
|
29
|
+
is rejected the plugin falls back to just opening the Kick app (`com.kick.mobile`,
|
|
30
|
+
requires tvOS 18+).
|
|
27
31
|
|
|
28
32
|
The switch is momentary: it auto-resets to off after `resetDelay` ms, and the launch runs
|
|
29
33
|
fire-and-forget in the background. Repeat flips while a launch is in flight are ignored.
|
|
30
34
|
|
|
31
35
|
## Configuration
|
|
32
36
|
|
|
37
|
+
Zero-config by default: the channel list is fetched from
|
|
38
|
+
[omni-notify](https://github.com/micthiesen/omni-notify)'s `/api/trigger-channels`
|
|
39
|
+
endpoint (one channel per monitored streamer, YouTube preferred over Twitch, Kick-only
|
|
40
|
+
streamers skipped), so adding a streamer there is all it takes.
|
|
41
|
+
|
|
42
|
+
```json
|
|
43
|
+
{
|
|
44
|
+
"platform": "StreamTriggers"
|
|
45
|
+
}
|
|
46
|
+
```
|
|
47
|
+
|
|
48
|
+
The list re-syncs hourly (`channelsRefreshInterval`), so new streamers appear without a
|
|
49
|
+
restart. If omni-notify is unreachable at startup, previously-known switches keep working
|
|
50
|
+
from the accessory cache (the channel is stored in each accessory's context) and fetching
|
|
51
|
+
retries every minute until it succeeds. Setting `channelsRefreshInterval` to `0` disables
|
|
52
|
+
all background fetching, including that startup retry.
|
|
53
|
+
|
|
54
|
+
A static list can be set instead (mainly for testing; it disables fetching entirely):
|
|
55
|
+
|
|
33
56
|
```json
|
|
34
57
|
{
|
|
35
58
|
"platform": "StreamTriggers",
|
|
36
59
|
"channels": [
|
|
37
|
-
{ "key": "destiny",
|
|
38
|
-
{ "key": "
|
|
39
|
-
{ "key": "wilburgur", "type": "youtube", "url": "https://www.youtube.com/@Wilburgur/live" },
|
|
40
|
-
{ "key": "vinesauce", "type": "twitch" },
|
|
41
|
-
{ "key": "jerma", "type": "twitch" }
|
|
60
|
+
{ "key": "destiny", "type": "youtube", "url": "https://www.youtube.com/@destiny/live" },
|
|
61
|
+
{ "key": "jerma", "type": "twitch" }
|
|
42
62
|
]
|
|
43
63
|
}
|
|
44
64
|
```
|
|
@@ -48,17 +68,19 @@ fire-and-forget in the background. Repeat flips while a launch is in flight are
|
|
|
48
68
|
| Field | Required | Description |
|
|
49
69
|
| --- | --- | --- |
|
|
50
70
|
| `key` | yes | Short unique id (e.g. `destiny`). Seeds the accessory UUID, so it's stable across restarts. |
|
|
51
|
-
| `type` | yes | `youtube` or `
|
|
52
|
-
| `url` | youtube
|
|
71
|
+
| `type` | yes | `youtube`, `twitch`, or `kick`. |
|
|
72
|
+
| `url` | youtube | YouTube: the channel's live page, e.g. `https://www.youtube.com/@destiny/live` (required). Kick: the channel link, e.g. `https://kick.com/vinesauce` (optional; tried as a deep link, falls back to opening the app). |
|
|
53
73
|
| `displayName` | no | Defaults to the capitalized key. The switch is named `<displayName><suffix>` (e.g. `Destiny Trigger`). |
|
|
54
74
|
|
|
55
75
|
### Platform options
|
|
56
76
|
|
|
57
77
|
| Field | Default | Description |
|
|
58
78
|
| --- | --- | --- |
|
|
79
|
+
| `channelsUrl` | `http://omni.boris/api/trigger-channels` | Endpoint serving the channel list; used when `channels` is empty. |
|
|
80
|
+
| `channelsRefreshInterval` | `3600000` (1h) | How often (ms) to re-fetch the list and re-sync switches. `0` disables background refresh. |
|
|
59
81
|
| `credentialsDir` | `/var/lib/homebridge/appletv-enhanced` | Where homebridge-appletv-enhanced stores Apple TV pairings. |
|
|
60
82
|
| `appleTvId` | auto | Apple TV identifier. Auto-discovered as the single subdirectory of `credentialsDir` containing a `credentials.txt`; set explicitly if there are multiple. |
|
|
61
|
-
| `atvremotePath` |
|
|
83
|
+
| `atvremotePath` | `/var/lib/homebridge/appletv-enhanced/.venv/bin/atvremote` | `atvremote` binary from appletv-enhanced's venv (that plugin keeps pyatv updated). |
|
|
62
84
|
| `ytDlpPath` | self-managed | Override for testing. By default the plugin downloads the latest standalone `yt-dlp` into Homebridge's storage dir and refreshes it when older than 30 days (stale copies break against YouTube within months). |
|
|
63
85
|
| `suffix` | `" Trigger"` | Appended to switch names, avoiding collisions with the "Stream X" scene names. |
|
|
64
86
|
| `resetDelay` | `2000` | How long (ms) a switch reads "on" before auto-resetting. |
|
package/config.schema.json
CHANGED
|
@@ -10,8 +10,22 @@
|
|
|
10
10
|
"type": "string",
|
|
11
11
|
"default": "Stream Triggers"
|
|
12
12
|
},
|
|
13
|
+
"channelsUrl": {
|
|
14
|
+
"title": "Channels URL",
|
|
15
|
+
"description": "Endpoint serving the channel list (omni-notify's /api/trigger-channels). Used when the static channel list below is empty.",
|
|
16
|
+
"type": "string",
|
|
17
|
+
"default": "http://omni.boris/api/trigger-channels"
|
|
18
|
+
},
|
|
19
|
+
"channelsRefreshInterval": {
|
|
20
|
+
"title": "Channel Refresh Interval (ms)",
|
|
21
|
+
"description": "How often to re-fetch the channel list and re-sync switches. 0 disables all background fetching, including the retry after a failed startup fetch.",
|
|
22
|
+
"type": "integer",
|
|
23
|
+
"minimum": 0,
|
|
24
|
+
"default": 3600000
|
|
25
|
+
},
|
|
13
26
|
"channels": {
|
|
14
|
-
"title": "Channels",
|
|
27
|
+
"title": "Channels (static override)",
|
|
28
|
+
"description": "Optional static channel list. When non-empty, the Channels URL is never fetched.",
|
|
15
29
|
"type": "array",
|
|
16
30
|
"items": {
|
|
17
31
|
"type": "object",
|
|
@@ -32,13 +46,14 @@
|
|
|
32
46
|
"type": "string",
|
|
33
47
|
"oneOf": [
|
|
34
48
|
{ "title": "YouTube", "enum": ["youtube"] },
|
|
35
|
-
{ "title": "Twitch", "enum": ["twitch"] }
|
|
49
|
+
{ "title": "Twitch", "enum": ["twitch"] },
|
|
50
|
+
{ "title": "Kick", "enum": ["kick"] }
|
|
36
51
|
],
|
|
37
52
|
"required": true
|
|
38
53
|
},
|
|
39
54
|
"url": {
|
|
40
55
|
"title": "URL",
|
|
41
|
-
"description": "
|
|
56
|
+
"description": "YouTube: channel live page (required), e.g. https://www.youtube.com/@destiny/live. Kick: channel link (optional), e.g. https://kick.com/vinesauce, tried as a deep link.",
|
|
42
57
|
"type": "string"
|
|
43
58
|
}
|
|
44
59
|
}
|
|
@@ -75,7 +90,8 @@
|
|
|
75
90
|
"resetDelay": {
|
|
76
91
|
"title": "Reset Delay (ms)",
|
|
77
92
|
"description": "How long a switch reads \"on\" before auto-resetting to off.",
|
|
78
|
-
"type": "
|
|
93
|
+
"type": "integer",
|
|
94
|
+
"minimum": 1,
|
|
79
95
|
"default": 2000
|
|
80
96
|
}
|
|
81
97
|
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Logging } from "homebridge";
|
|
2
|
+
import { type ChannelConfig } from "./config.js";
|
|
3
|
+
/**
|
|
4
|
+
* Fetch the channel list from omni-notify's /api/trigger-channels endpoint.
|
|
5
|
+
* Returns undefined on any failure (logged); callers fall back to the
|
|
6
|
+
* accessory cache so previously-known switches keep working.
|
|
7
|
+
*/
|
|
8
|
+
export declare function fetchChannels(url: string, log: Logging): Promise<ChannelConfig[] | undefined>;
|
|
9
|
+
//# sourceMappingURL=channels.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../src/channels.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,KAAK,aAAa,EAAiB,MAAM,aAAa,CAAC;AAKhE;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC,CAatC"}
|
package/lib/channels.js
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { tryCatch } from "@micthiesen/mitools/async";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import { channelSchema } from "./config.js";
|
|
4
|
+
const responseSchema = z.object({ channels: z.array(channelSchema) });
|
|
5
|
+
const FETCH_TIMEOUT_MS = 10_000;
|
|
6
|
+
/**
|
|
7
|
+
* Fetch the channel list from omni-notify's /api/trigger-channels endpoint.
|
|
8
|
+
* Returns undefined on any failure (logged); callers fall back to the
|
|
9
|
+
* accessory cache so previously-known switches keep working.
|
|
10
|
+
*/
|
|
11
|
+
export async function fetchChannels(url, log) {
|
|
12
|
+
const result = await tryCatch(async () => {
|
|
13
|
+
const response = await fetch(url, {
|
|
14
|
+
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
|
|
15
|
+
});
|
|
16
|
+
if (!response.ok)
|
|
17
|
+
throw new Error(`HTTP ${response.status}`);
|
|
18
|
+
return responseSchema.parse(await response.json());
|
|
19
|
+
});
|
|
20
|
+
if (!result.ok) {
|
|
21
|
+
log.error(`Failed to fetch channels from ${url}: ${result.error.message}`);
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
return result.value.channels;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=channels.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channels.js","sourceRoot":"","sources":["../src/channels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAsB,aAAa,EAAE,MAAM,aAAa,CAAC;AAEhE,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;AACtE,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEhC;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,GAAW,EACX,GAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,IAAI,EAAE;QACvC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC;SAC9C,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7D,OAAO,cAAc,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,KAAK,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3E,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;AAC/B,CAAC"}
|
package/lib/config.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export declare const channelSchema: z.ZodObject<{
|
|
|
5
5
|
type: z.ZodEnum<{
|
|
6
6
|
youtube: "youtube";
|
|
7
7
|
twitch: "twitch";
|
|
8
|
+
kick: "kick";
|
|
8
9
|
}>;
|
|
9
10
|
url: z.ZodOptional<z.ZodString>;
|
|
10
11
|
}, z.core.$strip>;
|
|
@@ -16,9 +17,13 @@ export declare const configSchema: z.ZodObject<{
|
|
|
16
17
|
type: z.ZodEnum<{
|
|
17
18
|
youtube: "youtube";
|
|
18
19
|
twitch: "twitch";
|
|
20
|
+
kick: "kick";
|
|
19
21
|
}>;
|
|
20
22
|
url: z.ZodOptional<z.ZodString>;
|
|
21
23
|
}, z.core.$strip>>>;
|
|
24
|
+
channelsUrl: z.ZodDefault<z.ZodString>;
|
|
25
|
+
channelsRefreshInterval: z.ZodDefault<z.ZodNumber>;
|
|
26
|
+
channelsRetryDelay: z.ZodDefault<z.ZodNumber>;
|
|
22
27
|
credentialsDir: z.ZodDefault<z.ZodString>;
|
|
23
28
|
appleTvId: z.ZodOptional<z.ZodString>;
|
|
24
29
|
atvremotePath: z.ZodDefault<z.ZodString>;
|
package/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,aAAa
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,aAAa;;;;;;;;;iBAMxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAK1D,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;iBAqBvB,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAEhE,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,oBAAoB,CAE9D;AAED,oDAAoD;AACpD,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CAG7D"}
|
package/lib/config.js
CHANGED
|
@@ -2,11 +2,25 @@ import { z } from "zod";
|
|
|
2
2
|
export const channelSchema = z.object({
|
|
3
3
|
key: z.string().min(1),
|
|
4
4
|
displayName: z.string().min(1).optional(),
|
|
5
|
-
type: z.enum(["youtube", "twitch"]),
|
|
5
|
+
type: z.enum(["youtube", "twitch", "kick"]),
|
|
6
|
+
/** youtube: live page for yt-dlp. kick: universal link tried as a deep link. */
|
|
6
7
|
url: z.string().min(1).optional(),
|
|
7
8
|
});
|
|
9
|
+
/** Node clamps larger setTimeout delays to 1ms, which would turn timers into hot loops. */
|
|
10
|
+
const MAX_TIMER_MS = 2_147_483_647;
|
|
8
11
|
export const configSchema = z.object({
|
|
12
|
+
/** Static override; when empty the list is fetched from channelsUrl. */
|
|
9
13
|
channels: z.array(channelSchema).default([]),
|
|
14
|
+
channelsUrl: z.string().default("http://omni.boris/api/trigger-channels"),
|
|
15
|
+
/** How often to re-fetch the channel list and re-sync switches. 0 disables. */
|
|
16
|
+
channelsRefreshInterval: z
|
|
17
|
+
.number()
|
|
18
|
+
.int()
|
|
19
|
+
.nonnegative()
|
|
20
|
+
.max(MAX_TIMER_MS)
|
|
21
|
+
.default(3_600_000),
|
|
22
|
+
/** Delay before retrying after a failed fetch. Not in the UI schema; mainly for tests. */
|
|
23
|
+
channelsRetryDelay: z.number().int().positive().max(MAX_TIMER_MS).default(60_000),
|
|
10
24
|
credentialsDir: z.string().default("/var/lib/homebridge/appletv-enhanced"),
|
|
11
25
|
appleTvId: z.string().optional(),
|
|
12
26
|
atvremotePath: z
|
|
@@ -14,7 +28,7 @@ export const configSchema = z.object({
|
|
|
14
28
|
.default("/var/lib/homebridge/appletv-enhanced/.venv/bin/atvremote"),
|
|
15
29
|
ytDlpPath: z.string().optional(),
|
|
16
30
|
suffix: z.string().default(" Trigger"),
|
|
17
|
-
resetDelay: z.number().int().positive().default(2000),
|
|
31
|
+
resetDelay: z.number().int().positive().max(MAX_TIMER_MS).default(2000),
|
|
18
32
|
});
|
|
19
33
|
/** Pure parse of the raw platform config; throws ZodError on invalid input. */
|
|
20
34
|
export function parseConfig(raw) {
|
package/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACtB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACzC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACtB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACzC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC3C,gFAAgF;IAChF,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC;AAIH,2FAA2F;AAC3F,MAAM,YAAY,GAAG,aAAa,CAAC;AAEnC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,wEAAwE;IACxE,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC5C,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,wCAAwC,CAAC;IACzE,+EAA+E;IAC/E,uBAAuB,EAAE,CAAC;SACvB,MAAM,EAAE;SACR,GAAG,EAAE;SACL,WAAW,EAAE;SACb,GAAG,CAAC,YAAY,CAAC;SACjB,OAAO,CAAC,SAAS,CAAC;IACrB,0FAA0F;IAC1F,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACjF,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,sCAAsC,CAAC;IAC1E,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,OAAO,CAAC,0DAA0D,CAAC;IACtE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;IACtC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;CACxE,CAAC,CAAC;AAIH,+EAA+E;AAC/E,MAAM,UAAU,WAAW,CAAC,GAAY;IACtC,OAAO,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,cAAc,CAAC,OAAsB;IACnD,IAAI,OAAO,CAAC,WAAW;QAAE,OAAO,OAAO,CAAC,WAAW,CAAC;IACpD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC"}
|
package/lib/exec.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../src/exec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../src/exec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAyB,MAAM,2BAA2B,CAAC;AAS/E,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,gFAAgF;AAChF,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAY7B;AAED,wDAAwD;AACxD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAStD;AAED,4EAA4E;AAC5E,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAE1D;AAED,uEAAuE;AACvE,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAG3D"}
|
package/lib/exec.js
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { execFile } from "node:child_process";
|
|
2
2
|
import { promisify } from "node:util";
|
|
3
|
-
import { tryCatch } from "@micthiesen/mitools/async";
|
|
3
|
+
import { tryCatch, withTimeout } from "@micthiesen/mitools/async";
|
|
4
4
|
const execFileAsync = promisify(execFile);
|
|
5
|
+
// execFile's own timeout only kills the child; if the child ignores the signal or a
|
|
6
|
+
// grandchild holds the stdio pipes open, the promise never settles. The outer
|
|
7
|
+
// withTimeout guarantees the caller always gets an answer (and SIGKILL can't be ignored).
|
|
8
|
+
const KILL_GRACE_MS = 5_000;
|
|
5
9
|
/** Run a binary with a hard timeout, returning a Result instead of throwing. */
|
|
6
10
|
export async function runCommand(file, args, timeoutMs) {
|
|
7
11
|
return tryCatch(async () => {
|
|
8
|
-
const { stdout, stderr } = await execFileAsync(file, args, {
|
|
12
|
+
const { stdout, stderr } = await withTimeout(execFileAsync(file, args, {
|
|
9
13
|
timeout: timeoutMs,
|
|
14
|
+
killSignal: "SIGKILL",
|
|
10
15
|
maxBuffer: 16 * 1024 * 1024,
|
|
11
|
-
});
|
|
16
|
+
}), timeoutMs + KILL_GRACE_MS);
|
|
12
17
|
return { stdout, stderr };
|
|
13
18
|
});
|
|
14
19
|
}
|
package/lib/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../src/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAe,QAAQ,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../src/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAe,QAAQ,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE/E,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,oFAAoF;AACpF,8EAA8E;AAC9E,0FAA0F;AAC1F,MAAM,aAAa,GAAG,KAAK,CAAC;AAO5B,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAY,EACZ,IAAc,EACd,SAAiB;IAEjB,OAAO,QAAQ,CAAC,KAAK,IAAI,EAAE;QACzB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAC1C,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE;YACxB,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;SAC5B,CAAC,EACF,SAAS,GAAG,aAAa,CAC1B,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,iBAAiB,CAAC,KAAY;IAC5C,MAAM,SAAS,GAAG,KAAgD,CAAC;IACnE,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,2BAA2B,CAAC;IACpE,IAAI,SAAS,CAAC,MAAM;QAClB,OAAO,6BAA6B,SAAS,CAAC,MAAM,IAAI,QAAQ,GAAG,CAAC;IACtE,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,MAAM,IAAI,GACR,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;IAChF,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9C,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,oBAAoB,CAAC,KAAY;IAC/C,OAAQ,KAA2B,CAAC,IAAI,KAAK,QAAQ,CAAC;AACxD,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,UAAU,CAAC,KAAY;IACrC,MAAM,IAAI,GAAI,KAA2B,CAAC,IAAI,CAAC;IAC/C,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACrD,CAAC"}
|
package/lib/launcher.d.ts
CHANGED
|
@@ -2,14 +2,6 @@ import type { Logging } from "homebridge";
|
|
|
2
2
|
import type { AppleTv } from "./atv.js";
|
|
3
3
|
import type { ChannelConfig } from "./config.js";
|
|
4
4
|
import type { YtDlp } from "./ytdlp.js";
|
|
5
|
-
/**
|
|
6
|
-
* The launch flow: wake -> app_list prime -> resolve -> launch_app.
|
|
7
|
-
*
|
|
8
|
-
* The app_list prime is REQUIRED: after an Apple TV reboot (e.g. a tvOS auto-update),
|
|
9
|
-
* tvOS silently drops app-launch requests with a Companion protocol timeout until some
|
|
10
|
-
* client has requested the app list once (documented pyatv FAQ behavior). Priming on
|
|
11
|
-
* every launch keeps the system self-healing across tvOS updates.
|
|
12
|
-
*/
|
|
13
5
|
export declare class StreamLauncher {
|
|
14
6
|
private readonly log;
|
|
15
7
|
private readonly atv;
|
package/lib/launcher.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAYxC,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAFL,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,KAAK;IAG/B,6EAA6E;IACvE,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;YA+BrC,UAAU;CAsBzB"}
|
package/lib/launcher.js
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* client has requested the app list once (documented pyatv FAQ behavior). Priming on
|
|
7
7
|
* every launch keeps the system self-healing across tvOS updates.
|
|
8
8
|
*/
|
|
9
|
+
const KICK_APP_ID = "com.kick.mobile";
|
|
9
10
|
export class StreamLauncher {
|
|
10
11
|
log;
|
|
11
12
|
atv;
|
|
@@ -29,8 +30,18 @@ export class StreamLauncher {
|
|
|
29
30
|
const uri = await this.resolveUri(channel, prefix);
|
|
30
31
|
if (!uri)
|
|
31
32
|
return;
|
|
32
|
-
if (!(await this.atv.run(`launch_app=${uri}`, prefix)))
|
|
33
|
+
if (!(await this.atv.run(`launch_app=${uri}`, prefix))) {
|
|
34
|
+
// The Kick deep link (https://kick.com/<user> universal link) is
|
|
35
|
+
// unverified on tvOS; if it's rejected, opening the app still beats
|
|
36
|
+
// doing nothing.
|
|
37
|
+
if (channel.type === "kick" && uri !== KICK_APP_ID) {
|
|
38
|
+
this.log.warn(`${prefix} Kick deep link rejected; opening the Kick app`);
|
|
39
|
+
if (!(await this.atv.run(`launch_app=${KICK_APP_ID}`, prefix)))
|
|
40
|
+
return;
|
|
41
|
+
this.log.info(`${prefix} Launched ${KICK_APP_ID}`);
|
|
42
|
+
}
|
|
33
43
|
return;
|
|
44
|
+
}
|
|
34
45
|
this.log.info(`${prefix} Launched ${uri}`);
|
|
35
46
|
}
|
|
36
47
|
catch (error) {
|
|
@@ -42,6 +53,11 @@ export class StreamLauncher {
|
|
|
42
53
|
// The tvOS Twitch app has no deep links; opening the app is the intended behavior.
|
|
43
54
|
return "tv.twitch";
|
|
44
55
|
}
|
|
56
|
+
if (channel.type === "kick") {
|
|
57
|
+
// Try the universal link (kick.com's AASA claims https://kick.com/*);
|
|
58
|
+
// without a url, just open the app.
|
|
59
|
+
return channel.url ?? KICK_APP_ID;
|
|
60
|
+
}
|
|
45
61
|
if (!channel.url) {
|
|
46
62
|
this.log.error(`${prefix} YouTube channel is missing "url"`);
|
|
47
63
|
return undefined;
|
package/lib/launcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,MAAM,OAAO,cAAc;IAEN;IACA;IACA;IAHnB,YACmB,GAAY,EACZ,GAAY,EACZ,KAAY;QAFZ,QAAG,GAAH,GAAG,CAAS;QACZ,QAAG,GAAH,GAAG,CAAS;QACZ,UAAK,GAAL,KAAK,CAAO;IAC5B,CAAC;IAEJ,6EAA6E;IAC7E,KAAK,CAAC,MAAM,CAAC,OAAsB;QACjC,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,GAAG,GAAG,CAAC;QAClC,IAAI,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,sBAAsB,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;YAE9D,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAAE,OAAO;YACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,iBAAiB,CAAC,CAAC;YAE1C,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBAAE,OAAO;YACtD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,kBAAkB,CAAC,CAAC;YAE3C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACnD,IAAI,CAAC,GAAG;gBAAE,OAAO;YAEjB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"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"}
|
package/lib/platform.d.ts
CHANGED
|
@@ -5,15 +5,30 @@ export declare class StreamTriggersPlatform implements DynamicPlatformPlugin {
|
|
|
5
5
|
readonly Service: typeof Service;
|
|
6
6
|
readonly Characteristic: typeof Characteristic;
|
|
7
7
|
private readonly config;
|
|
8
|
+
private readonly configValid;
|
|
8
9
|
private readonly accessories;
|
|
9
10
|
private readonly launchesInFlight;
|
|
10
11
|
private readonly ytDlp;
|
|
11
12
|
private readonly launcher;
|
|
12
13
|
constructor(log: Logging, rawConfig: PlatformConfig, api: API);
|
|
14
|
+
private startup;
|
|
15
|
+
private trySync;
|
|
16
|
+
/**
|
|
17
|
+
* Background re-sync so channel changes in omni-notify appear without a
|
|
18
|
+
* Homebridge restart. Failures retry sooner (covers omni-notify still
|
|
19
|
+
* booting after a host reboot) but never touch the current accessories.
|
|
20
|
+
*/
|
|
21
|
+
private scheduleRefresh;
|
|
13
22
|
/** Called by Homebridge for each accessory restored from cache at startup. */
|
|
14
23
|
configureAccessory(accessory: PlatformAccessory): void;
|
|
15
|
-
/** Register switches for
|
|
24
|
+
/** Register switches for the given channels; unregister ones no longer present. */
|
|
16
25
|
private syncAccessories;
|
|
26
|
+
/**
|
|
27
|
+
* Fallback when the channel list is unreachable at startup: wire switches
|
|
28
|
+
* from the channel stored in each cached accessory's context, so everything
|
|
29
|
+
* previously known keeps working. Nothing is registered or unregistered.
|
|
30
|
+
*/
|
|
31
|
+
private wireCachedAccessories;
|
|
17
32
|
private setUpSwitch;
|
|
18
33
|
/** Fire-and-forget launch; never throws, never awaited by the set handler. */
|
|
19
34
|
private handleTrigger;
|
package/lib/platform.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,cAAc,EACd,qBAAqB,EACrB,OAAO,EACP,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,cAAc,EACd,qBAAqB,EACrB,OAAO,EACP,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,YAAY,CAAC;AAcpB,qBAAa,sBAAuB,YAAW,qBAAqB;aAYhD,GAAG,EAAE,OAAO;aAEZ,GAAG,EAAE,GAAG;IAb1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAC;IAEtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwC;IACpE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiB;gBAGxB,GAAG,EAAE,OAAO,EAC5B,SAAS,EAAE,cAAc,EACT,GAAG,EAAE,GAAG;YA2BZ,OAAO;IAqBrB,OAAO,CAAC,OAAO;IAQf;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAkBvB,8EAA8E;IAC9E,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAKtD,mFAAmF;IACnF,OAAO,CAAC,eAAe;IA4CvB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,WAAW;IAkCnB,8EAA8E;IAC9E,OAAO,CAAC,aAAa;CAiBtB"}
|
package/lib/platform.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AppleTv } from "./atv.js";
|
|
2
|
-
import {
|
|
2
|
+
import { fetchChannels } from "./channels.js";
|
|
3
|
+
import { channelSchema, configSchema, displayNameFor, } from "./config.js";
|
|
3
4
|
import { StreamLauncher } from "./launcher.js";
|
|
4
5
|
import { PLATFORM_NAME, PLUGIN_NAME } from "./settings.js";
|
|
5
6
|
import { YtDlp } from "./ytdlp.js";
|
|
@@ -9,6 +10,7 @@ export class StreamTriggersPlatform {
|
|
|
9
10
|
Service;
|
|
10
11
|
Characteristic;
|
|
11
12
|
config;
|
|
13
|
+
configValid;
|
|
12
14
|
accessories = new Map();
|
|
13
15
|
launchesInFlight = new Set();
|
|
14
16
|
ytDlp;
|
|
@@ -19,51 +21,106 @@ export class StreamTriggersPlatform {
|
|
|
19
21
|
this.Service = api.hap.Service;
|
|
20
22
|
this.Characteristic = api.hap.Characteristic;
|
|
21
23
|
const parsed = configSchema.safeParse(rawConfig);
|
|
24
|
+
this.configValid = parsed.success;
|
|
22
25
|
if (parsed.success) {
|
|
23
26
|
this.config = parsed.data;
|
|
24
27
|
}
|
|
25
28
|
else {
|
|
26
|
-
|
|
29
|
+
// Going inert (not falling back to defaults) is deliberate: default paths
|
|
30
|
+
// could hit the wrong binaries/endpoints, and syncing with a guessed config
|
|
31
|
+
// could unregister working accessories. Cached accessories stay registered.
|
|
32
|
+
this.log.error(`Invalid config; plugin is inactive until it is fixed: ${parsed.error.message}`);
|
|
27
33
|
this.config = configSchema.parse({});
|
|
28
34
|
}
|
|
29
35
|
this.ytDlp = new YtDlp(log, api.user.storagePath(), this.config.ytDlpPath);
|
|
30
36
|
this.launcher = new StreamLauncher(log, new AppleTv(log, this.config), this.ytDlp);
|
|
31
37
|
api.on("didFinishLaunching", () => {
|
|
38
|
+
void this.startup();
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
async startup() {
|
|
42
|
+
if (!this.configValid)
|
|
43
|
+
return;
|
|
44
|
+
if (this.config.channels.length > 0) {
|
|
45
|
+
// Static config override (mainly for testing); no fetching involved.
|
|
46
|
+
this.trySync(this.config.channels);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
const channels = await fetchChannels(this.config.channelsUrl, this.log);
|
|
50
|
+
if (channels) {
|
|
51
|
+
this.trySync(channels);
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
this.wireCachedAccessories();
|
|
55
|
+
}
|
|
56
|
+
// Outside any fallible region: a sync failure must not kill the refresh chain.
|
|
57
|
+
this.scheduleRefresh(channels ? this.config.channelsRefreshInterval : this.config.channelsRetryDelay);
|
|
58
|
+
}
|
|
59
|
+
// Non-blocking: download/refresh the managed yt-dlp binary in the background.
|
|
60
|
+
void this.ytDlp.ensureFresh();
|
|
61
|
+
}
|
|
62
|
+
trySync(channels) {
|
|
63
|
+
try {
|
|
64
|
+
this.syncAccessories(channels);
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
this.log.error(`Failed to sync accessories: ${String(error)}`);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Background re-sync so channel changes in omni-notify appear without a
|
|
72
|
+
* Homebridge restart. Failures retry sooner (covers omni-notify still
|
|
73
|
+
* booting after a host reboot) but never touch the current accessories.
|
|
74
|
+
*/
|
|
75
|
+
scheduleRefresh(delayMs) {
|
|
76
|
+
if (this.config.channelsRefreshInterval <= 0)
|
|
77
|
+
return;
|
|
78
|
+
const timer = setTimeout(async () => {
|
|
79
|
+
let nextDelayMs = this.config.channelsRetryDelay;
|
|
32
80
|
try {
|
|
33
|
-
this.
|
|
81
|
+
const channels = await fetchChannels(this.config.channelsUrl, this.log);
|
|
82
|
+
if (channels) {
|
|
83
|
+
this.syncAccessories(channels);
|
|
84
|
+
nextDelayMs = this.config.channelsRefreshInterval;
|
|
85
|
+
}
|
|
34
86
|
}
|
|
35
87
|
catch (error) {
|
|
36
|
-
this.log.error(`
|
|
88
|
+
this.log.error(`Channel refresh failed: ${String(error)}`);
|
|
37
89
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
90
|
+
this.scheduleRefresh(nextDelayMs);
|
|
91
|
+
}, delayMs);
|
|
92
|
+
timer.unref?.();
|
|
41
93
|
}
|
|
42
94
|
/** Called by Homebridge for each accessory restored from cache at startup. */
|
|
43
95
|
configureAccessory(accessory) {
|
|
44
96
|
this.log.info(`Restoring cached accessory: ${accessory.displayName}`);
|
|
45
97
|
this.accessories.set(accessory.UUID, accessory);
|
|
46
98
|
}
|
|
47
|
-
/** Register switches for
|
|
48
|
-
syncAccessories() {
|
|
99
|
+
/** Register switches for the given channels; unregister ones no longer present. */
|
|
100
|
+
syncAccessories(channels) {
|
|
49
101
|
const configuredUuids = new Set();
|
|
50
|
-
for (const channel of
|
|
102
|
+
for (const channel of channels) {
|
|
103
|
+
const uuid = this.api.hap.uuid.generate(`${PLUGIN_NAME}.${channel.key}`);
|
|
104
|
+
// Marked as configured even when skipped below, so a transiently broken
|
|
105
|
+
// channel entry never unregisters a working accessory (which would strip
|
|
106
|
+
// its HomeKit room/scene/automation assignments).
|
|
107
|
+
configuredUuids.add(uuid);
|
|
51
108
|
if (channel.type === "youtube" && !channel.url) {
|
|
52
|
-
this.log.error(`[${channel.key}] YouTube channel is missing "url"; skipping`);
|
|
109
|
+
this.log.error(`[${channel.key}] YouTube channel is missing "url"; skipping (existing switch retained)`);
|
|
53
110
|
continue;
|
|
54
111
|
}
|
|
55
|
-
const uuid = this.api.hap.uuid.generate(`${PLUGIN_NAME}.${channel.key}`);
|
|
56
|
-
configuredUuids.add(uuid);
|
|
57
112
|
const name = `${displayNameFor(channel)}${this.config.suffix}`;
|
|
58
113
|
const existing = this.accessories.get(uuid);
|
|
59
114
|
if (existing) {
|
|
60
115
|
existing.displayName = name;
|
|
116
|
+
existing.context.channel = channel;
|
|
61
117
|
this.setUpSwitch(existing, channel, name);
|
|
62
118
|
this.api.updatePlatformAccessories([existing]);
|
|
63
|
-
this.log.
|
|
119
|
+
this.log.debug(`[${channel.key}] Updated switch "${name}"`);
|
|
64
120
|
}
|
|
65
121
|
else {
|
|
66
122
|
const accessory = new this.api.platformAccessory(name, uuid);
|
|
123
|
+
accessory.context.channel = channel;
|
|
67
124
|
this.setUpSwitch(accessory, channel, name);
|
|
68
125
|
this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
|
|
69
126
|
this.accessories.set(uuid, accessory);
|
|
@@ -78,7 +135,32 @@ export class StreamTriggersPlatform {
|
|
|
78
135
|
this.log.info(`Unregistered switch "${accessory.displayName}" (channel removed)`);
|
|
79
136
|
}
|
|
80
137
|
}
|
|
138
|
+
/**
|
|
139
|
+
* Fallback when the channel list is unreachable at startup: wire switches
|
|
140
|
+
* from the channel stored in each cached accessory's context, so everything
|
|
141
|
+
* previously known keeps working. Nothing is registered or unregistered.
|
|
142
|
+
*/
|
|
143
|
+
wireCachedAccessories() {
|
|
144
|
+
let wired = 0;
|
|
145
|
+
for (const accessory of this.accessories.values()) {
|
|
146
|
+
const channel = channelSchema.safeParse(accessory.context.channel);
|
|
147
|
+
if (!channel.success) {
|
|
148
|
+
this.log.warn(`Cached accessory "${accessory.displayName}" has no stored channel; ` +
|
|
149
|
+
`it stays inert until the channel list is reachable`);
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
this.setUpSwitch(accessory, channel.data, accessory.displayName);
|
|
153
|
+
wired++;
|
|
154
|
+
}
|
|
155
|
+
this.log.warn(`Channel list unavailable; running with ${wired} cached switch(es)`);
|
|
156
|
+
}
|
|
81
157
|
setUpSwitch(accessory, channel, name) {
|
|
158
|
+
accessory
|
|
159
|
+
.getService(this.Service.AccessoryInformation)
|
|
160
|
+
?.setCharacteristic(this.Characteristic.Name, name)
|
|
161
|
+
.setCharacteristic(this.Characteristic.Manufacturer, "micthiesen")
|
|
162
|
+
.setCharacteristic(this.Characteristic.Model, "Stream Trigger")
|
|
163
|
+
.setCharacteristic(this.Characteristic.SerialNumber, channel.key);
|
|
82
164
|
const service = accessory.getService(this.Service.Switch) ??
|
|
83
165
|
accessory.addService(this.Service.Switch);
|
|
84
166
|
service.setCharacteristic(this.Characteristic.Name, name);
|
package/lib/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAEL,YAAY,EACZ,cAAc,GAEf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,OAAO,sBAAsB;
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
package/lib/ytdlp.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ytdlp.d.ts","sourceRoot":"","sources":["../src/ytdlp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"ytdlp.d.ts","sourceRoot":"","sources":["../src/ytdlp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAY1C,gFAAgF;AAChF,wBAAgB,cAAc,CAC5B,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,IAAI,GAAE,MAAM,CAAC,YAA2B,GACvC,MAAM,GAAG,SAAS,CAKpB;AAED,2EAA2E;AAC3E,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,MAAmB,GAAG,OAAO,CAE5E;AAED;;;;GAIG;AACH,qBAAa,KAAK;IAKd,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,SAAgB,WAAW,EAAE,MAAM,CAAC;IACpC,OAAO,CAAC,eAAe,CAA4B;gBAGhC,GAAG,EAAE,OAAO,EAC7B,WAAW,EAAE,MAAM,EACF,YAAY,EAAE,MAAM,GAAG,SAAS;IAKnD,8EAA8E;IAC9E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5B;;;;OAIG;IACG,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAkClF,yEAAyE;YAC3D,UAAU;YAWV,OAAO;YAaP,QAAQ;CAuBvB"}
|
package/lib/ytdlp.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { tryCatch } from "@micthiesen/mitools/async";
|
|
4
|
-
import { describeExecError, isMissingBinaryError, runCommand } from "./exec.js";
|
|
4
|
+
import { describeExecError, exitCodeOf, isMissingBinaryError, runCommand, } from "./exec.js";
|
|
5
5
|
const YTDLP_TIMEOUT_MS = 60_000;
|
|
6
6
|
const DOWNLOAD_TIMEOUT_MS = 180_000;
|
|
7
7
|
const MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000;
|
|
@@ -59,10 +59,14 @@ export class YtDlp {
|
|
|
59
59
|
this.log.error(`${prefix} yt-dlp binary missing at ${binary}`);
|
|
60
60
|
void this.ensureFresh();
|
|
61
61
|
}
|
|
62
|
-
else {
|
|
63
|
-
//
|
|
62
|
+
else if (exitCodeOf(result.error) !== undefined) {
|
|
63
|
+
// A clean non-zero exit = channel not live. Expected, not an error.
|
|
64
64
|
this.log.info(`${prefix} Not live (yt-dlp: ${describeExecError(result.error)})`);
|
|
65
65
|
}
|
|
66
|
+
else {
|
|
67
|
+
// Spawn failures (EACCES, ...) and timeouts are real errors.
|
|
68
|
+
this.log.error(`${prefix} yt-dlp failed: ${describeExecError(result.error)}`);
|
|
69
|
+
}
|
|
66
70
|
return undefined;
|
|
67
71
|
}
|
|
68
72
|
const id = result.value.stdout.trim().split("\n").at(-1)?.trim();
|
package/lib/ytdlp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ytdlp.js","sourceRoot":"","sources":["../src/ytdlp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,
|
|
1
|
+
{"version":3,"file":"ytdlp.js","sourceRoot":"","sources":["../src/ytdlp.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "homebridge-stream-triggers",
|
|
3
3
|
"displayName": "Homebridge Stream Triggers",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.2.0",
|
|
5
5
|
"description": "HomeKit switches that launch live streams (YouTube/Twitch) on an Apple TV via atvremote and yt-dlp.",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"homebridge-plugin",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
},
|
|
18
18
|
"repository": {
|
|
19
19
|
"type": "git",
|
|
20
|
-
"url": "git://github.com/micthiesen/homebridge-stream-triggers.git"
|
|
20
|
+
"url": "git+https://github.com/micthiesen/homebridge-stream-triggers.git"
|
|
21
21
|
},
|
|
22
22
|
"type": "module",
|
|
23
23
|
"license": "MIT",
|