split to GPIO api wrapper and deviceLib api wrapper
This commit is contained in:
Родитель
4f7e61dda9
Коммит
e30fd72ba2
|
@ -60,8 +60,18 @@ app.put(/GPIO\/[0-9]+\/(function|value|pulse|sequence|pulseRatio|pulseAngle)$/,
|
|||
});
|
||||
|
||||
//TODO check whatever this does in webiopi api
|
||||
app.get(/[a-z]*[A-Z]*[0-9]*$/, function(req, res) {
|
||||
|
||||
app.get(/\*$/, function(req, res) {
|
||||
console.log("path ", req.path);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//HTTP POST /macros/(macro)/(args)
|
||||
|
@ -79,214 +89,3 @@ app.put(/macros\/[A-Z]*[0-9]*$/, function(req, res) {
|
|||
});
|
||||
});
|
||||
|
||||
//ADC
|
||||
app.get(/devices/[A-Z]*[a-z]*/analog/[0-9]*/(integer|volt|float)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
/*
|
||||
app.get(/devices/[A-Z]*[a-z]*/analog/*/(integer|volt|float)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
*/
|
||||
|
||||
app.get(/devices/[A-Z]*[a-z]*/analog\/(count|resolution|maximum|vref)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//DAC
|
||||
app.put(/devices\/[A-Z]*[0-9]*\/analog/[1-9]*/(integer|float|volt)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//PWM
|
||||
app.get(/devices/[A-Z]*[a-z]*/pwm\/(count|resolution|maximum)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.put(/devices\/[a-z]*[0-9]*\/pwm/[1-9]*/(integer|float|angle|\*)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//DIGITAL TODO verify all regex
|
||||
app.get(/devices/[A-Z]*[a-z]*/count$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.get(/devices/[A-Z]*[a-z]*/([0-9]*|[*])\/value$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
//exception in portRead()
|
||||
app.get(/devices/[A-Z]*[a-z]*/[*]\/integer$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.put(/devices\/[a-z]*[0-9]*\/[1-9]*\/value$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.put(/devices\/[a-z]*[0-9]*\/[*]\/integer$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.get(/devices/[A-Z]*[a-z]*/[0-9]*\/function$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.get(webiopiUrl + req.path)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//exception
|
||||
app.put(/devices\/[a-z]*[0-9]*\/[1-9]*\/function$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.get(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.get(/devices/[A-Z]*[a-z]*/\*$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.listen(port);
|
||||
|
|
|
@ -0,0 +1,244 @@
|
|||
var http = require("http");
|
||||
var url = require("url");
|
||||
var express = require('express');
|
||||
var getRawBody = require('raw-body');
|
||||
var cors = require('cors');
|
||||
var request = require('superagent');
|
||||
|
||||
var argv = process.argv;
|
||||
var port = argv[2];
|
||||
if (port === undefined)
|
||||
port = 5454;
|
||||
var webiopiUrl = "http://localhost:8000";
|
||||
|
||||
console.log("listening on port: ", port);
|
||||
var app = express();
|
||||
|
||||
//handle post/put
|
||||
app.use(function (req, res, next) {
|
||||
getRawBody(req, {
|
||||
length: req.headers['content-length'],
|
||||
limit: '1mb',
|
||||
encoding: 'utf8'
|
||||
}, function (err, string) {
|
||||
if (err)
|
||||
return next(err);
|
||||
req.text = string;
|
||||
next();
|
||||
})
|
||||
});
|
||||
|
||||
app.use(cors());
|
||||
|
||||
//ADC
|
||||
app.get(/devices/[A-Z]*[a-z]*/analog/[0-9]*/(integer|volt|float)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
/*
|
||||
app.get(/devices/[A-Z]*[a-z]*/analog/*/(integer|volt|float)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
*/
|
||||
|
||||
app.get(/devices/[A-Z]*[a-z]*/analog\/(count|resolution|maximum|vref)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//DAC
|
||||
app.put(/devices\/[A-Z]*[0-9]*\/analog/[1-9]*/(integer|float|volt)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//PWM
|
||||
app.get(/devices/[A-Z]*[a-z]*/pwm\/(count|resolution|maximum)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.put(/devices\/[a-z]*[0-9]*\/pwm/[1-9]*/(integer|float|angle|\*)$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//DIGITAL
|
||||
app.get(/devices/[A-Z]*[a-z]*/count$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.get(/devices/[A-Z]*[a-z]*/([0-9]*|[*])\/value$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//exception in portRead()
|
||||
app.get(/devices/[A-Z]*[a-z]*/[*]\/integer$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.put(/devices\/[a-z]*[0-9]*\/[1-9]*\/value$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.put(/devices\/[a-z]*[0-9]*\/[*]\/integer$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.post(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.get(/devices/[A-Z]*[a-z]*/[0-9]*\/function$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.get(webiopiUrl + req.path)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//exception
|
||||
app.put(/devices\/[a-z]*[0-9]*\/[1-9]*\/function$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request.get(webiopiUrl + req.path + "/" + req.text)
|
||||
.send()
|
||||
.end(function(res1) {
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.get(/devices/[A-Z]*[a-z]*/\*$/, function(req, res) {
|
||||
console.log("got this pathnamme", req.path);
|
||||
console.log("value to concat to url ", req.text);
|
||||
request
|
||||
.get(webiopiUrl + req.path)
|
||||
.end(function(res1){
|
||||
console.log("res is ", res1);
|
||||
if (res1.ok) {
|
||||
res.send(res1.text);
|
||||
} else {
|
||||
res.send("something went wrong");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.listen(port);
|
Загрузка…
Ссылка в новой задаче