debug

The release order computation is now uncoupled of the packages to release computation, and is now done for all packages so that transitive dependencies are still correctly ordered.

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged

@vates/disposable/package.json

@@ -14,7 +14,7 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "engines": {
     "node": ">=8.10"
   },
@@ -25,7 +25,7 @@
   "dependencies": {
     "@vates/multi-key-map": "^0.1.0",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "ensure-array": "^1.0.0"
   },
   "devDependencies": {

@vates/fuse-vhd/package.json

@@ -21,7 +21,7 @@
     "fuse-native": "^2.2.6",
     "lru-cache": "^7.14.0",
     "promise-toolbox": "^0.21.0",
-    "vhd-lib": "^4.1.1"
+    "vhd-lib": "^4.2.0"
   },
   "scripts": {
     "postversion": "npm publish --access public"

@vates/toggle-scripts/index.js

@@ -30,6 +30,7 @@ if (args.length === 0) {
 
 ${name} v${version}
 `)
+  // eslint-disable-next-line n/no-process-exit
   process.exit()
 }
 

@xen-orchestra/audit-core/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.2.1",
+  "version": "0.2.2",
   "engines": {
     "node": ">=14"
   },
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@vates/decorate-with": "^2.0.0",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "golike-defer": "^0.5.1",
     "object-hash": "^2.0.1"
   },

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

@@ -5,7 +5,6 @@ const PRESETS_RE = /^@babel\/preset-.+$/
 
 const NODE_ENV = process.env.NODE_ENV || 'development'
 const __PROD__ = NODE_ENV === 'production'
-const __TEST__ = NODE_ENV === 'test'
 
 const configs = {
   '@babel/plugin-proposal-decorators': {
@@ -15,7 +14,7 @@ const configs = {
     proposal: 'minimal',
   },
   '@babel/preset-env': {
-    debug: !__TEST__,
+    debug: __PROD__,
 
     // disabled until https://github.com/babel/babel/issues/8323 is resolved
     // loose: true,

@xen-orchestra/backups-cli/_composeCommands.mjs

@@ -1,11 +1,10 @@
-'use strict'
+import { readFileSync } from 'fs'
+import getopts from 'getopts'
 
-const getopts = require('getopts')
+const { version } = JSON.parse(readFileSync(new URL('package.json', import.meta.url)))
 
-const { version } = require('./package.json')
-
-module.exports = commands =>
-  async function (args, prefix) {
+export function composeCommands(commands) {
+  return async function (args, prefix) {
     const opts = getopts(args, {
       alias: {
         help: 'h',
@@ -30,5 +29,6 @@ xo-backups v${version}
       return
     }
 
-    return command.main(args.slice(1), prefix + ' ' + commandName)
+    return (await command.default)(args.slice(1), prefix + ' ' + commandName)
   }
+}

@xen-orchestra/backups-cli/_fs.mjs

@@ -1,11 +1,9 @@
-'use strict'
+import fs from 'fs/promises'
+import { dirname } from 'path'
 
-const { dirname } = require('path')
+export * from 'fs/promises'
 
-const fs = require('promise-toolbox/promisifyAll')(require('fs'))
-module.exports = fs
-
-fs.getSize = path =>
+export const getSize = path =>
   fs.stat(path).then(
     _ => _.size,
     error => {
@@ -16,7 +14,7 @@ fs.getSize = path =>
     }
   )
 
-fs.mktree = async function mkdirp(path) {
+export async function mktree(path) {
   try {
     await fs.mkdir(path)
   } catch (error) {
@@ -26,8 +24,8 @@ fs.mktree = async function mkdirp(path) {
       return
     }
     if (code === 'ENOENT') {
-      await mkdirp(dirname(path))
-      return mkdirp(path)
+      await mktree(dirname(path))
+      return mktree(path)
     }
     throw error
   }
@@ -37,7 +35,7 @@ fs.mktree = async function mkdirp(path) {
 //   - single param for direct use in `Array#map`
 //   - files are prefixed with directory path
 // - safer: returns empty array if path is missing or not a directory
-fs.readdir2 = path =>
+export const readdir2 = path =>
   fs.readdir(path).then(
     entries => {
       entries.forEach((entry, i) => {
@@ -59,7 +57,7 @@ fs.readdir2 = path =>
     }
   )
 
-fs.symlink2 = async (target, path) => {
+export async function symlink2(target, path) {
   try {
     await fs.symlink(target, path)
   } catch (error) {

@xen-orchestra/backups-cli/commands/clean-vms.js

@@ -1,40 +0,0 @@
-'use strict'
-
-// -----------------------------------------------------------------------------
-
-const asyncMap = require('lodash/curryRight')(require('@xen-orchestra/async-map').asyncMap)
-const getopts = require('getopts')
-const { RemoteAdapter } = require('@xen-orchestra/backups/RemoteAdapter')
-const { resolve } = require('path')
-
-const adapter = new RemoteAdapter(require('@xen-orchestra/fs').getHandler({ url: 'file://' }))
-
-module.exports = async function main(args) {
-  const { _, fix, remove, merge } = getopts(args, {
-    alias: {
-      fix: 'f',
-      remove: 'r',
-      merge: 'm',
-    },
-    boolean: ['fix', 'merge', 'remove'],
-    default: {
-      merge: false,
-      remove: false,
-    },
-  })
-
-  await asyncMap(_, async vmDir => {
-    vmDir = resolve(vmDir)
-    try {
-      await adapter.cleanVm(vmDir, {
-        fixMetadata: fix,
-        remove,
-        merge,
-        logInfo: (...args) => console.log(...args),
-        logWarn: (...args) => console.warn(...args),
-      })
-    } catch (error) {
-      console.error('adapter.cleanVm', vmDir, error)
-    }
-  })
-}

@xen-orchestra/backups-cli/commands/clean-vms.mjs

@@ -0,0 +1,38 @@
+import { asyncMap } from '@xen-orchestra/async-map'
+import { RemoteAdapter } from '@xen-orchestra/backups/RemoteAdapter.js'
+import { getSyncedHandler } from '@xen-orchestra/fs'
+import getopts from 'getopts'
+import { basename, dirname } from 'path'
+import Disposable from 'promise-toolbox/Disposable'
+import { pathToFileURL } from 'url'
+
+export default async function cleanVms(args) {
+  const { _, fix, remove, merge } = getopts(args, {
+    alias: {
+      fix: 'f',
+      remove: 'r',
+      merge: 'm',
+    },
+    boolean: ['fix', 'merge', 'remove'],
+    default: {
+      merge: false,
+      remove: false,
+    },
+  })
+
+  await asyncMap(_, vmDir =>
+    Disposable.use(getSyncedHandler({ url: pathToFileURL(dirname(vmDir)).href }), async handler => {
+      try {
+        await new RemoteAdapter(handler).cleanVm(basename(vmDir), {
+          fixMetadata: fix,
+          remove,
+          merge,
+          logInfo: (...args) => console.log(...args),
+          logWarn: (...args) => console.warn(...args),
+        })
+      } catch (error) {
+        console.error('adapter.cleanVm', vmDir, error)
+      }
+    })
+  )
+}

@xen-orchestra/backups-cli/commands/create-symlink-index.mjs

@@ -1,13 +1,10 @@
-'use strict'
+import { mktree, readdir2, readFile, symlink2 } from '../_fs.mjs'
+import { asyncMap } from '@xen-orchestra/async-map'
+import filenamify from 'filenamify'
+import get from 'lodash/get.js'
+import { dirname, join, relative } from 'path'
 
-const filenamify = require('filenamify')
-const get = require('lodash/get')
-const { asyncMap } = require('@xen-orchestra/async-map')
-const { dirname, join, relative } = require('path')
-
-const { mktree, readdir2, readFile, symlink2 } = require('../_fs')
-
-module.exports = async function createSymlinkIndex([backupDir, fieldPath]) {
+export default async function createSymlinkIndex([backupDir, fieldPath]) {
   const indexDir = join(backupDir, 'indexes', filenamify(fieldPath))
   await mktree(indexDir)
 

@xen-orchestra/backups-cli/commands/info.mjs

@@ -1,16 +1,13 @@
-'use strict'
-
-const groupBy = require('lodash/groupBy')
-const { asyncMap } = require('@xen-orchestra/async-map')
-const { createHash } = require('crypto')
-const { dirname, resolve } = require('path')
-
-const { readdir2, readFile, getSize } = require('../_fs')
+import { readdir2, readFile, getSize } from '../_fs.mjs'
+import { asyncMap } from '@xen-orchestra/async-map'
+import { createHash } from 'crypto'
+import groupBy from 'lodash/groupBy.js'
+import { dirname, resolve } from 'path'
 
 const sha512 = str => createHash('sha512').update(str).digest('hex')
 const sum = values => values.reduce((a, b) => a + b)
 
-module.exports = async function info(vmDirs) {
+export default async function info(vmDirs) {
   const jsonFiles = (
     await asyncMap(vmDirs, async vmDir => (await readdir2(vmDir)).filter(_ => _.endsWith('.json')))
   ).flat()

@xen-orchestra/backups-cli/index.mjs

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
+import { composeCommands } from './_composeCommands.mjs'
 
-'use strict'
+const importDefault = async path => (await import(path)).default
 
-require('./_composeCommands')({
+composeCommands({
   'clean-vms': {
-    get main() {
-      return require('./commands/clean-vms')
+    get default() {
+      return importDefault('./commands/clean-vms.mjs')
     },
     usage: `[--fix] [--merge] [--remove] xo-vm-backups/*
 
@@ -18,14 +19,14 @@ require('./_composeCommands')({
 `,
   },
   'create-symlink-index': {
-    get main() {
-      return require('./commands/create-symlink-index')
+    get default() {
+      return importDefault('./commands/create-symlink-index.mjs')
     },
     usage: 'xo-vm-backups <field path>',
   },
   info: {
-    get main() {
-      return require('./commands/info')
+    get default() {
+      return importDefault('./commands/info.mjs')
     },
     usage: 'xo-vm-backups/*',
   },

@xen-orchestra/backups-cli/package.json

@@ -1,21 +1,21 @@
 {
   "private": false,
   "bin": {
-    "xo-backups": "index.js"
+    "xo-backups": "index.mjs"
   },
   "preferGlobal": true,
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "dependencies": {
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/backups": "^0.29.0",
-    "@xen-orchestra/fs": "^3.2.0",
+    "@xen-orchestra/backups": "^0.29.1",
+    "@xen-orchestra/fs": "^3.3.0",
     "filenamify": "^4.1.0",
     "getopts": "^2.2.5",
     "lodash": "^4.17.15",
     "promise-toolbox": "^0.21.0"
   },
   "engines": {
-    "node": ">=7.10.1"
+    "node": ">=14"
   },
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/backups-cli",
   "name": "@xen-orchestra/backups-cli",
@@ -27,7 +27,7 @@
   "scripts": {
     "postversion": "npm publish --access public"
   },
-  "version": "0.7.8",
+  "version": "1.0.0",
   "license": "AGPL-3.0-or-later",
   "author": {
     "name": "Vates SAS",

@xen-orchestra/backups/RemoteAdapter.js

@@ -537,10 +537,6 @@ class RemoteAdapter {
     }
   }
 
-  async invalidateVmBackupListCache(vmUuid) {
-    await this.handler.unlink(this.#getVmBackupsCache(vmUuid))
-  }
-
   async #getCachabledDataListVmBackups(dir) {
     debug('generating cache', { path: dir })
 

@xen-orchestra/backups/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.29.0",
+  "version": "0.29.1",
   "engines": {
     "node": ">=14.6"
   },
@@ -21,13 +21,13 @@
     "@vates/cached-dns.lookup": "^1.0.0",
     "@vates/compose": "^2.1.0",
     "@vates/decorate-with": "^2.0.0",
-    "@vates/disposable": "^0.1.2",
+    "@vates/disposable": "^0.1.3",
     "@vates/fuse-vhd": "^1.0.0",
     "@vates/nbd-client": "*",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/fs": "^3.2.0",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/fs": "^3.3.0",
+    "@xen-orchestra/log": "^0.5.0",
     "@xen-orchestra/template": "^0.1.0",
     "compare-versions": "^5.0.1",
     "d3-time-format": "^3.0.0",
@@ -42,7 +42,7 @@
     "promise-toolbox": "^0.21.0",
     "proper-lockfile": "^4.1.2",
     "uuid": "^9.0.0",
-    "vhd-lib": "^4.1.1",
+    "vhd-lib": "^4.2.0",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
@@ -52,7 +52,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^1.5.2"
+    "@xen-orchestra/xapi": "^1.5.3"
   },
   "license": "AGPL-3.0-or-later",
   "author": {

@xen-orchestra/backups/writers/FullBackupWriter.js

@@ -49,7 +49,6 @@ exports.FullBackupWriter = class FullBackupWriter extends MixinBackupWriter(Abst
     const dataBasename = basename + '.xva'
     const dataFilename = backupDir + '/' + dataBasename
 
-    const metadataFilename = `${backupDir}/${basename}.json`
     const metadata = {
       jobId: job.id,
       mode: job.mode,

@xen-orchestra/fs/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@xen-orchestra/fs",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "license": "AGPL-3.0-or-later",
   "description": "The File System for Xen Orchestra backups.",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/fs",
@@ -30,7 +30,7 @@
     "@vates/decorate-with": "^2.0.0",
     "@vates/read-chunk": "^1.0.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "bind-property-descriptor": "^2.0.0",
     "decorator-synchronized": "^0.6.0",
     "execa": "^5.0.0",

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

@@ -284,15 +284,25 @@ export default class RemoteHandlerAbstract {
     return this._encryptor.decryptData(data)
   }
 
-  async rename(oldPath, newPath, { checksum = false } = {}) {
-    oldPath = normalizePath(oldPath)
-    newPath = normalizePath(newPath)
-
-    let p = timeout.call(this._rename(oldPath, newPath), this._timeout)
-    if (checksum) {
-      p = Promise.all([p, this._rename(checksumFile(oldPath), checksumFile(newPath))])
+  async #rename(oldPath, newPath, { checksum }, createTree = true) {
+    try {
+      let p = timeout.call(this._rename(oldPath, newPath), this._timeout)
+      if (checksum) {
+        p = Promise.all([p, this._rename(checksumFile(oldPath), checksumFile(newPath))])
+      }
+      await p
+    } catch (error) {
+      // ENOENT can be a missing target directory OR a missing source
+      if (error.code === 'ENOENT' && createTree) {
+        await this._mktree(dirname(newPath))
+        return this.#rename(oldPath, newPath, { checksum }, false)
+      }
+      throw error
     }
-    return p
+  }
+
+  rename(oldPath, newPath, { checksum = false } = {}) {
+    return this.#rename(normalizePath(oldPath), normalizePath(newPath), { checksum })
   }
 
   async copy(oldPath, newPath, { checksum = false } = {}) {

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

@@ -228,6 +228,17 @@ handlers.forEach(url => {
         expect(await handler.list('.')).toEqual(['file2'])
         expect(await handler.readFile(`file2`)).toEqual(TEST_DATA)
       })
+      it(`should rename the file and create dest directory`, async () => {
+        await handler.outputFile('file', TEST_DATA)
+        await handler.rename('file', `sub/file2`)
+
+        expect(await handler.list('sub')).toEqual(['file2'])
+        expect(await handler.readFile(`sub/file2`)).toEqual(TEST_DATA)
+      })
+      it(`should fail with enoent if source file is missing`, async () => {
+        const error = await rejectionOf(handler.rename('file', `sub/file2`))
+        expect(error.code).toBe('ENOENT')
+      })
     })
 
     describe('#rmdir()', () => {

@xen-orchestra/lite/.prettierrc.cjs

@@ -1,15 +1,2 @@
-module.exports = {
-  importOrder: [
-    "^[^/]+$",
-    "<THIRD_PARTY_MODULES>",
-    "^@/components/(.*)$",
-    "^@/composables/(.*)$",
-    "^@/libs/(.*)$",
-    "^@/router/(.*)$",
-    "^@/stores/(.*)$",
-    "^@/views/(.*)$",
-  ],
-  importOrderSeparation: false,
-  importOrderSortSpecifiers: true,
-  importOrderParserPlugins: ["typescript", "decorators-legacy"],
-};
+// Keeping this file to prevent applying the global monorepo config for now
+module.exports = {};

@xen-orchestra/lite/CHANGELOG.md

@@ -5,6 +5,7 @@
 - Invalidate sessionId token after logout (PR [#6480](https://github.com/vatesfr/xen-orchestra/pull/6480))
 - Settings page (PR [#6418](https://github.com/vatesfr/xen-orchestra/pull/6418))
 - Uncollapse hosts in the tree by default (PR [#6428](https://github.com/vatesfr/xen-orchestra/pull/6428))
+- Display RAM usage in pool dashboard (PR [#6419](https://github.com/vatesfr/xen-orchestra/pull/6419))
 
 ## **0.1.0**
 

@xen-orchestra/lite/README.md

@@ -91,18 +91,21 @@ const fontSize = ref("2rem");
 
 This project is using Font Awesome 6 Free.
 
-Here is how to use an icon in your template.
+Icons can be displayed with the `UiIcon` component.
 
-Note: `FontAwesomeIcon` is a global component that does not need to be imported.
+Passing `undefined` as `icon` prop will disable the component (no need to use an additional `v-if` condition).
+
+Use the `busy` prop to display a loader icon.
 
 ```vue
 <template>
   <div>
-    <FontAwesomeIcon :icon="faDisplay" />
+    <UiIcon :icon="faDisplay" />
   </div>
 </template>
 
 <script lang="ts" setup>
+import UiIcon from "@/components/ui/UiIcon.vue";
 import { faDisplay } from "@fortawesome/free-solid-svg-icons";
 </script>
 ```
@@ -115,8 +118,6 @@ Here is the equivalent between font weight and style name.
 | ---------- | ----------- |
 | Solid      | 900         |
 | Regular    | 400         |
-| Light      | 300         |
-| Thin       | 100         |
 
 ### CSS
 

@xen-orchestra/lite/package.json

@@ -7,8 +7,8 @@
     "preview": "vite preview --port 4173",
     "build-only": "GIT_HEAD=$(git rev-parse HEAD) vite build",
     "deploy": "./scripts/deploy.sh",
-    "type-check": "vue-tsc --noEmit",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
+    "test": "yarn run type-check",
+    "type-check": "vue-tsc --noEmit"
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.1.1",
@@ -18,7 +18,8 @@
     "@novnc/novnc": "^1.3.0",
     "@types/d3-time-format": "^4.0.0",
     "@types/lodash-es": "^4.17.6",
-    "@vueuse/core": "^8.7.5",
+    "@vueuse/core": "^9.5.0",
+    "@vueuse/math": "^9.5.0",
     "complex-matcher": "^0.7.0",
     "d3-time-format": "^4.1.0",
     "decorator-synchronized": "^0.6.0",
@@ -40,18 +41,18 @@
     "@intlify/vite-plugin-vue-i18n": "^6.0.1",
     "@limegrass/eslint-plugin-import-alias": "^1.0.5",
     "@rushstack/eslint-patch": "^1.1.0",
-    "@trivago/prettier-plugin-sort-imports": "^3.2.0",
     "@types/node": "^16.11.41",
-    "@vitejs/plugin-vue": "^2.3.3",
+    "@vitejs/plugin-vue": "^3.2.0",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^11.0.0",
     "@vue/tsconfig": "^0.1.3",
     "eslint-plugin-vue": "^9.0.0",
     "npm-run-all": "^4.1.5",
-    "postcss-nested": "^5.0.6",
-    "typescript": "~4.7.4",
-    "vite": "^2.9.12",
-    "vue-tsc": "^0.38.1"
+    "postcss": "^8.4.19",
+    "postcss-nested": "^6.0.0",
+    "typescript": "^4.9.3",
+    "vite": "^3.2.4",
+    "vue-tsc": "^1.0.9"
   },
   "private": true,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/lite",

@xen-orchestra/lite/src/App.vue

@@ -32,6 +32,9 @@
 </template>
 
 <script lang="ts" setup>
+import { useUiStore } from "@/stores/ui.store";
+import { useActiveElement, useMagicKeys, whenever } from "@vueuse/core";
+import { logicAnd } from "@vueuse/math";
 import { difference } from "lodash";
 import { computed, ref, watch, watchEffect } from "vue";
 import favicon from "@/assets/favicon.svg";
@@ -58,13 +61,28 @@ link.href = favicon;
 
 document.title = "XO Lite";
 
-if (window.localStorage?.getItem("colorMode") !== "light") {
-  document.documentElement.classList.add("dark");
-}
-
 const xenApiStore = useXenApiStore();
 const hostStore = useHostStore();
 useChartTheme();
+const uiStore = useUiStore();
+
+if (import.meta.env.DEV) {
+  const activeElement = useActiveElement();
+  const { D } = useMagicKeys();
+
+  const canToggleDarkMode = computed(() => {
+    if (activeElement.value == null) {
+      return true;
+    }
+
+    return !["INPUT", "TEXTAREA"].includes(activeElement.value.tagName);
+  });
+
+  whenever(
+    logicAnd(D, canToggleDarkMode),
+    () => (uiStore.colorMode = uiStore.colorMode === "dark" ? "light" : "dark")
+  );
+}
 
 watchEffect(() => {
   if (xenApiStore.isConnected) {

@xen-orchestra/lite/src/components/AppHeader.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script lang="ts" setup>
-import AccountButton from '@/components/AccountButton.vue'
+import AccountButton from "@/components/AccountButton.vue";
 </script>
 
 <style lang="postcss" scoped>

@xen-orchestra/lite/src/components/CollectionFilter.vue

@@ -43,14 +43,14 @@
 
     <template #buttons>
       <UiButton transparent @click="addNewFilter">
-          {{ $t("add-or") }}
-        </UiButton>
+        {{ $t("add-or") }}
+      </UiButton>
       <UiButton :disabled="!isFilterValid" type="submit">
         {{ $t(editedFilter ? "update" : "add") }}
       </UiButton>
       <UiButton outlined @click="handleCancel">
-          {{ $t("cancel") }}
-        </UiButton>
+        {{ $t("cancel") }}
+      </UiButton>
     </template>
   </UiModal>
 </template>

@xen-orchestra/lite/src/components/CollectionSorter.vue

@@ -41,8 +41,8 @@
     <template #buttons>
       <UiButton type="submit">{{ $t("add") }}</UiButton>
       <UiButton outlined @click="handleCancel">
-          {{ $t("cancel") }}
-        </UiButton>
+        {{ $t("cancel") }}
+      </UiButton>
     </template>
   </UiModal>
 </template>

@xen-orchestra/lite/src/components/ProgressBar.vue

@@ -3,10 +3,10 @@
     <div class="progress-bar">
       <div class="progress-bar-fill" />
     </div>
-    <div class="badge" v-if="label !== undefined">
+    <div class="legend" v-if="label !== undefined">
       <span class="circle" />
       {{ label }}
-      <UiBadge>{{ badgeLabel ?? progressWithUnit }}</UiBadge>
+      <UiBadge class="badge">{{ badgeLabel ?? progressWithUnit }}</UiBadge>
     </div>
   </div>
 </template>
@@ -33,9 +33,14 @@ const progressWithUnit = computed(() => {
 </script>
 
 <style lang="postcss" scoped>
-.badge {
+.legend {
   text-align: right;
-  margin: 1rem 0;
+  margin: 1.6em 0;
+}
+
+.badge {
+  font-size: 0.9em;
+  font-weight: 700;
 }
 
 .circle {

@xen-orchestra/lite/src/components/UsageBar.vue

@@ -1,24 +1,28 @@
 <template>
-  <div v-if="data.length !== 0">
+  <div>
     <div class="header">
       <slot name="header" />
     </div>
-    <ProgressBar
-      v-for="item in computedData.sortedArray"
-      :key="item.id"
-      :value="item.value"
-      :label="item.label"
-      :badge-label="item.badgeLabel"
-    />
-    <div class="footer">
-      <slot name="footer" :total-percent="computedData.totalPercentUsage" />
-    </div>
+    <template v-if="data !== undefined">
+      <ProgressBar
+        v-for="item in computedData.sortedArray"
+        :key="item.id"
+        :value="item.value"
+        :label="item.label"
+        :badge-label="item.badgeLabel"
+      />
+      <div class="footer">
+        <slot name="footer" :total-percent="computedData.totalPercentUsage" />
+      </div>
+    </template>
+    <UiSpinner v-else class="spinner" />
   </div>
 </template>
 
 <script lang="ts" setup>
 import { computed } from "vue";
 import ProgressBar from "@/components/ProgressBar.vue";
+import UiSpinner from "@/components/ui/UiSpinner.vue";
 
 interface Data {
   id: string;
@@ -29,7 +33,7 @@ interface Data {
 }
 
 interface Props {
-  data: Array<Data>;
+  data?: Array<Data>;
   nItems?: number;
 }
 
@@ -40,7 +44,7 @@ const computedData = computed(() => {
   let totalPercentUsage = 0;
   return {
     sortedArray: _data
-      .map((item) => {
+      ?.map((item) => {
         const value = Math.round((item.value / (item.maxValue ?? 100)) * 100);
         totalPercentUsage += value;
         return {
@@ -72,6 +76,14 @@ const computedData = computed(() => {
   font-size: 14px;
   color: var(--color-blue-scale-300);
 }
+
+.spinner {
+  color: var(--color-extra-blue-base);
+  display: flex;
+  margin: auto;
+  width: 40px;
+  height: 40px;
+}
 </style>
 
 <style>

@xen-orchestra/lite/src/components/infra/InfraHostItem.vue

@@ -12,7 +12,7 @@
       :icon="faServer"
       :route="{ name: 'host.dashboard', params: { uuid: host.uuid } }"
     >
-      {{ host.name_label || '(Host)' }}
+      {{ host.name_label || "(Host)" }}
       <template #actions>
         <InfraAction
           :icon="isExpanded ? faAngleDown : faAngleUp"

@xen-orchestra/lite/src/components/infra/InfraVmItem.vue

@@ -12,7 +12,7 @@
       :icon="faDisplay"
       :route="{ name: 'vm.console', params: { uuid: vm.uuid } }"
     >
-      {{ vm.name_label || '(VM)' }}
+      {{ vm.name_label || "(VM)" }}
       <template #actions>
         <InfraAction>
           <PowerStateIcon :state="vm?.power_state" />

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardRamUsage.vue

@@ -0,0 +1,14 @@
+<template>
+  <UiCard>
+    <UiTitle type="h4">{{ $t("ram-usage") }}</UiTitle>
+    <HostsRamUsage />
+    <VmsRamUsage />
+  </UiCard>
+</template>
+
+<script setup lang="ts">
+import HostsRamUsage from "@/components/pool/dashboard/ramUsage/HostsRamUsage.vue";
+import VmsRamUsage from "@/components/pool/dashboard/ramUsage/VmsRamUsage.vue";
+import UiCard from "@/components/ui/UiCard.vue";
+import UiTitle from "@/components/ui/UiTitle.vue";
+</script>

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardStatus.vue

@@ -14,6 +14,7 @@
         :label="$t('vms')"
       />
     </template>
+    <UiSpinner v-else class="spinner" />
   </UiCard>
 </template>
 
@@ -22,6 +23,7 @@ import { computed } from "vue";
 import PoolDashboardStatusItem from "@/components/pool/dashboard/PoolDashboardStatusItem.vue";
 import UiCard from "@/components/ui/UiCard.vue";
 import UiSeparator from "@/components/ui/UiSeparator.vue";
+import UiSpinner from "@/components/ui/UiSpinner.vue";
 import UiTitle from "@/components/ui/UiTitle.vue";
 import { useHostMetricsStore } from "@/stores/host-metrics.store";
 import { useVmStore } from "@/stores/vm.store";
@@ -45,3 +47,13 @@ const activeVmsCount = computed(() => {
   ).length;
 });
 </script>
+
+<style lang="postcss" scoped>
+.spinner {
+  color: var(--color-extra-blue-base);
+  display: flex;
+  margin: auto;
+  width: 40px;
+  height: 40px;
+}
+</style>

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardStorageUsage.vue

@@ -1,10 +1,10 @@
 <template>
   <UiCard>
     <UiTitle type="h4">{{ $t("storage-usage") }}</UiTitle>
-    <UsageBar :data="data.result" :nItems="5">
+    <UsageBar :data="srStore.isReady ? data.result : undefined" :nItems="N_ITEMS">
       <template #header>
         <span>{{ $t("storage") }}</span>
-        <span>{{ $t("top-#", { n: 5 }) }}</span>
+        <span>{{ $t("top-#", { n: N_ITEMS }) }}</span>
       </template>
       <template #footer v-if="showFooter">
         <div class="footer-card">
@@ -37,6 +37,7 @@ import UiCard from "@/components/ui/UiCard.vue";
 import UiTitle from "@/components/ui/UiTitle.vue";
 import { formatSize, percent } from "@/libs/utils";
 import { useSrStore } from "@/stores/storage.store";
+import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
 
 const srStore = useSrStore();
 

@xen-orchestra/lite/src/components/pool/dashboard/cpuUsage/HostsCpuUsage.vue

@@ -1,8 +1,8 @@
 <template>
-  <UsageBar :data="data" :n-items="5">
+  <UsageBar :data="statFetched ? data : undefined" :n-items="N_ITEMS">
     <template #header>
       <span>{{ $t("hosts") }}</span>
-      <span>{{ $t("top-#", { n: 5 }) }}</span>
+      <span>{{ $t("top-#", { n: N_ITEMS }) }}</span>
     </template>
   </UsageBar>
 </template>
@@ -13,6 +13,7 @@ import UsageBar from "@/components/UsageBar.vue";
 import type { Stat } from "@/composables/fetch-stats.composable";
 import { getAvgCpuUsage } from "@/libs/utils";
 import type { HostStats } from "@/libs/xapi-stats";
+import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
 
 const stats = inject<ComputedRef<Stat<HostStats>[]>>(
   "hostStats",
@@ -42,4 +43,10 @@ const data = computed<{ id: string; label: string; value: number }[]>(() => {
 
   return result;
 });
+
+const statFetched: ComputedRef<boolean> = computed(() =>
+  statFetched.value
+    ? true
+    : stats.value.length > 0 && stats.value.length === data.value.length
+);
 </script>

@xen-orchestra/lite/src/components/pool/dashboard/cpuUsage/VmsCpuUsage.vue

@@ -1,8 +1,8 @@
 <template>
-  <UsageBar :data="data" :n-items="5">
+  <UsageBar :data="statFetched ? data : undefined" :n-items="N_ITEMS">
     <template #header>
       <span>{{ $t("vms") }}</span>
-      <span>{{ $t("top-#", { n: 5 }) }}</span>
+      <span>{{ $t("top-#", { n: N_ITEMS }) }}</span>
     </template>
   </UsageBar>
 </template>
@@ -13,6 +13,7 @@ import UsageBar from "@/components/UsageBar.vue";
 import type { Stat } from "@/composables/fetch-stats.composable";
 import { getAvgCpuUsage } from "@/libs/utils";
 import type { VmStats } from "@/libs/xapi-stats";
+import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
 
 const stats = inject<ComputedRef<Stat<VmStats>[]>>(
   "vmStats",
@@ -42,4 +43,10 @@ const data = computed<{ id: string; label: string; value: number }[]>(() => {
 
   return result;
 });
+
+const statFetched: ComputedRef<boolean> = computed(() =>
+  statFetched.value
+    ? true
+    : stats.value.length > 0 && stats.value.length === data.value.length
+);
 </script>

@xen-orchestra/lite/src/components/pool/dashboard/ramUsage/HostsRamUsage.vue

@@ -0,0 +1,52 @@
+<template>
+  <UsageBar :data="statFetched ? data : undefined" :n-items="N_ITEMS">
+    <template #header>
+      <span>{{ $t("hosts") }}</span>
+      <span>{{ $t("top-#", { n: N_ITEMS }) }}</span>
+    </template>
+  </UsageBar>
+</template>
+
+<script lang="ts" setup>
+import { type ComputedRef, computed, inject } from "vue";
+import UsageBar from "@/components/UsageBar.vue";
+import type { Stat } from "@/composables/fetch-stats.composable";
+import { formatSize, parseRamUsage } from "@/libs/utils";
+import type { HostStats } from "@/libs/xapi-stats";
+import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
+
+const stats = inject<ComputedRef<Stat<HostStats>[]>>(
+  "hostStats",
+  computed(() => [])
+);
+
+const data = computed(() => {
+  const result: {
+    id: string;
+    label: string;
+    value: number;
+    badgeLabel: string;
+  }[] = [];
+
+  stats.value.forEach((stat) => {
+    if (stat.stats === undefined) {
+      return;
+    }
+
+    const { percentUsed, total, used } = parseRamUsage(stat.stats);
+    result.push({
+      id: stat.id,
+      label: stat.name,
+      value: percentUsed,
+      badgeLabel: `${formatSize(used)}/${formatSize(total)}`,
+    });
+  });
+  return result;
+});
+
+const statFetched: ComputedRef<boolean> = computed(
+  () =>
+    statFetched.value ||
+    (stats.value.length > 0 && stats.value.length === data.value.length)
+);
+</script>

@xen-orchestra/lite/src/components/pool/dashboard/ramUsage/VmsRamUsage.vue

@@ -0,0 +1,52 @@
+<template>
+  <UsageBar :data="statFetched ? data : undefined" :n-items="N_ITEMS">
+    <template #header>
+      <span>{{ $t("vms") }}</span>
+      <span>{{ $t("top-#", { n: N_ITEMS }) }}</span>
+    </template>
+  </UsageBar>
+</template>
+
+<script lang="ts" setup>
+import { type ComputedRef, computed, inject } from "vue";
+import UsageBar from "@/components/UsageBar.vue";
+import type { Stat } from "@/composables/fetch-stats.composable";
+import { formatSize, parseRamUsage } from "@/libs/utils";
+import type { VmStats } from "@/libs/xapi-stats";
+import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
+
+const stats = inject<ComputedRef<Stat<VmStats>[]>>(
+  "vmStats",
+  computed(() => [])
+);
+
+const data = computed(() => {
+  const result: {
+    id: string;
+    label: string;
+    value: number;
+    badgeLabel: string;
+  }[] = [];
+
+  stats.value.forEach((stat) => {
+    if (stat.stats === undefined) {
+      return;
+    }
+
+    const { percentUsed, total, used } = parseRamUsage(stat.stats);
+    result.push({
+      id: stat.id,
+      label: stat.name,
+      value: percentUsed,
+      badgeLabel: `${formatSize(used)}/${formatSize(total)}`,
+    });
+  });
+  return result;
+});
+
+const statFetched: ComputedRef<boolean> = computed(
+  () =>
+    statFetched.value ||
+    (stats.value.length > 0 && stats.value.length === data.value.length)
+);
+</script>

@xen-orchestra/lite/src/components/ui/UiBadge.vue

@@ -22,7 +22,7 @@ defineProps<{
   font-size: 1.4rem;
   font-weight: 500;
   padding: 0 0.8rem;
-  height: 2.4rem;
+  height: 1.8em;
   color: var(--color-blue-scale-500);
   border-radius: 9.6rem;
   background-color: var(--color-blue-scale-300);

@xen-orchestra/lite/src/components/ui/UiButton.vue

@@ -30,7 +30,12 @@ const props = withDefaults(
     transparent?: boolean;
     active?: boolean;
   }>(),
-  { busy: undefined, disabled: undefined, outlined: undefined }
+  {
+    busy: undefined,
+    disabled: undefined,
+    outlined: undefined,
+    transparent: undefined,
+  }
 );
 
 const isGroupBusy = inject("isButtonGroupBusy", false);

@xen-orchestra/lite/src/components/ui/UiButtonGroup.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ui-button-group">
+  <div :class="{ merge }" class="ui-button-group">
     <slot />
   </div>
 </template>
@@ -14,6 +14,7 @@ const props = defineProps<{
   color?: Color;
   outlined?: boolean;
   transparent?: boolean;
+  merge?: boolean;
 }>();
 provide(
   "isButtonGroupBusy",
@@ -40,8 +41,32 @@ provide(
 <style lang="postcss" scoped>
 .ui-button-group {
   display: flex;
-  justify-content: left;
   align-items: center;
+  justify-content: left;
   gap: 1rem;
+
+  &.merge {
+    gap: 0;
+
+    :slotted(.ui-button) {
+      &:not(:first-child) {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+
+        &.outlined {
+          border-left: none;
+        }
+      }
+
+      &:not(:last-child) {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+
+        &.outlined {
+          border-right: none;
+        }
+      }
+    }
+  }
 }
 </style>

@xen-orchestra/lite/src/composables/busy.composable.md

@@ -1,23 +1,22 @@
 # useBusy composable
 
 ```vue
-
 <template>
   <span class="error" v-if="error">{{ error }}</span>
   <button @click="run" :disabled="isBusy">Do something</button>
 </template>
 
 <script lang="ts" setup>
-  import useBusy from '@/composables/busy.composable';
+import useBusy from "@/composables/busy.composable";
 
-  async function doSomething() {
-    try {
-      // Doing some async work  
-    } catch (e) {
-      throw "Something bad happened";
-    }
+async function doSomething() {
+  try {
+    // Doing some async work
+  } catch (e) {
+    throw "Something bad happened";
   }
+}
 
-  const { isBusy, error, run } = useBusy(doSomething)
+const { isBusy, error, run } = useBusy(doSomething);
 </script>
 ```

@xen-orchestra/lite/src/composables/collection-filter.composable.md

@@ -13,19 +13,23 @@ const filteredCollection = myCollection.filter(predicate);
 By default, when adding/removing filters, the URL will update automatically.
 
 ```typescript
-addFilter('name:/^foo/i'); // Will update the URL with ?filter=name:/^foo/i
+addFilter("name:/^foo/i"); // Will update the URL with ?filter=name:/^foo/i
 ```
 
 ### Change the URL query string parameter name
 
 ```typescript
-const { /* ... */ } = useCollectionFilter({ queryStringParam: 'f' }); // ?f=name:/^foo/i
+const {
+  /* ... */
+} = useCollectionFilter({ queryStringParam: "f" }); // ?f=name:/^foo/i
 ```
 
 ### Disable the usage of URL query string
 
 ```typescript
-const { /* ... */ } = useCollectionFilter({ queryStringParam: undefined });
+const {
+  /* ... */
+} = useCollectionFilter({ queryStringParam: undefined });
 ```
 
 ## Example of using the composable with the `CollectionFilter` component
@@ -38,32 +42,32 @@ const { /* ... */ } = useCollectionFilter({ queryStringParam: undefined });
     @add-filter="addFilter"
     @remove-filter="removeFilter"
   />
-  
+
   <div v-for="item in filteredCollection">...</div>
 </template>
 
 <script lang="ts" setup>
-  import CollectionFilter from "@/components/CollectionFilter.vue";
-  import useCollectionFilter from "@/composables/collection-filter.composable";
-  import { computed } from "vue";
+import CollectionFilter from "@/components/CollectionFilter.vue";
+import useCollectionFilter from "@/composables/collection-filter.composable";
+import { computed } from "vue";
 
-  const collection = [
-    { name: "Foo", age: 5, registered: true },
-    { name: "Bar", age: 12, registered: false },
-    { name: "Foo Bar", age: 2, registered: true },
-    { name: "Bar Baz", age: 45, registered: false },
-    { name: "Foo Baz", age: 32, registered: false },
-    { name: "Foo Bar Baz", age: 32, registered: true },
-  ];
+const collection = [
+  { name: "Foo", age: 5, registered: true },
+  { name: "Bar", age: 12, registered: false },
+  { name: "Foo Bar", age: 2, registered: true },
+  { name: "Bar Baz", age: 45, registered: false },
+  { name: "Foo Baz", age: 32, registered: false },
+  { name: "Foo Bar Baz", age: 32, registered: true },
+];
 
-  const availableFilters: AvailableFilter[] = [
-    { property: "name", label: "Name", type: "string" },
-    { property: "age", label: "Age", type: "number" },
-    { property: "registered", label: "Registered", type: "boolean", icon: faKey },
-  ];
+const availableFilters: AvailableFilter[] = [
+  { property: "name", label: "Name", type: "string" },
+  { property: "age", label: "Age", type: "number" },
+  { property: "registered", label: "Registered", type: "boolean", icon: faKey },
+];
 
-  const { filters, addFilter, removeFilter, predicate } = useCollectionFilter();
-  
-  const filteredCollection = computed(() => collection.filter(predicate));
+const { filters, addFilter, removeFilter, predicate } = useCollectionFilter();
+
+const filteredCollection = computed(() => collection.filter(predicate));
 </script>
 ```

@xen-orchestra/lite/src/composables/filtered-collection.composable.md

@@ -2,14 +2,17 @@
 
 ```vue
 <script lang="ts" setup>
-  import useFilteredCollection from './filtered-collection.composable';
+import useFilteredCollection from "./filtered-collection.composable";
 
-  const players = [
-    { name: "Foo", team: "Blue" },
-    { name: "Bar", team: "Red" },
-    { name: "Baz", team: "Blue" },
-  ]
-  
-  const bluePlayers = useFilteredCollection(players, (player) => player.team === "Blue");
+const players = [
+  { name: "Foo", team: "Blue" },
+  { name: "Bar", team: "Red" },
+  { name: "Baz", team: "Blue" },
+];
+
+const bluePlayers = useFilteredCollection(
+  players,
+  (player) => player.team === "Blue"
+);
 </script>
 ```

@xen-orchestra/lite/src/composables/modal.composable.md

@@ -5,27 +5,28 @@
   <div v-for="item in items">
     {{ item.name }} <button @click="openRemoveModal(item)">Delete</button>
   </div>
-  
+
   <UiModal v-if="isRemoveModalOpen">
     Are you sure you want to delete {{ removeModalPayload.name }}
-    
-    <button @click="handleRemove">Yes</button> <button @click="closeRemoveModal">No</button>
+
+    <button @click="handleRemove">Yes</button>
+    <button @click="closeRemoveModal">No</button>
   </UiModal>
 </template>
 
 <script lang="ts" setup>
-  import useModal from '@/composables/modal.composable';
+import useModal from "@/composables/modal.composable";
 
-  const {
-    payload: removeModalPayload,
-    isOpen: isRemoveModalOpen,
-    open: openRemoveModal,
-    close: closeRemoveModal,
-  } = useModal()
-  
-  async function handleRemove() {
-    await removeItem(removeModalPayload.id);
-    closeRemoveModal()
-  }
+const {
+  payload: removeModalPayload,
+  isOpen: isRemoveModalOpen,
+  open: openRemoveModal,
+  close: closeRemoveModal,
+} = useModal();
+
+async function handleRemove() {
+  await removeItem(removeModalPayload.id);
+  closeRemoveModal();
+}
 </script>
 ```

@xen-orchestra/lite/src/composables/multi-select.composable.md

@@ -4,34 +4,30 @@
 <template>
   <table>
     <thead>
-    <tr>
-      <th>
-        <input type="checkbox" v-model="areAllSelected">
-      </th>
-      <th>Name</th>
-    </tr>
+      <tr>
+        <th>
+          <input type="checkbox" v-model="areAllSelected" />
+        </th>
+        <th>Name</th>
+      </tr>
     </thead>
     <tbody>
-    <tr v-for="item in items">
-      <td>
-        <input type="checkbox" :value="item.id" v-model="selected" />
-      </td>
-      <td>{{ item.name }}</td>
-    </tr>
+      <tr v-for="item in items">
+        <td>
+          <input type="checkbox" :value="item.id" v-model="selected" />
+        </td>
+        <td>{{ item.name }}</td>
+      </tr>
     </tbody>
   </table>
-  
+
   <!-- You can use something else than a "Select All" checkbox -->
   <button @click="areAllSelected = !areAllSelected">Toggle all selected</button>
 </template>
 
-
 <script lang="ts" setup>
-  import useMultiSelect from './multi-select.composable';
+import useMultiSelect from "./multi-select.composable";
 
-  const {
-    selected,
-    areAllSelected,
-  } = useMultiSelect()
+const { selected, areAllSelected } = useMultiSelect();
 </script>
 ```

@xen-orchestra/lite/src/libs/utils.ts

@@ -123,3 +123,37 @@ export const buildXoObject = (
   ...record,
   $ref: params.opaqueRef,
 });
+
+export function parseRamUsage(
+  {
+    memory,
+    memoryFree,
+  }: {
+    memory: number[];
+    memoryFree?: number[];
+  },
+  { nSequence = 4 } = {}
+) {
+  const _nSequence = Math.min(memory.length, nSequence);
+
+  let total = 0;
+  let used = 0;
+
+  memory = memory.slice(memory.length - _nSequence);
+  memoryFree = memoryFree?.slice(memoryFree.length - _nSequence);
+
+  memory.forEach((ram, key) => {
+    total += ram;
+    used += ram - (memoryFree?.[key] ?? 0);
+  });
+
+  const percentUsed = percent(used, total);
+  return {
+    // In case `memoryFree` is not given by the xapi,
+    // we won't be able to calculate the percentage of used memory properly.
+    percentUsed:
+      memoryFree === undefined || isNaN(percentUsed) ? 0 : percentUsed,
+    total: total / _nSequence,
+    used: memoryFree === undefined ? 0 : used / _nSequence,
+  };
+}

@xen-orchestra/lite/src/libs/xapi-stats.ts

@@ -259,7 +259,7 @@ export type VmStats = {
     w: Record<string, number[]>;
   };
   memory: number[];
-  memoryFree: number[];
+  memoryFree?: number[];
   vifs: {
     rx: Record<string, number[]>;
     tx: Record<string, number[]>;

@xen-orchestra/lite/src/locales/en.json

@@ -15,7 +15,9 @@
   "community-name": "{name} community",
   "copy": "Copy",
   "cpu-usage":"CPU usage",
-  "dark-mode": "Dark mode",
+  "theme-dark": "Dark",
+  "theme-light": "Light",
+  "theme-auto": "Auto",
   "dashboard": "Dashboard",
   "delete": "Delete",
   "descending": "descending",
@@ -37,6 +39,7 @@
   "or": "Or",
   "password": "Password",
   "property": "Property",
+  "ram-usage":"RAM usage",
   "send-us-feedback": "Send us feedback",
   "settings": "Settings",
   "snapshot": "Snapshot",

@xen-orchestra/lite/src/locales/fr.json

@@ -15,7 +15,9 @@
   "community-name": "Communauté {name}",
   "copy": "Copier",
   "cpu-usage":"Utilisation CPU",
-  "dark-mode": "Mode sombre",
+  "theme-dark": "Sombre",
+  "theme-light": "Clair",
+  "theme-auto": "Auto",
   "dashboard": "Tableau de bord",
   "delete": "Supprimer",
   "descending": "descendant",
@@ -37,6 +39,7 @@
   "or": "Ou",
   "password": "Mot de passe",
   "property": "Propriété",
+  "ram-usage":"Utilisation de la RAM",
   "send-us-feedback": "Envoyez-nous vos commentaires",
   "settings": "Paramètres",
   "snapshot": "Instantané",

@xen-orchestra/lite/src/stores/host.store.ts

@@ -1,12 +1,11 @@
-import { defineStore } from "pinia";
 import { sortRecordsByNameLabel } from "@/libs/utils";
 import type { GRANULARITY } from "@/libs/xapi-stats";
 import type { XenApiHost } from "@/libs/xen-api";
 import { createRecordContext } from "@/stores/index";
 import { useXenApiStore } from "@/stores/xen-api.store";
+import { defineStore } from "pinia";
 
 export const useHostStore = defineStore("host", () => {
-  const xapiStats = useXenApiStore().getXapiStats();
   const recordContext = createRecordContext<XenApiHost>("host", {
     sort: sortRecordsByNameLabel,
   });
@@ -16,7 +15,7 @@ export const useHostStore = defineStore("host", () => {
     if (host === undefined) {
       throw new Error(`Host ${id} could not be found.`);
     }
-    return xapiStats._getAndUpdateStats({
+    return useXenApiStore().getXapiStats()._getAndUpdateStats({
       host,
       uuid: host.uuid,
       granularity,

@xen-orchestra/lite/src/stores/ui.store.ts

@@ -1,10 +1,14 @@
+import { useColorMode } from "@vueuse/core";
 import { defineStore } from "pinia";
 import { ref } from "vue";
 
 export const useUiStore = defineStore("ui", () => {
   const currentHostOpaqueRef = ref();
 
+  const colorMode = useColorMode({ emitAuto: true, initialValue: "dark" });
+
   return {
+    colorMode,
     currentHostOpaqueRef,
   };
 });

@xen-orchestra/lite/src/stores/vm.store.ts

@@ -1,15 +1,14 @@
-import { defineStore } from "pinia";
-import { computed } from "vue";
 import { sortRecordsByNameLabel } from "@/libs/utils";
 import type { GRANULARITY } from "@/libs/xapi-stats";
 import type { XenApiVm } from "@/libs/xen-api";
 import { useHostStore } from "@/stores/host.store";
 import { createRecordContext } from "@/stores/index";
 import { useXenApiStore } from "@/stores/xen-api.store";
+import { defineStore } from "pinia";
+import { computed } from "vue";
 
 export const useVmStore = defineStore("vm", () => {
   const hostStore = useHostStore();
-  const xapiStats = useXenApiStore().getXapiStats();
   const baseVmContext = createRecordContext<XenApiVm>("VM", {
     filter: (vm) =>
       !vm.is_a_snapshot && !vm.is_a_template && !vm.is_control_domain,
@@ -42,7 +41,7 @@ export const useVmStore = defineStore("vm", () => {
       throw new Error(`VM ${id} is halted or host could not be found.`);
     }
 
-    return xapiStats._getAndUpdateStats({
+    return useXenApiStore().getXapiStats()._getAndUpdateStats({
       host,
       uuid: vm.uuid,
       granularity,

@xen-orchestra/lite/src/views/pool/PoolDashboardView.vue

@@ -3,13 +3,18 @@
     <PoolDashboardStatus class="item" />
     <PoolDashboardStorageUsage class="item" />
     <PoolDashboardCpuUsage class="item" />
+    <PoolDashboardRamUsage class="item" />
   </div>
 </template>
 
+<script lang="ts">
+export const N_ITEMS = 5;
+</script>
 <script lang="ts" setup>
 import { differenceBy } from "lodash-es";
 import { computed, onMounted, provide, watch } from "vue";
 import PoolDashboardCpuUsage from "@/components/pool/dashboard/PoolDashboardCpuUsage.vue";
+import PoolDashboardRamUsage from "@/components/pool/dashboard/PoolDashboardRamUsage.vue";
 import PoolDashboardStatus from "@/components/pool/dashboard/PoolDashboardStatus.vue";
 import PoolDashboardStorageUsage from "@/components/pool/dashboard/PoolDashboardStorageUsage.vue";
 import useFetchStats from "@/composables/fetch-stats.composable";

@xen-orchestra/lite/src/views/settings/SettingsView.vue

@@ -19,7 +19,9 @@
               rel="noopener noreferrer"
               href="https://xcp-ng.org/blog/"
               >{{ $t("news-name", { name: "XCP-ng" }) }}</a
-            > - <a
+            >
+            -
+            <a
               target="_blank"
               rel="noopener noreferrer"
               href="https://xen-orchestra.com/blog/"
@@ -35,7 +37,9 @@
               rel="noopener noreferrer"
               href="https://xcp-ng.org/forum"
               >{{ $t("community-name", { name: "XCP-ng" }) }}</a
-            > - <a
+            >
+            -
+            <a
               target="_blank"
               rel="noopener noreferrer"
               href="https://xcp-ng.org/forum/category/12/xen-orchestra"
@@ -50,14 +54,15 @@
       <UiKeyValueList>
         <UiKeyValueRow>
           <template #key>{{ $t("appearance") }}</template>
-          <template #value
-            ><FormLabel>
-              <FormToggle
-                :modelValue="darkMode"
-                @update:modelValue="setDarkMode"
-              />{{ $t("dark-mode") }}</FormLabel
-            ></template
-          >
+          <template #value>
+            <FormLabel>
+              <FormSelect v-model="colorMode">
+                <option value="auto">{{ $t("theme-auto") }}</option>
+                <option value="dark">{{ $t("theme-dark") }}</option>
+                <option value="light">{{ $t("theme-light") }}</option>
+              </FormSelect>
+            </FormLabel>
+          </template>
         </UiKeyValueRow>
       </UiKeyValueList>
     </UiCard>
@@ -85,15 +90,16 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from "vue";
+import FormSelect from "@/components/form/FormSelect.vue";
+import { useUiStore } from "@/stores/ui.store";
+import { storeToRefs } from "pinia";
+import { watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { locales } from "@/i18n";
 import { faEarthAmericas, faGear } from "@fortawesome/free-solid-svg-icons";
-import { useLocalStorage } from "@vueuse/core";
 import FormWidget from "@/components/FormWidget.vue";
 import TitleBar from "@/components/TitleBar.vue";
 import FormLabel from "@/components/form/FormLabel.vue";
-import FormToggle from "@/components/form/FormToggle.vue";
 import UiCard from "@/components/ui/UiCard.vue";
 import UiKeyValueList from "@/components/ui/UiKeyValueList.vue";
 import UiKeyValueRow from "@/components/ui/UiKeyValueRow.vue";
@@ -105,12 +111,7 @@ const { locale } = useI18n();
 
 watch(locale, (newLocale) => localStorage.setItem("lang", newLocale));
 
-const colorMode = useLocalStorage<string>("colorMode", "dark");
-const darkMode = computed(() => colorMode.value !== "light");
-const setDarkMode = (enabled: boolean) => {
-  colorMode.value = enabled ? "dark" : "light";
-  document.documentElement.classList[enabled ? "add" : "remove"]("dark");
-};
+const { colorMode } = storeToRefs(useUiStore());
 </script>
 
 <style lang="postcss" scoped>

@xen-orchestra/lite/tsconfig.json

@@ -3,7 +3,10 @@
   "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
   "compilerOptions": {
     "experimentalDecorators": true,
-    "lib": ["ES2019"],
+    "lib": [
+      "ES2019",
+      "dom"
+    ],
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]

@xen-orchestra/lite/vite.config.ts

@@ -1,10 +1,14 @@
-import { URL, fileURLToPath } from "url";
-import { defineConfig } from "vite";
 import vueI18n from "@intlify/vite-plugin-vue-i18n";
 import vue from "@vitejs/plugin-vue";
+import { fileURLToPath, URL } from "url";
+import { defineConfig } from "vite";
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  server: {
+    host: "127.0.0.1",
+    port: 3000,
+  },
   plugins: [vue(), vueI18n()],
   define: {
     XO_LITE_VERSION: JSON.stringify(process.env.npm_package_version),

@xen-orchestra/log/_compileGlobPattern.js

@@ -0,0 +1,33 @@
+'use strict'
+
+const escapeRegExp = require('lodash/escapeRegExp')
+
+const compileGlobPatternFragment = pattern => pattern.split('*').map(escapeRegExp).join('.*')
+
+module.exports = function 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(''))
+}

@xen-orchestra/log/configure.js

@@ -1,8 +1,8 @@
 'use strict'
 
+const compileGlobPattern = require('./_compileGlobPattern.js')
 const createConsoleTransport = require('./transports/console')
 const { LEVELS, resolve } = require('./levels')
-const { compileGlobPattern } = require('./utils')
 
 // ===================================================================
 

@xen-orchestra/log/index.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const compileGlobPattern = require('./_compileGlobPattern.js')
 const createTransport = require('./transports/console')
 const { LEVELS, resolve } = require('./levels')
 
@@ -8,8 +9,19 @@ if (!(symbol in global)) {
   // the default behavior, without requiring `configure` is to avoid
   // logging anything unless it's a real error
   const transport = createTransport()
-  const level = resolve(process.env.LOG_LEVEL, LEVELS.WARN)
-  global[symbol] = log => log.level >= level && transport(log)
+
+  const { env } = process
+
+  const pattern = [env.DEBUG, env.NODE_DEBUG].filter(Boolean).join(',')
+  const matchDebug = pattern.length !== 0 ? RegExp.prototype.test.bind(compileGlobPattern(pattern)) : () => false
+
+  const level = resolve(env.LOG_LEVEL, LEVELS.WARN)
+
+  global[symbol] = function conditionalTransport(log) {
+    if (log.level >= level || matchDebug(log.namespace)) {
+      transport(log)
+    }
+  }
 }
 
 // -------------------------------------------------------------------

@xen-orchestra/log/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@xen-orchestra/log",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "license": "ISC",
   "description": "Logging system with decoupled producers/consumer",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/log",

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

@@ -1,9 +1,9 @@
 'use strict'
 
 const fromCallback = require('promise-toolbox/fromCallback')
-// eslint-disable-next-line n/no-missing-require
+// eslint-disable-next-line n/no-extraneous-require
 const splitHost = require('split-host')
-// eslint-disable-next-line n/no-missing-require
+// eslint-disable-next-line n/no-extraneous-require
 const { createClient, Facility, Severity, Transport } = require('syslog-client')
 
 const LEVELS = require('../levels')

@xen-orchestra/log/utils.js

@@ -1,9 +1,5 @@
 'use strict'
 
-const escapeRegExp = require('lodash/escapeRegExp')
-
-// ===================================================================
-
 const TPL_RE = /\{\{(.+?)\}\}/g
 const evalTemplate = (tpl, data) => {
   const getData = typeof data === 'function' ? (_, key) => data(key) : (_, key) => data[key]
@@ -14,39 +10,6 @@ exports.evalTemplate = evalTemplate
 
 // -------------------------------------------------------------------
 
-const compileGlobPatternFragment = pattern => pattern.split('*').map(escapeRegExp).join('.*')
-
-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(''))
-}
-exports.compileGlobPattern = compileGlobPattern
-
-// -------------------------------------------------------------------
-
 const required = name => {
   throw new Error(`missing required arg ${name}`)
 }

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

@@ -3,7 +3,7 @@
 const { describe, it } = require('test')
 const assert = require('assert').strict
 
-const { compileGlobPattern } = require('./utils')
+const compileGlobPattern = require('./_compileGlobPattern.js')
 
 describe('compileGlobPattern()', () => {
   it('works', () => {

@xen-orchestra/mixin/.USAGE.md

@@ -0,0 +1,20 @@
+- mixins can depend on each other, they will be instanciated on-demand
+
+```js
+import mixin from '@xen-orchestra/mixin'
+
+class MyMixin {
+  constructor(app, ...mixinParams) {}
+
+  foo() {}
+}
+
+class App {
+  constructor() {
+    mixin(this, { MyMixin }, [...mixinParams])
+  }
+}
+
+app = new App()
+app.myMixin.foo()
+```

@xen-orchestra/mixin/README.md

@@ -12,6 +12,29 @@ Installation of the [npm package](https://npmjs.org/package/@xen-orchestra/mixin
 > npm install --save @xen-orchestra/mixin
 ```
 
+## Usage
+
+- mixins can depend on each other, they will be instanciated on-demand
+
+```js
+import mixin from '@xen-orchestra/mixin'
+
+class MyMixin {
+  constructor(app, ...mixinParams) {}
+
+  foo() {}
+}
+
+class App {
+  constructor() {
+    mixin(this, { MyMixin }, [...mixinParams])
+  }
+}
+
+app = new App()
+app.myMixin.foo()
+```
+
 ## Contributions
 
 Contributions are _very_ welcomed, either on the documentation or on

@xen-orchestra/mixins/package.json

@@ -14,7 +14,7 @@
     "url": "https://vates.fr"
   },
   "license": "AGPL-3.0-or-later",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "engines": {
     "node": ">=15.6"
   },
@@ -22,7 +22,7 @@
     "@vates/event-listeners-manager": "^1.0.1",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/emit-async": "^1.0.0",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "acme-client": "^5.0.0",
     "app-conf": "^2.3.0",
     "lodash": "^4.17.21",

@xen-orchestra/proxy/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@xen-orchestra/proxy",
-  "version": "0.26.4",
+  "version": "0.26.5",
   "license": "AGPL-3.0-or-later",
   "description": "XO Proxy used to remotely execute backup jobs",
   "keywords": [
@@ -30,15 +30,15 @@
     "@vates/cached-dns.lookup": "^1.0.0",
     "@vates/compose": "^2.1.0",
     "@vates/decorate-with": "^2.0.0",
-    "@vates/disposable": "^0.1.2",
+    "@vates/disposable": "^0.1.3",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/backups": "^0.29.0",
-    "@xen-orchestra/fs": "^3.2.0",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/backups": "^0.29.1",
+    "@xen-orchestra/fs": "^3.3.0",
+    "@xen-orchestra/log": "^0.5.0",
     "@xen-orchestra/mixin": "^0.1.0",
-    "@xen-orchestra/mixins": "^0.8.1",
+    "@xen-orchestra/mixins": "^0.8.2",
     "@xen-orchestra/self-signed": "^0.1.3",
-    "@xen-orchestra/xapi": "^1.5.2",
+    "@xen-orchestra/xapi": "^1.5.3",
     "ajv": "^8.0.3",
     "app-conf": "^2.3.0",
     "async-iterator-to-stream": "^1.1.0",

@xen-orchestra/upload-ova/package.json

@@ -43,7 +43,7 @@
     "pw": "^0.0.4",
     "xdg-basedir": "^4.0.0",
     "xo-lib": "^0.11.1",
-    "xo-vmdk-to-vhd": "^2.4.3"
+    "xo-vmdk-to-vhd": "^2.5.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",

@xen-orchestra/xapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/xapi",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/xapi",
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "repository": {
@@ -23,14 +23,14 @@
   "dependencies": {
     "@vates/decorate-with": "^2.0.0",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "d3-time-format": "^3.0.0",
     "golike-defer": "^0.5.1",
     "http-request-plus": "^0.14.0",
     "json-rpc-protocol": "^0.13.2",
     "lodash": "^4.17.15",
     "promise-toolbox": "^0.21.0",
-    "vhd-lib": "^4.1.1",
+    "vhd-lib": "^4.2.0",
     "xo-common": "^0.8.0"
   },
   "private": false,

CHANGELOG.md

@@ -1,9 +1,69 @@
 # ChangeLog
 
-## **5.76.1** (2022-11-08)
+## **5.77.0** (2022-11-30)
 
 <img id="latest" src="https://badgen.net/badge/channel/latest/yellow" alt="Channel: latest" />
 
+### Highlights
+
+- [Proxies] Ability to register an existing proxy (PR [#6556](https://github.com/vatesfr/xen-orchestra/pull/6556))
+- [VM] [Warm migration](https://xen-orchestra.com/blog/warm-migration-with-xen-orchestra/) support (PRs [6549](https://github.com/vatesfr/xen-orchestra/pull/6549) & [6549](https://github.com/vatesfr/xen-orchestra/pull/6549))
+
+### Enhancements
+
+- [Remotes] Prevent remote path from ending with `xo-vm-backups` as it's usually a mistake
+- [OVA export] Speed up OVA generation by 2. Generated file will be bigger (as big as uncompressed XVA) (PR [#6487](https://github.com/vatesfr/xen-orchestra/pull/6487))
+- [Settings/Users] Add `Remove` button to delete OTP of users from the admin panel [Forum#6521](https://xcp-ng.org/forum/topic/6521/remove-totp-on-a-user-account) (PR [#6541](https://github.com/vatesfr/xen-orchestra/pull/6541))
+- [Plugin/transport-nagios] XO now reports backed up VMs invidually with the VM name label used as _host_ and backup job name used as _service_
+- [VM/Advanced] Add warm migration button (PR [#6533](https://github.com/vatesfr/xen-orchestra/pull/6533))
+
+### Bug fixes
+
+- [Dashboard/Health] Fix `Unknown SR` and `Unknown VDI` in Unhealthy VDIs (PR [#6519](https://github.com/vatesfr/xen-orchestra/pull/6519))
+- [Delta Backup] Can now recover VHD merge when failed at the begining
+- [Delta Backup] Fix `ENOENT` errors when merging a VHD directory on non-S3 remote
+- [Remote] Prevent the browser from auto-completing the encryption key field
+
+### Released packages
+
+- @xen-orchestra/log 0.5.0
+- @vates/disposable 0.1.3
+- @xen-orchestra/fs 3.3.0
+- vhd-lib 4.2.0
+- @xen-orchestra/audit-core 0.2.2
+- @xen-orchestra/backups 0.29.1
+- @xen-orchestra/backups-cli 1.0.0
+- @xen-orchestra/mixins 0.8.2
+- @xen-orchestra/xapi 1.5.3
+- @xen-orchestra/proxy 0.26.5
+- xo-vmdk-to-vhd 2.5.0
+- xo-cli 0.14.2
+- xo-server 5.107.1
+- xo-server-audit 0.10.2
+- xo-server-auth-ldap 0.10.6
+- xo-server-backup-reports 0.17.2
+- xo-server-load-balancer 0.7.2
+- xo-server-netbox 0.3.5
+- xo-server-sdn-controller 1.0.7
+- xo-server-transport-nagios 1.0.0
+- xo-server-usage-report 0.10.2
+- xo-server-web-hooks 0.3.2
+- xo-web 5.108.0
+
+## **5.76.2** (2022-11-14)
+
+<img id="stable" src="https://badgen.net/badge/channel/stable/green" alt="Channel: stable" />
+
+### Bug fixes
+
+- [Proxies] Fix `this.getObject is not a function` on upgrade
+
+### Released packages
+
+- xo-server 5.106.1
+
+## **5.76.1** (2022-11-08)
+
 ### Enhancements
 
 - [API] `proxy.register` accepts `vmUuid` parameter which can be used when not connected to the XAPI containing the XO Proxy VM
@@ -72,8 +132,6 @@
 
 ## **5.75.0** (2022-09-30)
 
-<img id="stable" src="https://badgen.net/badge/channel/stable/green" alt="Channel: stable" />
-
 ### Enhancements
 
 - [Backup/Restore file] Implement File level restore for s3 and encrypted backups (PR [#6409](https://github.com/vatesfr/xen-orchestra/pull/6409))

CHANGELOG.unreleased.md

@@ -11,9 +11,6 @@
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
-- [Dashboard/Health] Fix `Unknown SR` and `Unknown VDI` in Unhealthy VDIs (PR [#6519](https://github.com/vatesfr/xen-orchestra/pull/6519))
-- [Proxies] Fix `this.getObject is not a function` on upgrade
-
 ### Packages to release
 
 > When modifying a package, add it here with its release type.
@@ -29,7 +26,4 @@
 > Keep this list alphabetically ordered to avoid merge conflicts
 
 <!--packages-start-->
-
-- xo-web minor
-
 <!--packages-end-->

docker/Dockerfile

@@ -15,10 +15,8 @@ RUN /bin/bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use
 ENV NODE_PATH $NVM_DIR/versions/node/$NODE_VERSION/lib/node_modules
 ENV PATH      $NVM_DIR/versions/node/$NODE_VERSION/bin:$PATH
 
-RUN  npm install -g yarn
+RUN npm install -g yarn
 
 WORKDIR /xen-orchestra
-#  invalidate build on package change
-COPY ./yarn.lock /xen-orchestra/yarn.lock
-ENTRYPOINT yarn ci
 
+ENTRYPOINT yarn ci

package.json

@@ -3,10 +3,9 @@
     "@babel/core": "^7.0.0",
     "@babel/eslint-parser": "^7.13.8",
     "@babel/register": "^7.0.0",
-    "@vates/async-each": "1.0.0",
+    "@vates/async-each": "^1.0.0",
     "babel-jest": "^29.0.3",
     "benchmark": "^2.1.4",
-    "deptree": "^1.0.0",
     "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-config-standard": "^17.0.0",
@@ -20,7 +19,7 @@
     "getopts": "^2.3.0",
     "globby": "^13.1.1",
     "handlebars": "^4.7.6",
-    "husky": "^4.2.5",
+    "husky": "^8.0.2",
     "jest": "^29.0.3",
     "lint-staged": "^13.0.3",
     "lodash": "^4.17.4",
@@ -34,11 +33,6 @@
     "node": ">=14",
     "yarn": "^1.7.0"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged && scripts/lint-staged.js"
-    }
-  },
   "jest": {
     "moduleNameMapper": {
       "^(@vates/[^/]+)$": [
@@ -75,23 +69,30 @@
     "testRegex": "\\.spec\\.js$"
   },
   "lint-staged": {
-    "*.{md,ts,ts}": "prettier --write"
+    "*": [
+      "scripts/run-changed-pkgs.js test",
+      "prettier --ignore-unknown --write"
+    ],
+    "*.{{{,c,m}j,t}s{,x},vue}": [
+      "eslint --ignore-pattern '!*'",
+      "jest --testRegex='^(?!.*.integ.spec.js$).*.spec.js$' --findRelatedTests --passWithNoTests"
+    ]
   },
   "private": true,
   "scripts": {
     "build": "scripts/run-script.js --parallel --concurrency 2 build",
-    "ci": "yarn && yarn build &&  yarn test-integration",
+    "ci": "yarn && yarn build && yarn test && yarn test-integration",
     "clean": "scripts/run-script.js --parallel clean",
-    "dev": "scripts/run-script.js --parallel dev",
+    "dev": "scripts/run-script.js --parallel --concurrency 0 --verbose dev",
     "dev-test": "jest --bail --watch \"^(?!.*\\.integ\\.spec\\.js$)\"",
     "docs:dev": "vuepress dev docs",
     "docs:build": "vuepress build docs",
+    "prepare": "husky install",
     "prettify": "prettier --ignore-path .gitignore --write '**/*.{cjs,js,jsx,md,mjs,ts,tsx}'",
-    "test": "npm run test-lint && npm run test-unit",
+    "test": "yarn run test-lint && yarn run test-unit",
     "test-integration": "jest \".integ\\.spec\\.js$\"",
-    "test-lint": "eslint --ignore-path .gitignore .",
-    "test-unit": "jest \"^(?!.*\\.integ\\.spec\\.js$)\" && scripts/run-script.js test",
-    "travis-tests": "scripts/travis-tests.js"
+    "test-lint": "eslint --ignore-path .gitignore --ignore-pattern packages/xo-web .",
+    "test-unit": "jest \"^(?!.*\\.integ\\.spec\\.js$)\" && scripts/run-script.js --bail test"
   },
   "workspaces": [
     "@*/*",

packages/complex-matcher/index.test.js

@@ -1,7 +1,8 @@
-/* eslint-env jest */
-
 'use strict'
 
+const { describe, it } = require('test')
+const assert = require('assert').strict
+
 const { ast, pattern } = require('./index.fixtures')
 const {
   getPropertyClausesStrings,
@@ -17,7 +18,7 @@ const {
 
 it('getPropertyClausesStrings', () => {
   const tmp = getPropertyClausesStrings(parse('foo bar:baz baz:|(foo bar /^boo$/ /^far$/) foo:/^bar$/'))
-  expect(tmp).toEqual({
+  assert.deepEqual(tmp, {
     bar: ['baz'],
     baz: ['foo', 'bar', 'boo', 'far'],
     foo: ['bar'],
@@ -26,72 +27,72 @@ it('getPropertyClausesStrings', () => {
 
 describe('parse', () => {
   it('analyses a string and returns a node/tree', () => {
-    expect(parse(pattern)).toEqual(ast)
+    assert.deepEqual(parse(pattern), ast)
   })
 
   it('supports an empty string', () => {
-    expect(parse('')).toEqual(new Null())
+    assert.deepEqual(parse(''), new Null())
   })
 
   it('differentiate between numbers and numbers in strings', () => {
     let node
 
     node = parse('32')
-    expect(node.match(32)).toBe(true)
-    expect(node.match('32')).toBe(true)
-    expect(node.toString()).toBe('32')
+    assert.equal(node.match(32), true)
+    assert.equal(node.match('32'), true)
+    assert.equal(node.toString(), '32')
 
     node = parse('"32"')
-    expect(node.match(32)).toBe(false)
-    expect(node.match('32')).toBe(true)
-    expect(node.toString()).toBe('"32"')
+    assert.equal(node.match(32), false)
+    assert.equal(node.match('32'), true)
+    assert.equal(node.toString(), '"32"')
   })
 
   it('supports non-ASCII letters in raw strings', () => {
-    expect(parse('åäöé:ÅÄÖÉ')).toStrictEqual(new Property('åäöé', new StringNode('ÅÄÖÉ')))
+    assert.deepEqual(parse('åäöé:ÅÄÖÉ'), new Property('åäöé', new StringNode('ÅÄÖÉ')))
   })
 })
 
 describe('GlobPattern', () => {
   it('matches a glob pattern recursively', () => {
-    expect(new GlobPattern('b*r').match({ foo: 'bar' })).toBe(true)
+    assert.equal(new GlobPattern('b*r').match({ foo: 'bar' }), true)
   })
 })
 
 describe('Number', () => {
   it('match a number recursively', () => {
-    expect(new NumberNode(3).match([{ foo: 3 }])).toBe(true)
+    assert.equal(new NumberNode(3).match([{ foo: 3 }]), true)
   })
 })
 
 describe('NumberOrStringNode', () => {
   it('match a string', () => {
-    expect(new NumberOrStringNode('123').match([{ foo: '123' }])).toBe(true)
+    assert.equal(new NumberOrStringNode('123').match([{ foo: '123' }]), true)
   })
 })
 
 describe('setPropertyClause', () => {
   it('creates a node if none passed', () => {
-    expect(setPropertyClause(undefined, 'foo', 'bar').toString()).toBe('foo:bar')
+    assert.equal(setPropertyClause(undefined, 'foo', 'bar').toString(), 'foo:bar')
   })
 
   it('adds a property clause if there was none', () => {
-    expect(setPropertyClause(parse('baz'), 'foo', 'bar').toString()).toBe('baz foo:bar')
+    assert.equal(setPropertyClause(parse('baz'), 'foo', 'bar').toString(), 'baz foo:bar')
   })
 
   it('replaces the property clause if there was one', () => {
-    expect(setPropertyClause(parse('plip foo:baz plop'), 'foo', 'bar').toString()).toBe('plip plop foo:bar')
+    assert.equal(setPropertyClause(parse('plip foo:baz plop'), 'foo', 'bar').toString(), 'plip plop foo:bar')
 
-    expect(setPropertyClause(parse('foo:|(baz plop)'), 'foo', 'bar').toString()).toBe('foo:bar')
+    assert.equal(setPropertyClause(parse('foo:|(baz plop)'), 'foo', 'bar').toString(), 'foo:bar')
   })
 
   it('removes the property clause if no chid is passed', () => {
-    expect(setPropertyClause(parse('foo bar:baz qux'), 'bar', undefined).toString()).toBe('foo qux')
+    assert.equal(setPropertyClause(parse('foo bar:baz qux'), 'bar', undefined).toString(), 'foo qux')
 
-    expect(setPropertyClause(parse('foo bar:baz qux'), 'baz', undefined).toString()).toBe('foo bar:baz qux')
+    assert.equal(setPropertyClause(parse('foo bar:baz qux'), 'baz', undefined).toString(), 'foo bar:baz qux')
   })
 })
 
 it('toString', () => {
-  expect(ast.toString()).toBe(pattern)
+  assert.equal(ast.toString(), pattern)
 })

packages/complex-matcher/package.json

@@ -26,6 +26,10 @@
     "lodash": "^4.17.4"
   },
   "scripts": {
-    "postversion": "npm publish"
+    "postversion": "npm publish",
+    "test": "node--test"
+  },
+  "devDependencies": {
+    "test": "^3.2.1"
   }
 }

packages/vhd-cli/commands/index.js

@@ -2,7 +2,9 @@
 // This file has been generated by [index-modules](https://npmjs.com/index-modules)
 //
 
-var d = Object.defineProperty
+'use strict'
+
+const d = Object.defineProperty
 function de(o, n, v) {
   d(o, n, { enumerable: true, value: v })
   return v
@@ -17,7 +19,7 @@ function dl(o, n, g, a) {
   })
 }
 function r(p) {
-  var v = require(p)
+  const v = require(p)
   return v && v.__esModule
     ? v
     : typeof v === 'object' || typeof v === 'function'
@@ -32,7 +34,7 @@ function e(p, i) {
 }
 
 d(exports, '__esModule', { value: true })
-var defaults = de(exports, 'default', {})
+const defaults = de(exports, 'default', {})
 e('./check.js', 'check')
 e('./compare.js', 'compare')
 e('./copy.js', 'copy')

packages/vhd-cli/package.json

@@ -23,7 +23,7 @@
     "node": ">=10"
   },
   "dependencies": {
-    "@xen-orchestra/fs": "^3.2.0",
+    "@xen-orchestra/fs": "^3.3.0",
     "cli-progress": "^3.1.0",
     "exec-promise": "^0.7.0",
     "getopts": "^2.2.3",
@@ -31,7 +31,7 @@
     "lodash": "^4.17.21",
     "promise-toolbox": "^0.21.0",
     "uuid": "^9.0.0",
-    "vhd-lib": "^4.1.1"
+    "vhd-lib": "^4.2.0"
   },
   "scripts": {
     "postversion": "npm publish"

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

@@ -95,15 +95,9 @@ test('It rename and unlink a VHDFile', async () => {
   await convertFromRawToVhd(rawFileName, vhdFileName)
   await Disposable.use(async function* () {
     const handler = yield getSyncedHandler({ url: 'file:///' })
-    const { size } = await fs.stat(vhdFileName)
-    const targetFileName = `${tempDir}/renamed.vhd`
 
-    await VhdAbstract.rename(handler, vhdFileName, targetFileName)
+    await VhdAbstract.unlink(handler, vhdFileName)
     expect(await fs.exists(vhdFileName)).toEqual(false)
-    const { size: renamedSize } = await fs.stat(targetFileName)
-    expect(size).toEqual(renamedSize)
-    await VhdAbstract.unlink(handler, targetFileName)
-    expect(await fs.exists(targetFileName)).toEqual(false)
   })
 })
 
@@ -122,12 +116,8 @@ test('It rename and unlink a VhdDirectory', async () => {
     // it should clean an existing directory
     await fs.mkdir(targetFileName)
     await fs.writeFile(`${targetFileName}/dummy`, 'I exists')
-    await VhdAbstract.rename(handler, vhdDirectory, targetFileName)
-    expect(await fs.exists(vhdDirectory)).toEqual(false)
-    expect(await fs.exists(targetFileName)).toEqual(true)
+    await VhdAbstract.unlink(handler, `${targetFileName}/dummy`)
     expect(await fs.exists(`${targetFileName}/dummy`)).toEqual(false)
-    await VhdAbstract.unlink(handler, targetFileName)
-    expect(await fs.exists(targetFileName)).toEqual(false)
   })
 })
 
@@ -138,7 +128,6 @@ test('It create , rename and unlink alias', async () => {
   const vhdFileName = `${tempDir}/randomfile.vhd`
   await convertFromRawToVhd(rawFileName, vhdFileName)
   const aliasFileName = `${tempDir}/aliasFileName.alias.vhd`
-  const aliasFileNameRenamed = `${tempDir}/aliasFileNameRenamed.alias.vhd`
 
   await Disposable.use(async function* () {
     const handler = yield getSyncedHandler({ url: 'file:///' })
@@ -146,15 +135,9 @@ test('It create , rename and unlink alias', async () => {
     expect(await fs.exists(aliasFileName)).toEqual(true)
     expect(await fs.exists(vhdFileName)).toEqual(true)
 
-    await VhdAbstract.rename(handler, aliasFileName, aliasFileNameRenamed)
-    expect(await fs.exists(aliasFileName)).toEqual(false)
-    expect(await fs.exists(vhdFileName)).toEqual(true)
-    expect(await fs.exists(aliasFileNameRenamed)).toEqual(true)
-
-    await VhdAbstract.unlink(handler, aliasFileNameRenamed)
+    await VhdAbstract.unlink(handler, aliasFileName)
     expect(await fs.exists(aliasFileName)).toEqual(false)
     expect(await fs.exists(vhdFileName)).toEqual(false)
-    expect(await fs.exists(aliasFileNameRenamed)).toEqual(false)
   })
 })
 

packages/vhd-lib/Vhd/VhdAbstract.js

@@ -200,14 +200,6 @@ exports.VhdAbstract = class VhdAbstract {
     }
   }
 
-  static async rename(handler, sourcePath, targetPath) {
-    try {
-      // delete target if it already exists
-      await VhdAbstract.unlink(handler, targetPath)
-    } catch (e) {}
-    await handler.rename(sourcePath, targetPath)
-  }
-
   static async unlink(handler, path) {
     const resolved = await resolveVhdAlias(handler, path)
     try {

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

@@ -6,10 +6,10 @@ const fs = require('fs-extra')
 const rimraf = require('rimraf')
 const tmp = require('tmp')
 const { getSyncedHandler } = require('@xen-orchestra/fs')
-const { pFromCallback } = require('promise-toolbox')
+const { pFromCallback, Disposable } = require('promise-toolbox')
 
-const { VhdFile, chainVhd } = require('./index')
-const { _cleanupVhds: cleanupVhds, mergeVhdChain } = require('./merge')
+const { VhdFile, chainVhd, openVhd, VhdAbstract } = require('./index')
+const { mergeVhdChain } = require('./merge')
 
 const { checkFile, createRandomFile, convertFromRawToVhd } = require('./tests/utils')
 
@@ -163,6 +163,87 @@ test('it can resume a simple merge ', async () => {
   }
 })
 
+test('it can resume a failed renaming', async () => {
+  const mbOfFather = 8
+  const mbOfChildren = 4
+  const parentRandomFileName = `${tempDir}/randomfile`
+
+  const parentName = 'parentvhd.alias.vhd'
+  const childName = 'childvhd.alias.vhd'
+
+  await createRandomFile(`${tempDir}/randomfile`, mbOfFather)
+  await convertFromRawToVhd(`${tempDir}/randomfile`, `${tempDir}/parentdata.vhd`)
+  VhdAbstract.createAlias(handler, parentName, 'parentdata.vhd')
+  const parentVhd = new VhdFile(handler, 'parentdata.vhd')
+  await parentVhd.readHeaderAndFooter()
+
+  await createRandomFile(`${tempDir}/small_randomfile`, mbOfChildren)
+  await convertFromRawToVhd(`${tempDir}/small_randomfile`, `${tempDir}/childdata.vhd`)
+  await chainVhd(handler, 'parentdata.vhd', handler, 'childdata.vhd', true)
+  VhdAbstract.createAlias(handler, childName, 'childdata.vhd')
+  const childVhd = new VhdFile(handler, 'childdata.vhd')
+  await childVhd.readHeaderAndFooter()
+
+  await handler.writeFile(
+    `.${parentName}.merge.json`,
+    JSON.stringify({
+      parent: {
+        header: parentVhd.header.checksum,
+      },
+      child: {
+        header: childVhd.header.checksum,
+      },
+      step: 'cleanupVhds',
+    })
+  )
+  // expect merge to succeed
+  await mergeVhdChain(handler, [parentName, childName])
+
+  // parent have been renamed
+  expect(await fs.exists(`${tempDir}/${parentName}`)).toBeFalsy()
+  expect(await fs.exists(`${tempDir}/${childName}`)).toBeTruthy()
+  expect(await fs.exists(`${tempDir}/.${parentName}.merge.json`)).toBeFalsy()
+  // we shouldn't have moved the data, but the child data should have been merged into parent
+  expect(await fs.exists(`${tempDir}/parentdata.vhd`)).toBeTruthy()
+  expect(await fs.exists(`${tempDir}/childdata.vhd`)).toBeFalsy()
+
+  Disposable.use(openVhd(handler, childName), async mergedVhd => {
+    await mergedVhd.readBlockAllocationTable()
+    // the resume is at the step 'cleanupVhds' it should not have merged blocks and should still contains parent data
+
+    let offset = 0
+    const fd = await fs.open(parentRandomFileName, 'r')
+    for await (const block of mergedVhd.blocks()) {
+      const blockContent = block.data
+      const buffer = Buffer.alloc(blockContent.length)
+      await fs.read(fd, buffer, 0, buffer.length, offset)
+      expect(buffer.equals(blockContent)).toEqual(true)
+      offset += childVhd.header.blockSize
+    }
+  })
+
+  // merge succeed if renaming was already done
+  await handler.writeFile(
+    `.${parentName}.merge.json`,
+    JSON.stringify({
+      parent: {
+        header: parentVhd.header.checksum,
+      },
+      child: {
+        header: childVhd.header.checksum,
+      },
+      step: 'cleanupVhds',
+    })
+  )
+  await mergeVhdChain(handler, [parentName, childName])
+  expect(await fs.exists(`${tempDir}/${parentName}`)).toBeFalsy()
+  expect(await fs.exists(`${tempDir}/${childName}`)).toBeTruthy()
+  // we shouldn't have moved the data, but the child data should have been merged into parent
+  expect(await fs.exists(`${tempDir}/parentdata.vhd`)).toBeTruthy()
+  expect(await fs.exists(`${tempDir}/childdata.vhd`)).toBeFalsy()
+  expect(await fs.exists(`${tempDir}/.${parentName}.merge.json`)).toBeFalsy()
+})
+
 test('it can resume a multiple merge ', async () => {
   const mbOfFather = 8
   const mbOfChildren = 6
@@ -226,7 +307,11 @@ test('it can resume a multiple merge ', async () => {
     })
   )
   // it should succeed
-  await mergeVhdChain(handler, ['parent.vhd', 'child.vhd', 'grandchild.vhd'])
+  await mergeVhdChain(handler, ['parent.vhd', 'child.vhd', 'grandchild.vhd'], { removeUnused: true })
+  expect(await fs.exists(`${tempDir}/parent.vhd`)).toBeFalsy()
+  expect(await fs.exists(`${tempDir}/child.vhd`)).toBeFalsy()
+  expect(await fs.exists(`${tempDir}/grandchild.vhd`)).toBeTruthy()
+  expect(await fs.exists(`${tempDir}/.parent.vhd.merge.json`)).toBeFalsy()
 })
 
 test('it merge multiple child in one pass ', async () => {
@@ -278,18 +363,3 @@ test('it merge multiple child in one pass ', async () => {
     offset += parentVhd.header.blockSize
   }
 })
-
-test('it cleans vhd mergedfiles', async () => {
-  await handler.writeFile('parent', 'parentData')
-  await handler.writeFile('child1', 'child1Data')
-  await handler.writeFile('child2', 'child2Data')
-  await handler.writeFile('child3', 'child3Data')
-
-  await cleanupVhds(handler, ['parent', 'child1', 'child2', 'child3'], { merge: true, removeUnused: true })
-
-  // only child3 should stay, with the data of parent
-  const [child3, ...other] = await handler.list('.')
-  expect(other.length).toEqual(0)
-  expect(child3).toEqual('child3')
-  expect((await handler.readFile('child3')).toString('utf8')).toEqual('parentData')
-})

packages/vhd-lib/merge.js

@@ -18,6 +18,7 @@ const { VhdAbstract } = require('./Vhd/VhdAbstract')
 const { VhdDirectory } = require('./Vhd/VhdDirectory')
 const { VhdSynthetic } = require('./Vhd/VhdSynthetic')
 const { asyncMap } = require('@xen-orchestra/async-map')
+const { isVhdAlias, resolveVhdAlias } = require('./aliases')
 
 const { warn } = createLogger('vhd-lib:merge')
 
@@ -41,91 +42,97 @@ const { warn } = createLogger('vhd-lib:merge')
 //         |                                |
 //         \_____________rename_____________/
 
-// write the merge progress file at most  every `delay` seconds
-function makeThrottledWriter(handler, path, delay) {
-  let lastWrite = Date.now()
-  return async json => {
+class Merger {
+  #chain
+  #childrenPaths
+  #handler
+  #isResuming = false
+  #lastStateWrittenAt = 0
+  #logInfo
+  #mergeBlockConcurrency
+  #onProgress
+  #parentPath
+  #removeUnused
+  #state
+  #statePath
+
+  constructor(handler, chain, { onProgress, logInfo, removeUnused, mergeBlockConcurrency }) {
+    this.#chain = chain
+    this.#handler = handler
+    this.#parentPath = chain[0]
+    this.#childrenPaths = chain.slice(1)
+    this.#logInfo = logInfo
+    this.#onProgress = onProgress
+    this.#removeUnused = removeUnused
+    this.#mergeBlockConcurrency = mergeBlockConcurrency
+
+    this.#statePath = dirname(this.#parentPath) + '/.' + basename(this.#parentPath) + '.merge.json'
+  }
+
+  async #writeState() {
+    await this.#handler.writeFile(this.#statePath, JSON.stringify(this.#state), { flags: 'w' }).catch(warn)
+  }
+
+  async #writeStateThrottled() {
+    const delay = 10e3
     const now = Date.now()
-    if (now - lastWrite > delay) {
-      lastWrite = now
-      await handler.writeFile(path, JSON.stringify(json), { flags: 'w' }).catch(warn)
+    if (now - this.#lastStateWrittenAt > delay) {
+      this.#lastStateWrittenAt = now
+      await this.#writeState()
     }
   }
-}
 
-// make the rename / delete part of the merge process
-// will fail if parent and children are in different remote
-
-async function cleanupVhds(handler, chain, { logInfo = noop, removeUnused = false } = {}) {
-  const parent = chain[0]
-  const children = chain.slice(1, -1)
-  const mergeTargetChild = chain[chain.length - 1]
-
-  await VhdAbstract.rename(handler, parent, mergeTargetChild)
-
-  return asyncMap(children, child => {
-    logInfo(`the VHD child is already merged`, { child })
-    if (removeUnused) {
-      logInfo(`deleting merged VHD child`, { child })
-      return VhdAbstract.unlink(handler, child)
-    }
-  })
-}
-
-module.exports._cleanupVhds = cleanupVhds
-
-// Merge a chain of VHDs into a single VHD
-module.exports.mergeVhdChain = limitConcurrency(2)(async function mergeVhdChain(
-  handler,
-  chain,
-  { onProgress = noop, logInfo = noop, removeUnused = false, mergeBlockConcurrency = 2 } = {}
-) {
-  assert(chain.length >= 2)
-
-  const parentPath = chain[0]
-  const childrenPaths = chain.slice(1)
-
-  const mergeStatePath = dirname(parentPath) + '/.' + basename(parentPath) + '.merge.json'
-
-  return await Disposable.use(async function* () {
-    let mergeState
-    let isResuming = false
+  async merge() {
     try {
-      const mergeStateContent = await handler.readFile(mergeStatePath)
-      mergeState = JSON.parse(mergeStateContent)
+      const mergeStateContent = await this.#handler.readFile(this.#statePath)
+      this.#state = JSON.parse(mergeStateContent)
 
       // work-around a bug introduce in 97d94b795
       //
       // currentBlock could be `null` due to the JSON.stringify of a `NaN` value
-      if (mergeState.currentBlock === null) {
-        mergeState.currentBlock = 0
+      if (this.#state.currentBlock === null) {
+        this.#state.currentBlock = 0
       }
+      this.#isResuming = true
     } catch (error) {
       if (error.code !== 'ENOENT') {
         warn('problem while checking the merge state', { error })
       }
     }
+    /* eslint-disable no-fallthrough */
+    switch (this.#state?.step ?? 'mergeBlocks') {
+      case 'mergeBlocks':
+        await this.#step_mergeBlocks()
+      case 'cleanupVhds':
+        await this.#step_cleanVhds()
+        return this.#cleanup()
+      default:
+        warn(`Step ${this.#state.step} is unknown`, { state: this.#state })
+    }
+    /* eslint-enable no-fallthrough */
+  }
 
+  async *#openVhds() {
     // during merging, the end footer of the parent can be overwritten by new blocks
     // we should use it as a way to check vhd health
-    const parentVhd = yield openVhd(handler, parentPath, {
+    const parentVhd = yield openVhd(this.#handler, this.#parentPath, {
       flags: 'r+',
-      checkSecondFooter: mergeState === undefined,
+      checkSecondFooter: this.#state === undefined,
     })
     let childVhd
     const parentIsVhdDirectory = parentVhd instanceof VhdDirectory
     let childIsVhdDirectory
-    if (childrenPaths.length !== 1) {
-      childVhd = yield VhdSynthetic.open(handler, childrenPaths)
+    if (this.#childrenPaths.length !== 1) {
+      childVhd = yield VhdSynthetic.open(this.#handler, this.#childrenPaths)
       childIsVhdDirectory = childVhd.checkVhdsClass(VhdDirectory)
     } else {
-      childVhd = yield openVhd(handler, childrenPaths[0])
+      childVhd = yield openVhd(this.#handler, this.#childrenPaths[0])
       childIsVhdDirectory = childVhd instanceof VhdDirectory
     }
 
     // merging vhdFile must not be concurrently with the potential block reordering after a change
-    const concurrency = parentIsVhdDirectory && childIsVhdDirectory ? mergeBlockConcurrency : 1
-    if (mergeState === undefined) {
+    this.#mergeBlockConcurrency = parentIsVhdDirectory && childIsVhdDirectory ? this.#mergeBlockConcurrency : 1
+    if (this.#state === undefined) {
       // merge should be along a vhd chain
       assert.strictEqual(UUID.stringify(childVhd.header.parentUuid), UUID.stringify(parentVhd.footer.uuid))
       const parentDiskType = parentVhd.footer.diskType
@@ -133,69 +140,86 @@ module.exports.mergeVhdChain = limitConcurrency(2)(async function mergeVhdChain(
       assert.strictEqual(childVhd.footer.diskType, DISK_TYPES.DIFFERENCING)
       assert.strictEqual(childVhd.header.blockSize, parentVhd.header.blockSize)
     } else {
-      isResuming = true
       // vhd should not have changed to resume
-      assert.strictEqual(parentVhd.header.checksum, mergeState.parent.header)
-      assert.strictEqual(childVhd.header.checksum, mergeState.child.header)
+      assert.strictEqual(parentVhd.header.checksum, this.#state.parent.header)
+      assert.strictEqual(childVhd.header.checksum, this.#state.child.header)
     }
 
     // Read allocation table of child/parent.
     await Promise.all([parentVhd.readBlockAllocationTable(), childVhd.readBlockAllocationTable()])
 
+    return { childVhd, parentVhd }
+  }
+
+  async #step_mergeBlocks() {
+    const self = this
+    await Disposable.use(async function* () {
+      const { childVhd, parentVhd } = yield* self.#openVhds()
+      const { maxTableEntries } = childVhd.header
+
+      if (self.#state === undefined) {
+        await parentVhd.ensureBatSize(childVhd.header.maxTableEntries)
+
+        self.#state = {
+          child: { header: childVhd.header.checksum },
+          parent: { header: parentVhd.header.checksum },
+          currentBlock: 0,
+          mergedDataSize: 0,
+          step: 'mergeBlocks',
+          chain: self.#chain.map(vhdPath => handlerPath.relativeFromFile(self.#statePath, vhdPath)),
+        }
+
+        // finds first allocated block for the 2 following loops
+        while (self.#state.currentBlock < maxTableEntries && !childVhd.containsBlock(self.#state.currentBlock)) {
+          ++self.#state.currentBlock
+        }
+        await self.#writeState()
+      }
+      await self.#mergeBlocks(parentVhd, childVhd)
+      await self.#updateHeaders(parentVhd, childVhd)
+    })
+  }
+
+  async #mergeBlocks(parentVhd, childVhd) {
     const { maxTableEntries } = childVhd.header
-
-    if (mergeState === undefined) {
-      await parentVhd.ensureBatSize(childVhd.header.maxTableEntries)
-
-      mergeState = {
-        child: { header: childVhd.header.checksum },
-        parent: { header: parentVhd.header.checksum },
-        currentBlock: 0,
-        mergedDataSize: 0,
-        chain: chain.map(vhdPath => handlerPath.relativeFromFile(mergeStatePath, vhdPath)),
-      }
-
-      // finds first allocated block for the 2 following loops
-      while (mergeState.currentBlock < maxTableEntries && !childVhd.containsBlock(mergeState.currentBlock)) {
-        ++mergeState.currentBlock
-      }
-    }
-
-    // counts number of allocated blocks
     const toMerge = []
-    for (let block = mergeState.currentBlock; block < maxTableEntries; block++) {
+    for (let block = this.#state.currentBlock; block < maxTableEntries; block++) {
       if (childVhd.containsBlock(block)) {
         toMerge.push(block)
       }
     }
     const nBlocks = toMerge.length
-    onProgress({ total: nBlocks, done: 0 })
+    this.#onProgress({ total: nBlocks, done: 0 })
 
     const merging = new Set()
     let counter = 0
 
-    const mergeStateWriter = makeThrottledWriter(handler, mergeStatePath, 10e3)
     await asyncEach(
       toMerge,
       async blockId => {
         merging.add(blockId)
-        mergeState.mergedDataSize += await parentVhd.mergeBlock(childVhd, blockId, isResuming)
+        this.#state.mergedDataSize += await parentVhd.mergeBlock(childVhd, blockId, this.#isResuming)
 
-        mergeState.currentBlock = Math.min(...merging)
+        this.#state.currentBlock = Math.min(...merging)
         merging.delete(blockId)
 
-        onProgress({
+        this.#onProgress({
           total: nBlocks,
           done: counter + 1,
         })
         counter++
-        mergeStateWriter(mergeState)
+        this.#writeStateThrottled()
       },
       {
-        concurrency,
+        concurrency: this.#mergeBlockConcurrency,
       }
     )
-    onProgress({ total: nBlocks, done: nBlocks })
+    // ensure data size is correct
+    await this.#writeState()
+    this.#onProgress({ total: nBlocks, done: nBlocks })
+  }
+
+  async #updateHeaders(parentVhd, childVhd) {
     // some blocks could have been created or moved in parent : write bat
     await parentVhd.writeBlockAllocationTable()
 
@@ -211,19 +235,78 @@ module.exports.mergeVhdChain = limitConcurrency(2)(async function mergeVhdChain(
     // necessary to update values and to recreate the footer after block
     // creation
     await parentVhd.writeFooter()
+  }
 
-    await cleanupVhds(handler, chain, { logInfo, removeUnused })
+  // make the rename / delete part of the merge process
+  // will fail if parent and children are in different remote
+  async #step_cleanVhds() {
+    assert.notEqual(this.#state, undefined)
+    this.#state.step = 'cleanupVhds'
+    await this.#writeState()
 
-    // should be a disposable
-    handler.unlink(mergeStatePath).catch(warn)
+    const chain = this.#chain
+    const handler = this.#handler
 
-    return mergeState.mergedDataSize
-  }).catch(error => {
+    const parent = chain[0]
+    const children = chain.slice(1, -1)
+    const mergeTargetChild = chain[chain.length - 1]
+
+    // in the case is an alias, renaming parent to mergeTargetChild will keep the real data
+    // of mergeTargetChild in the data folder
+    // mergeTargetChild is already in an incomplete state, its blocks have been transferred to parent
+    let oldTarget
+    if (isVhdAlias(mergeTargetChild)) {
+      oldTarget = await resolveVhdAlias(handler, mergeTargetChild)
+    }
+
+    try {
+      await handler.rename(parent, mergeTargetChild)
+      if (oldTarget !== undefined) {
+        await VhdAbstract.unlink(handler, oldTarget).catch(warn)
+      }
+    } catch (error) {
+      // maybe the renaming was already successfull during merge
+      if (error.code === 'ENOENT' && this.#isResuming) {
+        Disposable.use(openVhd(handler, mergeTargetChild), vhd => {
+          // we are sure that mergeTargetChild is the right one
+          assert.strictEqual(vhd.header.checksum, this.#state.parent.header)
+        })
+        this.#logInfo(`the VHD parent was already renamed`, { parent, mergeTargetChild })
+      } else {
+        throw error
+      }
+    }
+
+    await asyncMap(children, child => {
+      this.#logInfo(`the VHD child is already merged`, { child })
+      if (this.#removeUnused) {
+        this.#logInfo(`deleting merged VHD child`, { child })
+        return VhdAbstract.unlink(handler, child)
+      }
+    })
+  }
+
+  async #cleanup() {
+    const mergedSize = this.#state?.mergedDataSize ?? 0
+    await this.#handler.unlink(this.#statePath).catch(warn)
+    return mergedSize
+  }
+}
+
+module.exports.mergeVhdChain = limitConcurrency(2)(async function mergeVhdChain(
+  handler,
+  chain,
+  { onProgress = noop, logInfo = noop, removeUnused = false, mergeBlockConcurrency = 2 } = {}
+) {
+  const merger = new Merger(handler, chain, { onProgress, logInfo, removeUnused, mergeBlockConcurrency })
+  try {
+    return merger.merge()
+  } catch (error) {
     try {
       error.chain = chain
     } finally {
       // eslint-disable-next-line no-unsafe-finally
       throw error
     }
-  })
+  }
 })

packages/vhd-lib/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vhd-lib",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "license": "AGPL-3.0-or-later",
   "description": "Primitives for VHD file handling",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/vhd-lib",
@@ -18,8 +18,8 @@
     "@vates/async-each": "^1.0.0",
     "@vates/read-chunk": "^1.0.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/fs": "^3.2.0",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/fs": "^3.3.0",
+    "@xen-orchestra/log": "^0.5.0",
     "async-iterator-to-stream": "^1.0.2",
     "decorator-synchronized": "^0.6.0",
     "fs-extra": "^10.0.0",
@@ -31,7 +31,7 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@xen-orchestra/fs": "^3.2.0",
+    "@xen-orchestra/fs": "^3.3.0",
     "execa": "^5.0.0",
     "get-stream": "^6.0.0",
     "rimraf": "^3.0.2",

packages/xen-api/examples/.eslintrc.js

@@ -0,0 +1,5 @@
+'use strict'
+
+module.exports = {
+  ignorePatterns: ['*'],
+}

packages/xen-api/examples/package.json

@@ -8,6 +8,6 @@
     "promise-toolbox": "^0.19.2",
     "readable-stream": "^3.1.1",
     "throttle": "^1.0.3",
-    "vhd-lib": "^4.1.1"
+    "vhd-lib": "^4.2.0"
   }
 }

packages/xo-cli/index.mjs

@@ -273,7 +273,9 @@ async function main(args) {
       const lines = [error.message]
       const { errors } = error.data
       errors.forEach(error => {
-        lines.push(`  property ${error.property}: ${error.message}`)
+        let { instancePath } = error
+        instancePath = instancePath.length === 0 ? '@' : '@.' + instancePath
+        lines.push(`  property ${instancePath}: ${error.message}`)
       })
       throw lines.join('\n')
     })

packages/xo-cli/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "xo-cli",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "license": "AGPL-3.0-or-later",
   "description": "Basic CLI for Xen-Orchestra",
   "keywords": [

packages/xo-collection/src/view.example.js

@@ -55,3 +55,4 @@ setTimeout(function () {
     name: 'Steve',
   })
 }, 10)
+/* eslint-enable no-console */

packages/xo-lib/example.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+
 'use strict'
 
 process.on('unhandledRejection', function (error) {
@@ -59,3 +61,5 @@ xo.open()
   .then(function () {
     return xo.close()
   })
+
+/* eslint-enable no-console */

packages/xo-remote-parser/index.test.js

@@ -1,8 +1,11 @@
-/* eslint-env jest */
+'use strict'
 
-import deepFreeze from 'deep-freeze'
+const { describe, it } = require('test')
+const { strict: assert } = require('assert')
 
-import { parse, format } from './'
+const deepFreeze = require('deep-freeze')
+
+const { parse, format } = require('./')
 
 // ===================================================================
 
@@ -132,6 +135,7 @@ const parseData = deepFreeze({
     object: {
       type: 'nfs',
       host: '192.168.100.225',
+      port: undefined,
       path: '/media/nfs',
     },
   },
@@ -203,7 +207,7 @@ describe('format', () => {
   for (const name in formatData) {
     const datum = formatData[name]
     it(name, () => {
-      expect(format(datum.object)).toBe(datum.string)
+      assert.equal(format(datum.object), datum.string)
     })
   }
 })
@@ -212,7 +216,7 @@ describe('parse', () => {
   for (const name in parseData) {
     const datum = parseData[name]
     it(name, () => {
-      expect(parse(datum.string)).toEqual(datum.object)
+      assert.deepEqual(parse(datum.string), datum.object)
     })
   }
 })

packages/xo-remote-parser/package.json

@@ -31,7 +31,8 @@
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^7.0.2",
     "deep-freeze": "^0.0.1",
-    "rimraf": "^3.0.0"
+    "rimraf": "^3.0.0",
+    "test": "^3.2.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
@@ -39,6 +40,7 @@
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build",
-    "postversion": "npm publish"
+    "postversion": "npm publish",
+    "test": "node--test"
   }
 }

packages/xo-server-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-audit",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "license": "AGPL-3.0-or-later",
   "description": "Audit plugin for XO-Server",
   "keywords": [
@@ -44,9 +44,9 @@
     "prepublishOnly": "yarn run build"
   },
   "dependencies": {
-    "@xen-orchestra/audit-core": "^0.2.1",
+    "@xen-orchestra/audit-core": "^0.2.2",
     "@xen-orchestra/cron": "^1.0.6",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "async-iterator-to-stream": "^1.1.0",
     "promise-toolbox": "^0.21.0",
     "readable-stream": "^4.1.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-auth-ldap",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "license": "AGPL-3.0-or-later",
   "description": "LDAP authentication plugin for XO-Server",
   "keywords": [
@@ -31,7 +31,7 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "ensure-array": "^1.0.0",
     "exec-promise": "^0.7.0",
     "inquirer": "^8.0.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-backup-reports",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "license": "AGPL-3.0-or-later",
   "description": "Backup reports plugin for XO-Server",
   "keywords": [
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@xen-orchestra/defined": "^0.0.1",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "human-format": "^1.0.0",
     "lodash": "^4.13.1",
     "moment-timezone": "^0.5.13"

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

@@ -284,8 +284,6 @@ class BackupReportsXoPlugin {
       getErrorMarkdown(log),
     ]
 
-    const nagiosText = []
-
     // body
     for (const status of STATUS) {
       const tasks = tasksByStatus[status]
@@ -310,10 +308,6 @@ class BackupReportsXoPlugin {
         const { title, body } = taskMarkdown
         const subMarkdown = [...body, ...getWarningsMarkdown(task.warnings)]
 
-        if (task.status !== 'success') {
-          nagiosText.push(`[${task.status}] ${title}`)
-        }
-
         for (const subTask of task.tasks ?? []) {
           const taskMarkdown = await getMarkdown(subTask, { formatDate, xo })
           if (taskMarkdown === undefined) {
@@ -335,10 +329,6 @@ class BackupReportsXoPlugin {
       subject: `[Xen Orchestra] ${log.status} − Metadata backup report for ${log.jobName} ${STATUS_ICON[log.status]}`,
       markdown: toMarkdown(markdown),
       success: log.status === 'success',
-      nagiosMarkdown:
-        log.status === 'success'
-          ? `[Xen Orchestra] [Success] Metadata backup report for ${log.jobName}`
-          : `[Xen Orchestra] [${log.status}] Metadata backup report for ${log.jobName} - ${nagiosText.join(' ')}`,
     })
   }
 
@@ -369,9 +359,6 @@ class BackupReportsXoPlugin {
         mailReceivers,
         markdown: toMarkdown(markdown),
         success: false,
-        nagiosMarkdown: `[Xen Orchestra] [${log.status}] Backup report for ${jobName}${
-          log.result?.message !== undefined ? ` - Error : ${log.result.message}` : ''
-        }`,
       })
     }
 
@@ -379,7 +366,6 @@ class BackupReportsXoPlugin {
     const skippedVmsText = []
     const successfulVmsText = []
     const interruptedVmsText = []
-    const nagiosText = []
 
     let globalMergeSize = 0
     let globalTransferSize = 0
@@ -401,16 +387,13 @@ class BackupReportsXoPlugin {
           if (type === 'SR') {
             const { name_label: name, uuid } = xo.getObject(id)
             failedTasksText.push(`### ${name}`, '', `- **UUID**: ${uuid}`)
-            nagiosText.push(`[(${type} failed) ${name} : ${taskLog.result.message} ]`)
           } else {
             const { name } = await xo.getRemote(id)
             failedTasksText.push(`### ${name}`, '', `- **UUID**: ${id}`)
-            nagiosText.push(`[(${type} failed) ${name} : ${taskLog.result.message} ]`)
           }
         } catch (error) {
           logger.warn(error)
           failedTasksText.push(`### ${UNKNOWN_ITEM}`, '', `- **UUID**: ${id}`)
-          nagiosText.push(`[(${type} failed) ${id} : ${taskLog.result.message} ]`)
         }
 
         failedTasksText.push(
@@ -553,22 +536,17 @@ class BackupReportsXoPlugin {
                 : taskLog.result.message
             }`
           )
-          nagiosText.push(`[(Skipped) ${vm !== undefined ? vm.name_label : 'undefined'} : ${taskLog.result.message} ]`)
         } else {
           ++nFailures
           failedTasksText.push(...text, `- **Error**: ${taskLog.result.message}`)
-
-          nagiosText.push(`[(Failed) ${vm !== undefined ? vm.name_label : 'undefined'} : ${taskLog.result.message} ]`)
         }
       } else {
         if (taskLog.status === 'failure') {
           ++nFailures
           failedTasksText.push(...text, ...subText)
-          nagiosText.push(`[${vm !== undefined ? vm.name_label : 'undefined'}: (failed)[${failedSubTasks.toString()}]]`)
         } else if (taskLog.status === 'interrupted') {
           ++nInterrupted
           interruptedVmsText.push(...text, ...subText)
-          nagiosText.push(`[(Interrupted) ${vm !== undefined ? vm.name_label : 'undefined'}]`)
         } else {
           ++nSuccesses
           successfulVmsText.push(...text, ...subText)
@@ -614,16 +592,10 @@ class BackupReportsXoPlugin {
       markdown: toMarkdown(markdown),
       subject: `[Xen Orchestra] ${log.status} − Backup report for ${jobName} ${STATUS_ICON[log.status]}`,
       success: log.status === 'success',
-      nagiosMarkdown:
-        log.status === 'success'
-          ? `[Xen Orchestra] [Success] Backup report for ${jobName}`
-          : `[Xen Orchestra] [${
-              nFailures !== 0 ? 'Failure' : 'Skipped'
-            }] Backup report for ${jobName} - VMs : ${nagiosText.join(' ')}`,
     })
   }
 
-  _sendReport({ mailReceivers, markdown, nagiosMarkdown, subject, success }) {
+  _sendReport({ mailReceivers, markdown, subject, success }) {
     if (mailReceivers === undefined || mailReceivers.length === 0) {
       mailReceivers = this._mailsReceivers
     }
@@ -645,11 +617,6 @@ class BackupReportsXoPlugin {
         xo.sendSlackMessage({
           message: markdown,
         }),
-      xo.sendPassiveCheck !== undefined &&
-        xo.sendPassiveCheck({
-          status: success ? 0 : 2,
-          message: nagiosMarkdown,
-        }),
       xo.sendIcinga2Status !== undefined &&
         xo.sendIcinga2Status({
           status: success ? 'OK' : 'CRITICAL',
@@ -683,7 +650,6 @@ class BackupReportsXoPlugin {
         subject: `[Xen Orchestra] ${globalStatus} ${icon}`,
         markdown,
         success: false,
-        nagiosMarkdown: `[Xen Orchestra] [${globalStatus}] Error : ${error.message}`,
       })
     }
 
@@ -720,7 +686,6 @@ class BackupReportsXoPlugin {
     let nSkipped = 0
 
     const failedBackupsText = []
-    const nagiosText = []
     const skippedBackupsText = []
     const successfulBackupText = []
 
@@ -754,13 +719,9 @@ class BackupReportsXoPlugin {
             `- **Reason**: ${message === UNHEALTHY_VDI_CHAIN_ERROR ? UNHEALTHY_VDI_CHAIN_MESSAGE : message}`,
             ''
           )
-
-          nagiosText.push(`[(Skipped) ${vm !== undefined ? vm.name_label : 'undefined'} : ${message} ]`)
         } else {
           ++nFailures
           failedBackupsText.push(...text, `- **Error**: ${message}`, '')
-
-          nagiosText.push(`[(Failed) ${vm !== undefined ? vm.name_label : 'undefined'} : ${message} ]`)
         }
       } else if (!reportOnFailure) {
         const { returnedValue } = call
@@ -835,11 +796,6 @@ class BackupReportsXoPlugin {
         globalSuccess ? ICON_SUCCESS : nFailures !== 0 ? ICON_FAILURE : ICON_SKIPPED
       }`,
       success: globalSuccess,
-      nagiosMarkdown: globalSuccess
-        ? `[Xen Orchestra] [Success] Backup report for ${tag}`
-        : `[Xen Orchestra] [${
-            nFailures !== 0 ? 'Failure' : 'Skipped'
-          }] Backup report for ${tag} - VMs : ${nagiosText.join(' ')}`,
     })
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-load-balancer",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "license": "AGPL-3.0-or-later",
   "description": "Load balancer for XO-Server",
   "keywords": [
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@xen-orchestra/cron": "^1.0.6",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "lodash": "^4.16.2"
   },
   "devDependencies": {

packages/xo-server-netbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-netbox",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "license": "AGPL-3.0-or-later",
   "description": "Synchronizes pools managed by Xen Orchestra with Netbox",
   "keywords": [
@@ -29,7 +29,7 @@
     "node": ">=14.6"
   },
   "dependencies": {
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "ipaddr.js": "^2.0.1",
     "lodash": "^4.17.21",
     "semver": "^7.3.5"

packages/xo-server-sdn-controller/package.json

@@ -16,7 +16,7 @@
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
   },
-  "version": "1.0.6",
+  "version": "1.0.7",
   "engines": {
     "node": ">=10"
   },
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@vates/coalesce-calls": "^0.1.0",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.5.0",
     "@xen-orchestra/openflow": "^0.1.2",
     "ipaddr.js": "^2.0.1",
     "lodash": "^4.17.11",

packages/xo-server-test-plugin/index.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+
 'use strict'
 
 // This is one of the simplest xo-server's plugin than can be created.
@@ -78,3 +80,5 @@ exports.default = function (opts) {
     },
   }
 }
+
+/* eslint-enable no-console */