From fb8ca00ad132b61bb231fb9cf39af86cb383b640 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Fri, 28 May 2021 09:34:49 +0200
Subject: [PATCH] fix: dont use deprecated event-to-promise

---
 packages/xo-server-test/src/old-tests/disk.spec.js      | 4 ++--
 packages/xo-server-test/src/old-tests/host.spec.js      | 4 ++--
 packages/xo-server-test/src/old-tests/pool.spec.js      | 4 ++--
 packages/xo-server-test/src/old-tests/schedule.spec.js  | 4 ++--
 packages/xo-server-test/src/old-tests/scheduler.spec.js | 4 ++--
 packages/xo-server-test/src/old-tests/vbd.spec.js       | 4 ++--
 packages/xo-server-test/src/old-tests/vif.spec.js       | 4 ++--
 packages/xo-server-test/src/old-tests/vm.spec.js        | 8 ++++----
 packages/xo-server-transport-xmpp/package.json          | 4 ++--
 packages/xo-server-transport-xmpp/src/index.js          | 6 +++---
 packages/xo-vmdk-to-vhd/package.json                    | 2 +-
 packages/xo-vmdk-to-vhd/src/vmdk-to-vhd.integ.spec.js   | 4 ++--
 packages/xo-web/package.json                            | 1 -
 packages/xo-web/src/common/xoa-updater.js               | 4 ++--
 14 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/packages/xo-server-test/src/old-tests/disk.spec.js b/packages/xo-server-test/src/old-tests/disk.spec.js
index f8e6f360d..689e69062 100644
--- a/packages/xo-server-test/src/old-tests/disk.spec.js
+++ b/packages/xo-server-test/src/old-tests/disk.spec.js
@@ -5,9 +5,9 @@ import expect from 'must'
 
 // ===================================================================
 
+import fromEvent from 'promise-toolbox/fromEvent'
 import { getConfig, getMainConnection, getSrId, waitObjectState } from './util'
 import { map } from 'lodash'
-import eventToPromise from 'event-to-promise'
 
 // ===================================================================
 
@@ -27,7 +27,7 @@ describe('disk', () => {
     const config = await getConfig()
     serverId = await xo.call('server.add', Object.assign({ autoConnect: false }, config.xenServer1))
     await xo.call('server.connect', { id: serverId })
-    await eventToPromise(xo.objects, 'finish')
+    await fromEvent(xo.objects, 'finish')
     srId = await getSrId(xo)
   })
 
diff --git a/packages/xo-server-test/src/old-tests/host.spec.js b/packages/xo-server-test/src/old-tests/host.spec.js
index 4051386c8..4c6a6243d 100644
--- a/packages/xo-server-test/src/old-tests/host.spec.js
+++ b/packages/xo-server-test/src/old-tests/host.spec.js
@@ -3,7 +3,7 @@
 // Doc: https://github.com/moll/js-must/blob/master/doc/API.md#must
 
 import expect from 'must'
-import eventToPromise from 'event-to-promise'
+import fromEvent from 'promise-toolbox/fromEvent'
 import { getAllHosts, getConfig, getMainConnection, getVmToMigrateId, waitObjectState } from './util'
 import { find, forEach } from 'lodash'
 
@@ -21,7 +21,7 @@ describe('host', () => {
     let config
     ;[xo, config] = await Promise.all([getMainConnection(), getConfig()])
     serverId = await xo.call('server.add', config.xenServer2).catch(() => {})
-    await eventToPromise(xo.objects, 'finish')
+    await fromEvent(xo.objects, 'finish')
 
     hostId = getHost(config.host1)
   })
diff --git a/packages/xo-server-test/src/old-tests/pool.spec.js b/packages/xo-server-test/src/old-tests/pool.spec.js
index c53d5cf44..b24ae1c43 100644
--- a/packages/xo-server-test/src/old-tests/pool.spec.js
+++ b/packages/xo-server-test/src/old-tests/pool.spec.js
@@ -5,8 +5,8 @@ import expect from 'must'
 
 // ===================================================================
 
