feat(smart-selector): initial commit

.eslintrc.js

@@ -1,7 +1,5 @@
 module.exports = {
   extends: [
-    'plugin:eslint-comments/recommended',
-
     'standard',
     'standard-jsx',
     'prettier',
@@ -21,7 +19,7 @@ module.exports = {
 
   overrides: [
     {
-      files: ['cli.js', '*-cli.js', 'packages/*cli*/**/*.js'],
+      files: ['packages/*cli*/**/*.js', '*-cli.js'],
       rules: {
         'no-console': 'off',
       },
@@ -35,9 +33,6 @@ module.exports = {
     },
   },
   rules: {
-    // disabled because XAPI objects are using camel case
-    camelcase: ['off'],
-
     'no-console': ['error', { allow: ['warn', 'error'] }],
     'no-var': 'error',
     'node/no-extraneous-import': 'error',

@xen-orchestra/async-map/package.json

@@ -46,7 +46,6 @@
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
     "prepare": "yarn run build",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

@xen-orchestra/babel-config/index.js

@@ -46,12 +46,6 @@ const getConfig = (key, ...args) => {
     : config
 }
 
-// some plugins must be used in a specific order
-const pluginsOrder = [
-  '@babel/plugin-proposal-decorators',
-  '@babel/plugin-proposal-class-properties',
-]
-
 module.exports = function(pkg, plugins, presets) {
   plugins === undefined && (plugins = {})
   presets === undefined && (presets = {})
@@ -67,13 +61,7 @@ module.exports = function(pkg, plugins, presets) {
   return {
     comments: !__PROD__,
     ignore: __TEST__ ? undefined : [/\.spec\.js$/],
-    plugins: Object.keys(plugins)
-      .map(plugin => [plugin, plugins[plugin]])
-      .sort(([a], [b]) => {
-        const oA = pluginsOrder.indexOf(a)
-        const oB = pluginsOrder.indexOf(b)
-        return oA !== -1 && oB !== -1 ? oA - oB : a < b ? -1 : 1
-      }),
+    plugins: Object.keys(plugins).map(plugin => [plugin, plugins[plugin]]),
     presets: Object.keys(presets).map(preset => [preset, presets[preset]]),
   }
 }

@xen-orchestra/cr-seed-cli/package.json

@@ -16,9 +16,6 @@
   },
   "dependencies": {
     "golike-defer": "^0.4.1",
-    "xen-api": "^0.27.1"
-  },
-  "scripts": {
-    "postversion": "npm publish"
+    "xen-api": "^0.24.5"
   }
 }

@xen-orchestra/cron/package.json

@@ -55,7 +55,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run clean",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

@xen-orchestra/defined/package.json

@@ -43,7 +43,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

@xen-orchestra/emit-async/package.json

@@ -42,7 +42,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

@xen-orchestra/fs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/fs",
-  "version": "0.10.1",
+  "version": "0.7.1",
   "license": "AGPL-3.0",
   "description": "The File System for Xen Orchestra backups.",
   "keywords": [],
@@ -21,19 +21,18 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@marsaud/smb2": "^0.14.0",
+    "@marsaud/smb2": "^0.13.0",
     "@sindresorhus/df": "^2.1.0",
     "@xen-orchestra/async-map": "^0.0.0",
     "decorator-synchronized": "^0.5.0",
     "execa": "^1.0.0",
-    "fs-extra": "^8.0.1",
+    "fs-extra": "^7.0.0",
     "get-stream": "^4.0.0",
-    "limit-concurrency-decorator": "^0.4.0",
     "lodash": "^4.17.4",
-    "promise-toolbox": "^0.13.0",
+    "promise-toolbox": "^0.12.1",
     "readable-stream": "^3.0.6",
     "through2": "^3.0.0",
-    "tmp": "^0.1.0",
+    "tmp": "^0.0.33",
     "xo-remote-parser": "^0.5.0"
   },
   "devDependencies": {
@@ -41,13 +40,12 @@
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-decorators": "^7.1.6",
     "@babel/plugin-proposal-function-bind": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
     "async-iterator-to-stream": "^1.1.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "dotenv": "^8.0.0",
+    "dotenv": "^7.0.0",
     "index-modules": "^0.3.0",
     "rimraf": "^2.6.2"
   },
@@ -57,7 +55,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run clean",
-    "prepare": "yarn run build",
-    "postversion": "npm publish"
+    "prepare": "yarn run build"
   }
 }

@xen-orchestra/fs/src/abstract.js

@@ -4,7 +4,6 @@
 import getStream from 'get-stream'
 
 import asyncMap from '@xen-orchestra/async-map'
-import limit from 'limit-concurrency-decorator'
 import path from 'path'
 import synchronized from 'decorator-synchronized'
 import { fromCallback, fromEvent, ignoreErrors, timeout } from 'promise-toolbox'
@@ -32,7 +31,6 @@ const computeRate = (hrtime: number[], size: number) => {
 }
 
 const DEFAULT_TIMEOUT = 6e5 // 10 min
-const DEFAULT_MAX_PARALLEL_OPERATIONS = 10
 
 const ignoreEnoent = error => {
   if (error == null || error.code !== 'ENOENT') {
@@ -85,25 +83,6 @@ export default class RemoteHandlerAbstract {
       }
     }
     ;({ timeout: this._timeout = DEFAULT_TIMEOUT } = options)
-
-    const sharedLimit = limit(
-      options.maxParallelOperations ?? DEFAULT_MAX_PARALLEL_OPERATIONS
-    )
-    this.closeFile = sharedLimit(this.closeFile)
-    this.getInfo = sharedLimit(this.getInfo)
-    this.getSize = sharedLimit(this.getSize)
-    this.list = sharedLimit(this.list)
-    this.mkdir = sharedLimit(this.mkdir)
-    this.openFile = sharedLimit(this.openFile)
-    this.outputFile = sharedLimit(this.outputFile)
-    this.read = sharedLimit(this.read)
-    this.readFile = sharedLimit(this.readFile)
-    this.rename = sharedLimit(this.rename)
-    this.rmdir = sharedLimit(this.rmdir)
-    this.truncate = sharedLimit(this.truncate)
-    this.unlink = sharedLimit(this.unlink)
-    this.write = sharedLimit(this.write)
-    this.writeFile = sharedLimit(this.writeFile)
   }
 
   // Public members
@@ -421,10 +400,6 @@ export default class RemoteHandlerAbstract {
     }
   }
 
-  async truncate(file: string, len: number): Promise<void> {
-    await this._truncate(file, len)
-  }
-
   async unlink(file: string, { checksum = true }: Object = {}): Promise<void> {
     file = normalizePath(file)
 
@@ -435,18 +410,6 @@ export default class RemoteHandlerAbstract {
     await this._unlink(file).catch(ignoreEnoent)
   }
 
-  async write(
-    file: File,
-    buffer: Buffer,
-    position: number
-  ): Promise<{| bytesWritten: number, buffer: Buffer |}> {
-    await this._write(
-      typeof file === 'string' ? normalizePath(file) : file,
-      buffer,
-      position
-    )
-  }
-
   async writeFile(
     file: string,
     data: Data,
@@ -583,28 +546,6 @@ export default class RemoteHandlerAbstract {
     throw new Error('Not implemented')
   }
 
-  async _write(file: File, buffer: Buffer, position: number): Promise<void> {
-    const isPath = typeof file === 'string'
-    if (isPath) {
-      file = await this.openFile(file, 'r+')
-    }
-    try {
-      return await this._writeFd(file, buffer, position)
-    } finally {
-      if (isPath) {
-        await this.closeFile(file)
-      }
-    }
-  }
-
-  async _writeFd(
-    fd: FileDescriptor,
-    buffer: Buffer,
-    position: number
-  ): Promise<void> {
-    throw new Error('Not implemented')
-  }
-
   async _writeFile(
     file: string,
     data: Data,

@xen-orchestra/fs/src/fs.spec.js

@@ -3,9 +3,9 @@
 import 'dotenv/config'
 import asyncIteratorToStream from 'async-iterator-to-stream'
 import getStream from 'get-stream'
-import { forOwn, random } from 'lodash'
 import { fromCallback } from 'promise-toolbox'
 import { pipeline } from 'readable-stream'
+import { random } from 'lodash'
 import { tmpdir } from 'os'
 
 import { getHandler } from '.'
@@ -310,70 +310,5 @@ handlers.forEach(url => {
         await handler.unlink('file')
       })
     })
-
-    describe('#write()', () => {
-      beforeEach(() => handler.outputFile('file', TEST_DATA))
-
-      const PATCH_DATA_LEN = Math.ceil(TEST_DATA_LEN / 2)
-      const PATCH_DATA = unsecureRandomBytes(PATCH_DATA_LEN)
-
-      forOwn(
-        {
-          'dont increase file size': (() => {
-            const offset = random(0, TEST_DATA_LEN - PATCH_DATA_LEN)
-
-            const expected = Buffer.from(TEST_DATA)
-            PATCH_DATA.copy(expected, offset)
-
-            return { offset, expected }
-          })(),
-          'increase file size': (() => {
-            const offset = random(
-              TEST_DATA_LEN - PATCH_DATA_LEN + 1,
-              TEST_DATA_LEN
-            )
-
-            const expected = Buffer.alloc(offset + PATCH_DATA_LEN)
-            TEST_DATA.copy(expected)
-            PATCH_DATA.copy(expected, offset)
-
-            return { offset, expected }
-          })(),
-        },
-        ({ offset, expected }, title) => {
-          describe(title, () => {
-            testWithFileDescriptor('file', 'r+', async ({ file }) => {
-              await handler.write(file, PATCH_DATA, offset)
-              await expect(await handler.readFile('file')).toEqual(expected)
-            })
-          })
-        }
-      )
-    })
-
-    describe('#truncate()', () => {
-      forOwn(
-        {
-          'shrinks file': (() => {
-            const length = random(0, TEST_DATA_LEN)
-            const expected = TEST_DATA.slice(0, length)
-            return { length, expected }
-          })(),
-          'grows file': (() => {
-            const length = random(TEST_DATA_LEN, TEST_DATA_LEN * 2)
-            const expected = Buffer.alloc(length)
-            TEST_DATA.copy(expected)
-            return { length, expected }
-          })(),
-        },
-        ({ length, expected }, title) => {
-          it(title, async () => {
-            await handler.outputFile('file', TEST_DATA)
-            await handler.truncate('file', length)
-            await expect(await handler.readFile('file')).toEqual(expected)
-          })
-        }
-      )
-    })
   })
 })

@xen-orchestra/fs/src/local.js

@@ -106,18 +106,10 @@ export default class LocalHandler extends RemoteHandlerAbstract {
     await fs.access(path, fs.R_OK | fs.W_OK)
   }
 
-  _truncate(file, len) {
-    return fs.truncate(this._getFilePath(file), len)
-  }
-
   async _unlink(file) {
     return fs.unlink(this._getFilePath(file))
   }
 
-  _writeFd(file, buffer, position) {
-    return fs.write(file.fd, buffer, 0, buffer.length, position)
-  }
-
   _writeFile(file, data, { flags }) {
     return fs.writeFile(this._getFilePath(file), data, { flag: flags })
   }

@xen-orchestra/fs/src/smb.js

@@ -155,20 +155,10 @@ export default class SmbHandler extends RemoteHandlerAbstract {
     return this.list('.')
   }
 
-  _truncate(file, len) {
-    return this._client
-      .truncate(this._getFilePath(file), len)
-      .catch(normalizeError)
-  }
-
   _unlink(file) {
     return this._client.unlink(this._getFilePath(file)).catch(normalizeError)
   }
 
