WiP: feat(xo-server-rework): new version from scratch

.gitignore

@@ -8,9 +8,10 @@
 /packages/*/dist/
 /packages/*/node_modules/
 
+/@xen-orchestra/log/src/transports/index.js
+
 /packages/vhd-cli/src/commands/index.js
 
-/packages/xen-api/examples/node_modules/
 /packages/xen-api/plot.dat
 
 /packages/xo-server/.xo-server.*
@@ -23,6 +24,8 @@
 /packages/xo-web/src/common/intl/locales/index.js
 /packages/xo-web/src/common/themes/index.js
 
+/packages/xo-server-rework/src/app/mixins/index.js
+
 npm-debug.log
 npm-debug.log.*
 pnpm-debug.log

@xen-orchestra/async-fs/.npmignore

@@ -0,0 +1,24 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
+/examples/
+example.js
+example.js.map
+*.example.js
+*.example.js.map
+
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
+/test/
+/tests/
+*.spec.js
+*.spec.js.map
+
+__snapshots__/

@xen-orchestra/async-fs/README.md

@@ -0,0 +1,49 @@
+# ${pkg.name} [![Build Status](https://travis-ci.org/${pkg.shortGitHubPath}.png?branch=master)](https://travis-ci.org/${pkg.shortGitHubPath})
+
+> ${pkg.description}
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/${pkg.name}):
+
+```
+> npm install --save ${pkg.name}
+```
+
+## Usage
+
+**TODO**
+
+## 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](${pkg.bugs})
+  you've encountered;
+- fork and create a pull request.
+
+## License
+
+${pkg.license} © [${pkg.author.name}](${pkg.author.url})

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

@@ -0,0 +1,47 @@
+{
+  "private": true,
+  "name": "@xen-orchestra/async-fs",
+  "version": "0.0.0",
+  "license": "ISC",
+  "description": "",
+  "keywords": [],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/@xen-orchestra/async-fs",
+  "bugs": "https://github.com/vatesfr/xo-web/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": ">=4"
+  },
+  "dependencies": {
+    "promise-toolbox": "^0.9.5"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.3",
+    "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 prebuild",
+    "prepublishOnly": "yarn run build"
+  }
+}

@xen-orchestra/async-fs/src/index.js

@@ -0,0 +1,10 @@
+// @flow
+
+import fs from 'fs'
+import { promisifyAll } from 'promise-toolbox'
+
+const NOT_PROMISIFIABLE_RE = /^(?:[_A-Z]|exists$)|(?:Async|Stream|Sync)$/
+
+module.exports = promisifyAll(fs, {
+  mapper: name => !NOT_PROMISIFIABLE_RE.test(name) && name,
+})

@xen-orchestra/async-map/.npmignore

@@ -0,0 +1,24 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
+/examples/
+example.js
+example.js.map
+*.example.js
+*.example.js.map
+
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
+/test/
+/tests/
+*.spec.js
+*.spec.js.map
+
+__snapshots__/

@xen-orchestra/async-map/README.md

@@ -0,0 +1,49 @@
+# ${pkg.name} [![Build Status](https://travis-ci.org/${pkg.shortGitHubPath}.png?branch=master)](https://travis-ci.org/${pkg.shortGitHubPath})
+
+> ${pkg.description}
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/${pkg.name}):
+
+```
+> npm install --save ${pkg.name}
+```
+
+## Usage
+
+**TODO**
+
+## 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](${pkg.bugs})
+  you've encountered;
+- fork and create a pull request.
+
+## License
+
+${pkg.license} © [${pkg.author.name}](${pkg.author.url})

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

@@ -0,0 +1,50 @@
+{
+  "private": true,
+  "name": "@xen-orchestra/async-map",
+  "version": "0.0.0",
+  "license": "ISC",
+  "description": "",
+  "keywords": [],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/@xen-orchestra/async-map",
+  "bugs": "https://github.com/vatesfr/xo-web/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/"
+  ],
+  "browserslist": [
+    ">2%"
+  ],
+  "engines": {
+    "node": ">=4"
+  },
+  "dependencies": {
+    "lodash": "^4.17.4"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.3",
+    "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 prebuild",
+    "prepublishOnly": "yarn run build"
+  }
+}

@xen-orchestra/async-map/src/index.js

@@ -0,0 +1,36 @@
+// @flow
+
+import { map } from 'lodash'
+
+// Similar to map() + Promise.all() but wait for all promises to
+// settle before rejecting (with the first error)
+const asyncMap = <T1, T2>(
+  collection: Array<T1> | Promise<Array<T1>>,
+  iteratee: (value: T1, key: number, collection: Array<T1>) => T2
+): Promise<Array<T2>> => {
+  if (!Array.isArray(collection)) {
+    return collection.then(collection => asyncMap(collection, iteratee))
+  }
+
+  let errorContainer
+  const onError = error => {
+    if (errorContainer === undefined) {
+      errorContainer = { error }
+    }
+  }
+
+  return Promise.all(
+    map(collection, (item, key, collection) =>
+      new Promise(resolve => {
+        resolve(iteratee(item, key, collection))
+      }).catch(onError)
+    )
+  ).then(values => {
+    if (errorContainer !== undefined) {
+      throw errorContainer.error
+    }
+    return values
+  })
+}
+
+export { asyncMap as default }

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const PLUGINS_RE = /^(?:@babel\/|babel-)plugin-.+$/
+const PLUGINS_RE = /^(?:@babel\/plugin-.+|babel-plugin-lodash)$/
 const PRESETS_RE = /^@babel\/preset-.+$/
 
 const NODE_ENV = process.env.NODE_ENV || 'development'
@@ -18,15 +18,15 @@ const configs = {
       shippedProposals: true,
       targets: __PROD__
         ? (() => {
-            let node = (pkg.engines || {}).node
-            if (node !== undefined) {
-              const trimChars = '^=>~'
-              while (trimChars.includes(node[0])) {
-                node = node.slice(1)
-              }
-              return { node: node }
+          let node = (pkg.engines || {}).node
+          if (node !== undefined) {
+            const trimChars = '^=>~'
+            while (trimChars.includes(node[0])) {
+              node = node.slice(1)
             }
-          })()
+            return { node: node }
+          }
+        })()
         : { browsers: '', node: 'current' },
       useBuiltIns: '@babel/polyfill' in (pkg.dependencies || {}) && 'usage',
     }
@@ -35,11 +35,7 @@ const configs = {
 
 const getConfig = (key, ...args) => {
   const config = configs[key]
-  return config === undefined
-    ? {}
-    : typeof config === 'function'
-      ? config(...args)
-      : config
+  return config === undefined ? {} : typeof config === 'function' ? config(...args) : config
 }
 
 module.exports = function (pkg, plugins, presets) {

@xen-orchestra/cron/package.json

@@ -41,10 +41,10 @@
     "moment-timezone": "^0.5.14"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.49",
-    "@babel/core": "7.0.0-beta.49",
-    "@babel/preset-env": "7.0.0-beta.49",
-    "@babel/preset-flow": "7.0.0-beta.49",
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
     "cross-env": "^5.1.3",
     "rimraf": "^2.6.2"
   },
@@ -53,7 +53,7 @@
     "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",
+    "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
   }
 }

@xen-orchestra/defined/.npmignore

@@ -0,0 +1,24 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
+/examples/
+example.js
+example.js.map
+*.example.js
+*.example.js.map
+
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
+/test/
+/tests/
+*.spec.js
+*.spec.js.map
+
+__snapshots__/

@xen-orchestra/defined/README.md

@@ -0,0 +1,49 @@
+# ${pkg.name} [![Build Status](https://travis-ci.org/${pkg.shortGitHubPath}.png?branch=master)](https://travis-ci.org/${pkg.shortGitHubPath})
+
+> ${pkg.description}
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/${pkg.name}):
+
+```
+> npm install --save ${pkg.name}
+```
+
+## Usage
+
+**TODO**
+
+## 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](${pkg.bugs})
+  you've encountered;
+- fork and create a pull request.
+
+## License
+
+${pkg.license} © [${pkg.author.name}](${pkg.author.url})

@xen-orchestra/defined/package.json

@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@xen-orchestra/defined",
+  "version": "0.0.0",
+  "license": "ISC",
+  "description": "",
+  "keywords": [],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/@xen-orchestra/defined",
+  "bugs": "https://github.com/vatesfr/xo-web/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vatesfr/xen-orchestra.git"
+  },
+  "author": {
+    "name": "Julien Fontanet",
+    "email": "julien.fontanet@vates.fr"
+  },
+  "preferGlobal": false,
+  "main": "dist/",
+  "bin": {},
+  "files": [
+    "dist/"
+  ],
+  "browserslist": [
+    ">2%"
+  ],
+  "engines": {
+    "node": ">=4"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.3",
+    "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 prebuild",
+    "prepublishOnly": "yarn run build"
+  }
+}

@xen-orchestra/defined/src/index.js

@@ -0,0 +1,65 @@
+// @flow
+
+// Usage:
+//
+// ```js
+// const httpProxy = defined(
+//   process.env.HTTP_PROXY,
+//   process.env.http_proxy
+// )
+//
+// const httpProxy = defined([
+//   process.env.HTTP_PROXY,
+//   process.env.http_proxy
+// ])
+// ```
+export default function defined () {
+  let args = arguments
+  let n = args.length
+  if (n === 1) {
+    args = arguments[0]
+    n = args.length
+  }
+
+  for (let i = 0; i < n; ++i) {
+    let arg = arguments[i]
+    if (typeof arg === 'function') {
+      arg = get(arg)
+    }
+    if (arg !== undefined) {
+      return arg
+    }
+  }
+}
+
+// Usage:
+//
+// ```js
+// const friendName = get(() => props.user.friends[0].name)
+//
+// // this form can be used to avoid recreating functions:
+// const getFriendName = _ => _.friends[0].name
+// const friendName = get(getFriendName, props.user)
+// ```
+export const get = (accessor: (input: ?any) => any, arg: ?any) => {
+  try {
+    return accessor(arg)
+  } catch (error) {
+    if (!(error instanceof TypeError)) { // avoid hidding other errors
+      throw error
+    }
+  }
+}
+
+// Usage:
+//
+// ```js
+// const httpAgent = ifDef(
+//   process.env.HTTP_PROXY,
+//   _ => new ProxyAgent(_)
+// )
+// ```
+export const ifDef = (value: ?any, thenFn: (value: any) => any) =>
+  value !== undefined
+    ? thenFn(value)
+    : value

@xen-orchestra/emit-async/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = require('../../@xen-orchestra/babel-config')(
+  require('./package.json')
+)

@xen-orchestra/emit-async/.npmignore

@@ -0,0 +1,24 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
+/examples/
+example.js
+example.js.map
+*.example.js
+*.example.js.map
+
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
+/test/
+/tests/
+*.spec.js
+*.spec.js.map
+
+__snapshots__/

@xen-orchestra/emit-async/README.md

@@ -0,0 +1,49 @@
+# ${pkg.name} [![Build Status](https://travis-ci.org/${pkg.shortGitHubPath}.png?branch=master)](https://travis-ci.org/${pkg.shortGitHubPath})
+
+> ${pkg.description}
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/${pkg.name}):
+
+```
+> npm install --save ${pkg.name}
+```
+
+## Usage
+
+**TODO**
+
+## 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](${pkg.bugs})
+  you've encountered;
+- fork and create a pull request.
+
+## License
+
+${pkg.license} © [${pkg.author.name}](${pkg.author.url})

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

@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@xen-orchestra/emit-async",
+  "version": "0.0.0",
+  "license": "ISC",
+  "description": "",
+  "keywords": [],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/@xen-orchestra/emit-async",
+  "bugs": "https://github.com/vatesfr/xo-web/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vatesfr/xen-orchestra.git"
+  },
+  "author": {
+    "name": "Julien Fontanet",
+    "email": "julien.fontanet@vates.fr"
+  },
+  "preferGlobal": false,
+  "main": "dist/",
+  "bin": {},
+  "files": [
+    "dist/"
+  ],
+  "browserslist": [
+    ">2%"
+  ],
+  "engines": {
+    "node": ">=4"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.3",
+    "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 prebuild",
+    "prepublishOnly": "yarn run build"
+  }
+}

@xen-orchestra/emit-async/src/index.js

@@ -0,0 +1,24 @@
+export default function emitAsync (event) {
+  let opts
+  let i = 1
+
+  // an option object has been passed as first param
+  if (typeof event !== 'string') {
+    opts = event
+    event = arguments[i++]
+  }
+
+  const n = arguments.length - i
+  const args = new Array(n)
+  for (let j = 0; j < n; ++j) {
+    args[j] = arguments[j + i]
+  }
+
+  const onError = opts != null && opts.onError
+
+  return Promise.all(this.listeners(event).map(
+    listener => new Promise(resolve => {
+      resolve(listener.apply(this, args))
+    }).catch(onError)
+  ))
+}

@xen-orchestra/fs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/fs",
-  "version": "0.1.0",
+  "version": "0.0.0",
   "license": "AGPL-3.0",
   "description": "The File System for Xen Orchestra backups.",
   "keywords": [],
@@ -20,10 +20,10 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.49",
+    "@babel/runtime": "^7.0.0-beta.44",
     "@marsaud/smb2-promise": "^0.2.1",
     "execa": "^0.10.0",
-    "fs-extra": "^6.0.1",
+    "fs-extra": "^5.0.0",
     "get-stream": "^3.0.0",
     "lodash": "^4.17.4",
     "promise-toolbox": "^0.9.5",
@@ -32,12 +32,12 @@
     "xo-remote-parser": "^0.3"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.49",
-    "@babel/core": "7.0.0-beta.49",
-    "@babel/plugin-proposal-function-bind": "7.0.0-beta.49",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
-    "@babel/preset-env": "7.0.0-beta.49",
-    "@babel/preset-flow": "7.0.0-beta.49",
+    "@babel/cli": "7.0.0-beta.44",
+    "@babel/core": "7.0.0-beta.44",
+    "@babel/plugin-proposal-function-bind": "7.0.0-beta.44",
+    "@babel/plugin-transform-runtime": "^7.0.0-beta.44",
+    "@babel/preset-env": "7.0.0-beta.44",
+    "@babel/preset-flow": "7.0.0-beta.44",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "index-modules": "^0.3.0",

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

@@ -92,22 +92,6 @@ export default class RemoteHandlerAbstract {
     await promise
   }
 
