smartpager
/
msg-dwd
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added new level selections and profile selection

Browse Source
master
cheetah 2 years ago
parent cceae0c843
commit af63266744
2 changed files with 134 additions and 75 deletions
Show Stats Download Patch File Download Diff File

188
html/index.html
Unescape Escape View File

@ -15,6 +15,7 @@
<v-app-bar app> <v-app-bar app>
<v-toolbar-title>DWD Module Configuration</v-toolbar-title> <v-toolbar-title>DWD Module Configuration</v-toolbar-title>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn color="success" @click="storeConfig()">Store & Restart</v-btn>
<v-checkbox label="Expert Mode" v-model="EXPERTMODE"></v-checkbox> <v-checkbox label="Expert Mode" v-model="EXPERTMODE"></v-checkbox>
</v-app-bar> </v-app-bar>
<v-content> <v-content>
@ -22,41 +23,52 @@
<v-tabs v-model="configTab" next-icon="mdi-arrow-right-bold-box-outline" prev-icon="mdi-arrow-left-bold-box-outline" show-arrows> <v-tabs v-model="configTab" next-icon="mdi-arrow-right-bold-box-outline" prev-icon="mdi-arrow-left-bold-box-outline" show-arrows>
<v-tabs-slider></v-tabs-slider> <v-tabs-slider></v-tabs-slider>
<v-tab key="regions">Regions</v-tab> <v-tab key="regions">Regions</v-tab>
<v-tab key="notificationConfig">Notification Configuration</v-tab> <v-tab key="notificationConfig" v-show="EXPERTMODE">Notification Configuration</v-tab>
</v-tabs> </v-tabs>
<v-tabs-items v-model="configTab"> <v-tabs-items v-model="configTab">
<v-tab-item key="regions"> <v-tab-item key="regions">
<v-container> <v-container>
<v-row> <v-row>
<v-checkbox label="German Umlaut Support" v-model="configData.germanUmlautSupport"></v-checkbox> <v-checkbox label="use German POCSAG" v-model="configData.germanUmlautSupport"></v-checkbox>
</v-row> </v-row>
<v-row> <v-row>
<h3>Regions:</h3> <h3>Regions:</h3>
</v-row> </v-row>
<v-row> <v-row>
<v-btn color="success" @click="addRegionCMD()" ><v-icon>mdi-plus</v-icon> Add</v-btn> <v-btn color="primary" fab dark small icon @click="addRegionCMD()">
<v-icon>mdi-plus</v-icon>
</v-btn>
</v-row> </v-row>
<v-row v-for="(region, index) in configData.regions" :key="region._id" > <v-row v-for="(region, index) in configData.regions" :key="region._id" >
<v-col> <v-col cols="4">
<v-row cols="6" sm="12" md="4"> <v-checkbox label="Active" v-model="region.active"></v-checkbox>
<v-text-field v-model="region.name" label="Name"></v-text-field>
<v-col> <v-text-field v-model="region.dwdID" label="DWD ID"></v-text-field>
<v-checkbox label="Active" v-model="region.active"></v-checkbox> <v-autocomplete
</v-col> v-model="region.preset"
<v-col> :items="presetSearchItems"
<v-text-field v-model="region.name" label="Name"></v-text-field> :loading="!presetSearchItems.length > 0"
</v-col> color="white"
<v-col> hide-no-data
<v-text-field v-model="region.dwdID" label="DWD ID"></v-text-field> dense
</v-col> label="Profile"
<v-col> placeholder="Start typing to Search"
<v-btn color="error" @click="configData.regions.splice(index, 1)" icon><v-icon>mdi-delete</v-icon></v-btn> prepend-icon="mdi-database-search"
</v-col> ></v-autocomplete>
</v-col>
<v-col cols="3">
<v-row v-for="(dwdType) of dwdTypes1">
<v-select v-model="region.levels[ dwdType.u ]" :label="dwdType.k" :items="dwdType.i" ></v-checkbox>
</v-row> </v-row>
</v-col> </v-col>
</v-row> <v-col cols="3">
<v-row> <v-row v-for="(dwdType) of dwdTypes2">
<v-btn color="success" @click="storeConfig()">Store & Restart</v-btn> <v-select v-model="region.levels[ dwdType.u ]" :label="dwdType.k" :items="dwdType.i" ></v-checkbox>
</v-row>
</v-col>
<v-col cols="2">
<v-btn color="error" @click="configData.regions.splice(index, 1)" fab icon><v-icon>mdi-delete</v-icon></v-btn>
</v-col>
</v-row> </v-row>
</v-container> </v-container>
</v-tab-item> </v-tab-item>
@ -64,33 +76,9 @@
<v-container> <v-container>
<b>Routing Paramters:</b> <b>Routing Paramters:</b>
<v-row> <v-row>
<v-col cols="12" sm="12" md="6" v-show="EXPERTMODE"> <v-col cols="12" sm="12" md="6">
<v-text-field label="Daemon Endpoint URL" v-model="configData.pager.url"></v-text-field> <v-text-field label="Daemon Endpoint URL" v-model="configData.pager.url"></v-text-field>
</v-col>
<v-col cols="12" sm="12" md="6">
<v-select :items="pagerTypes" v-model="configData.pager.params.type" item-text="k" item-value="v" label="Delivery Type"></v-select>
</v-col>
</v-row>
<v-row>
<v-col cols="12" sm="12" md="6">
<v-select :items="deviceType" v-model="configData.pager.params.routing.device" item-text="k" item-value="v" label="Device"></v-select>
</v-col>
</v-row>
<b>Delivery Targets:</b>
<v-btn color="success" @click="addDeliveryTarget()">Add</v-btn>
<v-row v-for="(connector, index) in configData.pager.params.routing.connectors" :key="index">
<v-col cols="6" sm="4" md="4">
<v-select :items="connectorTypes" v-model="connector[0]" item-text="k" item-value="v" label="Gateway"></v-select>
</v-col>
<v-col cols="6" sm="4" md="4">
<v-text-field v-model="connector[1]" label="Call ID"></v-text-field>
</v-col> </v-col>
<v-col cols="6" sm="4" md="4">
<v-btn color="error" @click="configData.pager.params.routing.connectors.splice(index, 1)" icon><v-icon>mdi-delete</v-icon></v-btn>
</v-col>
</v-row>
<v-row>
<v-btn color="success" @click="storeConfig()">Store & Restart</v-btn>
</v-row> </v-row>
</v-container> </v-container>
</v-tab-item> </v-tab-item>
@ -102,7 +90,7 @@
<div>Hilfe (de)</div> <div>Hilfe (de)</div>
<div class="text--primary"> <div class="text--primary">
DWD ID auf <a href="https://wettwarn.de/wettwarn_wetterwarnungen/warnregion_waehlen/index.html">WettWarn</a> generieren und 3 stelligen Code einfügen DWD ID auf <a href="https://wettwarn.de/wettwarn_wetterwarnungen/warnregion_waehlen/index.html">WettWarn</a> generieren und 3 stelligen Code einfügen
<a href="https://wettwarn.de/ueber_wetterwarnungen/warnkriterien/index.html">Warnstufen</a>
</div> </div>
</v-card-text> </v-card-text>
</v-card> </v-card>
@ -122,28 +110,6 @@
return { return {
EXPERTMODE: false, EXPERTMODE: false,
configTab: null, configTab: null,
pagerTypes: [
{k: 'Simple', v: 'simple'},
{k: 'Duplex', v: 'duplex'},
],
deviceType: [
{k: 'Generic', v: 'generic'},
{k: 'Birdy Slim (IoT)', v: 'birdyslim'},
],
connectorTypes: [
{k: 'Dummy', v: 'dummy'},
{k: 'POCSAG GW', v: 'pocsag'},
{k: 'DAPNET', v: 'dapnet'},
{k: 'e*Cityruf inetgw', v: 'ecityruf'},
{k: 'e*Cityruf Puppeteer', v: 'em-p-cityruf'},
{k: 'e*Cityruf alertManager', v: 'em-a-cityruf'},
{k: 'e*2wayS Puppeteer', v: 'em-p-twoways'},
{k: 'e*2wayS alertManager', v: 'em-a-twoways'},
{k: 'LoRaWAN TTNv3', v: 'lorawan'},
],
configData: { configData: {
"pager": { "pager": {
"url": "", "url": "",
@ -158,12 +124,93 @@
"menuSupport": false, "menuSupport": false,
"regions": [] "regions": []
}, },
presetSearchItems: [],
dwdTypes1: [
{ n: 4, k: 'Wind / Sturm / Orkan', u: 'wind_storm',
i: [
{ text: 'ignore', value: 666 },
{ text: 'Level 1 or higher', value: 1 },
{ text: 'Level 2 or higher', value: 2 },
{ text: 'Level 3 or higher', value: 3 },
{ text: 'Level 4', value: 4 },
]
},
{ n: 4, k: 'Gewitter', u: 'thunderstorm',
i: [
{ text: 'ignore', value: 666 },
{ text: 'Level 1 or higher', value: 1 },
{ text: 'Level 2 or higher', value: 2 },
{ text: 'Level 3 or higher', value: 3 },
{ text: 'Level 4', value: 4 },
]
},
{ n: 4, k: 'Starkregen', u: 'rain1',
i: [
{ text: 'ignore', value: 666 },
{ text: 'Level 2 or higher', value: 2 },
{ text: 'Level 3 or higher', value: 3 },
{ text: 'Level 4', value: 4 },
]
},
{ n: 4, k: 'Dauerregen', u: 'rain2',
i: [
{ text: 'ignore', value: 666 },
{ text: 'Level 2 or higher', value: 2 },
{ text: 'Level 3 or higher', value: 3 },
{ text: 'Level 4', value: 4 },
]
},
],
dwdTypes2: [
{ n: 4, k: 'Schneefall/-verwehungen', u: 'snow',
i: [
{ text: 'ignore', value: 666 },
{ text: 'Level 1 or higher', value: 1 },
{ text: 'Level 2 or higher', value: 2 },
{ text: 'Level 3 or higher', value: 3 },
{ text: 'Level 4', value: 4 },
]
},
{ n: 4, k: 'Glaette', u: 'ice',
i: [
{ text: 'ignore', value: 666 },
{ text: 'Level 1 or higher', value: 1 },
{ text: 'Level 2 or higher', value: 2 },
{ text: 'Level 3 or higher', value: 3 },
{ text: 'Level 4', value: 4 },
]
},
{ n: 2, k: 'Frost', u: 'frost',
i: [
{ text: 'ignore', value: 666 },
{ text: 'Level 1 or higher', value: 1 },
{ text: 'Level 2', value: 2 },
]
},
{ n: 1, k: 'Nebel', u: 'fog',
i: [
{ text: 'ignore', value: 666 },
{ text: 'Level 1', value: 1 },
]
},
],
} }
}, },
created() { created() {
this.loadPresets()
this.loadConfig() this.loadConfig()
}, },
methods: { methods: {
loadPresets() {
this.$http.get('/api/deliveryPresets')
.then(response => {
this.presetSearchItems = response.body.map(x => { return {
text: x.name,
value: x.key,
}})
}, response => {
})
},
loadConfig() { loadConfig() {
this.$http.get('/config').then(response => { this.$http.get('/config').then(response => {
const newConfig = response.body const newConfig = response.body
@ -192,6 +239,7 @@
this.configData.regions.push({ this.configData.regions.push({
name: "", name: "",
active: true, active: true,
levels: [],
dwdID: "", dwdID: "",
}) })
}, },

21
index.js
Unescape Escape View File

@ -45,9 +45,16 @@ function replaceUmlaute(str) {
); );
} }
async function sendPage(payload) { async function sendPage(preset, payload) {
console.log(payload) console.log(preset, payload)
return (await axios.post(config.pager.url, Object.assign({ ...config.pager.params }, { payload }))) try {
await axios.post(new URL(config.pager.url).origin + '/api/message/' + (!!preset ? 'preset' : 'advanced'), Object.assign( !!preset
? { preset }
: { ...config.pager.params } // backward compatibility
, { payload: payload }))
} catch (e) {}
} }
async function checkDWD() { async function checkDWD() {
for (region of config.regions) { for (region of config.regions) {
@ -68,14 +75,14 @@ async function checkDWD() {
if (!!stateMachine[ region.dwdID ]) { if (!!stateMachine[ region.dwdID ]) {
if (stateMachine [ region.dwdID ] != msg) { if (stateMachine [ region.dwdID ] != msg) {
await sendPage( msg ) await sendPage( region.preset, msg )
stateMachine [ region.dwdID ] = msg stateMachine [ region.dwdID ] = msg
} }
} else { } else {
stateMachine [ region.dwdID ] = msg stateMachine [ region.dwdID ] = msg
// if initial state is unknown and we have an alert, send it anyway // if initial state is unknown and we have an alert, send it anyway
if (msg.indexOf('Es sind keine Warnungen') == -1) { if (msg.indexOf('Es sind keine Warnungen') == -1) {
await sendPage( msg ) await sendPage( region.preset, msg )
} }
} }
} }
@ -106,6 +113,10 @@ appConfig.use(express.static(__dirname + '/node_modules/@mdi/font'))
appConfig.get('/config', async (req, res) => { appConfig.get('/config', async (req, res) => {
return res.json(JSON.parse(fs.readFileSync('config.json'))) return res.json(JSON.parse(fs.readFileSync('config.json')))
}) })
appConfig.get('/api/deliveryPresets', async (req, res) => {
const presets = await axios.get(new URL(config.pager.url).origin + '/api/deliveryPresets')
return res.json(presets.data)
})
appConfig.post('/config', async (req, res) => { appConfig.post('/config', async (req, res) => {
if (!(!!req.body.pager)) return res.status(403).json(false) if (!(!!req.body.pager)) return res.status(403).json(false)
if (!(!!req.body.regions)) return res.status(403).json(false) if (!(!!req.body.regions)) return res.status(403).json(false)

Write Preview
Loading…
Cancel
Save