@nubisco/openbridge-camera-platform 1.0.0 → 1.1.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/dist/CameraMonitor.d.ts +53 -0
- package/dist/CameraMonitor.d.ts.map +1 -0
- package/dist/CameraMonitor.js +132 -0
- package/dist/CameraMonitor.js.map +1 -0
- package/dist/StreamingDelegate.d.ts +2 -0
- package/dist/StreamingDelegate.d.ts.map +1 -1
- package/dist/StreamingDelegate.js +4 -0
- package/dist/StreamingDelegate.js.map +1 -1
- package/dist/config.d.ts +3 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +3 -0
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +21 -3
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
2
|
+
import type { CameraConfig } from './types.js';
|
|
3
|
+
export interface CameraTelemetry {
|
|
4
|
+
reachable: boolean;
|
|
5
|
+
unreachableReason?: string;
|
|
6
|
+
/** ISO timestamp of the last successful reach, absent until the first one. */
|
|
7
|
+
lastSeen?: string;
|
|
8
|
+
/** How many HomeKit viewers are streaming right now. */
|
|
9
|
+
streamsActive: number;
|
|
10
|
+
}
|
|
11
|
+
export type MonitorEvents = {
|
|
12
|
+
telemetry: [CameraTelemetry];
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* Watches whether a camera is actually there.
|
|
16
|
+
*
|
|
17
|
+
* Without this a camera registered as a device reports nothing at all, so
|
|
18
|
+
* OpenBridge draws it with the grey "never reported" dot and the inspector
|
|
19
|
+
* says "No telemetry yet" forever. That is worse than useless: a camera that
|
|
20
|
+
* has been unplugged for a week looks exactly like one that is fine.
|
|
21
|
+
*
|
|
22
|
+
* The probe is a bare TCP connect to the RTSP port rather than an ffmpeg run.
|
|
23
|
+
* Opening a real stream every minute for every camera would be an absurd cost
|
|
24
|
+
* for a liveness check, and a camera that accepts a connection on 554 is the
|
|
25
|
+
* thing a stream request needs anyway. ICMP is deliberately not used: plenty of
|
|
26
|
+
* cameras ignore ping while serving RTSP perfectly well.
|
|
27
|
+
*/
|
|
28
|
+
export declare class CameraMonitor extends EventEmitter<MonitorEvents> {
|
|
29
|
+
readonly camera: CameraConfig;
|
|
30
|
+
private readonly failuresBeforeOffline;
|
|
31
|
+
private readonly probeTimeoutMs;
|
|
32
|
+
private timer;
|
|
33
|
+
private consecutiveFailures;
|
|
34
|
+
private offline;
|
|
35
|
+
private lastSeen;
|
|
36
|
+
private lastReason;
|
|
37
|
+
private streams;
|
|
38
|
+
constructor(camera: CameraConfig, failuresBeforeOffline?: number, probeTimeoutMs?: number);
|
|
39
|
+
get telemetry(): CameraTelemetry;
|
|
40
|
+
/** Called by the streaming delegate so the device view shows live viewers. */
|
|
41
|
+
setActiveStreams(count: number): void;
|
|
42
|
+
probe(): Promise<boolean>;
|
|
43
|
+
private recordSuccess;
|
|
44
|
+
private recordFailure;
|
|
45
|
+
start(intervalSeconds: number): void;
|
|
46
|
+
stop(): void;
|
|
47
|
+
}
|
|
48
|
+
/** Host and port from an rtsp URL, defaulting to 554. */
|
|
49
|
+
export declare function parseTarget(url: string): {
|
|
50
|
+
host: string;
|
|
51
|
+
port: number;
|
|
52
|
+
} | null;
|
|
53
|
+
//# sourceMappingURL=CameraMonitor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CameraMonitor.d.ts","sourceRoot":"","sources":["../src/CameraMonitor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,wDAAwD;IACxD,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,CAAC,eAAe,CAAC,CAAA;CAC7B,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,aAAc,SAAQ,YAAY,CAAC,aAAa,CAAC;IAS1D,QAAQ,CAAC,MAAM,EAAE,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAVjC,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,mBAAmB,CAAI;IAC/B,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,OAAO,CAAI;gBAGR,MAAM,EAAE,YAAY,EACZ,qBAAqB,SAAI,EACzB,cAAc,SAAO;IAKxC,IAAI,SAAS,IAAI,eAAe,CAO/B;IAED,8EAA8E;IAC9E,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM/B,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAiB/B,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,aAAa;IASrB,KAAK,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI;IAOpC,IAAI,IAAI,IAAI;CAIb;AAED,yDAAyD;AACzD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQ9E"}
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CameraMonitor = void 0;
|
|
4
|
+
exports.parseTarget = parseTarget;
|
|
5
|
+
const node_net_1 = require("node:net");
|
|
6
|
+
const node_events_1 = require("node:events");
|
|
7
|
+
/**
|
|
8
|
+
* Watches whether a camera is actually there.
|
|
9
|
+
*
|
|
10
|
+
* Without this a camera registered as a device reports nothing at all, so
|
|
11
|
+
* OpenBridge draws it with the grey "never reported" dot and the inspector
|
|
12
|
+
* says "No telemetry yet" forever. That is worse than useless: a camera that
|
|
13
|
+
* has been unplugged for a week looks exactly like one that is fine.
|
|
14
|
+
*
|
|
15
|
+
* The probe is a bare TCP connect to the RTSP port rather than an ffmpeg run.
|
|
16
|
+
* Opening a real stream every minute for every camera would be an absurd cost
|
|
17
|
+
* for a liveness check, and a camera that accepts a connection on 554 is the
|
|
18
|
+
* thing a stream request needs anyway. ICMP is deliberately not used: plenty of
|
|
19
|
+
* cameras ignore ping while serving RTSP perfectly well.
|
|
20
|
+
*/
|
|
21
|
+
class CameraMonitor extends node_events_1.EventEmitter {
|
|
22
|
+
camera;
|
|
23
|
+
failuresBeforeOffline;
|
|
24
|
+
probeTimeoutMs;
|
|
25
|
+
timer = null;
|
|
26
|
+
consecutiveFailures = 0;
|
|
27
|
+
offline = false;
|
|
28
|
+
lastSeen;
|
|
29
|
+
lastReason;
|
|
30
|
+
streams = 0;
|
|
31
|
+
constructor(camera, failuresBeforeOffline = 2, probeTimeoutMs = 4000) {
|
|
32
|
+
super();
|
|
33
|
+
this.camera = camera;
|
|
34
|
+
this.failuresBeforeOffline = failuresBeforeOffline;
|
|
35
|
+
this.probeTimeoutMs = probeTimeoutMs;
|
|
36
|
+
}
|
|
37
|
+
get telemetry() {
|
|
38
|
+
return {
|
|
39
|
+
reachable: !this.offline,
|
|
40
|
+
...(this.offline && this.lastReason ? { unreachableReason: this.lastReason } : {}),
|
|
41
|
+
...(this.lastSeen ? { lastSeen: this.lastSeen } : {}),
|
|
42
|
+
streamsActive: this.streams,
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
/** Called by the streaming delegate so the device view shows live viewers. */
|
|
46
|
+
setActiveStreams(count) {
|
|
47
|
+
if (count === this.streams)
|
|
48
|
+
return;
|
|
49
|
+
this.streams = count;
|
|
50
|
+
this.emit('telemetry', this.telemetry);
|
|
51
|
+
}
|
|
52
|
+
async probe() {
|
|
53
|
+
const target = parseTarget(this.camera.url);
|
|
54
|
+
if (!target) {
|
|
55
|
+
this.recordFailure('camera url could not be parsed');
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
try {
|
|
59
|
+
await tcpProbe(target.host, target.port, this.probeTimeoutMs);
|
|
60
|
+
this.recordSuccess();
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
catch (err) {
|
|
64
|
+
this.recordFailure(err instanceof Error ? err.message : String(err));
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
recordSuccess() {
|
|
69
|
+
this.consecutiveFailures = 0;
|
|
70
|
+
this.lastSeen = new Date().toISOString();
|
|
71
|
+
const wasOffline = this.offline;
|
|
72
|
+
this.offline = false;
|
|
73
|
+
this.lastReason = undefined;
|
|
74
|
+
// Emitted on every success, not only on recovery: `lastSeen` moves each
|
|
75
|
+
// time, and a device whose telemetry never updates is treated as stale.
|
|
76
|
+
this.emit('telemetry', this.telemetry);
|
|
77
|
+
if (wasOffline)
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
recordFailure(reason) {
|
|
81
|
+
this.consecutiveFailures += 1;
|
|
82
|
+
this.lastReason = reason;
|
|
83
|
+
if (!this.offline && this.consecutiveFailures >= this.failuresBeforeOffline) {
|
|
84
|
+
this.offline = true;
|
|
85
|
+
this.emit('telemetry', this.telemetry);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
start(intervalSeconds) {
|
|
89
|
+
this.stop();
|
|
90
|
+
void this.probe();
|
|
91
|
+
this.timer = setInterval(() => void this.probe(), intervalSeconds * 1000);
|
|
92
|
+
this.timer.unref?.();
|
|
93
|
+
}
|
|
94
|
+
stop() {
|
|
95
|
+
if (this.timer)
|
|
96
|
+
clearInterval(this.timer);
|
|
97
|
+
this.timer = null;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
exports.CameraMonitor = CameraMonitor;
|
|
101
|
+
/** Host and port from an rtsp URL, defaulting to 554. */
|
|
102
|
+
function parseTarget(url) {
|
|
103
|
+
try {
|
|
104
|
+
const parsed = new URL(url);
|
|
105
|
+
if (!parsed.hostname)
|
|
106
|
+
return null;
|
|
107
|
+
return { host: parsed.hostname, port: parsed.port ? Number(parsed.port) : 554 };
|
|
108
|
+
}
|
|
109
|
+
catch {
|
|
110
|
+
return null;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
function tcpProbe(host, port, timeoutMs) {
|
|
114
|
+
return new Promise((resolve, reject) => {
|
|
115
|
+
const socket = (0, node_net_1.connect)({ host, port });
|
|
116
|
+
let settled = false;
|
|
117
|
+
const done = (err) => {
|
|
118
|
+
if (settled)
|
|
119
|
+
return;
|
|
120
|
+
settled = true;
|
|
121
|
+
socket.destroy();
|
|
122
|
+
if (err)
|
|
123
|
+
reject(err);
|
|
124
|
+
else
|
|
125
|
+
resolve();
|
|
126
|
+
};
|
|
127
|
+
socket.setTimeout(timeoutMs, () => done(new Error(`no answer from ${host}:${port} within ${timeoutMs}ms`)));
|
|
128
|
+
socket.once('connect', () => done());
|
|
129
|
+
socket.once('error', (err) => done(err));
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
//# sourceMappingURL=CameraMonitor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CameraMonitor.js","sourceRoot":"","sources":["../src/CameraMonitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,8 @@ export declare class StreamingDelegate {
|
|
|
23
23
|
private readonly debug;
|
|
24
24
|
private sessions;
|
|
25
25
|
controller: any;
|
|
26
|
+
/** Set by the platform so the device view can show live viewer count. */
|
|
27
|
+
onStreamCountChange?: (count: number) => void;
|
|
26
28
|
constructor(hap: any, camera: CameraConfig, ffmpegPath: string, snapshots: SnapshotCache, log: DelegateLogger, debug: boolean);
|
|
27
29
|
/**
|
|
28
30
|
* HomeKit's snapshot request.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamingDelegate.d.ts","sourceRoot":"","sources":["../src/StreamingDelegate.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B;AAWD;;;;;;;GAOG;AACH,qBAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"StreamingDelegate.d.ts","sourceRoot":"","sources":["../src/StreamingDelegate.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B;AAWD;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAO1B,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAXxB,OAAO,CAAC,QAAQ,CAAmC;IACnD,UAAU,EAAE,GAAG,CAAA;IACf,yEAAyE;IACzE,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;gBAG1B,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,OAAO;IAGjC;;;;;;OAMG;IACG,qBAAqB,CACzB,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAC1C,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GACxD,OAAO,CAAC,IAAI,CAAC;IAyBhB,2EAA2E;IACrE,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B1G,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAoBjF,OAAO,CAAC,WAAW;IA6DnB,OAAO,CAAC,UAAU;IAYlB,+CAA+C;IAC/C,OAAO,IAAI,IAAI;CAGhB;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAShD"}
|
|
@@ -23,6 +23,8 @@ class StreamingDelegate {
|
|
|
23
23
|
debug;
|
|
24
24
|
sessions = new Map();
|
|
25
25
|
controller;
|
|
26
|
+
/** Set by the platform so the device view can show live viewer count. */
|
|
27
|
+
onStreamCountChange;
|
|
26
28
|
constructor(hap, camera, ffmpegPath, snapshots, log, debug) {
|
|
27
29
|
this.hap = hap;
|
|
28
30
|
this.camera = camera;
|
|
@@ -151,6 +153,7 @@ class StreamingDelegate {
|
|
|
151
153
|
}
|
|
152
154
|
done();
|
|
153
155
|
});
|
|
156
|
+
this.onStreamCountChange?.(this.sessions.size);
|
|
154
157
|
// ffmpeg does not announce readiness, and waiting for first output would
|
|
155
158
|
// delay the HomeKit tile. Answering now is what the protocol expects.
|
|
156
159
|
done();
|
|
@@ -166,6 +169,7 @@ class StreamingDelegate {
|
|
|
166
169
|
/* already gone */
|
|
167
170
|
}
|
|
168
171
|
this.sessions.delete(sessionID);
|
|
172
|
+
this.onStreamCountChange?.(this.sessions.size);
|
|
169
173
|
}
|
|
170
174
|
/** Kills every stream, for plugin shutdown. */
|
|
171
175
|
stopAll() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamingDelegate.js","sourceRoot":"","sources":["../src/StreamingDelegate.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"StreamingDelegate.js","sourceRoot":"","sources":["../src/StreamingDelegate.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -118,6 +118,7 @@ export declare const PlatformSchema: z.ZodObject<{
|
|
|
118
118
|
}>, "many">>;
|
|
119
119
|
ffmpegPath: z.ZodOptional<z.ZodString>;
|
|
120
120
|
debug: z.ZodDefault<z.ZodBoolean>;
|
|
121
|
+
reachabilityIntervalSeconds: z.ZodDefault<z.ZodNumber>;
|
|
121
122
|
}, "strip", z.ZodTypeAny, {
|
|
122
123
|
cameras: {
|
|
123
124
|
url: string;
|
|
@@ -140,6 +141,7 @@ export declare const PlatformSchema: z.ZodObject<{
|
|
|
140
141
|
serialNumber?: string | undefined;
|
|
141
142
|
}[];
|
|
142
143
|
debug: boolean;
|
|
144
|
+
reachabilityIntervalSeconds: number;
|
|
143
145
|
ffmpegPath?: string | undefined;
|
|
144
146
|
}, {
|
|
145
147
|
cameras?: {
|
|
@@ -164,6 +166,7 @@ export declare const PlatformSchema: z.ZodObject<{
|
|
|
164
166
|
}[] | undefined;
|
|
165
167
|
ffmpegPath?: string | undefined;
|
|
166
168
|
debug?: boolean | undefined;
|
|
169
|
+
reachabilityIntervalSeconds?: number | undefined;
|
|
167
170
|
}>;
|
|
168
171
|
export type ParsedPlatformConfig = z.infer<typeof PlatformSchema>;
|
|
169
172
|
export interface ConfigProblem {
|
package/dist/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,CAAA;AAuBvB,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BvB,CAAA;AAEF,eAAO,MAAM,cAAc
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAuBvB,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BvB,CAAA;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOzB,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;AAEjE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,wEAAwE;AACxE,wBAAgB,WAAW,CACzB,GAAG,EAAE,OAAO,GACX;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,oBAAoB,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAAE,CAqBtF"}
|
package/dist/config.js
CHANGED
|
@@ -53,6 +53,9 @@ exports.PlatformSchema = zod_1.z.object({
|
|
|
53
53
|
cameras: zod_1.z.array(exports.CameraSchema).default([]),
|
|
54
54
|
ffmpegPath: zod_1.z.string().optional(),
|
|
55
55
|
debug: zod_1.z.boolean().default(false),
|
|
56
|
+
// A bare TCP connect per camera, so a minute is cheap and keeps the device
|
|
57
|
+
// list honest without opening a stream just to ask whether it is there.
|
|
58
|
+
reachabilityIntervalSeconds: zod_1.z.number().positive().default(60),
|
|
56
59
|
});
|
|
57
60
|
/** Parses config, returning either the value or every problem found. */
|
|
58
61
|
function parseConfig(raw) {
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAwEA,kCAuBC;AA/FD,6BAAuB;AAEvB;;;;;;;GAOG;AAEH,MAAM,QAAQ,GAAG,sBAAsB,CAAA;AAEvC,MAAM,qBAAqB,GAAG,OAAC;KAC5B,MAAM,EAAE;KACR,KAAK,CAAC,QAAQ,EAAE,oCAAoC,CAAC;IACtD,4EAA4E;IAC5E,sEAAsE;IACtE,0EAA0E;KACzE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;IAC9C,OAAO,EAAE,0EAA0E;CACpF,CAAC,CAAA;AAES,QAAA,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,GAAG,EAAE,qBAAqB;IAC1B,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,SAAS,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAChD,WAAW,EAAE,qBAAqB,CAAC,QAAQ,EAAE;IAE7C,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAEnC,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACnD,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACpD,+EAA+E;IAC/E,2EAA2E;IAC3E,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACvD,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzD,4EAA4E;IAC5E,6EAA6E;IAC7E,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,KAAK,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IACjC,SAAS,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAErC,oBAAoB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAC1D,yEAAyE;IACzE,4EAA4E;IAC5E,0EAA0E;IAC1E,uBAAuB;IACvB,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;CAC/D,CAAC,CAAA;AAEW,QAAA,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,oBAAY,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC1C,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,KAAK,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IACjC,2EAA2E;IAC3E,wEAAwE;IACxE,2BAA2B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;CAC/D,CAAC,CAAA;AASF,wEAAwE;AACxE,SAAgB,WAAW,CACzB,GAAY;IAEZ,MAAM,MAAM,GAAG,sBAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7E,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAClC,IAAI,EAAE,SAAS;oBACf,oEAAoE;oBACpE,iDAAiD;oBACjD,OAAO,EAAE,0BAA0B,IAAI,8BAA8B;iBACtE,CAAC,CAAC;aACJ,CAAA;QACH,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;IACzC,CAAC;IACD,OAAO;QACL,EAAE,EAAE,KAAK;QACT,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KACvG,CAAA;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAe;IACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAA;IACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QACrC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACf,CAAC;IACD,OAAO,CAAC,GAAG,UAAU,CAAC,CAAA;AACxB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -39,5 +39,6 @@ export * from './ffmpeg/args.js';
|
|
|
39
39
|
export * from './ffmpeg/resolve.js';
|
|
40
40
|
export * from './resolutions.js';
|
|
41
41
|
export { SnapshotCache, FfmpegSnapshotRunner } from './SnapshotCache.js';
|
|
42
|
+
export { CameraMonitor, parseTarget } from './CameraMonitor.js';
|
|
42
43
|
export { StreamingDelegate, reserveUdpPort } from './StreamingDelegate.js';
|
|
43
44
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,UAAU,YAAY;IACpB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IAChD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IAC/C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IAC/C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;CACjD;AAED,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,GAAG,EAAE,YAAY,CAAA;IACjB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;IACtE,cAAc,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IACrH,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAC7G,YAAY,CAAC,IAAI;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,GAAG,SAAS,CAAA;CACvD;AAyDD,QAAA,MAAM,MAAM;;;;;;;eAQO,aAAa;eAwBb,aAAa;cAiDd,aAAa;CAU7B,CAAA;AAEF,eAAe,MAAM,CAAA;AAIrB,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AACxE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -14,8 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.reserveUdpPort = exports.StreamingDelegate = exports.FfmpegSnapshotRunner = exports.SnapshotCache = void 0;
|
|
17
|
+
exports.reserveUdpPort = exports.StreamingDelegate = exports.parseTarget = exports.CameraMonitor = exports.FfmpegSnapshotRunner = exports.SnapshotCache = void 0;
|
|
18
18
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
19
|
+
const CameraMonitor_js_1 = require("./CameraMonitor.js");
|
|
19
20
|
const config_js_1 = require("./config.js");
|
|
20
21
|
const resolve_js_1 = require("./ffmpeg/resolve.js");
|
|
21
22
|
const SnapshotCache_js_1 = require("./SnapshotCache.js");
|
|
@@ -32,7 +33,7 @@ catch {
|
|
|
32
33
|
function definePlugin(plugin) {
|
|
33
34
|
return plugin;
|
|
34
35
|
}
|
|
35
|
-
const state = { delegates: [] };
|
|
36
|
+
const state = { delegates: [], monitors: [] };
|
|
36
37
|
function buildCamera(hap, camera, ffmpegPath, snapshots, log, debug) {
|
|
37
38
|
const { Accessory, Service, Characteristic, uuid, Categories } = hap;
|
|
38
39
|
// Generated from the bare name, matching what homebridge-camera-ffmpeg does.
|
|
@@ -119,17 +120,31 @@ const plugin = definePlugin({
|
|
|
119
120
|
hapBridge.bridge.addBridgedAccessory(accessory);
|
|
120
121
|
// Registered as a device too, so a camera appears in OpenBridge's own
|
|
121
122
|
// list rather than only inside HomeKit.
|
|
123
|
+
const deviceId = `camera-${camera.name.toLowerCase().replace(/[^a-z0-9]+/g, '-')}`;
|
|
122
124
|
ctx.registerDevice({
|
|
123
|
-
id:
|
|
125
|
+
id: deviceId,
|
|
124
126
|
name: camera.name,
|
|
125
127
|
widgetType: 'camera',
|
|
126
128
|
manufacturer: camera.manufacturer ?? 'Nubisco',
|
|
127
129
|
model: camera.model ?? 'RTSP Camera',
|
|
128
130
|
});
|
|
131
|
+
// Without this the camera reports nothing, so OpenBridge draws it with
|
|
132
|
+
// the grey "never reported" dot forever and a camera unplugged a week ago
|
|
133
|
+
// looks exactly like one that is fine.
|
|
134
|
+
const monitor = new CameraMonitor_js_1.CameraMonitor(camera);
|
|
135
|
+
state.monitors.push(monitor);
|
|
136
|
+
monitor.on('telemetry', (t) => ctx.reportTelemetry(deviceId, { ...t }));
|
|
137
|
+
delegate.onStreamCountChange = (n) => monitor.setActiveStreams(n);
|
|
138
|
+
monitor.start(config.reachabilityIntervalSeconds);
|
|
129
139
|
}
|
|
130
140
|
ctx.log.info(`Started with ${config.cameras.length} camera(s), ffmpeg at ${ffmpeg.path}`);
|
|
131
141
|
},
|
|
132
142
|
async stop(ctx) {
|
|
143
|
+
for (const monitor of state.monitors) {
|
|
144
|
+
monitor.stop();
|
|
145
|
+
monitor.removeAllListeners();
|
|
146
|
+
}
|
|
147
|
+
state.monitors = [];
|
|
133
148
|
for (const delegate of state.delegates)
|
|
134
149
|
delegate.stopAll();
|
|
135
150
|
state.delegates = [];
|
|
@@ -147,6 +162,9 @@ __exportStar(require("./resolutions.js"), exports);
|
|
|
147
162
|
var SnapshotCache_js_2 = require("./SnapshotCache.js");
|
|
148
163
|
Object.defineProperty(exports, "SnapshotCache", { enumerable: true, get: function () { return SnapshotCache_js_2.SnapshotCache; } });
|
|
149
164
|
Object.defineProperty(exports, "FfmpegSnapshotRunner", { enumerable: true, get: function () { return SnapshotCache_js_2.FfmpegSnapshotRunner; } });
|
|
165
|
+
var CameraMonitor_js_2 = require("./CameraMonitor.js");
|
|
166
|
+
Object.defineProperty(exports, "CameraMonitor", { enumerable: true, get: function () { return CameraMonitor_js_2.CameraMonitor; } });
|
|
167
|
+
Object.defineProperty(exports, "parseTarget", { enumerable: true, get: function () { return CameraMonitor_js_2.parseTarget; } });
|
|
150
168
|
var StreamingDelegate_js_2 = require("./StreamingDelegate.js");
|
|
151
169
|
Object.defineProperty(exports, "StreamingDelegate", { enumerable: true, get: function () { return StreamingDelegate_js_2.StreamingDelegate; } });
|
|
152
170
|
Object.defineProperty(exports, "reserveUdpPort", { enumerable: true, get: function () { return StreamingDelegate_js_2.reserveUdpPort; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uDAAuD;AACvD,2CAAyC;AACzC,oDAAmD;AACnD,yDAAwE;AACxE,iEAA0D;AAC1D,qDAAiD;AAGjD,MAAM,WAAW,GAAG,qCAAqC,CAAA;AAEzD,IAAI,cAAc,GAAG,OAAO,CAAA;AAC5B,IAAI,CAAC;IACH,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAA;AACrD,CAAC;AAAC,MAAM,CAAC;IACP,sBAAsB;AACxB,CAAC;AAqBD,SAAS,YAAY,CAA4D,MAAS;IACxF,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nubisco/openbridge-camera-platform",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "RTSP cameras in HomeKit through OpenBridge, with structured config and no credentials in your logs",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|