-  async read (
-    file: File,
-    buffer: Buffer,
-    position?: number
-  ): Promise<{| bytesRead: number, buffer: Buffer |}> {
-    return this._read(file, buffer, position)
-  }
-
-  _read (
-    file: File,
-    buffer: Buffer,
-    position?: number
-  ): Promise<{| bytesRead: number, buffer: Buffer |}> {
-    throw new Error('Not implemented')
-  }
-
   async readFile (file: string, options?: Object): Promise<Buffer> {
     return this._readFile(file, options)
   }
@@ -142,10 +126,7 @@ export default class RemoteHandlerAbstract {
       prependDir = false,
     }: { filter?: (name: string) => boolean, prependDir?: boolean } = {}
   ): Promise<string[]> {
-    let entries = await this._list(dir)
-    if (filter !== undefined) {
-      entries = entries.filter(filter)
-    }
+    const entries = await this._list(dir)
 
     if (prependDir) {
       entries.forEach((entry, i) => {
@@ -153,7 +134,7 @@ export default class RemoteHandlerAbstract {
       })
     }
 
-    return entries
+    return filter === undefined ? entries : entries.filter(filter)
   }
 
   async _list (dir: string): Promise<string[]> {

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

@@ -50,24 +50,6 @@ export default class LocalHandler extends RemoteHandlerAbstract {
     await fs.writeFile(path, data, options)
   }
 
-  async _read (file, buffer, position) {
-    const needsClose = typeof file === 'string'
-    file = needsClose ? await fs.open(this._getFilePath(file), 'r') : file.fd
-    try {
-      return await fs.read(
-        file,
-        buffer,
-        0,
-        buffer.length,
-        position === undefined ? null : position
-      )
-    } finally {
-      if (needsClose) {
-        await fs.close(file)
-      }
-    }
-  }
-
   async _readFile (file, options) {
     return fs.readFile(this._getFilePath(file), options)
   }

@xen-orchestra/log/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = require('../../@xen-orchestra/babel-config')(
+  require('./package.json')
+)

@xen-orchestra/log/.npmignore

@@ -0,0 +1,24 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
+/examples/
+example.js
+example.js.map
+*.example.js
+*.example.js.map
+
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
+/test/
+/tests/
+*.spec.js
+*.spec.js.map
+
+__snapshots__/

@xen-orchestra/log/README.md

@@ -0,0 +1,141 @@
+# @xen-orchestra/log [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
+
+> ${pkg.description}
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/@xen-orchestra/log):
+
+```
+> npm install --save @xen-orchestra/log
+```
+
+## Usage
+
+Everywhere something should be logged:
+
+```js
+import createLogger from '@xen-orchestra/log'
+
+const log = createLogger('xo-server-api')
+log.warn('foo')
+```
+
+Then at application level you can choose how to handle these logs:
+
+```js
+import { configure, transports } from '@xen-orchestra/log'
+
+configure([
+  {
+    // if filter is a string, then it is pattern
+    // (https://github.com/visionmedia/debug#wildcards) which is
+    // matched against the namespace of the logs
+    filter: process.env.DEBUG,
+
+    transport: transports.console()
+  },
+  {
+    // only levels >= warn
+    level: 'warn',
+
+    transport: transports.email({
+      service: 'gmail',
+      auth: {
+        user: 'jane.smith@gmail.com',
+        pass: 'H&NbECcpXF|pyXe#%ZEb'
+      },
+      from: 'jane.smith@gmail.com',
+      to: [
+        'jane.smith@gmail.com',
+        'sam.doe@yahoo.com'
+      ]
+    })
+  }
+])
+```
+
+### Transports
+
+#### Console
+
+```js
+configure(transports.console())
+```
+
+#### Email
+
+Optional dependency:
+
+```
+> yarn add nodemailer pretty-format
+```
+
+Configuration:
+
+```js
+configure(transports.email({
+  service: 'gmail',
+  auth: {
+    user: 'jane.smith@gmail.com',
+    pass: 'H&NbECcpXF|pyXe#%ZEb'
+  },
+  from: 'jane.smith@gmail.com',
+  to: [
+    'jane.smith@gmail.com',
+    'sam.doe@yahoo.com'
+  ]
+}))
+```
+
+#### Syslog
+
+Optional dependency:
+
+```
+> yarn add split-host syslog-client
+```
+
+Configuration:
+
+```js
+// By default, log to udp://localhost:514
+configure(transports.syslog())
+
+// But TCP, a different host, or a different port can be used
+configure(transports.syslog('tcp://syslog.company.lan'))
+```
+
+## 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)

@xen-orchestra/log/configure.js

@@ -0,0 +1 @@
+dist/configure.js

@xen-orchestra/log/package.json

@@ -0,0 +1,53 @@
+{
+  "private": true,
+  "name": "@xen-orchestra/log",
+  "version": "0.0.0",
+  "license": "ISC",
+  "description": "",
+  "keywords": [],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/@xen-orchestra/log",
+  "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@vates.fr"
+  },
+  "preferGlobal": false,
+  "main": "dist/",
+  "bin": {},
+  "files": [
+    "dist/"
+  ],
+  "browserslist": [
+    ">2%"
+  ],
+  "engines": {
+    "node": ">=4"
+  },
+  "dependencies": {
+    "@babel/polyfill": "7.0.0-beta.46",
+    "lodash": "^4.17.4",
+    "promise-toolbox": "^0.9.5"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.3",
+    "index-modules": "^0.3.0",
+    "rimraf": "^2.6.2"
+  },
+  "scripts": {
+    "build": "index-modules --cjs-lazy src/transports && cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
+    "clean": "rimraf dist/",
+    "dev": "index-modules --cjs-lazy src/transports && 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"
+  }
+}

@xen-orchestra/log/src/configure.js

@@ -0,0 +1,94 @@
+import createConsoleTransport from './transports/console'
+import LEVELS, { resolve } from './levels'
+import { compileGlobPattern } from './utils'
+
+// ===================================================================
+
+const createTransport = config => {
+  if (typeof config === 'function') {
+    return config
+  }
+
+  if (Array.isArray(config)) {
+    const transports = config.map(createTransport)
+    const { length } = transports
+    return function () {
+      for (let i = 0; i < length; ++i) {
+        transports[i].apply(this, arguments)
+      }
+    }
+  }
+
+  let { filter, transport } = config
+  const level = resolve(config.level)
+
+  if (filter !== undefined) {
+    if (typeof filter === 'string') {
+      const re = compileGlobPattern(filter)
+      filter = log => re.test(log.namespace)
+    }
+
+    const orig = transport
+    transport = function (log) {
+      if ((level !== undefined && log.level >= level) || filter(log)) {
+        return orig.apply(this, arguments)
+      }
+    }
+  } else if (level !== undefined) {
+    const orig = transport
+    transport = function (log) {
+      if (log.level >= level) {
+        return orig.apply(this, arguments)
+      }
+    }
+  }
+
+  return transport
+}
+
+let transport = createTransport({
+  // display warnings or above, and all that are enabled via DEBUG or
+  // NODE_DEBUG env
+  filter: process.env.DEBUG || process.env.NODE_DEBUG,
+  level: LEVELS.INFO,
+
+  transport: createConsoleTransport(),
+})
+
+export const configure = config => {
+  transport = createTransport(config)
+}
+
+// -------------------------------------------------------------------
+
+export const catchGlobalErrors = logger => {
+  // patch process
+  const onUncaughtException = error => {
+    logger.error('uncaught exception', { error })
+  }
+  const onUnhandledRejection = error => {
+    logger.warn('possibly unhandled rejection', { error })
+  }
+  process.on('uncaughtException', onUncaughtException)
+  process.on('unhandledRejection', onUnhandledRejection)
+
+  // patch EventEmitter
+  const EventEmitter = require('events')
+  const { prototype } = EventEmitter
+  const { emit } = prototype
+  function patchedEmit (event, error) {
+    event === 'error' && !this.listenerCount(event)
+      ? logger.error('unhandled error event', { error })
+      : emit.apply(this, arguments)
+  }
+  prototype.emit = patchedEmit
+
+  return () => {
+    process.removeListener('uncaughtException', onUncaughtException)
+    process.removeListener('unhandledRejection', onUnhandledRejection)
+
+    if (prototype.emit === patchedEmit) {
+      prototype.emit = emit
+    }
+  }
+}

@xen-orchestra/log/src/index.js

@@ -0,0 +1,62 @@
+import createTransport from './transports/console'
+import LEVELS from './levels'
+
+const symbol = typeof Symbol !== 'undefined' ? Symbol.for('@xen-orchestra/log') : '@@@xen-orchestra/log'
+if (!(symbol in global)) {
+  // the default behavior, without requiring `configure` is to avoid
+  // logging anything unless it's a real error
+  const transport = createTransport()
+  global[symbol] = log => log.level > LEVEL.WARN && transport(log)
+}
+
+// -------------------------------------------------------------------
+
+function Log (data, level, namespace, message, time) {
+  this.data = data
+  this.level = level
+  this.namespace = namespace
+  this.message = message
+  this.time = time
+}
+
+function Logger (namespace) {
+  this._namespace = namespace
+
+  // bind all logging methods
+  for (const name in LEVELS) {
+    const lowerCase = name.toLowerCase()
+    this[lowerCase] = this[lowerCase].bind(this)
+  }
+}
+
+const { prototype } = Logger
+
+for (const name in LEVELS) {
+  const level = LEVELS[name]
+
+  prototype[name.toLowerCase()] = function (message, data) {
+    global[symbol](new Log(data, level, this._namespace, message, new Date()))
+  }
+}
+
+prototype.wrap = function (message, fn) {
+  const logger = this
+  const warnAndRethrow = error => {
+    logger.warn(message, { error })
+    throw error
+  }
+  return function () {
+    try {
+      const result = fn.apply(this, arguments)
+      const then = result != null && result.then
+      return typeof then === 'function'
+        ? then.call(result, warnAndRethrow)
+        : result
+    } catch (error) {
+      warnAndRethrow(error)
+    }
+  }
+}
+
+const createLogger = namespace => new Logger(namespace)
+export { createLogger }

@xen-orchestra/log/src/levels.js

@@ -0,0 +1,24 @@
+const LEVELS = Object.create(null)
+export { LEVELS as default }
+
+// https://github.com/trentm/node-bunyan#levels
+LEVELS.FATAL = 60 // service/app is going to down
+LEVELS.ERROR = 50 // fatal for current action
+LEVELS.WARN = 40 // something went wrong but it's not fatal
+LEVELS.INFO = 30 // detail on unusual but normal operation
+LEVELS.DEBUG = 20
+
+export const NAMES = Object.create(null)
+for (const name in LEVELS) {
+  NAMES[LEVELS[name]] = name
+}
+
+export const resolve = level => {
+  if (typeof level === 'string') {
+    level = LEVELS[level.toUpperCase()]
+  }
+  return level
+}
+
+Object.freeze(LEVELS)
+Object.freeze(NAMES)

@xen-orchestra/log/src/levels.spec.js

@@ -0,0 +1,32 @@
+/* eslint-env jest */
+
+import { forEach, isInteger } from 'lodash'
+
+import LEVELS, { NAMES, resolve } from './levels'
+
+describe('LEVELS', () => {
+  it('maps level names to their integer values', () => {
+    forEach(LEVELS, (value, name) => {
+      expect(isInteger(value)).toBe(true)
+    })
+  })
+})
+
+describe('NAMES', () => {
+  it('maps level values to their names', () => {
+    forEach(LEVELS, (value, name) => {
+      expect(NAMES[value]).toBe(name)
+    })
+  })
+})
+
+describe('resolve()', () => {
+  it('returns level values either from values or names', () => {
+    forEach(LEVELS, value => {
+      expect(resolve(value)).toBe(value)
+    })
+    forEach(NAMES, (name, value) => {
+      expect(resolve(name)).toBe(+value)
+    })
+  })
+})

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

@@ -0,0 +1,20 @@
+import LEVELS, { NAMES } from '../levels'
+
+// Bind console methods (necessary for browsers)
+const debugConsole = console.log.bind(console)
+const infoConsole = console.info.bind(console)
+const warnConsole = console.warn.bind(console)
+const errorConsole = console.error.bind(console)
+
+const { ERROR, INFO, WARN } = LEVELS
+
+const consoleTransport = ({ data, level, namespace, message, time }) => {
+  const fn =
+    level < INFO
+      ? debugConsole
+      : level < WARN ? infoConsole : level < ERROR ? warnConsole : errorConsole
+
+  fn('%s - %s - [%s] %s', time.toISOString(), namespace, NAMES[level], message)
+  data != null && fn(data)
+}
+export default () => consoleTransport

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

@@ -0,0 +1,68 @@
+import prettyFormat from 'pretty-format' // eslint-disable-line node/no-extraneous-import
+import { createTransport } from 'nodemailer' // eslint-disable-line node/no-extraneous-import
+import { fromCallback } from 'promise-toolbox'
+
+import { evalTemplate, required } from '../utils'
+import { NAMES } from '../levels'
+
+export default ({
+  // transport options (https://nodemailer.com/smtp/)
+  auth,
+  authMethod,
+  host,
+  ignoreTLS,
+  port,
+  proxy,
+  requireTLS,
+  secure,
+  service,
+  tls,
+
+  // message options (https://nodemailer.com/message/)
+  bcc,
+  cc,
+  from = required('from'),
+  to = required('to'),
+  subject = '[{{level}} - {{namespace}}] {{time}} {{message}}',
+}) => {
+  const transporter = createTransport(
+    {
+      auth,
+      authMethod,
+      host,
+      ignoreTLS,
+      port,
+      proxy,
+      requireTLS,
+      secure,
+      service,
+      tls,
+
+      disableFileAccess: true,
+      disableUrlAccess: true,
+    },
+    {
+      bcc,
+      cc,
+      from,
+      to,
+    }
+  )
+
+  return log =>
+    fromCallback(cb =>
+      transporter.sendMail(
+        {
+          subject: evalTemplate(
+            subject,
+            key =>
+              key === 'level'
+                ? NAMES[log.level]
+                : key === 'time' ? log.time.toISOString() : log[key]
+          ),
+          text: prettyFormat(log.data),
+        },
+        cb
+      )
+    )
+}

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

@@ -0,0 +1,7 @@
+export default () => {
+  const memoryLogger = log => {
+    logs.push(log)
+  }
+  const logs = (memoryLogger.logs = [])
+  return memoryLogger
+}

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

