@nubisco/openbridge-camera-platform 1.1.0 → 2.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/ffmpeg/args.d.ts +12 -0
- package/dist/ffmpeg/args.d.ts.map +1 -1
- package/dist/ffmpeg/args.js +37 -0
- package/dist/ffmpeg/args.js.map +1 -1
- package/dist/index.d.ts +8 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +27 -0
- package/dist/index.js.map +1 -1
- package/package.json +9 -7
package/dist/ffmpeg/args.d.ts
CHANGED
|
@@ -23,6 +23,18 @@ export interface SnapshotArgsOptions {
|
|
|
23
23
|
}
|
|
24
24
|
/** ffmpeg arguments for a single still frame. */
|
|
25
25
|
export declare function snapshotArgs(camera: CameraConfig, options?: SnapshotArgsOptions): string[];
|
|
26
|
+
/** The multipart boundary the live view's Motion JPEG uses. */
|
|
27
|
+
export declare const LIVE_BOUNDARY = "ffmpeg";
|
|
28
|
+
/**
|
|
29
|
+
* ffmpeg arguments for OpenBridge's own live view: Motion JPEG on stdout, a
|
|
30
|
+
* picture a browser shows as it arrives with no player. Capped at 960 px and
|
|
31
|
+
* six frames a second, because it runs on the bridge (often a Raspberry Pi)
|
|
32
|
+
* and only while someone has the camera open.
|
|
33
|
+
*/
|
|
34
|
+
export declare function liveArgs(camera: CameraConfig, options?: {
|
|
35
|
+
width?: number;
|
|
36
|
+
fps?: number;
|
|
37
|
+
}): string[];
|
|
26
38
|
export interface StreamArgsOptions {
|
|
27
39
|
width: number;
|
|
28
40
|
height: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../src/ffmpeg/args.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C;;;;;;GAMG;AAEH,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,UAAU,GAAG,UAAU,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAQlH;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,iDAAiD;AACjD,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,mBAAwB,GAAG,MAAM,EAAE,CA8B9F;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,6CAA6C;IAC7C,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,GAAG,MAAM,EAAE,CA+DrF;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAEtE"}
|
|
1
|
+
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../src/ffmpeg/args.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C;;;;;;GAMG;AAEH,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,UAAU,GAAG,UAAU,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAQlH;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,iDAAiD;AACjD,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,mBAAwB,GAAG,MAAM,EAAE,CA8B9F;AAED,+DAA+D;AAC/D,eAAO,MAAM,aAAa,WAAW,CAAA;AAErC;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,MAAM,EAAE,CA0BvG;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,6CAA6C;IAC7C,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,GAAG,MAAM,EAAE,CA+DrF;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAEtE"}
|
package/dist/ffmpeg/args.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LIVE_BOUNDARY = void 0;
|
|
3
4
|
exports.authenticatedUrl = authenticatedUrl;
|
|
4
5
|
exports.redact = redact;
|
|
5
6
|
exports.snapshotArgs = snapshotArgs;
|
|
7
|
+
exports.liveArgs = liveArgs;
|
|
6
8
|
exports.streamArgs = streamArgs;
|
|
7
9
|
exports.describeCommand = describeCommand;
|
|
8
10
|
/**
|
|
@@ -64,6 +66,41 @@ function snapshotArgs(camera, options = {}) {
|
|
|
64
66
|
args.push('-f', 'image2', '-');
|
|
65
67
|
return args;
|
|
66
68
|
}
|
|
69
|
+
/** The multipart boundary the live view's Motion JPEG uses. */
|
|
70
|
+
exports.LIVE_BOUNDARY = 'ffmpeg';
|
|
71
|
+
/**
|
|
72
|
+
* ffmpeg arguments for OpenBridge's own live view: Motion JPEG on stdout, a
|
|
73
|
+
* picture a browser shows as it arrives with no player. Capped at 960 px and
|
|
74
|
+
* six frames a second, because it runs on the bridge (often a Raspberry Pi)
|
|
75
|
+
* and only while someone has the camera open.
|
|
76
|
+
*/
|
|
77
|
+
function liveArgs(camera, options = {}) {
|
|
78
|
+
const width = Math.min(options.width ?? 960, camera.maxWidth);
|
|
79
|
+
const fps = options.fps ?? 6;
|
|
80
|
+
return [
|
|
81
|
+
'-hide_banner',
|
|
82
|
+
'-loglevel',
|
|
83
|
+
'error',
|
|
84
|
+
'-rtsp_transport',
|
|
85
|
+
camera.transport,
|
|
86
|
+
'-analyzeduration',
|
|
87
|
+
'1000000',
|
|
88
|
+
'-probesize',
|
|
89
|
+
'1000000',
|
|
90
|
+
'-i',
|
|
91
|
+
authenticatedUrl(camera),
|
|
92
|
+
'-an',
|
|
93
|
+
'-vf',
|
|
94
|
+
`fps=${fps},scale='min(${width},iw)':-2`,
|
|
95
|
+
'-q:v',
|
|
96
|
+
'7',
|
|
97
|
+
'-f',
|
|
98
|
+
'mpjpeg',
|
|
99
|
+
'-boundary_tag',
|
|
100
|
+
exports.LIVE_BOUNDARY,
|
|
101
|
+
'pipe:1',
|
|
102
|
+
];
|
|
103
|
+
}
|
|
67
104
|
/** ffmpeg arguments for a live SRTP stream to a HomeKit client. */
|
|
68
105
|
function streamArgs(camera, options) {
|
|
69
106
|
const source = authenticatedUrl(camera);
|
package/dist/ffmpeg/args.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/ffmpeg/args.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/ffmpeg/args.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -20,6 +20,14 @@ interface PluginContext {
|
|
|
20
20
|
hap: any;
|
|
21
21
|
bridge: any;
|
|
22
22
|
} | undefined;
|
|
23
|
+
/** OpenBridge 1.15 and later: video for OpenBridge's own UI. */
|
|
24
|
+
registerVideo?(deviceId: string, source: {
|
|
25
|
+
snapshot(): Promise<Buffer>;
|
|
26
|
+
live?(signal: AbortSignal): {
|
|
27
|
+
stream: NodeJS.ReadableStream;
|
|
28
|
+
boundary: string;
|
|
29
|
+
};
|
|
30
|
+
}): void;
|
|
23
31
|
}
|
|
24
32
|
declare const plugin: {
|
|
25
33
|
manifest: {
|
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":"AAuBA,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;IACtD,gEAAgE;IAChE,aAAa,CAAC,CACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE;QACN,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAA;QAC3B,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,GAAG;YAAE,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAChF,GACA,IAAI,CAAA;CACR;AAyDD,QAAA,MAAM,MAAM;;;;;;;eAQO,aAAa;eAwBb,aAAa;cAwEd,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
|
@@ -16,7 +16,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
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 node_child_process_1 = require("node:child_process");
|
|
19
20
|
const CameraMonitor_js_1 = require("./CameraMonitor.js");
|
|
21
|
+
const args_js_1 = require("./ffmpeg/args.js");
|
|
20
22
|
const config_js_1 = require("./config.js");
|
|
21
23
|
const resolve_js_1 = require("./ffmpeg/resolve.js");
|
|
22
24
|
const SnapshotCache_js_1 = require("./SnapshotCache.js");
|
|
@@ -128,6 +130,31 @@ const plugin = definePlugin({
|
|
|
128
130
|
manufacturer: camera.manufacturer ?? 'Nubisco',
|
|
129
131
|
model: camera.model ?? 'RTSP Camera',
|
|
130
132
|
});
|
|
133
|
+
// The picture in OpenBridge itself: the snapshot HomeKit uses, and a
|
|
134
|
+
// live view made only while someone has the camera open.
|
|
135
|
+
ctx.registerVideo?.(deviceId, {
|
|
136
|
+
snapshot: () => snapshots.get(camera.name, (0, args_js_1.snapshotArgs)(camera), camera.snapshotCacheSeconds, camera.snapshotTimeoutMs),
|
|
137
|
+
live: (signal) => {
|
|
138
|
+
const args = (0, args_js_1.liveArgs)(camera);
|
|
139
|
+
if (config.debug)
|
|
140
|
+
ctx.log.debug(`live view: ${(0, args_js_1.describeCommand)(ffmpeg.path, args)}`);
|
|
141
|
+
const child = (0, node_child_process_1.spawn)(ffmpeg.path, args, { stdio: ['ignore', 'pipe', 'pipe'] });
|
|
142
|
+
let errors = '';
|
|
143
|
+
child.stderr.on('data', (b) => (errors = (errors + b.toString()).slice(-500)));
|
|
144
|
+
child.on('exit', (code) => {
|
|
145
|
+
if (code && !signal.aborted)
|
|
146
|
+
ctx.log.warn(`${camera.name}: live view stopped: ${(0, args_js_1.redact)(errors.trim())}`);
|
|
147
|
+
});
|
|
148
|
+
const stop = () => {
|
|
149
|
+
if (child.exitCode === null)
|
|
150
|
+
child.kill('SIGTERM');
|
|
151
|
+
};
|
|
152
|
+
signal.addEventListener('abort', stop, { once: true });
|
|
153
|
+
if (signal.aborted)
|
|
154
|
+
stop();
|
|
155
|
+
return { stream: child.stdout, boundary: args_js_1.LIVE_BOUNDARY };
|
|
156
|
+
},
|
|
157
|
+
});
|
|
131
158
|
// Without this the camera reports nothing, so OpenBridge draws it with
|
|
132
159
|
// the grey "never reported" dot forever and a camera unplugged a week ago
|
|
133
160
|
// looks exactly like one that is fine.
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uDAAuD;AACvD,yDAAkD;AAClD,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;
|
|
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": "
|
|
3
|
+
"version": "2.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",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"README.md"
|
|
11
11
|
],
|
|
12
12
|
"engines": {
|
|
13
|
-
"node": ">=
|
|
13
|
+
"node": ">=22.23.4"
|
|
14
14
|
},
|
|
15
15
|
"license": "MIT",
|
|
16
16
|
"author": "José Silva <jose@nubisco.io>",
|
|
@@ -52,9 +52,9 @@
|
|
|
52
52
|
"types:check": "tsc --noEmit",
|
|
53
53
|
"format:check": "prettier --check .",
|
|
54
54
|
"quality:check": "npm test && npm run lint && npm run format:check && npm run types:check",
|
|
55
|
-
"docs:dev": "
|
|
56
|
-
"docs:build": "
|
|
57
|
-
"docs:preview": "
|
|
55
|
+
"docs:dev": "nubisco-docs dev docs",
|
|
56
|
+
"docs:build": "nubisco-docs build docs",
|
|
57
|
+
"docs:preview": "nubisco-docs preview docs"
|
|
58
58
|
},
|
|
59
59
|
"peerDependencies": {
|
|
60
60
|
"hap-nodejs": ">=0.12.0"
|
|
@@ -67,6 +67,8 @@
|
|
|
67
67
|
},
|
|
68
68
|
"devDependencies": {
|
|
69
69
|
"@eslint/js": "^10.0.1",
|
|
70
|
+
"@nubisco/docs-sdk": "^0.5.1",
|
|
71
|
+
"@nubisco/ui": "^5.49.0",
|
|
70
72
|
"@semantic-release/changelog": "^7.0.0",
|
|
71
73
|
"@semantic-release/git": "^11.0.1",
|
|
72
74
|
"@types/node": "^22.0.0",
|
|
@@ -76,8 +78,8 @@
|
|
|
76
78
|
"semantic-release": "^25.0.9",
|
|
77
79
|
"typescript": "^5.0.0",
|
|
78
80
|
"typescript-eslint": "^8.71.0",
|
|
79
|
-
"
|
|
80
|
-
"
|
|
81
|
+
"vitest": "^3.0.0",
|
|
82
|
+
"vue": "^3.5.45"
|
|
81
83
|
},
|
|
82
84
|
"release": {
|
|
83
85
|
"branches": [
|