changelog entry added

.eslintrc.js

@@ -15,10 +15,9 @@ module.exports = {
 
   overrides: [
     {
-      files: ['cli.{,c,m}js', '*-cli.{,c,m}js', '**/*cli*/**/*.{,c,m}js', '**/scripts/**.{,c,m}js'],
+      files: ['cli.{,c,m}js', '*-cli.{,c,m}js', '**/*cli*/**/*.{,c,m}js'],
       rules: {
         'n/no-process-exit': 'off',
-        'n/shebang': 'off',
         'no-console': 'off',
       },
     },
@@ -47,58 +46,6 @@ module.exports = {
         ],
       },
     },
-    {
-      files: ['@xen-orchestra/{web-core,lite,web}/**/*.{vue,ts}'],
-      parserOptions: {
-        sourceType: 'module',
-      },
-      plugins: ['import'],
-      extends: [
-        'plugin:import/recommended',
-        'plugin:import/typescript',
-        'plugin:vue/vue3-recommended',
-        '@vue/eslint-config-typescript/recommended',
-        '@vue/eslint-config-prettier',
-      ],
-      settings: {
-        'import/resolver': {
-          typescript: true,
-          'eslint-import-resolver-custom-alias': {
-            alias: {
-              '@core': '../web-core/lib',
-              '@': './src',
-            },
-            extensions: ['.ts'],
-            packages: ['@xen-orchestra/lite', '@xen-orchestra/web'],
-          },
-        },
-      },
-      rules: {
-        'no-void': 'off',
-        'n/no-missing-import': 'off', // using 'import' plugin instead to support TS aliases
-        '@typescript-eslint/no-explicit-any': 'off',
-        'vue/require-default-prop': 'off', // https://github.com/vuejs/eslint-plugin-vue/issues/2051
-      },
-    },
-    {
-      files: ['@xen-orchestra/{web-core,lite,web}/src/pages/**/*.vue'],
-      parserOptions: {
-        sourceType: 'module',
-      },
-      rules: {
-        'vue/multi-word-component-names': 'off',
-      },
-    },
-    {
-      files: ['@xen-orchestra/{web-core,lite,web}/typed-router.d.ts'],
-      parserOptions: {
-        sourceType: 'module',
-      },
-      rules: {
-        'eslint-comments/disable-enable-pair': 'off',
-        'eslint-comments/no-unlimited-disable': 'off',
-      },
-    },
   ],
 
   parserOptions: {
@@ -121,11 +68,6 @@ module.exports = {
 
     'no-console': ['error', { allow: ['warn', 'error'] }],
 
-    // this rule can prevent race condition bugs like parallel `a += await foo()`
-    //
-    // as it has a lots of false positive, it is only enabled as a warning for now
-    'require-atomic-updates': 'warn',
-
     strict: 'error',
   },
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'status: triaging :triangular_flag_on_post:, type: bug :bug:'
+assignees: ''
+---
+
+1. ⚠️ **If you don't follow this template, the issue will be closed**.
+2. ⚠️ **If your issue can't be easily reproduced, please report it [on the forum first](https://xcp-ng.org/forum/category/12/xen-orchestra)**.
+
+Are you using XOA or XO from the sources?
+
+If XOA:
+
+- which release channel? (`stable` vs `latest`)
+- please consider creating a support ticket in [your dedicated support area](https://xen-orchestra.com/#!/member/support)
+
+If XO from the sources:
+
+- Provide **your commit number**. If it's older than a week, we won't investigate
+- Don't forget to [read this first](https://xen-orchestra.com/docs/community.html)
+- As well as follow [this guide](https://xen-orchestra.com/docs/community.html#report-a-bug)
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please provide the following information):**
+
+- Node: [e.g. 16.12.1]
+- hypervisor: [e.g. XCP-ng 8.2.0]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,119 +0,0 @@
-name: Bug Report
-description: Create a report to help us improve
-labels: ['type: bug :bug:', 'status: triaging :triangular_flag_on_post:']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        1. ⚠️ **If you don't follow this template, the issue will be closed**.
-        2. ⚠️ **If your issue can't be easily reproduced, please report it [on the forum first](https://xcp-ng.org/forum/category/12/xen-orchestra)**.
-  - type: markdown
-    attributes:
-      value: '## Are you using XOA or XO from the sources?'
-  - type: dropdown
-    id: xo-origin
-    attributes:
-      label: Are you using XOA or XO from the sources?
-      options:
-        - XOA
-        - XO from the sources
-        - both
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: '### If XOA:'
-  - type: dropdown
-    id: xoa-channel
-    attributes:
-      label: Which release channel?
-      description: please consider creating a support ticket in [your dedicated support area](https://xen-orchestra.com/#!/member/support)
-      options:
-        - stable
-        - latest
-        - both
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: '### If XO from the sources:'
-  - type: markdown
-    attributes:
-      value: |
-        - Don't forget to [read this first](https://xen-orchestra.com/docs/community.html)
-        - As well as follow [this guide](https://xen-orchestra.com/docs/community.html#report-a-bug)
-  - type: input
-    id: xo-sources-commit-number
-    attributes:
-      label: Provide your commit number
-      description: If it's older than a week, we won't investigate
-      placeholder: e.g. 579f0
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: '## Bug description:'
-  - type: textarea
-    id: bug-description
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is
-    validations:
-      required: true
-  - type: textarea
-    id: error-message
-    attributes:
-      label: Error message
-      render: Text
-    validations:
-      required: false
-  - type: textarea
-    id: steps
-    attributes:
-      label: To reproduce
-      description: 'Steps to reproduce the behavior:'
-      value: |
-        1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to '...'
-        4. See error
-    validations:
-      required: false
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen
-    validations:
-      required: false
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: If applicable, add screenshots to help explain your problem
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: '## Environment (please provide the following information):'
-  - type: input
-    id: node-version
-    attributes:
-      label: Node
-      placeholder: e.g. 16.12.1
-    validations:
-      required: true
-  - type: input
-    id: hypervisor-version
-    attributes:
-      label: Hypervisor
-      placeholder: e.g. XCP-ng 8.2.0
-    validations:
-      required: true
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here
-    validations:
-      required: false

.github/workflows/ci.yml

@@ -24,12 +24,8 @@ jobs:
           cache: 'yarn'
       - name: Install project dependencies
         run: yarn
-      - name: Ensure yarn.lock is up-to-date
-        run: git diff --exit-code yarn.lock
       - name: Build the project
         run: yarn build
-      - name: Unit tests
-        run: yarn test-unit
       - name: Lint tests
         run: yarn test-lint
       - name: Integration tests

.gitignore

@@ -30,12 +30,8 @@ pnpm-debug.log.*
 yarn-error.log
 yarn-error.log.*
 .env
-*.tsbuildinfo
 
 # code coverage
 .nyc_output/
 coverage/
 .turbo/
-
-# https://node-tap.org/dot-tap-folder/
-.tap/

@vates/async-each/package.json

@@ -33,7 +33,8 @@
     "test": "node--test"
   },
   "devDependencies": {
-    "sinon": "^17.0.1",
+    "sinon": "^16.0.0",
+    "tap": "^16.3.0",
     "test": "^3.2.1"
   }
 }

@vates/decorate-with/.USAGE.md

@@ -62,42 +62,6 @@ decorateClass(Foo, {
 })
 ```
 
-### `decorateObject(object, map)`
-
-Decorates an object the same way `decorateClass()` decorates a class:
-
-```js
-import { decorateObject } from '@vates/decorate-with'
-
-const object = {
-  get bar() {
-    // body
-  },
-
-  set bar(value) {
-    // body
-  },
-
-  baz() {
-    // body
-  },
-}
-
-decorateObject(object, {
-  // getter and/or setter
-  bar: {
-    // without arguments
-    get: lodash.memoize,
-
-    // with arguments
-    set: [lodash.debounce, 150],
-  },
-
-  // method (with or without arguments)
-  baz: lodash.curry,
-})
-```
-
 ### `perInstance(fn, ...args)`
 
 Helper to decorate the method by instance instead of for the whole class.

@vates/decorate-with/README.md

@@ -80,42 +80,6 @@ decorateClass(Foo, {
 })
 ```
 
-### `decorateObject(object, map)`
-
-Decorates an object the same way `decorateClass()` decorates a class:
-
-```js
-import { decorateObject } from '@vates/decorate-with'
-
-const object = {
-  get bar() {
-    // body
-  },
-
-  set bar(value) {
-    // body
-  },
-
-  baz() {
-    // body
-  },
-}
-
-decorateObject(object, {
-  // getter and/or setter
-  bar: {
-    // without arguments
-    get: lodash.memoize,
-
-    // with arguments
-    set: [lodash.debounce, 150],
-  },
-
-  // method (with or without arguments)
-  baz: lodash.curry,
-})
-```
-
 ### `perInstance(fn, ...args)`
 
 Helper to decorate the method by instance instead of for the whole class.

@vates/decorate-with/index.js

@@ -14,13 +14,10 @@ function applyDecorator(decorator, value) {
 }
 
 exports.decorateClass = exports.decorateMethodsWith = function decorateClass(klass, map) {
-  return decorateObject(klass.prototype, map)
-}
-
-function decorateObject(object, map) {
+  const { prototype } = klass
   for (const name of Object.keys(map)) {
     const decorator = map[name]
-    const descriptor = getOwnPropertyDescriptor(object, name)
+    const descriptor = getOwnPropertyDescriptor(prototype, name)
     if (typeof decorator === 'function' || Array.isArray(decorator)) {
       descriptor.value = applyDecorator(decorator, descriptor.value)
     } else {
@@ -33,11 +30,10 @@ function decorateObject(object, map) {
       }
     }
 
-    defineProperty(object, name, descriptor)
+    defineProperty(prototype, name, descriptor)
   }
-  return object
+  return klass
 }
-exports.decorateObject = decorateObject
 
 exports.perInstance = function perInstance(fn, decorator, ...args) {
   const map = new WeakMap()

@vates/decorate-with/package.json

@@ -20,7 +20,7 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "2.1.0",
+  "version": "2.0.0",
   "engines": {
     "node": ">=8.10"
   },

@vates/disposable/package.json

@@ -14,7 +14,7 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "0.1.5",
+  "version": "0.1.4",
   "engines": {
     "node": ">=8.10"
   },
@@ -23,13 +23,13 @@
     "test": "node--test"
   },
   "dependencies": {
-    "@vates/multi-key-map": "^0.2.0",
+    "@vates/multi-key-map": "^0.1.0",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/log": "^0.6.0",
     "ensure-array": "^1.0.0"
   },
   "devDependencies": {
-    "sinon": "^17.0.1",
+    "sinon": "^16.0.0",
     "test": "^3.2.1"
   }
 }

@vates/event-listeners-manager/index.spec.js

@@ -20,9 +20,6 @@ function assertListeners(t, event, listeners) {
 }
 
 t.beforeEach(function (t) {
-  // work around https://github.com/tapjs/tapjs/issues/998
-  t.context = {}
-
   t.context.ee = new EventEmitter()
   t.context.em = new EventListenersManager(t.context.ee)
 })

@vates/event-listeners-manager/package.json

@@ -38,9 +38,9 @@
   "version": "1.0.1",
   "scripts": {
     "postversion": "npm publish --access public",
-    "test": "tap --allow-incomplete-coverage"
+    "test": "tap --branches=72"
   },
   "devDependencies": {
-    "tap": "^18.7.0"
+    "tap": "^16.2.0"
   }
 }

@vates/fuse-vhd/.USAGE.md

@@ -1,28 +0,0 @@
-Mount a vhd generated by xen-orchestra to filesystem
-
-### Library
-
-```js
-import { mount } from 'fuse-vhd'
-
-// return a disposable, see promise-toolbox/Disposable
-// unmount automatically when disposable is disposed
-// in case of differencing VHD, it mounts the full chain
-await mount(handler, diskId, mountPoint)
-```
-
-### cli
-
-From the install folder :
-
-```
-cli.mjs <remoteUrl> <vhdPathInRemote> <mountPoint>
-```
-
-After installing the package
-
-```
-xo-fuse-vhd <remoteUrl> <vhdPathInRemote> <mountPoint>
-```
-
-remoteUrl can be found by using cli in `@xen-orchestra/fs` , for example a local remote will have a url like `file:///path/to/remote/root`

@vates/fuse-vhd/README.md