-  _writeFd(file, buffer, position) {
-    return this._client.write(file.fd, buffer, 0, buffer.length, position)
-  }
-
   _writeFile(file, data, options) {
     return this._client
       .writeFile(this._getFilePath(file), data, options)

@xen-orchestra/log/README.md

@@ -24,19 +24,6 @@ log.info('this information is relevant to the user')
 log.warn('something went wrong but did not prevent current action')
 log.error('something went wrong')
 log.fatal('service/app is going down')
-
-// you can add contextual info
-log.debug('new API request', {
-  method: 'foo',
-  params: [ 'bar', 'baz' ]
-  user: 'qux'
-})
-
-// by convention, errors go into the `error` field
-log.error('could not join server', {
-  error,
-  server: 'example.org',
-})
 ```
 
 Then, at application level, configure the logs are handled:

@xen-orchestra/log/package.json

@@ -27,11 +27,11 @@
     ">2%"
   ],
   "engines": {
-    "node": ">=6"
+    "node": ">=4"
   },
   "dependencies": {
     "lodash": "^4.17.4",
-    "promise-toolbox": "^0.13.0"
+    "promise-toolbox": "^0.12.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
@@ -48,7 +48,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

@xen-orchestra/log/src/transports/console.js

@@ -1,12 +1,10 @@
 import LEVELS, { NAMES } from '../levels'
 
 // Bind console methods (necessary for browsers)
-/* eslint-disable no-console */
 const debugConsole = console.log.bind(console)
 const infoConsole = console.info.bind(console)
 const warnConsole = console.warn.bind(console)
 const errorConsole = console.error.bind(console)
-/* eslint-enable no-console */
 
 const { ERROR, INFO, WARN } = LEVELS
 

@xen-orchestra/log/src/transports/syslog.js

@@ -1,6 +1,7 @@
 import fromCallback from 'promise-toolbox/fromCallback'
-import splitHost from 'split-host'
-import { createClient, Facility, Severity, Transport } from 'syslog-client'
+import splitHost from 'split-host' // eslint-disable-line node/no-extraneous-import node/no-missing-import
+import startsWith from 'lodash/startsWith'
+import { createClient, Facility, Severity, Transport } from 'syslog-client' // eslint-disable-line node/no-extraneous-import node/no-missing-import
 
 import LEVELS from '../levels'
 
@@ -18,10 +19,10 @@ const facility = Facility.User
 export default target => {
   const opts = {}
   if (target !== undefined) {
-    if (target.startsWith('tcp://')) {
+    if (startsWith(target, 'tcp://')) {
       target = target.slice(6)
       opts.transport = Transport.Tcp
-    } else if (target.startsWith('udp://')) {
+    } else if (startsWith(target, 'udp://')) {
       target = target.slice(6)
       opts.transport = Transport.Udp
     }

@xen-orchestra/mixin/package.json

@@ -45,7 +45,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

CHANGELOG.md

@@ -1,169 +1,6 @@
 # ChangeLog
 
-## **next**
-
-### Enhancements
-
-- [Stats] Ability to display last day stats [#4160](https://github.com/vatesfr/xen-orchestra/issues/4160) (PR [#4168](https://github.com/vatesfr/xen-orchestra/pull/4168))
-- [Settings/servers] Display servers connection issues [#4300](https://github.com/vatesfr/xen-orchestra/issues/4300) (PR [#4310](https://github.com/vatesfr/xen-orchestra/pull/4310))
-- [VM] Permission to revert to any snapshot for VM operators [#3928](https://github.com/vatesfr/xen-orchestra/issues/3928) (PR [#4247](https://github.com/vatesfr/xen-orchestra/pull/4247))
-- [VM] Show current operations and progress [#3811](https://github.com/vatesfr/xen-orchestra/issues/3811) (PR [#3982](https://github.com/vatesfr/xen-orchestra/pull/3982))
-- [SR/General] Improve SR usage graph [#3608](https://github.com/vatesfr/xen-orchestra/issues/3608) (PR [#3830](https://github.com/vatesfr/xen-orchestra/pull/3830))
-- [Backup NG/New] Generate default schedule if no schedule is specified [#4036](https://github.com/vatesfr/xen-orchestra/issues/4036) (PR [#4183](https://github.com/vatesfr/xen-orchestra/pull/4183))
-- [Host/Advanced] Ability to edit iSCSI IQN [#4048](https://github.com/vatesfr/xen-orchestra/issues/4048) (PR [#4208](https://github.com/vatesfr/xen-orchestra/pull/4208))
-- [Backup NG] Ability to bypass unhealthy VDI chains check [#4324](https://github.com/vatesfr/xen-orchestra/issues/4324) (PR [#4340](https://github.com/vatesfr/xen-orchestra/pull/4340))
-- [Pool] Ability to add multiple hosts on the pool [#2402](https://github.com/vatesfr/xen-orchestra/issues/2402) (PR [#3716](https://github.com/vatesfr/xen-orchestra/pull/3716))
-- [VM/console] Multiline copy/pasting [#4261](https://github.com/vatesfr/xen-orchestra/issues/4261) (PR [#4341](https://github.com/vatesfr/xen-orchestra/pull/4341))
-- [VM,host] Improved state icons/pills (colors and tooltips) (PR [#4363](https://github.com/vatesfr/xen-orchestra/pull/4363))
-
-### Bug fixes
-
-- [Settings/Servers] Fix read-only setting toggling
-- [SDN Controller] Do not choose physical PIF without IP configuration for tunnels. (PR [#4319](https://github.com/vatesfr/xen-orchestra/pull/4319))
-- [Xen servers] Fix `no connection found for object` error if pool master is reinstalled [#4299](https://github.com/vatesfr/xen-orchestra/issues/4299) (PR [#4302](https://github.com/vatesfr/xen-orchestra/pull/4302))
-- [Backup-ng/restore] Display correct size for full VM backup [#4316](https://github.com/vatesfr/xen-orchestra/issues/4316) (PR [#4332](https://github.com/vatesfr/xen-orchestra/pull/4332))
-- [VM/tab-advanced] Fix CPU limits edition (PR [#4337](https://github.com/vatesfr/xen-orchestra/pull/4337))
-- [Remotes] Fix `EIO` errors due to massive parallel fs operations [#4323](https://github.com/vatesfr/xen-orchestra/issues/4323) (PR [#4330](https://github.com/vatesfr/xen-orchestra/pull/4330))
-- [VM/Advanced] Fix virtualization mode switch (PV/HVM) (PR [#4349](https://github.com/vatesfr/xen-orchestra/pull/4349))
-- [Task] fix hidden notification by search field [#3874](https://github.com/vatesfr/xen-orchestra/issues/3874) (PR [#4305](https://github.com/vatesfr/xen-orchestra/pull/4305)
-- [VM] Fail to change affinity (PR [#4361](https://github.com/vatesfr/xen-orchestra/pull/4361)
-- [VM] Number of CPUs not correctly changed on running VMs (PR [#4360](https://github.com/vatesfr/xen-orchestra/pull/4360)
-
-### Released packages
-
-- @xen-orchestra/fs v0.10.1
-- xo-server-sdn-controller v0.1.1
-- xen-api v0.27.1
-- xo-server v5.46.0
-- xo-web v5.46.0
-
-## **5.36.0** (2019-06-27)
-
-![Channel: latest](https://badgen.net/badge/channel/latest/yellow)
-
-### Highlights
-
-- [SR/new] Create ZFS storage [#4260](https://github.com/vatesfr/xen-orchestra/issues/4260) (PR [#4266](https://github.com/vatesfr/xen-orchestra/pull/4266))
-- [Host/advanced] Fix host CPU hyperthreading detection [#4262](https://github.com/vatesfr/xen-orchestra/issues/4262) (PR [#4285](https://github.com/vatesfr/xen-orchestra/pull/4285))
-- [VM/Advanced] Ability to use UEFI instead of BIOS [#4264](https://github.com/vatesfr/xen-orchestra/issues/4264) (PR [#4268](https://github.com/vatesfr/xen-orchestra/pull/4268))
-- [Backup-ng/restore] Display size for full VM backup [#4009](https://github.com/vatesfr/xen-orchestra/issues/4009) (PR [#4245](https://github.com/vatesfr/xen-orchestra/pull/4245))
-- [Sr/new] Ability to select NFS version when creating NFS storage [#3951](https://github.com/vatesfr/xen-orchestra/issues/3951) (PR [#4277](https://github.com/vatesfr/xen-orchestra/pull/4277))
-- [Host/storages, SR/hosts] Display PBD details [#4264](https://github.com/vatesfr/xen-orchestra/issues/4161) (PR [#4268](https://github.com/vatesfr/xen-orchestra/pull/4284))
-- [auth-saml] Improve compatibility with Microsoft Azure Active Directory (PR [#4294](https://github.com/vatesfr/xen-orchestra/pull/4294))
-
-### Enhancements
-
-- [Host] Display warning when "Citrix Hypervisor" license has restrictions [#4251](https://github.com/vatesfr/xen-orchestra/issues/4164) (PR [#4235](https://github.com/vatesfr/xen-orchestra/pull/4279))
-- [VM/Backup] Create backup bulk action [#2573](https://github.com/vatesfr/xen-orchestra/issues/2573) (PR [#4257](https://github.com/vatesfr/xen-orchestra/pull/4257))
-- [Host] Display warning when host's time differs too much from XOA's time [#4113](https://github.com/vatesfr/xen-orchestra/issues/4113) (PR [#4173](https://github.com/vatesfr/xen-orchestra/pull/4173))
-- [VM/network] Display and set bandwidth rate-limit of a VIF [#4215](https://github.com/vatesfr/xen-orchestra/issues/4215) (PR [#4293](https://github.com/vatesfr/xen-orchestra/pull/4293))
-- [SDN Controller] New plugin which enables creating pool-wide private networks [xcp-ng/xcp#175](https://github.com/xcp-ng/xcp/issues/175) (PR [#4269](https://github.com/vatesfr/xen-orchestra/pull/4269))
-
-### Bug fixes
-
-- [XOA] Don't require editing the _email_ field in case of re-registration (PR [#4259](https://github.com/vatesfr/xen-orchestra/pull/4259))
-- [Metadata backup] Missing XAPIs should trigger a failure job [#4281](https://github.com/vatesfr/xen-orchestra/issues/4281) (PR [#4283](https://github.com/vatesfr/xen-orchestra/pull/4283))
-- [iSCSI] Fix fibre channel paths display [#4291](https://github.com/vatesfr/xen-orchestra/issues/4291) (PR [#4303](https://github.com/vatesfr/xen-orchestra/pull/4303))
-- [New VM] Fix tooltips not displayed on disabled elements in some browsers (e.g. Google Chrome) [#4304](https://github.com/vatesfr/xen-orchestra/issues/4304) (PR [#4309](https://github.com/vatesfr/xen-orchestra/pull/4309))
-
-### Released packages
-
-- xo-server-auth-ldap v0.6.5
-- xen-api v0.26.0
-- xo-server-sdn-controller v0.1
-- xo-server-auth-saml v0.6.0
-- xo-server-backup-reports v0.16.2
-- xo-server v5.44.0
-- xo-web v5.44.0
-
-## **5.35.0** (2019-05-29)
-
-![Channel: stable](https://badgen.net/badge/channel/stable/green)
-
-### Enhancements
-
-- [VM/general] Display 'Started... ago' instead of 'Halted... ago' for paused state [#3750](https://github.com/vatesfr/xen-orchestra/issues/3750) (PR [#4170](https://github.com/vatesfr/xen-orchestra/pull/4170))
-- [Metadata backup] Ability to define when the backup report will be sent (PR [#4149](https://github.com/vatesfr/xen-orchestra/pull/4149))
-- [XOA/Update] Ability to select release channel [#4200](https://github.com/vatesfr/xen-orchestra/issues/4200) (PR [#4202](https://github.com/vatesfr/xen-orchestra/pull/4202))
-- [User] Forget connection tokens on password change or on demand [#4214](https://github.com/vatesfr/xen-orchestra/issues/4214) (PR [#4224](https://github.com/vatesfr/xen-orchestra/pull/4224))
-- [Settings/Logs] LICENCE_RESTRICTION errors: suggest XCP-ng as an Open Source alternative [#3876](https://github.com/vatesfr/xen-orchestra/issues/3876) (PR [#4238](https://github.com/vatesfr/xen-orchestra/pull/4238))
-- [VM/Migrate] Display VDI size on migrate modal [#2534](https://github.com/vatesfr/xen-orchestra/issues/2534) (PR [#4250](https://github.com/vatesfr/xen-orchestra/pull/4250))
-- [Host] Display hyperthreading status on advanced tab [#4262](https://github.com/vatesfr/xen-orchestra/issues/4262) (PR [#4263](https://github.com/vatesfr/xen-orchestra/pull/4263))
-
-### Bug fixes
-
-- [Pool/Patches] Fix "an error has occurred" in "Applied patches" [#4192](https://github.com/vatesfr/xen-orchestra/issues/4192) (PR [#4193](https://github.com/vatesfr/xen-orchestra/pull/4193))
-- [Backup NG] Fix report sent even though "Never" is selected [#4092](https://github.com/vatesfr/xen-orchestra/issues/4092) (PR [#4178](https://github.com/vatesfr/xen-orchestra/pull/4178))
-- [Remotes] Fix issues after a config import (PR [#4197](https://github.com/vatesfr/xen-orchestra/pull/4197))
-- [Charts] Fixed the chart lines sometimes changing order/color (PR [#4221](https://github.com/vatesfr/xen-orchestra/pull/4221))
-- Prevent non-admin users to access admin pages with URL (PR [#4220](https://github.com/vatesfr/xen-orchestra/pull/4220))
-- [Upgrade] Fix alert before upgrade while running backup jobs [#4164](https://github.com/vatesfr/xen-orchestra/issues/4164) (PR [#4235](https://github.com/vatesfr/xen-orchestra/pull/4235))
-- [Import] Fix import OVA files (PR [#4232](https://github.com/vatesfr/xen-orchestra/pull/4232))
-- [VM/network] Fix duplicate IPv4 (PR [#4239](https://github.com/vatesfr/xen-orchestra/pull/4239))
-- [Remotes] Fix disconnected remotes which may appear to work
-- [Host] Fix incorrect hypervisor name [#4246](https://github.com/vatesfr/xen-orchestra/issues/4246) (PR [#4248](https://github.com/vatesfr/xen-orchestra/pull/4248))
-
-### Released packages
-
-- xo-server-backup-reports v0.16.1
-- @xen-orchestra/fs v0.9.0
-- vhd-lib v0.7.0
-- xo-server v5.42.1
-- xo-web v5.42.1
-
-## **5.34.0** (2019-04-30)
-
-### Highlights
-
-- [Self/New VM] Add network config box to custom cloud-init [#3872](https://github.com/vatesfr/xen-orchestra/issues/3872) (PR [#4150](https://github.com/vatesfr/xen-orchestra/pull/4150))
-- [Metadata backup] Detailed logs [#4005](https://github.com/vatesfr/xen-orchestra/issues/4005) (PR [#4014](https://github.com/vatesfr/xen-orchestra/pull/4014))
-- [Backup reports] Support metadata backups (PR [#4084](https://github.com/vatesfr/xen-orchestra/pull/4084))
-- [VM migration] Auto select default SR and collapse optional actions [#3326](https://github.com/vatesfr/xen-orchestra/issues/3326) (PR [#4121](https://github.com/vatesfr/xen-orchestra/pull/4121))
-- Unlock basic stats on all editions [#4166](https://github.com/vatesfr/xen-orchestra/issues/4166) (PR [#4172](https://github.com/vatesfr/xen-orchestra/pull/4172))
-
-### Enhancements
-
-- [Settings/remotes] Expose mount options field for SMB [#4063](https://github.com/vatesfr/xen-orchestra/issues/4063) (PR [#4067](https://github.com/vatesfr/xen-orchestra/pull/4067))
-- [Backup/Schedule] Add warning regarding DST when you add a schedule [#4042](https://github.com/vatesfr/xen-orchestra/issues/4042) (PR [#4056](https://github.com/vatesfr/xen-orchestra/pull/4056))
-- [Import] Avoid blocking the UI when dropping a big OVA file on the UI (PR [#4018](https://github.com/vatesfr/xen-orchestra/pull/4018))
-- [Backup NG/Overview] Make backup list title clearer [#4111](https://github.com/vatesfr/xen-orchestra/issues/4111) (PR [#4129](https://github.com/vatesfr/xen-orchestra/pull/4129))
-- [Dashboard] Hide "Report" section for non-admins [#4123](https://github.com/vatesfr/xen-orchestra/issues/4123) (PR [#4126](https://github.com/vatesfr/xen-orchestra/pull/4126))
-- [Self/New VM] Display confirmation modal when user will use a large amount of resources [#4044](https://github.com/vatesfr/xen-orchestra/issues/4044) (PR [#4127](https://github.com/vatesfr/xen-orchestra/pull/4127))
-- [VDI migration, New disk] Warning when SR host is different from the other disks [#3911](https://github.com/vatesfr/xen-orchestra/issues/3911) (PR [#4035](https://github.com/vatesfr/xen-orchestra/pull/4035))
-- [Attach disk] Display warning message when VDI SR is on different host from the other disks [#3911](https://github.com/vatesfr/xen-orchestra/issues/3911) (PR [#4117](https://github.com/vatesfr/xen-orchestra/pull/4117))
-- [Editable] Notify user when editable undo fails [#3799](https://github.com/vatesfr/xen-orchestra/issues/3799) (PR [#4150](https://github.com/vatesfr/xen-orchestra/pull/4157))
-- [XO] Add banner for sources users to clarify support conditions [#4165](https://github.com/vatesfr/xen-orchestra/issues/4165) (PR [#4167](https://github.com/vatesfr/xen-orchestra/pull/4167))
-
-### Bug fixes
-
-- [Continuous Replication] Fix VHD size guess for empty files [#4105](https://github.com/vatesfr/xen-orchestra/issues/4105)  (PR [#4107](https://github.com/vatesfr/xen-orchestra/pull/4107))
-- [Backup NG] Only display full backup interval in case of a delta backup (PR [#4125](https://github.com/vatesfr/xen-orchestra/pull/4107))
-- [Dashboard/Health] fix 'an error has occurred' on the storage state table [#4128](https://github.com/vatesfr/xen-orchestra/issues/4128)  (PR [#4132](https://github.com/vatesfr/xen-orchestra/pull/4132))
-- [Menu] XOA: Fixed empty slot when menu is collapsed [#4012](https://github.com/vatesfr/xen-orchestra/issues/4012) (PR [#4068](https://github.com/vatesfr/xen-orchestra/pull/4068)
-- [Self/New VM] Fix missing templates when refreshing page [#3265](https://github.com/vatesfr/xen-orchestra/issues/3265) (PR [#3565](https://github.com/vatesfr/xen-orchestra/pull/3565))
-- [Home] No more false positives when select Tag on Home page [#4087](https://github.com/vatesfr/xen-orchestra/issues/4087) (PR [#4112](https://github.com/vatesfr/xen-orchestra/pull/4112))
-
-### Released packages
-
-- xo-server-backup-reports v0.16.0
-- complex-matcher v0.6.0
-- xo-vmdk-to-vhd v0.1.7
-- vhd-lib v0.6.1
-- xo-server v5.40.0
-- xo-web v5.40.1
-
-## **5.33.1** (2019-04-04)
-
-### Bug fix
-
-- Fix major memory leak [2563be4](https://github.com/vatesfr/xen-orchestra/commit/2563be472bfd84c6ed867efd21c4aeeb824d387f)
-
-### Released packages
-
-- xen-api v0.25.1
-- xo-server v5.38.2
-
-## **5.33.0** (2019-03-29)
+## Next (2019-03-19)
 
 ### Enhancements
 
@@ -176,20 +13,6 @@
 - [Home] Save the current page in url [#3993](https://github.com/vatesfr/xen-orchestra/issues/3993) (PR [#3999](https://github.com/vatesfr/xen-orchestra/pull/3999))
 - [VDI] Ensure suspend VDI is destroyed when destroying a VM  [#4027](https://github.com/vatesfr/xen-orchestra/issues/4027) (PR [#4038](https://github.com/vatesfr/xen-orchestra/pull/4038))
 - [VM/disk]: Warning when 2 VDIs are on 2 different hosts' local SRs [#3911](https://github.com/vatesfr/xen-orchestra/issues/3911) (PR [#3969](https://github.com/vatesfr/xen-orchestra/pull/3969))
-- [Remotes] Benchmarks (read and write rate speed) added when remote is tested [#3991](https://github.com/vatesfr/xen-orchestra/issues/3991) (PR [#4015](https://github.com/vatesfr/xen-orchestra/pull/4015))
-- [Cloud Config] Support both NoCloud and Config Drive 2 datasources for maximum compatibility (PR [#4053](https://github.com/vatesfr/xen-orchestra/pull/4053))
-- [Advanced] Configurable cookie validity (PR [#4059](https://github.com/vatesfr/xen-orchestra/pull/4059))
-- [Plugins] Display number of installed plugins [#4008](https://github.com/vatesfr/xen-orchestra/issues/4008) (PR [#4050](https://github.com/vatesfr/xen-orchestra/pull/4050))
-- [Continuous Replication] Opt-in mode to guess VHD size, should help with XenServer 7.1 CU2 and various `VDI_IO_ERROR` errors (PR [#3726](https://github.com/vatesfr/xen-orchestra/pull/3726))
-- [VM/Snapshots] Always delete broken quiesced snapshots [#4074](https://github.com/vatesfr/xen-orchestra/issues/4074) (PR [#4075](https://github.com/vatesfr/xen-orchestra/pull/4075))
-- [Settings/Servers] Display link to pool [#4041](https://github.com/vatesfr/xen-orchestra/issues/4041) (PR [#4045](https://github.com/vatesfr/xen-orchestra/pull/4045))
-- [Import] Change wording of drop zone (PR [#4020](https://github.com/vatesfr/xen-orchestra/pull/4020))
-- [Backup NG] Ability to set the interval of the full backups [#1783](https://github.com/vatesfr/xen-orchestra/issues/1783) (PR [#4083](https://github.com/vatesfr/xen-orchestra/pull/4083))
-- [Hosts] Display a warning icon if you have XenServer license restrictions [#4091](https://github.com/vatesfr/xen-orchestra/issues/4091) (PR [#4094](https://github.com/vatesfr/xen-orchestra/pull/4094))
-- [Restore] Ability to restore a metadata backup [#4004](https://github.com/vatesfr/xen-orchestra/issues/4004) (PR [#4023](https://github.com/vatesfr/xen-orchestra/pull/4023))
-- Improve connection to XCP-ng/XenServer hosts:
-  - never disconnect by itself even in case of errors
-  - never stop watching events
 
 ### Bug fixes
 
@@ -199,25 +22,6 @@
 - [Home/VM] Bulk migration: fixed VM VDIs not migrated to the selected SR [#3986](https://github.com/vatesfr/xen-orchestra/issues/3986) (PR [#3987](https://github.com/vatesfr/xen-orchestra/pull/3987))
 - [Stats] Fix cache usage with simultaneous requests [#4017](https://github.com/vatesfr/xen-orchestra/issues/4017) (PR [#4028](https://github.com/vatesfr/xen-orchestra/pull/4028))
 - [Backup NG] Fix compression displayed for the wrong backup mode (PR [#4021](https://github.com/vatesfr/xen-orchestra/pull/4021))
-- [Home] Always sort the items by their names as a secondary sort criteria [#3983](https://github.com/vatesfr/xen-orchestra/issues/3983) (PR [#4047](https://github.com/vatesfr/xen-orchestra/pull/4047))
-- [Remotes] Fixes `spawn mount EMFILE` error during backup
-- Properly redirect to sign in page instead of being stuck in a refresh loop
-- [Backup-ng] No more false positives when list matching VMs on Home page [#4078](https://github.com/vatesfr/xen-orchestra/issues/4078) (PR [#4085](https://github.com/vatesfr/xen-orchestra/pull/4085))
-- [Plugins] Properly remove optional settings when unchecking _Fill information_ (PR [#4076](https://github.com/vatesfr/xen-orchestra/pull/4076))
-- [Patches] (PR [#4077](https://github.com/vatesfr/xen-orchestra/pull/4077))
-  - Add a host to a pool: fixes the auto-patching of the host on XenServer < 7.2 [#3783](https://github.com/vatesfr/xen-orchestra/issues/3783)
-  - Add a host to a pool: homogenizes both the host and **pool**'s patches [#2188](https://github.com/vatesfr/xen-orchestra/issues/2188)
-  - Safely install a subset of patches on a pool [#3777](https://github.com/vatesfr/xen-orchestra/issues/3777)
-  - XCP-ng: no longer requires to run `yum install xcp-ng-updater` when it's already installed [#3934](https://github.com/vatesfr/xen-orchestra/issues/3934)
-
-### Released packages
-
-- xen-api v0.25.0
-- vhd-lib v0.6.0
-- @xen-orchestra/fs v0.8.0
-- xo-server-usage-report v0.7.2
-- xo-server v5.38.1
-- xo-web v5.38.0
 
 ## **5.32.2** (2019-02-28)
 

CHANGELOG.unreleased.md

@@ -1,27 +1,20 @@
 > This file contains all changes that have not been released yet.
->
-> Keep in mind the changelog is addressed to **users** and should be
-> understandable by them.
 
 ### Enhancements
 
-> Users must be able to say: “Nice enhancement, I'm eager to test it”
-
-- [VM/copy] Only show zstd option when it's supported [#3892](https://github.com/vatesfr/xen-orchestra/issues/3892) (PR [#4326](https://github.com/vatesfr/xen-orchestra/pull/4326))
+- [Remotes] Benchmarks (read and write rate speed) added when remote is tested [#3991](https://github.com/vatesfr/xen-orchestra/issues/3991) (PR [#4015](https://github.com/vatesfr/xen-orchestra/pull/4015))
+- [Cloud Config] Support both NoCloud and Config Drive 2 datasources for maximum compatibility (PR [#4053](https://github.com/vatesfr/xen-orchestra/pull/4053))
+- [Advanced] Configurable cookie validity (PR [#4059](https://github.com/vatesfr/xen-orchestra/pull/4059))
+- [Plugins] Display number of installed plugins [#4008](https://github.com/vatesfr/xen-orchestra/issues/4008) (PR [#4050](https://github.com/vatesfr/xen-orchestra/pull/4050))
 
 ### Bug fixes
 
-> Users must be able to say: “I had this issue, happy to know it's fixed”
-
-- [SDN Controller] Better detect host shutting down to adapt network topology (PR [#4314](https://github.com/vatesfr/xen-orchestra/pull/4314))
+- [Home] Always sort the items by their names as a secondary sort criteria [#3983](https://github.com/vatesfr/xen-orchestra/issues/3983) (PR [#4047](https://github.com/vatesfr/xen-orchestra/pull/4047))
+- [Remotes] Fixes `spawn mount EMFILE` error during backup
+- Properly redirect to sign in page instead of being stuck in a refresh loop
 
 ### Released packages
 
-> Packages will be released in the order they are here, therefore, they should
-> be listed by inverse order of dependency.
->
-> Rule of thumb: add packages on top.
-
-- xo-server-sdn-controller v0.1.2
-- xo-server v5.47.0
-- xo-web v5.47.0
+- @xen-orchestra/fs v0.8.0
+- xo-server v5.38.0
+- xo-web v5.38.0

PULL_REQUEST_TEMPLATE.md

@@ -14,5 +14,5 @@
 
 1. create a PR as soon as possible
 1. mark it as `WiP:` (Work in Progress) if not ready to be merged
-1. when you want a review, add a reviewer (and only one)
+1. when you want a review, add a reviewer
 1. if necessary, update your PR, and re- add a reviewer

README.md

@@ -1,4 +1,4 @@
-# Xen Orchestra [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
+# Xen Orchestra [![Chat with us](https://storage.crisp.im/plugins/images/936925df-f37b-4ba8-bab0-70cd2edcb0be/badge.svg)](https://go.crisp.im/chat/embed/?website_id=-JzqzzwddSV7bKGtEyAQ) [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
 
 ![](http://i.imgur.com/tRffA5y.png)
 

docs/installation.md

@@ -1,13 +1,13 @@
 
 # Installation
 
-SSH to your XenServer/XCP-ng host and execute the following:
+SSH to your XenServer and execute the following:
 
 ```
 bash -c "$(curl -s http://xoa.io/deploy)"
 ```
 
-This will automatically download/import/start the XOA appliance. Nothing is changed on your host itself, it's 100% safe.
+This will automatically download/import/start the XOA appliance. Nothing is changed on your XenServer host itself, it's 100% safe.
 
 ## [More on XOA](xoa.md)
 

docs/metadata_backup.md

@@ -1,6 +1,6 @@
 # Metadata backup
 
-> WARNING: Metadata backup is an experimental feature. Unexpected issues are possible, but unlikely.
+> WARNING: Metadata backup is an experimental feature. Restore is not yet available and some unexpected issues may occur.
 
 ## Introduction
 
@@ -11,38 +11,21 @@ In Xen Orchestra, Metadata backup is divided into two different options:
 * Pool metadata backup
 * XO configuration backup
 
-### Performing a backup
+### How to use metadata backup
 
-In the backup job section, when creating a new backup job, you will now have a choice between backing up VMs and backing up Metadata:
-![](./assets/metadata-1.png)
+In the backup job section, when creating a new backup job, you will now have a choice between backing up VMs and backing up Metadata.
+![](https://user-images.githubusercontent.com/21563339/53413921-bd636f00-39cd-11e9-8a3c-d4f893135fa4.png)
 
 When you select Metadata backup, you will have a new backup job screen, letting you choose between a pool metadata backup and an XO configuration backup (or both at the same time):
 
-![](./assets/metadata-2.png)
+![](https://user-images.githubusercontent.com/21563339/52416838-d2de2b00-2aea-11e9-8da0-340fcb2767db.png)
 
 Define the name and retention for the job.
 
-![](./assets/metadata-3.png)
+![](https://user-images.githubusercontent.com/21563339/52471527-65390a00-2b91-11e9-8019-600a4d9eeafb.png)
 
 Once created, the job is displayed with the other classic jobs.
 
-![](./assets/metadata-4.png)
+![](https://user-images.githubusercontent.com/21563339/52416802-c0fc8800-2aea-11e9-8ef0-b0c1bd0e48b8.png)
 
-
-### Performing a restore
-
-> WARNING: restoring pool metadata completely overwrites the XAPI database of a host. Only perform a metadata restore if it is a new server with nothing running on it (eg replacing a host with new hardware).
-
-If you browse to the Backup NG Restore panel, you will now notice a Metadata filter button:
-
-![](./assets/metadata-5.png)
-
-If you click this button, it will show you Metadata backups available for restore:
-
-![](./assets/metadata-6.png)
-
-You can see both our Xen Orchestra config backup, and our pool metadata backup. To restore one, simply click the blue restore arrow, choose a backup date to restore, and click OK:
-
-![](./assets/metadata-7.png)
-
-That's it!
+> Restore for metadata backup jobs should be available in XO 5.33

docs/support.md

@@ -1,33 +1,24 @@
 # Support
 
-Xen Orchestra will run in a controlled/tested environment thanks to XOA ([Xen Orchestra virtual Appliance](https://xen-orchestra.com/#!/xoa)). **This is the way to get pro support**. Any account with a registered XOA can access a [dedicated support panel](https://xen-orchestra.com/#!/member/support).
+You can access our pro support if you subscribe to any of these plans:
 
-XOA is available in multiple plans:
-
-* Free  
 * Starter
 * Enterprise
 * Premium
 
-Higher tier support plans include faster ticket response times (and cover more features). Paid support plans and response times are based on the plan you have, plans can be [reviewed here](https://xen-orchestra.com/#!/xo-pricing).
-
-## XOA Free support
-
-With the free version of the Xen Orchestra Appliance (XOA free), you can open support tickets and we will do our best to assist you, however, this support is limited and is not guaranteed in regards to response times or resolutions offered.
+The better the plan, the faster the support will be with higher priority.
 
 ## Community support
 
-If you are using Xen Orchestra via the source and not XOA, you can ask questions and try to recieve help through a number of different ways:
+If you are using Xen Orchestra via the sources, you can ask questions and try to recieve help two different ways:
 
-* In our [forum](https://xcp-ng.org/forum/category/12/xen-orchestra)
+* In our [forum](https://xen-orchestra.com/forum/)
 * In our IRC - `#xen-orchestra` on `Freenode`
 
-We encourage you to give back to the community by assisting other users via these two avenues as well.
+However, there's no guarantee you will receive an answer and no guaranteed response time. If you are using XO from sources, we encourage you to give back to the community by assisting other users via these two avenues as well.  
 
-Lastly while Xen Orchestra is free and Open Source software, supporting and developing it takes a lot of effort. If you are considering using Xen Orchestra in production, please subscribe for one of our [professional support plans](https://xen-orchestra.com/#!/xo-pricing).
-
-> Note: support from the sources is harder, because Xen Orchestra can potentially run on any Linux distro (or even FreeBSD and Windows!). Always try to double check that you followed our guide on how to [install it from the sources](https://xen-orchestra.com/docs/from_the_sources.html) before going further.
+If you are using Xen Orchestra in production, please subscribe to a plan.
 
 ## Open a ticket
 
-If you have a subscription (or at least a registered free XOA), you can open a ticket describing your issue directly from your personal account page [here](https://xen-orchestra.com/#!/member/support)
+If you have a subscription, you can open a ticket describing your issue directly from your personal account page [here](https://xen-orchestra.com/#!/member/support)

package.json

@@ -6,24 +6,23 @@
     "babel-eslint": "^10.0.1",
     "babel-jest": "^24.1.0",
     "benchmark": "^2.1.4",
-    "eslint": "^6.0.1",
-    "eslint-config-prettier": "^6.0.0",
+    "eslint": "^5.1.0",
+    "eslint-config-prettier": "^4.1.0",
     "eslint-config-standard": "12.0.0",
     "eslint-config-standard-jsx": "^6.0.2",
-    "eslint-plugin-eslint-comments": "^3.1.1",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-node": "^9.0.1",
+    "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-promise": "^4.0.0",
     "eslint-plugin-react": "^7.6.1",
     "eslint-plugin-standard": "^4.0.0",
     "exec-promise": "^0.7.0",
-    "flow-bin": "^0.102.0",
-    "globby": "^10.0.0",
-    "husky": "^3.0.0",
+    "flow-bin": "^0.95.1",
+    "globby": "^9.0.0",
+    "husky": "^1.2.1",
     "jest": "^24.1.0",
     "lodash": "^4.17.4",
     "prettier": "^1.10.2",
-    "promise-toolbox": "^0.13.0",
+    "promise-toolbox": "^0.12.1",
     "sorted-object": "^2.0.1"
   },
   "engines": {

packages/complex-matcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "complex-matcher",
-  "version": "0.6.0",
+  "version": "0.5.0",
   "license": "ISC",
   "description": "",
   "keywords": [],
@@ -25,7 +25,7 @@
     ">2%"
   ],
   "engines": {
-    "node": ">=6"
+    "node": ">=4"
   },
   "dependencies": {
     "lodash": "^4.17.4"
@@ -44,7 +44,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

packages/complex-matcher/src/index.js

@@ -599,13 +599,6 @@ export const parse = parser.parse.bind(parser)
 
 // -------------------------------------------------------------------
 
-const _extractStringFromRegexp = child => {
-  const unescapedRegexp = child.re.source.replace(/^(\^)|\\|\$$/g, '')
-  if (child.re.source === `^${escapeRegExp(unescapedRegexp)}$`) {
-    return unescapedRegexp
-  }
-}
-
 const _getPropertyClauseStrings = ({ child }) => {
   if (child instanceof Or) {
     const strings = []
@@ -613,12 +606,6 @@ const _getPropertyClauseStrings = ({ child }) => {
       if (child instanceof StringNode) {
         strings.push(child.value)
       }
-      if (child instanceof RegExpNode) {
-        const unescapedRegexp = _extractStringFromRegexp(child)
-        if (unescapedRegexp !== undefined) {
-          strings.push(unescapedRegexp)
-        }
-      }
     })
     return strings
   }
@@ -626,12 +613,6 @@ const _getPropertyClauseStrings = ({ child }) => {
   if (child instanceof StringNode) {
     return [child.value]
   }
-  if (child instanceof RegExpNode) {
-    const unescapedRegexp = _extractStringFromRegexp(child)
-    if (unescapedRegexp !== undefined) {
-      return [unescapedRegexp]
-    }
-  }
 
   return []
 }

packages/complex-matcher/src/index.spec.js

@@ -12,13 +12,10 @@ import {
 } from './'
 
 it('getPropertyClausesStrings', () => {
-  const tmp = getPropertyClausesStrings(
-    parse('foo bar:baz baz:|(foo bar /^boo$/ /^far$/) foo:/^bar$/')
-  )
+  const tmp = getPropertyClausesStrings(parse('foo bar:baz baz:|(foo bar)'))
   expect(tmp).toEqual({
     bar: ['baz'],
-    baz: ['foo', 'bar', 'boo', 'far'],
-    foo: ['bar'],
+    baz: ['foo', 'bar'],
   })
 })
 

packages/smart-selector/README.md

@@ -0,0 +1,76 @@
+# ${pkg.name} [![Build Status](https://travis-ci.org/${pkg.shortGitHubPath}.png?branch=master)](https://travis-ci.org/${pkg.shortGitHubPath})
+
+> ${pkg.description}
+
+Differences with [reselect](https://github.com/reactjs/reselect):
+
+- simpler: no custom memoization
+- inputs (and their selectors): are stored in objects, not arrays
+- lazy:
+   - inputs are not computed before accessed
+   - unused inputs do not trigger a call to the transform function
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/${pkg.name}):
+
+```
+> npm install --save ${pkg.name}
+```
+
+## Usage
+
+```js
+import createSelector from 'smart-selector'
+
+const getVisibleTodos = createSelector(
+  {
+    filter: state => state.filter,
+    todos: state => state.todos,
+  },
+  inputs => {
+    switch (inputs.filter) {
+      case 'ALL':
+        return inputs.todos
+      case 'COMPLETED':
+        return inputs.todos.filter(todo => todo.completed)
+      case 'ACTIVE':
+        return inputs.todos.filter(todo => !todo.completed)
+    }
+  }
+)
+```
+
+## Development
+
+```
+# Install dependencies
+> yarn
+
+# Run the tests
+> yarn test
+
+# Continuously compile
+> yarn dev
+
+# Continuously run the tests
+> yarn dev-test
+
+# Build for production (automatically called by npm install)
+> yarn build
+```
+
+## Contributions
+
+Contributions are *very* welcomed, either on the documentation or on
+the code.
+
+You may:
+
+- report any [issue](https://github.com/vatesfr/xo-web/issues)
+  you've encountered;
+- fork and create a pull request.
+
+## License
+
+ISC © [Vates SAS](https://vates.fr)

packages/smart-selector/package.json

@@ -0,0 +1,43 @@
+{
+  "private": true,
+  "name": "smart-selector",
+  "version": "0.0.0",
+  "license": "ISC",
+  "description": "",
+  "keywords": [],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/smart-selector",
+  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vatesfr/xen-orchestra.git"
+  },
+  "author": {
+    "name": "Julien Fontanet",
+    "email": "julien.fontanet@isonoe.net"
+  },
+  "preferGlobal": false,
+  "main": "dist/",
+  "bin": {},
+  "files": [
+    "dist/"
+  ],
+  "engines": {
+    "node": ">=8"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.1.5",
+    "@babel/core": "7.1.5",
+    "@babel/preset-env": "7.1.5",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.1",
+    "rimraf": "^2.6.2"
+  },
+  "scripts": {
+    "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
+    "clean": "rimraf dist/",
+    "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
+    "prebuild": "yarn run clean",
+    "predev": "yarn run clean",
+    "prepublishOnly": "yarn run build"
+  }
+}

packages/smart-selector/src/index.js

@@ -0,0 +1,82 @@
+const { create, keys } = Object
+
+const createSelector = (inputSelectors, transform) => {
+  const previousArgs = [{}] // initialize with non-repeatable args
+  let cache, previousResult, previousThisArg
+  let previousInputs = {}
+
+  const spyDescriptors = {}
+  const inputs = keys(inputSelectors)
+  for (let i = 0, n = inputs.length; i < n; ++i) {
+    const input = inputs[i]
+    spyDescriptors[input] = {
+      enumerable: true,
+      get: () =>
+        input in previousInputs
+          ? previousInputs[input]
+          : (previousInputs[input] =
+              input in cache
+                ? cache[input]
+                : inputSelectors[input].apply(previousThisArg, previousArgs)),
+    }
+  }
+  const spy = create(null, spyDescriptors)
+
+  function selector () {
+    // handle arguments
+    {
+      const { length } = arguments
+      let i = 0
+      if (this === previousThisArg && length === previousArgs.length) {
+        while (i < length && arguments[i] === previousArgs[i]) {
+          ++i
+        }
+        if (i === length) {
+          return previousResult
+        }
+      } else {
+        previousArgs.length = length
+        previousThisArg = this
+      }
+      while (i < length) {
+        previousArgs[i] = arguments[i]
+        ++i
+      }
+    }
+
+    // handle inputs
+    cache = previousInputs
+    previousInputs = {}
+    {
+      const inputs = keys(cache)
+      const { length } = inputs
+      if (length !== 0) {
+        let i = 0
+        while (true) {
+          if (i === length) {
+            // inputs are unchanged
+            return previousResult
+          }
+
+          const input = inputs[i++]
+          const value = inputSelectors[input].apply(this, arguments)
+          if (value !== cache[input]) {
+            // update the value
+            cache[input] = value
+
+            // remove non-computed values
+            while (i < length) {
+              delete cache[inputs[i++]]
+            }
+
+            break
+          }
+        }
+      }
+    }
+
+    return (previousResult = transform(spy))
+  }
+  return selector
+}
+export { createSelector as default }

packages/smart-selector/src/index.spec.js

@@ -0,0 +1,99 @@
+/* eslint-env jest */
+
+import createSelector from './'
+
+const noop = () => {}
+
+describe('createSelector', () => {
+  it('calls input selectors with this and arguments', () => {
+    const thisArg = {}
+    const args = ['arg1', 'arg2']
+    const foo = jest.fn()
+
+    createSelector({ foo }, ({ foo }) => {}).apply(thisArg, args)
+
+    expect(foo.mock.instances).toEqual([thisArg])
+    expect(foo.mock.calls).toEqual([args])
+  })
+
+  it('calls input selectors only when accessed', () => {
+    const foo = jest.fn()
+    createSelector({ foo }, inputs => {
+      expect(foo.mock.calls.length).toBe(0)
+      noop(inputs.foo)
+      expect(foo.mock.calls.length).toBe(1)
+    })()
+  })
+
+  it('does not call the input selectors if this arguments did not change', () => {
+    const foo = jest.fn()
+    const selector = createSelector({ foo }, ({ foo }) => {})
+
+    selector('arg1')
+    expect(foo.mock.calls.length).toBe(1)
+
+    selector('arg1')
+    expect(foo.mock.calls.length).toBe(1)
+
+    selector('arg1', 'arg2')
+    expect(foo.mock.calls.length).toBe(2)
+
+    selector.call({}, 'arg1', 'arg2')
+    expect(foo.mock.calls.length).toBe(3)
+  })
+
+  it('does not call the transform if inputs did not change', () => {
+    const transform = jest.fn(({ foo }) => {})
+    const selector = createSelector(
+      {
+        foo: () => 'foo',
+      },
+      transform
+    )
+
+    selector({})
+    expect(transform.mock.calls.length).toBe(1)
+
+    selector({})
+    expect(transform.mock.calls.length).toBe(1)
+  })
+
+  it('computes only the necessary inputs to determine if transform should be called', () => {
+    let foo = 'foo 1'
+    const bar = 'bar 1'
+    const inputs = {
+      foo: jest.fn(() => foo),
+      bar: jest.fn(() => bar),
+    }
+    const transform = jest.fn(inputs => {
+      if (inputs.foo !== 'foo 1') {
+        return inputs.bar
+      }
+    })
+    const selector = createSelector(inputs, transform)
+
+    selector({})
+    expect(inputs.foo.mock.calls.length).toBe(1)
+    expect(inputs.bar.mock.calls.length).toBe(0)
+
+    selector({})
+    expect(inputs.foo.mock.calls.length).toBe(2)
+    expect(inputs.bar.mock.calls.length).toBe(0)
+
+    foo = 'foo 2'
+
+    selector({})
+    expect(inputs.foo.mock.calls.length).toBe(3)
+    expect(inputs.bar.mock.calls.length).toBe(1)
+
+    foo = 'foo 1'
+
+    selector({})
+    expect(inputs.foo.mock.calls.length).toBe(4)
+    expect(inputs.bar.mock.calls.length).toBe(1)
+
+    selector({})
+    expect(inputs.foo.mock.calls.length).toBe(5)
+    expect(inputs.bar.mock.calls.length).toBe(1)
+  })
+})

packages/value-matcher/package.json

@@ -25,7 +25,7 @@
     ">2%"
   ],
   "engines": {
-    "node": ">=6"
+    "node": ">=4"
   },
   "dependencies": {},
   "devDependencies": {
@@ -43,7 +43,6 @@
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
     "prepare": "yarn run build",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

packages/vhd-cli/package.json

@@ -27,12 +27,12 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@xen-orchestra/fs": "^0.10.1",
+    "@xen-orchestra/fs": "^0.7.1",
     "cli-progress": "^2.0.0",
     "exec-promise": "^0.7.0",
     "getopts": "^2.2.3",
     "struct-fu": "^1.2.0",
-    "vhd-lib": "^0.7.0"
+    "vhd-lib": "^0.5.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
@@ -40,18 +40,17 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "execa": "^2.0.2",
+    "execa": "^1.0.0",
     "index-modules": "^0.3.0",
-    "promise-toolbox": "^0.13.0",
+    "promise-toolbox": "^0.12.1",
     "rimraf": "^2.6.1",
-    "tmp": "^0.1.0"
+    "tmp": "^0.0.33"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "rimraf dist/ && index-modules --cjs-lazy src/commands",
     "predev": "yarn run prebuild",
-    "prepare": "yarn run build",
-    "postversion": "npm publish"
+    "prepare": "yarn run build"
   }
 }

packages/vhd-lib/merge.integ.spec.js

@@ -1,40 +1,38 @@
 /* eslint-env jest */
 
-import asyncIteratorToStream from 'async-iterator-to-stream'
 import execa from 'execa'
 import fs from 'fs-extra'
 import getStream from 'get-stream'
 import rimraf from 'rimraf'
 import tmp from 'tmp'
+import { fromEvent, pFromCallback } from 'promise-toolbox'
 import { getHandler } from '@xen-orchestra/fs'
-import { pFromCallback } from 'promise-toolbox'
-import { pipeline } from 'readable-stream'
 import { randomBytes } from 'crypto'
 
 import Vhd, { chainVhd, createSyntheticStream, mergeVhd as vhdMerge } from './'
 
 import { SECTOR_SIZE } from './src/_constants'
 
-let tempDir = null
+const initialDir = process.cwd()
 
 jest.setTimeout(60000)
 
 beforeEach(async () => {
-  tempDir = await pFromCallback(cb => tmp.dir(cb))
+  const dir = await pFromCallback(cb => tmp.dir(cb))
+  process.chdir(dir)
 })
 
 afterEach(async () => {
-  await pFromCallback(cb => rimraf(tempDir, cb))
+  const tmpDir = process.cwd()
+  process.chdir(initialDir)
+  await pFromCallback(cb => rimraf(tmpDir, cb))
 })
 
-async function createRandomFile(name, sizeMB) {
-  const createRandomStream = asyncIteratorToStream(function*(size) {
-    while (size-- > 0) {
-      yield Buffer.from([Math.floor(Math.random() * 256)])
-    }
-  })
-  const input = createRandomStream(sizeMB * 1024 * 1024)
-  await pFromCallback(cb => pipeline(input, fs.createWriteStream(name), cb))
+async function createRandomFile(name, sizeMb) {
+  await execa('bash', [
+    '-c',
+    `< /dev/urandom tr -dc "\\t\\n [:alnum:]" | head -c ${sizeMb}M >${name}`,
+  ])
 }
 
 async function checkFile(vhdName) {
@@ -55,35 +53,31 @@ async function convertFromRawToVhd(rawName, vhdName) {
 
 test('blocks can be moved', async () => {
   const initalSize = 4
-  const rawFileName = `${tempDir}/randomfile`
-  await createRandomFile(rawFileName, initalSize)
-  const vhdFileName = `${tempDir}/randomfile.vhd`
-  await convertFromRawToVhd(rawFileName, vhdFileName)
-  const handler = getHandler({ url: 'file://' })
-  const originalSize = await handler.getSize(rawFileName)
-  const newVhd = new Vhd(handler, vhdFileName)
+  await createRandomFile('randomfile', initalSize)
+  await convertFromRawToVhd('randomfile', 'randomfile.vhd')
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  const originalSize = await handler.getSize('randomfile')
+  const newVhd = new Vhd(handler, 'randomfile.vhd')
   await newVhd.readHeaderAndFooter()
   await newVhd.readBlockAllocationTable()
   await newVhd._freeFirstBlockSpace(8000000)
-  const recoveredFileName = `${tempDir}/recovered`
-  await recoverRawContent(vhdFileName, recoveredFileName, originalSize)
-  expect(await fs.readFile(recoveredFileName)).toEqual(
-    await fs.readFile(rawFileName)
+  await recoverRawContent('randomfile.vhd', 'recovered', originalSize)
+  expect(await fs.readFile('recovered')).toEqual(
+    await fs.readFile('randomfile')
   )
 })
 
 test('the BAT MSB is not used for sign', async () => {
   const randomBuffer = await pFromCallback(cb => randomBytes(SECTOR_SIZE, cb))
-  const emptyFileName = `${tempDir}/empty.vhd`
-  await execa('qemu-img', ['create', '-fvpc', emptyFileName, '1.8T'])
-  const handler = getHandler({ url: 'file://' })
-  const vhd = new Vhd(handler, emptyFileName)
+  await execa('qemu-img', ['create', '-fvpc', 'empty.vhd', '1.8T'])
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  const vhd = new Vhd(handler, 'empty.vhd')
   await vhd.readHeaderAndFooter()
   await vhd.readBlockAllocationTable()
   // we want the bit 31 to be on, to prove it's not been used for sign
   const hugeWritePositionSectors = Math.pow(2, 31) + 200
   await vhd.writeData(hugeWritePositionSectors, randomBuffer)
-  await checkFile(emptyFileName)
+  await checkFile('empty.vhd')
   // here we are moving the first sector very far in the VHD to prove the BAT doesn't use signed int32
   const hugePositionBytes = hugeWritePositionSectors * SECTOR_SIZE
   await vhd._freeFirstBlockSpace(hugePositionBytes)
@@ -91,10 +85,9 @@ test('the BAT MSB is not used for sign', async () => {
   // we recover the data manually for speed reasons.
   // fs.write() with offset is way faster than qemu-img when there is a 1.5To
   // hole before the block of data
-  const recoveredFileName = `${tempDir}/recovered`
-  const recoveredFile = await fs.open(recoveredFileName, 'w')
+  const recoveredFile = await fs.open('recovered', 'w')
   try {
-    const vhd2 = new Vhd(handler, emptyFileName)
+    const vhd2 = new Vhd(handler, 'empty.vhd')
     await vhd2.readHeaderAndFooter()
     await vhd2.readBlockAllocationTable()
     for (let i = 0; i < vhd.header.maxTableEntries; i++) {
@@ -114,7 +107,7 @@ test('the BAT MSB is not used for sign', async () => {
     fs.close(recoveredFile)
   }
   const recovered = await getStream.buffer(
-    await fs.createReadStream(recoveredFileName, {
+    await fs.createReadStream('recovered', {
       start: hugePositionBytes,
       end: hugePositionBytes + randomBuffer.length - 1,
     })
@@ -124,33 +117,27 @@ test('the BAT MSB is not used for sign', async () => {
 
 test('writeData on empty file', async () => {
   const mbOfRandom = 3
-  const rawFileName = `${tempDir}/randomfile`
-  const emptyFileName = `${tempDir}/empty.vhd`
-  await createRandomFile(rawFileName, mbOfRandom)
-  await execa('qemu-img', ['create', '-fvpc', emptyFileName, mbOfRandom + 'M'])
-  const randomData = await fs.readFile(rawFileName)
-  const handler = getHandler({ url: 'file://' })
-  const originalSize = await handler.getSize(rawFileName)
-  const newVhd = new Vhd(handler, emptyFileName)
+  await createRandomFile('randomfile', mbOfRandom)
+  await execa('qemu-img', ['create', '-fvpc', 'empty.vhd', mbOfRandom + 'M'])
+  const randomData = await fs.readFile('randomfile')
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  const originalSize = await handler.getSize('randomfile')
+  const newVhd = new Vhd(handler, 'empty.vhd')
   await newVhd.readHeaderAndFooter()
   await newVhd.readBlockAllocationTable()
   await newVhd.writeData(0, randomData)
-  const recoveredFileName = `${tempDir}/recovered`
-  await recoverRawContent(emptyFileName, recoveredFileName, originalSize)
-  expect(await fs.readFile(recoveredFileName)).toEqual(randomData)
+  await recoverRawContent('empty.vhd', 'recovered', originalSize)
+  expect(await fs.readFile('recovered')).toEqual(randomData)
 })
 
 test('writeData in 2 non-overlaping operations', async () => {
   const mbOfRandom = 3
-  const rawFileName = `${tempDir}/randomfile`
-  const emptyFileName = `${tempDir}/empty.vhd`
-  const recoveredFileName = `${tempDir}/recovered`
-  await createRandomFile(rawFileName, mbOfRandom)
-  await execa('qemu-img', ['create', '-fvpc', emptyFileName, mbOfRandom + 'M'])
-  const randomData = await fs.readFile(rawFileName)
-  const handler = getHandler({ url: 'file://' })
-  const originalSize = await handler.getSize(rawFileName)
-  const newVhd = new Vhd(handler, emptyFileName)
+  await createRandomFile('randomfile', mbOfRandom)
+  await execa('qemu-img', ['create', '-fvpc', 'empty.vhd', mbOfRandom + 'M'])
+  const randomData = await fs.readFile('randomfile')
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  const originalSize = await handler.getSize('randomfile')
+  const newVhd = new Vhd(handler, 'empty.vhd')
   await newVhd.readHeaderAndFooter()
   await newVhd.readBlockAllocationTable()
   const splitPointSectors = 2
@@ -159,21 +146,18 @@ test('writeData in 2 non-overlaping operations', async () => {
     splitPointSectors,
     randomData.slice(splitPointSectors * 512)
   )
-  await recoverRawContent(emptyFileName, recoveredFileName, originalSize)
-  expect(await fs.readFile(recoveredFileName)).toEqual(randomData)
+  await recoverRawContent('empty.vhd', 'recovered', originalSize)
+  expect(await fs.readFile('recovered')).toEqual(randomData)
 })
 
 test('writeData in 2 overlaping operations', async () => {
   const mbOfRandom = 3
-  const rawFileName = `${tempDir}/randomfile`
-  const emptyFileName = `${tempDir}/empty.vhd`
-  const recoveredFileName = `${tempDir}/recovered`
-  await createRandomFile(rawFileName, mbOfRandom)
-  await execa('qemu-img', ['create', '-fvpc', emptyFileName, mbOfRandom + 'M'])
-  const randomData = await fs.readFile(rawFileName)
-  const handler = getHandler({ url: 'file://' })
-  const originalSize = await handler.getSize(rawFileName)
-  const newVhd = new Vhd(handler, emptyFileName)
+  await createRandomFile('randomfile', mbOfRandom)
+  await execa('qemu-img', ['create', '-fvpc', 'empty.vhd', mbOfRandom + 'M'])
+  const randomData = await fs.readFile('randomfile')
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  const originalSize = await handler.getSize('randomfile')
+  const newVhd = new Vhd(handler, 'empty.vhd')
   await newVhd.readHeaderAndFooter()
   await newVhd.readBlockAllocationTable()
   const endFirstWrite = 3
@@ -183,138 +167,119 @@ test('writeData in 2 overlaping operations', async () => {
     startSecondWrite,
     randomData.slice(startSecondWrite * 512)
   )
-  await recoverRawContent(emptyFileName, recoveredFileName, originalSize)
-  expect(await fs.readFile(recoveredFileName)).toEqual(randomData)
+  await recoverRawContent('empty.vhd', 'recovered', originalSize)
+  expect(await fs.readFile('recovered')).toEqual(randomData)
 })
 
 test('BAT can be extended and blocks moved', async () => {
   const initalSize = 4
-  const rawFileName = `${tempDir}/randomfile`
-  const recoveredFileName = `${tempDir}/recovered`
-  const vhdFileName = `${tempDir}/randomfile.vhd`
-  await createRandomFile(rawFileName, initalSize)
-  await convertFromRawToVhd(rawFileName, vhdFileName)
-  const handler = getHandler({ url: 'file://' })
-  const originalSize = await handler.getSize(rawFileName)
-  const newVhd = new Vhd(handler, vhdFileName)
+  await createRandomFile('randomfile', initalSize)
+  await convertFromRawToVhd('randomfile', 'randomfile.vhd')
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  const originalSize = await handler.getSize('randomfile')
+  const newVhd = new Vhd(handler, 'randomfile.vhd')
   await newVhd.readHeaderAndFooter()
   await newVhd.readBlockAllocationTable()
   await newVhd.ensureBatSize(2000)
-  await recoverRawContent(vhdFileName, recoveredFileName, originalSize)
-  expect(await fs.readFile(recoveredFileName)).toEqual(
-    await fs.readFile(rawFileName)
+  await recoverRawContent('randomfile.vhd', 'recovered', originalSize)
+  expect(await fs.readFile('recovered')).toEqual(
+    await fs.readFile('randomfile')
   )
 })
 
 test('coalesce works with empty parent files', async () => {
   const mbOfRandom = 2
-  const rawFileName = `${tempDir}/randomfile`
-  const emptyFileName = `${tempDir}/empty.vhd`
-  const vhdFileName = `${tempDir}/randomfile.vhd`
-  const recoveredFileName = `${tempDir}/recovered`
-  await createRandomFile(rawFileName, mbOfRandom)
-  await convertFromRawToVhd(rawFileName, vhdFileName)
+  await createRandomFile('randomfile', mbOfRandom)
+  await convertFromRawToVhd('randomfile', 'randomfile.vhd')
   await execa('qemu-img', [
     'create',
     '-fvpc',
-    emptyFileName,
+    'empty.vhd',
     mbOfRandom + 1 + 'M',
   ])
-  await checkFile(vhdFileName)
-  await checkFile(emptyFileName)
-  const handler = getHandler({ url: 'file://' })
-  const originalSize = await handler._getSize(rawFileName)
-  await chainVhd(handler, emptyFileName, handler, vhdFileName, true)
-  await checkFile(vhdFileName)
-  await checkFile(emptyFileName)
-  await vhdMerge(handler, emptyFileName, handler, vhdFileName)
-  await recoverRawContent(emptyFileName, recoveredFileName, originalSize)
-  expect(await fs.readFile(recoveredFileName)).toEqual(
-    await fs.readFile(rawFileName)
+  await checkFile('randomfile.vhd')
+  await checkFile('empty.vhd')
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  const originalSize = await handler._getSize('randomfile')
+  await chainVhd(handler, 'empty.vhd', handler, 'randomfile.vhd', true)
+  await checkFile('randomfile.vhd')
+  await checkFile('empty.vhd')
+  await vhdMerge(handler, 'empty.vhd', handler, 'randomfile.vhd')
+  await recoverRawContent('empty.vhd', 'recovered', originalSize)
+  expect(await fs.readFile('recovered')).toEqual(
+    await fs.readFile('randomfile')
   )
 })
 
 test('coalesce works in normal cases', async () => {
   const mbOfRandom = 5
-  const randomFileName = `${tempDir}/randomfile`
-  const random2FileName = `${tempDir}/randomfile2`
-  const smallRandomFileName = `${tempDir}/small_randomfile`
-  const parentFileName = `${tempDir}/parent.vhd`
-  const child1FileName = `${tempDir}/child1.vhd`
-  const child2FileName = `${tempDir}/child2.vhd`
-  const recoveredFileName = `${tempDir}/recovered`
-  await createRandomFile(randomFileName, mbOfRandom)
-  await createRandomFile(smallRandomFileName, Math.ceil(mbOfRandom / 2))
+  await createRandomFile('randomfile', mbOfRandom)
+  await createRandomFile('small_randomfile', Math.ceil(mbOfRandom / 2))
   await execa('qemu-img', [
     'create',
     '-fvpc',
-    parentFileName,
+    'parent.vhd',
     mbOfRandom + 1 + 'M',
   ])
-  await convertFromRawToVhd(randomFileName, child1FileName)
-  const handler = getHandler({ url: 'file://' })
-  await execa('vhd-util', [
-    'snapshot',
-    '-n',
-    child2FileName,
-    '-p',
-    child1FileName,
-  ])
-  const vhd = new Vhd(handler, child2FileName)
+  await convertFromRawToVhd('randomfile', 'child1.vhd')
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  await execa('vhd-util', ['snapshot', '-n', 'child2.vhd', '-p', 'child1.vhd'])
+  const vhd = new Vhd(handler, 'child2.vhd')
   await vhd.readHeaderAndFooter()
   await vhd.readBlockAllocationTable()
   vhd.footer.creatorApplication = 'xoa'
   await vhd.writeFooter()
 
-  const originalSize = await handler._getSize(randomFileName)
-  await chainVhd(handler, parentFileName, handler, child1FileName, true)
-  await execa('vhd-util', ['check', '-t', '-n', child1FileName])
-  await chainVhd(handler, child1FileName, handler, child2FileName, true)
-  await execa('vhd-util', ['check', '-t', '-n', child2FileName])
-  const smallRandom = await fs.readFile(smallRandomFileName)
-  const newVhd = new Vhd(handler, child2FileName)
+  const originalSize = await handler._getSize('randomfile')
+  await chainVhd(handler, 'parent.vhd', handler, 'child1.vhd', true)
+  await execa('vhd-util', ['check', '-t', '-n', 'child1.vhd'])
+  await chainVhd(handler, 'child1.vhd', handler, 'child2.vhd', true)
+  await execa('vhd-util', ['check', '-t', '-n', 'child2.vhd'])
+  const smallRandom = await fs.readFile('small_randomfile')
+  const newVhd = new Vhd(handler, 'child2.vhd')
   await newVhd.readHeaderAndFooter()
   await newVhd.readBlockAllocationTable()
   await newVhd.writeData(5, smallRandom)
-  await checkFile(child2FileName)
-  await checkFile(child1FileName)
-  await checkFile(parentFileName)
-  await vhdMerge(handler, parentFileName, handler, child1FileName)
-  await checkFile(parentFileName)
-  await chainVhd(handler, parentFileName, handler, child2FileName, true)
-  await checkFile(child2FileName)
-  await vhdMerge(handler, parentFileName, handler, child2FileName)
-  await checkFile(parentFileName)
-  await recoverRawContent(parentFileName, recoveredFileName, originalSize)
-  await execa('cp', [randomFileName, random2FileName])
-  const fd = await fs.open(random2FileName, 'r+')
+  await checkFile('child2.vhd')
+  await checkFile('child1.vhd')
+  await checkFile('parent.vhd')
+  await vhdMerge(handler, 'parent.vhd', handler, 'child1.vhd')
+  await checkFile('parent.vhd')
+  await chainVhd(handler, 'parent.vhd', handler, 'child2.vhd', true)
+  await checkFile('child2.vhd')
+  await vhdMerge(handler, 'parent.vhd', handler, 'child2.vhd')
+  await checkFile('parent.vhd')
+  await recoverRawContent(
+    'parent.vhd',
+    'recovered_from_coalescing',
+    originalSize
+  )
+  await execa('cp', ['randomfile', 'randomfile2'])
+  const fd = await fs.open('randomfile2', 'r+')
   try {
     await fs.write(fd, smallRandom, 0, smallRandom.length, 5 * SECTOR_SIZE)
   } finally {
     await fs.close(fd)
   }
-  expect(await fs.readFile(recoveredFileName)).toEqual(
-    await fs.readFile(random2FileName)
+  expect(await fs.readFile('recovered_from_coalescing')).toEqual(
+    await fs.readFile('randomfile2')
   )
 })
 
-test.only('createSyntheticStream passes vhd-util check', async () => {
+test('createSyntheticStream passes vhd-util check', async () => {
   const initalSize = 4
-  const rawFileName = `${tempDir}/randomfile`
-  const vhdFileName = `${tempDir}/randomfile.vhd`
-  const recoveredVhdFileName = `${tempDir}/recovered.vhd`
-  await createRandomFile(rawFileName, initalSize)
-  await convertFromRawToVhd(rawFileName, vhdFileName)
-  await checkFile(vhdFileName)
-  const handler = getHandler({ url: 'file://' })
-  const stream = await createSyntheticStream(handler, vhdFileName)
-  const expectedVhdSize = (await fs.stat(vhdFileName)).size
-  expect(stream.length).toEqual((await fs.stat(vhdFileName)).size)
-  await pFromCallback(cb =>
-    pipeline(stream, fs.createWriteStream(recoveredVhdFileName), cb)
+  const expectedVhdSize = 4197888
+  await createRandomFile('randomfile', initalSize)
+  await convertFromRawToVhd('randomfile', 'randomfile.vhd')
+  const handler = getHandler({ url: 'file://' + process.cwd() })
+  const stream = await createSyntheticStream(handler, 'randomfile.vhd')
+  expect(stream.length).toEqual(expectedVhdSize)
+  await fromEvent(
+    stream.pipe(await fs.createWriteStream('recovered.vhd')),
+    'finish'
   )
-  await checkFile(recoveredVhdFileName)
-  const stats = await fs.stat(recoveredVhdFileName)
+  await checkFile('recovered.vhd')
+  const stats = await fs.stat('recovered.vhd')
   expect(stats.size).toEqual(expectedVhdSize)
-  await execa('qemu-img', ['compare', recoveredVhdFileName, rawFileName])
+  await execa('qemu-img', ['compare', 'recovered.vhd', 'randomfile'])
 })

packages/vhd-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vhd-lib",
-  "version": "0.7.0",
+  "version": "0.5.1",
   "license": "AGPL-3.0",
   "description": "Primitives for VHD file handling",
   "keywords": [],
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "async-iterator-to-stream": "^1.0.2",
-    "core-js": "^3.0.0",
+    "core-js": "3.0.0",
     "from2": "^2.3.0",
-    "fs-extra": "^8.0.1",
+    "fs-extra": "^7.0.0",
     "limit-concurrency-decorator": "^0.4.0",
-    "promise-toolbox": "^0.13.0",
+    "promise-toolbox": "^0.12.1",
     "struct-fu": "^1.2.0",
     "uuid": "^3.0.1"
   },
@@ -35,16 +35,15 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
-    "@xen-orchestra/fs": "^0.10.1",
+    "@xen-orchestra/fs": "^0.7.1",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "execa": "^2.0.2",
+    "execa": "^1.0.0",
     "fs-promise": "^2.0.0",
-    "get-stream": "^5.1.0",
+    "get-stream": "^4.0.0",
     "index-modules": "^0.3.0",
-    "readable-stream": "^3.0.6",
     "rimraf": "^2.6.2",
-    "tmp": "^0.1.0"
+    "tmp": "^0.0.33"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
@@ -52,7 +51,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run clean",
-    "prepare": "yarn run build",
-    "postversion": "npm publish"
+    "prepare": "yarn run build"
   }
 }

packages/vhd-lib/src/_checkFooter.js

@@ -1,20 +0,0 @@
-import assert from 'assert'
-
-import {
-  DISK_TYPE_DIFFERENCING,
-  DISK_TYPE_DYNAMIC,
-  FILE_FORMAT_VERSION,
-  FOOTER_COOKIE,
-  FOOTER_SIZE,
-} from './_constants'
-
-export default footer => {
-  assert.strictEqual(footer.cookie, FOOTER_COOKIE)
-  assert.strictEqual(footer.dataOffset, FOOTER_SIZE)
-  assert.strictEqual(footer.fileFormatVersion, FILE_FORMAT_VERSION)
-  assert(footer.originalSize <= footer.currentSize)
-  assert(
-    footer.diskType === DISK_TYPE_DIFFERENCING ||
-      footer.diskType === DISK_TYPE_DYNAMIC
-  )
-}

packages/vhd-lib/src/_checkHeader.js

@@ -1,14 +0,0 @@
-import assert from 'assert'
-
-import { HEADER_COOKIE, HEADER_VERSION, SECTOR_SIZE } from './_constants'
-
-export default (header, footer) => {
-  assert.strictEqual(header.cookie, HEADER_COOKIE)
-  assert.strictEqual(header.dataOffset, undefined)
-  assert.strictEqual(header.headerVersion, HEADER_VERSION)
-  assert(Number.isInteger(Math.log2(header.blockSize / SECTOR_SIZE)))
-
-  if (footer !== undefined) {
-    assert(header.maxTableEntries >= footer.currentSize / header.blockSize)
-  }
-}

packages/vhd-lib/src/_getFirstAndLastBlocks.js

@@ -1,45 +0,0 @@
-import assert from 'assert'
-
-import { BLOCK_UNUSED } from './_constants'
-
-// get the identifiers and first sectors of the first and last block
-// in the file
-export default bat => {
-  const n = bat.length
-  assert.notStrictEqual(n, 0)
-  assert.strictEqual(n % 4, 0)
-
-  let i = 0
-  let j = 0
-  let first, firstSector, last, lastSector
-
-  // get first allocated block for initialization
-  while ((firstSector = bat.readUInt32BE(j)) === BLOCK_UNUSED) {
-    i += 1
-    j += 4
-
-    if (j === n) {
-      return
-    }
-  }
-  lastSector = firstSector
-  first = last = i
-
-  while (j < n) {
-    const sector = bat.readUInt32BE(j)
-    if (sector !== BLOCK_UNUSED) {
-      if (sector < firstSector) {
-        first = i
-        firstSector = sector
-      } else if (sector > lastSector) {
-        last = i
-        lastSector = sector
-      }
-    }
-
-    i += 1
-    j += 4
-  }
-
-  return { first, firstSector, last, lastSector }
-}

packages/vhd-lib/src/_readChunk.js

@@ -1,50 +0,0 @@
-export default async function readChunk(stream, n) {
-  if (n === 0) {
-    return Buffer.alloc(0)
-  }
-  return new Promise((resolve, reject) => {
-    const chunks = []
-    let i = 0
-
-    function clean() {
-      stream.removeListener('readable', onReadable)
-      stream.removeListener('end', onEnd)
-      stream.removeListener('error', onError)
-    }
-
-    function resolve2() {
-      clean()
-      resolve(Buffer.concat(chunks, i))
-    }
-
-    function onEnd() {
-      resolve2()
-      clean()
-    }
-
-    function onError(error) {
-      reject(error)
-      clean()
-    }
-
-    function onReadable() {
-      const chunk = stream.read(n - i)
-      if (chunk === null) {
-        return // wait for more data
-      }
-      i += chunk.length
-      chunks.push(chunk)
-      if (i >= n) {
-        resolve2()
-      }
-    }
-
-    stream.on('end', onEnd)
-    stream.on('error', onError)
-    stream.on('readable', onReadable)
-
-    if (stream.readable) {
-      onReadable()
-    }
-  })
-}

packages/vhd-lib/src/createVhdStreamWithLength.integ.spec.js

@@ -1,132 +0,0 @@
-/* eslint-env jest */
-
-import asyncIteratorToStream from 'async-iterator-to-stream'
-import execa from 'execa'
-import fs from 'fs-extra'
-import rimraf from 'rimraf'
-import getStream from 'get-stream'
-import tmp from 'tmp'
-import { createReadStream, createWriteStream } from 'fs'
-import { pFromCallback } from 'promise-toolbox'
-import { pipeline } from 'readable-stream'
-
-import { createVhdStreamWithLength } from '.'
-import { FOOTER_SIZE } from './_constants'
-
-let tempDir = null
-
-beforeEach(async () => {
-  tempDir = await pFromCallback(cb => tmp.dir(cb))
-})
-
-afterEach(async () => {
-  await pFromCallback(cb => rimraf(tempDir, cb))
-})
-
-const RAW = 'raw'
-const VHD = 'vpc'
-const convert = (inputFormat, inputFile, outputFormat, outputFile) =>
-  execa('qemu-img', [
-    'convert',
-    '-f',
-    inputFormat,
-    '-O',
-    outputFormat,
-    inputFile,
-    outputFile,
-  ])
-
-const createRandomStream = asyncIteratorToStream(function*(size) {
-  let requested = Math.min(size, yield)
-  while (size > 0) {
-    const buf = Buffer.allocUnsafe(requested)
-    for (let i = 0; i < requested; ++i) {
-      buf[i] = Math.floor(Math.random() * 256)
-    }
-    requested = Math.min((size -= requested), yield buf)
-  }
-})
-
-async function createRandomFile(name, size) {
-  const input = await createRandomStream(size)
-  await pFromCallback(cb => pipeline(input, fs.createWriteStream(name), cb))
-}
-
-const forOwn = (object, cb) =>
-  Object.keys(object).forEach(key => cb(object[key], key, object))
-
-describe('createVhdStreamWithLength', () => {
-  forOwn(
-    {
-      // qemu-img requires this length or it fill with null bytes which breaks
-      // the test
-      'can extract length': 34816,
-
-      'can handle empty file': 0,
-    },
-    (size, title) =>
-      it(title, async () => {
-        const inputRaw = `${tempDir}/input.raw`
-        await createRandomFile(inputRaw, size)
-
-        const inputVhd = `${tempDir}/input.vhd`
-        await convert(RAW, inputRaw, VHD, inputVhd)
-
-        const result = await createVhdStreamWithLength(
-          await createReadStream(inputVhd)
-        )
-        const { length } = result
-
-        const outputVhd = `${tempDir}/output.vhd`
-        await pFromCallback(
-          pipeline.bind(undefined, result, await createWriteStream(outputVhd))
-        )
-
-        // ensure the guessed length correspond to the stream length
-        const { size: outputSize } = await fs.stat(outputVhd)
-        expect(length).toEqual(outputSize)
-
-        // ensure the generated VHD is correct and contains the same data
-        const outputRaw = `${tempDir}/output.raw`
-        await convert(VHD, outputVhd, RAW, outputRaw)
-        await execa('cmp', [inputRaw, outputRaw])
-      })
-  )
-
-  it('can skip blank after the last block and before the footer', async () => {
-    const initialSize = 4 * 1024
-    const rawFileName = `${tempDir}/randomfile`
-    const vhdName = `${tempDir}/randomfile.vhd`
-    const outputVhdName = `${tempDir}/output.vhd`
-    await createRandomFile(rawFileName, initialSize)
-    await convert(RAW, rawFileName, VHD, vhdName)
-    const { size: vhdSize } = await fs.stat(vhdName)
-    // read file footer
-    const footer = await getStream.buffer(
-      createReadStream(vhdName, { start: vhdSize - FOOTER_SIZE })
-    )
-
-    // we'll override the footer
-    const endOfFile = await createWriteStream(vhdName, {
-      flags: 'r+',
-      start: vhdSize - FOOTER_SIZE,
-    })
-    // write a blank over the previous footer
-    await pFromCallback(cb => endOfFile.write(Buffer.alloc(FOOTER_SIZE), cb))
-    // write the footer after the new blank
-    await pFromCallback(cb => endOfFile.end(footer, cb))
-    const { size: longerSize } = await fs.stat(vhdName)
-    // check input file has been lengthened
-    expect(longerSize).toEqual(vhdSize + FOOTER_SIZE)
-    const result = await createVhdStreamWithLength(
-      await createReadStream(vhdName)
-    )
-    expect(result.length).toEqual(vhdSize)
-    const outputFileStream = await createWriteStream(outputVhdName)
-    await pFromCallback(cb => pipeline(result, outputFileStream, cb))
-    const { size: outputSize } = await fs.stat(outputVhdName)
-    // check out file has been shortened again
-    expect(outputSize).toEqual(vhdSize)
-    await execa('qemu-img', ['compare', outputVhdName, vhdName])
-  })
-})

packages/vhd-lib/src/createVhdStreamWithLength.js

@@ -1,84 +0,0 @@
-import assert from 'assert'
-import { pipeline, Transform } from 'readable-stream'
-
-import checkFooter from './_checkFooter'
-import checkHeader from './_checkHeader'
-import noop from './_noop'
-import getFirstAndLastBlocks from './_getFirstAndLastBlocks'
-import readChunk from './_readChunk'
-import { FOOTER_SIZE, HEADER_SIZE, SECTOR_SIZE } from './_constants'
-import { fuFooter, fuHeader } from './_structs'
-
-class EndCutterStream extends Transform {
-  constructor(footerOffset, footerBuffer) {
-    super()
-    this._footerOffset = footerOffset
-    this._footerBuffer = footerBuffer
-    this._position = 0
-    this._done = false
-  }
-
-  _transform(data, encoding, callback) {
-    if (!this._done) {
-      if (this._position + data.length >= this._footerOffset) {
-        this._done = true
-        const difference = this._footerOffset - this._position
-        data = data.slice(0, difference)
-        this.push(data)
-        this.push(this._footerBuffer)
-      } else {
-        this.push(data)
-      }
-      this._position += data.length
-    }
-    callback()
-  }
-}
-
-export default async function createVhdStreamWithLength(stream) {
-  const readBuffers = []
-  let streamPosition = 0
-
-  async function readStream(length) {
-    const chunk = await readChunk(stream, length)
-    assert.strictEqual(chunk.length, length)
-    streamPosition += chunk.length
-    readBuffers.push(chunk)
-    return chunk
-  }
-
-  const footerBuffer = await readStream(FOOTER_SIZE)
-  const footer = fuFooter.unpack(footerBuffer)
-  checkFooter(footer)
-
-  const header = fuHeader.unpack(await readStream(HEADER_SIZE))
-  checkHeader(header, footer)
-
-  await readStream(header.tableOffset - streamPosition)
-
-  const table = await readStream(header.maxTableEntries * 4)
-
-  readBuffers.reverse()
-  for (const buf of readBuffers) {
-    stream.unshift(buf)
-  }
-
-  const firstAndLastBlocks = getFirstAndLastBlocks(table)
-  const footerOffset =
-    firstAndLastBlocks !== undefined
-      ? firstAndLastBlocks.lastSector * SECTOR_SIZE +
-        Math.ceil(header.blockSize / SECTOR_SIZE / 8 / SECTOR_SIZE) *
-          SECTOR_SIZE +
-        header.blockSize
-      : Math.ceil(streamPosition / SECTOR_SIZE) * SECTOR_SIZE
-
-  // ignore any data after footerOffset and push footerBuffer
-  //
-  // this is necessary to ignore any blank space between the last block and the
-  // final footer which would invalidate the size we computed
-  const newStream = new EndCutterStream(footerOffset, footerBuffer)
-  pipeline(stream, newStream, noop)
-
-  newStream.length = footerOffset + FOOTER_SIZE
-  return newStream
-}

packages/vhd-lib/src/index.js

@@ -11,6 +11,3 @@ export {
 } from './createReadableSparseStream'
 export { default as createSyntheticStream } from './createSyntheticStream'
 export { default as mergeVhd } from './merge'
-export {
-  default as createVhdStreamWithLength,
-} from './createVhdStreamWithLength'

packages/vhd-lib/src/vhd.js

@@ -1,14 +1,19 @@
 import assert from 'assert'
+import { fromEvent } from 'promise-toolbox'
 
-import checkFooter from './_checkFooter'
-import checkHeader from './_checkHeader'
-import getFirstAndLastBlocks from './_getFirstAndLastBlocks'
+import constantStream from './_constant-stream'
 import { fuFooter, fuHeader, checksumStruct, unpackField } from './_structs'
 import { set as mapSetBit, test as mapTestBit } from './_bitmap'
 import {
   BLOCK_UNUSED,
+  DISK_TYPE_DIFFERENCING,
+  DISK_TYPE_DYNAMIC,
+  FILE_FORMAT_VERSION,
+  FOOTER_COOKIE,
   FOOTER_SIZE,
+  HEADER_COOKIE,
   HEADER_SIZE,
+  HEADER_VERSION,
   PARENT_LOCATOR_ENTRIES,
   PLATFORM_NONE,
   PLATFORM_W2KU,
@@ -165,10 +170,21 @@ export default class Vhd {
     }
 
     const footer = (this.footer = fuFooter.unpack(bufFooter))
-    checkFooter(footer)
+    assert.strictEqual(footer.cookie, FOOTER_COOKIE, 'footer cookie')
+    assert.strictEqual(footer.dataOffset, FOOTER_SIZE)
+    assert.strictEqual(footer.fileFormatVersion, FILE_FORMAT_VERSION)
+    assert(footer.originalSize <= footer.currentSize)
+    assert(
+      footer.diskType === DISK_TYPE_DIFFERENCING ||
+        footer.diskType === DISK_TYPE_DYNAMIC
+    )
 
     const header = (this.header = fuHeader.unpack(bufHeader))
-    checkHeader(header, footer)
+    assert.strictEqual(header.cookie, HEADER_COOKIE)
+    assert.strictEqual(header.dataOffset, undefined)
+    assert.strictEqual(header.headerVersion, HEADER_VERSION)
+    assert(header.maxTableEntries >= footer.currentSize / header.blockSize)
+    assert(Number.isInteger(Math.log2(header.blockSize / SECTOR_SIZE)))
 
     // Compute the number of sectors in one block.
     // Default: One block contains 4096 sectors of 512 bytes.
@@ -226,49 +242,109 @@ export default class Vhd {
     )
   }
 
+  // get the identifiers and first sectors of the first and last block
+  // in the file
+  //
+  _getFirstAndLastBlocks() {
+    const n = this.header.maxTableEntries
+    const bat = this.blockTable
+    let i = 0
+    let j = 0
+    let first, firstSector, last, lastSector
+
+    // get first allocated block for initialization
+    while ((firstSector = bat.readUInt32BE(j)) === BLOCK_UNUSED) {
+      i += 1
+      j += 4
+
+      if (i === n) {
+        const error = new Error('no allocated block found')
+        error.noBlock = true
+        throw error
+      }
+    }
+    lastSector = firstSector
+    first = last = i
+
+    while (i < n) {
+      const sector = bat.readUInt32BE(j)
+      if (sector !== BLOCK_UNUSED) {
+        if (sector < firstSector) {
+          first = i
+          firstSector = sector
+        } else if (sector > lastSector) {
+          last = i
+          lastSector = sector
+        }
+      }
+
+      i += 1
+      j += 4
+    }
+
+    return { first, firstSector, last, lastSector }
+  }
+
   // =================================================================
   // Write functions.
   // =================================================================
 
-  // Write a buffer at a given position in a vhd file.
+  // Write a buffer/stream at a given position in a vhd file.
   async _write(data, offset) {
-    assert(Buffer.isBuffer(data))
-    debug(`_write offset=${offset} size=${data.length}`)
-    return this._handler.write(this._path, data, offset)
+    debug(
+      `_write offset=${offset} size=${
+        Buffer.isBuffer(data) ? data.length : '???'
+      }`
+    )
+    // TODO: could probably be merged in remote handlers.
+    const stream = await this._handler.createOutputStream(this._path, {
+      flags: 'r+',
+      start: offset,
+    })
+    return Buffer.isBuffer(data)
+      ? new Promise((resolve, reject) => {
+          stream.on('error', reject)
+          stream.end(data, resolve)
+        })
+      : fromEvent(data.pipe(stream), 'finish')
   }
 
   async _freeFirstBlockSpace(spaceNeededBytes) {
-    const firstAndLastBlocks = getFirstAndLastBlocks(this.blockTable)
-    if (firstAndLastBlocks === undefined) {
-      return
-    }
-
-    const { first, firstSector, lastSector } = firstAndLastBlocks
-    const tableOffset = this.header.tableOffset
-    const { batSize } = this
-    const newMinSector = Math.ceil(
-      (tableOffset + batSize + spaceNeededBytes) / SECTOR_SIZE
-    )
-    if (
-      tableOffset + batSize + spaceNeededBytes >=
-      sectorsToBytes(firstSector)
-    ) {
-      const { fullBlockSize } = this
-      const newFirstSector = Math.max(
-        lastSector + fullBlockSize / SECTOR_SIZE,
-        newMinSector
+    try {
+      const { first, firstSector, lastSector } = this._getFirstAndLastBlocks()
+      const tableOffset = this.header.tableOffset
+      const { batSize } = this
+      const newMinSector = Math.ceil(
+        (tableOffset + batSize + spaceNeededBytes) / SECTOR_SIZE
       )
-      debug(
-        `freeFirstBlockSpace: move first block ${firstSector} -> ${newFirstSector}`
-      )
-      // copy the first block at the end
-      const block = await this._read(sectorsToBytes(firstSector), fullBlockSize)
-      await this._write(block, sectorsToBytes(newFirstSector))
-      await this._setBatEntry(first, newFirstSector)
-      await this.writeFooter(true)
-      spaceNeededBytes -= this.fullBlockSize
-      if (spaceNeededBytes > 0) {
-        return this._freeFirstBlockSpace(spaceNeededBytes)
+      if (
+        tableOffset + batSize + spaceNeededBytes >=
+        sectorsToBytes(firstSector)
+      ) {
+        const { fullBlockSize } = this
+        const newFirstSector = Math.max(
+          lastSector + fullBlockSize / SECTOR_SIZE,
+          newMinSector
+        )
+        debug(
+          `freeFirstBlockSpace: move first block ${firstSector} -> ${newFirstSector}`
+        )
+        // copy the first block at the end
+        const block = await this._read(
+          sectorsToBytes(firstSector),
+          fullBlockSize
+        )
+        await this._write(block, sectorsToBytes(newFirstSector))
+        await this._setBatEntry(first, newFirstSector)
+        await this.writeFooter(true)
+        spaceNeededBytes -= this.fullBlockSize
+        if (spaceNeededBytes > 0) {
+          return this._freeFirstBlockSpace(spaceNeededBytes)
+        }
+      }
+    } catch (e) {
+      if (!e.noBlock) {
+        throw e
       }
     }
   }
@@ -291,7 +367,7 @@ export default class Vhd {
       `ensureBatSize: extend BAT ${prevMaxTableEntries} -> ${maxTableEntries}`
     )
     await this._write(
-      Buffer.alloc(maxTableEntries - prevMaxTableEntries, BUF_BLOCK_UNUSED),
+      constantStream(BUF_BLOCK_UNUSED, maxTableEntries - prevMaxTableEntries),
       header.tableOffset + prevBat.length
     )
     await this.writeHeader()
@@ -316,7 +392,10 @@ export default class Vhd {
 
     await Promise.all([
       // Write an empty block and addr in vhd file.
-      this._write(Buffer.alloc(this.fullBlockSize), sectorsToBytes(blockAddr)),
+      this._write(
+        constantStream([0], this.fullBlockSize),
+        sectorsToBytes(blockAddr)
+      ),
 
       this._setBatEntry(blockId, blockAddr),
     ])
@@ -364,7 +443,9 @@ export default class Vhd {
     const offset = blockAddr + this.sectorsOfBitmap + beginSectorId
 
     debug(
-      `writeBlockSectors at ${offset} block=${block.id}, sectors=${beginSectorId}...${endSectorId}`
+      `writeBlockSectors at ${offset} block=${
+        block.id
+      }, sectors=${beginSectorId}...${endSectorId}`
     )
 
     for (let i = beginSectorId; i < endSectorId; ++i) {

packages/vhd-lib/vhd.integ.spec.js

@@ -4,20 +4,22 @@ import rimraf from 'rimraf'
 import tmp from 'tmp'
 import { createWriteStream, readFile } from 'fs-promise'
 import { fromEvent, pFromCallback } from 'promise-toolbox'
-import { pipeline } from 'readable-stream'
 
 import { createReadableRawStream, createReadableSparseStream } from './'
 
 import { createFooter } from './src/_createFooterHeader'
 
-let tempDir = null
+const initialDir = process.cwd()
 
 beforeEach(async () => {
-  tempDir = await pFromCallback(cb => tmp.dir(cb))
+  const dir = await pFromCallback(cb => tmp.dir(cb))
+  process.chdir(dir)
 })
 
 afterEach(async () => {
-  await pFromCallback(cb => rimraf(tempDir, cb))
+  const tmpDir = process.cwd()
+  process.chdir(initialDir)
+  await pFromCallback(cb => rimraf(tmpDir, cb))
 })
 
 test('createFooter() does not crash', () => {
@@ -53,10 +55,9 @@ test('ReadableRawVHDStream does not crash', async () => {
   }
   const fileSize = 1000
   const stream = createReadableRawStream(fileSize, mockParser)
-  await pFromCallback(cb =>
-    pipeline(stream, createWriteStream(`${tempDir}/output.vhd`), cb)
-  )
-  await execa('vhd-util', ['check', '-t', '-i', '-n', `${tempDir}/output.vhd`])
+  const pipe = stream.pipe(createWriteStream('output.vhd'))
+  await fromEvent(pipe, 'finish')
+  await execa('vhd-util', ['check', '-t', '-i', '-n', 'output.vhd'])
 })
 
 test('ReadableRawVHDStream detects when blocks are out of order', async () => {
@@ -86,9 +87,9 @@ test('ReadableRawVHDStream detects when blocks are out of order', async () => {
     new Promise((resolve, reject) => {
       const stream = createReadableRawStream(100000, mockParser)
       stream.on('error', reject)
-      pipeline(stream, createWriteStream(`${tempDir}/outputStream`), err =>
-        err ? reject(err) : resolve()
-      )
+      const pipe = stream.pipe(createWriteStream('outputStream'))
+      pipe.on('finish', resolve)
+      pipe.on('error', reject)
     })
   ).rejects.toThrow('Received out of order blocks')
 })
@@ -113,19 +114,19 @@ test('ReadableSparseVHDStream can handle a sparse file', async () => {
     blocks
   )
   expect(stream.length).toEqual(4197888)
-  const pipe = stream.pipe(createWriteStream(`${tempDir}/output.vhd`))
+  const pipe = stream.pipe(createWriteStream('output.vhd'))
   await fromEvent(pipe, 'finish')
-  await execa('vhd-util', ['check', '-t', '-i', '-n', `${tempDir}/output.vhd`])
+  await execa('vhd-util', ['check', '-t', '-i', '-n', 'output.vhd'])
   await execa('qemu-img', [
     'convert',
     '-f',
     'vpc',
     '-O',
     'raw',
-    `${tempDir}/output.vhd`,
-    `${tempDir}/out1.raw`,
+    'output.vhd',
+    'out1.raw',
   ])
-  const out1 = await readFile(`${tempDir}/out1.raw`)
+  const out1 = await readFile('out1.raw')
   const expected = Buffer.alloc(fileSize)
   blocks.forEach(b => {
     b.data.copy(expected, b.offsetBytes)

packages/xapi-explore-sr/package.json

@@ -41,7 +41,7 @@
     "human-format": "^0.10.0",
     "lodash": "^4.17.4",
     "pw": "^0.0.4",
-    "xen-api": "^0.27.1"
+    "xen-api": "^0.24.5"
   },
   "devDependencies": {
     "@babel/cli": "^7.1.5",
@@ -56,7 +56,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

packages/xen-api/README.md

@@ -82,7 +82,7 @@ console.log(xapi.pool.$master.$resident_VMs[0].name_label)
 A CLI is provided to help exploration and discovery of the XAPI.
 
 ```
-> xen-api xen1.company.net root
+> xen-api https://xen1.company.net root
 Password: ******
 root@xen1.company.net> xapi.status
 'connected'
@@ -92,14 +92,6 @@ root@xen1.company.net> xapi.pool.$master.name_label
 'xen1'
 ```
 
-You can optionally prefix the address by a protocol: `https://` (default) or `http://`.
-
-In case of error due to invalid or self-signed certificates you can use the `--allow-unauthorized` flag (or `--au`):
-
-```
-> xen-api --au xen1.company.net root
-```
-
 To ease searches, `find()` and `findAll()` functions are available:
 
 ```

packages/xen-api/examples/utils.js

@@ -4,7 +4,7 @@ const { PassThrough, pipeline } = require('readable-stream')
 const humanFormat = require('human-format')
 const Throttle = require('throttle')
 
-const isOpaqueRef = require('../dist/_isOpaqueRef').default
+const { isOpaqueRef } = require('../')
 
 exports.createInputStream = path => {
   if (path === undefined || path === '-') {

packages/xen-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xen-api",
-  "version": "0.27.1",
+  "version": "0.24.5",
   "license": "ISC",
   "description": "Connector to the Xen API",
   "keywords": [
@@ -33,12 +33,12 @@
     "node": ">=6"
   },
   "dependencies": {
-    "bind-property-descriptor": "^1.0.0",
     "blocked": "^1.2.1",
     "debug": "^4.0.1",
     "event-to-promise": "^0.8.0",
     "exec-promise": "^0.7.0",
     "http-request-plus": "^0.8.0",
+    "iterable-backoff": "^0.1.0",
     "jest-diff": "^24.0.0",
     "json-rpc-protocol": "^0.13.1",
     "kindof": "^2.0.0",
@@ -46,7 +46,7 @@
     "make-error": "^1.3.0",
     "minimist": "^1.2.0",
     "ms": "^2.1.1",
-    "promise-toolbox": "^0.13.0",
+    "promise-toolbox": "^0.12.1",
     "pw": "0.0.4",
     "xmlrpc": "^1.3.2",
     "xo-collection": "^0.4.1"
@@ -54,10 +54,7 @@
   "devDependencies": {
     "@babel/cli": "^7.0.0",
     "@babel/core": "^7.0.0",
-    "@babel/plugin-proposal-class-properties": "^7.3.4",
     "@babel/plugin-proposal-decorators": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.2.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
@@ -69,7 +66,6 @@
     "plot": "gnuplot -p memory-test.gnu",
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

packages/xen-api/src/_XapiError.js

@@ -1,30 +0,0 @@
-import { BaseError } from 'make-error'
-
-export default class XapiError extends BaseError {
-  static wrap(error) {
-    let code, params
-    if (Array.isArray(error)) {
-      // < XenServer 7.3
-      ;[code, ...params] = error
-    } else {
-      code = error.message
-      params = error.data
-      if (!Array.isArray(params)) {
-        params = []
-      }
-    }
-    return new XapiError(code, params)
-  }
-
-  constructor(code, params) {
-    super(`${code}(${params.join(', ')})`)
-
-    this.code = code
-    this.params = params
-
-    // slots than can be assigned later
-    this.call = undefined
-    this.url = undefined
-    this.task = undefined
-  }
-}

packages/xen-api/src/_coalesceCalls.js

@@ -1,15 +0,0 @@
-// decorates fn so that more than one concurrent calls will be coalesced
-export default function coalesceCalls(fn) {
-  let promise
-  const clean = () => {
-    promise = undefined
-  }
-  return function() {
-    if (promise !== undefined) {
-      return promise
-    }
-    promise = fn.apply(this, arguments)
-    promise.then(clean, clean)
-    return promise
-  }
-}

packages/xen-api/src/_coalesceCalls.spec.js

@@ -1,26 +0,0 @@
-/* eslint-env jest */
-
-import pDefer from 'promise-toolbox/defer'
-
-import coalesceCalls from './_coalesceCalls'
-
-describe('coalesceCalls', () => {
-  it('decorates an async function', async () => {
-    const fn = coalesceCalls(promise => promise)
-
-    const defer1 = pDefer()
-    const promise1 = fn(defer1.promise)
-    const defer2 = pDefer()
-    const promise2 = fn(defer2.promise)
-
-    defer1.resolve('foo')
-    expect(await promise1).toBe('foo')
-    expect(await promise2).toBe('foo')
-
-    const defer3 = pDefer()
-    const promise3 = fn(defer3.promise)
-
-    defer3.resolve('bar')
-    expect(await promise3).toBe('bar')
-  })
-})

packages/xen-api/src/_debug.js

@@ -1,3 +0,0 @@
-import debug from 'debug'
-
-export default debug('xen-api')

packages/xen-api/src/_getTaskResult.js

@@ -1,22 +0,0 @@
-import { Cancel } from 'promise-toolbox'
-
-import XapiError from './_XapiError'
-
-export default task => {
-  const { status } = task
-  if (status === 'cancelled') {
-    return Promise.reject(new Cancel('task canceled'))
-  }
-  if (status === 'failure') {
-    const error = XapiError.wrap(task.error_info)
-    error.task = task
-    return Promise.reject(error)
-  }
-  if (status === 'success') {
-    // the result might be:
-    // - empty string
-    // - an opaque reference
-    // - an XML-RPC value
-    return Promise.resolve(task.result)
-  }
-}

packages/xen-api/src/_isGetAllRecordsMethod.js

@@ -1,3 +0,0 @@
-const SUFFIX = '.get_all_records'
-
-export default method => method.endsWith(SUFFIX)

packages/xen-api/src/_isOpaqueRef.js

@@ -1,3 +0,0 @@
-const PREFIX = 'OpaqueRef:'
-
-export default value => typeof value === 'string' && value.startsWith(PREFIX)

packages/xen-api/src/_isReadOnlyCall.js

@@ -1,4 +0,0 @@
-const RE = /^[^.]+\.get_/
-
-export default (method, args) =>
-  args.length === 1 && typeof args[0] === 'string' && RE.test(method)

packages/xen-api/src/_makeCallSetting.js

@@ -1,8 +0,0 @@
-export default (setting, defaultValue) =>
-  setting === undefined
-    ? () => defaultValue
-    : typeof setting === 'function'
-    ? setting
-    : typeof setting === 'object'
-    ? method => setting[method] ?? setting['*'] ?? defaultValue
-    : () => setting

packages/xen-api/src/_parseUrl.js

@@ -1,18 +0,0 @@
-const URL_RE = /^(?:(https?:)\/*)?(?:([^:]+):([^@]+)@)?([^/]+?)(?::([0-9]+))?\/?$/
-
-export default url => {
-  const matches = URL_RE.exec(url)
-  if (matches === null) {
-    throw new Error('invalid URL: ' + url)
-  }
-
-  const [, protocol = 'https:', username, password, hostname, port] = matches
-  const parsedUrl = { protocol, hostname, port }
-  if (username !== undefined) {
-    parsedUrl.username = decodeURIComponent(username)
-  }
-  if (password !== undefined) {
-    parsedUrl.password = decodeURIComponent(password)
-  }
-  return parsedUrl
-}

packages/xen-api/src/cli.js

@@ -9,7 +9,6 @@ import minimist from 'minimist'
 import pw from 'pw'
 import { asCallback, fromCallback } from 'promise-toolbox'
 import { filter, find, isArray } from 'lodash'
-import { getBoundPropertyDescriptor } from 'bind-property-descriptor'
 import { start as createRepl } from 'repl'
 
 import { createClient } from './'
@@ -26,20 +25,6 @@ function askPassword(prompt = 'Password: ') {
   })
 }
 
-const { getPrototypeOf, ownKeys } = Reflect
-function getAllBoundDescriptors(object) {
-  const descriptors = { __proto__: null }
-  let current = object
-  do {
-    ownKeys(current).forEach(key => {
-      if (!(key in descriptors)) {
-        descriptors[key] = getBoundPropertyDescriptor(current, key, object)
-      }
-    })
-  } while ((current = getPrototypeOf(current)) !== null)
-  return descriptors
-}
-
 // ===================================================================
 
 const usage = 'Usage: xen-api <url> [<user> [<password>]]'
@@ -93,17 +78,11 @@ const main = async args => {
   const repl = createRepl({
     prompt: `${xapi._humanId}> `,
   })
+  repl.context.xapi = xapi
 
-  {
-    const ctx = repl.context
-    ctx.xapi = xapi
-
-    ctx.diff = (a, b) => console.log('%s', diff(a, b))
-    ctx.find = predicate => find(xapi.objects.all, predicate)
-    ctx.findAll = predicate => filter(xapi.objects.all, predicate)
-
-    Object.defineProperties(ctx, getAllBoundDescriptors(xapi))
-  }
+  repl.context.diff = (a, b) => console.log('%s', diff(a, b))
+  repl.context.find = predicate => find(xapi.objects.all, predicate)
+  repl.context.findAll = predicate => filter(xapi.objects.all, predicate)
 
   // Make the REPL waits for promise completion.
   repl.eval = (evaluate => (cmd, context, filename, cb) => {

packages/xen-api/src/inject-events.js

@@ -4,33 +4,31 @@ import { pDelay } from 'promise-toolbox'
 
 import { createClient } from './'
 
-async function main([url]) {
-  const xapi = createClient({
-    allowUnauthorized: true,
+const xapi = (() => {
+  const [, , url, user, password] = process.argv
+
+  return createClient({
+    auth: { user, password },
     url,
     watchEvents: false,
   })
-  await xapi.connect()
+})()
 
-  let loop = true
-  process.on('SIGINT', () => {
-    loop = false
+xapi
+  .connect()
+
+  // Get the pool record's ref.
+  .then(() => xapi.call('pool.get_all'))
+
+  // Injects lots of events.
+  .then(([poolRef]) => {
+    const loop = () =>
+      pDelay
+        .call(
+          xapi.call('event.inject', 'pool', poolRef),
+          10 // A small delay is required to avoid overloading the Xen API.
+        )
+        .then(loop)
+
+    return loop()
   })
-
-  const { pool } = xapi
-  // eslint-disable-next-line no-unmodified-loop-condition
-  while (loop) {
-    await pool.update_other_config(
-      'xo:injectEvents',
-      Math.random()
-        .toString(36)
-        .slice(2)
-    )
-    await pDelay(1e2)
-  }
-
-  await pool.update_other_config('xo:injectEvents', null)
-  await xapi.disconnect()
-}
-
-main(process.argv.slice(2)).catch(console.error)

packages/xen-api/src/transports/_UnsupportedTransport.js

@@ -1,3 +0,0 @@
-import makeError from 'make-error'
-
-export default makeError('UnsupportedTransport')

packages/xen-api/src/transports/_prepareXmlRpcParams.js

@@ -1,25 +0,0 @@
-// Prepare values before passing them to the XenAPI:
-//
-// - cast integers to strings
-export default function prepare(param) {
-  if (Number.isInteger(param)) {
-    return String(param)
-  }
-
-  if (typeof param !== 'object' || param === null) {
-    return param
-  }
-
-  if (Array.isArray(param)) {
-    return param.map(prepare)
-  }
-
-  const values = {}
-  Object.keys(param).forEach(key => {
-    const value = param[key]
-    if (value !== undefined) {
-      values[key] = prepare(value)
-    }
-  })
-  return values
-}

packages/xen-api/src/transports/_utils.js

@@ -0,0 +1,3 @@
+import makeError from 'make-error'
+
+export const UnsupportedTransport = makeError('UnsupportedTransport')

packages/xen-api/src/transports/auto.js

@@ -1,7 +1,7 @@
 import jsonRpc from './json-rpc'
-import UnsupportedTransport from './_UnsupportedTransport'
 import xmlRpc from './xml-rpc'
 import xmlRpcJson from './xml-rpc-json'
+import { UnsupportedTransport } from './_utils'
 
 const factories = [jsonRpc, xmlRpcJson, xmlRpc]
 const { length } = factories

packages/xen-api/src/transports/json-rpc.js

@@ -1,7 +1,7 @@
 import httpRequestPlus from 'http-request-plus'
 import { format, parse } from 'json-rpc-protocol'
 
-import UnsupportedTransport from './_UnsupportedTransport'
+import { UnsupportedTransport } from './_utils'
 
 // https://github.com/xenserver/xenadmin/blob/0df39a9d83cd82713f32d24704852a0fd57b8a64/XenModel/XenAPI/Session.cs#L403-L433
 export default ({ allowUnauthorized, url }) => {

packages/xen-api/src/transports/xml-rpc-json.js

@@ -1,8 +1,7 @@
 import { createClient, createSecureClient } from 'xmlrpc'
 import { promisify } from 'promise-toolbox'
 
-import prepareXmlRpcParams from './_prepareXmlRpcParams'
-import UnsupportedTransport from './_UnsupportedTransport'
+import { UnsupportedTransport } from './_utils'
 
 const logError = error => {
   if (error.res) {
@@ -72,7 +71,10 @@ const parseResult = result => {
   throw new UnsupportedTransport()
 }
 
-export default ({ allowUnauthorized, url: { hostname, port, protocol } }) => {
+export default ({
+  allowUnauthorized,
+  url: { hostname, path, port, protocol },
+}) => {
   const client = (protocol === 'https:' ? createSecureClient : createClient)({
     host: hostname,
     path: '/json',
@@ -81,6 +83,5 @@ export default ({ allowUnauthorized, url: { hostname, port, protocol } }) => {
   })
   const call = promisify(client.methodCall, client)
 
-  return (method, args) =>
-    call(method, prepareXmlRpcParams(args)).then(parseResult, logError)
+  return (method, args) => call(method, args).then(parseResult, logError)
 }

packages/xen-api/src/transports/xml-rpc.js

@@ -1,8 +1,6 @@
 import { createClient, createSecureClient } from 'xmlrpc'
 import { promisify } from 'promise-toolbox'
 
-import prepareXmlRpcParams from './_prepareXmlRpcParams'
-
 const logError = error => {
   if (error.res) {
     console.error(
@@ -32,7 +30,10 @@ const parseResult = result => {
   return result.Value
 }
 
-export default ({ allowUnauthorized, url: { hostname, port, protocol } }) => {
+export default ({
+  allowUnauthorized,
+  url: { hostname, path, port, protocol },
+}) => {
   const client = (protocol === 'https:' ? createSecureClient : createClient)({
     host: hostname,
     port,
@@ -40,6 +41,5 @@ export default ({ allowUnauthorized, url: { hostname, port, protocol } }) => {
   })
   const call = promisify(client.methodCall, client)
 
-  return (method, args) =>
-    call(method, prepareXmlRpcParams(args)).then(parseResult, logError)
+  return (method, args) => call(method, args).then(parseResult, logError)
 }

packages/xo-acl-resolver/package.json

@@ -25,8 +25,5 @@
   },
   "dependencies": {
     "xo-common": "^0.2.0"
-  },
-  "scripts": {
-    "postversion": "npm publish"
   }
 }

packages/xo-cli/package.json

@@ -43,7 +43,7 @@
     "nice-pipe": "0.0.0",
     "pretty-ms": "^4.0.0",
     "progress-stream": "^2.0.0",
-    "promise-toolbox": "^0.13.0",
+    "promise-toolbox": "^0.12.1",
     "pump": "^3.0.0",
     "pw": "^0.0.4",
     "strip-indent": "^2.0.0",
@@ -64,7 +64,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

packages/xo-cli/src/index.js

@@ -24,6 +24,7 @@ const nicePipe = require('nice-pipe')
 const pairs = require('lodash/toPairs')
 const pick = require('lodash/pick')
 const pump = require('pump')
+const startsWith = require('lodash/startsWith')
 const prettyMs = require('pretty-ms')
 const progressStream = require('progress-stream')
 const pw = require('pw')
@@ -80,7 +81,7 @@ function parseParameters(args) {
     const name = matches[1]
     let value = matches[2]
 
-    if (value.startsWith('json:')) {
+    if (startsWith(value, 'json:')) {
       value = JSON.parse(value.slice(5))
     }
 

packages/xo-collection/package.json

@@ -43,7 +43,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

packages/xo-collection/src/collection.js

@@ -1,7 +1,7 @@
 import kindOf from 'kindof'
 import { BaseError } from 'make-error'
 import { EventEmitter } from 'events'
-import { forOwn } from 'lodash'
+import { forEach } from 'lodash'
 
 import isEmpty from './is-empty'
 import isObject from './is-object'
@@ -10,7 +10,6 @@ import isObject from './is-object'
 
 const {
   create: createObject,
-  keys,
   prototype: { hasOwnProperty },
 } = Object
 
@@ -64,16 +63,6 @@ export class NoSuchItem extends BaseError {
 
 // -------------------------------------------------------------------
 
-const assertValidKey = key => {
-  if (!isValidKey(key)) {
-    throw new InvalidKey(key)
-  }
-}
-
-const isValidKey = key => typeof key === 'number' || typeof key === 'string'
-
-// -------------------------------------------------------------------
-
 export default class Collection extends EventEmitter {
   constructor() {
     super()
@@ -82,7 +71,7 @@ export default class Collection extends EventEmitter {
     this._buffering = 0
     this._indexes = createObject(null)
     this._indexedItems = createObject(null)
-    this._items = createObject(null)
+    this._items = {} // createObject(null)
     this._size = 0
   }
 
@@ -124,7 +113,7 @@ export default class Collection extends EventEmitter {
   }
 
   clear() {
-    keys(this._items).forEach(this._remove, this)
+    forEach(this._items, (_, key) => this._remove(key))
   }
 
   remove(keyOrObjectWithId) {
@@ -187,7 +176,8 @@ export default class Collection extends EventEmitter {
       return defaultValue
     }
 
-    throw new NoSuchItem(key)
+    // Throws a NoSuchItem.
+    this._assertHas(key)
   }
 
   has(key) {
@@ -199,7 +189,7 @@ export default class Collection extends EventEmitter {
   // -----------------------------------------------------------------
 
   createIndex(name, index) {
-    const indexes = this._indexes
+    const { _indexes: indexes } = this
     if (hasOwnProperty.call(indexes, name)) {
       throw new DuplicateIndex(name)
     }
@@ -211,7 +201,7 @@ export default class Collection extends EventEmitter {
   }
 
   deleteIndex(name) {
-    const indexes = this._indexes
+    const { _indexes: indexes } = this
     if (!hasOwnProperty.call(indexes, name)) {
       throw new NoSuchIndex(name)
     }
@@ -228,7 +218,7 @@ export default class Collection extends EventEmitter {
   // -----------------------------------------------------------------
 
   *[Symbol.iterator]() {
-    const items = this._items
+    const { _items: items } = this
 
     for (const key in items) {
       yield [key, items[key]]
@@ -236,7 +226,7 @@ export default class Collection extends EventEmitter {
   }
 
   *keys() {
-    const items = this._items
+    const { _items: items } = this
 
     for (const key in items) {
       yield key
@@ -244,7 +234,7 @@ export default class Collection extends EventEmitter {
   }
 
   *values() {
-    const items = this._items
+    const { _items: items } = this
 
     for (const key in items) {
       yield items[key]
@@ -265,11 +255,11 @@ export default class Collection extends EventEmitter {
       }
       called = true
 
-      if (--this._buffering !== 0) {
+      if (--this._buffering) {
         return
       }
 
-      const buffer = this._buffer
+      const { _buffer: buffer } = this
 
       // Due to deduplication there could be nothing in the buffer.
       if (isEmpty(buffer)) {
@@ -286,7 +276,7 @@ export default class Collection extends EventEmitter {
         data[buffer[key]][key] = this._items[key]
       }
 
-      forOwn(data, (items, action) => {
+      forEach(data, (items, action) => {
         if (!isEmpty(items)) {
           this.emit(action, items)
         }
@@ -316,6 +306,16 @@ export default class Collection extends EventEmitter {
     }
   }
 
+  _assertValidKey(key) {
+    if (!this._isValidKey(key)) {
+      throw new InvalidKey(key)
+    }
+  }
+
+  _isValidKey(key) {
+    return typeof key === 'number' || typeof key === 'string'
+  }
+
   _remove(key) {
     delete this._items[key]
     this._size--
@@ -324,17 +324,17 @@ export default class Collection extends EventEmitter {
 
   _resolveItem(keyOrObjectWithId, valueIfKey = undefined) {
     if (valueIfKey !== undefined) {
-      assertValidKey(keyOrObjectWithId)
+      this._assertValidKey(keyOrObjectWithId)
 
       return [keyOrObjectWithId, valueIfKey]
     }
 
-    if (isValidKey(keyOrObjectWithId)) {
+    if (this._isValidKey(keyOrObjectWithId)) {
       return [keyOrObjectWithId]
     }
 
     const key = this.getKey(keyOrObjectWithId)
-    assertValidKey(key)
+    this._assertValidKey(key)
 
     return [key, keyOrObjectWithId]
   }
@@ -347,7 +347,7 @@ export default class Collection extends EventEmitter {
     }
 
     if (action === ACTION_ADD) {
-      this._buffer[key] = key in this._buffer ? ACTION_UPDATE : ACTION_ADD
+      this._buffer[key] = this._buffer[key] ? ACTION_UPDATE : ACTION_ADD
     } else if (action === ACTION_REMOVE) {
       if (this._buffer[key] === ACTION_ADD) {
         delete this._buffer[key]
@@ -356,7 +356,7 @@ export default class Collection extends EventEmitter {
       }
     } else {
       // update
-      if (!(key in this._buffer)) {
+      if (!this._buffer[key]) {
         this._buffer[key] = ACTION_UPDATE
       }
     }

packages/xo-common/package.json

@@ -45,7 +45,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

packages/xo-import-servers-csv/package.json

@@ -32,7 +32,7 @@
     "dist/"
   ],
   "engines": {
-    "node": ">=6"
+    "node": ">=4"
   },
   "dependencies": {
     "csv-parser": "^2.1.0",
@@ -43,7 +43,7 @@
     "xo-lib": "^0.9.0"
   },
   "devDependencies": {
-    "@types/node": "^12.0.2",
+    "@types/node": "^11.11.4",
     "@types/through2": "^2.0.31",
     "tslint": "^5.9.1",
     "tslint-config-standard": "^8.0.1",
@@ -55,7 +55,6 @@
     "lint": "tslint 'src/*.ts'",
     "posttest": "yarn run lint",
     "prepublishOnly": "yarn run build",
-    "start": "node dist/index.js",
-    "postversion": "npm publish"
+    "start": "node dist/index.js"
   }
 }

packages/xo-lib/package.json

@@ -32,7 +32,7 @@
     "node": ">=6"
   },
   "dependencies": {
-    "jsonrpc-websocket-client": "^0.5.0",
+    "jsonrpc-websocket-client": "^0.4.1",
     "lodash": "^4.17.2",
     "make-error": "^1.0.4"
   },
@@ -49,7 +49,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "prepublishOnly": "yarn run build"
   }
 }

packages/xo-lib/src/index.js

@@ -1,5 +1,6 @@
 import JsonRpcWebSocketClient, { OPEN, CLOSED } from 'jsonrpc-websocket-client'
 import { BaseError } from 'make-error'
+import { startsWith } from 'lodash'
 
 // ===================================================================
 
@@ -34,7 +35,7 @@ export default class Xo extends JsonRpcWebSocketClient {
   }
 
   call(method, args, i) {
-    if (method.startsWith('session.')) {
+    if (startsWith(method, 'session.')) {
       return Promise.reject(
         new XoError('session.*() methods are disabled from this interface')
       )

packages/xo-remote-parser/package.json

@@ -41,7 +41,6 @@
     "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
-    "prepare": "yarn run build",
-    "postversion": "npm publish"
+    "prepare": "yarn run build"
   }
 }

packages/xo-server-auth-github/package.json

@@ -41,6 +41,5 @@
     "build": "NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
     "dev": "NODE_DEV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prepublishOnly": "yarn run build"
-  },
-  "private": true
+  }
 }

packages/xo-server-auth-google/package.json

@@ -49,6 +49,5 @@
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
-  },
-  "private": true
+  }
 }

packages/xo-server-auth-ldap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-auth-ldap",
-  "version": "0.6.5",
+  "version": "0.6.4",
   "license": "AGPL-3.0",
   "description": "LDAP authentication plugin for XO-Server",
   "keywords": [
@@ -39,7 +39,7 @@
     "inquirer": "^6.0.0",
     "ldapjs": "^1.0.1",
     "lodash": "^4.17.4",
-    "promise-toolbox": "^0.13.0"
+    "promise-toolbox": "^0.12.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
@@ -55,6 +55,5 @@
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
-  },
-  "private": true
+  }
 }

packages/xo-server-auth-ldap/src/index.js

@@ -230,9 +230,10 @@ class AuthLdap {
           logger(`attempting to bind as ${entry.objectName}`)
           await bind(entry.objectName, password)
           logger(
-            `successfully bound as ${entry.objectName} => ${username} authenticated`
+            `successfully bound as ${
+              entry.objectName
+            } => ${username} authenticated`
           )
-          logger(JSON.stringify(entry, null, 2))
           return { username }
         } catch (error) {
           logger(`failed to bind as ${entry.objectName}: ${error.message}`)

packages/xo-server-auth-saml/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-auth-saml",
-  "version": "0.6.0",
+  "version": "0.5.3",
   "license": "AGPL-3.0",
   "description": "SAML authentication plugin for XO-Server",
   "keywords": [
@@ -33,7 +33,7 @@
     "node": ">=6"
   },
   "dependencies": {
-    "passport-saml": "^1.1.0"
+    "passport-saml": "^1.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
@@ -50,6 +50,5 @@
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
-  },
-  "private": true
+  }
 }

packages/xo-server-auth-saml/src/index.js

@@ -24,10 +24,7 @@ export const configurationSchema = {
     },
     usernameField: {
       title: 'Username field',
-      description: `Field to use as the XO username
-
-You should try \`http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress\` if you are using Microsoft Azure Active Directory.
-      `,
+      description: 'Field to use as the XO username',
       type: 'string',
     },
   },

packages/xo-server-backup-reports/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-backup-reports",
-  "version": "0.16.2",
+  "version": "0.15.0",
   "license": "AGPL-3.0",
   "description": "Backup reports plugin for XO-Server",
   "keywords": [
@@ -36,7 +36,6 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@xen-orchestra/log": "^0.1.4",
     "human-format": "^0.10.0",
     "lodash": "^4.13.1",
     "moment-timezone": "^0.5.13"
@@ -44,8 +43,6 @@
   "devDependencies": {
     "@babel/cli": "^7.0.0",
     "@babel/core": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.3",
-    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
@@ -58,6 +55,5 @@
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
-  },
-  "private": true
+  }
 }

packages/xo-server-backup-reports/src/index.js

@@ -1,11 +1,8 @@
-import createLogger from '@xen-orchestra/log'
 import humanFormat from 'human-format'
 import moment from 'moment-timezone'
-import { forEach, groupBy, startCase } from 'lodash'
+import { forEach, get, startCase } from 'lodash'
 import pkg from '../package'
 
-const logger = createLogger('xo:xo-server-backup-reports')
-
 export const configurationSchema = {
   type: 'object',
 
@@ -49,9 +46,6 @@ export const testSchema = {
 
 // ===================================================================
 
-const INDENT = '  '
-const UNKNOWN_ITEM = 'Unknown'
-
 const ICON_FAILURE = '🚨'
 const ICON_INTERRUPTED = '⚠️'
 const ICON_SKIPPED = '⏩'
@@ -66,7 +60,7 @@ const STATUS_ICON = {
 }
 
 const DATE_FORMAT = 'dddd, MMMM Do YYYY, h:mm:ss a'
-const createDateFormatter = timezone =>
+const createDateFormater = timezone =>
   timezone !== undefined
     ? timestamp =>
         moment(timestamp)
@@ -92,6 +86,10 @@ const formatSpeed = (bytes, milliseconds) =>
       })
     : 'N/A'
 
+const logError = e => {
+  console.error('backup report error:', e)
+}
+
 const NO_VMS_MATCH_THIS_PATTERN = 'no VMs match this pattern'
 const NO_SUCH_OBJECT_ERROR = 'no such object'
 const UNHEALTHY_VDI_CHAIN_ERROR = 'unhealthy VDI chain'
@@ -102,116 +100,40 @@ const isSkippedError = error =>
   error.message === UNHEALTHY_VDI_CHAIN_ERROR ||
   error.message === NO_SUCH_OBJECT_ERROR
 
-// ===================================================================
+const INDENT = '  '
+const createGetTemporalDataMarkdown = formatDate => (
+  start,
+  end,
+  nbIndent = 0
+) => {
+  const indent = INDENT.repeat(nbIndent)
 
-const STATUS = ['failure', 'interrupted', 'skipped', 'success']
-const TITLE_BY_STATUS = {
-  failure: n => `## ${n} Failure${n === 1 ? '' : 's'}`,
-  interrupted: n => `## ${n} Interrupted`,
-  skipped: n => `## ${n} Skipped`,
-  success: n => `## ${n} Success${n === 1 ? '' : 'es'}`,
-}
-
-const getTemporalDataMarkdown = (end, start, formatDate) => {
-  const markdown = [`- **Start time**: ${formatDate(start)}`]
+  const markdown = [`${indent}- **Start time**: ${formatDate(start)}`]
   if (end !== undefined) {
-    markdown.push(`- **End time**: ${formatDate(end)}`)
+    markdown.push(`${indent}- **End time**: ${formatDate(end)}`)
     const duration = end - start
     if (duration >= 1) {
-      markdown.push(`- **Duration**: ${formatDuration(duration)}`)
+      markdown.push(`${indent}- **Duration**: ${formatDuration(duration)}`)
     }
   }
   return markdown
 }
 
-const getWarningsMarkdown = (warnings = []) =>
-  warnings.map(({ message }) => `- **${ICON_WARNING} ${message}**`)
-
-const getErrorMarkdown = task => {
-  let message
-  if (
-    task.status === 'success' ||
-    (message = task.result?.message ?? task.result?.code) === undefined
-  ) {
+const addWarnings = (text, warnings, nbIndent = 0) => {
+  if (warnings === undefined) {
     return
   }
 
-  const label = task.status === 'skipped' ? 'Reason' : 'Error'
-  return `- **${label}**: ${message}`
+  const indent = INDENT.repeat(nbIndent)
+  warnings.forEach(({ message }) => {
+    text.push(`${indent}- **${ICON_WARNING} ${message}**`)
+  })
 }
 
-const MARKDOWN_BY_TYPE = {
-  pool(task, { formatDate }) {
-    const { id, pool = {}, poolMaster = {} } = task.data
-    const name = pool.name_label || poolMaster.name_label || UNKNOWN_ITEM
-
-    return {
-      body: [
-        pool.uuid !== undefined
-          ? `- **UUID**: ${pool.uuid}`
-          : `- **ID**: ${id}`,
-        ...getTemporalDataMarkdown(task.end, task.start, formatDate),
-        getErrorMarkdown(task),
-      ],
-      title: `[pool] ${name}`,
-    }
-  },
-  xo(task, { formatDate, jobName }) {
-    return {
-      body: [
-        ...getTemporalDataMarkdown(task.end, task.start, formatDate),
-        getErrorMarkdown(task),
-      ],
-      title: `[XO] ${jobName}`,
-    }
-  },
-  async remote(task, { formatDate, xo }) {
-    const id = task.data.id
-    const name = await xo.getRemote(id).then(
-      ({ name }) => name,
-      error => {
-        logger.warn(error)
-        return UNKNOWN_ITEM
-      }
-    )
-    return {
-      body: [
-        `- **ID**: ${id}`,
-        ...getTemporalDataMarkdown(task.end, task.start, formatDate),
-        getErrorMarkdown(task),
-      ],
-      title: `[remote] ${name}`,
-    }
-  },
-}
-
-const getMarkdown = (task, props) =>
-  MARKDOWN_BY_TYPE[(task.data?.type)]?.(task, props)
-
-const toMarkdown = parts => {
-  const lines = []
-  let indentLevel = 0
-
-  const helper = part => {
-    if (typeof part === 'string') {
-      lines.push(`${INDENT.repeat(indentLevel)}${part}`)
-    } else if (Array.isArray(part)) {
-      ++indentLevel
-      part.forEach(helper)
-      --indentLevel
-    }
-  }
-  helper(parts)
-
-  return lines.join('\n')
-}
-
-// ===================================================================
-
 class BackupReportsXoPlugin {
   constructor(xo) {
     this._xo = xo
-    this._report = this._report.bind(this)
+    this._report = this._wrapper.bind(this)
   }
 
   configure({ toMails, toXmpp }) {
@@ -224,174 +146,76 @@ class BackupReportsXoPlugin {
   }
 
   test({ runId }) {
-    return this._report(runId, undefined, true)
+    return this._backupNgListener(undefined, undefined, undefined, runId)
   }
 
   unload() {
     this._xo.removeListener('job:terminated', this._report)
   }
 
-  async _report(runJobId, { type, status } = {}, force) {
-    const xo = this._xo
-    try {
-      if (type === 'call') {
-        return this._legacyVmHandler(status)
-      }
-
-      const log = await xo.getBackupNgLogs(runJobId)
-      if (log === undefined) {
-        throw new Error(`no log found with runId=${JSON.stringify(runJobId)}`)
-      }
-
-      const reportWhen = log.data.reportWhen
-      if (
-        !force &&
-        (reportWhen === 'never' ||
-          // Handle improper value introduced by:
-          // https://github.com/vatesfr/xen-orchestra/commit/753ee994f2948bbaca9d3161eaab82329a682773#diff-9c044ab8a42ed6576ea927a64c1ec3ebR105
-          reportWhen === 'Never' ||
-          (reportWhen === 'failure' && log.status === 'success'))
-      ) {
-        return
-      }
-
-      const [job, schedule] = await Promise.all([
-        await xo.getJob(log.jobId),
-        await xo.getSchedule(log.scheduleId).catch(error => {
-          logger.warn(error)
-        }),
-      ])
-
-      if (job.type === 'backup') {
-        return this._ngVmHandler(log, job, schedule, force)
-      } else if (job.type === 'metadataBackup') {
-        return this._metadataHandler(log, job, schedule, force)
-      }
-
-      throw new Error(`Unknown backup job type: ${job.type}`)
-    } catch (error) {
-      logger.warn(error)
+  _wrapper(status, job, schedule, runJobId) {
+    if (job.type === 'metadataBackup') {
+      return
     }
+
+    return new Promise(resolve =>
+      resolve(
+        job.type === 'backup'
+          ? this._backupNgListener(status, job, schedule, runJobId)
+          : this._listener(status, job, schedule, runJobId)
+      )
+    ).catch(logError)
   }
 
-  async _metadataHandler(log, { name: jobName }, schedule, force) {
+  async _backupNgListener(_1, _2, schedule, runJobId) {
     const xo = this._xo
-
-    const formatDate = createDateFormatter(schedule?.timezone)
-
-    const tasksByStatus = groupBy(log.tasks, 'status')
-    const n = log.tasks?.length ?? 0
-    const nSuccesses = tasksByStatus.success?.length ?? 0
-
-    if (!force && log.data.reportWhen === 'failure') {
-      delete tasksByStatus.success
+    const log = await xo.getBackupNgLogs(runJobId)
+    if (log === undefined) {
+      throw new Error(`no log found with runId=${JSON.stringify(runJobId)}`)
     }
 
-    // header
-    const markdown = [
-      `##  Global status: ${log.status}`,
-      '',
-      `- **Job ID**: ${log.jobId}`,
-      `- **Job name**: ${jobName}`,
-      `- **Run ID**: ${log.id}`,
-      ...getTemporalDataMarkdown(log.end, log.start, formatDate),
-      n !== 0 && `- **Successes**: ${nSuccesses} / ${n}`,
-      ...getWarningsMarkdown(log.warnings),
-      getErrorMarkdown(log),
-    ]
-
-    const nagiosText = []
-
-    // body
-    for (const status of STATUS) {
-      const tasks = tasksByStatus[status]
-      if (tasks === undefined) {
-        continue
-      }
-
-      // tasks header
-      markdown.push('---', '', TITLE_BY_STATUS[status](tasks.length))
-
-      // tasks body
-      for (const task of tasks) {
-        const taskMarkdown = await getMarkdown(task, {
-          formatDate,
-          jobName: log.jobName,
-        })
-        if (taskMarkdown === undefined) {
-          continue
-        }
-
-        const { title, body } = taskMarkdown
-        const subMarkdown = [...body, ...getWarningsMarkdown(task.warnings)]
-
-        if (task.status !== 'success') {
-          nagiosText.push(`[${task.status}] ${title}`)
-        }
-
-        for (const subTask of task.tasks ?? []) {
-          const taskMarkdown = await getMarkdown(subTask, { formatDate, xo })
-          if (taskMarkdown === undefined) {
-            continue
-          }
-
-          const icon = STATUS_ICON[subTask.status]
-          const { title, body } = taskMarkdown
-          subMarkdown.push([
-            `- **${title}** ${icon}`,
-            [...body, ...getWarningsMarkdown(subTask.warnings)],
-          ])
-        }
-        markdown.push('', '', `### ${title}`, ...subMarkdown)
-      }
-    }
-
-    // footer
-    markdown.push('---', '', `*${pkg.name} v${pkg.version}*`)
-
-    return this._sendReport({
-      subject: `[Xen Orchestra] ${log.status} − Metadata backup report for ${
-        log.jobName
-      } ${STATUS_ICON[log.status]}`,
-      markdown: toMarkdown(markdown),
-      nagiosStatus: log.status === 'success' ? 0 : 2,
-      nagiosMarkdown:
-        log.status === 'success'
-          ? `[Xen Orchestra] [Success] Metadata backup report for ${log.jobName}`
-          : `[Xen Orchestra] [${log.status}] Metadata backup report for ${
-              log.jobName
-            } - ${nagiosText.join(' ')}`,
-    })
-  }
-
-  async _ngVmHandler(log, { name: jobName }, schedule, force) {
-    const xo = this._xo
-
     const { reportWhen, mode } = log.data || {}
+    if (
+      reportWhen === 'never' ||
+      (log.status === 'success' && reportWhen === 'failure')
+    ) {
+      return
+    }
 
-    const formatDate = createDateFormatter(schedule?.timezone)
+    if (schedule === undefined) {
+      schedule = await xo.getSchedule(log.scheduleId)
+    }
 
-    if (log.tasks === undefined) {
-      const markdown = [
+    const jobName = (await xo.getJob(log.jobId, 'backup')).name
+    const formatDate = createDateFormater(schedule.timezone)
+    const getTemporalDataMarkdown = createGetTemporalDataMarkdown(formatDate)
+
+    if (
+      (log.status === 'failure' || log.status === 'skipped') &&
+      log.result !== undefined
+    ) {
+      let markdown = [
         `##  Global status: ${log.status}`,
         '',
         `- **Job ID**: ${log.jobId}`,
-        `- **Run ID**: ${log.id}`,
+        `- **Run ID**: ${runJobId}`,
         `- **mode**: ${mode}`,
-        ...getTemporalDataMarkdown(log.end, log.start, formatDate),
-        getErrorMarkdown(log),
-        ...getWarningsMarkdown(log.warnings),
-        '---',
-        '',
-        `*${pkg.name} v${pkg.version}*`,
+        ...getTemporalDataMarkdown(log.start, log.end),
+        `- **Error**: ${log.result.message}`,
       ]
+      addWarnings(markdown, log.warnings)
+      markdown.push('---', '', `*${pkg.name} v${pkg.version}*`)
+
+      markdown = markdown.join('\n')
       return this._sendReport({
         subject: `[Xen Orchestra] ${
           log.status
         } − Backup report for ${jobName} ${STATUS_ICON[log.status]}`,
-        markdown: toMarkdown(markdown),
+        markdown,
         nagiosStatus: 2,
-        nagiosMarkdown: `[Xen Orchestra] [${log.status}] Backup report for ${jobName} - Error : ${log.result.message}`,
+        nagiosMarkdown: `[Xen Orchestra] [${
+          log.status
+        }] Backup report for ${jobName} - Error : ${log.result.message}`,
       })
     }
 
@@ -407,7 +231,7 @@ class BackupReportsXoPlugin {
     let nSkipped = 0
     let nInterrupted = 0
     for (const taskLog of log.tasks) {
-      if (!force && taskLog.status === 'success' && reportWhen === 'failure') {
+      if (taskLog.status === 'success' && reportWhen === 'failure') {
         continue
       }
 
@@ -420,16 +244,16 @@ class BackupReportsXoPlugin {
         `### ${vm !== undefined ? vm.name_label : 'VM not found'}`,
         '',
         `- **UUID**: ${vm !== undefined ? vm.uuid : vmId}`,
-        ...getTemporalDataMarkdown(taskLog.end, taskLog.start, formatDate),
-        ...getWarningsMarkdown(taskLog.warnings),
+        ...getTemporalDataMarkdown(taskLog.start, taskLog.end),
       ]
+      addWarnings(text, taskLog.warnings)
 
       const failedSubTasks = []
       const snapshotText = []
       const srsText = []
       const remotesText = []
 
-      for (const subTaskLog of taskLog.tasks ?? []) {
+      for (const subTaskLog of taskLog.tasks || []) {
         if (
           subTaskLog.message !== 'export' &&
           subTaskLog.message !== 'snapshot'
@@ -438,36 +262,29 @@ class BackupReportsXoPlugin {
         }
 
         const icon = STATUS_ICON[subTaskLog.status]
-        const type = subTaskLog.data?.type
-        const errorMarkdown = getErrorMarkdown(subTaskLog)
+        const errorMessage = `    - **Error**: ${get(
+          subTaskLog.result,
+          'message'
+        )}`
 
         if (subTaskLog.message === 'snapshot') {
-          snapshotText.push(`- **Snapshot** ${icon}`, [
-            ...getTemporalDataMarkdown(
-              subTaskLog.end,
-              subTaskLog.start,
-              formatDate
-            ),
-          ])
-        } else if (type === 'remote') {
+          snapshotText.push(
+            `- **Snapshot** ${icon}`,
+            ...getTemporalDataMarkdown(subTaskLog.start, subTaskLog.end, 1)
+          )
+        } else if (subTaskLog.data.type === 'remote') {
           const id = subTaskLog.data.id
-          const remote = await xo.getRemote(id).catch(error => {
-            logger.warn(error)
-          })
-          const title = remote !== undefined ? remote.name : `Remote Not found`
-
-          remotesText.push(`- **${title}** (${id}) ${icon}`, [
-            ...getTemporalDataMarkdown(
-              subTaskLog.end,
-              subTaskLog.start,
-              formatDate
-            ),
-            ...getWarningsMarkdown(subTaskLog.warnings),
-            errorMarkdown,
-          ])
-
+          const remote = await xo.getRemote(id).catch(() => {})
+          remotesText.push(
+            `  - **${
+              remote !== undefined ? remote.name : `Remote Not found`
+            }** (${id}) ${icon}`,
+            ...getTemporalDataMarkdown(subTaskLog.start, subTaskLog.end, 2)
+          )
+          addWarnings(remotesText, subTaskLog.warnings, 2)
           if (subTaskLog.status === 'failure') {
             failedSubTasks.push(remote !== undefined ? remote.name : id)
+            remotesText.push('', errorMessage)
           }
         } else {
           const id = subTaskLog.data.id
@@ -477,17 +294,14 @@ class BackupReportsXoPlugin {
           } catch (e) {}
           const [srName, srUuid] =
             sr !== undefined ? [sr.name_label, sr.uuid] : [`SR Not found`, id]
-          srsText.push(`- **${srName}** (${srUuid}) ${icon}`, [
-            ...getTemporalDataMarkdown(
-              subTaskLog.end,
-              subTaskLog.start,
-              formatDate
-            ),
-            ...getWarningsMarkdown(subTaskLog.warnings),
-            errorMarkdown,
-          ])
+          srsText.push(
+            `  - **${srName}** (${srUuid}) ${icon}`,
+            ...getTemporalDataMarkdown(subTaskLog.start, subTaskLog.end, 2)
+          )
+          addWarnings(srsText, subTaskLog.warnings, 2)
           if (subTaskLog.status === 'failure') {
             failedSubTasks.push(sr !== undefined ? sr.name_label : id)
+            srsText.push('', errorMessage)
           }
         }
 
@@ -499,48 +313,53 @@ class BackupReportsXoPlugin {
             return
           }
 
-          const size = operationLog.result?.size
-          if (size > 0) {
+          const operationInfoText = []
+          addWarnings(operationInfoText, operationLog.warnings, 3)
+          if (operationLog.status === 'success') {
+            const size = operationLog.result.size
             if (operationLog.message === 'merge') {
               globalMergeSize += size
             } else {
               globalTransferSize += size
             }
-          }
 
+            operationInfoText.push(
+              `      - **Size**: ${formatSize(size)}`,
+              `      - **Speed**: ${formatSpeed(
+                size,
+                operationLog.end - operationLog.start
+              )}`
+            )
+          } else if (get(operationLog.result, 'message') !== undefined) {
+            operationInfoText.push(
+              `      - **Error**: ${get(operationLog.result, 'message')}`
+            )
+          }
           const operationText = [
-            `- **${operationLog.message}** ${STATUS_ICON[operationLog.status]}`,
-            [
-              ...getTemporalDataMarkdown(
-                operationLog.end,
-                operationLog.start,
-                formatDate
-              ),
-              size > 0 && `- **Size**: ${formatSize(size)}`,
-              size > 0 &&
-                `- **Speed**: ${formatSpeed(
-                  size,
-                  operationLog.end - operationLog.start
-                )}`,
-              ...getWarningsMarkdown(operationLog.warnings),
-              getErrorMarkdown(operationLog),
-            ],
-          ]
-          if (type === 'remote') {
+            `    - **${operationLog.message}** ${
+              STATUS_ICON[operationLog.status]
+            }`,
+            ...getTemporalDataMarkdown(operationLog.start, operationLog.end, 3),
+            ...operationInfoText,
+          ].join('\n')
+          if (get(subTaskLog, 'data.type') === 'remote') {
             remotesText.push(operationText)
-          } else if (type === 'SR') {
+            remotesText.join('\n')
+          }
+          if (get(subTaskLog, 'data.type') === 'SR') {
             srsText.push(operationText)
+            srsText.join('\n')
           }
         })
       }
 
-      const subText = [
-        ...snapshotText,
-        srsText.length !== 0 && `- **SRs**`,
-        srsText,
-        remotesText.length !== 0 && `- **Remotes**`,
-        remotesText,
-      ]
+      if (srsText.length !== 0) {
+        srsText.unshift(`- **SRs**`)
+      }
+      if (remotesText.length !== 0) {
+        remotesText.unshift(`- **Remotes**`)
+      }
+      const subText = [...snapshotText, '', ...srsText, '', ...remotesText]
       if (taskLog.result !== undefined) {
         if (taskLog.status === 'skipped') {
           ++nSkipped
@@ -550,7 +369,8 @@ class BackupReportsXoPlugin {
               taskLog.result.message === UNHEALTHY_VDI_CHAIN_ERROR
                 ? UNHEALTHY_VDI_CHAIN_MESSAGE
                 : taskLog.result.message
-            }`
+            }`,
+            ''
           )
           nagiosText.push(
             `[(Skipped) ${vm !== undefined ? vm.name_label : 'undefined'} : ${
@@ -559,7 +379,11 @@ class BackupReportsXoPlugin {
           )
         } else {
           ++nFailures
-          failedVmsText.push(...text, `- **Error**: ${taskLog.result.message}`)
+          failedVmsText.push(
+            ...text,
+            `- **Error**: ${taskLog.result.message}`,
+            ''
+          )
 
           nagiosText.push(
             `[(Failed) ${vm !== undefined ? vm.name_label : 'undefined'} : ${
@@ -570,7 +394,7 @@ class BackupReportsXoPlugin {
       } else {
         if (taskLog.status === 'failure') {
           ++nFailures
-          failedVmsText.push(...text, ...subText)
+          failedVmsText.push(...text, '', '', ...subText, '')
           nagiosText.push(
             `[${
               vm !== undefined ? vm.name_label : 'undefined'
@@ -578,34 +402,37 @@ class BackupReportsXoPlugin {
           )
         } else if (taskLog.status === 'interrupted') {
           ++nInterrupted
-          interruptedVmsText.push(...text, ...subText)
+          interruptedVmsText.push(...text, '', '', ...subText, '')
           nagiosText.push(
             `[(Interrupted) ${vm !== undefined ? vm.name_label : 'undefined'}]`
           )
         } else {
-          successfulVmsText.push(...text, ...subText)
+          successfulVmsText.push(...text, '', '', ...subText, '')
         }
       }
     }
 
     const nVms = log.tasks.length
     const nSuccesses = nVms - nFailures - nSkipped - nInterrupted
-    const markdown = [
+    let markdown = [
       `##  Global status: ${log.status}`,
       '',
       `- **Job ID**: ${log.jobId}`,
-      `- **Run ID**: ${log.id}`,
+      `- **Run ID**: ${runJobId}`,
       `- **mode**: ${mode}`,
-      ...getTemporalDataMarkdown(log.end, log.start, formatDate),
+      ...getTemporalDataMarkdown(log.start, log.end),
       `- **Successes**: ${nSuccesses} / ${nVms}`,
-      globalTransferSize !== 0 &&
-        `- **Transfer size**: ${formatSize(globalTransferSize)}`,
-      globalMergeSize !== 0 &&
-        `- **Merge size**: ${formatSize(globalMergeSize)}`,
-      ...getWarningsMarkdown(log.warnings),
-      '',
     ]
 
+    if (globalTransferSize !== 0) {
+      markdown.push(`- **Transfer size**: ${formatSize(globalTransferSize)}`)
+    }
+    if (globalMergeSize !== 0) {
+      markdown.push(`- **Merge size**: ${formatSize(globalMergeSize)}`)
+    }
+    addWarnings(markdown, log.warnings)
+    markdown.push('')
+
     if (nFailures !== 0) {
       markdown.push(
         '---',
@@ -630,7 +457,7 @@ class BackupReportsXoPlugin {
       )
     }
 
-    if (nSuccesses !== 0 && (force || reportWhen !== 'failure')) {
+    if (nSuccesses !== 0 && reportWhen !== 'failure') {
       markdown.push(
         '---',
         '',
@@ -641,8 +468,9 @@ class BackupReportsXoPlugin {
     }
 
     markdown.push('---', '', `*${pkg.name} v${pkg.version}*`)
+    markdown = markdown.join('\n')
     return this._sendReport({
-      markdown: toMarkdown(markdown),
+      markdown,
       subject: `[Xen Orchestra] ${log.status} − Backup report for ${jobName} ${
         STATUS_ICON[log.status]
       }`,
@@ -682,9 +510,9 @@ class BackupReportsXoPlugin {
     ])
   }
 
-  _legacyVmHandler(status) {
+  _listener(status) {
     const { calls, timezone, error } = status
-    const formatDate = createDateFormatter(timezone)
+    const formatDate = createDateFormater(timezone)
 
     if (status.error !== undefined) {
       const [globalStatus, icon] =
@@ -709,7 +537,9 @@ class BackupReportsXoPlugin {
         subject: `[Xen Orchestra] ${globalStatus} ${icon}`,
         markdown,
         nagiosStatus: 2,
-        nagiosMarkdown: `[Xen Orchestra] [${globalStatus}] Error : ${error.message}`,
+        nagiosMarkdown: `[Xen Orchestra] [${globalStatus}] Error : ${
+          error.message
+        }`,
       })
     }
 

packages/xo-server-cloud/package.json

@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "http-request-plus": "^0.8.0",
-    "jsonrpc-websocket-client": "^0.5.0"
+    "jsonrpc-websocket-client": "^0.4.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
@@ -49,6 +49,5 @@
     "prebuild": "yarn run clean",
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
-  },
-  "private": true
+  }
 }

packages/xo-server-load-balancer/package.json

@@ -44,6 +44,5 @@
     "build": "NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
     "dev": "NODE_DEV=development babel --watch --source-maps --out-dir=dist/ src/",
     "prepublishOnly": "yarn run build"
-  },
-  "private": true
+  }
 }

packages/xo-server-load-balancer/src/density-plan.js

@@ -189,7 +189,9 @@ export default class DensityPlan extends Plan {
         const { vm, destination } = move
         const xapiDest = this.xo.getXapi(destination)
         debug(
-          `Migrate VM (${vm.id}) to Host (${destination.id}) from Host (${vm.$container}).`
+          `Migrate VM (${vm.id}) to Host (${destination.id}) from Host (${
+            vm.$container
+          }).`
         )
         return xapiDest.migrateVm(
           vm._xapiId,

packages/xo-server-load-balancer/src/performance-plan.js

@@ -126,7 +126,9 @@ export default class PerformancePlan extends Plan {
       destinationAverages.memoryFree -= vmAverages.memory
 
       debug(
-        `Migrate VM (${vm.id}) to Host (${destination.id}) from Host (${exceededHost.id}).`
+        `Migrate VM (${vm.id}) to Host (${destination.id}) from Host (${
+          exceededHost.id
+        }).`
       )
       optimizationsCount++
 
@@ -141,7 +143,9 @@ export default class PerformancePlan extends Plan {
 
     await Promise.all(promises)
     debug(
-      `Performance mode: ${optimizationsCount} optimizations for Host (${exceededHost.id}).`
+      `Performance mode: ${optimizationsCount} optimizations for Host (${
+        exceededHost.id
+      }).`
     )
   }
 }