@camera.ui/camera-ui-homekit 0.0.3 → 0.0.4
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 +59 -58
- package/dist/camera/recordingDelegate.js.map +1 -1
- package/dist/camera/services.d.ts +3 -0
- package/dist/camera/services.js +45 -18
- package/dist/camera/services.js.map +1 -1
- package/dist/camera/streamingDelegate.js +1 -1
- package/dist/camera/streamingDelegate.js.map +1 -1
- package/dist/camera/streamingServer.d.ts +0 -1
- package/dist/camera/streamingServer.js +2 -28
- package/dist/camera/streamingServer.js.map +1 -1
- package/package.json +6 -6
|
@@ -42,69 +42,70 @@ 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');
|
|
46
45
|
const mpegtsPrebufferingState = this.cameraDevice.streamSource.getPrebufferingState('mpegts');
|
|
47
|
-
|
|
48
|
-
if (!mp4PrebufferingState.state && !this.cameraDevice.isCloud) {
|
|
46
|
+
if (!mpegtsPrebufferingState.state && !this.cameraDevice.isCloud) {
|
|
49
47
|
this.logger.attention(this.cameraDevice.name, 'Prebuffering is not enabled! Please install and enable the prebuffering plugin.');
|
|
50
48
|
}
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
const streamInfo = await this.cameraDevice.streamSource.getStreamInfo();
|
|
50
|
+
const cameraAudioEnabled = streamInfo?.audio.enabled !== undefined ? streamInfo.audio.enabled : true;
|
|
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}`);
|
|
53
95
|
}
|
|
54
96
|
else {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
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', '-re', '-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}`);
|
|
97
|
+
videoArgs.push('-vcodec', 'copy');
|
|
98
|
+
}
|
|
99
|
+
if (audioEnabled) {
|
|
100
|
+
if (!isAAC) {
|
|
101
|
+
this.logger.warn(this.cameraDevice.name, 'Recording audio is not explicitly AAC, forcing transcoding. Setting audio output to AAC is recommended.');
|
|
102
|
+
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}`);
|
|
93
103
|
}
|
|
94
104
|
else {
|
|
95
|
-
|
|
105
|
+
audioArgs.push('-acodec', 'copy', '-bsf:a', 'aac_adtstoasc');
|
|
96
106
|
}
|
|
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
|
-
}
|
|
105
|
-
}
|
|
106
|
-
await this.server.createServer(ffmpegPath, ffmpegInput, videoArgs, audioArgs);
|
|
107
107
|
}
|
|
108
|
+
await this.server.createServer(ffmpegPath, ffmpegInput, videoArgs, audioArgs);
|
|
108
109
|
if (!this.server || this.server.destroyed) {
|
|
109
110
|
this.logger.warn(this.cameraDevice.name, 'Server was destroyed, cannot start recording stream!');
|
|
110
111
|
await this.cleanupRecording();
|
|
@@ -118,16 +119,16 @@ export class RecordingDelegate {
|
|
|
118
119
|
isLastSegment = true;
|
|
119
120
|
}, this.maxVideoDuration);
|
|
120
121
|
try {
|
|
121
|
-
let checkMp4 =
|
|
122
|
+
let checkMp4 = true;
|
|
122
123
|
let needSkip = true;
|
|
123
124
|
let pending = [];
|
|
124
125
|
let ftyp;
|
|
125
126
|
let moov;
|
|
126
127
|
for await (const box of this.server.generator()) {
|
|
127
128
|
const { header, type, data } = box;
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
129
|
+
if (checkMp4 && !ftyp && type === 'ftyp') {
|
|
130
|
+
ftyp = [header, data];
|
|
131
|
+
}
|
|
131
132
|
if (checkMp4 && !moov && type === 'moov') {
|
|
132
133
|
moov = [header, data];
|
|
133
134
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"recordingDelegate.js","sourceRoot":"","sources":["../../src/camera/recordingDelegate.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,9 @@ export declare class CameraServices {
|
|
|
10
10
|
private onDoorbellPressed?;
|
|
11
11
|
private onLightSwitched?;
|
|
12
12
|
private onBatteryChanged?;
|
|
13
|
+
private motionTimeout?;
|
|
14
|
+
private maxMotionTime;
|
|
15
|
+
private motionTimeoutDuration;
|
|
13
16
|
constructor(accessory: Accessory, cameraDevice: CameraDevice, logger: PluginLogger);
|
|
14
17
|
addServices(): void;
|
|
15
18
|
private addBatteryService;
|
package/dist/camera/services.js
CHANGED
|
@@ -8,20 +8,20 @@ export class CameraServices {
|
|
|
8
8
|
onDoorbellPressed;
|
|
9
9
|
onLightSwitched;
|
|
10
10
|
onBatteryChanged;
|
|
11
|
+
motionTimeout;
|
|
12
|
+
maxMotionTime = 2 * 60 * 1000;
|
|
13
|
+
motionTimeoutDuration = 30000;
|
|
11
14
|
constructor(accessory, cameraDevice, logger) {
|
|
12
15
|
this.accessory = accessory;
|
|
13
16
|
this.cameraDevice = cameraDevice;
|
|
14
17
|
this.logger = logger;
|
|
15
|
-
this.cameraDevice.onPropertyChange('hasMotionDetector').subscribe(({ newData }) => {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
this.accessory.getService(Service.MotionSensor)?.getCharacteristic(Characteristic.MotionDetected).updateValue(false);
|
|
23
|
-
}
|
|
24
|
-
});
|
|
18
|
+
// this.cameraDevice.onPropertyChange('hasMotionDetector').subscribe(({ newData }) => {
|
|
19
|
+
// if (newData) {
|
|
20
|
+
// this.addMotionService();
|
|
21
|
+
// } else {
|
|
22
|
+
// this.removeMotionService();
|
|
23
|
+
// }
|
|
24
|
+
// });
|
|
25
25
|
this.cameraDevice.onPropertyChange('hasLight').subscribe(({ newData }) => {
|
|
26
26
|
if (newData) {
|
|
27
27
|
this.addLightService();
|
|
@@ -67,13 +67,19 @@ export class CameraServices {
|
|
|
67
67
|
batteryService.addCharacteristic(Characteristic.ChargingState);
|
|
68
68
|
}
|
|
69
69
|
batteryService.getCharacteristic(Characteristic.BatteryLevel).on('change', (change) => {
|
|
70
|
-
|
|
70
|
+
if (change.oldValue !== change.newValue) {
|
|
71
|
+
this.logger.debug(this.cameraDevice.name, 'Battery level changed to', change.newValue);
|
|
72
|
+
}
|
|
71
73
|
});
|
|
72
74
|
batteryService.getCharacteristic(Characteristic.StatusLowBattery).on('change', (change) => {
|
|
73
|
-
|
|
75
|
+
if (change.oldValue !== change.newValue) {
|
|
76
|
+
this.logger.debug(this.cameraDevice.name, 'Battery state changed to', change.newValue);
|
|
77
|
+
}
|
|
74
78
|
});
|
|
75
79
|
batteryService.getCharacteristic(Characteristic.ChargingState).on('change', (change) => {
|
|
76
|
-
|
|
80
|
+
if (change.oldValue !== change.newValue) {
|
|
81
|
+
this.logger.debug(this.cameraDevice.name, 'Battery charging state changed to', change.newValue);
|
|
82
|
+
}
|
|
77
83
|
});
|
|
78
84
|
this.onBatteryChanged = this.cameraDevice.onBatteryChanged.subscribe(({ level, lowBattery, charging }) => {
|
|
79
85
|
const low = lowBattery || level <= 10 ? Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
@@ -96,16 +102,33 @@ export class CameraServices {
|
|
|
96
102
|
}
|
|
97
103
|
addMotionService() {
|
|
98
104
|
let motionService = this.accessory.getService(Service.MotionSensor);
|
|
99
|
-
// if (!motionService && this.cameraDevice.hasMotionDetector) {
|
|
100
105
|
if (!motionService) {
|
|
101
106
|
this.logger.debug(this.cameraDevice.name, 'Adding motion service');
|
|
102
107
|
motionService = this.accessory.addService(Service.MotionSensor, 'Motion Sensor');
|
|
103
108
|
motionService.getCharacteristic(Characteristic.MotionDetected).on('change', (change) => {
|
|
104
|
-
|
|
109
|
+
if (change.oldValue !== change.newValue) {
|
|
110
|
+
this.logger.debug(this.cameraDevice.name, 'Motion state changed to', change.newValue);
|
|
111
|
+
// after maxMotionTime, reset motion state
|
|
112
|
+
if (change.newValue) {
|
|
113
|
+
clearTimeout(this.motionTimeout);
|
|
114
|
+
this.motionTimeout = setTimeout(() => {
|
|
115
|
+
this.logger.debug(this.cameraDevice.name, 'Resetting motion state');
|
|
116
|
+
motionService?.getCharacteristic(Characteristic.MotionDetected).updateValue(false);
|
|
117
|
+
}, this.maxMotionTime);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
105
120
|
});
|
|
106
121
|
this.onMotionDetected = this.cameraDevice.onMotionDetected.subscribe(({ state, detections }) => {
|
|
122
|
+
clearTimeout(this.motionTimeout);
|
|
107
123
|
const detected = state || detections.length > 0;
|
|
108
|
-
|
|
124
|
+
if (detected) {
|
|
125
|
+
motionService?.getCharacteristic(Characteristic.MotionDetected).updateValue(detected);
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
this.motionTimeout = setTimeout(() => {
|
|
129
|
+
motionService?.getCharacteristic(Characteristic.MotionDetected).updateValue(detected);
|
|
130
|
+
}, this.motionTimeoutDuration);
|
|
131
|
+
}
|
|
109
132
|
});
|
|
110
133
|
this.services.push(motionService);
|
|
111
134
|
}
|
|
@@ -125,7 +148,9 @@ export class CameraServices {
|
|
|
125
148
|
this.logger.debug(this.cameraDevice.name, 'Adding doorbell service');
|
|
126
149
|
doorbellService = this.accessory.addService(Service.Doorbell, 'Doorbell');
|
|
127
150
|
doorbellService.getCharacteristic(Characteristic.ProgrammableSwitchEvent).on('change', (change) => {
|
|
128
|
-
|
|
151
|
+
if (change.oldValue !== change.newValue) {
|
|
152
|
+
this.logger.debug(this.cameraDevice.name, 'Doorbell state changed to', change.newValue);
|
|
153
|
+
}
|
|
129
154
|
});
|
|
130
155
|
this.onDoorbellPressed = this.cameraDevice.onDoorbellPressed.subscribe(({ state }) => {
|
|
131
156
|
if (state) {
|
|
@@ -150,7 +175,9 @@ export class CameraServices {
|
|
|
150
175
|
this.logger.debug(this.cameraDevice.name, 'Adding light service');
|
|
151
176
|
lightService = this.accessory.addService(Service.Lightbulb, 'Light');
|
|
152
177
|
lightService.getCharacteristic(Characteristic.On).on('change', (change) => {
|
|
153
|
-
|
|
178
|
+
if (change.oldValue !== change.newValue) {
|
|
179
|
+
this.logger.debug(this.cameraDevice.name, 'Light state changed to', change.newValue);
|
|
180
|
+
}
|
|
154
181
|
});
|
|
155
182
|
this.onLightSwitched = this.cameraDevice.onLightSwitched.subscribe(({ state }) => {
|
|
156
183
|
lightService?.getCharacteristic(Characteristic.On).updateValue(state);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/camera/services.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAMrD,MAAM,OAAO,cAAc;IAClB,QAAQ,GAAc,EAAE,CAAC;IAExB,SAAS,CAAY;IACrB,YAAY,CAAe;IAC3B,MAAM,CAAe;IAErB,gBAAgB,CAAgB;IAChC,iBAAiB,CAAgB;IACjC,eAAe,CAAgB;IAC/B,gBAAgB,CAAgB;
|
|
1
|
+
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/camera/services.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAMrD,MAAM,OAAO,cAAc;IAClB,QAAQ,GAAc,EAAE,CAAC;IAExB,SAAS,CAAY;IACrB,YAAY,CAAe;IAC3B,MAAM,CAAe;IAErB,gBAAgB,CAAgB;IAChC,iBAAiB,CAAgB;IACjC,eAAe,CAAgB;IAC/B,gBAAgB,CAAgB;IAEhC,aAAa,CAAkB;IAC/B,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;IAC9B,qBAAqB,GAAG,KAAK,CAAC;IAEtC,YAAY,SAAoB,EAAE,YAA0B,EAAE,MAAoB;QAChF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,uFAAuF;QACvF,mBAAmB;QACnB,+BAA+B;QAC/B,aAAa;QACb,kCAAkC;QAClC,MAAM;QACN,MAAM;QAEN,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YACvE,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YAC9E,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YACzE,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAEM,WAAW;QAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAE7D,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAEO,iBAAiB;QACvB,IAAI,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;YACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;YAEpE,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAEvE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;gBACpE,cAAc,CAAC,iBAAiB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;YAChE,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC;gBACrE,cAAc,CAAC,iBAAiB,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YACjE,CAAC;YAED,cAAc,CAAC,iBAAiB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBACpF,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,0BAA0B,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACzF,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,cAAc,CAAC,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBACxF,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,0BAA0B,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACzF,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,cAAc,CAAC,iBAAiB,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBACrF,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,mCAAmC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAClG,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACvG,MAAM,GAAG,GAAG,UAAU,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,oBAAoB,CAAC;gBACjJ,MAAM,KAAK,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,YAAY,CAAC;gBAEpH,cAAc,EAAE,iBAAiB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAClF,cAAc,EAAE,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACpF,cAAc,EAAE,iBAAiB,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACrF,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEO,oBAAoB;QAC1B,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAElE,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC;YAEtE,IAAI,CAAC,gBAAgB,EAAE,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YAC7C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1F,CAAC;IACH,CAAC;IAEO,gBAAgB;QACtB,IAAI,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEpE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;YAEnE,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;YACjF,aAAa,CAAC,iBAAiB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBACrF,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,yBAAyB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAEtF,0CAA0C;oBAC1C,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;wBACpB,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBACjC,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;4BACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;4BACpE,aAAa,EAAE,iBAAiB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;wBACrF,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;oBACzB,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE;gBAC7F,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBACjC,MAAM,QAAQ,GAAG,KAAK,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;gBAEhD,IAAI,QAAQ,EAAE,CAAC;oBACb,aAAa,EAAE,iBAAiB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACxF,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;wBACnC,aAAa,EAAE,iBAAiB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;oBACxF,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,wCAAwC;IACxC,2EAA2E;IAE3E,yBAAyB;IACzB,4EAA4E;IAE5E,4CAA4C;IAC5C,mDAAmD;IACnD,8FAA8F;IAC9F,MAAM;IACN,IAAI;IAEI,kBAAkB;QACxB,IAAI,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;YAErE,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC1E,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBAChG,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,2BAA2B,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC1F,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBACnF,IAAI,KAAK,EAAE,CAAC;oBACV,eAAe,EAAE,iBAAiB,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;gBAC9I,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAEO,qBAAqB;QAC3B,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEpE,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC;YAEvE,IAAI,CAAC,iBAAiB,EAAE,WAAW,EAAE,CAAC;YACtC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;YAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;IAEO,eAAe;QACrB,IAAI,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEhE,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;YAElE,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACrE,YAAY,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBACxE,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,wBAAwB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACvF,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC/E,YAAY,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAEO,kBAAkB;QACxB,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAElE,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;YAEpE,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YAC3C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;CACF"}
|
|
@@ -27,7 +27,7 @@ export class StreamingDelegate {
|
|
|
27
27
|
try {
|
|
28
28
|
this.logger.log(this.cameraDevice.name, 'Fetching snapshot', request);
|
|
29
29
|
const snapshot = await this.cameraDevice.snapshot();
|
|
30
|
-
let snapshotBuffer = Buffer.from(snapshot);
|
|
30
|
+
let snapshotBuffer = snapshot ? Buffer.from(snapshot) : undefined;
|
|
31
31
|
if (!snapshotBuffer || snapshotBuffer.length === 0) {
|
|
32
32
|
this.logger.log(this.cameraDevice.name, 'No snapshot available, sending offline image');
|
|
33
33
|
snapshotBuffer = await readFileAsync(noSnapshotPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamingDelegate.js","sourceRoot":"","sources":["../../src/camera/streamingDelegate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAc9D,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC;AACrC,CAAC;AAED,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAC1C,0DAA0D;AAC1D,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,EAAE,4BAA4B,CAAC,CAAC;AACxE,0DAA0D;AAC1D,gEAAgE;AAEhE,MAAM,OAAO,iBAAiB;IACpB,eAAe,CAAkB;IACjC,YAAY,CAAe;IAC3B,MAAM,CAAe;IAErB,QAAQ,GAAsD,EAAE,CAAC;IAEzE,YAAY,eAAgC,EAAE,YAA0B,EAAE,MAAoB;QAC5F,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,OAAwB,EAAE,QAAiC;QAC5F,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAEtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YACpD,IAAI,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"streamingDelegate.js","sourceRoot":"","sources":["../../src/camera/streamingDelegate.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,6 @@ 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>;
|
|
20
19
|
destroy(): Promise<void>;
|
|
21
20
|
generator(): AsyncGenerator<MP4Atom>;
|
|
22
21
|
private handleConnection;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
2
|
import { once } from 'node:events';
|
|
3
|
-
import {
|
|
3
|
+
import { createServer } from 'node:net';
|
|
4
4
|
export class MP4StreamingServer {
|
|
5
5
|
debugMode = false;
|
|
6
6
|
destroyed = false;
|
|
@@ -27,19 +27,7 @@ export class MP4StreamingServer {
|
|
|
27
27
|
});
|
|
28
28
|
this.server = createServer(this.handleConnection.bind(this));
|
|
29
29
|
const ffmpeg = ffmpegPath;
|
|
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
|
-
];
|
|
30
|
+
const args = [...ffmpegInput, ...videoOutputArgs, ...audioOutputArgs, '-movflags', 'frag_keyframe+empty_moov+default_base_moof+skip_sidx+skip_trailer', '-f', 'mp4'];
|
|
43
31
|
const promise = once(this.server, 'listening');
|
|
44
32
|
this.server.listen(); // listen on random port
|
|
45
33
|
await promise;
|
|
@@ -55,20 +43,6 @@ export class MP4StreamingServer {
|
|
|
55
43
|
this.childProcess.stderr?.on('data', (data) => this.logger.debug(this.cameraDevice.name, data.toString()));
|
|
56
44
|
}
|
|
57
45
|
}
|
|
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
|
-
}
|
|
72
46
|
async destroy() {
|
|
73
47
|
this.socket?.destroy();
|
|
74
48
|
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,
|
|
1
|
+
{"version":3,"file":"streamingServer.js","sourceRoot":"","sources":["../../src/camera/streamingServer.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.4",
|
|
5
5
|
"description": "camera.ui homekit plugin",
|
|
6
6
|
"author": "seydx (https://github.com/seydx/camera.ui)",
|
|
7
7
|
"main": "./dist/index.js",
|
|
@@ -19,15 +19,15 @@
|
|
|
19
19
|
"chacha": "^2.1.0",
|
|
20
20
|
"hap-nodejs": "^1.1.0",
|
|
21
21
|
"rxjs": "^7.8.1",
|
|
22
|
-
"werift": "^0.19.
|
|
22
|
+
"werift": "^0.19.6"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@camera.ui/types": "^0.0.
|
|
25
|
+
"@camera.ui/types": "^0.0.56",
|
|
26
26
|
"@rushstack/eslint-patch": "^1.10.4",
|
|
27
|
-
"@types/node": "^22.
|
|
27
|
+
"@types/node": "^22.3.0",
|
|
28
28
|
"@types/ws": "^8.5.12",
|
|
29
|
-
"@typescript-eslint/eslint-plugin": "^8.0
|
|
30
|
-
"@typescript-eslint/parser": "^8.0
|
|
29
|
+
"@typescript-eslint/eslint-plugin": "^8.1.0",
|
|
30
|
+
"@typescript-eslint/parser": "^8.1.0",
|
|
31
31
|
"concurrently": "^8.2.2",
|
|
32
32
|
"eslint": "8.57.0",
|
|
33
33
|
"eslint-config-prettier": "^9.1.0",
|