@@ -1,59 +0,0 @@
-<!-- DO NOT EDIT MANUALLY, THIS FILE HAS BEEN GENERATED -->
-
-# @vates/fuse-vhd
-
-[![Package Version](https://badgen.net/npm/v/@vates/fuse-vhd)](https://npmjs.org/package/@vates/fuse-vhd) ![License](https://badgen.net/npm/license/@vates/fuse-vhd) [![PackagePhobia](https://badgen.net/bundlephobia/minzip/@vates/fuse-vhd)](https://bundlephobia.com/result?p=@vates/fuse-vhd) [![Node compatibility](https://badgen.net/npm/node/@vates/fuse-vhd)](https://npmjs.org/package/@vates/fuse-vhd)
-
-## Install
-
-Installation of the [npm package](https://npmjs.org/package/@vates/fuse-vhd):
-
-```sh
-npm install --save @vates/fuse-vhd
-```
-
-## Usage
-
-Mount a vhd generated by xen-orchestra to filesystem
-
-### Library
-
-```js
-import { mount } from 'fuse-vhd'
-
-// return a disposable, see promise-toolbox/Disposable
-// unmount automatically when disposable is disposed
-// in case of differencing VHD, it mounts the full chain
-await mount(handler, diskId, mountPoint)
-```
-
-### cli
-
-From the install folder :
-
-```
-cli.mjs <remoteUrl> <vhdPathInRemote> <mountPoint>
-```
-
-After installing the package
-
-```
-xo-fuse-vhd <remoteUrl> <vhdPathInRemote> <mountPoint>
-```
-
-remoteUrl can be found by using cli in `@xen-orchestra/fs` , for example a local remote will have a url like `file:///path/to/remote/root`
-
-## Contributions
-
-Contributions are _very_ welcomed, either on the documentation or on
-the code.
-
-You may:
-
-- report any [issue](https://github.com/vatesfr/xen-orchestra/issues)
-  you've encountered;
-- fork and create a pull request.
-
-## License
-
-[ISC](https://spdx.org/licenses/ISC) © [Vates SAS](https://vates.fr)

@vates/fuse-vhd/cli.mjs

@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-
-import Disposable from 'promise-toolbox/Disposable'
-import { getSyncedHandler } from '@xen-orchestra/fs'
-
-import { mount } from './index.mjs'
-
-async function* main([remoteUrl, vhdPathInRemote, mountPoint]) {
-  if (mountPoint === undefined) {
-    throw new TypeError('missing arg: cli <remoteUrl> <vhdPathInRemote> <mountPoint>')
-  }
-  const handler = yield getSyncedHandler({ url: remoteUrl })
-  const mounted = await mount(handler, vhdPathInRemote, mountPoint)
-
-  let disposePromise
-  process.on('SIGINT', async () => {
-    // ensure single dispose
-    if (!disposePromise) {
-      disposePromise = mounted.dispose()
-    }
-    await disposePromise
-    process.exit()
-  })
-}
-
-Disposable.wrap(main)(process.argv.slice(2))

@vates/fuse-vhd/index.mjs

@@ -58,7 +58,7 @@ export const mount = Disposable.factory(async function* mount(handler, diskPath,
     },
   })
   return new Disposable(
-    () => fromCallback(cb => fuse.unmount(cb)),
-    fromCallback(cb => fuse.mount(cb))
+    () => fromCallback(() => fuse.unmount()),
+    fromCallback(() => fuse.mount())
   )
 })

@vates/fuse-vhd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vates/fuse-vhd",
-  "version": "2.1.0",
+  "version": "2.0.0",
   "license": "ISC",
   "private": false,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/fuse-vhd",
@@ -19,14 +19,10 @@
   },
   "main": "./index.mjs",
   "dependencies": {
-    "@xen-orchestra/fs": "^4.1.4",
     "fuse-native": "^2.2.6",
     "lru-cache": "^7.14.0",
     "promise-toolbox": "^0.21.0",
-    "vhd-lib": "^4.9.0"
-  },
-  "bin": {
-    "xo-fuse-vhd": "./cli.mjs"
+    "vhd-lib": "^4.6.1"
   },
   "scripts": {
     "postversion": "npm publish --access public"

@vates/multi-key-map/.USAGE.md

@@ -17,14 +17,4 @@ map.get(['foo', 'bar']) // 2
 map.get(['bar', 'foo']) // 3
 map.get([OBJ]) // 4
 map.get([{}]) // undefined
-
-map.delete([])
-
-for (const [key, value] of map.entries() {
-  console.log(key, value)
-}
-
-for (const  value of map.values()) {
-  console.log(value)
-}
 ```

@vates/multi-key-map/README.md

@@ -35,16 +35,6 @@ map.get(['foo', 'bar']) // 2
 map.get(['bar', 'foo']) // 3
 map.get([OBJ]) // 4
 map.get([{}]) // undefined
-
-map.delete([])
-
-for (const [key, value] of map.entries() {
-  console.log(key, value)
-}
-
-for (const  value of map.values()) {
-  console.log(value)
-}
 ```
 
 ## Contributions

@vates/multi-key-map/index.js

@@ -36,31 +36,14 @@ function del(node, i, keys) {
   return node
 }
 
-function* entries(node, key) {
-  if (node !== undefined) {
-    if (node instanceof Node) {
-      const { value } = node
-      if (value !== undefined) {
-        yield [key, node.value]
-      }
-
-      for (const [childKey, child] of node.children.entries()) {
-        yield* entries(child, key.concat(childKey))
-      }
-    } else {
-      yield [key, node]
-    }
-  }
-}
-
 function get(node, i, keys) {
   return i === keys.length
     ? node instanceof Node
       ? node.value
       : node
     : node instanceof Node
-      ? get(node.children.get(keys[i]), i + 1, keys)
-      : undefined
+    ? get(node.children.get(keys[i]), i + 1, keys)
+    : undefined
 }
 
 function set(node, i, keys, value) {
@@ -86,22 +69,6 @@ function set(node, i, keys, value) {
   return node
 }
 
-function* values(node) {
-  if (node !== undefined) {
-    if (node instanceof Node) {
-      const { value } = node
-      if (value !== undefined) {
-        yield node.value
-      }
-      for (const child of node.children.values()) {
-        yield* values(child)
-      }
-    } else {
-      yield node
-    }
-  }
-}
-
 exports.MultiKeyMap = class MultiKeyMap {
   constructor() {
     // each node is either a value or a Node if it contains children
@@ -112,10 +79,6 @@ exports.MultiKeyMap = class MultiKeyMap {
     this._root = del(this._root, 0, keys)
   }
 
-  entries() {
-    return entries(this._root, [])
-  }
-
   get(keys) {
     return get(this._root, 0, keys)
   }
@@ -123,8 +86,4 @@ exports.MultiKeyMap = class MultiKeyMap {
   set(keys, value) {
     this._root = set(this._root, 0, keys, value)
   }
-
-  values() {
-    return values(this._root)
-  }
 }

@vates/multi-key-map/index.test.js

@@ -19,7 +19,7 @@ describe('MultiKeyMap', () => {
       // reverse composite key
       ['bar', 'foo'],
     ]
-    const values = keys.map(() => Math.random())
+    const values = keys.map(() => ({}))
 
     // set all values first to make sure they are all stored and not only the
     // last one
@@ -27,12 +27,6 @@ describe('MultiKeyMap', () => {
       map.set(key, values[i])
     })
 
-    assert.deepEqual(
-      Array.from(map.entries()),
-      keys.map((key, i) => [key, values[i]])
-    )
-    assert.deepEqual(Array.from(map.values()), values)
-
     keys.forEach((key, i) => {
       // copy the key to make sure the array itself is not the key
       assert.strictEqual(map.get(key.slice()), values[i])

@vates/multi-key-map/package.json

@@ -18,7 +18,7 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "0.2.0",
+  "version": "0.1.0",
   "engines": {
     "node": ">=8.10"
   },

@vates/nbd-client/index.mjs

@@ -1,9 +1,10 @@
 import assert from 'node:assert'
 import { Socket } from 'node:net'
 import { connect } from 'node:tls'
-import { fromCallback, pRetry, pDelay, pTimeout, pFromCallback } from 'promise-toolbox'
+import { fromCallback, pRetry, pDelay, pTimeout } from 'promise-toolbox'
 import { readChunkStrict } from '@vates/read-chunk'
 import { createLogger } from '@xen-orchestra/log'
+
 import {
   INIT_PASSWD,
   NBD_CMD_READ,
@@ -20,6 +21,7 @@ import {
   OPTS_MAGIC,
   NBD_CMD_DISC,
 } from './constants.mjs'
+
 const { warn } = createLogger('vates:nbd-client')
 
 // documentation is here : https://github.com/NetworkBlockDevice/nbd/blob/master/doc/proto.md
@@ -38,7 +40,6 @@ export default class NbdClient {
   #readBlockRetries
   #reconnectRetry
   #connectTimeout
-  #messageTimeout
 
   // AFAIK, there is no guaranty the server answers in the same order as the queries
   // so we handle a backlog of command waiting for response and handle concurrency manually
@@ -51,14 +52,7 @@ export default class NbdClient {
   #reconnectingPromise
   constructor(
     { address, port = NBD_DEFAULT_PORT, exportname, cert },
-    {
-      connectTimeout = 6e4,
-      messageTimeout = 6e4,
-      waitBeforeReconnect = 1e3,
-      readAhead = 10,
-      readBlockRetries = 5,
-      reconnectRetry = 5,
-    } = {}
+    { connectTimeout = 6e4, waitBeforeReconnect = 1e3, readAhead = 10, readBlockRetries = 5, reconnectRetry = 5 } = {}
   ) {
     this.#serverAddress = address
     this.#serverPort = port
@@ -69,7 +63,6 @@ export default class NbdClient {
     this.#readBlockRetries = readBlockRetries
     this.#reconnectRetry = reconnectRetry
     this.#connectTimeout = connectTimeout
-    this.#messageTimeout = messageTimeout
   }
 
   get exportSize() {
@@ -122,27 +115,13 @@ export default class NbdClient {
     if (!this.#connected) {
       return
     }
-    this.#connected = false
-    const socket = this.#serverSocket
-
-    const queryId = this.#nextCommandQueryId
-    this.#nextCommandQueryId++
 
     const buffer = Buffer.alloc(28)
     buffer.writeInt32BE(NBD_REQUEST_MAGIC, 0) // it is a nbd request
     buffer.writeInt16BE(0, 4) // no command flags for a disconnect
     buffer.writeInt16BE(NBD_CMD_DISC, 6) // we want to disconnect from nbd server
-    buffer.writeBigUInt64BE(queryId, 8)
-    buffer.writeBigUInt64BE(0n, 16)
-    buffer.writeInt32BE(0, 24)
-    const promise = pFromCallback(cb => {
-      socket.end(buffer, 'utf8', cb)
-    })
-    try {
-      await pTimeout.call(promise, this.#messageTimeout)
-    } catch (error) {
-      socket.destroy()
-    }
+    await this.#write(buffer)
+    await this.#serverSocket.destroy()
     this.#serverSocket = undefined
     this.#connected = false
   }
@@ -216,13 +195,11 @@ export default class NbdClient {
   }
 
   #read(length) {
-    const promise = readChunkStrict(this.#serverSocket, length)
-    return pTimeout.call(promise, this.#messageTimeout)
+    return readChunkStrict(this.#serverSocket, length)
   }
 
   #write(buffer) {
-    const promise = fromCallback.call(this.#serverSocket, 'write', buffer)
-    return pTimeout.call(promise, this.#messageTimeout)
+    return fromCallback.call(this.#serverSocket, 'write', buffer)
   }
 
   async #readInt32() {
@@ -255,20 +232,19 @@ export default class NbdClient {
     }
     try {
       this.#waitingForResponse = true
-      const buffer = await this.#read(16)
-      const magic = buffer.readInt32BE(0)
+      const magic = await this.#readInt32()
 
       if (magic !== NBD_REPLY_MAGIC) {
         throw new Error(`magic number for block answer is wrong : ${magic} ${NBD_REPLY_MAGIC}`)
       }
 
-      const error = buffer.readInt32BE(4)
+      const error = await this.#readInt32()
       if (error !== 0) {
         // @todo use error code from constants.mjs
         throw new Error(`GOT ERROR CODE  : ${error}`)
       }
 
-      const blockQueryId = buffer.readBigUInt64BE(8)
+      const blockQueryId = await this.#readInt64()
       const query = this.#commandQueryBacklog.get(blockQueryId)
       if (!query) {
         throw new Error(` no query associated with id ${blockQueryId}`)
@@ -289,7 +265,7 @@ export default class NbdClient {
     }
   }
 
-  async #readBlock(index, size) {
+  async readBlock(index, size = NBD_DEFAULT_BLOCK_SIZE) {
     // we don't want to add anything in backlog while reconnecting
     if (this.#reconnectingPromise) {
       await this.#reconnectingPromise
@@ -305,13 +281,7 @@ export default class NbdClient {
     buffer.writeInt16BE(NBD_CMD_READ, 6) // we want to read a data block
     buffer.writeBigUInt64BE(queryId, 8)
     // byte offset in the raw disk
-    const offset = BigInt(index) * BigInt(size)
-    const remaining = this.#exportSize - offset
-    if (remaining < BigInt(size)) {
-      size = Number(remaining)
-    }
-
-    buffer.writeBigUInt64BE(offset, 16)
+    buffer.writeBigUInt64BE(BigInt(index) * BigInt(size), 16)
     buffer.writeInt32BE(size, 24)
 
     return new Promise((resolve, reject) => {
@@ -337,13 +307,45 @@ export default class NbdClient {
     })
   }
 
-  async readBlock(index, size = NBD_DEFAULT_BLOCK_SIZE) {
-    return pRetry(() => this.#readBlock(index, size), {
-      tries: this.#readBlockRetries,
-      onRetry: async err => {
-        warn('will retry reading block ', index, err)
-        await this.reconnect()
-      },
-    })
+  async *readBlocks(indexGenerator) {
+    // default : read all blocks
+    if (indexGenerator === undefined) {
+      const exportSize = this.#exportSize
+      const chunkSize = 2 * 1024 * 1024
+      indexGenerator = function* () {
+        const nbBlocks = Math.ceil(Number(exportSize / BigInt(chunkSize)))
+        for (let index = 0; BigInt(index) < nbBlocks; index++) {
+          yield { index, size: chunkSize }
+        }
+      }
+    }
+    const readAhead = []
+    const readAheadMaxLength = this.#readAhead
+    const makeReadBlockPromise = (index, size) => {
+      const promise = pRetry(() => this.readBlock(index, size), {
+        tries: this.#readBlockRetries,
+        onRetry: async err => {
+          warn('will retry reading block ', index, err)
+          await this.reconnect()
+        },
+      })
+      // error is handled during unshift
+      promise.catch(() => {})
+      return promise
+    }
+
+    // read all blocks, but try to keep readAheadMaxLength promise waiting ahead
+    for (const { index, size } of indexGenerator()) {
+      // stack readAheadMaxLength promises before starting to handle the results
+      if (readAhead.length === readAheadMaxLength) {
+        // any error will stop reading blocks
+        yield readAhead.shift()
+      }
+
+      readAhead.push(makeReadBlockPromise(index, size))
+    }
+    while (readAhead.length > 0) {
+      yield readAhead.shift()
+    }
   }
 }

@vates/nbd-client/multi.mjs

@@ -1,85 +0,0 @@
-import { asyncEach } from '@vates/async-each'
-import { NBD_DEFAULT_BLOCK_SIZE } from './constants.mjs'
-import NbdClient from './index.mjs'
-import { createLogger } from '@xen-orchestra/log'
-
-const { warn } = createLogger('vates:nbd-client:multi')
-export default class MultiNbdClient {
-  #clients = []
-  #readAhead
-
-  get exportSize() {
-    return this.#clients[0].exportSize
-  }
-
-  constructor(settings, { nbdConcurrency = 8, readAhead = 16, ...options } = {}) {
-    this.#readAhead = readAhead
-    if (!Array.isArray(settings)) {
-      settings = [settings]
-    }
-    for (let i = 0; i < nbdConcurrency; i++) {
-      this.#clients.push(
-        new NbdClient(settings[i % settings.length], { ...options, readAhead: Math.ceil(readAhead / nbdConcurrency) })
-      )
-    }
-  }
-
-  async connect() {
-    const connectedClients = []
-    for (const clientId in this.#clients) {
-      const client = this.#clients[clientId]
-      try {
-        await client.connect()
-        connectedClients.push(client)
-      } catch (err) {
-        client.disconnect().catch(() => {})
-        warn(`can't connect to one nbd client`, { err })
-      }
-    }
-    if (connectedClients.length === 0) {
-      throw new Error(`Fail to connect to any Nbd client`)
-    }
-    if (connectedClients.length < this.#clients.length) {
-      warn(
-        `incomplete connection by multi Nbd, only ${connectedClients.length} over ${this.#clients.length} expected clients`
-      )
-      this.#clients = connectedClients
-    }
-  }
-
-  async disconnect() {
-    await asyncEach(this.#clients, client => client.disconnect(), {
-      stopOnError: false,
-    })
-  }
-
-  async readBlock(index, size = NBD_DEFAULT_BLOCK_SIZE) {
-    const clientId = index % this.#clients.length
-    return this.#clients[clientId].readBlock(index, size)
-  }
-
-  async *readBlocks(indexGenerator) {
-    // default : read all blocks
-    const readAhead = []
-    const makeReadBlockPromise = (index, size) => {
-      const promise = this.readBlock(index, size)
-      // error is handled during unshift
-      promise.catch(() => {})
-      return promise
-    }
-
-    // read all blocks, but try to keep readAheadMaxLength promise waiting ahead
-    for (const { index, size } of indexGenerator()) {
-      // stack readAheadMaxLength promises before starting to handle the results
-      if (readAhead.length === this.#readAhead) {
-        // any error will stop reading blocks
-        yield readAhead.shift()
-      }
-
-      readAhead.push(makeReadBlockPromise(index, size))
-    }
-    while (readAhead.length > 0) {
-      yield readAhead.shift()
-    }
-  }
-}

@vates/nbd-client/package.json

@@ -13,7 +13,7 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "3.0.0",
+  "version": "2.0.0",
   "engines": {
     "node": ">=14.0"
   },
@@ -24,14 +24,14 @@
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/log": "^0.6.0",
     "promise-toolbox": "^0.21.0",
-    "xen-api": "^2.0.1"
+    "xen-api": "^1.3.6"
   },
   "devDependencies": {
-    "tap": "^18.7.0",
+    "tap": "^16.3.0",
     "tmp": "^0.2.1"
   },
   "scripts": {
     "postversion": "npm publish --access public",
-    "test-integration": "tap --allow-incomplete-coverage"
+    "test-integration": "tap --lines 97 --functions 95 --branches 74 --statements 97 tests/*.integ.mjs"
   }
 }

@vates/nbd-client/tests/nbdclient.integ.mjs

@@ -1,3 +1,4 @@
+import NbdClient from '../index.mjs'
 import { spawn, exec } from 'node:child_process'
 import fs from 'node:fs/promises'
 import { test } from 'tap'
@@ -6,10 +7,8 @@ import { pFromCallback } from 'promise-toolbox'
 import { Socket } from 'node:net'
 import { NBD_DEFAULT_PORT } from '../constants.mjs'
 import assert from 'node:assert'
-import MultiNbdClient from '../multi.mjs'
 
-const CHUNK_SIZE = 1024 * 1024 // non default size
-const FILE_SIZE = 1024 * 1024 * 9.5 // non aligned file size
+const FILE_SIZE = 10 * 1024 * 1024
 
 async function createTempFile(size) {
   const tmpPath = await pFromCallback(cb => tmp.file(cb))
@@ -82,7 +81,7 @@ test('it works with unsecured network', async tap => {
   const path = await createTempFile(FILE_SIZE)
 
   let nbdServer = await spawnNbdKit(path)
-  const client = new MultiNbdClient(
+  const client = new NbdClient(
     {
       address: '127.0.0.1',
       exportname: 'MY_SECRET_EXPORT',
@@ -110,13 +109,13 @@ CYu1Xn/FVPx1HoRgWc7E8wFhDcA/P3SJtfIQWHB9FzSaBflKGR4t8WCE2eE8+cTB
 `,
     },
     {
-      nbdConcurrency: 1,
       readAhead: 2,
     }
   )
 
   await client.connect()
   tap.equal(client.exportSize, BigInt(FILE_SIZE))
+  const CHUNK_SIZE = 1024 * 1024 // non default size
   const indexes = []
   for (let i = 0; i < FILE_SIZE / CHUNK_SIZE; i++) {
     indexes.push(i)
@@ -128,9 +127,9 @@ CYu1Xn/FVPx1HoRgWc7E8wFhDcA/P3SJtfIQWHB9FzSaBflKGR4t8WCE2eE8+cTB
   })
   let i = 0
   for await (const block of nbdIterator) {
-    let blockOk = block.length === Math.min(CHUNK_SIZE, FILE_SIZE - CHUNK_SIZE * i)
+    let blockOk = true
     let firstFail
-    for (let j = 0; j < block.length; j += 4) {
+    for (let j = 0; j < CHUNK_SIZE; j += 4) {
       const wanted = i * CHUNK_SIZE + j
       const found = block.readUInt32BE(j)
       blockOk = blockOk && found === wanted
@@ -138,7 +137,7 @@ CYu1Xn/FVPx1HoRgWc7E8wFhDcA/P3SJtfIQWHB9FzSaBflKGR4t8WCE2eE8+cTB
         firstFail = j
       }
     }
-    tap.ok(blockOk, `check block ${i} content ${block.length}`)
+    tap.ok(blockOk, `check block ${i} content`)
     i++
 
     // flaky server is flaky
@@ -148,6 +147,17 @@ CYu1Xn/FVPx1HoRgWc7E8wFhDcA/P3SJtfIQWHB9FzSaBflKGR4t8WCE2eE8+cTB
       nbdServer = await spawnNbdKit(path)
     }
   }
+
+  // we can reuse the conneciton to read other blocks
+  // default iterator
+  const nbdIteratorWithDefaultBlockIterator = client.readBlocks()
+  let nb = 0
+  for await (const block of nbdIteratorWithDefaultBlockIterator) {
+    nb++
+    tap.equal(block.length, 2 * 1024 * 1024)
+  }
+
+  tap.equal(nb, 5)
   assert.rejects(() => client.readBlock(100, CHUNK_SIZE))
 
   await client.disconnect()

@vates/otp/index.spec.mjs

@@ -1,5 +1,5 @@
 import { strict as assert } from 'node:assert'
-import test from 'test'
+import { describe, it } from 'tap/mocha'
 
 import {
   generateHotp,
@@ -11,8 +11,6 @@ import {
   verifyTotp,
 } from './index.mjs'
 
-const { describe, it } = test
-
 describe('generateSecret', function () {
   it('generates a string of 32 chars', async function () {
     const secret = generateSecret()

@vates/otp/package.json

@@ -31,9 +31,9 @@
   },
   "scripts": {
     "postversion": "npm publish --access public",
-    "test": "node--test"
+    "test": "tap"
   },
   "devDependencies": {
-    "test": "^3.3.0"
+    "tap": "^16.3.0"
   }
 }

@vates/predicates/index.spec.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const assert = require('assert/strict')
-const { describe, it } = require('test')
+const { describe, it } = require('tap').mocha
 
 const { every, not, some } = require('./')
 

@vates/predicates/package.json

@@ -32,9 +32,9 @@
   },
   "scripts": {
     "postversion": "npm publish --access public",
-    "test": "node--test"
+    "test": "tap"
   },
   "devDependencies": {
-    "test": "^3.3.0"
+    "tap": "^16.0.1"
   }
 }

@vates/read-chunk/index.js

@@ -22,41 +22,41 @@ const readChunk = (stream, size) =>
   stream.errored != null
     ? Promise.reject(stream.errored)
     : stream.closed || stream.readableEnded
-      ? Promise.resolve(null)
-      : new Promise((resolve, reject) => {
-          if (size !== undefined) {
-            assert(size > 0)
+    ? Promise.resolve(null)
+    : new Promise((resolve, reject) => {
+        if (size !== undefined) {
+          assert(size > 0)
 
-            // per Node documentation:
-            // > The size argument must be less than or equal to 1 GiB.
-            assert(size < 1073741824)
-          }
+          // per Node documentation:
+          // > The size argument must be less than or equal to 1 GiB.
+          assert(size < 1073741824)
+        }
 
-          function onEnd() {
-            resolve(null)
+        function onEnd() {
+          resolve(null)
+          removeListeners()
+        }
+        function onError(error) {
+          reject(error)
+          removeListeners()
+        }
+        function onReadable() {
+          const data = stream.read(size)
+          if (data !== null) {
+            resolve(data)
             removeListeners()
           }
-          function onError(error) {
-            reject(error)
-            removeListeners()
-          }
-          function onReadable() {
-            const data = stream.read(size)
-            if (data !== null) {
-              resolve(data)
-              removeListeners()
-            }
-          }
-          function removeListeners() {
-            stream.removeListener('end', onEnd)
-            stream.removeListener('error', onError)
-            stream.removeListener('readable', onReadable)
-          }
-          stream.on('end', onEnd)
-          stream.on('error', onError)
-          stream.on('readable', onReadable)
-          onReadable()
-        })
+        }
+        function removeListeners() {
+          stream.removeListener('end', onEnd)
+          stream.removeListener('error', onError)
+          stream.removeListener('readable', onReadable)
+        }
+        stream.on('end', onEnd)
+        stream.on('error', onError)
+        stream.on('readable', onReadable)
+        onReadable()
+      })
 exports.readChunk = readChunk
 
 /**
@@ -111,42 +111,42 @@ async function skip(stream, size) {
   return stream.errored != null
     ? Promise.reject(stream.errored)
     : size === 0 || stream.closed || stream.readableEnded
-      ? Promise.resolve(0)
-      : new Promise((resolve, reject) => {
-          let left = size
-          function onEnd() {
-            resolve(size - left)
-            removeListeners()
-          }
-          function onError(error) {
-            reject(error)
-            removeListeners()
-          }
-          function onReadable() {
-            const data = stream.read()
-            left -= data === null ? 0 : data.length
-            if (left > 0) {
-              // continue to read
-            } else {
-              // if more than wanted has been read, push back the rest
-              if (left < 0) {
-                stream.unshift(data.slice(left))
-              }
-
-              resolve(size)
-              removeListeners()
+    ? Promise.resolve(0)
+    : new Promise((resolve, reject) => {
+        let left = size
+        function onEnd() {
+          resolve(size - left)
+          removeListeners()
+        }
+        function onError(error) {
+          reject(error)
+          removeListeners()
+        }
+        function onReadable() {
+          const data = stream.read()
+          left -= data === null ? 0 : data.length
+          if (left > 0) {
+            // continue to read
+          } else {
+            // if more than wanted has been read, push back the rest
+            if (left < 0) {
+              stream.unshift(data.slice(left))
             }
+
+            resolve(size)
+            removeListeners()
           }
-          function removeListeners() {
-            stream.removeListener('end', onEnd)
-            stream.removeListener('error', onError)
-            stream.removeListener('readable', onReadable)
-          }
-          stream.on('end', onEnd)
-          stream.on('error', onError)
-          stream.on('readable', onReadable)
-          onReadable()
-        })
+        }
+        function removeListeners() {
+          stream.removeListener('end', onEnd)
+          stream.removeListener('error', onError)
+          stream.removeListener('readable', onReadable)
+        }
+        stream.on('end', onEnd)
+        stream.on('error', onError)
+        stream.on('readable', onReadable)
+        onReadable()
+      })
 }
 exports.skip = skip
 

@vates/task/.USAGE.md

@@ -123,7 +123,7 @@ const onProgress = makeOnProgress({
   onTaskUpdate(taskLog) {},
 })
 
-Task.run({ properties: { name: 'my task' }, onProgress }, asyncFn)
+Task.run({ data: { name: 'my task' }, onProgress }, asyncFn)
 ```
 
 It can also be fed event logs directly:

@vates/task/README.md

@@ -111,7 +111,7 @@ const onProgress = makeOnProgress({
     // current status of the task as described in the previous section
     taskLog.status
 
-    // undefined or a dictionary of properties attached to the task
+    // undefined or a dictionnary of properties attached to the task
     taskLog.properties
 
     // timestamp at which the abortion was requested, undefined otherwise
@@ -139,7 +139,7 @@ const onProgress = makeOnProgress({
   onTaskUpdate(taskLog) {},
 })
 
-Task.run({ properties: { name: 'my task' }, onProgress }, asyncFn)
+Task.run({ data: { name: 'my task' }, onProgress }, asyncFn)
 ```
 
 It can also be fed event logs directly:

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

@@ -35,7 +35,7 @@
     "test": "node--test"
   },
   "devDependencies": {
-    "sinon": "^17.0.1",
+    "sinon": "^16.0.0",
     "test": "^3.2.1"
   }
 }

@xen-orchestra/audit-core/index.spec.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const assert = require('assert/strict')
-const { afterEach, describe, it } = require('test')
+const { afterEach, describe, it } = require('tap').mocha
 
 const { AlteredRecordError, AuditCore, MissingRecordError, NULL_ID, Storage } = require('.')
 

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

@@ -13,10 +13,10 @@
   },
   "scripts": {
     "postversion": "npm publish --access public",
-    "test": "node--test"
+    "test": "tap --lines 67 --functions 92 --branches 52 --statements 67"
   },
   "dependencies": {
-    "@vates/decorate-with": "^2.1.0",
+    "@vates/decorate-with": "^2.0.0",
     "@xen-orchestra/log": "^0.6.0",
     "golike-defer": "^0.5.1",
     "object-hash": "^2.0.1"
@@ -28,6 +28,6 @@
     "url": "https://vates.fr"
   },
   "devDependencies": {
-    "test": "^3.3.0"
+    "tap": "^16.0.1"
   }
 }

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

@@ -7,8 +7,8 @@
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "dependencies": {
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/backups": "^0.44.6",
-    "@xen-orchestra/fs": "^4.1.4",
+    "@xen-orchestra/backups": "^0.43.2",
+    "@xen-orchestra/fs": "^4.1.1",
     "filenamify": "^6.0.0",
     "getopts": "^2.2.5",
     "lodash": "^4.17.15",
@@ -27,7 +27,7 @@
   "scripts": {
     "postversion": "npm publish --access public"
   },
-  "version": "1.0.14",
+  "version": "1.0.13",
   "license": "AGPL-3.0-or-later",
   "author": {
     "name": "Vates SAS",

@xen-orchestra/backups/ImportVmBackup.mjs

@@ -4,229 +4,23 @@ import { formatFilenameDate } from './_filenameDate.mjs'
 import { importIncrementalVm } from './_incrementalVm.mjs'
 import { Task } from './Task.mjs'
 import { watchStreamSize } from './_watchStreamSize.mjs'
-import { VhdNegative, VhdSynthetic } from 'vhd-lib'
-import { decorateClass } from '@vates/decorate-with'
-import { createLogger } from '@xen-orchestra/log'
-import { dirname, join } from 'node:path'
-import pickBy from 'lodash/pickBy.js'
-import { defer } from 'golike-defer'
 
-const { debug, info, warn } = createLogger('xo:backups:importVmBackup')
-async function resolveUuid(xapi, cache, uuid, type) {
-  if (uuid == null) {
-    return uuid
-  }
-  const ref = cache.get(uuid)
-  if (ref === undefined) {
-    cache.set(uuid, xapi.call(`${type}.get_by_uuid`, uuid))
-  }
-  return cache.get(uuid)
-}
 export class ImportVmBackup {
-  constructor({
-    adapter,
-    metadata,
-    srUuid,
-    xapi,
-    settings: { additionnalVmTag, newMacAddresses, mapVdisSrs = {}, useDifferentialRestore = false } = {},
-  }) {
+  constructor({ adapter, metadata, srUuid, xapi, settings: { newMacAddresses, mapVdisSrs = {} } = {} }) {
     this._adapter = adapter
-    this._importIncrementalVmSettings = { additionnalVmTag, newMacAddresses, mapVdisSrs, useDifferentialRestore }
+    this._importIncrementalVmSettings = { newMacAddresses, mapVdisSrs }
     this._metadata = metadata
     this._srUuid = srUuid
     this._xapi = xapi
   }
 
-  async #getPathOfVdiSnapshot(snapshotUuid) {
-    const metadata = this._metadata
-    if (this._pathToVdis === undefined) {
-      const backups = await this._adapter.listVmBackups(
-        this._metadata.vm.uuid,
-        ({ mode, timestamp }) => mode === 'delta' && timestamp >= metadata.timestamp
-      )
-      const map = new Map()
-      for (const backup of backups) {
-        for (const [vdiRef, vdi] of Object.entries(backup.vdis)) {
-          map.set(vdi.uuid, backup.vhds[vdiRef])
-        }
-      }
-      this._pathToVdis = map
-    }
-    return this._pathToVdis.get(snapshotUuid)
-  }
-
-  async _reuseNearestSnapshot($defer, ignoredVdis) {
-    const metadata = this._metadata
-    const { mapVdisSrs } = this._importIncrementalVmSettings
-    const { vbds, vhds, vifs, vm, vmSnapshot } = metadata
-    const streams = {}
-    const metdataDir = dirname(metadata._filename)
-    const vdis = ignoredVdis === undefined ? metadata.vdis : pickBy(metadata.vdis, vdi => !ignoredVdis.has(vdi.uuid))
-
-    for (const [vdiRef, vdi] of Object.entries(vdis)) {
-      const vhdPath = join(metdataDir, vhds[vdiRef])
-
-      let xapiDisk
-      try {
-        xapiDisk = await this._xapi.getRecordByUuid('VDI', vdi.$snapshot_of$uuid)
-      } catch (err) {
-        // if this disk is not present anymore, fall back to default restore
-        warn(err)
-      }
-
-      let snapshotCandidate, backupCandidate
-      if (xapiDisk !== undefined) {
-        debug('found disks, wlll search its snapshots', { snapshots: xapiDisk.snapshots })
-        for (const snapshotRef of xapiDisk.snapshots) {
-          const snapshot = await this._xapi.getRecord('VDI', snapshotRef)
-          debug('handling snapshot', { snapshot })
-
-          // take only the first snapshot
-          if (snapshotCandidate && snapshotCandidate.snapshot_time < snapshot.snapshot_time) {
-            debug('already got a better candidate')
-            continue
-          }
-
-          // have a corresponding backup more recent than metadata ?
-          const pathToSnapshotData = await this.#getPathOfVdiSnapshot(snapshot.uuid)
-          if (pathToSnapshotData === undefined) {
-            debug('no backup linked to this snaphot')
-            continue
-          }
-          if (snapshot.$SR.uuid !== (mapVdisSrs[vdi.$snapshot_of$uuid] ?? this._srUuid)) {
-            debug('not restored on the same SR', { snapshotSr: snapshot.$SR.uuid, mapVdisSrs, srUuid: this._srUuid })
-            continue
-          }
-
-          debug('got a candidate', pathToSnapshotData)
-
-          snapshotCandidate = snapshot
-          backupCandidate = pathToSnapshotData
-        }
-      }
-
-      let stream
-      const backupWithSnapshotPath = join(metdataDir, backupCandidate ?? '')
-      if (vhdPath === backupWithSnapshotPath) {
-        // all the data are already on the host
-        debug('direct reuse of a snapshot')
-        stream = null
-        vdis[vdiRef].baseVdi = snapshotCandidate
-        // go next disk , we won't use this stream
-        continue
-      }
-
-      let disposableDescendants
-
-      const disposableSynthetic = await VhdSynthetic.fromVhdChain(this._adapter._handler, vhdPath)
-
-      // this will also clean if another disk of this VM backup fails
-      // if user really only need to restore non failing disks he can retry with ignoredVdis
-      let disposed = false
-      const disposeOnce = async () => {
-        if (!disposed) {
-          disposed = true
-          try {
-            await disposableDescendants?.dispose()
-            await disposableSynthetic?.dispose()
-          } catch (error) {
-            warn('openVhd: failed to dispose VHDs', { error })
-          }
-        }
-      }
-      $defer.onFailure(() => disposeOnce())
-
-      const parentVhd = disposableSynthetic.value
-      await parentVhd.readBlockAllocationTable()
-      debug('got vhd synthetic of parents', parentVhd.length)
-
-      if (snapshotCandidate !== undefined) {
-        try {
-          debug('will try to use differential restore', {
-            backupWithSnapshotPath,
-            vhdPath,
-            vdiRef,
-          })
-
-          disposableDescendants = await VhdSynthetic.fromVhdChain(this._adapter._handler, backupWithSnapshotPath, {
-            until: vhdPath,
-          })
-          const descendantsVhd = disposableDescendants.value
-          await descendantsVhd.readBlockAllocationTable()
-          debug('got vhd synthetic of descendants')
-          const negativeVhd = new VhdNegative(parentVhd, descendantsVhd)
-          debug('got vhd negative')
-
-          // update the stream with the negative vhd stream
-          stream = await negativeVhd.stream()
-          vdis[vdiRef].baseVdi = snapshotCandidate
-        } catch (error) {
-          // can be a broken VHD chain, a vhd chain with a key backup, ....
-          // not an irrecuperable error, don't dispose parentVhd, and fallback to full restore
-          warn(`can't use differential restore`, { error })
-          disposableDescendants?.dispose()
-        }
-      }
-      // didn't make a negative stream : fallback to classic stream
-      if (stream === undefined) {
-        debug('use legacy restore')
-        stream = await parentVhd.stream()
-      }
-
-      stream.on('end', disposeOnce)
-      stream.on('close', disposeOnce)
-      stream.on('error', disposeOnce)
-      info('everything is ready, will transfer', stream.length)
-      streams[`${vdiRef}.vhd`] = stream
-    }
-    return {
-      streams,
-      vbds,
-      vdis,
-      version: '1.0.0',
-      vifs,
-      vm: { ...vm, suspend_VDI: vmSnapshot.suspend_VDI },
-    }
-  }
-
-  async #decorateIncrementalVmMetadata() {
-    const { additionnalVmTag, mapVdisSrs, useDifferentialRestore } = this._importIncrementalVmSettings
-
-    const ignoredVdis = new Set(
-      Object.entries(mapVdisSrs)
-        .filter(([_, srUuid]) => srUuid === null)
-        .map(([vdiUuid]) => vdiUuid)
-    )
-    let backup
-    if (useDifferentialRestore) {
-      backup = await this._reuseNearestSnapshot(ignoredVdis)
-    } else {
-      backup = await this._adapter.readIncrementalVmBackup(this._metadata, ignoredVdis)
-    }
-    const xapi = this._xapi
-
-    const cache = new Map()
-    const mapVdisSrRefs = {}
-    if (additionnalVmTag !== undefined) {
-      backup.vm.tags.push(additionnalVmTag)
-    }
-    for (const [vdiUuid, srUuid] of Object.entries(mapVdisSrs)) {
-      mapVdisSrRefs[vdiUuid] = await resolveUuid(xapi, cache, srUuid, 'SR')
-    }
-    const srRef = await resolveUuid(xapi, cache, this._srUuid, 'SR')
-    Object.values(backup.vdis).forEach(vdi => {
-      vdi.SR = mapVdisSrRefs[vdi.uuid] ?? srRef
-    })
-    return backup
-  }
-
   async run() {
     const adapter = this._adapter
     const metadata = this._metadata
     const isFull = metadata.mode === 'full'
 
     const sizeContainer = { size: 0 }
-    const { newMacAddresses } = this._importIncrementalVmSettings
+
     let backup
     if (isFull) {
       backup = await adapter.readFullVmBackup(metadata)
@@ -234,7 +28,12 @@ export class ImportVmBackup {
     } else {
       assert.strictEqual(metadata.mode, 'delta')
 
-      backup = await this.#decorateIncrementalVmMetadata()
+      const ignoredVdis = new Set(
+        Object.entries(this._importIncrementalVmSettings.mapVdisSrs)
+          .filter(([_, srUuid]) => srUuid === null)
+          .map(([vdiUuid]) => vdiUuid)
+      )
+      backup = await adapter.readIncrementalVmBackup(metadata, ignoredVdis)
       Object.values(backup.streams).forEach(stream => watchStreamSize(stream, sizeContainer))
     }
 
@@ -249,7 +48,8 @@ export class ImportVmBackup {
         const vmRef = isFull
           ? await xapi.VM_import(backup, srRef)
           : await importIncrementalVm(backup, await xapi.getRecord('SR', srRef), {
-              newMacAddresses,
+              ...this._importIncrementalVmSettings,
+              detectBase: false,
             })
 
         await Promise.all([
@@ -259,13 +59,6 @@ export class ImportVmBackup {
             vmRef,
             `${metadata.vm.name_label} (${formatFilenameDate(metadata.timestamp)})`
           ),
-          xapi.call(
-            'VM.set_name_description',
-            vmRef,
-            `Restored on ${formatFilenameDate(+new Date())} from ${adapter._handler._remote.name} -
-             ${metadata.vm.name_description}
-            `
-          ),
         ])
 
         return {
@@ -276,5 +69,3 @@ export class ImportVmBackup {
     )
   }
 }
-
-decorateClass(ImportVmBackup, { _reuseNearestSnapshot: defer })

@xen-orchestra/backups/RemoteAdapter.mjs

@@ -35,8 +35,6 @@ export const DIR_XO_CONFIG_BACKUPS = 'xo-config-backups'
 
 export const DIR_XO_POOL_METADATA_BACKUPS = 'xo-pool-metadata-backups'
 
-const IMMUTABILTY_METADATA_FILENAME = '/immutability.json'
-
 const { debug, warn } = createLogger('xo:backups:RemoteAdapter')
 
 const compareTimestamp = (a, b) => a.timestamp - b.timestamp
@@ -191,14 +189,13 @@ export class RemoteAdapter {
   // check if we will be allowed to merge a a vhd created in this adapter
   // with the vhd at path `path`
   async isMergeableParent(packedParentUid, path) {
-    return await Disposable.use(VhdSynthetic.fromVhdChain(this.handler, path), vhd => {
+    return await Disposable.use(openVhd(this.handler, path), vhd => {
       // this baseUuid is not linked with this vhd
       if (!vhd.footer.uuid.equals(packedParentUid)) {
         return false
       }
 
-      // check if all the chain is composed of vhd directory
-      const isVhdDirectory = vhd.checkVhdsClass(VhdDirectory)
+      const isVhdDirectory = vhd instanceof VhdDirectory
       return isVhdDirectory
         ? this.useVhdDirectory() && this.#getCompressionType() === vhd.compressionType
         : !this.useVhdDirectory()
@@ -752,37 +749,10 @@ export class RemoteAdapter {
   }
 
   async readVmBackupMetadata(path) {
-    let json
-    let isImmutable = false
-    let remoteIsImmutable = false
-    // if the remote is immutable, check if this metadatas are also immutables
-    try {
-      // this file is not encrypted
-      await this._handler._readFile(IMMUTABILTY_METADATA_FILENAME)
-      remoteIsImmutable = true
-    } catch (error) {
-      if (error.code !== 'ENOENT') {
-        throw error
-      }
-    }
-
-    try {
-      // this will trigger an EPERM error if the file is immutable
-      json = await this.handler.readFile(path, { flag: 'r+' })
-      // s3 handler don't respect flags
-    } catch (err) {
-      // retry without triggerring immutbaility check ,only on immutable remote
-      if (err.code === 'EPERM' && remoteIsImmutable) {
-        isImmutable = true
-        json = await this._handler.readFile(path, { flag: 'r' })
-      } else {
-        throw err
-      }
-    }
     // _filename is a private field used to compute the backup id
     //
     // it's enumerable to make it cacheable
-    const metadata = { ...JSON.parse(json), _filename: path, isImmutable }
+    const metadata = { ...JSON.parse(await this._handler.readFile(path)), _filename: path }
 
     // backups created on XenServer < 7.1 via JSON in XML-RPC transports have boolean values encoded as integers, which make them unusable with more recent XAPIs
     if (typeof metadata.vm.is_a_template === 'number') {

@xen-orchestra/backups/RestoreMetadataBackup.mjs

@@ -21,7 +21,7 @@ export class RestoreMetadataBackup {
       })
     } else {
       const metadata = JSON.parse(await handler.readFile(join(backupId, 'metadata.json')))
-      const dataFileName = resolve('/', backupId, metadata.data ?? 'data.json').slice(1)
+      const dataFileName = resolve(backupId, metadata.data ?? 'data.json')
       const data = await handler.readFile(dataFileName)
 
       // if data is JSON, sent it as a plain string, otherwise, consider the data as binary and encode it

@xen-orchestra/backups/_cleanVm.integ.mjs

@@ -67,11 +67,6 @@ async function generateVhd(path, opts = {}) {
     await VhdAbstract.createAlias(handler, path + '.alias.vhd', dataPath)
   }
 
-  if (opts.blocks) {
-    for (const blockId of opts.blocks) {
-      await vhd.writeEntireBlock({ id: blockId, buffer: Buffer.alloc(2 * 1024 * 1024 + 512, blockId) })
-    }
-  }
   await vhd.writeBlockAllocationTable()
   await vhd.writeHeader()
   await vhd.writeFooter()
@@ -235,7 +230,7 @@ test('it merges delta of non destroyed chain', async () => {
 
   const metadata = JSON.parse(await handler.readFile(`${rootPath}/metadata.json`))
   // size should be the size of children + grand children after the merge
-  assert.equal(metadata.size, 104960)
+  assert.equal(metadata.size, 209920)
 
   // merging is already tested in vhd-lib, don't retest it here (and theses vhd are as empty as my stomach at 12h12)
   // only check deletion
@@ -325,7 +320,6 @@ describe('tests multiple combination ', () => {
         const ancestor = await generateVhd(`${basePath}/ancestor.vhd`, {
           useAlias,
           mode: vhdMode,
-          blocks: [1, 3],
         })
         const child = await generateVhd(`${basePath}/child.vhd`, {
           useAlias,
@@ -334,7 +328,6 @@ describe('tests multiple combination ', () => {
             parentUnicodeName: 'ancestor.vhd' + (useAlias ? '.alias.vhd' : ''),
             parentUuid: ancestor.footer.uuid,
           },
-          blocks: [1, 2],
         })
         // a grand child  vhd in metadata
         await generateVhd(`${basePath}/grandchild.vhd`, {
@@ -344,7 +337,6 @@ describe('tests multiple combination ', () => {
             parentUnicodeName: 'child.vhd' + (useAlias ? '.alias.vhd' : ''),
             parentUuid: child.footer.uuid,
           },
-          blocks: [2, 3],
         })
 
         // an older parent that was merging in clean
@@ -403,7 +395,7 @@ describe('tests multiple combination ', () => {
 
         const metadata = JSON.parse(await handler.readFile(`${rootPath}/metadata.json`))
         // size should be the size of children + grand children + clean after the merge
-        assert.deepEqual(metadata.size, vhdMode === 'file' ? 6502400 : 6501888)
+        assert.deepEqual(metadata.size, vhdMode === 'file' ? 314880 : undefined)
 
         // broken vhd, non referenced, abandonned should be deleted ( alias and data)
         // ancestor and child should be merged

@xen-orchestra/backups/_cleanVm.mjs

@@ -36,32 +36,34 @@ const computeVhdsSize = (handler, vhdPaths) =>
   )
 
 // chain is [ ancestor, child_1, ..., child_n ]
-async function _mergeVhdChain(handler, chain, { logInfo, remove, mergeBlockConcurrency }) {
-  logInfo(`merging VHD chain`, { chain })
+async function _mergeVhdChain(handler, chain, { logInfo, remove, merge, mergeBlockConcurrency }) {
+  if (merge) {
+    logInfo(`merging VHD chain`, { chain })
 
-  let done, total
-  const handle = setInterval(() => {
-    if (done !== undefined) {
-      logInfo('merge in progress', {
-        done,
-        parent: chain[0],
-        progress: Math.round((100 * done) / total),
-        total,
+    let done, total
+    const handle = setInterval(() => {
+      if (done !== undefined) {
+        logInfo('merge in progress', {
+          done,
+          parent: chain[0],
+          progress: Math.round((100 * done) / total),
+          total,
+        })
+      }
+    }, 10e3)
+    try {
+      return await mergeVhdChain(handler, chain, {
+        logInfo,
+        mergeBlockConcurrency,
+        onProgress({ done: d, total: t }) {
+          done = d
+          total = t
+        },
+        removeUnused: remove,
       })
+    } finally {
+      clearInterval(handle)
     }
-  }, 10e3)
-  try {
-    return await mergeVhdChain(handler, chain, {
-      logInfo,
-      mergeBlockConcurrency,
-      onProgress({ done: d, total: t }) {
-        done = d
-        total = t
-      },
-      removeUnused: remove,
-    })
-  } finally {
-    clearInterval(handle)
   }
 }
 
@@ -469,20 +471,23 @@ export async function cleanVm(
   const metadataWithMergedVhd = {}
   const doMerge = async () => {
     await asyncMap(toMerge, async chain => {
-      const { finalVhdSize } = await limitedMergeVhdChain(handler, chain, {
+      const merged = await limitedMergeVhdChain(handler, chain, {
         logInfo,
         logWarn,
         remove,
+        merge,
         mergeBlockConcurrency,
       })
-      const metadataPath = vhdsToJSons[chain[chain.length - 1]] // all the chain should have the same metada file
-      metadataWithMergedVhd[metadataPath] = (metadataWithMergedVhd[metadataPath] ?? 0) + finalVhdSize
+      if (merged !== undefined) {
+        const metadataPath = vhdsToJSons[chain[chain.length - 1]] // all the chain should have the same metada file
+        metadataWithMergedVhd[metadataPath] = true
+      }
     })
   }
 
   await Promise.all([
     ...unusedVhdsDeletion,
-    toMerge.length !== 0 && (merge ? Task.run({ name: 'merge' }, doMerge) : () => Promise.resolve()),
+    toMerge.length !== 0 && (merge ? Task.run({ name: 'merge' }, doMerge) : doMerge()),
     asyncMap(unusedXvas, path => {
       logWarn('unused XVA', { path })
       if (remove) {
@@ -504,11 +509,12 @@ export async function cleanVm(
 
   // update size for delta metadata with merged VHD
   // check for the other that the size is the same as the real file size
+
   await asyncMap(jsons, async metadataPath => {
     const metadata = backups.get(metadataPath)
 
     let fileSystemSize
-    const mergedSize = metadataWithMergedVhd[metadataPath]
+    const merged = metadataWithMergedVhd[metadataPath] !== undefined
 
     const { mode, size, vhds, xva } = metadata
 
@@ -518,29 +524,26 @@ export async function cleanVm(
         const linkedXva = resolve('/', vmDir, xva)
         try {
           fileSystemSize = await handler.getSize(linkedXva)
-          if (fileSystemSize !== size && fileSystemSize !== undefined) {
-            logWarn('cleanVm: incorrect backup size in metadata', {
-              path: metadataPath,
-              actual: size ?? 'none',
-              expected: fileSystemSize,
-            })
-          }
         } catch (error) {
           // can fail with encrypted remote
         }
       } else if (mode === 'delta') {
+        const linkedVhds = Object.keys(vhds).map(key => resolve('/', vmDir, vhds[key]))
+        fileSystemSize = await computeVhdsSize(handler, linkedVhds)
+
+        // the size is not computed in some cases (e.g. VhdDirectory)
+        if (fileSystemSize === undefined) {
+          return
+        }
+
         // don't warn if the size has changed after a merge
-        if (mergedSize === undefined) {
-          const linkedVhds = Object.keys(vhds).map(key => resolve('/', vmDir, vhds[key]))
-          fileSystemSize = await computeVhdsSize(handler, linkedVhds)
-          // the size is not computed in some cases (e.g. VhdDirectory)
-          if (fileSystemSize !== undefined && fileSystemSize !== size) {
-            logWarn('cleanVm: incorrect backup size in metadata', {
-              path: metadataPath,
-              actual: size ?? 'none',
-              expected: fileSystemSize,
-            })
-          }
+        if (!merged && fileSystemSize !== size) {
+          // FIXME: figure out why it occurs so often and, once fixed, log the real problems with `logWarn`
+          console.warn('cleanVm: incorrect backup size in metadata', {
+            path: metadataPath,
+            actual: size ?? 'none',
+            expected: fileSystemSize,
+          })
         }
       }
     } catch (error) {
@@ -548,19 +551,9 @@ export async function cleanVm(
       return
     }
 
-    // systematically update size and differentials after a merge
-
-    // @todo : after 2024-04-01 remove the fixmetadata options since the size computation is fixed
-    if (mergedSize || (fixMetadata && fileSystemSize !== size)) {
-      metadata.size = mergedSize ?? fileSystemSize ?? size
-
-      if (mergedSize) {
-        // all disks are now key disk
-        metadata.isVhdDifferencing = {}
-        for (const id of Object.values(metadata.vdis ?? {})) {
-          metadata.isVhdDifferencing[`${id}.vhd`] = false
-        }
-      }
+    // systematically update size after a merge
+    if ((merged || fixMetadata) && size !== fileSystemSize) {
+      metadata.size = fileSystemSize
       mustRegenerateCache = true
       try {
         await handler.writeFile(metadataPath, JSON.stringify(metadata), { flags: 'w' })

@xen-orchestra/backups/_incrementalVm.mjs

@@ -1,3 +1,4 @@
+import find from 'lodash/find.js'
 import groupBy from 'lodash/groupBy.js'
 import ignoreErrors from 'promise-toolbox/ignoreErrors'
 import omit from 'lodash/omit.js'
@@ -11,18 +12,24 @@ import { cancelableMap } from './_cancelableMap.mjs'
 import { Task } from './Task.mjs'
 import pick from 'lodash/pick.js'
 
-// in `other_config` of an incrementally replicated VM, contains the UUID of the source VM
 export const TAG_BASE_DELTA = 'xo:base_delta'
 
-// in `other_config` of an incrementally replicated VM, contains the UUID of the target SR used for replication
-//
-// added after the complete replication
-export const TAG_BACKUP_SR = 'xo:backup:sr'
-
-// in other_config of VDIs of an incrementally replicated VM, contains the UUID of the source VDI
 export const TAG_COPY_SRC = 'xo:copy_of'
 
+const TAG_BACKUP_SR = 'xo:backup:sr'
+
 const ensureArray = value => (value === undefined ? [] : Array.isArray(value) ? value : [value])
+const resolveUuid = async (xapi, cache, uuid, type) => {
+  if (uuid == null) {
+    return uuid
+  }
+  let ref = cache.get(uuid)
+  if (ref === undefined) {
+    ref = await xapi.call(`${type}.get_by_uuid`, uuid)
+    cache.set(uuid, ref)
+  }
+  return ref
+}
 
 export async function exportIncrementalVm(
   vm,
@@ -34,7 +41,6 @@ export async function exportIncrementalVm(
     fullVdisRequired = new Set(),
 
     disableBaseTags = false,
-    nbdConcurrency = 1,
     preferNbd,
   } = {}
 ) {
@@ -83,7 +89,6 @@ export async function exportIncrementalVm(
       baseRef: baseVdi?.$ref,
       cancelToken,
       format: 'vhd',
-      nbdConcurrency,
       preferNbd,
     })
   })
@@ -142,7 +147,7 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
   $defer,
   incrementalVm,
   sr,
-  { cancelToken = CancelToken.none, newMacAddresses = false } = {}
+  { cancelToken = CancelToken.none, detectBase = true, mapVdisSrs = {}, newMacAddresses = false } = {}
 ) {
   const { version } = incrementalVm
   if (compareVersions(version, '1.0.0') < 0) {
@@ -152,6 +157,35 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
   const vmRecord = incrementalVm.vm
   const xapi = sr.$xapi
 
+  let baseVm
+  if (detectBase) {
+    const remoteBaseVmUuid = vmRecord.other_config[TAG_BASE_DELTA]
+    if (remoteBaseVmUuid) {
+      baseVm = find(
+        xapi.objects.all,
+        obj => (obj = obj.other_config) && obj[TAG_COPY_SRC] === remoteBaseVmUuid && obj[TAG_BACKUP_SR] === sr.$id
+      )
+
+      if (!baseVm) {
+        throw new Error(`could not find the base VM (copy of ${remoteBaseVmUuid})`)
+      }
+    }
+  }
+
+  const cache = new Map()
+  const mapVdisSrRefs = {}
+  for (const [vdiUuid, srUuid] of Object.entries(mapVdisSrs)) {
+    mapVdisSrRefs[vdiUuid] = await resolveUuid(xapi, cache, srUuid, 'SR')
+  }
+
+  const baseVdis = {}
+  baseVm &&
+    baseVm.$VBDs.forEach(vbd => {
+      const vdi = vbd.$VDI
+      if (vdi !== undefined) {
+        baseVdis[vbd.VDI] = vbd.$VDI
+      }
+    })
   const vdiRecords = incrementalVm.vdis
 
   // 0. Create suspend_VDI
@@ -163,7 +197,18 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
         vm: pick(vmRecord, 'uuid', 'name_label', 'suspend_VDI'),
       })
     } else {
-      suspendVdi = await xapi.getRecord('VDI', await xapi.VDI_create(vdi))
+      suspendVdi = await xapi.getRecord(
+        'VDI',
+        await xapi.VDI_create({
+          ...vdi,
+          other_config: {
+            ...vdi.other_config,
+            [TAG_BASE_DELTA]: undefined,
+            [TAG_COPY_SRC]: vdi.uuid,
+          },
+          sr: mapVdisSrRefs[vdi.uuid] ?? sr.$ref,
+        })
+      )
       $defer.onFailure(() => suspendVdi.$destroy())
     }
   }
@@ -181,6 +226,10 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
       ha_always_run: false,
       is_a_template: false,
       name_label: '[Importing…] ' + vmRecord.name_label,
+      other_config: {
+        ...vmRecord.other_config,
+        [TAG_COPY_SRC]: vmRecord.uuid,
+      },
     },
     {
       bios_strings: vmRecord.bios_strings,
@@ -201,8 +250,14 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
     const vdi = vdiRecords[vdiRef]
     let newVdi
 
-    if (vdi.baseVdi !== undefined) {
-      newVdi = await xapi.getRecord('VDI', await vdi.baseVdi.$clone())
+    const remoteBaseVdiUuid = detectBase && vdi.other_config[TAG_BASE_DELTA]
+    if (remoteBaseVdiUuid) {
+      const baseVdi = find(baseVdis, vdi => vdi.other_config[TAG_COPY_SRC] === remoteBaseVdiUuid)
+      if (!baseVdi) {
+        throw new Error(`missing base VDI (copy of ${remoteBaseVdiUuid})`)
+      }
+
+      newVdi = await xapi.getRecord('VDI', await baseVdi.$clone())
       $defer.onFailure(() => newVdi.$destroy())
 
       await newVdi.update_other_config(TAG_COPY_SRC, vdi.uuid)
@@ -213,7 +268,18 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
       // suspendVDI has already created
       newVdi = suspendVdi
     } else {
-      newVdi = await xapi.getRecord('VDI', await xapi.VDI_create(vdi))
+      newVdi = await xapi.getRecord(
+        'VDI',
+        await xapi.VDI_create({
+          ...vdi,
+          other_config: {
+            ...vdi.other_config,
+            [TAG_BASE_DELTA]: undefined,
+            [TAG_COPY_SRC]: vdi.uuid,
+          },
+          SR: mapVdisSrRefs[vdi.uuid] ?? sr.$ref,
+        })
+      )
       $defer.onFailure(() => newVdi.$destroy())
     }
 
@@ -252,19 +318,13 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
     // Import VDI contents.
     cancelableMap(cancelToken, Object.entries(newVdis), async (cancelToken, [id, vdi]) => {
       for (let stream of ensureArray(streams[`${id}.vhd`])) {
-        if (stream === null) {
-          // we restore a backup and reuse completly a local snapshot
-          continue
-        }
         if (typeof stream === 'function') {
           stream = await stream()
         }
         if (stream.length === undefined) {
           stream = await createVhdStreamWithLength(stream)
         }
-        await xapi.setField('VDI', vdi.$ref, 'name_label', `[Importing] ${vdiRecords[id].name_label}`)
         await vdi.$importContent(stream, { cancelToken, format: 'vhd' })
-        await xapi.setField('VDI', vdi.$ref, 'name_label', vdiRecords[id].name_label)
       }
     }),
 

@xen-orchestra/backups/_runners/_vmRunners/IncrementalRemote.mjs

@@ -2,7 +2,6 @@ import { asyncEach } from '@vates/async-each'
 import { decorateMethodsWith } from '@vates/decorate-with'
 import { defer } from 'golike-defer'
 import assert from 'node:assert'
-import * as UUID from 'uuid'
 import isVhdDifferencingDisk from 'vhd-lib/isVhdDifferencingDisk.js'
 import mapValues from 'lodash/mapValues.js'
 
@@ -10,48 +9,11 @@ import { AbstractRemote } from './_AbstractRemote.mjs'
 import { forkDeltaExport } from './_forkDeltaExport.mjs'
 import { IncrementalRemoteWriter } from '../_writers/IncrementalRemoteWriter.mjs'
 import { Task } from '../../Task.mjs'
-import { Disposable } from 'promise-toolbox'
-import { openVhd } from 'vhd-lib'
-import { getVmBackupDir } from '../../_getVmBackupDir.mjs'
 
 class IncrementalRemoteVmBackupRunner extends AbstractRemote {
   _getRemoteWriter() {
     return IncrementalRemoteWriter
   }
-  async _selectBaseVm(metadata) {
-    // for each disk , get the parent
-    const baseUuidToSrcVdi = new Map()
-
-    // no previous backup for a base( =key) backup
-    if (metadata.isBase) {
-      return
-    }
-    await asyncEach(Object.entries(metadata.vdis), async ([id, vdi]) => {
-      const isDifferencing = metadata.isVhdDifferencing[`${id}.vhd`]
-      if (isDifferencing) {
-        const vmDir = getVmBackupDir(metadata.vm.uuid)
-        const path = `${vmDir}/${metadata.vhds[id]}`
-        // don't catch error : we can't recover if the source vhd are missing
-        await Disposable.use(openVhd(this._sourceRemoteAdapter._handler, path), vhd => {
-          baseUuidToSrcVdi.set(UUID.stringify(vhd.header.parentUuid), vdi.$snapshot_of$uuid)
-        })
-      }
-    })
-
-    const presentBaseVdis = new Map(baseUuidToSrcVdi)
-    await this._callWriters(
-      writer => presentBaseVdis.size !== 0 && writer.checkBaseVdis(presentBaseVdis),
-      'writer.checkBaseVdis()',
-      false
-    )
-    // check if the parent vdi are present in all the remotes
-    baseUuidToSrcVdi.forEach((srcVdiUuid, baseUuid) => {
-      if (!presentBaseVdis.has(baseUuid)) {
-        throw new Error(`Missing vdi ${baseUuid} which is a base for a delta`)
-      }
-    })
-    // yeah , let's go
-  }
   async _run($defer) {
     const transferList = await this._computeTransferList(({ mode }) => mode === 'delta')
     await this._callWriters(async writer => {
@@ -64,16 +26,16 @@ class IncrementalRemoteVmBackupRunner extends AbstractRemote {
     if (transferList.length > 0) {
       for (const metadata of transferList) {
         assert.strictEqual(metadata.mode, 'delta')
-        await this._selectBaseVm(metadata)
+
         await this._callWriters(writer => writer.prepare({ isBase: metadata.isBase }), 'writer.prepare()')
         const incrementalExport = await this._sourceRemoteAdapter.readIncrementalVmBackup(metadata, undefined, {
           useChain: false,
         })
 
-        const isVhdDifferencing = {}
+        const differentialVhds = {}
 
         await asyncEach(Object.entries(incrementalExport.streams), async ([key, stream]) => {
-          isVhdDifferencing[key] = await isVhdDifferencingDisk(stream)
+          differentialVhds[key] = await isVhdDifferencingDisk(stream)
         })
 
         incrementalExport.streams = mapValues(incrementalExport.streams, this._throttleStream)
@@ -81,24 +43,13 @@ class IncrementalRemoteVmBackupRunner extends AbstractRemote {
           writer =>
             writer.transfer({
               deltaExport: forkDeltaExport(incrementalExport),
-              isVhdDifferencing,
+              differentialVhds,
               timestamp: metadata.timestamp,
               vm: metadata.vm,
               vmSnapshot: metadata.vmSnapshot,
             }),
           'writer.transfer()'
         )
-        // this will update parent name with the needed alias
-        await this._callWriters(
-          writer =>
-            writer.updateUuidAndChain({
-              isVhdDifferencing,
-              timestamp: metadata.timestamp,
-              vdis: incrementalExport.vdis,
-            }),
-          'writer.updateUuidAndChain()'
-        )
-
         await this._callWriters(writer => writer.cleanup(), 'writer.cleanup()')
         // for healthcheck
         this._tags = metadata.vm.tags

@xen-orchestra/backups/_runners/_vmRunners/IncrementalXapi.mjs

@@ -41,7 +41,6 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
 
     const deltaExport = await exportIncrementalVm(exportedVm, baseVm, {
       fullVdisRequired,
-      nbdConcurrency: this._settings.nbdConcurrency,
       preferNbd: this._settings.preferNbd,
     })
     // since NBD is network based, if one disk use nbd , all the disk use them
@@ -50,11 +49,11 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
       Task.info('Transfer data using NBD')
     }
 
-    const isVhdDifferencing = {}
+    const differentialVhds = {}
     // since isVhdDifferencingDisk is reading and unshifting data in stream
     // it should be done BEFORE any other stream transform
     await asyncEach(Object.entries(deltaExport.streams), async ([key, stream]) => {
-      isVhdDifferencing[key] = await isVhdDifferencingDisk(stream)
+      differentialVhds[key] = await isVhdDifferencingDisk(stream)
     })
     const sizeContainers = mapValues(deltaExport.streams, stream => watchStreamSize(stream))
 
@@ -69,7 +68,7 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
       writer =>
         writer.transfer({
           deltaExport: forkDeltaExport(deltaExport),
-          isVhdDifferencing,
+          differentialVhds,
           sizeContainers,
           timestamp,
           vm,
@@ -78,18 +77,6 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
       'writer.transfer()'
     )
 
-    // we want to control the uuid of the vhd in the chain
-    // and ensure they are correctly chained
-    await this._callWriters(
-      writer =>
-        writer.updateUuidAndChain({
-          isVhdDifferencing,
-          timestamp,
-          vdis: deltaExport.vdis,
-        }),
-      'writer.updateUuidAndChain()'
-    )
-
     this._baseVm = exportedVm
 
     if (baseVm !== undefined) {
@@ -145,7 +132,7 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
       ])
       const srcVdi = srcVdis[snapshotOf]
       if (srcVdi !== undefined) {
-        baseUuidToSrcVdi.set(baseUuid, srcVdi.uuid)
+        baseUuidToSrcVdi.set(baseUuid, srcVdi)
       } else {
         debug('ignore snapshot VDI because no longer present on VM', {
           vdi: baseUuid,
@@ -166,18 +153,18 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
     }
 
     const fullVdisRequired = new Set()
-    baseUuidToSrcVdi.forEach((srcVdiUuid, baseUuid) => {
+    baseUuidToSrcVdi.forEach((srcVdi, baseUuid) => {
       if (presentBaseVdis.has(baseUuid)) {
         debug('found base VDI', {
           base: baseUuid,
-          vdi: srcVdiUuid,
+          vdi: srcVdi.uuid,
         })
       } else {
         debug('missing base VDI', {
           base: baseUuid,
-          vdi: srcVdiUuid,
+          vdi: srcVdi.uuid,
         })
-        fullVdisRequired.add(srcVdiUuid)
+        fullVdisRequired.add(srcVdi.uuid)
       }
     })
 

@xen-orchestra/backups/_runners/_vmRunners/_forkDeltaExport.mjs

@@ -1,11 +1,11 @@
-import cloneDeep from 'lodash/cloneDeep.js'
 import mapValues from 'lodash/mapValues.js'
 
 import { forkStreamUnpipe } from '../_forkStreamUnpipe.mjs'
 
 export function forkDeltaExport(deltaExport) {
-  const { streams, ...rest } = deltaExport
-  const newMetadata = cloneDeep(rest)
-  newMetadata.streams = mapValues(streams, forkStreamUnpipe)
-  return newMetadata
+  return Object.create(deltaExport, {
+    streams: {
+      value: mapValues(deltaExport.streams, forkStreamUnpipe),
+    },
+  })
 }

@xen-orchestra/backups/_runners/_writers/IncrementalRemoteWriter.mjs

@@ -1,12 +1,13 @@
 import assert from 'node:assert'
 import mapValues from 'lodash/mapValues.js'
+import ignoreErrors from 'promise-toolbox/ignoreErrors'
 import { asyncEach } from '@vates/async-each'
 import { asyncMap } from '@xen-orchestra/async-map'
-import { chainVhd, openVhd } from 'vhd-lib'
+import { chainVhd, checkVhdChain, openVhd, VhdAbstract } from 'vhd-lib'
 import { createLogger } from '@xen-orchestra/log'
 import { decorateClass } from '@vates/decorate-with'
 import { defer } from 'golike-defer'
-import { dirname, basename } from 'node:path'
+import { dirname } from 'node:path'
 
 import { formatFilenameDate } from '../../_filenameDate.mjs'
 import { getOldEntries } from '../../_getOldEntries.mjs'
@@ -21,45 +22,42 @@ import { Disposable } from 'promise-toolbox'
 const { warn } = createLogger('xo:backups:DeltaBackupWriter')
 
 export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrementalWriter) {
-  #parentVdiPaths
-  #vhds
   async checkBaseVdis(baseUuidToSrcVdi) {
-    this.#parentVdiPaths = {}
     const { handler } = this._adapter
     const adapter = this._adapter
 
     const vdisDir = `${this._vmBackupDir}/vdis/${this._job.id}`
 
-    await asyncMap(baseUuidToSrcVdi, async ([baseUuid, srcVdiUuid]) => {
-      let parentDestPath
-      const vhdDir = `${vdisDir}/${srcVdiUuid}`
+    await asyncMap(baseUuidToSrcVdi, async ([baseUuid, srcVdi]) => {
+      let found = false
       try {
-        const vhds = await handler.list(vhdDir, {
+        const vhds = await handler.list(`${vdisDir}/${srcVdi.uuid}`, {
           filter: _ => _[0] !== '.' && _.endsWith('.vhd'),
           ignoreMissing: true,
           prependDir: true,
         })
         const packedBaseUuid = packUuid(baseUuid)
-        // the last one is probably the right one
-
-        for (let i = vhds.length - 1; i >= 0 && parentDestPath === undefined; i--) {
-          const path = vhds[i]
+        await asyncMap(vhds, async path => {
           try {
-            if (await adapter.isMergeableParent(packedBaseUuid, path)) {
-              parentDestPath = path
-            }
+            await checkVhdChain(handler, path)
+            // Warning, this should not be written as found = found || await adapter.isMergeableParent(packedBaseUuid, path)
+            //
+            // since all the checks of a path are done in parallel, found would be containing
+            // only the last answer of isMergeableParent which is probably not the right one
+            // this led to the support tickets  https://help.vates.fr/#ticket/zoom/4751 , 4729, 4665 and 4300
+
+            const isMergeable = await adapter.isMergeableParent(packedBaseUuid, path)
+            found = found || isMergeable
           } catch (error) {
             warn('checkBaseVdis', { error })
+            await ignoreErrors.call(VhdAbstract.unlink(handler, path))
           }
-        }
+        })
       } catch (error) {
         warn('checkBaseVdis', { error })
       }
-      // no usable parent => the runner will have to decide to fall back to a full or stop backup
-      if (parentDestPath === undefined) {
+      if (!found) {
         baseUuidToSrcVdi.delete(baseUuid)
-      } else {
-        this.#parentVdiPaths[vhdDir] = parentDestPath
       }
     })
   }
@@ -124,44 +122,6 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
     }
   }
 
-  async updateUuidAndChain({ isVhdDifferencing, vdis }) {
-    assert.notStrictEqual(
-      this.#vhds,
-      undefined,
-      '_transfer must be called before updateUuidAndChain for incremental backups'
-    )
-
-    const parentVdiPaths = this.#parentVdiPaths
-    const { handler } = this._adapter
-    const vhds = this.#vhds
-    await asyncEach(Object.entries(vdis), async ([id, vdi]) => {
-      const isDifferencing = isVhdDifferencing[`${id}.vhd`]
-      const path = `${this._vmBackupDir}/${vhds[id]}`
-      if (isDifferencing) {
-        assert.notStrictEqual(
-          parentVdiPaths,
-          'checkbasevdi must be called before updateUuidAndChain for incremental backups'
-        )
-        const parentPath = parentVdiPaths[dirname(path)]
-        // we are in a incremental backup
-        // we already computed the chain in checkBaseVdis
-        assert.notStrictEqual(parentPath, undefined, 'A differential VHD must have a parent')
-        // forbid any kind of loop
-        assert.ok(basename(parentPath) < basename(path), `vhd must be sorted to be chained`)
-        await chainVhd(handler, parentPath, handler, path)
-      }
-
-      // set the correct UUID in the VHD if needed
-      await Disposable.use(openVhd(handler, path), async vhd => {
-        if (!vhd.footer.uuid.equals(packUuid(vdi.uuid))) {
-          vhd.footer.uuid = packUuid(vdi.uuid)
-          await vhd.readBlockAllocationTable() // required by writeFooter()
-          await vhd.writeFooter()
-        }
-      })
-    })
-  }
-
   async _deleteOldEntries() {
     const adapter = this._adapter
     const oldEntries = this._oldEntries
@@ -172,7 +132,7 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
     }
   }
 
-  async _transfer($defer, { isVhdDifferencing, timestamp, deltaExport, vm, vmSnapshot }) {
+  async _transfer($defer, { differentialVhds, timestamp, deltaExport, vm, vmSnapshot }) {
     const adapter = this._adapter
     const job = this._job
     const scheduleId = this._scheduleId
@@ -180,10 +140,14 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
     const jobId = job.id
     const handler = adapter.handler
 
+    let metadataContent = await this._isAlreadyTransferred(timestamp)
+    if (metadataContent !== undefined) {
+      // @todo : should skip backup while being vigilant to not stuck the forked stream
+      Task.info('This backup has already been transfered')
+    }
+
     const basename = formatFilenameDate(timestamp)
-    // update this.#vhds before eventually skipping transfer, so that
-    // updateUuidAndChain has all the mandatory data
-    const vhds = (this.#vhds = mapValues(
+    const vhds = mapValues(
       deltaExport.vdis,
       vdi =>
         `vdis/${jobId}/${
@@ -193,18 +157,9 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
               vdi.uuid
             : vdi.$snapshot_of$uuid
         }/${adapter.getVhdFileName(basename)}`
-    ))
-
-    let metadataContent = await this._isAlreadyTransferred(timestamp)
-    if (metadataContent !== undefined) {
-      // skip backup while being vigilant to not stuck the forked stream
-      Task.info('This backup has already been transfered')
-      Object.values(deltaExport.streams).forEach(stream => stream.destroy())
-      return { size: 0 }
-    }
+    )
 
     metadataContent = {
-      isVhdDifferencing,
       jobId,
       mode: job.mode,
       scheduleId,
@@ -217,24 +172,56 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
       vm,
       vmSnapshot,
     }
-
     const { size } = await Task.run({ name: 'transfer' }, async () => {
       let transferSize = 0
       await asyncEach(
-        Object.keys(deltaExport.vdis),
-        async id => {
+        Object.entries(deltaExport.vdis),
+        async ([id, vdi]) => {
           const path = `${this._vmBackupDir}/${vhds[id]}`
-          // don't write it as transferSize += await async function
-          // since i += await asyncFun lead to race condition
-          // as explained : https://eslint.org/docs/latest/rules/require-atomic-updates
-          const transferSizeOneDisk = await adapter.writeVhd(path, deltaExport.streams[`${id}.vhd`], {
+
+          const isDelta = differentialVhds[`${id}.vhd`]
+          let parentPath
+          if (isDelta) {
+            const vdiDir = dirname(path)
+            parentPath = (
+              await handler.list(vdiDir, {
+                filter: filename => filename[0] !== '.' && filename.endsWith('.vhd'),
+                prependDir: true,
+              })
+            )
+              .sort()
+              .pop()
+
+            assert.notStrictEqual(
+              parentPath,
+              undefined,
+              `missing parent of ${id} in ${dirname(path)}, looking for ${vdi.other_config['xo:base_delta']}`
+            )
+
+            parentPath = parentPath.slice(1) // remove leading slash
+
+            // TODO remove when this has been done before the export
+            await checkVhd(handler, parentPath)
+          }
+
+          transferSize += await adapter.writeVhd(path, deltaExport.streams[`${id}.vhd`], {
             // no checksum for VHDs, because they will be invalidated by
             // merges and chainings
             checksum: false,
             validator: tmpPath => checkVhd(handler, tmpPath),
             writeBlockConcurrency: this._config.writeBlockConcurrency,
           })
-          transferSize += transferSizeOneDisk
+
+          if (isDelta) {
+            await chainVhd(handler, parentPath, handler, path)
+          }
+
+          // set the correct UUID in the VHD
+          await Disposable.use(openVhd(handler, path), async vhd => {
+            vhd.footer.uuid = packUuid(vdi.uuid)
+            await vhd.readBlockAllocationTable() // required by writeFooter()
+            await vhd.writeFooter()
+          })
         },
         {
           concurrency: settings.diskPerVmConcurrency,

@xen-orchestra/backups/_runners/_writers/IncrementalXapiWriter.mjs

@@ -1,21 +1,18 @@
-import assert from 'node:assert'
 import { asyncMap, asyncMapSettled } from '@xen-orchestra/async-map'
 import ignoreErrors from 'promise-toolbox/ignoreErrors'
 import { formatDateTime } from '@xen-orchestra/xapi'
 
 import { formatFilenameDate } from '../../_filenameDate.mjs'
 import { getOldEntries } from '../../_getOldEntries.mjs'
-import { importIncrementalVm, TAG_BACKUP_SR, TAG_BASE_DELTA, TAG_COPY_SRC } from '../../_incrementalVm.mjs'
+import { importIncrementalVm, TAG_COPY_SRC } from '../../_incrementalVm.mjs'
 import { Task } from '../../Task.mjs'
 
 import { AbstractIncrementalWriter } from './_AbstractIncrementalWriter.mjs'
 import { MixinXapiWriter } from './_MixinXapiWriter.mjs'
 import { listReplicatedVms } from './_listReplicatedVms.mjs'
-import find from 'lodash/find.js'
 
 export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWriter) {
   async checkBaseVdis(baseUuidToSrcVdi, baseVm) {
-    assert.notStrictEqual(baseVm, undefined)
     const sr = this._sr
     const replicatedVm = listReplicatedVms(sr.$xapi, this._job.id, sr.uuid, this._vmUuid).find(
       vm => vm.other_config[TAG_COPY_SRC] === baseVm.uuid
@@ -38,9 +35,7 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
       }
     }
   }
-  updateUuidAndChain() {
-    // nothing to do, the chaining is not modified in this case
-  }
+
   prepare({ isFull }) {
     // create the task related to this export and ensure all methods are called in this context
     const task = new Task({
@@ -86,54 +81,6 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
     return asyncMapSettled(this._oldEntries, vm => vm.$destroy())
   }
 
-  #decorateVmMetadata(backup) {
-    const { _warmMigration } = this._settings
-    const sr = this._sr
-    const xapi = sr.$xapi
-    const vm = backup.vm
-    vm.other_config[TAG_COPY_SRC] = vm.uuid
-    const remoteBaseVmUuid = vm.other_config[TAG_BASE_DELTA]
-    let baseVm
-    if (remoteBaseVmUuid) {
-      baseVm = find(
-        xapi.objects.all,
-        obj => (obj = obj.other_config) && obj[TAG_COPY_SRC] === remoteBaseVmUuid && obj[TAG_BACKUP_SR] === sr.$id
-      )
-
-      if (!baseVm) {
-        throw new Error(`could not find the base VM (copy of ${remoteBaseVmUuid})`)
-      }
-    }
-    const baseVdis = {}
-    baseVm?.$VBDs.forEach(vbd => {
-      const vdi = vbd.$VDI
-      if (vdi !== undefined) {
-        baseVdis[vbd.VDI] = vbd.$VDI
-      }
-    })
-
-    vm.other_config[TAG_COPY_SRC] = vm.uuid
-    if (!_warmMigration) {
-      vm.tags.push('Continuous Replication')
-    }
-
-    Object.values(backup.vdis).forEach(vdi => {
-      vdi.other_config[TAG_COPY_SRC] = vdi.uuid
-      vdi.SR = sr.$ref
-      // vdi.other_config[TAG_BASE_DELTA] is never defined on a suspend vdi
-      if (vdi.other_config[TAG_BASE_DELTA]) {
-        const remoteBaseVdiUuid = vdi.other_config[TAG_BASE_DELTA]
-        const baseVdi = find(baseVdis, vdi => vdi.other_config[TAG_COPY_SRC] === remoteBaseVdiUuid)
-        if (!baseVdi) {
-          throw new Error(`missing base VDI (copy of ${remoteBaseVdiUuid})`)
-        }
-        vdi.baseVdi = baseVdi
-      }
-    })
-
-    return backup
-  }
-
   async _transfer({ timestamp, deltaExport, sizeContainers, vm }) {
     const { _warmMigration } = this._settings
     const sr = this._sr
@@ -144,7 +91,16 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
 
     let targetVmRef
     await Task.run({ name: 'transfer' }, async () => {
-      targetVmRef = await importIncrementalVm(this.#decorateVmMetadata(deltaExport), sr)
+      targetVmRef = await importIncrementalVm(
+        {
+          __proto__: deltaExport,
+          vm: {
+            ...deltaExport.vm,
+            tags: _warmMigration ? deltaExport.vm.tags : [...deltaExport.vm.tags, 'Continuous Replication'],
+          },
+        },
+        sr
+      )
       return {
         size: Object.values(sizeContainers).reduce((sum, { size }) => sum + size, 0),
       }
@@ -165,13 +121,13 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
         )
       ),
       targetVm.update_other_config({
-        [TAG_BACKUP_SR]: srUuid,
+        'xo:backup:sr': srUuid,
 
         // these entries need to be added in case of offline backup
         'xo:backup:datetime': formatDateTime(timestamp),
         'xo:backup:job': job.id,
         'xo:backup:schedule': scheduleId,
-        [TAG_BASE_DELTA]: vm.uuid,
+        'xo:backup:vm': vm.uuid,
       }),
     ])
   }

@xen-orchestra/backups/_runners/_writers/_AbstractIncrementalWriter.mjs

@@ -5,10 +5,6 @@ export class AbstractIncrementalWriter extends AbstractWriter {
     throw new Error('Not implemented')
   }
 
-  updateUuidAndChain() {
-    throw new Error('Not implemented')
-  }
-
   cleanup() {
     throw new Error('Not implemented')
   }

@xen-orchestra/backups/_runners/_writers/_MixinRemoteWriter.mjs

@@ -96,9 +96,6 @@ export const MixinRemoteWriter = (BaseClass = Object) =>
             metadata,
             srUuid,
             xapi,
-            settings: {
-              additionnalVmTag: 'xo:no-bak=Health Check',
-            },
           }).run()
           const restoredVm = xapi.getObject(restoredId)
           try {
@@ -113,13 +110,13 @@ export const MixinRemoteWriter = (BaseClass = Object) =>
       )
     }
 
-    async _isAlreadyTransferred(timestamp) {
+    _isAlreadyTransferred(timestamp) {
       const vmUuid = this._vmUuid
       const adapter = this._adapter
       const backupDir = getVmBackupDir(vmUuid)
       try {
         const actualMetadata = JSON.parse(
-          await adapter._handler.readFile(`${backupDir}/${formatFilenameDate(timestamp)}.json`)
+          adapter._handler.readFile(`${backupDir}/${formatFilenameDate(timestamp)}.json`)
         )
         return actualMetadata
       } catch (error) {}

@xen-orchestra/backups/_runners/_writers/_MixinXapiWriter.mjs

@@ -58,7 +58,7 @@ export const MixinXapiWriter = (BaseClass = Object) =>
               )
             }
             const healthCheckVm = xapi.getObject(healthCheckVmRef) ?? (await xapi.waitObject(healthCheckVmRef))
-            await healthCheckVm.add_tags('xo:no-bak=Health Check')
+
             await new HealthCheckVmBackup({
               restoredVm: healthCheckVm,
               xapi,

@xen-orchestra/backups/docs/VM backups/README.md

@@ -221,7 +221,7 @@ For multiple objects:
 
 ### Settings
 
-Settings are described in [`@xen-orchestra/backups/\_runners/VmsXapi.mjs``](https://github.com/vatesfr/xen-orchestra/blob/master/%40xen-orchestra/backups/_runners/VmsXapi.mjs).
+Settings are described in [`@xen-orchestra/backups/Backup.js](https://github.com/vatesfr/xen-orchestra/blob/master/%40xen-orchestra/backups/Backup.js).
 
 ## Writer API
 
@@ -230,7 +230,6 @@ Settings are described in [`@xen-orchestra/backups/\_runners/VmsXapi.mjs``](http
     - `checkBaseVdis(baseUuidToSrcVdi, baseVm)`
     - `prepare({ isFull })`
     - `transfer({ timestamp, deltaExport, sizeContainers })`
-    - `updateUuidAndChain({ isVhdDifferencing, vdis })`
     - `cleanup()`
     - `healthCheck()` // is not executed if no health check sr or tag doesn't match
   - **Full**

@xen-orchestra/backups/formatVmBackups.mjs

@@ -2,21 +2,6 @@ import mapValues from 'lodash/mapValues.js'
 import { dirname } from 'node:path'
 
 function formatVmBackup(backup) {
-  const { isVhdDifferencing, vmSnapshot } = backup
-
-  let differencingVhds
-  let dynamicVhds
-  // some backups don't use snapshots, therefore cannot be with memory
-  const withMemory = vmSnapshot !== undefined && vmSnapshot.suspend_VDI !== 'OpaqueRef:NULL'
-  // isVhdDifferencing is either undefined or an object
-  if (isVhdDifferencing !== undefined) {
-    differencingVhds = Object.values(isVhdDifferencing).filter(t => t).length
-    dynamicVhds = Object.values(isVhdDifferencing).filter(t => !t).length
-    if (withMemory) {
-      // the suspend VDI (memory) is always a dynamic
-      dynamicVhds -= 1
-    }
-  }
   return {
     disks:
       backup.vhds === undefined
@@ -31,7 +16,6 @@ function formatVmBackup(backup) {
           }),
 
     id: backup.id,
-    isImmutable: backup.isImmutable,
     jobId: backup.jobId,
     mode: backup.mode,
     scheduleId: backup.scheduleId,
@@ -41,10 +25,6 @@ function formatVmBackup(backup) {
       name_description: backup.vm.name_description,
       name_label: backup.vm.name_label,
     },
-
-    differencingVhds,
-    dynamicVhds,
-    withMemory,
   }
 }
 

@xen-orchestra/backups/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.44.6",
+  "version": "0.43.2",
   "engines": {
     "node": ">=14.18"
   },
@@ -22,13 +22,13 @@
     "@vates/async-each": "^1.0.0",
     "@vates/cached-dns.lookup": "^1.0.0",
     "@vates/compose": "^2.1.0",
-    "@vates/decorate-with": "^2.1.0",
-    "@vates/disposable": "^0.1.5",
-    "@vates/fuse-vhd": "^2.1.0",
-    "@vates/nbd-client": "^3.0.0",
+    "@vates/decorate-with": "^2.0.0",
+    "@vates/disposable": "^0.1.4",
+    "@vates/fuse-vhd": "^2.0.0",
+    "@vates/nbd-client": "^2.0.0",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/fs": "^4.1.4",
+    "@xen-orchestra/fs": "^4.1.1",
     "@xen-orchestra/log": "^0.6.0",
     "@xen-orchestra/template": "^0.1.0",
     "app-conf": "^2.3.0",
@@ -44,19 +44,19 @@
     "proper-lockfile": "^4.1.2",
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
-    "vhd-lib": "^4.9.0",
-    "xen-api": "^2.0.1",
+    "vhd-lib": "^4.6.1",
+    "xen-api": "^1.3.6",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
     "fs-extra": "^11.1.0",
     "rimraf": "^5.0.1",
-    "sinon": "^17.0.1",
+    "sinon": "^16.0.0",
     "test": "^3.2.1",
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^4.2.0"
+    "@xen-orchestra/xapi": "^3.3.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {

@xen-orchestra/cr-seed-cli/index.js

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 
-import { defer } from 'golike-defer'
-import { readFileSync } from 'fs'
-import { Ref, Xapi } from 'xen-api'
+'use strict'
 
-const pkg = JSON.parse(readFileSync(new URL('./package.json', import.meta.url)))
+const { Ref, Xapi } = require('xen-api')
+const { defer } = require('golike-defer')
+
+const pkg = require('./package.json')
 
 Xapi.prototype.getVmDisks = async function (vm) {
   const disks = { __proto__: null }

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

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@xen-orchestra/cr-seed-cli",
-  "version": "1.0.0",
+  "version": "0.2.0",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/cr-seed-cli",
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "repository": {
@@ -10,15 +10,15 @@
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=8"
   },
   "bin": {
-    "xo-cr-seed": "./index.mjs"
+    "xo-cr-seed": "./index.js"
   },
   "preferGlobal": true,
   "dependencies": {
     "golike-defer": "^0.5.1",
-    "xen-api": "^2.0.1"
+    "xen-api": "^1.3.6"
   },
   "scripts": {
     "postversion": "npm publish"

@xen-orchestra/cron/package.json

@@ -42,7 +42,7 @@
     "test": "node--test"
   },
   "devDependencies": {
-    "sinon": "^17.0.1",
+    "sinon": "^16.0.0",
     "test": "^3.2.1"
   }
 }

@xen-orchestra/fs/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@xen-orchestra/fs",
-  "version": "4.1.4",
+  "version": "4.1.1",
   "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",
@@ -28,7 +28,7 @@
     "@sindresorhus/df": "^3.1.1",
     "@vates/async-each": "^1.0.0",
     "@vates/coalesce-calls": "^0.1.0",
-    "@vates/decorate-with": "^2.1.0",
+    "@vates/decorate-with": "^2.0.0",
     "@vates/read-chunk": "^1.2.0",
     "@xen-orchestra/log": "^0.6.0",
     "bind-property-descriptor": "^2.0.0",
@@ -53,7 +53,7 @@
     "cross-env": "^7.0.2",
     "dotenv": "^16.0.0",
     "rimraf": "^5.0.1",
-    "sinon": "^17.0.1",
+    "sinon": "^16.0.0",
     "test": "^3.3.0",
     "tmp": "^0.2.1"
   },

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

@@ -364,7 +364,7 @@ export default class RemoteHandlerAbstract {
     let data
     try {
       // this file is not encrypted
-      data = await this._readFile(normalizePath(ENCRYPTION_DESC_FILENAME))
+      data = await this._readFile(normalizePath(ENCRYPTION_DESC_FILENAME), 'utf-8')
       const json = JSON.parse(data)
       encryptionAlgorithm = json.algorithm
     } catch (error) {
@@ -377,7 +377,7 @@ export default class RemoteHandlerAbstract {
     try {
       this.#rawEncryptor = _getEncryptor(encryptionAlgorithm, this._remote.encryptionKey)
       // this file is encrypted
-      const data = await this.__readFile(ENCRYPTION_METADATA_FILENAME)
+      const data = await this.__readFile(ENCRYPTION_METADATA_FILENAME, 'utf-8')
       JSON.parse(data)
     } catch (error) {
       // can be enoent, bad algorithm, or broeken json ( bad key or algorithm)

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

@@ -171,12 +171,7 @@ export default class LocalHandler extends RemoteHandlerAbstract {
     }
   }
 
-  async _readFile(file, { flags, ...options } = {}) {
-    // contrary to createReadStream, readFile expect singular `flag`
-    if (flags !== undefined) {
-      options.flag = flags
-    }
-
+  async _readFile(file, options) {
     const filePath = this.getFilePath(file)
     return await this.#addSyncStackTrace(retry, () => fs.readFile(filePath, options), this.#retriesOnEagain)
   }

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

@@ -20,7 +20,5 @@ export function split(path) {
   return parts
 }
 
-// paths are made absolute otherwise fs.relative() would resolve them against working directory
-export const relativeFromFile = (file, path) => relative(dirname(normalize(file)), normalize(path))
-
+export const relativeFromFile = (file, path) => relative(dirname(file), path)
 export const resolveFromFile = (file, path) => resolve('/', dirname(file), path).slice(1)

@xen-orchestra/fs/src/path.test.js

@@ -1,17 +0,0 @@
-import { describe, it } from 'test'
-import { strict as assert } from 'assert'
-
-import { relativeFromFile } from './path.js'
-
-describe('relativeFromFile()', function () {
-  for (const [title, args] of Object.entries({
-    'file absolute and path absolute': ['/foo/bar/file.vhd', '/foo/baz/path.vhd'],
-    'file relative and path absolute': ['foo/bar/file.vhd', '/foo/baz/path.vhd'],
-    'file absolute and path relative': ['/foo/bar/file.vhd', 'foo/baz/path.vhd'],
-    'file relative and path relative': ['foo/bar/file.vhd', 'foo/baz/path.vhd'],
-  })) {
-    it('works with ' + title, function () {
-      assert.equal(relativeFromFile(...args), '../baz/path.vhd')
-    })
-  }
-})

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

@@ -33,7 +33,7 @@ import { pRetry } from 'promise-toolbox'
 const MAX_PART_SIZE = 1024 * 1024 * 1024 * 5 // 5GB
 const MAX_PART_NUMBER = 10000
 const MIN_PART_SIZE = 5 * 1024 * 1024
-const { debug, info, warn } = createLogger('xo:fs:s3')
+const { warn } = createLogger('xo:fs:s3')
 
 export default class S3Handler extends RemoteHandlerAbstract {
   #bucket
@@ -453,18 +453,10 @@ export default class S3Handler extends RemoteHandlerAbstract {
       if (res.ObjectLockConfiguration?.ObjectLockEnabled === 'Enabled') {
         // Workaround for https://github.com/aws/aws-sdk-js-v3/issues/2673
         // will automatically add the contentMD5 header to any upload to S3
-        debug(`Object Lock is enable, enable content md5 header`)
         this.#s3.middlewareStack.use(getApplyMd5BodyChecksumPlugin(this.#s3.config))
       }
     } catch (error) {
-      // maybe the account doesn't have enought privilege to query the object lock configuration
-      // be defensive and apply the md5  just in case
-      if (error.$metadata.httpStatusCode === 403) {
-        info(`s3 user doesnt have enough privilege to check for Object Lock, enable content MD5 header`)
-        this.#s3.middlewareStack.use(getApplyMd5BodyChecksumPlugin(this.#s3.config))
-      } else if (error.Code === 'ObjectLockConfigurationNotFoundError' || error.$metadata.httpStatusCode === 501) {
-        info(`Object lock is not available or not configured, don't add the content MD5 header`)
-      } else {
+      if (error.Code !== 'ObjectLockConfigurationNotFoundError') {
         throw error
       }
     }

@xen-orchestra/immutable-backups/.USAGE.md

@@ -1,10 +0,0 @@
-### make a remote immutable
-
-launch the `xo-immutable-remote` command. The configuration is stored in the config file.
-This script must be kept running to make file immutable reliably.
-
-### make file mutable
-
-launch the `xo-lift-remote-immutability` cli. The configuration is stored in the config file .
-
-If the config file have a `liftEvery`, this script will contiue to run and check regularly if there are files to update.

@xen-orchestra/immutable-backups/.npmignore

@@ -1 +0,0 @@
-../../scripts/npmignore

@xen-orchestra/immutable-backups/README.md

@@ -1,41 +0,0 @@
-<!-- DO NOT EDIT MANUALLY, THIS FILE HAS BEEN GENERATED -->
-
-# @xen-orchestra/immutable-backups
-
-[![Package Version](https://badgen.net/npm/v/@xen-orchestra/immutable-backups)](https://npmjs.org/package/@xen-orchestra/immutable-backups) ![License](https://badgen.net/npm/license/@xen-orchestra/immutable-backups) [![PackagePhobia](https://badgen.net/bundlephobia/minzip/@xen-orchestra/immutable-backups)](https://bundlephobia.com/result?p=@xen-orchestra/immutable-backups) [![Node compatibility](https://badgen.net/npm/node/@xen-orchestra/immutable-backups)](https://npmjs.org/package/@xen-orchestra/immutable-backups)
-
-## Install
-
-Installation of the [npm package](https://npmjs.org/package/@xen-orchestra/immutable-backups):
-
-```sh
-npm install --save @xen-orchestra/immutable-backups
-```
-
-## Usage
-
-### make a remote immutable
-
-launch the `xo-immutable-remote` command. The configuration is stored in the config file.
-This script must be kept running to make file immutable reliably.
-
-### make file mutable
-
-launch the `xo-lift-remote-immutability` cli. The configuration is stored in the config file .
-
-If the config file have a `liftEvery`, this script will contiue to run and check regularly if there are files to update.
-
-## Contributions
-
-Contributions are _very_ welcomed, either on the documentation or on
-the code.
-
-You may:
-
-- report any [issue](https://github.com/vatesfr/xen-orchestra/issues)
-  you've encountered;
-- fork and create a pull request.
-
-## License
-
-[AGPL-3.0-or-later](https://spdx.org/licenses/AGPL-3.0-or-later) © [Vates SAS](https://vates.fr)

@xen-orchestra/immutable-backups/_cleanXoCache.mjs

@@ -1,10 +0,0 @@
-import fs from 'node:fs/promises'
-import { dirname, join } from 'node:path'
-import isBackupMetadata from './isBackupMetadata.mjs'
-
-export default async path => {
-  if (isBackupMetadata(path)) {
-    // snipe vm metadata cache to force XO to update it
-    await fs.unlink(join(dirname(path), 'cache.json.gz'))
-  }
-}

@xen-orchestra/immutable-backups/_isInVhdDirectory.mjs

@@ -1,4 +0,0 @@
-import { dirname } from 'node:path'
-
-// check if we are handling file directly under a vhd directory ( bat, headr, footer,..)
-export default path => dirname(path).endsWith('.vhd')

@xen-orchestra/immutable-backups/_loadConfig.mjs

@@ -1,46 +0,0 @@
-import { load } from 'app-conf'
-import { homedir } from 'os'
-import { join } from 'node:path'
-import ms from 'ms'
-
-const APP_NAME = 'xo-immutable-backups'
-const APP_DIR = new URL('.', import.meta.url).pathname
-
-export default async function loadConfig() {
-  const config = await load(APP_NAME, {
-    appDir: APP_DIR,
-    ignoreUnknownFormats: true,
-  })
-  if (config.remotes === undefined || config.remotes?.length < 1) {
-    throw new Error(
-      'No remotes are configured in the config file, please add at least one [remotes.<remoteid>]  with a root property pointing to the absolute path of the remote to watch'
-    )
-  }
-  if (config.liftEvery) {
-    config.liftEvery = ms(config.liftEvery)
-  }
-  for (const [remoteId, { indexPath, immutabilityDuration, root }] of Object.entries(config.remotes)) {
-    if (!root) {
-      throw new Error(
-        `Remote ${remoteId} don't have a root property,containing the absolute path to the root of a backup repository `
-      )
-    }
-    if (!immutabilityDuration) {
-      throw new Error(
-        `Remote ${remoteId} don't have a immutabilityDuration property to indicate the minimal duration the backups should be  protected by immutability `
-      )
-    }
-    if (ms(immutabilityDuration) < ms('1d')) {
-      throw new Error(
-        `Remote ${remoteId} immutability duration is smaller than the minimum allowed (1d), current : ${immutabilityDuration}`
-      )
-    }
-    if (!indexPath) {
-      const basePath = indexPath ?? process.env.XDG_DATA_HOME ?? join(homedir(), '.local', 'share')
-      const immutabilityIndexPath = join(basePath, APP_NAME, remoteId)
-      config.remotes[remoteId].indexPath = immutabilityIndexPath
-    }
-    config.remotes[remoteId].immutabilityDuration = ms(immutabilityDuration)
-  }
-  return config
-}

@xen-orchestra/immutable-backups/config.toml

@@ -1,14 +0,0 @@
-
-# how often does the lift immutability script will run to check if 
-# some files need to be made mutable 
-liftEvery =  1h
-
-# you can add as many remote as you want, if you change the id ( here : remote1)
-#[remotes.remote1]
-#root = "/mnt/ssd/vhdblock/" # the absolute path of the root of the backup repository
-#immutabilityDuration = 7d # mandatory
-# optional, default value is false will scan and update the index on start, can be expensive
-#rebuildIndexOnStart = true 
-
-# the index path is optional, default in XDG_DATA_HOME, or if this is not set, in ~/.local/share
-#indexPath = "/var/lib/" # will add automatically the application name immutable-backup 

@xen-orchestra/immutable-backups/directory.integ.mjs

@@ -1,33 +0,0 @@
-import { describe, it } from 'node:test'
-import assert from 'node:assert/strict'
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import { tmpdir } from 'node:os'
-import * as Directory from './directory.mjs'
-import { rimraf } from 'rimraf'
-
-describe('immutable-backups/file', async () => {
-  it('really lock a directory', async () => {
-    const dir = await fs.mkdtemp(path.join(tmpdir(), 'immutable-backups-tests'))
-    const dataDir = path.join(dir, 'data')
-    await fs.mkdir(dataDir)
-    const immutDir = path.join(dir, '.immutable')
-    const filePath = path.join(dataDir, 'test')
-    await fs.writeFile(filePath, 'data')
-    await Directory.makeImmutable(dataDir, immutDir)
-    assert.strictEqual(await Directory.isImmutable(dataDir), true)
-    await assert.rejects(() => fs.writeFile(filePath, 'data'))
-    await assert.rejects(() => fs.appendFile(filePath, 'data'))
-    await assert.rejects(() => fs.unlink(filePath))
-    await assert.rejects(() => fs.rename(filePath, filePath + 'copy'))
-    await assert.rejects(() => fs.writeFile(path.join(dataDir, 'test2'), 'data'))
-    await assert.rejects(() => fs.rename(dataDir, dataDir + 'copy'))
-    await Directory.liftImmutability(dataDir, immutDir)
-    assert.strictEqual(await Directory.isImmutable(dataDir), false)
-    await fs.writeFile(filePath, 'data')
-    await fs.appendFile(filePath, 'data')
-    await fs.unlink(filePath)
-    await fs.rename(dataDir, dataDir + 'copy')
-    await rimraf(dir)
-  })
-})

@xen-orchestra/immutable-backups/directory.mjs

@@ -1,21 +0,0 @@
-import execa from 'execa'
-import { unindexFile, indexFile } from './fileIndex.mjs'
-
-export async function makeImmutable(dirPath, immutabilityCachePath) {
-  if (immutabilityCachePath) {
-    await indexFile(dirPath, immutabilityCachePath)
-  }
-  await execa('chattr', ['+i', '-R', dirPath])
-}
-
-export async function liftImmutability(dirPath, immutabilityCachePath) {
-  if (immutabilityCachePath) {
-    await unindexFile(dirPath, immutabilityCachePath)
-  }
-  await execa('chattr', ['-i', '-R', dirPath])
-}
-
-export async function isImmutable(path) {
-  const { stdout } = await execa('lsattr', ['-d', path])
-  return stdout[4] === 'i'
-}

@xen-orchestra/immutable-backups/doc.md

@@ -1,114 +0,0 @@
-# Imutability
-
-the goal is to make a remote that XO can write, but not modify during the immutability duration set on the remote. That way, it's not possible for XO to delete or encrypt any backup during this period. It protects your backup agains ransomware, at least as long as the attacker does not have a root access to the remote server.
-
-We target `governance` type of immutability, **the local root account of the remote server will be able to lift immutability**.
-
-We use the file system capabilities, they are tested on the protection process start.
-
-It is compatible with encryption at rest made by XO.
-
-## Prerequisites
-
-The commands must be run as root on the remote, or by a user with the `CAP_LINUX_IMMUTABLE` capability . On start, the protect process writes into the remote `imutability.json` file its status and the immutability duration.
-
-the `chattr` and `lsattr` should be installed on the system
-
-## Configuring
-
-this package uses app-conf to store its config. The application name is `xo-immutable-backup`. A sample config file is provided in this package.
-
-## Making a file immutable
-
-when marking a file or a folder immutable, it create an alias file in the `<indexPath>/<DayOfFileCreation>/<sha256(fullpath)>`.
-
-`indexPath` can be defined in the config file, otherwise `XDG_HOME` is used. If not available it goes to `~/.local/share`
-
-This index is used when lifting the immutability of the remote, it will only look at the old enough `<indexPath>/<DayOfFileCreation>/` folders.
-
-## Real time protecting
-
-On start, the watcher will create the index if it does not exists.
-It will also do a checkup to ensure immutability could work on this remote and handle the easiest issues.
-
-The watching process depends on the backup type, since we don't want to make temporary files and cache immutable.
-
-It won't protect files during upload, only when the files have been completly written on disk. Real time, in this case, means "protecting critical files as soon as possible after they are uploaded"
-
-This can be alleviated by :
-
-- Coupling immutability with encryption to ensure the file is not modified
-- Making health check to ensure the data are exactly as the snapshot data
-
-List of protected files :
-
-```js
-const PATHS = [
-  // xo configuration backupq
-  'xo-config-backups/*/*/data',
-  'xo-config-backups/*/*/data.json',
-  'xo-config-backups/*/*/metadata.json',
-  // pool backupq
-  'xo-pool-metadata-backups/*/metadata.json',
-  'xo-pool-metadata-backups/*/data',
-  // vm backups , xo-vm-backups/<vmuuid>/
-  'xo-vm-backups/*/*.json',
-  'xo-vm-backups/*/*.xva',
-  'xo-vm-backups/*/*.xva.checksum',
-  // xo-vm-backups/<vmuuid>/vdis/<jobid>/<vdiUuid>
-  'xo-vm-backups/*/vdis/*/*/*.vhd', // can be an alias or a vhd file
-  // for vhd directory :
-  'xo-vm-backups/*/vdis/*/*/data/*.vhd/bat',
-  'xo-vm-backups/*/vdis/*/*/data/*.vhd/header',
-  'xo-vm-backups/*/vdis/*/*/data/*.vhd/footer',
-]
-```
-
-## Releasing protection on old enough files on a remote
-
-the watcher will periodically check if some file must by unlocked
-
-## Troubleshooting
-
-### some files are still locked
-
-add the `rebuildIndexOnStart` option to the config file
-
-### make remote fully mutable again
-
-- Update the immutability setting with a 0 duration
-- launch the `liftProtection` cli.
-- remove the `protectRemotes` service
-
-### increasing the immutability duration
-
-this will prolong immutable file, but won't protect files that are already out of immutability
-
-### reducing the immutability duration
-
-change the setting, and launch the `liftProtection` cli , or wait for next planed execution
-
-### why are my incremental backups not marked as protected in XO ?
-
-are not marked as protected in XO ?
-
-For incremental backups to be marked as protected in XO, the entire chain must be under protection. To ensure at least 7 days of backups are protected, you need to set the immutability duration and retention at 14 days, the full backup interval at 7 days
-
-That means that if the last backup chain is complete ( 7 backup ) it is completely under protection, and if not, the precedent chain is also under protection. K are key backups, and are delta
-
-```
-Kd Kdddddd Kdddddd K #  8 backups protected, 2 chains
-K Kdddddd Kdddddd Kd #  9 backups protected, 2 chains
- Kdddddd Kdddddd Kdd # 10 backups protected, 2 chains
- Kddddd Kdddddd Kddd # 11 backups protected, 2 chains
- Kdddd Kdddddd Kdddd # 12 backups protected, 2 chains
- Kddd Kdddddd Kddddd # 13 backups protected, 2 chains
- Kdd Kdddddd Kdddddd #  7 backups protected, 1 chain since precedent full is now mutable
-Kd Kdddddd Kdddddd K #  8 backups protected, 2 chains
-```
-
-### Why doesn't the protect process start ?
-
-- it should be run as root or by a user with the `CAP_LINUX_IMMUTABLE` capability
-- the underlying file system should support immutability, especially the `chattr` and `lsattr` command
-- logs are in journalctl

@xen-orchestra/immutable-backups/file.integ.mjs

@@ -1,29 +0,0 @@
-import { describe, it } from 'node:test'
-import assert from 'node:assert/strict'
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import * as File from './file.mjs'
-import { tmpdir } from 'node:os'
-import { rimraf } from 'rimraf'
-
-describe('immutable-backups/file', async () => {
-  it('really lock a file', async () => {
-    const dir = await fs.mkdtemp(path.join(tmpdir(), 'immutable-backups-tests'))
-    const immutDir = path.join(dir, '.immutable')
-    const filePath = path.join(dir, 'test.ext')
-    await fs.writeFile(filePath, 'data')
-    assert.strictEqual(await File.isImmutable(filePath), false)
-    await File.makeImmutable(filePath, immutDir)
-    assert.strictEqual(await File.isImmutable(filePath), true)
-    await assert.rejects(() => fs.writeFile(filePath, 'data'))
-    await assert.rejects(() => fs.appendFile(filePath, 'data'))
-    await assert.rejects(() => fs.unlink(filePath))
-    await assert.rejects(() => fs.rename(filePath, filePath + 'copy'))
-    await File.liftImmutability(filePath, immutDir)
-    assert.strictEqual(await File.isImmutable(filePath), false)
-    await fs.writeFile(filePath, 'data')
-    await fs.appendFile(filePath, 'data')
-    await fs.unlink(filePath)
-    await rimraf(dir)
-  })
-})

@xen-orchestra/immutable-backups/file.mjs

@@ -1,24 +0,0 @@
-import execa from 'execa'
-import { unindexFile, indexFile } from './fileIndex.mjs'
-
-// this work only on linux like systems
-// this could work on windows : https://4sysops.com/archives/set-and-remove-the-read-only-file-attribute-with-powershell/
-
-export async function makeImmutable(path, immutabilityCachePath) {
-  if (immutabilityCachePath) {
-    await indexFile(path, immutabilityCachePath)
-  }
-  await execa('chattr', ['+i', path])
-}
-
-export async function liftImmutability(filePath, immutabilityCachePath) {
-  if (immutabilityCachePath) {
-    await unindexFile(filePath, immutabilityCachePath)
-  }
-  await execa('chattr', ['-i', filePath])
-}
-
-export async function isImmutable(path) {
-  const { stdout } = await execa('lsattr', ['-d', path])
-  return stdout[4] === 'i'
-}

@xen-orchestra/immutable-backups/fileIndex.integ.mjs

@@ -1,81 +0,0 @@
-import { describe, it } from 'node:test'
-import assert from 'node:assert/strict'
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import * as FileIndex from './fileIndex.mjs'
-import * as Directory from './directory.mjs'
-import { tmpdir } from 'node:os'
-import { rimraf } from 'rimraf'
-
-describe('immutable-backups/fileIndex', async () => {
-  it('index File changes', async () => {
-    const dir = await fs.mkdtemp(path.join(tmpdir(), 'immutable-backups-tests'))
-    const immutDir = path.join(dir, '.immutable')
-    const filePath = path.join(dir, 'test.ext')
-
-    await fs.writeFile(filePath, 'data')
-    await FileIndex.indexFile(filePath, immutDir)
-    await fs.mkdir(path.join(immutDir, 'NOTADATE'))
-    await fs.writeFile(path.join(immutDir, 'NOTADATE.file'), 'content')
-    let nb = 0
-    let index, target
-    for await ({ index, target } of FileIndex.listOlderTargets(immutDir, 0)) {
-      assert.strictEqual(true, false, 'Nothing should be eligible for deletion')
-    }
-    nb = 0
-    for await ({ index, target } of FileIndex.listOlderTargets(immutDir, -24 * 60 * 60 * 1000)) {
-      assert.strictEqual(target, filePath)
-      await fs.unlink(index)
-      nb++
-    }
-    assert.strictEqual(nb, 1)
-    await fs.rmdir(path.join(immutDir, 'NOTADATE'))
-    await fs.rm(path.join(immutDir, 'NOTADATE.file'))
-    for await ({ index, target } of FileIndex.listOlderTargets(immutDir, -24 * 60 * 60 * 1000)) {
-      // should remove the empty dir
-      assert.strictEqual(true, false, 'Nothing should have stayed here')
-    }
-    assert.strictEqual((await fs.readdir(immutDir)).length, 0)
-    await rimraf(dir)
-  })
-
-  it('fails correctly', async () => {
-    const dir = await fs.mkdtemp(path.join(tmpdir(), 'immutable-backups-tests'))
-    const immutDir = path.join(dir, '.immutable')
-    await fs.mkdir(immutDir)
-    const placeholderFile = path.join(dir, 'test.ext')
-    await fs.writeFile(placeholderFile, 'data')
-    await FileIndex.indexFile(placeholderFile, immutDir)
-
-    const filePath = path.join(dir, 'test2.ext')
-    await fs.writeFile(filePath, 'data')
-    await FileIndex.indexFile(filePath, immutDir)
-    await assert.rejects(() => FileIndex.indexFile(filePath, immutDir), { code: 'EEXIST' })
-
-    await Directory.makeImmutable(immutDir)
-    await assert.rejects(() => FileIndex.unindexFile(filePath, immutDir), { code: 'EPERM' })
-    await Directory.liftImmutability(immutDir)
-    await rimraf(dir)
-  })
-
-  it('handles bomb index files', async () => {
-    const dir = await fs.mkdtemp(path.join(tmpdir(), 'immutable-backups-tests'))
-    const immutDir = path.join(dir, '.immutable')
-    await fs.mkdir(immutDir)
-    const placeholderFile = path.join(dir, 'test.ext')
-    await fs.writeFile(placeholderFile, 'data')
-    await FileIndex.indexFile(placeholderFile, immutDir)
-
-    const indexDayDir = path.join(immutDir, '1980,11-28')
-    await fs.mkdir(indexDayDir)
-    await fs.writeFile(path.join(indexDayDir, 'big'), Buffer.alloc(2 * 1024 * 1024))
-    assert.rejects(async () => {
-      let index, target
-      for await ({ index, target } of FileIndex.listOlderTargets(immutDir, 0)) {
-        // should remove the empty dir
-        assert.strictEqual(true, false, `Nothing should have stayed here, got ${index} ${target}`)
-      }
-    })
-    await rimraf(dir)
-  })
-})

@xen-orchestra/immutable-backups/fileIndex.mjs

@@ -1,88 +0,0 @@
-import { join } from 'node:path'
-import { createHash } from 'node:crypto'
-import fs from 'node:fs/promises'
-import { dirname } from 'path'
-const MAX_INDEX_FILE_SIZE = 1024 * 1024
-function sha256(content) {
-  return createHash('sha256').update(content).digest('hex')
-}
-
-function formatDate(date) {
-  return date.toISOString().split('T')[0]
-}
-
-async function computeIndexFilePath(path, immutabilityIndexPath) {
-  const stat = await fs.stat(path)
-  const date = new Date(stat.birthtimeMs)
-  const day = formatDate(date)
-  const hash = sha256(path)
-  return join(immutabilityIndexPath, day, hash)
-}
-
-export async function indexFile(path, immutabilityIndexPath) {
-  const indexFilePath = await computeIndexFilePath(path, immutabilityIndexPath)
-  try {
-    await fs.writeFile(indexFilePath, path, { flag: 'wx' })
-  } catch (err) {
-    // missing dir: make it
-    if (err.code === 'ENOENT') {
-      await fs.mkdir(dirname(indexFilePath), { recursive: true })
-      await fs.writeFile(indexFilePath, path)
-    } else {
-      throw err
-    }
-  }
-  return indexFilePath
-}
-
-export async function unindexFile(path, immutabilityIndexPath) {
-  try {
-    const cacheFileName = await computeIndexFilePath(path, immutabilityIndexPath)
-    await fs.unlink(cacheFileName)
-  } catch (err) {
-    if (err.code !== 'ENOENT') {
-      throw err
-    }
-  }
-}
-
-export async function* listOlderTargets(immutabilityCachePath, immutabilityDuration) {
-  // walk all dir by day until  the limit day
-  const limitDate = new Date(Date.now() - immutabilityDuration)
-
-  const limitDay = formatDate(limitDate)
-  const dir = await fs.opendir(immutabilityCachePath)
-  for await (const dirent of dir) {
-    if (dirent.isFile()) {
-      continue
-    }
-    // ensure we have a valid date
-    if (isNaN(new Date(dirent.name))) {
-      continue
-    }
-    // recent enough to be kept
-    if (dirent.name >= limitDay) {
-      continue
-    }
-    const subDirPath = join(immutabilityCachePath, dirent.name)
-    const subdir = await fs.opendir(subDirPath)
-    let nb = 0
-    for await (const hashFileEntry of subdir) {
-      const entryFullPath = join(subDirPath, hashFileEntry.name)
-      const { size } = await fs.stat(entryFullPath)
-      if (size > MAX_INDEX_FILE_SIZE) {
-        throw new Error(`Index file at ${entryFullPath} is too big, ${size} bytes `)
-      }
-      const targetPath = await fs.readFile(entryFullPath, { encoding: 'utf8' })
-      yield {
-        index: entryFullPath,
-        target: targetPath,
-      }
-      nb++
-    }
-    // cleanup older folder
-    if (nb === 0) {
-      await fs.rmdir(subDirPath)
-    }
-  }
-}

@xen-orchestra/immutable-backups/isBackupMetadata.mjs

@@ -1 +0,0 @@
-export default path => path.match(/xo-vm-backups\/[^/]+\/[^/]+\.json$/)

@xen-orchestra/immutable-backups/liftProtection.mjs

@@ -1,37 +0,0 @@
-#!/usr/bin/env node
-
-import fs from 'node:fs/promises'
-import * as Directory from './directory.mjs'
-import { createLogger } from '@xen-orchestra/log'
-import { listOlderTargets } from './fileIndex.mjs'
-import cleanXoCache from './_cleanXoCache.mjs'
-import loadConfig from './_loadConfig.mjs'
-
-const { info, warn } = createLogger('xen-orchestra:immutable-backups:liftProtection')
-
-async function liftRemoteImmutability(immutabilityCachePath, immutabilityDuration) {
-  for await (const { index, target } of listOlderTargets(immutabilityCachePath, immutabilityDuration)) {
-    await Directory.liftImmutability(target, immutabilityCachePath)
-    await fs.unlink(index)
-    await cleanXoCache(target)
-  }
-}
-
-async function liftImmutability(remotes) {
-  for (const [remoteId, { indexPath, immutabilityDuration }] of Object.entries(remotes)) {
-    liftRemoteImmutability(indexPath, immutabilityDuration).catch(err =>
-      warn('error during watchRemote', { err, remoteId, indexPath, immutabilityDuration })
-    )
-  }
-}
-
-const { liftEvery, remotes } = await loadConfig()
-
-if (liftEvery > 0) {
-  info('setup watcher for immutability lifting')
-  setInterval(async () => {
-    liftImmutability(remotes)
-  }, liftEvery)
-} else {
-  liftImmutability(remotes)
-}

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

@@ -1,42 +0,0 @@
-{
-  "private": false,
-  "name": "@xen-orchestra/immutable-backups",
-  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/immutable-backups",
-  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
-  "repository": {
-    "directory": "@xen-orchestra/immutable-backups",
-    "type": "git",
-    "url": "https://github.com/vatesfr/xen-orchestra.git"
-  },
-  "author": {
-    "name": "Vates SAS",
-    "url": "https://vates.fr"
-  },
-  "bin": {
-    "xo-immutable-remote": "./protectRemotes.mjs",
-    "xo-lift-remote-immutability": "./liftProtection.mjs"
-  },
-  "license": "AGPL-3.0-or-later",
-  "version": "1.0.1",
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "dependencies": {
-    "@vates/async-each": "^1.0.0",
-    "@xen-orchestra/backups": "^0.44.6",
-    "@xen-orchestra/log": "^0.6.0",
-    "app-conf": "^2.3.0",
-    "chokidar": "^3.5.3",
-    "execa": "^5.0.0",
-    "ms": "^2.1.3",
-    "vhd-lib": "^4.7.0"
-  },
-  "devDependencies": {
-    "rimraf": "^5.0.5",
-    "tap": "^18.6.1"
-  },
-  "scripts": {
-    "postversion": "npm publish --access public",
-    "test-integration": "tap  *.integ.mjs"
-  }
-}

@xen-orchestra/immutable-backups/protectRemotes.mjs

@@ -1,191 +0,0 @@
-#!/usr/bin/env node
-
-import fs from 'node:fs/promises'
-import * as File from './file.mjs'
-import * as Directory from './directory.mjs'
-import assert from 'node:assert'
-import { dirname, join, sep } from 'node:path'
-import { createLogger } from '@xen-orchestra/log'
-import chokidar from 'chokidar'
-import { indexFile } from './fileIndex.mjs'
-import cleanXoCache from './_cleanXoCache.mjs'
-import loadConfig from './_loadConfig.mjs'
-import isInVhdDirectory from './_isInVhdDirectory.mjs'
-const { debug, info, warn } = createLogger('xen-orchestra:immutable-backups:remote')
-
-async function test(remotePath, indexPath) {
-  await fs.readdir(remotePath)
-
-  const testPath = join(remotePath, '.test-immut')
-  // cleanup
-  try {
-    await File.liftImmutability(testPath, indexPath)
-    await fs.unlink(testPath)
-  } catch (err) {}
-  // can create , modify and delete a file
-  await fs.writeFile(testPath, `test immut ${new Date()}`)
-  await fs.writeFile(testPath, `test immut change 1 ${new Date()}`)
-  await fs.unlink(testPath)
-
-  // cannot modify or delete an immutable file
-  await fs.writeFile(testPath, `test immut ${new Date()}`)
-  await File.makeImmutable(testPath, indexPath)
-  await assert.rejects(fs.writeFile(testPath, `test immut change 2  ${new Date()}`), { code: 'EPERM' })
-  await assert.rejects(fs.unlink(testPath), { code: 'EPERM' })
-  // can modify and delete a file after lifting immutability
-  await File.liftImmutability(testPath, indexPath)
-
-  await fs.writeFile(testPath, `test immut change 3 ${new Date()}`)
-  await fs.unlink(testPath)
-}
-async function handleExistingFile(root, indexPath, path) {
-  try {
-    // a vhd block directory is completly immutable
-    if (isInVhdDirectory(path)) {
-      // this will trigger 3 times per vhd blocks
-      const dir = join(root, dirname(path))
-      if (Directory.isImmutable(dir)) {
-        await indexFile(dir, indexPath)
-      }
-    } else {
-      // other files are immutable a file basis
-      const fullPath = join(root, path)
-      if (File.isImmutable(fullPath)) {
-        await indexFile(fullPath, indexPath)
-      }
-    }
-  } catch (error) {
-    if (error.code !== 'EEXIST') {
-      // there can be a symbolic link in the tree
-      warn('handleExistingFile', { error })
-    }
-  }
-}
-
-async function handleNewFile(root, indexPath, pendingVhds, path) {
-  // with awaitWriteFinish we have complete files here
-  // we can make them immutable
-
-  if (isInVhdDirectory(path)) {
-    // watching a vhd block
-    // wait for header/footer and BAT before making this immutable recursively
-    const splitted = path.split(sep)
-    const vmUuid = splitted[1]
-    const vdiUuid = splitted[4]
-    const uniqPath = `${vmUuid}/${vdiUuid}`
-    const { existing } = pendingVhds.get(uniqPath) ?? {}
-    if (existing === undefined) {
-      pendingVhds.set(uniqPath, { existing: 1, lastModified: Date.now() })
-    } else {
-      // already two of the key files,and we got the last one
-      if (existing === 2) {
-        await Directory.makeImmutable(join(root, dirname(path)), indexPath)
-        pendingVhds.delete(uniqPath)
-      } else {
-        // wait for the other
-        pendingVhds.set(uniqPath, { existing: existing + 1, lastModified: Date.now() })
-      }
-    }
-  } else {
-    const fullFilePath = join(root, path)
-    await File.makeImmutable(fullFilePath, indexPath)
-    await cleanXoCache(fullFilePath)
-  }
-}
-export async function watchRemote(remoteId, { root, immutabilityDuration, rebuildIndexOnStart = false, indexPath }) {
-  // create index directory
-  await fs.mkdir(indexPath, { recursive: true })
-
-  // test if fs and index directories are well configured
-  await test(root, indexPath)
-
-  // add duration and watch status in the metadata.json of the remote
-  const settingPath = join(root, 'immutability.json')
-  try {
-    // this file won't be made mutable by liftimmutability
-    await File.liftImmutability(settingPath)
-  } catch (error) {
-    // file may not exists, and it's not really a problem
-    info('lifting immutability on current settings', { error })
-  }
-  await fs.writeFile(
-    settingPath,
-    JSON.stringify({
-      since: Date.now(),
-      immutable: true,
-      duration: immutabilityDuration,
-    })
-  )
-  // no index path in makeImmutable(): the immutability won't be lifted
-  File.makeImmutable(settingPath)
-
-  // we wait for footer/header AND BAT to be written before locking a vhd directory
-  // this map allow us to track the vhd with partial metadata
-  const pendingVhds = new Map()
-  // cleanup pending vhd map periodically
-  setInterval(
-    () => {
-      pendingVhds.forEach(({ lastModified, existing }, path) => {
-        if (Date.now() - lastModified > 60 * 60 * 1000) {
-          pendingVhds.delete(path)
-          warn(`vhd at ${path} is incomplete since ${lastModified}`, { existing, lastModified, path })
-        }
-      })
-    },
-    60 * 60 * 1000
-  )
-
-  // watch the remote for any new VM metadata json file
-  const PATHS = [
-    'xo-config-backups/*/*/data',
-    'xo-config-backups/*/*/data.json',
-    'xo-config-backups/*/*/metadata.json',
-    'xo-pool-metadata-backups/*/metadata.json',
-    'xo-pool-metadata-backups/*/data',
-    // xo-vm-backups/<vmuuid>/
-    'xo-vm-backups/*/*.json',
-    'xo-vm-backups/*/*.xva',
-    'xo-vm-backups/*/*.xva.checksum',
-    // xo-vm-backups/<vmuuid>/vdis/<jobid>/<vdiUuid>
-    'xo-vm-backups/*/vdis/*/*/*.vhd', // can be an alias or a vhd file
-    // for vhd directory :
-    'xo-vm-backups/*/vdis/*/*/data/*.vhd/bat',
-    'xo-vm-backups/*/vdis/*/*/data/*.vhd/header',
-    'xo-vm-backups/*/vdis/*/*/data/*.vhd/footer',
-  ]
-
-  let ready = false
-  const watcher = chokidar.watch(PATHS, {
-    ignored: [
-      /(^|[/\\])\../, // ignore dotfiles
-      /\.lock$/,
-    ],
-    cwd: root,
-    recursive: false, // vhd directory can generate a lot of folder, don't let chokidar choke on this
-    ignoreInitial: !rebuildIndexOnStart,
-    depth: 7,
-    awaitWriteFinish: true,
-  })
-
-  // Add event listeners.
-  watcher
-    .on('add', async path => {
-      debug(`File ${path} has been added ${path.split('/').length}`)
-      if (ready) {
-        await handleNewFile(root, indexPath, pendingVhds, path)
-      } else {
-        await handleExistingFile(root, indexPath, path)
-      }
-    })
-    .on('error', error => warn(`Watcher error: ${error}`))
-    .on('ready', () => {
-      ready = true
-      info('Ready for changes')
-    })
-}
-
-const { remotes } = await loadConfig()
-
-for (const [remoteId, remote] of Object.entries(remotes)) {
-  watchRemote(remoteId, remote).catch(err => warn('error during watchRemote', { err, remoteId, remote }))
-}

@xen-orchestra/lite/.eslintrc.cjs

@@ -0,0 +1,28 @@
+/* eslint-env node */
+require("@rushstack/eslint-patch/modern-module-resolution");
+
+module.exports = {
+  globals: {
+    XO_LITE_GIT_HEAD: true,
+    XO_LITE_VERSION: true,
+  },
+  root: true,
+  env: {
+    node: true,
+  },
+  extends: [
+    "plugin:vue/vue3-essential",
+    "eslint:recommended",
+    "@vue/eslint-config-typescript/recommended",
+    "@vue/eslint-config-prettier",
+  ],
+  plugins: ["@limegrass/import-alias"],
+  rules: {
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@limegrass/import-alias/import-alias": [
+      "error",
+      { aliasConfigPath: require("path").join(__dirname, "tsconfig.json") },
+    ],
+  },
+};

@xen-orchestra/lite/.prettierrc.cjs

@@ -0,0 +1,4 @@
+// Keeping this file to prevent applying the global monorepo config for now
+module.exports = {
+  trailingComma: "es5",
+};

@xen-orchestra/lite/CHANGELOG.md

@@ -2,34 +2,9 @@
 
 ## **next**
 
-- Fix Typescript typings errors when running `yarn type-check` command (PR [#7278](https://github.com/vatesfr/xen-orchestra/pull/7278))
-- Introduce PWA Json Manifest (PR [#7291](https://github.com/vatesfr/xen-orchestra/pull/7291))
-
-## **0.1.7** (2023-12-28)
-
-- [VM/Action] Ability to migrate a VM from its view (PR [#7164](https://github.com/vatesfr/xen-orchestra/pull/7164))
-- Ability to override host address with `master` URL query param (PR [#7187](https://github.com/vatesfr/xen-orchestra/pull/7187))
-- Added tooltip on CPU provisioning warning icon (PR [#7223](https://github.com/vatesfr/xen-orchestra/pull/7223))
-- Add indeterminate state on FormToggle component (PR [#7230](https://github.com/vatesfr/xen-orchestra/pull/7230))
-- Add new UiStatusPanel component (PR [#7227](https://github.com/vatesfr/xen-orchestra/pull/7227))
-- XOA quick deploy (PR [#7245](https://github.com/vatesfr/xen-orchestra/pull/7245))
-- Fix infinite loader when no stats on pool dashboard (PR [#7236](https://github.com/vatesfr/xen-orchestra/pull/7236))
-- [Tree view] Display VMs count (PR [#7185](https://github.com/vatesfr/xen-orchestra/pull/7185))
-
-## **0.1.6** (2023-11-30)
-
-- Explicit error if users attempt to connect from a slave host (PR [#7110](https://github.com/vatesfr/xen-orchestra/pull/7110))
-- More compact UI (PR [#7159](https://github.com/vatesfr/xen-orchestra/pull/7159))
-- Fix dashboard host patches list (PR [#7169](https://github.com/vatesfr/xen-orchestra/pull/7169))
-- Ability to export selected VMs (PR [#7174](https://github.com/vatesfr/xen-orchestra/pull/7174))
-- [VM/Action] Ability to export a VM from its view (PR [#7190](https://github.com/vatesfr/xen-orchestra/pull/7190))
-
-## **0.1.5** (2023-11-07)
-
 - Ability to snapshot/copy a VM from its view (PR [#7087](https://github.com/vatesfr/xen-orchestra/pull/7087))
 - [Header] Replace logo with "XO LITE" (PR [#7118](https://github.com/vatesfr/xen-orchestra/pull/7118))
 - New VM console toolbar + Ability to send Ctrl+Alt+Del (PR [#7088](https://github.com/vatesfr/xen-orchestra/pull/7088))
-- Total overhaul of the modal system (PR [#7134](https://github.com/vatesfr/xen-orchestra/pull/7134))
 
 ## **0.1.4** (2023-10-03)
 

@xen-orchestra/lite/README.md

@@ -48,16 +48,18 @@ Note: When reading Vue official doc, don't forget to set "API Preference" toggle
 
 ```vue
 <script lang="ts" setup>
-import { computed, ref } from 'vue'
+import { computed, ref } from "vue";
 
 const props = defineProps<{
-  greetings: string
-}>()
+  greetings: string;
+}>();
 
-const firstName = ref('')
-const lastName = ref('')
+const firstName = ref("");
+const lastName = ref("");
 
-const fullName = computed(() => `${props.greetings} ${firstName.value} ${lastName.value}`)
+const fullName = computed(
+  () => `${props.greetings} ${firstName.value} ${lastName.value}`
+);
 </script>
 ```
 
@@ -71,9 +73,9 @@ Vue variables can be interpolated with `v-bind`.
 
 ```vue
 <script lang="ts" setup>
-import { ref } from 'vue'
+import { ref } from "vue";
 
-const fontSize = ref('2rem')
+const fontSize = ref("2rem");
 </script>
 
 <style scoped>
@@ -103,8 +105,8 @@ Use the `busy` prop to display a loader icon.
 </template>
 
 <script lang="ts" setup>
-import UiIcon from '@/components/ui/icon/UiIcon.vue'
-import { faDisplay } from '@fortawesome/free-solid-svg-icons'
+import UiIcon from "@/components/ui/icon/UiIcon.vue";
+import { faDisplay } from "@fortawesome/free-solid-svg-icons";
 </script>
 ```
 
@@ -138,21 +140,21 @@ For a `foobar` store, create a `store/foobar.store.ts` then use `defineStore('fo
 #### Example
 
 ```typescript
-import { computed, ref } from 'vue'
+import { computed, ref } from "vue";
 
-export const useFoobarStore = defineStore('foobar', () => {
-  const aStateVar = ref(0)
-  const otherStateVar = ref(0)
-  const aGetter = computed(() => aStateVar.value * 2)
-  const anAction = () => (otherStateVar.value += 10)
+export const useFoobarStore = defineStore("foobar", () => {
+  const aStateVar = ref(0);
+  const otherStateVar = ref(0);
+  const aGetter = computed(() => aStateVar.value * 2);
+  const anAction = () => (otherStateVar.value += 10);
 
   return {
     aStateVar,
     otherStateVar,
     aGetter,
     anAction,
-  }
-})
+  };
+});
 ```
 
 ### I18n

@xen-orchestra/lite/docs/component-stories.md

@@ -85,9 +85,9 @@ In your `.story.vue` file, import and use the `ComponentStory` component.
 </template>
 
 <script lang="ts" setup>
-import MyComponent from '@/components/MyComponent.vue'
-import ComponentStory from '@/components/component-story/ComponentStory.vue'
-import { prop, event, model, slot, setting } from '@/libs/story/story-param'
+import MyComponent from "@/components/MyComponent.vue";
+import ComponentStory from "@/components/component-story/ComponentStory.vue";
+import { prop, event, model, slot, setting } from "@/libs/story/story-param";
 </script>
 ```
 
@@ -119,27 +119,27 @@ Let's take this Vue component:
 <script lang="ts" setup>
 withDefaults(
   defineProps<{
-    imString: string
-    imNumber: number
-    imOptional?: string
-    imOptionalWithDefault?: string
-    modelValue?: string
-    customModel?: number
+    imString: string;
+    imNumber: number;
+    imOptional?: string;
+    imOptionalWithDefault?: string;
+    modelValue?: string;
+    customModel?: number;
   }>(),
-  { imOptionalWithDefault: 'Hi World' }
-)
+  { imOptionalWithDefault: "Hi World" }
+);
 
 const emit = defineEmits<{
-  (event: 'click'): void
-  (event: 'clickWithArg', id: string): void
-  (event: 'update:modelValue', value: string): void
-  (event: 'update:customModel', value: number): void
-}>()
+  (event: "click"): void;
+  (event: "clickWithArg", id: string): void;
+  (event: "update:modelValue", value: string): void;
+  (event: "update:customModel", value: number): void;
+}>();
 
-const moonDistance = 384400
+const moonDistance = 384400;
 
-const handleClick = () => emit('click')
-const handleClickWithArg = (id: string) => emit('clickWithArg', id)
+const handleClick = () => emit("click");
+const handleClickWithArg = (id: string) => emit("clickWithArg", id);
 </script>
 ```
 
@@ -150,33 +150,53 @@ Here is how to document it with a Component Story:
   <ComponentStory
     v-slot="{ properties, settings }"
     :params="[
-      prop('imString').str().required().preset('Example').widget().help('This is a required string prop'),
-      prop('imNumber').num().required().preset(42).widget().help('This is a required number prop'),
+      prop('imString')
+        .str()
+        .required()
+        .preset('Example')
+        .widget()
+        .help('This is a required string prop'),
+      prop('imNumber')
+        .num()
+        .required()
+        .preset(42)
+        .widget()
+        .help('This is a required number prop'),
       prop('imOptional').str().widget().help('This is an optional string prop'),
-      prop('imOptionalWithDefault').str().default('Hi World').widget().default('My default value'),
-      model().prop(p => p.str()),
-      model('customModel').prop(p => p.num()),
+      prop('imOptionalWithDefault')
+        .str()
+        .default('Hi World')
+        .widget()
+        .default('My default value'),
+      model().prop((p) => p.str()),
+      model('customModel').prop((p) => p.num()),
       event('click').help('Emitted when the user clicks the first button'),
-      event('clickWithArg').args({ id: 'string' }).help('Emitted when the user clicks the second button'),
+      event('clickWithArg')
+        .args({ id: 'string' })
+        .help('Emitted when the user clicks the second button'),
       slot().help('This is the default slot'),
       slot('namedSlot').help('This is a named slot'),
-      slot('namedScopedSlot').prop('moon-distance', 'number').help('This is a named slot'),
+      slot('namedScopedSlot')
+        .prop('moon-distance', 'number')
+        .help('This is a named slot'),
       setting('contentExample').widget(text()).preset('Some content'),
     ]"
   >
     <MyComponent v-bind="properties">
       {{ settings.contentExample }}
       <template #named-slot>Named slot content</template>
-      <template #named-scoped-slot="{ moonDistance }"> Moon distance is {{ moonDistance }} meters. </template>
+      <template #named-scoped-slot="{ moonDistance }">
+        Moon distance is {{ moonDistance }} meters.
+      </template>
     </MyComponent>
   </ComponentStory>
 </template>
 
 <script lang="ts" setup>
-import ComponentStory from '@/components/component-story/ComponentStory.vue'
-import MyComponent from '@/components/MyComponent.vue'
-import { event, model, prop, setting, slot } from '@/libs/story/story-param'
-import { text } from '@/libs/story/story-widget'
+import ComponentStory from "@/components/component-story/ComponentStory.vue";
+import MyComponent from "@/components/MyComponent.vue";
+import { event, model, prop, setting, slot } from "@/libs/story/story-param";
+import { text } from "@/libs/story/story-widget";
 </script>
 ```
 

@xen-orchestra/lite/docs/modals.md

@@ -1,111 +0,0 @@
-# Modal System Documentation
-
-## Opening a modal
-
-To open a modal, call `useModal(loader, props?)`.
-
-- `loader`: The modal component loader (e.g. `() => import("path/to/MyModal.vue")`)
-- `props`: The optional props to pass to the modal component
-
-This will return an object with the following methods:
-
-- `onApprove(cb)`:
-  - A function to register a callback to be called when the modal is approved.
-  - The callback will receive the modal payload as first argument, if any.
-  - The callback can return a Promise, in which case the modal will wait for it to resolve before closing.
-- `onDecline(cb)`:
-  - A function to register a callback to be called when the modal is declined.
-  - The callback can return a Promise, in which case the modal will wait for it to resolve before closing.
-
-### Static modal
-
-```ts
-useModal(MyModal)
-```
-
-### Modal with props
-
-```ts
-useModal(MyModal, { message: 'Hello world!' })
-```
-
-### Handle modal approval
-
-```ts
-const { onApprove } = useModal(MyModal, { message: 'Hello world!' })
-
-onApprove(() => console.log('Modal approved'))
-```
-
-### Handle modal approval with payload
-
-```ts
-const { onApprove } = useModal(MyModal, { message: 'Hello world!' })
-
-onApprove(payload => console.log('Modal approved with payload', payload))
-```
-
-### Handle modal decline
-
-```ts
-const { onDecline } = useModal(MyModal, { message: 'Hello world!' })
-
-onDecline(() => console.log('Modal declined'))
-```
-
-### Handle modal close
-
-```ts
-const { onClose } = useModal(MyModal, { message: 'Hello world!' })
-
-onClose(() => console.log('Modal closed'))
-```
-
-## Modal controller
-
-Inside the modal component, you can inject the modal controller with `inject(IK_MODAL)!`.
-
-```ts
-const modal = inject(IK_MODAL)!
-```
-
-You can then use the following properties and methods on the `modal` object:
-
-- `isBusy`: Whether the modal is currently doing something (e.g. waiting for a promise to resolve).
-- `approve(payload?: any | Promise<any>)`: Approve the modal with an optional payload.
-  - Set `isBusy` to `true`.
-  - Wait for the `payload` to resolve (if any).
-  - Wait for all callbacks registered with `onApprove` to resolve (if any).
-  - Close the modal in case of success.
-- `decline()`: Decline the modal.
-  - Set `isBusy` to `true`.
-  - Wait for all callbacks registered with `onDecline` to resolve (if any).
-  - Close the modal in case of success.
-
-## Components
-
-Some components are available for quick modal creation.
-
-### `UiModal`
-
-The root component of the modal which will display the backdrop.
-
-A click on the backdrop will execute `modal.decline()`.
-
-It accepts `color` and `disabled` props which will update the `ColorContext` and `DisabledContext`.
-
-`DisabledContext` will also be set to `true` when `modal.isBusy` is `true`.
-
-The component itself is a `form` and is meant to be used with `<UiModal @submit.prevent="modal.approve()">`.
-
-### `ModalApproveButton`
-
-A wrapper around `UiButton` with `type="submit"` and with the `busy` prop set to `modal.isBusy`.
-
-### `ModalDeclineButton`
-
-A wrapper around `UiButton` with an `outline` prop and with the `busy` prop set to `modal.isBusy`.
-
-This button will call `modal.decline()` on click.
-
-Default text is `$t("cancel")`.

@xen-orchestra/lite/docs/xen-api-collections.md

@@ -36,7 +36,7 @@ They are stored in `src/composables/xen-api-collection/*-collection.composable.t
 ```typescript
 // src/composables/xen-api-collection/console-collection.composable.ts
 
-export const useConsoleCollection = () => useXenApiCollection('console')
+export const useConsoleCollection = () => useXenApiCollection("console");
 ```
 
 If you want to allow the user to defer the subscription, you can propagate the options to `useXenApiCollection`.
@@ -44,16 +44,19 @@ If you want to allow the user to defer the subscription, you can propagate the o
 ```typescript
 // console-collection.composable.ts
 
-export const useConsoleCollection = <Immediate extends boolean = true>(options?: { immediate?: Immediate }) =>
-  useXenApiCollection('console', options)
+export const useConsoleCollection = <
+  Immediate extends boolean = true,
+>(options?: {
+  immediate?: Immediate;
+}) => useXenApiCollection("console", options);
 ```
 
 ```typescript
 // MyComponent.vue
 
-const collection = useConsoleCollection({ immediate: false })
+const collection = useConsoleCollection({ immediate: false });
 
-setTimeout(() => collection.start(), 10000)
+setTimeout(() => collection.start(), 10000);
 ```
 
 ## Alter the collection
@@ -65,10 +68,10 @@ You can alter the collection by overriding parts of it.
 ```typescript
 // xen-api.ts
 
-export interface XenApiConsole extends XenApiRecord<'console'> {
+export interface XenApiConsole extends XenApiRecord<"console"> {
   // ... existing props
-  someProp: string
-  someOtherProp: number
+  someProp: string;
+  someOtherProp: number;
 }
 ```
 
@@ -76,27 +79,27 @@ export interface XenApiConsole extends XenApiRecord<'console'> {
 // console-collection.composable.ts
 
 export const useConsoleCollection = () => {
-  const collection = useXenApiCollection('console')
+  const collection = useXenApiCollection("console");
 
   const records = computed(() => {
-    return collection.records.value.map(console => ({
+    return collection.records.value.map((console) => ({
       ...console,
-      someProp: 'Some value',
+      someProp: "Some value",
       someOtherProp: 42,
-    }))
-  })
+    }));
+  });
 
   return {
     ...collection,
     records,
-  }
-}
+  };
+};
 ```
 
 ```typescript
-const consoleCollection = useConsoleCollection()
+const consoleCollection = useConsoleCollection();
 
-consoleCollection.getByUuid('...').someProp // "Some value"
+consoleCollection.getByUuid("...").someProp; // "Some value"
 ```
 
 ### Example 2: Adding props to the collection
@@ -105,13 +108,17 @@ consoleCollection.getByUuid('...').someProp // "Some value"
 // vm-collection.composable.ts
 
 export const useVmCollection = () => {
-  const collection = useXenApiCollection('VM')
+  const collection = useXenApiCollection("VM");
 
   return {
     ...collection,
-    runningVms: computed(() => collection.records.value.filter(vm => vm.power_state === POWER_STATE.RUNNING)),
-  }
-}
+    runningVms: computed(() =>
+      collection.records.value.filter(
+        (vm) => vm.power_state === POWER_STATE.RUNNING
+      )
+    ),
+  };
+};
 ```
 
 ### Example 3, filtering and sorting the collection
@@ -120,15 +127,18 @@ export const useVmCollection = () => {
 // vm-collection.composable.ts
 
 export const useVmCollection = () => {
-  const collection = useXenApiCollection('VM')
+  const collection = useXenApiCollection("VM");
 
   return {
     ...collection,
     records: computed(() =>
       collection.records.value
-        .filter(vm => !vm.is_a_snapshot && !vm.is_a_template && !vm.is_control_domain)
+        .filter(
+          (vm) =>
+            !vm.is_a_snapshot && !vm.is_a_template && !vm.is_control_domain
+        )
         .sort((vm1, vm2) => vm1.name_label.localeCompare(vm2.name_label))
     ),
-  }
-}
+  };
+};
 ```

@xen-orchestra/lite/env.d.ts

@@ -2,5 +2,5 @@
 /// <reference types="json-rpc-2.0/dist" />
 /// <reference types="vite-plugin-pages/client" />
 
-declare const XO_LITE_VERSION: string
-declare const XO_LITE_GIT_HEAD: string
+declare const XO_LITE_VERSION: string;
+declare const XO_LITE_GIT_HEAD: string;

@xen-orchestra/lite/index.html

@@ -2,8 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
-    <link rel="manifest" href="/manifest.webmanifest" />
+    <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>XO Lite</title>
   </head>

@xen-orchestra/lite/package.json

@@ -1,68 +1,66 @@
 {
   "name": "@xen-orchestra/lite",
-  "version": "0.1.7",
-  "type": "module",
+  "version": "0.1.4",
   "scripts": {
     "dev": "GIT_HEAD=$(git rev-parse HEAD) vite",
     "build": "run-p type-check build-only",
     "preview": "vite preview --port 4173",
-    "release": "./scripts/release.mjs",
-    "build-only": "yarn release --build",
-    "deploy": "yarn release --build --deploy",
-    "gh-release": "yarn release --build --tarball --gh-release",
+    "build-only": "GIT_HEAD=$(git rev-parse HEAD) vite build",
+    "deploy": "./scripts/deploy.sh",
     "test": "yarn run type-check",
-    "type-check": "vue-tsc --build --force tsconfig.type-check.json"
+    "type-check": "vue-tsc --noEmit"
   },
-  "devDependencies": {
-    "@csstools/postcss-global-data": "^2.1.1",
+  "dependencies": {
     "@fontsource/poppins": "^5.0.8",
-    "@fortawesome/fontawesome-svg-core": "^6.5.1",
-    "@fortawesome/free-regular-svg-icons": "^6.5.1",
-    "@fortawesome/free-solid-svg-icons": "^6.5.1",
-    "@fortawesome/vue-fontawesome": "^3.0.5",
-    "@intlify/unplugin-vue-i18n": "^2.0.0",
-    "@novnc/novnc": "^1.4.0",
-    "@tsconfig/node18": "^18.2.2",
-    "@types/d3-time-format": "^4.0.3",
-    "@types/file-saver": "^2.0.7",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^18.19.7",
-    "@vitejs/plugin-vue": "^5.0.3",
-    "@vue/tsconfig": "^0.5.1",
-    "@vueuse/core": "^10.7.1",
-    "@vueuse/math": "^10.7.1",
-    "@vueuse/shared": "^10.7.1",
-    "@xen-orchestra/web-core": "*",
+    "@fortawesome/fontawesome-svg-core": "^6.1.1",
+    "@fortawesome/free-regular-svg-icons": "^6.2.0",
+    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@fortawesome/vue-fontawesome": "^3.0.1",
+    "@novnc/novnc": "^1.3.0",
+    "@types/d3-time-format": "^4.0.0",
+    "@types/file-saver": "^2.0.5",
+    "@types/lodash-es": "^4.17.6",
+    "@types/marked": "^4.0.8",
+    "@vueuse/core": "^10.1.2",
+    "@vueuse/math": "^10.1.2",
     "complex-matcher": "^0.7.1",
     "d3-time-format": "^4.1.0",
     "decorator-synchronized": "^0.6.0",
-    "echarts": "^5.4.3",
+    "echarts": "^5.3.3",
     "file-saver": "^2.0.5",
-    "highlight.js": "^11.9.0",
-    "human-format": "^1.2.0",
+    "highlight.js": "^11.6.0",
+    "human-format": "^1.1.0",
     "iterable-backoff": "^0.1.0",
-    "json-rpc-2.0": "^1.7.0",
-    "json5": "^2.2.3",
+    "json-rpc-2.0": "^1.3.0",
+    "json5": "^2.2.1",
     "limit-concurrency-decorator": "^0.5.0",
     "lodash-es": "^4.17.21",
     "make-error": "^1.3.6",
-    "marked": "^9.1.5",
-    "minimist": "^1.2.8",
-    "npm-run-all": "^4.1.5",
-    "pinia": "^2.1.7",
+    "marked": "^4.2.12",
+    "pinia": "^2.1.2",
     "placement.js": "^1.0.0-beta.5",
-    "postcss": "^8.4.33",
-    "postcss-color-function": "^4.1.0",
-    "postcss-custom-media": "^10.0.2",
-    "postcss-nested": "^6.0.1",
-    "typescript": "~5.3.3",
-    "vite": "^5.0.11",
-    "vue": "^3.4.13",
-    "vue-echarts": "^6.6.8",
-    "vue-i18n": "^9.9.0",
-    "vue-router": "^4.2.5",
-    "vue-tsc": "^1.8.27",
-    "zx": "^7.2.3"
+    "vue": "^3.3.4",
+    "vue-echarts": "^6.2.3",
+    "vue-i18n": "^9.2.2",
+    "vue-router": "^4.2.1"
+  },
+  "devDependencies": {
+    "@intlify/unplugin-vue-i18n": "^0.10.0",
+    "@limegrass/eslint-plugin-import-alias": "^1.0.5",
+    "@rushstack/eslint-patch": "^1.1.0",
+    "@types/node": "^16.11.41",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@vue/eslint-config-prettier": "^8.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": "^8.4.19",
+    "postcss-custom-media": "^9.0.1",
+    "postcss-nested": "^6.0.0",
+    "typescript": "^4.9.3",
+    "vite": "^4.3.8",
+    "vue-tsc": "^1.6.5"
   },
   "private": true,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/lite",
@@ -78,6 +76,6 @@
   },
   "license": "AGPL-3.0-or-later",
   "engines": {
-    "node": ">=18"
+    "node": ">=8.10"
   }
 }

@xen-orchestra/lite/postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    "postcss-nested": {},
+    "postcss-custom-media": {},
+  },
+};

@xen-orchestra/lite/postcss.config.mjs

@@ -1,10 +0,0 @@
-export default {
-  plugins: {
-    '@csstools/postcss-global-data': {
-      files: ['../web-core/lib/assets/css/.globals.pcss'],
-    },
-    'postcss-nested': {},
-    'postcss-custom-media': {},
-    'postcss-color-function': {},
-  },
-}

@xen-orchestra/lite/public/manifest.webmanifest

@@ -1,14 +0,0 @@
-{
-  "name": "XO Lite",
-  "short_name": "XOLite",
-  "start_url": "/",
-  "display": "standalone",
-  "description": "Integrated local and lightweight solution to manage a local XCP-ng pool.",
-  "icons": [
-    {
-      "src": "favicon.svg",
-      "sizes": "any",
-      "type": "image/svg+xml"
-    }
-  ]
-}

@xen-orchestra/lite/scripts/agpl-3.0.txt

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

@xen-orchestra/lite/scripts/deploy.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+set -euo pipefail
+
+if [ $# -ne 1 ]
+then
+  echo "Usage: ./deploy.sh <LDAP username>"
+  exit 1
+fi
+
+USERNAME=$1
+DIST="dist"
+BASE="https://lite.xen-orchestra.com/dist"
+SERVER="www-xo.gpn.vates.fr"
+
+echo "Building XO Lite"
+
+(cd ../.. && yarn)
+yarn build-only --base="$BASE"
+
+echo "Deploying XO Lite from $DIST"
+
+echo "\"use strict\";
+(function () {
+  const d = document;
+
+  function js(file) {
+    const s = d.createElement(\"script\");
+    s.defer = \"defer\";
+    s.type = \"module\";
+    s.crossOrigin = \"anonymous\";
+    s.src = file;
+    d.body.appendChild(s);
+  }
+$(
+  for filename in "$DIST"/assets/*.js; do
+    echo "  js(\"$BASE/assets/$(basename $filename)\");"
+  done
+)
+
+  function css(file) {
+    const s = d.createElement(\"link\");
+    s.rel = \"stylesheet\";
+    s.href = file;
+    d.head.appendChild(s);
+  }
+$(
+  for filename in "$DIST"/assets/*.css; do
+    echo "  css(\"$BASE/assets/$(basename $filename)\");"
+  done
+)
+})();" > "$DIST/index.js"
+
+rsync \
+  -r --delete --delete-excluded --exclude=index.html \
+  "$DIST"/ \
+  "$USERNAME@$SERVER:xo-lite"
+
+echo "XO Lite files sent to server"
+
+echo "→ Connect to the server using:"
+echo -e "\tssh $USERNAME@$SERVER"
+
+echo "→ Log in as xo-lite using"
+echo -e "\tsudo -su xo-lite"
+
+echo "→ Then run the following command to move the files to the \`latest\` folder:"
+echo -e "\trsync -r --delete --exclude=index.html /home/$USERNAME/xo-lite/ /home/xo-lite/public/latest"

@xen-orchestra/lite/scripts/release.mjs

@@ -1,393 +0,0 @@
-#!/usr/bin/env node
-
-import argv from 'minimist'
-import { tmpdir } from 'os'
-import { fileURLToPath, URL } from 'url'
-import { $, cd, chalk, fs, path, question, within } from 'zx'
-
-$.verbose = false
-
-const DEPLOY_SERVER = 'www-xo.gpn.vates.fr'
-
-const { version: pkgVersion } = await fs.readJson('./package.json')
-
-const opts = argv(process.argv, {
-  boolean: ['help', 'build', 'deploy', 'ghRelease', 'tarball'],
-  string: ['base', 'dist', 'ghToken', 'tarballDest', 'tarballName', 'username', 'version'],
-  alias: {
-    u: 'username',
-    h: 'help',
-    'gh-release': 'ghRelease',
-    'gh-token': 'ghToken',
-    'tarball-dest': 'tarballDest',
-    'tarball-name': 'tarballName',
-  },
-  default: {
-    dist: 'dist',
-    version: pkgVersion,
-  },
-})
-
-let { base, build, deploy, dist, ghRelease, ghToken, help, tarball, tarballDest, tarballName, username, version } = opts
-
-const usage = () => {
-  console.log(
-    `Usage: ./release.mjs
-    [--help|-h - show this message]
-
-    [--version X.Y.Z - XO Lite version - default: package.json version (${version})]
-    [--dist /path/to/folder - build destination folder - default: dist]
-
-    [
-      --build - whether to build XO Lite or not
-      [--base url - base URL for assets - default: "/" or "lite.xen-orchestra.com/dist" if --deploy is passed]
-    ]
-
-    [
-      --tarball - whether to generate a tarball or not
-      [--tarball-dest /path/to/folder - tarball destination folder]
-      [--tarball-name file.tar.gz - tarball file name - default xo-lite-X.Y.Z.tar.gz]
-    ]
-
-    [
-      --gh-release - whether to release on GitHub or not
-      [--gh-token token - GitHub API token with "Contents" write permissions]
-    ]
-
-    [
-      --deploy - whether to deploy to xen-orchestra.com or not
-      --username|-u <LDAP username>
-    ]
-`
-  )
-}
-
-if (help) {
-  usage()
-  process.exit(0)
-}
-
-const yes = async q => ['y', 'yes'].includes((await question(q + ' [y/N] ')).toLowerCase())
-
-const no = async q => !(await yes(q))
-
-const step = s => console.log(chalk.green.bold(`\n${s}\n`))
-
-const stop = () => {
-  console.log(chalk.yellow('Stopping'))
-  process.exit(0)
-}
-
-const ghApiCall = async (path, method = 'GET', data) => {
-  const opts = {
-    method,
-    headers: {
-      Accept: 'application/vnd.github+json',
-      Authorization: `Bearer ${ghToken}`,
-      'X-GitHub-Api-Version': '2022-11-28',
-    },
-  }
-
-  if (data !== undefined) {
-    opts.body = typeof data === 'object' ? JSON.stringify(data) : data
-  }
-
-  const res = await fetch('https://api.github.com/repos/vatesfr/xen-orchestra' + path, opts)
-
-  if (res.status === 404 || res.status === 422) {
-    return
-  }
-
-  if (!res.ok) {
-    console.log(chalk.red(await res.text()))
-    throw new Error(`GitHub API error: ${res.statusText}`)
-  }
-
-  try {
-    // Return undefined if response is not JSON
-    return JSON.parse(await res.text())
-  } catch {}
-}
-
-const ghApiUploadReleaseAsset = async (releaseId, assetName, file) => {
-  const opts = {
-    method: 'POST',
-    body: fs.createReadStream(file),
-    headers: {
-      Accept: 'application/vnd.github+json',
-      Authorization: `Bearer ${ghToken}`,
-      'Content-Length': (await fs.stat(file)).size,
-      'Content-Type': 'application/vnd.cncf.helm.chart.content.v1.tar+gzip',
-      'X-GitHub-Api-Version': '2022-11-28',
-    },
-  }
-
-  const res = await fetch(
-    `https://uploads.github.com/repos/vatesfr/xen-orchestra/releases/${releaseId}/assets?name=${encodeURIComponent(
-      assetName
-    )}`,
-    opts
-  )
-
-  if (!res.ok) {
-    console.log(chalk.red(await res.text()))
-    throw new Error(`GitHub API error: ${res.statusText}`)
-  }
-
-  return JSON.parse(await res.text())
-}
-
-// Validate args and assign defaults -------------------------------------------
-
-const headSha = (await $`git rev-parse HEAD`).stdout.trim()
-
-if (!build && !deploy && !tarball && !ghRelease) {
-  console.log(chalk.yellow('Nothing to do! Use --build, --deploy, --tarball and/or --gh-release'))
-  process.exit(0)
-}
-
-if (deploy && ghRelease) {
-  throw new Error('--deploy and --gh-release cannot be used together')
-}
-
-if (deploy && username === undefined) {
-  throw new Error('--username is required when --deploy is used')
-}
-
-if (ghRelease && ghToken === undefined) {
-  throw new Error('--gh-token is required to upload a release to GitHub')
-}
-
-if (base === undefined) {
-  base = deploy ? 'https://lite.xen-orchestra.com/dist/' : '/'
-}
-
-if (tarball) {
-  if (tarballDest === undefined) {
-    tarballDest = path.join(tmpdir(), `xo-lite-${new Date().toISOString()}`)
-  }
-
-  if (tarballName === undefined) {
-    tarballName = `xo-lite-${version}.tar.gz`
-  }
-}
-
-if (tarballDest !== undefined) {
-  tarballDest = path.resolve(tarballDest)
-}
-
-if (ghRelease && (tarballDest === undefined || tarballName === undefined)) {
-  throw new Error(
-    'In order to release to GitHub, either use --tarball to generate the tarball or provide the tarball with --tarball-dest and --tarball-name'
-  )
-}
-
-let tarballPath
-let tarballExists = false
-if (tarballDest !== undefined && tarballName !== undefined) {
-  tarballPath = path.join(tarballDest, tarballName)
-
-  try {
-    if ((await fs.stat(tarballPath)).isFile()) {
-      tarballExists = true
-    }
-  } catch (err) {
-    if (err.code !== 'ENOENT') {
-      throw err
-    }
-  }
-}
-
-if (ghRelease && !tarball && !tarballExists) {
-  throw new Error(`No such file ${tarballPath}`)
-}
-
-if (tarball && tarballExists) {
-  if (await no(`Tarball ${tarballPath} already exists. Overwrite?`)) {
-    stop()
-  }
-}
-
-const tag = `xo-lite-v${version}`
-if (ghRelease) {
-  const remoteTag = await ghApiCall(`/git/ref/tags/${encodeURIComponent(tag)}`)
-
-  if (remoteTag === undefined) {
-    if ((await ghApiCall(`/commits/${headSha}`)) === undefined) {
-      throw new Error(
-        `Tag ${tag} and commit ${headSha} not found on GitHub. At least one needs to exist to use it as a release target.`
-      )
-    }
-
-    if (
-      await no(
-        `Tag ${tag} not found on GitHub. The GitHub release will be attached to the current commit and the tag will be created automatically when the release is published. Continue?`
-      )
-    ) {
-      stop()
-    }
-  } else {
-    if (
-      remoteTag.object.sha !== headSha &&
-      (await no(
-        `Commit SHA of tag ${tag} on GitHub (${remoteTag.object.sha}) is different from current commit SHA (${headSha}). Continue?`
-      ))
-    ) {
-      stop()
-    }
-
-    if (
-      !(await $`git tag --points-at HEAD`).stdout.trim().split('\n').includes(tag) &&
-      (await no(`Tag ${tag} not found on current commit. Continue?`))
-    ) {
-      stop()
-    }
-  }
-}
-
-// Build -----------------------------------------------------------------------
-
-if (build) {
-  step('Build')
-
-  console.log(`Building XO Lite ${version} into ${dist}`)
-
-  $.verbose = true
-  await within(async () => {
-    cd('../..')
-    await $`yarn`
-  })
-  await $`GIT_HEAD=${headSha} vite build --base=${base}`
-  $.verbose = false
-}
-
-// License and index.js --------------------------------------------------------
-
-if (ghRelease || deploy) {
-  step('Prepare dist')
-
-  if (ghRelease) {
-    console.log(`Adding LICENSE file to ${dist}`)
-    await fs.copy(fileURLToPath(new URL('agpl-3.0.txt', import.meta.url)), path.join(dist, 'LICENSE'))
-  }
-
-  if (deploy) {
-    console.log(`Adding index.js file to ${dist}`)
-
-    // Concatenate a URL (absolute or relative) and paths
-    // e.g.: joinUrl('http://example.com/', 'foo/bar') => 'http://example.com/foo/bar
-    // `path.join` isn't made for URLs and deduplicates the slashes in URL
-    // schemes (http:// becomes http:/). `.replace()` reverts this.
-    const joinUrl = (...parts) => path.join(...parts).replace(/^(https?:\/)/, '$1/')
-
-    // Use of document.write is discouraged but seems to work consistently.
-    // https://html.spec.whatwg.org/multipage/dynamic-markup-insertion.html#document.write()
-    await fs.writeFile(
-      path.join(dist, 'index.js'),
-      `(async () => {
-  document.open();
-  document.write(
-    await (await fetch("${joinUrl(base, 'index.html')}")).text()
-  );
-  document.close();
-})();
-`
-    )
-  }
-}
-
-// Tarball ---------------------------------------------------------------------
-
-if (tarball) {
-  step('Tarball')
-
-  console.log(`Generating tarball ${tarballPath}`)
-
-  await fs.mkdirp(tarballDest)
-
-  // The file is called xo-lite-X.Y.Z.tar.gz by default
-  // The archive contains the following tree:
-  // xo-lite-X.Y.Z/
-  // ├ LICENSE
-  // ├ index.js
-  // ├ index.html
-  // ├ assets/
-  // └ ...
-  await $`tar -c -z -f ${tarballPath} --transform='s|^${dist}|xo-lite-${version}|' ${dist}`
-}
-
-// Create GitHub release -------------------------------------------------------
-
-if (ghRelease) {
-  step('GitHub release')
-
-  let release = (await ghApiCall('/releases')).find(release => release.tag_name === tag)
-
-  if (release !== undefined) {
-    if (
-      await no(
-        `Release with tag ${tag} already exists on GitHub (${chalk.blue(
-          release.html_url
-        )}). Skip and proceed with upload?`
-      )
-    ) {
-      stop()
-    }
-  } else {
-    release = await ghApiCall('/releases', 'POST', {
-      tag_name: tag,
-      target_commitish: headSha,
-      name: tag,
-      draft: true,
-    })
-
-    console.log(`Created GitHub release ${tag}: ${chalk.blue(release.html_url)}`)
-  }
-
-  console.log(`Uploading tarball ${tarballPath} to GitHub`)
-
-  let asset = release.assets.find(asset => asset.name === tarballName)
-  if (
-    asset !== undefined &&
-    (await yes(`An asset called ${tarballName} already exists on that release. Replace it?`))
-  ) {
-    await ghApiCall(`/releases/assets/${asset.id}`, 'DELETE')
-    asset = undefined
-  }
-
-  if (asset === undefined) {
-    console.log('Uploading…')
-    asset = await ghApiUploadReleaseAsset(release.id, tarballName, tarballPath)
-  }
-
-  if (release.draft) {
-    console.log(
-      chalk.yellow(
-        'The release is in DRAFT. To make it public, visit the release URL above, edit the release and click on "Publish release".'
-      )
-    )
-  }
-}
-
-// Deploy ----------------------------------------------------------------------
-
-if (deploy) {
-  step('Deploy')
-
-  console.log(`Deploying XO Lite from ${dist} to ${DEPLOY_SERVER}`)
-
-  await $`rsync -r --delete ${dist}/ ${username}@${DEPLOY_SERVER}:xo-lite`
-
-  console.log(`
-  XO Lite files sent to server
-
-  → Connect to the server using:
-  \tssh ${username}@${DEPLOY_SERVER}
-
-  → Log in as xo-lite using
-  \tsudo -su xo-lite
-
-  → Then run the following command to move the files to the \`latest\` folder:
-  \trsync -r --delete /home/${username}/xo-lite/ /home/xo-lite/public/latest
-  `)
-}

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

@@ -1,4 +1,5 @@
 <template>
+  <UnreachableHostsModal />
   <div v-if="!$route.meta.hasStoryNav && !xenApiStore.isConnected">
     <AppLogin />
   </div>
@@ -12,65 +13,82 @@
     </div>
     <AppTooltips />
   </div>
-  <ModalList />
 </template>
 
 <script lang="ts" setup>
-import AppHeader from '@/components/AppHeader.vue'
-import AppLogin from '@/components/AppLogin.vue'
-import AppNavigation from '@/components/AppNavigation.vue'
-import AppTooltips from '@/components/AppTooltips.vue'
-import ModalList from '@/components/ui/modals/ModalList.vue'
-import { useChartTheme } from '@/composables/chart-theme.composable'
-import { useUnreachableHosts } from '@/composables/unreachable-hosts.composable'
-import { useUiStore } from '@/stores/ui.store'
-import { usePoolCollection } from '@/stores/xen-api/pool.store'
-import { useXenApiStore } from '@/stores/xen-api.store'
-import { useActiveElement, useMagicKeys, whenever } from '@vueuse/core'
-import { logicAnd } from '@vueuse/math'
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
+import favicon from "@/assets/favicon.svg";
+import AppHeader from "@/components/AppHeader.vue";
+import AppLogin from "@/components/AppLogin.vue";
+import AppNavigation from "@/components/AppNavigation.vue";
+import AppTooltips from "@/components/AppTooltips.vue";
+import UnreachableHostsModal from "@/components/UnreachableHostsModal.vue";
+import { useChartTheme } from "@/composables/chart-theme.composable";
+import { useUiStore } from "@/stores/ui.store";
+import { usePoolCollection } from "@/stores/xen-api/pool.store";
+import { useXenApiStore } from "@/stores/xen-api.store";
+import { useActiveElement, useMagicKeys, whenever } from "@vueuse/core";
+import { logicAnd } from "@vueuse/math";
+import { computed } from "vue";
+import { useI18n } from "vue-i18n";
 
-const xenApiStore = useXenApiStore()
+let link = document.querySelector(
+  "link[rel~='icon']"
+) as HTMLLinkElement | null;
+if (link == null) {
+  link = document.createElement("link");
+  link.rel = "icon";
+  document.getElementsByTagName("head")[0].appendChild(link);
+}
+link.href = favicon;
 
-const { pool } = usePoolCollection()
+const xenApiStore = useXenApiStore();
 
-useChartTheme()
-const uiStore = useUiStore()
+const { pool } = usePoolCollection();
+
+useChartTheme();
+const uiStore = useUiStore();
 
 if (import.meta.env.DEV) {
-  const { locale } = useI18n()
-  const activeElement = useActiveElement()
-  const { D, L } = useMagicKeys()
+  const { locale } = useI18n();
+  const activeElement = useActiveElement();
+  const { D, L } = useMagicKeys();
 
   const canToggle = computed(() => {
     if (activeElement.value == null) {
-      return true
+      return true;
     }
 
-    return !['INPUT', 'TEXTAREA'].includes(activeElement.value.tagName)
-  })
+    return !["INPUT", "TEXTAREA"].includes(activeElement.value.tagName);
+  });
 
-  whenever(logicAnd(D, canToggle), () => (uiStore.colorMode = uiStore.colorMode === 'dark' ? 'light' : 'dark'))
+  whenever(
+    logicAnd(D, canToggle),
+    () => (uiStore.colorMode = uiStore.colorMode === "dark" ? "light" : "dark")
+  );
 
-  whenever(logicAnd(L, canToggle), () => (locale.value = locale.value === 'en' ? 'fr' : 'en'))
+  whenever(
+    logicAnd(L, canToggle),
+    () => (locale.value = locale.value === "en" ? "fr" : "en")
+  );
 }
 
 whenever(
   () => pool.value?.$ref,
-  poolRef => {
-    xenApiStore.getXapi().startWatching(poolRef)
+  (poolRef) => {
+    xenApiStore.getXapi().startWatching(poolRef);
   }
-)
-
-useUnreachableHosts()
+);
 </script>
 
+<style lang="postcss">
+@import "@/assets/base.css";
+</style>
+
 <style lang="postcss" scoped>
 .main {
   overflow: auto;
   flex: 1;
-  height: calc(100vh - 5.5rem);
+  height: calc(100vh - 8rem);
   background-color: var(--background-color-secondary);
 
   &.no-ui {