From 62208e7847595960c403d27ce1bd58866a02c58e Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Wed, 25 Oct 2023 14:36:40 +0200
Subject: [PATCH] fix(xo-server-transport-xmpp): fix loading (#7082)

Fixes https://xcp-ng.org/forum/post/66402

Introduced by d6fc86b6b
---
 CHANGELOG.unreleased.md                        | 2 ++
 packages/xo-server-transport-xmpp/package.json | 3 +--
 packages/xo-server-transport-xmpp/src/index.js | 6 +-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 053ccf8ea..8b5412046 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -28,6 +28,7 @@
 - Don't require to sign in again in XO after losing connection to XO Server (e.g. when restarting or upgrading XO) (PR [#7103](https://github.com/vatesfr/xen-orchestra/pull/7103))
 - [Usage report] Fix "Converting circular structure to JSON" error (PR [#7096](https://github.com/vatesfr/xen-orchestra/pull/7096))
 - [Usage report] Fix "Cannot convert undefined or null to object" error (PR [#7092](https://github.com/vatesfr/xen-orchestra/pull/7092))
+- [Plugin/transport-xmpp] Fix plugin load
 
 ### Packages to release
 
@@ -52,6 +53,7 @@
 - xo-server minor
 - xo-server-backup-reports minor
 - xo-server-netbox patch
+- xo-server-transport-xmpp patch
 - xo-server-usage-report patch
 - xo-web minor
 
diff --git a/packages/xo-server-transport-xmpp/package.json b/packages/xo-server-transport-xmpp/package.json
index 2c7ef9212..dbc50b295 100644
--- a/packages/xo-server-transport-xmpp/package.json
+++ b/packages/xo-server-transport-xmpp/package.json
@@ -29,8 +29,7 @@
     "node": ">=10"
   },
   "dependencies": {
-    "@xmpp/client": "^0.13.1",
-    "promise-toolbox": "^0.21.0"
+    "@xmpp/client": "^0.13.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
diff --git a/packages/xo-server-transport-xmpp/src/index.js b/packages/xo-server-transport-xmpp/src/index.js
index 6c02a370c..ca563e76a 100644
--- a/packages/xo-server-transport-xmpp/src/index.js
+++ b/packages/xo-server-transport-xmpp/src/index.js
@@ -1,4 +1,3 @@
-import fromEvent from 'promise-toolbox/fromEvent'
 import { client, xml } from '@xmpp/client'
 
 // ===================================================================
@@ -56,10 +55,7 @@ class TransportXmppPlugin {
 
   async load() {
     this._client = client(this._conf)
-    this._client.on('error', () => {})
-
-    await fromEvent(this._client.connection.socket, 'data')
-    await fromEvent(this._client, 'online')
+    await this._client.start()
 
     this._unset = this._set('sendToXmppClient', this._sendToXmppClient)
   }