diff --git a/config.json b/config.json
index a18fb9f..ff88cc9 100644
--- a/config.json
+++ b/config.json
@@ -1,8 +1,6 @@
{
"general": {
- "amqp": [
- "amqp://daemon:daemon@127.0.0.1:5672/"
- ],
+ "amqp": [],
"port": 3000,
"configPort": 3001,
"configWebInterfaceEnabled": true
diff --git a/html_config/index.html b/html_config/index.html
index f42bdf5..b5ba917 100644
--- a/html_config/index.html
+++ b/html_config/index.html
@@ -101,9 +101,9 @@
-
+
- POCSAG-GW
+ smartPOC
@@ -112,6 +112,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -141,7 +153,6 @@
-
TETRACONTROL
@@ -166,7 +177,6 @@
-
LoRaWAN
@@ -449,12 +459,11 @@
}, {})
this.$http.post(window.location.pathname + 'config', storeConfig).then(response => {
- })
- .then(this.$http.post(window.location.pathname + 'restart'))
- .then(() => {
- document.body.style = 'display:none'
- setTimeout(() => window.location.reload(), 1e3)
+ this.$http.post(window.location.pathname + 'restart').then(() => {
})
+ setTimeout(() => window.location.reload(), 1e3)
+ document.body.style = 'display:none'
+ })
},
addDeliveryTarget(index) {
this.configData.deliveryPresets[index].params.routing.connectors.push(["dummy", "12345"])
diff --git a/index.js b/index.js
index d2cf39a..4356fbf 100644
--- a/index.js
+++ b/index.js
@@ -1,13 +1,13 @@
-const amqp = require('amqp-connection-manager')
+// const amqp = require('amqp-connection-manager')
const fs = require('fs')
const config = require('./config.json')
// Create a connetion manager
-const connection = amqp.connect(config.general.amqp)
-connection.on('connect', () => console.log('Connected to AMQP.'))
-connection.on('disconnect', err => console.log('Disconnected from AMQP.', err.stack))
-
+// const connection = amqp.connect(config.general.amqp)
+// connection.on('connect', () => console.log('Connected to AMQP.'))
+// connection.on('disconnect', err => console.log('Disconnected from AMQP.', err.stack))
+const connection = null
const types = require('./types') // also initializes the registries, if they havent been loaded
if (!!config.connectors.pocsag && config.connectors.pocsag.enabled === true) {
@@ -33,11 +33,11 @@ if (!!config.connectors.emPuppettering && config.connectors.emPuppettering.enabl
types.ConnectorRegistry.register(new types.Connectors.eMessagePuppeteerConnectorTwoWays(connection))
}
-if (!!config.connectors.ecityruf && config.connectors.pagernetzAT.enabled === true) {
+if (!!config.connectors.pagernetzAT && config.connectors.pagernetzAT.enabled === true) {
types.ConnectorRegistry.register(new types.Connectors.PagernetzConnetorAT(connection))
}
-if (!!config.connectors.ecityruf && config.connectors.pnet.enabled === true) {
- types.ConnectorRegistry.register(new types.Connectors.pNetConnector())
+if (!!config.connectors.pnet && config.connectors.pnet.enabled === true) {
+ types.ConnectorRegistry.register(new types.Connectors.pNetConnector(connection))
}
if (!!config.connectors.tetracontrol && config.connectors.tetracontrol.enabled === true) {
types.ConnectorRegistry.register(new types.Connectors.TetraControlConnector(connection))
diff --git a/types/connectors/POCSAGConnector.js b/types/connectors/POCSAGConnector.js
index d45bc4d..812146b 100644
--- a/types/connectors/POCSAGConnector.js
+++ b/types/connectors/POCSAGConnector.js
@@ -3,6 +3,7 @@ const config = require('../../config.json')
const boskrypt = require('../../boskrypt')
const Connector = require("./Connector")
const md5 = require('md5')
+const MQTT = require('async-mqtt')
class POCSAGConnector extends Connector {
constructor (amqpConnMngr) {
@@ -10,12 +11,28 @@ class POCSAGConnector extends Connector {
this.name = "pocsag"
this.duplexCapable = false
this.supportBOSkrypt = true
- this.channelWrapper = this.amqpConnMngr.createChannel({
- json: false,
- setup: function(channel) {
- return channel.assertQueue('tx_pocsag', { durable: true })
- }
+
+ this.client = MQTT.connect(config.connectors.pocsag.mqttserver, {
+ username: config.connectors.pocsag.username,
+ password: config.connectors.pocsag.password,
+ connectTimeout: 10,
})
+ this.client.on('error', (x) => console.error(e))
+ this.client.on('connect', this.onMQTTConnect.bind(this))
+ this.client.on('message', this.onMQTTMessage.bind(this))
+ console.log("pocsag connector initalized",
+ config.connectors.pocsag.mqttserver,
+ config.connectors.pocsag.username,
+ config.connectors.pocsag.password
+ )
+ }
+ async onMQTTConnect() {
+ // await this.client.subscribe(`v3/${ config.connectors.pocsag.username }/devices/#`)
+ // await this.client.subscribe(`${ config.connectors.pocsag.username }/devices/#`)
+ console.log('[pocsag] subscribed')
+ }
+ async onMQTTMessage(topic, message) {
+ console.log(topic, message)
}
async transmitMessage(msg, params) {
const UUID = this.name+':'+md5(JSON.stringify([this.name,...params]))
@@ -25,18 +42,6 @@ class POCSAGConnector extends Connector {
const addressPart = lastChar >= 0 && lastChar <= 3 ? RIC.substring(0, RIC.length - 1) : RIC
const functionBits = lastChar >= 0 && lastChar <= 3 ? lastChar : 0
- const headers = {
- ric: {
- '!': 'int64',
- value: addressPart
- },
- function: {
- '!': 'int64',
- value: functionBits
- },
- }
- if (params.length >= 2 && params[1] === true) headers.numeric = 1
-
let payloadBuffer = Buffer.from(msg.payload)
const $device = msg.routingParams.device
@@ -50,9 +55,13 @@ class POCSAGConnector extends Connector {
}
}
- this.channelWrapper.sendToQueue('tx_pocsag', payloadBuffer, {
- headers
- })
+ let payload = {
+ ric: parseInt(addressPart, 10),
+ fun: functionBits,
+ msg: payloadBuffer.toString("ascii")
+ }
+ console.log (config.connectors.pocsag, payloadBuffer.toString("ascii"), payload)
+ await this.client.publish(config.connectors.pocsag.topic, JSON.stringify(payload))
.then(() => {
this.connectorRegistry.reportState(msg, UUID, 'routed')
return true