michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-03-20 08:30:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

core/mqtt: scripting fixes

Browse Source
This commit is contained in:
Koushik Dutta
2024-07-23 09:22:15 -07:00
parent cd3c748dd0
commit 90b6fc1e49
6 changed files with 13 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/eval/monaco-libs.ts
View File

@@ -45,7 +45,7 @@ export function createMonacoEvalDefaultsWithLibs(standardLibs: StandardLibs, scr
const libs: any = {
...scryptedLibs,
extraLibs,
...extraLibs,
};
const catLibs = Object.values(libs).join('\n');
@@ -65,8 +65,6 @@ export function createMonacoEvalDefaultsWithLibs(standardLibs: StandardLibs, scr
const endpointManager: EndpointManager;
const mediaManager: MediaManager;
const systemManager: SystemManager;
const mqtt: MqttClient;
const device: ScryptedDeviceBase & { pathname : string };
const eventSource: ScryptedDevice;
const eventDetails: EventDetails;

4
common/src/eval/monaco/script-device.ts
View File

@@ -1,3 +1,5 @@
import type { ScryptedDeviceBase } from "@scrypted/sdk";
export interface ScriptDevice {
/**
* @deprecated Use the default export to specify the device handler.
@@ -6,3 +8,5 @@ export interface ScriptDevice {
handle<T>(handler?: T & object): void;
handleTypes(...interfaces: string[]): void;
}
export declare const device: ScryptedDeviceBase & ScriptDevice;

4
plugins/core/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/core",
"version": "0.3.57",
"version": "0.3.58",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/core",
"version": "0.3.57",
"version": "0.3.58",
"license": "Apache-2.0",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/core/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/core",
"version": "0.3.57",
"version": "0.3.58",
"description": "Scrypted Core plugin. Provides the UI, websocket, and engine.io APIs.",
"author": "Scrypted",
"license": "Apache-2.0",

64
plugins/mqtt/src/api/util.ts
View File

@@ -1,63 +1,3 @@
import type { ScryptedDeviceBase } from "@scrypted/sdk";
import type { MqttClient, MqttEvent, MqttSubscriptions } from "./mqtt-client";
import type { MqttClient } from "./mqtt-client";
declare const device: ScryptedDeviceBase;
declare const mqtt: MqttClient;
export function createSensor(options: {
type: string,
topic: string,
when: (message: MqttEvent) => boolean;
set: (value: boolean) => void,
delay?: number;
}) {
const subscriptions: MqttSubscriptions = {};
let timeout: NodeJS.Timeout;
subscriptions[options.topic] = message => {
const detected = options.when(message);
if (!options.delay) {
options.set(detected);
return;
}
if (!detected)
return;
options.set(true);
clearTimeout(timeout);
timeout = setTimeout(() => options.set(false), options.delay * 1000);
};
mqtt.subscribe(subscriptions);
mqtt.handleTypes(options.type);
}
export function createMotionSensor(options: {
topic: string,
when: (message: MqttEvent) => boolean;
delay?: number;
}) {
return createSensor({
type: "MotionSensor",
topic: options.topic,
set: (value: boolean) => device.motionDetected = value,
when: options.when,
delay: options.delay,
})
}
export function createBinarySensor(options: {
topic: string,
when: (message: MqttEvent) => boolean;
delay?: number;
}) {
return createSensor({
type: "BinarySensor",
topic: options.topic,
set: (value: boolean) => device.binaryState = value,
when: options.when,
delay: options.delay,
})
}
export declare const mqtt: MqttClient;

6
plugins/mqtt/src/monaco.ts
View File

@@ -1,9 +1,9 @@
import { createMonacoEvalDefaults } from "@scrypted/common/src/eval/scrypted-eval";
const libs = {
script: require("!!raw-loader!@scrypted/common/src/eval/monaco/script-device.ts").default,
client: require("!!raw-loader!./api/mqtt-client.ts").default,
util: require("!!raw-loader!./api/util.ts").default,
'@types/scrypted/common/script-device.d.ts': require("!!raw-loader!@scrypted/common/src/eval/monaco/script-device.ts").default,
'@types/scrypted/mqtt/mqtt-client.d.ts': require("!!raw-loader!./api/mqtt-client.ts").default,
'@types/scrypted/mqtt/util.d.ts': require("!!raw-loader!./api/util.ts").default,
};
export const monacoEvalDefaults = createMonacoEvalDefaults(libs);