Compare commits

...
10 Commits
Author SHA1 Message Date
ari 621f43e5c8 v0.1.10 2022-05-18 11:57:34 -04:00
ari f3496f9d32 fixed nodejs test 2022-05-18 11:04:15 -04:00
ari 409cf2b21a simpler names 2022-05-18 11:03:07 -04:00
ari ef92261666 reverting something stupid 2022-05-18 11:01:29 -04:00
ari 83edaf9bf8 tagged names 2022-05-18 11:00:41 -04:00
ari f8efd895a9 not building 2022-05-18 10:59:35 -04:00
ari da0d153b81 fixed up linting 2022-05-18 10:58:26 -04:00
ari bcd262dd46 - fixed up optional metadata + + desc
- using timestamp for default new ids
'
2022-05-18 10:54:53 -04:00
ari ea47b3e1eb fixed up automation time 2022-05-18 10:37:41 -04:00
ari 5192c09681 trying to provide test 2022-05-18 09:50:08 -04:00
25 changed files with 423 additions and 83 deletions

No files matched your search

+7 -7
View File
@@ -1,15 +1,15 @@
name: Manual Build
on:
name: "Manual Build"
on:
workflow_dispatch:
inputs:
version:
version:
type: string
description: "Version Number"
required: true
jobs:
build:
runs-on: ubuntu-latest
name: Build & Publish ${{ github.event.inputs.version }} / ${{ matrix.arch }}
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
@@ -17,7 +17,7 @@ jobs:
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
@@ -31,4 +31,4 @@ jobs:
--${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target .
--target .
+28 -30
View File
@@ -1,18 +1,17 @@
name: Deploy
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
on:
workflow_dispatch:
push:
branch: [main]
paths:
- 'config.yaml'
- "config.yaml"
jobs:
metadata:
runs-on: ubuntu-latest
name: Metadata
outputs:
outputs:
version: ${{ steps.version.outputs.VERSION }}
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
steps:
@@ -29,42 +28,41 @@ jobs:
run: |
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
build:
runs-on: ubuntu-latest
name: Build & Publish ${{ matrix.arch }}
needs:
- metadata
strategy:
matrix:
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
# build:
# runs-on: ubuntu-latest
# name: Build & Publish ${{ matrix.arch }}
# needs:
# - metadata
# strategy:
# matrix:
# arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v3
- name: Login to DockerHub
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
# steps:
# - name: Check out repository
# uses: actions/checkout@v3
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
uses: home-assistant/builder@2022.03.1
with:
args: |
--${{ matrix.arch }} \
--target .
# - name: Login to DockerHub
# uses: docker/login-action@v2.0.0
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_TOKEN }}
# - name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
# uses: home-assistant/builder@2022.03.1
# with:
# args: |
# --${{ matrix.arch }} \
# --target .
publish:
runs-on: ubuntu-latest
needs:
- metadata
- build
name: Publish Github Release
steps:
- name: Publish Release ${{ needs.metadata.outputs.version }}
uses: actions/github-script@v6
env:
env:
VERSION: ${{ needs.metadata.outputs.version }}
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
with:
@@ -74,4 +72,4 @@ jobs:
repo: context.repo.repo,
tag_name: process.env.VERSION,
body: process.env.CHANGELOG,
});
});
+4 -1
View File
@@ -63,7 +63,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
action: [test:ci, tsc:ci, build]
action:
- "test:ci"
- "tsc:ci"
- "build"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
+5
View File
@@ -1,5 +1,10 @@
# Changelog
## [0.1.10] - More Bug Fixes
- Allowing null or undefined values for metadata fields
- Trigger.platform==time will now have the .at property better supported
## [0.1.9] - Fixed up invalid types for various triggers
- Some triggers had invalid types and were causing a false-positive validation
+1 -1
View File
@@ -1,4 +1,4 @@
from typing import Dict, List, Literal, Optional, Union
from typing import Dict, List, Optional, Union
from pydantic import BaseModel
from pydantic.fields import Field
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation
version: 0.1.9
version: 0.1.10
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
@@ -80,8 +80,8 @@ export const AutoInfoBox: FC<Props> = ({
return <div className={`automation-editor--info-box ${className}`}>
<div className="automation-editor--info-box-inner">
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} />
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
<InputTextArea label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
<InputList
label="Mode"
current={metadata.mode}
@@ -253,6 +253,253 @@ FewAutos.args = {
}
],
"tags": {}
},
{
"metadata": {
"id": "1649726828269",
"alias": "Climate Heat Mode Settings",
"description": "Ensures that the climate is always in sync with the house settings",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "state",
"entity_id": "climate.main_floor",
"id": "main"
},
{
"platform": "state",
"entity_id": "climate.second_floor",
"id": "second"
},
{
"platform": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"id": "setting"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "setting"
}
],
"sequence": [
{
"service": "climate.turn_off",
"data": {},
"target": {
"device_id": [
"d88dcfe82bc9a1c0f2b77b871848155e",
"ef2d47fdeef19f8984b85f92f2597f73"
]
}
}
]
},
{
"conditions": [
{
"condition": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"state": "on"
}
],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'heat' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "heat"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"default": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'cool' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "cool"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"tags": {}
},
{
"metadata": {
"id": "1628024070687",
"alias": "Baby Light Setting",
"description": "Configures max/min light settings for the baby ",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "time",
"at": "21:00:00",
"id": "night"
},
{
"platform": "time",
"at": "07:30:00",
"id": "day"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "night"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": "15"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "day"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": 100
}
}
]
}
],
"default": []
}
],
"tags": {}
},
{
"metadata": {
"id": "alarmanlage_an",
"alias": "alarmanlage_an (Uhrzeit)",
"mode": "single"
},
tags: {},
"trigger": [
{
"entity_id": "sensor.time",
"platform": "state",
"to": "23:30"
}
],
"condition": [
{
"condition": "or",
"conditions": [
{
"condition": "state",
"entity_id": "person.simon",
"state": "home"
},
{
"condition": "state",
"entity_id": "person.leni",
"state": "home"
}
]
}
],
"sequence": [
{
"service": "alarm_control_panel.alarm_arm_night",
"target": {
"entity_id": [
"alarm_control_panel.alarmo"
]
},
"data": {
"code": "xxx"
}
},
{
"service": "alarm_control_panel.alarm_arm_away",
"data": {},
"target": {
"entity_id": "alarm_control_panel.blink_home"
}
}
],
}
],
}
@@ -71,8 +71,8 @@ const filterAutomations = (autos: AutomationData[], searchText: string, selected
if (searchText.length > 0) {
if (
!(
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
a.metadata.alias.toLocaleLowerCase().includes(searchText)
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
)
) {
return false
@@ -169,8 +169,8 @@ export const MetadataBox: FC<{
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
if (auto.metadata) {
title = <>
<b>{String(auto.metadata.alias).slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description).slice(0, 25)}</span>
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
</>
}
return <div
@@ -40,7 +40,7 @@ export const AutomationList: FC<AutomationListParams> = ({
<AutomationListBox
automations={automations}
onAdd={() => {
onAdd(defaultAutomation(`shortu-${automations.length}`));
onAdd(defaultAutomation(String(Date.now())));
setCurrent(automations.length)
}}
onSelectAutomation={i => {
@@ -209,7 +209,7 @@ const addChooseNode = (
}, { size: dims.circleSize })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
+1 -1
View File
@@ -68,7 +68,7 @@ export const makeSequenceUpdater = (
)
} else {
return makeSequenceUpdater(
node.default,
node.default ?? [],
seq => this.updateNode(i, {
...node,
default: seq
+10 -6
View File
@@ -1,14 +1,15 @@
import { PropsWithChildren, useState } from "react";
import { AutomationTime } from "types/automations/common";
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { milisecondsToObject } from "utils/time";
import InputWrapper from "./InputWrapper";
import { useInputTimeStyles } from "./styles";
import { convertStringToAutomationTimeObject } from 'utils/time';
export interface Props {
textBoxFor?: string;
label: string;
value?: AutomationTime;
onChange: (v?: AutomationTime) => void;
onChange: (v?: AutomationTimeObject) => void;
onEnter?: () => void;
}
export default function InputTime({
@@ -21,11 +22,14 @@ export default function InputTime({
}: PropsWithChildren<Props>) {
let cleanValue = '';
if (value) {
if (typeof value === 'string') {
value = convertStringToAutomationTimeObject(value);
}
const {
hours,
minutes,
seconds,
milliseconds,
hours = 0,
minutes = 0,
seconds = 0,
milliseconds = 0,
} = value;
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
}
@@ -1,13 +1,14 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerTime } from 'types/automations/triggers';
import InputTime from 'components/Inputs/InputTime';
import { convertObjectToAutomationTimeString } from 'utils/time';
export const TriggerTime: OptionManager<AutomationTriggerTime> = {
defaultState: () => ({
"alias": "",
"platform": 'time',
"at": {},
"at": "",
}),
isReady: ({ alias }) => {
return (alias !== '')
@@ -19,7 +20,7 @@ export const TriggerTime: OptionManager<AutomationTriggerTime> = {
value={state.at}
onChange={_at => setState({
...state,
at: _at ?? {},
at: _at ? convertObjectToAutomationTimeString(_at) : "00:00:00",
})}
/>
</>
@@ -18,6 +18,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, uState: UseStat
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
useEffect(() => {
setAllState({ ...allState, node: originalNode, isModified: false, })
// eslint-disable-next-line
}, [originalNode])
const setState = (node: AutomationNode) => setAllState(({ ...allState, node, isModified: true, }));
const setYamlMode = (yamlMode: boolean) => setAllState({ ...allState, yamlMode, });
+2 -2
View File
@@ -9,7 +9,7 @@ type AutomationActionNodeBase<Data extends Object> = Data & {
export type ServiceAction = AutomationActionNodeBase<{
service: string;
target: any;
target?: any;
data: any;
}>
export type RepeatAction = AutomationActionNodeBase<{
@@ -38,7 +38,7 @@ export type ChooseAction = AutomationActionNodeBase<{
conditions: AutomationCondition[];
sequence: AutomationSequenceNode[];
}>;
default: AutomationSequenceNode[];
default?: AutomationSequenceNode[];
}>
export type AutomationAction =
| ServiceAction
+6 -6
View File
@@ -1,6 +1,6 @@
export interface AutomationTime {
hours?: number;
minutes?: number;
seconds?: number;
milliseconds?: number;
}
import * as st from 'superstruct'
import * as v from "types/validators/common";
export type AutomationTime = st.Infer<typeof v.AutomationTime>
export type AutomationTimeObject = st.Infer<typeof v.AutomationTimeObject>
export type AutomationTimeString = st.Infer<typeof v.AutomationTimeString>
+1 -2
View File
@@ -1,11 +1,10 @@
import * as st from 'superstruct'
import { AutomationMetadata } from './metadata'
import { AutomationTrigger } from './triggers';
export const AutomationData = st.object({
metadata: AutomationMetadata,
trigger: st.array(AutomationTrigger),
trigger: st.array(st.object()),
condition: st.array(st.object()),
sequence: st.array(st.object()),
tags: st.record(st.string(), st.string()),
+28 -2
View File
@@ -1,9 +1,35 @@
import * as st from 'superstruct'
export const AutomationTime = st.object({
export const AutomationTimeString = st.refine(st.string(), 'TimeString', (v, c) => {
// https://www.home-assistant.io/docs/automation/trigger/#time-string
const bits: string[] = v.split(':')
if ((bits.length !== 2) && (bits.length !== 3)) {
return {
"branch": c.branch,
"message": "Time string should be either in the form 'HH:MM' or 'HH:MM:SS' as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string",
"path": c.path,
}
}
for (let i = 0; i < bits.length; i++) {
const b = bits[i];
const num = Number(b);
if (!Number.isInteger(num) || (num < 0) || (num > 23)) {
return {
"branch": c.branch,
"message": "Time string should contain only positive numbers between 0-23 as specified in https://www.home-assistant.io/docs/automation/trigger/#time-string",
"path": c.path.concat(
bits.slice(0, i)
).concat([`<<${b}>>`])
}
}
}
return true
})
export const AutomationTimeObject = st.object({
hours: st.optional(st.number()),
minutes: st.optional(st.number()),
seconds: st.optional(st.number()),
milliseconds: st.optional(st.number()),
})
});
export const AutomationTime = st.union([st.string(), AutomationTimeObject])
+32 -1
View File
@@ -2,6 +2,7 @@ import * as st from "superstruct";
import { AutomationMetadata } from "./metadata";
import { AutomationData } from './autmation';
import { getFailures } from './helper';
import { AutomationTimeString } from "./common";
test('superstructure is', () => {
const badCheck = st.is({}, AutomationMetadata);
@@ -10,7 +11,7 @@ test('superstructure is', () => {
test('getFailures returns failures', () => {
const failures = getFailures({ metadata: {} }, AutomationData);
expect(failures).toHaveLength(8)
expect(failures).toHaveLength(6)
})
test('getFailures returns null', () => {
@@ -21,4 +22,34 @@ test('getFailures returns null', () => {
mode: "single",
}, AutomationMetadata);
expect(failures).toBeNull()
})
test('AutomationTimeString is valid', () => {
for (const c of [
'10:23',
'15:02',
'13:00:1',
'23:00:23'
]) {
const failures = getFailures(c, AutomationTimeString)
expect(failures).toBeNull()
}
})
test('AutomationTimeString is invalid', () => {
for (const c of [
'xx:23',
'1x:02',
'13:0a:1c',
'25:00:23',
'11'
]) {
const failures = getFailures({
"time": c
}, st.object({
time: AutomationTimeString,
}))
expect(failures).toHaveLength(1)
}
})
+2 -2
View File
@@ -3,8 +3,8 @@ import * as st from 'superstruct'
export const AutomationMetadata = st.object({
id: st.string(),
alias: st.string(),
description: st.string(),
alias: st.optional(st.string()),
description: st.optional(st.string()),
trigger_variables: st.optional(st.nullable(st.record(st.string(), st.string()))),
mode: st.enums(["single", "restart", "queued", "parallel"]),
})
+2 -2
View File
@@ -1,5 +1,5 @@
import * as st from 'superstruct'
import { AutomationTime } from './common'
import { AutomationTimeString, AutomationTime } from './common'
const AutomationTriggerBase = {
@@ -67,7 +67,7 @@ export const AutomationTriggerTemplate = st.object({
export const AutomationTriggerTime = st.object({
...AutomationTriggerBase,
platform: st.literal('time'),
at: AutomationTime,
at: AutomationTimeString,
})
export const AutomationTriggerTimePattern = st.object({
+13 -7
View File
@@ -2,13 +2,19 @@ import { AutomationNode, AutomationNodeTypes } from "types/automations";
import { AutomationTime } from "types/automations/common";
export const convertTimeToString = ({
hours = 0,
minutes = 0,
seconds = 0,
milliseconds = 0,
}: AutomationTime) => [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':')
export const convertTimeToString = (t: AutomationTime) => {
if (typeof t === 'string') {
return t
} else {
const {
hours = 0,
minutes = 0,
seconds = 0,
milliseconds = 0,
} = t
return [hours, minutes, seconds, milliseconds].map(n => String(n).padStart(2, '0')).join(':')
}
}
export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => {
if (node.alias) {
return node.alias;
+20 -2
View File
@@ -1,8 +1,8 @@
import { AutomationTime } from "types/automations/common";
import { AutomationTimeObject, AutomationTimeString } from "types/automations/common";
const cleanTime = (t: number) => Math.max(0, Math.floor(t))
export const milisecondsToObject = (total_miliseconds: number): AutomationTime => {
export const milisecondsToObject = (total_miliseconds: number): AutomationTimeObject => {
const hours = cleanTime(total_miliseconds / (60 * 60 * 1000));
const minutes = cleanTime((total_miliseconds - hours * 60 * 60 * 1000) / (60 * 1000));
const seconds = cleanTime((total_miliseconds - hours * 60 * 60 * 1000 - minutes * 60 * 1000) / 1000);
@@ -10,4 +10,22 @@ export const milisecondsToObject = (total_miliseconds: number): AutomationTime =
return {
hours, minutes, seconds, milliseconds,
}
}
export const convertStringToAutomationTimeObject = (t: AutomationTimeString): AutomationTimeObject => {
const bits = t.split(':')
return {
hours: Number(bits[0]),
minutes: Number(bits[1]),
seconds: bits.length === 3 ? Number(bits[2]) : 0,
}
}
export const convertObjectToAutomationTimeString = (t: AutomationTimeObject): AutomationTimeString => {
const {
hours = 0,
minutes = 0,
seconds = 0
} = t
return [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':')
}
+1
View File
@@ -5,6 +5,7 @@ export const useDelayEffect = (cb: () => void, deps: any[], timeout: number) =>
const fcn = useDelayedFunction(cb, timeout);
useEffect(() => {
fcn()
// eslint-disable-next-line
}, deps)
}