adding default message for unexisting VMs in backups

In Settings/Logs modals : transform objects UUIDs into clickable links, leading
to the corresponding object page.
For objects that are not found, UUID can be copied to clipboard.

.eslintrc.js

@@ -15,9 +15,10 @@ module.exports = {
 
   overrides: [
     {
-      files: ['cli.{,c,m}js', '*-cli.{,c,m}js', '**/*cli*/**/*.{,c,m}js'],
+      files: ['cli.{,c,m}js', '*-cli.{,c,m}js', '**/*cli*/**/*.{,c,m}js', '**/scripts/**.{,c,m}js'],
       rules: {
         'n/no-process-exit': 'off',
+        'n/shebang': 'off',
         'no-console': 'off',
       },
     },
@@ -46,6 +47,38 @@ 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: {
+              '@': './src',
+            },
+            extensions: ['.ts'],
+            packages: ['@xen-orchestra/lite'],
+          },
+        },
+      },
+      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
+      },
+    },
   ],
 
   parserOptions: {
@@ -68,6 +101,11 @@ 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

@@ -1,48 +0,0 @@
----
-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

@@ -0,0 +1,119 @@
+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: Markdown
+    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

.gitignore

@@ -30,8 +30,12 @@ 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/

.prettierrc.js

@@ -1,8 +1,11 @@
+'use strict'
+
 module.exports = {
   arrowParens: 'avoid',
   jsxSingleQuote: true,
   semi: false,
   singleQuote: true,
+  trailingComma: 'es5',
 
   // 2020-11-24: Requested by nraynaud and approved by the rest of the team
   //

@vates/async-each/package.json

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

@vates/decorate-with/.USAGE.md

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

@vates/decorate-with/index.test.js

@@ -13,12 +13,15 @@ describe('decorateWith', () => {
     const expectedFn = Function.prototype
     const newFn = () => {}
 
-    const decorator = decorateWith(function wrapper(fn, ...args) {
-      assert.deepStrictEqual(fn, expectedFn)
-      assert.deepStrictEqual(args, expectedArgs)
+    const decorator = decorateWith(
+      function wrapper(fn, ...args) {
+        assert.deepStrictEqual(fn, expectedFn)
+        assert.deepStrictEqual(args, expectedArgs)
 
-      return newFn
-    }, ...expectedArgs)
+        return newFn
+      },
+      ...expectedArgs
+    )
 
     const descriptor = {
       configurable: true,

@vates/disposable/package.json

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

@vates/fuse-vhd/.USAGE.md

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,59 @@
+<!-- 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

@@ -0,0 +1,26 @@
+#!/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

@@ -1,9 +1,7 @@
-'use strict'
-
-const LRU = require('lru-cache')
-const Fuse = require('fuse-native')
-const { VhdSynthetic } = require('vhd-lib')
-const { Disposable, fromCallback } = require('promise-toolbox')
+import LRU from 'lru-cache'
+import Fuse from 'fuse-native'
+import { VhdSynthetic } from 'vhd-lib'
+import { Disposable, fromCallback } from 'promise-toolbox'
 
 // build a s stat object from https://github.com/fuse-friends/fuse-native/blob/master/test/fixtures/stat.js
 const stat = st => ({
@@ -16,7 +14,7 @@ const stat = st => ({
   gid: st.gid !== undefined ? st.gid : process.getgid(),
 })
 
-exports.mount = Disposable.factory(async function* mount(handler, diskPath, mountDir) {
+export const mount = Disposable.factory(async function* mount(handler, diskPath, mountDir) {
   const vhd = yield VhdSynthetic.fromVhdChain(handler, diskPath)
 
   const cache = new LRU({
@@ -60,7 +58,7 @@ exports.mount = Disposable.factory(async function* mount(handler, diskPath, moun
     },
   })
   return new Disposable(
-    () => fromCallback(() => fuse.unmount()),
-    fromCallback(() => fuse.mount())
+    () => fromCallback(cb => fuse.unmount(cb)),
+    fromCallback(cb => fuse.mount(cb))
   )
 })

@vates/fuse-vhd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vates/fuse-vhd",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "license": "ISC",
   "private": false,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/fuse-vhd",
@@ -15,13 +15,18 @@
     "url": "https://vates.fr"
   },
   "engines": {
-    "node": ">=10.0"
+    "node": ">=14"
   },
+  "main": "./index.mjs",
   "dependencies": {
+    "@xen-orchestra/fs": "^4.1.3",
     "fuse-native": "^2.2.6",
     "lru-cache": "^7.14.0",
     "promise-toolbox": "^0.21.0",
-    "vhd-lib": "^4.5.0"
+    "vhd-lib": "^4.9.0"
+  },
+  "bin": {
+    "xo-fuse-vhd": "./cli.mjs"
   },
   "scripts": {
     "postversion": "npm publish --access public"

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

@@ -17,4 +17,14 @@ 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,6 +35,16 @@ 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,14 +36,31 @@ 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) {
@@ -69,6 +86,22 @@ 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
@@ -79,6 +112,10 @@ exports.MultiKeyMap = class MultiKeyMap {
     this._root = del(this._root, 0, keys)
   }
 
+  entries() {
+    return entries(this._root, [])
+  }
+
   get(keys) {
     return get(this._root, 0, keys)
   }
@@ -86,4 +123,8 @@ 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(() => ({}))
+    const values = keys.map(() => Math.random())
 
     // set all values first to make sure they are all stored and not only the
     // last one
@@ -27,6 +27,12 @@ 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.1.0",
+  "version": "0.2.0",
   "engines": {
     "node": ">=8.10"
   },

@vates/nbd-client/constants.js

@@ -1,42 +0,0 @@
-'use strict'
-exports.INIT_PASSWD = Buffer.from('NBDMAGIC') // "NBDMAGIC" ensure we're connected to a nbd server
-exports.OPTS_MAGIC = Buffer.from('IHAVEOPT') // "IHAVEOPT" start an option block
-exports.NBD_OPT_REPLY_MAGIC = 1100100111001001n // magic received during negociation
-exports.NBD_OPT_EXPORT_NAME = 1
-exports.NBD_OPT_ABORT = 2
-exports.NBD_OPT_LIST = 3
-exports.NBD_OPT_STARTTLS = 5
-exports.NBD_OPT_INFO = 6
-exports.NBD_OPT_GO = 7
-
-exports.NBD_FLAG_HAS_FLAGS = 1 << 0
-exports.NBD_FLAG_READ_ONLY = 1 << 1
-exports.NBD_FLAG_SEND_FLUSH = 1 << 2
-exports.NBD_FLAG_SEND_FUA = 1 << 3
-exports.NBD_FLAG_ROTATIONAL = 1 << 4
-exports.NBD_FLAG_SEND_TRIM = 1 << 5
-
-exports.NBD_FLAG_FIXED_NEWSTYLE = 1 << 0
-
-exports.NBD_CMD_FLAG_FUA = 1 << 0
-exports.NBD_CMD_FLAG_NO_HOLE = 1 << 1
-exports.NBD_CMD_FLAG_DF = 1 << 2
-exports.NBD_CMD_FLAG_REQ_ONE = 1 << 3
-exports.NBD_CMD_FLAG_FAST_ZERO = 1 << 4
-
-exports.NBD_CMD_READ = 0
-exports.NBD_CMD_WRITE = 1
-exports.NBD_CMD_DISC = 2
-exports.NBD_CMD_FLUSH = 3
-exports.NBD_CMD_TRIM = 4
-exports.NBD_CMD_CACHE = 5
-exports.NBD_CMD_WRITE_ZEROES = 6
-exports.NBD_CMD_BLOCK_STATUS = 7
-exports.NBD_CMD_RESIZE = 8
-
-exports.NBD_REQUEST_MAGIC = 0x25609513 // magic number to create a new NBD request to send to the server
-exports.NBD_REPLY_MAGIC = 0x67446698 // magic number received from the server when reading response to a nbd request
-exports.NBD_REPLY_ACK = 1
-
-exports.NBD_DEFAULT_PORT = 10809
-exports.NBD_DEFAULT_BLOCK_SIZE = 64 * 1024

@vates/nbd-client/constants.mjs

@@ -0,0 +1,41 @@
+export const INIT_PASSWD = Buffer.from('NBDMAGIC') // "NBDMAGIC" ensure we're connected to a nbd server
+export const OPTS_MAGIC = Buffer.from('IHAVEOPT') // "IHAVEOPT" start an option block
+export const NBD_OPT_REPLY_MAGIC = 1100100111001001n // magic received during negociation
+export const NBD_OPT_EXPORT_NAME = 1
+export const NBD_OPT_ABORT = 2
+export const NBD_OPT_LIST = 3
+export const NBD_OPT_STARTTLS = 5
+export const NBD_OPT_INFO = 6
+export const NBD_OPT_GO = 7
+
+export const NBD_FLAG_HAS_FLAGS = 1 << 0
+export const NBD_FLAG_READ_ONLY = 1 << 1
+export const NBD_FLAG_SEND_FLUSH = 1 << 2
+export const NBD_FLAG_SEND_FUA = 1 << 3
+export const NBD_FLAG_ROTATIONAL = 1 << 4
+export const NBD_FLAG_SEND_TRIM = 1 << 5
+
+export const NBD_FLAG_FIXED_NEWSTYLE = 1 << 0
+
+export const NBD_CMD_FLAG_FUA = 1 << 0
+export const NBD_CMD_FLAG_NO_HOLE = 1 << 1
+export const NBD_CMD_FLAG_DF = 1 << 2
+export const NBD_CMD_FLAG_REQ_ONE = 1 << 3
+export const NBD_CMD_FLAG_FAST_ZERO = 1 << 4
+
+export const NBD_CMD_READ = 0
+export const NBD_CMD_WRITE = 1
+export const NBD_CMD_DISC = 2
+export const NBD_CMD_FLUSH = 3
+export const NBD_CMD_TRIM = 4
+export const NBD_CMD_CACHE = 5
+export const NBD_CMD_WRITE_ZEROES = 6
+export const NBD_CMD_BLOCK_STATUS = 7
+export const NBD_CMD_RESIZE = 8
+
+export const NBD_REQUEST_MAGIC = 0x25609513 // magic number to create a new NBD request to send to the server
+export const NBD_REPLY_MAGIC = 0x67446698 // magic number received from the server when reading response to a nbd request
+export const NBD_REPLY_ACK = 1
+
+export const NBD_DEFAULT_PORT = 10809
+export const NBD_DEFAULT_BLOCK_SIZE = 64 * 1024

@vates/nbd-client/index.mjs

@@ -1,8 +1,10 @@
-'use strict'
-const assert = require('node:assert')
-const { Socket } = require('node:net')
-const { connect } = require('node:tls')
-const {
+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 { readChunkStrict } from '@vates/read-chunk'
+import { createLogger } from '@xen-orchestra/log'
+import {
   INIT_PASSWD,
   NBD_CMD_READ,
   NBD_DEFAULT_BLOCK_SIZE,
@@ -17,16 +19,12 @@ const {
   NBD_REQUEST_MAGIC,
   OPTS_MAGIC,
   NBD_CMD_DISC,
-} = require('./constants.js')
-const { fromCallback, pRetry, pDelay, pTimeout } = require('promise-toolbox')
-const { readChunkStrict } = require('@vates/read-chunk')
-const { createLogger } = require('@xen-orchestra/log')
-
+} from './constants.mjs'
 const { warn } = createLogger('vates:nbd-client')
 
 // documentation is here : https://github.com/NetworkBlockDevice/nbd/blob/master/doc/proto.md
 
-module.exports = class NbdClient {
+export default class NbdClient {
   #serverAddress
   #serverCert
   #serverPort
@@ -40,6 +38,7 @@ module.exports = 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
@@ -52,7 +51,14 @@ module.exports = class NbdClient {
   #reconnectingPromise
   constructor(
     { address, port = NBD_DEFAULT_PORT, exportname, cert },
-    { connectTimeout = 6e4, waitBeforeReconnect = 1e3, readAhead = 10, readBlockRetries = 5, reconnectRetry = 5 } = {}
+    {
+      connectTimeout = 6e4,
+      messageTimeout = 6e4,
+      waitBeforeReconnect = 1e3,
+      readAhead = 10,
+      readBlockRetries = 5,
+      reconnectRetry = 5,
+    } = {}
   ) {
     this.#serverAddress = address
     this.#serverPort = port
@@ -63,6 +69,7 @@ module.exports = class NbdClient {
     this.#readBlockRetries = readBlockRetries
     this.#reconnectRetry = reconnectRetry
     this.#connectTimeout = connectTimeout
+    this.#messageTimeout = messageTimeout
   }
 
   get exportSize() {
@@ -115,13 +122,27 @@ module.exports = 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
-    await this.#write(buffer)
-    await this.#serverSocket.destroy()
+    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()
+    }
     this.#serverSocket = undefined
     this.#connected = false
   }
@@ -195,11 +216,13 @@ module.exports = class NbdClient {
   }
 
   #read(length) {
-    return readChunkStrict(this.#serverSocket, length)
+    const promise = readChunkStrict(this.#serverSocket, length)
+    return pTimeout.call(promise, this.#messageTimeout)
   }
 
   #write(buffer) {
-    return fromCallback.call(this.#serverSocket, 'write', buffer)
+    const promise = fromCallback.call(this.#serverSocket, 'write', buffer)
+    return pTimeout.call(promise, this.#messageTimeout)
   }
 
   async #readInt32() {
@@ -232,19 +255,20 @@ module.exports = class NbdClient {
     }
     try {
       this.#waitingForResponse = true
-      const magic = await this.#readInt32()
+      const buffer = await this.#read(16)
+      const magic = buffer.readInt32BE(0)
 
       if (magic !== NBD_REPLY_MAGIC) {
         throw new Error(`magic number for block answer is wrong : ${magic} ${NBD_REPLY_MAGIC}`)
       }
 
-      const error = await this.#readInt32()
+      const error = buffer.readInt32BE(4)
       if (error !== 0) {
         // @todo use error code from constants.mjs
         throw new Error(`GOT ERROR CODE  : ${error}`)
       }
 
-      const blockQueryId = await this.#readInt64()
+      const blockQueryId = buffer.readBigUInt64BE(8)
       const query = this.#commandQueryBacklog.get(blockQueryId)
       if (!query) {
         throw new Error(` no query associated with id ${blockQueryId}`)
@@ -265,7 +289,7 @@ module.exports = class NbdClient {
     }
   }
 
-  async readBlock(index, size = NBD_DEFAULT_BLOCK_SIZE) {
+  async #readBlock(index, size) {
     // we don't want to add anything in backlog while reconnecting
     if (this.#reconnectingPromise) {
       await this.#reconnectingPromise
@@ -281,7 +305,13 @@ module.exports = 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
-    buffer.writeBigUInt64BE(BigInt(index) * BigInt(size), 16)
+    const offset = BigInt(index) * BigInt(size)
+    const remaining = this.#exportSize - offset
+    if (remaining < BigInt(size)) {
+      size = Number(remaining)
+    }
+
+    buffer.writeBigUInt64BE(offset, 16)
     buffer.writeInt32BE(size, 24)
 
     return new Promise((resolve, reject) => {
@@ -307,45 +337,13 @@ module.exports = class NbdClient {
     })
   }
 
-  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()
-    }
+  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()
+      },
+    })
   }
 }

@vates/nbd-client/multi.mjs

@@ -0,0 +1,85 @@
+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,17 +13,18 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "1.2.1",
+  "version": "3.0.0",
   "engines": {
     "node": ">=14.0"
   },
+  "main": "./index.mjs",
   "dependencies": {
     "@vates/async-each": "^1.0.0",
-    "@vates/read-chunk": "^1.1.1",
+    "@vates/read-chunk": "^1.2.0",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/log": "^0.6.0",
     "promise-toolbox": "^0.21.0",
-    "xen-api": "^1.3.3"
+    "xen-api": "^2.0.0"
   },
   "devDependencies": {
     "tap": "^16.3.0",
@@ -31,6 +32,6 @@
   },
   "scripts": {
     "postversion": "npm publish --access public",
-    "test-integration": "tap --lines 97 --functions 95 --branches 74 --statements 97 tests/*.integ.js"
+    "test-integration": "tap --lines 97 --functions 95 --branches 74 --statements 97 tests/*.integ.mjs"
   }
 }

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

@@ -1,15 +1,15 @@
-'use strict'
-const NbdClient = require('../index.js')
-const { spawn, exec } = require('node:child_process')
-const fs = require('node:fs/promises')
-const { test } = require('tap')
-const tmp = require('tmp')
-const { pFromCallback } = require('promise-toolbox')
-const { Socket } = require('node:net')
-const { NBD_DEFAULT_PORT } = require('../constants.js')
-const assert = require('node:assert')
+import { spawn, exec } from 'node:child_process'
+import fs from 'node:fs/promises'
+import { test } from 'tap'
+import tmp from 'tmp'
+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 FILE_SIZE = 10 * 1024 * 1024
+const CHUNK_SIZE = 1024 * 1024 // non default size
+const FILE_SIZE = 1024 * 1024 * 9.5 // non aligned file size
 
 async function createTempFile(size) {
   const tmpPath = await pFromCallback(cb => tmp.file(cb))
@@ -82,7 +82,7 @@ test('it works with unsecured network', async tap => {
   const path = await createTempFile(FILE_SIZE)
 
   let nbdServer = await spawnNbdKit(path)
-  const client = new NbdClient(
+  const client = new MultiNbdClient(
     {
       address: '127.0.0.1',
       exportname: 'MY_SECRET_EXPORT',
@@ -110,13 +110,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 +128,9 @@ CYu1Xn/FVPx1HoRgWc7E8wFhDcA/P3SJtfIQWHB9FzSaBflKGR4t8WCE2eE8+cTB
   })
   let i = 0
   for await (const block of nbdIterator) {
-    let blockOk = true
+    let blockOk = block.length === Math.min(CHUNK_SIZE, FILE_SIZE - CHUNK_SIZE * i)
     let firstFail
-    for (let j = 0; j < CHUNK_SIZE; j += 4) {
+    for (let j = 0; j < block.length; j += 4) {
       const wanted = i * CHUNK_SIZE + j
       const found = block.readUInt32BE(j)
       blockOk = blockOk && found === wanted
@@ -138,7 +138,7 @@ CYu1Xn/FVPx1HoRgWc7E8wFhDcA/P3SJtfIQWHB9FzSaBflKGR4t8WCE2eE8+cTB
         firstFail = j
       }
     }
-    tap.ok(blockOk, `check block ${i} content`)
+    tap.ok(blockOk, `check block ${i} content ${block.length}`)
     i++
 
     // flaky server is flaky
@@ -148,17 +148,6 @@ 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/node-vsphere-soap/lib/client.mjs

@@ -1,4 +1,3 @@
-'use strict'
 /*
 
   node-vsphere-soap
@@ -12,17 +11,18 @@
 
 */
 
-const EventEmitter = require('events').EventEmitter
-const axios = require('axios')
-const https = require('node:https')
-const util = require('util')
-const soap = require('soap')
-const Cookie = require('soap-cookie') // required for session persistence
+import { EventEmitter } from 'events'
+import axios from 'axios'
+import https from 'node:https'
+import util from 'util'
+import soap from 'soap'
+import Cookie from 'soap-cookie' // required for session persistence
+
 // Client class
 // inherits from EventEmitter
 // possible events: connect, error, ready
 
-function Client(vCenterHostname, username, password, sslVerify) {
+export function Client(vCenterHostname, username, password, sslVerify) {
   this.status = 'disconnected'
   this.reconnectCount = 0
 
@@ -228,4 +228,3 @@ function _soapErrorHandler(self, emitter, command, args, err) {
 }
 
 // end
-exports.Client = Client

@vates/node-vsphere-soap/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@vates/node-vsphere-soap",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "interface to vSphere SOAP/WSDL from node for interfacing with vCenter or ESXi, forked from node-vsphere-soap",
-  "main": "lib/client.js",
+  "main": "lib/client.mjs",
   "author": "reedog117",
   "repository": {
     "directory": "@vates/node-vsphere-soap",
@@ -30,7 +30,7 @@
   "private": false,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/node-vsphere-soap",
   "engines": {
-    "node": ">=8.10"
+    "node": ">=14"
   },
   "scripts": {
     "postversion": "npm publish --access public"

@vates/node-vsphere-soap/test/config-test.stub.mjs

@@ -1,15 +1,11 @@
-'use strict'
-
 // place your own credentials here for a vCenter or ESXi server
 // this information will be used for connecting to a vCenter instance
 // for module testing
 // name the file config-test.js
 
-const vCenterTestCreds = {
+export const vCenterTestCreds = {
   vCenterIP: 'vcsa',
   vCenterUser: 'vcuser',
   vCenterPassword: 'vcpw',
   vCenter: true,
 }
-
-exports.vCenterTestCreds = vCenterTestCreds

@vates/node-vsphere-soap/test/vsphere-soap.test.mjs

@@ -1,18 +1,16 @@
-'use strict'
-
 /*
   vsphere-soap.test.js
 
   tests for the vCenterConnectionInstance class
 */
 
-const assert = require('assert')
-const { describe, it } = require('test')
+import assert from 'assert'
+import { describe, it } from 'test'
 
-const vc = require('../lib/client')
+import * as vc from '../lib/client.mjs'
 
-// eslint-disable-next-line n/no-missing-require
-const TestCreds = require('../config-test.js').vCenterTestCreds
+// eslint-disable-next-line n/no-missing-import
+import { vCenterTestCreds as TestCreds } from '../config-test.mjs'
 
 const VItest = new vc.Client(TestCreds.vCenterIP, TestCreds.vCenterUser, TestCreds.vCenterPassword, false)
 

@vates/read-chunk/index.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const assert = require('assert')
+const isUtf8 = require('isutf8')
 
 /**
  * Read a chunk of data from a stream.
@@ -21,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)
-          removeListeners()
-        }
-        function onError(error) {
-          reject(error)
-          removeListeners()
-        }
-        function onReadable() {
-          const data = stream.read(size)
-          if (data !== null) {
-            resolve(data)
+          function onEnd() {
+            resolve(null)
             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 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()
+        })
 exports.readChunk = readChunk
 
 /**
@@ -81,6 +82,13 @@ exports.readChunkStrict = async function readChunkStrict(stream, size) {
 
   if (size !== undefined && chunk.length !== size) {
     const error = new Error(`stream has ended with not enough data (actual: ${chunk.length}, expected: ${size})`)
+
+    // Buffer.isUtf8 is too recent for now
+    // @todo : replace external package by Buffer.isUtf8 when the supported version of node reach 18
+
+    if (chunk.length < 1024 && isUtf8(chunk)) {
+      error.text = chunk.toString('utf8')
+    }
     Object.defineProperties(error, {
       chunk: {
         value: chunk,
@@ -103,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)
+      ? Promise.resolve(0)
+      : new Promise((resolve, reject) => {
+          let left = size
+          function onEnd() {
+            resolve(size - left)
             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 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()
+        })
 }
 exports.skip = skip
 

@vates/read-chunk/index.test.js

@@ -102,12 +102,37 @@ describe('readChunkStrict', function () {
     assert.strictEqual(error.chunk, undefined)
   })
 
-  it('throws if stream ends with not enough data', async () => {
+  it('throws if stream ends with not enough data, utf8', async () => {
     const error = await rejectionOf(readChunkStrict(makeStream(['foo', 'bar']), 10))
     assert(error instanceof Error)
     assert.strictEqual(error.message, 'stream has ended with not enough data (actual: 6, expected: 10)')
+    assert.strictEqual(error.text, 'foobar')
     assert.deepEqual(error.chunk, Buffer.from('foobar'))
   })
+
+  it('throws if stream ends with not enough data, non utf8 ', async () => {
+    const source = [Buffer.alloc(10, 128), Buffer.alloc(10, 128)]
+    const error = await rejectionOf(readChunkStrict(makeStream(source), 30))
+    assert(error instanceof Error)
+    assert.strictEqual(error.message, 'stream has ended with not enough data (actual: 20, expected: 30)')
+    assert.strictEqual(error.text, undefined)
+    assert.deepEqual(error.chunk, Buffer.concat(source))
+  })
+
+  it('throws if stream ends with not enough data,  utf8 , long data', async () => {
+    const source = Buffer.from('a'.repeat(1500))
+    const error = await rejectionOf(readChunkStrict(makeStream([source]), 2000))
+    assert(error instanceof Error)
+    assert.strictEqual(error.message, `stream has ended with not enough data (actual: 1500, expected: 2000)`)
+    assert.strictEqual(error.text, undefined)
+    assert.deepEqual(error.chunk, source)
+  })
+
+  it('succeed', async () => {
+    const source = Buffer.from('a'.repeat(20))
+    const chunk = await readChunkStrict(makeStream([source]), 10)
+    assert.deepEqual(source.subarray(10), chunk)
+  })
 })
 
 describe('skip', function () {
@@ -134,6 +159,16 @@ describe('skip', function () {
   it('returns less size if stream ends', async () => {
     assert.deepEqual(await skip(makeStream('foo bar'), 10), 7)
   })
+
+  it('put back if it read too much', async () => {
+    let source = makeStream(['foo', 'bar'])
+    await skip(source, 1) // read part of data chunk
+    const chunk = (await readChunkStrict(source, 2)).toString('utf-8')
+    assert.strictEqual(chunk, 'oo')
+
+    source = makeStream(['foo', 'bar'])
+    assert.strictEqual(await skip(source, 3), 3) // read aligned with data chunk
+  })
 })
 
 describe('skipStrict', function () {
@@ -144,4 +179,9 @@ describe('skipStrict', function () {
     assert.strictEqual(error.message, 'stream has ended with not enough data (actual: 7, expected: 10)')
     assert.deepEqual(error.bytesSkipped, 7)
   })
+  it('succeed', async () => {
+    const source = makeStream(['foo', 'bar', 'baz'])
+    const res = await skipStrict(source, 4)
+    assert.strictEqual(res, undefined)
+  })
 })

@vates/read-chunk/package.json

@@ -19,7 +19,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "1.1.1",
+  "version": "1.2.0",
   "engines": {
     "node": ">=8.10"
   },
@@ -33,5 +33,8 @@
   },
   "devDependencies": {
     "test": "^3.2.1"
+  },
+  "dependencies": {
+    "isutf8": "^4.0.0"
   }
 }

@vates/stream-reader/package.json

@@ -27,7 +27,7 @@
   "license": "ISC",
   "version": "0.1.0",
   "engines": {
-    "node": ">=10"
+    "node": ">=12.3"
   },
   "scripts": {
     "postversion": "npm publish --access public",

@vates/task/.USAGE.md

@@ -123,7 +123,7 @@ const onProgress = makeOnProgress({
   onTaskUpdate(taskLog) {},
 })
 
-Task.run({ data: { name: 'my task' }, onProgress }, asyncFn)
+Task.run({ properties: { 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 dictionnary of properties attached to the task
+    // undefined or a dictionary 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({ data: { name: 'my task' }, onProgress }, asyncFn)
+Task.run({ properties: { 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": "^15.0.1",
+    "sinon": "^17.0.1",
     "test": "^3.2.1"
   }
 }

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

@@ -7,9 +7,9 @@
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "dependencies": {
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/backups": "^0.39.0",
-    "@xen-orchestra/fs": "^4.0.1",
-    "filenamify": "^4.1.0",
+    "@xen-orchestra/backups": "^0.44.3",
+    "@xen-orchestra/fs": "^4.1.3",
+    "filenamify": "^6.0.0",
     "getopts": "^2.2.5",
     "lodash": "^4.17.15",
     "promise-toolbox": "^0.21.0"
@@ -27,7 +27,7 @@
   "scripts": {
     "postversion": "npm publish --access public"
   },
-  "version": "1.0.9",
+  "version": "1.0.14",
   "license": "AGPL-3.0-or-later",
   "author": {
     "name": "Vates SAS",

@xen-orchestra/backups/ImportVmBackup.mjs

@@ -4,23 +4,229 @@ 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: { newMacAddresses, mapVdisSrs = {} } = {} }) {
+  constructor({
+    adapter,
+    metadata,
+    srUuid,
+    xapi,
+    settings: { additionnalVmTag, newMacAddresses, mapVdisSrs = {}, useDifferentialRestore = false } = {},
+  }) {
     this._adapter = adapter
-    this._importIncrementalVmSettings = { newMacAddresses, mapVdisSrs }
+    this._importIncrementalVmSettings = { additionnalVmTag, newMacAddresses, mapVdisSrs, useDifferentialRestore }
     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 (err) {
+          // 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`, err)
+          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)
@@ -28,12 +234,7 @@ export class ImportVmBackup {
     } else {
       assert.strictEqual(metadata.mode, 'delta')
 
-      const ignoredVdis = new Set(
-        Object.entries(this._importIncrementalVmSettings.mapVdisSrs)
-          .filter(([_, srUuid]) => srUuid === null)
-          .map(([vdiUuid]) => vdiUuid)
-      )
-      backup = await adapter.readIncrementalVmBackup(metadata, ignoredVdis)
+      backup = await this.#decorateIncrementalVmMetadata()
       Object.values(backup.streams).forEach(stream => watchStreamSize(stream, sizeContainer))
     }
 
@@ -48,8 +249,7 @@ export class ImportVmBackup {
         const vmRef = isFull
           ? await xapi.VM_import(backup, srRef)
           : await importIncrementalVm(backup, await xapi.getRecord('SR', srRef), {
-              ...this._importIncrementalVmSettings,
-              detectBase: false,
+              newMacAddresses,
             })
 
         await Promise.all([
@@ -59,6 +259,13 @@ 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 {
@@ -69,3 +276,5 @@ export class ImportVmBackup {
     )
   }
 }
+
+decorateClass(ImportVmBackup, { _reuseNearestSnapshot: defer })

@xen-orchestra/backups/RemoteAdapter.mjs

@@ -5,7 +5,7 @@ import { createLogger } from '@xen-orchestra/log'
 import { createVhdDirectoryFromStream, openVhd, VhdAbstract, VhdDirectory, VhdSynthetic } from 'vhd-lib'
 import { decorateMethodsWith } from '@vates/decorate-with'
 import { deduped } from '@vates/disposable/deduped.js'
-import { dirname, join, normalize, resolve } from 'node:path'
+import { dirname, join, resolve } from 'node:path'
 import { execFile } from 'child_process'
 import { mount } from '@vates/fuse-vhd'
 import { readdir, lstat } from 'node:fs/promises'
@@ -18,6 +18,7 @@ import fromEvent from 'promise-toolbox/fromEvent'
 import groupBy from 'lodash/groupBy.js'
 import pDefer from 'promise-toolbox/defer'
 import pickBy from 'lodash/pickBy.js'
+import tar from 'tar'
 import zlib from 'zlib'
 
 import { BACKUP_DIR } from './_getVmBackupDir.mjs'
@@ -41,20 +42,23 @@ const compareTimestamp = (a, b) => a.timestamp - b.timestamp
 const noop = Function.prototype
 
 const resolveRelativeFromFile = (file, path) => resolve('/', dirname(file), path).slice(1)
+const makeRelative = path => resolve('/', path).slice(1)
+const resolveSubpath = (root, path) => resolve(root, makeRelative(path))
 
-const resolveSubpath = (root, path) => resolve(root, `.${resolve('/', path)}`)
+async function addZipEntries(zip, realBasePath, virtualBasePath, relativePaths) {
+  for (const relativePath of relativePaths) {
+    const realPath = join(realBasePath, relativePath)
+    const virtualPath = join(virtualBasePath, relativePath)
 
-async function addDirectory(files, realPath, metadataPath) {
-  const stats = await lstat(realPath)
-  if (stats.isDirectory()) {
-    await asyncMap(await readdir(realPath), file =>
-      addDirectory(files, realPath + '/' + file, metadataPath + '/' + file)
-    )
-  } else if (stats.isFile()) {
-    files.push({
-      realPath,
-      metadataPath,
-    })
+    const stats = await lstat(realPath)
+    const { mode, mtime } = stats
+    const opts = { mode, mtime }
+    if (stats.isDirectory()) {
+      zip.addEmptyDirectory(virtualPath, opts)
+      await addZipEntries(zip, realPath, virtualPath, await readdir(realPath))
+    } else if (stats.isFile()) {
+      zip.addFile(realPath, virtualPath, opts)
+    }
   }
 }
 
@@ -182,17 +186,6 @@ export class RemoteAdapter {
     })
   }
 
-  async *_usePartitionFiles(diskId, partitionId, paths) {
-    const path = yield this.getPartition(diskId, partitionId)
-
-    const files = []
-    await asyncMap(paths, file =>
-      addDirectory(files, resolveSubpath(path, file), normalize('./' + file).replace(/\/+$/, ''))
-    )
-
-    return files
-  }
-
   // 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) {
@@ -209,15 +202,24 @@ export class RemoteAdapter {
     })
   }
 
-  fetchPartitionFiles(diskId, partitionId, paths) {
+  fetchPartitionFiles(diskId, partitionId, paths, format) {
     const { promise, reject, resolve } = pDefer()
     Disposable.use(
       async function* () {
-        const files = yield this._usePartitionFiles(diskId, partitionId, paths)
-        const zip = new ZipFile()
-        files.forEach(({ realPath, metadataPath }) => zip.addFile(realPath, metadataPath))
-        zip.end()
-        const { outputStream } = zip
+        const path = yield this.getPartition(diskId, partitionId)
+        let outputStream
+
+        if (format === 'tgz') {
+          outputStream = tar.c({ cwd: path, gzip: true }, paths.map(makeRelative))
+        } else if (format === 'zip') {
+          const zip = new ZipFile()
+          await addZipEntries(zip, path, '', paths.map(makeRelative))
+          zip.end()
+          ;({ outputStream } = zip)
+        } else {
+          throw new Error('unsupported format ' + format)
+        }
+
         resolve(outputStream)
         await fromEvent(outputStream, 'end')
       }.bind(this)
@@ -679,11 +681,13 @@ export class RemoteAdapter {
     }
   }
 
-  async outputStream(path, input, { checksum = true, validator = noop } = {}) {
+  async outputStream(path, input, { checksum = true, maxStreamLength, streamLength, validator = noop } = {}) {
     const container = watchStreamSize(input)
     await this._handler.outputStream(path, input, {
       checksum,
       dirMode: this._dirMode,
+      maxStreamLength,
+      streamLength,
       async validator() {
         await input.task
         return validator.apply(this, arguments)
@@ -824,8 +828,6 @@ decorateMethodsWith(RemoteAdapter, {
     debounceResourceFactory,
   ]),
 
-  _usePartitionFiles: Disposable.factory,
-
   getDisk: compose([Disposable.factory, [deduped, diskId => [diskId]], debounceResourceFactory]),
 
   getPartition: Disposable.factory,

@xen-orchestra/backups/RestoreMetadataBackup.mjs

@@ -21,7 +21,12 @@ export class RestoreMetadataBackup {
       })
     } else {
       const metadata = JSON.parse(await handler.readFile(join(backupId, 'metadata.json')))
-      return String(await handler.readFile(resolve(backupId, metadata.data ?? 'data.json')))
+      const dataFileName = resolve('/', backupId, metadata.data ?? 'data.json').slice(1)
+      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
+      const isJson = dataFileName.endsWith('.json')
+      return isJson ? data.toString() : { encoding: 'base64', data: data.toString('base64') }
     }
   }
 }

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

@@ -67,6 +67,11 @@ 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()
@@ -230,7 +235,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, 209920)
+  assert.equal(metadata.size, 104960)
 
   // 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
@@ -320,6 +325,7 @@ 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,
@@ -328,6 +334,7 @@ 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`, {
@@ -337,6 +344,7 @@ 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
@@ -395,7 +403,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' ? 314880 : undefined)
+        assert.deepEqual(metadata.size, vhdMode === 'file' ? 6502400 : 6501888)
 
         // broken vhd, non referenced, abandonned should be deleted ( alias and data)
         // ancestor and child should be merged

@xen-orchestra/backups/_cleanVm.mjs

@@ -36,34 +36,32 @@ const computeVhdsSize = (handler, vhdPaths) =>
   )
 
 // chain is [ ancestor, child_1, ..., child_n ]
-async function _mergeVhdChain(handler, chain, { logInfo, remove, merge, mergeBlockConcurrency }) {
-  if (merge) {
-    logInfo(`merging VHD chain`, { chain })
+async function _mergeVhdChain(handler, chain, { logInfo, remove, mergeBlockConcurrency }) {
+  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,
-        })
-      }
-    }, 10e3)
-    try {
-      return await mergeVhdChain(handler, chain, {
-        logInfo,
-        mergeBlockConcurrency,
-        onProgress({ done: d, total: t }) {
-          done = d
-          total = t
-        },
-        removeUnused: remove,
+  let done, total
+  const handle = setInterval(() => {
+    if (done !== undefined) {
+      logInfo('merge in progress', {
+        done,
+        parent: chain[0],
+        progress: Math.round((100 * done) / total),
+        total,
       })
-    } 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)
   }
 }
 
@@ -471,23 +469,20 @@ export async function cleanVm(
   const metadataWithMergedVhd = {}
   const doMerge = async () => {
     await asyncMap(toMerge, async chain => {
-      const merged = await limitedMergeVhdChain(handler, chain, {
+      const { finalVhdSize } = await limitedMergeVhdChain(handler, chain, {
         logInfo,
         logWarn,
         remove,
-        merge,
         mergeBlockConcurrency,
       })
-      if (merged !== undefined) {
-        const metadataPath = vhdsToJSons[chain[chain.length - 1]] // all the chain should have the same metada file
-        metadataWithMergedVhd[metadataPath] = true
-      }
+      const metadataPath = vhdsToJSons[chain[chain.length - 1]] // all the chain should have the same metada file
+      metadataWithMergedVhd[metadataPath] = (metadataWithMergedVhd[metadataPath] ?? 0) + finalVhdSize
     })
   }
 
   await Promise.all([
     ...unusedVhdsDeletion,
-    toMerge.length !== 0 && (merge ? Task.run({ name: 'merge' }, doMerge) : doMerge()),
+    toMerge.length !== 0 && (merge ? Task.run({ name: 'merge' }, doMerge) : () => Promise.resolve()),
     asyncMap(unusedXvas, path => {
       logWarn('unused XVA', { path })
       if (remove) {
@@ -509,12 +504,11 @@ 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 merged = metadataWithMergedVhd[metadataPath] !== undefined
+    const mergedSize = metadataWithMergedVhd[metadataPath]
 
     const { mode, size, vhds, xva } = metadata
 
@@ -524,26 +518,29 @@ 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 (!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,
-          })
+        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,
+            })
+          }
         }
       }
     } catch (error) {
@@ -551,9 +548,19 @@ export async function cleanVm(
       return
     }
 
-    // systematically update size after a merge
-    if ((merged || fixMetadata) && size !== fileSystemSize) {
-      metadata.size = fileSystemSize
+    // 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
+        }
+      }
       mustRegenerateCache = true
       try {
         await handler.writeFile(metadataPath, JSON.stringify(metadata), { flags: 'w' })

@xen-orchestra/backups/_incrementalVm.mjs

@@ -1,4 +1,3 @@
-import find from 'lodash/find.js'
 import groupBy from 'lodash/groupBy.js'
 import ignoreErrors from 'promise-toolbox/ignoreErrors'
 import omit from 'lodash/omit.js'
@@ -12,22 +11,18 @@ 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 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,
@@ -39,6 +34,8 @@ export async function exportIncrementalVm(
     fullVdisRequired = new Set(),
 
     disableBaseTags = false,
+    nbdConcurrency = 1,
+    preferNbd,
   } = {}
 ) {
   // refs of VM's VDIs → base's VDIs.
@@ -86,6 +83,8 @@ export async function exportIncrementalVm(
       baseRef: baseVdi?.$ref,
       cancelToken,
       format: 'vhd',
+      nbdConcurrency,
+      preferNbd,
     })
   })
 
@@ -143,7 +142,7 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
   $defer,
   incrementalVm,
   sr,
-  { cancelToken = CancelToken.none, detectBase = true, mapVdisSrs = {}, newMacAddresses = false } = {}
+  { cancelToken = CancelToken.none, newMacAddresses = false } = {}
 ) {
   const { version } = incrementalVm
   if (compareVersions(version, '1.0.0') < 0) {
@@ -153,32 +152,6 @@ 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)
-
-      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
@@ -190,18 +163,7 @@ 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,
-          other_config: {
-            ...vdi.other_config,
-            [TAG_BASE_DELTA]: undefined,
-            [TAG_COPY_SRC]: vdi.uuid,
-          },
-          sr: mapVdisSrRefs[vdi.uuid] ?? sr.$ref,
-        })
-      )
+      suspendVdi = await xapi.getRecord('VDI', await xapi.VDI_create(vdi))
       $defer.onFailure(() => suspendVdi.$destroy())
     }
   }
@@ -219,10 +181,6 @@ 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,
@@ -243,14 +201,8 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
     const vdi = vdiRecords[vdiRef]
     let newVdi
 
-    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())
+    if (vdi.baseVdi !== undefined) {
+      newVdi = await xapi.getRecord('VDI', await vdi.baseVdi.$clone())
       $defer.onFailure(() => newVdi.$destroy())
 
       await newVdi.update_other_config(TAG_COPY_SRC, vdi.uuid)
@@ -261,18 +213,7 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
       // suspendVDI has already created
       newVdi = suspendVdi
     } else {
-      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,
-        })
-      )
+      newVdi = await xapi.getRecord('VDI', await xapi.VDI_create(vdi))
       $defer.onFailure(() => newVdi.$destroy())
     }
 
@@ -311,13 +252,19 @@ 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/VmsRemote.mjs

@@ -86,7 +86,12 @@ export const VmsRemote = class RemoteVmsBackupRunner extends Abstract {
             throw new Error(`Job mode ${job.mode} not implemented for mirror backup`)
           }
 
-          return runTask(taskStart, () => vmBackup.run())
+          return sourceRemoteAdapter
+            .listVmBackups(vmUuid, ({ mode }) => mode === job.mode)
+            .then(vmBackups => {
+              // avoiding to create tasks for empty directories
+              if (vmBackups.length > 0) return runTask(taskStart, () => vmBackup.run())
+            })
         }
         const { concurrency } = settings
         await asyncMapSettled(vmsUuids, !concurrency ? handleVm : limitConcurrency(concurrency)(handleVm))

@xen-orchestra/backups/_runners/_XoMetadataBackup.mjs

@@ -22,7 +22,13 @@ export class XoMetadataBackup {
     const dir = `${scheduleDir}/${formatFilenameDate(timestamp)}`
 
     const data = job.xoMetadata
-    const dataBaseName = './data.json'
+    let dataBaseName = './data'
+
+    // JSON data is sent as plain string, binary data is sent as an object with `data` and `encoding properties
+    const isJson = typeof data === 'string'
+    if (isJson) {
+      dataBaseName += '.json'
+    }
 
     const metadata = JSON.stringify(
       {
@@ -54,7 +60,7 @@ export class XoMetadataBackup {
           async () => {
             const handler = adapter.handler
             const dirMode = this._config.dirMode
-            await handler.outputFile(dataFileName, data, { dirMode })
+            await handler.outputFile(dataFileName, isJson ? data : Buffer.from(data.data, data.encoding), { dirMode })
             await handler.outputFile(metaDataFileName, metadata, {
               dirMode,
             })

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

@@ -29,6 +29,8 @@ export const FullRemote = class FullRemoteVmBackupRunner extends AbstractRemote
           writer =>
             writer.run({
               stream: forkStreamUnpipe(stream),
+              // stream will be forked and transformed, it's not safe to attach additionnal properties to it
+              streamLength: stream.length,
               timestamp: metadata.timestamp,
               vm: metadata.vm,
               vmSnapshot: metadata.vmSnapshot,

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

@@ -35,13 +35,25 @@ export const FullXapi = class FullXapiVmBackupRunner extends AbstractXapi {
         useSnapshot: false,
       })
     )
+
+    const vdis = await exportedVm.$getDisks()
+    let maxStreamLength = 1024 * 1024 // Ovf file and tar headers are a few KB, let's stay safe
+    for (const vdiRef of vdis) {
+      const vdi = await this._xapi.getRecord('VDI', vdiRef)
+
+      // the size a of fully allocated vdi will be virtual_size  exaclty, it's a gross over evaluation
+      // of the real stream size in general, since a disk is never completly full
+      // vdi.physical_size seems to underevaluate a lot the real disk usage of a VDI, as of 2023-10-30
+      maxStreamLength += vdi.virtual_size
+    }
+
     const sizeContainer = watchStreamSize(stream)
 
     const timestamp = Date.now()
-
     await this._callWriters(
       writer =>
         writer.run({
+          maxStreamLength,
           sizeContainer,
           stream: forkStreamUnpipe(stream),
           timestamp,

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

@@ -32,10 +32,10 @@ class IncrementalRemoteVmBackupRunner extends AbstractRemote {
           useChain: false,
         })
 
-        const differentialVhds = {}
+        const isVhdDifferencing = {}
 
         await asyncEach(Object.entries(incrementalExport.streams), async ([key, stream]) => {
-          differentialVhds[key] = await isVhdDifferencingDisk(stream)
+          isVhdDifferencing[key] = await isVhdDifferencingDisk(stream)
         })
 
         incrementalExport.streams = mapValues(incrementalExport.streams, this._throttleStream)
@@ -43,7 +43,7 @@ class IncrementalRemoteVmBackupRunner extends AbstractRemote {
           writer =>
             writer.transfer({
               deltaExport: forkDeltaExport(incrementalExport),
-              differentialVhds,
+              isVhdDifferencing,
               timestamp: metadata.timestamp,
               vm: metadata.vm,
               vmSnapshot: metadata.vmSnapshot,

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

@@ -41,6 +41,8 @@ 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
     // except the suspended VDI
@@ -48,11 +50,11 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
       Task.info('Transfer data using NBD')
     }
 
-    const differentialVhds = {}
+    const isVhdDifferencing = {}
     // 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]) => {
-      differentialVhds[key] = await isVhdDifferencingDisk(stream)
+      isVhdDifferencing[key] = await isVhdDifferencingDisk(stream)
     })
     const sizeContainers = mapValues(deltaExport.streams, stream => watchStreamSize(stream))
 
@@ -67,7 +69,7 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
       writer =>
         writer.transfer({
           deltaExport: forkDeltaExport(deltaExport),
-          differentialVhds,
+          isVhdDifferencing,
           sizeContainers,
           timestamp,
           vm,

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

@@ -4,6 +4,7 @@ import { Disposable } from 'promise-toolbox'
 import { getVmBackupDir } from '../../_getVmBackupDir.mjs'
 
 import { Abstract } from './_Abstract.mjs'
+import { extractIdsFromSimplePattern } from '../../extractIdsFromSimplePattern.mjs'
 
 export const AbstractRemote = class AbstractRemoteVmBackupRunner extends Abstract {
   constructor({
@@ -34,7 +35,8 @@ export const AbstractRemote = class AbstractRemoteVmBackupRunner extends Abstrac
     this._writers = writers
 
     const RemoteWriter = this._getRemoteWriter()
-    Object.entries(remoteAdapters).forEach(([remoteId, adapter]) => {
+    extractIdsFromSimplePattern(job.remotes).forEach(remoteId => {
+      const adapter = remoteAdapters[remoteId]
       const targetSettings = {
         ...settings,
         ...allSettings[remoteId],

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

@@ -31,6 +31,11 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       throw new Error('cannot backup a VM created by this very job')
     }
 
+    const currentOperations = Object.values(vm.current_operations)
+    if (currentOperations.some(_ => _ === 'migrate_send' || _ === 'pool_migrate')) {
+      throw new Error('cannot backup a VM currently being migrated')
+    }
+
     this.config = config
     this.job = job
     this.remoteAdapters = remoteAdapters
@@ -256,7 +261,15 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       }
 
       if (this._writers.size !== 0) {
-        await this._copy()
+        const { pool_migrate = null, migrate_send = null } = this._exportedVm.blocked_operations
+
+        const reason = 'VM migration is blocked during backup'
+        await this._exportedVm.update_blocked_operations({ pool_migrate: reason, migrate_send: reason })
+        try {
+          await this._copy()
+        } finally {
+          await this._exportedVm.update_blocked_operations({ pool_migrate, migrate_send })
+        }
       }
     } finally {
       if (startAfter) {

@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) {
-  return Object.create(deltaExport, {
-    streams: {
-      value: mapValues(deltaExport.streams, forkStreamUnpipe),
-    },
-  })
+  const { streams, ...rest } = deltaExport
+  const newMetadata = cloneDeep(rest)
+  newMetadata.streams = mapValues(streams, forkStreamUnpipe)
+  return newMetadata
 }

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

@@ -24,7 +24,7 @@ export class FullRemoteWriter extends MixinRemoteWriter(AbstractFullWriter) {
     )
   }
 
-  async _run({ timestamp, sizeContainer, stream, vm, vmSnapshot }) {
+  async _run({ maxStreamLength, timestamp, sizeContainer, stream, streamLength, vm, vmSnapshot }) {
     const settings = this._settings
     const job = this._job
     const scheduleId = this._scheduleId
@@ -65,6 +65,8 @@ export class FullRemoteWriter extends MixinRemoteWriter(AbstractFullWriter) {
 
     await Task.run({ name: 'transfer' }, async () => {
       await adapter.outputStream(dataFilename, stream, {
+        maxStreamLength,
+        streamLength,
         validator: tmpPath => adapter.isValidXva(tmpPath),
       })
       return { size: sizeContainer.size }

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

@@ -11,6 +11,7 @@ import { dirname } from 'node:path'
 
 import { formatFilenameDate } from '../../_filenameDate.mjs'
 import { getOldEntries } from '../../_getOldEntries.mjs'
+import { TAG_BASE_DELTA } from '../../_incrementalVm.mjs'
 import { Task } from '../../Task.mjs'
 
 import { MixinRemoteWriter } from './_MixinRemoteWriter.mjs'
@@ -132,7 +133,7 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
     }
   }
 
-  async _transfer($defer, { differentialVhds, timestamp, deltaExport, vm, vmSnapshot }) {
+  async _transfer($defer, { isVhdDifferencing, timestamp, deltaExport, vm, vmSnapshot }) {
     const adapter = this._adapter
     const job = this._job
     const scheduleId = this._scheduleId
@@ -160,6 +161,7 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
     )
 
     metadataContent = {
+      isVhdDifferencing,
       jobId,
       mode: job.mode,
       scheduleId,
@@ -179,9 +181,9 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
         async ([id, vdi]) => {
           const path = `${this._vmBackupDir}/${vhds[id]}`
 
-          const isDelta = differentialVhds[`${id}.vhd`]
+          const isDifferencing = isVhdDifferencing[`${id}.vhd`]
           let parentPath
-          if (isDelta) {
+          if (isDifferencing) {
             const vdiDir = dirname(path)
             parentPath = (
               await handler.list(vdiDir, {
@@ -195,7 +197,7 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
             assert.notStrictEqual(
               parentPath,
               undefined,
-              `missing parent of ${id} in ${dirname(path)}, looking for ${vdi.other_config['xo:base_delta']}`
+              `missing parent of ${id} in ${dirname(path)}, looking for ${vdi.other_config[TAG_BASE_DELTA]}`
             )
 
             parentPath = parentPath.slice(1) // remove leading slash
@@ -204,15 +206,19 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
             await checkVhd(handler, parentPath)
           }
 
-          transferSize += await adapter.writeVhd(path, deltaExport.streams[`${id}.vhd`], {
+          // 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`], {
             // 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) {
+          if (isDifferencing) {
             await chainVhd(handler, parentPath, handler, path)
           }
 

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

@@ -4,12 +4,13 @@ import { formatDateTime } from '@xen-orchestra/xapi'
 
 import { formatFilenameDate } from '../../_filenameDate.mjs'
 import { getOldEntries } from '../../_getOldEntries.mjs'
-import { importIncrementalVm, TAG_COPY_SRC } from '../../_incrementalVm.mjs'
+import { importIncrementalVm, TAG_BACKUP_SR, TAG_BASE_DELTA, 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) {
@@ -81,6 +82,54 @@ 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
@@ -91,16 +140,7 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
 
     let targetVmRef
     await Task.run({ name: 'transfer' }, async () => {
-      targetVmRef = await importIncrementalVm(
-        {
-          __proto__: deltaExport,
-          vm: {
-            ...deltaExport.vm,
-            tags: _warmMigration ? deltaExport.vm.tags : [...deltaExport.vm.tags, 'Continuous Replication'],
-          },
-        },
-        sr
-      )
+      targetVmRef = await importIncrementalVm(this.#decorateVmMetadata(deltaExport), sr)
       return {
         size: Object.values(sizeContainers).reduce((sum, { size }) => sum + size, 0),
       }
@@ -121,13 +161,13 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
         )
       ),
       targetVm.update_other_config({
-        'xo:backup:sr': srUuid,
+        [TAG_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,
-        'xo:backup:vm': vm.uuid,
+        [TAG_BASE_DELTA]: vm.uuid,
       }),
     ])
   }

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

@@ -1,9 +1,9 @@
 import { AbstractWriter } from './_AbstractWriter.mjs'
 
 export class AbstractFullWriter extends AbstractWriter {
-  async run({ timestamp, sizeContainer, stream, vm, vmSnapshot }) {
+  async run({ maxStreamLength, timestamp, sizeContainer, stream, streamLength, vm, vmSnapshot }) {
     try {
-      return await this._run({ timestamp, sizeContainer, stream, vm, vmSnapshot })
+      return await this._run({ maxStreamLength, timestamp, sizeContainer, stream, streamLength, vm, vmSnapshot })
     } finally {
       // ensure stream is properly closed
       stream.destroy()

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

@@ -96,6 +96,9 @@ export const MixinRemoteWriter = (BaseClass = Object) =>
             metadata,
             srUuid,
             xapi,
+            settings: {
+              additionnalVmTag: 'xo:no-bak=Health Check',
+            },
           }).run()
           const restoredVm = xapi.getObject(restoredId)
           try {

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

@@ -18,7 +18,7 @@ export const MixinXapiWriter = (BaseClass = Object) =>
       const vdiRefs = await xapi.VM_getDisks(baseVm.$ref)
       for (const vdiRef of vdiRefs) {
         const vdi = xapi.getObject(vdiRef)
-        if (vdi.$SR.uuid !== this._heathCheckSr.uuid) {
+        if (vdi.$SR.uuid !== this._healthCheckSr.uuid) {
           return false
         }
       }
@@ -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/Backup.js](https://github.com/vatesfr/xen-orchestra/blob/master/%40xen-orchestra/backups/Backup.js).
+Settings are described in [`@xen-orchestra/backups/\_runners/VmsXapi.mjs``](https://github.com/vatesfr/xen-orchestra/blob/master/%40xen-orchestra/backups/_runners/VmsXapi.mjs).
 
 ## Writer API
 

@xen-orchestra/backups/formatVmBackups.mjs

@@ -2,6 +2,20 @@ import mapValues from 'lodash/mapValues.js'
 import { dirname } from 'node:path'
 
 function formatVmBackup(backup) {
+  const { isVhdDifferencing, vmSnapshot } = backup
+
+  let differencingVhds
+  let dynamicVhds
+  const withMemory = 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
@@ -25,6 +39,10 @@ function formatVmBackup(backup) {
       name_description: backup.vm.name_description,
       name_label: backup.vm.name_label,
     },
+
+    differencingVhds,
+    dynamicVhds,
+    withMemory,
   }
 }
 

@xen-orchestra/backups/merge-worker/cli.mjs

@@ -2,18 +2,21 @@
 // eslint-disable-next-line eslint-comments/disable-enable-pair
 /* eslint-disable n/shebang */
 
+import { asyncEach } from '@vates/async-each'
 import { catchGlobalErrors } from '@xen-orchestra/log/configure'
 import { createLogger } from '@xen-orchestra/log'
 import { getSyncedHandler } from '@xen-orchestra/fs'
 import { join } from 'node:path'
+import { load as loadConfig } from 'app-conf'
 import Disposable from 'promise-toolbox/Disposable'
-import min from 'lodash/min.js'
 
 import { getVmBackupDir } from '../_getVmBackupDir.mjs'
 import { RemoteAdapter } from '../RemoteAdapter.mjs'
 
 import { CLEAN_VM_QUEUE } from './index.mjs'
 
+const APP_NAME = 'xo-merge-worker'
+const APP_DIR = new URL('.', import.meta.url).pathname
 // -------------------------------------------------------------------
 
 catchGlobalErrors(createLogger('xo:backups:mergeWorker'))
@@ -34,6 +37,7 @@ const main = Disposable.wrap(async function* main(args) {
     for (let i = 0; i < 10; ++i) {
       const entries = await handler.list(CLEAN_VM_QUEUE)
       if (entries.length !== 0) {
+        entries.sort()
         return entries
       }
       await new Promise(timeoutResolver)
@@ -42,38 +46,47 @@ const main = Disposable.wrap(async function* main(args) {
 
   let taskFiles
   while ((taskFiles = await listRetry()) !== undefined) {
-    const taskFileBasename = min(taskFiles)
-    const previousTaskFile = join(CLEAN_VM_QUEUE, taskFileBasename)
-    const taskFile = join(CLEAN_VM_QUEUE, '_' + taskFileBasename)
+    const { concurrency } = await loadConfig(APP_NAME, {
+      appDir: APP_DIR,
+      ignoreUnknownFormats: true,
+    })
+    await asyncEach(
+      taskFiles,
+      async taskFileBasename => {
+        const previousTaskFile = join(CLEAN_VM_QUEUE, taskFileBasename)
+        const taskFile = join(CLEAN_VM_QUEUE, '_' + taskFileBasename)
 
-    // move this task to the end
-    try {
-      await handler.rename(previousTaskFile, taskFile)
-    } catch (error) {
-      // this error occurs if the task failed too many times (i.e. too many `_` prefixes)
-      // there is nothing more that can be done
-      if (error.code === 'ENAMETOOLONG') {
-        await handler.unlink(previousTaskFile)
-      }
+        // move this task to the end
+        try {
+          await handler.rename(previousTaskFile, taskFile)
+        } catch (error) {
+          // this error occurs if the task failed too many times (i.e. too many `_` prefixes)
+          // there is nothing more that can be done
+          if (error.code === 'ENAMETOOLONG') {
+            await handler.unlink(previousTaskFile)
+          }
 
-      throw error
-    }
-
-    try {
-      const vmDir = getVmBackupDir(String(await handler.readFile(taskFile)))
-      try {
-        await adapter.cleanVm(vmDir, { merge: true, logInfo: info, logWarn: warn, remove: true })
-      } catch (error) {
-        // consider the clean successful if the VM dir is missing
-        if (error.code !== 'ENOENT') {
           throw error
         }
-      }
 
-      handler.unlink(taskFile).catch(error => warn('deleting task failure', { error }))
-    } catch (error) {
-      warn('failure handling task', { error })
-    }
+        try {
+          const vmDir = getVmBackupDir(String(await handler.readFile(taskFile)))
+          try {
+            await adapter.cleanVm(vmDir, { merge: true, logInfo: info, logWarn: warn, remove: true })
+          } catch (error) {
+            // consider the clean successful if the VM dir is missing
+            if (error.code !== 'ENOENT') {
+              throw error
+            }
+          }
+
+          handler.unlink(taskFile).catch(error => warn('deleting task failure', { error }))
+        } catch (error) {
+          warn('failure handling task', { error })
+        }
+      },
+      { concurrency }
+    )
   }
 })
 

@xen-orchestra/backups/merge-worker/config.toml

@@ -0,0 +1 @@
+concurrency = 1

@xen-orchestra/backups/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.39.0",
+  "version": "0.44.3",
   "engines": {
     "node": ">=14.18"
   },
@@ -17,21 +17,23 @@
     "test-integration": "node--test *.integ.mjs"
   },
   "dependencies": {
+    "@iarna/toml": "^2.2.5",
     "@kldzj/stream-throttle": "^1.1.1",
     "@vates/async-each": "^1.0.0",
     "@vates/cached-dns.lookup": "^1.0.0",
     "@vates/compose": "^2.1.0",
     "@vates/decorate-with": "^2.0.0",
-    "@vates/disposable": "^0.1.4",
-    "@vates/fuse-vhd": "^1.0.0",
-    "@vates/nbd-client": "^1.2.1",
+    "@vates/disposable": "^0.1.5",
+    "@vates/fuse-vhd": "^2.0.0",
+    "@vates/nbd-client": "^3.0.0",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/fs": "^4.0.1",
+    "@xen-orchestra/fs": "^4.1.3",
     "@xen-orchestra/log": "^0.6.0",
     "@xen-orchestra/template": "^0.1.0",
-    "compare-versions": "^5.0.1",
-    "d3-time-format": "^3.0.0",
+    "app-conf": "^2.3.0",
+    "compare-versions": "^6.0.0",
+    "d3-time-format": "^4.1.0",
     "decorator-synchronized": "^0.6.0",
     "golike-defer": "^0.5.1",
     "limit-concurrency-decorator": "^0.5.0",
@@ -40,20 +42,21 @@
     "parse-pairs": "^2.0.0",
     "promise-toolbox": "^0.21.0",
     "proper-lockfile": "^4.1.2",
+    "tar": "^6.1.15",
     "uuid": "^9.0.0",
-    "vhd-lib": "^4.5.0",
-    "xen-api": "^1.3.3",
+    "vhd-lib": "^4.9.0",
+    "xen-api": "^2.0.0",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
     "fs-extra": "^11.1.0",
     "rimraf": "^5.0.1",
-    "sinon": "^15.0.1",
+    "sinon": "^17.0.1",
     "test": "^3.2.1",
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^2.2.1"
+    "@xen-orchestra/xapi": "^4.1.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {

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

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 
-'use strict'
+import { defer } from 'golike-defer'
+import { readFileSync } from 'fs'
+import { Ref, Xapi } from 'xen-api'
 
-const { Ref, Xapi } = require('xen-api')
-const { defer } = require('golike-defer')
-
-const pkg = require('./package.json')
+const pkg = JSON.parse(readFileSync(new URL('./package.json', import.meta.url)))
 
 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": "0.2.0",
+  "version": "1.0.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": ">=8"
+    "node": ">=10"
   },
   "bin": {
-    "xo-cr-seed": "./index.js"
+    "xo-cr-seed": "./index.mjs"
   },
   "preferGlobal": true,
   "dependencies": {
     "golike-defer": "^0.5.1",
-    "xen-api": "^1.3.3"
+    "xen-api": "^2.0.0"
   },
   "scripts": {
     "postversion": "npm publish"

@xen-orchestra/cron/package.json

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

@xen-orchestra/fs/package.json

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

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

@@ -189,7 +189,7 @@ export default class RemoteHandlerAbstract {
    * @param {number} [options.dirMode]
    * @param {(this: RemoteHandlerAbstract, path: string) => Promise<undefined>} [options.validator] Function that will be called before the data is commited to the remote, if it fails, file should not exist
    */
-  async outputStream(path, input, { checksum = true, dirMode, validator } = {}) {
+  async outputStream(path, input, { checksum = true, dirMode, maxStreamLength, streamLength, validator } = {}) {
     path = normalizePath(path)
     let checksumStream
 
@@ -201,6 +201,8 @@ export default class RemoteHandlerAbstract {
     }
     await this._outputStream(path, input, {
       dirMode,
+      maxStreamLength,
+      streamLength,
       validator,
     })
     if (checksum) {
@@ -624,14 +626,18 @@ export default class RemoteHandlerAbstract {
 
     const files = await this._list(dir)
     await asyncEach(files, file =>
-      this._unlink(`${dir}/${file}`).catch(error => {
-        // Unlink dir behavior is not consistent across platforms
-        // https://github.com/nodejs/node-v0.x-archive/issues/5791
-        if (error.code === 'EISDIR' || error.code === 'EPERM') {
-          return this._rmtree(`${dir}/${file}`)
-        }
-        throw error
-      })
+      this._unlink(`${dir}/${file}`).catch(
+        error => {
+          // Unlink dir behavior is not consistent across platforms
+          // https://github.com/nodejs/node-v0.x-archive/issues/5791
+          if (error.code === 'EISDIR' || error.code === 'EPERM') {
+            return this._rmtree(`${dir}/${file}`)
+          }
+          throw error
+        },
+        // real unlink concurrency will be 2**max directory depth
+        { concurrency: 2 }
+      )
     )
     return this._rmtree(dir)
   }

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

@@ -209,7 +209,7 @@ describe('encryption', () => {
     // encrypt with a non default algorithm
     const encryptor = _getEncryptor('aes-256-cbc', '73c1838d7d8a6088ca2317fb5f29cd91')
 
-    await fs.writeFile(`${dir}/encryption.json`, `{"algorithm": "aes-256-gmc"}`)
+    await fs.writeFile(`${dir}/encryption.json`, `{"algorithm": "aes-256-gcm"}`)
     await fs.writeFile(`${dir}/metadata.json`, encryptor.encryptData(`{"random": "NOTSORANDOM"}`))
 
     // remote is now non empty : can't modify key anymore

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

@@ -5,6 +5,7 @@ import {
   CreateMultipartUploadCommand,
   DeleteObjectCommand,
   GetObjectCommand,
+  GetObjectLockConfigurationCommand,
   HeadObjectCommand,
   ListObjectsV2Command,
   PutObjectCommand,
@@ -16,22 +17,23 @@ import { NodeHttpHandler } from '@aws-sdk/node-http-handler'
 import { getApplyMd5BodyChecksumPlugin } from '@aws-sdk/middleware-apply-body-checksum'
 import { Agent as HttpAgent } from 'http'
 import { Agent as HttpsAgent } from 'https'
-import pRetry from 'promise-toolbox/retry'
 import { createLogger } from '@xen-orchestra/log'
-import { decorateWith } from '@vates/decorate-with'
-import { PassThrough, pipeline } from 'stream'
+import { PassThrough, Transform, pipeline } from 'stream'
 import { parse } from 'xo-remote-parser'
 import copyStreamToBuffer from './_copyStreamToBuffer.js'
 import guessAwsRegion from './_guessAwsRegion.js'
 import RemoteHandlerAbstract from './abstract'
 import { basename, join, split } from './path'
 import { asyncEach } from '@vates/async-each'
+import { pRetry } from 'promise-toolbox'
 
 // endpoints https://docs.aws.amazon.com/general/latest/gr/s3.html
 
 // limits: https://docs.aws.amazon.com/AmazonS3/latest/dev/qfacts.html
 const MAX_PART_SIZE = 1024 * 1024 * 1024 * 5 // 5GB
-const { warn } = createLogger('xo:fs:s3')
+const MAX_PART_NUMBER = 10000
+const MIN_PART_SIZE = 5 * 1024 * 1024
+const { debug, info, warn } = createLogger('xo:fs:s3')
 
 export default class S3Handler extends RemoteHandlerAbstract {
   #bucket
@@ -72,12 +74,47 @@ export default class S3Handler extends RemoteHandlerAbstract {
       }),
     })
 
-    // Workaround for https://github.com/aws/aws-sdk-js-v3/issues/2673
-    this.#s3.middlewareStack.use(getApplyMd5BodyChecksumPlugin(this.#s3.config))
-
     const parts = split(path)
     this.#bucket = parts.shift()
     this.#dir = join(...parts)
+    const WITH_RETRY = [
+      '_closeFile',
+      '_copy',
+      '_getInfo',
+      '_getSize',
+      '_list',
+      '_mkdir',
+      '_openFile',
+      '_outputFile',
+      '_read',
+      '_readFile',
+      '_rename',
+      '_rmdir',
+      '_truncate',
+      '_unlink',
+      '_write',
+      '_writeFile',
+    ]
+    WITH_RETRY.forEach(functionName => {
+      if (this[functionName] !== undefined) {
+        // adding the retry on the top level mtehod won't
+        // cover when _functionName are called internally
+        this[functionName] = pRetry.wrap(this[functionName], {
+          delays: [100, 200, 500, 1000, 2000],
+          // these errors should not change on retry
+          when: err => !['EEXIST', 'EISDIR', 'ENOTEMPTY', 'ENOENT', 'ENOTDIR', 'EISDIR'].includes(err?.code),
+          onRetry(error) {
+            warn('retrying method on fs ', {
+              method: functionName,
+              attemptNumber: this.attemptNumber,
+              delay: this.delay,
+              error,
+              file: this.arguments?.[0],
+            })
+          },
+        })
+      }
+    })
   }
 
   get type() {
@@ -186,11 +223,35 @@ export default class S3Handler extends RemoteHandlerAbstract {
     }
   }
 
-  async _outputStream(path, input, { validator }) {
+  async _outputStream(path, input, { streamLength, maxStreamLength = streamLength, validator }) {
+    // S3 storage is limited to 10K part, each part is limited to 5GB. And the total upload must be smaller than 5TB
+    // a bigger partSize increase the memory consumption of aws/lib-storage exponentially
+    let partSize
+    if (maxStreamLength === undefined) {
+      warn(`Writing ${path} to a S3 remote without a max size set will cut it to 50GB`, { path })
+      partSize = MIN_PART_SIZE // min size for S3
+    } else {
+      partSize = Math.min(Math.max(Math.ceil(maxStreamLength / MAX_PART_NUMBER), MIN_PART_SIZE), MAX_PART_SIZE)
+    }
+
+    // ensure we don't try to upload a stream to big for this partSize
+    let readCounter = 0
+    const MAX_SIZE = MAX_PART_NUMBER * partSize
+    const streamCutter = new Transform({
+      transform(chunk, encoding, callback) {
+        readCounter += chunk.length
+        if (readCounter > MAX_SIZE) {
+          callback(new Error(`read ${readCounter} bytes, maximum size allowed  is ${MAX_SIZE} `))
+        } else {
+          callback(null, chunk)
+        }
+      },
+    })
+
     // Workaround for "ReferenceError: ReadableStream is not defined"
     // https://github.com/aws/aws-sdk-js-v3/issues/2522
     const Body = new PassThrough()
-    pipeline(input, Body, () => {})
+    pipeline(input, streamCutter, Body, () => {})
 
     const upload = new Upload({
       client: this.#s3,
@@ -198,6 +259,8 @@ export default class S3Handler extends RemoteHandlerAbstract {
         ...this.#createParams(path),
         Body,
       },
+      partSize,
+      leavePartsOnError: false,
     })
 
     await upload.done()
@@ -212,21 +275,6 @@ export default class S3Handler extends RemoteHandlerAbstract {
     }
   }
 
-  // some objectstorage provider like backblaze, can answer a 500/503 routinely
-  // in this case we should retry,  and let their load balancing do its magic
-  // https://www.backblaze.com/b2/docs/calling.html#error_handling
-  @decorateWith(pRetry.wrap, {
-    delays: [100, 200, 500, 1000, 2000],
-    when: e => e.$metadata?.httpStatusCode === 500,
-    onRetry(error) {
-      warn('retrying writing file', {
-        attemptNumber: this.attemptNumber,
-        delay: this.delay,
-        error,
-        file: this.arguments[0],
-      })
-    },
-  })
   async _writeFile(file, data, options) {
     return this.#s3.send(
       new PutObjectCommand({
@@ -396,6 +444,32 @@ export default class S3Handler extends RemoteHandlerAbstract {
 
   async _closeFile(fd) {}
 
+  async _sync() {
+    await super._sync()
+    try {
+      // if Object Lock is enabled, each upload must come with a contentMD5 header
+      // the computation of this md5 is memory-intensive, especially when uploading a stream
+      const res = await this.#s3.send(new GetObjectLockConfigurationCommand({ Bucket: this.#bucket }))
+      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 {
+        throw error
+      }
+    }
+  }
+
   useVhdDirectory() {
     return true
   }

@xen-orchestra/lite/.eslintrc.cjs

@@ -1,28 +0,0 @@
-/* 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

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

@xen-orchestra/lite/CHANGELOG.md

@@ -2,6 +2,52 @@
 
 ## **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)
+
+- Ability to migrate selected VMs to another host (PR [#7040](https://github.com/vatesfr/xen-orchestra/pull/7040))
+- Ability to snapshot selected VMs (PR [#7021](https://github.com/vatesfr/xen-orchestra/pull/7021))
+- Add Patches to Pool Dashboard (PR [#6709](https://github.com/vatesfr/xen-orchestra/pull/6709))
+- Add remember me checkbox on the login page (PR [#7030](https://github.com/vatesfr/xen-orchestra/pull/7030))
+
+## **0.1.3** (2023-09-01)
+
+- Add Alarms to Pool Dashboard (PR [#6976](https://github.com/vatesfr/xen-orchestra/pull/6976))
+
+## **0.1.2** (2023-07-28)
+
+- Ability to export selected VMs as CSV file (PR [#6915](https://github.com/vatesfr/xen-orchestra/pull/6915))
+- [Pool/VMs] Ability to export selected VMs as JSON file (PR [#6911](https://github.com/vatesfr/xen-orchestra/pull/6911))
+- Add Tasks to Pool Dashboard (PR [#6713](https://github.com/vatesfr/xen-orchestra/pull/6713))
+
 ## **0.1.1** (2023-07-03)
 
 - Invalidate sessionId token after logout (PR [#6480](https://github.com/vatesfr/xen-orchestra/pull/6480))

@xen-orchestra/lite/README.md

@@ -48,18 +48,16 @@ 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>
 ```
 
@@ -73,9 +71,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>
@@ -105,8 +103,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>
 ```
 
@@ -140,21 +138,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,53 +150,33 @@ 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

@@ -0,0 +1,111 @@
+# 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

@@ -0,0 +1,134 @@
+<!-- TOC -->
+
+- [XenApiCollection](#xenapicollection)
+  - [Get the collection](#get-the-collection)
+  - [Defer the subscription](#defer-the-subscription)
+  - [Create a dedicated collection](#create-a-dedicated-collection)
+  - [Alter the collection](#alter-the-collection)
+  _ [Example 1: Adding props to records](#example-1-adding-props-to-records)
+  _ [Example 2: Adding props to the collection](#example-2-adding-props-to-the-collection) \* [Example 3, filtering and sorting the collection](#example-3-filtering-and-sorting-the-collection)
+  <!-- TOC -->
+
+# XenApiCollection
+
+## Get the collection
+
+To retrieve a collection, invoke `useXenApiCollection("VM")`.
+
+By doing this, the current component will be automatically subscribed to the collection and will be updated when the
+collection changes.
+
+When the component is unmounted, the subscription will be automatically stopped.
+
+## Defer the subscription
+
+If you don't want to fetch the data of the collection when the component is mounted, you can pass `{ immediate: false }`
+as options: `const { start, isStarted } = useXenApiCollection("VM", { immediate: false })`.
+
+Then you subscribe to the collection by calling `start()`.
+
+## Create a dedicated collection
+
+It is recommended to create a dedicated collection composable for each type of record you want to use.
+
+They are stored in `src/composables/xen-api-collection/*-collection.composable.ts`.
+
+```typescript
+// src/composables/xen-api-collection/console-collection.composable.ts
+
+export const useConsoleCollection = () => useXenApiCollection('console')
+```
+
+If you want to allow the user to defer the subscription, you can propagate the options to `useXenApiCollection`.
+
+```typescript
+// console-collection.composable.ts
+
+export const useConsoleCollection = <Immediate extends boolean = true>(options?: { immediate?: Immediate }) =>
+  useXenApiCollection('console', options)
+```
+
+```typescript
+// MyComponent.vue
+
+const collection = useConsoleCollection({ immediate: false })
+
+setTimeout(() => collection.start(), 10000)
+```
+
+## Alter the collection
+
+You can alter the collection by overriding parts of it.
+
+### Example 1: Adding props to records
+
+```typescript
+// xen-api.ts
+
+export interface XenApiConsole extends XenApiRecord<'console'> {
+  // ... existing props
+  someProp: string
+  someOtherProp: number
+}
+```
+
+```typescript
+// console-collection.composable.ts
+
+export const useConsoleCollection = () => {
+  const collection = useXenApiCollection('console')
+
+  const records = computed(() => {
+    return collection.records.value.map(console => ({
+      ...console,
+      someProp: 'Some value',
+      someOtherProp: 42,
+    }))
+  })
+
+  return {
+    ...collection,
+    records,
+  }
+}
+```
+
+```typescript
+const consoleCollection = useConsoleCollection()
+
+consoleCollection.getByUuid('...').someProp // "Some value"
+```
+
+### Example 2: Adding props to the collection
+
+```typescript
+// vm-collection.composable.ts
+
+export const useVmCollection = () => {
+  const collection = useXenApiCollection('VM')
+
+  return {
+    ...collection,
+    runningVms: computed(() => collection.records.value.filter(vm => vm.power_state === POWER_STATE.RUNNING)),
+  }
+}
+```
+
+### Example 3, filtering and sorting the collection
+
+```typescript
+// vm-collection.composable.ts
+
+export const useVmCollection = () => {
+  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)
+        .sort((vm1, vm2) => vm1.name_label.localeCompare(vm2.name_label))
+    ),
+  }
+}
+```

@xen-orchestra/lite/docs/xen-api-record-stores.md

@@ -1,144 +0,0 @@
-# Stores for XenApiRecord collections
-
-All collections of `XenApiRecord` are stored inside the `xapiCollectionStore`.
-
-To retrieve a collection, invoke `useXapiCollectionStore().get(type)`.
-
-## Accessing a collection
-
-In order to use a collection, you'll need to subscribe to it.
-
-```typescript
-const consoleStore = useXapiCollectionStore().get("console");
-const { records, getByUuid /* ... */ } = consoleStore.subscribe();
-```
-
-## Deferred subscription
-
-If you wish to initialize the subscription on demand, you can pass `{ immediate: false }` as options to `subscribe()`.
-
-```typescript
-const consoleStore = useXapiCollectionStore().get("console");
-const { records, start, isStarted /* ... */ } = consoleStore.subscribe({
-  immediate: false,
-});
-
-// Later, you can then use start() to initialize the subscription.
-```
-
-## Create a dedicated store for a collection
-
-To create a dedicated store for a specific `XenApiRecord`, simply return the collection from the XAPI Collection Store:
-
-```typescript
-export const useConsoleStore = defineStore("console", () =>
-  useXapiCollectionStore().get("console")
-);
-```
-
-## Extending the base Subscription
-
-To extend the base Subscription, you'll need to override the `subscribe` method.
-
-For that, you can use the `createSubscribe<XenApiRecord, Extensions>((options) => { /* ... */})` helper.
-
-### Define the extensions
-
-Subscription extensions are defined as `(object | [object, RequiredOptions])[]`.
-
-When using a tuple (`[object, RequiredOptions]`), the corresponding `object` type will be added to the subscription if
-the `RequiredOptions` for that tuple are present in the options passed to `subscribe`.
-
-```typescript
-// Always present extension
-type DefaultExtension = {
-  propA: string;
-  propB: ComputedRef<number>;
-};
-
-// Conditional extension 1
-type FirstConditionalExtension = [
-  { propC: ComputedRef<string> }, // <- This signature will be added
-  { optC: string } // <- if this condition is met
-];
-
-// Conditional extension 2
-type SecondConditionalExtension = [
-  { propD: () => void }, // <- This signature will be added
-  { optD: number } // <- if this condition is met
-];
-
-// Create the extensions array
-type Extensions = [
-  DefaultExtension,
-  FirstConditionalExtension,
-  SecondConditionalExtension
-];
-```
-
-### Define the subscription
-
-```typescript
-export const useConsoleStore = defineStore("console", () => {
-  const consoleCollection = useXapiCollectionStore().get("console");
-
-  const subscribe = createSubscribe<XenApiConsole, Extensions>((options) => {
-    const originalSubscription = consoleCollection.subscribe(options);
-
-    const extendedSubscription = {
-      propA: "Some string",
-      propB: computed(() => 42),
-    };
-
-    const propCSubscription = options?.optC !== undefined && {
-      propC: computed(() => "Some other string"),
-    };
-
-    const propDSubscription = options?.optD !== undefined && {
-      propD: () => console.log("Hello"),
-    };
-
-    return {
-      ...originalSubscription,
-      ...extendedSubscription,
-      ...propCSubscription,
-      ...propDSubscription,
-    };
-  });
-
-  return {
-    ...consoleCollection,
-    subscribe,
-  };
-});
-```
-
-The generated `subscribe` method will then automatically have the following `options` signature:
-
-```typescript
-type Options = {
-  immediate?: false;
-  optC?: string;
-  optD?: number;
-};
-```
-
-### Use the subscription
-
-In each case, all the default properties (`records`, `getByUuid`, etc.) will be present.
-
-```typescript
-const store = useConsoleStore();
-
-// No options (propA and propB will be present)
-const subscription = store.subscribe();
-
-// optC option (propA, propB and propC will be present)
-const subscription = store.subscribe({ optC: "Hello" });
-
-// optD option (propA, propB and propD will be present)
-const subscription = store.subscribe({ optD: 12 });
-
-// optC and optD options (propA, propB, propC and propD will be present)
-const subscription = store.subscribe({ optC: "Hello", optD: 12 });
-```

@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

@@ -1,10 +1,11 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
+    <link rel="manifest" href="/manifest.webmanifest" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>XO Lite</title>
   </head>
   <body>
     <div id="root"></div>

@xen-orchestra/lite/package.json

@@ -1,63 +1,68 @@
 {
   "name": "@xen-orchestra/lite",
-  "version": "0.1.1",
+  "version": "0.1.7",
+  "type": "module",
   "scripts": {
     "dev": "GIT_HEAD=$(git rev-parse HEAD) vite",
     "build": "run-p type-check build-only",
     "preview": "vite preview --port 4173",
-    "build-only": "GIT_HEAD=$(git rev-parse HEAD) vite build",
-    "deploy": "./scripts/deploy.sh",
+    "release": "./scripts/release.mjs",
+    "build-only": "yarn release --build",
+    "deploy": "yarn release --build --deploy",
+    "gh-release": "yarn release --build --tarball --gh-release",
     "test": "yarn run type-check",
-    "type-check": "vue-tsc --noEmit"
+    "type-check": "vue-tsc --build --force tsconfig.type-check.json"
   },
-  "dependencies": {
-    "@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/lodash-es": "^4.17.6",
-    "@types/marked": "^4.0.8",
-    "@vueuse/core": "^10.1.2",
-    "@vueuse/math": "^10.1.2",
-    "complex-matcher": "^0.7.0",
+  "devDependencies": {
+    "@csstools/postcss-global-data": "^2.1.1",
+    "@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": "*",
+    "complex-matcher": "^0.7.1",
     "d3-time-format": "^4.1.0",
     "decorator-synchronized": "^0.6.0",
-    "echarts": "^5.3.3",
-    "highlight.js": "^11.6.0",
-    "human-format": "^1.1.0",
+    "echarts": "^5.4.3",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.9.0",
+    "human-format": "^1.2.0",
     "iterable-backoff": "^0.1.0",
-    "json-rpc-2.0": "^1.3.0",
-    "json5": "^2.2.1",
+    "json-rpc-2.0": "^1.7.0",
+    "json5": "^2.2.3",
     "limit-concurrency-decorator": "^0.5.0",
     "lodash-es": "^4.17.21",
     "make-error": "^1.3.6",
-    "marked": "^4.2.12",
-    "pinia": "^2.1.2",
-    "placement.js": "^1.0.0-beta.5",
-    "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": "^7.0.0",
-    "@vue/eslint-config-typescript": "^11.0.0",
-    "@vue/tsconfig": "^0.1.3",
-    "eslint-plugin-vue": "^9.0.0",
+    "marked": "^9.1.5",
+    "minimist": "^1.2.8",
     "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"
+    "pinia": "^2.1.7",
+    "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"
   },
   "private": true,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/lite",
@@ -73,6 +78,6 @@
   },
   "license": "AGPL-3.0-or-later",
   "engines": {
-    "node": ">=8.10"
+    "node": ">=18"
   }
 }

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

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

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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,14 @@
+{
+  "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

@@ -0,0 +1,661 @@
+                    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

@@ -1,67 +0,0 @@
-#!/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

@@ -0,0 +1,393 @@
+#!/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,96 +1,80 @@
 <template>
-  <UnreachableHostsModal />
   <div v-if="!$route.meta.hasStoryNav && !xenApiStore.isConnected">
     <AppLogin />
   </div>
   <div v-else>
-    <AppHeader />
+    <AppHeader v-if="uiStore.hasUi" />
     <div style="display: flex">
-      <AppNavigation />
-      <main class="main">
+      <AppNavigation v-if="uiStore.hasUi" />
+      <main class="main" :class="{ 'no-ui': !uiStore.hasUi }">
         <RouterView />
       </main>
     </div>
     <AppTooltips />
   </div>
+  <ModalList />
 </template>
 
 <script lang="ts" setup>
-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 { usePoolStore } from "@/stores/pool.store";
-import { useUiStore } from "@/stores/ui.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 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'
 
-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 xenApiStore = useXenApiStore()
 
-document.title = "XO Lite";
+const { pool } = usePoolCollection()
 
-const xenApiStore = useXenApiStore();
-const { pool } = usePoolStore().subscribe();
-useChartTheme();
-const uiStore = useUiStore();
+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,
-  async (poolRef) => {
-    const xenApi = xenApiStore.getXapi();
-    await xenApi.injectWatchEvent(poolRef);
-    await xenApi.startWatch();
+  poolRef => {
+    xenApiStore.getXapi().startWatching(poolRef)
   }
-);
-</script>
+)
 
-<style lang="postcss">
-@import "@/assets/base.css";
-</style>
+useUnreachableHosts()
+</script>
 
 <style lang="postcss" scoped>
 .main {
   overflow: auto;
   flex: 1;
-  height: calc(100vh - 8rem);
+  height: calc(100vh - 5.5rem);
   background-color: var(--background-color-secondary);
+
+  &.no-ui {
+    height: 100vh;
+  }
 }
 </style>

@xen-orchestra/lite/src/assets/_responsive.pcss

@@ -1,2 +0,0 @@
-@custom-media --mobile (max-width: 1023px);
-@custom-media --desktop (min-width: 1024px);

@xen-orchestra/lite/src/assets/base.css

@@ -1,48 +0,0 @@
-@import "reset.css";
-@import "theme.css";
-/* TODO Serve fonts locally */
-@import url("https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,400;0,500;0,600;0,700;0,900;1,400;1,500;1,600;1,700;1,900&display=swap");
-
-body {
-  min-height: 100vh;
-  font-size: 1.3rem;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color: var(--color-blue-scale-100);
-}
-
-a {
-  color: var(--color-extra-blue-base);
-}
-
-code,
-code * {
-  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
-    "Courier New", monospace;
-}
-
-.card-view {
-  padding: 1.2rem;
-  display: flex;
-  gap: 2rem;
-}
-
-.link {
-  text-decoration: underline;
-  color: var(--color-extra-blue-base);
-  cursor: pointer;
-}
-
-.link:hover {
-  color: var(--color-extra-blue-d20);
-}
-
-.link:active,
-.link.router-link-active {
-  color: var(--color-extra-blue-d40);
-}
-
-.link.router-link-active {
-  text-decoration: underline;
-}

@xen-orchestra/lite/src/assets/no-result.svg

@@ -0,0 +1,51 @@
+<svg width="214" height="166" viewBox="0 0 214 166" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="undraw_location_search_re_ttoj 1" clip-path="url(#clip0_2650_135967)">
+<path id="Vector" d="M121.852 81.1686C126.667 81.1686 130.571 77.2695 130.571 72.4598C130.571 67.65 126.667 63.751 121.852 63.751C117.036 63.751 113.133 67.65 113.133 72.4598C113.133 77.2695 117.036 81.1686 121.852 81.1686Z" fill="#E6E6E6"/>
+<path id="Vector_2" d="M143.221 83.6511L134.11 74.5502C134.808 73.4652 135.282 72.2511 135.502 70.98C135.722 69.7089 135.684 68.4066 135.391 67.1503C135.098 65.894 134.556 64.7092 133.796 63.6661C133.036 62.623 132.074 61.7428 130.968 61.0778C128.884 59.8344 126.409 59.4181 124.032 59.9112C121.655 60.4042 119.551 61.7708 118.135 63.7402C116.833 65.5645 116.207 67.785 116.366 70.0201C116.525 72.2552 117.458 74.3651 119.006 75.9872C120.554 77.6093 122.619 78.6422 124.846 78.9083C127.074 79.1744 129.324 78.6571 131.211 77.4453L140.323 86.5462C140.707 86.9298 141.229 87.1451 141.772 87.145C142.315 87.1448 142.836 86.9292 143.221 86.5454C143.605 86.1616 143.821 85.6411 143.821 85.0984C143.821 84.5557 143.605 84.0351 143.221 83.6511ZM130.871 74.2105C129.742 75.3382 128.257 76.04 126.668 76.1963C125.079 76.3527 123.485 75.9539 122.157 75.0679C120.83 74.1819 119.851 72.8635 119.387 71.3374C118.924 69.8113 119.004 68.1719 119.615 66.6985C120.226 65.2252 121.33 64.009 122.738 63.2572C124.146 62.5054 125.772 62.2646 127.338 62.5757C128.904 62.8868 130.313 63.7306 131.326 64.9634C132.339 66.1962 132.892 67.7416 132.892 69.3364C132.894 70.2418 132.716 71.1385 132.369 71.9749C132.022 72.8114 131.513 73.5711 130.871 74.2105Z" fill="#3F3D56"/>
+<path id="Vector_3" d="M209.27 97.0758C232.572 122.815 165.024 159.908 110.444 159.908C55.8631 159.908 18.1019 131.167 11.6168 97.0758C-4.10723 14.4151 145.59 -38.1235 110.444 34.2431C59.2141 139.726 190.92 76.8058 209.27 97.0758Z" fill="#E6E6E6"/>
+<path id="Vector_4" d="M198.815 103.168C222.117 128.907 154.569 166 99.9884 166C45.408 166 7.64682 137.259 1.16175 103.168C-14.5623 20.5069 135.135 -32.0317 99.9884 40.3349C48.759 145.818 180.464 82.8976 198.815 103.168Z" fill="#3F3D56"/>
+<path id="Vector_5" d="M32.5842 42.8207C16.2334 42.1016 3.55577 38.5788 3.72233 34.8006C3.82218 32.5354 8.44961 30.7139 16.418 29.8033C16.4465 29.7999 16.4755 29.8021 16.5031 29.8099C16.5308 29.8176 16.5566 29.8308 16.5792 29.8485C16.6017 29.8663 16.6205 29.8884 16.6345 29.9134C16.6485 29.9385 16.6574 29.9661 16.6606 29.9946C16.6639 30.0231 16.6615 30.052 16.6535 30.0795C16.6456 30.1071 16.6322 30.1328 16.6143 30.1552C16.5964 30.1776 16.5741 30.1963 16.549 30.2101C16.5238 30.2239 16.4961 30.2326 16.4675 30.2356C8.96128 31.0935 4.24436 32.85 4.15753 34.8197C4.00691 38.2363 17.0335 41.7013 32.6034 42.386C48.1732 43.0707 61.4543 40.7628 61.6049 37.3462C61.6921 35.3682 57.1186 33.1983 49.6692 31.6835C49.6411 31.6778 49.6143 31.6667 49.5905 31.6508C49.5668 31.6348 49.5464 31.6143 49.5305 31.5904C49.5147 31.5666 49.5037 31.5399 49.4982 31.5118C49.4927 31.4837 49.4928 31.4548 49.4985 31.4267C49.5043 31.3987 49.5155 31.372 49.5315 31.3483C49.5476 31.3246 49.5681 31.3043 49.5921 31.2885C49.616 31.2727 49.6428 31.2618 49.6709 31.2565C49.6991 31.2511 49.728 31.2513 49.7561 31.2571C57.663 32.8649 62.1404 35.0913 62.0401 37.3653C61.8736 41.1435 48.935 43.5398 32.5842 42.8207Z" fill="#8F84FF"/>
+<path id="Vector_6" d="M18.0625 43.4541C19.4303 46.0495 21.4566 48.2406 23.9385 49.8081C26.4204 51.3757 29.2709 52.2648 32.2048 52.3864C35.1388 52.5081 38.0533 51.858 40.6567 50.5012C43.2601 49.1445 45.4612 47.1286 47.0396 44.6554C37.3658 44.7856 27.6922 44.3846 18.0625 43.4541Z" fill="#8F84FF"/>
+<path id="Vector_7" d="M48.8472 40.0787C49.6704 37.6124 49.9076 34.9886 49.5401 32.4149C49.1725 29.8413 48.2102 27.3884 46.7294 25.2504C45.2486 23.1124 43.29 21.348 41.0084 20.0968C38.7269 18.8457 36.1851 18.1421 33.5842 18.0418C30.9834 17.9415 28.3949 18.4472 26.0235 19.5188C23.6522 20.5905 21.5631 22.1988 19.9216 24.2164C18.2802 26.2339 17.1314 28.6054 16.5662 31.1431C16.001 33.6808 16.0349 36.3151 16.6653 38.8374C27.2937 40.6395 38.1113 41.0568 48.8472 40.0787Z" fill="#8F84FF"/>
+<path id="Vector_8" d="M36.7748 28.8487C37.8574 28.8487 38.7351 27.972 38.7351 26.8906C38.7351 25.8093 37.8574 24.9326 36.7748 24.9326C35.6921 24.9326 34.8145 25.8093 34.8145 26.8906C34.8145 27.972 35.6921 28.8487 36.7748 28.8487Z" fill="white"/>
+<path id="Vector_9" d="M26.6852 36.4613C28.4896 36.4613 29.9524 35.0003 29.9524 33.1979C29.9524 31.3956 28.4896 29.9346 26.6852 29.9346C24.8808 29.9346 23.418 31.3956 23.418 33.1979C23.418 35.0003 24.8808 36.4613 26.6852 36.4613Z" fill="white"/>
+<path id="Vector_10" d="M75.9965 33.2641C77.1994 33.2641 78.1745 32.2901 78.1745 31.0886C78.1745 29.8871 77.1994 28.9131 75.9965 28.9131C74.7935 28.9131 73.8184 29.8871 73.8184 31.0886C73.8184 32.2901 74.7935 33.2641 75.9965 33.2641Z" fill="#8F84FF"/>
+<path id="Vector_11" d="M26.7698 99.8373C27.4916 99.8373 28.0767 99.2529 28.0767 98.5319C28.0767 97.811 27.4916 97.2266 26.7698 97.2266C26.048 97.2266 25.4629 97.811 25.4629 98.5319C25.4629 99.2529 26.048 99.8373 26.7698 99.8373Z" fill="#E6E6E6"/>
+<path id="Vector_12" d="M118.252 144.654C118.974 144.654 119.559 144.069 119.559 143.348C119.559 142.627 118.974 142.043 118.252 142.043C117.53 142.043 116.945 142.627 116.945 143.348C116.945 144.069 117.53 144.654 118.252 144.654Z" fill="#E6E6E6"/>
+<path id="Vector_13" d="M33.087 74.6003C33.4479 74.6003 33.7405 74.3081 33.7405 73.9476C33.7405 73.5871 33.4479 73.2949 33.087 73.2949C32.7262 73.2949 32.4336 73.5871 32.4336 73.9476C32.4336 74.3081 32.7262 74.6003 33.087 74.6003Z" fill="#E6E6E6"/>
+<path id="Vector_14" d="M87.1046 123.334C87.4655 123.334 87.7581 123.041 87.7581 122.681C87.7581 122.321 87.4655 122.028 87.1046 122.028C86.7437 122.028 86.4512 122.321 86.4512 122.681C86.4512 123.041 86.7437 123.334 87.1046 123.334Z" fill="#E6E6E6"/>
+<path id="Vector_15" d="M185.339 117.024C185.7 117.024 185.992 116.732 185.992 116.371C185.992 116.011 185.7 115.719 185.339 115.719C184.978 115.719 184.686 116.011 184.686 116.371C184.686 116.732 184.978 117.024 185.339 117.024Z" fill="#E6E6E6"/>
+<path id="Vector_16" d="M154.628 136.386C154.989 136.386 155.282 136.094 155.282 135.734C155.282 135.373 154.989 135.081 154.628 135.081C154.267 135.081 153.975 135.373 153.975 135.734C153.975 136.094 154.267 136.386 154.628 136.386Z" fill="#E6E6E6"/>
+<path id="Vector_17" d="M122.609 112.89C122.969 112.89 123.262 112.598 123.262 112.238C123.262 111.877 122.969 111.585 122.609 111.585C122.248 111.585 121.955 111.877 121.955 112.238C121.955 112.598 122.248 112.89 122.609 112.89Z" fill="#E6E6E6"/>
+<path id="Vector_18" d="M81.2238 48.4929C81.5847 48.4929 81.8772 48.2007 81.8772 47.8402C81.8772 47.4797 81.5847 47.1875 81.2238 47.1875C80.8629 47.1875 80.5703 47.4797 80.5703 47.8402C80.5703 48.2007 80.8629 48.4929 81.2238 48.4929Z" fill="#E6E6E6"/>
+<path id="Vector_19" d="M86.4523 16.2946C86.8132 16.2946 87.1057 16.0024 87.1057 15.6419C87.1057 15.2815 86.8132 14.9893 86.4523 14.9893C86.0914 14.9893 85.7988 15.2815 85.7988 15.6419C85.7988 16.0024 86.0914 16.2946 86.4523 16.2946Z" fill="#E6E6E6"/>
+<path id="Vector_20" d="M83.4015 151.834C83.7624 151.834 84.055 151.541 84.055 151.181C84.055 150.821 83.7624 150.528 83.4015 150.528C83.0406 150.528 82.748 150.821 82.748 151.181C82.748 151.541 83.0406 151.834 83.4015 151.834Z" fill="#E6E6E6"/>
+<path id="Vector_21" d="M51.1652 138.128C51.5261 138.128 51.8186 137.835 51.8186 137.475C51.8186 137.114 51.5261 136.822 51.1652 136.822C50.8043 136.822 50.5117 137.114 50.5117 137.475C50.5117 137.835 50.8043 138.128 51.1652 138.128Z" fill="#E6E6E6"/>
+<path id="Vector_22" d="M153.321 114.631C153.682 114.631 153.975 114.338 153.975 113.978C153.975 113.617 153.682 113.325 153.321 113.325C152.961 113.325 152.668 113.617 152.668 113.978C152.668 114.338 152.961 114.631 153.321 114.631Z" fill="#E6E6E6"/>
+<path id="Vector_23" d="M32.3178 50.8653C33.4004 50.8653 34.2781 49.9886 34.2781 48.9072C34.2781 47.8259 33.4004 46.9492 32.3178 46.9492C31.2351 46.9492 30.3574 47.8259 30.3574 48.9072C30.3574 49.9886 31.2351 50.8653 32.3178 50.8653Z" fill="white"/>
+<path id="Vector_24" d="M76.6492 78.9516C76.6492 84.7996 67.597 98.4265 64.9516 102.284C64.8718 102.401 64.7647 102.496 64.6396 102.562C64.5145 102.628 64.3752 102.662 64.2338 102.662C64.0924 102.662 63.9531 102.628 63.828 102.562C63.7029 102.496 63.5958 102.401 63.516 102.284C60.8706 98.4265 51.8184 84.7996 51.8184 78.9516C51.8184 77.3231 52.1395 75.7105 52.7634 74.206C53.3874 72.7015 54.3019 71.3344 55.4548 70.1829C56.6076 69.0314 57.9763 68.1179 59.4826 67.4947C60.9889 66.8715 62.6034 66.5508 64.2338 66.5508C65.8642 66.5508 67.4787 66.8715 68.985 67.4947C70.4913 68.1179 71.86 69.0314 73.0128 70.1829C74.1657 71.3344 75.0802 72.7015 75.7042 74.206C76.3281 75.7105 76.6492 77.3231 76.6492 78.9516Z" fill="white"/>
+<path id="Vector_25" d="M64.2346 84.3908C67.7232 84.3908 70.5512 81.5661 70.5512 78.0816C70.5512 74.5972 67.7232 71.7725 64.2346 71.7725C60.746 71.7725 57.918 74.5972 57.918 78.0816C57.918 81.5661 60.746 84.3908 64.2346 84.3908Z" fill="#8F84FF"/>
+<path id="Vector_26" d="M64.1249 109.409C68.1548 109.409 71.4217 108.776 71.4217 107.995C71.4217 107.214 68.1548 106.581 64.1249 106.581C60.095 106.581 56.8281 107.214 56.8281 107.995C56.8281 108.776 60.095 109.409 64.1249 109.409Z" fill="white"/>
+<path id="Vector_27" d="M177.922 69.1662C177.867 69.2732 177.82 69.3844 177.783 69.4988L167.375 72.3872L165.499 70.554L162.359 73.0196L165.364 76.5873C165.607 76.8756 165.936 77.0774 166.304 77.1625C166.671 77.2475 167.056 77.2113 167.401 77.0592L178.644 72.1022C179.025 72.3666 179.478 72.5088 179.943 72.5098C180.407 72.5109 180.861 72.3707 181.243 72.1079C181.626 71.8451 181.919 71.4723 182.084 71.0389C182.25 70.6055 182.279 70.1321 182.168 69.6817C182.057 69.2313 181.812 68.8253 181.465 68.5175C181.117 68.2098 180.684 68.015 180.224 67.9591C179.763 67.9031 179.296 67.9886 178.885 68.2043C178.473 68.4199 178.138 68.7554 177.922 69.1662H177.922Z" fill="#FFB8B8"/>
+<path id="Vector_28" d="M167.009 72.5566L163.102 75.5936C162.991 75.68 162.863 75.7415 162.726 75.7738C162.589 75.8062 162.446 75.8086 162.308 75.781C162.17 75.7534 162.039 75.6964 161.925 75.6138C161.811 75.5313 161.716 75.4252 161.647 75.3027L159.219 71.0108C158.78 70.4403 158.584 69.719 158.677 69.005C158.769 68.291 159.141 67.6427 159.711 67.2022C160.281 66.7617 161.002 66.565 161.718 66.6552C162.433 66.7454 163.083 67.1152 163.525 67.6835L167.084 71.076C167.186 71.1732 167.265 71.2911 167.317 71.4218C167.37 71.5525 167.393 71.6929 167.386 71.8334C167.379 71.9739 167.341 72.1113 167.276 72.2361C167.211 72.3608 167.12 72.4702 167.009 72.5566V72.5566Z" fill="#8F84FF"/>
+<path id="Vector_29" d="M178.921 67.7293L182.883 69.5095C183.048 69.5841 183.178 69.7214 183.242 69.8913C183.307 70.0612 183.301 70.2497 183.227 70.4154L182.758 71.4567C182.813 71.4817 182.856 71.5275 182.877 71.5841C182.899 71.6406 182.897 71.7034 182.872 71.7587L182.685 72.1752C182.66 72.2303 182.614 72.2733 182.557 72.2947C182.501 72.3162 182.438 72.3144 182.382 72.2898L182.195 72.7063C182.25 72.7313 182.293 72.7771 182.314 72.8336C182.336 72.8902 182.334 72.953 182.309 73.0082L182.122 73.4248C182.097 73.4799 182.051 73.5229 181.994 73.5443C181.938 73.5658 181.875 73.564 181.82 73.5393L179.287 79.1624C179.212 79.3281 179.075 79.4574 178.905 79.5218C178.734 79.5863 178.546 79.5806 178.38 79.5061L174.418 77.7258C174.252 77.6512 174.123 77.5139 174.058 77.344C173.994 77.1742 173.999 76.9856 174.074 76.8199L178.014 68.073C178.089 67.9073 178.226 67.778 178.396 67.7135C178.566 67.649 178.755 67.6547 178.921 67.7293Z" fill="#3F3D56"/>
+<path id="Vector_30" d="M175.137 77.172L178.315 78.6016C178.474 78.6727 178.655 78.678 178.818 78.6164C178.981 78.5548 179.114 78.4313 179.186 78.2727L180.654 75.0116L181.164 73.8812L182.492 70.9307C182.563 70.7719 182.568 70.5916 182.507 70.429C182.445 70.2664 182.321 70.1348 182.163 70.0629L181.164 69.613L178.982 68.6333C178.823 68.5623 178.642 68.5573 178.479 68.6194C178.317 68.6814 178.185 68.8056 178.114 68.9644L176.829 71.8168L175.365 75.0642L174.808 76.3042C174.736 76.4629 174.731 76.6434 174.793 76.806C174.854 76.9687 174.978 77.1003 175.137 77.172Z" fill="#F2F2F2"/>
+<path id="Vector_31" d="M168.497 117.578L171.167 117.578L172.437 107.29L168.496 107.29L168.497 117.578Z" fill="#FFB8B8"/>
+<path id="Vector_32" d="M167.814 116.707L173.073 116.707H173.074C173.514 116.707 173.949 116.794 174.356 116.962C174.763 117.13 175.132 117.377 175.443 117.687C175.755 117.998 176.001 118.367 176.17 118.773C176.338 119.18 176.425 119.615 176.425 120.054V120.163L167.815 120.164L167.814 116.707Z" fill="#2F2E41"/>
+<path id="Vector_33" d="M175.467 116.925L178.138 116.925L179.408 106.637L175.467 106.637L175.467 116.925Z" fill="#FFB8B8"/>
+<path id="Vector_34" d="M174.785 116.054L180.044 116.054H180.044C180.484 116.054 180.92 116.14 181.327 116.308C181.733 116.477 182.103 116.723 182.414 117.034C182.725 117.345 182.972 117.714 183.141 118.12C183.309 118.526 183.396 118.962 183.396 119.401V119.51L174.785 119.51L174.785 116.054Z" fill="#2F2E41"/>
+<path id="Vector_35" d="M156.518 93.4361C157.087 95.1206 158.166 96.5868 159.606 97.6318C161.046 98.6768 162.776 99.2488 164.555 99.2688L164.69 99.271C166.069 99.3101 167.688 98.8663 169.275 98.2289C172.412 96.9692 175.424 94.9524 176.224 94.3977L174.869 107.405L174.32 112.679C174.306 112.816 174.321 112.953 174.364 113.084C174.406 113.214 174.476 113.334 174.568 113.436C174.66 113.538 174.772 113.619 174.897 113.675C175.023 113.731 175.159 113.76 175.296 113.76H178.678C178.895 113.76 179.106 113.689 179.278 113.557C179.45 113.424 179.573 113.239 179.628 113.029L185.213 91.7848C185.38 91.1489 185.394 90.4823 185.252 89.8402C185.111 89.1981 184.818 88.5989 184.398 88.0922C183.979 87.5856 183.444 87.186 182.839 86.9265C182.235 86.6671 181.576 86.5553 180.92 86.6004L169.319 87.3945L170.129 84.1572L159.774 83.4697L159.744 83.4915C159.496 83.6721 159.254 83.8613 159.023 84.0593C158.446 84.5469 157.934 85.1071 157.5 85.7258C156.725 86.8359 156.23 88.1173 156.059 89.4602C155.888 90.803 156.046 92.1673 156.518 93.4361Z" fill="#2F2E41"/>
+<path id="Vector_36" d="M156.518 93.4368C157.087 95.1213 158.166 96.5876 159.606 97.6325C161.046 98.6775 162.776 99.2496 164.555 99.2696C166.257 98.4092 167.9 97.436 169.471 96.3565L169.275 98.2296L167.568 114.638C167.554 114.774 167.569 114.912 167.611 115.042C167.654 115.173 167.724 115.293 167.816 115.395C167.908 115.496 168.02 115.578 168.145 115.634C168.271 115.69 168.406 115.719 168.544 115.719H171.926C172.143 115.719 172.354 115.648 172.526 115.515C172.698 115.383 172.821 115.198 172.876 114.988L174.869 107.406L178.461 93.7436C178.628 93.1077 178.642 92.4411 178.5 91.799C178.358 91.1569 178.066 90.5577 177.646 90.051C177.226 89.5443 176.692 89.1448 176.087 88.8853C175.482 88.6259 174.824 88.5141 174.167 88.5592L162.567 89.3533L163.377 86.116L157.5 85.7266C156.725 86.8367 156.23 88.1181 156.059 89.461C155.888 90.8038 156.046 92.1681 156.518 93.4368Z" fill="#2F2E41"/>
+<path id="Vector_37" d="M159.008 84.8101L158.93 84.8007L157.123 75.9276C157.108 75.8505 155.631 68.197 160.159 64.1959L160.238 63.6483C160.258 63.5081 160.308 63.374 160.385 63.2552C160.462 63.1364 160.564 63.0357 160.684 62.96C160.804 62.8844 160.939 62.8356 161.079 62.817C161.22 62.7985 161.363 62.8106 161.498 62.8525L165.764 64.1741C166.005 64.2484 166.209 64.4132 166.331 64.6339C166.454 64.8546 166.486 65.1141 166.422 65.358L166.007 66.9335C166.582 67.608 173.35 75.7473 170.993 82.018L169.937 86.1411L159.008 84.8101Z" fill="#8F84FF"/>
+<path id="Vector_38" d="M176.721 77.8854C176.619 77.9495 176.522 78.0216 176.431 78.1009L165.998 75.3035L165.316 72.7725L161.357 73.3013L162.129 77.8993C162.191 78.2707 162.373 78.612 162.646 78.8718C162.919 79.1316 163.269 79.2959 163.643 79.3401L175.848 80.7801C176.041 81.2015 176.359 81.5539 176.759 81.7906C177.158 82.0272 177.62 82.1368 178.083 82.1048C178.546 82.0728 178.989 81.9007 179.352 81.6114C179.714 81.3221 179.981 80.9292 180.114 80.4852C180.248 80.0411 180.244 79.5669 180.101 79.1255C179.959 78.6842 179.685 78.2966 179.317 78.0144C178.948 77.7321 178.502 77.5686 178.039 77.5456C177.575 77.5226 177.115 77.6411 176.721 77.8854H176.721Z" fill="#FFB8B8"/>
+<path id="Vector_39" d="M165.597 75.2624L160.687 75.8941C160.548 75.9121 160.406 75.8998 160.271 75.858C160.137 75.8163 160.013 75.746 159.908 75.6521C159.803 75.5582 159.72 75.4428 159.663 75.3138C159.607 75.1849 159.58 75.0453 159.582 74.9046L159.676 69.9759C159.588 69.2615 159.787 68.5413 160.23 67.9733C160.672 67.4054 161.323 67.036 162.038 66.9461C162.753 66.8562 163.474 67.0532 164.044 67.4939C164.614 67.9346 164.986 68.5831 165.077 69.297L166.415 74.0255C166.454 74.1609 166.462 74.3029 166.44 74.4419C166.419 74.5809 166.367 74.7137 166.29 74.831C166.212 74.9484 166.11 75.0477 165.991 75.1222C165.871 75.1966 165.737 75.2444 165.597 75.2624Z" fill="#8F84FF"/>
+<path id="Vector_40" d="M164.215 61.6478C167.17 61.6478 169.565 59.2555 169.565 56.3044C169.565 53.3533 167.17 50.9609 164.215 50.9609C161.26 50.9609 158.865 53.3533 158.865 56.3044C158.865 59.2555 161.26 61.6478 164.215 61.6478Z" fill="#FFB8B8"/>
+<path id="Vector_41" d="M163.934 56.7515L163.265 55.5332C161.996 60.6964 164.237 64.9694 164.237 64.9694L155.539 60.9226L155.622 59.4867L154.761 60.4623L153.525 59.7816L153.361 58.8503L152.428 59.0813L155.835 52.9054C159.142 47.0284 163.95 49.2722 163.95 49.2722C171.598 48.909 170.664 56.4463 170.664 56.4463L163.934 56.7515Z" fill="#2F2E41"/>
+<path id="Vector_42" d="M103.036 96.5712C104.269 95.7814 102.769 91.2461 99.6852 86.4413C96.6014 81.6365 93.1016 78.3817 91.8681 79.1715C90.6347 79.9613 92.1347 84.4966 95.2185 89.3014C98.3023 94.1062 101.802 97.361 103.036 96.5712Z" fill="#3F3D56"/>
+</g>
+<defs>
+<clipPath id="clip0_2650_135967">
+<rect width="214" height="166" fill="white"/>
+</clipPath>
+</defs>
+</svg>

@xen-orchestra/lite/src/assets/server-status.svg

@@ -0,0 +1,346 @@
+<svg width="345" height="254" viewBox="0 0 345 254" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#clip0_2254_118640)">
+    <path opacity="0.1"
+          d="M112.532 161.16C123.943 156.653 141.854 155.734 158.158 156.095C209.369 157.221 255.596 168.175 295.58 180.566C310.056 185.053 324.307 189.888 333.704 196.065C352.831 208.64 347.157 226.06 320.561 236.419C311.511 239.945 300.541 242.656 289.278 245.039C269.249 249.3 247.65 252.717 224.921 253.701C208.715 254.394 192.307 253.829 176.197 252.861C131.179 250.146 86.9952 244.182 49.9595 233.931C33.7148 229.444 18.405 223.864 11.7176 216.6C5.03021 209.336 9.30546 200.139 25.8933 195.839C32.7572 194.063 40.9546 193.259 48.9854 192.507C60.8044 191.398 72.813 190.301 83.4783 188.046C94.4965 185.716 107.541 181.209 105.361 176.052C103.011 170.518 101.135 165.66 112.532 161.16Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M164.531 9.89007L163.286 82.4315C163.286 82.4315 208.365 82.4315 246.718 94.9375L247.467 21.6346C247.467 21.6346 185.95 6.88994 164.531 9.89007Z"
+          fill="black"/>
+    <path
+      d="M163.878 8.90472L162.632 81.4461C162.632 81.4461 207.712 81.4461 246.065 93.9521L246.813 20.6492C246.813 20.6492 185.296 5.90459 163.878 8.90472Z"
+      fill="#F5F5FB"/>
+    <path opacity="0.1"
+          d="M145.332 9.83393L146.577 82.3753C146.577 82.3753 101.498 82.3754 63.1447 94.8814L62.3962 21.5981C62.3962 21.5981 123.913 6.8338 145.332 9.83393Z"
+          fill="black"/>
+    <path
+      d="M145.986 8.84956L147.231 81.391C147.231 81.391 102.151 81.391 63.7985 93.897L63.05 20.6137C63.05 20.6137 124.567 5.84943 145.986 8.84956Z"
+      fill="#F5F5FB"/>
+    <path opacity="0.1"
+          d="M258.348 31.9775V103.761C258.348 103.761 273.056 102.011 303.924 140.278L306.667 68.4944C306.667 68.4944 274.537 33.7303 258.348 31.9775Z"
+          fill="black"/>
+    <path
+      d="M257.694 31.3213V103.104C257.694 103.104 272.403 101.355 303.271 139.621L306.013 67.8382C306.013 67.8382 273.883 33.0741 257.694 31.3213Z"
+      fill="#F5F5FB"/>
+    <path opacity="0.1"
+          d="M52.3162 34.1074V105.894C52.3162 105.894 37.6078 104.144 6.73976 142.411L4.00073 70.6276C4.00073 70.6276 36.1271 35.8635 52.3162 34.1074Z"
+          fill="black"/>
+    <path
+      d="M52.9697 33.123V104.91C52.9697 104.91 38.2613 103.16 7.39333 141.426L4.6543 69.6432C4.6543 69.6432 36.7807 34.8791 52.9697 33.123Z"
+      fill="#F5F5FB"/>
+    <path
+      d="M218.358 154.169C218.358 156.614 202.894 170.745 167.695 170.745C132.497 170.745 113.438 157.107 113.438 154.661C113.438 152.216 133.15 158.272 168.349 158.272C203.548 158.272 218.358 151.72 218.358 154.169Z"
+      fill="#F7F7FD"/>
+    <path opacity="0.1"
+          d="M103.322 120.488C105.39 120.488 107.067 120.257 107.067 119.972C107.067 119.688 105.39 119.457 103.322 119.457C101.253 119.457 99.5759 119.688 99.5759 119.972C99.5759 120.257 101.253 120.488 103.322 120.488Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M88.976 121.949C91.0447 121.949 92.7217 121.718 92.7217 121.433C92.7217 121.149 91.0447 120.918 88.976 120.918C86.9072 120.918 85.2302 121.149 85.2302 121.433C85.2302 121.718 86.9072 121.949 88.976 121.949Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M72.0841 119.972C74.1528 119.972 75.8299 119.741 75.8299 119.457C75.8299 119.172 74.1528 118.941 72.0841 118.941C70.0154 118.941 68.3384 119.172 68.3384 119.457C68.3384 119.741 70.0154 119.972 72.0841 119.972Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M94.7187 125.96C96.1881 125.96 97.3793 125.795 97.3793 125.592C97.3793 125.389 96.1881 125.225 94.7187 125.225C93.2493 125.225 92.0581 125.389 92.0581 125.592C92.0581 125.795 93.2493 125.96 94.7187 125.96Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M79.8305 125.592C81.2999 125.592 82.4911 125.427 82.4911 125.224C82.4911 125.021 81.2999 124.856 79.8305 124.856C78.3611 124.856 77.1699 125.021 77.1699 125.224C77.1699 125.427 78.3611 125.592 79.8305 125.592Z"
+          fill="#2CA878"/>
+    <path
+      d="M88.8974 121.318C88.8974 121.318 94.1467 104.03 88.0737 97.1072C83.5305 91.9276 78.3662 92.5348 76.0782 93.1913C75.4806 93.351 74.9247 93.6392 74.449 94.0359C73.9732 94.4327 73.589 94.9284 73.3229 95.489C72.5155 97.2385 72.6691 100.084 78.3629 103.393C87.9038 108.94 88.4954 116.552 88.4954 116.552L88.8974 121.318Z"
+      fill="#2CA878"/>
+    <path d="M76.8889 95.6396C76.8889 95.6396 92.3687 100.501 88.8975 121.318" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M85.9297 97.3828C85.9297 97.3828 83.7986 98.8238 84.4752 100.993" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M78.4414 98.6663C78.4414 98.6663 79.7488 97.3337 81.3275 98.0689" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M84.5764 105.359C84.5764 105.359 86.8644 104.194 87.456 105.655" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M90.2213 107.791C90.2213 107.791 88.5021 107.653 88.4727 108.477" stroke="#565987" stroke-miterlimit="10"/>
+    <path
+      d="M89.11 121.456C89.11 121.456 82.9587 108.891 81.2656 109.167C80.4648 109.298 80.0954 110.089 79.9255 110.887C79.7152 111.916 79.8295 112.985 80.2523 113.946C81.1381 115.955 83.4816 119.779 89.11 121.456Z"
+      fill="#2CA878"/>
+    <path d="M81.3079 111.55C81.3079 111.55 87.7632 120.951 89.0118 121.364" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M80.7229 113.017H82.2297" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M82.5271 116.457L84.887 116.559" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M83.9652 113.706L83.707 114.94" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M86.4754 117.465L86.4297 118.587" stroke="#565987" stroke-miterlimit="10"/>
+    <path
+      d="M88.927 121.456C88.927 121.456 95.0751 108.891 96.7715 109.167C97.5755 109.298 97.9449 110.089 98.1116 110.887C98.3203 111.916 98.2061 112.985 97.7847 113.946C96.899 115.955 94.5554 119.779 88.927 121.456Z"
+      fill="#2CA878"/>
+    <path d="M96.719 111.55C96.719 111.55 90.2636 120.951 89.0183 121.364" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M97.3139 113.017H95.8071" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M95.5096 116.457L93.1465 116.559" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M94.0715 113.706L94.3298 114.94" stroke="#565987" stroke-miterlimit="10"/>
+    <path d="M91.5613 117.465L91.607 118.587" stroke="#565987" stroke-miterlimit="10"/>
+    <path
+      d="M78.3662 124.39C78.1986 124.253 78.0766 124.067 78.0165 123.858C77.9889 123.754 77.9983 123.643 78.043 123.545C78.0877 123.447 78.165 123.367 78.2616 123.32C78.4839 123.231 78.7257 123.389 78.9153 123.546C78.993 123.638 79.089 123.713 79.197 123.766C79.3051 123.818 79.4229 123.847 79.5429 123.852C79.4205 123.74 79.3288 123.599 79.2766 123.441C79.2245 123.284 79.2138 123.115 79.2454 122.952C79.2581 122.885 79.2874 122.822 79.3304 122.768C79.4546 122.634 79.6802 122.693 79.8305 122.798C80.3044 123.126 80.4352 123.783 80.4385 124.364C80.464 124.146 80.464 123.925 80.4385 123.707C80.4287 123.599 80.4457 123.491 80.4879 123.391C80.5301 123.292 80.5962 123.204 80.6803 123.136C80.7927 123.075 80.9188 123.045 81.0464 123.047C81.1524 123.032 81.2605 123.04 81.3635 123.069C81.4666 123.098 81.5623 123.149 81.6445 123.218C81.7227 123.326 81.7628 123.458 81.7587 123.591C81.7545 123.725 81.7063 123.854 81.6217 123.957C81.4453 124.156 81.2364 124.324 81.0039 124.452C80.8261 124.557 80.6751 124.702 80.5627 124.876C80.5485 124.899 80.5375 124.925 80.53 124.951H79.1899C78.8925 124.8 78.6157 124.612 78.3662 124.39Z"
+      fill="#2CA878"/>
+    <path
+      d="M101.802 119.329C101.634 119.193 101.512 119.009 101.452 118.801C101.424 118.696 101.433 118.585 101.478 118.486C101.523 118.387 101.6 118.307 101.697 118.259C101.817 118.236 101.94 118.245 102.055 118.285C102.17 118.326 102.272 118.396 102.351 118.489C102.428 118.581 102.524 118.656 102.632 118.708C102.74 118.76 102.858 118.788 102.978 118.791C102.856 118.68 102.764 118.538 102.712 118.381C102.66 118.223 102.649 118.055 102.681 117.892C102.692 117.825 102.722 117.762 102.766 117.711C102.89 117.577 103.116 117.632 103.266 117.737C103.74 118.066 103.871 118.722 103.874 119.306C103.899 119.088 103.899 118.868 103.874 118.65C103.864 118.542 103.881 118.433 103.923 118.334C103.966 118.234 104.032 118.147 104.116 118.079C104.228 118.017 104.354 117.988 104.482 117.993C104.588 117.977 104.696 117.984 104.799 118.014C104.903 118.043 104.998 118.094 105.08 118.164C105.158 118.272 105.199 118.402 105.195 118.536C105.19 118.669 105.142 118.797 105.057 118.899C104.881 119.099 104.672 119.266 104.439 119.395C104.262 119.501 104.111 119.646 103.998 119.818C103.984 119.842 103.973 119.867 103.965 119.894H102.625C102.327 119.743 102.05 119.553 101.802 119.329Z"
+      fill="#2CA878"/>
+    <path
+      d="M93.9899 124.39C93.8222 124.253 93.7003 124.067 93.6402 123.858C93.6133 123.754 93.6229 123.643 93.6676 123.545C93.7122 123.447 93.7891 123.368 93.8853 123.32C94.1108 123.231 94.3494 123.389 94.539 123.546C94.6168 123.638 94.7128 123.713 94.8208 123.765C94.9289 123.818 95.0466 123.847 95.1666 123.852C95.0445 123.74 94.9532 123.598 94.9017 123.441C94.8501 123.283 94.84 123.115 94.8724 122.952C94.8824 122.885 94.9107 122.821 94.9541 122.768C95.0783 122.634 95.3038 122.693 95.4542 122.798C95.9281 123.126 96.0621 123.783 96.0654 124.364C96.0892 124.146 96.0892 123.925 96.0654 123.707C96.0557 123.599 96.0727 123.491 96.1149 123.391C96.1571 123.292 96.2232 123.204 96.3073 123.136C96.4613 123.065 96.6312 123.035 96.8002 123.049C96.9692 123.064 97.1316 123.122 97.2715 123.218C97.3507 123.326 97.3915 123.457 97.3874 123.591C97.3832 123.725 97.3344 123.854 97.2486 123.957C97.0729 124.157 96.8639 124.324 96.6309 124.452C96.4544 124.559 96.3037 124.704 96.1896 124.876C96.1768 124.9 96.1658 124.925 96.1569 124.951H94.8201C94.5201 124.802 94.241 124.613 93.9899 124.39Z"
+      fill="#2CA878"/>
+    <path
+      d="M71.8292 114.162C71.8292 114.162 71.3291 114.819 72.0612 115.803C72.7934 116.788 73.4013 117.638 73.1562 118.259C73.1562 118.259 72.0482 116.411 71.1493 116.384C70.2505 116.358 70.8486 115.272 71.8292 114.162Z"
+      fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M71.8292 114.162C71.7854 114.226 71.7512 114.295 71.7279 114.369C70.8487 115.403 70.3813 116.371 71.2245 116.394C72.0123 116.417 72.9569 117.832 73.1857 118.186C73.1789 118.214 73.1702 118.242 73.1595 118.268C73.1595 118.268 72.0515 116.42 71.1526 116.394C70.2538 116.368 70.8487 115.272 71.8292 114.162Z"
+          fill="black"/>
+    <path
+      d="M70.9075 115C70.9075 115.233 70.9336 115.42 70.9663 115.42C70.999 115.42 71.0219 115.233 71.0219 115C71.0219 114.767 70.9925 114.878 70.9598 114.878C70.9271 114.878 70.9075 114.77 70.9075 115Z"
+      fill="#FFD037"/>
+    <path
+      d="M70.5873 115.278C70.7899 115.39 70.9664 115.455 70.9828 115.426C70.9991 115.396 70.8455 115.285 70.6559 115.176C70.4663 115.068 70.5317 115.144 70.5186 115.176C70.5056 115.209 70.3846 115.183 70.5873 115.278Z"
+      fill="#FFD037"/>
+    <path
+      d="M74.4897 114.162C74.4897 114.162 74.9931 114.819 74.2577 115.803C73.5222 116.788 72.9208 117.638 73.166 118.259C73.166 118.259 74.2707 116.411 75.1729 116.384C76.075 116.358 75.4801 115.272 74.4897 114.162Z"
+      fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M74.4897 114.162C74.5336 114.226 74.5678 114.295 74.5911 114.369C75.4703 115.403 75.9377 116.371 75.0944 116.394C74.3067 116.417 73.3654 117.832 73.1333 118.186C73.14 118.214 73.1488 118.242 73.1595 118.268C73.1595 118.268 74.2642 116.42 75.1663 116.394C76.0684 116.368 75.4801 115.272 74.4897 114.162Z"
+          fill="black"/>
+    <path
+      d="M75.4247 115C75.4247 115.233 75.4018 115.42 75.3691 115.42C75.3364 115.42 75.3103 115.233 75.3103 115C75.3103 114.767 75.343 114.878 75.3757 114.878C75.4084 114.878 75.4247 114.77 75.4247 115Z"
+      fill="#FFD037"/>
+    <path
+      d="M75.7514 115.278C75.5488 115.39 75.3723 115.455 75.3592 115.426C75.3461 115.396 75.4932 115.285 75.6861 115.176C75.8789 115.068 75.8103 115.144 75.8266 115.176C75.843 115.209 75.9443 115.183 75.7514 115.278Z"
+      fill="#FFD037"/>
+    <path
+      d="M75.2646 118.183C75.2646 118.183 73.8591 118.141 73.4374 117.839C73.0158 117.537 71.2802 117.182 71.1756 117.658C71.071 118.134 69.0674 120.071 70.6494 120.084C72.2314 120.097 74.3298 119.834 74.7514 119.578C75.173 119.322 75.2646 118.183 75.2646 118.183Z"
+      fill="#A8A8A8"/>
+    <path opacity="0.2"
+          d="M70.6231 119.913C72.2051 119.913 74.3035 119.667 74.7251 119.407C75.052 119.21 75.1729 118.505 75.2154 118.18H75.2645C75.2645 118.18 75.1729 119.315 74.7513 119.575C74.3297 119.834 72.2345 120.093 70.6493 120.08C70.195 120.08 70.0348 119.913 70.0446 119.67C70.1067 119.821 70.2832 119.91 70.6231 119.913Z"
+          fill="black"/>
+    <path opacity="0.1"
+          d="M63.7919 164.62C70.0595 164.62 75.1403 163.866 75.1403 162.936C75.1403 162.006 70.0595 161.252 63.7919 161.252C57.5244 161.252 52.4436 162.006 52.4436 162.936C52.4436 163.866 57.5244 164.62 63.7919 164.62Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M95.4902 178.563C101.758 178.563 106.839 177.809 106.839 176.879C106.839 175.949 101.758 175.195 95.4902 175.195C89.2227 175.195 84.1418 175.949 84.1418 176.879C84.1418 177.809 89.2227 178.563 95.4902 178.563Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M48.8613 194.427C55.1288 194.427 60.2096 193.673 60.2096 192.743C60.2096 191.813 55.1288 191.06 48.8613 191.06C42.5938 191.06 37.5129 191.813 37.5129 192.743C37.5129 193.673 42.5938 194.427 48.8613 194.427Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M289.311 229.274C295.578 229.274 300.659 228.52 300.659 227.59C300.659 226.66 295.578 225.906 289.311 225.906C283.043 225.906 277.962 226.66 277.962 227.59C277.962 228.52 283.043 229.274 289.311 229.274Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M160.514 189.687C164.664 189.687 168.029 189.309 168.029 188.844C168.029 188.378 164.664 188 160.514 188C156.364 188 153 188.378 153 188.844C153 189.309 156.364 189.687 160.514 189.687Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M268.049 146.36C272.199 146.36 275.563 145.982 275.563 145.516C275.563 145.051 272.199 144.673 268.049 144.673C263.899 144.673 260.535 145.051 260.535 145.516C260.535 145.982 263.899 146.36 268.049 146.36Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M209.539 210.367C213.689 210.367 217.053 209.989 217.053 209.523C217.053 209.057 213.689 208.68 209.539 208.68C205.389 208.68 202.025 209.057 202.025 209.523C202.025 209.989 205.389 210.367 209.539 210.367Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M144.678 204.799C148.828 204.799 152.193 204.422 152.193 203.956C152.193 203.49 148.828 203.112 144.678 203.112C140.528 203.112 137.164 203.49 137.164 203.956C137.164 204.422 140.528 204.799 144.678 204.799Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M83.8935 202.61C88.0436 202.61 91.4078 202.232 91.4078 201.766C91.4078 201.301 88.0436 200.923 83.8935 200.923C79.7434 200.923 76.3792 201.301 76.3792 201.766C76.3792 202.232 79.7434 202.61 83.8935 202.61Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M68.0542 217.722C72.2042 217.722 75.5685 217.345 75.5685 216.879C75.5685 216.413 72.2042 216.035 68.0542 216.035C63.9041 216.035 60.5398 216.413 60.5398 216.879C60.5398 217.345 63.9041 217.722 68.0542 217.722Z"
+          fill="#2CA878"/>
+    <g opacity="0.1">
+      <path opacity="0.1"
+            d="M166.303 100.898C193.763 100.898 216.024 90.9207 216.024 78.6134C216.024 66.3061 193.763 56.3291 166.303 56.3291C138.843 56.3291 116.582 66.3061 116.582 78.6134C116.582 90.9207 138.843 100.898 166.303 100.898Z"
+            fill="black"/>
+      <path opacity="0.1"
+            d="M216.887 86.5803C214.687 98.2001 192.951 107.322 166.457 107.322C139.73 107.322 117.844 98.0392 115.968 86.2783H115.781V105.215C124.521 114.386 143.871 120.763 166.332 120.763C188.794 120.763 208.143 114.386 216.887 105.215V86.5803Z"
+            fill="black"/>
+      <path opacity="0.1"
+            d="M216.887 109.623C214.687 121.239 192.951 130.364 166.457 130.364C139.73 130.364 117.844 121.082 115.968 109.317H115.781V128.257C124.521 137.428 143.871 143.802 166.332 143.802C188.794 143.802 208.143 137.428 216.887 128.257V109.623Z"
+            fill="black"/>
+      <path opacity="0.1"
+            d="M216.887 134.966C214.687 146.586 192.951 155.708 166.457 155.708C139.73 155.708 117.844 146.428 115.968 134.664H115.781V155.087C115.78 155.522 115.869 155.953 116.043 156.352C116.216 156.751 116.47 157.109 116.788 157.405C125.94 165.844 144.698 169.149 166.332 169.149C187.967 169.149 206.715 165.844 215.88 157.405C216.198 157.109 216.452 156.751 216.625 156.352C216.799 155.953 216.888 155.522 216.887 155.087V134.966Z"
+            fill="black"/>
+    </g>
+    <path
+      d="M166.303 99.5853C193.763 99.5853 216.024 89.6082 216.024 77.3009C216.024 64.9936 193.763 55.0166 166.303 55.0166C138.843 55.0166 116.582 64.9936 116.582 77.3009C116.582 89.6082 138.843 99.5853 166.303 99.5853Z"
+      fill="#2CA878"/>
+    <path
+      d="M216.887 85.2678C214.687 96.8876 192.951 106.009 166.457 106.009C139.73 106.009 117.844 96.7267 115.968 84.9658H115.781V103.902C124.521 113.073 143.871 119.451 166.332 119.451C188.794 119.451 208.143 113.073 216.887 103.902V85.2678Z"
+      fill="#2CA878"/>
+    <path
+      d="M216.887 108.31C214.687 119.927 192.951 129.052 166.457 129.052C139.73 129.052 117.844 119.769 115.968 108.005H115.781V126.944C124.521 136.115 143.871 142.49 166.332 142.49C188.794 142.49 208.143 136.115 216.887 126.944V108.31Z"
+      fill="#2CA878"/>
+    <path
+      d="M216.887 133.654C214.687 145.273 192.951 154.395 166.457 154.395C139.73 154.395 117.844 145.116 115.968 133.352H115.781V153.775C115.78 154.21 115.869 154.641 116.043 155.039C116.216 155.438 116.47 155.797 116.788 156.092C125.94 164.531 144.698 167.837 166.332 167.837C187.967 167.837 206.715 164.531 215.88 156.092C216.198 155.797 216.452 155.438 216.625 155.039C216.799 154.641 216.888 154.21 216.887 153.775V133.654Z"
+      fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M239.593 190.876C249.882 190.876 258.224 189.368 258.224 187.508C258.224 185.648 249.882 184.141 239.593 184.141C229.304 184.141 220.962 185.648 220.962 187.508C220.962 189.368 229.304 190.876 239.593 190.876Z"
+          fill="#2CA878"/>
+    <path
+      d="M229.134 144.597C230.075 145.155 231.553 145.52 233.412 144.318L233.396 146.98C233.527 148.805 235.776 155.459 235.776 155.459L237.361 160.931C238.499 164.798 239.085 168.807 239.103 172.839C239.103 174.172 239.227 175.551 239.609 176.588C240.456 178.886 239.283 181.84 238.769 182.93C237.911 183.221 237.038 183.467 236.155 183.668C236.076 183.687 235.998 183.711 235.923 183.74V183.724C235.923 183.724 233.543 184.672 232.484 184.541C231.696 184.446 231.203 185.434 231.83 186.159C231.318 186.316 230.784 186.387 230.248 186.369C229.189 186.238 228.66 188.063 230.644 188.585C232.628 189.107 243.868 188.585 243.868 188.585C244.184 188.426 244.438 188.167 244.591 187.847C244.743 187.527 244.786 187.166 244.712 186.819L246.117 186.76C246.117 186.76 248.101 185.848 246.117 183.369L246.009 183.448L245.588 182.194V180.504C245.588 180.504 248.101 168.359 247.307 166.938C246.513 165.516 246.091 158.183 246.091 158.183L246.369 150.24C247.085 148.756 247.451 146.426 247.637 144.604C247.908 143.736 248.078 142.839 248.144 141.932C248.176 141.502 248.202 141.056 248.219 140.59C248.23 139.567 248.066 138.55 247.735 137.583C248.632 136.246 249.635 134.984 250.732 133.808C251.189 133.382 251.536 132.85 251.744 132.26C251.951 131.669 252.014 131.037 251.925 130.417L251.272 125.983L249.683 118.433C249.882 116.336 249.448 115.128 248.964 114.445C249.078 113.766 249.186 113.09 249.268 112.407C249.618 109.448 249.461 106.45 248.804 103.544C248.575 102.533 248.261 101.493 247.552 100.725C246.751 99.8515 245.45 99.323 245.15 98.184C245.107 97.8937 245.046 97.6064 244.967 97.324C244.676 96.5789 243.761 96.3065 242.956 96.208C241.525 96.0341 239.456 95.9028 238.08 96.4673C236.872 97.0036 235.878 97.9303 235.256 99.0998C234.946 99.5804 234.829 100.161 234.929 100.725C234.978 100.92 235.054 101.108 235.154 101.283C234.696 102.53 234.746 103.908 235.293 105.118C235.84 106.329 236.84 107.274 238.077 107.749C238.109 107.851 238.139 107.949 238.162 108.044C238.222 108.278 238.266 108.516 238.292 108.757C238.266 109.216 238.237 109.679 238.217 110.142L238.168 110.329C237.03 110.835 235.921 111.402 234.844 112.029C235.635 113.204 234.71 118.161 234.71 118.161C232.726 119.333 230.745 122.333 232.86 125.464C234.975 128.596 233.785 131.983 233.785 131.983L233.458 137.084L233.393 138.105H233.416L233.393 138.492H233.448V138.909C232.52 139.254 231.16 139.943 230.353 141.223C229.97 141.851 229.505 142.424 228.97 142.927C228.846 143.034 228.749 143.17 228.687 143.323C228.626 143.475 228.603 143.641 228.619 143.805C228.635 143.969 228.69 144.127 228.78 144.264C228.869 144.402 228.991 144.517 229.134 144.597ZM245.101 131.048C245.021 130.165 245.184 129.277 245.571 128.481H246.506C246.534 128.688 246.572 128.894 246.62 129.098C246.889 130.263 245.816 130.811 245.101 131.048Z"
+      fill="url(#paint0_linear_2254_118640)"/>
+    <path
+      d="M245.362 181.597L245.872 183.129L244.218 184.79L238.747 186.084L234.802 185.7L235.056 184.295C235.132 183.992 235.288 183.717 235.509 183.498C235.73 183.279 236.006 183.125 236.308 183.054C237.943 182.673 241.022 181.8 241.672 180.589L245.362 181.597Z"
+      fill="#DB8B8B"/>
+    <path opacity="0.1"
+          d="M245.362 181.597L245.872 183.129L244.218 184.79L238.747 186.084L234.802 185.7L235.056 184.295C235.132 183.992 235.288 183.717 235.509 183.498C235.73 183.279 236.006 183.125 236.308 183.054C237.943 182.673 241.022 181.8 241.672 180.589L245.362 181.597Z"
+          fill="black"/>
+    <path
+      d="M236.073 185.302L236.838 184.281L236.073 183.096C236.073 183.096 233.785 184.025 232.765 183.897C231.745 183.769 231.239 185.558 233.148 186.07C235.056 186.582 245.872 186.07 245.872 186.07C245.872 186.07 247.781 185.174 245.872 182.745L244.218 184.025C244.218 184.025 241.417 185.558 240.018 185.302H236.073Z"
+      fill="#C17174"/>
+    <path
+      d="M232.641 187.475L236.586 187.859L242.058 186.579L243.711 184.918L243.577 184.514L243.388 183.943L243.201 183.385L239.505 182.364C239.317 182.67 239.061 182.928 238.756 183.116C237.557 183.94 235.406 184.534 234.141 184.829C234.088 184.842 234.035 184.859 233.984 184.879C233.738 184.957 233.514 185.093 233.331 185.276C233.11 185.493 232.953 185.768 232.879 186.07L232.641 187.475Z"
+      fill="#DB8B8B"/>
+    <path opacity="0.1"
+          d="M232.641 187.475L236.586 187.859L242.058 186.579L243.711 184.918L243.577 184.515L242.058 185.686C242.058 185.686 239.256 187.219 237.857 186.963H233.909L234.674 185.943L233.988 184.879C233.741 184.958 233.517 185.094 233.334 185.276C233.113 185.494 232.957 185.769 232.883 186.071L232.641 187.475Z"
+          fill="black"/>
+    <path
+      d="M233.909 187.091L234.674 186.07L233.909 184.885C233.909 184.885 231.621 185.814 230.601 185.686C229.582 185.558 229.075 187.347 230.984 187.859C232.893 188.371 243.708 187.859 243.708 187.859C243.708 187.859 245.617 186.963 243.708 184.537L242.054 185.814C242.054 185.814 239.253 187.347 237.854 187.091H233.909Z"
+      fill="#C17174"/>
+    <path
+      d="M237.089 112.974C237.089 112.974 243.198 113.63 242.319 111.057C242.068 110.332 242.003 109.555 242.129 108.799C242.287 107.862 242.656 106.973 243.208 106.202L237.482 107.095C237.826 107.671 238.088 108.293 238.259 108.943C238.93 111.654 237.089 112.974 237.089 112.974Z"
+      fill="#DB8B8B"/>
+    <path
+      d="M247.526 142.1C247.526 142.1 247.398 147.594 246.127 150.279L245.872 158.075C245.872 158.075 246.251 165.231 247.016 166.636C247.781 168.041 245.362 179.926 245.362 179.926V181.971C245.362 181.971 241.289 183.504 240.132 181.715L241.276 166.508L240.766 145.425L247.526 142.1Z"
+      fill="#474463"/>
+    <path opacity="0.1"
+          d="M247.526 142.1C247.526 142.1 247.398 147.594 246.127 150.279L245.872 158.075C245.872 158.075 246.251 165.231 247.016 166.636C247.781 168.041 245.362 179.926 245.362 179.926V181.971C245.362 181.971 241.289 183.504 240.132 181.715L241.276 166.508L240.766 145.425L247.526 142.1Z"
+          fill="black"/>
+    <path
+      d="M250.069 124.476L250.834 126.521L251.487 130.863C251.572 131.469 251.513 132.087 251.313 132.665C251.114 133.243 250.78 133.765 250.34 134.188C248.814 135.721 246.777 138.915 246.777 138.915L244.362 131.631C244.362 131.631 246.777 131.247 246.395 129.586C246.012 127.925 246.143 124.86 246.143 124.86L250.069 124.476Z"
+      fill="#FF748E"/>
+    <path opacity="0.05"
+          d="M250.098 124.446L250.86 126.491L251.514 130.837C251.6 131.442 251.541 132.059 251.342 132.637C251.143 133.215 250.81 133.737 250.37 134.159C248.84 135.692 246.807 138.889 246.807 138.889L244.372 131.595C244.372 131.595 246.791 131.211 246.408 129.55C246.026 127.89 246.153 124.82 246.153 124.82L250.098 124.446Z"
+          fill="black"/>
+    <path opacity="0.1"
+          d="M238.76 183.129C240.394 185.709 242.934 184.245 243.385 183.956L243.198 183.398L239.505 182.364C239.32 182.675 239.065 182.937 238.76 183.129Z"
+          fill="black"/>
+    <path
+      d="M233.654 147.095C233.782 148.884 235.942 155.4 235.942 155.4L237.469 160.763C238.561 164.556 239.125 168.482 239.145 172.429C239.107 173.672 239.272 174.913 239.632 176.102C240.652 178.915 238.616 182.746 238.616 182.746C240.397 185.943 243.45 183.77 243.45 183.77V181.725C243.45 181.725 245.869 170.607 245.231 168.434C244.594 166.261 244.342 160.386 244.342 160.386V149.777C246.38 147.738 247.619 145.03 247.833 142.149C247.863 141.729 247.889 141.289 247.905 140.836C248.006 137.954 246.042 134.573 245.29 133.368C245.107 133.076 244.99 132.912 244.99 132.912L233.756 137.389H233.729V137.832V138.797L233.654 147.095Z"
+      fill="#474463"/>
+    <path opacity="0.1"
+          d="M237.472 107.095C237.816 107.671 238.078 108.293 238.25 108.943C238.872 109.18 239.535 109.289 240.199 109.264C240.864 109.24 241.517 109.081 242.12 108.799C242.277 107.862 242.646 106.973 243.198 106.202L237.472 107.095Z"
+          fill="black"/>
+    <path
+      d="M240.018 109.012C242.758 109.012 244.98 106.781 244.98 104.03C244.98 101.278 242.758 99.0469 240.018 99.0469C237.278 99.0469 235.056 101.278 235.056 104.03C235.056 106.781 237.278 109.012 240.018 109.012Z"
+      fill="#DB8B8B"/>
+    <path opacity="0.1"
+          d="M233.654 138.787H233.71C239.044 139.89 245.745 134.307 245.745 134.307C245.565 134.002 245.41 133.684 245.28 133.355C245.097 133.063 244.98 132.898 244.98 132.898L233.746 137.376L233.716 137.822L233.654 138.787Z"
+          fill="black"/>
+    <path
+      d="M235.057 112.846C235.057 112.846 242.182 108.5 244.47 110.289L247.653 114.379C247.653 114.379 249.69 115.019 249.311 119.122L250.837 126.534L246.261 127.683C246.261 127.683 243.591 130.24 245.754 133.946C245.754 133.946 239.008 139.569 233.661 138.416L234.043 132.413C234.043 132.413 235.187 129.088 233.154 126.022C231.121 122.956 233.027 120.015 234.936 118.866C234.929 118.853 235.818 113.995 235.057 112.846Z"
+      fill="#FF748E"/>
+    <path
+      d="M234.674 138.915C234.674 138.915 232 139.427 230.729 141.472C230.361 142.087 229.913 142.649 229.395 143.143C229.279 143.249 229.189 143.381 229.133 143.528C229.077 143.675 229.056 143.834 229.071 143.991C229.087 144.148 229.139 144.299 229.223 144.432C229.307 144.565 229.421 144.677 229.555 144.758C230.565 145.368 232.209 145.742 234.292 144.026C237.871 141.088 234.674 138.915 234.674 138.915Z"
+      fill="#DB8B8B"/>
+    <path opacity="0.1"
+          d="M238.619 115.275C238.619 115.275 241.162 115.019 241.799 121.662C242.437 128.306 243.453 129.842 243.453 129.842C243.453 129.842 244.091 133.292 242.561 135.337C241.031 137.382 238.109 141.728 238.109 141.728C238.109 141.728 234.929 142.621 234.292 139.43L238.237 132.019C238.237 132.019 238.871 129.461 237.344 127.673C235.818 125.884 234.674 113.995 238.619 115.275Z"
+          fill="black"/>
+    <path
+      d="M238.364 114.892C238.364 114.892 240.907 114.636 241.544 121.283C242.182 127.929 243.198 129.459 243.198 129.459C243.198 129.459 243.852 132.909 242.309 134.954C240.767 136.999 237.871 141.345 237.871 141.345C237.871 141.345 234.69 142.237 234.053 139.047L237.998 131.635C237.998 131.635 238.635 129.078 237.106 127.289C235.576 125.5 234.419 113.615 238.364 114.892Z"
+      fill="#FF748E"/>
+    <path opacity="0.1"
+          d="M236.263 119.684C236.263 119.684 236.011 123.645 237.155 125.818C238.299 127.991 238.299 130.801 237.155 132.334"
+          fill="black"/>
+    <path opacity="0.1"
+          d="M235.628 114.826C235.628 114.826 236.645 113.805 239.574 113.677C242.502 113.549 243.77 112.656 243.77 112.656"
+          fill="black"/>
+    <path opacity="0.1"
+          d="M242.705 97.5896C243.479 97.6848 244.362 97.9507 244.64 98.6794C244.716 98.9567 244.776 99.2384 244.82 99.5229C245.107 100.639 246.359 101.164 247.13 102.011C247.81 102.766 248.111 103.784 248.333 104.778C248.967 107.626 249.118 110.561 248.781 113.46C248.533 115.577 248.023 117.665 247.882 119.792C247.742 121.919 248 124.161 249.157 125.95C249.657 126.718 250.314 127.394 250.667 128.247C249.938 128.841 248.931 128.927 247.99 128.96C246.901 128.997 245.806 128.997 244.705 128.96C244.129 128.983 243.556 128.862 243.038 128.608C242.672 128.374 242.37 128.05 242.162 127.666C241.535 126.6 241.378 125.316 241.404 124.079C241.43 122.841 241.626 121.61 241.649 120.37C241.714 119.693 241.564 119.013 241.221 118.426C240.905 118.058 240.547 117.727 240.155 117.442C238.792 116.227 238.325 114.284 238.279 112.456C238.233 110.627 238.534 108.799 238.381 106.977C238.322 106.265 238.054 105.408 237.358 105.27C237.138 105.261 236.919 105.233 236.704 105.185C236.145 104.968 236.2 104.177 236.05 103.596C235.87 102.94 235.315 102.438 235.158 101.781C234.792 100.235 236.753 98.3872 238.037 97.8423C239.322 97.2975 241.329 97.4189 242.705 97.5896Z"
+          fill="black"/>
+    <path
+      d="M242.832 97.3331C243.607 97.4283 244.489 97.6942 244.767 98.4261C244.844 98.7023 244.904 98.9829 244.947 99.2664C245.235 100.382 246.487 100.908 247.258 101.755C247.938 102.509 248.238 103.527 248.461 104.522C249.094 107.373 249.245 110.312 248.905 113.213C248.66 115.331 248.15 117.418 248.01 119.548C247.869 121.679 248.127 123.914 249.284 125.703C249.784 126.474 250.441 127.147 250.794 128.001C250.066 128.598 249.059 128.68 248.118 128.713C247.028 128.748 245.933 128.748 244.833 128.713C244.257 128.737 243.684 128.618 243.166 128.365C242.799 128.129 242.498 127.804 242.29 127.42C241.662 126.353 241.505 125.07 241.531 123.832C241.558 122.595 241.754 121.364 241.777 120.126C241.777 119.45 241.737 118.734 241.348 118.183C241.033 117.814 240.676 117.483 240.283 117.198C238.92 115.984 238.452 114.041 238.407 112.212C238.361 110.384 238.662 108.556 238.508 106.734C238.449 106.022 238.181 105.165 237.485 105.027C237.265 105.018 237.046 104.99 236.831 104.942C236.272 104.725 236.328 103.934 236.178 103.353C235.998 102.697 235.442 102.198 235.285 101.538C234.919 99.9919 236.88 98.1439 238.165 97.599C239.449 97.0541 241.466 97.1624 242.832 97.3331Z"
+      fill="#464353"/>
+    <path
+      d="M41.8503 188.007C41.8503 188.007 45.3542 187.899 46.4067 187.144C47.4591 186.389 51.7932 185.486 52.0547 186.697C52.3162 187.909 57.317 192.717 53.3621 192.75C49.4072 192.783 44.1775 192.13 43.1218 191.486C42.0661 190.843 41.8503 188.007 41.8503 188.007Z"
+      fill="#A8A8A8"/>
+    <path opacity="0.2"
+          d="M53.434 192.32C49.4824 192.353 44.2494 191.703 43.197 191.06C42.3962 190.568 42.0759 188.808 41.968 187.994H41.8503C41.8503 187.994 42.0726 190.83 43.1251 191.474C44.1775 192.117 49.4105 192.767 53.3654 192.737C54.5061 192.737 54.8983 192.32 54.8787 191.716C54.7186 192.094 54.2838 192.32 53.434 192.32Z"
+          fill="black"/>
+    <path
+      d="M264.401 141.84C264.401 141.84 266.804 141.764 267.529 141.246C268.255 140.727 271.226 140.11 271.406 140.941C271.586 141.771 275.021 145.073 272.305 145.096C269.589 145.119 266 144.669 265.277 144.229C264.555 143.79 264.401 141.84 264.401 141.84Z"
+      fill="#A8A8A8"/>
+    <path opacity="0.2"
+          d="M272.354 144.808C269.641 144.827 266.049 144.381 265.326 143.941C264.774 143.613 264.555 142.395 264.483 141.837H264.401C264.401 141.837 264.555 143.783 265.277 144.227C266 144.67 269.592 145.113 272.305 145.093C273.089 145.093 273.36 144.808 273.344 144.391C273.236 144.647 272.939 144.801 272.354 144.808Z"
+          fill="black"/>
+    <path opacity="0.1"
+          d="M10.2273 14.1997C14.1319 14.1997 17.2971 11.021 17.2971 7.09987C17.2971 3.17872 14.1319 0 10.2273 0C6.32274 0 3.15747 3.17872 3.15747 7.09987C3.15747 11.021 6.32274 14.1997 10.2273 14.1997Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M314.201 34.5503C318.105 34.5503 321.271 31.3716 321.271 27.4505C321.271 23.5293 318.105 20.3506 314.201 20.3506C310.296 20.3506 307.131 23.5293 307.131 27.4505C307.131 31.3716 310.296 34.5503 314.201 34.5503Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M5.22965 40.1043C8.11791 40.1043 10.4593 37.753 10.4593 34.8525C10.4593 31.9519 8.11791 29.6006 5.22965 29.6006C2.34139 29.6006 0 31.9519 0 34.8525C0 37.753 2.34139 40.1043 5.22965 40.1043Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M58.1798 10.5633C61.0681 10.5633 63.4095 8.21196 63.4095 5.31144C63.4095 2.41091 61.0681 0.0595703 58.1798 0.0595703C55.2916 0.0595703 52.9502 2.41091 52.9502 5.31144C52.9502 8.21196 55.2916 10.5633 58.1798 10.5633Z"
+          fill="#2CA878"/>
+    <path opacity="0.1"
+          d="M272.595 11.2196C275.484 11.2196 277.825 8.86821 277.825 5.96769C277.825 3.06716 275.484 0.71582 272.595 0.71582C269.707 0.71582 267.366 3.06716 267.366 5.96769C267.366 8.86821 269.707 11.2196 272.595 11.2196Z"
+          fill="#2CA878"/>
+    <path
+      d="M290.775 212.176C290.775 212.176 292.083 213.896 290.17 216.492C288.258 219.089 286.68 221.278 287.317 222.896C287.317 222.896 290.203 218.078 292.547 218.009C294.89 217.94 293.357 215.077 290.775 212.176Z"
+      fill="#FC6681"/>
+    <path opacity="0.1"
+          d="M290.775 212.176C290.889 212.343 290.978 212.525 291.04 212.717C293.328 215.422 294.557 217.946 292.347 218.009C290.295 218.068 287.833 221.754 287.242 222.686C287.261 222.758 287.285 222.828 287.314 222.896C287.314 222.896 290.2 218.078 292.543 218.009C294.887 217.94 293.357 215.077 290.775 212.176Z"
+          fill="black"/>
+    <path
+      d="M293.207 214.368C293.207 214.972 293.138 215.464 293.056 215.464C292.975 215.464 292.906 214.972 292.906 214.368C292.906 213.764 292.991 214.04 293.073 214.04C293.154 214.04 293.207 213.761 293.207 214.368Z"
+      fill="#FFD037"/>
+    <path
+      d="M294.044 215.09C293.514 215.379 293.063 215.553 293.011 215.481C292.959 215.409 293.37 215.113 293.897 214.824C294.423 214.536 294.224 214.746 294.259 214.824C294.295 214.903 294.573 214.802 294.044 215.09Z"
+      fill="#FFD037"/>
+    <path
+      d="M283.859 212.176C283.859 212.176 282.551 213.896 284.463 216.492C286.376 219.089 287.954 221.278 287.317 222.896C287.317 222.896 284.427 218.078 282.087 218.009C279.747 217.94 281.273 215.077 283.859 212.176Z"
+      fill="#FC6681"/>
+    <path opacity="0.1"
+          d="M283.859 212.176C283.745 212.343 283.655 212.525 283.591 212.717C281.303 215.422 280.077 217.946 282.283 218.009C284.336 218.068 286.801 221.754 287.389 222.686C287.369 222.755 287.346 222.827 287.32 222.896C287.32 222.896 284.431 218.078 282.091 218.009C279.75 217.94 281.273 215.077 283.859 212.176Z"
+          fill="black"/>
+    <path
+      d="M281.424 214.368C281.424 214.972 281.492 215.464 281.577 215.464C281.662 215.464 281.728 214.972 281.728 214.368C281.728 213.764 281.643 214.04 281.558 214.04C281.473 214.04 281.424 213.761 281.424 214.368Z"
+      fill="#FFD037"/>
+    <path
+      d="M280.59 215.09C281.12 215.379 281.571 215.553 281.62 215.481C281.669 215.409 281.264 215.113 280.734 214.824C280.205 214.536 280.407 214.746 280.375 214.824C280.342 214.903 280.061 214.802 280.59 215.09Z"
+      fill="#FFD037"/>
+    <path
+      d="M281.842 222.673C281.842 222.673 285.503 222.558 286.605 221.77C287.706 220.982 292.236 220.04 292.511 221.304C292.785 222.568 298.008 227.596 293.877 227.629C289.746 227.662 284.274 226.973 283.176 226.316C282.078 225.66 281.842 222.673 281.842 222.673Z"
+      fill="#A8A8A8"/>
+    <path opacity="0.2"
+          d="M293.952 227.19C289.818 227.222 284.349 226.533 283.248 225.877C282.411 225.364 282.074 223.523 281.963 222.673H281.842C281.842 222.673 282.074 225.627 283.176 226.31C284.277 226.993 289.746 227.662 293.877 227.623C295.07 227.623 295.482 227.186 295.459 226.556C295.296 226.943 294.838 227.183 293.952 227.19Z"
+          fill="black"/>
+    <g opacity="0.7">
+      <path
+        d="M103.433 41.3486C102.075 41.3486 100.748 41.7529 99.6194 42.5103C98.4906 43.2677 97.6109 44.3443 97.0913 45.6038C96.5718 46.8634 96.4359 48.2494 96.7007 49.5865C96.9656 50.9236 97.6193 52.1518 98.5792 53.1159C99.5392 54.0799 100.762 54.7364 102.094 55.0023C103.425 55.2683 104.805 55.1318 106.059 54.6101C107.314 54.0884 108.386 53.2049 109.14 52.0713C109.894 50.9377 110.297 49.605 110.297 48.2417C110.297 46.4136 109.574 44.6603 108.286 43.3676C106.999 42.0749 105.253 41.3486 103.433 41.3486ZM103.433 42.6846C104.532 42.6846 105.606 43.0118 106.52 43.625C107.434 44.2381 108.146 45.1096 108.566 46.1293C108.987 47.1489 109.097 48.2709 108.882 49.3533C108.668 50.4358 108.139 51.43 107.362 52.2104C106.585 52.9908 105.595 53.5223 104.517 53.7376C103.439 53.9529 102.322 53.8424 101.306 53.42C100.291 52.9977 99.4233 52.2825 98.8127 51.3648C98.2021 50.4472 97.8763 49.3683 97.8763 48.2647C97.8763 46.7848 98.4617 45.3654 99.5037 44.319C100.546 43.2725 101.959 42.6846 103.433 42.6846ZM107.319 46.3116L106.695 45.6781C106.664 45.6464 106.628 45.6211 106.587 45.6038C106.547 45.5866 106.503 45.5777 106.459 45.5777C106.415 45.5777 106.372 45.5866 106.332 45.6038C106.291 45.6211 106.255 45.6464 106.224 45.6781L102.302 49.5809L100.648 47.8938C100.617 47.862 100.581 47.8367 100.54 47.8195C100.5 47.8022 100.457 47.7933 100.413 47.7933C100.369 47.7933 100.325 47.8022 100.285 47.8195C100.244 47.8367 100.208 47.862 100.177 47.8938L99.5497 48.5207C99.5181 48.5513 99.493 48.588 99.4758 48.6287C99.4586 48.6693 99.4497 48.7129 99.4497 48.7571C99.4497 48.8012 99.4586 48.8448 99.4758 48.8854C99.493 48.9261 99.5181 48.9628 99.5497 48.9934L102.067 51.5405C102.097 51.5723 102.134 51.5976 102.174 51.6148C102.214 51.6321 102.258 51.641 102.302 51.641C102.346 51.641 102.389 51.6321 102.43 51.6148C102.47 51.5976 102.507 51.5723 102.537 51.5405L107.319 46.7745C107.351 46.7439 107.376 46.7071 107.393 46.6665C107.41 46.6259 107.419 46.5823 107.419 46.5381C107.419 46.494 107.41 46.4503 107.393 46.4097C107.376 46.3691 107.351 46.3324 107.319 46.3018V46.3116Z"
+        fill="#2CA878"/>
+      <path
+        d="M103.433 41.3486C102.075 41.3486 100.748 41.7529 99.6194 42.5103C98.4906 43.2677 97.6109 44.3443 97.0913 45.6038C96.5718 46.8634 96.4359 48.2494 96.7007 49.5865C96.9656 50.9236 97.6193 52.1518 98.5792 53.1159C99.5392 54.0799 100.762 54.7364 102.094 55.0023C103.425 55.2683 104.805 55.1318 106.059 54.6101C107.314 54.0884 108.386 53.2049 109.14 52.0713C109.894 50.9377 110.297 49.605 110.297 48.2417C110.297 46.4136 109.574 44.6603 108.286 43.3676C106.999 42.0749 105.253 41.3486 103.433 41.3486ZM103.433 42.6846C104.532 42.6846 105.606 43.0118 106.52 43.625C107.434 44.2381 108.146 45.1096 108.566 46.1293C108.987 47.1489 109.097 48.2709 108.882 49.3533C108.668 50.4358 108.139 51.43 107.362 52.2104C106.585 52.9908 105.595 53.5223 104.517 53.7376C103.439 53.9529 102.322 53.8424 101.306 53.42C100.291 52.9977 99.4233 52.2825 98.8127 51.3648C98.2021 50.4472 97.8763 49.3683 97.8763 48.2647C97.8763 46.7848 98.4617 45.3654 99.5037 44.319C100.546 43.2725 101.959 42.6846 103.433 42.6846ZM107.319 46.3116L106.695 45.6781C106.664 45.6464 106.628 45.6211 106.587 45.6038C106.547 45.5866 106.503 45.5777 106.459 45.5777C106.415 45.5777 106.372 45.5866 106.332 45.6038C106.291 45.6211 106.255 45.6464 106.224 45.6781L102.302 49.5809L100.648 47.8938C100.617 47.862 100.581 47.8367 100.54 47.8195C100.5 47.8022 100.457 47.7933 100.413 47.7933C100.369 47.7933 100.325 47.8022 100.285 47.8195C100.244 47.8367 100.208 47.862 100.177 47.8938L99.5497 48.5207C99.5181 48.5513 99.493 48.588 99.4758 48.6287C99.4586 48.6693 99.4497 48.7129 99.4497 48.7571C99.4497 48.8012 99.4586 48.8448 99.4758 48.8854C99.493 48.9261 99.5181 48.9628 99.5497 48.9934L102.067 51.5405C102.097 51.5723 102.134 51.5976 102.174 51.6148C102.214 51.6321 102.258 51.641 102.302 51.641C102.346 51.641 102.389 51.6321 102.43 51.6148C102.47 51.5976 102.507 51.5723 102.537 51.5405L107.319 46.7745C107.351 46.7439 107.376 46.7071 107.393 46.6665C107.41 46.6259 107.419 46.5823 107.419 46.5381C107.419 46.494 107.41 46.4503 107.393 46.4097C107.376 46.3691 107.351 46.3324 107.319 46.3018V46.3116Z"
+        fill="white" fill-opacity="0.2"/>
+    </g>
+    <g opacity="0.7">
+      <path
+        d="M27.4458 76.2471C26.1243 76.5554 24.9233 77.2501 23.9947 78.2435C23.0661 79.2368 22.4514 80.4843 22.2284 81.8283C22.0054 83.1722 22.1839 84.5525 22.7416 85.7946C23.2992 87.0367 24.2109 88.085 25.3615 88.807C26.512 89.5291 27.8499 89.8925 29.206 89.8514C30.5622 89.8103 31.8757 89.3665 32.9809 88.576C34.086 87.7856 34.933 86.684 35.4151 85.4104C35.8971 84.1368 35.9924 82.7482 35.6891 81.4202C35.4872 80.5364 35.1136 79.7012 34.5898 78.9626C34.0659 78.224 33.4021 77.5964 32.6364 77.1159C31.8706 76.6353 31.018 76.3112 30.1273 76.1621C29.2366 76.0131 28.3254 76.042 27.4458 76.2471ZM27.7465 77.5601C28.8179 77.309 29.9393 77.383 30.9687 77.7726C31.9981 78.1621 32.8892 78.8498 33.5291 79.7485C34.169 80.6471 34.5289 81.7163 34.5631 82.8205C34.5973 83.9248 34.3044 85.0143 33.7215 85.9512C33.1385 86.8881 32.2917 87.6302 31.2884 88.0833C30.2851 88.5364 29.1705 88.6803 28.0857 88.4967C27.0009 88.313 25.9948 87.8102 25.1949 87.0518C24.3949 86.2934 23.8372 85.3136 23.5922 84.2365C23.2652 82.7982 23.5186 81.2883 24.2971 80.0372C25.0756 78.786 26.3159 77.8954 27.7465 77.5601ZM32.3454 80.2189L31.5936 79.7331C31.5569 79.7091 31.5158 79.6928 31.4727 79.6851C31.4296 79.6774 31.3853 79.6785 31.3427 79.6883C31.3 79.6981 31.2597 79.7164 31.2242 79.7421C31.1887 79.7679 31.1587 79.8005 31.136 79.8381L28.1943 84.5254L26.2038 83.2617C26.1671 83.2377 26.126 83.2214 26.0829 83.2137C26.0397 83.206 25.9955 83.2071 25.9529 83.2169C25.9102 83.2267 25.8699 83.245 25.8344 83.2707C25.7989 83.2965 25.7689 83.3291 25.7462 83.3667L25.2723 84.1216C25.2484 84.1585 25.2322 84.1998 25.2245 84.2431C25.2169 84.2864 25.2179 84.3308 25.2277 84.3737C25.2374 84.4165 25.2557 84.457 25.2813 84.4926C25.3069 84.5283 25.3394 84.5584 25.3769 84.5812L28.397 86.4948C28.4338 86.5193 28.4752 86.5361 28.5186 86.544C28.5621 86.552 28.6067 86.5511 28.6498 86.5413C28.6928 86.5314 28.7335 86.513 28.7693 86.4869C28.805 86.4609 28.8352 86.4278 28.8578 86.3898L32.4532 80.6685C32.4772 80.6319 32.4937 80.5907 32.5016 80.5476C32.5095 80.5044 32.5087 80.4601 32.4992 80.4173C32.4898 80.3744 32.4719 80.3339 32.4466 80.2982C32.4213 80.2624 32.3891 80.2321 32.3519 80.209L32.3454 80.2189Z"
+        fill="#2CA878"/>
+      <path
+        d="M27.4458 76.2471C26.1243 76.5554 24.9233 77.2501 23.9947 78.2435C23.0661 79.2368 22.4514 80.4843 22.2284 81.8283C22.0054 83.1722 22.1839 84.5525 22.7416 85.7946C23.2992 87.0367 24.2109 88.085 25.3615 88.807C26.512 89.5291 27.8499 89.8925 29.206 89.8514C30.5622 89.8103 31.8757 89.3665 32.9809 88.576C34.086 87.7856 34.933 86.684 35.4151 85.4104C35.8971 84.1368 35.9924 82.7482 35.6891 81.4202C35.4872 80.5364 35.1136 79.7012 34.5898 78.9626C34.0659 78.224 33.4021 77.5964 32.6364 77.1159C31.8706 76.6353 31.018 76.3112 30.1273 76.1621C29.2366 76.0131 28.3254 76.042 27.4458 76.2471ZM27.7465 77.5601C28.8179 77.309 29.9393 77.383 30.9687 77.7726C31.9981 78.1621 32.8892 78.8498 33.5291 79.7485C34.169 80.6471 34.5289 81.7163 34.5631 82.8205C34.5973 83.9248 34.3044 85.0143 33.7215 85.9512C33.1385 86.8881 32.2917 87.6302 31.2884 88.0833C30.2851 88.5364 29.1705 88.6803 28.0857 88.4967C27.0009 88.313 25.9948 87.8102 25.1949 87.0518C24.3949 86.2934 23.8372 85.3136 23.5922 84.2365C23.2652 82.7982 23.5186 81.2883 24.2971 80.0372C25.0756 78.786 26.3159 77.8954 27.7465 77.5601ZM32.3454 80.2189L31.5936 79.7331C31.5569 79.7091 31.5158 79.6928 31.4727 79.6851C31.4296 79.6774 31.3853 79.6785 31.3427 79.6883C31.3 79.6981 31.2597 79.7164 31.2242 79.7421C31.1887 79.7679 31.1587 79.8005 31.136 79.8381L28.1943 84.5254L26.2038 83.2617C26.1671 83.2377 26.126 83.2214 26.0829 83.2137C26.0397 83.206 25.9955 83.2071 25.9529 83.2169C25.9102 83.2267 25.8699 83.245 25.8344 83.2707C25.7989 83.2965 25.7689 83.3291 25.7462 83.3667L25.2723 84.1216C25.2484 84.1585 25.2322 84.1998 25.2245 84.2431C25.2169 84.2864 25.2179 84.3308 25.2277 84.3737C25.2374 84.4165 25.2557 84.457 25.2813 84.4926C25.3069 84.5283 25.3394 84.5584 25.3769 84.5812L28.397 86.4948C28.4338 86.5193 28.4752 86.5361 28.5186 86.544C28.5621 86.552 28.6067 86.5511 28.6498 86.5413C28.6928 86.5314 28.7335 86.513 28.7693 86.4869C28.805 86.4609 28.8352 86.4278 28.8578 86.3898L32.4532 80.6685C32.4772 80.6319 32.4937 80.5907 32.5016 80.5476C32.5095 80.5044 32.5087 80.4601 32.4992 80.4173C32.4898 80.3744 32.4719 80.3339 32.4466 80.2982C32.4213 80.2624 32.3891 80.2321 32.3519 80.209L32.3454 80.2189Z"
+        fill="white" fill-opacity="0.2"/>
+    </g>
+    <g opacity="0.7">
+      <path
+        d="M203.473 42.3467C202.115 42.3467 200.788 42.751 199.659 43.5084C198.53 44.2658 197.651 45.3423 197.131 46.6019C196.612 47.8614 196.476 49.2474 196.741 50.5845C197.005 51.9217 197.659 53.1499 198.619 54.1139C199.579 55.0779 200.802 55.7344 202.133 56.0004C203.465 56.2664 204.845 56.1298 206.099 55.6081C207.353 55.0864 208.425 54.2029 209.18 53.0693C209.934 51.9358 210.336 50.6031 210.336 49.2398C210.336 47.4116 209.613 45.6583 208.326 44.3656C207.039 43.0729 205.293 42.3467 203.473 42.3467ZM203.473 43.6826C204.572 43.6826 205.646 44.0099 206.56 44.623C207.473 45.2362 208.186 46.1077 208.606 47.1273C209.027 48.1469 209.137 49.2689 208.922 50.3514C208.708 51.4338 208.179 52.4281 207.402 53.2085C206.625 53.9889 205.634 54.5203 204.557 54.7356C203.479 54.9509 202.361 54.8404 201.346 54.4181C200.331 53.9957 199.463 53.2805 198.852 52.3629C198.242 51.4452 197.916 50.3664 197.916 49.2627C197.916 47.7828 198.501 46.3635 199.544 45.317C200.586 44.2705 201.999 43.6826 203.473 43.6826ZM207.359 47.3097L206.735 46.6762C206.704 46.6444 206.668 46.6192 206.627 46.6019C206.587 46.5846 206.543 46.5757 206.499 46.5757C206.455 46.5757 206.412 46.5846 206.371 46.6019C206.331 46.6192 206.294 46.6444 206.264 46.6762L202.342 50.579L200.684 48.9017C200.654 48.8699 200.617 48.8446 200.577 48.8274C200.537 48.8101 200.493 48.8012 200.449 48.8012C200.405 48.8012 200.362 48.8101 200.321 48.8274C200.281 48.8446 200.244 48.8699 200.214 48.9017L199.59 49.5352C199.558 49.5658 199.533 49.6025 199.516 49.6431C199.498 49.6837 199.49 49.7274 199.49 49.7715C199.49 49.8156 199.498 49.8593 199.516 49.8999C199.533 49.9405 199.558 49.9772 199.59 50.0078L202.106 52.555C202.137 52.5868 202.173 52.612 202.214 52.6293C202.254 52.6466 202.298 52.6554 202.342 52.6554C202.386 52.6554 202.429 52.6466 202.469 52.6293C202.51 52.612 202.546 52.5868 202.577 52.555L207.359 47.7889C207.39 47.7583 207.416 47.7216 207.433 47.681C207.45 47.6404 207.459 47.5967 207.459 47.5526C207.459 47.5085 207.45 47.4648 207.433 47.4242C207.416 47.3836 207.39 47.3469 207.359 47.3163V47.3097Z"
+        fill="#2CA878"/>
+      <path
+        d="M203.473 42.3467C202.115 42.3467 200.788 42.751 199.659 43.5084C198.53 44.2658 197.651 45.3423 197.131 46.6019C196.612 47.8614 196.476 49.2474 196.741 50.5845C197.005 51.9217 197.659 53.1499 198.619 54.1139C199.579 55.0779 200.802 55.7344 202.133 56.0004C203.465 56.2664 204.845 56.1298 206.099 55.6081C207.353 55.0864 208.425 54.2029 209.18 53.0693C209.934 51.9358 210.336 50.6031 210.336 49.2398C210.336 47.4116 209.613 45.6583 208.326 44.3656C207.039 43.0729 205.293 42.3467 203.473 42.3467ZM203.473 43.6826C204.572 43.6826 205.646 44.0099 206.56 44.623C207.473 45.2362 208.186 46.1077 208.606 47.1273C209.027 48.1469 209.137 49.2689 208.922 50.3514C208.708 51.4338 208.179 52.4281 207.402 53.2085C206.625 53.9889 205.634 54.5203 204.557 54.7356C203.479 54.9509 202.361 54.8404 201.346 54.4181C200.331 53.9957 199.463 53.2805 198.852 52.3629C198.242 51.4452 197.916 50.3664 197.916 49.2627C197.916 47.7828 198.501 46.3635 199.544 45.317C200.586 44.2705 201.999 43.6826 203.473 43.6826ZM207.359 47.3097L206.735 46.6762C206.704 46.6444 206.668 46.6192 206.627 46.6019C206.587 46.5846 206.543 46.5757 206.499 46.5757C206.455 46.5757 206.412 46.5846 206.371 46.6019C206.331 46.6192 206.294 46.6444 206.264 46.6762L202.342 50.579L200.684 48.9017C200.654 48.8699 200.617 48.8446 200.577 48.8274C200.537 48.8101 200.493 48.8012 200.449 48.8012C200.405 48.8012 200.362 48.8101 200.321 48.8274C200.281 48.8446 200.244 48.8699 200.214 48.9017L199.59 49.5352C199.558 49.5658 199.533 49.6025 199.516 49.6431C199.498 49.6837 199.49 49.7274 199.49 49.7715C199.49 49.8156 199.498 49.8593 199.516 49.8999C199.533 49.9405 199.558 49.9772 199.59 50.0078L202.106 52.555C202.137 52.5868 202.173 52.612 202.214 52.6293C202.254 52.6466 202.298 52.6554 202.342 52.6554C202.386 52.6554 202.429 52.6466 202.469 52.6293C202.51 52.612 202.546 52.5868 202.577 52.555L207.359 47.7889C207.39 47.7583 207.416 47.7216 207.433 47.681C207.45 47.6404 207.459 47.5967 207.459 47.5526C207.459 47.5085 207.45 47.4648 207.433 47.4242C207.416 47.3836 207.39 47.3469 207.359 47.3163V47.3097Z"
+        fill="white" fill-opacity="0.2"/>
+    </g>
+    <g opacity="0.7">
+      <path
+        d="M282.221 76.3888C280.868 76.2834 279.514 76.5831 278.331 77.2502C277.147 77.9172 276.187 78.9216 275.572 80.1365C274.957 81.3513 274.714 82.7221 274.874 84.0754C275.035 85.4288 275.591 86.7041 276.473 87.7401C277.354 88.7761 278.522 89.5263 279.829 89.896C281.135 90.2656 282.521 90.238 283.812 89.8168C285.102 89.3955 286.24 88.5994 287.08 87.5292C287.92 86.4589 288.426 85.1625 288.533 83.8038C288.604 82.9006 288.497 81.9922 288.218 81.1306C287.939 80.269 287.494 79.471 286.908 78.7824C286.321 78.0937 285.606 77.5278 284.802 77.1171C283.997 76.7064 283.121 76.4589 282.221 76.3888ZM282.117 77.7182C283.214 77.801 284.261 78.2089 285.127 78.8903C285.993 79.5716 286.638 80.4958 286.981 81.5457C287.323 82.5955 287.348 83.7238 287.051 84.7876C286.754 85.8514 286.15 86.8028 285.314 87.5213C284.478 88.2398 283.449 88.6931 282.357 88.8236C281.265 88.9542 280.158 88.7562 279.178 88.2547C278.198 87.7532 277.388 86.9709 276.851 86.0067C276.314 85.0426 276.074 83.94 276.161 82.8388C276.217 82.1097 276.415 81.3988 276.745 80.7468C277.075 80.0947 277.529 79.5143 278.082 79.0388C278.635 78.5632 279.276 78.2018 279.968 77.9752C280.661 77.7486 281.391 77.6613 282.117 77.7182ZM285.712 81.6374L285.137 80.958C285.109 80.924 285.075 80.896 285.036 80.8755C284.997 80.8551 284.955 80.8427 284.911 80.839C284.868 80.8353 284.824 80.8405 284.782 80.8541C284.741 80.8678 284.702 80.8897 284.669 80.9186L280.463 84.5062L278.94 82.7042C278.912 82.6697 278.877 82.6413 278.838 82.6206C278.799 82.5998 278.757 82.5872 278.713 82.5835C278.669 82.5799 278.624 82.5852 278.582 82.5991C278.541 82.6131 278.502 82.6354 278.469 82.6648L277.792 83.2425C277.759 83.2706 277.731 83.3052 277.711 83.3442C277.691 83.3832 277.679 83.4258 277.676 83.4696C277.672 83.5133 277.678 83.5573 277.692 83.599C277.705 83.6406 277.727 83.679 277.756 83.7119L280.067 86.4462C280.095 86.4801 280.129 86.5081 280.168 86.5286C280.207 86.549 280.249 86.5614 280.293 86.5651C280.336 86.5688 280.38 86.5636 280.422 86.55C280.463 86.5363 280.502 86.5144 280.535 86.4855L285.673 82.1068C285.707 82.0789 285.734 82.0446 285.755 82.0057C285.775 81.9668 285.788 81.9242 285.791 81.8804C285.795 81.8367 285.79 81.7926 285.776 81.7509C285.763 81.7091 285.741 81.6705 285.712 81.6374Z"
+        fill="#2CA878"/>
+      <path
+        d="M282.221 76.3888C280.868 76.2834 279.514 76.5831 278.331 77.2502C277.147 77.9172 276.187 78.9216 275.572 80.1365C274.957 81.3513 274.714 82.7221 274.874 84.0754C275.035 85.4288 275.591 86.7041 276.473 87.7401C277.354 88.7761 278.522 89.5263 279.829 89.896C281.135 90.2656 282.521 90.238 283.812 89.8168C285.102 89.3955 286.24 88.5994 287.08 87.5292C287.92 86.4589 288.426 85.1625 288.533 83.8038C288.604 82.9006 288.497 81.9922 288.218 81.1306C287.939 80.269 287.494 79.471 286.908 78.7824C286.321 78.0937 285.606 77.5278 284.802 77.1171C283.997 76.7064 283.121 76.4589 282.221 76.3888ZM282.117 77.7182C283.214 77.801 284.261 78.2089 285.127 78.8903C285.993 79.5716 286.638 80.4958 286.981 81.5457C287.323 82.5955 287.348 83.7238 287.051 84.7876C286.754 85.8514 286.15 86.8028 285.314 87.5213C284.478 88.2398 283.449 88.6931 282.357 88.8236C281.265 88.9542 280.158 88.7562 279.178 88.2547C278.198 87.7532 277.388 86.9709 276.851 86.0067C276.314 85.0426 276.074 83.94 276.161 82.8388C276.217 82.1097 276.415 81.3988 276.745 80.7468C277.075 80.0947 277.529 79.5143 278.082 79.0388C278.635 78.5632 279.276 78.2018 279.968 77.9752C280.661 77.7486 281.391 77.6613 282.117 77.7182ZM285.712 81.6374L285.137 80.958C285.109 80.924 285.075 80.896 285.036 80.8755C284.997 80.8551 284.955 80.8427 284.911 80.839C284.868 80.8353 284.824 80.8405 284.782 80.8541C284.741 80.8678 284.702 80.8897 284.669 80.9186L280.463 84.5062L278.94 82.7042C278.912 82.6697 278.877 82.6413 278.838 82.6206C278.799 82.5998 278.757 82.5872 278.713 82.5835C278.669 82.5799 278.624 82.5852 278.582 82.5991C278.541 82.6131 278.502 82.6354 278.469 82.6648L277.792 83.2425C277.759 83.2706 277.731 83.3052 277.711 83.3442C277.691 83.3832 277.679 83.4258 277.676 83.4696C277.672 83.5133 277.678 83.5573 277.692 83.599C277.705 83.6406 277.727 83.679 277.756 83.7119L280.067 86.4462C280.095 86.4801 280.129 86.5081 280.168 86.5286C280.207 86.549 280.249 86.5614 280.293 86.5651C280.336 86.5688 280.38 86.5636 280.422 86.55C280.463 86.5363 280.502 86.5144 280.535 86.4855L285.673 82.1068C285.707 82.0789 285.734 82.0446 285.755 82.0057C285.775 81.9668 285.788 81.9242 285.791 81.8804C285.795 81.8367 285.79 81.7926 285.776 81.7509C285.763 81.7091 285.741 81.6705 285.712 81.6374Z"
+        fill="white" fill-opacity="0.2"/>
+    </g>
+  </g>
+  <defs>
+    <linearGradient id="paint0_linear_2254_118640" x1="240.289" y1="188.818" x2="240.289" y2="96.0439"
+                    gradientUnits="userSpaceOnUse">
+      <stop stop-color="#808080" stop-opacity="0.25"/>
+      <stop offset="0.54" stop-color="#808080" stop-opacity="0.12"/>
+      <stop offset="1" stop-color="#808080" stop-opacity="0.1"/>
+    </linearGradient>
+    <clipPath id="clip0_2254_118640">
+      <rect width="345" height="254" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>

@xen-orchestra/lite/src/assets/theme.css

@@ -1,85 +0,0 @@
-:root {
-  --color-blue-scale-000: #000000;
-  --color-blue-scale-100: #1a1b38;
-  --color-blue-scale-200: #595a6f;
-  --color-blue-scale-300: #9899a5;
-  --color-blue-scale-400: #e5e5e7;
-  --color-blue-scale-500: #ffffff;
-
-  --color-extra-blue-l60: #d1cefb;
-  --color-extra-blue-l40: #bbb5f9;
-  --color-extra-blue-l20: #a39df8;
-  --color-extra-blue-base: #8f84ff;
-  --color-extra-blue-d20: #716ac6;
-  --color-extra-blue-d40: #554f94;
-  --color-extra-blue-d60: #383563;
-
-  --color-green-infra-l60: #b5dbca;
-  --color-green-infra-l40: #91c9b0;
-  --color-green-infra-l20: #70b795;
-  --color-green-infra-base: #55a57b;
-  --color-green-infra-d20: #438463;
-  --color-green-infra-d40: #32634a;
-  --color-green-infra-d60: #214231;
-
-  --color-orange-world-l60: #f2cda8;
-  --color-orange-world-l40: #ebb57d;
-  --color-orange-world-l20: #e59d56;
-  --color-orange-world-base: #ef7f18;
-  --color-orange-world-d20: #bf6612;
-  --color-orange-world-d40: #864f1f;
-  --color-orange-world-d60: #5a3514;
-
-  --color-red-vates-l60: #dda5a7;
-  --color-red-vates-l40: #ce787c;
-  --color-red-vates-l20: #bf4f51;
-  --color-red-vates-base: #be1621;
-  --color-red-vates-d20: #8e2221;
-  --color-red-vates-d40: #6a1919;
-  --color-red-vates-d60: #471010;
-
-  --color-grayscale-200: #585757;
-
-  --background-color-primary: #ffffff;
-  --background-color-secondary: #f6f6f7;
-  --background-color-extra-blue: #f4f3fe;
-  --background-color-green-infra: #ecf5f2;
-  --background-color-orange-world: #fbf2e9;
-  --background-color-red-vates: #f5e8e9;
-
-  --shadow-100: 0 0.1rem 0.1rem rgba(20, 20, 30, 0.06);
-  --shadow-200: 0 0.1rem 0.3rem rgba(20, 20, 30, 0.1),
-    0 0.2rem 0.1rem rgba(20, 20, 30, 0.06),
-    0 0.1rem 0.1rem rgba(20, 20, 30, 0.08);
-  --shadow-300: 0 0.3rem 0.5rem rgba(20, 20, 30, 0.1),
-    0 0.1rem 1.8rem rgba(20, 20, 30, 0.06), 0 0.6rem 1rem rgba(20, 20, 30, 0.08);
-  --shadow-400: 0 1.1rem 1.5rem rgba(20, 20, 30, 0.1),
-    0 0.9rem 4.6rem rgba(20, 20, 30, 0.06),
-    0 2.4rem 3.8rem rgba(20, 20, 30, 0.04);
-}
-
-:root.dark {
-  --color-blue-scale-000: #ffffff;
-  --color-blue-scale-100: #e5e5e7;
-  --color-blue-scale-200: #9899a5;
-  --color-blue-scale-300: #595a6f;
-  --color-blue-scale-400: #1a1b38;
-  --color-blue-scale-500: #000000;
-
-  --background-color-primary: #14141d;
-  --background-color-secondary: #17182a;
-  --background-color-extra-blue: #35335d;
-  --background-color-green-infra: #243b3d;
-  --background-color-orange-world: #493328;
-  --background-color-red-vates: #3c1a28;
-
-  --shadow-100: 0 0.1rem 0.1rem rgba(20, 20, 30, 0.12);
-  --shadow-200: 0 0.1rem 0.3rem rgba(20, 20, 30, 0.2),
-    0 0.2rem 0.1rem rgba(20, 20, 30, 0.12),
-    0 0.1rem 0.1rem rgba(20, 20, 30, 0.16);
-  --shadow-300: 0 0.3rem 0.5rem rgba(20, 20, 30, 0.2),
-    0 0.1rem 1.8rem rgba(20, 20, 30, 0.12), 0 0.6rem 1rem rgba(20, 20, 30, 0.16);
-  --shadow-400: 0 1.1rem 1.5rem rgba(20, 20, 30, 0.2),
-    0 0.9rem 4.6rem rgba(20, 20, 30, 0.12),
-    0 2.4rem 3.8rem rgba(20, 20, 30, 0.08);
-}