WiP: xapi-typegen

.eslintrc.js

@@ -28,10 +28,8 @@ module.exports = {
       },
     },
     {
-      files: ['*.{spec,test}.{,c,m}js'],
+      files: ['*.spec.{,c,m}js'],
       rules: {
-        'n/no-unpublished-require': 'off',
-        'n/no-unpublished-import': 'off',
         'n/no-unsupported-features/node-builtins': [
           'error',
           {

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,10 +6,7 @@ labels: 'status: triaging :triangular_flag_on_post:, type: bug :bug:'
 assignees: ''
 ---
 
-1. ⚠️ **If you don't follow this template, the issue will be closed**.
-2. ⚠️ **If your issue can't be easily reproduced, please report it [on the forum first](https://xcp-ng.org/forum/category/12/xen-orchestra)**.
-
-Are you using XOA or XO from the sources?
+**XOA or XO from the sources?**
 
 If XOA:
 
@@ -18,7 +15,6 @@ If XOA:
 
 If XO from the sources:
 
-- Provide **your commit number**. If it's older than a week, we won't investigate
 - Don't forget to [read this first](https://xen-orchestra.com/docs/community.html)
 - As well as follow [this guide](https://xen-orchestra.com/docs/community.html#report-a-bug)
 
@@ -42,6 +38,8 @@ If applicable, add screenshots to help explain your problem.
 **Environment (please provide the following information):**
 
 - Node: [e.g. 16.12.1]
+- xo-server: [e.g. 5.82.3]
+- xo-web: [e.g. 5.87.0]
 - hypervisor: [e.g. XCP-ng 8.2.0]
 
 **Additional context**

.github/workflows/push.yml

@@ -1,12 +1,13 @@
 name: CI
-on: push
+on: [push]
 jobs:
   build:
+    name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Build docker image
-        run: docker-compose -f docker/docker-compose.dev.yml build
-      - name: Create the container and start the tests
-        run: docker-compose -f docker/docker-compose.dev.yml up --exit-code-from xo
+      - uses: actions/checkout@v3
+      - uses: satackey/action-docker-layer-caching@v0.0.11
+      # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
+      - run: docker-compose  -f docker/docker-compose.dev.yml build
+      - run: docker-compose  -f docker/docker-compose.dev.yml up

.husky/pre-commit

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

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

@@ -1,8 +1,6 @@
 'use strict'
 
-const { describe, it, beforeEach } = require('test')
-const assert = require('assert').strict
-const { spy } = require('sinon')
+/* eslint-env jest */
 
 const { asyncEach } = require('./')
 
@@ -36,18 +34,12 @@ describe('asyncEach', () => {
       })
 
       it('works', async () => {
-        const iteratee = spy(async () => {})
+        const iteratee = jest.fn(async () => {})
 
         await asyncEach.call(thisArg, iterable, iteratee, { concurrency: 1 })
 
-        assert.deepStrictEqual(
-          iteratee.thisValues,
-          Array.from(values, () => thisArg)
-        )
-        assert.deepStrictEqual(
-          iteratee.args,
-          Array.from(values, (value, index) => [value, index, iterable])
-        )
+        expect(iteratee.mock.instances).toEqual(Array.from(values, () => thisArg))
+        expect(iteratee.mock.calls).toEqual(Array.from(values, (value, index) => [value, index, iterable]))
       })
       ;[1, 2, 4].forEach(concurrency => {
         it('respects a concurrency of ' + concurrency, async () => {
@@ -57,7 +49,7 @@ describe('asyncEach', () => {
             values,
             async () => {
               ++running
-              assert.deepStrictEqual(running <= concurrency, true)
+              expect(running).toBeLessThanOrEqual(concurrency)
               await randomDelay()
               --running
             },
@@ -67,52 +59,42 @@ describe('asyncEach', () => {
       })
 
       it('stops on first error when stopOnError is true', async () => {
-        const tracker = new assert.CallTracker()
-
         const error = new Error()
-        const iteratee = tracker.calls((_, i) => {
+        const iteratee = jest.fn((_, i) => {
           if (i === 1) {
             throw error
           }
-        }, 2)
-        assert.deepStrictEqual(
-          await rejectionOf(asyncEach(iterable, iteratee, { concurrency: 1, stopOnError: true })),
-          error
-        )
+        })
 
-        tracker.verify()
+        expect(await rejectionOf(asyncEach(iterable, iteratee, { concurrency: 1, stopOnError: true }))).toBe(error)
+        expect(iteratee).toHaveBeenCalledTimes(2)
       })
 
       it('rejects AggregateError when stopOnError is false', async () => {
         const errors = []
-        const iteratee = spy(() => {
+        const iteratee = jest.fn(() => {
           const error = new Error()
           errors.push(error)
           throw error
         })
 
         const error = await rejectionOf(asyncEach(iterable, iteratee, { stopOnError: false }))
-        assert.deepStrictEqual(error.errors, errors)
-        assert.deepStrictEqual(
-          iteratee.args,
-          Array.from(values, (value, index) => [value, index, iterable])
-        )
+        expect(error.errors).toEqual(errors)
+        expect(iteratee.mock.calls).toEqual(Array.from(values, (value, index) => [value, index, iterable]))
       })
 
       it('can be interrupted with an AbortSignal', async () => {
-        const tracker = new assert.CallTracker()
-
         const ac = new AbortController()
-        const iteratee = tracker.calls((_, i) => {
+        const iteratee = jest.fn((_, i) => {
           if (i === 1) {
             ac.abort()
           }
-        }, 2)
-        await assert.rejects(asyncEach(iterable, iteratee, { concurrency: 1, signal: ac.signal }), {
-          message: 'asyncEach aborted',
         })
 
-        tracker.verify()
+        await expect(asyncEach(iterable, iteratee, { concurrency: 1, signal: ac.signal })).rejects.toThrow(
+          'asyncEach aborted'
+        )
+        expect(iteratee).toHaveBeenCalledTimes(2)
       })
     })
   )

@vates/async-each/package.json

@@ -29,12 +29,6 @@
     "node": ">=8.10"
   },
   "scripts": {
-    "postversion": "npm publish --access public",
-    "test": "node--test"
-  },
-  "devDependencies": {
-    "sinon": "^14.0.1",
-    "tap": "^16.3.0",
-    "test": "^3.2.1"
+    "postversion": "npm publish --access public"
   }
 }

@vates/coalesce-calls/index.spec.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const { describe, it } = require('test')
-const assert = require('assert')
+/* eslint-env jest */
 
 const { coalesceCalls } = require('./')
 
@@ -24,13 +23,13 @@ describe('coalesceCalls', () => {
     const promise2 = fn(defer2.promise)
 
     defer1.resolve('foo')
-    assert.strictEqual(await promise1, 'foo')
-    assert.strictEqual(await promise2, 'foo')
+    expect(await promise1).toBe('foo')
+    expect(await promise2).toBe('foo')
 
     const defer3 = pDefer()
     const promise3 = fn(defer3.promise)
 
     defer3.resolve('bar')
-    assert.strictEqual(await promise3, 'bar')
+    expect(await promise3).toBe('bar')
   })
 })

@vates/coalesce-calls/package.json

@@ -30,10 +30,6 @@
     "node": ">=8.10"
   },
   "scripts": {
-    "postversion": "npm publish --access public",
-    "test": "node--test"
-  },
-  "devDependencies": {
-    "test": "^3.2.1"
+    "postversion": "npm publish --access public"
   }
 }

@vates/compose/index.spec.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const { describe, it } = require('test')
-const assert = require('node:assert').strict
+/* eslint-env jest */
 
 const { compose } = require('./')
 
@@ -10,42 +9,43 @@ const mul3 = x => x * 3
 
 describe('compose()', () => {
   it('throws when no functions is passed', () => {
-    assert.throws(() => compose(), TypeError)
-    assert.throws(() => compose([]), TypeError)
+    expect(() => compose()).toThrow(TypeError)
+    expect(() => compose([])).toThrow(TypeError)
   })
 
   it('applies from left to right', () => {
-    assert.strictEqual(compose(add2, mul3)(5), 21)
+    expect(compose(add2, mul3)(5)).toBe(21)
   })
 
   it('accepts functions in an array', () => {
-    assert.strictEqual(compose([add2, mul3])(5), 21)
+    expect(compose([add2, mul3])(5)).toBe(21)
   })
 
   it('can apply from right to left', () => {
-    assert.strictEqual(compose({ right: true }, add2, mul3)(5), 17)
+    expect(compose({ right: true }, add2, mul3)(5)).toBe(17)
   })
 
   it('accepts options with functions in an array', () => {
-    assert.strictEqual(compose({ right: true }, [add2, mul3])(5), 17)
+    expect(compose({ right: true }, [add2, mul3])(5)).toBe(17)
   })
 
   it('can compose async functions', async () => {
-    assert.strictEqual(
+    expect(
       await compose(
         { async: true },
         async x => x + 2,
         async x => x * 3
-      )(5),
-      21
-    )
+      )(5)
+    ).toBe(21)
   })
 
   it('forwards all args to first function', () => {
+    expect.assertions(1)
+
     const expectedArgs = [Math.random(), Math.random()]
     compose(
       (...args) => {
-        assert.deepEqual(args, expectedArgs)
+        expect(args).toEqual(expectedArgs)
       },
       // add a second function to avoid the one function special case
       Function.prototype
@@ -53,13 +53,15 @@ describe('compose()', () => {
   })
 
   it('forwards context to all functions', () => {
+    expect.assertions(2)
+
     const expectedThis = {}
     compose(
       function () {
-        assert.strictEqual(this, expectedThis)
+        expect(this).toBe(expectedThis)
       },
       function () {
-        assert.strictEqual(this, expectedThis)
+        expect(this).toBe(expectedThis)
       }
     ).call(expectedThis)
   })

@vates/compose/package.json

@@ -19,10 +19,6 @@
     "node": ">=7.6"
   },
   "scripts": {
-    "postversion": "npm publish --access public",
-    "test": "node--test"
-  },
-  "devDependencies": {
-    "test": "^3.2.1"
+    "postversion": "npm publish --access public"
   }
 }

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

@@ -1,7 +1,7 @@
 'use strict'
 
 const assert = require('assert')
-const { describe, it } = require('test')
+const { describe, it } = require('tap').mocha
 
 const { decorateClass, decorateWith, decorateMethodsWith, perInstance } = require('./')
 

@vates/decorate-with/package.json

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

@vates/disposable/debounceResource.spec.js

@@ -1,17 +1,16 @@
 'use strict'
 
-const { describe, it } = require('test')
-const { useFakeTimers, spy, assert } = require('sinon')
+/* eslint-env jest */
 
 const { createDebounceResource } = require('./debounceResource')
 
-const clock = useFakeTimers()
+jest.useFakeTimers()
 
 describe('debounceResource()', () => {
   it('calls the resource disposer after 10 seconds', async () => {
     const debounceResource = createDebounceResource()
     const delay = 10e3
-    const dispose = spy()
+    const dispose = jest.fn()
 
     const resource = await debounceResource(
       Promise.resolve({
@@ -23,10 +22,10 @@ describe('debounceResource()', () => {
 
     resource.dispose()
 
-    assert.notCalled(dispose)
+    expect(dispose).not.toBeCalled()
 
-    clock.tick(delay)
+    jest.advanceTimersByTime(delay)
 
-    assert.called(dispose)
+    expect(dispose).toBeCalled()
   })
 })

@vates/disposable/deduped.spec.js

@@ -1,14 +1,13 @@
 'use strict'
 
-const { describe, it } = require('test')
-const { spy, assert } = require('sinon')
+/* eslint-env jest */
 
 const { deduped } = require('./deduped')
 
 describe('deduped()', () => {
   it('calls the resource function only once', async () => {
     const value = {}
-    const getResource = spy(async () => ({
+    const getResource = jest.fn(async () => ({
       value,
       dispose: Function.prototype,
     }))
@@ -18,13 +17,13 @@ describe('deduped()', () => {
     const { value: v1 } = await dedupedGetResource()
     const { value: v2 } = await dedupedGetResource()
 
-    assert.calledOnce(getResource)
-    assert.match(v1, value)
-    assert.match(v2, value)
+    expect(getResource).toHaveBeenCalledTimes(1)
+    expect(v1).toBe(value)
+    expect(v2).toBe(value)
   })
 
   it('only disposes the source disposable when its all copies dispose', async () => {
-    const dispose = spy()
+    const dispose = jest.fn()
     const getResource = async () => ({
       value: '',
       dispose,
@@ -37,35 +36,35 @@ describe('deduped()', () => {
 
     d1()
 
-    assert.notCalled(dispose)
+    expect(dispose).not.toHaveBeenCalled()
 
     d2()
 
-    assert.calledOnce(dispose)
+    expect(dispose).toHaveBeenCalledTimes(1)
   })
 
   it('works with sync factory', () => {
     const value = {}
-    const dispose = spy()
+    const dispose = jest.fn()
     const dedupedGetResource = deduped(() => ({ value, dispose }))
 
     const d1 = dedupedGetResource()
-    assert.match(d1.value, value)
+    expect(d1.value).toBe(value)
 
     const d2 = dedupedGetResource()
-    assert.match(d2.value, value)
+    expect(d2.value).toBe(value)
 
     d1.dispose()
 
-    assert.notCalled(dispose)
+    expect(dispose).not.toHaveBeenCalled()
 
     d2.dispose()
 
-    assert.calledOnce(dispose)
+    expect(dispose).toHaveBeenCalledTimes(1)
   })
 
   it('no race condition on dispose before async acquisition', async () => {
-    const dispose = spy()
+    const dispose = jest.fn()
     const dedupedGetResource = deduped(async () => ({ value: 42, dispose }))
 
     const d1 = await dedupedGetResource()
@@ -74,6 +73,6 @@ describe('deduped()', () => {
 
     d1.dispose()
 
-    assert.notCalled(dispose)
+    expect(dispose).not.toHaveBeenCalled()
   })
 })

@vates/disposable/package.json

@@ -14,22 +14,17 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "0.1.2",
+  "version": "0.1.1",
   "engines": {
     "node": ">=8.10"
   },
   "scripts": {
-    "postversion": "npm publish --access public",
-    "test": "node--test"
+    "postversion": "npm publish --access public"
   },
   "dependencies": {
     "@vates/multi-key-map": "^0.1.0",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.3.0",
     "ensure-array": "^1.0.0"
-  },
-  "devDependencies": {
-    "sinon": "^14.0.1",
-    "test": "^3.2.1"
   }
 }

@vates/fuse-vhd/index.js

@@ -1,66 +0,0 @@
-'use strict'
-
-const LRU = require('lru-cache')
-const Fuse = require('fuse-native')
-const { VhdSynthetic } = require('vhd-lib')
-const { Disposable, fromCallback } = require('promise-toolbox')
-
-// 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(),
-  ctime: st.ctime || new Date(),
-  size: st.size !== undefined ? st.size : 0,
-  mode: st.mode === 'dir' ? 16877 : st.mode === 'file' ? 33188 : st.mode === 'link' ? 41453 : st.mode,
-  uid: st.uid !== undefined ? st.uid : process.getuid(),
-  gid: st.gid !== undefined ? st.gid : process.getgid(),
-})
-
-exports.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 fuse = new Fuse(mountDir, {
-    async readdir(path, cb) {
-      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,
-          })
-        )
-      }
-
-      cb(Fuse.ENOENT)
-    },
-    read(path, fd, buf, len, pos, cb) {
-      if (path === '/vhd0') {
-        return vhd.readRawData(pos, len, cache, buf).then(cb)
-      }
-      throw new Error(`read file ${path} not exists`)
-    },
-  })
-  return new Disposable(
-    () => fromCallback(() => fuse.unmount()),
-    fromCallback(() => fuse.mount())
-  )
-})

@vates/fuse-vhd/package.json

@@ -1,29 +0,0 @@
-{
-  "name": "@vates/fuse-vhd",
-  "version": "1.0.0",
-  "license": "ISC",
-  "private": false,
-  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/fuse-vhd",
-  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
-  "repository": {
-    "directory": "@vates/fuse-vhd",
-    "type": "git",
-    "url": "https://github.com/vatesfr/xen-orchestra.git"
-  },
-  "author": {
-    "name": "Vates SAS",
-    "url": "https://vates.fr"
-  },
-  "engines": {
-    "node": ">=10.0"
-  },
-  "dependencies": {
-    "fuse-native": "^2.2.6",
-    "lru-cache": "^7.14.0",
-    "promise-toolbox": "^0.21.0",
-    "vhd-lib": "^4.1.1"
-  },
-  "scripts": {
-    "postversion": "npm publish --access public"
-  }
-}

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

@@ -1,7 +1,6 @@
 'use strict'
 
-const { describe, it } = require('test')
-const assert = require('node:assert')
+/* eslint-env jest */
 
 const { MultiKeyMap } = require('./')
 
@@ -29,9 +28,9 @@ describe('MultiKeyMap', () => {
 
     keys.forEach((key, i) => {
       // copy the key to make sure the array itself is not the key
-      assert.strictEqual(map.get(key.slice()), values[i])
+      expect(map.get(key.slice())).toBe(values[i])
       map.delete(key.slice())
-      assert.strictEqual(map.get(key.slice()), undefined)
+      expect(map.get(key.slice())).toBe(undefined)
     })
   })
 })

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

@@ -23,10 +23,6 @@
     "node": ">=8.10"
   },
   "scripts": {
-    "postversion": "npm publish --access public",
-    "test": "node--test"
-  },
-  "devDependencies": {
-    "test": "^3.2.1"
+    "postversion": "npm publish --access public"
   }
 }

@vates/nbd-client/.USAGE.md

@@ -1,16 +0,0 @@
-### `new NdbClient({address, exportname, secure = true, port = 10809})`
-
-create a new nbd client
-
-```js
-import NbdClient from '@vates/nbd-client'
-const client = new NbdClient({
-  address: 'MY_NBD_HOST',
-  exportname: 'MY_SECRET_EXPORT',
-  cert: 'Server certificate', // optional, will use encrypted link if provided
-})
-
-await client.connect()
-const block = await client.readBlock(blockIndex, BlockSize)
-await client.disconnect()
-```

@vates/nbd-client/.npmignore

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

@vates/nbd-client/README.md

@@ -1,47 +0,0 @@
-<!-- DO NOT EDIT MANUALLY, THIS FILE HAS BEEN GENERATED -->
-
-# @vates/nbd-client
-
-[![Package Version](https://badgen.net/npm/v/@vates/nbd-client)](https://npmjs.org/package/@vates/nbd-client) ![License](https://badgen.net/npm/license/@vates/nbd-client) [![PackagePhobia](https://badgen.net/bundlephobia/minzip/@vates/nbd-client)](https://bundlephobia.com/result?p=@vates/nbd-client) [![Node compatibility](https://badgen.net/npm/node/@vates/nbd-client)](https://npmjs.org/package/@vates/nbd-client)
-
-## Install
-
-Installation of the [npm package](https://npmjs.org/package/@vates/nbd-client):
-
-```
-> npm install --save @vates/nbd-client
-```
-
-## Usage
-
-### `new NdbClient({address, exportname, secure = true, port = 10809})`
-
-create a new nbd client
-
-```js
-import NbdClient from '@vates/nbd-client'
-const client = new NbdClient({
-  address: 'MY_NBD_HOST',
-  exportname: 'MY_SECRET_EXPORT',
-  cert: 'Server certificate', // optional, will use encrypted link if provided
-})
-
-await client.connect()
-const block = await client.readBlock(blockIndex, BlockSize)
-await client.disconnect()
-```
-
-## 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/nbd-client/constants.js

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

@vates/nbd-client/index.js

@@ -1,243 +0,0 @@
-'use strict'
-const assert = require('node:assert')
-const { Socket } = require('node:net')
-const { connect } = require('node:tls')
-const {
-  INIT_PASSWD,
-  NBD_CMD_READ,
-  NBD_DEFAULT_BLOCK_SIZE,
-  NBD_DEFAULT_PORT,
-  NBD_FLAG_FIXED_NEWSTYLE,
-  NBD_FLAG_HAS_FLAGS,
-  NBD_OPT_EXPORT_NAME,
-  NBD_OPT_REPLY_MAGIC,
-  NBD_OPT_STARTTLS,
-  NBD_REPLY_ACK,
-  NBD_REPLY_MAGIC,
-  NBD_REQUEST_MAGIC,
-  OPTS_MAGIC,
-} = require('./constants.js')
-const { fromCallback } = require('promise-toolbox')
-const { readChunkStrict } = require('@vates/read-chunk')
-
-// documentation is here : https://github.com/NetworkBlockDevice/nbd/blob/master/doc/proto.md
-
-module.exports = class NbdClient {
-  #serverAddress
-  #serverCert
-  #serverPort
-  #serverSocket
-
-  #exportName
-  #exportSize
-
-  // AFAIK, there is no guaranty the server answers in the same order as the queries
-  // so we handle a backlog of command waiting for response and handle concurrency manually
-
-  #waitingForResponse // there is already a listenner waiting for a response
-  #nextCommandQueryId = BigInt(0)
-  #commandQueryBacklog // map of command waiting for an response queryId => { size/*in byte*/, resolve, reject}
-
-  constructor({ address, port = NBD_DEFAULT_PORT, exportname, cert }) {
-    this.#serverAddress = address
-    this.#serverPort = port
-    this.#exportName = exportname
-    this.#serverCert = cert
-  }
-
-  get exportSize() {
-    return this.#exportSize
-  }
-
-  async #tlsConnect() {
-    return new Promise((resolve, reject) => {
-      this.#serverSocket = connect({
-        socket: this.#serverSocket,
-        rejectUnauthorized: false,
-        cert: this.#serverCert,
-      })
-      this.#serverSocket.once('error', reject)
-      this.#serverSocket.once('secureConnect', () => {
-        this.#serverSocket.removeListener('error', reject)
-        resolve()
-      })
-    })
-  }
-
-  // mandatory , at least to start the handshake
-  async #unsecureConnect() {
-    this.#serverSocket = new Socket()
-    return new Promise((resolve, reject) => {
-      this.#serverSocket.connect(this.#serverPort, this.#serverAddress)
-      this.#serverSocket.once('error', reject)
-      this.#serverSocket.once('connect', () => {
-        this.#serverSocket.removeListener('error', reject)
-        resolve()
-      })
-    })
-  }
-
-  async connect() {
-    // first we connect to the serve without tls, and then we upgrade the connection
-    // to tls during the handshake
-    await this.#unsecureConnect()
-    await this.#handshake()
-
-    // reset internal state if we reconnected a nbd client
-    this.#commandQueryBacklog = new Map()
-    this.#waitingForResponse = false
-  }
-
-  async disconnect() {
-    await this.#serverSocket.destroy()
-  }
-
-  // we can use individual read/write from the socket here since there is no concurrency
-  async #sendOption(option, buffer = Buffer.alloc(0)) {
-    await this.#write(OPTS_MAGIC)
-    await this.#writeInt32(option)
-    await this.#writeInt32(buffer.length)
-    await this.#write(buffer)
-    assert.strictEqual(await this.#readInt64(), NBD_OPT_REPLY_MAGIC) // magic number everywhere
-    assert.strictEqual(await this.#readInt32(), option) // the option passed
-    assert.strictEqual(await this.#readInt32(), NBD_REPLY_ACK) // ACK
-    const length = await this.#readInt32()
-    assert.strictEqual(length, 0) // length
-  }
-
-  // we can use individual read/write from the socket here since there is only one handshake at once, no concurrency
-  async #handshake() {
-    assert((await this.#read(8)).equals(INIT_PASSWD))
-    assert((await this.#read(8)).equals(OPTS_MAGIC))
-    const flagsBuffer = await this.#read(2)
-    const flags = flagsBuffer.readInt16BE(0)
-    assert.strictEqual(flags & NBD_FLAG_FIXED_NEWSTYLE, NBD_FLAG_FIXED_NEWSTYLE) // only FIXED_NEWSTYLE one is supported from the server options
-    await this.#writeInt32(NBD_FLAG_FIXED_NEWSTYLE) // client also support  NBD_FLAG_C_FIXED_NEWSTYLE
-
-    if (this.#serverCert !== undefined) {
-      // upgrade socket to TLS if needed
-      await this.#sendOption(NBD_OPT_STARTTLS)
-      await this.#tlsConnect()
-    }
-
-    // send export name we want to access.
-    // it's  implictly closing the negociation phase.
-    await this.#write(OPTS_MAGIC)
-    await this.#writeInt32(NBD_OPT_EXPORT_NAME)
-    const exportNameBuffer = Buffer.from(this.#exportName)
-    await this.#writeInt32(exportNameBuffer.length)
-    await this.#write(exportNameBuffer)
-
-    // 8 (export size ) + 2 (flags) + 124 zero = 134
-    // must read all to ensure nothing stays in the  buffer
-    const answer = await this.#read(134)
-    this.#exportSize = answer.readBigUInt64BE(0)
-    const transmissionFlags = answer.readInt16BE(8)
-    assert.strictEqual(transmissionFlags & NBD_FLAG_HAS_FLAGS, NBD_FLAG_HAS_FLAGS, 'NBD_FLAG_HAS_FLAGS') // must always be 1 by the norm
-
-    // note : xapi server always send NBD_FLAG_READ_ONLY (3) as a flag
-  }
-
-  #read(length) {
-    return readChunkStrict(this.#serverSocket, length)
-  }
-
-  #write(buffer) {
-    return fromCallback.call(this.#serverSocket, 'write', buffer)
-  }
-
-  async #readInt32() {
-    const buffer = await this.#read(4)
-    return buffer.readInt32BE(0)
-  }
-
-  async #readInt64() {
-    const buffer = await this.#read(8)
-    return buffer.readBigUInt64BE(0)
-  }
-
-  #writeInt32(int) {
-    const buffer = Buffer.alloc(4)
-    buffer.writeInt32BE(int)
-    return this.#write(buffer)
-  }
-
-  // when one read fail ,stop everything
-  async #rejectAll(error) {
-    this.#commandQueryBacklog.forEach(({ reject }) => {
-      reject(error)
-    })
-    await this.disconnect()
-  }
-
-  async #readBlockResponse() {
-    // ensure at most one read occur in parallel
-    if (this.#waitingForResponse) {
-      return
-    }
-
-    try {
-      this.#waitingForResponse = true
-      const magic = await this.#readInt32()
-
-      if (magic !== NBD_REPLY_MAGIC) {
-        throw new Error(`magic number for block answer is wrong : ${magic} ${NBD_REPLY_MAGIC}`)
-      }
-
-      const error = await this.#readInt32()
-      if (error !== 0) {
-        // @todo use error code from constants.mjs
-        throw new Error(`GOT ERROR CODE  : ${error}`)
-      }
-
-      const blockQueryId = await this.#readInt64()
-      const query = this.#commandQueryBacklog.get(blockQueryId)
-      if (!query) {
-        throw new Error(` no query associated with id ${blockQueryId}`)
-      }
-      this.#commandQueryBacklog.delete(blockQueryId)
-      const data = await this.#read(query.size)
-      query.resolve(data)
-      this.#waitingForResponse = false
-      if (this.#commandQueryBacklog.size > 0) {
-        await this.#readBlockResponse()
-      }
-    } catch (error) {
-      // reject all the promises
-      // we don't need to call readBlockResponse on failure
-      // since we will empty the backlog
-      await this.#rejectAll(error)
-    }
-  }
-
-  async readBlock(index, size = NBD_DEFAULT_BLOCK_SIZE) {
-    const queryId = this.#nextCommandQueryId
-    this.#nextCommandQueryId++
-
-    // create and send  command at once to ensure there is no concurrency issue
-    const buffer = Buffer.alloc(28)
-    buffer.writeInt32BE(NBD_REQUEST_MAGIC, 0) // it is a nbd request
-    buffer.writeInt16BE(0, 4) // no command flags for a simple block read
-    buffer.writeInt16BE(NBD_CMD_READ, 6) // we want to read a data block
-    buffer.writeBigUInt64BE(queryId, 8)
-    // byte offset in the raw disk
-    buffer.writeBigUInt64BE(BigInt(index) * BigInt(size), 16)
-    buffer.writeInt32BE(size, 24)
-
-    return new Promise((resolve, reject) => {
-      // this will handle one block response, but it can be another block
-      // since server does not guaranty to handle query in order
-      this.#commandQueryBacklog.set(queryId, {
-        size,
-        resolve,
-        reject,
-      })
-      // really send the command to the server
-      this.#write(buffer).catch(reject)
-
-      // #readBlockResponse never throws directly
-      // but if it fails it will reject all the promises in the backlog
-      this.#readBlockResponse()
-    })
-  }
-}

@vates/nbd-client/nbdclient.spec.js

@@ -1,76 +0,0 @@
-'use strict'
-const NbdClient = require('./index.js')
-const { spawn } = require('node:child_process')
-const fs = require('node:fs/promises')
-const { test } = require('tap')
-const tmp = require('tmp')
-const { pFromCallback } = require('promise-toolbox')
-const { asyncEach } = require('@vates/async-each')
-
-const FILE_SIZE = 2 * 1024 * 1024
-
-async function createTempFile(size) {
-  const tmpPath = await pFromCallback(cb => tmp.file(cb))
-  const data = Buffer.alloc(size, 0)
-  for (let i = 0; i < size; i += 4) {
-    data.writeUInt32BE(i, i)
-  }
-  await fs.writeFile(tmpPath, data)
-
-  return tmpPath
-}
-
-test('it works with unsecured network', async tap => {
-  const path = await createTempFile(FILE_SIZE)
-
-  const nbdServer = spawn(
-    'nbdkit',
-    [
-      'file',
-      path,
-      '--newstyle', //
-      '--exit-with-parent',
-      '--read-only',
-      '--export-name=MY_SECRET_EXPORT',
-    ],
-    {
-      stdio: ['inherit', 'inherit', 'inherit'],
-    }
-  )
-
-  const client = new NbdClient({
-    address: 'localhost',
-    exportname: 'MY_SECRET_EXPORT',
-    secure: false,
-  })
-
-  await client.connect()
-  tap.equal(client.exportSize, BigInt(FILE_SIZE))
-  const CHUNK_SIZE = 128 * 1024 // non default size
-  const indexes = []
-  for (let i = 0; i < FILE_SIZE / CHUNK_SIZE; i++) {
-    indexes.push(i)
-  }
-  // read mutiple blocks in parallel
-  await asyncEach(
-    indexes,
-    async i => {
-      const block = await client.readBlock(i, CHUNK_SIZE)
-      let blockOk = true
-      let firstFail
-      for (let j = 0; j < CHUNK_SIZE; j += 4) {
-        const wanted = i * CHUNK_SIZE + j
-        const found = block.readUInt32BE(j)
-        blockOk = blockOk && found === wanted
-        if (!blockOk && firstFail === undefined) {
-          firstFail = j
-        }
-      }
-      tap.ok(blockOk, `check block ${i} content`)
-    },
-    { concurrency: 8 }
-  )
-  await client.disconnect()
-  nbdServer.kill()
-  await fs.unlink(path)
-})

@vates/nbd-client/package.json

@@ -1,35 +0,0 @@
-{
-  "private": false,
-  "name": "@vates/nbd-client",
-  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/nbd-client",
-  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
-  "repository": {
-    "directory": "@vates/nbd-client",
-    "type": "git",
-    "url": "https://github.com/vatesfr/xen-orchestra.git"
-  },
-  "author": {
-    "name": "Vates SAS",
-    "url": "https://vates.fr"
-  },
-  "license": "ISC",
-  "version": "1.0.0",
-  "engines": {
-    "node": ">=14.0"
-  },
-  "dependencies": {
-    "@vates/async-each": "^1.0.0",
-    "@vates/read-chunk": "^1.0.1",
-    "@xen-orchestra/async-map": "^0.1.2",
-    "promise-toolbox": "^0.21.0",
-    "xen-api": "^1.2.2"
-  },
-  "devDependencies": {
-    "tap": "^16.3.0",
-    "tmp": "^0.2.1"
-  },
-  "scripts": {
-    "postversion": "npm publish --access public",
-    "test-integration": "tap *.spec.js"
-  }
-}

@vates/otp/.USAGE.md

@@ -1,130 +0,0 @@
-### Usual workflow
-
-> This section presents how this library should be used to implement a classic two factor authentification.
-
-#### Setup
-
-```js
-import { generateSecret, generateTotp } from '@vates/otp'
-import QrCode from 'qrcode'
-
-// Generates a secret that will be shared by both the service and the user:
-const secret = generateSecret()
-
-// Stores the secret in the service:
-await currentUser.saveOtpSecret(secret)
-
-// Generates an URI to present to the user
-const uri = generateTotpUri({ secret })
-
-// Generates the QR code from the URI to make it easily importable in Authy or Google Authenticator
-const qr = await QrCode.toDataURL(uri)
-```
-
-#### Authentication
-
-```js
-import { verifyTotp } from '@vates/otp'
-
-// Verifies a `token` entered by the user against a `secret` generated during setup.
-if (await verifyTotp(token, { secret })) {
-  console.log('authenticated!')
-}
-```
-
-### API
-
-#### Secret
-
-```js
-import { generateSecret } from '@vates/otp'
-
-const secret = generateSecret()
-// 'OJOKA65RY5FQQ2RYWVKD5Y3YG5CSHGYH'
-```
-
-#### HOTP
-
-> This is likely not what you want to use, see TOTP below instead.
-
-```js
-import { generateHotp, generateHotpUri, verifyHotp } from '@vates/otp'
-
-// a sequence number, see HOTP specification
-const counter = 0
-
-// generate a token
-//
-// optional params:
-// - digits
-const token = await generateHotp({ counter, secret })
-// '239988'
-
-// verify a token
-//
-// optional params:
-// - digits
-const isValid = await verifyHotp(token, { counter, secret })
-// true
-
-// generate a URI than can be displayed as a QR code to be used with Authy or Google Authenticator
-//
-// optional params:
-// - digits
-const uri = generateHotpUri({ counter, label: 'account name', issuer: 'my app', secret })
-// 'otpauth://hotp/my%20app:account%20name?counter=0&issuer=my%20app&secret=OJOKA65RY5FQQ2RYWVKD5Y3YG5CSHGYH'
-```
-
-Optional params and their default values:
-
-- `digits = 6`: length of the token, avoid using it because not compatible with Google Authenticator
-
-#### TOTP
-
-```js
-import { generateTotp, generateTotpUri, verifyTotp } from '@vates/otp'
-
-// generate a token
-//
-// optional params:
-// - digits
-// - period
-// - timestamp
-const token = await generateTotp({ secret })
-// '632869'
-
-// verify a token
-//
-// optional params:
-// - digits
-// - period
-// - timestamp
-// - window
-const isValid = await verifyTotp(token, { secret })
-// true
-
-// generate a URI than can be displayed as a QR code to be used with Authy or Google Authenticator
-//
-// optional params:
-// - digits
-// - period
-const uri = generateTotpUri({ label: 'account name', issuer: 'my app', secret })
-// 'otpauth://totp/my%20app:account%20name?issuer=my%20app&secret=OJOKA65RY5FQQ2RYWVKD5Y3YG5CSHGYH'
-```
-
-Optional params and their default values:
-
-- `digits = 6`: length of the token, avoid using it because not compatible with Google Authenticator
-- `period = 30`: number of seconds a token is valid
-- `timestamp = Date.now() / 1e3`: Unix timestamp, in seconds, when this token will be valid, default to now
-- `window = 1`: number of periods before and after `timestamp` for which the token is considered valid
-
-#### Verification from URI
-
-```js
-import { verifyFromUri } from '@vates/otp'
-
-// Verify the token using all the information contained in the URI
-const isValid = await verifyFromUri(token, uri)
-// true
-```

@vates/otp/.npmignore

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

@vates/otp/README.md

@@ -1,163 +0,0 @@
-<!-- DO NOT EDIT MANUALLY, THIS FILE HAS BEEN GENERATED -->
-
-# @vates/otp
-
-[![Package Version](https://badgen.net/npm/v/@vates/otp)](https://npmjs.org/package/@vates/otp) ![License](https://badgen.net/npm/license/@vates/otp) [![PackagePhobia](https://badgen.net/bundlephobia/minzip/@vates/otp)](https://bundlephobia.com/result?p=@vates/otp) [![Node compatibility](https://badgen.net/npm/node/@vates/otp)](https://npmjs.org/package/@vates/otp)
-
-> Minimal HTOP/TOTP implementation
-
-## Install
-
-Installation of the [npm package](https://npmjs.org/package/@vates/otp):
-
-```
-> npm install --save @vates/otp
-```
-
-## Usage
-
-### Usual workflow
-
-> This section presents how this library should be used to implement a classic two factor authentification.
-
-#### Setup
-
-```js
-import { generateSecret, generateTotp } from '@vates/otp'
-import QrCode from 'qrcode'
-
-// Generates a secret that will be shared by both the service and the user:
-const secret = generateSecret()
-
-// Stores the secret in the service:
-await currentUser.saveOtpSecret(secret)
-
-// Generates an URI to present to the user
-const uri = generateTotpUri({ secret })
-
-// Generates the QR code from the URI to make it easily importable in Authy or Google Authenticator
-const qr = await QrCode.toDataURL(uri)
-```
-
-#### Authentication
-
-```js
-import { verifyTotp } from '@vates/otp'
-
-// Verifies a `token` entered by the user against a `secret` generated during setup.
-if (await verifyTotp(token, { secret })) {
-  console.log('authenticated!')
-}
-```
-
-### API
-
-#### Secret
-
-```js
-import { generateSecret } from '@vates/otp'
-
-const secret = generateSecret()
-// 'OJOKA65RY5FQQ2RYWVKD5Y3YG5CSHGYH'
-```
-
-#### HOTP
-
-> This is likely not what you want to use, see TOTP below instead.
-
-```js
-import { generateHotp, generateHotpUri, verifyHotp } from '@vates/otp'
-
-// a sequence number, see HOTP specification
-const counter = 0
-
-// generate a token
-//
-// optional params:
-// - digits
-const token = await generateHotp({ counter, secret })
-// '239988'
-
-// verify a token
-//
-// optional params:
-// - digits
-const isValid = await verifyHotp(token, { counter, secret })
-// true
-
-// generate a URI than can be displayed as a QR code to be used with Authy or Google Authenticator
-//
-// optional params:
-// - digits
-const uri = generateHotpUri({ counter, label: 'account name', issuer: 'my app', secret })
-// 'otpauth://hotp/my%20app:account%20name?counter=0&issuer=my%20app&secret=OJOKA65RY5FQQ2RYWVKD5Y3YG5CSHGYH'
-```
-
-Optional params and their default values:
-
-- `digits = 6`: length of the token, avoid using it because not compatible with Google Authenticator
-
-#### TOTP
-
-```js
-import { generateTotp, generateTotpUri, verifyTotp } from '@vates/otp'
-
-// generate a token
-//
-// optional params:
-// - digits
-// - period
-// - timestamp
-const token = await generateTotp({ secret })
-// '632869'
-
-// verify a token
-//
-// optional params:
-// - digits
-// - period
-// - timestamp
-// - window
-const isValid = await verifyTotp(token, { secret })
-// true
-
-// generate a URI than can be displayed as a QR code to be used with Authy or Google Authenticator
-//
-// optional params:
-// - digits
-// - period
-const uri = generateTotpUri({ label: 'account name', issuer: 'my app', secret })
-// 'otpauth://totp/my%20app:account%20name?issuer=my%20app&secret=OJOKA65RY5FQQ2RYWVKD5Y3YG5CSHGYH'
-```
-
-Optional params and their default values:
-
-- `digits = 6`: length of the token, avoid using it because not compatible with Google Authenticator
-- `period = 30`: number of seconds a token is valid
-- `timestamp = Date.now() / 1e3`: Unix timestamp, in seconds, when this token will be valid, default to now
-- `window = 1`: number of periods before and after `timestamp` for which the token is considered valid
-
-#### Verification from URI
-
-```js
-import { verifyFromUri } from '@vates/otp'
-
-// Verify the token using all the information contained in the URI
-const isValid = await verifyFromUri(token, uri)
-// true
-```
-
-## 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/otp/index.mjs

@@ -1,111 +0,0 @@
-import { base32 } from 'rfc4648'
-import { webcrypto } from 'node:crypto'
-
-const { subtle } = webcrypto
-
-function assert(name, value) {
-  if (!value) {
-    throw new TypeError('invalid value for param ' + name)
-  }
-}
-
-// https://github.com/google/google-authenticator/wiki/Key-Uri-Format
-function generateUri(protocol, label, params) {
-  assert('label', typeof label === 'string')
-  assert('secret', typeof params.secret === 'string')
-
-  let path = encodeURIComponent(label)
-
-  const { issuer } = params
-  if (issuer !== undefined) {
-    path = encodeURIComponent(issuer) + ':' + path
-  }
-
-  const query = Object.entries(params)
-    .filter(_ => _[1] !== undefined)
-    .map(([key, value]) => key + '=' + encodeURIComponent(value))
-    .join('&')
-
-  return `otpauth://${protocol}/${path}?${query}`
-}
-
-export function generateSecret() {
-  // https://www.rfc-editor.org/rfc/rfc4226 recommends 160 bits (i.e. 20 bytes)
-  const data = new Uint8Array(20)
-  webcrypto.getRandomValues(data)
-  return base32.stringify(data, { pad: false })
-}
-
-const DIGITS = 6
-
-// https://www.rfc-editor.org/rfc/rfc4226
-export async function generateHotp({ counter, digits = DIGITS, secret }) {
-  const data = new Uint8Array(8)
-  new DataView(data.buffer).setBigInt64(0, BigInt(counter), false)
-
-  const key = await subtle.importKey(
-    'raw',
-    base32.parse(secret, { loose: true }),
-    { name: 'HMAC', hash: 'SHA-1' },
-    false,
-    ['sign', 'verify']
-  )
-  const digest = new DataView(await subtle.sign('HMAC', key, data))
-
-  const offset = digest.getUint8(digest.byteLength - 1) & 0xf
-  const p = digest.getUint32(offset) & 0x7f_ff_ff_ff
-
-  return String(p % Math.pow(10, digits)).padStart(digits, '0')
-}
-
-export function generateHotpUri({ counter, digits, issuer, label, secret }) {
-  assert('counter', typeof counter === 'number')
-  return generateUri('hotp', label, { counter, digits, issuer, secret })
-}
-
-export async function verifyHotp(token, opts) {
-  return token === (await generateHotp(opts))
-}
-
-function totpCounter(period = 30, timestamp = Math.floor(Date.now() / 1e3)) {
-  return Math.floor(timestamp / period)
-}
-
-// https://www.rfc-editor.org/rfc/rfc6238.html
-export async function generateTotp({ period, timestamp, ...opts }) {
-  opts.counter = totpCounter(period, timestamp)
-  return await generateHotp(opts)
-}
-
-export function generateTotpUri({ digits, issuer, label, period, secret }) {
-  return generateUri('totp', label, { digits, issuer, period, secret })
-}
-
-export async function verifyTotp(token, { period, timestamp, window = 1, ...opts }) {
-  const counter = totpCounter(period, timestamp)
-  const end = counter + window
-  opts.counter = counter - window
-  while (opts.counter <= end) {
-    if (token === (await generateHotp(opts))) {
-      return true
-    }
-    opts.counter += 1
-  }
-  return false
-}
-
-export async function verifyFromUri(token, uri) {
-  const url = new URL(uri)
-  assert('protocol', url.protocol === 'otpauth:')
-
-  const { host } = url
-  const opts = Object.fromEntries(url.searchParams.entries())
-  if (host === 'hotp') {
-    return await verifyHotp(token, opts)
-  }
-  if (host === 'totp') {
-    return await verifyTotp(token, opts)
-  }
-
-  assert('host', false)
-}

@vates/otp/index.spec.mjs

@@ -1,112 +0,0 @@
-import { strict as assert } from 'node:assert'
-import { describe, it } from 'tap/mocha'
-
-import {
-  generateHotp,
-  generateHotpUri,
-  generateSecret,
-  generateTotp,
-  generateTotpUri,
-  verifyHotp,
-  verifyTotp,
-} from './index.mjs'
-
-describe('generateSecret', function () {
-  it('generates a string of 32 chars', async function () {
-    const secret = generateSecret()
-    assert.equal(typeof secret, 'string')
-    assert.equal(secret.length, 32)
-  })
-
-  it('generates a different secret at each call', async function () {
-    assert.notEqual(generateSecret(), generateSecret())
-  })
-})
-
-describe('HOTP', function () {
-  it('generate and verify valid tokens', async function () {
-    for (const [token, opts] of Object.entries({
-      382752: {
-        counter: -3088,
-        secret: 'PJYFSZ3JNVXVQMZXOB2EQYJSKB2HE6TB',
-      },
-      163376: {
-        counter: 30598,
-        secret: 'GBUDQZ3UKZZGIMRLNVYXA33GMFMEGQKN',
-      },
-    })) {
-      assert.equal(await generateHotp(opts), token)
-      assert(await verifyHotp(token, opts))
-    }
-  })
-
-  describe('generateHotpUri', function () {
-    const opts = {
-      counter: 59732,
-      label: 'the label',
-      secret: 'OGK45BBZAIGNGELHZPXYKN4GUVWWO6YX',
-    }
-
-    Object.entries({
-      'without optional params': [
-        opts,
-        'otpauth://hotp/the%20label?counter=59732&secret=OGK45BBZAIGNGELHZPXYKN4GUVWWO6YX',
-      ],
-      'with issuer': [
-        { ...opts, issuer: 'the issuer' },
-        'otpauth://hotp/the%20issuer:the%20label?counter=59732&issuer=the%20issuer&secret=OGK45BBZAIGNGELHZPXYKN4GUVWWO6YX',
-      ],
-      'with digits': [
-        { ...opts, digits: 7 },
-        'otpauth://hotp/the%20label?counter=59732&digits=7&secret=OGK45BBZAIGNGELHZPXYKN4GUVWWO6YX',
-      ],
-    }).forEach(([title, [opts, uri]]) => {
-      it(title, async function () {
-        assert.strictEqual(generateHotpUri(opts), uri)
-      })
-    })
-  })
-})
-
-describe('TOTP', function () {
-  Object.entries({
-    '033702': {
-      secret: 'PJYFSZ3JNVXVQMZXOB2EQYJSKB2HE6TB',
-      timestamp: 1665416296,
-      period: 30,
-    },
-    107250: {
-      secret: 'GBUDQZ3UKZZGIMRLNVYXA33GMFMEGQKN',
-      timestamp: 1665416674,
-      period: 60,
-    },
-  }).forEach(([token, opts]) => {
-    it('works', async function () {
-      assert.equal(await generateTotp(opts), token)
-      assert(await verifyTotp(token, opts))
-    })
-  })
-
-  describe('generateHotpUri', function () {
-    const opts = {
-      label: 'the label',
-      secret: 'OGK45BBZAIGNGELHZPXYKN4GUVWWO6YX',
-    }
-
-    Object.entries({
-      'without optional params': [opts, 'otpauth://totp/the%20label?secret=OGK45BBZAIGNGELHZPXYKN4GUVWWO6YX'],
-      'with issuer': [
-        { ...opts, issuer: 'the issuer' },
-        'otpauth://totp/the%20issuer:the%20label?issuer=the%20issuer&secret=OGK45BBZAIGNGELHZPXYKN4GUVWWO6YX',
-      ],
-      'with digits': [
-        { ...opts, digits: 7 },
-        'otpauth://totp/the%20label?digits=7&secret=OGK45BBZAIGNGELHZPXYKN4GUVWWO6YX',
-      ],
-    }).forEach(([title, [opts, uri]]) => {
-      it(title, async function () {
-        assert.strictEqual(generateTotpUri(opts), uri)
-      })
-    })
-  })
-})

@vates/otp/package.json

@@ -1,39 +0,0 @@
-{
-  "private": false,
-  "name": "@vates/otp",
-  "description": "Minimal HTOP/TOTP implementation",
-  "keywords": [
-    "2fa",
-    "authenticator",
-    "hotp",
-    "otp",
-    "totp"
-  ],
-  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/otp",
-  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
-  "main": "index.mjs",
-  "repository": {
-    "directory": "@vates/otp",
-    "type": "git",
-    "url": "https://github.com/vatesfr/xen-orchestra.git"
-  },
-  "author": {
-    "name": "Vates SAS",
-    "url": "https://vates.fr"
-  },
-  "license": "ISC",
-  "version": "1.0.0",
-  "engines": {
-    "node": ">=15"
-  },
-  "dependencies": {
-    "rfc4648": "^1.5.2"
-  },
-  "scripts": {
-    "postversion": "npm publish --access public",
-    "test": "tap"
-  },
-  "devDependencies": {
-    "tap": "^16.3.0"
-  }
-}

@vates/predicates/.USAGE.md

@@ -1,7 +1,7 @@
 `undefined` predicates are ignored and `undefined` is returned if all predicates are `undefined`, this permits the most efficient composition:
 
 ```js
-const compositePredicate = not(every(undefined, some(not(predicate2), undefined)))
+const compositePredicate = every(undefined, some(predicate2, undefined))
 
 // ends up as
 
@@ -36,21 +36,6 @@ isBetween3And10(10)
 // → false
 ```
 
-### `not(predicate)`
-
-> Returns a predicate that returns the negation of the predicate.
-
-```js
-const isEven = n => n % 2 === 0
-const isOdd = not(isEven)
-
-isOdd(1)
-// true
-
-isOdd(2)
-// false
-```
-
 ### `some(predicates)`
 
 > Returns a predicate that returns `true` iff some predicate returns `true`.

@vates/predicates/README.md

@@ -19,7 +19,7 @@ Installation of the [npm package](https://npmjs.org/package/@vates/predicates):
 `undefined` predicates are ignored and `undefined` is returned if all predicates are `undefined`, this permits the most efficient composition:
 
 ```js
-const compositePredicate = not(every(undefined, some(not(predicate2), undefined)))
+const compositePredicate = every(undefined, some(predicate2, undefined))
 
 // ends up as
 
@@ -54,21 +54,6 @@ isBetween3And10(10)
 // → false
 ```
 
-### `not(predicate)`
-
-> Returns a predicate that returns the negation of the predicate.
-
-```js
-const isEven = n => n % 2 === 0
-const isOdd = not(isEven)
-
-isOdd(1)
-// true
-
-isOdd(2)
-// false
-```
-
 ### `some(predicates)`
 
 > Returns a predicate that returns `true` iff some predicate returns `true`.

@vates/predicates/index.js

@@ -51,22 +51,6 @@ exports.every = function every() {
   }
 }
 
-const notPredicateTag = {}
-exports.not = function not(predicate) {
-  if (isDefinedPredicate(predicate)) {
-    if (predicate.tag === notPredicateTag) {
-      return predicate.predicate
-    }
-
-    function notPredicate() {
-      return !predicate.apply(this, arguments)
-    }
-    notPredicate.predicate = predicate
-    notPredicate.tag = notPredicateTag
-    return notPredicate
-  }
-}
-
 exports.some = function some() {
   const predicates = handleArgs.apply(this, arguments)
   const n = predicates.length

@vates/predicates/index.spec.js

@@ -3,14 +3,20 @@
 const assert = require('assert/strict')
 const { describe, it } = require('tap').mocha
 
-const { every, not, some } = require('./')
+const { every, some } = require('./')
 
 const T = () => true
 const F = () => false
 
-const testArgHandling = fn => {
-  it('returns undefined if predicate is undefined', () => {
+const testArgsHandling = fn => {
+  it('returns undefined if all predicates are undefined', () => {
     assert.equal(fn(undefined), undefined)
+    assert.equal(fn([undefined]), undefined)
+  })
+
+  it('returns the predicate if only a single one is passed', () => {
+    assert.equal(fn(undefined, T), T)
+    assert.equal(fn([undefined, T]), T)
   })
 
   it('throws if it receives a non-predicate', () => {
@@ -18,15 +24,6 @@ const testArgHandling = fn => {
     error.value = 3
     assert.throws(() => fn(3), error)
   })
-}
-
-const testArgsHandling = fn => {
-  testArgHandling(fn)
-
-  it('returns the predicate if only a single one is passed', () => {
-    assert.equal(fn(undefined, T), T)
-    assert.equal(fn([undefined, T]), T)
-  })
 
   it('forwards this and arguments to predicates', () => {
     const thisArg = 'qux'
@@ -39,21 +36,17 @@ const testArgsHandling = fn => {
   })
 }
 
-const runTests = (fn, acceptMultiple, truthTable) =>
+const runTests = (fn, truthTable) =>
   it('works', () => {
     truthTable.forEach(([result, ...predicates]) => {
-      if (acceptMultiple) {
-        assert.equal(fn(predicates)(), result)
-      } else {
-        assert.equal(predicates.length, 1)
-      }
       assert.equal(fn(...predicates)(), result)
+      assert.equal(fn(predicates)(), result)
     })
   })
 
 describe('every', () => {
   testArgsHandling(every)
-  runTests(every, true, [
+  runTests(every, [
     [true, T, T],
     [false, T, F],
     [false, F, T],
@@ -61,22 +54,9 @@ describe('every', () => {
   ])
 })
 
-describe('not', () => {
-  testArgHandling(not)
-
-  it('returns the original predicate if negated twice', () => {
-    assert.equal(not(not(T)), T)
-  })
-
-  runTests(not, false, [
-    [true, F],
-    [false, T],
-  ])
-})
-
 describe('some', () => {
   testArgsHandling(some)
-  runTests(some, true, [
+  runTests(some, [
     [true, T, T],
     [true, T, F],
     [true, F, T],

@vates/predicates/package.json

@@ -26,7 +26,7 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "1.1.0",
+  "version": "1.0.0",
   "engines": {
     "node": ">=6"
   },

@vates/read-chunk/index.js

@@ -1,9 +1,7 @@
 'use strict'
 
 const readChunk = (stream, size) =>
-  stream.closed || stream.readableEnded
-    ? Promise.resolve(null)
-    : size === 0
+  size === 0
     ? Promise.resolve(Buffer.alloc(0))
     : new Promise((resolve, reject) => {
         function onEnd() {

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

@@ -1,7 +1,6 @@
 'use strict'
 
-const { describe, it } = require('test')
-const assert = require('node:assert').strict
+/* eslint-env jest */
 
 const { Readable } = require('stream')
 
@@ -12,42 +11,35 @@ makeStream.obj = Readable.from
 
 describe('readChunk', () => {
   it('returns null if stream is empty', async () => {
-    assert.strictEqual(await readChunk(makeStream([])), null)
-  })
-
-  it('returns null if the stream is already ended', async () => {
-    const stream = await makeStream([])
-    await readChunk(stream)
-
-    assert.strictEqual(await readChunk(stream), null)
+    expect(await readChunk(makeStream([]))).toBe(null)
   })
 
   describe('with binary stream', () => {
     it('returns the first chunk of data', async () => {
-      assert.deepEqual(await readChunk(makeStream(['foo', 'bar'])), Buffer.from('foo'))
+      expect(await readChunk(makeStream(['foo', 'bar']))).toEqual(Buffer.from('foo'))
     })
 
     it('returns a chunk of the specified size (smaller than first)', async () => {
-      assert.deepEqual(await readChunk(makeStream(['foo', 'bar']), 2), Buffer.from('fo'))
+      expect(await readChunk(makeStream(['foo', 'bar']), 2)).toEqual(Buffer.from('fo'))
     })
 
     it('returns a chunk of the specified size (larger than first)', async () => {
-      assert.deepEqual(await readChunk(makeStream(['foo', 'bar']), 4), Buffer.from('foob'))
+      expect(await readChunk(makeStream(['foo', 'bar']), 4)).toEqual(Buffer.from('foob'))
     })
 
     it('returns less data if stream ends', async () => {
-      assert.deepEqual(await readChunk(makeStream(['foo', 'bar']), 10), Buffer.from('foobar'))
+      expect(await readChunk(makeStream(['foo', 'bar']), 10)).toEqual(Buffer.from('foobar'))
     })
 
     it('returns an empty buffer if the specified size is 0', async () => {
-      assert.deepEqual(await readChunk(makeStream(['foo', 'bar']), 0), Buffer.alloc(0))
+      expect(await readChunk(makeStream(['foo', 'bar']), 0)).toEqual(Buffer.alloc(0))
     })
   })
 
   describe('with object stream', () => {
     it('returns the first chunk of data verbatim', async () => {
       const chunks = [{}, {}]
-      assert.strictEqual(await readChunk(makeStream.obj(chunks)), chunks[0])
+      expect(await readChunk(makeStream.obj(chunks))).toBe(chunks[0])
     })
   })
 })
@@ -63,15 +55,15 @@ const rejectionOf = promise =>
 describe('readChunkStrict', function () {
   it('throws if stream is empty', async () => {
     const error = await rejectionOf(readChunkStrict(makeStream([])))
-    assert(error instanceof Error)
-    assert.strictEqual(error.message, 'stream has ended without data')
-    assert.strictEqual(error.chunk, undefined)
+    expect(error).toBeInstanceOf(Error)
+    expect(error.message).toBe('stream has ended without data')
+    expect(error.chunk).toEqual(undefined)
   })
 
   it('throws if stream ends with not enough data', async () => {
     const error = await rejectionOf(readChunkStrict(makeStream(['foo', 'bar']), 10))
-    assert(error instanceof Error)
-    assert.strictEqual(error.message, 'stream has ended with not enough data')
-    assert.deepEqual(error.chunk, Buffer.from('foobar'))
+    expect(error).toBeInstanceOf(Error)
+    expect(error.message).toBe('stream has ended with not enough data')
+    expect(error.chunk).toEqual(Buffer.from('foobar'))
   })
 })

@vates/read-chunk/package.json

@@ -19,19 +19,15 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "1.0.1",
+  "version": "1.0.0",
   "engines": {
     "node": ">=8.10"
   },
   "scripts": {
-    "postversion": "npm publish --access public",
-    "test": "node--test"
+    "postversion": "npm publish --access public"
   },
   "author": {
     "name": "Vates SAS",
     "url": "https://vates.fr"
-  },
-  "devDependencies": {
-    "test": "^3.2.1"
   }
 }

@vates/toggle-scripts/index.js

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

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

@@ -1,8 +1,6 @@
 'use strict'
 
-const { describe, it } = require('test')
-const assert = require('assert').strict
-const sinon = require('sinon')
+/* eslint-env jest */
 
 const { asyncMapSettled } = require('./')
 
@@ -11,29 +9,26 @@ const noop = Function.prototype
 describe('asyncMapSettled', () => {
   it('works', async () => {
     const values = [Math.random(), Math.random()]
-    const spy = sinon.spy(async v => v * 2)
+    const spy = jest.fn(async v => v * 2)
     const iterable = new Set(values)
 
     // returns an array containing the result of each calls
-    assert.deepStrictEqual(
-      await asyncMapSettled(iterable, spy),
-      values.map(value => value * 2)
-    )
+    expect(await asyncMapSettled(iterable, spy)).toEqual(values.map(value => value * 2))
 
     for (let i = 0, n = values.length; i < n; ++i) {
       // each call receive the current item as sole argument
-      assert.deepStrictEqual(spy.args[i], [values[i]])
+      expect(spy.mock.calls[i]).toEqual([values[i]])
 
       // each call as this bind to the iterable
-      assert.deepStrictEqual(spy.thisValues[i], iterable)
+      expect(spy.mock.instances[i]).toBe(iterable)
     }
   })
 
   it('can use a specified thisArg', () => {
     const thisArg = {}
-    const spy = sinon.spy()
+    const spy = jest.fn()
     asyncMapSettled(['foo'], spy, thisArg)
-    assert.deepStrictEqual(spy.thisValues[0], thisArg)
+    expect(spy.mock.instances[0]).toBe(thisArg)
   })
 
   it('rejects only when all calls as resolved', async () => {
@@ -60,22 +55,19 @@ describe('asyncMapSettled', () => {
     // wait for all microtasks to settle
     await new Promise(resolve => setImmediate(resolve))
 
-    assert.strictEqual(hasSettled, false)
+    expect(hasSettled).toBe(false)
 
     defers[1].resolve()
 
     // wait for all microtasks to settle
     await new Promise(resolve => setImmediate(resolve))
 
-    assert.strictEqual(hasSettled, true)
-    await assert.rejects(promise, error)
+    expect(hasSettled).toBe(true)
+    await expect(promise).rejects.toBe(error)
   })
 
   it('issues when latest promise rejects', async () => {
     const error = new Error()
-    await assert.rejects(
-      asyncMapSettled([1], () => Promise.reject(error)),
-      error
-    )
+    await expect(asyncMapSettled([1], () => Promise.reject(error))).rejects.toBe(error)
   })
 })

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

@@ -31,11 +31,6 @@
     "lodash": "^4.17.4"
   },
   "scripts": {
-    "postversion": "npm publish",
-    "test": "node--test"
-  },
-  "devDependencies": {
-    "sinon": "^14.0.1",
-    "test": "^3.2.1"
+    "postversion": "npm publish"
   }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@xen-orchestra/backups/Backup.js

@@ -43,7 +43,6 @@ const DEFAULT_VM_SETTINGS = {
   offlineSnapshot: false,
   snapshotRetention: 0,
   timeout: 0,
-  useNbd: false,
   unconditionalSnapshot: false,
   vmTimeout: 0,
 }

@xen-orchestra/backups/RemoteAdapter.js

@@ -22,15 +22,11 @@ const zlib = require('zlib')
 
 const { BACKUP_DIR } = require('./_getVmBackupDir.js')
 const { cleanVm } = require('./_cleanVm.js')
-const { formatFilenameDate } = require('./_filenameDate.js')
 const { getTmpDir } = require('./_getTmpDir.js')
 const { isMetadataFile } = require('./_backupType.js')
 const { isValidXva } = require('./_isValidXva.js')
 const { listPartitions, LVM_PARTITION_TYPE } = require('./_listPartitions.js')
 const { lvs, pvs } = require('./_lvm.js')
-// @todo : this import is marked extraneous , sould be fixed when lib is published
-const { mount } = require('@vates/fuse-vhd')
-const { asyncEach } = require('@vates/async-each')
 
 const DIR_XO_CONFIG_BACKUPS = 'xo-config-backups'
 exports.DIR_XO_CONFIG_BACKUPS = DIR_XO_CONFIG_BACKUPS
@@ -38,7 +34,7 @@ exports.DIR_XO_CONFIG_BACKUPS = DIR_XO_CONFIG_BACKUPS
 const DIR_XO_POOL_METADATA_BACKUPS = 'xo-pool-metadata-backups'
 exports.DIR_XO_POOL_METADATA_BACKUPS = DIR_XO_POOL_METADATA_BACKUPS
 
-const { debug, warn } = createLogger('xo:backups:RemoteAdapter')
+const { warn } = createLogger('xo:backups:RemoteAdapter')
 
 const compareTimestamp = (a, b) => a.timestamp - b.timestamp
 
@@ -48,6 +44,8 @@ const resolveRelativeFromFile = (file, path) => resolve('/', dirname(file), path
 
 const resolveSubpath = (root, path) => resolve(root, `.${resolve('/', path)}`)
 
+const RE_VHDI = /^vhdi(\d+)$/
+
 async function addDirectory(files, realPath, metadataPath) {
   const stats = await lstat(realPath)
   if (stats.isDirectory()) {
@@ -76,16 +74,12 @@ const debounceResourceFactory = factory =>
   }
 
 class RemoteAdapter {
-  constructor(
-    handler,
-    { debounceResource = res => res, dirMode, vhdDirectoryCompression, useGetDiskLegacy = false } = {}
-  ) {
+  constructor(handler, { debounceResource = res => res, dirMode, vhdDirectoryCompression } = {}) {
     this._debounceResource = debounceResource
     this._dirMode = dirMode
     this._handler = handler
     this._vhdDirectoryCompression = vhdDirectoryCompression
     this._readCacheListVmBackups = synchronized.withKey()(this._readCacheListVmBackups)
-    this._useGetDiskLegacy = useGetDiskLegacy
   }
 
   get handler() {
@@ -133,9 +127,7 @@ class RemoteAdapter {
   }
 
   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']
+    const options = ['loop', 'ro']
 
     if (partition !== undefined) {
       const { size, start } = partition
@@ -232,30 +224,11 @@ class RemoteAdapter {
     return promise
   }
 
-  #removeVmBackupsFromCache(backups) {
-    for (const [dir, filenames] of Object.entries(
-      groupBy(
-        backups.map(_ => _._filename),
-        dirname
-      )
-    )) {
-      // detached async action, will not reject
-      this._updateCache(dir + '/cache.json.gz', backups => {
-        for (const filename of filenames) {
-          debug('removing cache entry', { entry: filename })
-          delete backups[filename]
-        }
-      })
-    }
-  }
-
   async deleteDeltaVmBackups(backups) {
     const handler = this._handler
 
     // this will delete the json, unused VHDs will be detected by `cleanVm`
     await asyncMapSettled(backups, ({ _filename }) => handler.unlink(_filename))
-
-    this.#removeVmBackupsFromCache(backups)
   }
 
   async deleteMetadataBackup(backupId) {
@@ -283,8 +256,6 @@ class RemoteAdapter {
     await asyncMapSettled(backups, ({ _filename, xva }) =>
       Promise.all([handler.unlink(_filename), handler.unlink(resolveRelativeFromFile(_filename, xva))])
     )
-
-    this.#removeVmBackupsFromCache(backups)
   }
 
   deleteVmBackup(file) {
@@ -305,13 +276,14 @@ class RemoteAdapter {
       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
-      // - don't error in case this fails:
-      //   - if lock is already being held, a backup is running and cleanVm will be ran at the end
-      //   - otherwise, there is nothing more we can do, orphan file will be cleaned in the future
-      this.cleanVm(dir, { remove: true, logWarn: warn }).catch(noop)
-    )
+    const dirs = new Set(files.map(file => dirname(file)))
+    for (const dir of dirs) {
+      // don't merge in main process, unused VHDs will be merged in the next backup run
+      await this.cleanVm(dir, { remove: true, logWarn: warn })
+    }
+
+    const dedupedVmUuid = new Set(metadatas.map(_ => _.vm.uuid))
+    await asyncMap(dedupedVmUuid, vmUuid => this.invalidateVmBackupListCache(vmUuid))
   }
 
   #getCompressionType() {
@@ -326,8 +298,7 @@ class RemoteAdapter {
     return this.#useVhdDirectory()
   }
 
-  async *#getDiskLegacy(diskId) {
-    const RE_VHDI = /^vhdi(\d+)$/
+  async *getDisk(diskId) {
     const handler = this._handler
 
     const diskPath = handler._getFilePath('/' + diskId)
@@ -357,20 +328,6 @@ class RemoteAdapter {
     }
   }
 
-  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
@@ -421,25 +378,22 @@ class RemoteAdapter {
   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
-            }
+      await asyncMap(await readdir(path), async name => {
+        try {
+          const stats = await lstat(`${path}/${name}`)
+          if (stats.isDirectory()) {
+            entriesMap[name + '/'] = {}
+          } else if (stats.isFile()) {
+            entriesMap[name] = {}
           }
-        },
-        { concurrency: 1 }
-      )
+        } catch (error) {
+          if (error == null || error.code !== 'ENOENT') {
+            throw error
+          }
+        }
+      })
 
       return entriesMap
     })
@@ -504,42 +458,11 @@ class RemoteAdapter {
     return backupsByPool
   }
 
-  #getVmBackupsCache(vmUuid) {
-    return `${BACKUP_DIR}/${vmUuid}/cache.json.gz`
-  }
-
-  async #readCache(path) {
-    try {
-      return JSON.parse(await fromCallback(zlib.gunzip, await this.handler.readFile(path)))
-    } catch (error) {
-      if (error.code !== 'ENOENT') {
-        warn('#readCache', { error, path })
-      }
-    }
-  }
-
-  _updateCache = synchronized.withKey()(this._updateCache)
-  // eslint-disable-next-line no-dupe-class-members
-  async _updateCache(path, fn) {
-    const cache = await this.#readCache(path)
-    if (cache !== undefined) {
-      fn(cache)
-
-      await this.#writeCache(path, cache)
-    }
-  }
-
-  async #writeCache(path, data) {
-    try {
-      await this.handler.writeFile(path, await fromCallback(zlib.gzip, JSON.stringify(data)), { flags: 'w' })
-    } catch (error) {
-      warn('#writeCache', { error, path })
-    }
+  async invalidateVmBackupListCache(vmUuid) {
+    await this.handler.unlink(`${BACKUP_DIR}/${vmUuid}/cache.json.gz`)
   }
 
   async #getCachabledDataListVmBackups(dir) {
-    debug('generating cache', { path: dir })
-
     const handler = this._handler
     const backups = {}
 
@@ -575,26 +498,41 @@ class RemoteAdapter {
   // if cache is missing  or broken  => regenerate it and return
 
   async _readCacheListVmBackups(vmUuid) {
-    const path = this.#getVmBackupsCache(vmUuid)
+    const dir = `${BACKUP_DIR}/${vmUuid}`
+    const path = `${dir}/cache.json.gz`
 
-    const cache = await this.#readCache(path)
-    if (cache !== undefined) {
-      debug('found VM backups cache, using it', { path })
-      return cache
+    try {
+      const gzipped = await this.handler.readFile(path)
+      const text = await fromCallback(zlib.gunzip, gzipped)
+      return JSON.parse(text)
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        warn('Cache file was unreadable', { vmUuid, error })
+      }
     }
 
     // nothing cached, or cache unreadable => regenerate it
-    const backups = await this.#getCachabledDataListVmBackups(`${BACKUP_DIR}/${vmUuid}`)
+    const backups = await this.#getCachabledDataListVmBackups(dir)
     if (backups === undefined) {
       return
     }
 
     // detached async action, will not reject
-    this.#writeCache(path, backups)
+    this.#writeVmBackupsCache(path, backups)
 
     return backups
   }
 
+  async #writeVmBackupsCache(cacheFile, backups) {
+    try {
+      const text = JSON.stringify(backups)
+      const zipped = await fromCallback(zlib.gzip, text)
+      await this.handler.writeFile(cacheFile, zipped, { flags: 'w' })
+    } catch (error) {
+      warn('writeVmBackupsCache', { cacheFile, error })
+    }
+  }
+
   async listVmBackups(vmUuid, predicate) {
     const backups = []
     const cached = await this._readCacheListVmBackups(vmUuid)
@@ -633,40 +571,18 @@ class RemoteAdapter {
     return backups.sort(compareTimestamp)
   }
 
-  async writeVmBackupMetadata(vmUuid, metadata) {
-    const path = `/${BACKUP_DIR}/${vmUuid}/${formatFilenameDate(metadata.timestamp)}.json`
-
-    await this.handler.outputFile(path, JSON.stringify(metadata), {
-      dirMode: this._dirMode,
-    })
-
-    // will not throw
-    this._updateCache(this.#getVmBackupsCache(vmUuid), backups => {
-      debug('adding cache entry', { entry: path })
-      backups[path] = {
-        ...metadata,
-
-        // these values are required in the cache
-        _filename: path,
-        id: path,
-      }
-    })
-
-    return path
-  }
-
-  async writeVhd(path, input, { checksum = true, validator = noop, writeBlockConcurrency, nbdClient } = {}) {
+  async writeVhd(path, input, { checksum = true, validator = noop } = {}) {
     const handler = this._handler
+
     if (this.#useVhdDirectory()) {
       const dataPath = `${dirname(path)}/data/${uuidv4()}.vhd`
       await createVhdDirectoryFromStream(handler, dataPath, input, {
-        concurrency: writeBlockConcurrency,
+        concurrency: 16,
         compression: this.#getCompressionType(),
         async validator() {
           await input.task
           return validator.apply(this, arguments)
         },
-        nbdClient,
       })
       await VhdAbstract.createAlias(handler, path, dataPath)
     } else {

@xen-orchestra/backups/_cleanVm.integ.spec.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const { beforeEach, afterEach, test, describe } = require('test')
-const assert = require('assert').strict
+/* eslint-env jest */
 
 const rimraf = require('rimraf')
 const tmp = require('tmp')
@@ -15,8 +14,9 @@ const { VhdFile, Constants, VhdDirectory, VhdAbstract } = require('vhd-lib')
 const { checkAliases } = require('./_cleanVm')
 const { dirname, basename } = require('path')
 
-let tempDir, adapter, handler, jobId, vdiId, basePath, relativePath
-const rootPath = 'xo-vm-backups/VMUUID/'
+let tempDir, adapter, handler, jobId, vdiId, basePath
+
+jest.setTimeout(60000)
 
 beforeEach(async () => {
   tempDir = await pFromCallback(cb => tmp.dir(cb))
@@ -25,8 +25,7 @@ beforeEach(async () => {
   adapter = new RemoteAdapter(handler)
   jobId = uniqueId()
   vdiId = uniqueId()
-  relativePath = `vdis/${jobId}/${vdiId}`
-  basePath = `${rootPath}/${relativePath}`
+  basePath = `vdis/${jobId}/${vdiId}`
   await fs.mkdirp(`${tempDir}/${basePath}`)
 })
 
@@ -77,18 +76,18 @@ test('It remove broken vhd', async () => {
   // todo also tests a directory and an alias
 
   await handler.writeFile(`${basePath}/notReallyAVhd.vhd`, 'I AM NOT A VHD')
-  assert.equal((await handler.list(basePath)).length, 1)
+  expect((await handler.list(basePath)).length).toEqual(1)
   let loggued = ''
   const logInfo = message => {
     loggued += message
   }
-  await adapter.cleanVm(rootPath, { remove: false, logInfo, logWarn: logInfo, lock: false })
-  assert.equal(loggued, `VHD check error`)
+  await adapter.cleanVm('/', { remove: false, logInfo, logWarn: logInfo, lock: false })
+  expect(loggued).toEqual(`VHD check error`)
   // not removed
-  assert.deepEqual(await handler.list(basePath), ['notReallyAVhd.vhd'])
+  expect((await handler.list(basePath)).length).toEqual(1)
   // really remove it
-  await adapter.cleanVm(rootPath, { remove: true, logInfo, logWarn: () => {}, lock: false })
-  assert.deepEqual(await handler.list(basePath), [])
+  await adapter.cleanVm('/', { remove: true, logInfo, logWarn: () => {}, lock: false })
+  expect((await handler.list(basePath)).length).toEqual(0)
 })
 
 test('it remove vhd with missing or multiple ancestors', async () => {
@@ -122,10 +121,10 @@ test('it remove vhd with missing or multiple ancestors', async () => {
   const logInfo = message => {
     loggued += message + '\n'
   }
-  await adapter.cleanVm(rootPath, { remove: true, logInfo, logWarn: logInfo, lock: false })
+  await adapter.cleanVm('/', { remove: true, logInfo, logWarn: logInfo, lock: false })
 
   const deletedOrphanVhd = loggued.match(/deleting orphan VHD/g) || []
-  assert.equal(deletedOrphanVhd.length, 1) // only one vhd should have been deleted
+  expect(deletedOrphanVhd.length).toEqual(1) // only one vhd should have been deleted
 
   // we don't test the filew on disk, since they will all be marker as unused and deleted without a metadata.json file
 })
@@ -133,12 +132,12 @@ test('it remove vhd with missing or multiple ancestors', async () => {
 test('it remove backup meta data referencing a missing vhd in delta backup', async () => {
   // create a metadata file marking child and orphan as ok
   await handler.writeFile(
-    `${rootPath}/metadata.json`,
+    `metadata.json`,
     JSON.stringify({
       mode: 'delta',
       vhds: [
-        `${relativePath}/orphan.vhd`,
-        `${relativePath}/child.vhd`,
+        `${basePath}/orphan.vhd`,
+        `${basePath}/child.vhd`,
         // abandonned.json is not here
       ],
     })
@@ -161,39 +160,39 @@ test('it remove backup meta data referencing a missing vhd in delta backup', asy
   const logInfo = message => {
     loggued += message + '\n'
   }
-  await adapter.cleanVm(rootPath, { remove: true, logInfo, logWarn: logInfo, lock: false })
+  await adapter.cleanVm('/', { remove: true, logInfo, logWarn: logInfo, lock: false })
   let matched = loggued.match(/deleting unused VHD/g) || []
-  assert.equal(matched.length, 1) // only one vhd should have been deleted
+  expect(matched.length).toEqual(1) // only one vhd should have been deleted
 
   // a missing vhd cause clean to remove all vhds
   await handler.writeFile(
-    `${rootPath}/metadata.json`,
+    `metadata.json`,
     JSON.stringify({
       mode: 'delta',
       vhds: [
-        `deleted.vhd`, // in metadata but not in vhds
-        `orphan.vhd`,
-        `child.vhd`,
+        `${basePath}/deleted.vhd`, // in metadata but not in vhds
+        `${basePath}/orphan.vhd`,
+        `${basePath}/child.vhd`,
         // abandonned.vhd is not here anymore
       ],
     }),
     { flags: 'w' }
   )
   loggued = ''
-  await adapter.cleanVm(rootPath, { remove: true, logInfo, logWarn: () => {}, lock: false })
+  await adapter.cleanVm('/', { remove: true, logInfo, logWarn: () => {}, lock: false })
   matched = loggued.match(/deleting unused VHD/g) || []
-  assert.equal(matched.length, 2) // all vhds (orphan and  child  ) should have been deleted
+  expect(matched.length).toEqual(2) // all vhds (orphan and  child  ) should have been deleted
 })
 
 test('it merges delta of non destroyed chain', async () => {
   await handler.writeFile(
-    `${rootPath}/metadata.json`,
+    `metadata.json`,
     JSON.stringify({
       mode: 'delta',
       size: 12000, // a size too small
       vhds: [
-        `${relativePath}/grandchild.vhd`, // grand child should not be merged
-        `${relativePath}/child.vhd`,
+        `${basePath}/grandchild.vhd`, // grand child should not be merged
+        `${basePath}/child.vhd`,
         // orphan is not here, he should be merged in child
       ],
     })
@@ -220,33 +219,33 @@ test('it merges delta of non destroyed chain', async () => {
   const logInfo = message => {
     loggued.push(message)
   }
-  await adapter.cleanVm(rootPath, { remove: true, logInfo, logWarn: logInfo, lock: false })
-  assert.equal(loggued[0], `incorrect backup size in metadata`)
+  await adapter.cleanVm('/', { remove: true, logInfo, logWarn: logInfo, lock: false })
+  expect(loggued[0]).toEqual(`incorrect backup size in metadata`)
 
   loggued = []
-  await adapter.cleanVm(rootPath, { remove: true, merge: true, logInfo, logWarn: () => {}, lock: false })
+  await adapter.cleanVm('/', { remove: true, merge: true, logInfo, logWarn: () => {}, lock: false })
   const [merging] = loggued
-  assert.equal(merging, `merging VHD chain`)
+  expect(merging).toEqual(`merging VHD chain`)
 
-  const metadata = JSON.parse(await handler.readFile(`${rootPath}/metadata.json`))
+  const metadata = JSON.parse(await handler.readFile(`metadata.json`))
   // size should be the size of children + grand children after the merge
-  assert.equal(metadata.size, 209920)
+  expect(metadata.size).toEqual(209920)
 
   // merging is already tested in vhd-lib, don't retest it here (and theses vhd are as empty as my stomach at 12h12)
   // only check deletion
   const remainingVhds = await handler.list(basePath)
-  assert.equal(remainingVhds.length, 2)
-  assert.equal(remainingVhds.includes('child.vhd'), true)
-  assert.equal(remainingVhds.includes('grandchild.vhd'), true)
+  expect(remainingVhds.length).toEqual(2)
+  expect(remainingVhds.includes('child.vhd')).toEqual(true)
+  expect(remainingVhds.includes('grandchild.vhd')).toEqual(true)
 })
 
 test('it finish unterminated merge ', async () => {
   await handler.writeFile(
-    `${rootPath}/metadata.json`,
+    `metadata.json`,
     JSON.stringify({
       mode: 'delta',
       size: 209920,
-      vhds: [`${relativePath}/orphan.vhd`, `${relativePath}/child.vhd`],
+      vhds: [`${basePath}/orphan.vhd`, `${basePath}/child.vhd`],
     })
   )
 
@@ -272,13 +271,13 @@ test('it finish unterminated merge ', async () => {
     })
   )
 
-  await adapter.cleanVm(rootPath, { remove: true, merge: true, logWarn: () => {}, lock: false })
+  await adapter.cleanVm('/', { remove: true, merge: true, logWarn: () => {}, lock: false })
   // merging is already tested in vhd-lib, don't retest it here (and theses vhd are as empty as my stomach at 12h12)
 
   // only check deletion
   const remainingVhds = await handler.list(basePath)
-  assert.equal(remainingVhds.length, 1)
-  assert.equal(remainingVhds.includes('child.vhd'), true)
+  expect(remainingVhds.length).toEqual(1)
+  expect(remainingVhds.includes('child.vhd')).toEqual(true)
 })
 
 // each of the vhd can be a file, a directory, an alias to a file or an alias to a directory
@@ -368,22 +367,22 @@ describe('tests multiple combination ', () => {
 
         // the metadata file
         await handler.writeFile(
-          `${rootPath}/metadata.json`,
+          `metadata.json`,
           JSON.stringify({
             mode: 'delta',
             vhds: [
-              `${relativePath}/grandchild.vhd` + (useAlias ? '.alias.vhd' : ''), // grand child should not be merged
-              `${relativePath}/child.vhd` + (useAlias ? '.alias.vhd' : ''),
-              `${relativePath}/clean.vhd` + (useAlias ? '.alias.vhd' : ''),
+              `${basePath}/grandchild.vhd` + (useAlias ? '.alias.vhd' : ''), // grand child should not be merged
+              `${basePath}/child.vhd` + (useAlias ? '.alias.vhd' : ''),
+              `${basePath}/clean.vhd` + (useAlias ? '.alias.vhd' : ''),
             ],
           })
         )
 
-        await adapter.cleanVm(rootPath, { remove: true, merge: true, logWarn: () => {}, lock: false })
+        await adapter.cleanVm('/', { remove: true, merge: true, logWarn: () => {}, lock: false })
 
-        const metadata = JSON.parse(await handler.readFile(`${rootPath}/metadata.json`))
+        const metadata = JSON.parse(await handler.readFile(`metadata.json`))
         // size should be the size of children + grand children + clean after the merge
-        assert.deepEqual(metadata.size, vhdMode === 'file' ? 314880 : undefined)
+        expect(metadata.size).toEqual(vhdMode === 'file' ? 314880 : undefined)
 
         // broken vhd, non referenced, abandonned should be deleted ( alias and data)
         // ancestor and child should be merged
@@ -393,19 +392,19 @@ describe('tests multiple combination ', () => {
         if (useAlias) {
           const dataSurvivors = await handler.list(basePath + '/data')
           // the goal of the alias : do not move a full folder
-          assert.equal(dataSurvivors.includes('ancestor.vhd'), true)
-          assert.equal(dataSurvivors.includes('grandchild.vhd'), true)
-          assert.equal(dataSurvivors.includes('cleanAncestor.vhd'), true)
-          assert.equal(survivors.includes('clean.vhd.alias.vhd'), true)
-          assert.equal(survivors.includes('child.vhd.alias.vhd'), true)
-          assert.equal(survivors.includes('grandchild.vhd.alias.vhd'), true)
-          assert.equal(survivors.length, 4) // the 3 ok + data
-          assert.equal(dataSurvivors.length, 3)
+          expect(dataSurvivors).toContain('ancestor.vhd')
+          expect(dataSurvivors).toContain('grandchild.vhd')
+          expect(dataSurvivors).toContain('cleanAncestor.vhd')
+          expect(survivors).toContain('clean.vhd.alias.vhd')
+          expect(survivors).toContain('child.vhd.alias.vhd')
+          expect(survivors).toContain('grandchild.vhd.alias.vhd')
+          expect(survivors.length).toEqual(4) // the 3 ok + data
+          expect(dataSurvivors.length).toEqual(3) // the 3 ok + data
         } else {
-          assert.equal(survivors.includes('clean.vhd'), true)
-          assert.equal(survivors.includes('child.vhd'), true)
-          assert.equal(survivors.includes('grandchild.vhd'), true)
-          assert.equal(survivors.length, 3)
+          expect(survivors).toContain('clean.vhd')
+          expect(survivors).toContain('child.vhd')
+          expect(survivors).toContain('grandchild.vhd')
+          expect(survivors.length).toEqual(3)
         }
       })
     }
@@ -415,9 +414,9 @@ describe('tests multiple combination ', () => {
 test('it cleans orphan merge states ', async () => {
   await handler.writeFile(`${basePath}/.orphan.vhd.merge.json`, '')
 
-  await adapter.cleanVm(rootPath, { remove: true, logWarn: () => {}, lock: false })
+  await adapter.cleanVm('/', { remove: true, logWarn: () => {}, lock: false })
 
-  assert.deepEqual(await handler.list(basePath), [])
+  expect(await handler.list(basePath)).toEqual([])
 })
 
 test('check Aliases should work alone', async () => {
@@ -438,8 +437,8 @@ test('check Aliases should work alone', async () => {
 
   // only ok have suvived
   const alias = (await handler.list('vhds')).filter(f => f.endsWith('.vhd'))
-  assert.equal(alias.length, 1)
+  expect(alias.length).toEqual(1)
 
   const data = await handler.list('vhds/data')
-  assert.equal(data.length, 1)
+  expect(data.length).toEqual(1)
 })

@xen-orchestra/backups/_cleanVm.js

@@ -37,7 +37,7 @@ const computeVhdsSize = (handler, vhdPaths) =>
   )
 
 // chain is [ ancestor, child_1, ..., child_n ]
-async function _mergeVhdChain(handler, chain, { logInfo, remove, merge, mergeBlockConcurrency }) {
+async function _mergeVhdChain(handler, chain, { logInfo, remove, merge }) {
   if (merge) {
     logInfo(`merging VHD chain`, { chain })
 
@@ -55,7 +55,6 @@ async function _mergeVhdChain(handler, chain, { logInfo, remove, merge, mergeBlo
     try {
       return await mergeVhdChain(handler, chain, {
         logInfo,
-        mergeBlockConcurrency,
         onProgress({ done: d, total: t }) {
           done = d
           total = t
@@ -182,15 +181,7 @@ const defaultMergeLimiter = limitConcurrency(1)
 
 exports.cleanVm = async function cleanVm(
   vmDir,
-  {
-    fixMetadata,
-    remove,
-    merge,
-    mergeBlockConcurrency,
-    mergeLimiter = defaultMergeLimiter,
-    logInfo = noop,
-    logWarn = console.warn,
-  }
+  { fixMetadata, remove, merge, mergeLimiter = defaultMergeLimiter, logInfo = noop, logWarn = console.warn }
 ) {
   const limitedMergeVhdChain = mergeLimiter(_mergeVhdChain)
 
@@ -311,7 +302,6 @@ exports.cleanVm = async function cleanVm(
   }
 
   const jsons = new Set()
-  let mustInvalidateCache = false
   const xvas = new Set()
   const xvaSums = []
   const entries = await handler.list(vmDir, {
@@ -360,7 +350,6 @@ exports.cleanVm = async function cleanVm(
         if (remove) {
           logInfo('deleting incomplete backup', { path: json })
           jsons.delete(json)
-          mustInvalidateCache = true
           await handler.unlink(json)
         }
       }
@@ -383,7 +372,6 @@ exports.cleanVm = async function cleanVm(
         logWarn('some VHDs linked to the backup are missing', { backup: json, missingVhds })
         if (remove) {
           logInfo('deleting incomplete backup', { path: json })
-          mustInvalidateCache = true
           jsons.delete(json)
           await handler.unlink(json)
         }
@@ -456,13 +444,7 @@ exports.cleanVm = async function cleanVm(
   const metadataWithMergedVhd = {}
   const doMerge = async () => {
     await asyncMap(toMerge, async chain => {
-      const merged = await limitedMergeVhdChain(handler, chain, {
-        logInfo,
-        logWarn,
-        remove,
-        merge,
-        mergeBlockConcurrency,
-      })
+      const merged = await limitedMergeVhdChain(handler, chain, { logInfo, logWarn, remove, merge })
       if (merged !== undefined) {
         const metadataPath = vhdsToJSons[chain[chain.length - 1]] // all the chain should have the same metada file
         metadataWithMergedVhd[metadataPath] = true
@@ -546,11 +528,6 @@ exports.cleanVm = async function cleanVm(
     }
   })
 
-  // purge cache if a metadata file has been deleted
-  if (mustInvalidateCache) {
-    await handler.unlink(vmDir + '/cache.json.gz')
-  }
-
   return {
     // boolean whether some VHDs were merged (or should be merged)
     merge: toMerge.length !== 0,

@xen-orchestra/backups/_deltaVm.js

@@ -1,12 +1,12 @@
 'use strict'
 
+const compareVersions = require('compare-versions')
 const find = require('lodash/find.js')
 const groupBy = require('lodash/groupBy.js')
 const ignoreErrors = require('promise-toolbox/ignoreErrors')
 const omit = require('lodash/omit.js')
 const { asyncMap } = require('@xen-orchestra/async-map')
 const { CancelToken } = require('promise-toolbox')
-const { compareVersions } = require('compare-versions')
 const { createVhdStreamWithLength } = require('vhd-lib')
 const { defer } = require('golike-defer')
 

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

@@ -21,7 +21,7 @@
 └─ xo-vm-backups
   ├─ index.json // TODO
   └─ <VM UUID>
-     ├─ cache.json.gz
+     ├─ index.json // TODO
      ├─ vdis
      │  └─ <job UUID>
      │     └─ <VDI UUID>
@@ -45,18 +45,6 @@ When `useVhdDirectory` is enabled on the remote, the directory containing the VH
     └─ <uuid>.vhd
 ```
 
-## Cache for a VM
-
-In a VM directory, if the file `cache.json.gz` exists, it contains the metadata for all the backups for this VM.
-
-Add the following file: `xo-vm-backups/<VM UUID>/cache.json.gz`.
-
-This cache is compressed in Gzip and contains an JSON object with the metadata for all the backups of this VM indexed by their absolute path (i.e. `/xo-vm-backups/<VM UUID>/<timestamp>.json`).
-
-This file is generated on demande when listing the backups, and directly updated on backup creation/deletion.
-
-In case any incoherence is detected, the file is deleted so it will be fully generated when required.
-
 ## Attributes
 
 ### Of created snapshots

@xen-orchestra/backups/package.json

@@ -8,28 +8,24 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.29.0",
+  "version": "0.27.4",
   "engines": {
     "node": ">=14.6"
   },
   "scripts": {
-    "postversion": "npm publish --access public",
-    "test": "node--test"
+    "postversion": "npm publish --access public"
   },
   "dependencies": {
-    "@vates/async-each": "^1.0.0",
     "@vates/cached-dns.lookup": "^1.0.0",
     "@vates/compose": "^2.1.0",
     "@vates/decorate-with": "^2.0.0",
-    "@vates/disposable": "^0.1.2",
-    "@vates/fuse-vhd": "^1.0.0",
-    "@vates/nbd-client": "*",
+    "@vates/disposable": "^0.1.1",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/fs": "^3.2.0",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/fs": "^3.0.0",
+    "@xen-orchestra/log": "^0.3.0",
     "@xen-orchestra/template": "^0.1.0",
-    "compare-versions": "^5.0.1",
+    "compare-versions": "^4.0.1",
     "d3-time-format": "^3.0.0",
     "decorator-synchronized": "^0.6.0",
     "end-of-stream": "^1.4.4",
@@ -41,18 +37,16 @@
     "parse-pairs": "^1.1.0",
     "promise-toolbox": "^0.21.0",
     "proper-lockfile": "^4.1.2",
-    "uuid": "^9.0.0",
-    "vhd-lib": "^4.1.1",
+    "uuid": "^8.3.2",
+    "vhd-lib": "^4.0.0",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
-    "sinon": "^14.0.1",
-    "test": "^3.2.1",
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^1.5.2"
+    "@xen-orchestra/xapi": "^1.4.2"
   },
   "license": "AGPL-3.0-or-later",
   "author": {

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

@@ -19,9 +19,10 @@ const { AbstractDeltaWriter } = require('./_AbstractDeltaWriter.js')
 const { checkVhd } = require('./_checkVhd.js')
 const { packUuid } = require('./_packUuid.js')
 const { Disposable } = require('promise-toolbox')
-const NbdClient = require('@vates/nbd-client')
+const { HealthCheckVmBackup } = require('../HealthCheckVmBackup.js')
+const { ImportVmBackup } = require('../ImportVmBackup.js')
 
-const { debug, warn } = createLogger('xo:backups:DeltaBackupWriter')
+const { warn } = createLogger('xo:backups:DeltaBackupWriter')
 
 exports.DeltaBackupWriter = class DeltaBackupWriter extends MixinBackupWriter(AbstractDeltaWriter) {
   async checkBaseVdis(baseUuidToSrcVdi) {
@@ -37,7 +38,6 @@ exports.DeltaBackupWriter = class DeltaBackupWriter extends MixinBackupWriter(Ab
       try {
         const vhds = await handler.list(`${vdisDir}/${srcVdi.uuid}`, {
           filter: _ => _[0] !== '.' && _.endsWith('.vhd'),
-          ignoreMissing: true,
           prependDir: true,
         })
         const packedBaseUuid = packUuid(baseUuid)
@@ -71,6 +71,35 @@ exports.DeltaBackupWriter = class DeltaBackupWriter extends MixinBackupWriter(Ab
     return this._cleanVm({ merge: true })
   }
 
+  healthCheck(sr) {
+    return Task.run(
+      {
+        name: 'health check',
+      },
+      async () => {
+        const xapi = sr.$xapi
+        const srUuid = sr.uuid
+        const adapter = this._adapter
+        const metadata = await adapter.readVmBackupMetadata(this._metadataFileName)
+        const { id: restoredId } = await new ImportVmBackup({
+          adapter,
+          metadata,
+          srUuid,
+          xapi,
+        }).run()
+        const restoredVm = xapi.getObject(restoredId)
+        try {
+          await new HealthCheckVmBackup({
+            restoredVm,
+            xapi,
+          }).run()
+        } finally {
+          await xapi.VM_destroy(restoredVm.$ref)
+        }
+      }
+    )
+  }
+
   prepare({ isFull }) {
     // create the task related to this export and ensure all methods are called in this context
     const task = new Task({
@@ -160,6 +189,7 @@ exports.DeltaBackupWriter = class DeltaBackupWriter extends MixinBackupWriter(Ab
         }/${adapter.getVhdFileName(basename)}`
     )
 
+    const metadataFilename = (this._metadataFileName = `${backupDir}/${basename}.json`)
     const metadataContent = {
       jobId,
       mode: job.mode,
@@ -200,30 +230,11 @@ exports.DeltaBackupWriter = class DeltaBackupWriter extends MixinBackupWriter(Ab
             await checkVhd(handler, parentPath)
           }
 
-          const vdiRef = vm.$xapi.getObject(vdi.uuid).$ref
-
-          let nbdClient
-          if (!this._backup.config.useNbd) {
-            // get nbd if possible
-            try {
-              // this will always take the first host in the list
-              const [nbdInfo] = await vm.$xapi.call('VDI.get_nbd_info', vdiRef)
-              nbdClient = new NbdClient(nbdInfo)
-              await nbdClient.connect()
-              debug(`got nbd connection `, { vdi: vdi.uuid })
-            } catch (error) {
-              nbdClient = undefined
-              debug(`can't connect to nbd server or no server available`, { error })
-            }
-          }
-
           await adapter.writeVhd(path, deltaExport.streams[`${id}.vhd`], {
             // no checksum for VHDs, because they will be invalidated by
             // merges and chainings
             checksum: false,
             validator: tmpPath => checkVhd(handler, tmpPath),
-            writeBlockConcurrency: this._backup.config.writeBlockConcurrency,
-            nbdClient,
           })
 
           if (isDelta) {
@@ -243,7 +254,9 @@ exports.DeltaBackupWriter = class DeltaBackupWriter extends MixinBackupWriter(Ab
       }
     })
     metadataContent.size = size
-    this._metadataFileName = await adapter.writeVmBackupMetadata(vm.uuid, metadataContent)
+    await handler.outputFile(metadataFilename, JSON.stringify(metadataContent), {
+      dirMode: backup.config.dirMode,
+    })
 
     // TODO: run cleanup?
   }

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

@@ -34,6 +34,7 @@ exports.FullBackupWriter = class FullBackupWriter extends MixinBackupWriter(Abst
     const { job, scheduleId, vm } = backup
 
     const adapter = this._adapter
+    const handler = adapter.handler
     const backupDir = getVmBackupDir(vm.uuid)
 
     // TODO: clean VM backup directory
@@ -49,6 +50,7 @@ exports.FullBackupWriter = class FullBackupWriter extends MixinBackupWriter(Abst
     const dataBasename = basename + '.xva'
     const dataFilename = backupDir + '/' + dataBasename
 
+    const metadataFilename = `${backupDir}/${basename}.json`
     const metadata = {
       jobId: job.id,
       mode: job.mode,
@@ -72,7 +74,9 @@ exports.FullBackupWriter = class FullBackupWriter extends MixinBackupWriter(Abst
       return { size: sizeContainer.size }
     })
     metadata.size = sizeContainer.size
-    this._metadataFileName = await adapter.writeVmBackupMetadata(vm.uuid, metadata)
+    await handler.outputFile(metadataFilename, JSON.stringify(metadata), {
+      dirMode: backup.config.dirMode,
+    })
 
     if (!deleteFirst) {
       await deleteOldBackups()

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

@@ -3,13 +3,10 @@
 const { createLogger } = require('@xen-orchestra/log')
 const { join } = require('path')
 
-const assert = require('assert')
-const { formatFilenameDate } = require('../_filenameDate.js')
 const { getVmBackupDir } = require('../_getVmBackupDir.js')
-const { HealthCheckVmBackup } = require('../HealthCheckVmBackup.js')
-const { ImportVmBackup } = require('../ImportVmBackup.js')
-const { Task } = require('../Task.js')
 const MergeWorker = require('../merge-worker/index.js')
+const { formatFilenameDate } = require('../_filenameDate.js')
+const { Task } = require('../Task.js')
 
 const { info, warn } = createLogger('xo:backups:MixinBackupWriter')
 
@@ -39,7 +36,6 @@ exports.MixinBackupWriter = (BaseClass = Object) =>
               Task.warning(message, data)
             },
             lock: false,
-            mergeBlockConcurrency: this._backup.config.mergeBlockConcurrency,
           })
         })
       } catch (error) {
@@ -75,39 +71,6 @@ exports.MixinBackupWriter = (BaseClass = Object) =>
         const remotePath = handler._getRealPath()
         await MergeWorker.run(remotePath)
       }
-    }
-
-    healthCheck(sr) {
-      assert.notStrictEqual(
-        this._metadataFileName,
-        undefined,
-        'Metadata file name should be defined before making a healthcheck'
-      )
-      return Task.run(
-        {
-          name: 'health check',
-        },
-        async () => {
-          const xapi = sr.$xapi
-          const srUuid = sr.uuid
-          const adapter = this._adapter
-          const metadata = await adapter.readVmBackupMetadata(this._metadataFileName)
-          const { id: restoredId } = await new ImportVmBackup({
-            adapter,
-            metadata,
-            srUuid,
-            xapi,
-          }).run()
-          const restoredVm = xapi.getObject(restoredId)
-          try {
-            await new HealthCheckVmBackup({
-              restoredVm,
-              xapi,
-            }).run()
-          } finally {
-            await xapi.VM_destroy(restoredVm.$ref)
-          }
-        }
-      )
+      await this._adapter.invalidateVmBackupListCache(this._backup.vm.uuid)
     }
   }

@xen-orchestra/cron/index.spec.js

@@ -1,20 +1,24 @@
-'use strict'
+/* eslint-env jest */
 
-const test = require('test')
-const assert = require('assert').strict
-const sinon = require('sinon')
+'use strict'
 
 const { createSchedule } = require('./')
 
-const clock = sinon.useFakeTimers()
+jest.useFakeTimers()
 
 const wrap = value => () => value
 
-test('issues', async t => {
+describe('issues', () => {
   let originalDateNow
-  originalDateNow = Date.now
+  beforeAll(() => {
+    originalDateNow = Date.now
+  })
+  afterAll(() => {
+    Date.now = originalDateNow
+    originalDateNow = undefined
+  })
 
-  await t.test('stop during async execution', async () => {
+  test('stop during async execution', async () => {
     let nCalls = 0
     let resolve, promise
 
@@ -31,20 +35,20 @@ test('issues', async t => {
 
     job.start()
     Date.now = wrap(+schedule.next(1)[0])
-    clock.runAll()
+    jest.runAllTimers()
 
-    assert.strictEqual(nCalls, 1)
+    expect(nCalls).toBe(1)
 
     job.stop()
 
     resolve()
     await promise
 
-    clock.runAll()
-    assert.strictEqual(nCalls, 1)
+    jest.runAllTimers()
+    expect(nCalls).toBe(1)
   })
 
-  await t.test('stop then start during async job execution', async () => {
+  test('stop then start during async job execution', async () => {
     let nCalls = 0
     let resolve, promise
 
@@ -61,9 +65,9 @@ test('issues', async t => {
 
     job.start()
     Date.now = wrap(+schedule.next(1)[0])
-    clock.runAll()
+    jest.runAllTimers()
 
-    assert.strictEqual(nCalls, 1)
+    expect(nCalls).toBe(1)
 
     job.stop()
     job.start()
@@ -72,10 +76,7 @@ test('issues', async t => {
     await promise
 
     Date.now = wrap(+schedule.next(1)[0])
-    clock.runAll()
-    assert.strictEqual(nCalls, 2)
+    jest.runAllTimers()
+    expect(nCalls).toBe(2)
   })
-
-  Date.now = originalDateNow
-  originalDateNow = undefined
 })

@xen-orchestra/cron/next.spec.js

@@ -1,7 +1,6 @@
-'use strict'
+/* eslint-env jest */
 
-const { describe, it } = require('test')
-const assert = require('assert').strict
+'use strict'
 
 const mapValues = require('lodash/mapValues')
 const moment = require('moment-timezone')
@@ -26,24 +25,24 @@ describe('next()', () => {
     },
     ([pattern, result], title) =>
       it(title, () => {
-        assert.strictEqual(N(pattern), result)
+        expect(N(pattern)).toBe(result)
       })
   )
 
   it('select first between month-day and week-day', () => {
-    assert.strictEqual(N('* * 10 * wen'), '2018-04-10T00:00')
-    assert.strictEqual(N('* * 12 * wen'), '2018-04-11T00:00')
+    expect(N('* * 10 * wen')).toBe('2018-04-10T00:00')
+    expect(N('* * 12 * wen')).toBe('2018-04-11T00:00')
   })
 
   it('select the last available day of a month', () => {
-    assert.strictEqual(N('* * 29 feb *'), '2020-02-29T00:00')
+    expect(N('* * 29 feb *')).toBe('2020-02-29T00:00')
   })
 
   it('fails when no solutions has been found', () => {
-    assert.throws(() => N('0 0 30 feb *'), { message: 'no solutions found for this schedule' })
+    expect(() => N('0 0 30 feb *')).toThrow('no solutions found for this schedule')
   })
 
   it('select the first sunday of the month', () => {
-    assert.strictEqual(N('* * * * 0', '2018-03-31T00:00'), '2018-04-01T00:00')
+    expect(N('* * * * 0', '2018-03-31T00:00')).toBe('2018-04-01T00:00')
   })
 })

@xen-orchestra/cron/package.json

@@ -38,11 +38,6 @@
     "moment-timezone": "^0.5.14"
   },
   "scripts": {
-    "postversion": "npm publish",
-    "test": "node--test"
-  },
-  "devDependencies": {
-    "sinon": "^14.0.1",
-    "test": "^3.2.1"
+    "postversion": "npm publish"
   }
 }

@xen-orchestra/cron/parse.spec.js

@@ -0,0 +1,49 @@
+/* eslint-env jest */
+
+'use strict'
+
+const parse = require('./parse')
+
+describe('parse()', () => {
+  it('works', () => {
+    expect(parse('0 0-10 */10 jan,2,4-11/3 *')).toEqual({
+      minute: [0],
+      hour: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+      dayOfMonth: [1, 11, 21, 31],
+      month: [0, 2, 4, 7, 10],
+    })
+  })
+
+  it('correctly parse months', () => {
+    expect(parse('* * * 0,11 *')).toEqual({
+      month: [0, 11],
+    })
+    expect(parse('* * * jan,dec *')).toEqual({
+      month: [0, 11],
+    })
+  })
+
+  it('correctly parse days', () => {
+    expect(parse('* * * * mon,sun')).toEqual({
+      dayOfWeek: [0, 1],
+    })
+  })
+
+  it('reports missing integer', () => {
+    expect(() => parse('*/a')).toThrow('minute: missing integer at character 2')
+    expect(() => parse('*')).toThrow('hour: missing integer at character 1')
+  })
+
+  it('reports invalid aliases', () => {
+    expect(() => parse('* * * jan-foo *')).toThrow('month: missing alias or integer at character 10')
+  })
+
+  it('dayOfWeek: 0 and 7 bind to sunday', () => {
+    expect(parse('* * * * 0')).toEqual({
+      dayOfWeek: [0],
+    })
+    expect(parse('* * * * 7')).toEqual({
+      dayOfWeek: [0],
+    })
+  })
+})

@xen-orchestra/cron/parse.test.js

@@ -1,50 +0,0 @@
-'use strict'
-
-const { describe, it } = require('test')
-const assert = require('assert').strict
-
-const parse = require('./parse')
-
-describe('parse()', () => {
-  it('works', () => {
-    assert.deepStrictEqual(parse('0 0-10 */10 jan,2,4-11/3 *'), {
-      minute: [0],
-      hour: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-      dayOfMonth: [1, 11, 21, 31],
-      month: [0, 2, 4, 7, 10],
-    })
-  })
-
-  it('correctly parse months', () => {
-    assert.deepStrictEqual(parse('* * * 0,11 *'), {
-      month: [0, 11],
-    })
-    assert.deepStrictEqual(parse('* * * jan,dec *'), {
-      month: [0, 11],
-    })
-  })
-
-  it('correctly parse days', () => {
-    assert.deepStrictEqual(parse('* * * * mon,sun'), {
-      dayOfWeek: [0, 1],
-    })
-  })
-
-  it('reports missing integer', () => {
-    assert.throws(() => parse('*/a'), { message: 'minute: missing integer at character 2' })
-    assert.throws(() => parse('*'), { message: 'hour: missing integer at character 1' })
-  })
-
-  it('reports invalid aliases', () => {
-    assert.throws(() => parse('* * * jan-foo *'), { message: 'month: missing alias or integer at character 10' })
-  })
-
-  it('dayOfWeek: 0 and 7 bind to sunday', () => {
-    assert.deepStrictEqual(parse('* * * * 0'), {
-      dayOfWeek: [0],
-    })
-    assert.deepStrictEqual(parse('* * * * 7'), {
-      dayOfWeek: [0],
-    })
-  })
-})

@xen-orchestra/fs/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@xen-orchestra/fs",
-  "version": "3.2.0",
+  "version": "3.0.0",
   "license": "AGPL-3.0-or-later",
   "description": "The File System for Xen Orchestra backups.",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/fs",
@@ -28,9 +28,9 @@
     "@vates/async-each": "^1.0.0",
     "@vates/coalesce-calls": "^0.1.0",
     "@vates/decorate-with": "^2.0.0",
-    "@vates/read-chunk": "^1.0.1",
+    "@vates/read-chunk": "^1.0.0",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/log": "^0.4.0",
+    "@xen-orchestra/log": "^0.3.0",
     "bind-property-descriptor": "^2.0.0",
     "decorator-synchronized": "^0.6.0",
     "execa": "^5.0.0",
@@ -40,9 +40,10 @@
     "lodash": "^4.17.4",
     "promise-toolbox": "^0.21.0",
     "proper-lockfile": "^4.1.2",
+    "pumpify": "^2.0.1",
     "readable-stream": "^4.1.0",
     "through2": "^4.0.2",
-    "xo-remote-parser": "^0.9.2"
+    "xo-remote-parser": "^0.9.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
@@ -53,8 +54,7 @@
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^7.0.2",
     "dotenv": "^16.0.0",
-    "rimraf": "^3.0.0",
-    "tmp": "^0.2.1"
+    "rimraf": "^3.0.0"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

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

@@ -1,15 +1,8 @@
-const { pipeline } = require('node:stream')
 const { readChunk } = require('@vates/read-chunk')
 const crypto = require('crypto')
+const pumpify = require('pumpify')
 
-export const DEFAULT_ENCRYPTION_ALGORITHM = 'aes-256-gcm'
-export const UNENCRYPTED_ALGORITHM = 'none'
-
-export function isLegacyEncryptionAlgorithm(algorithm) {
-  return algorithm !== UNENCRYPTED_ALGORITHM && algorithm !== DEFAULT_ENCRYPTION_ALGORITHM
-}
-
-function getEncryptor(algorithm = DEFAULT_ENCRYPTION_ALGORITHM, key) {
+function getEncryptor(key) {
   if (key === undefined) {
     return {
       id: 'NULL_ENCRYPTOR',
@@ -22,100 +15,43 @@ function getEncryptor(algorithm = DEFAULT_ENCRYPTION_ALGORITHM, key) {
       decryptStream: stream => stream,
     }
   }
-  const info = crypto.getCipherInfo(algorithm, { keyLength: key.length })
-  if (info === undefined) {
-    const error = new Error(
-      `Either the algorithm ${algorithm} is not available, or the key length ${
-        key.length
-      } is incorrect. Supported algorithm are ${crypto.getCiphers()}`
-    )
-    error.code = 'BAD_ALGORITHM'
-    throw error
-  }
-  const { ivLength, mode } = info
-  const authTagLength = ['gcm', 'ccm', 'ocb'].includes(mode) ? 16 : 0
+  const algorithm = 'aes-256-cbc'
+  const ivLength = 16
 
   function encryptStream(input) {
-    return pipeline(
-      input,
-      async function* (source) {
-        const iv = crypto.randomBytes(ivLength)
-        const cipher = crypto.createCipheriv(algorithm, Buffer.from(key), iv)
-        yield iv
-        for await (const data of source) {
-          yield cipher.update(data)
-        }
-        yield cipher.final()
-        // must write the auth tag at the end of the encryption stream
-        if (authTagLength > 0) {
-          yield cipher.getAuthTag()
-        }
-      },
-      () => {}
-    )
+    const iv = crypto.randomBytes(ivLength)
+    const cipher = crypto.createCipheriv(algorithm, Buffer.from(key), iv)
+
+    const encrypted = pumpify(input, cipher)
+    encrypted.unshift(iv)
+    return encrypted
   }
 
-  function decryptStream(encryptedStream) {
-    return pipeline(
-      encryptedStream,
-      async function* (source) {
-        /**
-         * WARNING
-         *
-         * the crypted size has an initializtion vector + eventually an auth tag + a padding at the end
-         * whe can't predict the decrypted size from the start of the encrypted size
-         * thus, we can't set decrypted.length reliably
-         *
-         */
-
-        const iv = await readChunk(source, ivLength)
-        const cipher = crypto.createDecipheriv(algorithm, Buffer.from(key), iv)
-        let authTag = Buffer.alloc(0)
-        for await (const data of source) {
-          if (data.length >= authTagLength) {
-            // fast path, no buffer concat
-            yield cipher.update(authTag)
-            authTag = data.slice(data.length - authTagLength)
-            yield cipher.update(data.slice(0, data.length - authTagLength))
-          } else {
-            // slower since there is a concat
-            const fullData = Buffer.concat([authTag, data])
-            const fullDataLength = fullData.length
-            if (fullDataLength > authTagLength) {
-              authTag = fullData.slice(fullDataLength - authTagLength)
-              yield cipher.update(fullData.slice(0, fullDataLength - authTagLength))
-            } else {
-              authTag = fullData
-            }
-          }
-        }
-        if (authTagLength > 0) {
-          cipher.setAuthTag(authTag)
-        }
-        yield cipher.final()
-      },
-      () => {}
-    )
+  async function decryptStream(encryptedStream) {
+    const iv = await readChunk(encryptedStream, ivLength)
+    const cipher = crypto.createDecipheriv(algorithm, Buffer.from(key), iv)
+    /**
+     * WARNING
+     *
+     * the crytped size has an initializtion vector + a padding at the end
+     * whe can't predict the decrypted size from the start of the encrypted size
+     * thus, we can't set decrypted.length reliably
+     *
+     */
+    return pumpify(encryptedStream, cipher)
   }
 
   function encryptData(buffer) {
     const iv = crypto.randomBytes(ivLength)
     const cipher = crypto.createCipheriv(algorithm, Buffer.from(key), iv)
     const encrypted = cipher.update(buffer)
-    return Buffer.concat([iv, encrypted, cipher.final(), authTagLength > 0 ? cipher.getAuthTag() : Buffer.alloc(0)])
+    return Buffer.concat([iv, encrypted, cipher.final()])
   }
 
   function decryptData(buffer) {
     const iv = buffer.slice(0, ivLength)
+    const encrypted = buffer.slice(ivLength)
     const decipher = crypto.createDecipheriv(algorithm, Buffer.from(key), iv)
-    let encrypted
-    if (authTagLength > 0) {
-      const authTag = buffer.slice(buffer.length - authTagLength)
-      decipher.setAuthTag(authTag)
-      encrypted = buffer.slice(ivLength, buffer.length - authTagLength)
-    } else {
-      encrypted = buffer.slice(ivLength)
-    }
     const decrypted = decipher.update(encrypted)
     return Buffer.concat([decrypted, decipher.final()])
   }

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

@@ -1,50 +0,0 @@
-/* eslint-env jest */
-import { Readable } from 'node:stream'
-import { _getEncryptor } from './_encryptor'
-import crypto from 'crypto'
-
-const algorithms = ['none', 'aes-256-cbc', 'aes-256-gcm']
-
-function streamToBuffer(stream) {
-  return new Promise(resolve => {
-    const bufs = []
-    stream.on('data', function (d) {
-      bufs.push(d)
-    })
-    stream.on('end', function () {
-      resolve(Buffer.concat(bufs))
-    })
-  })
-}
-
-algorithms.forEach(algorithm => {
-  describe(`test algorithm ${algorithm}`, () => {
-    const key = algorithm === 'none' ? undefined : '73c1838d7d8a6088ca2317fb5f29cd91'
-    const encryptor = _getEncryptor(algorithm, key)
-    const buffer = crypto.randomBytes(1024 * 1024 + 1)
-    it('handle buffer', () => {
-      const encrypted = encryptor.encryptData(buffer)
-      if (algorithm !== 'none') {
-        expect(encrypted.equals(buffer)).toEqual(false) // encrypted should be different
-        // ivlength, auth tag, padding
-        expect(encrypted.length).not.toEqual(buffer.length)
-      }
-
-      const decrypted = encryptor.decryptData(encrypted)
-      expect(decrypted.equals(buffer)).toEqual(true)
-    })
-
-    it('handle stream', async () => {
-      const stream = Readable.from(buffer)
-      stream.length = buffer.length
-      const encrypted = encryptor.encryptStream(stream)
-      if (algorithm !== 'none') {
-        expect(encrypted.length).toEqual(undefined)
-      }
-
-      const decrypted = encryptor.decryptStream(encrypted)
-      const decryptedBuffer = await streamToBuffer(decrypted)
-      expect(decryptedBuffer.equals(buffer)).toEqual(true)
-    })
-  })
-})

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

@@ -12,7 +12,7 @@ import { synchronized } from 'decorator-synchronized'
 
 import { basename, dirname, normalize as normalizePath } from './path'
 import { createChecksumStream, validChecksumOfReadStream } from './checksum'
-import { DEFAULT_ENCRYPTION_ALGORITHM, _getEncryptor } from './_encryptor'
+import { _getEncryptor } from './_encryptor'
 
 const { info, warn } = createLogger('@xen-orchestra:fs')
 
@@ -68,15 +68,7 @@ class PrefixWrapper {
 }
 
 export default class RemoteHandlerAbstract {
-  #encryptor
-
-  get _encryptor() {
-    if (this.#encryptor === undefined) {
-      throw new Error(`Can't access to encryptor before remote synchronization`)
-    }
-    return this.#encryptor
-  }
-
+  _encryptor
   constructor(remote, options = {}) {
     if (remote.url === 'test://') {
       this._remote = remote
@@ -87,6 +79,7 @@ export default class RemoteHandlerAbstract {
       }
     }
     ;({ highWaterMark: this._highWaterMark, timeout: this._timeout = DEFAULT_TIMEOUT } = options)
+    this._encryptor = _getEncryptor(this._remote.encryptionKey)
 
     const sharedLimit = limitConcurrency(options.maxParallelOperations ?? DEFAULT_MAX_PARALLEL_OPERATIONS)
     this.closeFile = sharedLimit(this.closeFile)
@@ -284,25 +277,15 @@ export default class RemoteHandlerAbstract {
     return this._encryptor.decryptData(data)
   }
 
-  async #rename(oldPath, newPath, { checksum }, createTree = true) {
-    try {
-      let p = timeout.call(this._rename(oldPath, newPath), this._timeout)
-      if (checksum) {
-        p = Promise.all([p, this._rename(checksumFile(oldPath), checksumFile(newPath))])
-      }
-      await p
-    } catch (error) {
-      // ENOENT can be a missing target directory OR a missing source
-      if (error.code === 'ENOENT' && createTree) {
-        await this._mktree(dirname(newPath))
-        return this.#rename(oldPath, newPath, { checksum }, false)
-      }
-      throw error
-    }
-  }
+  async rename(oldPath, newPath, { checksum = false } = {}) {
+    oldPath = normalizePath(oldPath)
+    newPath = normalizePath(newPath)
 
-  rename(oldPath, newPath, { checksum = false } = {}) {
-    return this.#rename(normalizePath(oldPath), normalizePath(newPath), { checksum })
+    let p = timeout.call(this._rename(oldPath, newPath), this._timeout)
+    if (checksum) {
+      p = Promise.all([p, this._rename(checksumFile(oldPath), checksumFile(newPath))])
+    }
+    return p
   }
 
   async copy(oldPath, newPath, { checksum = false } = {}) {
@@ -347,54 +330,44 @@ export default class RemoteHandlerAbstract {
   }
 
   async _createMetadata() {
-    const encryptionAlgorithm = this._remote.encryptionKey === undefined ? 'none' : DEFAULT_ENCRYPTION_ALGORITHM
-    this.#encryptor = _getEncryptor(encryptionAlgorithm, this._remote.encryptionKey)
-
     await Promise.all([
-      this._writeFile(normalizePath(ENCRYPTION_DESC_FILENAME), JSON.stringify({ algorithm: encryptionAlgorithm }), {
-        flags: 'w',
-      }), // not encrypted
+      this._writeFile(
+        normalizePath(ENCRYPTION_DESC_FILENAME),
+        JSON.stringify({ algorithm: this._encryptor.algorithm }),
+        {
+          flags: 'w',
+        }
+      ), // not encrypted
       this.writeFile(ENCRYPTION_METADATA_FILENAME, `{"random":"${randomUUID()}"}`, { flags: 'w' }), // encrypted
     ])
   }
 
   async _checkMetadata() {
-    let encryptionAlgorithm = 'none'
-    let data
     try {
       // this file is not encrypted
-      data = await this._readFile(normalizePath(ENCRYPTION_DESC_FILENAME), 'utf-8')
-      const json = JSON.parse(data)
-      encryptionAlgorithm = json.algorithm
+      const data = await this._readFile(normalizePath(ENCRYPTION_DESC_FILENAME))
+      JSON.parse(data)
     } catch (error) {
       if (error.code !== 'ENOENT') {
         throw error
       }
-      encryptionAlgorithm = this._remote.encryptionKey === undefined ? 'none' : DEFAULT_ENCRYPTION_ALGORITHM
     }
 
     try {
-      this.#encryptor = _getEncryptor(encryptionAlgorithm, this._remote.encryptionKey)
       // this file is encrypted
-      const data = await this.readFile(ENCRYPTION_METADATA_FILENAME, 'utf-8')
+      const data = await this.readFile(ENCRYPTION_METADATA_FILENAME)
       JSON.parse(data)
     } catch (error) {
-      // can be enoent, bad algorithm, or broeken json ( bad key or algorithm)
-      if (encryptionAlgorithm !== 'none') {
-        if (await this._canWriteMetadata()) {
-          // any other error , but on empty remote => update with remote settings
-
-          info('will update metadata of this remote')
-          return this._createMetadata()
-        } else {
-          warn(
-            `The encryptionKey settings of this remote does not match the key used to create it. You won't be able to read any data from this remote`,
-            { error }
-          )
-          // will probably send a ERR_OSSL_EVP_BAD_DECRYPT if key is incorrect
-          throw error
-        }
+      if (error.code === 'ENOENT' || (await this._canWriteMetadata())) {
+        info('will update metadata of this remote')
+        return this._createMetadata()
       }
+      warn(
+        `The encryptionKey settings of this remote does not match the key used to create it. You won't be able to read any data from this remote`,
+        { error }
+      )
+      // will probably send a ERR_OSSL_EVP_BAD_DECRYPT if key is incorrect
+      throw error
     }
   }
 

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

@@ -1,29 +1,21 @@
 /* eslint-env jest */
 
-import { DEFAULT_ENCRYPTION_ALGORITHM, _getEncryptor } from './_encryptor'
-import { Disposable, pFromCallback, TimeoutError } from 'promise-toolbox'
-import { getSyncedHandler } from '.'
+import { TimeoutError } from 'promise-toolbox'
+
 import AbstractHandler from './abstract'
-import fs from 'fs-extra'
-import rimraf from 'rimraf'
-import tmp from 'tmp'
 
 const TIMEOUT = 10e3
 
 class TestHandler extends AbstractHandler {
   constructor(impl) {
     super({ url: 'test://' }, { timeout: TIMEOUT })
-    Object.defineProperty(this, 'isEncrypted', {
-      get: () => false, // encryption is tested separatly
-    })
+
     Object.keys(impl).forEach(method => {
       this[`_${method}`] = impl[method]
     })
   }
 }
 
-const noop = Function.prototype
-
 jest.useFakeTimers()
 
 describe('closeFile()', () => {
@@ -109,112 +101,3 @@ describe('rmdir()', () => {
     await expect(promise).rejects.toThrowError(TimeoutError)
   })
 })
-
-describe('encryption', () => {
-  let dir
-  beforeEach(async () => {
-    dir = await pFromCallback(cb => tmp.dir(cb))
-  })
-  afterAll(async () => {
-    await pFromCallback(cb => rimraf(dir, cb))
-  })
-
-  it('sync should NOT create metadata if missing (not encrypted)', async () => {
-    await Disposable.use(getSyncedHandler({ url: `file://${dir}` }), noop)
-
-    expect(await fs.readdir(dir)).toEqual([])
-  })
-
-  it('sync should create metadata if missing (encrypted)', async () => {
-    await Disposable.use(
-      getSyncedHandler({ url: `file://${dir}?encryptionKey="73c1838d7d8a6088ca2317fb5f29cd00"` }),
-      noop
-    )
-
-    expect(await fs.readdir(dir)).toEqual(['encryption.json', 'metadata.json'])
-
-    const encryption = JSON.parse(await fs.readFile(`${dir}/encryption.json`, 'utf-8'))
-    expect(encryption.algorithm).toEqual(DEFAULT_ENCRYPTION_ALGORITHM)
-    // encrypted , should not be parsable
-    expect(async () => JSON.parse(await fs.readFile(`${dir}/metadata.json`))).rejects.toThrowError()
-  })
-
-  it('sync should not modify existing metadata', async () => {
-    await fs.writeFile(`${dir}/encryption.json`, `{"algorithm": "none"}`)
-    await fs.writeFile(`${dir}/metadata.json`, `{"random": "NOTSORANDOM"}`)
-
-    await Disposable.use(await getSyncedHandler({ url: `file://${dir}` }), noop)
-
-    const encryption = JSON.parse(await fs.readFile(`${dir}/encryption.json`, 'utf-8'))
-    expect(encryption.algorithm).toEqual('none')
-    const metadata = JSON.parse(await fs.readFile(`${dir}/metadata.json`, 'utf-8'))
-    expect(metadata.random).toEqual('NOTSORANDOM')
-  })
-
-  it('should modify metadata if empty', async () => {
-    await Disposable.use(getSyncedHandler({ url: `file://${dir}` }), noop)
-    // nothing created without encryption
-
-    await Disposable.use(
-      getSyncedHandler({ url: `file://${dir}?encryptionKey="73c1838d7d8a6088ca2317fb5f29cd00"` }),
-      noop
-    )
-    let encryption = JSON.parse(await fs.readFile(`${dir}/encryption.json`, 'utf-8'))
-    expect(encryption.algorithm).toEqual(DEFAULT_ENCRYPTION_ALGORITHM)
-
-    await Disposable.use(getSyncedHandler({ url: `file://${dir}` }), noop)
-    encryption = JSON.parse(await fs.readFile(`${dir}/encryption.json`, 'utf-8'))
-    expect(encryption.algorithm).toEqual('none')
-  })
-
-  it(
-    'sync should work with encrypted',
-    Disposable.wrap(async function* () {
-      const encryptor = _getEncryptor(DEFAULT_ENCRYPTION_ALGORITHM, '73c1838d7d8a6088ca2317fb5f29cd91')
-
-      await fs.writeFile(`${dir}/encryption.json`, `{"algorithm": "${DEFAULT_ENCRYPTION_ALGORITHM}"}`)
-      await fs.writeFile(`${dir}/metadata.json`, encryptor.encryptData(`{"random": "NOTSORANDOM"}`))
-
-      const handler = yield getSyncedHandler({ url: `file://${dir}?encryptionKey="73c1838d7d8a6088ca2317fb5f29cd91"` })
-
-      const encryption = JSON.parse(await fs.readFile(`${dir}/encryption.json`, 'utf-8'))
-      expect(encryption.algorithm).toEqual(DEFAULT_ENCRYPTION_ALGORITHM)
-      const metadata = JSON.parse(await handler.readFile(`./metadata.json`))
-      expect(metadata.random).toEqual('NOTSORANDOM')
-    })
-  )
-
-  it('sync should fail when changing key on non empty remote ', async () => {
-    const encryptor = _getEncryptor(DEFAULT_ENCRYPTION_ALGORITHM, '73c1838d7d8a6088ca2317fb5f29cd91')
-
-    await fs.writeFile(`${dir}/encryption.json`, `{"algorithm": "${DEFAULT_ENCRYPTION_ALGORITHM}"}`)
-    await fs.writeFile(`${dir}/metadata.json`, encryptor.encryptData(`{"random": "NOTSORANDOM"}`))
-
-    // different key but empty remote => ok
-    await Disposable.use(
-      getSyncedHandler({ url: `file://${dir}?encryptionKey="73c1838d7d8a6088ca2317fb5f29cd00"` }),
-      noop
-    )
-
-    // remote is now non empty : can't modify key anymore
-    await fs.writeFile(`${dir}/nonempty.json`, 'content')
-    await expect(
-      Disposable.use(getSyncedHandler({ url: `file://${dir}?encryptionKey="73c1838d7d8a6088ca2317fb5f29cd10"` }), noop)
-    ).rejects.toThrowError()
-  })
-
-  it('sync should fail when changing algorithm', async () => {
-    // encrypt with a non default algorithm
-    const encryptor = _getEncryptor('aes-256-cbc', '73c1838d7d8a6088ca2317fb5f29cd91')
-
-    await fs.writeFile(`${dir}/encryption.json`, `{"algorithm": "aes-256-gmc"}`)
-    await fs.writeFile(`${dir}/metadata.json`, encryptor.encryptData(`{"random": "NOTSORANDOM"}`))
-
-    // remote is now non empty : can't modify key anymore
-    await fs.writeFile(`${dir}/nonempty.json`, 'content')
-
-    await expect(
-      Disposable.use(getSyncedHandler({ url: `file://${dir}?encryptionKey="73c1838d7d8a6088ca2317fb5f29cd91"` }), noop)
-    ).rejects.toThrowError()
-  })
-})

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

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

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

@@ -5,7 +5,6 @@ import RemoteHandlerLocal from './local'
 import RemoteHandlerNfs from './nfs'
 import RemoteHandlerS3 from './s3'
 import RemoteHandlerSmb from './smb'
-export { DEFAULT_ENCRYPTION_ALGORITHM, UNENCRYPTED_ALGORITHM, isLegacyEncryptionAlgorithm } from './_encryptor'
 
 const HANDLERS = {
   file: RemoteHandlerLocal,

@xen-orchestra/lite/.env.dist

@@ -1 +0,0 @@
-VITE_XO_HOST=

@xen-orchestra/lite/.eslintrc.cjs

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

@xen-orchestra/lite/.npmignore

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

@xen-orchestra/lite/.prettierrc.cjs

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

@xen-orchestra/lite/.vscode/extensions.json

@@ -1,3 +0,0 @@
-{
-  "recommendations": ["Vue.volar"]
-}

@xen-orchestra/lite/CHANGELOG.md

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

@xen-orchestra/lite/README.md

@@ -1,248 +0,0 @@
-# POC XO Lite
-
-- Clone
-- Copy `.env.dist` to `.env` and set vars
-- `yarn`
-- `yarn dev`
-
-## Conventions
-
-### File names
-
-| Type       | Format                                   | Exemple                             |
-| ---------- | ---------------------------------------- | ----------------------------------- |
-| Component  | `components/<PascalCase>.vue`            | `components/FooBar.vue`             |
-| View       | `views/<PascalCase>View.vue`             | `views/FooBarView.vue`              |
-| Composable | `composables/<kebab-case>.composable.ts` | `composables/foo-bar.composable.ts` |
-| Store      | `stores/<kebab-case>.store.ts`           | `stores/foo-bar.store.ts`           |
-| Other      | `libs/<kebab-case>.ts`                   | `libs/foo-bar.ts`                   |
-
-For components and views, prepend the subdirectories names to the resulting filename.
-
-Example: `components/foo/bar/FooBarBaz.vue`
-
-### Vue Components
-
-Use Vue Single File Components (`*.vue`).
-
-Insert blocks in the following order: `template`, `script` then `style`.
-
-#### Template
-
-Use HTML.
-
-If your component only has one root element, add the component name as a class.
-
-```vue
-<!-- MyComponent.vue -->
-<template>
-  <div class="my-component">...</div>
-</template>
-```
-
-#### Script
-
-Use composition API + TypeScript + `setup` attribute (`<script lang="ts" setup>`).
-
-Note: When reading Vue official doc, don't forget to set "API Preference" toggle (in the upper left) on "Composition".
-
-```vue
-<script lang="ts" setup>
-import { computed, ref } from "vue";
-
-const props = defineProps<{
-  greetings: string;
-}>();
-
-const firstName = ref("");
-const lastName = ref("");
-
-const fullName = computed(
-  () => `${props.greetings} ${firstName.value} ${lastName.value}`
-);
-</script>
-```
-
-#### CSS
-
-Always use `scoped` attribute (`<style scoped>`).
-
-Nested rules are allowed.
-
-Vue variables can be interpolated with `v-bind`.
-
-```vue
-<script lang="ts" setup>
-import { ref } from "vue";
-
-const fontSize = ref("2rem");
-</script>
-
-<style scoped>
-.my-item {
-  .nested {
-    font-size: v-bind(fontSize);
-  }
-}
-</style>
-```
-
-### Icons
-
-This project is using Font Awesome 6 Free.
-
-Icons can be displayed with the `UiIcon` component.
-
-Passing `undefined` as `icon` prop will disable the component (no need to use an additional `v-if` condition).
-
-Use the `busy` prop to display a loader icon.
-
-```vue
-<template>
-  <div>
-    <UiIcon :icon="faDisplay" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import UiIcon from "@/components/ui/UiIcon.vue";
-import { faDisplay } from "@fortawesome/free-solid-svg-icons";
-</script>
-```
-
-#### Font weight <=> Style name
-
-Here is the equivalent between font weight and style name.
-
-| Style name | Font weight |
-| ---------- | ----------- |
-| Solid      | 900         |
-| Regular    | 400         |
-
-### CSS
-
-Always use `rem` unit (`1rem` = `10px`)
-
-### Store
-
-Use Pinia store with setup function.
-
-State are `ref`
-
-Getters are `computed`
-
-Actions/Mutations are simple functions
-
-#### Naming convention
-
-For a `foobar` store, create a `store/foobar.store.ts` then use `defineStore('foobar', setupFunc)`
-
-#### Example
-
-```typescript
-import { computed, ref } from "vue";
-
-export const useFoobarStore = defineStore("foobar", () => {
-  const aStateVar = ref(0);
-  const otherStateVar = ref(0);
-  const aGetter = computed(() => aStateVar.value * 2);
-  const anAction = () => (otherStateVar.value += 10);
-
-  return {
-    aStateVar,
-    otherStateVar,
-    aGetter,
-    anAction,
-  };
-});
-```
-
-#### Xen Api Collection Stores
-
-When creating a store for a Xen Api objects collection, use the `createXenApiCollectionStoreContext` helper.
-
-```typescript
-export const useConsoleStore = defineStore("console", () =>
-  createXenApiCollectionStoreContext("console")
-);
-```
-
-##### Extending the base context
-
-Here is how to extend the base context:
-
-```typescript
-import { computed } from "vue";
-
-export const useFoobarStore = defineStore("foobar", () => {
-  const baseContext = createXenApiCollectionStoreContext("foobar");
-
-  const myCustomGetter = computed(() => baseContext.ids.reverse());
-
-  return {
-    ...baseContext,
-    myCustomGetter,
-  };
-});
-```
-
-### I18n
-
-Internationalization of the app is done with [Vue-i18n](https://vue-i18n.intlify.dev/).
-
-Locale files are located in `src/locales` directory.
-
-Source of truth is `en-US.json` file.
-
-To quickly check if there are missing translations in other locale files, open `main.ts` and check the `messages`
-property of `createI18n()` for TypeScript error.
-
-#### Example
-
-```json
-{
-  "hello": "Hello",
-  "hello_name": "Hello {name}",
-  "hello_linked": "@:hello_name how are you?",
-  "hello_plural": "No hello | Hello to you | Hello to {count} persons"
-}
-```
-
-```html
-<!-- String -->
-
-<p>{{ $t("hello") }}</p>
-<!-- Hello -->
-<p>{{ $t("hello_name", { name: "World" }) }}</p>
-<!-- Hello World -->
-<p>{{ $t("hello_linked", { name: "World" }) }}</p>
-<!-- Hello World how are you? -->
-<p>{{ $tc("hello_plural", 0) }}</p>
-<!-- No hello -->
-<p>{{ $tc("hello_plural", 1) }}</p>
-<!-- Hello to you -->
-<p>{{ $tc("hello_plural", 4) }}</p>
-<!-- Hello to 4 persons -->
-
-<!-- Date and time -->
-
-<p>{{ $d(date, "date_short") }}</p>
-<!-- 9/10/2022 -->
-<p>{{ $d(date, "date_medium") }}</p>
-<!-- Sep 10, 2022 -->
-<p>{{ $d(date, "date_long") }}</p>
-<!-- September 10, 2022 -->
-<p>{{ $d(date, "datetime_short") }}</p>
-<!-- 9/10/2022, 06:30 PM -->
-<p>{{ $d(date, "datetime_medium") }}</p>
-<!-- Sep 10, 2022, 06:30 PM -->
-<p>{{ $d(date, "datetime_long") }}</p>
-<!-- September 10, 2022 at 06:30 PM -->
-<p>{{ $d(date, "time") }}</p>
-<!-- 06:30 PM -->
-
-<!-- Number -->
-
-<p>{{ $n(1234567.898765) }}</p>
-<!-- 1,234,567.899 -->
-```

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

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

@xen-orchestra/lite/index.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>

@xen-orchestra/lite/package.json

@@ -1,73 +0,0 @@
-{
-  "name": "@xen-orchestra/lite",
-  "version": "0.1.0",
-  "scripts": {
-    "dev": "GIT_HEAD=$(git rev-parse HEAD) vite",
-    "build": "run-p type-check build-only",
-    "preview": "vite preview --port 4173",
-    "build-only": "GIT_HEAD=$(git rev-parse HEAD) vite build",
-    "deploy": "./scripts/deploy.sh",
-    "test": "yarn run type-check",
-    "type-check": "vue-tsc --noEmit"
-  },
-  "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.1.1",
-    "@fortawesome/free-regular-svg-icons": "^6.2.0",
-    "@fortawesome/free-solid-svg-icons": "^6.2.0",
-    "@fortawesome/vue-fontawesome": "^3.0.1",
-    "@novnc/novnc": "^1.3.0",
-    "@types/d3-time-format": "^4.0.0",
-    "@types/lodash-es": "^4.17.6",
-    "@vueuse/core": "^9.5.0",
-    "@vueuse/math": "^9.5.0",
-    "complex-matcher": "^0.7.0",
-    "d3-time-format": "^4.1.0",
-    "decorator-synchronized": "^0.6.0",
-    "echarts": "^5.3.3",
-    "human-format": "^1.0.0",
-    "json-rpc-2.0": "^1.3.0",
-    "json5": "^2.2.1",
-    "limit-concurrency-decorator": "^0.5.0",
-    "lodash-es": "^4.17.21",
-    "make-error": "^1.3.6",
-    "pinia": "^2.0.14",
-    "placement.js": "^1.0.0-beta.5",
-    "vue": "^3.2.37",
-    "vue-echarts": "^6.2.3",
-    "vue-i18n": "9",
-    "vue-router": "^4.0.16"
-  },
-  "devDependencies": {
-    "@intlify/vite-plugin-vue-i18n": "^6.0.1",
-    "@limegrass/eslint-plugin-import-alias": "^1.0.5",
-    "@rushstack/eslint-patch": "^1.1.0",
-    "@types/node": "^16.11.41",
-    "@vitejs/plugin-vue": "^3.2.0",
-    "@vue/eslint-config-prettier": "^7.0.0",
-    "@vue/eslint-config-typescript": "^11.0.0",
-    "@vue/tsconfig": "^0.1.3",
-    "eslint-plugin-vue": "^9.0.0",
-    "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.19",
-    "postcss-nested": "^6.0.0",
-    "typescript": "^4.9.3",
-    "vite": "^3.2.4",
-    "vue-tsc": "^1.0.9"
-  },
-  "private": true,
-  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/lite",
-  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
-  "repository": {
-    "directory": "@xen-orchestra/lite",
-    "type": "git",
-    "url": "https://github.com/vatesfr/xen-orchestra.git"
-  },
-  "author": {
-    "name": "Vates SAS",
-    "url": "https://vates.fr"
-  },
-  "license": "AGPL-3.0-or-later",
-  "engines": {
-    "node": ">=8.10"
-  }
-}

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

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

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

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

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

@@ -1,129 +0,0 @@
-<template>
-  <UiModal
-    v-if="isSslModalOpen"
-    color="error"
-    :icon="faServer"
-    @close="clearUnreachableHostsUrls"
-  >
-    <template #title>{{ $t("unreachable-hosts") }}</template>
-    <template #subtitle>{{ $t("following-hosts-unreachable") }}</template>
-    <p>{{ $t("allow-self-signed-ssl") }}</p>
-    <ul>
-      <li v-for="url in unreachableHostsUrls" :key="url.hostname">
-        <a :href="url.href" target="_blank" rel="noopener">{{ url.href }}</a>
-      </li>
-    </ul>
-  </UiModal>
-  <div v-if="!xenApiStore.isConnected">
-    <AppLogin />
-  </div>
-  <div v-else>
-    <AppHeader />
-    <div style="display: flex">
-      <nav class="nav">
-        <InfraPoolList />
-      </nav>
-      <main class="main">
-        <RouterView />
-      </main>
-    </div>
-    <AppTooltips />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { useUiStore } from "@/stores/ui.store";
-import { useActiveElement, useMagicKeys, whenever } from "@vueuse/core";
-import { logicAnd } from "@vueuse/math";
-import { difference } from "lodash";
-import { computed, ref, watch, watchEffect } from "vue";
-import favicon from "@/assets/favicon.svg";
-import { faServer } from "@fortawesome/free-solid-svg-icons";
-import AppHeader from "@/components/AppHeader.vue";
-import AppLogin from "@/components/AppLogin.vue";
-import AppTooltips from "@/components/AppTooltips.vue";
-import InfraPoolList from "@/components/infra/InfraPoolList.vue";
-import UiModal from "@/components/ui/UiModal.vue";
-import { useChartTheme } from "@/composables/chart-theme.composable";
-import { useHostStore } from "@/stores/host.store";
-import { useXenApiStore } from "@/stores/xen-api.store";
-
-const unreachableHostsUrls = ref<URL[]>([]);
-const clearUnreachableHostsUrls = () => (unreachableHostsUrls.value = []);
-
-let link: HTMLLinkElement | null = document.querySelector("link[rel~='icon']");
-if (link == null) {
-  link = document.createElement("link");
-  link.rel = "icon";
-  document.getElementsByTagName("head")[0].appendChild(link);
-}
-link.href = favicon;
-
-document.title = "XO Lite";
-
-const xenApiStore = useXenApiStore();
-const hostStore = useHostStore();
-useChartTheme();
-const uiStore = useUiStore();
-
-if (import.meta.env.DEV) {
-  const activeElement = useActiveElement();
-  const { D } = useMagicKeys();
-
-  const canToggleDarkMode = computed(() => {
-    if (activeElement.value == null) {
-      return true;
-    }
-
-    return !["INPUT", "TEXTAREA"].includes(activeElement.value.tagName);
-  });
-
-  whenever(
-    logicAnd(D, canToggleDarkMode),
-    () => (uiStore.colorMode = uiStore.colorMode === "dark" ? "light" : "dark")
-  );
-}
-
-watchEffect(() => {
-  if (xenApiStore.isConnected) {
-    xenApiStore.init();
-  }
-});
-
-watch(
-  () => hostStore.allRecords,
-  (hosts, previousHosts) => {
-    difference(hosts, previousHosts).forEach((host) => {
-      const url = new URL("http://localhost");
-      url.protocol = window.location.protocol;
-      url.hostname = host.address;
-      fetch(url, { mode: "no-cors" }).catch(() =>
-        unreachableHostsUrls.value.push(url)
-      );
-    });
-  }
-);
-
-const isSslModalOpen = computed(() => unreachableHostsUrls.value.length > 0);
-</script>
-
-<style lang="postcss">
-@import "@/assets/base.css";
-
-.nav {
-  overflow: auto;
-  width: 37rem;
-  max-width: 37rem;
-  height: calc(100vh - 9rem);
-  padding: 0.5rem;
-  border-right: 1px solid var(--color-blue-scale-400);
-  background-color: var(--background-color-primary);
-}
-
-.main {
-  overflow: auto;
-  flex: 1;
-  height: calc(100vh - 9rem);
-  background-color: var(--background-color-secondary);
-}
-</style>

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

@@ -1,27 +0,0 @@
-@import "reset.css";
-@import "theme.css";
-/* TODO Serve fonts locally */
-@import url("https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,400;0,500;0,600;0,700;0,900;1,400;1,500;1,600;1,700;1,900&display=swap");
-
-body {
-  min-height: 100vh;
-  font-size: 1.3rem;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color: var(--color-blue-scale-100);
-}
-
-a {
-  color: var(--color-extra-blue-base);
-}
-
-code {
-  font-family: monospace;
-}
-
-.card-view {
-  padding: 1.2rem;
-  display: flex;
-  gap: 2rem;
-}

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

@@ -1,28 +0,0 @@
-html {
-  box-sizing: border-box;
-  font-size: 10px;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: inherit;
-  margin: 0;
-  position: relative;
-  font-family: Poppins, sans-serif;
-}
-
-body, h1, h2, h3, h4, h5, h6, p, ol, ul {
-  margin: 0;
-  padding: 0;
-  font-weight: normal;
-}
-
-ol, ul {
-  list-style: none;
-}
-
-img {
-  max-width: 100%;
-  height: auto;
-}

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

@@ -1,75 +0,0 @@
-:root {
-  --color-blue-scale-000: #000000;
-  --color-blue-scale-100: #1A1B38;
-  --color-blue-scale-200: #595A6F;
-  --color-blue-scale-300: #9899A5;
-  --color-blue-scale-400: #E5E5E7;
-  --color-blue-scale-500: #FFFFFF;
-
-  --color-extra-blue-l60: #D1CEFB;
-  --color-extra-blue-l40: #BBB5F9;
-  --color-extra-blue-l20: #A39DF8;
-  --color-extra-blue-base: #8F84FF;
-  --color-extra-blue-d20: #716AC6;
-  --color-extra-blue-d40: #554F94;
-  --color-extra-blue-d60: #383563;
-
-  --color-green-infra-l60: #B5DBCA;
-  --color-green-infra-l40: #91C9B0;
-  --color-green-infra-l20: #70B795;
-  --color-green-infra-base: #55A57B;
-  --color-green-infra-d20: #438463;
-  --color-green-infra-d40: #32634A;
-  --color-green-infra-d60: #214231;
-
-  --color-orange-world-l60: #F2CDA8;
-  --color-orange-world-l40: #EBB57D;
-  --color-orange-world-l20: #E59D56;
-  --color-orange-world-base: #EF7F18;
-  --color-orange-world-d20: #BF6612;
-  --color-orange-world-d40: #864F1F;
-  --color-orange-world-d60: #5A3514;
-
-  --color-red-vates-l60: #DDA5A7;
-  --color-red-vates-l40: #CE787C;
-  --color-red-vates-l20: #BF4F51;
-  --color-red-vates-base: #BE1621;
-  --color-red-vates-d20: #8E2221;
-  --color-red-vates-d40: #6A1919;
-  --color-red-vates-d60: #471010;
-
-  --color-grayscale-200: #585757;
-
-  --background-color-primary: #FFFFFF;
-  --background-color-secondary: #F6F6F7;
-  --background-color-extra-blue: #F4F3FE;
-  --background-color-green-infra: #ECF5F2;
-  --background-color-orange-world: #FBF2E9;
-  --background-color-red-vates: #F5E8E9;
-
-  --shadow-100: 0 0.1rem 0.1rem rgba(20, 20, 30, 0.06);
-  --shadow-200: 0 0.1rem 0.3rem rgba(20, 20, 30, 0.1), 0 0.2rem 0.1rem rgba(20, 20, 30, 0.06), 0 0.1rem 0.1rem rgba(20, 20, 30, 0.08);
-  --shadow-300: 0 0.3rem 0.5rem rgba(20, 20, 30, 0.1), 0 0.1rem 1.8rem rgba(20, 20, 30, 0.06), 0 0.6rem 1.0rem rgba(20, 20, 30, 0.08);
-  --shadow-400: 0 1.1rem 1.5rem rgba(20, 20, 30, 0.1), 0 0.9rem 4.6rem rgba(20, 20, 30, 0.06), 0 2.4rem 3.8rem rgba(20, 20, 30, 0.04);
-}
-
-:root.dark {
-  --color-blue-scale-000: #FFFFFF;
-  --color-blue-scale-100: #E5E5E7;
-  --color-blue-scale-200: #9899A5;
-  --color-blue-scale-300: #595A6F;
-  --color-blue-scale-400: #1A1B38;
-  --color-blue-scale-500: #000000;
-
-  --background-color-primary: #14141D;
-  --background-color-secondary: #17182A;
-  --background-color-extra-blue: #35335D;
-  --background-color-green-infra: #243B3D;
-  --background-color-orange-world: #493328;
-  --background-color-red-vates: #3C1A28;
-
-  --shadow-100: 0 0.1rem 0.1rem rgba(20, 20, 30, 0.12);
-  --shadow-200: 0 0.1rem 0.3rem rgba(20, 20, 30, 0.2), 0 0.2rem 0.1rem rgba(20, 20, 30, 0.12), 0 0.1rem 0.1rem rgba(20, 20, 30, 0.16);
-  --shadow-300: 0 0.3rem 0.5rem rgba(20, 20, 30, 0.2), 0 0.1rem 1.8rem rgba(20, 20, 30, 0.12), 0 0.6rem 1.0rem rgba(20, 20, 30, 0.16);
-  --shadow-400: 0 1.1rem 1.5rem rgba(20, 20, 30, 0.2), 0 0.9rem 4.6rem rgba(20, 20, 30, 0.12), 0 2.4rem 3.8rem rgba(20, 20, 30, 0.08);
-}

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

@@ -1,101 +0,0 @@
-<template>
-  <AppMenu placement="bottom-end" shadow>
-    <template #trigger="{ open, isOpen }">
-      <button :class="{ active: isOpen }" class="account-button" @click="open">
-        <UiIcon :icon="faCircleUser" class="user-icon" />
-        <UiIcon :icon="faAngleDown" class="dropdown-icon" />
-      </button>
-    </template>
-    <MenuItem :icon="faGear" @click="openSettings">{{
-      $t("settings")
-    }}</MenuItem>
-    <MenuItem :icon="faMessage" @click="openFeedbackUrl">
-      {{ $t("send-us-feedback") }}
-    </MenuItem>
-    <MenuItem
-      :icon="faArrowRightFromBracket"
-      class="menu-item-logout"
-      @click="logout"
-    >
-      {{ $t("log-out") }}
-    </MenuItem>
-  </AppMenu>
-</template>
-
-<script lang="ts" setup>
-import { nextTick } from "vue";
-import { useRouter } from "vue-router";
-import {
-  faAngleDown,
-  faArrowRightFromBracket,
-  faCircleUser,
-  faGear,
-  faMessage,
-} from "@fortawesome/free-solid-svg-icons";
-import AppMenu from "@/components/menu/AppMenu.vue";
-import MenuItem from "@/components/menu/MenuItem.vue";
-import UiIcon from "@/components/ui/UiIcon.vue";
-import { useXenApiStore } from "@/stores/xen-api.store";
-
-const router = useRouter();
-
-const logout = () => {
-  const xenApiStore = useXenApiStore();
-  xenApiStore.disconnect();
-  nextTick(() => router.push({ name: "home" }));
-};
-
-const openFeedbackUrl = () => {
-  window.open(
-    "https://xcp-ng.org/forum/topic/4731/xen-orchestra-lite",
-    "_blank",
-    "noopener"
-  );
-};
-
-const openSettings = () => router.push({ name: "settings" });
-</script>
-
-<style scoped>
-.account-button {
-  display: flex;
-  align-items: center;
-  padding: 1rem;
-  color: var(--color-blue-scale-100);
-  border: none;
-  border-radius: 0.8rem;
-  background-color: var(--background-color-secondary);
-  gap: 0.8rem;
-
-  &:disabled {
-    color: var(--color-blue-scale-400);
-  }
-
-  &:not(:disabled) {
-    cursor: pointer;
-
-    &:hover,
-    &:active,
-    &.active {
-      background-color: var(--background-color-primary);
-    }
-
-    &:active,
-    &.active {
-      color: var(--color-extra-blue-base);
-    }
-  }
-}
-
-.user-icon {
-  font-size: 2.4rem;
-}
-
-.dropdown-icon {
-  font-size: 1.6rem;
-}
-
-.menu-item-logout {
-  color: var(--color-red-vates-base);
-}
-</style>

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

@@ -1,36 +0,0 @@
-<template>
-  <header class="app-header">
-    <RouterLink :to="{ name: 'home' }">
-      <img alt="XO Lite" src="../assets/logo.svg" />
-    </RouterLink>
-    <slot />
-    <div class="right">
-      <AccountButton />
-    </div>
-  </header>
-</template>
-
-<script lang="ts" setup>
-import AccountButton from "@/components/AccountButton.vue";
-</script>
-
-<style lang="postcss" scoped>
-.app-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  min-height: 8rem;
-  padding: 1rem;
-  border-bottom: 0.1rem solid var(--color-blue-scale-400);
-  background-color: var(--background-color-secondary);
-
-  img {
-    width: 4rem;
-  }
-}
-
-.right {
-  display: flex;
-  align-items: center;
-}
-</style>

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

@@ -1,94 +0,0 @@
-<template>
-  <div class="app-login form-container">
-    <form @submit.prevent="handleSubmit">
-      <img alt="XO Lite" src="../assets/logo-title.svg" />
-      <input v-model="login" name="login" readonly type="text" />
-      <input
-        v-model="password"
-        :readonly="isConnecting"
-        name="password"
-        :placeholder="$t('password')"
-        type="password"
-      />
-      <UiButton :busy="isConnecting" type="submit">
-        {{ $t("login") }}
-      </UiButton>
-    </form>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { storeToRefs } from "pinia";
-import { onMounted, ref } from "vue";
-import UiButton from "@/components/ui/UiButton.vue";
-import { useXenApiStore } from "@/stores/xen-api.store";
-
-const xenApiStore = useXenApiStore();
-const { isConnecting } = storeToRefs(xenApiStore);
-const login = ref("root");
-const password = ref("");
-
-onMounted(() => {
-  xenApiStore.reconnect();
-});
-
-async function handleSubmit() {
-  await xenApiStore.connect(login.value, password.value);
-}
-</script>
-
-<style lang="postcss" scoped>
-.form-container {
-  display: flex;
-  align-items: center;
-  flex: 1;
-  justify-content: center;
-  min-height: 100vh;
-  max-width: 100vw;
-  background-color: var(--background-color-primary);
-}
-
-form {
-  display: flex;
-  min-width: 30em;
-  max-width: 100%;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  margin: 0 auto;
-  padding: 8.5rem;
-  background-color: var(--background-color-secondary);
-}
-
-h1 {
-  font-size: 4.8rem;
-  font-weight: 900;
-  line-height: 7.2rem;
-  margin-bottom: 4.2rem;
-}
-
-img {
-  width: 40rem;
-  margin-bottom: 5rem;
-}
-
-label {
-  font-size: 120%;
-  font-weight: bold;
-  margin: 1.5rem 0 0.5rem 0;
-}
-
-input {
-  width: 45rem;
-  max-width: 100%;
-  margin-bottom: 1rem;
-  padding: 1rem 1.5rem;
-  border: 1px solid var(--color-blue-scale-400);
-  border-radius: 0.8rem;
-  background-color: white;
-}
-
-button {
-  margin-top: 3rem;
-}
-</style>

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

@@ -1,167 +0,0 @@
-<template>
-  <div v-if="!isDisabled" ref="tooltipElement" class="app-tooltip">
-    <span class="triangle" />
-    <span class="label">{{ content }}</span>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { isEmpty, isFunction, isString } from "lodash-es";
-import place from "placement.js";
-import { computed, ref, watchEffect } from "vue";
-import type { TooltipOptions } from "@/stores/tooltip.store";
-
-const props = defineProps<{
-  target: HTMLElement;
-  options: TooltipOptions;
-}>();
-
-const tooltipElement = ref<HTMLElement>();
-
-const content = computed(() =>
-  isString(props.options) ? props.options : props.options.content
-);
-
-const isDisabled = computed(() => {
-  if (isEmpty(content.value)) {
-    return true;
-  }
-
-  if (isString(props.options)) {
-    return false;
-  }
-
-  if (isFunction(props.options.disabled)) {
-    return props.options.disabled(props.target);
-  }
-
-  return props.options.disabled ?? false;
-});
-
-const placement = computed(() =>
-  isString(props.options) ? "top" : props.options.placement ?? "top"
-);
-
-watchEffect(() => {
-  if (tooltipElement.value) {
-    place(props.target, tooltipElement.value, {
-      placement: placement.value,
-    });
-  }
-});
-</script>
-
-<style lang="postcss" scoped>
-.app-tooltip {
-  font-size: 1.6rem;
-  font-weight: 400;
-  position: relative;
-  display: inline-flex;
-  padding: 0.3125em 0.5em;
-  pointer-events: none;
-  color: var(--color-blue-scale-500);
-  border-radius: 0.5em;
-  background-color: var(--color-blue-scale-100);
-}
-
-.triangle {
-  position: absolute;
-  overflow: hidden;
-  width: 1.875em;
-  height: 1.875em;
-}
-
-[data-placement^="top"] {
-  margin-bottom: 0.625em;
-
-  .triangle {
-    bottom: -1.75em;
-    transform: rotate(180deg);
-  }
-}
-
-[data-placement^="right"] {
-  margin-left: 0.625em;
-
-  .triangle {
-    left: -1.75em;
-    transform: rotate(270deg);
-  }
-}
-
-[data-placement^="bottom"] {
-  margin-top: 0.625em;
-
-  .triangle {
-    top: -1.75em;
-  }
-}
-
-[data-placement^="left"] {
-  margin-right: 0.625em;
-
-  .triangle {
-    right: -1.75em;
-    transform: rotate(90deg);
-  }
-}
-
-[data-placement="top-start"] .triangle {
-  left: 0;
-}
-
-[data-placement="top-center"] .triangle {
-  left: 50%;
-  margin-left: -0.9375em;
-}
-
-[data-placement="top-end"] .triangle {
-  right: 0;
-}
-
-[data-placement="left-start"] .triangle {
-  top: -0.25em;
-}
-
-[data-placement="left-center"] .triangle {
-  top: 50%;
-  margin-top: -0.9375em;
-}
-
-[data-placement="left-end"] .triangle {
-  bottom: -0.25em;
-}
-
-[data-placement="right-start"] .triangle {
-  top: -0.25em;
-}
-
-[data-placement="right-center"] .triangle {
-  top: 50%;
-  margin-top: -0.9375em;
-}
-
-[data-placement="right-end"] .triangle {
-  bottom: -0.25em;
-}
-
-[data-placement="bottom-center"] .triangle {
-  left: 50%;
-  margin-left: -0.9375em;
-}
-
-[data-placement="bottom-end"] .triangle {
-  right: 0;
-}
-
-.triangle::after {
-  display: block;
-  width: 100%;
-  height: 100%;
-  margin-top: 1.875em;
-  content: "";
-  transform: rotate(45deg) skew(20deg, 20deg);
-  border-radius: 0.3125em;
-  background-color: var(--color-blue-scale-100);
-}
-</style>

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

@@ -1,19 +0,0 @@
-<template>
-  <AppTooltip
-    v-for="tooltip in tooltips"
-    :key="tooltip.key"
-    :options="tooltip.options"
-    :target="tooltip.target"
-  />
-</template>
-
-<script lang="ts" setup>
-import { storeToRefs } from "pinia";
-import AppTooltip from "@/components/AppTooltip.vue";
-import { useTooltipStore } from "@/stores/tooltip.store";
-
-const tooltipStore = useTooltipStore();
-const { tooltips } = storeToRefs(tooltipStore);
-</script>
-
-<style scoped></style>