Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/lib/Accessory.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
Units,
} from './Characteristic.js'
import { createCameraControllerOptions, MOCK_IMAGE } from './controller/CameraController.spec.js'
import { CameraController, Controller, ControllerIdentifier, ControllerServiceMap } from './controller/index.js'
import { CameraController, Controller, ControllerIdentifier, ControllerServiceMap, ResourceRequestReason, SnapshotController } from './controller/index.js'
import { HAPHTTPCode, HAPServer, HAPStatus, IdentifyCallback, TLVErrorCode } from './HAPServer.js'
import { AccessoryInfo, PairingInformation, PermissionTypes } from './model/AccessoryInfo.js'
import { IdentifierCache } from './model/IdentifierCache.js'
Expand Down Expand Up @@ -2384,6 +2384,23 @@ describe('accessory', () => {
expect(callback).toHaveBeenCalledWith(undefined, MOCK_IMAGE)
})

it('retrieve image resource from any snapshot controller', async () => {
accessory.removeController(cameraController)
const snapshotController: SnapshotController = {
controllerId: () => 'snapshot',
constructServices: () => ({}),
initWithServices: () => undefined,
configureServices: () => undefined,
handleControllerRemoved: () => undefined,
handleSnapshotRequest: vi.fn().mockResolvedValue(MOCK_IMAGE),
}
accessory.configureController(snapshotController)

await testRequestResponse({ reason: ResourceRequestReason.PERIODIC })
expect(callback).toHaveBeenCalledWith(undefined, MOCK_IMAGE)
expect(snapshotController.handleSnapshotRequest).toHaveBeenCalledWith(200, 200, accessory.displayName, ResourceRequestReason.PERIODIC)
})

