From 2bb0735167277e8c5b731a92a41793af9bbb5331 Mon Sep 17 00:00:00 2001 From: Anatoly Tsapkov Date: Thu, 6 Feb 2020 23:30:38 -0500 Subject: [PATCH] version up --- README.md | 5 +++-- bin/with_auth.js | 16 +++++++--------- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a40f1b8..f611871 100644 --- a/README.md +++ b/README.md @@ -35,19 +35,20 @@ const FoxRouter = require('fox-wamp') const PORT = process.env.PORT || 5000 let app = express() +app.get('/', (req, res) => res.send('Hello World!')) let httpServer = http.createServer(app) httpServer.listen(PORT, () => console.log(`Listening on ${ PORT }`)) router = new FoxRouter() -router.listenWAMP({server: httpServer, path: "/wss"}) +router.listenWAMP({server: httpServer, path: "/wamp"}) ``` and correspondingly the web socket client connection will look like as ```javascript let autobahn = require('autobahn') let connection = new autobahn.Connection({ - url: 'ws:localhost:5000/wss', + url: 'ws:localhost:5000/wamp', realm: 'realm1' }) ``` diff --git a/bin/with_auth.js b/bin/with_auth.js index 011102f..2d3d39e 100644 --- a/bin/with_auth.js +++ b/bin/with_auth.js @@ -2,18 +2,18 @@ // This is authenticate router example // -var Router = require('../index') -var TopicPattern = require('../lib/topic_pattern') -var program = require('commander') +const Router = require('../index') +const TopicPattern = require('../lib/topic_pattern') +const program = require('commander') program .option('-p, --port ', 'Server IP port', 9000) .parse(process.argv) -let app = new Router() +const app = new Router() app.setLogTrace(true) -let WampAuth = function () { +const WampAuth = function () { this.getAuthMethods = function () { return ['ticket'] } @@ -42,15 +42,13 @@ let WampAuth = function () { } this.wampcra_auth = function (realmName, secureDetails, secret, extra, cb) { console.log(realmName, secureDetails, secret, extra) - } this.authorize = function (session, funcClass, uniUri) { - let userDetails = session.getUserDetails() + const userDetails = session.getUserDetails() console.log('authorize:', funcClass, uniUri, 'userDetails:', userDetails) if (userDetails.role === 'admin') { return true - } - else { + } else { return !TopicPattern.intersect(uniUri, ['sys', 'user', 'info', '#']) } } diff --git a/package-lock.json b/package-lock.json index 9e0198f..25f714d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fox-wamp", - "version": "0.6.9", + "version": "0.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5597c07..eb5d78b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fox-wamp", - "version": "0.6.9", + "version": "0.7.0", "description": "Web Application Message Router/Server WAMP/MQTT", "author": { "name": "Anatoly Tsapkov",