Skip to content

Commit 413f729

Browse files
jpwsuttonjpwsutton
authored
Merge pull request #172 from eclipse/develop
Merge Develop into Master for Eclipse Photon 1.1.0 release
2 parents e3df358 + a1936ee commit 413f729

20 files changed

+3939
-3345
lines changed

‎.eslintrc.json‎

Lines changed: 284 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,284 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"node": true,
5+
"es6": true,
6+
"amd": true
7+
},
8+
"extends": "eslint:recommended",
9+
"globals" : {
10+
"Paho" : true
11+
},
12+
"rules": {
13+
"accessor-pairs": "error",
14+
"array-bracket-newline": "off",
15+
"array-bracket-spacing": [
16+
"error",
17+
"never"
18+
],
19+
"array-callback-return": "error",
20+
"array-element-newline": "off",
21+
"arrow-body-style": "error",
22+
"arrow-parens": "error",
23+
"arrow-spacing": "error",
24+
"block-scoped-var": "off",
25+
"block-spacing": "off",
26+
"brace-style": "off",
27+
"callback-return": "error",
28+
"camelcase": [
29+
"error",
30+
{
31+
"properties": "never"
32+
}
33+
],
34+
"capitalized-comments": "off",
35+
"class-methods-use-this": "error",
36+
"comma-dangle": "off",
37+
"comma-spacing": "off",
38+
"comma-style": [
39+
"error",
40+
"last"
41+
],
42+
"complexity": "off",
43+
"computed-property-spacing": [
44+
"error",
45+
"never"
46+
],
47+
"consistent-return": "off",
48+
"consistent-this": "error",
49+
"curly": "off",
50+
"default-case": "off",
51+
"dot-location": "error",
52+
"dot-notation": "error",
53+
"eol-last": "error",
54+
"eqeqeq": "off",
55+
"for-direction": "error",
56+
"func-call-spacing": "off",
57+
"func-name-matching": "error",
58+
"func-names": "off",
59+
"func-style": "off",
60+
"function-paren-newline": "off",
61+
"generator-star-spacing": "error",
62+
"getter-return": "error",
63+
"global-require": "error",
64+
"guard-for-in": "off",
65+
"handle-callback-err": "error",
66+
"id-blacklist": "error",
67+
"id-length": "off",
68+
"id-match": "error",
69+
"implicit-arrow-linebreak": "error",
70+
"indent": "off",
71+
"indent-legacy": "off",
72+
"init-declarations": "off",
73+
"jsx-quotes": "error",
74+
"key-spacing": "off",
75+
"keyword-spacing": "off",
76+
"line-comment-position": "off",
77+
"linebreak-style": [
78+
"error",
79+
"unix"
80+
],
81+
"lines-around-comment": "off",
82+
"lines-around-directive": "error",
83+
"lines-between-class-members": "error",
84+
"max-depth": "off",
85+
"max-len": "off",
86+
"max-lines": "off",
87+
"max-nested-callbacks": "error",
88+
"max-params": "off",
89+
"max-statements": "off",
90+
"max-statements-per-line": "off",
91+
"multiline-comment-style": "off",
92+
"new-parens": "error",
93+
"newline-after-var": "off",
94+
"newline-before-return": "off",
95+
"newline-per-chained-call": "error",
96+
"no-alert": "error",
97+
"no-array-constructor": "error",
98+
"no-await-in-loop": "error",
99+
"no-bitwise": "off",
100+
"no-buffer-constructor": "error",
101+
"no-caller": "error",
102+
"no-catch-shadow": "error",
103+
"no-cond-assign": [
104+
"error",
105+
"except-parens"
106+
],
107+
"no-confusing-arrow": "error",
108+
"no-continue": "error",
109+
"no-div-regex": "error",
110+
"no-duplicate-imports": "error",
111+
"no-else-return": "off",
112+
"no-empty-function": "error",
113+
"no-eq-null": "error",
114+
"no-eval": "error",
115+
"no-extend-native": "error",
116+
"no-extra-bind": "error",
117+
"no-extra-label": "error",
118+
"no-extra-parens": "off",
119+
"no-floating-decimal": "error",
120+
"no-implicit-coercion": "error",
121+
"no-implicit-globals": "off",
122+
"no-implied-eval": "error",
123+
"no-inline-comments": "off",
124+
"no-inner-declarations": [
125+
"error",
126+
"functions"
127+
],
128+
"no-invalid-this": "error",
129+
"no-iterator": "error",
130+
"no-label-var": "error",
131+
"no-labels": "error",
132+
"no-lone-blocks": "error",
133+
"no-lonely-if": "off",
134+
"no-loop-func": "error",
135+
"no-magic-numbers": "off",
136+
"no-mixed-operators": "off",
137+
"no-mixed-requires": "error",
138+
"no-multi-assign": "off",
139+
"no-multi-spaces": "off",
140+
"no-multi-str": "error",
141+
"no-multiple-empty-lines": "off",
142+
"no-native-reassign": "error",
143+
"no-negated-condition": "off",
144+
"no-negated-in-lhs": "error",
145+
"no-nested-ternary": "error",
146+
"no-new": "error",
147+
"no-new-func": "error",
148+
"no-new-object": "error",
149+
"no-new-require": "error",
150+
"no-new-wrappers": "error",
151+
"no-octal-escape": "error",
152+
"no-param-reassign": "off",
153+
"no-path-concat": "error",
154+
"no-plusplus": "off",
155+
"no-process-env": "error",
156+
"no-process-exit": "error",
157+
"no-proto": "error",
158+
"no-prototype-builtins": "off",
159+
"no-redeclare" : "warn",
160+
"no-restricted-globals": "error",
161+
"no-restricted-imports": "error",
162+
"no-restricted-modules": "error",
163+
"no-restricted-properties": "error",
164+
"no-restricted-syntax": "error",
165+
"no-return-assign": "error",
166+
"no-return-await": "error",
167+
"no-script-url": "error",
168+
"no-self-compare": "error",
169+
"no-sequences": "error",
170+
"no-shadow": "off",
171+
"no-shadow-restricted-names": "error",
172+
"no-spaced-func": "off",
173+
"no-sync": "error",
174+
"no-tabs": "off",
175+
"no-template-curly-in-string": "error",
176+
"no-ternary": "off",
177+
"no-throw-literal": "error",
178+
"no-trailing-spaces": "off",
179+
"no-undef-init": "error",
180+
"no-undefined": "off",
181+
"no-underscore-dangle": "off",
182+
"no-unmodified-loop-condition": "error",
183+
"no-unneeded-ternary": "error",
184+
"no-unused-expressions": "error",
185+
"no-use-before-define": "off",
186+
"no-useless-call": "error",
187+
"no-useless-computed-key": "error",
188+
"no-useless-concat": "off",
189+
"no-useless-constructor": "error",
190+
"no-useless-escape": "warn",
191+
"no-useless-rename": "error",
192+
"no-useless-return": "off",
193+
"no-var": "off",
194+
"no-void": "error",
195+
"no-warning-comments": [
196+
"error",
197+
{
198+
"location": "start"
199+
}
200+
],
201+
"no-whitespace-before-property": "error",
202+
"no-with": "error",
203+
"nonblock-statement-body-position": [
204+
"error",
205+
"any"
206+
],
207+
"object-curly-newline": "off",
208+
"object-curly-spacing": "off",
209+
"object-property-newline": [
210+
"error",
211+
{
212+
"allowMultiplePropertiesPerLine": true
213+
}
214+
],
215+
"object-shorthand": "off",
216+
"one-var": "off",
217+
"one-var-declaration-per-line": [
218+
"error",
219+
"initializations"
220+
],
221+
"operator-assignment": "off",
222+
"operator-linebreak": "error",
223+
"padded-blocks": "off",
224+
"padding-line-between-statements": "error",
225+
"prefer-arrow-callback": "off",
226+
"prefer-const": "error",
227+
"prefer-destructuring": "off",
228+
"prefer-numeric-literals": "error",
229+
"prefer-promise-reject-errors": "error",
230+
"prefer-reflect": "off",
231+
"prefer-rest-params": "off",
232+
"prefer-spread": "error",
233+
"prefer-template": "off",
234+
"quote-props": "off",
235+
"quotes": [
236+
"error",
237+
"double"
238+
],
239+
"radix": [
240+
"error",
241+
"as-needed"
242+
],
243+
"require-await": "error",
244+
"require-jsdoc": "off",
245+
"rest-spread-spacing": "error",
246+
"semi": "error",
247+
"semi-spacing": "off",
248+
"semi-style": [
249+
"error",
250+
"last"
251+
],
252+
"sort-imports": "error",
253+
"sort-keys": "off",
254+
"sort-vars": "error",
255+
"space-before-blocks": "off",
256+
"space-before-function-paren": "off",
257+
"space-in-parens": "off",
258+
"space-infix-ops": "off",
259+
"space-unary-ops": "error",
260+
"spaced-comment": "off",
261+
"strict": [
262+
"error",
263+
"never"
264+
],
265+
"switch-colon-spacing": "error",
266+
"symbol-description": "error",
267+
"template-curly-spacing": "error",
268+
"template-tag-spacing": "error",
269+
"unicode-bom": [
270+
"error",
271+
"never"
272+
],
273+
"valid-jsdoc": "off",
274+
"valid-typeof": [
275+
"error",
276+
{
277+
"requireStringLiterals": false
278+
}
279+
],
280+
"vars-on-top": "off",
281+
"wrap-regex": "error",
282+
"yield-star-spacing": "error"
283+
}
284+
}

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
node_modules
22
.npm
33
target
4+
package-lock.json
5+
.env
6+
paho.mqtt.testing/
7+
persistence/