+import fromEvent from 'promise-toolbox/fromEvent'
 import { getConfig, getMainConnection, waitObjectState } from './util'
-import eventToPromise from 'event-to-promise'
 import { find } from 'lodash'
 
 // ===================================================================
@@ -21,7 +21,7 @@ describe('pool', () => {
     jest.setTimeout(10e3)
     ;[xo, config] = await Promise.all([getMainConnection(), getConfig()])
     serverId = await xo.call('server.add', config.xenServer1).catch(() => {})
-    await eventToPromise(xo.objects, 'finish')
+    await fromEvent(xo.objects, 'finish')
     poolId = getPoolId()
   })
 
diff --git a/packages/xo-server-test/src/old-tests/schedule.spec.js b/packages/xo-server-test/src/old-tests/schedule.spec.js
index 38dba1efa..8181b0440 100644
--- a/packages/xo-server-test/src/old-tests/schedule.spec.js
+++ b/packages/xo-server-test/src/old-tests/schedule.spec.js
@@ -5,8 +5,8 @@ import expect from 'must'
 
 // ===================================================================
 
+import fromEvent from 'promise-toolbox/fromEvent'
 import { getConfig, getMainConnection, getSchedule, jobTest, scheduleTest } from './util'
-import eventToPromise from 'event-to-promise'
 import { map } from 'lodash'
 
 // ===================================================================
@@ -23,7 +23,7 @@ describe('schedule', () => {
     ;[xo, config] = await Promise.all([getMainConnection(), getConfig()])
 
     serverId = await xo.call('server.add', config.xenServer1).catch(() => {})
-    await eventToPromise(xo.objects, 'finish')
+    await fromEvent(xo.objects, 'finish')
 
     jobId = await jobTest(xo)
   })
diff --git a/packages/xo-server-test/src/old-tests/scheduler.spec.js b/packages/xo-server-test/src/old-tests/scheduler.spec.js
index 3d4704a81..17ab91c9a 100644
--- a/packages/xo-server-test/src/old-tests/scheduler.spec.js
+++ b/packages/xo-server-test/src/old-tests/scheduler.spec.js
@@ -5,8 +5,8 @@ import expect from 'must'
 
 // ===================================================================
 
+import fromEvent from 'promise-toolbox/fromEvent'
 import { jobTest, scheduleTest, getConfig, getMainConnection, getSchedule } from './util'
-import eventToPromise from 'event-to-promise'
 
 // ===================================================================
 
