fix: update tests

feat: export types based on async-each
feat: use async-each to parallelize operations

.eslintrc.js

@@ -252,8 +252,6 @@ module.exports = {
               'fi',
               'pl',
               'zh-Hans',
-              'sk',
-              'pt',
             ],
           },
         ],
@@ -281,7 +279,7 @@ module.exports = {
       },
     },
     {
-      files: ['@xen-orchestra/{web-core,lite,web}/src/route-map.d.ts'],
+      files: ['@xen-orchestra/{web-core,lite,web}/typed-router.d.ts'],
       parserOptions: {
         sourceType: 'module',
       },

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node environment
         uses: actions/setup-node@v4
         with:
-          node-version: '>=22.12'
+          node-version: '20'
           cache: 'yarn'
 
       - name: Install project dependencies

.prettierignore

@@ -3,5 +3,4 @@
 **/*.hbs
 
 # Generated files
-/@xen-orchestra/web/src/route-map.d.ts
-/@xen-orchestra/lite/src/route-map.d.ts
+/@xen-orchestra/web/typed-router.d.ts

@vates/async-each/index.test.js

@@ -67,17 +67,20 @@ describe('asyncEach', () => {
       })
 
       it('stops on first error when stopOnError is true', async () => {
+        const tracker = new assert.CallTracker()
+
         const error = new Error()
-        const iteratee = spy((_, i) => {
+        const iteratee = tracker.calls((_, i) => {
           if (i === 1) {
             throw error
           }
-        })
+        }, 2)
         assert.deepStrictEqual(
           await rejectionOf(asyncEach(iterable, iteratee, { concurrency: 1, stopOnError: true })),
           error
         )
-        assert.deepStrictEqual(iteratee.callCount, 2)
+
+        tracker.verify()
       })
 
       it('rejects AggregateError when stopOnError is false', async () => {
@@ -97,16 +100,19 @@ describe('asyncEach', () => {
       })
 
       it('can be interrupted with an AbortSignal', async () => {
+        const tracker = new assert.CallTracker()
+
         const ac = new AbortController()
-        const iteratee = spy((_, i) => {
+        const iteratee = tracker.calls((_, i) => {
           if (i === 1) {
             ac.abort()
           }
-        })
+        }, 2)
         await assert.rejects(asyncEach(iterable, iteratee, { concurrency: 1, signal: ac.signal }), {
           message: 'asyncEach aborted',
         })
-        assert.deepStrictEqual(iteratee.callCount, 2)
+
+        tracker.verify()
       })
 
       it('handle error on iterable', async () => {

@vates/async-each/package.json

@@ -25,7 +25,7 @@
   },
   "license": "ISC",
   "types": "index.d.ts",
-  "version": "1.0.3",
+  "version": "1.0.1",
   "engines": {
     "node": ">=8.10"
   },

@vates/disposable/package.json

@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@vates/multi-key-map": "^0.2.0",
-    "@xen-orchestra/async-map": "^0.1.3",
-    "@xen-orchestra/log": "^0.7.2",
+    "@xen-orchestra/async-map": "^0.1.2",
+    "@xen-orchestra/log": "^0.7.1",
     "ensure-array": "^1.0.0"
   },
   "devDependencies": {

@vates/fuse-vhd/index.mjs

@@ -1,12 +1,12 @@
-import Fuse from 'fuse-native'
 import LRU from 'lru-cache'
+import Fuse from 'fuse-native'
 import { createLogger } from '@xen-orchestra/log'
 import { VhdSynthetic } from 'vhd-lib'
 import { Disposable, fromCallback } from 'promise-toolbox'
 
 const { warn } = createLogger('vates:fuse-vhd')
 
-// build a stat object from https://github.com/fuse-friends/fuse-native/blob/master/test/fixtures/stat.js
+// build a s stat object from https://github.com/fuse-friends/fuse-native/blob/master/test/fixtures/stat.js
 const stat = st => ({
   mtime: st.mtime || new Date(),
   atime: st.atime || new Date(),
@@ -20,109 +20,42 @@ const stat = st => ({
 export const mount = Disposable.factory(async function* mount(handler, diskPath, mountDir) {
   const vhd = yield VhdSynthetic.fromVhdChain(handler, diskPath)
 
+  const cache = new LRU({
+    max: 16, // each cached block is 2MB in size
+  })
   await vhd.readBlockAllocationTable()
-  const { blockSize } = vhd.header
-
-  // A zeroed buffer returned for VHD blocks that are not present in the chain.
-  // Never mutated — safe to share across all reads.
-  const EMPTY_BLOCK = Buffer.alloc(blockSize, 0)
-
-  // --- coalescing block read queue ---
-  //
-  // FUSE read requests from NTFS-3g arrive in small chunks (typically 4 KiB)
-  // while VHD blocks are 2 MiB. Reading blocks one at a time from the backing
-  // store (CIFS/NFS/…) bounds libuv threadpool usage to 1 concurrent I/O call.
-  //
-  // Coalescing: all pending requests for the same blockId share a single
-  // readBlock() call. When the block resolves, every waiter is fulfilled at once.
-  //
-  // Together these two properties prevent the FUSE-on-FUSE threadpool deadlock:
-  // concurrent NTFS-3g reads no longer starve the VHD block reads they depend on.
-  // In-memory block cache. Each VHD block is 2 MiB; 16 blocks = 32 MiB.
-  // This is the primary tool against the 300× CIFS amplification: NTFS-3g
-  // reads a 2 MiB block in ~512 sequential 4 KiB FUSE requests. Without a
-  // cache, each request causes a full 2 MiB CIFS read. With the cache, only
-  // the first request reads from CIFS; the rest are served from RAM.
-  const blockCache = new LRU({ max: 64 })
-
-  const pendingBlocks = new Map() // blockId → Promise<Buffer>
-  const readQueue = [] // { blockId, resolve, reject }[]
-  let queueRunning = false
-
-  // log stats every 10 s while there is activity
-
-  function enqueueBlock(blockId) {
-    // 1. serve from cache if available
-    if (blockCache.has(blockId)) {
-      return Promise.resolve(blockCache.get(blockId))
-    }
-    // 2. coalesce: join an existing in-flight read for this block
-    if (pendingBlocks.has(blockId)) {
-      return pendingBlocks.get(blockId)
-    }
-    const p = new Promise((resolve, reject) => {
-      readQueue.push({ blockId, resolve, reject })
-    })
-    pendingBlocks.set(blockId, p)
-    p.then(
-      data => {
-        pendingBlocks.delete(blockId)
-        blockCache.set(blockId, data)
-      },
-      () => pendingBlocks.delete(blockId)
-    )
-    drainQueue()
-    return p
-  }
-
-  function drainQueue() {
-    if (queueRunning) return
-    queueRunning = true
-    // async IIFE — errors are forwarded to individual reject() callbacks,
-    // so the outer floating promise is always fulfilled
-    ;(async () => {
-      while (readQueue.length > 0) {
-        const { blockId, resolve, reject } = readQueue.shift()
-        try {
-          resolve((await vhd.readBlock(blockId)).data)
-        } catch (err) {
-          reject(err)
-        }
-      }
-      queueRunning = false
-    })()
-  }
-
-  async function readData(buf, len, pos) {
-    if (len === 0) return 0
-    const startBlockId = Math.floor(pos / blockSize)
-    // use (pos + len - 1) so an exact block boundary doesn't include the next block
-    const endBlockId = Math.floor((pos + len - 1) / blockSize)
-
-    let copied = 0
-    for (let blockId = startBlockId; blockId <= endBlockId; blockId++) {
-      const data = vhd.containsBlock(blockId) ? await enqueueBlock(blockId) : EMPTY_BLOCK
-      const offsetStart = blockId === startBlockId ? pos % blockSize : 0
-      const offsetEnd = blockId === endBlockId ? ((pos + len - 1) % blockSize) + 1 : blockSize
-      data.copy(buf, copied, offsetStart, offsetEnd)
-      copied += offsetEnd - offsetStart
-    }
-    return copied
-  }
-
   const fuse = new Fuse(mountDir, {
     async readdir(path, cb) {
-      if (path === '/') return cb(null, ['vhd0'])
+      if (path === '/') {
+        return cb(null, ['vhd0'])
+      }
       cb(Fuse.ENOENT)
     },
     async getattr(path, cb) {
-      if (path === '/') return cb(null, stat({ mode: 'dir', size: 4096 }))
-      if (path === '/vhd0') return cb(null, stat({ mode: 'file', size: vhd.footer.currentSize }))
+      if (path === '/') {
+        return cb(
+          null,
+          stat({
+            mode: 'dir',
+            size: 4096,
+          })
+        )
+      }
+      if (path === '/vhd0') {
+        return cb(
+          null,
+          stat({
+            mode: 'file',
+            size: vhd.footer.currentSize,
+          })
+        )
+      }
+
       cb(Fuse.ENOENT)
     },
     read(path, fd, buf, len, pos, cb) {
       if (path === '/vhd0') {
-        return readData(buf, len, pos).then(cb, error => {
+        return vhd.readRawData(pos, len, cache, buf).then(cb, error => {
           warn('read error', { path, len, pos, error })
           cb(Fuse.EIO)
         })
@@ -131,9 +64,7 @@ export const mount = Disposable.factory(async function* mount(handler, diskPath,
     },
   })
   return new Disposable(
-    () => {
-      return fromCallback(cb => fuse.unmount(cb))
-    },
+    () => fromCallback(cb => fuse.unmount(cb)),
     fromCallback(cb => fuse.mount(cb))
   )
 })

@vates/fuse-vhd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vates/fuse-vhd",
-  "version": "2.1.3",
+  "version": "2.1.2",
   "license": "ISC",
   "private": false,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/fuse-vhd",
@@ -19,12 +19,12 @@
   },
   "main": "./index.mjs",
   "dependencies": {
-    "@xen-orchestra/fs": "^4.9.3",
-    "@xen-orchestra/log": "^0.7.2",
+    "@xen-orchestra/fs": "^4.6.7",
+    "@xen-orchestra/log": "^0.7.1",
     "fuse-native": "^2.2.6",
     "lru-cache": "^7.14.0",
     "promise-toolbox": "^0.21.0",
-    "vhd-lib": "^4.16.1"
+    "vhd-lib": "^4.14.7"
   },
   "bin": {
     "xo-fuse-vhd": "./cli.mjs"

@vates/generator-toolbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vates/generator-toolbox",
-  "version": "1.1.3",
+  "version": "1.1.0",
   "main": "dist/index.mjs",
   "license": "MIT",
   "private": false,
@@ -10,7 +10,7 @@
     "rimraf": "^6.0.1",
     "@types/node": "^20.6",
     "typescript": "~5.6",
-    "typescript-eslint": "^8.61.0"
+    "typescript-eslint": "^8.23.0"
   },
   "scripts": {
     "build": "tsc",

@vates/http-server-plus/.USAGE.md

@@ -1,65 +0,0 @@
-### `create([opts], [requestListener])`
-
-Creates a new server instance. `opts` may contain `createServer` and `createSecureServer` factories (defaults to `http.createServer` and `https.createServer`). `requestListener` is registered as a `request` event listener.
-
-```js
-import { create } from '@vates/http-server-plus'
-
-const server = create(function onRequest(req, res) {
-  res.end('Hello')
-})
-```
-
-### `server.listen(opts)`
-
-Starts listening. Returns a promise that resolves to a human-readable address string, or rejects with `error.niceAddress` set.
-
-```js
-// HTTP on a specific port
-await server.listen({ port: 8080 })
-
-// HTTPS — detected automatically when cert+key are provided
-await server.listen({
-  port: 443,
-  cert: fs.readFileSync('certificate.pem'),
-  key: fs.readFileSync('private_key.pem'),
-})
-
-// Unix socket
-await server.listen({ socket: '/var/run/http.sock' })
-
-// File descriptor
-await server.listen({ fd: 3 })
-
-// Systemd socket activation
-await server.listen({ systemdSocket: 0 })
-```
-
-> As a convenience, if `hostname` is `'localhost'`, it will listen on both `127.0.0.1` and `::1`, similar to what Node does when no hostname is provided.
-
-Multiple endpoints can be started on the same instance:
-
-```js
-const [httpAddr, httpsAddr] = await Promise.all([server.listen({ port: 80 }), server.listen({ port: 443, cert, key })])
-console.log('listening on', httpAddr, httpsAddr)
-```
-
-### HTTP/2
-
-Pass a custom `createSecureServer` factory to enable HTTP/2:
-
-```js
-import { createSecureServer } from 'node:http2'
-import { create } from '@vates/http-server-plus'
-
-const server = create({ createSecureServer }, app)
-await server.listen({ port: 443, cert, key })
-```
-
-### `server.close()`
-
-Closes all underlying servers. Returns a promise that resolves once the `close` event is emitted.
-
-```js
-await server.close()
-```

@vates/http-server-plus/.npmignore

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

@vates/http-server-plus/README.md

@@ -1,98 +0,0 @@
-<!-- DO NOT EDIT MANUALLY, THIS FILE HAS BEEN GENERATED -->
-
-# @vates/http-server-plus
-
-[![Package Version](https://badgen.net/npm/v/@vates/http-server-plus)](https://npmjs.org/package/@vates/http-server-plus) ![License](https://badgen.net/npm/license/@vates/http-server-plus) [![PackagePhobia](https://badgen.net/bundlephobia/minzip/@vates/http-server-plus)](https://bundlephobia.com/result?p=@vates/http-server-plus) [![Node compatibility](https://badgen.net/npm/node/@vates/http-server-plus)](https://npmjs.org/package/@vates/http-server-plus)
-
-> Augmented &#x60;http.Server&#x60;, HTTP/HTTPS/HTTP2 and multiple ports on the same instance
-
-## Install
-
-Installation of the [npm package](https://npmjs.org/package/@vates/http-server-plus):
-
-```sh
-npm install --save @vates/http-server-plus
-```
-
-## Usage
-
-### `create([opts], [requestListener])`
-
-Creates a new server instance. `opts` may contain `createServer` and `createSecureServer` factories (defaults to `http.createServer` and `https.createServer`). `requestListener` is registered as a `request` event listener.
-
-```js
-import { create } from '@vates/http-server-plus'
-
-const server = create(function onRequest(req, res) {
-  res.end('Hello')
-})
-```
-
-### `server.listen(opts)`
-
-Starts listening. Returns a promise that resolves to a human-readable address string, or rejects with `error.niceAddress` set.
-
-```js
-// HTTP on a specific port
-await server.listen({ port: 8080 })
-
-// HTTPS — detected automatically when cert+key are provided
-await server.listen({
-  port: 443,
-  cert: fs.readFileSync('certificate.pem'),
-  key: fs.readFileSync('private_key.pem'),
-})
-
-// Unix socket
-await server.listen({ socket: '/var/run/http.sock' })
-
-// File descriptor
-await server.listen({ fd: 3 })
-
-// Systemd socket activation
-await server.listen({ systemdSocket: 0 })
-```
-
-> As a convenience, if `hostname` is `'localhost'`, it will listen on both `127.0.0.1` and `::1`, similar to what Node does when no hostname is provided.
-
-Multiple endpoints can be started on the same instance:
-
-```js
-const [httpAddr, httpsAddr] = await Promise.all([server.listen({ port: 80 }), server.listen({ port: 443, cert, key })])
-console.log('listening on', httpAddr, httpsAddr)
-```
-
-### HTTP/2
-
-Pass a custom `createSecureServer` factory to enable HTTP/2:
-
-```js
-import { createSecureServer } from 'node:http2'
-import { create } from '@vates/http-server-plus'
-
-const server = create({ createSecureServer }, app)
-await server.listen({ port: 443, cert, key })
-```
-
-### `server.close()`
-
-Closes all underlying servers. Returns a promise that resolves once the `close` event is emitted.
-
-```js
-await server.close()
-```
-
-## 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/http-server-plus/index.js

@@ -1,268 +0,0 @@
-'use strict'
-
-// ===================================================================
-
-const EventEmitter = require('events').EventEmitter
-const formatUrl = require('url').format
-const fromEvent = require('promise-toolbox/fromEvent')
-const inherits = require('util').inherits
-const resolvePath = require('path').resolve
-
-// ===================================================================
-
-const forwardedEvents = [
-  'checkContinue',
-  'checkExpectation',
-  'clientError',
-  'connect',
-  'connection',
-  'listening',
-  'request',
-  'secureConnection',
-  'upgrade',
-]
-
-function extractProperty(obj, prop) {
-  const value = obj[prop]
-  if (value !== undefined) {
-    delete obj[prop]
-    return value
-  }
-}
-
-function forOwn(obj, cb) {
-  const keys = Object.keys(obj)
-  for (let i = 0, n = keys.length; i < n; ++i) {
-    cb(obj[keys[i]])
-  }
-}
-
-function getSystemdFd(index) {
-  if (process.pid !== +process.env.LISTEN_PID) {
-    throw new Error('systemd sockets are not meant for us (LISTEN_PID)')
-  }
-
-  const listenFds = process.env.LISTEN_FDS
-  if (listenFds == null) {
-    throw new Error('no systemd sockets found (LISTEN_FDS)')
-  }
-  const max = listenFds - 1
-
-  if (index > max) {
-    throw new Error('no such systemd socket found')
-  }
-
-  return index + 3 // 3 = SD_LISTEN_FDS_START
-}
-
-const isEmpty = obj => Object.keys(obj).length === 0
-
-// ===================================================================
-
-function onNewListener(event, listener) {
-  if (forwardedEvents.includes(event)) {
-    forOwn(this._servers, server => {
-      server.on(event, listener)
-    })
-  }
-}
-
-function onRemoveListener(event, listener) {
-  if (forwardedEvents.includes(event)) {
-    forOwn(this._servers, server => {
-      server.off(event, listener)
-    })
-  }
-}
-
-function Server(opts) {
-  EventEmitter.call(this)
-
-  this._createServer = (opts != null && opts.createServer) || require('http').createServer
-  this._createSecureServer = (opts != null && opts.createSecureServer) || require('https').createServer
-  this._servers = Object.create(null)
-  this._niceAddresses = Object.create(null)
-
-  this.on('removeListener', onRemoveListener).on('newListener', onNewListener)
-}
-inherits(Server, EventEmitter)
-
-const proto = Server.prototype
-
-function getAddress(serverId) {
-  return this[serverId].address()
-}
-proto.addresses = function Server$addresses() {
-  const servers = this._servers
-  return Object.keys(servers).map(getAddress, servers)
-}
-
-function getNiceAddress(serverId) {
-  return this[serverId]
-}
-proto.niceAddresses = function Server$niceAddresses() {
-  const niceAddresses = this._niceAddresses
-  return Object.keys(niceAddresses).map(getNiceAddress, niceAddresses)
-}
-
-function close(server) {
-  server.close()
-}
-
-proto.close = function Server$close(callback) {
-  if (callback) {
-    this.once('close', callback)
-  }
-
-  // Emit the close event even if there are no registered servers.
-  if (isEmpty(this._servers)) {
-    const self = this
-    setImmediate(function () {
-      self.emit('close')
-    })
-    return Promise.resolve()
-  }
-  // Closes each servers.
-  forOwn(this._servers, close)
-
-  return fromEvent(this, 'close')
-}
-
-let nextId = 0
-proto.listen = function Server$listen(opts) {
-  opts = Object.assign({}, opts)
-
-  if (opts.hostname === 'localhost') {
-    return Promise.all([
-      this.listen(Object.assign(opts, { hostname: '::1' })),
-      this.listen(Object.assign(opts, { hostname: '127.0.0.1' })),
-    ]).then(addresses => addresses[0])
-  }
-
-  const hostname = extractProperty(opts, 'hostname')
-  let port = extractProperty(opts, 'port')
-  const systemdSocket = extractProperty(opts, 'systemdSocket')
-  let fd = extractProperty(opts, 'fd')
-  let socket = extractProperty(opts, 'socket')
-
-  const servers = this._servers
-
-  const niceAddresses = this._niceAddresses
-
-  let server, protocol
-  if (opts.pfx || opts.SNICallback || (opts.cert && opts.key)) {
-    server = this._createSecureServer(opts)
-    protocol = 'https'
-  } else {
-    server = this._createServer(opts)
-    protocol = 'http'
-  }
-
-  const id = nextId++
-  servers[id] = server
-
-  if (systemdSocket != null) {
-    fd = getSystemdFd(systemdSocket)
-  }
-
-  // Compute a temporary nice address to display in case of error.
-  let niceAddress
-  if (fd != null) {
-    server.listen({ fd })
-    niceAddress = protocol + '://<fd:' + fd + '>'
-  } else if (socket != null) {
-    socket = resolvePath(socket)
-    server.listen(socket)
-    niceAddress = protocol + '://' + socket
-  } else {
-    if (port == null) {
-      port = protocol === 'https' ? 443 : 80
-    }
-    server.listen(port, hostname)
-    niceAddress = formatUrl({
-      protocol,
-
-      // Hostname default to localhost.
-      hostname: hostname || 'localhost',
-
-      // No port means random, unknown for now.
-      port: port || '<unknown>',
-    })
-  }
-
-  const emit = this.emit.bind(this)
-  server.once('close', function onClose() {
-    delete servers[id]
-    delete niceAddresses[id]
-
-    if (isEmpty(servers)) {
-      emit('close')
-    }
-  })
-
-  server.on('error', function onError() {
-    delete servers[id]
-
-    // FIXME: Should it be forwarded and be fatal if there are no
-    // listeners?
-  })
-
-  forwardedEvents.forEach(event => {
-    this.listeners(event).forEach(listener => {
-      server.on(event, listener)
-    })
-  })
-
-  return fromEvent(server, 'listening').then(
-    function () {
-      const address = server.address()
-      const niceAddress =
-        typeof address === 'string'
-          ? protocol + '://' + address
-          : formatUrl({
-              protocol,
-              hostname: address.address,
-              port: address.port,
-            })
-      niceAddresses[id] = niceAddress
-      return niceAddress
-    },
-    function (error) {
-      error.niceAddress = niceAddress
-      throw error
-    }
-  )
-}
-
-function ref(server) {
-  server.ref()
-}
-
-proto.ref = function Server$ref() {
-  forOwn(this._servers, ref)
-}
-
-function unref(server) {
-  server.unref()
-}
-
-proto.unref = function Server$unref() {
-  forOwn(this._servers, unref)
-}
-
-// ===================================================================
-
-module.exports = exports = Server
-
-exports.create = function create(opts, requestListener) {
-  if (typeof opts === 'function') {
-    requestListener = opts
-    opts = undefined
-  }
-
-  const server = new Server(opts)
-  if (requestListener !== undefined) {
-    server.on('request', requestListener)
-  }
-  return server
-}

@vates/http-server-plus/index.spec.js

@@ -1,303 +0,0 @@
-'use strict'
-
-// ===================================================================
-
-const assert = require('assert/strict')
-const { EventEmitter } = require('events')
-const resolvePath = require('path').resolve
-const { describe, it } = require('node:test')
-
-const HttpServerPlus = require('./')
-
-// ===================================================================
-
-// Creates a minimal mock server that can be used as a drop-in for http/https.Server.
-// `address` is the value returned by mock.address() — use an object for TCP, a string for sockets.
-function createMock(address) {
-  const mock = new EventEmitter()
-  mock.listen = function () {
-    setImmediate(() => this.emit('listening'))
-  }
-  mock.address = () => address
-  mock.close = function () {
-    setImmediate(() => this.emit('close'))
-  }
-  return mock
-}
-
-// ===================================================================
-
-describe('HttpServerPlus', function () {
-  describe('#create()', function () {
-    it('creates a new instance', function () {
-      assert(HttpServerPlus.create() instanceof HttpServerPlus)
-    })
-
-    it('can register a `request` listener', function () {
-      const listener = function () {}
-      const server = HttpServerPlus.create(listener)
-
-      assert.deepEqual(server.listeners('request'), [listener])
-    })
-  })
-
-  describe('.addresses()', function () {
-    it('returns the list of addresses the server is listening at', function () {
-      const addr = { address: '127.0.0.1', port: 8080, family: 'IPv4' }
-      const mock = createMock(addr)
-      const server = HttpServerPlus.create({ createServer: () => mock })
-
-      return server.listen({ port: 8080 }).then(function () {
-        assert.deepEqual(server.addresses(), [addr])
-        return server.close()
-      })
-    })
-  })
-
-  describe('.niceAddresses()', function () {
-    it('returns the list of human readable addresses the server is listening at', function () {
-      const mock = createMock({ address: '127.0.0.1', port: 8080 })
-      const server = HttpServerPlus.create({ createServer: () => mock })
-
-      return server.listen({ hostname: '127.0.0.1', port: 8080 }).then(function (address) {
-        assert.deepEqual(server.niceAddresses(), [address])
-        return server.close()
-      })
-    })
-  })
-
-  describe('secureConnection event forwarding', function () {
-    function createMockHttpsServer() {
-      const server = new EventEmitter()
-      server.listen = function () {
-        setImmediate(() => this.emit('listening'))
-      }
-      server.address = () => ({ address: '127.0.0.1', port: 8443 })
-      server.close = function () {
-        setImmediate(() => this.emit('close'))
-      }
-      return server
-    }
-
-    function createServerWithMock() {
-      let mockServer
-      const server = HttpServerPlus.create({
-        createSecureServer: () => {
-          mockServer = createMockHttpsServer()
-          return mockServer
-        },
-      })
-      return {
-        server,
-        getMock: () => mockServer,
-      }
-    }
-
-    it('forwards secureConnection to listeners registered before listen()', function () {
-      const { server, getMock } = createServerWithMock()
-
-      const received = []
-      server.on('secureConnection', socket => received.push(socket))
-
-      const fakeSocket = {}
-      return server.listen({ cert: 'fake-cert', key: 'fake-key' }).then(function () {
-        getMock().emit('secureConnection', fakeSocket)
-        assert.deepEqual(received, [fakeSocket])
-        return server.close()
-      })
-    })
-
-    it('forwards secureConnection to listeners registered after listen()', function () {
-      const { server, getMock } = createServerWithMock()
-
-      return server.listen({ cert: 'fake-cert', key: 'fake-key' }).then(function () {
-        const received = []
-        server.on('secureConnection', socket => received.push(socket))
-
-        const fakeSocket = {}
-        getMock().emit('secureConnection', fakeSocket)
-        assert.deepEqual(received, [fakeSocket])
-        return server.close()
-      })
-    })
-
-    it('stops forwarding secureConnection after listener is removed', function () {
-      const { server, getMock } = createServerWithMock()
-
-      const received = []
-      const listener = socket => received.push(socket)
-      server.on('secureConnection', listener)
-
-      return server.listen({ cert: 'fake-cert', key: 'fake-key' }).then(function () {
-        server.off('secureConnection', listener)
-
-        getMock().emit('secureConnection', {})
-        assert.deepEqual(received, [])
-        return server.close()
-      })
-    })
-  })
-
-  describe('.listen()', function () {
-    it('can use a host:port', function () {
-      let listenArgs
-      const mock = createMock({ address: '127.0.0.1', port: 8080 })
-      mock.listen = function (...args) {
-        listenArgs = args
-        setImmediate(() => this.emit('listening'))
-      }
-      const server = HttpServerPlus.create({ createServer: () => mock })
-
-      return server.listen({ hostname: '127.0.0.1', port: 8080 }).then(function () {
-        assert.deepEqual(listenArgs, [8080, '127.0.0.1'])
-        return server.close()
-      })
-    })
-
-    it('can use a systemd socket', function () {
-      const SD_LISTEN_FDS_START = 3
-      const SOCKET_INDEX = 0
-
-      let listenArgs
-      const mock = createMock('http://<fd:3>')
-      mock.listen = function (...args) {
-        listenArgs = args
-        setImmediate(() => this.emit('listening'))
-      }
-
-      const server = HttpServerPlus.create({ createServer: () => mock })
-
-      const env = process.env
-      env.LISTEN_FDS = String(SOCKET_INDEX + 1)
-      env.LISTEN_PID = String(process.pid)
-
-      return server.listen({ systemdSocket: SOCKET_INDEX }).then(function () {
-        delete env.LISTEN_FDS
-        delete env.LISTEN_PID
-
-        assert.deepEqual(listenArgs, [{ fd: SOCKET_INDEX + SD_LISTEN_FDS_START }])
-        return server.close()
-      })
-    })
-
-    it('can use a socket', function () {
-      const socketPath = '/tmp/http-server-plus-test.sock'
-      let listenArgs
-      const mock = createMock(socketPath)
-      mock.listen = function (...args) {
-        listenArgs = args
-        setImmediate(() => this.emit('listening'))
-      }
-      const server = HttpServerPlus.create({ createServer: () => mock })
-
-      return server.listen({ socket: socketPath }).then(function () {
-        assert.deepEqual(listenArgs, [resolvePath(socketPath)])
-        return server.close()
-      })
-    })
-
-    it('can use a HTTPS certificate', function () {
-      let capturedOpts
-      const mock = createMock({ address: '127.0.0.1', port: 8443 })
-      const server = HttpServerPlus.create({
-        createSecureServer: opts => {
-          capturedOpts = opts
-          return mock
-        },
-      })
-
-      return server.listen({ cert: 'my-cert', key: 'my-key', port: 8443 }).then(function (address) {
-        assert.equal(capturedOpts.cert, 'my-cert')
-        assert.equal(capturedOpts.key, 'my-key')
-        assert.ok(address.startsWith('https://'), `expected https URL, got: ${address}`)
-        return server.close()
-      })
-    })
-
-    it('returns a promise which will resolve once listening', function () {
-      const mock = createMock({ address: '127.0.0.1', port: 8080 })
-      const server = HttpServerPlus.create({ createServer: () => mock })
-
-      return server.listen({ port: 8080 }).then(function (address) {
-        assert.equal(typeof address, 'string')
-        assert.ok(address.startsWith('http://'), `expected http URL, got: ${address}`)
-        return server.close()
-      })
-    })
-
-    it('returns a promise which will reject if failure', function () {
-      const listenError = new Error('EADDRINUSE')
-      const mock = createMock(null)
-      mock.listen = function () {
-        setImmediate(() => this.emit('error', listenError))
-      }
-      const server = HttpServerPlus.create({ createServer: () => mock })
-
-      return server.listen({ port: 8080 }).then(
-        function () {
-          assert.fail('should have rejected')
-        },
-        function (err) {
-          assert.equal(err, listenError)
-          assert.equal(typeof err.niceAddress, 'string')
-        }
-      )
-    })
-  })
-
-  describe('.close()', function () {
-    it('closes all servers', function () {
-      const closed = []
-      let callCount = 0
-
-      const server = HttpServerPlus.create({
-        createServer: () => {
-          const id = callCount++
-          const mock = createMock({ address: '127.0.0.1', port: id })
-          mock.close = function () {
-            closed.push(id)
-            setImmediate(() => this.emit('close'))
-          }
-          return mock
-        },
-      })
-
-      return Promise.all([server.listen({ port: 0 }), server.listen({ port: 0 })])
-        .then(function () {
-          return server.close()
-        })
-        .then(function () {
-          assert.equal(closed.length, 2)
-        })
-    })
-
-    it('emit the `close` event when all servers are closed', function () {
-      const mock = createMock({ address: '127.0.0.1', port: 8080 })
-      const server = HttpServerPlus.create({ createServer: () => mock })
-
-      let closeEmitted = false
-      server.on('close', () => {
-        closeEmitted = true
-      })
-
-      return server
-        .listen({ port: 8080 })
-        .then(function () {
-          return server.close()
-        })
-        .then(function () {
-          assert.ok(closeEmitted)
-        })
-    })
-
-    it('emit the `close` event even if there are no servers', function () {
-      const server = HttpServerPlus.create()
-
-      // close() with no servers returns Promise.resolve() immediately (before emitting
-      // 'close' via setImmediate), so we must wait for the event itself, not the promise.
-      return new Promise(function (resolve) {
-        server.close(resolve)
-      })
-    })
-  })
-})

@vates/http-server-plus/package.json

@@ -1,38 +0,0 @@
-{
-  "name": "@vates/http-server-plus",
-  "version": "2.0.2",
-  "license": "ISC",
-  "description": "Augmented `http.Server`, HTTP/HTTPS/HTTP2 and multiple ports on the same instance",
-  "keywords": [
-    "http",
-    "https",
-    "server",
-    "ports"
-  ],
-  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/http-server-plus",
-  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
-  "repository": {
-    "directory": "@vates/http-server-plus",
-    "type": "git",
-    "url": "https://github.com/vatesfr/xen-orchestra.git"
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "dependencies": {
-    "promise-toolbox": "^0.21.0"
-  },
-  "devDependencies": {
-    "eslint-plugin-n": "^15.1.0"
-  },
-  "scripts": {
-    "pretest": "eslint .",
-    "test": "node --test index.spec.js",
-    "postversion": "npm publish --access public"
-  },
-  "private": false,
-  "author": {
-    "name": "Vates SAS",
-    "url": "https://vates.fr"
-  }
-}

@vates/nbd-client/NbdDisk.mjs

@@ -19,12 +19,6 @@ export class NbdDisk extends RandomAccessDisk {
   /** @type {number} */
   #blockSize
 
-  /** @type {number | undefined} */
-  #hasBlockCursor
-
-  /** @type {number | undefined} */
-  #hasBlockPreviousIndex
-
   constructor(nbdInfos, blockSize, { dataMap } = {}) {
     super()
     this.#blockSize = blockSize
@@ -33,38 +27,11 @@ export class NbdDisk extends RandomAccessDisk {
   }
 
   #processDatamap(rawDataMap) {
-    const ranges = rawDataMap
-      .filter(({ type, length }) => type === 0 && length > 0)
+    return rawDataMap
+      .filter(({ type }) => type === 0)
       .map(({ offset, length }) => ({ offset, length }))
       .sort(({ offset: offset1 }, { offset: offset2 }) => offset1 - offset2)
-
-    // hasBlock()'s forward-only cursor is only correct if the extents are
-    // sorted AND disjoint: an earlier extent must never reach into a block
-    // after a later one, otherwise the cursor could skip it and wrongly report
-    // a block as empty, dropping data and corrupting the output.
-    // Touching extents (cur.offset === prevEnd) are merged
-    const merged = []
-    for (const range of ranges) {
-      const last = merged[merged.length - 1]
-      if (last !== undefined) {
-        const lastEnd = last.offset + last.length
-        if (range.offset < lastEnd) {
-          throw new Error(
-            `overlapping ranges in data map: [${last.offset}, ${lastEnd}) and [${range.offset}, ${range.offset + range.length})`
-          )
-        }
-        if (range.offset === lastEnd) {
-          // touching: extend the previous extent
-          last.length += range.length
-          continue
-        }
-      }
-      // gap (or first range): new extent
-      merged.push(range)
-    }
-    return merged
   }
-
   /**
    * @param {number} index
    * @returns {Promise<DiskBlock>}
@@ -150,34 +117,6 @@ export class NbdDisk extends RandomAccessDisk {
     return [...indexes].sort((a, b) => a - b)
   }
 
-  /**
-   * Counts the allocated blocks without materializing the index list.
-   *
-   * @returns {number}
-   */
-  getBlockIndexesCount() {
-    if (!this.#dataMap) {
-      throw new Error("can't getBlockIndexesCount before init")
-    }
-
-    const blockSize = this.getBlockSize()
-
-    let count = 0
-    let lastCountedBlock = -1
-    for (const { offset, length } of this.#dataMap) {
-      const firstBlockIndex = Math.floor(offset / blockSize)
-      const lastBlockIndex = Math.floor((offset + length - 1) / blockSize)
-      const from = Math.max(firstBlockIndex, lastCountedBlock + 1)
-
-      if (lastBlockIndex >= from) {
-        count += lastBlockIndex - from + 1
-        lastCountedBlock = lastBlockIndex
-      }
-    }
-
-    return count
-  }
-
   /**
    * @param {number} index
    * @returns {boolean}
@@ -186,32 +125,8 @@ export class NbdDisk extends RandomAccessDisk {
     if (!this.#dataMap) {
       throw new Error("can't hasBlock before init")
     }
-
-    const blockSize = this.getBlockSize()
-    const blockStart = index * blockSize
-    const blockEnd = blockStart + blockSize
-
-    let startExtentIndex = 0
-    if (this.#hasBlockCursor !== undefined && index >= this.#hasBlockPreviousIndex) {
-      startExtentIndex = this.#hasBlockCursor
-    } else {
-      this.#hasBlockCursor = undefined
-    }
-    this.#hasBlockPreviousIndex = index
-
-    const dataMap = this.#dataMap
-    const l = dataMap.length
-    for (let i = startExtentIndex; i < l; i++) {
-      const { offset, length } = dataMap[i]
-      if (offset >= blockEnd) {
-        // extents are sorted: nothing from here on can overlap this block
-        break
-      }
-      if (offset + length > blockStart) {
-        this.#hasBlockCursor = i
-        return true
-      }
-    }
-    return false
+    const blockStart = index * this.getBlockSize()
+    const blockEnd = (index + 1) * this.getBlockSize()
+    return this.#dataMap.some(({ offset, length }) => offset + length > blockStart && offset < blockEnd)
   }
 }

@vates/nbd-client/NbdDisk.test.mjs

@@ -1,127 +0,0 @@
-import { describe, it } from 'node:test'
-import assert from 'node:assert'
-
-import { NbdDisk } from './NbdDisk.mjs'
-
-const KiB = 1024
-const MiB = 1024 * KiB
-const TiB = 1024 * 1024 * MiB
-
-const SOURCE_BLOCK_SIZE = 2 * MiB // VHD_BLOCK_SIZE, the block size used when importing from VMware
-const CLUSTER_SIZE = 64 * KiB // qcow2 cluster size
-
-// hasBlock() only needs the dataMap (passed through the constructor) and the
-// block size, so we can exercise it without a live NBD connection.
-describe('NbdDisk.hasBlock', () => {
-  it('reports allocated and unallocated blocks correctly', () => {
-    const dataMap = [
-      { type: 0, offset: 0, length: SOURCE_BLOCK_SIZE }, // block 0
-      { type: 0, offset: 5 * SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE }, // block 5
-    ]
-    const disk = new NbdDisk({}, SOURCE_BLOCK_SIZE, { dataMap })
-
-    assert.strictEqual(disk.hasBlock(0), true)
-    assert.strictEqual(disk.hasBlock(1), false)
-    assert.strictEqual(disk.hasBlock(4), false)
-    assert.strictEqual(disk.hasBlock(5), true)
-    assert.strictEqual(disk.hasBlock(6), false)
-  })
-
-  it('handles repeated and out-of-order queries with the resume cursor', () => {
-    const dataMap = [
-      { type: 0, offset: 0, length: SOURCE_BLOCK_SIZE }, // block 0
-      { type: 0, offset: 5 * SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE }, // block 5
-    ]
-    const disk = new NbdDisk({}, SOURCE_BLOCK_SIZE, { dataMap })
-
-    // repeated indexes (the qcow2 path queries each 2MB block ~32 times as it
-    // walks 64KB clusters) must return a stable answer
-    assert.strictEqual(disk.hasBlock(5), true)
-    assert.strictEqual(disk.hasBlock(5), true)
-    assert.strictEqual(disk.hasBlock(6), false)
-    assert.strictEqual(disk.hasBlock(6), false)
-
-    // querying backwards must still be correct (falls back to a full scan)
-    assert.strictEqual(disk.hasBlock(0), true)
-    assert.strictEqual(disk.hasBlock(5), true)
-  })
-
-  it('invalidates the cursor on a backward miss (no stale skip)', () => {
-    const dataMap = [
-      { type: 0, offset: 3 * SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE }, // block 3
-      { type: 0, offset: 10 * SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE }, // block 10
-    ]
-    const disk = new NbdDisk({}, SOURCE_BLOCK_SIZE, { dataMap })
-
-    assert.strictEqual(disk.hasBlock(10), true) // forward hit: cursor parks on the high extent
-    assert.strictEqual(disk.hasBlock(1), false) // backward miss: must invalidate the cursor
-    assert.strictEqual(disk.hasBlock(3), true) // lower extent must not be skipped
-  })
-
-  it('throws on overlapping ranges (would break the resume cursor)', () => {
-    const dataMap = [
-      { type: 0, offset: 0, length: SOURCE_BLOCK_SIZE },
-      { type: 0, offset: SOURCE_BLOCK_SIZE / 2, length: SOURCE_BLOCK_SIZE }, // overlaps the previous range
-    ]
-    assert.throws(() => new NbdDisk({}, SOURCE_BLOCK_SIZE, { dataMap }), /overlapping ranges/)
-  })
-
-  it('merges touching ranges and drops zero-length / non type-0 entries', () => {
-    const dataMap = [
-      { type: 0, offset: 2 * SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE }, // [2, 3)
-      { type: 0, offset: 0, length: SOURCE_BLOCK_SIZE / 2 }, // [0, .5)
-      { type: 0, offset: SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE }, // [1, 2)
-      { type: 0, offset: SOURCE_BLOCK_SIZE / 2, length: SOURCE_BLOCK_SIZE / 2 }, // [.5, 1), touches [0, .5)
-      { type: 1, offset: 10 * SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE }, // wrong type: ignored
-      { type: 0, offset: 7 * SOURCE_BLOCK_SIZE, length: 0 }, // zero length: ignored
-    ]
-    const disk = new NbdDisk({}, SOURCE_BLOCK_SIZE, { dataMap })
-
-    assert.strictEqual(disk.hasBlock(0), true)
-    assert.strictEqual(disk.hasBlock(1), true)
-    assert.strictEqual(disk.hasBlock(2), true)
-    assert.strictEqual(disk.hasBlock(3), false)
-    assert.strictEqual(disk.hasBlock(7), false) // zero-length range dropped
-    assert.strictEqual(disk.hasBlock(10), false) // non type-0 range dropped
-  })
-})
-
-describe('NbdDisk.getBlockIndexesCount', () => {
-  const cases = {
-    'aligned, disjoint blocks': [
-      { type: 0, offset: 0, length: SOURCE_BLOCK_SIZE }, // block 0
-      { type: 0, offset: 5 * SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE }, // block 5
-    ],
-    'a range spanning several blocks': [
-      { type: 0, offset: SOURCE_BLOCK_SIZE / 2, length: 3 * SOURCE_BLOCK_SIZE }, // blocks 0,1,2,3
-    ],
-    'two disjoint extents sharing block 0 (needs dedup)': [
-      { type: 0, offset: 0, length: SOURCE_BLOCK_SIZE / 2 }, // [0, .5) => block 0
-      { type: 0, offset: 3 * (SOURCE_BLOCK_SIZE / 4), length: SOURCE_BLOCK_SIZE }, // [.75, 1.75) => blocks 0,1
-    ],
-    'touching sub-block fragments': [
-      { type: 0, offset: 0, length: SOURCE_BLOCK_SIZE / 2 },
-      { type: 0, offset: SOURCE_BLOCK_SIZE / 2, length: SOURCE_BLOCK_SIZE / 2 },
-      { type: 0, offset: SOURCE_BLOCK_SIZE, length: SOURCE_BLOCK_SIZE },
-    ],
-    empty: [],
-  }
-
-  for (const [name, dataMap] of Object.entries(cases)) {
-    it(`matches getBlockIndexes().length: ${name}`, () => {
-      const disk = new NbdDisk({}, SOURCE_BLOCK_SIZE, { dataMap })
-      assert.strictEqual(disk.getBlockIndexesCount(), disk.getBlockIndexes().length)
-    })
-  }
-
-  it('matches getBlockIndexes().length on the large sparse map', () => {
-    const virtualSize = Math.floor(3.5 * TiB)
-    const NB_RANGES = 113528
-    const dataMap = []
-    for (let i = 0; i < NB_RANGES; i++) {
-      dataMap.push({ type: 0, offset: Math.floor((i / NB_RANGES) * virtualSize), length: CLUSTER_SIZE })
-    }
-    const disk = new NbdDisk({}, SOURCE_BLOCK_SIZE, { dataMap })
-    assert.strictEqual(disk.getBlockIndexesCount(), disk.getBlockIndexes().length)
-  })
-})

@vates/nbd-client/index.mjs

@@ -353,7 +353,6 @@ export default class NbdClient {
   async readBlock(index, size = NBD_DEFAULT_BLOCK_SIZE) {
     return pRetry(() => this.#readBlock(index, size), {
       tries: this.#readBlockRetries,
-      when: error => error.code !== 'ERR_ABORTED',
       onRetry: async err => {
         warn('will retry reading block ', index, err)
         await this.reconnect()
@@ -371,7 +370,7 @@ export default class NbdClient {
    * - `length` — The size of the segment in bytes.
    * - `type` — A numeric code indicating the segment type ( 0 means data).
    */
-  /* async */ getMap(signal) {
+  /* async */ getMap() {
     return new Promise((resolve, reject) => {
       const process = spawn('nbdinfo', [
         '--json',
@@ -382,17 +381,8 @@ export default class NbdClient {
       let errText = ''
       process.stdout.on('data', data => (text += data))
       process.stderr.on('data', data => (errText += data))
-      const onAbort = () => {
-        process.kill()
-        reject(signal.reason)
-      }
-      signal?.addEventListener('abort', onAbort, { once: true })
-      process.on('error', err => {
-        signal?.removeEventListener('abort', onAbort)
-        reject(err)
-      })
+      process.on('error', reject)
       process.on('close', code => {
-        signal?.removeEventListener('abort', onAbort)
         if (code !== 0) {
           return reject(new Error(`Error during getMap (code: ${code}): ${errText}`))
         }

@vates/nbd-client/multi.mjs

@@ -138,8 +138,8 @@ export default class MultiNbdClient {
    * - `length` — The size of the segment in bytes.
    * - `type` — A numeric code indicating the segment type (0 means no data).
    */
-  async getMap(signal) {
+  async getMap() {
     // ask the map from one of the connected client
-    return this.#clients[Math.floor(this.#clients.length * Math.random())].getMap(signal)
+    return this.#clients[Math.floor(this.#clients.length * Math.random())].getMap()
   }
 }

@vates/nbd-client/package.json

@@ -13,19 +13,19 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "3.5.0",
+  "version": "3.2.3",
   "engines": {
     "node": ">=14.0"
   },
   "main": "./index.mjs",
   "dependencies": {
-    "@vates/async-each": "^1.0.3",
+    "@vates/async-each": "^1.0.1",
     "@vates/read-chunk": "^1.2.1",
-    "@xen-orchestra/async-map": "^0.1.3",
-    "@xen-orchestra/disk-transform": "^1.3.3",
-    "@xen-orchestra/log": "^0.7.2",
+    "@xen-orchestra/async-map": "^0.1.2",
+    "@xen-orchestra/disk-transform": "^1.2.1",
+    "@xen-orchestra/log": "^0.7.1",
     "promise-toolbox": "^0.21.0",
-    "xen-api": "^4.8.0"
+    "xen-api": "^4.7.6"
   },
   "devDependencies": {
     "tap": "^18.7.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vates/node-vsphere-soap",
-  "version": "2.1.3",
+  "version": "2.1.2",
   "description": "interface to vSphere SOAP/WSDL from node for interfacing with vCenter or ESXi, forked from node-vsphere-soap",
   "main": "lib/client.mjs",
   "author": "reedog117",
@@ -11,8 +11,8 @@
   },
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "dependencies": {
-    "@xen-orchestra/log": "^0.7.2",
-    "axios": "^1.15.0",
+    "@xen-orchestra/log": "^0.7.1",
+    "axios": "^1.8.0",
     "soap": "^1.0.0",
     "soap-cookie": "^0.10.1"
   },

@vates/task/combineEvents.js

@@ -23,7 +23,7 @@ exports.makeOnProgress = function ({ onRootTaskEnd = noop, onRootTaskStart = noo
         Object.defineProperty(taskLog, '$root', { value: taskLog })
 
         // start of a root task
-        onRootTaskStart(taskLog, event)
+        onRootTaskStart(taskLog)
       } else {
         // start of a subtask
         const parent = taskLogs.get(parentId)
@@ -54,10 +54,10 @@ exports.makeOnProgress = function ({ onRootTaskEnd = noop, onRootTaskStart = noo
       }
 
       if (type === 'end' && taskLog.$root === taskLog) {
-        onRootTaskEnd(taskLog, event)
+        onRootTaskEnd(taskLog)
       }
     }
 
-    onTaskUpdate(taskLog, event)
+    onTaskUpdate(taskLog)
   }
 }

@vates/task/index.js

@@ -7,27 +7,6 @@ function alreadyEnded() {
   throw new Error('task has already ended')
 }
 
-const serializeErrors = errors => (Array.isArray(errors) ? errors.map(serializeError) : errors)
-
-// Create a serializable object from an error.
-//
-// Otherwise some fields might be non-enumerable and missing from logs.
-const serializeError = error => {
-  return error instanceof Error
-    ? {
-        ...error, // Copy enumerable properties.
-        cause: error.cause,
-        code: error.code,
-        errors: serializeErrors(error.errors), // supports AggregateError
-        message: error.message,
-        name: error.name,
-        stack: error.stack,
-      }
-    : error
-}
-
-exports.serializeError = serializeError
-
 // define a read-only, non-enumerable, non-configurable property
 function define(object, property, value) {
   Object.defineProperty(object, property, { value })
@@ -93,11 +72,7 @@ class Task {
   _onProgress
 
   get id() {
-    // Use a compact, sortable, string representation of the creation date,
-    // and add a random part to differentiate tasks created at the same time
-    //
-    // Due to the padding, dates are sortable up to 5188-04-22T11:04:28.415Z
-    return (this.id = Date.now().toString(36).padStart(9, '0') + '-' + Math.random().toString(36).slice(2))
+    return (this.id = Math.random().toString(36).slice(2))
   }
   set id(value) {
     define(this, 'id', value)
@@ -161,10 +136,6 @@ class Task {
     assert.equal(this.#status, PENDING)
     assert.equal(this.#running, false)
 
-    if (result instanceof Error && result.toJSON === undefined) {
-      result = serializeError(result)
-    }
-
     this.#emit('end', { status, result })
     this._onProgress = alreadyEnded
     this.#status = status

@vates/task/index.test.js

@@ -4,7 +4,7 @@ const assert = require('node:assert').strict
 const { describe, it } = require('node:test')
 
 const { makeOnProgress } = require('./combineEvents.js')
-const { Task, serializeError } = require('./index.js')
+const { Task } = require('./index.js')
 
 const noop = Function.prototype
 
@@ -28,36 +28,6 @@ function createTask(opts) {
   return task
 }
 
-describe('serializeError', function () {
-  it('serializes simple error', function () {
-    const err = new Error('test Error')
-    err.code = 404
-    const serialized = serializeError(err)
-    assert.equal(serialized.message, 'test Error')
-    assert.equal(serialized.name, 'Error')
-    assert.equal(serialized.code, 404)
-    assert.notEqual(serialized.stack, undefined)
-  })
-
-  it('serializes aggregate error', function () {
-    const err = new AggregateError([new Error('test error 1'), new Error('test error 2')], 'Error message', {
-      cause: 'broken',
-    })
-    const serialized = serializeError(err)
-    assert.equal(serialized.message, 'Error message')
-    assert.equal(serialized.name, 'AggregateError')
-    assert.equal(serialized.cause, 'broken')
-    assert.notEqual(serialized.stack, undefined)
-    assert.equal(serialized.errors.length, 2)
-    assert.equal(serialized.errors[0].name, 'Error')
-    assert.equal(serialized.errors[1].name, 'Error')
-    assert.equal(serialized.errors[0].message, 'test error 1')
-    assert.equal(serialized.errors[1].message, 'test error 2')
-    assert.notEqual(serialized.errors[0].stack, undefined)
-    assert.notEqual(serialized.errors[1].stack, undefined)
-  })
-})
-
 describe('Task', function () {
   describe('constructor', function () {
     it('data properties are passed to the start event', async function () {
@@ -136,7 +106,7 @@ describe('Task', function () {
       assert.equal(task.$events.length, 3)
       assertEvent(task, { type: 'start' }, 0)
       assertEvent(task, { type: 'abortionRequested', reason }, 1)
-      assertEvent(task, { type: 'end', status: 'failure', result: serializeError(result) }, 2)
+      assertEvent(task, { type: 'end', status: 'failure', result }, 2)
     })
 
     it('does not abort if the task succeed', async function () {
@@ -206,7 +176,7 @@ describe('Task', function () {
 
       assertEvent(task, {
         status: 'failure',
-        result: serializeError(error),
+        result: error,
         type: 'end',
       })
     })
@@ -505,7 +475,7 @@ describe('Task', function () {
       assert.equal(task.status, 'failure')
       assertEvent(task, {
         status: 'failure',
-        result: serializeError(e),
+        result: e,
         type: 'end',
       })
     })
@@ -541,7 +511,7 @@ describe('Task', function () {
       assert.equal(task.status, 'failure')
       assertEvent(task, {
         status: 'failure',
-        result: serializeError(e),
+        result: e,
         type: 'end',
       })
     })

@vates/task/package.json

@@ -13,7 +13,7 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "0.7.0",
+  "version": "0.6.2",
   "engines": {
     "node": ">=14"
   },

@vates/types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vates/types",
   "private": false,
-  "version": "1.30.1",
+  "version": "1.21.0",
   "main": "./dist/index.mjs",
   "exports": {
     ".": {
@@ -32,8 +32,7 @@
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "typescript": "~5.6.3",
-    "typescript-eslint": "^8.61.0",
-    "@types/express": "^5.0.0"
+    "typescript-eslint": "^8.23.0"
   },
   "scripts": {
     "build": "tsc",

@vates/types/src/common.mts

@@ -1,4 +1,4 @@
-import type { XoHost, XoNetwork, XoVif } from './xo.mjs'
+import type { XoHost } from './xo.mjs'
 
 declare const __brand: unique symbol
 
@@ -740,32 +740,3 @@ export type XapiVmStatsRaw = {
 export type XapiVmStats = XapiStatsResponse<XapiVmStatsRaw>
 
 export type XapiPoolStats = Record<XoHost['id'], XapiHostStats | { error: Record<string, unknown> }>
-
-export type TrafficRuleProtocol = (typeof TRAFFIC_RULE_PROTOCOLS)[number]
-
-export const SDN_CONTROLLER_OF_RULES_KEY = 'xo:sdn-controller:of-rules'
-export const SDN_CONTROLLER_OF_METHOD_KEY = 'xo:sdn-controller:of-method'
-export const SDN_CONTROLLER_OF_FORMAT_KEY = 'xo:sdn-controller:of-format'
-export const TRAFFIC_RULE_PROTOCOLS = ['ARP', 'ICMP', 'IP', 'TCP', 'UDP'] as const
-export const TRAFFIC_RULE_PROTOCOLS_WITH_PORT: readonly TrafficRuleProtocol[] = ['TCP', 'UDP']
-
-export type TrafficRuleTargetType = XoNetwork['type'] | XoVif['type']
-
-export type TrafficRuleDirection = 'from' | 'to' | 'from/to'
-
-export type RawTrafficRule = {
-  allow: boolean
-  protocol: string
-  ipRange: string
-  direction: string
-  port?: string
-}
-
-type BaseTrafficRule = RawTrafficRule & {
-  id: string
-  networkId: XoNetwork['id']
-}
-
-export type TrafficRule =
-  | (BaseTrafficRule & { type: XoVif['type']; sourceId: XoVif['id'] })
-  | (BaseTrafficRule & { type: XoNetwork['type']; sourceId: XoNetwork['id'] })

@vates/types/src/index.mts

@@ -3,6 +3,4 @@ export * from './xen-api.mjs'
 export * from './xo.mjs'
 export * from './xo-app.mjs'
 export * from './lib/xen-orchestra-xapi.mjs'
-export * from './lib/xen-orchestra-acl.mjs'
 export * from './lib/complex-matcher.mjs'
-export * from './lib/rest-api.mjs'

@vates/types/src/lib/rest-api.mts

@@ -1,102 +0,0 @@
-import type { NextFunction, Request, Response } from 'express'
-import type { VatesTask } from './vates-task.mjs'
-import type { XoApp } from '../xo-app.mjs'
-
-export type SecurityName = '*' | 'token' | 'basic' | 'none'
-
-export type FieldDefinition =
-  | {
-      type: 'string'
-      example?: string
-      optional?: boolean
-    }
-  | {
-      type: 'boolean'
-      example?: boolean
-      optional?: boolean
-    }
-  | {
-      type: 'number'
-      example?: number
-      optional?: boolean
-    }
-  | {
-      type: 'enum'
-      enum: string[]
-      example?: string
-      optional?: boolean
-    }
-  | {
-      type: 'object'
-      fields: Record<string, FieldDefinition>
-      optional?: boolean
-    }
-  | {
-      type: 'array'
-      items: FieldDefinition
-      example?: unknown[]
-      optional?: boolean
-    }
-
-export type ParamFieldDefinition = Exclude<
-  FieldDefinition,
-  { type: 'boolean' } | { type: 'object' } | { type: 'array' }
->
-
-export type QueryFieldDefinition = Exclude<FieldDefinition, { type: 'object' } | { type: 'array' }>
-type RestApi = object & { xoApp: XoApp }
-export type CreateAction = <Result>(
-  callback: (task: VatesTask) => MaybePromise<Result>,
-  opts: {
-    sync?: boolean
-    statusCode?: number
-    taskProperties: { name: string; [key: string]: unknown }
-  }
-) => Promise<Result | undefined>
-
-export interface BaseRouteDefinition<Middleware> {
-  method: 'get' | 'post' | 'put' | 'delete' | 'patch'
-  endpoint: string
-  description?: string
-  tags?: string[]
-  params?: Record<string, ParamFieldDefinition>
-  query?: Record<string, QueryFieldDefinition>
-  body?: Record<string, FieldDefinition>
-  responses?: Array<{
-    status: number
-    description: string
-    schema?: Record<string, FieldDefinition>
-  }>
-  middlewares?: Middleware[]
-  scope?: 'acl'
-  callback: (params: {
-    req: Request
-    res: Response
-    next: NextFunction
-    restApi: RestApi
-    createAction: CreateAction
-  }) => MaybePromise<unknown>
-  security?: SecurityName
-}
-
-export type MiddlewareDescriptor =
-  | { name: 'json' | 'urlencoded' | 'text' | 'raw'; options?: Record<string, unknown> }
-  | { name: 'acl'; acls: LooseAclEntry | LooseAclEntry[] }
-
-type MaybePromise<T> = T | Promise<T>
-/**
- * Loosely-typed mirror of {@link https://github.com/vatesfr/xen-orchestra/blob/master/@xen-orchestra/rest-api/src/middlewares/acl.middleware.mts | AclEntry}
- * from `@xen-orchestra/rest-api/src/middlewares/acl.middleware.mts`.
- */
-export type LooseAclEntry = {
-  resource: string
-  action?: string | ((opts: { req: object; restApi: RestApi }) => string | undefined)
-  actions?: string[] | ((opts: { req: object; restApi: RestApi }) => string[])
-  objectId?: string | ((opts: { req: object; restApi: RestApi }) => string)
-  objectIds?: string[] | ((opts: { req: object; restApi: RestApi }) => string[])
-  object?: object | ((opts: { req: object; restApi: RestApi }) => MaybePromise<object> | undefined)
-  objects?: object[] | ((opts: { req: object; restApi: RestApi }) => MaybePromise<object[]> | undefined)
-  getObject?: (opts: { restApi: RestApi }) => (id: string) => MaybePromise<object>
-}
-
-export type PluginRestRouteDefinition = BaseRouteDefinition<MiddlewareDescriptor>

@vates/types/src/lib/xen-orchestra-acl.mts

@@ -1,83 +0,0 @@
-import { Branded } from '../common.mjs'
-import type { XoGroup, XoUser } from '../xo.mjs'
-
-type XoAclBaseRole = {
-  id: Branded<'acl-v2-role'>
-  name: string
-  description?: string
-  privilegeIds: XoAclBasePrivilege['id'][]
-}
-
-type XoAclRegularRole = XoAclBaseRole & {
-  groupIds: XoGroup['id'][]
-  userIds: XoUser['id'][]
-}
-
-type XoAclTemplateRole = XoAclBaseRole & {
-  isTemplate: true
-  roleTemplateId: number
-}
-
-export type XoAclRole = XoAclRegularRole | XoAclTemplateRole
-
-export type XoAclSupportedActionsByResource = {
-  [resource: string]: Record<string, unknown>
-}
-
-/**
- * E.g
- * vms {
- *   shutdown: {
- *    clean: true,
- *    hard: true,
- *  }
- * }
- *
- * `shutdown | shutdown:clean | shutdown:hard`
- */
-export type GetKeysRecursively<T, Prefix extends string = ''> = {
-  [K in keyof T]: T[K] extends object
-    ? K extends string
-      ? `${Prefix}${K}` | GetKeysRecursively<T[K], `${Prefix}${K}:`>
-      : never
-    : K extends string
-      ? `${Prefix}${K}`
-      : never
-}[keyof T]
-
-export type XoAclSupportedResource<TActionsByResource extends XoAclSupportedActionsByResource> =
-  keyof TActionsByResource
-
-export type XoAclSupportedActions<
-  TActionsByResource extends XoAclSupportedActionsByResource,
-  TResource extends XoAclSupportedResource<TActionsByResource>,
-> = (GetKeysRecursively<TActionsByResource[TResource]> & string) | '*'
-
-export type XoAclBasePrivilege = {
-  id: Branded<'acl-v2-privilege'>
-  resource: string
-  action: string
-  selector?: string
-  effect: 'allow' | 'deny'
-  roleId: XoAclRole['id']
-}
-
-export type XoAclPrivilege<
-  TActionsByResource extends XoAclSupportedActionsByResource,
-  TResource extends XoAclSupportedResource<TActionsByResource>,
-> = XoAclBasePrivilege & {
-  resource: TResource
-  action: XoAclSupportedActions<TActionsByResource, TResource>
-}
-
-export type XoUserRole = {
-  id: string
-  roleId: XoAclRole['id']
-  userId: XoUser['id']
-}
-
-export type XoGroupRole = {
-  id: string
-  roleId: XoAclRole['id']
-  groupId: XoGroup['id']
-}

@vates/types/src/lib/xen-orchestra-xapi.mts

@@ -15,18 +15,15 @@ import {
   XenApiVtpm,
 } from '../xen-api.mjs'
 import type {
-  BOND_MODE,
   OPAQUE_REF_NULL,
   SUPPORTED_VDI_FORMAT,
   VBD_MODE,
   VBD_TYPE,
   VDI_TYPE,
   VIF_LOCKING_MODE,
-  VM_OPERATIONS,
 } from '../common.mjs'
 import type { PassThrough, Readable } from 'node:stream'
 import type {
-  XapiXoRecord,
   XoGpuGroup,
   XoHost,
   XoNetwork,
@@ -38,67 +35,8 @@ import type {
   XoVm,
   XoVmTemplate,
   XoVif,
-  XoVmSnapshot,
 } from '../xo.mjs'
 
-/**
- * Properties accepted by {@link Xapi.editVm}.
- *
- * Field names match the canonical (camelCase) properties defined by the
- * underlying `_editVm` (via `makeEditObject`). `_editVm` still resolves the
- * snake_case and legacy aliases, but the canonical names are used here.
- */
-export interface EditVmProps {
-  affinityHost?: string | null
-  autoPoweron?: boolean
-  blockedOperations?: Partial<Record<VM_OPERATIONS, boolean | string | null>>
-  coresPerSocket?: number | string | null
-  cpuCap?: number | null
-  cpuMask?: number[]
-  cpuWeight?: number | null
-  cpus?: number
-  cpusStaticMax?: number | string
-  /**
-   * Update VM creation metadata stored under `other_config.xo:*`. The object is
-   * merged with the existing data.
-   */
-  creation?: { user?: string }
-  expNestedHvm?: boolean
-  hasVendorDevice?: boolean
-  highAvailability?: 'best-effort' | 'restart' | ''
-  hvmBootFirmware?: string | null
-  memory?: number | string
-  memoryMax?: number | string
-  memoryMin?: number | string
-  memoryStaticMax?: number | string
-  nameDescription?: string
-  nameLabel?: string
-  nestedVirt?: boolean
-  nicType?: string | null
-  notes?: string | null
-  PV_args?: string
-  secureBoot?: boolean
-  startDelay?: number
-  suspendSr?: string | null
-  tags?: string[]
-  uefiMode?: 'setup' | 'user'
-  vga?: 'std' | 'cirrus'
-  videoram?: 1 | 2 | 4 | 8 | 16
-  viridian?: boolean
-  virtualizationMode?: 'pv' | 'hvm'
-  xenStoreData?: Record<string, string | null>
-}
-
-/** Properties accepted by {@link Xapi.editVif}. */
-export interface EditVifProps {
-  ipv4Allowed?: string[]
-  ipv6Allowed?: string[]
-  lockingMode?: VIF_LOCKING_MODE
-  // in kB/s, `null` removes the limit
-  rateLimit?: number | null
-  txChecksumming?: boolean
-}
-
 export type XcpPatches = {
   changelog?: {
     author: string
@@ -129,29 +67,15 @@ export type XsPatches = {
 }
 
 export interface Xapi {
-  status: string
-  pool?: { uuid: string }
-  sessionId: string
-  _auth: { user: string; password: string }
-  _url: { protocol: string; hostname: string; hostnameRaw: string; port?: string }
-
   call: <ReturnType>(...args: unknown[]) => Promise<ReturnType>
   callAsync: <ReturnType>(...args: unknown[]) => Promise<ReturnType>
 
   barrier<T extends XenApiRecord>(ref: T['$ref']): Promise<Extract<WrappedXenApiRecord, { $ref: T['$ref'] }>>
-  connectVif(vifId: XoVif['id']): Promise<void>
   getField<T extends XenApiRecord, K extends keyof T>(
     type: Extract<WrappedXenApiRecord, T>['$type'],
     ref: T['$ref'],
     field: K
   ): Promise<T[K]>
-  getObject: <
-    XoRecord extends XapiXoRecord,
-    WrappedRecord extends WrappedXenApiRecord = Extract<WrappedXenApiRecord, { $type: XoRecord['type'] }>,
-  >(
-    idOrUuidOrRef: XoRecord['id'] | WrappedRecord['$ref'] | WrappedRecord['uuid'],
-    defaultValue?: WrappedRecord
-  ) => WrappedRecord
   createNetwork(
     params:
       | {
@@ -168,24 +92,9 @@ export interface Xapi {
           vlan: number
         }
   ): Promise<XenApiNetworkWrapped>
-  createBondedNetwork(params: {
-    bondMode: BOND_MODE
-    pifIds: XoPif['id'][]
-    name: string
-    description?: string
-    mtu?: number
-  }): Promise<XenApiNetworkWrapped>
   deleteNetwork(id: XoNetwork['id']): Promise<void>
   deleteVif(vifId: XoVif['id']): Promise<void>
-  disconnectVif(vifId: XoVif['id']): Promise<void>
   exportVmOva(vmRef: XenApiVm['$ref']): Promise<PassThrough>
-  emergencyShutdownHost(hostId: XoHost['id']): Promise<void>
-  ejectHostFromPool(hostId: XoHost['id']): Promise<void>
-  host_smartReboot(
-    hostRef: XenApiHost['$ref'],
-    bypassBlockedSuspend?: boolean,
-    bypassCurrentVmCheck?: boolean
-  ): Promise<void>
   migrateVm(
     vmId: XoVm['id'],
     hostXapi: Xapi,
@@ -199,11 +108,9 @@ export interface Xapi {
       bypassAssert?: boolean
     }
   ): Promise<void>
-  joinPool(masterAddress: string, masterUsername: string, masterPassword: string, force?: boolean): Promise<void>
   listMissingPatches(host: XoHost['id']): Promise<XcpPatches[] | XsPatches[]>
   pool_emergencyShutdown(): Promise<void>
   resumeVm(id: XoVm['id']): Promise<void>
-  revertVm(snapshotId: XoVmSnapshot['id']): Promise<void>
   unpauseVm(id: XoVm['id']): Promise<void>
   cloneVm(
     vmId: XoVm['id'],
@@ -229,40 +136,6 @@ export interface Xapi {
     }
   ): Promise<{ vm: XenApiVmWrapped }>
   forgetSr(id: XoSr['id']): Promise<void>
-  forgetHost(hostId: XoHost['id']): Promise<void>
-  powerOnHost(hostId: XoHost['id']): Promise<void>
-  rebootHost(hostId: XoHost['id'], force?: boolean): Promise<void>
-  shutdownHost(hostId: XoHost['id'], opts?: { force?: boolean; bypassEvacuate?: boolean }): Promise<void>
-  SR_create(params: {
-    content_type?: XoSr['content_type']
-    // index signature, not `Record<string, string>`: tsoa emits an empty schema for `Record`
-    // (https://github.com/lukeautry/tsoa/pull/1858). device_config keys are driver-specific (SR_type).
-    device_config: {
-      chapuser?: string
-      chappassword?: string
-      device?: string
-      legacy_mode?: string
-      location?: string
-      nfsversion?: string
-      options?: string
-      password?: string
-      SCSIid?: string
-      server?: string
-      serverpath?: string
-      target?: string
-      targetIQN?: string
-      username?: string
-    } & {
-      [key: string]: string
-    }
-    host: XenApiHost['$ref']
-    name_description?: XoSr['name_description']
-    name_label: XoSr['name_label']
-    physical_size?: number
-    shared: boolean
-    sm_config?: { [key: string]: string }
-    type: XoSr['SR_type']
-  }): Promise<XenApiSr['$ref']>
   SR_importVdi(
     ref: XenApiSr['$ref'],
     stream: Readable,
@@ -281,12 +154,6 @@ export interface Xapi {
     }
   ): Promise<XenApiVdi['$ref']>
   SR_reclaimSpace(ref: XenApiSr['$ref']): Promise<void>
-  editVm(
-    id: XoVm['id'],
-    props: EditVmProps,
-    checkLimits?: (limits: Record<string, number>, vm: XenApiVmWrapped) => Promise<void>
-  ): Promise<void>
-  editVif(id: XoVif['id'], props: EditVifProps): Promise<void>
   startVm(
     id: XoVm['id'],
     opts?: {
@@ -304,7 +171,7 @@ export interface Xapi {
   ): Promise<void>
   VM_export(
     vmRef: XenApiVm['$ref'],
-    opts?: { cancelToken?: unknown; compress?: boolean | 'zstd' | 'gzip'; useSnapshot?: boolean }
+    opts?: { cancelToken?: unknown; compress?: boolean; useSnapshot?: boolean }
   ): ReturnType<Xapi['getResource']>
   VM_import(
     stream: Readable,
@@ -358,7 +225,6 @@ export interface Xapi {
       vgpuType?: XoVgpuType['id']
       gpuGroup?: XoGpuGroup['id']
       copyHostBiosStrings?: boolean
-      highAvailability?: XoVm['high_availability']
       hvmBootFirmware?: 'uefi' | 'bios'
       secureBoot?: boolean
     },
@@ -411,7 +277,7 @@ export interface Xapi {
   ): Promise<Readable & { length?: number }>
   VDI_importContent(
     vdiRef: XenApiVdi['$ref'],
-    stream: Readable | Buffer,
+    stream: Readable,
     opts: { cancelToken?: unknown; format: SUPPORTED_VDI_FORMAT }
   ): Promise<void>
   VIF_create(
@@ -450,12 +316,8 @@ export interface Xapi {
     pathname: string,
     params?: { host?: XenApiHost; query?: Record<string, unknown>; task?: boolean | XenApiTask['$ref'] }
   ): Promise<{ body: Readable }>
-  clearHost(
-    host: Pick<XenApiHostWrapped, '$ref' | '$pool'>,
-    force?: boolean,
-    opts?: { transient?: boolean }
-  ): Promise<void>
-  disableHost(hostId: XoHost['id'], opts?: { transient?: boolean }): Promise<void>
+  clearHost(host: Pick<XenApiHostWrapped, '$ref' | '$pool'>, force?: boolean): Promise<void>
+  disableHost(hostId: XoHost['id']): Promise<void>
   enableHost(hostId: XoHost['id']): Promise<void>
   getRecordByUuid<
     Type extends WrappedXenApiRecord['$type'],
@@ -466,13 +328,4 @@ export interface Xapi {
   ): Promise<XenApiRecord>
   isHyperThreadingEnabled(hostId: XoHost['id']): Promise<boolean | null>
   VTPM_create(params: { VM: XenApiVm['$ref']; is_unique?: boolean; contents?: string }): Promise<XenApiVtpm['$ref']>
-  destroySr(id: XoSr['id']): Promise<void>
-  xostor_delete(ref: XenApiSr['$ref']): Promise<void>
-  objects: {
-    indexes: {
-      type: {
-        [XenApiRecord in WrappedXenApiRecord as XenApiRecord['$type']]: Record<XenApiRecord['uuid'], XenApiRecord>
-      }
-    }
-  }
 }

@vates/types/src/xen-api.mts

@@ -192,7 +192,6 @@ export interface XenApiPool {
   ha_host_failures_to_tolerate: number
   ha_overcommitted: boolean
   ha_plan_exists_for: number
-  ha_reboot_vm_on_internal_shutdown?: boolean
   ha_statefiles: string[]
   health_check_config: Record<string, string>
   igmp_snooping_enabled?: boolean
@@ -492,9 +491,7 @@ export interface XenApiDrTask {
   uuid: string
 }
 
-type XenApiHostCallMethods = TagCallMethods & {
-  <T>(method: 'call_plugin', plugin: string, fn: string, args: Record<string, string>): Promise<T>
-}
+type XenApiHostCallMethods = TagCallMethods & {}
 export interface XenApiHost {
   $ref: Branded<'host'>
   address: string
@@ -571,9 +568,7 @@ export interface XenApiHost {
   uuid: string
   virtual_hardware_platform_versions: number[]
 }
-export interface XenApiHostWrapped extends WrapperXenApi<XenApiHost, 'host', XenApiHostCallMethods> {
-  $restartAgent(): Promise<void>
-}
+export type XenApiHostWrapped = WrapperXenApi<XenApiHost, 'host', XenApiHostCallMethods>
 
 export interface XenApiHostCrashdump {
   $ref: Branded<'host_crashdump'>
@@ -628,9 +623,7 @@ export interface XenApiHostCpu {
   vendor: string
 }
 
-type XenApiNetworkCallMethods = TagCallMethods & {
-  (method: 'add_purpose', purpose: NETWORK_PURPOSE): Promise<void>
-}
+type XenApiNetworkCallMethods = TagCallMethods & {}
 
 export interface XenApiNetwork {
   $ref: Branded<'network'>

@vates/types/src/xo-app.mts

@@ -1,5 +1,6 @@
 import { EventEmitter } from 'node:stream'
 import type {
+  AnyXoBackupJob,
   AnyXoJob,
   AnyXoLog,
   XapiXoRecord,
@@ -15,12 +16,10 @@ import type {
   XoServer,
   XoTask,
   XoUser,
-  XoVif,
   XoVm,
   XoVmBackupArchive,
 } from './xo.mjs'
 import { VatesTask } from './lib/vates-task.mjs'
-import type { PluginRestRouteDefinition } from './lib/rest-api.mjs'
 import {
   Xapi,
   XapiHostStats,
@@ -45,32 +44,14 @@ import {
   XenApiVifWrapped,
   XenApiVmWrapped,
   XenApiVtpmWrapped,
-  XoAclBasePrivilege,
-  XoAclRole,
-  XoGroupRole,
-  XoUserRole,
 } from './index.mjs'
 
-type FeatureCode =
-  | 'BACKUP.DELTA'
-  | 'BACKUP.DELTA_REPLICATION'
-  | 'BACKUP.FULL'
-  | 'BACKUP.HEALTHCHECK'
-  | 'BACKUP.METADATA'
-  | 'BACKUP.MIRROR'
-  | 'BACKUP.WITH_RAM'
-  | 'BACKUP.SMART_BACKUP'
-  | 'BACKUP.S3'
-  | 'DOCKER'
-  | 'EXPORT.XVA'
-  | 'LIST_MISSING_PATCHES'
-  | 'POOL_EMERGENCY_SHUTDOWN'
-  | 'RBAC'
-  | 'ROLLING_POOL_UPDATE'
-  | 'ROLLING_POOL_REBOOT'
-  | 'SMART_REBOOT'
-  | 'WARM_MIGRATION'
-  | 'PLUGIN.OPENMETRICS'
+export type XapiConnection = Xapi & {
+  status: string
+  pool?: { uuid: string }
+  sessionId: string
+  _url?: { protocol: string; hostname: string; port?: string }
+}
 
 type XapiRecordByXapiXoRecord = {
   gpuGroup: XenApiGpuGroupWrapped
@@ -97,45 +78,10 @@ type XapiRecordByXapiXoRecord = {
   'VM-template': XenApiVmWrapped
   VTPM: XenApiVtpmWrapped
 }
-
-type LicenseProductId =
-  | 'premium'
-  | 'xcpng-enterprise'
-  | 'xcpng-standard'
-  | 'xo-proxy'
-  | 'xosan.trial'
-  | 'xostor'
-  | 'xostor.trial'
-type LicenseProductType = 'xo' | 'xoproxy' | 'xcpng' | 'xosan' | 'xostor'
-
-type License = {
-  id: string
-  type: 'license'
-  created: number
-  licenseType: 'unit'
-  productId: LicenseProductId
-  tags: string[]
-  expires?: number
-  boundObjectId?: string
-  bindDate?: number
-  buyer?: { token: string; email: string }
-  history?: { date: number; boundObjectId: string }[]
-  rebound?: number
-  productTypes?: LicenseProductType[]
-  bundleInfo?: { name: string; id: string }
-}
-
 export type XoApp = {
-  hooks: EventEmitter
-  _redis: {
-    get(key: string): Promise<string | null>
-    mSet(args: string[]): Promise<unknown>
-    sMembers(key: string): Promise<string[]>
-    sIsMember(key: string, member: string): Promise<boolean>
-  }
   config: {
     get<T = string>(path: string): T
-    getOptional<T = unknown>(path: string): T | undefined
+    getOptional(path: string): Record<string, string> | undefined
     getOptionalDuration(path: string): number | undefined
     getGuiRoutes(): Promise<{
       default: {
@@ -182,42 +128,16 @@ export type XoApp = {
   }
 
   // methods ------------
-  allocIpAddresses(vifId: XoVif['id'], addAddresses?: string[], removeAddresses?: string[]): Promise<void>
-  addAclV2GroupRole(groupId: XoGroup['id'], roleId: XoAclRole['id']): Promise<XoGroupRole>
-  addAclV2UserRole(userId: XoUser['id'], roleId: XoAclRole['id']): Promise<XoUserRole>
   addUserToGroup: (userId: XoUser['id'], groupId: XoGroup['id']) => Promise<void>
-  addApiMethod: <A extends unknown[], R>(
-    name: string,
-    method: (...args: A) => Promise<R>,
-    //we use any since it is a legacy call, might be better typed in another pr
-    info: {
-      resolve?: any
-      params?: any
-    }
-  ) => () => void // eslint-disable-line @typescript-eslint/no-explicit-any
-  registerRestRoutes: (routes: PluginRestRouteDefinition[], base?: string) => () => void
   authenticateUser: (
     credentials: { token?: string; username?: string; password?: string },
     userData?: { ip?: string },
     opts?: { bypassOtp?: boolean; bypassTaskCreation?: boolean }
   ) => Promise<{ bypassOtp: boolean; expiration: number; user: XoUser }>
-  backupGuard(poolId: XoPool['id']): Promise<void>
   /* Throw if no authorization */
-  checkFeatureAuthorization(featureCode: FeatureCode): Promise<void>
+  checkFeatureAuthorization(featureCode: string): Promise<void>
   /* connect a server (XCP-ng/XenServer) */
   connectXenServer(id: XoServer['id']): Promise<void>
-  // TODO: replace all XoAclBasePrivilege with a more strict type. (discriminate union)
-  createAclV2Privilege(
-    privilege: Omit<XoAclBasePrivilege, 'id'>,
-    options?: {
-      force?: boolean
-    }
-  ): Promise<XoAclBasePrivilege>
-  copyAclV2Role(
-    id: XoAclRole['id'],
-    params?: { name?: XoAclRole['name']; description?: XoAclRole['description'] }
-  ): Promise<XoAclRole['id']>
-  createAclV2Role(role: { name: XoAclRole['name']; description?: XoAclRole['description'] }): Promise<XoAclRole>
   createAuthenticationToken(opts: {
     client?: {
       id?: string
@@ -227,54 +147,19 @@ export type XoApp = {
     expiresIn?: string | number
     userId: XoUser['id']
   }): Promise<XoAuthenticationToken>
-  createRemote(params: {
-    name: string
-    options?: string
-    proxy?: XoProxy['id']
-    url: string
-  }): Promise<XoBackupRepository>
   createUser(params: { name?: string; password?: string; [key: string]: unknown }): Promise<XoUser>
-  deleteAclV2GroupRole(
-    groupId: XoGroup['id'],
-    roleId: XoAclRole['id'],
-    opts?: { bypassAuthorization?: boolean }
-  ): Promise<boolean>
-  deleteAclV2Privilege(privilegeId: XoAclBasePrivilege['id'], options?: { force?: boolean }): Promise<boolean>
-  deleteAclV2Role(roleId: XoAclRole['id'], options?: { force?: boolean }): Promise<boolean>
   deleteGroup(id: XoGroup['id']): Promise<void>
   deleteUser(id: XoUser['id']): Promise<void>
-  detachHostFromPool(hostId: XoHost['id']): Promise<void>
   createGroup(params: { name: string; provider?: string; providerGroup?: string }): Promise<XoGroup>
   /* disconnect a server (XCP-ng/XenServer) */
   disconnectXenServer(id: XoServer['id']): Promise<void>
-  findEnabledScheduleSequenceFromSchedule(id: XoSchedule['id']): Promise<XoSchedule | undefined>
-  getAclV2Privilege(id: XoAclBasePrivilege['id']): Promise<XoAclBasePrivilege>
-  getAclV2Privileges(): Promise<XoAclBasePrivilege[]>
-  getAclV2RolePrivileges(roleId: XoAclRole['id']): Promise<XoAclBasePrivilege[]>
-  getAclV2Role(id: XoAclRole['id'], opts?: { bypassAuthorization?: boolean }): Promise<XoAclRole>
-  deleteAclV2UserRole(
-    userId: XoUser['id'],
-    roleId: XoAclRole['id'],
-    opts?: { bypassAuthorization?: boolean }
-  ): Promise<boolean>
-  getAclV2GroupRoles(
-    groupId: XoGroup['id'],
-    opts?: { bypassAuthorization?: boolean }
-  ): Promise<Exclude<XoAclRole, { isTemplate: true }>[]>
-  getAclV2Roles(): Promise<XoAclRole[]>
-  getAclV2UserPrivileges(userId: XoUser['id']): Promise<XoAclBasePrivilege[]>
-  getAclV2UserRoles(
-    userId: XoUser['id'],
-    opts?: { bypassAuthorization?: boolean; fromGroup?: boolean; fromUser?: boolean }
-  ): Promise<XoAclRole[]>
   getAllGroups(): Promise<XoGroup[]>
   getAllProxies(): Promise<XoProxy[]>
-  getAllJobs<T extends AnyXoJob['type']>(type: T): Promise<Extract<AnyXoJob, { type: T }>[]>
+  getAllJobs<T extends AnyXoBackupJob['type']>(type: T): Promise<Extract<AnyXoBackupJob, { type: T }>[]>
   getAllJobs(type?: string): Promise<AnyXoJob[]>
   getProxy(id: XoProxy['id']): Promise<XoProxy>
   getRemote(id: XoBackupRepository['id']): Promise<XoBackupRepository>
   getAllRemotes(): Promise<XoBackupRepository[]>
-  removeRemote(id: XoBackupRepository['id']): Promise<void>
   getAllRemotesInfo(): Promise<
     Record<
       XoBackupRepository['id'],
@@ -332,7 +217,6 @@ export type XoApp = {
     backupRepositoryIds: XoBackupRepository['id'][],
     opts?: { _forceRefresh?: boolean; vmId: XoVm['id'] }
   ): Promise<Record<XoBackupRepository['id'], Record<XoVm['id'], XoVmBackupArchive[]>>>
-  pingRemote(id: XoBackupRepository['id']): Promise<{ success: true }>
   /** Allow to add a new server in the DB (XCP-ng/XenServer) */
   registerXenServer(
     body: Pick<XoServer, 'host' | 'httpProxy' | 'label' | 'username'> & {
@@ -341,22 +225,11 @@ export type XoApp = {
       readOnly?: XoServer['readOnly']
     }
   ): Promise<XoServer>
-  rollingPoolReboot(pool: XoPool, opts?: { parentTask?: VatesTask; shutdownPinnedVms?: boolean }): Promise<void>
-  rollingPoolUpdate(
-    pool: XoPool,
-    opts?: { rebootVm?: boolean; parentTask?: VatesTask; shutdownPinnedVms?: boolean }
-  ): Promise<void>
-  setVmResourceSet(vmId: XoVm['id'], resourceSetId: string | null, force?: boolean): Promise<void>
-  shareVmResourceSet(vmId: XoVm['id']): Promise<void>
+  rollingPoolReboot(pool: XoPool, opts?: { parentTask?: VatesTask }): Promise<void>
+  rollingPoolUpdate(pool: XoPool, opts?: { rebootVm?: boolean; parentTask?: VatesTask }): Promise<void>
   removeUserFromGroup(userId: XoUser['id'], id: XoGroup['id']): Promise<void>
   runJob(job: AnyXoJob, schedule: XoSchedule): void
   runWithApiContext: (user: XoUser | undefined, fn: () => void) => Promise<unknown>
-  testRemote(
-    id: XoBackupRepository['id']
-  ): Promise<
-    | { success: true; readRate: number; writeRate: number }
-    | { success: false; step: string; file: string; error: unknown }
-  >
   /** Remove a server from the DB (XCP-ng/XenServer) */
   unregisterXenServer(id: XoServer['id']): Promise<void>
   updateUser(
@@ -373,44 +246,12 @@ export type XoApp = {
       preferences?: Record<string, string>
     }
   ): Promise<void>
-  updateAclV2Privilege(
-    privilegeId: XoAclBasePrivilege['id'],
-    privilege: XoAclBasePrivilege
-  ): Promise<XoAclBasePrivilege>
-  updateAclV2Role(
-    roleId: XoAclRole['id'],
-    role: {
-      name?: XoAclRole['name']
-      description?: XoAclRole['description'] | null
-    },
-    options?: {
-      force?: boolean
-    }
-  ): Promise<XoAclRole>
   updateGroup(
     id: XoGroup['id'],
     updates: {
       name?: string
     }
   ): void
-  updateRemote(
-    id: XoBackupRepository['id'],
-    params: {
-      enabled?: boolean
-      name?: string
-      options?: string | null
-      proxy?: XoProxy['id'] | null
-      url?: string
-    }
-  ): Promise<XoBackupRepository>
-  getAllXapis(): Record<string, Xapi>
+  getAllXapis(): Record<string, XapiConnection>
   getObjects(opts?: { filter?: Record<string, unknown>; limit?: number }): Record<string, XapiXoRecord>
-  getLicenses(params?: { productType?: LicenseProductType }): Promise<License[]>
-  bindLicense(params: { licenseId: string; boundObjectId: string }): Promise<License>
-  unbindLicense(params: {
-    productId: LicenseProductId
-    boundObjectId: string
-    licenseId: string
-    data?: Record<string, string>
-  }): Promise<License>
 }

@vates/types/src/xo.mts

@@ -19,7 +19,6 @@ import type {
   VM_POWER_STATE,
 } from './common.mjs'
 import type * as CMType from './lib/complex-matcher.mjs'
-import { XoAclPrivilege, XoAclRole, XoAclSupportedActionsByResource } from './lib/xen-orchestra-acl.mjs'
 import type { XenApiHost, XenApiPool } from './xen-api.mjs'
 
 type BaseXapiXo = {
@@ -76,7 +75,7 @@ type BaseXoVm = BaseXapiXo & {
   expNestedHvm: boolean
   isNestedVirtEnabled: boolean
   hasVendorDevice: boolean
-  high_availability: 'best-effort' | 'restart' | ''
+  high_availability: string
   installTime?: number | null
   isFirmwareSupported: boolean
   memory: {
@@ -94,7 +93,7 @@ type BaseXoVm = BaseXapiXo & {
   notes?: string
   os_version: Record<string, string> | null
   other: Record<string, string>
-  parent?: XoVmSnapshot['id']
+  parent?: XoVm['id']
   power_state: VM_POWER_STATE
   pvDriversDetected?: boolean
   pvDriversUpToDate?: boolean
@@ -107,10 +106,6 @@ type BaseXoVm = BaseXapiXo & {
   suspendSr?: XoSr['id']
   tags: string[]
   vga?: string
-  /**
-   * Value in MiB.
-   * See: https://wiki.xenproject.org/wiki/XCP_PV_templates_start
-   */
   videoram?: number
   viridian: boolean
   virtualizationMode: DOMAIN_TYPE
@@ -222,7 +217,6 @@ export type XoGroup = {
   provider?: string
   providerGroupId?: string
   users: XoUser['id'][]
-  aclRoleIds: XoAclRole['id'][]
 }
 
 export type XoHost = BaseXapiXo & {
@@ -336,7 +330,6 @@ export type XoNetwork = BaseXapiXo & {
   defaultIsLocked: boolean
   id: Branded<'network'>
   insecureNbd?: boolean
-  isBonded: boolean
   name_description: string
   name_label: string
   nbd?: boolean
@@ -434,7 +427,6 @@ export type XoPool = BaseXapiXo & {
   current_operations: Record<string, POOL_ALLOWED_OPERATIONS>
   default_SR?: XoSr['id']
   HA_enabled: boolean
-  haRebootVmOnInternalShutdown: boolean
   haSrs: XoSr['id'][]
   id: Branded<'pool'>
   master: XoHost['id']
@@ -566,18 +558,6 @@ export type XoMirrorBackupJob = BaseXoJob & {
 
 export type XoJob = BaseXoJob & {
   type: 'call'
-  method: string
-  paramsVector?: {
-    type: string
-    items: {
-      type?: string
-      values?: {
-        schedules?: XoSchedule['id'][]
-        [key: string]: unknown
-      }[]
-      [key: string]: unknown
-    }[]
-  }
 }
 
 export type XoSchedule = {
@@ -614,7 +594,7 @@ export type XoSr = BaseXapiXo & {
   VDIs: AnyXoVdi['id'][]
 
   allocationStrategy?: 'thin' | 'thick' | 'unknown'
-  content_type: 'user' | 'iso' | 'disk'
+  content_type: string
   current_operations: Record<string, STORAGE_OPERATIONS>
   id: Branded<'SR'>
   inMaintenanceMode: boolean
@@ -625,28 +605,7 @@ export type XoSr = BaseXapiXo & {
   shared: boolean
   size: number
   sm_config: Record<string, string>
-  // SM drivers shipped with XCP-ng/XenServer
-  SR_type:
-    | 'cephfs'
-    | 'dummy'
-    | 'ext'
-    | 'file'
-    | 'glusterfs'
-    | 'hba'
-    | 'iso'
-    | 'largeblock'
-    | 'linstor'
-    | 'lvm'
-    | 'lvmofcoe'
-    | 'lvmohba'
-    | 'lvmoiscsi'
-    | 'moosefs'
-    | 'nfs'
-    | 'shm'
-    | 'smb'
-    | 'udev'
-    | 'xfs'
-    | 'zfs'
+  SR_type: string
   tags: string[]
   type: 'SR'
   usage: number
@@ -693,15 +652,13 @@ export type XoTask = {
       | 'server'
       | 'task'
       | 'user'
-      | 'acl-privilege'
-      | 'acl-role'
     params?: Record<string, unknown>
     progress?: number
     type?: string
     userId?: string
     [key: string]: unknown | undefined
   }
-  result?: Record<string, unknown>
+  result: Record<string, unknown>
   start: number
   status: 'failure' | 'interrupted' | 'pending' | 'success'
   tasks?: XoTask[]
@@ -715,7 +672,7 @@ export type XoUser = {
   groups: XoGroup['id'][]
   id: Branded<'user'>
   name?: string
-  permission: 'none' | 'admin'
+  permission: string
   pw_hash?: string
   preferences: Record<string, string>
 }
@@ -768,7 +725,6 @@ type BaseXoVdi = BaseXapiXo & {
 
 export type XoVdi = BaseXoVdi & {
   id: Branded<'VDI'>
-  chainPhysicalUsage: number
   type: 'VDI'
 }
 
@@ -889,28 +845,22 @@ export type XapiXoRecord =
   | XoVtpm
   | XoSm
 
-export type NonXapiXoRecord<
-  TActionsByResource extends XoAclSupportedActionsByResource = never,
-  TResource extends string = never,
-> =
+export type NonXapiXoRecord =
   | AnyXoBackupArchive
   | AnyXoJob
   | AnyXoLog
   | XoGroup
   | XoProxy
+  | XoGroup
+  | XoProxy
   | XoJob
   | XoBackupRepository
   | XoSchedule
   | XoServer
   | XoTask
   | XoUser
-  | XoAclRole
-  | XoAclPrivilege<TActionsByResource, TResource>
 
-export type XoRecord<
-  TActionsByResource extends XoAclSupportedActionsByResource = never,
-  TResource extends string = never,
-> = XapiXoRecord | NonXapiXoRecord<TActionsByResource, TResource>
+export type XoRecord = XapiXoRecord | NonXapiXoRecord
 
 export type AnyXoVm = XoVm | XoVmSnapshot | XoVmTemplate | XoVmController
 

@xen-orchestra/acl/.npmignore

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

@xen-orchestra/acl/eslint.config.mjs

@@ -1,16 +0,0 @@
-// @ts-check
-
-import eslint from '@eslint/js'
-import tseslint from 'typescript-eslint'
-import { fileURLToPath } from 'node:url'
-import path from 'node:path'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-export default tseslint.config(eslint.configs.recommended, tseslint.configs.recommended, {
-  languageOptions: {
-    parserOptions: {
-      tsconfigRootDir: __dirname,
-    },
-  }
-})

@xen-orchestra/acl/package.json

@@ -1,47 +0,0 @@
-{
-  "author": {
-    "name": "Vates SAS",
-    "url": "https://vates.fr"
-  },
-  "main": "dist/index.mjs",
-  "name": "@xen-orchestra/acl",
-  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/acl",
-  "version": "1.5.0",
-  "license": "AGPL-3.0-or-later",
-  "private": false,
-  "type": "module",
-  "engines": {
-    "node": ">= 20.18"
-  },
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.mts",
-      "default": "./dist/index.mjs"
-    }
-  },
-  "scripts": {
-    "build": "tsc && node scripts/generate-types.mjs",
-    "clean": "rimraf dist/",
-    "dev": "tsc --watch",
-    "postversion": "npm publish --access public",
-    "test": "npm run build && node --test ./dist/**/*.test.mjs",
-    "prebuild": "npm run clean",
-    "prepublishOnly": "npm run build"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.19.0",
-    "@vates/types": "^1.30.1",
-    "rimraf": "^6.0.1",
-    "typescript": "~5.6",
-    "typescript-eslint": "^8.61.0"
-  },
-  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
-  "repository": {
-    "directory": "@xen-orchestra/acl",
-    "type": "git",
-    "url": "https://github.com/vatesfr/xen-orchestra.git"
-  },
-  "dependencies": {
-    "complex-matcher": "^1.0.0"
-  }
-}

@xen-orchestra/acl/scripts/generate-types.mjs

@@ -1,55 +0,0 @@
-#!/usr/bin/env node
-// AUTO-GENERATES dist/generated/privilege-types.d.mts
-// Run via `npm run build` (after tsc).
-
-import { mkdirSync, writeFileSync } from 'node:fs'
-import { dirname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-
-import { SUPPORTED_ACTIONS_BY_RESOURCE } from '../dist/actions/index.mjs'
-import { getActionStrings } from '../dist/index.mjs'
-
-function toPascalCase(str) {
-  return str
-    .split(/[-_]/)
-    .map(s => s.charAt(0).toUpperCase() + s.slice(1))
-    .join('')
-}
-
-const resources = Object.keys(SUPPORTED_ACTIONS_BY_RESOURCE)
-
-const typeBlocks = resources.map(resource => {
-  const actionUnion = getActionStrings(resource)
-    .map(action => `'${action}'`)
-    .join(' | ')
-  return `export type ${toPascalCase(resource)}Privilege = {
-  id: XoAclBasePrivilege['id']
-  resource: '${resource}'
-  action: ${actionUnion}
-  selector?: XoAclBasePrivilege['selector']
-  effect: XoAclBasePrivilege['effect']
-  roleId: XoAclBasePrivilege['roleId']
-}`
-})
-
-const anyUnion = resources.map(resource => `  | ${toPascalCase(resource)}Privilege`).join('\n')
-
-const types = `\
-// -----------------------------------------------------------------------
-// AUTO-GENERATED — do not edit manually.
-// Regenerated on every \`npm run build\`.
-// -----------------------------------------------------------------------
-import type { XoAclBasePrivilege } from '@vates/types'
-
-
-${typeBlocks.join('\n\n')}
-
-export type AnyPrivilege =
-${anyUnion}
-`
-
-const root = join(dirname(fileURLToPath(import.meta.url)), '..')
-const outDir = join(root, 'dist/generated')
-
-mkdirSync(outDir, { recursive: true })
-writeFileSync(join(outDir, 'privilege-types.d.mts'), types, 'utf-8')

@xen-orchestra/acl/src/actions/acl-privilege.mts

@@ -1,11 +0,0 @@
-export default {
-  create: true,
-  delete: true,
-  read: true,
-  update: {
-    action: true,
-    effect: true,
-    resource: true,
-    selector: true,
-  },
-}

@xen-orchestra/acl/src/actions/acl-role.mts

@@ -1,11 +0,0 @@
-export default {
-  create: true,
-  delete: true,
-  read: true,
-  update: {
-    description: true,
-    groups: true,
-    name: true,
-    users: true,
-  },
-}

@xen-orchestra/acl/src/actions/alarm.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/backup-archive.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/backup-job.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/backup-log.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/backup-repository.mts

@@ -1,13 +0,0 @@
-export default {
-  benchmark: true,
-  create: true,
-  read: true,
-  forget: true,
-  update: {
-    enabled: true,
-    name: true,
-    options: true,
-    proxy: true,
-    url: true,
-  },
-}

@xen-orchestra/acl/src/actions/gpuGroup.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/group.mts

@@ -1,9 +0,0 @@
-export default {
-  create: true,
-  delete: true,
-  read: true,
-  update: {
-    name: true,
-    users: true,
-  },
-}

@xen-orchestra/acl/src/actions/host.mts

@@ -1,28 +0,0 @@
-export default {
-  'allow-vm': true,
-  detach: true,
-  disable: true,
-  enable: true,
-  evacuate: true,
-  export: {
-    logs: true,
-  },
-  forget: true,
-  'join-pool': true,
-  'migrate-receive': true,
-  read: true,
-  reboot: {
-    clean: true,
-    smart: true,
-  },
-  'restart-toolstack': true,
-  'scan-pifs': true,
-  shutdown: {
-    clean: true,
-    emergency: true,
-  },
-  start: true,
-  update: {
-    tags: true,
-  },
-}

@xen-orchestra/acl/src/actions/index.mts

@@ -1,80 +0,0 @@
-import { default as aclPrivilege } from './acl-privilege.mjs'
-import { default as aclRole } from './acl-role.mjs'
-import { default as alarm } from './alarm.mjs'
-import { default as backupArchive } from './backup-archive.mjs'
-import { default as backupJob } from './backup-job.mjs'
-import { default as backupLog } from './backup-log.mjs'
-import { default as backupRepository } from './backup-repository.mjs'
-import { default as gpuGroup } from './gpuGroup.mjs'
-import { default as group } from './group.mjs'
-import { default as host } from './host.mjs'
-import { default as message } from './message.mjs'
-import { default as network } from './network.mjs'
-import { default as pbd } from './pbd.mjs'
-import { default as pci } from './pci.mjs'
-import { default as pgpu } from './pgpu.mjs'
-import { default as pif } from './pif.mjs'
-import { default as pool } from './pool.mjs'
-import { default as proxy } from './proxy.mjs'
-import { default as restoreLog } from './restore-log.mjs'
-import { default as schedule } from './schedule.mjs'
-import { default as server } from './server.mjs'
-import { default as sm } from './sm.mjs'
-import { default as sr } from './sr.mjs'
-import { default as task } from './task.mjs'
-import { default as user } from './user.mjs'
-import { default as vbd } from './vbd.mjs'
-import { default as vdiSnapshot } from './vdi-snapshot.mjs'
-import { default as vdiUnmanaged } from './vdi-unmanaged.mjs'
-import { default as vdi } from './vdi.mjs'
-import { default as vgpu } from './vgpu.mjs'
-import { default as vgpuType } from './vgpuType.mjs'
-import { default as vif } from './vif.mjs'
-import { default as vmController } from './vm-controller.mjs'
-import { default as vmSnapshot } from './vm-snapshot.mjs'
-import { default as vmTemplate } from './vm-template.mjs'
-import { default as vm } from './vm.mjs'
-import { default as vtpm } from './vtpm.mjs'
-
-/**
- * value without sub action like 'shutdown' mean: 'shutdown:*' (so shutdown mean you can shutdown:clean and shutdown:hard)
- */
-export const SUPPORTED_ACTIONS_BY_RESOURCE = {
-  'acl-privilege': aclPrivilege,
-  'acl-role': aclRole,
-  alarm,
-  'backup-archive': backupArchive,
-  'backup-job': backupJob,
-  'backup-log': backupLog,
-  'backup-repository': backupRepository,
-  group,
-  gpuGroup,
-  host,
-  message,
-  network,
-  pbd,
-  pci,
-  pgpu,
-  pif,
-  pool,
-  proxy,
-  'restore-log': restoreLog,
-  schedule,
-  server,
-  sm,
-  sr,
-  task,
-  user,
-  vbd,
-  'vdi-snapshot': vdiSnapshot,
-  'vdi-unmanaged': vdiUnmanaged,
-  vdi,
-  vgpu,
-  vgpuType,
-  vif,
-  'vm-controller': vmController,
-  'vm-snapshot': vmSnapshot,
-  'vm-template': vmTemplate,
-  vm,
-  vtpm,
-} as const

@xen-orchestra/acl/src/actions/message.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/network.mts

@@ -1,9 +0,0 @@
-export default {
-  create: true,
-  delete: true,
-  read: true,
-  update: {
-    tags: true,
-    other_config: true,
-  },
-}

@xen-orchestra/acl/src/actions/pbd.mts

@@ -1,5 +0,0 @@
-export default {
-  read: true,
-  plug: true,
-  unplug: true,
-}

@xen-orchestra/acl/src/actions/pci.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/pgpu.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/pif.mts

@@ -1,6 +0,0 @@
-export default {
-  read: true,
-  update: {
-    management: true,
-  },
-}

@xen-orchestra/acl/src/actions/pool.mts

@@ -1,14 +0,0 @@
-export default {
-  'add-host': true,
-  create: {
-    network: true,
-    vm: true,
-  },
-  'emergency-shutdown': true,
-  read: true,
-  'rolling-reboot': true,
-  'rolling-update': true,
-  update: {
-    tags: true,
-  },
-}

@xen-orchestra/acl/src/actions/proxy.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/restore-log.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/schedule.mts

@@ -1,4 +0,0 @@
-export default {
-  read: true,
-  run: true,
-}

@xen-orchestra/acl/src/actions/server.mts

@@ -1,7 +0,0 @@
-export default {
-  connect: true,
-  create: true,
-  delete: true,
-  disconnect: true,
-  read: true,
-}

@xen-orchestra/acl/src/actions/sm.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/sr.mts

@@ -1,16 +0,0 @@
-export default {
-  create: true,
-  delete: true,
-  forget: true,
-  import: {
-    vdi: true,
-    vm: true,
-  },
-  'migrate-receive': true,
-  read: true,
-  'reclaim-space': true,
-  scan: true,
-  update: {
-    tags: true,
-  },
-}

@xen-orchestra/acl/src/actions/task.mts

@@ -1,5 +0,0 @@
-export default {
-  abort: true,
-  delete: true,
-  read: true,
-}

@xen-orchestra/acl/src/actions/user.mts

@@ -1,11 +0,0 @@
-export default {
-  create: true,
-  delete: true,
-  read: true,
-  update: {
-    name: true,
-    password: true,
-    permission: true,
-    preferences: true,
-  },
-}

@xen-orchestra/acl/src/actions/vbd.mts

@@ -1,7 +0,0 @@
-export default {
-  connect: true,
-  create: true,
-  delete: true,
-  disconnect: true,
-  read: true,
-}

@xen-orchestra/acl/src/actions/vdi-snapshot.mts

@@ -1,8 +0,0 @@
-export default {
-  delete: true,
-  export: true,
-  read: true,
-  update: {
-    tags: true,
-  },
-}

@xen-orchestra/acl/src/actions/vdi-unmanaged.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/vdi.mts

@@ -1,15 +0,0 @@
-export default {
-  boot: true,
-  create: true,
-  delete: true,
-  'export-content': true,
-  'import-content': true,
-  'migrate-send': true,
-  read: true,
-  update: {
-    name_description: true,
-    name_label: true,
-    size: true,
-    tags: true,
-  },
-}

@xen-orchestra/acl/src/actions/vgpu.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/vgpuType.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/actions/vif.mts

@@ -1,15 +0,0 @@
-export default {
-  connect: true,
-  create: true,
-  delete: true,
-  disconnect: true,
-  read: true,
-  update: {
-    allowedIpv4Addresses: true,
-    allowedIpv6Addresses: true,
-    lockingMode: true,
-    rateLimit: true,
-    txChecksumming: true,
-    other_config: true,
-  },
-}

@xen-orchestra/acl/src/actions/vm-controller.mts

@@ -1,6 +0,0 @@
-export default {
-  read: true,
-  update: {
-    tags: true,
-  },
-}

@xen-orchestra/acl/src/actions/vm-snapshot.mts

@@ -1,8 +0,0 @@
-export default {
-  delete: true,
-  export: true,
-  read: true,
-  update: {
-    tags: true,
-  },
-}

@xen-orchestra/acl/src/actions/vm-template.mts

@@ -1,9 +0,0 @@
-export default {
-  delete: true,
-  export: true,
-  instantiate: true,
-  read: true,
-  update: {
-    tags: true,
-  },
-}

@xen-orchestra/acl/src/actions/vm.mts

@@ -1,61 +0,0 @@
-export default {
-  clone: true,
-  delete: true,
-  export: true,
-  'migrate-send': true,
-  pause: true,
-  read: true,
-  reboot: {
-    clean: true,
-    hard: true,
-  },
-  resume: true,
-  'revert-snapshot': true,
-  shutdown: {
-    clean: true,
-    hard: true,
-  },
-  snapshot: true,
-  start: true,
-  suspend: true,
-  unpause: true,
-  update: {
-    affinityHost: true,
-    autoPoweron: true,
-    blockedOperations: true,
-    coresPerSocket: true,
-    cpuCap: true,
-    cpuMask: true,
-    cpuWeight: true,
-    cpus: true,
-    cpusStaticMax: true,
-    creation: true,
-    datasources: true,
-    expNestedHvm: true,
-    hasVendorDevice: true,
-    highAvailability: true,
-    hvmBootFirmware: true,
-    memory: true,
-    memoryMax: true,
-    memoryMin: true,
-    memoryStaticMax: true,
-    nameDescription: true,
-    nameLabel: true,
-    nestedVirt: true,
-    nicType: true,
-    notes: true,
-    PV_args: true,
-    resourceSet: true,
-    secureBoot: true,
-    share: true,
-    startDelay: true,
-    suspendSr: true,
-    tags: true,
-    uefiMode: true,
-    vga: true,
-    videoram: true,
-    viridian: true,
-    virtualizationMode: true,
-    xenStoreData: true,
-  },
-}

@xen-orchestra/acl/src/actions/vtpm.mts

@@ -1,3 +0,0 @@
-export default {
-  read: true,
-}

@xen-orchestra/acl/src/class/privilege.mts

@@ -1,119 +0,0 @@
-import * as CM from 'complex-matcher'
-import type { XoAclPrivilege, XoAclSupportedActions, XoAclSupportedResource } from '@vates/types/lib/xen-orchestra/acl'
-
-import { SUPPORTED_ACTIONS_BY_RESOURCE } from '../actions/index.mjs'
-
-export type SupportedActionsByResource = typeof SUPPORTED_ACTIONS_BY_RESOURCE
-export type SupportedResource = XoAclSupportedResource<SupportedActionsByResource>
-export type SupportedActions<T extends SupportedResource> = XoAclSupportedActions<SupportedActionsByResource, T>
-export type TPrivilege<T extends SupportedResource> = XoAclPrivilege<SupportedActionsByResource, T>
-
-export class Privilege<T extends SupportedResource> {
-  #action: TPrivilege<T>['action']
-  #selector?: (object: object) => boolean
-  #resource: TPrivilege<T>['resource']
-  #effect: TPrivilege<T>['effect']
-
-  constructor({
-    action,
-    selector,
-    resource,
-    effect,
-  }: {
-    action: TPrivilege<T>['action']
-    selector?: TPrivilege<T>['selector']
-    resource: TPrivilege<T>['resource']
-    effect: TPrivilege<T>['effect']
-  }) {
-    Privilege.checkActionIsValid(resource, action)
-
-    this.#action = action
-    this.#selector = selector !== undefined ? CM.parse(selector).createPredicate() : undefined
-    this.#resource = resource
-    this.#effect = effect
-  }
-
-  get effect() {
-    return this.#effect
-  }
-
-  #matchAction<Resource extends SupportedResource = T>(action: SupportedActions<Resource>) {
-    // read:name_label - read:name_label
-    if (this.#action === action) {
-      return true
-    }
-
-    const [namespaceToMatch, actionToMatch] = action.split(':')
-    const [thisNamespace, thisAction] = this.#action.split(':')
-
-    if (thisNamespace === '*') {
-      return true
-    }
-
-    // update:vm - read:name_label
-    if (thisNamespace !== namespaceToMatch) {
-      return false
-    }
-
-    // read - read:name_label
-    if (thisAction === undefined) {
-      return true
-    }
-    // read:name_decription - read:name_label
-    if (thisAction !== actionToMatch) {
-      return false
-    }
-
-    throw new Error(`Unable to verify if ${this.#action} match ${action} `)
-  }
-
-  #matchSelector(object: object) {
-    if (this.#selector === undefined) {
-      return true
-    }
-
-    return this.#selector(object)
-  }
-
-  #matchResource(resource: string): resource is SupportedResource {
-    return resource === this.#resource
-  }
-
-  match<Resource extends SupportedResource = T>(constraint: {
-    action: SupportedActions<Resource>
-    resource: Resource
-    object: object
-  }): boolean {
-    return (
-      this.#matchResource(constraint.resource) &&
-      this.#matchAction(constraint.action) &&
-      this.#matchSelector(constraint.object)
-    )
-  }
-
-  /**
-   * Throw if action not supported
-   */
-  static checkActionIsValid<T extends SupportedResource>(resource: T, action: SupportedActions<T>) {
-    const supportedActions = SUPPORTED_ACTIONS_BY_RESOURCE[resource]
-    if (supportedActions === undefined) {
-      throw new Error(`${resource} resource not supported`)
-    }
-
-    if (action === '*') {
-      return
-    }
-
-    const segments = action.split(':')
-    let _action: object | undefined = undefined
-    segments.forEach(segment => {
-      _action = (_action ?? supportedActions)[segment]
-
-      if (_action === undefined) {
-        throw new Error(
-          `${action} action not supported for the resource: ${resource}. See ${JSON.stringify(supportedActions)}`
-        )
-      }
-    })
-  }
-}

@xen-orchestra/acl/src/generated/privilege-types.mts

@@ -1,10 +0,0 @@
-// DO NOT EDIT
-// Overwritten by scripts/generate-types.mjs after running npm run build
-// scripts/generate-types.mjs will replace this file to automatically generate and export all privileged types.
-// This makes external use easier because it's not necessary to resolve the type every time.
-
-import type { Privilege, SupportedResource } from '../index.mjs'
-
-export type AnyPrivilege = {
-  [Resource in SupportedResource]: Privilege<Resource>
-}[SupportedResource]

@xen-orchestra/acl/src/index.mts

@@ -1,167 +0,0 @@
-import assert from 'node:assert'
-import type { XoUser } from '@vates/types/xo'
-
-import { SUPPORTED_ACTIONS_BY_RESOURCE } from './actions/index.mjs'
-import {
-  Privilege as CPrivilege,
-  TPrivilege as Privilege,
-  SupportedActions,
-  SupportedActionsByResource,
-  SupportedResource,
-} from './class/privilege.mjs'
-
-// Export all types constructed using SUPPORTED_ACTIONS_BY_RESOURCE
-export type { Privilege, SupportedActions, SupportedActionsByResource, SupportedResource }
-export { SUPPORTED_ACTIONS_BY_RESOURCE }
-
-export type * from './generated/privilege-types.mjs'
-
-import { AnyPrivilege } from './generated/privilege-types.mjs'
-
-export type AnyPrivilegeOnParam = {
-  [Resource in SupportedResource]: {
-    user: XoUser
-    resource: Resource
-    action: SupportedActions<Resource>
-    objects: object | object[]
-  }
-}[SupportedResource]
-
-export function hasPrivilegeOn<T extends SupportedResource>({
-  user,
-  action,
-  resource,
-  objects,
-  userPrivileges,
-}: {
-  user: XoUser
-  resource: T
-  action: SupportedActions<T>
-  objects: object | object[]
-  userPrivileges: AnyPrivilege[]
-}) {
-  // Function that will be called outside of the module
-  // We cannot be sure types are respected
-  assert.strictEqual(typeof user?.permission, 'string')
-  assert.strictEqual(typeof action, 'string')
-  assert.strictEqual(typeof resource, 'string')
-  assert.strictEqual(objects === undefined, false)
-
-  CPrivilege.checkActionIsValid(resource, action as SupportedActions<typeof resource>)
-
-  if (user.permission === 'admin') {
-    return true
-  }
-
-  const effectsByObject = new Map<object, Privilege<T>['effect'][]>()
-  if (Array.isArray(objects)) {
-    objects.forEach(obj => effectsByObject.set(obj, []))
-  } else {
-    effectsByObject.set(objects, [])
-  }
-
-  for (const userPrivilege of userPrivileges) {
-    const privilege = new CPrivilege(userPrivilege as Privilege<typeof userPrivilege.resource>)
-
-    for (const [object, effects] of effectsByObject.entries()) {
-      if (!privilege.match({ action, resource, object })) {
-        continue
-      }
-      effects.push(privilege.effect)
-    }
-  }
-
-  if (
-    Array.from(effectsByObject.values()).some(
-      effects => effects.length === 0 || effects.some(effect => effect === 'deny')
-    )
-  ) {
-    return false
-  }
-  return true
-}
-
-export function getMissingPrivileges(params: AnyPrivilegeOnParam[], userPrivileges: AnyPrivilege[]) {
-  return params
-    .filter(
-      param =>
-        !hasPrivilegeOn({
-          user: param.user,
-          resource: param.resource,
-          action: param.action as SupportedActions<typeof param.resource>,
-          objects: param.objects,
-          userPrivileges,
-        })
-    )
-    .map(({ action, objects, resource }) => {
-      let objectIds: unknown[] | undefined
-      let objectId: unknown | undefined
-
-      if (Array.isArray(objects)) {
-        if (objects.length > 1) {
-          objectIds = []
-          objects.forEach(obj => {
-            if ('id' in obj) {
-              objectIds!.push(obj.id)
-            }
-          })
-        } else {
-          objects = objects?.[0] ?? {}
-        }
-      }
-      if (!Array.isArray(objects)) {
-        objectId = 'id' in objects ? objects.id : undefined
-      }
-
-      return {
-        objectId,
-        objectIds,
-        action,
-        resource,
-      }
-    })
-}
-
-export function hasPrivileges(params: AnyPrivilegeOnParam[], userPrivileges: AnyPrivilege[]) {
-  return getMissingPrivileges(params, userPrivileges).length === 0
-}
-
-export function filterObjectsWithPrivilege<Resource extends SupportedResource, Object extends object>(param: {
-  user: XoUser
-  resource: Resource
-  action: SupportedActions<Resource>
-  objects: Object[]
-  userPrivileges: AnyPrivilege[]
-}) {
-  return param.objects.filter(obj => hasPrivilegeOn({ ...param, objects: obj }))
-}
-
-// Utils
-
-/**
- * Mirror GetKeysRecursively from @vates/types
- */
-export function getActionStrings<Resource extends SupportedResource, Actions = SupportedActions<Resource>>(
-  resource: Resource
-): Actions[] {
-  type NestedActions = { [key: string]: boolean | NestedActions }
-
-  function collectActions(obj: NestedActions, prefix?: Actions): Actions[] {
-    const actions: Actions[] = ['*' as Actions]
-
-    for (const [key, value] of Object.entries(obj)) {
-      const action = (prefix !== undefined ? `${prefix}:${key}` : key) as Actions
-      actions.push(action)
-
-      if (typeof value === 'boolean') {
-        continue
-      }
-
-      actions.push(...collectActions(value, action))
-    }
-
-    return actions
-  }
-
-  return collectActions(SUPPORTED_ACTIONS_BY_RESOURCE[resource])
-}

@xen-orchestra/acl/src/tests/acl.test.mts

@@ -1,378 +0,0 @@
-import { test, suite } from 'node:test'
-import assert from 'node:assert'
-import type { Branded } from '@vates/types/common'
-import type { XoUser } from '@vates/types/xo'
-
-import { Privilege } from '../class/privilege.mjs'
-import type { Privilege as TPrivilege } from '../index.mjs'
-import {
-  filterObjectsWithPrivilege,
-  getActionStrings,
-  getMissingPrivileges,
-  hasPrivilegeOn,
-  hasPrivileges,
-} from '../index.mjs'
-
-suite('Privilege.checkActionIsValid behavior', () => {
-  test('throw on invalid resource', () => {
-    // @ts-expect-error test invalid action
-    assert.throws(() => Privilege.checkActionIsValid('foo', 'read'))
-  })
-
-  test('throw on invalid action', () => {
-    // @ts-expect-error test invalid action
-    assert.throws(() => Privilege.checkActionIsValid('vm', 'foo:vm'))
-  })
-
-  test('should work', () => {
-    assert.doesNotThrow(() => Privilege.checkActionIsValid('vm', 'read'))
-  })
-})
-
-suite('Privilege.match behavior', () => {
-  const privilege = new Privilege({ action: 'read', resource: 'vm', effect: 'allow' })
-  const object = { id: 1, name_label: 'foo' }
-
-  test('Should not match because of the action', () => {
-    assert.strictEqual(privilege.match({ resource: 'vm', action: 'start', object }), false)
-  })
-
-  test('Should not match because of the resource', () => {
-    assert.strictEqual(privilege.match({ resource: 'host', action: 'read', object }), false)
-  })
-
-  test('Should match', () => {
-    assert.strictEqual(privilege.match({ resource: 'vm', action: 'read', object }), true)
-  })
-
-  test('Should match even if the action is not equal to the action privilege', () => {
-    const shutdownPrivilege = new Privilege({ action: 'shutdown', resource: 'vm', effect: 'allow' })
-    assert.strictEqual(shutdownPrivilege.match({ resource: 'vm', action: 'shutdown:clean', object }), true)
-  })
-
-  test('Should match because the action is *', () => {
-    const vmPrivilege = new Privilege({ action: '*', resource: 'vm', effect: 'allow' })
-    assert.strictEqual(vmPrivilege.match({ action: 'reboot:hard', resource: 'vm', object: object }), true)
-  })
-
-  test('Should not match due to insufficient privilege', () => {
-    const cleanShutdownPrivilege = new Privilege({ action: 'shutdown:clean', resource: 'vm', effect: 'allow' })
-    assert.strictEqual(cleanShutdownPrivilege.match({ resource: 'vm', action: 'shutdown', object }), false)
-  })
-})
-
-suite('ACL V2 behavior', async () => {
-  // === Setup ===
-  const admin = {
-    id: '1' as XoUser['id'],
-    groups: [],
-    permission: 'admin',
-    email: 'admin@admin.net',
-    preferences: {},
-  } satisfies XoUser
-
-  const user = {
-    id: '2' as XoUser['id'],
-    groups: [],
-    permission: 'none',
-    email: 'user@user.net',
-    preferences: {},
-  } satisfies XoUser
-
-  const privilegeId = 'fake-priv-test-id' as Branded<'acl-v2-privilege'>
-  const roleId = 'fake-role-test-id' as Branded<'acl-v2-role'>
-
-  // === Objects
-  const poolWithoutPrivilege = { id: 'pool-id' }
-  const alpineVm = { id: 'alpine', creation: { creator: admin.id } }
-  const almaVm = { id: 'alma', creation: { creator: user.id } }
-  const xoaVm = { id: 'xoa' }
-  const template = { id: 'template-id', $pool: '1' }
-  const templateDeny = { id: 'template-deny-id', $pool: '2' }
-  const vdis = [{ $SR: '2' }, { $SR: '2' }]
-  const vdisMultipleSrs = [{ $SR: '1' }, { $SR: '2' }]
-  const vifs = [{ $network: '1' }]
-  const iso = { id: 'iso-vdi-id', $SR: '3' }
-  const hostAffinity = { id: 'affinity-host-id', $pool: '1' }
-
-  // === DB Privileges
-  const vmRead = { id: privilegeId, action: 'read', resource: 'vm', effect: 'allow', roleId } satisfies TPrivilege<'vm'>
-  const vmCleanShutdown = {
-    id: privilegeId,
-    action: 'shutdown:clean',
-    resource: 'vm',
-    selector: `creation:creator:${user.id}`,
-    effect: 'allow',
-    roleId,
-  } satisfies TPrivilege<'vm'>
-  const xoaVmDenyRead = {
-    id: privilegeId,
-    action: 'read',
-    resource: 'vm',
-    effect: 'deny',
-    selector: `id: ${xoaVm.id}`,
-    roleId,
-  } satisfies TPrivilege<'vm'>
-  const vdiCreate = {
-    id: privilegeId,
-    action: 'create',
-    resource: 'vdi',
-    selector: '$SR:2',
-    effect: 'allow',
-    roleId,
-  } satisfies TPrivilege<'vdi'>
-  const vifCreate = {
-    id: privilegeId,
-    action: 'create',
-    resource: 'vif',
-    effect: 'allow',
-    roleId,
-  } satisfies TPrivilege<'vif'>
-  const templateInstantiate = {
-    id: privilegeId,
-    action: 'instantiate',
-    resource: 'vm-template',
-    effect: 'allow',
-    roleId,
-  } satisfies TPrivilege<'vm-template'>
-  const templateInstantiateDeny = {
-    id: privilegeId,
-    action: 'instantiate',
-    resource: 'vm-template',
-    selector: '$pool:2',
-    effect: 'deny',
-    roleId,
-  } satisfies TPrivilege<'vm-template'>
-  const isoVdiUse = {
-    id: privilegeId,
-    action: 'boot',
-    resource: 'vdi',
-    selector: '$SR:3',
-    effect: 'allow',
-    roleId,
-  } satisfies TPrivilege<'vdi'>
-  const hostVm = {
-    id: privilegeId,
-    action: 'allow-vm',
-    resource: 'host',
-    effect: 'allow',
-    roleId,
-  } satisfies TPrivilege<'host'>
-
-  const allPrivileges = [
-    vmRead,
-    vmCleanShutdown,
-    xoaVmDenyRead,
-    vdiCreate,
-    vifCreate,
-    templateInstantiate,
-    templateInstantiateDeny,
-    isoVdiUse,
-    hostVm,
-  ]
-
-  // === Test ===
-  suite('hasPrivilegeOn behavior', () => {
-    test('Should always return true for admin', () => {
-      assert.strictEqual(
-        hasPrivilegeOn<'pool'>({
-          user: admin,
-          action: 'read',
-          resource: 'pool',
-          objects: poolWithoutPrivilege,
-          userPrivileges: allPrivileges,
-        }),
-        true
-      )
-    })
-
-    test('Should return false by default for non admin', () => {
-      assert.strictEqual(
-        hasPrivilegeOn({
-          user,
-          action: 'read',
-          resource: 'pool',
-          objects: poolWithoutPrivilege,
-          userPrivileges: allPrivileges,
-        }),
-        false
-      )
-    })
-
-    test('Should return true if user has privilege', () => {
-      assert.strictEqual(
-        hasPrivilegeOn({ user, action: 'read', resource: 'vm', objects: alpineVm, userPrivileges: allPrivileges }),
-        true
-      )
-    })
-
-    test('Should return false if user have a both deny and allow privileges', () => {
-      assert.strictEqual(
-        hasPrivilegeOn({ user, action: 'read', resource: 'vm', objects: xoaVm, userPrivileges: allPrivileges }),
-        false
-      )
-    })
-
-    test('Should handle multiple and single object', () => {
-      assert.strictEqual(
-        hasPrivilegeOn({
-          user,
-          action: 'read',
-          resource: 'vm',
-          objects: [alpineVm, almaVm],
-          userPrivileges: allPrivileges,
-        }),
-        true
-      )
-      assert.strictEqual(
-        hasPrivilegeOn({
-          user,
-          action: 'read',
-          resource: 'vm',
-          objects: [alpineVm, almaVm, xoaVm],
-          userPrivileges: allPrivileges,
-        }),
-        false
-      )
-    })
-
-    test('Should allow clean shutdown only own VMs', () => {
-      assert.strictEqual(
-        hasPrivilegeOn({
-          user,
-          action: 'shutdown:clean',
-          resource: 'vm',
-          objects: almaVm,
-          userPrivileges: allPrivileges,
-        }),
-        true
-      )
-      assert.strictEqual(
-        hasPrivilegeOn({
-          user,
-          action: 'shutdown:clean',
-          resource: 'vm',
-          objects: [almaVm, alpineVm],
-          userPrivileges: allPrivileges,
-        }),
-        false
-      )
-    })
-  })
-
-  suite('getMissingPrivileges behavior', () => {
-    test('Should return empty array if no missing privileges', () => {
-      const missingPrivileges = getMissingPrivileges(
-        [
-          { user, action: 'shutdown:clean', resource: 'vm', objects: almaVm },
-          { user, action: 'instantiate', resource: 'vm-template', objects: template },
-          { user, action: 'create', resource: 'vdi', objects: vdis },
-          { user, action: 'create', resource: 'vif', objects: vifs },
-          { user, action: 'boot', resource: 'vdi', objects: iso },
-          { user, action: 'allow-vm', resource: 'host', objects: hostAffinity },
-        ],
-        allPrivileges
-      )
-
-      assert.strictEqual(missingPrivileges.length, 0)
-    })
-
-    test('Should return only missing privileges', () => {
-      const missingPrivileges = getMissingPrivileges(
-        [
-          { user, action: 'instantiate', resource: 'vm-template', objects: template },
-          { user, action: 'create', resource: 'vdi', objects: vdis },
-          { user, action: 'create', resource: 'vif', objects: vifs },
-          { user, action: 'boot', resource: 'vdi', objects: iso },
-          { user, action: 'allow-vm', resource: 'host', objects: hostAffinity },
-          { user, action: 'read', resource: 'pool', objects: poolWithoutPrivilege },
-          { user, action: '*', resource: 'pool', objects: poolWithoutPrivilege },
-        ],
-        allPrivileges
-      )
-
-      assert.strictEqual(missingPrivileges.length, 2)
-    })
-
-    test('Should return objectId if only one object in the missing privilege', () => {
-      const missingPrivileges = getMissingPrivileges(
-        [{ user, action: 'read', resource: 'pool', objects: poolWithoutPrivilege }],
-        allPrivileges
-      )
-
-      assert.strictEqual(missingPrivileges.length, 1)
-      assert.notStrictEqual(missingPrivileges[0]!.objectId, undefined)
-    })
-
-    test('Should return objectIds if multiple objects in the missing privilege', () => {
-      const missingPrivileges = getMissingPrivileges(
-        [{ user, action: 'read', resource: 'pool', objects: [poolWithoutPrivilege, poolWithoutPrivilege] }],
-        allPrivileges
-      )
-
-      assert.strictEqual(missingPrivileges.length, 1)
-      assert.notStrictEqual(missingPrivileges[0]!.objectIds, undefined)
-    })
-  })
-
-  suite('hasPrivileges behavior', () => {
-    test('Should return false if at least one privilege deny', () => {
-      const result = hasPrivileges(
-        [
-          { user, action: 'instantiate', resource: 'vm-template', objects: templateDeny },
-          { user, action: 'create', resource: 'vdi', objects: vdis },
-          { user, action: 'create', resource: 'vif', objects: vifs },
-          { user, action: 'boot', resource: 'vdi', objects: iso },
-          { user, action: 'allow-vm', resource: 'host', objects: hostAffinity },
-        ],
-        allPrivileges
-      )
-      assert.strictEqual(result, false)
-    })
-    test("Should return false if at least one privilege didn't match", () => {
-      const result = hasPrivileges(
-        [
-          { user, action: 'instantiate', resource: 'vm-template', objects: template },
-          { user, action: 'create', resource: 'vdi', objects: vdisMultipleSrs },
-          { user, action: 'create', resource: 'vif', objects: vifs },
-          { user, action: 'boot', resource: 'vdi', objects: iso },
-          { user, action: 'allow-vm', resource: 'host', objects: hostAffinity },
-        ],
-        allPrivileges
-      )
-      assert.strictEqual(result, false)
-    })
-  })
-
-  suite('filterObjectsWithPrivilege behavior', () => {
-    test('Should return only objects that match privileges', () => {
-      let vms = [almaVm, alpineVm, xoaVm, xoaVm]
-      assert.strictEqual(vms.length, 4)
-      vms = filterObjectsWithPrivilege({
-        user,
-        action: 'read',
-        resource: 'vm',
-        objects: vms,
-        userPrivileges: allPrivileges,
-      })
-      assert.strictEqual(vms.length, 2)
-    })
-  })
-})
-
-suite('getActionStrings', () => {
-  test('returns flat actions for a resource without nesting', () => {
-    const actions = getActionStrings('host')
-    assert.ok(actions.includes('read'))
-    // @ts-ignore A TypeScript error is thrown because `foo` is not of type `SupportedActions<'vm'>`.
-    // To test for a negative value, the error is ignored.
-    assert.strictEqual(actions.includes('foo'), false)
-  })
-
-  test('parent action is included alongside its children', () => {
-    const actions = getActionStrings('vm')
-    assert.ok(actions.includes('shutdown'))
-    assert.ok(actions.includes('shutdown:clean'))
-    assert.ok(actions.includes('shutdown:hard'))
-  })
-})

@xen-orchestra/acl/tsconfig.json

@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "./dist",
-    "rootDir": "./src",
-
-    "strict": true,
-    "module": "nodenext",
-    "lib": ["ESNext"],
-    "moduleResolution": "nodenext",
-    "target": "ES2022",
-    "skipLibCheck": true,
-    "types": ["node"], // Only use types from Node.js and packages that are explicitly imported
-    "noImplicitAny": false, // otherwise it will throw an error when importing packages without type definition
-    "noUncheckedIndexedAccess": true,
-    "declaration": true
-  },
-  "include": ["./src/**/*"],
-  "exclude": ["./node_modules", "./dist"]
-}

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

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@xen-orchestra/async-map",
-  "version": "0.1.3",
+  "version": "0.1.2",
   "license": "ISC",
   "description": "Promise.all + map for all iterables",
   "keywords": [
@@ -28,7 +28,7 @@
     "node": ">=6"
   },
   "dependencies": {
-    "lodash": "^4.18.0"
+    "lodash": "^4.17.4"
   },
   "scripts": {
     "postversion": "npm publish",

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

@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@vates/decorate-with": "^2.1.0",
-    "@xen-orchestra/log": "^0.7.2",
+    "@xen-orchestra/log": "^0.7.1",
     "golike-defer": "^0.5.1",
     "object-hash": "^2.0.1"
   },

@xen-orchestra/backup-archive/package.json

@@ -1,48 +1,41 @@
 {
   "name": "@xen-orchestra/backup-archive",
-  "version": "1.1.1",
+  "version": "1.0.0",
   "description": "Helper to handle generic backup archives",
   "license": "ISC",
   "author": "",
   "type": "module",
   "main": "./dist/index.mjs",
-  "exports": {
-    ".": "./dist/index.mjs",
-    "./disks": "./dist/disks/index.mjs"
-  },
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "rimraf": "^6.0.1",
     "@types/node": "^22.3.0",
     "typescript": "~5.6",
-    "typescript-eslint": "^8.61.0",
+    "typescript-eslint": "^8.23.0",
     "fs-extra": "^11.1.0",
     "sinon": "^18.0.0",
     "tar-stream": "^3.1.8",
     "@types/tar-stream": "^3.1.4",
     "tmp": "^0.2.1",
-    "@vates/types": "^1.30.1"
+    "@vates/types": "^1.21.0"
   },
   "dependencies": {
     "@xen-orchestra/log": "^0.7.1",
-    "@xen-orchestra/fs": "^4.9.3",
-    "@xen-orchestra/disk-transform": "^1.3.3",
-    "@vates/task": "0.7.0",
-    "golike-defer": "0.5.1",
+    "@xen-orchestra/fs": "^4.6.7",
+    "@xen-orchestra/backups": "^0.69.2",
     "uuid": "^9.0.0",
     "promise-toolbox": "^0.21.0",
     "@vates/async-each": "^1.0.1",
-    "vhd-lib": "^4.16.1"
+    "vhd-lib": "^4.14.7"
   },
   "scripts": {
-    "build": "yarn run clean && tsc",
+    "build": "tsc",
     "dev": "tsc --watch",
     "postversion": "npm publish --access public",
-    "test": "yarn run clean && tsc && node --test **/*.test.mjs",
-    "test-integration": "yarn run clean && tsc && node --test **/*.integ.mjs",
+    "test-integration": "tsc && node --test **/*.integ.mjs",
     "clean": "rimraf dist/"
   },
-  "private": false,
+  "private": true,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/backup-archive",
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "repository": {

@xen-orchestra/backup-archive/src/RemoteDiskLineage.mts

@@ -1,31 +1,13 @@
-import { RemoteHandlerAbstract } from '@xen-orchestra/fs'
-import { basename, dirname, normalize } from '@xen-orchestra/fs/path'
-import {
-  MergeRemoteDisk,
-  openDisk,
-  openDisposableDisk,
-  RemoteDisk,
-  isDisk,
-  openDiskChain,
-} from '@xen-orchestra/backup-archive/disks'
-import Disposable from 'promise-toolbox/Disposable'
-import {
-  CleanResult,
-  DEFAULT_MERGE_CONCURRENCY,
-  DEFAULT_REMOVE_CONCURRENCY,
-  ResolvedBackupCleanOptions,
-} from './VmBackup.types.mjs'
+import RemoteHandlerAbstract from '@xen-orchestra/fs'
+import { dirname, normalize } from '@xen-orchestra/fs/path'
+import { MergeRemoteDisk, openDisk, openDiskChainFromPaths, RemoteDisk, isDiskFile } from '@xen-orchestra/backups/disks'
+import { DEFAULT_MERGE_CONCURRENCY, DEFAULT_REMOVE_CONCURRENCY, ResolvedBackupCleanOptions } from './VmBackup.types.mjs'
 import { asyncEach } from '@vates/async-each'
-import { Task } from '@vates/task'
-import { limitConcurrency } from 'limit-concurrency-decorator'
-import assert from 'node:assert/strict'
 
-const defaultMergeLimiter = limitConcurrency(1)
-const MERGE_STATE_FILE_RE = /^\.(.+)\.merge\.json$/
 /**
  * Tracks the disk chain for a single VDI across all backup snapshots.
  * Owns merge and deletion decisions for its chain given which disks are still
- * referenced by active backups (accumulated via addActiveDiskPath).
+ * referenced by active backups (accumulated via addActiveDiskPaths).
  */
 export class RemoteDiskLineage {
   #handler: RemoteHandlerAbstract
@@ -70,45 +52,24 @@ export class RemoteDiskLineage {
    * Also detects interrupted merge state files.
    */
   async init(): Promise<void> {
-    let files: string[]
-    try {
-      files = await this.#handler.list(this.#vdiDir, { prependDir: true })
-    } catch (error) {
-      if (error?.code === 'NOT_SUPPORTED') throw error
-      this.#opts.logWarn('failed to list VDI directory', { vdiDir: this.#vdiDir, error })
-      return
-    }
+    const files = await this.#handler.list(this.#vdiDir, { prependDir: true })
 
     for (const filePath of files) {
-      if (isDisk(filePath)) {
+      if (isDiskFile(filePath)) {
         this.#diskPaths.add(normalize(filePath))
       }
     }
 
-    const mergeParentPaths = new Set<string>()
-    for (const filePath of files) {
-      const match = MERGE_STATE_FILE_RE.exec(basename(filePath))
-      if (match !== null) {
-        mergeParentPaths.add(normalize(this.#vdiDir + '/' + match[1]))
-      }
-    }
-
     const uuidToPath = new Map<string, string>()
     for (const diskPath of this.#diskPaths) {
       let disk: RemoteDisk | undefined
       try {
-        if (mergeParentPaths.has(diskPath)) {
-          disk = await openDisk({ handler: this.#handler, path: diskPath, force: true })
-        } else {
-          disk = await openDisk({ handler: this.#handler, path: diskPath })
-        }
-      } catch (error) {
+        disk = await openDisk({ handler: this.#handler as any, path: diskPath })
+      } catch (error: any) {
         if (error?.code === 'NOT_SUPPORTED' && this.#opts.merge) {
           throw error
         }
         this.#opts.logWarn('failed to open disk', { path: diskPath, error })
-        // Broken disks will be removed by the clean phase
-        // because they are marked as NOT active
         this.#brokenDiskPaths.add(diskPath)
         continue
       }
@@ -121,14 +82,17 @@ export class RemoteDiskLineage {
           this.#opts.logWarn('duplicate disk UUID detected', { uuid, path1: existingPath, path2: diskPath })
           let existingDisk: RemoteDisk | undefined
           try {
-            existingDisk = await openDisk({ handler: this.#handler, path: existingPath })
+            existingDisk = await openDisk({ handler: this.#handler as any, path: existingPath })
             if (existingDisk.containsAllDataOf(disk)) {
-              this.#opts.logWarn('should drop duplicate disk, existing is superset', { dropped: diskPath })
+              this.#opts.logWarn('dropping duplicate disk, existing is superset', { dropped: diskPath })
+              this.#unregisterDisk(diskPath)
               continue
             } else if (disk.containsAllDataOf(existingDisk)) {
-              this.#opts.logWarn('should drop old duplicate disk, new is superset', { dropped: existingPath })
+              this.#opts.logWarn('dropping duplicate disk, new is superset', { dropped: existingPath })
+              this.#unregisterDisk(existingPath)
             } else {
-              this.#opts.logWarn('duplicate disks have different content, should first-seen', { dropped: diskPath })
+              this.#opts.logWarn('duplicate disks have different content, keeping first-seen', { dropped: diskPath })
+              this.#unregisterDisk(diskPath)
               continue
             }
           } catch (error) {
@@ -163,29 +127,12 @@ export class RemoteDiskLineage {
     }
 
     this.#interruptedMerges = await MergeRemoteDisk.findInterruptedMerges(
-      this.#handler,
+      this.#handler as any,
       this.#vdiDir,
       files,
       uuidToPath,
       this.#childOf
     )
-
-    const propagateBroken = (diskPath: string) => {
-      if (!this.#brokenDiskPaths.has(diskPath)) {
-        this.#brokenDiskPaths.add(diskPath)
-        const child = this.#childOf.get(diskPath)
-        if (child !== undefined) {
-          propagateBroken(child)
-        }
-      }
-    }
-
-    for (const [child, parent] of this.#parentOf) {
-      if (!this.#diskPaths.has(parent) || this.#brokenDiskPaths.has(parent)) {
-        this.#opts.logWarn('disk broken: parent missing or broken', { child, parent })
-        propagateBroken(child)
-      }
-    }
   }
 
   /**
@@ -215,8 +162,10 @@ export class RemoteDiskLineage {
    * Called by each archive that references this lineage after it determines it is complete.
    * Accumulated across all referencing archives before clean() is called.
    */
-  addActiveDiskPath(diskPath: string): void {
-    this.#activeDiskPaths.add(normalize(diskPath))
+  addActiveDiskPaths(diskPaths: string[]): void {
+    for (const path of diskPaths) {
+      this.#activeDiskPaths.add(normalize(path))
+    }
   }
 
   /**
@@ -227,13 +176,13 @@ export class RemoteDiskLineage {
    * Also resumes interrupted merges (detected via .merge.json files) when opts.merge is true.
    * Deletes orphan merge state files (for missing disks) when opts.remove is true.
    *
-   * Requires activeDiskPaths to be completed to have been called by all referencing archives before this.
+   * Requires addActiveDiskPaths() to have been called by all referencing archives before this.
    * @returns Set of deleted disk paths.
    */
   async clean({
     remove = this.#opts.remove ?? false,
     merge = this.#opts.merge ?? false,
-  }: { remove?: boolean; merge?: boolean } = {}): Promise<CleanResult> {
+  }: { remove?: boolean; merge?: boolean } = {}): Promise<{ deleted: Set<string>; mergedSizes: Map<string, number> }> {
     const orphanDisks = new Set([...this.#diskPaths].filter(p => !this.#activeDiskPaths.has(p)))
     const toDelete = new Set<string>()
     const toMerge: { chain: string[]; isResuming: boolean }[] = []
@@ -307,10 +256,8 @@ export class RemoteDiskLineage {
         async path => {
           this.#opts.logInfo('deleting unused disk', { path })
           try {
-            const disk = await openDisk({ handler: this.#handler, path, ignoreBlockIndexes: true })
+            const disk = await openDisk({ handler: this.#handler as any, path, ignoreBlockIndexes: true })
             await disk.unlink({ force: true })
-            // Remove from tracking so #cleanOrphanDataFiles skips this now-deleted path
-            this.#unregisterDisk(path)
           } catch (error) {
             this.#opts.logWarn('failed to delete unused disk', { path, error })
           }
@@ -326,37 +273,19 @@ export class RemoteDiskLineage {
     // mergeTargetPath: final size of the disk everything was merged into
     const mergedSizes = new Map<string, number>()
     if (merge) {
-      const limitedMergeChain = defaultMergeLimiter(this.#mergeChain.bind(this))
-      const doMerge = async () => {
-        await asyncEach(
-          toMerge,
-          async ({ chain, isResuming }) => {
-            const { finalDiskSize, mergeTargetPath } = await limitedMergeChain([...chain], isResuming)
-            mergedSizes.set(mergeTargetPath, (mergedSizes.get(mergeTargetPath) ?? 0) + finalDiskSize)
-            // parentPath alias deleted by parentDisk.rename(mergeTargetPath)
-            // intermediates deleted by childDisk.unlink() when removeUnused=true
-            // Unregister so #cleanOrphanDataFiles does not read already-deleted aliases
-            // and produce false "missing target of alias" warnings.
-            for (const deletedPath of chain.slice(0, -1)) {
-              this.#unregisterDisk(deletedPath)
-            }
-          },
-          { concurrency: this.#opts.mergeConcurrency ?? DEFAULT_MERGE_CONCURRENCY }
-        )
-      }
-      if (toMerge.length !== 0) {
-        await Task.run({ properties: { name: 'merge' } }, doMerge)
-      }
+      await asyncEach(
+        toMerge,
+        async ({ chain, isResuming }) => {
+          const { finalDiskSize, mergeTargetPath } = await this.#mergeChain(chain, isResuming)
+          mergedSizes.set(mergeTargetPath, (mergedSizes.get(mergeTargetPath) ?? 0) + finalDiskSize)
+        },
+        { concurrency: DEFAULT_MERGE_CONCURRENCY }
+      )
     }
 
     await this.#cleanOrphanDataFiles(remove)
 
-    return {
-      removedFiles: Array.from(toDelete),
-      merge: toMerge.length > 0,
-      size: [...mergedSizes.values()].reduce((total, subSize) => total + subSize, 0),
-      mergedSizes,
-    }
+    return { deleted: toDelete, mergedSizes }
   }
 
   /**
@@ -364,39 +293,28 @@ export class RemoteDiskLineage {
    * Returns the final size of the merge target and its path.
    */
   async #mergeChain(chain: string[], isResuming: boolean): Promise<{ finalDiskSize: number; mergeTargetPath: string }> {
-    assert.ok(chain.length >= 2, `look to merge a chain shorter than 2 ${JSON.stringify(chain)}`)
     const parentPath = chain[0]
-    this.#opts.logInfo('merging disk chain', { chain: [...chain] }) // need a copy here to log full chain
     // The last disk in the chain is the active one that everything gets merged into
-    const mergeTargetPath = chain.pop()!
+    const mergeTargetPath = chain[chain.length - 1]
 
-    const merger = new MergeRemoteDisk(this.#handler, {
+    this.#opts.logInfo('merging disk chain', { chain })
+
+    const merger = new MergeRemoteDisk(this.#handler as any, {
       logInfo: this.#opts.logInfo,
       removeUnused: this.#opts.remove,
       mergeBlockConcurrency: this.#opts.mergeBlockConcurrency,
       onProgress: this.#opts.onProgress,
     })
-    let parentDisk: RemoteDisk | undefined
-    let childDisk: RemoteDisk | undefined
-    try {
-      parentDisk = await openDisk({ handler: this.#handler, path: parentPath, force: isResuming })
-      childDisk = await openDiskChain({
-        handler: this.#handler,
-        path: mergeTargetPath,
-        until: parentPath,
-        force: isResuming,
-      })
 
-      const { finalDiskSize } = (await merger.merge(parentDisk, childDisk!))!
-      return { finalDiskSize, mergeTargetPath }
-    } finally {
-      await parentDisk?.close().catch(error => {
-        this.#opts.logWarn('Error closing parent Disk', error)
-      })
-      await childDisk?.close().catch(error => {
-        this.#opts.logWarn('Error closing child Disk', error)
-      })
-    }
+    const parentDisk = await openDisk({ handler: this.#handler as any, path: parentPath, force: isResuming })
+    const childDisk = await openDiskChainFromPaths({
+      handler: this.#handler as any,
+      paths: chain.slice(1),
+      force: isResuming,
+    })
+
+    const { finalDiskSize } = await merger.merge(parentDisk, childDisk)
+    return { finalDiskSize, mergeTargetPath }
   }
 
   /**
@@ -406,13 +324,14 @@ export class RemoteDiskLineage {
   async #cleanOrphanDataFiles(remove: boolean): Promise<void> {
     const claimedFiles = new Set<string>()
     for (const diskPath of this.#diskPaths) {
-      const claimed = await Disposable.use(
-        openDisposableDisk({ handler: this.#handler, path: diskPath, ignoreBlockIndexes: true }),
-        async disk => {
-          await disk.clean({ remove, logWarn: this.#opts.logWarn, logInfo: this.#opts.logInfo })
-          return disk.listAssociatedFiles(this.#vdiDir)
-        }
-      )
+      let claimed: string[] = []
+      const disk = await openDisk({ handler: this.#handler as any, path: diskPath, ignoreBlockIndexes: true })
+      try {
+        await disk.clean({ remove, logWarn: this.#opts.logWarn, logInfo: this.#opts.logInfo })
+        claimed = await disk.listAssociatedFiles(this.#vdiDir)
+      } finally {
+        await disk.close()
+      }
       for (const f of claimed) claimedFiles.add(normalize(f))
     }
 
@@ -423,7 +342,7 @@ export class RemoteDiskLineage {
         if (!claimedFiles.has(normalize(item))) {
           this.#opts.logWarn('orphaned data file', { path: item })
           if (remove) {
-            await this.#handler.unlink(item).catch(async err => {
+            await this.#handler.unlink(item).catch(async (err: any) => {
               if (err?.code === 'EISDIR') {
                 await this.#handler.rmtree(item)
               } else {

@xen-orchestra/backup-archive/src/VmBackup.types.mts

@@ -1,4 +1,4 @@
-import { RemoteHandlerAbstract } from '@xen-orchestra/fs'
+import RemoteHandlerAbstract from '@xen-orchestra/fs'
 
 export interface PartialBackupMetadata {
   mode: 'full' | 'delta'
@@ -10,11 +10,6 @@ export interface PartialBackupMetadata {
   jobId: string
   scheduleId: string
   timestamp: number
-  // 'true' when written by code including the non-NBD qcow2 corruption fix and its force-full
-  // gate; its absence marks a potentially-corrupt older backup and makes the gate re-probe.
-  // Preserved (never stamped) across merges here.
-  // @todo remove this code and the logic associated on 2027 01 01
-  includeNonNbdQcow2Fix?: boolean
 }
 export const DEFAULT_MERGE_CONCURRENCY = 1
 export const DEFAULT_REMOVE_CONCURRENCY = 4
@@ -24,7 +19,6 @@ export interface BackupCleanOptions {
   merge?: boolean
   remove?: boolean
   mergeBlockConcurrency?: number
-  mergeConcurrency?: number
   onProgress?: (progress: { total: number; done: number }) => void
   logInfo?: (message: any, opts?: object) => void
   logWarn?: (message: any, opts?: object) => void
@@ -55,9 +49,7 @@ export interface CheckResult {
 
 export type CleanResult = {
   removedFiles: string[]
-  merge?: boolean
-  size?: number
-  mergedSizes?: Map<string, number>
+  merge: boolean
 }
 
 export interface VmBackupInterface {

@xen-orchestra/backup-archive/src/VmBackupDirectory.mts

@@ -1,4 +1,4 @@
-import { RemoteHandlerAbstract } from '@xen-orchestra/fs'
+import RemoteHandlerAbstract from '@xen-orchestra/fs'
 import { basename, normalize } from '@xen-orchestra/fs/path'
 import { resolve } from 'node:path'
 import { VmFullBackupArchive } from './VmFullBackupArchive.mjs'
@@ -14,14 +14,10 @@ import {
   ResolvedBackupCleanOptions,
   DEFAULT_MERGE_CONCURRENCY,
 } from './VmBackup.types.mjs'
-import { cleanOrphanDiskDirs } from '@xen-orchestra/backup-archive/disks'
+import { cleanOrphanDiskDirs } from '@xen-orchestra/backups/disks'
 import { asyncEach } from '@vates/async-each'
 import { createLogger } from '@xen-orchestra/log'
-import { promisify } from 'node:util'
-import zlib from 'node:zlib'
-
-const gzip = promisify(zlib.gzip)
-const gunzip = promisify(zlib.gunzip)
+import { RemoteAdapter } from '@xen-orchestra/backups/RemoteAdapter.mjs'
 
 const { info: logInfo, warn: logWarn } = createLogger('xo:backup-archive')
 
@@ -38,10 +34,7 @@ export class VmBackupDirectory implements VmBackupInterface {
   // Cached result of the last check() call; invalidated by init()
   #checkResult: (CheckResult & { orphans: string[]; linked: string[] }) | undefined = undefined
   #uniqueLineages: Map<string, RemoteDiskLineage> | undefined = undefined
-
-  // Set by #checkCacheCount(): the on-disk cache did not match the archives found
-  // on disk, so clean() must regenerate it even when nothing was merged/removed.
-  #cacheOutOfSync = false
+  #remoteAdapter: RemoteAdapter
 
   constructor(
     handler: RemoteHandlerAbstract,
@@ -64,24 +57,7 @@ export class VmBackupDirectory implements VmBackupInterface {
       logInfo: opts.logInfo ?? logInfo,
       logWarn: opts.logWarn ?? logWarn,
     }
-  }
-
-  async #readCache(path: string): Promise<Record<string, unknown> | undefined> {
-    try {
-      return JSON.parse((await gunzip(await this.handler.readFile(path))).toString())
-    } catch (error) {
-      if (error?.code !== 'ENOENT') {
-        logWarn('failed to read cache', { error, path })
-      }
-    }
-  }
-
-  async #writeCache(path: string, data: Record<string, unknown>): Promise<void> {
-    try {
-      await this.handler.writeFile(path, await gzip(JSON.stringify(data)), { flags: 'w' })
-    } catch (error) {
-      logWarn('failed to write cache', { error, path })
-    }
+    this.#remoteAdapter = new RemoteAdapter(handler)
   }
 
   async init() {
@@ -100,7 +76,7 @@ export class VmBackupDirectory implements VmBackupInterface {
         try {
           const backupArchive = await this.instantiateBackupArchive(fullPath, metadata)
           this.backupArchives.set(fullPath, backupArchive)
-        } catch (error) {
+        } catch (error: any) {
           if (error?.code === 'NOT_SUPPORTED') throw error
           this.opts.logWarn(`Issue loading ${metadata.xva ?? metadata.vhds}`, { json: fullPath, backup: metadata })
         }
@@ -145,21 +121,17 @@ export class VmBackupDirectory implements VmBackupInterface {
     const { orphans } = this.#checkResult ?? (await this.check())
 
     let cacheNeedsRegen = false
-    let someLineageMergedOrShouldBe = false
 
     // Merge/delete orphan disks in VDI directories covered by archives; collect merged sizes per disk path
     const allMergedSizes = new Map<string, number>()
     await asyncEach(
       Array.from(this.#uniqueLineages!.entries()),
       async ([_vdiDir, lineage]) => {
-        const { mergedSizes, removedFiles, merge: hasPendingMerge } = await lineage.clean({ remove, merge })
-        if (removedFiles.length > 0) {
+        const { mergedSizes, deleted } = await lineage.clean({ remove, merge })
+        if (deleted.size > 0) {
           cacheNeedsRegen = true
         }
-        if (hasPendingMerge) {
-          someLineageMergedOrShouldBe = true
-        }
-        for (const [diskPath, size] of mergedSizes || []) {
+        for (const [diskPath, size] of mergedSizes) {
           allMergedSizes.set(diskPath, (allMergedSizes.get(diskPath) ?? 0) + size)
         }
       },
@@ -168,7 +140,7 @@ export class VmBackupDirectory implements VmBackupInterface {
 
     // Delete VDI directories not referenced by any archive
     const coveredDirs = new Set(this.#uniqueLineages!.keys())
-    await cleanOrphanDiskDirs(this.handler, this.rootPath, coveredDirs, {
+    await cleanOrphanDiskDirs(this.handler as any, this.rootPath, coveredDirs, {
       remove,
       logWarn: this.opts.logWarn,
       logInfo: this.opts.logInfo,
@@ -179,15 +151,15 @@ export class VmBackupDirectory implements VmBackupInterface {
     await asyncEach(
       Array.from(this.backupArchives.values()),
       async (archive: VmBackupInterface) => {
-        const { removedFiles } = await archive.clean({ remove, mergedSizes: allMergedSizes })
-        if (removedFiles.length > 0) {
+        const { removedFiles, merge: didMerge } = await archive.clean({ remove, mergedSizes: allMergedSizes })
+        if (removedFiles.length > 0 || didMerge) {
           cacheNeedsRegen = true
         }
       },
       { concurrency: 2 }
     )
 
-    if (allMergedSizes.size > 0 || cacheNeedsRegen || this.#cacheOutOfSync) {
+    if (cacheNeedsRegen) {
       await this.#regenerateCache()
     }
 
@@ -198,7 +170,7 @@ export class VmBackupDirectory implements VmBackupInterface {
         async (orphan: string) => {
           try {
             await this.handler.unlink(orphan)
-          } catch (error) {
+          } catch (error: any) {
             if (error?.code === 'EISDIR') {
               this.opts.logWarn('orphan is a directory, skipping deletion', { path: orphan })
             } else if (error?.code !== 'ENOENT') {
@@ -209,17 +181,16 @@ export class VmBackupDirectory implements VmBackupInterface {
         { concurrency: 2 }
       )
     }
-    const size = [...allMergedSizes.values()].reduce((total, merged) => total + merged, 0)
-    return { removedFiles: orphans, merge: someLineageMergedOrShouldBe, size: size }
+
+    return { removedFiles: orphans, merge: allMergedSizes.size > 0 }
   }
 
   async #checkCacheCount(): Promise<void> {
     const cachePath = `${this.rootPath}/cache.json.gz`
-    const existingCache = await this.#readCache(cachePath)
-    const actual = existingCache === undefined ? 0 : Object.keys(existingCache).length
+    const existingCache = await this.#remoteAdapter._readCache(cachePath)
+    const actual = existingCache === undefined ? undefined : Object.keys(existingCache).length
     const expected = this.backupArchives.size
-    this.#cacheOutOfSync = actual !== expected
-    if (this.#cacheOutOfSync) {
+    if (actual !== undefined && actual !== expected) {
       this.opts.logWarn('unexpected number of entries in backup cache', { path: cachePath, actual, expected })
     }
   }
@@ -231,7 +202,7 @@ export class VmBackupDirectory implements VmBackupInterface {
       const a = archive as VmFullBackupArchive | VmIncrementalBackupArchive
       cache[path] = { _filename: path, id: path, ...a.metadata }
     }
-    await this.#writeCache(cachePath, cache)
+    await this.#remoteAdapter._writeCache(cachePath, cache)
   }
 
   async instantiateBackupArchive(metadataPath: string, metadata: PartialBackupMetadata) {
@@ -243,7 +214,7 @@ export class VmBackupDirectory implements VmBackupInterface {
           this.rootPath,
           metadataPath,
           metadata,
-          resolve('/', this.rootPath, metadata.xva!),
+          metadata.xva!,
           this.opts
         )
       } else if (metadata.mode === 'delta') {
@@ -283,7 +254,7 @@ export class VmBackupDirectory implements VmBackupInterface {
     const dir = new VmBackupDirectory(handler, vmBackupPath, cleanOpts)
     await dir.init()
     await dir.check()
-    const { merge, size } = await dir.clean({ remove: cleanOpts.remove, merge: cleanOpts.merge })
-    return { merge, size }
+    const { merge } = await dir.clean({ remove: cleanOpts.remove, merge: cleanOpts.merge })
+    return { merge }
   }
 }

@xen-orchestra/backup-archive/src/VmFullBackupArchive.integ.mjs

@@ -44,17 +44,15 @@ afterEach(async () => {
 const uniqueId = () => uuid.v1()
 
 async function createFullBackupMetadata(name, xvaName) {
-  await handler.writeFile(`${rootPath}/${xvaName}`, await createMinimalXva())
-  const size = await handler.getSize(`${rootPath}/${xvaName}`)
   const metadata = {
     mode: 'full',
-    xva: `./${xvaName}`,
+    xva: `${rootPath}/${xvaName}`,
     vm: { uuid: vmUuid },
     jobId: uniqueId(),
     timestamp: Date.now(),
-    size,
   }
   await handler.writeFile(`${rootPath}/${name}`, JSON.stringify(metadata))
+  await handler.writeFile(`${rootPath}/${xvaName}`, await createMinimalXva())
   return metadata
 }
 
@@ -101,7 +99,8 @@ describe('VmBackupDirectory with full backups', { concurrency: 1 }, () => {
     await createFullBackupMetadata('backup1.json', 'backup1.xva')
     await handler.writeFile(`${rootPath}/orphan.xva`, 'orphan-content')
 
-    await VmBackupDirectory.cleanVm(handler, rootPath, { remove: true })
+    await vmBackupDir.init()
+    await vmBackupDir.clean({ remove: true })
 
     const remainingFiles = await handler.list(rootPath)
     assert.ok(remainingFiles.includes('backup1.json'))
@@ -109,24 +108,12 @@ describe('VmBackupDirectory with full backups', { concurrency: 1 }, () => {
     assert.ok(!remainingFiles.includes('orphan.xva'))
   })
 
-  test('Missing XVA cleans the metadata', async () => {
-    await createFullBackupMetadata('metadata.json', 'missing.xva')
-    await handler.unlink(`${rootPath}/missing.xva`)
-    let logged = ''
-    const logInfo = message => {
-      logged += message + '\n'
-    }
-    await VmBackupDirectory.cleanVm(handler, rootPath, { remove: true, logInfo, logWarn: logInfo })
-    const remainingFiles = await handler.list(rootPath)
-    assert.ok(logged.match(/XVA is missing/g))
-    assert.ok(!remainingFiles.includes('metadata.json'))
-  })
-
   test('clean() preserves cache.json.gz', async () => {
     await createFullBackupMetadata('backup1.json', 'backup1.xva')
     await handler.writeFile(`${rootPath}/cache.json.gz`, 'cache')
 
-    await VmBackupDirectory.cleanVm(handler, rootPath)
+    await vmBackupDir.init()
+    await vmBackupDir.clean()
 
     const remainingFiles = await handler.list(rootPath)
     assert.equal(remainingFiles.length, 3)
@@ -136,7 +123,8 @@ describe('VmBackupDirectory with full backups', { concurrency: 1 }, () => {
   test('clean() removes an orphan XVA checksum file (no matching metadata or XVA)', async () => {
     await handler.writeFile(`${rootPath}/stray.xva.checksum`, 'sha256:deadbeef')
 
-    await VmBackupDirectory.cleanVm(handler, rootPath, { remove: true })
+    await vmBackupDir.init()
+    await vmBackupDir.clean({ remove: true })
 
     const remainingFiles = await handler.list(rootPath)
     assert.ok(!remainingFiles.includes('stray.xva.checksum'), 'orphan XVA checksum should be deleted')
@@ -151,7 +139,6 @@ describe('VmBackupDirectory with full backups', { concurrency: 1 }, () => {
 
     const remainingFiles = await handler.list(rootPath)
     assert.ok(remainingFiles.includes('backup1.xva'), 'XVA should be kept')
-    assert.ok(vmBackupDir.backupArchives.get(`/${rootPath}/backup1.json`).isValid)
-    assert.ok(remainingFiles.includes('backup1.xva.checksum'), 'checksum should be kept')
+    assert.ok(remainingFiles.includes('backup1.xva.checksum'), 'checksum should be kept alongside its valid backup')
   })
 })

@xen-orchestra/backup-archive/src/VmFullBackupArchive.mts

@@ -9,7 +9,7 @@ import {
   PartialBackupMetadata,
   ResolvedBackupCleanOptions,
 } from './VmBackup.types.mjs'
-import { RemoteHandlerAbstract } from '@xen-orchestra/fs'
+import RemoteHandlerAbstract from '@xen-orchestra/fs'
 
 const COMPRESSED_MAGIC_NUMBERS: Buffer[] = [
   // https://tools.ietf.org/html/rfc1952.html#page-5
@@ -43,39 +43,31 @@ const isValidTar = async (handler: RemoteHandlerAbstract, size: number, fd: File
   return buf.every(byte => byte === 0)
 }
 
-export async function isValidXva(
-  handler: RemoteHandlerAbstract,
-  filePath: string,
-  metadataSize?: number
-): Promise<boolean> {
+export async function isValidXva(handler: RemoteHandlerAbstract, filePath: string): Promise<boolean> {
   // size is longer when encrypted + reading part of an encrypted file is not implemented
   if (handler.isEncrypted) {
-    const size = await handler.getSizeOnDisk(filePath)
-    return size > 20
+    return true
   }
 
-  let isValid = true
-
-  const fd = await handler.openFile(filePath, 'r')
   try {
-    const size = await handler.getSize(filePath)
-    if (size < 20) {
-      // neither a valid gzip nor tar
-      return false
-    }
-    let validSize = true
-    if (metadataSize !== undefined) {
-      validSize = metadataSize === size
-    }
+    const fd = await handler.openFile(filePath, 'r')
+    try {
+      const size = await handler.getSize(filePath)
+      if (size < 20) {
+        // neither a valid gzip nor tar
+        return false
+      }
 
-    const validDisk = (await isCompressedFile(handler, fd))
-      ? true // compressed files cannot be validated at this time
-      : await isValidTar(handler, size, fd)
-    isValid = validSize && validDisk
-  } finally {
-    handler.closeFile(fd).catch(noop)
+      return (await isCompressedFile(handler, fd))
+        ? true // compressed files cannot be validated at this time
+        : await isValidTar(handler, size, fd)
+    } finally {
+      handler.closeFile(fd).catch(noop)
+    }
+  } catch (error) {
+    // never throw, log and report as valid to avoid side effects
+    return true
   }
-  return isValid
 }
 
 const noop = (): void => {}
@@ -85,7 +77,6 @@ export class VmFullBackupArchive implements VmBackupInterface {
   rootPath: string
   xvaPath: string
   isValid?: boolean
-  missingDisk = false
   metadataPath: string
   metadata: PartialBackupMetadata
   opts: ResolvedBackupCleanOptions
@@ -108,37 +99,14 @@ export class VmFullBackupArchive implements VmBackupInterface {
 
   async init() {}
 
-  /**
-   * As we are not 100% sure if XVA is valid,
-   * we prefer to warn if it is the case but not remove it.
-   */
   async check(): Promise<CheckResult> {
     if (this.isValid === undefined) {
-      try {
-        this.isValid = await isValidXva(this.handler, this.xvaPath, this.metadata.size)
-      } catch (error) {
-        this.isValid = false
-        if (error?.code === 'ENOENT') {
-          this.missingDisk = true
-        }
-        this.opts.logWarn('Issue while checking XVA', { error })
-      }
-      if (!this.handler.isEncrypted) {
-        try {
-          await this.handler.getSize(`${this.xvaPath}.checksum`)
-        } catch (error) {
-          this.opts.logWarn('Checksum file not valid, not blocking', { error })
-        }
-      }
+      this.isValid = await isValidXva(this.handler, this.xvaPath)
     }
     if (!this.isValid) {
-      if (this.missingDisk) {
-        this.opts.logWarn('XVA is missing', { path: this.xvaPath })
-      } else {
-        this.opts.logWarn('XVA might be broken', { path: this.xvaPath })
-      }
+      this.opts.logWarn('XVA might be broken', { path: this.xvaPath })
     }
-    return { isValid: this.isValid }
+    return { isValid: this.isValid! }
   }
 
   async clean({ remove = this.opts.remove ?? false }: ArchiveCleanOptions = {}): Promise<CleanResult> {
@@ -146,34 +114,26 @@ export class VmFullBackupArchive implements VmBackupInterface {
       await this.check()
     }
     const removedFiles: string[] = []
-
-    if (!this.isValid && this.missingDisk) {
-      removedFiles.push(this.metadataPath, `${this.xvaPath}.checksum`)
+    if (!this.isValid) {
+      removedFiles.push(this.metadataPath, this.xvaPath, `${this.xvaPath}.checksum`)
     }
-
     if (remove) {
-      if (!this.isValid) {
-        if (!this.missingDisk) {
-          this.opts.logWarn(`This files may be corrupted but not yet to be removed`, {
-            files: this.getAssociatedFiles({ prefix: false }),
-          })
-        } else {
-          for (const file of removedFiles) {
-            try {
-              await this.handler.unlink(file)
-            } catch (error) {
-              this.opts.logWarn(`Issue removing ${file}`, { error })
-            }
-          }
+      for (const file of removedFiles) {
+        try {
+          await this.handler.unlink(file)
+        } catch (error) {
+          this.opts.logWarn(`Issue removing ${file}`)
         }
       }
     }
-
     return { removedFiles, merge: false }
   }
 
   getAssociatedFiles({ prefix = false }): Array<string> {
     let validFiles = [this.metadataPath, this.xvaPath, `${this.xvaPath}.checksum`]
+    if (!this.isValid) {
+      validFiles = []
+    }
     return prefix ? validFiles : validFiles.map(file => basename(file))
   }
 }

@xen-orchestra/backup-archive/src/VmIncrementalBackupArchive.integ.mjs

@@ -8,19 +8,13 @@ import { getHandler } from '@xen-orchestra/fs'
 import { pFromCallback } from 'promise-toolbox'
 // eslint-disable-next-line n/no-missing-import
 import { VmBackupDirectory } from '../dist/VmBackupDirectory.mjs'
-import { RemoteVhdDisk } from '../dist/disks/RemoteVhdDisk.mjs'
-import { MergeRemoteDisk } from '../dist/disks/MergeRemoteDisk.mjs'
 import { VHDFOOTER, VHDHEADER } from './tests.fixtures.mjs'
 import { VhdFile, Constants, VhdDirectory, VhdAbstract } from 'vhd-lib'
 import { dirname, basename } from 'node:path'
-import { promisify } from 'node:util'
-import zlib from 'node:zlib'
 import { rimraf } from 'rimraf'
 
 const { beforeEach, afterEach, describe } = test
 
-const gunzip = promisify(zlib.gunzip)
-
 let tempDir, handler, jobId, vdiId, basePath, relativePath, vdiId2, basePath2, relativePath2
 const rootPath = 'xo-vm-backups/VMUUID/'
 
@@ -349,7 +343,6 @@ test('it merges delta of non destroyed chain', async () => {
       parentUnicodeName: 'orphan.vhd',
       parentUuid: orphan.footer.uuid,
     },
-    blocks: [0, 1],
   })
   // a grand child
   await generateVhd(`${basePath}/grandchild.vhd`, {
@@ -364,7 +357,7 @@ test('it merges delta of non destroyed chain', async () => {
     logged.push(message)
   }
   await VmBackupDirectory.cleanVm(handler, rootPath, { remove: true, logInfo, logWarn: logInfo })
-  assert.equal(logged[0], `unexpected number of entries in backup cache`)
+  assert.equal(logged[0], `Disk chain needs merging`)
 
   logged = []
   await VmBackupDirectory.cleanVm(handler, rootPath, { remove: true, merge: true, logInfo, logWarn: () => {} })
@@ -378,7 +371,7 @@ test('it merges delta of non destroyed chain', async () => {
   assert.equal(remainingVhds.includes('grandchild.vhd'), true)
 
   const metadata = JSON.parse(await handler.readFile(`${rootPath}/metadata.json`))
-  assert.equal(metadata.size, 4299776, 'metadata.size should be updated after merge')
+  assert.equal(metadata.size, 104448, 'metadata.size should be updated after merge')
 })
 
 test('it merges a chain of multiple consecutive orphan ancestors in one pass', async () => {
@@ -418,118 +411,6 @@ test('it merges a chain of multiple consecutive orphan ancestors in one pass', a
   assert.equal(remainingVhds.includes('child.vhd'), false)
 })
 
-test('it resumes, through cleanVm, an interrupted merge whose ancestor lost its footer', async () => {
-  // Reproduces the production "footer1 !== footer2" failure end-to-end via the full cleanVm
-  // pipeline. ancestor (full) <- child (differencing, the active backup).
-  const ancestor = await generateVhd(`${basePath}/ancestor.vhd`, { blocks: [0, 1] })
-  await generateVhd(`${basePath}/child.vhd`, {
-    header: { parentUnicodeName: 'ancestor.vhd', parentUuid: ancestor.footer.uuid },
-    blocks: [2, 3, 4, 5],
-  })
-  await handler.writeFile(
-    `${rootPath}/metadata.json`,
-    JSON.stringify({ mode: 'delta', size: 12000, vhds: [`${relativePath}/child.vhd`] })
-  )
-
-  // Simulate a merge killed mid-transfer: write 2 of the 4 child blocks into the ancestor
-  // (which overwrites its end footer) then throw before mergeMetadata() rewrites the footer.
-  // This leaves the ancestor footerless AND a `.merge.json` state file — the exact post-crash
-  // state that makes cleanVm take the resume path.
-  const parent = new RemoteVhdDisk({ handler, path: `${basePath}/ancestor.vhd` })
-  const child = new RemoteVhdDisk({ handler, path: `${basePath}/child.vhd` })
-  await parent.init({ force: false })
-  await child.init({ force: false })
-  const merger = new MergeRemoteDisk(handler, { removeUnused: true, writeStateDelay: 0 })
-  let written = 0
-  const realWriteBlock = parent.writeBlock.bind(parent)
-  parent.writeBlock = async diskBlock => {
-    if (written === 2) {
-      throw new Error('simulated interruption')
-    }
-    written++
-    return realWriteBlock(diskBlock)
-  }
-  await assert.rejects(merger.merge(parent, child), /simulated interruption/)
-
-  assert.ok(
-    (await handler.list(basePath)).includes('.ancestor.vhd.merge.json'),
-    'an interrupted-merge state file should remain'
-  )
-
-  // Full pipeline: cleanVm must recognize the interrupted merge and resume it — opening the
-  // footerless ancestor through the chain without throwing "footer1 !== footer2".
-  await VmBackupDirectory.cleanVm(handler, rootPath, {
-    remove: true,
-    merge: true,
-    logInfo: () => {},
-    logWarn: () => {},
-  })
-
-  // The merge completed: the ancestor was consolidated into child.vhd and the state file is gone.
-  const remaining = await handler.list(basePath)
-  assert.equal(remaining.includes('.ancestor.vhd.merge.json'), false, 'state file removed after successful resume')
-  assert.equal(remaining.includes('ancestor.vhd'), false, 'ancestor consolidated into the merge target')
-  assert.equal(remaining.includes('child.vhd'), true, 'merge target remains')
-
-  // No blocks lost: the resumed merge wrote the blocks (4, 5) that were never written before
-  // the crash, so the consolidated disk holds the full set.
-  const merged = new RemoteVhdDisk({ handler, path: `${basePath}/child.vhd` })
-  await merged.init({ force: false })
-  try {
-    assert.deepEqual(merged.getBlockIndexes(), [0, 1, 2, 3, 4, 5], 'all blocks present after resumed merge')
-  } finally {
-    await merged.close()
-  }
-
-  // The backup is consistent, so its metadata is preserved.
-  assert.ok((await handler.list(rootPath)).includes('metadata.json'), 'metadata should be preserved')
-})
-
-test('it does not warn "missing target of alias" for aliases deleted by merge', async () => {
-  // Regression: RemoteDiskLineage.#cleanOrphanDataFiles iterated #diskPaths entries just
-  // deleted during the same clean() call's merge phase, producing false "missing target of
-  // alias" warnings
-  const orphan = await generateVhd(`${basePath}/orphan.vhd`, {
-    useAlias: true,
-    blocks: [0],
-  })
-  await generateVhd(`${basePath}/child.vhd`, {
-    useAlias: true,
-    header: {
-      parentUnicodeName: 'orphan.vhd.alias.vhd',
-      parentUuid: orphan.footer.uuid,
-    },
-    blocks: [1],
-  })
-
-  await handler.writeFile(
-    `${rootPath}/metadata.json`,
-    JSON.stringify({
-      mode: 'delta',
-      vhds: [`${relativePath}/child.vhd.alias.vhd`],
-    })
-  )
-
-  const warnings = []
-  await VmBackupDirectory.cleanVm(handler, rootPath, {
-    remove: true,
-    merge: true,
-    logWarn: (message, data) => warnings.push({ message, data }),
-    logInfo: () => {},
-  })
-
-  const missingTargetWarnings = warnings.filter(w => w.message === 'missing target of alias')
-  assert.equal(
-    missingTargetWarnings.length,
-    0,
-    `"missing target of alias" must not fire after merge; got: ${JSON.stringify(missingTargetWarnings)}`
-  )
-
-  const remaining = await handler.list(basePath)
-  assert.ok(!remaining.includes('orphan.vhd.alias.vhd'), 'orphan alias must be deleted after merge')
-  assert.ok(remaining.includes('child.vhd.alias.vhd'), 'child alias must survive as merge target')
-})
-
 test('it resumes an interrupted merge with chain field', async () => {
   await handler.writeFile(
     `${rootPath}/metadata.json`,
@@ -725,7 +606,7 @@ describe('tests multiple combination ', { concurrency: 1 }, () => {
 
         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, 6501888)
+        assert.deepEqual(metadata.size, 4404224)
         // cache.json.gz must be regenerated when metadata changes after a merge
         assert.ok(
           (await handler.list(rootPath)).includes('cache.json.gz'),
@@ -804,56 +685,3 @@ test('check all types of aliases, corrupted, missing or not', async () => {
   assert.equal(data.length, 1)
   assert.equal(data[0], 'ok.vhd')
 })
-
-test('it preserves VDI directory when handler.list() throws during lineage init', async () => {
-  // Regression: when handler.list(vdiDir) threw (e.g. S3 404), the lineage
-  // was never added to #uniqueLineages, so cleanOrphanDiskDirs treated the directory
-  // as an orphan and deleted it with rmtree()
-  await generateVhd(`${basePath}/snapshot.vhd`)
-  await handler.writeFile(
-    `${rootPath}/metadata.json`,
-    JSON.stringify({ mode: 'delta', vhds: [`${relativePath}/snapshot.vhd`] })
-  )
-
-  const originalList = handler.list.bind(handler)
-  handler.list = async (path, opts) => {
-    if (typeof path === 'string' && path.includes(vdiId)) {
-      throw Object.assign(new Error('Simulated transient storage error'), { code: 'ENOENT' })
-    }
-    return originalList(path, opts)
-  }
-
-  try {
-    await VmBackupDirectory.cleanVm(handler, rootPath, { remove: true, logWarn: () => {}, logInfo: () => {} })
-  } finally {
-    handler.list = originalList
-  }
-
-  const remaining = await handler.list(basePath)
-  assert.ok(remaining.includes('snapshot.vhd'), 'VHD must survive when handler.list() throws during lineage init')
-})
-
-test('it regenerates the cache when its entry count is out of sync, even with nothing to merge/remove', async () => {
-  // a referenced disk + its metadata, but no cache.json.gz on disk
-  await generateVhd(`${basePath}/diskA1.vhd`)
-  await handler.writeFile(
-    `${rootPath}/metadata.json`,
-    JSON.stringify({ mode: 'delta', vhds: [`${relativePath}/diskA1.vhd`] })
-  )
-  await assert.rejects(handler.readFile(`${rootPath}/cache.json.gz`), { code: 'ENOENT' })
-
-  const logged = []
-  // remove/merge both false: cacheNeedsRegen stays false and no merge happens,
-  // so only the cache-count mismatch can trigger the regeneration
-  await VmBackupDirectory.cleanVm(handler, rootPath, {
-    remove: false,
-    merge: false,
-    logInfo: () => {},
-    logWarn: message => logged.push(message),
-  })
-
-  assert.ok(logged.includes('unexpected number of entries in backup cache'), 'mismatch should be reported')
-
-  const cache = JSON.parse((await gunzip(await handler.readFile(`${rootPath}/cache.json.gz`))).toString())
-  assert.equal(Object.keys(cache).length, 1, 'cache should be regenerated to match the archives on disk')
-})

@xen-orchestra/backup-archive/src/VmIncrementalBackupArchive.mts

@@ -6,7 +6,7 @@ import {
   VmBackupInterface,
   PartialBackupMetadata,
 } from './VmBackup.types.mjs'
-import { RemoteHandlerAbstract } from '@xen-orchestra/fs'
+import RemoteHandlerAbstract from '@xen-orchestra/fs'
 import { basename, dirname, normalize } from '@xen-orchestra/fs/path'
 import { RemoteDiskLineage } from './RemoteDiskLineage.mjs'
 
@@ -52,18 +52,18 @@ export class VmIncrementalBackupArchive implements VmBackupInterface {
 
   async init(): Promise<void> {
     // Build one RemoteDiskLineage per VDI directory derived from diskPaths
-    for (const diskPath of this.diskPaths) {
-      const vdiDir = dirname(diskPath)
-      if (!this.diskLineages.has(vdiDir)) {
-        const lineage = new RemoteDiskLineage(this.handler, vdiDir, this.opts)
-        this.diskLineages.set(vdiDir, lineage)
-        try {
+    try {
+      for (const diskPath of this.diskPaths) {
+        const vdiDir = dirname(diskPath)
+        if (!this.diskLineages.has(vdiDir)) {
+          const lineage = new RemoteDiskLineage(this.handler, vdiDir, this.opts)
           await lineage.init()
-        } catch (error) {
-          if (error?.code === 'NOT_SUPPORTED') throw error
-          this.opts.logWarn('failed to scan VDI directory', { vdiDir, error })
+          this.diskLineages.set(vdiDir, lineage)
         }
       }
+    } catch (error: any) {
+      if (error?.code === 'NOT_SUPPORTED') throw error
+      this.opts.logWarn('failed to scan VDI directories', { error })
     }
   }
 
@@ -98,8 +98,8 @@ export class VmIncrementalBackupArchive implements VmBackupInterface {
       }
     }
     if (this.#isComplete) {
-      for (const diskPath of this.diskPaths) {
-        this.diskLineages.get(dirname(diskPath))?.addActiveDiskPath(diskPath)
+      for (const lineage of this.diskLineages.values()) {
+        lineage.addActiveDiskPaths(this.diskPaths)
       }
     }
 
@@ -142,7 +142,7 @@ export class VmIncrementalBackupArchive implements VmBackupInterface {
       }
     }
 
-    return { removedFiles }
+    return { removedFiles, merge: mergedSize > 0 }
   }
 
   /**

@xen-orchestra/backup-archive/src/disks/openDiskChain.mjs

@@ -1,57 +0,0 @@
-// @ts-check
-/**
- *
- * @typedef {import('@xen-orchestra/fs').RemoteHandlerAbstract} RemoteHandlerAbstract
- * @typedef {import('./RemoteDisk.mjs').RemoteDisk} RemoteDisk
- */
-import { RemoteVhdDisk } from './RemoteVhdDisk.mjs'
-import { defer } from 'golike-defer'
-import { RemoteVhdDiskChain } from './RemoteVhdDiskChain.mjs'
-
-/**
- * @param {any} $defer
- * @param {Object} params
- * @param {RemoteHandlerAbstract} params.handler
- * @param {string} params.path
- * @param {string | undefined} params.until
- * @param {boolean} [params.force]
- * @param {boolean} [params.ignoreBlockIndexes] - skip reading the block allocation table of each disk (cheaper, but blocks can't be read)
- * @returns {Promise<RemoteDisk>}
- */
-async function _openDiskChain($defer, { handler, path, until, force = false, ignoreBlockIndexes = false }) {
-  /**
-   * @type {RemoteVhdDisk}
-   */
-  let disk
-  /**
-   * @type {Array<RemoteVhdDisk>}
-   */
-  const disks = []
-  $defer.onFailure(() => Promise.all(disks.map(disk => disk.close())))
-  disk = new RemoteVhdDisk({ handler, path })
-
-  await disk.init({ force, ignoreBlockIndexes })
-  disks.push(disk)
-  let foundRootDisk = until === undefined
-  while (disk.isDifferencing()) {
-    if (disk.getParentPath() === until) {
-      foundRootDisk = true
-      break
-    }
-    // Instantiate + init the parent directly (instead of openParent()) so the
-    // block allocation table read can be skipped when ignoreBlockIndexes is set.
-    disk = /** @type {RemoteVhdDisk} */ (disk.instantiateParent())
-    await disk.init({ force, ignoreBlockIndexes })
-    disks.unshift(disk)
-  }
-  if (!foundRootDisk) {
-    throw new Error(`trying to open chain from ${path} to ${until}, root disk not found`)
-  }
-  // the root disk
-  return new RemoteVhdDiskChain({ disks })
-}
-
-/**
- * @type {(params: { handler: RemoteHandlerAbstract, path: string, until?: string, force?: boolean, ignoreBlockIndexes?: boolean }) => Promise<RemoteDisk>}
- */
-export const openDiskChain = defer(_openDiskChain)

@xen-orchestra/backup-archive/src/index.mts

@@ -1 +0,0 @@
-export { VmBackupDirectory } from './VmBackupDirectory.mjs'

@xen-orchestra/backup-archive/tsconfig.json

@@ -9,8 +9,6 @@
     "rootDir": "./src",
     "skipLibCheck": true,
     "noImplicitAny": false,
-    "allowJs": true,
-    "useUnknownInCatchVariables": false,
     "types": ["node"] // Only use types from Node.js and packages that are explicitly imported
   },
   "include": ["src/**/*"],

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

@@ -19,7 +19,7 @@ async function cleanFiles(vmDirs, { fix, merge, remove }) {
         try {
           nbStarted++
           await new RemoteAdapter(handler).cleanVm(basename(vmDir), {
-            fix,
+            fixMetadata: fix,
             remove,
             merge,
             logInfo: (...args) => console.log(...args),
@@ -50,7 +50,7 @@ async function cleanRemote(url, { fix, merge, remove }) {
         try {
           nbStarted++
           await remoteAdapter.cleanVm(join('xo-vm-backups', vmUuid), {
-            fix,
+            fixMetadata: fix,
             remove,
             merge,
             logInfo: (...args) => console.log(...args),

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

@@ -6,13 +6,13 @@
   "preferGlobal": true,
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "dependencies": {
-    "@vates/async-each": "^1.0.3",
-    "@xen-orchestra/async-map": "^0.1.3",
-    "@xen-orchestra/backups": "^0.73.10",
-    "@xen-orchestra/fs": "^4.9.3",
+    "@vates/async-each": "^1.0.1",
+    "@xen-orchestra/async-map": "^0.1.2",
+    "@xen-orchestra/backups": "^0.69.4",
+    "@xen-orchestra/fs": "^4.6.7",
     "filenamify": "^6.0.0",
     "getopts": "^2.2.5",
-    "lodash": "^4.18.0",
+    "lodash": "^4.17.15",
     "promise-toolbox": "^0.21.0"
   },
   "engines": {
@@ -28,7 +28,7 @@
   "scripts": {
     "postversion": "npm publish --access public"
   },
-  "version": "1.1.13",
+  "version": "1.1.8",
   "license": "AGPL-3.0-or-later",
   "author": {
     "name": "Vates SAS",

@xen-orchestra/backups/HealthCheckVmBackup.mjs

@@ -1,4 +1,4 @@
-import { Task } from '@vates/task'
+import { Task } from './Task.mjs'
 
 export class HealthCheckVmBackup {
   #restoredVm
@@ -14,7 +14,7 @@ export class HealthCheckVmBackup {
   async run() {
     return Task.run(
       {
-        properties: { name: 'vmstart' },
+        name: 'vmstart',
       },
       async () => {
         let restoredVm = this.#restoredVm

@xen-orchestra/backups/ImportVmBackup.mjs

@@ -2,15 +2,15 @@ import assert from 'node:assert'
 
 import { formatFilenameDate } from './_filenameDate.mjs'
 import { importIncrementalVm } from './_incrementalVm.mjs'
+import { Task } from './Task.mjs'
 import { watchStreamSize } from './_watchStreamSize.mjs'
 import { decorateClass } from '@vates/decorate-with'
-import { Task } from '@vates/task'
 import { createLogger } from '@xen-orchestra/log'
 import { dirname, join } from 'node:path'
 import pickBy from 'lodash/pickBy.js'
 import { defer } from 'golike-defer'
 import { NegativeDisk } from '@xen-orchestra/disk-transform'
-import { openDiskChain } from '@xen-orchestra/backup-archive/disks'
+import { openDiskChain } from './disks/openDiskChain.mjs'
 import { resetVmOtherConfig } from './_otherConfig.mjs'
 
 const { debug, info, warn } = createLogger('xo:backups:importVmBackup')
@@ -244,7 +244,7 @@ export class ImportVmBackup {
 
     return Task.run(
       {
-        properties: { name: 'transfer' },
+        name: 'transfer',
       },
       async () => {
         const xapi = this._xapi
@@ -255,14 +255,6 @@ export class ImportVmBackup {
           : await importIncrementalVm(backup, await xapi.getRecord('SR', srRef), {
               newMacAddresses,
             })
-        let size = 0
-        if (isFull) {
-          size = sizeContainer.size
-        } else {
-          for (const disk of Object.values(backup.disks)) {
-            size += disk.getNbGeneratedBlock() * disk.getBlockSize()
-          }
-        }
         const remoteName = adapter._handler._remote.name
         let desc = `Restored on ${formatFilenameDate(+new Date())}`
         if (remoteName !== undefined) {
@@ -283,7 +275,7 @@ export class ImportVmBackup {
         ])
 
         return {
-          size,
+          size: sizeContainer.size,
           id: await xapi.getField('VM', vmRef, 'uuid'),
         }
       }

@xen-orchestra/backups/RemoteAdapter.mjs

@@ -1,26 +1,38 @@
 import { asyncEach } from '@vates/async-each'
 import { asyncMap, asyncMapSettled } from '@xen-orchestra/async-map'
+import { compose } from '@vates/compose'
 import { createLogger } from '@xen-orchestra/log'
 import { VhdDirectory, VhdSynthetic } from 'vhd-lib'
 import { decorateMethodsWith } from '@vates/decorate-with'
+import { deduped } from '@vates/disposable/deduped.js'
 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'
 import { synchronized } from 'decorator-synchronized'
+import { ZipFile } from 'yazl'
 import Disposable from 'promise-toolbox/Disposable'
 import fromCallback from 'promise-toolbox/fromCallback'
+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 reduce from 'lodash/reduce.js'
+import * as tar from 'tar'
 import zlib from 'zlib'
 
 import { BACKUP_DIR } from './_getVmBackupDir.mjs'
-import { VmBackupDirectory } from '@xen-orchestra/backup-archive'
-import { fileRestoreDecorators, fileRestoreMethods } from './_fileRestore.mjs'
+import { cleanVm } from './_cleanVm.mjs'
 import { formatFilenameDate } from './_filenameDate.mjs'
+import { getTmpDir } from './_getTmpDir.mjs'
 import { isMetadataFile } from './_backupType.mjs'
 import { isValidXva } from './_isValidXva.mjs'
+import { listPartitions, LVM_PARTITION_TYPE_MBR, LVM_PARTITION_TYPE_GPT } from './_listPartitions.mjs'
+import { lvs, pvs } from './_lvm.mjs'
 import { watchStreamSize } from './_watchStreamSize.mjs'
 
-import { RemoteVhdDisk, openDiskChain } from '@xen-orchestra/backup-archive/disks'
+import { RemoteVhdDisk } from './disks/RemoteVhdDisk.mjs'
+import { openDiskChain } from './disks/openDiskChain.mjs'
 import { toVhdStream, writeToVhdDirectory } from 'vhd-lib/disk-consumer/index.mjs'
 import { ReadAhead } from '@xen-orchestra/disk-transform'
 
@@ -37,6 +49,25 @@ export 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))
+
+async function addZipEntries(zip, realBasePath, virtualBasePath, relativePaths) {
+  for (const relativePath of relativePaths) {
+    const realPath = join(realBasePath, relativePath)
+    const virtualPath = join(virtualBasePath, relativePath)
+
+    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)
+    }
+  }
+}
 
 const createSafeReaddir = (handler, methodName) => (path, options) =>
   handler.list(path, options).catch(error => {
@@ -46,6 +77,11 @@ const createSafeReaddir = (handler, methodName) => (path, options) =>
     return []
   })
 
+const debounceResourceFactory = factory =>
+  function () {
+    return this._debounceResource(factory.apply(this, arguments))
+  }
+
 export class RemoteAdapter {
   constructor(
     handler,
@@ -63,6 +99,112 @@ export class RemoteAdapter {
     return this._handler
   }
 
+  async _findPartition(devicePath, partitionId) {
+    const partitions = await listPartitions(devicePath)
+    const partition = partitions.find(_ => _.id === partitionId)
+    if (partition === undefined) {
+      throw new Error(`partition ${partitionId} not found`)
+    }
+    return partition
+  }
+
+  async *_getLvmLogicalVolumes(devicePath, pvId, vgName) {
+    yield this._getLvmPhysicalVolume(devicePath, pvId && (await this._findPartition(devicePath, pvId)))
+
+    debug('activate LVM volume group', { vgName })
+    await fromCallback(execFile, 'vgchange', ['-ay', vgName])
+    try {
+      debug('get LVM volume group name and path', { vgName })
+      yield lvs(['lv_name', 'lv_path'], vgName)
+    } finally {
+      debug('deactivate LVM volume group', { vgName })
+      await fromCallback(execFile, 'vgchange', ['-an', vgName])
+    }
+  }
+
+  async *_getLvmPhysicalVolume(devicePath, partition) {
+    const args = []
+    if (partition !== undefined) {
+      args.push('-o', partition.start * 512, '--sizelimit', partition.size)
+    }
+    args.push('--show', '-f', devicePath)
+
+    debug('attach loop device', { devicePath, partition })
+    const path = (await fromCallback(execFile, 'losetup', args)).trim()
+    try {
+      debug('list LVM physical volume', { path })
+      await fromCallback(execFile, 'pvscan', ['--cache', path])
+
+      yield path
+    } finally {
+      try {
+        const vgNames = await pvs('vg_name', path)
+
+        debug('deactivate LVM volume groups', { vgNames })
+        await fromCallback(execFile, 'vgchange', ['-an', ...vgNames])
+      } finally {
+        debug('detach loop device', { path })
+        await fromCallback(execFile, 'losetup', ['-d', path])
+      }
+    }
+  }
+
+  async *_getPartition(devicePath, partition) {
+    // the norecovery option is necessary because if the partition is dirty,
+    // mount will try to fix it which is impossible if because the device is read-only
+    const options = ['loop', 'ro', 'norecovery']
+
+    if (partition !== undefined) {
+      const { size, start } = partition
+      options.push(`sizelimit=${size}`)
+      if (start !== undefined) {
+        options.push(`offset=${start * 512}`)
+      }
+    }
+
+    const path = yield getTmpDir()
+    const mount = options => {
+      debug('mount device', { devicePath, mountPath: path })
+      return fromCallback(execFile, 'mount', [
+        `--options=${options.join(',')}`,
+        `--source=${devicePath}`,
+        `--target=${path}`,
+      ])
+    }
+
+    // `norecovery` option is used for ext3/ext4/xfs, if it fails it might be
+    // another fs, try without
+    try {
+      await mount([...options, 'norecovery'])
+    } catch (error) {
+      await mount(options)
+    }
+    try {
+      yield path
+    } finally {
+      debug('umount device', { devicePath, mountPath: path })
+      await fromCallback(execFile, 'umount', ['--lazy', path])
+    }
+  }
+
+  _listLvmLogicalVolumes(devicePath, partition, results = []) {
+    return Disposable.use(this._getLvmPhysicalVolume(devicePath, partition), async path => {
+      const lvs = await pvs(['lv_name', 'lv_path', 'lv_size', 'vg_name'], path)
+      const partitionId = partition !== undefined ? partition.id : ''
+      lvs.forEach((lv, i) => {
+        const name = lv.lv_name
+        if (name !== '') {
+          results.push({
+            id: `${partitionId}/${lv.vg_name}/${name}`,
+            name,
+            size: lv.lv_size,
+          })
+        }
+      })
+      return results
+    })
+  }
+
   // check if we will be allowed to merge a vhd created in this adapter
   // with the vhd at path `path`
   async isMergeableParent(packedParentUid, path) {
@@ -80,6 +222,34 @@ export class RemoteAdapter {
     })
   }
 
+  fetchPartitionFiles(diskId, partitionId, paths, format) {
+    const { promise, reject, resolve } = pDefer()
+    Disposable.use(
+      async function* () {
+        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)
+    ).catch(error => {
+      warn(error)
+      reject(error)
+    })
+    return promise
+  }
+
   async #removeVmBackupsFromCache(backups) {
     await asyncEach(
       Object.entries(
@@ -131,20 +301,7 @@ export class RemoteAdapter {
   async deleteFullVmBackups(backups) {
     const handler = this._handler
     await asyncMapSettled(backups, ({ _filename, xva }) =>
-      Promise.all([
-        handler.unlink(_filename).catch(error => {
-          warn('error while removing full vm backup metadata', { error, filename: _filename })
-          if (error.code !== 'ENOENT') throw error
-        }),
-        handler.unlink(resolveRelativeFromFile(_filename, xva)).catch(error => {
-          warn('error while removing full vm backup file', { error, filename: _filename })
-          if (error.code !== 'ENOENT') throw error
-        }),
-        handler.unlink(resolveRelativeFromFile(_filename, `${xva}.checksum`)).catch(error => {
-          // checksum can be missing , it's not an issue
-          if (error.code !== 'ENOENT') throw error
-        }),
-      ])
+      Promise.all([handler.unlink(_filename), handler.unlink(resolveRelativeFromFile(_filename, xva))])
     )
 
     await this.#removeVmBackupsFromCache(backups)
@@ -155,46 +312,18 @@ export class RemoteAdapter {
   }
 
   async deleteVmBackups(files) {
-    const metadataOrNull = await asyncMap(files, async file => {
-      try {
-        return await this.readVmBackupMetadata(file)
-      } catch (error) {
-        if (error.code === 'ENOENT') {
-          // File was already removed (e.g. by coalescing); clean the stale cache entry
-          warn('backup metadata not found, removing stale cache entry', { file })
-          return null
-        }
-        throw error
-      }
-    })
-
-    const presentMetadata = []
-    const missingFiles = []
-    for (let i = 0; i < files.length; i++) {
-      if (metadataOrNull[i] === null) {
-        missingFiles.push({ _filename: files[i] })
-      } else {
-        presentMetadata.push(metadataOrNull[i])
-      }
-    }
-
-    const { delta, full, ...others } = groupBy(presentMetadata, 'mode')
+    const metadata = await asyncMap(files, file => this.readVmBackupMetadata(file))
+    const { delta, full, ...others } = groupBy(metadata, 'mode')
 
     const unsupportedModes = Object.keys(others)
     if (unsupportedModes.length !== 0) {
       throw new Error('no deleter for backup modes: ' + unsupportedModes.join(', '))
     }
-    const promises = []
-    if (delta !== undefined) {
-      promises.push(this.deleteDeltaVmBackups(delta))
-    }
-    if (full !== undefined) {
-      promises.push(this.deleteFullVmBackups(full))
-    }
-    if (missingFiles.length) {
-      promises.push(this.#removeVmBackupsFromCache(missingFiles))
-    }
-    await Promise.all(promises)
+
+    await Promise.all([
+      delta !== undefined && this.deleteDeltaVmBackups(delta),
+      full !== undefined && this.deleteFullVmBackups(full),
+    ])
 
     await asyncMap(new Set(files.map(file => dirname(file))), dir =>
       // - don't merge in main process, unused VHDs will be merged in the next backup run
@@ -217,6 +346,76 @@ export class RemoteAdapter {
     return this.useVhdDirectory()
   }
 
+  async *#getDiskLegacy(diskId) {
+    const RE_VHDI = /^vhdi(\d+)$/
+    const handler = this._handler
+
+    const diskPath = handler.getFilePath('/' + diskId)
+    const mountDir = yield getTmpDir()
+
+    debug('mount VHD (vhdimount)', { diskPath, mountPath: mountDir })
+    await fromCallback(execFile, 'vhdimount', [diskPath, mountDir])
+    try {
+      let max = 0
+      let maxEntry
+      const entries = await readdir(mountDir)
+      entries.forEach(entry => {
+        const matches = RE_VHDI.exec(entry)
+        if (matches !== null) {
+          const value = +matches[1]
+          if (value > max) {
+            max = value
+            maxEntry = entry
+          }
+        }
+      })
+      if (max === 0) {
+        throw new Error('no disks found')
+      }
+
+      yield `${mountDir}/${maxEntry}`
+    } finally {
+      debug('umount VHD (fusermount)', { diskPath, mountPath: mountDir })
+      await fromCallback(execFile, 'fusermount', ['-uz', mountDir])
+    }
+  }
+
+  async *getDisk(diskId) {
+    if (this._useGetDiskLegacy) {
+      yield* this.#getDiskLegacy(diskId)
+      return
+    }
+    const handler = this._handler
+    // this is a disposable
+    const mountDir = yield getTmpDir()
+    // this is also a disposable
+    yield mount(handler, diskId, mountDir)
+    // this will yield disk path to caller
+    yield `${mountDir}/vhd0`
+  }
+
+  // partitionId values:
+  //
+  // - undefined: raw disk
+  // - `<partitionId>`: partitioned disk
+  // - `<pvId>/<vgName>/<lvName>`: LVM on a partitioned disk
+  // - `/<vgName>/lvName>`: LVM on a raw disk
+  async *getPartition(diskId, partitionId) {
+    const devicePath = yield this.getDisk(diskId)
+    if (partitionId === undefined) {
+      return yield this._getPartition(devicePath)
+    }
+
+    const isLvmPartition = partitionId.includes('/')
+    if (isLvmPartition) {
+      const [pvId, vgName, lvName] = partitionId.split('/')
+      const lvs = yield this._getLvmLogicalVolumes(devicePath, pvId !== '' ? pvId : undefined, vgName)
+      return yield this._getPartition(lvs.find(_ => _.lv_name === lvName).lv_path)
+    }
+
+    return yield this._getPartition(devicePath, await this._findPartition(devicePath, partitionId))
+  }
+
   // if we use alias on this remote, we have to name the file alias.vhd
   getVhdFileName(baseName) {
     if (this.#useAlias()) {
@@ -257,6 +456,56 @@ export class RemoteAdapter {
     return backups
   }
 
+  listPartitionFiles(diskId, partitionId, path) {
+    return Disposable.use(this.getPartition(diskId, partitionId), async rootPath => {
+      path = resolveSubpath(rootPath, path)
+      const entriesMap = {}
+      await asyncEach(
+        await readdir(path),
+        async name => {
+          try {
+            const stats = await lstat(`${path}/${name}`)
+            if (stats.isDirectory()) {
+              entriesMap[name + '/'] = {}
+            } else if (stats.isFile()) {
+              entriesMap[name] = {}
+            }
+          } catch (error) {
+            if (error == null || error.code !== 'ENOENT') {
+              throw error
+            }
+          }
+        },
+        { concurrency: 1 }
+      )
+
+      return entriesMap
+    })
+  }
+
+  listPartitions(diskId) {
+    return Disposable.use(this.getDisk(diskId), async devicePath => {
+      const partitions = await listPartitions(devicePath)
+
+      if (partitions.length === 0) {
+        try {
+          // handle potential raw LVM physical volume
+          return await this._listLvmLogicalVolumes(devicePath, undefined, partitions)
+        } catch (error) {
+          return []
+        }
+      }
+
+      const results = []
+      await asyncMapSettled(partitions, partition =>
+        partition.type === LVM_PARTITION_TYPE_MBR || partition.type === LVM_PARTITION_TYPE_GPT
+          ? this._listLvmLogicalVolumes(devicePath, partition, results)
+          : results.push(partition)
+      )
+      return results
+    })
+  }
+
   async listPoolMetadataBackups() {
     const handler = this._handler
     const safeReaddir = createSafeReaddir(handler, 'listPoolMetadataBackups')
@@ -315,11 +564,6 @@ export class RemoteAdapter {
       fn(cache)
 
       await this._writeCache(path, cache)
-    } else {
-      const regenerated = await this.#getCacheableDataListVmBackups(dirname(path))
-      if (regenerated !== undefined) {
-        await this._writeCache(path, regenerated)
-      }
     }
   }
 
@@ -388,7 +632,8 @@ export class RemoteAdapter {
       return
     }
 
-    await this._writeCache(path, backups)
+    // detached async action, will not reject
+    this._writeCache(path, backups)
 
     return backups
   }
@@ -453,11 +698,11 @@ export class RemoteAdapter {
     return path
   }
 
-  async writeVhd(path, disk, { validator = noop, writeBlockConcurrency, uuid, parentUuid, parentPath } = {}) {
+  async writeVhd(path, disk, { validator = noop, writeBlockConcurrency } = {}) {
     const handler = this._handler
 
     if (this.useVhdDirectory()) {
-      return await writeToVhdDirectory({
+      await writeToVhdDirectory({
         disk,
         target: {
           handler,
@@ -465,21 +710,12 @@ export class RemoteAdapter {
           concurrency: writeBlockConcurrency,
           validator,
           compression: 'brotli',
-          uuid,
-          parentUuid,
-          parentPath,
         },
       })
     } else {
-      const stream = await toVhdStream(disk, { uuid, parentUuid, parentPath })
-      const size = await this.outputStream(path, stream, {
-        validator,
-        // no checksum for VHDs, because they will be invalidated by
-        // merges and chains
-        checksum: false,
-      })
+      const stream = await toVhdStream(disk)
+      await this.outputStream(path, stream, { validator, checksum: false })
       await validator(path)
-      return size
     }
   }
 
@@ -642,21 +878,36 @@ export class RemoteAdapter {
 }
 
 Object.assign(RemoteAdapter.prototype, {
-  cleanVm(vmBackupPath, opts = {}) {
-    const { lock = true, ...cleanOpts } = opts
+  cleanVm(vmDir, { lock = true } = {}) {
     if (lock) {
-      return Disposable.use(this._handler.lock(vmBackupPath), () => {
-        return VmBackupDirectory.cleanVm(this._handler, vmBackupPath, cleanOpts)
-      })
+      return Disposable.use(this._handler.lock(vmDir), () => cleanVm.apply(this, arguments))
     } else {
-      return VmBackupDirectory.cleanVm(this._handler, vmBackupPath, cleanOpts)
+      return cleanVm.apply(this, arguments)
     }
   },
   isValidXva,
 })
 
-// File-level-restore methods live in ./_fileRestore.mjs; mix them onto the prototype
-// before decorating so decorateMethodsWith can wrap them.
-Object.assign(RemoteAdapter.prototype, fileRestoreMethods)
+decorateMethodsWith(RemoteAdapter, {
+  _getLvmLogicalVolumes: compose([
+    Disposable.factory,
+    [deduped, (devicePath, pvId, vgName) => [devicePath, pvId, vgName]],
+    debounceResourceFactory,
+  ]),
 
-decorateMethodsWith(RemoteAdapter, fileRestoreDecorators)
+  _getLvmPhysicalVolume: compose([
+    Disposable.factory,
+    [deduped, (devicePath, partition) => [devicePath, partition?.id]],
+    debounceResourceFactory,
+  ]),
+
+  _getPartition: compose([
+    Disposable.factory,
+    [deduped, (devicePath, partition) => [devicePath, partition?.id]],
+    debounceResourceFactory,
+  ]),
+
+  getDisk: compose([Disposable.factory, [deduped, diskId => [diskId]], debounceResourceFactory]),
+
+  getPartition: Disposable.factory,
+})

@xen-orchestra/backups/Task.mjs

@@ -0,0 +1,155 @@
+import CancelToken from 'promise-toolbox/CancelToken'
+import Zone from 'node-zone'
+
+const logAfterEnd = log => {
+  const error = new Error('task has already ended')
+  error.log = log
+  throw error
+}
+
+const noop = Function.prototype
+
+const serializeErrors = errors => (Array.isArray(errors) ? errors.map(serializeError) : errors)
+
+// Create a serializable object from an error.
+//
+// Otherwise some fields might be non-enumerable and missing from logs.
+const serializeError = error =>
+  error instanceof Error
+    ? {
+        ...error, // Copy enumerable properties.
+        code: error.code,
+        errors: serializeErrors(error.errors), // supports AggregateError
+        message: error.message,
+        name: error.name,
+        stack: error.stack,
+      }
+    : error
+
+const $$task = Symbol('@xen-orchestra/backups/Task')
+
+export class Task {
+  static get cancelToken() {
+    const task = Zone.current.data[$$task]
+    return task !== undefined ? task.#cancelToken : CancelToken.none
+  }
+
+  static run(opts, fn) {
+    return new this(opts).run(fn, true)
+  }
+
+  static wrapFn(opts, fn) {
+    // compatibility with @decorateWith
+    if (typeof fn !== 'function') {
+      ;[fn, opts] = [opts, fn]
+    }
+
+    return function () {
+      return Task.run(typeof opts === 'function' ? opts.apply(this, arguments) : opts, () => fn.apply(this, arguments))
+    }
+  }
+
+  #cancelToken
+  #id = Math.random().toString(36).slice(2)
+  #onLog
+  #zone
+
+  constructor({ name, data, onLog }) {
+    let parentCancelToken, parentId
+    if (onLog === undefined) {
+      const parent = Zone.current.data[$$task]
+      if (parent === undefined) {
+        onLog = noop
+      } else {
+        onLog = log => parent.#onLog(log)
+        parentCancelToken = parent.#cancelToken
+        parentId = parent.#id
+      }
+    }
+
+    const zone = Zone.current.fork('@xen-orchestra/backups/Task')
+    zone.data[$$task] = this
+    this.#zone = zone
+
+    const { cancel, token } = CancelToken.source(parentCancelToken && [parentCancelToken])
+    this.#cancelToken = token
+    this.cancel = cancel
+
+    this.#onLog = onLog
+
+    this.#log('start', {
+      data,
+      message: name,
+      parentId,
+    })
+  }
+
+  failure(error) {
+    this.#end('failure', serializeError(error))
+  }
+
+  info(message, data) {
+    this.#log('info', { data, message })
+  }
+
+  /**
+   * Run a function in the context of this task
+   *
+   * In case of error, the task will be failed.
+   *
+   * @typedef Result
+   * @param {() => Result} fn
+   * @param {boolean} last - Whether the task should succeed if there is no error
+   * @returns Result
+   */
+  run(fn, last = false) {
+    return this.#zone.run(() => {
+      try {
+        const result = fn()
+        let then
+        if (result != null && typeof (then = result.then) === 'function') {
+          then.call(result, last && (value => this.success(value)), error => this.failure(error))
+        } else if (last) {
+          this.success(result)
+        }
+        return result
+      } catch (error) {
+        this.failure(error)
+        throw error
+      }
+    })
+  }
+
+  success(value) {
+    this.#end('success', value)
+  }
+
+  warning(message, data) {
+    this.#log('warning', { data, message })
+  }
+
+  wrapFn(fn, last) {
+    const task = this
+    return function () {
+      return task.run(() => fn.apply(this, arguments), last)
+    }
+  }
+
+  #end(status, result) {
+    this.#log('end', { result, status })
+    this.#onLog = logAfterEnd
+  }
+
+  #log(event, props) {
+    this.#onLog({
+      ...props,
+      event,
+      taskId: this.#id,
+      timestamp: Date.now(),
+    })
+  }
+}
+
+for (const method of ['info', 'warning']) {
+  Task[method] = (...args) => Zone.current.data[$$task]?.[method](...args)
+}