frodovdr
/
node-red-nodes
mirror of https://github.com/node-red/node-red-nodes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #179 from hardillb/master 

Fix starting with a URL
This commit is contained in:
Dave Conway-Jones 2016-02-23 09:29:52 +00:00
parent 5e46a1dfb4 40f47ad729
commit c01a1745db
3 changed files with 71 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/physical-web/package.json
View File

@ -1,6 +1,6 @@
{
"name": "node-red-node-physical-web",
"version": "0.0.3",
"version": "0.0.4",
"description": "A set of nodes to interact with the Phyical Web",
"main": "physical-web.js",
"scripts": {

14
hardware/physical-web/physical-web.html
View File

@ -97,6 +97,8 @@
<div class="form-row">
<label for="node-input-url"><i class="fa fa-link"></i> URL</label>
<input type="text" id="node-input-url" placeholder="http://...">
<!--<button type="button" id="node-input-url-shorten" disabled=true>Shorten</button> -->
<p style="margin-left:100px;width: 70%">This URL needs to be shorter than 18 bytes in length to meet Eddystone spec</p>
</div>
<br/>
<div class="form-row">
@ -115,7 +117,7 @@
<script type="text/x-red" data-help-name="PhysicalWeb out">
<p><a href="https://google.github.io/physical-web/">Physical Web</a></p>
<p><a href="https://github.com/sandeepmistry/bleno#running-on-linux">READ THIS ON LINUX</a>
<p>This node takes the value of <i>msg.payload</i> and publishes it as a Eddystone URL announcement</p>
<p>This node takes the value of <i>msg.payload</i> and publishes it as a Eddystone URL announcement. URLs need to be less than 18 bytes long so should be run through a shortner first.</p>
<p>The config window will allow you to set the powerlevel (-30 to 100 db) and the period (ms) between anouncements</p>
</script>
@ -124,7 +126,9 @@
category: 'Physical_Web', // the palette category
defaults: { // defines the editable properties of the node
name: {value:"Eddystone"}, // along with default values.
url: {value: ""},
url: {value: ""
//, validate: function(v) {var m = encodeURIComponent(v).match(/%[89ABab]/g); if (v.length + (m ? m.length : 0) < 18){$('#node-input-url-shorten').prop('disabled', true);return true} else {$('#node-input-url-shorten').prop('disabled', false);return false}}
},
power: {value:"-21"},
period: {value: "10"}
},
@ -138,6 +142,12 @@
},
labelStyle: function() { // sets the class to apply to the label
return this.name?"node_label_italic":"";
},
oneditprepare: function() {
},
oneditsave: function() {
}
});
</script>

115
hardware/physical-web/physical-web.js
View File

@ -15,73 +15,74 @@
**/
module.exports = function(RED) {
"use strict";
"use strict";
var eddystoneBeacon = require('eddystone-beacon');
var EddystoneBeaconScanner = require('eddystone-beacon-scanner');
var eddystoneBeacon = require('eddystone-beacon');
var EddystoneBeaconScanner = require('eddystone-beacon-scanner');
function Beacon(n){
RED.nodes.createNode(this,n);
var node = this;
node.power = n.power;
node.period = n.period;
node.url = n.url;
function Beacon(n){
RED.nodes.createNode(this,n);
var node = this;
node.power = n.power;
node.period = n.period;
node.url = n.url;
node.options = {
txPowerLevel: node.power,
tlmPeriod: node.period
}
node.options = {
txPowerLevel: node.power,
tlmPeriod: node.period,
tlmCount: 2
}
if (node.url) {
try {
eddystoneBeacon.advertiseUrl(msg.payload, node.options);
} catch(e){
node.error('Error setting beacon URL', e);
}
}
if (node.url) {
try {
eddystoneBeacon.advertiseUrl(node.url, node.options);
} catch(e){
node.error('Error setting beacon URL', e);
}
}
node.on('input', function(msg){
try {
eddystoneBeacon.advertiseUrl(msg.payload, node.options);
} catch(e){
node.error('error updating beacon URL', e);
}
});
node.on('input', function(msg){
try {
eddystoneBeacon.advertiseUrl(msg.payload, node.options);
} catch(e){
node.error('error updating beacon URL', e);
}
});
node.on('close', function(done){
try {
eddystoneBeacon.stop();
done();
} catch(e){
node.error('error shuttingdown beacon', e);
}
});
node.on('close', function(done){
try {
eddystoneBeacon.stop();
done();
} catch(e){
node.error('error shuttingdown beacon', e);
}
});
}
RED.nodes.registerType("PhysicalWeb out", Beacon);
}
RED.nodes.registerType("PhysicalWeb out", Beacon);
function Scanner(n){
RED.nodes.createNode(this,n);
var node = this;
node.topic = n.topic;
function Scanner(n){
RED.nodes.createNode(this,n);
var node = this;
node.topic = n.topic;
function onFound(beacon) {
node.send({
topic: node.topic,
payload: beacon
});
}
function onFound(beacon) {
node.send({
topic: node.topic,
payload: beacon
});
}
EddystoneBeaconScanner.on('found', onFound);
EddystoneBeaconScanner.on('updated', onFound);
EddystoneBeaconScanner.on('found', onFound);
EddystoneBeaconScanner.on('updated', onFound);
node.on('close',function(done){
EddystoneBeaconScanner.removeListener('found', onFound);
EddystoneBeaconScanner.removeListener('updated', onFound);
done();
});
}
RED.nodes.registerType("PhysicalWeb in", Scanner);
node.on('close',function(done){
EddystoneBeaconScanner.removeListener('found', onFound);
EddystoneBeaconScanner.removeListener('updated', onFound);
done();
});
}
RED.nodes.registerType("PhysicalWeb in", Scanner);
};
};