@camera.ui/camera-ui-homekit 0.0.5 → 0.0.7
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/camera/recordingDelegate.js +55 -56
- package/dist/camera/recordingDelegate.js.map +1 -1
- package/dist/camera/services.d.ts +1 -0
- package/dist/camera/services.js +7 -5
- package/dist/camera/services.js.map +1 -1
- package/dist/camera/streamingServer.d.ts +1 -0
- package/dist/camera/streamingServer.js +28 -2
- package/dist/camera/streamingServer.js.map +1 -1
- package/dist/crypto.js +30 -25
- package/dist/crypto.js.map +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/package.json +5 -3
|
@@ -42,70 +42,69 @@ export class RecordingDelegate {
|
|
|
42
42
|
this.handlingRecordingRequest = true;
|
|
43
43
|
this.server = new MP4StreamingServer(this.logger, this.accessory, this.cameraDevice);
|
|
44
44
|
const ffmpegPath = await this.cameraDevice.getFfmpegPath();
|
|
45
|
+
const mp4PrebufferingState = this.cameraDevice.streamSource.getPrebufferingState('mp4');
|
|
45
46
|
const mpegtsPrebufferingState = this.cameraDevice.streamSource.getPrebufferingState('mpegts');
|
|
46
|
-
|
|
47
|
+
const isMP4Server = mp4PrebufferingState.state && mp4PrebufferingState.url;
|
|
48
|
+
if (!mp4PrebufferingState.state && !this.cameraDevice.isCloud) {
|
|
47
49
|
this.logger.attention(this.cameraDevice.name, 'Prebuffering is not enabled! Please install and enable the prebuffering plugin.');
|
|
48
50
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
const recordingAudioEnabled = this.cameraAccessory.controller?.recordingManagement?.recordingManagementService.getCharacteristic(Characteristic.RecordingAudioActive).value === 1;
|
|
52
|
-
const audioEnabled = cameraAudioEnabled && recordingAudioEnabled;
|
|
53
|
-
const isAAC = streamInfo?.audio.codec ? streamInfo.audio.codec.toLowerCase().indexOf('aac') !== -1 : true;
|
|
54
|
-
const transcodeRecording = await this.cameraAccessory.cameraStorage?.getValue('transcodeRecording');
|
|
55
|
-
const request = {
|
|
56
|
-
audio: {
|
|
57
|
-
codec: this.configuration.audioCodec.type === 0 /* AudioRecordingCodecType.AAC_LC */ ? 'aac' : 'libfdk_aac',
|
|
58
|
-
sampleRate: this.getSampleRate(this.configuration.audioCodec.samplerate),
|
|
59
|
-
channels: this.configuration.audioCodec.audioChannels,
|
|
60
|
-
bitrate: this.configuration.audioCodec.bitrate,
|
|
61
|
-
},
|
|
62
|
-
video: {
|
|
63
|
-
width: this.configuration.videoCodec.resolution[0],
|
|
64
|
-
height: this.configuration.videoCodec.resolution[1],
|
|
65
|
-
fps: this.configuration.videoCodec.resolution[2],
|
|
66
|
-
bitrate: this.configuration.videoCodec.parameters.bitRate,
|
|
67
|
-
iFrameInterval: this.configuration.videoCodec.parameters.iFrameInterval / 1000,
|
|
68
|
-
profile: this.getProfile(this.configuration.videoCodec.parameters.profile),
|
|
69
|
-
level: this.getLevel(this.configuration.videoCodec.parameters.level),
|
|
70
|
-
},
|
|
71
|
-
};
|
|
72
|
-
const ffmpegInput = [
|
|
73
|
-
'-hide_banner',
|
|
74
|
-
'-loglevel',
|
|
75
|
-
'verbose',
|
|
76
|
-
'-fflags',
|
|
77
|
-
'+discardcorrupt+nobuffer',
|
|
78
|
-
'-flags',
|
|
79
|
-
'low_delay',
|
|
80
|
-
'-timeout',
|
|
81
|
-
'5000000',
|
|
82
|
-
'-fflags',
|
|
83
|
-
'+genpts',
|
|
84
|
-
];
|
|
85
|
-
const url = mpegtsPrebufferingState.state ? mpegtsPrebufferingState.url : this.cameraDevice.streamSource.urls.transcoded.aac;
|
|
86
|
-
ffmpegInput.push('-rtsp_transport', 'tcp', '-i', url);
|
|
87
|
-
const videoArgs = [];
|
|
88
|
-
const audioArgs = [];
|
|
89
|
-
if (transcodeRecording) {
|
|
90
|
-
videoArgs.push(
|
|
91
|
-
// '-an',
|
|
92
|
-
'-sn', '-dn', '-codec:v', 'libx264', '-pix_fmt', 'yuv420p', '-profile:v', request.video.profile, '-level:v', request.video.level, '-preset', 'ultrafast', '-bf', '0', '-filter_complex', `scale=w='min(${request.video.width},iw)':h=-2`, '-b:v', `${request.video.bitrate}k`, '-bufsize', `${2 * request.video.bitrate}k`, '-maxrate', `${request.video.bitrate}k`,
|
|
93
|
-
// '-force_key_frames', `expr:gte(t,n_forced*${request.video.iFrameInterval})`,
|
|
94
|
-
'-g', `${request.video.iFrameInterval * request.video.fps}`, '-r', `${request.video.fps}`);
|
|
51
|
+
if (isMP4Server) {
|
|
52
|
+
await this.server.connectToServer(mp4PrebufferingState.url);
|
|
95
53
|
}
|
|
96
54
|
else {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
55
|
+
const streamInfo = await this.cameraDevice.streamSource.getStreamInfo();
|
|
56
|
+
const cameraAudioEnabled = streamInfo?.audio.enabled !== undefined ? streamInfo.audio.enabled : true;
|
|
57
|
+
const recordingAudioEnabled = this.cameraAccessory.controller?.recordingManagement?.recordingManagementService.getCharacteristic(Characteristic.RecordingAudioActive).value === 1;
|
|
58
|
+
const audioEnabled = cameraAudioEnabled && recordingAudioEnabled;
|
|
59
|
+
const isAAC = streamInfo?.audio.codec ? streamInfo.audio.codec.toLowerCase().indexOf('aac') !== -1 : true;
|
|
60
|
+
const transcodeRecording = await this.cameraAccessory.cameraStorage?.getValue('transcodeRecording');
|
|
61
|
+
const request = {
|
|
62
|
+
audio: {
|
|
63
|
+
codec: this.configuration.audioCodec.type === 0 /* AudioRecordingCodecType.AAC_LC */ ? 'aac' : 'libfdk_aac',
|
|
64
|
+
sampleRate: this.getSampleRate(this.configuration.audioCodec.samplerate),
|
|
65
|
+
channels: this.configuration.audioCodec.audioChannels,
|
|
66
|
+
bitrate: this.configuration.audioCodec.bitrate,
|
|
67
|
+
},
|
|
68
|
+
video: {
|
|
69
|
+
width: this.configuration.videoCodec.resolution[0],
|
|
70
|
+
height: this.configuration.videoCodec.resolution[1],
|
|
71
|
+
fps: this.configuration.videoCodec.resolution[2],
|
|
72
|
+
bitrate: this.configuration.videoCodec.parameters.bitRate,
|
|
73
|
+
iFrameInterval: this.configuration.videoCodec.parameters.iFrameInterval / 1000,
|
|
74
|
+
profile: this.getProfile(this.configuration.videoCodec.parameters.profile),
|
|
75
|
+
level: this.getLevel(this.configuration.videoCodec.parameters.level),
|
|
76
|
+
},
|
|
77
|
+
};
|
|
78
|
+
const ffmpegInput = ['-hide_banner', '-v', 'error', '-fflags', '+nobuffer', '-flags', 'low_delay', '-timeout', '5000000', '-fflags', '+genpts'];
|
|
79
|
+
if (mpegtsPrebufferingState.state) {
|
|
80
|
+
ffmpegInput.push('-f', 'mpegts', '-re', '-i', mpegtsPrebufferingState.url);
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
ffmpegInput.push('-rtsp_transport', 'tcp', '-i', this.cameraDevice.streamSource.urls.transcoded.aac);
|
|
84
|
+
}
|
|
85
|
+
const videoArgs = [];
|
|
86
|
+
const audioArgs = [];
|
|
87
|
+
if (transcodeRecording) {
|
|
88
|
+
videoArgs.push(
|
|
89
|
+
// '-an',
|
|
90
|
+
'-sn', '-dn', '-codec:v', 'libx264', '-pix_fmt', 'yuv420p', '-profile:v', request.video.profile, '-level:v', request.video.level, '-preset', 'ultrafast', '-bf', '0', '-filter_complex', `scale=w='min(${request.video.width},iw)':h=-2`, '-b:v', `${request.video.bitrate}k`, '-bufsize', `${2 * request.video.bitrate}k`, '-maxrate', `${request.video.bitrate}k`,
|
|
91
|
+
// '-force_key_frames', `expr:gte(t,n_forced*${request.video.iFrameInterval})`,
|
|
92
|
+
'-g', `${request.video.iFrameInterval * request.video.fps}`, '-r', `${request.video.fps}`);
|
|
103
93
|
}
|
|
104
94
|
else {
|
|
105
|
-
|
|
95
|
+
videoArgs.push('-vcodec', 'copy');
|
|
96
|
+
}
|
|
97
|
+
if (audioEnabled) {
|
|
98
|
+
if (!isAAC) {
|
|
99
|
+
this.logger.warn(this.cameraDevice.name, 'Recording audio is not explicitly AAC, forcing transcoding. Setting audio output to AAC is recommended.');
|
|
100
|
+
audioArgs.push(...(request.audio.codec === 'aac' ? ['-acodec', request.audio.codec, '-profile:a', 'aac_low'] : ['-acodec', request.audio.codec, '-profile:a', 'aac_eld']), '-ar', `${request.audio.sampleRate}k`, '-b:a', `${request.audio.bitrate}k`, '-ac', `${request.audio.channels}`);
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
audioArgs.push('-acodec', 'copy', '-bsf:a', 'aac_adtstoasc');
|
|
104
|
+
}
|
|
106
105
|
}
|
|
106
|
+
await this.server.createServer(ffmpegPath, ffmpegInput, videoArgs, audioArgs);
|
|
107
107
|
}
|
|
108
|
-
await this.server.createServer(ffmpegPath, ffmpegInput, videoArgs, audioArgs);
|
|
109
108
|
if (!this.server || this.server.destroyed) {
|
|
110
109
|
this.logger.warn(this.cameraDevice.name, 'Server was destroyed, cannot start recording stream!');
|
|
111
110
|
await this.cleanupRecording();
|
|
@@ -119,7 +118,7 @@ export class RecordingDelegate {
|
|
|
119
118
|
isLastSegment = true;
|
|
120
119
|
}, this.maxVideoDuration);
|
|
121
120
|
try {
|
|
122
|
-
let checkMp4 =
|
|
121
|
+
let checkMp4 = !isMP4Server;
|
|
123
122
|
let needSkip = true;
|
|
124
123
|
let pending = [];
|
|
125
124
|
let ftyp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recordingDelegate.js","sourceRoot":"","sources":["../../src/camera/recordingDelegate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,cAAc,EAA0D,OAAO,EAAE,MAAM,YAAY,CAAC;AAEhK,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAM1D,MAAM,OAAO,iBAAiB;IACpB,eAAe,CAAkB;IACjC,SAAS,CAAY;IACrB,YAAY,CAAe;IAC3B,MAAM,CAAe;IAErB,WAAW,GAAG,KAAK,CAAC;IACpB,wBAAwB,GAAG,KAAK,CAAC;IACjC,gBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;IACjC,gBAAgB,CAAkB;IAElC,MAAM,CAAsB;IAC5B,aAAa,CAAgC;IAErD,YAAY,eAAgC,EAAE,SAAoB,EAAE,YAA0B,EAAE,MAAoB;QAClH,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,MAAe;QAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,qBAAqB,MAAM,EAAE,CAAC,CAAC;QAEzE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACvH,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;IAC5B,CAAC;IAEM,4BAA4B,CAAC,aAA4C;QAC9E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7G,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,CAAC,4BAA4B,CAAC,QAAgB;QACzD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,oEAAoE,CAAC,CAAC;YAC/G,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,wEAAwE,CAAC,CAAC;YACnH,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,mDAAmD,QAAQ,GAAG,CAAC,CAAC;QAExG,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAErF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;QAC3D,MAAM,uBAAuB,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"recordingDelegate.js","sourceRoot":"","sources":["../../src/camera/recordingDelegate.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export declare class CameraServices {
|
|
|
11
11
|
private onLightSwitched?;
|
|
12
12
|
private onBatteryChanged?;
|
|
13
13
|
private motionTimeout?;
|
|
14
|
+
private maxMotionTimeout?;
|
|
14
15
|
private maxMotionTime;
|
|
15
16
|
private motionTimeoutDuration;
|
|
16
17
|
constructor(accessory: Accessory, cameraDevice: CameraDevice, logger: PluginLogger);
|
package/dist/camera/services.js
CHANGED
|
@@ -9,6 +9,7 @@ export class CameraServices {
|
|
|
9
9
|
onLightSwitched;
|
|
10
10
|
onBatteryChanged;
|
|
11
11
|
motionTimeout;
|
|
12
|
+
maxMotionTimeout;
|
|
12
13
|
maxMotionTime = 2 * 60 * 1000;
|
|
13
14
|
motionTimeoutDuration = 30000;
|
|
14
15
|
constructor(accessory, cameraDevice, logger) {
|
|
@@ -107,11 +108,11 @@ export class CameraServices {
|
|
|
107
108
|
motionService = this.accessory.addService(Service.MotionSensor, 'Motion Sensor');
|
|
108
109
|
motionService.getCharacteristic(Characteristic.MotionDetected).on('change', (change) => {
|
|
109
110
|
if (change.oldValue !== change.newValue) {
|
|
111
|
+
clearTimeout(this.maxMotionTimeout);
|
|
110
112
|
this.logger.debug(this.cameraDevice.name, 'Motion state changed to', change.newValue);
|
|
111
|
-
// after maxMotionTime, reset motion state
|
|
112
113
|
if (change.newValue) {
|
|
113
|
-
|
|
114
|
-
|
|
114
|
+
this.maxMotionTimeout = setTimeout(() => {
|
|
115
|
+
clearTimeout(this.motionTimeout);
|
|
115
116
|
this.logger.debug(this.cameraDevice.name, 'Resetting motion state');
|
|
116
117
|
motionService?.getCharacteristic(Characteristic.MotionDetected).updateValue(false);
|
|
117
118
|
}, this.maxMotionTime);
|
|
@@ -122,11 +123,12 @@ export class CameraServices {
|
|
|
122
123
|
clearTimeout(this.motionTimeout);
|
|
123
124
|
const detected = state || detections.length > 0;
|
|
124
125
|
if (detected) {
|
|
125
|
-
motionService?.getCharacteristic(Characteristic.MotionDetected).updateValue(
|
|
126
|
+
motionService?.getCharacteristic(Characteristic.MotionDetected).updateValue(true);
|
|
126
127
|
}
|
|
127
128
|
else {
|
|
128
129
|
this.motionTimeout = setTimeout(() => {
|
|
129
|
-
|
|
130
|
+
clearTimeout(this.maxMotionTime);
|
|
131
|
+
motionService?.getCharacteristic(Characteristic.MotionDetected).updateValue(false);
|
|
130
132
|
}, this.motionTimeoutDuration);
|
|
131
133
|
}
|
|
132
134
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/camera/services.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/camera/services.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare class MP4StreamingServer {
|
|
|
16
16
|
private isRemoteServer;
|
|
17
17
|
constructor(logger: PluginLogger, accessory: Accessory, cameraDevice: CameraDevice);
|
|
18
18
|
createServer(ffmpegPath: string, ffmpegInput: Array<string>, videoOutputArgs: Array<string>, audioOutputArgs: Array<string>): Promise<void>;
|
|
19
|
+
connectToServer(prebufferUrl: string): Promise<void>;
|
|
19
20
|
destroy(): Promise<void>;
|
|
20
21
|
generator(): AsyncGenerator<MP4Atom>;
|
|
21
22
|
private handleConnection;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
2
|
import { once } from 'node:events';
|
|
3
|
-
import { createServer } from 'node:net';
|
|
3
|
+
import { createServer, Socket } from 'node:net';
|
|
4
4
|
export class MP4StreamingServer {
|
|
5
5
|
debugMode = false;
|
|
6
6
|
destroyed = false;
|
|
@@ -27,7 +27,19 @@ export class MP4StreamingServer {
|
|
|
27
27
|
});
|
|
28
28
|
this.server = createServer(this.handleConnection.bind(this));
|
|
29
29
|
const ffmpeg = ffmpegPath;
|
|
30
|
-
const args = [
|
|
30
|
+
const args = [
|
|
31
|
+
...ffmpegInput,
|
|
32
|
+
...videoOutputArgs,
|
|
33
|
+
...audioOutputArgs,
|
|
34
|
+
'-fflags',
|
|
35
|
+
'+genpts',
|
|
36
|
+
'-reset_timestamps',
|
|
37
|
+
'1',
|
|
38
|
+
'-movflags',
|
|
39
|
+
'frag_keyframe+empty_moov+default_base_moof+skip_sidx+skip_trailer',
|
|
40
|
+
'-f',
|
|
41
|
+
'mp4',
|
|
42
|
+
];
|
|
31
43
|
const promise = once(this.server, 'listening');
|
|
32
44
|
this.server.listen(); // listen on random port
|
|
33
45
|
await promise;
|
|
@@ -43,6 +55,20 @@ export class MP4StreamingServer {
|
|
|
43
55
|
this.childProcess.stderr?.on('data', (data) => this.logger.debug(this.cameraDevice.name, data.toString()));
|
|
44
56
|
}
|
|
45
57
|
}
|
|
58
|
+
async connectToServer(prebufferUrl) {
|
|
59
|
+
this.isRemoteServer = true;
|
|
60
|
+
this.connectPromise = new Promise((resolve, reject) => {
|
|
61
|
+
this.connectResolve = resolve;
|
|
62
|
+
this.connectReject = reject;
|
|
63
|
+
});
|
|
64
|
+
const socketUrl = new URL(prebufferUrl);
|
|
65
|
+
const socket = new Socket();
|
|
66
|
+
this.handleConnection(socket);
|
|
67
|
+
const promise = once(socket, 'connect');
|
|
68
|
+
socket.connect(parseInt(socketUrl.port), socketUrl.hostname);
|
|
69
|
+
await promise;
|
|
70
|
+
this.logger.debug(this.cameraDevice.name, 'Recording command: Remote server');
|
|
71
|
+
}
|
|
46
72
|
async destroy() {
|
|
47
73
|
this.socket?.destroy();
|
|
48
74
|
this.childProcess?.kill('SIGKILL');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamingServer.js","sourceRoot":"","sources":["../../src/camera/streamingServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"streamingServer.js","sourceRoot":"","sources":["../../src/camera/streamingServer.ts"],"names":[],"mappings":"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"}
|
package/dist/crypto.js
CHANGED
|
@@ -1,29 +1,34 @@
|
|
|
1
|
-
import chacha from 'chacha';
|
|
2
1
|
import crypto from 'node:crypto';
|
|
3
2
|
if (!crypto.getCiphers().includes('chacha20-poly1305')) {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
3
|
+
try {
|
|
4
|
+
const { default: chacha } = await import('chacha');
|
|
5
|
+
const originalGetCiphers = crypto.getCiphers;
|
|
6
|
+
const originalCreateCipheriv = crypto.createCipheriv;
|
|
7
|
+
const originalCreateDecipheriv = crypto.createDecipheriv;
|
|
8
|
+
crypto.getCiphers = () => {
|
|
9
|
+
const ciphers = originalGetCiphers();
|
|
10
|
+
ciphers.push('chacha20-poly1305');
|
|
11
|
+
return ciphers;
|
|
12
|
+
};
|
|
13
|
+
crypto.createCipheriv = (algorithm, key, iv, options) => {
|
|
14
|
+
if (algorithm !== 'chacha20-poly1305') {
|
|
15
|
+
return originalCreateCipheriv(algorithm, key, iv, options);
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
return chacha.createCipher(key, iv);
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
crypto.createDecipheriv = (algorithm, key, iv, options) => {
|
|
22
|
+
if (algorithm !== 'chacha20-poly1305') {
|
|
23
|
+
return originalCreateDecipheriv(algorithm, key, iv, options);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
return chacha.createDecipher(key, iv);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
//
|
|
32
|
+
}
|
|
28
33
|
}
|
|
29
34
|
//# sourceMappingURL=crypto.js.map
|
package/dist/crypto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;IACvD,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEnD,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC;QAC7C,MAAM,sBAAsB,GAAG,MAAM,CAAC,cAAc,CAAC;QACrD,MAAM,wBAAwB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAEzD,MAAM,CAAC,UAAU,GAAG,GAAa,EAAE;YACjC,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;YACrC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAClC,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC;QAEF,MAAM,CAAC,cAAc,GAAG,CAAC,SAAc,EAAE,GAAQ,EAAE,EAAO,EAAE,OAAY,EAAE,EAAE;YAC1E,IAAI,SAAS,KAAK,mBAAmB,EAAE,CAAC;gBACtC,OAAO,sBAAsB,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACtC,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,GAAG,CAAC,SAAc,EAAE,GAAQ,EAAE,EAAO,EAAE,OAAa,EAAE,EAAE;YAC7E,IAAI,SAAS,KAAK,mBAAmB,EAAE,CAAC;gBACtC,OAAO,wBAAwB,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACxC,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,EAAE;IACJ,CAAC;AACH,CAAC"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "HomeKit",
|
|
3
3
|
"name": "@camera.ui/camera-ui-homekit",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.7",
|
|
5
5
|
"description": "camera.ui homekit plugin",
|
|
6
6
|
"author": "seydx (https://github.com/seydx/camera.ui)",
|
|
7
7
|
"main": "./dist/index.js",
|
|
@@ -16,15 +16,17 @@
|
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@homebridge/camera-utils": "^2.2.6",
|
|
19
|
-
"chacha": "^2.1.0",
|
|
20
19
|
"hap-nodejs": "^1.1.0",
|
|
21
20
|
"rxjs": "^7.8.1",
|
|
22
21
|
"werift": "^0.19.6"
|
|
23
22
|
},
|
|
23
|
+
"optionalDependencies": {
|
|
24
|
+
"chacha": "^2.1.0"
|
|
25
|
+
},
|
|
24
26
|
"devDependencies": {
|
|
25
27
|
"@camera.ui/types": "^0.0.56",
|
|
26
28
|
"@rushstack/eslint-patch": "^1.10.4",
|
|
27
|
-
"@types/node": "^22.
|
|
29
|
+
"@types/node": "^22.4.0",
|
|
28
30
|
"@types/ws": "^8.5.12",
|
|
29
31
|
"@typescript-eslint/eslint-plugin": "^8.1.0",
|
|
30
32
|
"@typescript-eslint/parser": "^8.1.0",
|