Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xmppjs/xmpp.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.12.0
Choose a base ref
...
head repository: xmppjs/xmpp.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 12 commits
  • 76 files changed
  • 3 contributors

Commits on Dec 21, 2020

  1. update dependencies (#873)

    sonnyp authored Dec 21, 2020
    Copy the full SHA
    29e8da2 View commit details
  2. upgrade ini to version 1.3.6

    sonnyp committed Dec 21, 2020
    Copy the full SHA
    05b1e6c View commit details

Commits on Jan 5, 2021

  1. Copy the full SHA
    5b4849f View commit details

Commits on Jan 6, 2021

  1. sendMultiple (#876)

    sonnyp authored Jan 6, 2021
    Copy the full SHA
    bc8c6f2 View commit details

Commits on Jan 11, 2021

  1. Update issue templates

    sonnyp authored Jan 11, 2021
    Copy the full SHA
    2636f3d View commit details
  2. Update issue templates

    sonnyp authored Jan 11, 2021
    Copy the full SHA
    1e775fd View commit details

Commits on Mar 14, 2021

  1. Mention XML string parse script

    silverbucket authored and sonnyp committed Mar 14, 2021
    Copy the full SHA
    dd6b4e3 View commit details
  2. xml: better README

    sonnyp committed Mar 14, 2021
    Copy the full SHA
    42f9072 View commit details
  3. update dependencies (#891)

    sonnyp authored Mar 14, 2021
    Copy the full SHA
    3128387 View commit details

Commits on Apr 17, 2021

  1. Copy the full SHA
    551858c View commit details

Commits on Jul 24, 2021

  1. Copy the full SHA
    e559307 View commit details

Commits on Aug 19, 2021

  1. Copy the full SHA
    cb4d748 View commit details
Showing with 33,301 additions and 10,907 deletions.
  1. +3 −1 .eslintrc.js
  2. +19 −0 .github/ISSUE_TEMPLATE/bug-report.md
  3. +17 −0 .github/ISSUE_TEMPLATE/feature_request.md
  4. +42 −0 .github/workflows/CI.yml
  5. +2 −1 .gitignore
  6. +4 −0 .husky/pre-commit
  7. +4 −0 .husky/pre-push
  8. +0 −2 .prettierignore
  9. +0 −33 .travis.yml
  10. +9 −6 Makefile
  11. +1 −5 README.md
  12. +1 −4 lerna.json
  13. +32,938 −0 package-lock.json
  14. +31 −25 package.json
  15. +1 −2 packages/base64/package.json
  16. +4 −0 packages/client-core/lib/Client.js
  17. +1 −2 packages/client-core/package.json
  18. +11 −3 packages/client/README.md
  19. +5 −6 packages/client/package.json
  20. +1 −2 packages/component-core/package.json
  21. +11 −3 packages/component/README.md
  22. +1 −2 packages/component/package.json
  23. +15 −0 packages/connection-tcp/index.js
  24. +1 −2 packages/connection-tcp/package.json
  25. +19 −0 packages/connection-tcp/test/Connection.js
  26. +8 −17 packages/connection/index.js
  27. +1 −2 packages/connection/package.json
  28. +1 −18 packages/connection/test/send.js
  29. +1 −1 packages/debug/README.md
  30. +1 −2 packages/debug/package.json
  31. +1 −1 packages/error/README.md
  32. +1 −2 packages/error/package.json
  33. +2 −3 packages/events/package.json
  34. +1 −1 packages/id/README.md
  35. +1 −2 packages/id/package.json
  36. +7 −6 packages/iq/caller.js
  37. +2 −3 packages/iq/package.json
  38. +1 −1 packages/jid/README.md
  39. +1 −2 packages/jid/lib/JID.js
  40. +1 −2 packages/jid/package.json
  41. +1 −2 packages/middleware/package.json
  42. +1 −2 packages/reconnect/package.json
  43. +1 −1 packages/resolve/index.js
  44. +7 −6 packages/resolve/lib/dns.js
  45. +1 −2 packages/resolve/package.json
  46. +1 −1 packages/resolve/resolve.js
  47. +1 −2 packages/resource-binding/package.json
  48. +1 −2 packages/sasl-anonymous/package.json
  49. +1 −2 packages/sasl-plain/package.json
  50. +1 −2 packages/sasl-scram-sha-1/package.json
  51. +1 −2 packages/sasl/package.json
  52. +1 −2 packages/session-establishment/package.json
  53. +2 −2 packages/starttls/client.js
  54. +1 −2 packages/starttls/package.json
  55. +2 −2 packages/starttls/test.js
  56. +1 −2 packages/stream-features/package.json
  57. +12 −10 packages/stream-features/test.js
  58. +1 −2 packages/stream-management/package.json
  59. +1 −2 packages/tcp/package.json
  60. +1 −2 packages/test/package.json
  61. +1 −1 packages/time/README.md
  62. +1 −2 packages/time/package.json
  63. +1 −2 packages/tls/package.json
  64. +1 −2 packages/uri/package.json
  65. +7 −1 packages/websocket/lib/Connection.js
  66. +5 −4 packages/websocket/lib/Socket.js
  67. +2 −3 packages/websocket/package.json
  68. +15 −0 packages/websocket/test/test.js
  69. +32 −5 packages/xml/README.md
  70. +7 −7 packages/xml/lib/Element.js
  71. +1 −1 packages/xml/lib/x.js
  72. +1 −2 packages/xml/package.json
  73. +1 −2 packages/xmpp.js/package.json
  74. +15 −10 packages/xmpp.js/test.js
  75. +1 −0 test/browser.js
  76. +0 −10,653 yarn.lock
4 changes: 3 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ module.exports = {
"eslint:recommended",
"plugin:unicorn/recommended",
"plugin:node/recommended",
"plugin:prettier/recommended",
"plugin:promise/recommended",
"plugin:prettier/recommended",
],

env: {
@@ -67,5 +67,7 @@ module.exports = {
"unicorn/prefer-number-properties": 0,
"unicorn/no-useless-undefined": 0,
"unicorn/no-null": 0,
"unicorn/prefer-module": 0,
"unicorn/numeric-separators-style": 0, // Requires Node.js 12.8
},
};
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

⚠ If you need help with XMPP itself, please visit https://xmpp.org/community/ instead.

**Describe the bug**
A clear and concise description of what the bug is.

**Logs**
Share logs using https://github.com/xmppjs/xmpp.js/tree/master/packages/debug

**Environment**
As much as possible information about the environment running xmpp.js
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Additional context**
Add any other context or links about the feature request here.
42 changes: 42 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: CI

on:
push:
branches: [master]
pull_request:
branches: [master]

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x, 14.x, 16.x]
steps:
- uses: actions/checkout@v2

- uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install prosody
run: |
sudo apt-get update
sudo apt-get -y install prosody lua-bitop lua-sec
sudo service prosody stop
- run: npm install -g npm
- run: make
- run: make test-ci

- name: The job has failed
if: ${{ failure() }}
run: cat server/prosody.err
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -14,4 +14,5 @@ server/prosody-modules/

npm-debug.log
lerna-debug.log
yarn-error.log

.eslintcache
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
4 changes: 4 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

make test
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
node_modules/
**/dist/*.js
bundle.js
package.json
.yarn/
server/prosody-modules/
33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -2,25 +2,25 @@

setup:
node packages/xmpp.js/script.js
yarn
npm install
./node_modules/.bin/lerna bootstrap
cd packages/xmpp.js/ && yarn run prepublish
cd packages/xmpp.js/ && npm run prepublish
node bundle.js

lint:
./node_modules/.bin/eslint .
./node_modules/.bin/eslint --cache .

test:
cd packages/xmpp.js/ && yarn run prepublish
yarn
cd packages/xmpp.js/ && npm run prepublish
npm install
./node_modules/.bin/lerna bootstrap
node bundle.js
./node_modules/.bin/ava
make lint
make bundlesize

test-ci:
yarn
npm install
./node_modules/.bin/lerna bootstrap
./node_modules/.bin/ava
make lint
@@ -61,3 +61,6 @@ size:

cert:
cd server && openssl req -new -x509 -days 365 -nodes -out "localhost.crt" -newkey rsa:2048 -keyout "localhost.key" -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost"

ncu:
ncu && npx lerna exec ncu
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# xmpp.js

[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
[![build status](https://img.shields.io/travis/xmppjs/xmpp.js/master.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/xmppjs/xmpp.js/branches)
[![license](https://img.shields.io/github/license/xmppjs/xmpp.js.svg?maxAge=2592000&style=flat-square)](https://raw.githubusercontent.com/xmppjs/xmpp.js/master/LICENSE)

> XMPP is an open technology for real-time communication, which powers a wide range of applications including instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data.
> [xmpp.org/about-xmpp/technology-overview/](https://xmpp.org/about/technology-overview.html)
@@ -29,7 +25,7 @@ It aims to run everywhere JavaScript runs and make use of the best network trans

By default, it handles errors and will automatically reconnect. With appropriate configuration it will even loop through a list of endpoints. You don't have to write a single line of code to handle network failures.

Releases follow the [Semantic Versionning specification](http://semver.org/)
Releases follow the [Semantic Versioning specification](http://semver.org/)

### modular

5 changes: 1 addition & 4 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"version": "0.12.0",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
"packages/*"
],
"packages": ["packages/*"],
"command": {
"publish": {
"ignoreChanges": [
Loading