‎.travis.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1+
language: node_js
2+
node_js: 5
3+
before_install:
4+
- ./start-broker.sh
15
script:
2-
mvn clean verify
6+
- cp travis.env .env
7+
- mvn clean verify
8+
- ./runTests.sh

‎README.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Eclipse Paho JavaScript client
22

3+
[![Build Status](https://travis-ci.org/eclipse/paho.mqtt.javascript.svg?branch=develop)](https://travis-ci.org/eclipse/paho.mqtt.javascript)
4+
35
The Paho JavaScript Client is an MQTT browser-based client library written in Javascript that uses WebSockets to connect to an MQTT Broker.
46

57
## Project description:
@@ -15,7 +17,7 @@ Paho reflects the inherent physical and cost constraints of device connectivity.
1517
- GitHub: [https://github.com/eclipse/paho.mqtt.javascript](https://github.com/eclipse/paho.mqtt.javascript)
1618
- Twitter: [@eclipsepaho](https://twitter.com/eclipsepaho)
1719
- Issues: [github.com/eclipse/paho.mqtt.javascript/issues](https://github.com/eclipse/paho.mqtt.javascript/issues)
18-
- Mailing-list: [https://dev.eclipse.org/mailman/listinfo/paho-dev](https://dev.eclipse.org/mailman/listinfo/paho-dev
20+
- Mailing-list: [https://dev.eclipse.org/mailman/listinfo/paho-dev](https://dev.eclipse.org/mailman/listinfo/paho-dev)
1921

2022

2123
## Using the Paho Javascript Client
@@ -73,7 +75,7 @@ This requires the use of a broker that supports WebSockets natively, or the use
7375

7476
```JS
7577
// Create a client instance
76-
client = new Paho.MQTT.Client(location.hostname, Number(location.port), "clientId");
78+
var client = new Paho.MQTT.Client(location.hostname, Number(location.port), "clientId");
7779

7880
// set callback handlers
7981
client.onConnectionLost = onConnectionLost;
@@ -105,3 +107,8 @@ function onMessageArrived(message) {
105107
console.log("onMessageArrived:"+message.payloadString);
106108
}
107109
```
110+
111+
## Breaking Changes
112+
113+
Previously the Client's Namepsace was `Paho.MQTT`, as of version 1.1.0 (develop branch) this has now been simplified to `Paho`.
114+
You should be able to simply do a find and replace in your code to resolve this, for example all instances of `Paho.MQTT.Client` will now be `Paho.Client` and `Paho.MQTT.Message` will be `Paho.Message`.

‎package.json‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
{
22
"name": "paho-client",
3-
"description": "Pre reqs for the Paho JS client",
4-
"dependencies": {
5-
"websocket": "1.x.x",
6-
"node-localstorage": "1.3.x",
3+
"description": "Eclipse Paho JavaScript MQTT client",
4+
"version": "1.1.0",
5+
"main": "./src/paho-mqtt.js",
6+
"repository": {
7+
"type": "git",
8+
"url": "https://github.com/eclipse/paho.mqtt.javascript.git"
9+
},
10+
"license": "EPL-1.0",
11+
"devDependencies": {
12+
"dotenv": "^4.0.0",
13+
"eslint": "^4.12.1",
714
"jasmine-node": "1.14.x",
8-
"jshint" : "2.9.x"
15+
"jsdoc": "^3.5.5",
16+
"node-localstorage": "1.3.x",
17+
"websocket": "1.x.x"
918
}
1019
}

0 commit comments

Comments
 (0)