michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-05-26 14:40:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:koush/scrypted

Browse Source
This commit is contained in:
Koushik Dutta
2023-03-01 14:51:55 -08:00
parent 3c237eac91 fa218cbcbd
commit 69d7ff2ced
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/remote/src/main.ts
View File

@@ -1,4 +1,4 @@
import { Device, DeviceProvider, DeviceCreator, DeviceCreatorSettings, ScryptedDevice, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, Setting, Settings, Battery, VideoCamera, SettingValue, RequestMediaStreamOptions, MediaObject, DeviceManifest} from '@scrypted/sdk';
import { Device, DeviceProvider, DeviceCreator, DeviceCreatorSettings, ScryptedDevice, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, Setting, Settings, Battery, SettingValue, DeviceManifest} from '@scrypted/sdk';
import sdk from '@scrypted/sdk';
import { StorageSettings } from '@scrypted/sdk/storage-settings';
import { connectScryptedClient, ScryptedClientStatic } from '@scrypted/client';
@@ -111,28 +111,15 @@ class ScryptedRemoteInstance extends ScryptedDeviceBase implements DeviceProvide
deviceManager.getDeviceState(device.nativeId).batteryLevel = (<Battery>remoteDevice).batteryLevel;
}
// since the remote may be using rebroadcast, explicitly request the external
// address for video streams
if (device.interfaces.includes(ScryptedInterface.VideoCamera)) {
const remoteGetVideoStream = (<VideoCamera><any>remoteDevice).getVideoStream;
(<VideoCamera><any>remoteDevice).getVideoStream = async (options?: RequestMediaStreamOptions): Promise<MediaObject> => {
if (!options) {
options = {};
}
(<any>options).route = "external";
return await remoteGetVideoStream(options);
}
}
// for device providers, we need to translate the nativeId
// for device providers, we intercept calls to load device representations
// stored within this plugin instance, instead of directly from the remote
if (device.interfaces.includes(ScryptedInterface.DeviceProvider)) {
const plugin = this;
(<DeviceProvider><any>remoteDevice).getDevice = async (nativeId: string): Promise<Device> => {
return <Device>plugin.devices.get(nativeId);
return <Device>this.devices.get(nativeId);
}
(<DeviceProvider><any>remoteDevice).releaseDevice = async (id: string, nativeId: string): Promise<any> => {
// don't delete the device from the remote
plugin.releaseDevice(id, nativeId);
this.releaseDevice(id, nativeId);
}
}
}