From 05539f55dcdf06ebd51acb59f3ebb32abd47d2e8 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 25 Jun 2022 14:17:50 -0700 Subject: [PATCH] sdk: update sdk exports --- sdk/gen/types.input.ts | 17 ++++++++++++----- sdk/scrypted_python/scrypted_sdk/types.py | 4 +++- sdk/types/index.d.ts | 18 ++++++++++++------ sdk/types/index.js | 2 ++ sdk/types/index.ts | 17 ++++++++++++----- .../scrypted_python/scrypted_sdk/types.py | 4 +++- 6 files changed, 44 insertions(+), 18 deletions(-) diff --git a/sdk/gen/types.input.ts b/sdk/gen/types.input.ts index bf1e48106..2c67f8cbd 100644 --- a/sdk/gen/types.input.ts +++ b/sdk/gen/types.input.ts @@ -722,7 +722,7 @@ export interface Scriptable { * SoftwareUpdate provides a way to check for updates and install them. This may be a Scrypted Plugin or device firmware. */ export interface SoftwareUpdate { - checkForUpdate(): Promise; + checkForUpdate(): Promise; installUpdate(): Promise; @@ -1559,6 +1559,13 @@ export enum ScryptedMimeTypes { RTCSignalingChannel = 'x-scrypted/x-scrypted-rtc-signaling-channel', SchemePrefix = 'x-scrypted/x-scrypted-scheme-', MediaObject = 'x-scrypted/x-scrypted-media-object', + ScryptedDevice = 'x-scrypted/x-scrypted-device', + ScryptedDeviceInterface = 'x-scrypted/x-scrypted-device-interface', +} + +export interface ScryptedDeviceInterface { + id: string; + interface: ScryptedInterface; } export interface ScryptedStatic { @@ -1567,12 +1574,12 @@ export interface ScryptedStatic { */ log?: Logger, - deviceManager?: DeviceManager, - endpointManager?: EndpointManager, - mediaManager?: MediaManager, + deviceManager: DeviceManager, + endpointManager: EndpointManager, + mediaManager: MediaManager, systemManager: SystemManager, - pluginHostAPI?: any; + pluginHostAPI: any; } export declare interface DeviceState { diff --git a/sdk/scrypted_python/scrypted_sdk/types.py b/sdk/scrypted_python/scrypted_sdk/types.py index 4187bdaea..1d8bd5904 100644 --- a/sdk/scrypted_python/scrypted_sdk/types.py +++ b/sdk/scrypted_python/scrypted_sdk/types.py @@ -148,6 +148,8 @@ class ScryptedMimeTypes(Enum): PushEndpoint = "text/x-push-endpoint" RTCSignalingChannel = "x-scrypted/x-scrypted-rtc-signaling-channel" SchemePrefix = "x-scrypted/x-scrypted-scheme-" + ScryptedDevice = "x-scrypted/x-scrypted-device" + ScryptedDeviceInterface = "x-scrypted/x-scrypted-device-interface" Url = "text/x-uri" class SecuritySystemMode(Enum): @@ -902,7 +904,7 @@ class Settings: class SoftwareUpdate: updateAvailable: bool - async def checkForUpdate(self) -> None: + async def checkForUpdate(self) -> bool: pass async def installUpdate(self) -> None: pass diff --git a/sdk/types/index.d.ts b/sdk/types/index.d.ts index 9ce4fd510..56c22ac64 100644 --- a/sdk/types/index.d.ts +++ b/sdk/types/index.d.ts @@ -831,7 +831,7 @@ export interface Scriptable { * SoftwareUpdate provides a way to check for updates and install them. This may be a Scrypted Plugin or device firmware. */ export interface SoftwareUpdate { - checkForUpdate(): Promise; + checkForUpdate(): Promise; installUpdate(): Promise; updateAvailable?: boolean; } @@ -1590,18 +1590,24 @@ export declare enum ScryptedMimeTypes { FFmpegInput = "x-scrypted/x-ffmpeg-input", RTCSignalingChannel = "x-scrypted/x-scrypted-rtc-signaling-channel", SchemePrefix = "x-scrypted/x-scrypted-scheme-", - MediaObject = "x-scrypted/x-scrypted-media-object" + MediaObject = "x-scrypted/x-scrypted-media-object", + ScryptedDevice = "x-scrypted/x-scrypted-device", + ScryptedDeviceInterface = "x-scrypted/x-scrypted-device-interface" +} +export interface ScryptedDeviceInterface { + id: string; + interface: ScryptedInterface; } export interface ScryptedStatic { /** * @deprecated */ log?: Logger; - deviceManager?: DeviceManager; - endpointManager?: EndpointManager; - mediaManager?: MediaManager; + deviceManager: DeviceManager; + endpointManager: EndpointManager; + mediaManager: MediaManager; systemManager: SystemManager; - pluginHostAPI?: any; + pluginHostAPI: any; } export declare interface DeviceState { } diff --git a/sdk/types/index.js b/sdk/types/index.js index 51879c7fa..6d06257c7 100644 --- a/sdk/types/index.js +++ b/sdk/types/index.js @@ -827,5 +827,7 @@ var ScryptedMimeTypes; ScryptedMimeTypes["RTCSignalingChannel"] = "x-scrypted/x-scrypted-rtc-signaling-channel"; ScryptedMimeTypes["SchemePrefix"] = "x-scrypted/x-scrypted-scheme-"; ScryptedMimeTypes["MediaObject"] = "x-scrypted/x-scrypted-media-object"; + ScryptedMimeTypes["ScryptedDevice"] = "x-scrypted/x-scrypted-device"; + ScryptedMimeTypes["ScryptedDeviceInterface"] = "x-scrypted/x-scrypted-device-interface"; })(ScryptedMimeTypes = exports.ScryptedMimeTypes || (exports.ScryptedMimeTypes = {})); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/sdk/types/index.ts b/sdk/types/index.ts index e2bc02f1b..33b867a5e 100644 --- a/sdk/types/index.ts +++ b/sdk/types/index.ts @@ -1476,7 +1476,7 @@ export interface Scriptable { * SoftwareUpdate provides a way to check for updates and install them. This may be a Scrypted Plugin or device firmware. */ export interface SoftwareUpdate { - checkForUpdate(): Promise; + checkForUpdate(): Promise; installUpdate(): Promise; @@ -2313,6 +2313,13 @@ export enum ScryptedMimeTypes { RTCSignalingChannel = 'x-scrypted/x-scrypted-rtc-signaling-channel', SchemePrefix = 'x-scrypted/x-scrypted-scheme-', MediaObject = 'x-scrypted/x-scrypted-media-object', + ScryptedDevice = 'x-scrypted/x-scrypted-device', + ScryptedDeviceInterface = 'x-scrypted/x-scrypted-device-interface', +} + +export interface ScryptedDeviceInterface { + id: string; + interface: ScryptedInterface; } export interface ScryptedStatic { @@ -2321,12 +2328,12 @@ export interface ScryptedStatic { */ log?: Logger, - deviceManager?: DeviceManager, - endpointManager?: EndpointManager, - mediaManager?: MediaManager, + deviceManager: DeviceManager, + endpointManager: EndpointManager, + mediaManager: MediaManager, systemManager: SystemManager, - pluginHostAPI?: any; + pluginHostAPI: any; } export declare interface DeviceState { diff --git a/sdk/types/scrypted_python/scrypted_sdk/types.py b/sdk/types/scrypted_python/scrypted_sdk/types.py index 4187bdaea..1d8bd5904 100644 --- a/sdk/types/scrypted_python/scrypted_sdk/types.py +++ b/sdk/types/scrypted_python/scrypted_sdk/types.py @@ -148,6 +148,8 @@ class ScryptedMimeTypes(Enum): PushEndpoint = "text/x-push-endpoint" RTCSignalingChannel = "x-scrypted/x-scrypted-rtc-signaling-channel" SchemePrefix = "x-scrypted/x-scrypted-scheme-" + ScryptedDevice = "x-scrypted/x-scrypted-device" + ScryptedDeviceInterface = "x-scrypted/x-scrypted-device-interface" Url = "text/x-uri" class SecuritySystemMode(Enum): @@ -902,7 +904,7 @@ class Settings: class SoftwareUpdate: updateAvailable: bool - async def checkForUpdate(self) -> None: + async def checkForUpdate(self) -> bool: pass async def installUpdate(self) -> None: pass