@@ -22,7 +22,7 @@ describe('scheduler', () => {
     ;[xo, config] = await Promise.all([getMainConnection(), getConfig()])
 
     serverId = await xo.call('server.add', config.xenServer1).catch(() => {})
-    await eventToPromise(xo.objects, 'finish')
+    await fromEvent(xo.objects, 'finish')
 
     jobId = await jobTest(xo)
     scheduleId = (await scheduleTest(xo, jobId)).id
diff --git a/packages/xo-server-test/src/old-tests/vbd.spec.js b/packages/xo-server-test/src/old-tests/vbd.spec.js
index c9bd786ac..c1927a118 100644
--- a/packages/xo-server-test/src/old-tests/vbd.spec.js
+++ b/packages/xo-server-test/src/old-tests/vbd.spec.js
@@ -5,9 +5,9 @@ import expect from 'must'
 
 // ===================================================================
 
+import fromEvent from 'promise-toolbox/fromEvent'
 import { getConfig, getMainConnection, getVmXoTestPvId, getOneHost, waitObjectState } from './util'
 import { map } from 'lodash'
-import eventToPromise from 'event-to-promise'
 
 // ===================================================================
 
@@ -27,7 +27,7 @@ describe('vbd', () => {
 
     serverId = await xo.call('server.add', Object.assign({ autoConnect: false }, config.xenServer1))
     await xo.call('server.connect', { id: serverId })
-    await eventToPromise(xo.objects, 'finish')
+    await fromEvent(xo.objects, 'finish')
 
     vmId = await getVmXoTestPvId(xo)
     try {
diff --git a/packages/xo-server-test/src/old-tests/vif.spec.js b/packages/xo-server-test/src/old-tests/vif.spec.js
index dfe425829..0f509dc96 100644
--- a/packages/xo-server-test/src/old-tests/vif.spec.js
+++ b/packages/xo-server-test/src/old-tests/vif.spec.js
@@ -5,8 +5,8 @@ import expect from 'must'
 
 // ===================================================================
 
+import fromEvent from 'promise-toolbox/fromEvent'
 import { getConfig, getMainConnection, getNetworkId, waitObjectState, getVmXoTestPvId } from './util'
-import eventToPromise from 'event-to-promise'
 import { map } from 'lodash'
 
 // ===================================================================
@@ -24,7 +24,7 @@ describe('vif', () => {
     ;[xo, config] = await Promise.all([getMainConnection(), getConfig()])
 
     serverId = await xo.call('server.add', config.xenServer1).catch(() => {})
-    await eventToPromise(xo.objects, 'finish')
+    await fromEvent(xo.objects, 'finish')
 
     vmId = await getVmXoTestPvId(xo)
     try {
diff --git a/packages/xo-server-test/src/old-tests/vm.spec.js b/packages/xo-server-test/src/old-tests/vm.spec.js
index bc1c661bf..207d8d21e 100644
--- a/packages/xo-server-test/src/old-tests/vm.spec.js
+++ b/packages/xo-server-test/src/old-tests/vm.spec.js
@@ -5,6 +5,7 @@ import expect from 'must'
 
 // ===================================================================
 
+import fromEvent from 'promise-toolbox/fromEvent'
 import {
   almostEqual,
   getAllHosts,
@@ -18,7 +19,6 @@ import {
   waitObjectState,
 } from './util'
 import { map, find } from 'lodash'
-import eventToPromise from 'event-to-promise'
 
 // ===================================================================
 
@@ -35,7 +35,7 @@ describe('vm', () => {
     jest.setTimeout(10e3)
     ;[xo, config] = await Promise.all([getMainConnection(), getConfig()])
     serverId = await xo.call('server.add', config.xenServer1).catch(() => {})
-    await eventToPromise(xo.objects, 'finish')
+    await fromEvent(xo.objects, 'finish')
   })
 
   // ----------------------------------------------------------------------
@@ -347,7 +347,7 @@ describe('vm', () => {
 
     beforeAll(async () => {
       secondServerId = await xo.call('server.add', config.xenServer2).catch(() => {})
-      await eventToPromise(xo.objects, 'finish')
+      await fromEvent(xo.objects, 'finish')
 
       vmId = await getVmToMigrateId(xo)
 
@@ -393,7 +393,7 @@ describe('vm', () => {
 
     beforeAll(async () => {
       secondServerId = await xo.call('server.add', config.xenServer2).catch(() => {})
-      await eventToPromise(xo.objects, 'finish')
+      await fromEvent(xo.objects, 'finish')
 
       vmId = await getVmToMigrateId(xo)
 
diff --git a/packages/xo-server-transport-xmpp/package.json b/packages/xo-server-transport-xmpp/package.json
index f5be20da2..7d36d4980 100644
--- a/packages/xo-server-transport-xmpp/package.json
+++ b/packages/xo-server-transport-xmpp/package.json
@@ -29,8 +29,8 @@
     "node": ">=6"
   },
   "dependencies": {
-    "event-to-promise": "^0.8.0",
-    "node-xmpp-client": "^3.0.0"
+    "node-xmpp-client": "^3.0.0",
+    "promise-toolbox": "^0.19.2"
   },
   "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 6599a1252..cf2dad776 100644
--- a/packages/xo-server-transport-xmpp/src/index.js
+++ b/packages/xo-server-transport-xmpp/src/index.js
@@ -1,4 +1,4 @@
-import eventToPromise from 'event-to-promise'
+import fromEvent from 'promise-toolbox/fromEvent'
 import XmppClient from 'node-xmpp-client'
 
 // ===================================================================
@@ -55,8 +55,8 @@ class TransportXmppPlugin {
     this._client = new XmppClient(this._conf)
     this._client.on('error', () => {})
 
-    await eventToPromise(this._client.connection.socket, 'data')
-    await eventToPromise(this._client, 'online')
+    await fromEvent(this._client.connection.socket, 'data')
+    await fromEvent(this._client, 'online')
 
     this._unset = this._set('sendToXmppClient', this._sendToXmppClient)
   }
diff --git a/packages/xo-vmdk-to-vhd/package.json b/packages/xo-vmdk-to-vhd/package.json
index c6f4ee47b..be04254a3 100644
--- a/packages/xo-vmdk-to-vhd/package.json
+++ b/packages/xo-vmdk-to-vhd/package.json
@@ -35,10 +35,10 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^7.0.2",
-    "event-to-promise": "^0.8.0",
     "execa": "^5.0.0",
     "fs-extra": "^9.0.0",
     "get-stream": "^6.0.0",
+    "promise-toolbox": "^0.19.2",
     "rimraf": "^3.0.0",
     "tmp": "^0.2.1"
   },
diff --git a/packages/xo-vmdk-to-vhd/src/vmdk-to-vhd.integ.spec.js b/packages/xo-vmdk-to-vhd/src/vmdk-to-vhd.integ.spec.js
index a6f48d1aa..d75f15015 100644
--- a/packages/xo-vmdk-to-vhd/src/vmdk-to-vhd.integ.spec.js
+++ b/packages/xo-vmdk-to-vhd/src/vmdk-to-vhd.integ.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env jest */
 
 import execa from 'execa'
-import eventToPromise from 'event-to-promise'
+import fromEvent from 'promise-toolbox/fromEvent'
 import getStream from 'get-stream'
 import rimraf from 'rimraf'
 import tmp from 'tmp'
@@ -54,7 +54,7 @@ test('VMDK to VHD can convert a random data file with VMDKDirectParser', async (
     const pipe = (
       await vmdkToVhd(createReadStream(vmdkFileName), result.grainLogicalAddressList, result.grainFileOffsetList)
     ).pipe(createWriteStream(vhdFileName))
-    await eventToPromise(pipe, 'finish')
+    await fromEvent(pipe, 'finish')
     await execa('vhd-util', ['check', '-p', '-b', '-t', '-n', vhdFileName])
     await execa('qemu-img', ['convert', '-fvmdk', '-Oraw', vmdkFileName, reconvertedFromVmdk])
     await execa('qemu-img', ['convert', '-fvpc', '-Oraw', vhdFileName, reconvertedFromVhd])
diff --git a/packages/xo-web/package.json b/packages/xo-web/package.json
index 7426404bc..47a5b6cc7 100644
--- a/packages/xo-web/package.json
+++ b/packages/xo-web/package.json
@@ -61,7 +61,6 @@
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-15": "^1.0.5",
     "enzyme-to-json": "^3.3.0",
-    "event-to-promise": "^0.8.0",
     "font-awesome": "^4.7.0",
     "font-mfizz": "^2.4.1",
     "get-stream": "^4.0.0",
diff --git a/packages/xo-web/src/common/xoa-updater.js b/packages/xo-web/src/common/xoa-updater.js
index e127af4a4..017e78bb5 100644
--- a/packages/xo-web/src/common/xoa-updater.js
+++ b/packages/xo-web/src/common/xoa-updater.js
@@ -1,5 +1,5 @@
-import eventToPromise from 'event-to-promise'
 import forEach from 'lodash/forEach'
+import fromEvents from 'promise-toolbox/fromEvents'
 import makeError from 'make-error'
 import map from 'lodash/map'
 import { AbortedConnection, ConnectionError, JsonRpcWebSocketClient as Client } from 'jsonrpc-websocket-client'
@@ -191,7 +191,7 @@ class XoaUpdater extends EventEmitter {
     if (c.status === 'open') {
       return c
     } else {
-      return eventToPromise.multi(c, ['open'], ['closed', 'error']).then(() => c)
+      return fromEvents(c, ['open'], ['closed', 'error']).then(() => c)
     }
   }