@@ -0,0 +1,42 @@
+import splitHost from 'split-host' // eslint-disable-line node/no-extraneous-import node/no-missing-import
+import { createClient, Facility, Severity, Transport } from 'syslog-client' // eslint-disable-line node/no-extraneous-import node/no-missing-import
+import { fromCallback } from 'promise-toolbox'
+import { startsWith } from 'lodash'
+
+import LEVELS from '../levels'
+
+// https://github.com/paulgrove/node-syslog-client#syslogseverity
+const LEVEL_TO_SEVERITY = {
+  [LEVELS.FATAL]: Severity.Critical,
+  [LEVELS.ERROR]: Severity.Error,
+  [LEVELS.WARN]: Severity.Warning,
+  [LEVELS.INFO]: Severity.Informational,
+  [LEVELS.DEBUG]: Severity.Debug,
+}
+
+const facility = Facility.User
+
+export default target => {
+  const opts = {}
+  if (target !== undefined) {
+    if (startsWith(target, 'tcp://')) {
+      target = target.slice(6)
+      opts.transport = Transport.Tcp
+    } else if (startsWith(target, 'udp://')) {
+      target = target.slice(6)
+      opts.transport = Transport.Ucp
+    }
+
+    ({ host: target, port: opts.port } = splitHost(target))
+  }
+
+  const client = createClient(target, opts)
+
+  return log =>
+    fromCallback(cb =>
+      client.log(log.message, {
+        facility,
+        severity: LEVEL_TO_SEVERITY[log.level],
+      })
+    )
+}

@xen-orchestra/log/src/utils.js

@@ -0,0 +1,64 @@
+import escapeRegExp from 'lodash/escapeRegExp'
+
+// ===================================================================
+
+const TPL_RE = /\{\{(.+?)\}\}/g
+export const evalTemplate = (tpl, data) => {
+  const getData =
+    typeof data === 'function'
+      ? (_, key) => data(key)
+      : (_, key) => data[key]
+
+  return tpl.replace(TPL_RE, getData)
+}
+
+// -------------------------------------------------------------------
+
+const compileGlobPatternFragment = pattern =>
+  pattern
+    .split('*')
+    .map(escapeRegExp)
+    .join('.*')
+
+export const compileGlobPattern = pattern => {
+  const no = []
+  const yes = []
+  pattern.split(/[\s,]+/).forEach(pattern => {
+    if (pattern[0] === '-') {
+      no.push(pattern.slice(1))
+    } else {
+      yes.push(pattern)
+    }
+  })
+
+  const raw = ['^']
+
+  if (no.length !== 0) {
+    raw.push('(?!', no.map(compileGlobPatternFragment).join('|'), ')')
+  }
+
+  if (yes.length !== 0) {
+    raw.push('(?:', yes.map(compileGlobPatternFragment).join('|'), ')')
+  } else {
+    raw.push('.*')
+  }
+
+  raw.push('$')
+
+  return new RegExp(raw.join(''))
+}
+
+// -------------------------------------------------------------------
+
+export const required = name => {
+  throw new Error(`missing required arg ${name}`)
+}
+
+// -------------------------------------------------------------------
+
+export const serializeError = error => ({
+  ...error,
+  message: error.message,
+  name: error.name,
+  stack: error.stack,
+})

@xen-orchestra/log/src/utils.spec.js

@@ -0,0 +1,13 @@
+/* eslint-env jest */
+
+import { compileGlobPattern } from './utils'
+
+describe('compileGlobPattern()', () => {
+  it('works', () => {
+    const re = compileGlobPattern('foo, ba*, -bar')
+    expect(re.test('foo')).toBe(true)
+    expect(re.test('bar')).toBe(false)
+    expect(re.test('baz')).toBe(true)
+    expect(re.test('qux')).toBe(false)
+  })
+})

@xen-orchestra/log/transports

@@ -0,0 +1 @@
+dist/transports

@xen-orchestra/mixin/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = require('../../@xen-orchestra/babel-config')(
+  require('./package.json')
+)

@xen-orchestra/mixin/.npmignore

@@ -0,0 +1,24 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
+/examples/
+example.js
+example.js.map
+*.example.js
+*.example.js.map
+
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
+/test/
+/tests/
+*.spec.js
+*.spec.js.map
+
+__snapshots__/

@xen-orchestra/mixin/README.md

@@ -0,0 +1,49 @@
+# ${pkg.name} [![Build Status](https://travis-ci.org/${pkg.shortGitHubPath}.png?branch=master)](https://travis-ci.org/${pkg.shortGitHubPath})
+
+> ${pkg.description}
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/${pkg.name}):
+
+```
+> npm install --save ${pkg.name}
+```
+
+## Usage
+
+**TODO**
+
+## 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](${pkg.bugs})
+  you've encountered;
+- fork and create a pull request.
+
+## License
+
+${pkg.license} © [${pkg.author.name}](${pkg.author.url})

@xen-orchestra/mixin/package.json

@@ -0,0 +1,50 @@
+{
+  "private": true,
+  "name": "@xen-orchestra/mixin",
+  "version": "0.0.0",
+  "license": "ISC",
+  "description": "",
+  "keywords": [],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/@xen-orchestra/mixin",
+  "bugs": "https://github.com/vatesfr/xo-web/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vatesfr/xen-orchestra.git"
+  },
+  "author": {
+    "name": "Julien Fontanet",
+    "email": "julien.fontanet@vates.fr"
+  },
+  "preferGlobal": false,
+  "main": "dist/",
+  "bin": {},
+  "files": [
+    "dist/"
+  ],
+  "browserslist": [
+    ">2%"
+  ],
+  "engines": {
+    "node": ">=4"
+  },
+  "dependencies": {
+    "bind-property-descriptor": "^1.0.0"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.3",
+    "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 prebuild",
+    "prepublishOnly": "yarn run build"
+  }
+}

@xen-orchestra/mixin/src/index.js

@@ -0,0 +1,128 @@
+import { getBoundPropertyDescriptor } from 'bind-property-descriptor'
+
+// ===================================================================
+
+const { defineProperties, getOwnPropertyDescriptor } = Object
+
+const isIgnoredProperty = name => name[0] === '_' || name === 'constructor'
+
+const IGNORED_STATIC_PROPERTIES = {
+  __proto__: null,
+
+  arguments: true,
+  caller: true,
+  length: true,
+  name: true,
+  prototype: true,
+}
+const isIgnoredStaticProperty = name => name in IGNORED_STATIC_PROPERTIES
+
+const ownKeys =
+  (typeof Reflect !== 'undefined' && Reflect.ownKeys) ||
+  (({ getOwnPropertyNames: names, getOwnPropertySymbols: symbols }) =>
+    symbols !== undefined ? obj => names(obj).concat(symbols(obj)) : names)(Object)
+
+// -------------------------------------------------------------------
+
+const mixin = Mixins => Class => {
+  if (__DEV__ && !Array.isArray(Mixins)) {
+    throw new TypeError('Mixins should be an array')
+  }
+
+  const { name } = Class
+
+  // Copy properties of plain object mix-ins to the prototype.
+  {
+    const allMixins = Mixins
+    Mixins = []
+    const { prototype } = Class
+    const descriptors = { __proto__: null }
+    allMixins.forEach(Mixin => {
+      if (typeof Mixin === 'function') {
+        Mixins.push(Mixin)
+        return
+      }
+
+      for (const prop of ownKeys(Mixin)) {
+        if (__DEV__ && prop in prototype) {
+          throw new Error(`${name}#${prop} is already defined`)
+        }
+
+        ;(descriptors[prop] = getOwnPropertyDescriptor(
+          Mixin,
+          prop
+        )).enumerable = false // Object methods are enumerable but class methods are not.
+      }
+    })
+    defineProperties(prototype, descriptors)
+  }
+
+  const n = Mixins.length
+
+  function DecoratedClass (...args) {
+    const instance = new Class(...args)
+
+    for (let i = 0; i < n; ++i) {
+      const Mixin = Mixins[i]
+      const { prototype } = Mixin
+      const mixinInstance = new Mixin(instance, ...args)
+      const descriptors = { __proto__: null }
+      const props = ownKeys(prototype)
+      for (let j = 0, m = props.length; j < m; ++j) {
+        const prop = props[j]
+
+        if (isIgnoredProperty(prop)) {
+          continue
+        }
+
+        if (prop in instance) {
+          throw new Error(`${name}#${prop} is already defined`)
+        }
+
+        descriptors[prop] = getBoundPropertyDescriptor(
+          prototype,
+          prop,
+          mixinInstance
+        )
+      }
+      defineProperties(instance, descriptors)
+    }
+
+    return instance
+  }
+
+  // Copy original and mixed-in static properties on Decorator class.
+  const descriptors = { __proto__: null }
+  ownKeys(Class).forEach(prop => {
+    let descriptor
+    if (!(
+      // Special properties are not defined...
+      isIgnoredStaticProperty(prop) &&
+
+      // if they already exist...
+      (descriptor = getOwnPropertyDescriptor(DecoratedClass, prop)) !== undefined &&
+
+      // and are not configurable.
+      !descriptor.configurable
+    )) {
+      descriptors[prop] = getOwnPropertyDescriptor(Class, prop)
+    }
+  })
+  Mixins.forEach(Mixin => {
+    ownKeys(Mixin).forEach(prop => {
+      if (isIgnoredStaticProperty(prop)) {
+        return
+      }
+
+      if (__DEV__ && prop in descriptors) {
+        throw new Error(`${name}.${prop} is already defined`)
+      }
+
+      descriptors[prop] = getOwnPropertyDescriptor(Mixin, prop)
+    })
+  })
+  defineProperties(DecoratedClass, descriptors)
+
+  return DecoratedClass
+}
+export { mixin as default }

CHANGELOG.md

@@ -1,26 +1,6 @@
 # ChangeLog
 
