Skip to content

Merge Develop to Master for Eclipse Photon Release #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Jul 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d9ab728
Removed reference to window and change to self (#116)
tmulkern Sep 6, 2017
3c07549
Refactored Properties using Object.defineProperties (#120)
tmulkern Sep 8, 2017
3ed7ba8
Remove the needed for reversing arrays for processing
tmulkern Sep 8, 2017
517b5c5
Tweaking tests to run on travis.
jpwsutton Nov 14, 2017
ffc611b
Fix typo (#128)
nicorikken Nov 23, 2017
8ef9e08
Moving to eslint and setting consistent code style in paho-mqtt.js as…
jpwsutton Dec 8, 2017
2bc3176
Merge branch 'remove-reverse-call-on-arrays' of https://github.com/tm…
jpwsutton Dec 8, 2017
65523dc
Merge branch 'tmulkern-remove-reverse-call-on-arrays' into develop
jpwsutton Dec 8, 2017
55f85b2
Fixing tests to fully complete
jpwsutton Dec 8, 2017
15a12d2
Variable message should not be global
greenstone7 Dec 24, 2017
1c60cbf
Function call should be local
greenstone7 Dec 24, 2017
e2e4da5
Variable client should not be global
greenstone7 Dec 24, 2017
630a4cc
Variable client should not be global
greenstone7 Dec 24, 2017
6b0023a
Updating Utility to use Automatic Reconnect & have visible console
jpwsutton Jan 3, 2018
37834bb
Fixing tests to work with updated interopability broker, updating .gi…
jpwsutton Jan 5, 2018
285bbdd
Adding Travis badge and fixing typo.
jpwsutton Jan 5, 2018
20db889
Added subscribe/unsunbscribe support for multiple topics
svarogg Mar 6, 2018
50eb291
Merge branch 'develop' of https://github.com/greenstone7/paho.mqtt.ja…
jpwsutton May 4, 2018
24cb6bc
Merge branch 'greenstone7-develop' into develop
jpwsutton May 4, 2018
194d5a3
Merge branch 'multiple_topics' of https://github.com/svarogg/paho.mqt…
jpwsutton May 4, 2018
e9cf0cc
Fixing typo in PR and adding a test case
jpwsutton May 4, 2018
46a5e47
Merge branch 'svarogg-multiple_topics' into develop
jpwsutton May 4, 2018
557403c
GDPR - Adding LocalStorage Warning to Utility
jpwsutton May 9, 2018
1ff91a3
Brings Paho one step closer to be supported in non-browser environmen…
manueliglesias Jul 23, 2018
686d322
Updating version to 1.1.0 for Eclipse Photon
jpwsutton Jul 23, 2018
a1936ee
Merge branch 'master' into develop
jpwsutton Jul 23, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
284 changes: 284 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
{
"env": {
"browser": true,
"node": true,
"es6": true,
"amd": true
},
"extends": "eslint:recommended",
"globals" : {
"Paho" : true
},
"rules": {
"accessor-pairs": "error",
"array-bracket-newline": "off",
"array-bracket-spacing": [
"error",
"never"
],
"array-callback-return": "error",
"array-element-newline": "off",
"arrow-body-style": "error",
"arrow-parens": "error",
"arrow-spacing": "error",
"block-scoped-var": "off",
"block-spacing": "off",
"brace-style": "off",
"callback-return": "error",
"camelcase": [
"error",
{
"properties": "never"
}
],
"capitalized-comments": "off",
"class-methods-use-this": "error",
"comma-dangle": "off",
"comma-spacing": "off",
"comma-style": [
"error",
"last"
],
"complexity": "off",
"computed-property-spacing": [
"error",
"never"
],
"consistent-return": "off",
"consistent-this": "error",
"curly": "off",
"default-case": "off",
"dot-location": "error",
"dot-notation": "error",
"eol-last": "error",
"eqeqeq": "off",
"for-direction": "error",
"func-call-spacing": "off",
"func-name-matching": "error",
"func-names": "off",
"func-style": "off",
"function-paren-newline": "off",
"generator-star-spacing": "error",
"getter-return": "error",
"global-require": "error",
"guard-for-in": "off",
"handle-callback-err": "error",
"id-blacklist": "error",
"id-length": "off",
"id-match": "error",
"implicit-arrow-linebreak": "error",
"indent": "off",
"indent-legacy": "off",
"init-declarations": "off",
"jsx-quotes": "error",
"key-spacing": "off",
"keyword-spacing": "off",
"line-comment-position": "off",
"linebreak-style": [
"error",
"unix"
],
"lines-around-comment": "off",
"lines-around-directive": "error",
"lines-between-class-members": "error",
"max-depth": "off",
"max-len": "off",
"max-lines": "off",
"max-nested-callbacks": "error",
"max-params": "off",
"max-statements": "off",
"max-statements-per-line": "off",
"multiline-comment-style": "off",
"new-parens": "error",
"newline-after-var": "off",
"newline-before-return": "off",
"newline-per-chained-call": "error",
"no-alert": "error",
"no-array-constructor": "error",
"no-await-in-loop": "error",
"no-bitwise": "off",
"no-buffer-constructor": "error",
"no-caller": "error",
"no-catch-shadow": "error",
"no-cond-assign": [
"error",
"except-parens"
],
"no-confusing-arrow": "error",
"no-continue": "error",
"no-div-regex": "error",
"no-duplicate-imports": "error",
"no-else-return": "off",
"no-empty-function": "error",
"no-eq-null": "error",
"no-eval": "error",
"no-extend-native": "error",
"no-extra-bind": "error",
"no-extra-label": "error",
"no-extra-parens": "off",
"no-floating-decimal": "error",
"no-implicit-coercion": "error",
"no-implicit-globals": "off",
"no-implied-eval": "error",
"no-inline-comments": "off",
"no-inner-declarations": [
"error",
"functions"
],
"no-invalid-this": "error",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": "error",
"no-lone-blocks": "error",
"no-lonely-if": "off",
"no-loop-func": "error",
"no-magic-numbers": "off",
"no-mixed-operators": "off",
"no-mixed-requires": "error",
"no-multi-assign": "off",
"no-multi-spaces": "off",
"no-multi-str": "error",
"no-multiple-empty-lines": "off",
"no-native-reassign": "error",
"no-negated-condition": "off",
"no-negated-in-lhs": "error",
"no-nested-ternary": "error",
"no-new": "error",
"no-new-func": "error",
"no-new-object": "error",
"no-new-require": "error",
"no-new-wrappers": "error",
"no-octal-escape": "error",
"no-param-reassign": "off",
"no-path-concat": "error",
"no-plusplus": "off",
"no-process-env": "error",
"no-process-exit": "error",
"no-proto": "error",
"no-prototype-builtins": "off",
"no-redeclare" : "warn",
"no-restricted-globals": "error",
"no-restricted-imports": "error",
"no-restricted-modules": "error",
"no-restricted-properties": "error",
"no-restricted-syntax": "error",
"no-return-assign": "error",
"no-return-await": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-shadow": "off",
"no-shadow-restricted-names": "error",
"no-spaced-func": "off",
"no-sync": "error",
"no-tabs": "off",
"no-template-curly-in-string": "error",
"no-ternary": "off",
"no-throw-literal": "error",
"no-trailing-spaces": "off",
"no-undef-init": "error",
"no-undefined": "off",
"no-underscore-dangle": "off",
"no-unmodified-loop-condition": "error",
"no-unneeded-ternary": "error",
"no-unused-expressions": "error",
"no-use-before-define": "off",
"no-useless-call": "error",
"no-useless-computed-key": "error",
"no-useless-concat": "off",
"no-useless-constructor": "error",
"no-useless-escape": "warn",
"no-useless-rename": "error",
"no-useless-return": "off",
"no-var": "off",
"no-void": "error",
"no-warning-comments": [
"error",
{
"location": "start"
}
],
"no-whitespace-before-property": "error",
"no-with": "error",
"nonblock-statement-body-position": [
"error",
"any"
],
"object-curly-newline": "off",
"object-curly-spacing": "off",
"object-property-newline": [
"error",
{
"allowMultiplePropertiesPerLine": true
}
],
"object-shorthand": "off",
"one-var": "off",
"one-var-declaration-per-line": [
"error",
"initializations"
],
"operator-assignment": "off",
"operator-linebreak": "error",
"padded-blocks": "off",
"padding-line-between-statements": "error",
"prefer-arrow-callback": "off",
"prefer-const": "error",
"prefer-destructuring": "off",
"prefer-numeric-literals": "error",
"prefer-promise-reject-errors": "error",
"prefer-reflect": "off",
"prefer-rest-params": "off",
"prefer-spread": "error",
"prefer-template": "off",
"quote-props": "off",
"quotes": [
"error",
"double"
],
"radix": [
"error",
"as-needed"
],
"require-await": "error",
"require-jsdoc": "off",
"rest-spread-spacing": "error",
"semi": "error",
"semi-spacing": "off",
"semi-style": [
"error",
"last"
],
"sort-imports": "error",
"sort-keys": "off",
"sort-vars": "error",
"space-before-blocks": "off",
"space-before-function-paren": "off",
"space-in-parens": "off",
"space-infix-ops": "off",
"space-unary-ops": "error",
"spaced-comment": "off",
"strict": [
"error",
"never"
],
"switch-colon-spacing": "error",
"symbol-description": "error",
"template-curly-spacing": "error",
"template-tag-spacing": "error",
"unicode-bom": [
"error",
"never"
],
"valid-jsdoc": "off",
"valid-typeof": [
"error",
{
"requireStringLiterals": false
}
],
"vars-on-top": "off",
"wrap-regex": "error",
"yield-star-spacing": "error"
}
}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
node_modules
.npm
target
package-lock.json
.env
paho.mqtt.testing/
persistence/
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
language: node_js
node_js: 5
before_install:
- ./start-broker.sh
script:
mvn clean verify
- cp travis.env .env
- mvn clean verify
- ./runTests.sh
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Eclipse Paho JavaScript client

[![Build Status](https://travis-ci.org/eclipse/paho.mqtt.javascript.svg?branch=develop)](https://travis-ci.org/eclipse/paho.mqtt.javascript)

The Paho JavaScript Client is an MQTT browser-based client library written in Javascript that uses WebSockets to connect to an MQTT Broker.

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


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

```JS
// Create a client instance
client = new Paho.MQTT.Client(location.hostname, Number(location.port), "clientId");
var client = new Paho.MQTT.Client(location.hostname, Number(location.port), "clientId");

// set callback handlers
client.onConnectionLost = onConnectionLost;
Expand Down Expand Up @@ -105,3 +107,8 @@ function onMessageArrived(message) {
console.log("onMessageArrived:"+message.payloadString);
}
```

## Breaking Changes

Previously the Client's Namepsace was `Paho.MQTT`, as of version 1.1.0 (develop branch) this has now been simplified to `Paho`.
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`.
19 changes: 14 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
{
"name": "paho-client",
"description": "Pre reqs for the Paho JS client",
"dependencies": {
"websocket": "1.x.x",
"node-localstorage": "1.3.x",
"description": "Eclipse Paho JavaScript MQTT client",
"version": "1.1.0",
"main": "./src/paho-mqtt.js",
"repository": {
"type": "git",
"url": "https://github.com/eclipse/paho.mqtt.javascript.git"
},
"license": "EPL-1.0",
"devDependencies": {
"dotenv": "^4.0.0",
"eslint": "^4.12.1",
"jasmine-node": "1.14.x",
"jshint" : "2.9.x"
"jsdoc": "^3.5.5",
"node-localstorage": "1.3.x",
"websocket": "1.x.x"
}
}
Loading