michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-15 19:22:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

onvif: update for new rtsp code

Browse Source
This commit is contained in:
Koushik Dutta
2021-09-23 19:20:36 -07:00
parent ab40eb43ed
commit 39b183959d
2 changed files with 25 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
plugins/onvif/src/main.ts
View File

@@ -6,48 +6,29 @@ import { connectCameraAPI, OnvifEvent } from "./onvif-api";
const { mediaManager } = sdk;
class OnvifCamera extends RtspSmartCamera implements Camera {
class OnvifCamera extends RtspSmartCamera {
eventStream: Stream;
listenEvents(): EventEmitter & Destroyable {
(async () => {
const client = await this.createClient();
const events = client.listenEvents();
events.on('event', event => {
if (event === OnvifEvent.MotionStart)
this.motionDetected = true;
else if (event === OnvifEvent.MotionStop)
this.motionDetected = false;
else if (event === OnvifEvent.AudioStart)
this.audioDetected = true;
else if (event === OnvifEvent.AudioStop)
this.audioDetected = false;
})
})();
const ret: any = new EventEmitter();
ret.destroy = () => {
};
return ret;
}
constructor(nativeId: string) {
super(nativeId);
this.createMotionStream();
}
async createMotionStream() {
while (true) {
try {
this.motionDetected = false;
this.audioDetected = false;
const api = await this.createClient();
for await (const event of api.listenEvents()) {
if (event === OnvifEvent.MotionStart)
this.motionDetected = true;
else if (event === OnvifEvent.MotionStop)
this.motionDetected = false;
else if (event === OnvifEvent.AudioStart)
this.audioDetected = true;
else if (event === OnvifEvent.AudioStop)
this.audioDetected = false;
}
}
catch (e) {
console.error('event listener failure', e);
await new Promise(resolve => setTimeout(resolve, 10000));
}
}
}
createClient() {
return connectCameraAPI(this.storage.getItem('ip'), this.getUsername(), this.getPassword());
}

25
plugins/onvif/src/onvif-api.ts
View File

@@ -1,4 +1,5 @@
import { EventEmitter, once } from 'events';
import { Destroyable } from '../../rtsp/src/rtsp';
import DigestClient from './digest-client';
const onvif = require('onvif');
@@ -11,37 +12,31 @@ export enum OnvifEvent {
AudioStop,
}
export class OnvifCameraAPI extends EventEmitter {
export class OnvifCameraAPI {
digestAuth: DigestClient;
constructor(public cam: any, username: string, password: string) {
super();
this.digestAuth = new DigestClient(username, password);
}
async* listenEvents() {
listenEvents() {
const ret = new EventEmitter();
this.cam.on('event', (event: any) => {
const value = event.message?.message?.data?.simpleItem?.$?.Value;
if (event.topic?._?.indexOf('MotionAlarm') !== -1) {
if (value === true)
this.emit('event', OnvifEvent.MotionStart)
ret.emit('event', OnvifEvent.MotionStart)
else if (value === false)
this.emit('event', OnvifEvent.MotionStop)
ret.emit('event', OnvifEvent.MotionStop)
}
else if (event.topic?._?.indexOf('DetectedSound') !== -1) {
if (value === true)
this.emit('event', OnvifEvent.AudioStart)
ret.emit('event', OnvifEvent.AudioStart)
if (value === false)
this.emit('event', OnvifEvent.AudioStop)
ret.emit('event', OnvifEvent.AudioStop)
}
});
while (true) {
const [event] = await once(this, 'event');
yield event as OnvifEvent;
}
return ret;
}
async getStreamUrl(): Promise<string> {
@@ -51,7 +46,7 @@ export class OnvifCameraAPI extends EventEmitter {
async jpegSnapshot(): Promise<Buffer> {
const url: string = (await new Promise((resolve, reject) => this.cam.getSnapshotUri((err: Error, uri: string) => err ? reject(err) : resolve(uri))) as any).uri;
const response = await this.digestAuth.fetch( url);
const response = await this.digestAuth.fetch(url);
const buffer = await response.arrayBuffer();
return Buffer.from(buffer);