-## *next*
-
-### Enhancements
-
-- Hide legacy backup creation view [#2956](https://github.com/vatesfr/xen-orchestra/issues/2956)
-- [Delta Backup NG logs] Display wether the export is a full or a delta [#2711](https://github.com/vatesfr/xen-orchestra/issues/2711)
-- Copy VDIs' UUID from SR/disks view [#3051](https://github.com/vatesfr/xen-orchestra/issues/3051)
-- [Backup NG] New option to shutdown VMs before snapshotting them [#3058](https://github.com/vatesfr/xen-orchestra/issues/3058#event-1673756438)
-- [Backup NG form] Improve feedback [#2711](https://github.com/vatesfr/xen-orchestra/issues/2711)
-- [Backup NG] Different retentions for backup and replication [#2895](https://github.com/vatesfr/xen-orchestra/issues/2895)
-- Possibility to use a fast clone when creating a VM from a snapshot [#2937](https://github.com/vatesfr/xen-orchestra/issues/2937)
-
-### Bugs
-
-- update the xentools search item to return the version number of installed xentools [#3015](https://github.com/vatesfr/xen-orchestra/issues/3015)
-- Fix Nagios backup reports [#2991](https://github.com/vatesfr/xen-orchestra/issues/2991)
-- Fix the retry of a single failed/interrupted VM backup [#2912](https://github.com/vatesfr/xen-orchestra/issues/2912#issuecomment-395480321)
-- New VM with Self: filter out networks that are not in the template's pool [#3011](https://github.com/vatesfr/xen-orchestra/issues/3011)
-- [Backup NG] Auto-detect when a full export is necessary.
-
-## **5.20.0** (2018-05-31)
+## **5.20.0** (planned 2018-05-31)
 
 ### Enhancements
 
@@ -29,6 +9,8 @@
 - [Patches] ignore XS upgrade in missing patches counter [#2866](https://github.com/vatesfr/xen-orchestra/issues/2866)
 - [Health] List VM snapshots related to non-existing backup jobs/schedules [#2828](https://github.com/vatesfr/xen-orchestra/issues/2828)
 
+### Bugs
+
 ## **5.19.0** (2018-05-01)
 
 ### Enhancements

PULL_REQUEST_TEMPLATE.md

@@ -1,19 +0,0 @@
-### Check list
-
-> Check items when done or if not relevant
-
-- [ ] PR reference the relevant issue (e.g. `Fixes #007`)
-- [ ] if UI changes, a screenshot has been added to the PR
-- [ ] CHANGELOG updated
-- [ ] documentation updated
-
-### Process
-
-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
-1. if necessary, update your PR, and readd a reviewer
-
-### List of packages to release
-
-> No need to mention xo-server and xo-web.

babel.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  // Necessary for jest to be able to find the `.babelrc.js` closest to the file
-  // instead of only the one in this directory.
-  babelrcRoots: true,
-}

flow-typed/limit-concurrency-decorator.js

@@ -1,6 +0,0 @@
-declare module 'limit-concurrency-decorator' {
-  declare function limitConcurrencyDecorator(
-    concurrency: number
-  ): <T: Function>(T) => T
-  declare export default typeof limitConcurrencyDecorator
-}

flow-typed/lodash.js

@@ -1,8 +1,4 @@
 declare module 'lodash' {
-  declare export function countBy<K, V>(
-    object: { [K]: V },
-    iteratee: K | ((V, K) => string)
-  ): { [string]: number }
   declare export function forEach<K, V>(
     object: { [K]: V },
     iteratee: (V, K) => void
@@ -24,10 +20,5 @@ declare module 'lodash' {
     iteratee: (V1, K) => V2
   ): { [K]: V2 }
   declare export function noop(...args: mixed[]): void
-  declare export function some<T>(
-    collection: T[],
-    iteratee: (T, number) => boolean
-  ): boolean
-  declare export function sum(values: number[]): number
   declare export function values<K, V>(object: { [K]: V }): V[]
 }

package.json

@@ -1,10 +1,8 @@
 {
   "devDependencies": {
-    "@babel/core": "^7.0.0-beta.49",
-    "@babel/register": "^7.0.0-beta.49",
-    "babel-core": "^7.0.0-0",
+    "@babel/register": "^7.0.0-beta.46",
+    "babel-7-jest": "^21.3.2",
     "babel-eslint": "^8.1.2",
-    "babel-jest": "^23.0.1",
     "benchmark": "^2.1.4",
     "eslint": "^4.14.0",
     "eslint-config-standard": "^11.0.0-beta.0",
@@ -15,22 +13,23 @@
     "eslint-plugin-react": "^7.6.1",
     "eslint-plugin-standard": "^3.0.1",
     "exec-promise": "^0.7.0",
-    "flow-bin": "^0.73.0",
+    "flow-bin": "^0.69.0",
     "globby": "^8.0.0",
     "husky": "^0.14.3",
-    "jest": "^23.0.1",
+    "jest": "^22.0.4",
     "lodash": "^4.17.4",
     "prettier": "^1.10.2",
     "promise-toolbox": "^0.9.5",
     "sorted-object": "^2.0.1"
   },
   "engines": {
-    "yarn": "^1.7.0"
+    "yarn": "^1.2.1"
   },
   "jest": {
     "collectCoverage": true,
     "projects": [
-      "<rootDir>"
+      "<rootDir>",
+      "<rootDir>/packages/xo-web"
     ],
     "testEnvironment": "node",
     "testPathIgnorePatterns": [
@@ -39,6 +38,15 @@
     ],
     "testRegex": "\\.spec\\.js$",
     "transform": {
+      "/@xen-orchestra/cron/.+\\.jsx?$": "babel-7-jest",
+      "/@xen-orchestra/fs/.+\\.jsx?$": "babel-7-jest",
+      "/@xen-orchestra/log/.+\\.jsx?$": "babel-7-jest",
+      "/packages/complex-matcher/.+\\.jsx?$": "babel-7-jest",
+      "/packages/value-matcher/.+\\.jsx?$": "babel-7-jest",
+      "/packages/vhd-lib/.+\\.jsx?$": "babel-7-jest",
+      "/packages/xo-cli/.+\\.jsx?$": "babel-7-jest",
+      "/packages/xo-server/.+\\.jsx?$": "babel-7-jest",
+      "/packages/xo-vmdk-to-vhd/.+\\.jsx?$": "babel-7-jest",
       "\\.jsx?$": "babel-jest"
     }
   },

packages/complex-matcher/package.json

@@ -30,9 +30,9 @@
     "lodash": "^4.17.4"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.49",
-    "@babel/core": "7.0.0-beta.49",
-    "@babel/preset-env": "7.0.0-beta.49",
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.1",
     "rimraf": "^2.6.2"

packages/value-matcher/package.json

@@ -28,10 +28,10 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.49",
-    "@babel/core": "7.0.0-beta.49",
-    "@babel/preset-env": "7.0.0-beta.49",
-    "@babel/preset-flow": "7.0.0-beta.49",
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
     "cross-env": "^5.1.3",
     "rimraf": "^2.6.2"
   },

packages/vhd-cli/package.json

@@ -23,20 +23,21 @@
     "dist/"
   ],
   "engines": {
-    "node": ">=6"
+    "node": ">=4"
   },
   "dependencies": {
-    "@xen-orchestra/fs": "^0.1.0",
+    "@xen-orchestra/fs": "^0.0.0",
+    "babel-runtime": "^6.22.0",
     "exec-promise": "^0.7.0",
     "struct-fu": "^1.2.0",
-    "vhd-lib": "^0.1.2"
+    "vhd-lib": "^0.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0-beta.49",
-    "@babel/core": "^7.0.0-beta.49",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
-    "@babel/preset-env": "^7.0.0-beta.49",
+    "babel-cli": "^6.24.1",
     "babel-plugin-lodash": "^3.3.2",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.5.2",
+    "babel-preset-stage-3": "^6.24.1",
     "cross-env": "^5.1.3",
     "execa": "^0.10.0",
     "index-modules": "^0.3.0",
@@ -50,5 +51,22 @@
     "prebuild": "rimraf dist/ && index-modules --cjs-lazy src/commands",
     "predev": "yarn run prebuild",
     "prepare": "yarn run build"
+  },
+  "babel": {
+    "plugins": [
+      "lodash",
+      "transform-runtime"
+    ],
+    "presets": [
+      [
+        "env",
+        {
+          "targets": {
+            "node": 4
+          }
+        }
+      ],
+      "stage-3"
+    ]
   }
 }

packages/vhd-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vhd-lib",
-  "version": "0.1.2",
+  "version": "0.0.0",
   "license": "AGPL-3.0",
   "description": "Primitives for VHD file handling",
   "keywords": [],
@@ -20,30 +20,30 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.49",
+    "@babel/runtime": "^7.0.0-beta.44",
+    "@xen-orchestra/fs": "^0.0.0",
     "async-iterator-to-stream": "^1.0.2",
+    "execa": "^0.10.0",
     "from2": "^2.3.0",
-    "fs-extra": "^6.0.1",
+    "fs-extra": "^5.0.0",
+    "get-stream": "^3.0.0",
     "limit-concurrency-decorator": "^0.4.0",
     "promise-toolbox": "^0.9.5",
     "struct-fu": "^1.2.0",
-    "uuid": "^3.0.1"
+    "uuid": "^3.0.1",
+    "tmp": "^0.0.33"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.49",
-    "@babel/core": "7.0.0-beta.49",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
-    "@babel/preset-env": "7.0.0-beta.49",
-    "@babel/preset-flow": "7.0.0-beta.49",
-    "@xen-orchestra/fs": "^0.1.0",
+    "@babel/cli": "7.0.0-beta.44",
+    "@babel/core": "7.0.0-beta.44",
+    "@babel/plugin-transform-runtime": "^7.0.0-beta.44",
+    "@babel/preset-env": "7.0.0-beta.44",
+    "@babel/preset-flow": "7.0.0-beta.44",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "execa": "^0.10.0",
     "fs-promise": "^2.0.0",
-    "get-stream": "^3.0.0",
     "index-modules": "^0.3.0",
-    "rimraf": "^2.6.2",
-    "tmp": "^0.0.33"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/vhd-lib/src/createReadableSparseStream.js

@@ -1,4 +1,3 @@
-import assert from 'assert'
 import asyncIteratorToStream from 'async-iterator-to-stream'
 
 import computeGeometryForSize from './_computeGeometryForSize'
@@ -26,16 +25,62 @@ function createBAT (
   bat,
   bitmapSize
 ) {
+  const vhdOccupationTable = []
   let currentVhdPositionSector = firstBlockPosition / SECTOR_SIZE
   blockAddressList.forEach(blockPosition => {
-    assert.strictEqual(blockPosition % SECTOR_SIZE, 0)
-    const vhdTableIndex = Math.floor(blockPosition / VHD_BLOCK_SIZE_BYTES)
+    const scaled = blockPosition / VHD_BLOCK_SIZE_BYTES
+    const vhdTableIndex = Math.floor(scaled)
     if (bat.readUInt32BE(vhdTableIndex * 4) === BLOCK_UNUSED) {
       bat.writeUInt32BE(currentVhdPositionSector, vhdTableIndex * 4)
       currentVhdPositionSector +=
         (bitmapSize + VHD_BLOCK_SIZE_BYTES) / SECTOR_SIZE
     }
+    // not using bit operators to avoid the int32 coercion, that way we can go to 53 bits
+    vhdOccupationTable[vhdTableIndex] =
+      (vhdOccupationTable[vhdTableIndex] || 0) +
+      Math.pow(2, (scaled % 1) * ratio)
   })
+  return vhdOccupationTable
+}
+
+function createBitmap (bitmapSize, ratio, vhdOccupationBucket) {
+  const bitmap = Buffer.alloc(bitmapSize)
+  for (let i = 0; i < VHD_BLOCK_SIZE_SECTORS / ratio; i++) {
+    // do not shift to avoid int32 coercion
+    if ((vhdOccupationBucket * Math.pow(2, -i)) & 1) {
+      for (let j = 0; j < ratio; j++) {
+        setBitmap(bitmap, i * ratio + j)
+      }
+    }
+  }
+  return bitmap
+}
+
+function * yieldIfNotEmpty (buffer) {
+  if (buffer.length > 0) {
+    yield buffer
+  }
+}
+
+async function * generateFileContent (
+  blockIterator,
+  bitmapSize,
+  ratio,
+  vhdOccupationTable
+) {
+  let currentVhdBlockIndex = -1
+  let currentBlockBuffer = Buffer.alloc(0)
+  for await (const next of blockIterator) {
+    const batEntry = Math.floor(next.offsetBytes / VHD_BLOCK_SIZE_BYTES)
+    if (batEntry !== currentVhdBlockIndex) {
+      yield * yieldIfNotEmpty(currentBlockBuffer)
+      currentBlockBuffer = Buffer.alloc(VHD_BLOCK_SIZE_BYTES)
+      currentVhdBlockIndex = batEntry
+      yield createBitmap(bitmapSize, ratio, vhdOccupationTable[batEntry])
+    }
+    next.data.copy(currentBlockBuffer, next.offsetBytes % VHD_BLOCK_SIZE_BYTES)
+  }
+  yield * yieldIfNotEmpty(currentBlockBuffer)
 }
 
 export default asyncIteratorToStream(async function * (
@@ -57,8 +102,7 @@ export default asyncIteratorToStream(async function * (
   }
 
   const maxTableEntries = Math.ceil(diskSize / VHD_BLOCK_SIZE_BYTES) + 1
-  const tablePhysicalSizeBytes =
-    Math.ceil(maxTableEntries * 4 / SECTOR_SIZE) * SECTOR_SIZE
+  const tablePhysicalSizeBytes = Math.ceil(maxTableEntries * 4 / 512) * 512
 
   const batPosition = FOOTER_SIZE + HEADER_SIZE
   const firstBlockPosition = batPosition + tablePhysicalSizeBytes
@@ -79,50 +123,21 @@ export default asyncIteratorToStream(async function * (
   const bitmapSize =
     Math.ceil(VHD_BLOCK_SIZE_SECTORS / 8 / SECTOR_SIZE) * SECTOR_SIZE
   const bat = Buffer.alloc(tablePhysicalSizeBytes, 0xff)
-  createBAT(firstBlockPosition, blockAddressList, ratio, bat, bitmapSize)
-  let position = 0
-  function * yieldAndTrack (buffer, expectedPosition) {
-    if (expectedPosition !== undefined) {
-      assert.strictEqual(position, expectedPosition)
-    }
-    if (buffer.length > 0) {
-      yield buffer
-      position += buffer.length
-    }
-  }
-  async function * generateFileContent (blockIterator, bitmapSize, ratio) {
-    let currentBlock = -1
-    let currentVhdBlockIndex = -1
-    let currentBlockWithBitmap = Buffer.alloc(0)
-    for await (const next of blockIterator) {
-      currentBlock++
-      assert.strictEqual(blockAddressList[currentBlock], next.offsetBytes)
-      const batIndex = Math.floor(next.offsetBytes / VHD_BLOCK_SIZE_BYTES)
-      if (batIndex !== currentVhdBlockIndex) {
-        if (currentVhdBlockIndex >= 0) {
-          yield * yieldAndTrack(
-            currentBlockWithBitmap,
-            bat.readUInt32BE(currentVhdBlockIndex * 4) * SECTOR_SIZE
-          )
-        }
-        currentBlockWithBitmap = Buffer.alloc(bitmapSize + VHD_BLOCK_SIZE_BYTES)
-        currentVhdBlockIndex = batIndex
-      }
-      const blockOffset =
-        (next.offsetBytes / SECTOR_SIZE) % VHD_BLOCK_SIZE_SECTORS
-      for (let bitPos = 0; bitPos < VHD_BLOCK_SIZE_SECTORS / ratio; bitPos++) {
-        setBitmap(currentBlockWithBitmap, blockOffset + bitPos)
-      }
-      next.data.copy(
-        currentBlockWithBitmap,
-        bitmapSize + next.offsetBytes % VHD_BLOCK_SIZE_BYTES
-      )
-    }
-    yield * yieldAndTrack(currentBlockWithBitmap)
-  }
-  yield * yieldAndTrack(footer, 0)
-  yield * yieldAndTrack(header, FOOTER_SIZE)
-  yield * yieldAndTrack(bat, FOOTER_SIZE + HEADER_SIZE)
-  yield * generateFileContent(blockIterator, bitmapSize, ratio)
-  yield * yieldAndTrack(footer)
+  const vhdOccupationTable = createBAT(
+    firstBlockPosition,
+    blockAddressList,
+    ratio,
+    bat,
+    bitmapSize
+  )
+  yield footer
+  yield header
+  yield bat
+  yield * generateFileContent(
+    blockIterator,
+    bitmapSize,
+    ratio,
+    vhdOccupationTable
+  )
+  yield footer
 })

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

@@ -102,15 +102,15 @@ test('ReadableSparseVHDStream can handle a sparse file', async () => {
       data: Buffer.alloc(blockSize, 'azerzaerazeraze', 'ascii'),
     },
     {
-      offsetBytes: blockSize * 100,
+      offsetBytes: blockSize * 5,
       data: Buffer.alloc(blockSize, 'gdfslkdfguer', 'ascii'),
     },
   ]
-  const fileSize = blockSize * 110
+  const fileSize = blockSize * 10
   const stream = createReadableSparseVHDStream(
     fileSize,
     blockSize,
-    blocks.map(b => b.offsetBytes),
+    [100, 700],
     blocks
   )
   const pipe = stream.pipe(createWriteStream('output.vhd'))

packages/vhd-lib/src/vhd.js

@@ -1,4 +1,5 @@
 import assert from 'assert'
+import getStream from 'get-stream'
 import { fromEvent } from 'promise-toolbox'
 
 import constantStream from './_constant-stream'
@@ -92,14 +93,20 @@ export default class Vhd {
   // Read functions.
   // =================================================================
 
-  async _read (start, n) {
-    const { bytesRead, buffer } = await this._handler.read(
-      this._path,
-      Buffer.alloc(n),
-      start
-    )
-    assert.equal(bytesRead, n)
-    return buffer
+  _readStream (start, n) {
+    return this._handler.createReadStream(this._path, {
+      start,
+      end: start + n - 1, // end is inclusive
+    })
+  }
+
+  _read (start, n) {
+    return this._readStream(start, n)
+      .then(getStream.buffer)
+      .then(buf => {
+        assert.equal(buf.length, n)
+        return buf
+      })
   }
 
   containsBlock (id) {
@@ -329,11 +336,11 @@ export default class Vhd {
           `freeFirstBlockSpace: move first block ${firstSector} -> ${newFirstSector}`
         )
         // copy the first block at the end
-        const block = await this._read(
+        const stream = await this._readStream(
           sectorsToBytes(firstSector),
           fullBlockSize
         )
-        await this._write(block, sectorsToBytes(newFirstSector))
+        await this._write(stream, sectorsToBytes(newFirstSector))
         await this._setBatEntry(first, newFirstSector)
         await this.writeFooter(true)
         spaceNeededBytes -= this.fullBlockSize
@@ -469,12 +476,12 @@ export default class Vhd {
 
     // For each sector of block data...
     const { sectorsPerBlock } = child
-    let parentBitmap = null
     for (let i = 0; i < sectorsPerBlock; i++) {
       // If no changes on one sector, skip.
       if (!mapTestBit(bitmap, i)) {
         continue
       }
+      let parentBitmap = null
       let endSector = i + 1
 
       // Count changed sectors.

packages/xen-api/examples/export-vdi

@@ -4,7 +4,7 @@ process.env.DEBUG = '*'
 
 const defer = require('golike-defer').default
 const pump = require('pump')
-const { CancelToken, fromCallback } = require('promise-toolbox')
+const { fromCallback } = require('promise-toolbox')
 
 const { createClient } = require('../')
 
@@ -30,11 +30,8 @@ defer(async ($defer, args) => {
   await xapi.connect()
   $defer(() => xapi.disconnect())
 
-  const { cancel, token } = CancelToken.source()
-  process.on('SIGINT', cancel)
-
   // https://xapi-project.github.io/xen-api/snapshots.html#downloading-a-disk-or-snapshot
-  const exportStream = await xapi.getResource(token, '/export_raw_vdi/', {
+  const exportStream = await xapi.getResource('/export_raw_vdi/', {
     query: {
       format: raw ? 'raw' : 'vhd',
       vdi: await resolveRef(xapi, 'VDI', args[1])

packages/xen-api/examples/export-vm

@@ -4,7 +4,7 @@ process.env.DEBUG = '*'
 
 const defer = require('golike-defer').default
 const pump = require('pump')
-const { CancelToken, fromCallback } = require('promise-toolbox')
+const { fromCallback } = require('promise-toolbox')
 
 const { createClient } = require('../')
 
@@ -24,11 +24,8 @@ defer(async ($defer, args) => {
   await xapi.connect()
   $defer(() => xapi.disconnect())
 
-  const { cancel, token } = CancelToken.source()
-  process.on('SIGINT', cancel)
-
   // https://xapi-project.github.io/xen-api/importexport.html
-  const exportStream = await xapi.getResource(token, '/export/', {
+  const exportStream = await xapi.getResource('/export/', {
     query: {
       ref: await resolveRef(xapi, 'VM', args[1]),
       use_compression: 'true'

packages/xen-api/examples/import-vdi

@@ -3,7 +3,6 @@
 process.env.DEBUG = '*'
 
 const defer = require('golike-defer').default
-const { CancelToken } = require('promise-toolbox')
 
 const { createClient } = require('../')
 
@@ -29,11 +28,8 @@ defer(async ($defer, args) => {
   await xapi.connect()
   $defer(() => xapi.disconnect())
 
-  const { cancel, token } = CancelToken.source()
-  process.on('SIGINT', cancel)
-
   // https://xapi-project.github.io/xen-api/snapshots.html#uploading-a-disk-or-snapshot
-  await xapi.putResource(token, createInputStream(args[2]), '/import_raw_vdi/', {
+  await xapi.putResource(createInputStream(args[2]), '/import_raw_vdi/', {
     query: {
       format: raw ? 'raw' : 'vhd',
       vdi: await resolveRef(xapi, 'VDI', args[1])

packages/xen-api/examples/import-vm

@@ -3,7 +3,6 @@
 process.env.DEBUG = '*'
 
 const defer = require('golike-defer').default
-const { CancelToken } = require('promise-toolbox')
 
 const { createClient } = require('../')
 
@@ -23,11 +22,8 @@ defer(async ($defer, args) => {
   await xapi.connect()
   $defer(() => xapi.disconnect())
 
-  const { cancel, token } = CancelToken.source()
-  process.on('SIGINT', cancel)
-
   // https://xapi-project.github.io/xen-api/importexport.html
-  await xapi.putResource(token, createInputStream(args[1]), '/import/', {
+  await xapi.putResource(createInputStream(args[1]), '/import/', {
     query: args[2] && { sr_id: await resolveRef(xapi, 'SR', args[2]) }
   })
 })(process.argv.slice(2)).catch(

packages/xen-api/examples/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "golike-defer": "^0.4.1",
-    "pump": "^3.0.0"
+    "golike-defer": "^0.1.0",
+    "pump": "^1.0.2"
   }
 }

packages/xen-api/examples/yarn.lock

@@ -1,30 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  dependencies:
-    once "^1.4.0"
-
-golike-defer@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/golike-defer/-/golike-defer-0.4.1.tgz#7a1cd435d61e461305805d980b133a0f3db4e1cc"
-
-once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

packages/xen-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xen-api",
-  "version": "0.16.10",
+  "version": "0.16.9",
   "license": "ISC",
   "description": "Connector to the Xen API",
   "keywords": [

packages/xen-api/src/index.js

@@ -595,10 +595,7 @@ export class Xapi extends EventEmitter {
                 if (error != null && (response = error.response) != null) {
                   response.req.abort()
 
-                  const {
-                    headers: { location },
-                    statusCode,
-                  } = response
+                  const { headers: { location }, statusCode } = response
                   if (statusCode === 302 && location !== undefined) {
                     return doRequest(location)
                   }
@@ -780,13 +777,15 @@ export class Xapi extends EventEmitter {
       this._pool = object
 
       const eventWatchers = this._eventWatchers
-      Object.keys(object.other_config).forEach(key => {
-        const eventWatcher = eventWatchers[key]
-        if (eventWatcher !== undefined) {
-          delete eventWatchers[key]
-          eventWatcher(object)
-        }
-      })
+      if (eventWatchers !== undefined) {
+        forEach(object.other_config, (_, key) => {
+          const eventWatcher = eventWatchers[key]
+          if (eventWatcher !== undefined) {
+            delete eventWatchers[key]
+            eventWatcher(object)
+          }
+        })
+      }
     } else if (type === 'task') {
       if (prev === undefined) {
         ++this._nTasks

packages/xo-acl-resolver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-acl-resolver",
-  "version": "0.2.4",
+  "version": "0.2.3",
   "license": "ISC",
   "description": "Xen-Orchestra internal: do ACLs resolution",
   "keywords": [],

packages/xo-acl-resolver/src/index.js

@@ -50,9 +50,7 @@ const checkAuthorizationByTypes = {
 
   network: or(checkSelf, checkMember('$pool')),
 
-  PIF: checkMember('$host'),
-
-  SR: or(checkSelf, checkMember('$container')),
+  SR: or(checkSelf, checkMember('$pool')),
 
   task: checkMember('$host'),
 

packages/xo-cli/package.json

@@ -28,7 +28,7 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@babel/polyfill": "7.0.0-beta.49",
+    "@babel/polyfill": "7.0.0-beta.46",
     "bluebird": "^3.5.1",
     "chalk": "^2.2.0",
     "event-to-promise": "^0.8.0",
@@ -49,10 +49,10 @@
     "xo-lib": "^0.9.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.49",
-    "@babel/core": "7.0.0-beta.49",
-    "@babel/preset-env": "7.0.0-beta.49",
-    "@babel/preset-flow": "7.0.0-beta.49",
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "rimraf": "^2.6.2"

packages/xo-collection/package.json

@@ -25,16 +25,17 @@
     "node": ">=4"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.49",
+    "babel-runtime": "^6.18.0",
     "kindof": "^2.0.0",
     "lodash": "^4.17.2",
     "make-error": "^1.0.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0-beta.49",
-    "@babel/core": "^7.0.0-beta.49",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
-    "@babel/preset-env": "^7.0.0-beta.49",
+    "babel-cli": "^6.24.1",
+    "babel-plugin-lodash": "^3.3.2",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.5.2",
+    "babel-preset-stage-3": "^6.24.1",
     "cross-env": "^5.1.3",
     "event-to-promise": "^0.8.0",
     "rimraf": "^2.6.1"
@@ -45,5 +46,22 @@
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
+  },
+  "babel": {
+    "plugins": [
+      "lodash",
+      "transform-runtime"
+    ],
+    "presets": [
+      [
+        "env",
+        {
+          "targets": {
+            "node": 4
+          }
+        }
+      ],
+      "stage-3"
+    ]
   }
 }

packages/xo-remote-parser/package.json

@@ -27,10 +27,10 @@
     "lodash": "^4.13.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0-beta.49",
-    "@babel/core": "^7.0.0-beta.49",
-    "@babel/preset-env": "^7.0.0-beta.49",
+    "babel-cli": "^6.24.1",
     "babel-plugin-lodash": "^3.3.2",
+    "babel-preset-env": "^1.5.2",
+    "babel-preset-stage-3": "^6.24.1",
     "cross-env": "^5.1.3",
     "deep-freeze": "^0.0.1",
     "rimraf": "^2.6.1"
@@ -41,5 +41,22 @@
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
     "prepare": "yarn run build"
+  },
+  "babel": {
+    "plugins": [
+      "lodash"
+    ],
+    "presets": [
+      [
+        "env",
+        {
+          "targets": {
+            "browsers": "> 5%",
+            "node": 4
+          }
+        }
+      ],
+      "stage-3"
+    ]
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-backup-reports",
-  "version": "0.12.2",
+  "version": "0.11.0",
   "license": "AGPL-3.0",
   "description": "Backup reports plugin for XO-Server",
   "keywords": [

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

@@ -1,6 +1,7 @@
 import humanFormat from 'human-format'
 import moment from 'moment-timezone'
-import { forEach, get, startCase } from 'lodash'
+import { find, forEach, get, startCase } from 'lodash'
+
 import pkg from '../package'
 
 export const configurationSchema = {
@@ -36,12 +37,6 @@ const ICON_FAILURE = '🚨'
 const ICON_SKIPPED = '⏩'
 const ICON_SUCCESS = '✔'
 
-const STATUS_ICON = {
-  skipped: ICON_SKIPPED,
-  success: ICON_SUCCESS,
-  failure: ICON_FAILURE,
-}
-
 const DATE_FORMAT = 'dddd, MMMM Do YYYY, h:mm:ss a'
 const createDateFormater = timezone =>
   timezone !== undefined
@@ -62,12 +57,10 @@ const formatSize = bytes =>
   })
 
 const formatSpeed = (bytes, milliseconds) =>
-  milliseconds > 0
-    ? humanFormat((bytes * 1e3) / milliseconds, {
-        scale: 'binary',
-        unit: 'B/s',
-      })
-    : 'N/A'
+  humanFormat(bytes * 1e3 / milliseconds, {
+    scale: 'binary',
+    unit: 'B/s',
+  })
 
 const logError = e => {
   console.error('backup report error:', e)
@@ -102,42 +95,43 @@ class BackupReportsXoPlugin {
     this._xo.removeListener('job:terminated', this._report)
   }
 
-  _wrapper (status, job, schedule, runJobId) {
+  _wrapper (status, job, schedule) {
     return new Promise(resolve =>
       resolve(
         job.type === 'backup'
-          ? this._backupNgListener(status, job, schedule, runJobId)
-          : this._listener(status, job, schedule, runJobId)
+          ? this._backupNgListener(status, job, schedule)
+          : this._listener(status, job, schedule)
       )
     ).catch(logError)
   }
 
-  async _backupNgListener (_1, _2, { timezone }, runJobId) {
+  async _backupNgListener (runJobId, _, { timezone }) {
     const xo = this._xo
-    const log = await xo.getBackupNgLogs(runJobId)
+    const logs = await xo.getBackupNgLogs(runJobId)
+    const jobLog = logs['roots'][0]
+    const vmsTaskLog = logs[jobLog.id]
 
-    const { reportWhen, mode } = log.data || {}
-    if (
-      reportWhen === 'never' ||
-      (log.status === 'success' && reportWhen === 'failure')
-    ) {
+    const { reportWhen, mode } = jobLog.data || {}
+    if (reportWhen === 'never') {
       return
     }
 
-    const jobName = (await xo.getJob(log.jobId, 'backup')).name
     const formatDate = createDateFormater(timezone)
-    if (
-      (log.status === 'failure' || log.status === 'skipped') &&
-      log.result !== undefined
-    ) {
+    const jobName = (await xo.getJob(jobLog.jobId, 'backup')).name
+
+    if (jobLog.error !== undefined) {
+      const [globalStatus, icon] =
+        jobLog.error.message === NO_VMS_MATCH_THIS_PATTERN
+          ? ['Skipped', ICON_SKIPPED]
+          : ['Failure', ICON_FAILURE]
       let markdown = [
-        `##  Global status: ${log.status}`,
+        `##  Global status: ${globalStatus}`,
         '',
         `- **mode**: ${mode}`,
-        `- **Start time**: ${formatDate(log.start)}`,
-        `- **End time**: ${formatDate(log.end)}`,
-        `- **Duration**: ${formatDuration(log.end - log.start)}`,
-        `- **Error**: ${log.result.message}`,
+        `- **Start time**: ${formatDate(jobLog.start)}`,
+        `- **End time**: ${formatDate(jobLog.end)}`,
+        `- **Duration**: ${formatDuration(jobLog.duration)}`,
+        `- **Error**: ${jobLog.error.message}`,
         '---',
         '',
         `*${pkg.name} v${pkg.version}*`,
@@ -145,14 +139,12 @@ class BackupReportsXoPlugin {
 
       markdown = markdown.join('\n')
       return this._sendReport({
-        subject: `[Xen Orchestra] ${
-          log.status
-        } − Backup report for ${jobName} ${STATUS_ICON[log.status]}`,
+        subject: `[Xen Orchestra] ${globalStatus} − Backup report for ${jobName} ${icon}`,
         markdown,
         nagiosStatus: 2,
-        nagiosMarkdown: `[Xen Orchestra] [${
-          log.status
-        }] Backup report for ${jobName} - Error : ${log.result.message}`,
+        nagiosMarkdown: `[Xen Orchestra] [${globalStatus}] Backup report for ${jobName} - Error : ${
+          jobLog.error.message
+        }`,
       })
     }
 
@@ -165,12 +157,14 @@ class BackupReportsXoPlugin {
     let globalTransferSize = 0
     let nFailures = 0
     let nSkipped = 0
-    for (const taskLog of log.tasks) {
-      if (taskLog.status === 'success' && reportWhen === 'failure') {
+
+    for (const vmTaskLog of vmsTaskLog || []) {
+      const vmTaskStatus = vmTaskLog.status
+      if (vmTaskStatus === 'success' && reportWhen === 'failure') {
         return
       }
 
-      const vmId = taskLog.data.id
+      const vmId = vmTaskLog.data.id
       let vm
       try {
         vm = xo.getObject(vmId)
@@ -179,170 +173,136 @@ class BackupReportsXoPlugin {
         `### ${vm !== undefined ? vm.name_label : 'VM not found'}`,
         '',
         `- **UUID**: ${vm !== undefined ? vm.uuid : vmId}`,
-        `- **Start time**: ${formatDate(taskLog.start)}`,
-        `- **End time**: ${formatDate(taskLog.end)}`,
-        `- **Duration**: ${formatDuration(taskLog.end - taskLog.start)}`,
+        `- **Start time**: ${formatDate(vmTaskLog.start)}`,
+        `- **End time**: ${formatDate(vmTaskLog.end)}`,
+        `- **Duration**: ${formatDuration(vmTaskLog.duration)}`,
       ]
 
       const failedSubTasks = []
-      const snapshotText = []
+      const operationsText = []
       const srsText = []
       const remotesText = []
+      for (const subTaskLog of logs[vmTaskLog.taskId] || []) {
+        const { data, status, result, message } = subTaskLog
+        const icon =
+          subTaskLog.status === 'success' ? ICON_SUCCESS : ICON_FAILURE
+        const errorMessage = `  **Error**: ${get(result, 'message')}`
 
-      for (const subTaskLog of taskLog.tasks || []) {
-        if (
-          subTaskLog.message !== 'export' &&
-          subTaskLog.message !== 'snapshot'
-        ) {
-          continue
-        }
-
-        const icon = STATUS_ICON[subTaskLog.status]
-        const errorMessage = `    - **Error**: ${get(
-          subTaskLog.result,
-          'message'
-        )}`
-
-        if (subTaskLog.message === 'snapshot') {
-          snapshotText.push(
-            `- **Snapshot** ${icon}`,
-            `  - **Start time**: ${formatDate(subTaskLog.start)}`,
-            `  - **End time**: ${formatDate(subTaskLog.end)}`
-          )
-        } else if (subTaskLog.data.type === 'remote') {
-          const id = subTaskLog.data.id
-          const remote = await xo.getRemote(id).catch(() => {})
+        if (message === 'snapshot') {
+          operationsText.push(`- **Snapshot** ${icon}`)
+          if (status === 'failure') {
+            failedSubTasks.push('Snapshot')
+            operationsText.push('', errorMessage)
+          }
+        } else if (data.type === 'remote') {
+          const remoteId = data.id
+          const remote = await xo.getRemote(remoteId).catch(() => {})
           remotesText.push(
-            `  - **${
+            `- **${
               remote !== undefined ? remote.name : `Remote Not found`
-            }** (${id}) ${icon}`,
-            `    - **Start time**: ${formatDate(subTaskLog.start)}`,
-            `    - **End time**: ${formatDate(subTaskLog.end)}`,
-            `    - **Duration**: ${formatDuration(
-              subTaskLog.end - subTaskLog.start
-            )}`
+            }** (${remoteId}) ${icon}`
           )
-          if (subTaskLog.status === 'failure') {
-            failedSubTasks.push(remote !== undefined ? remote.name : id)
+          if (status === 'failure') {
+            failedSubTasks.push(remote !== undefined ? remote.name : remoteId)
             remotesText.push('', errorMessage)
           }
         } else {
-          const id = subTaskLog.data.id
+          const srId = data.id
           let sr
           try {
-            sr = xo.getObject(id)
+            sr = xo.getObject(srId)
           } catch (e) {}
           const [srName, srUuid] =
-            sr !== undefined ? [sr.name_label, sr.uuid] : [`SR Not found`, id]
-          srsText.push(
-            `  - **${srName}** (${srUuid}) ${icon}`,
-            `    - **Start time**: ${formatDate(subTaskLog.start)}`,
-            `    - **End time**: ${formatDate(subTaskLog.end)}`,
-            `    - **Duration**: ${formatDuration(
-              subTaskLog.end - subTaskLog.start
-            )}`
-          )
-          if (subTaskLog.status === 'failure') {
-            failedSubTasks.push(sr !== undefined ? sr.name_label : id)
+            sr !== undefined ? [sr.name_label, sr.uuid] : [`SR Not found`, srId]
+          srsText.push(`- **${srName}** (${srUuid}) ${icon}`)
+          if (status === 'failure') {
+            failedSubTasks.push(sr !== undefined ? sr.name_label : srId)
             srsText.push('', errorMessage)
           }
         }
-
-        forEach(subTaskLog.tasks, operationLog => {
-          if (
-            operationLog.message !== 'merge' &&
-            operationLog.message !== 'transfer'
-          ) {
-            return
-          }
-
-          const operationInfoText = []
-          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 {
-            operationInfoText.push(
-              `      - **Error**: ${get(operationLog.result, 'message')}`
-            )
-          }
-          const operationText = [
-            `    - **${operationLog.message}** ${
-              STATUS_ICON[operationLog.status]
-            }`,
-            `      - **Start time**: ${formatDate(operationLog.start)}`,
-            `      - **End time**: ${formatDate(operationLog.end)}`,
-            `      - **Duration**: ${formatDuration(
-              operationLog.end - operationLog.start
-            )}`,
-            ...operationInfoText,
-          ].join('\n')
-          if (get(subTaskLog, 'data.type') === 'remote') {
-            remotesText.push(operationText)
-            remotesText.join('\n')
-          }
-          if (get(subTaskLog, 'data.type') === 'SR') {
-            srsText.push(operationText)
-            srsText.join('\n')
-          }
-        })
       }
 
+      if (operationsText.length !== 0) {
+        operationsText.unshift(`#### Operations`, '')
+      }
       if (srsText.length !== 0) {
-        srsText.unshift(`- **SRs**`)
+        srsText.unshift(`#### SRs`, '')
       }
       if (remotesText.length !== 0) {
-        remotesText.unshift(`- **Remotes**`)
+        remotesText.unshift(`#### remotes`, '')
       }
-      const subText = [...snapshotText, '', ...srsText, '', ...remotesText]
-      if (taskLog.result !== undefined) {
-        if (taskLog.status === 'skipped') {
+      const subText = [...operationsText, '', ...srsText, '', ...remotesText]
+      const result = vmTaskLog.result
+      if (vmTaskStatus === 'failure' && result !== undefined) {
+        const { message } = result
+        if (isSkippedError(result)) {
           ++nSkipped
           skippedVmsText.push(
             ...text,
             `- **Reason**: ${
-              taskLog.result.message === UNHEALTHY_VDI_CHAIN_ERROR
+              message === UNHEALTHY_VDI_CHAIN_ERROR
                 ? UNHEALTHY_VDI_CHAIN_MESSAGE
-                : taskLog.result.message
+                : message
             }`,
             ''
           )
           nagiosText.push(
-            `[(Skipped) ${vm !== undefined ? vm.name_label : 'undefined'} : ${
-              taskLog.result.message
-            } ]`
+            `[(Skipped) ${
+              vm !== undefined ? vm.name_label : 'undefined'
+            } : ${message} ]`
           )
         } else {
           ++nFailures
-          failedVmsText.push(
-            ...text,
-            `- **Error**: ${taskLog.result.message}`,
-            ''
-          )
+          failedVmsText.push(...text, `- **Error**: ${message}`, '')
 
           nagiosText.push(
-            `[(Failed) ${vm !== undefined ? vm.name_label : 'undefined'} : ${
-              taskLog.result.message
-            } ]`
+            `[(Failed) ${
+              vm !== undefined ? vm.name_label : 'undefined'
+            } : ${message} ]`
           )
         }
       } else {
-        if (taskLog.status === 'failure') {
+        let transferSize, transferDuration, mergeSize, mergeDuration
+
+        forEach(logs[vmTaskLog.taskId], ({ taskId }) => {
+          if (transferSize !== undefined) {
+            return false
+          }
+
+          const transferTask = find(logs[taskId], { message: 'transfer' })
+          if (transferTask !== undefined) {
+            transferSize = transferTask.result.size
+            transferDuration = transferTask.end - transferTask.start
+          }
+
+          const mergeTask = find(logs[taskId], { message: 'merge' })
+          if (mergeTask !== undefined) {
+            mergeSize = mergeTask.result.size
+            mergeDuration = mergeTask.end - mergeTask.start
+          }
+        })
+        if (transferSize !== undefined) {
+          globalTransferSize += transferSize
+          text.push(
+            `- **Transfer size**: ${formatSize(transferSize)}`,
+            `- **Transfer speed**: ${formatSpeed(
+              transferSize,
+              transferDuration
+            )}`
+          )
+        }
+        if (mergeSize !== undefined) {
+          globalMergeSize += mergeSize
+          text.push(
+            `- **Merge size**: ${formatSize(mergeSize)}`,
+            `- **Merge speed**: ${formatSpeed(mergeSize, mergeDuration)}`
+          )
+        }
+        if (vmTaskStatus === 'failure') {
           ++nFailures
           failedVmsText.push(...text, '', '', ...subText, '')
           nagiosText.push(
-            `[${
+            `[(Failed) ${
               vm !== undefined ? vm.name_label : 'undefined'
             }: (failed)[${failedSubTasks.toString()}]]`
           )
@@ -351,16 +311,23 @@ class BackupReportsXoPlugin {
         }
       }
     }
+    const globalSuccess = nFailures === 0 && nSkipped === 0
+    if (reportWhen === 'failure' && globalSuccess) {
+      return
+    }
 
-    const nVms = log.tasks.length
+    const nVms = vmsTaskLog.length
     const nSuccesses = nVms - nFailures - nSkipped
+    const globalStatus = globalSuccess
+      ? `Success`
+      : nFailures !== 0 ? `Failure` : `Skipped`
     let markdown = [
-      `##  Global status: ${log.status}`,
+      `##  Global status: ${globalStatus}`,
       '',
       `- **mode**: ${mode}`,
-      `- **Start time**: ${formatDate(log.start)}`,
-      `- **End time**: ${formatDate(log.end)}`,
-      `- **Duration**: ${formatDuration(log.start - log.end)}`,
+      `- **Start time**: ${formatDate(jobLog.start)}`,
+      `- **End time**: ${formatDate(jobLog.end)}`,
+      `- **Duration**: ${formatDuration(jobLog.duration)}`,
       `- **Successes**: ${nSuccesses} / ${nVms}`,
     ]
 
@@ -400,16 +367,17 @@ class BackupReportsXoPlugin {
     markdown = markdown.join('\n')
     return this._sendReport({
       markdown,
-      subject: `[Xen Orchestra] ${log.status} − Backup report for ${jobName} ${
-        STATUS_ICON[log.status]
+      subject: `[Xen Orchestra] ${globalStatus} − Backup report for ${jobName} ${
+        globalSuccess
+          ? ICON_SUCCESS
+          : nFailures !== 0 ? ICON_FAILURE : ICON_SKIPPED
       }`,
-      nagiosStatus: log.status === 'success' ? 0 : 2,
-      nagiosMarkdown:
-        log.status === 'success'
-          ? `[Xen Orchestra] [Success] Backup report for ${jobName}`
-          : `[Xen Orchestra] [${
-              nFailures !== 0 ? 'Failure' : 'Skipped'
-            }] Backup report for ${jobName} - VMs : ${nagiosText.join(' ')}`,
+      nagiosStatus: globalSuccess ? 0 : 2,
+      nagiosMarkdown: globalSuccess
+        ? `[Xen Orchestra] [Success] Backup report for ${jobName}`
+        : `[Xen Orchestra] [${
+            nFailures !== 0 ? 'Failure' : 'Skipped'
+          }] Backup report for ${jobName} - VMs : ${nagiosText.join(' ')}`,
     })
   }
 
@@ -433,7 +401,7 @@ class BackupReportsXoPlugin {
         }),
       xo.sendPassiveCheck !== undefined &&
         xo.sendPassiveCheck({
-          status: nagiosStatus,
+          nagiosStatus,
           message: nagiosMarkdown,
         }),
     ])
@@ -599,9 +567,7 @@ class BackupReportsXoPlugin {
     const nSuccesses = nCalls - nFailures - nSkipped
     const globalStatus = globalSuccess
       ? `Success`
-      : nFailures !== 0
-        ? `Failure`
-        : `Skipped`
+      : nFailures !== 0 ? `Failure` : `Skipped`
 
     let markdown = [
       `##  Global status: ${globalStatus}`,
@@ -659,9 +625,7 @@ class BackupReportsXoPlugin {
       subject: `[Xen Orchestra] ${globalStatus} − Backup report for ${tag} ${
         globalSuccess
           ? ICON_SUCCESS
-          : nFailures !== 0
-            ? ICON_FAILURE
-            : ICON_SKIPPED
+          : nFailures !== 0 ? ICON_FAILURE : ICON_SKIPPED
       }`,
       nagiosStatus: globalSuccess ? 0 : 2,
       nagiosMarkdown: globalSuccess

packages/xo-server-perf-alert/package.json

@@ -26,10 +26,10 @@
     "lodash": "^4.17.4"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.49",
-    "@babel/core": "7.0.0-beta.49",
-    "@babel/preset-env": "7.0.0-beta.49",
-    "@babel/preset-flow": "^7.0.0-beta.49",
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "^7.0.0-beta.46",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "rimraf": "^2.6.2"

packages/xo-server-rework/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = require('../../@xen-orchestra/babel-config')(
+  require('./package.json')
+)

packages/xo-server-rework/.npmignore

@@ -0,0 +1,24 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
+/examples/
+example.js
+example.js.map
+*.example.js
+*.example.js.map
+
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
+/test/
+/tests/
+*.spec.js
+*.spec.js.map
+
+__snapshots__/

packages/xo-server-rework/README.md

@@ -0,0 +1,51 @@
+# xo-server [![Build Status](https://travis-ci.org/vatesfr/xo-server.png?branch=master)](https://travis-ci.org/vatesfr/xo-server)
+
+> Server part of [Xen Orchestra](https://xen-orchestra.com)
+
+## Install
+
+Installation of the [npm package](https://npmjs.org/package/xo-server):
+
+```
+> npm install --global xo-server
+```
+
+## Usage
+
+```
+> xo-server
+```
+
+## 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
+
+AGPL3 © [Vates SAS](http://vates.fr)

packages/xo-server-rework/config.json

@@ -0,0 +1,40 @@
+// Vendor config: DO NOT TOUCH!
+//
+// See sample.config.yaml to override.
+{
+
+  // Should users be created on first sign in?
+  //
+  // Necessary for external authentication providers.
+  "createUserOnFirstSignin": true,
+
+  "datadir": "/var/lib/xo-server/data",
+
+  "http": {
+    "listen": [
+      {
+        "port": 80
+      }
+    ],
+
+    "mounts": {},
+
+    // Ciphers to use.
+    //
+    // These are the default ciphers in Node 4.2.6, we are setting
+    // them explicitly for older Node versions.
+    "ciphers": "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA256:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!SRP:!CAMELLIA",
+
+    // Tell Node to respect the cipher order.
+    "honorCipherOrder": true,
+
+    // Specify to use at least TLSv1.1.
+    // See: https://github.com/certsimple/minimum-tls-version
+    "secureOptions": 117440512
+  },
+
+  "jwt": {
+    "expiresIn": "7d",
+    "secret": "P],7x#cRhuy,wCR'$}'N?<2yOQ3v6.!b*|1B2P36(wKsYICH|6"
+  }
+}

packages/xo-server-rework/package.json

@@ -0,0 +1,81 @@
+{
+  "private": true,
+  "name": "xo-server-rework",
+  "version": "0.0.0",
+  "license": "AGPL-3.0",
+  "description": "Server part of Xen Orchestra",
+  "keywords": [
+    "orchestra",
+    "server",
+    "xen",
+    "xen-orchestra"
+  ],
+  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-server-rework",
+  "bugs": "https://github.com/vatesfr/xo-web/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vatesfr/xen-orchestra.git"
+  },
+  "author": {
+    "name": "Julien Fontanet",
+    "email": "julien.fontanet@isonoe.net"
+  },
+  "preferGlobal": true,
+  "main": "dist/",
+  "bin": {
+    "xo-server": "dist/index.js"
+  },
+  "files": [
+    "dist/"
+  ],
+  "engines": {
+    "node": ">=6"
+  },
+  "dependencies": {
+    "@babel/polyfill": "7.0.0-beta.46",
+    "app-conf": "^0.5.0",
+    "base64url": "^2.0.0",
+    "bind-property-descriptor": "^1.0.0",
+    "bluebird": "^3.5.1",
+    "cuid": "^2.0.2",
+    "dataloader": "^1.3.0",
+    "event-to-promise": "^0.8.0",
+    "golike-defer": "^0.4.1",
+    "graphql": "^0.13.0",
+    "http-request-plus": "^0.5.0",
+    "http-server-plus": "^0.9.0",
+    "immutable": "^4.0.0-rc.4",
+    "index-modules": "^0.3.0",
+    "jsonwebtoken": "^8.1.0",
+    "lodash": "^4.17.4",
+    "mnemonist": "^0.21.0",
+    "promise-toolbox": "^0.9.5",
+    "proxy-agent": "^2.1.0",
+    "spdy": "^3.4.7",
+    "uuid": "^3.1.0",
+    "zen-observable": "^0.8.6"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.46",
+    "@babel/plugin-proposal-decorators": "7.0.0-beta.46",
+    "@babel/plugin-proposal-optional-chaining": "7.0.0-beta.46",
+    "@babel/plugin-proposal-pipeline-operator": "7.0.0-beta.46",
+    "@babel/plugin-proposal-throw-expressions": "7.0.0-beta.46",
+    "@babel/preset-env": "7.0.0-beta.46",
+    "@babel/preset-flow": "7.0.0-beta.46",
+    "babel-plugin-dev": "^1.0.0",
+    "babel-plugin-lodash": "^3.3.2",
+    "cross-env": "^5.1.3",
+    "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 && index-modules --auto src/",
+    "predev": "yarn run prebuild",
+    "prepublishOnly": "yarn run build",
+    "start": "./dist/index.js"
+  }
+}

packages/xo-server-rework/src/app/index.js

@@ -0,0 +1,8 @@
+import EventEmitter from 'events'
+import mixin from '@xen-orchestra/mixin'
+import { values } from 'lodash'
+
+import Mixins from './mixins'
+
+@mixin(values(Mixins))
+export default class App extends EventEmitter {}

packages/xo-server-rework/src/app/mixins/hooks.js

@@ -0,0 +1,51 @@
+// @flow
+
+import createLogger from '@xen-orchestra/log'
+import emitAsync from '@xen-orchestra/emit-async'
+
+const { debug, warn } = createLogger('hooks')
+
+const makeSingletonHook = (hook, postEvent) => {
+  let promise
+  return function () {
+    if (promise === undefined) {
+      promise = runHook(this, hook)
+      promise.then(() => {
+        this.removeAllListeners(hook)
+        this.emit(postEvent)
+        this.removeAllListeners(postEvent)
+      })
+    }
+    return promise
+  }
+}
+
+const runHook = (app, hook) => {
+  debug(`${hook} start…`)
+  const promise = emitAsync.call(app, {
+    onError: error => warn(`${hook} failure`, error),
+  }, hook)
+  promise.then(() => {
+    debug(`${hook} finished`)
+  })
+  return promise
+}
+
+export default {
+  // Run *clean* async listeners.
+  //
+  // They normalize existing data, clear invalid entries, etc.
+  clean () {
+    return runHook(this, 'clean')
+  },
+
+  // Run *start* async listeners.
+  //
+  // They initialize the application.
+  start: makeSingletonHook('start', 'started'),
+
+  // Run *stop* async listeners.
+  //
+  // They close connections, unmount file systems, save states, etc.
+  stop: makeSingletonHook('stop', 'stopped'),
+}

packages/xo-server-rework/src/app/mixins/http-request.js

@@ -0,0 +1,13 @@
+import defined, { ifDef } from '@xen-orchestra/defined'
+import hrp from 'http-request-plus'
+import ProxyAgent from 'proxy-agent'
+
+export default class HttpRequest {
+  constructor (_, {
+    httpProxy = defined(process.env.http_proxy, process.env.HTTP_PROXY),
+  }) {
+    this.httpRequest = hrp.extend({
+      agent: ifDef(httpProxy, _ => new ProxyAgent(_)),
+    })
+  }
+}

packages/xo-server-rework/src/app/mixins/http-server.js

@@ -0,0 +1,132 @@
+// @flow
+
+import type EventEmitter from 'events'
+import type {
+  IncomingMessage,
+  Server,
+  ServerResponse,
+} from 'http'
+
+import createLogger from '@xen-orchestra/log'
+import generateToken from 'generate-token'
+import { fromCallback } from 'promise-toolbox'
+import { once } from 'lodash'
+
+const HTTP_REQUEST_VALIDITY = 1e3 * 60 * 60
+const { warn } = createLogger('web-server')
+
+type Handler = (IncomingMessage, ServerResponse, any) => void
+type HandlerInfo = {|
+  data: any,
+  handler: Handler,
+  method: ?string,
+  once: boolean,
+  path: string,
+  unregister: () => void
+|}
+
+type HandlerInfoMap = { [url: string]: HandlerInfo }
+
+export default class httpServer {
+  _handlers: HandlerInfoMap
+
+  constructor (app: EventEmitter, { httpServer }: { httpServer: Server }) {
+    const openConnections = new Set()
+    httpServer.on('connection', connection => {
+      openConnections.add(connection)
+      connection.once('close', () => {
+        openConnections.delete(connection)
+      })
+    })
+    app.on('stop', () => {
+      const timeout = setTimeout(() => {
+        openConnections.forEach(connection => {
+          connection.end()
+        })
+      }, 5e3).unref()
+
+      return fromCallback(cb => httpServer.close(cb)).then(() => {
+        clearTimeout(timeout)
+      })
+    })
+
+    const handlers = this._handlers = Object.create(null)
+    httpServer.on('request', (req, res) => {
+      const handler = handlers[req.url]
+      if (
+        handler !== undefined &&
+        (handler.method !== undefined || handler.method === req.method)
+      ) {
+        if (handler.once) {
+          handler.unregister()
+        }
+
+        try {
+          handler.handler.call(app, req, res, handler.data)
+        } catch (error) {
+          warn('handler error', { error })
+          if (!res.headersSent) {
+            res.writeHead(500)
+          }
+          res.end()
+        }
+        return
+      }
+
+      res.writeHead(404)
+      res.end(`Page not found: ${req.url}`)
+    })
+  }
+
+  registerHttpHandler (
+    handler: Handler,
+    { data, method, once: once_ = false, path, ttl }
+  ) {
+    const handlers = this._handlers
+
+    if (path in handlers) {
+      throw new Error(`there is already an HTTP handler for ${path}`)
+    }
+
+    const unregister = once(() => {
+      delete handlers[path]
+    })
+
+    handlers[path] = {
+      data,
+      handler,
+      method: method && method.toUpperCase(),
+      once: once_,
+      path,
+      unregister,
+    }
+
+    if (ttl !== undefined) {
+      setTimeout(unregister, ttl)
+    }
+
+    return unregister
+  }
+
+  registerHttpRequest (
+    handler: Handler,
+    { data, path, method = 'GET', suffix }
+  ) {
+    return generateToken().then(token => {
+      let path = `/${token}`
+      if (suffix) {
+        path += `/${encodeURI(token)}`
+      }
+
+      this.registerHttpHandler(handler, {
+        data,
+        method,
+        once: true,
+        path,
+        ttl: HTTP_REQUEST_VALIDITY,
+      })
+
+      return path
+    })
+  }
+}

packages/xo-server-rework/src/app/mixins/jwt.js

@@ -0,0 +1,28 @@
+// @flow
+
+import jwt from 'jsonwebtoken'
+import { fromCallback } from 'promise-toolbox'
+
+export default class JsonWebToken {
+  _encodeOpts: Object
+  _secret: string
+
+  constructor (_: any, {
+    config: { jwt: { expiresIn, secret } },
+  }: {
+    config: { jwt: { expiresIn?: string, secret: string } }
+  }) {
+    this._encodeOpts = { expiresIn }
+    this._secret = secret
+  }
+
+  decodeJwt (token: string): Promise<any> {
+    return fromCallback(cb => jwt.verify(token, this._secret, cb))
+  }
+
+  encodeJwt (payload: any): Promise<string> {
+    return fromCallback(cb =>
+      jwt.sign(payload, this._secret, this._encodeOpts, cb)
+    )
+  }
+}

packages/xo-server-rework/src/app/mixins/plugins.js

@@ -0,0 +1,110 @@
+// @flow
+
+import asyncMap from '@xen-orchestra/async-map'
+import createLogger from '@xen-orchestra/log'
+import { forEach, startsWith } from 'lodash'
+import { join } from 'path'
+import { readdir } from '@xen-orchestra/async-fs'
+
+const { info, warn } = createLogger('plugins')
+
+// ===================================================================
+
+const LOOKUP_PATHS = [
+  '/usr/local/lib/node_modules',
+  join(__dirname, '../../../node_modules'),
+]
+
+// -------------------------------------------------------------------
+
+export default class Plugins {
+  _plugins: Object
+  _prefix: string
+
+  constructor (app: any, { appName, safeMode }: { appName: string, safeMode: ?boolean }) {
+    this._plugins = {}
+    this._prefix = `${appName}-`
+
+    app.on('start', () => {
+      if (!safeMode) {
+        return this.discoverPlugins()
+      }
+    })
+  }
+
+  discoverPlugins () {
+    return asyncMap(this._listPlugins(), async (plugin, name) => {})
+  }
+
+  _listPlugins () {
+    const plugins = { __proto__: null }
+
+    const prefix = this._prefix
+    const prefixLength = prefix.length
+
+    return asyncMap(LOOKUP_PATHS, lookupPath =>
+      readdir(lookupPath).then(
+        basenames =>
+          forEach(basenames, basename => {
+            if (startsWith(basename, prefix)) {
+              const name = basename.slice(prefixLength)
+              const path = join(lookupPath, basename)
+
+              const previous = plugins[name]
+              if (name in plugins) {
+                warn(`duplicate plugins ${name}`, {
+                  name,
+                  paths: [previous.path, path].sort(),
+                })
+
+                return
+              }
+
+              let plugin
+              try {
+                plugin = require(path)
+                info(`successfully imported plugin ${name}`, {
+                  name,
+                  path,
+                })
+              } catch (error) {
+                warn(`failed to import plugin ${name}`, {
+                  error,
+                  name,
+                  path,
+                })
+                return
+              }
+
+              let version
+              try {
+                ;({ version } = require(join(path, 'package.json')))
+              } catch (_) {}
+
+              // Supports both “normal” CommonJS and Babel's ES2015 modules.
+              const {
+                default: factory = plugin,
+                configurationSchema,
+                configurationPresets,
+              } = plugin
+
+              plugins[name] = {
+                configurationPresets,
+                configurationSchema,
+                factory,
+                version,
+              }
+            }
+          }),
+        error => {
+          if (error.code !== 'ENOENT') {
+            warn('plugins', 'failed to read directory', {
+              error,
+              lookupPath,
+            })
+          }
+        }
+      )
+    )
+  }
+}

packages/xo-server-rework/src/app/mixins/store.js

@@ -0,0 +1,58 @@
+// import generateId from 'cuid'
+// import mkdirp from 'simple-mkdirp'
+// import { pCatch, pTap } from 'promise-toolbox'
+// import { join } from 'path'
+// import { readFile, writeFile } from '@xen-orchestra/async-fs'
+
+// TODO: transition from in-memory database to a real database system.
+export default class Store {
+  // constructor (app, { config: { datadir } }) {
+  //   this._get = () => {
+  //     const datafile = join(datadir, 'store.json')
+  //
+  //     const promise = readFile(datafile)
+  //       .then(JSON.parse)
+  //       .catch(pCatch({ code: 'ENOENT' }, () => ({})))
+  //       .then(pTap(data => {
+  //         app.on('stop', data =>
+  //           mkdirp(datadir)
+  //             .then(() => writeFile(datafile, JSON.stringify(data)))
+  //         )
+  //       }))
+  //
+  //     // Inline future accesses.
+  //     this._get = () => promise
+  //
+  //     return promise
+  //   }
+  //
+  //   this._types = {}
+  // }
+  //
+  // registerType (name, spec) {
+  //   const types = this._types
+  //
+  //   if (__DEV__ && name in types) {
+  //     throw new Error(`type ${name} is already registered`)
+  //   }
+  //
+  //   types[name] = spec
+  // }
+  //
+  // async createObject ({ type, ...props }) {
+  //   if (__DEV__ && !type) {
+  //     throw new Error('missing type')
+  //   }
+  //
+  //   const db = await this._get()
+  //   const byType = db.byType || (db.byType = {})
+  //   const collection = byType[type] || (byType[type] = {})
+  //
+  //   let { id } = props
+  //   if (!id) {
+  //     props.id = id = generateId()
+  //   }
+  //
+  //   collection[id] = props
+  // }
+}

packages/xo-server-rework/src/app/mixins/users.js

@@ -0,0 +1,13 @@
+export default class Users {
+  // constructor (app) {
+  //   app.on('start', async () => {
+  //
+  //   })
+  //
+  //   app.on('export')
+  // }
+  //
+  // createUser ({ name }) {
+  //
+  // }
+}

packages/xo-server-rework/src/app/mixins/workers.js

@@ -0,0 +1,88 @@
+// @flow
+
+import { cpus as getCpus } from 'os'
+import { ChildProcess, fork } from 'child_process'
+
+const MAX = getCpus().length
+const WORKER = `${__dirname}/../../worker.js`
+
+class Task {
+  data: any
+  reject: (error: any) => void
+  resolve: (result: any) => void
+
+  constructor (data, resolve, reject) {
+    this.data = data
+    this.reject = reject
+    this.resolve = resolve
+  }
+}
+
+export default class Workers {
+  _idleWorker: ?ChildProcess
+  _nWorkers: number
+  _tasksQueue: Array<Task>
+
+  constructor () {
+    this._idleWorker = undefined
+    this._nWorkers = 0
+    this._tasksQueue = []
+  }
+
+  callWorker (data: any): any {
+    return new Promise((resolve, reject) => {
+      const task = new Task(data, resolve, reject)
+
+      const worker = this._getWorker()
+      if (worker !== undefined) {
+        this._submitTask(worker, task)
+      } else {
+        this._tasksQueue.push(task)
+      }
+    })
+  }
+
+  _getWorker () {
+    let worker = this._idleWorker
+    if (worker !== undefined) {
+      this._idleWorker = undefined
+      return worker
+    }
+
+    if (this._nWorkers < MAX) {
+      this._nWorkers++
+
+      worker = fork(WORKER)
+      worker.on('error', error => {
+        console.error('worker error', error)
+      })
+      worker.on('exit', (code, signal) => {
+        console.log('worker exit', code, signal)
+        this._nWorkers--
+      })
+
+      return worker
+    }
+  }
+
+  _submitTask (worker: ChildProcess, task: Task) {
+    worker.once('message', response => {
+      if ('error' in response) {
+        task.reject(response.error)
+      } else {
+        task.resolve(response.result)
+      }
+
+      const nextTask = this._tasksQueue.shift()
+      if (nextTask !== undefined) {
+        this._submitTask(worker, nextTask)
+      } else if (this._idleWorker !== undefined) {
+        worker.kill()
+      } else {
+        this._idleWorker = worker
+      }
+    })
+
+    worker.send(task.data)
+  }
+}

packages/xo-server-rework/src/index.js

@@ -0,0 +1,115 @@
+#!/usr/bin/env node
+
+const APP_NAME = 'xo-server'
+
+// -------------------------------------------------------------------
+
+const { info, warn } = require('@xen-orchestra/log').default('bootstrap')
+
+process.on('unhandledRejection', reason => {
+  warn('possibly unhandled rejection', reason)
+})
+;(({ prototype }) => {
+  const { emit } = prototype
+  prototype.emit = function (event, error) {
+    event === 'error' && !this.listenerCount(event)
+      ? warn('unhandled error event', error)
+      : emit.apply(this, arguments)
+  }
+})(require('events').EventEmitter)
+
+const Bluebird = require('bluebird')
+Bluebird.longStackTraces()
+global.Promise = Bluebird
+
+// -------------------------------------------------------------------
+
+const main = async args => {
+  info('starting')
+
+  const config = await require('app-conf').load(APP_NAME)
+
+  const httpServer = new (require('http-server-plus'))()
+
+  const readFile = Bluebird.promisify(require('fs').readFile)
+  await require('@xen-orchestra/async-map').default(
+    config.http.listen,
+    async ({
+      certificate,
+      // The properties was called `certificate` before.
+      cert = certificate,
+      key,
+      ...opts
+    }) => {
+      if (cert !== undefined && key !== undefined) {
+        [opts.cert, opts.key] = await Promise.all([
+          readFile(cert),
+          readFile(key),
+        ])
+      }
+
+      try {
+        const niceAddress = await httpServer.listen(opts)
+        info(`Web server listening on ${niceAddress}`)
+      } catch (error) {
+        if (error.niceAddress !== undefined) {
+          warn(`Web server could not listen on ${error.niceAddress}`)
+
+          const { code } = error
+          if (code === 'EACCES') {
+            warn('  Access denied.')
+            warn('  Ports < 1024 are often reserved to privileges users.')
+          } else if (code === 'EADDRINUSE') {
+            warn('  Address already in use.')
+          }
+        } else {
+          warn('Web server could not listen', error)
+        }
+      }
+    }
+  )
+
+  try {
+    const { group, user } = config
+    group != null && process.setgid(group)
+    user != null && process.setuid(user)
+  } catch (error) {
+    warn('failed to change group/user', error)
+  }
+
+  global.Observable = require('zen-observable')
+
+  const App = require('./app').default
+  const app = new App({
+    appName: APP_NAME,
+    config,
+    httpServer,
+    safeMode: require('lodash/includes')(args, '--safe-mode'),
+  })
+  await app.start()
+
+  // Gracefully shutdown on signals.
+  //
+  // TODO: implements a timeout? (or maybe it is the services launcher
+  // responsibility?)
+  require('lodash/forEach')(['SIGINT', 'SIGTERM'], signal => {
+    let alreadyCalled = false
+
+    process.on(signal, () => {
+      if (alreadyCalled) {
+        warn('forced exit')
+        process.exit(1)
+      }
+      alreadyCalled = true
+
+      info(`${signal} caught, closing…`)
+      app.stop()
+    })
+  })
+
+  return require('event-to-promise')(app, 'stopped')
+}
+main(process.argv.slice(2)).then(
+  () => info('bye :-)'),
+  error => warn('fatal error', error)
+)

packages/xo-server-rework/src/node_modules/generate-token.js

@@ -0,0 +1,10 @@
+// @flow
+
+import base64url from 'base64url'
+import { fromCallback } from 'promise-toolbox'
+import { randomBytes } from 'crypto'
+
+const generateSecureToken = (bytes: number = 32): Promise<string> =>
+  fromCallback(cb => randomBytes(bytes, cb)).then(base64url)
+
+export { generateSecureToken as default }

packages/xo-server-rework/src/node_modules/mp-atch.js

@@ -0,0 +1,103 @@
+import {
+  every,
+  forEach,
+  isArray,
+  isPlainObject,
+  some,
+} from 'lodash'
+
+// ===================================================================
+
+const { hasOwnProperty } = Object.prototype
+const getSingleKey = obj => {
+  let prop
+  for (const key in obj) {
+    if (hasOwnProperty.call(obj, key)) {
+      if (prop !== undefined) {
+        return
+      }
+      prop = key
+    }
+  }
+  return prop
+}
+
+const OPERATORS = {
+  __not: (pattern, value) => !match(pattern, value),
+  __or: (pattern, value) => some(pattern, subpattern => match(subpattern, value)),
+}
+
+export const match = (pattern, value) => {
+  if (isPlainObject(pattern)) {
+    const key = getSingleKey(pattern)
+    let operator
+    if (key !== undefined && (operator = OPERATORS[key]) !== undefined) {
+      return operator(pattern[key], value)
+    }
+
+    return isPlainObject(value) && every(pattern, (subpattern, key) => (
+      value[key] !== undefined && match(subpattern, value[key])
+    ))
+  }
+
+  if (isArray(pattern)) {
+    return isArray(value) && every(pattern, subpattern =>
+      some(value, subvalue => match(subpattern, subvalue))
+    )
+  }
+
+  return pattern === value
+}
+
+// -------------------------------------------------------------------
+
+const createPredicate = pattern => pattern == null
+  ? () => false
+  : value => match(pattern, value)
+
+export const patch = (value, patchData) => {
+  if (isPlainObject(patchData)) {
+    if (isArray(value)) {
+      const toRemove = createPredicate(patchData['-'])
+      const tmp = []
+      forEach(value, (v, i) => {
+        if (i in patchData) {
+          const p = patchData[i]
+          if (p === null) {
+            return
+          }
+          tmp.push(patch(v, p))
+        } else if (!toRemove(v)) {
+          tmp.push(v)
+        }
+      })
+      const toAdd = patchData['+']
+      if (toAdd) {
+        tmp.push.apply(tmp, toAdd)
+      }
+      return tmp
+    }
+
+    if (isPlainObject(value)) {
+      value = { ...value }
+      forEach(patchData, (v, k) => {
+        if (v === null) {
+          delete value[k]
+        } else {
+          value[k] = patch(value[k], v)
+        }
+      })
+      return value
+    }
+
+    value = {}
+    forEach(patchData, (v, k) => {
+      if (v !== null) {
+        value[k] = patch(null, v)
+      }
+    })
+    return value
+  }
+
+  return patchData
+}

packages/xo-server-rework/src/node_modules/mp-atch.spec.js

@@ -0,0 +1,103 @@
+/* eslint-env jest */
+
+import { forEach } from 'lodash'
+
+import { match, patch } from './mp-atch'
+
+// ===================================================================
+
+describe('match()', () => {
+  const data = {
+    'matches object properties': {
+      pattern: { foo: 'bar' },
+      nope: [
+        null,
+        { },
+        { foo: 'baz' },
+      ],
+      yep: [
+        { foo: 'bar' },
+        { foo: 'bar', bar: 'baz' },
+      ],
+    },
+    'matches set items': {
+      pattern: [ 'foo', 'bar' ],
+      nope: [
+        [],
+        [ 'foo' ],
+        [ 'bar' ],
+        [ 'foo', 'baz' ],
+      ],
+      yep: [
+        [ 'bar', 'foo' ],
+        [ 'bar', 'baz', 'foo' ],
+      ],
+    },
+    'supports a __or operator': {
+      pattern: { __or: [
+        'foo',
+        { },
+      ] },
+      nope: [
+        'bar',
+        [],
+      ],
+      yep: [
+        'foo',
+        { 'foo': 'bar' },
+      ],
+    },
+  }
+
+  forEach(data, ({ pattern, nope, yep }, desc) => {
+    if (!pattern) {
+      it(desc)
+    } else {
+      it(desc, () => {
+        forEach(nope, value => {
+          expect(match(pattern, value)).toBe(false)
+        })
+        forEach(yep, value => {
+          expect(match(pattern, value)).toBe(true)
+        })
+      })
+    }
+  })
+
+  it('supports a __not operator', () => {
+    forEach(data, ({ pattern, nope, yep }) => {
+      if (!pattern) {
+        return
+      }
+
+      pattern = { __not: pattern }
+
+      forEach(nope, value => {
+        expect(match(pattern, value)).toBe(true)
+      })
+      forEach(yep, value => {
+        expect(match(pattern, value)).toBe(false)
+      })
+    })
+  })
+})
+
+describe('patch', () => {
+  it('can patch arrays', () => {
+    expect(patch(
+      [ 'foo', 'bar', 'quuz' ],
+      { 0: null, '-': 'quuz', '+': [ 'baz' ] }
+    )).toEqual(
+      [ 'bar', 'baz' ]
+    )
+  })
+
+  it('can patch objects', () => {
+    expect(patch(
+      { foo: 1, bar: 2 },
+      { foo: null, bar: 3, baz: 4 }
+    )).toEqual(
+      { bar: 3, baz: 4 }
+    )
+  })
+})

packages/xo-server-rework/src/node_modules/simple-mkdirp.js

@@ -0,0 +1,26 @@
+// @flow
+
+import { dirname } from 'path'
+import { mkdir, stat } from 'fs'
+import { promisify } from 'promise-toolbox'
+
+const simpleMkdirp = (
+  path: string,
+  cb: (error: ?Error) => void
+) => mkdir(path, undefined, error => {
+  if (error == null) {
+    return cb()
+  }
+
+  if (error.code === 'ENOENT') {
+    return simpleMkdirp(dirname(path), error =>
+      error != null ? cb(error) : simpleMkdirp(path, cb)
+    )
+  }
+
+  return stat(path, (_, stats) =>
+    stats != null && stats.isDirectory() ? cb() : cb(error)
+  )
+})
+
+export default promisify(simpleMkdirp)

packages/xo-server-rework/src/task.js

@@ -0,0 +1,71 @@
+import toDecorator from './to-decorator'
+import { EventEmitter } from 'events'
+import { CancelToken } from 'promise-toolbox'
+
+class Task extends EventEmitter {
+  constructor (name, { cancelToken, parent, steps } = {}) {
+    super()
+
+    this._cancelToken = cancelToken || (parent && parent.cancelToken)
+    this._name = name
+    this._step = 0
+    this._steps = steps || 0
+  }
+
+  get cancelToken () {
+    return this._cancelToken
+  }
+
+  plan (n) {
+    this._steps += n
+  }
+
+  step (stepName) {
+    this.emit('progress', {
+      step: ++this._step,
+      stepName,
+      steps: this._steps,
+    })
+
+    const token = this._cancelToken
+    token && token.throwIfRequested()
+  }
+}
+
+export default opts =>
+  toDecorator(
+    fn =>
+      function () {
+        const { name = fn.name, steps } = opts || {}
+
+        const n = arguments.length
+        const i = 0
+        let task
+        if (n !== 0) {
+          const arg = arguments[0]
+          if (arg instanceof Task) {
+            task = new Task(name, { parent: arg, steps })
+          } else if (CancelToken.isCancelToken(arg)) {
+            task = new Task(name, { cancelToken: arg, steps })
+          }
+        }
+        if (task === undefined) {
+          task = new Task(name, { steps })
+        }
+
+        const args = new Array(i + n)
+        args[0] = task
+        for (let j = 1; j < n; ++j) {
+          args[j] = arguments[j + i]
+        }
+
+        const promise = new Promise(resolve => resolve(fn.apply(this, args)))
+        promise.onProgress = cb => {
+          task.on('progress', cb)
+
+          return () => task.removeListener('progress', cb)
+        }
+
+        return promise
+      }
+  )

packages/xo-server-rework/src/task.spec.js

@@ -0,0 +1,54 @@
+/* eslint-env jest */
+
+import { CancelToken } from 'promise-toolbox'
+
+import task from './task'
+
+// ===================================================================
+
+const rejectionOf = promise =>
+  promise.then(result => {
+    throw result
+  }, reason => reason)
+
+// ===================================================================
+
+const sleep = () => new Promise(resolve => setTimeout(resolve, 0))
+
+describe('@task', () => {
+  const fn = task()(async $task => {
+    await sleep()
+    $task.step('foo')
+    await sleep()
+    $task.step('bar')
+    await sleep()
+    $task.step('baz')
+  })
+
+  it('', () => {
+    const promise = fn()
+    promise.onProgress((...args) => console.log(args))
+
+    return promise
+  })
+
+  it('supports cancel tokens', async () => {
+    const { cancel, token } = CancelToken.source()
+    const promise = fn(token)
+
+    cancel('foo')
+    expect((await rejectionOf(promise)).message).toBe('foo')
+  })
+
+  it('supports subtasks', async () => {
+    const fn2 = task()(async $task => {
+      await sleep()
+      await fn($task)
+      await sleep()
+      await fn($task)
+    })
+
+    const promise = fn2()
+    await promise
+  })
+})