it('retrieve image resource on bridge', async () => {
accessory.addBridgedAccessory(new Accessory('Bridged accessory', uuid.generate('bridged')))
accessory._assignIDs(accessory._identifierCache!)
Expand Down
9 changes: 5 additions & 4 deletions src/lib/Accessory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ import {
Perms,
} from './Characteristic.js'
import {
CameraController,
Controller,
ControllerConstructor,
ControllerIdentifier,
ControllerServiceMap,
isSerializableController,
isSnapshotController,
SnapshotController,
} from './controller/index.js'
import {
AccessoriesCallback,
Expand Down Expand Up @@ -432,7 +433,7 @@ export class Accessory extends EventEmitter {

private controllers: Record<ControllerIdentifier, ControllerContext> = {}
private serializedControllers?: Record<ControllerIdentifier, ControllerServiceMap> // store uninitialized controller data after a Accessory.deserialize call
private activeCameraController?: CameraController
private activeCameraController?: SnapshotController

/**
* @private
Expand Down Expand Up @@ -847,7 +848,7 @@ export class Accessory extends EventEmitter {

this.controllers[id] = context

if (controller instanceof CameraController) { // save CameraController for Snapshot handling
if (isSnapshotController(controller)) { // save the controller for snapshot handling
this.activeCameraController = controller
}
}
Expand Down Expand Up @@ -1911,7 +1912,7 @@ export class Accessory extends EventEmitter {
const aid = data.aid // aid is optionally supplied by HomeKit (for example when camera is bridged, multiple cams, etc)

let accessory: Accessory | undefined
let controller: CameraController | undefined
let controller: SnapshotController | undefined
if (aid) {
accessory = this.getAccessoryByAID(aid)
if (accessory && accessory.activeCameraController) {
Expand Down
135 changes: 135 additions & 0 deletions src/lib/Characteristic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,20 @@ import type {
AudioFeedback,
BatteryLevel,
Brightness,
BufferActivityCommand,
BufferEventCommand,
BufferEventSequenceNumber,
BufferUploadCommand,
ButtonEvent,
CameraCapabilitiesConfiguration,
CameraClientCertificate,
CameraClientCertificateStatus,
CameraClientCSR,
CameraKey,
CameraKeyID,
CameraOperatingModeIndicator,
CameraRecordingPublishingPoint,
CameraZones,
CarbonDioxideDetected,
CarbonDioxideLevel,
CarbonDioxidePeakLevel,
Expand All @@ -36,6 +48,7 @@ import type {
ConfiguredName,
ConnectionHealthMonitor,
ContactSensorState,
ContributingSensors,
CoolingThresholdTemperature,
CryptoHash,
CurrentAirPurifierState,
Expand Down Expand Up @@ -105,6 +118,7 @@ import type {
MetricsBufferFullState,
Model,
MotionDetected,
MotionEnabled,
MultifunctionButton,
Mute,
Name,
Expand Down Expand Up @@ -153,6 +167,7 @@ import type {
RotationDirection,
RotationSpeed,
RouterStatus,
RTPStreamingControl,
Saturation,
SecuritySystemAlarmType,
SecuritySystemCurrentState,
Expand All @@ -163,6 +178,7 @@ import type {
SelectedRTPStreamConfiguration,
SelectedSessionKeepaliveConfigurationList,
SelectedSleepConfiguration,
SensorUUID,
SerialNumber,
ServiceLabelIndex,
ServiceLabelNamespace,
Expand All @@ -189,11 +205,13 @@ import type {
StatusJammed,
StatusLowBattery,
StatusTampered,
StreamingEnabled,
StreamingStatus,
SulphurDioxideDensity,
SupportedAssetTypes,
SupportedAudioRecordingConfiguration,
SupportedAudioStreamConfiguration,
SupportedAudioStreamTiers,
SupportedCameraRecordingConfiguration,
SupportedCharacteristicValueTransitionConfiguration,
SupportedDataStreamTransportConfiguration,
Expand All @@ -208,6 +226,7 @@ import type {
SupportedTransferTransportConfiguration,
SupportedVideoRecordingConfiguration,
SupportedVideoStreamConfiguration,
SupportedVideoStreamTiers,
SwingMode,
TapType,
TargetAirPurifierState,
Expand Down Expand Up @@ -249,6 +268,14 @@ import type {
WANConfigurationList,
WANStatusList,
WaterLevel,
WebRTCNumberOfActiveSessions,
WebRTCProvideAnswer,
WebRTCReoffer,
WebRTCSolicitOffer,
WebRTCStreamingControl,
WebRTCSupportedAudioStreamTiers,
WebRTCSupportedVideoStreamTiers,
WebRTCUpdateSession,
WiFiCapabilities,
WiFiConfigurationControl,
WiFiSatelliteStatus,
Expand Down Expand Up @@ -815,14 +842,62 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static Brightness: typeof Brightness
/**
* @group Characteristic Definitions
*/
public static BufferActivityCommand: typeof BufferActivityCommand
/**
* @group Characteristic Definitions
*/
public static BufferEventCommand: typeof BufferEventCommand
/**
* @group Characteristic Definitions
*/
public static BufferEventSequenceNumber: typeof BufferEventSequenceNumber
/**
* @group Characteristic Definitions
*/
public static BufferUploadCommand: typeof BufferUploadCommand
/**
* @group Characteristic Definitions
*/
public static ButtonEvent: typeof ButtonEvent
/**
* @group Characteristic Definitions
*/
public static CameraCapabilitiesConfiguration: typeof CameraCapabilitiesConfiguration
/**
* @group Characteristic Definitions
*/
public static CameraClientCertificate: typeof CameraClientCertificate
/**
* @group Characteristic Definitions
*/
public static CameraClientCertificateStatus: typeof CameraClientCertificateStatus
/**
* @group Characteristic Definitions
*/
public static CameraClientCSR: typeof CameraClientCSR
/**
* @group Characteristic Definitions
*/
public static CameraKey: typeof CameraKey
/**
* @group Characteristic Definitions
*/
public static CameraKeyID: typeof CameraKeyID
/**
* @group Characteristic Definitions
*/
public static CameraOperatingModeIndicator: typeof CameraOperatingModeIndicator
/**
* @group Characteristic Definitions
*/
public static CameraRecordingPublishingPoint: typeof CameraRecordingPublishingPoint
/**
* @group Characteristic Definitions
*/
public static CameraZones: typeof CameraZones
/**
* @group Characteristic Definitions
*/
Expand Down Expand Up @@ -891,6 +966,10 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static ContactSensorState: typeof ContactSensorState
/**
* @group Characteristic Definitions
*/
public static ContributingSensors: typeof ContributingSensors
/**
* @group Characteristic Definitions
*/
Expand Down Expand Up @@ -1167,6 +1246,10 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static MotionDetected: typeof MotionDetected
/**
* @group Characteristic Definitions
*/
public static MotionEnabled: typeof MotionEnabled
/**
* @group Characteristic Definitions
*/
Expand Down Expand Up @@ -1362,6 +1445,10 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static RouterStatus: typeof RouterStatus
/**
* @group Characteristic Definitions
*/
public static RTPStreamingControl: typeof RTPStreamingControl
/**
* @group Characteristic Definitions
*/
Expand Down Expand Up @@ -1402,6 +1489,10 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static SelectedSleepConfiguration: typeof SelectedSleepConfiguration
/**
* @group Characteristic Definitions
*/
public static SensorUUID: typeof SensorUUID
/**
* @group Characteristic Definitions
*/
Expand Down Expand Up @@ -1506,6 +1597,10 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static StatusTampered: typeof StatusTampered
/**
* @group Characteristic Definitions
*/
public static StreamingEnabled: typeof StreamingEnabled
/**
* @group Characteristic Definitions
*/
Expand All @@ -1526,6 +1621,10 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static SupportedAudioStreamConfiguration: typeof SupportedAudioStreamConfiguration
/**
* @group Characteristic Definitions
*/
public static SupportedAudioStreamTiers: typeof SupportedAudioStreamTiers
/**
* @group Characteristic Definitions
*/
Expand Down Expand Up @@ -1582,6 +1681,10 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static SupportedVideoStreamConfiguration: typeof SupportedVideoStreamConfiguration
/**
* @group Characteristic Definitions
*/
public static SupportedVideoStreamTiers: typeof SupportedVideoStreamTiers
/**
* @group Characteristic Definitions
*/
Expand Down Expand Up @@ -1752,6 +1855,38 @@ export class Characteristic extends EventEmitter {
* @group Characteristic Definitions
*/
public static WaterLevel: typeof WaterLevel
/**
* @group Characteristic Definitions
*/
public static WebRTCNumberOfActiveSessions: typeof WebRTCNumberOfActiveSessions
/**
* @group Characteristic Definitions
*/
public static WebRTCProvideAnswer: typeof WebRTCProvideAnswer
/**
* @group Characteristic Definitions
*/
public static WebRTCReoffer: typeof WebRTCReoffer
/**
* @group Characteristic Definitions
*/
public static WebRTCSolicitOffer: typeof WebRTCSolicitOffer
/**
* @group Characteristic Definitions
*/
public static WebRTCStreamingControl: typeof WebRTCStreamingControl
/**
* @group Characteristic Definitions
*/
public static WebRTCSupportedAudioStreamTiers: typeof WebRTCSupportedAudioStreamTiers
/**
* @group Characteristic Definitions
*/
public static WebRTCSupportedVideoStreamTiers: typeof WebRTCSupportedVideoStreamTiers
/**
* @group Characteristic Definitions
*/
public static WebRTCUpdateSession: typeof WebRTCUpdateSession
/**
* @group Characteristic Definitions
*/
Expand Down
Loading
Loading