usb nbd for al exports

@vates/fuse-vhd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vates/fuse-vhd",
-  "version": "2.0.0",
+  "version": "1.0.0",
   "license": "ISC",
   "private": false,
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@vates/fuse-vhd",

@vates/nbd-client/bench.mjs

@@ -0,0 +1,32 @@
+
+import NbdClient from "./index.mjs";
+
+
+
+async function bench(){
+    const client = new NbdClient({
+        address:'172.16.210.14',
+        port: 8077,
+        exportname: 'bench_export'
+    })
+    await client.connect()
+    console.log('connected', client.exportSize)
+
+    for(let chunk_size=16*1024; chunk_size < 16*1024*1024; chunk_size *=2){
+
+
+    let i=0
+    const start = + new Date()
+    for await(const block of client.readBlocks(chunk_size) ){
+        i++
+        if((i*chunk_size) % (16*1024*1024) ===0){
+                process.stdout.write('.')
+        }
+        if(i*chunk_size > 1024*1024*1024) break
+    }
+    console.log(chunk_size,Math.round( (i*chunk_size/1024/1024*1000)/ (new Date() - start)))
+
+    }
+}
+
+bench()

@vates/nbd-client/index.mjs

@@ -307,11 +307,11 @@ export default class NbdClient {
     })
   }
 
-  async *readBlocks(indexGenerator) {
+  async *readBlocks(indexGenerator = 2*1024*1024) {
     // default : read all blocks
-    if (indexGenerator === undefined) {
+    if (typeof indexGenerator === 'number') {
       const exportSize = this.#exportSize
-      const chunkSize = 2 * 1024 * 1024
+      const chunkSize =  indexGenerator
       indexGenerator = function* () {
         const nbBlocks = Math.ceil(Number(exportSize / BigInt(chunkSize)))
         for (let index = 0; BigInt(index) < nbBlocks; index++) {
@@ -319,6 +319,7 @@ export default class NbdClient {
         }
       }
     }
+
     const readAhead = []
     const readAheadMaxLength = this.#readAhead
     const makeReadBlockPromise = (index, size) => {

@vates/nbd-client/package.json

@@ -13,18 +13,18 @@
     "url": "https://vates.fr"
   },
   "license": "ISC",
-  "version": "2.0.0",
+  "version": "1.2.1",
   "engines": {
     "node": ">=14.0"
   },
   "main": "./index.mjs",
   "dependencies": {
     "@vates/async-each": "^1.0.0",
-    "@vates/read-chunk": "^1.2.0",
+    "@vates/read-chunk": "^1.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/log": "^0.6.0",
     "promise-toolbox": "^0.21.0",
-    "xen-api": "^1.3.4"
+    "xen-api": "^1.3.3"
   },
   "devDependencies": {
     "tap": "^16.3.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vates/node-vsphere-soap",
-  "version": "2.0.0",
+  "version": "1.0.0",
   "description": "interface to vSphere SOAP/WSDL from node for interfacing with vCenter or ESXi, forked from node-vsphere-soap",
   "main": "lib/client.mjs",
   "author": "reedog117",

@vates/read-chunk/package.json

@@ -19,7 +19,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "1.2.0",
+  "version": "1.1.1",
   "engines": {
     "node": ">=8.10"
   },

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

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

@xen-orchestra/backups/RemoteAdapter.mjs

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

@xen-orchestra/backups/_incrementalVm.mjs

@@ -16,8 +16,6 @@ export const TAG_BASE_DELTA = 'xo:base_delta'
 
 export const TAG_COPY_SRC = 'xo:copy_of'
 
-const TAG_BACKUP_SR = 'xo:backup:sr'
-
 const ensureArray = value => (value === undefined ? [] : Array.isArray(value) ? value : [value])
 const resolveUuid = async (xapi, cache, uuid, type) => {
   if (uuid == null) {
@@ -159,10 +157,7 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
   if (detectBase) {
     const remoteBaseVmUuid = vmRecord.other_config[TAG_BASE_DELTA]
     if (remoteBaseVmUuid) {
-      baseVm = find(
-        xapi.objects.all,
-        obj => (obj = obj.other_config) && obj[TAG_COPY_SRC] === remoteBaseVmUuid && obj[TAG_BACKUP_SR] === sr.$id
-      )
+      baseVm = find(xapi.objects.all, obj => (obj = obj.other_config) && obj[TAG_COPY_SRC] === remoteBaseVmUuid)
 
       if (!baseVm) {
         throw new Error(`could not find the base VM (copy of ${remoteBaseVmUuid})`)

@xen-orchestra/backups/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.40.0",
+  "version": "0.39.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -23,8 +23,8 @@
     "@vates/compose": "^2.1.0",
     "@vates/decorate-with": "^2.0.0",
     "@vates/disposable": "^0.1.4",
-    "@vates/fuse-vhd": "^2.0.0",
-    "@vates/nbd-client": "^2.0.0",
+    "@vates/fuse-vhd": "^1.0.0",
+    "@vates/nbd-client": "^1.2.1",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/fs": "^4.0.1",
@@ -40,10 +40,9 @@
     "parse-pairs": "^2.0.0",
     "promise-toolbox": "^0.21.0",
     "proper-lockfile": "^4.1.2",
-    "tar": "^6.1.15",
     "uuid": "^9.0.0",
     "vhd-lib": "^4.5.0",
-    "xen-api": "^1.3.4",
+    "xen-api": "^1.3.3",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
@@ -54,7 +53,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^3.0.0"
+    "@xen-orchestra/xapi": "^2.2.1"
   },
   "license": "AGPL-3.0-or-later",
   "author": {

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

@@ -18,7 +18,7 @@
   "preferGlobal": true,
   "dependencies": {
     "golike-defer": "^0.5.1",
-    "xen-api": "^1.3.4"
+    "xen-api": "^1.3.3"
   },
   "scripts": {
     "postversion": "npm publish"

@xen-orchestra/fs/package.json

@@ -29,7 +29,7 @@
     "@vates/async-each": "^1.0.0",
     "@vates/coalesce-calls": "^0.1.0",
     "@vates/decorate-with": "^2.0.0",
-    "@vates/read-chunk": "^1.2.0",
+    "@vates/read-chunk": "^1.1.1",
     "@xen-orchestra/log": "^0.6.0",
     "bind-property-descriptor": "^2.0.0",
     "decorator-synchronized": "^0.6.0",

@xen-orchestra/lite/CHANGELOG.md

@@ -2,11 +2,8 @@
 
 ## **next**
 
-## **0.1.2** (2023-07-28)
-
 - Ability to export selected VMs as CSV file (PR [#6915](https://github.com/vatesfr/xen-orchestra/pull/6915))
 - [Pool/VMs] Ability to export selected VMs as JSON file (PR [#6911](https://github.com/vatesfr/xen-orchestra/pull/6911))
-- Add Tasks to Pool Dashboard (PR [#6713](https://github.com/vatesfr/xen-orchestra/pull/6713))
 
 ## **0.1.1** (2023-07-03)
 

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

@@ -4,53 +4,6 @@ All collections of `XenApiRecord` are stored inside the `xapiCollectionStore`.
 
 To retrieve a collection, invoke `useXapiCollectionStore().get(type)`.
 
-## TL;DR - How to extend a subscription
-
-_**Note:** Once the extension grows in complexity, it's recommended to create a dedicated file for it (e.g. `host.extension.ts` for `host.store.ts`)._
-
-```typescript
-type MyExtension1 = Extension<{ propA: string }>;
-
-type MyExtension2 = Extension<{ propB: string }, { withB: true }>;
-
-type Extensions = [
-  XenApiRecordExtension<XenApiHost>, // If needed
-  DeferExtension, // If needed
-  MyExtension1,
-  MyExtension2
-];
-
-export const useHostStore = defineStore("host", () => {
-  const hostCollection = useXapiCollectionStore().get("console");
-
-  const subscribe = <O extends Options<Extensions>>(options?: O) => {
-    const originalSubscription = hostCollection.subscribe(options);
-
-    const myExtension1: PartialSubscription<MyExtension1> = {
-      propA: "Hello",
-    };
-
-    const myExtension2: PartialSubscription<MyExtension2> | undefined =
-      options?.withB
-        ? {
-            propB: "World",
-          }
-        : undefined;
-
-    return {
-      ...originalSubscription,
-      ...myExtension1,
-      ...myExtension2,
-    };
-  };
-
-  return {
-    ...hostCollection,
-    subscribe,
-  };
-});
-```
-
 ## Accessing a collection
 
 In order to use a collection, you'll need to subscribe to it.
@@ -87,102 +40,71 @@ export const useConsoleStore = defineStore("console", () =>
 
 To extend the base Subscription, you'll need to override the `subscribe` method.
 
+For that, you can use the `createSubscribe<XenApiRecord, Extensions>((options) => { /* ... */})` helper.
+
 ### Define the extensions
 
-Subscription extensions are defined as a simple extension (`Extension<object>`) or as a conditional
-extension (`Extension<object, object>`).
+Subscription extensions are defined as `(object | [object, RequiredOptions])[]`.
 
-When using a conditional extension, the corresponding `object` type will be added to the subscription only if
-the the options passed to `subscribe(options)` do match the second argument or `Extension`.
-
-There is two existing extensions:
-
-- `XenApiRecordExtension<T extends XenApiRecord>`: a simple extension which defined all the base
-  properties and methods (`records`, `getByOpaqueRef`, `getByUuid`, etc.)
-- `DeferExtension`: a conditional extension which add the `start` and `isStarted` properties if the
-  `immediate` option is set to `false`.
+When using a tuple (`[object, RequiredOptions]`), the corresponding `object` type will be added to the subscription if
+the `RequiredOptions` for that tuple are present in the options passed to `subscribe`.
 
 ```typescript
 // Always present extension
-type PropABExtension = Extension<{
+type DefaultExtension = {
   propA: string;
   propB: ComputedRef<number>;
-}>;
+};
 
 // Conditional extension 1
-type PropCExtension = Extension<
+type FirstConditionalExtension = [
   { propC: ComputedRef<string> }, // <- This signature will be added
   { optC: string } // <- if this condition is met
->;
+];
 
 // Conditional extension 2
-type PropDExtension = Extension<
+type SecondConditionalExtension = [
   { propD: () => void }, // <- This signature will be added
   { optD: number } // <- if this condition is met
->;
+];
 
 // Create the extensions array
 type Extensions = [
-  XenApiRecordExtension<XenApiHost>,
-  DeferExtension,
-  PropABExtension,
-  PropCExtension,
-  PropDExtension
+  DefaultExtension,
+  FirstConditionalExtension,
+  SecondConditionalExtension
 ];
 ```
 
-### Define the `subscribe` method
-
-You can then create the `subscribe` function with the help of `Options` and `Subscription` helper types.
-
-This will allow to get correct completion and type checking for the `options` argument, and to get the correct return
-type based on passed options.
-
-```typescript
-const subscribe = <O extends Options<Extensions>>(options?: O) => {
-  return {
-    // ...
-  } as Subscription<Extensions, O>;
-};
-```
-
-### Extend the subscription
-
-The `PartialSubscription` type will help to define and check the data to add to subscription for each extension.
+### Define the subscription
 
 ```typescript
 export const useConsoleStore = defineStore("console", () => {
   const consoleCollection = useXapiCollectionStore().get("console");
 
-  const subscribe = <O extends Options<Extensions>>(options?: O) => {
+  const subscribe = createSubscribe<XenApiConsole, Extensions>((options) => {
     const originalSubscription = consoleCollection.subscribe(options);
 
-    const propABSubscription: PartialSubscription<PropABExtension> = {
+    const extendedSubscription = {
       propA: "Some string",
       propB: computed(() => 42),
     };
 
-    const propCSubscription: PartialSubscription<PropCExtension> | undefined =
-      options?.optC !== undefined
-        ? {
-            propC: computed(() => "Some other string"),
-          }
-        : undefined;
+    const propCSubscription = options?.optC !== undefined && {
+      propC: computed(() => "Some other string"),
+    };
 
-    const propDSubscription: PartialSubscription<PropDExtension> | undefined =
-      options?.optD !== undefined
-        ? {
-            propD: () => console.log("Hello"),
-          }
-        : undefined;
+    const propDSubscription = options?.optD !== undefined && {
+      propD: () => console.log("Hello"),
+    };
 
     return {
       ...originalSubscription,
-      ...propABSubscription,
+      ...extendedSubscription,
       ...propCSubscription,
       ...propDSubscription,
     };
-  };
+  });
 
   return {
     ...consoleCollection,
@@ -203,18 +125,20 @@ type Options = {
 
 ### Use the subscription
 
+In each case, all the default properties (`records`, `getByUuid`, etc.) will be present.
+
 ```typescript
 const store = useConsoleStore();
 
-// No options (Contains common properties: `propA`, `propB`, `records`, `getByUuid`, etc.)
-const subscription1 = store.subscribe();
+// No options (propA and propB will be present)
+const subscription = store.subscribe();
 
-// optC option (Contains common properties + `propC`)
-const subscription2 = store.subscribe({ optC: "Hello" });
+// optC option (propA, propB and propC will be present)
+const subscription = store.subscribe({ optC: "Hello" });
 
-// optD option (Contains common properties + `propD`)
-const subscription3 = store.subscribe({ optD: 12 });
+// optD option (propA, propB and propD will be present)
+const subscription = store.subscribe({ optD: 12 });
 
-// optC and optD options (Contains common properties + `propC` + `propD`)
-const subscription4 = store.subscribe({ optC: "Hello", optD: 12 });
+// optC and optD options (propA, propB, propC and propD will be present)
+const subscription = store.subscribe({ optC: "Hello", optD: 12 });
 ```

@xen-orchestra/lite/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>XO Lite</title>
+    <title>Vite App</title>
   </head>
   <body>
     <div id="root"></div>

@xen-orchestra/lite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/lite",
-  "version": "0.1.2",
+  "version": "0.1.1",
   "scripts": {
     "dev": "GIT_HEAD=$(git rev-parse HEAD) vite",
     "build": "run-p type-check build-only",
@@ -22,7 +22,7 @@
     "@types/marked": "^4.0.8",
     "@vueuse/core": "^10.1.2",
     "@vueuse/math": "^10.1.2",
-    "complex-matcher": "^0.7.1",
+    "complex-matcher": "^0.7.0",
     "d3-time-format": "^4.1.0",
     "decorator-synchronized": "^0.6.0",
     "echarts": "^5.3.3",

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

@@ -4,10 +4,10 @@
     <AppLogin />
   </div>
   <div v-else>
-    <AppHeader v-if="uiStore.hasUi" />
+    <AppHeader />
     <div style="display: flex">
-      <AppNavigation v-if="uiStore.hasUi" />
-      <main class="main" :class="{ 'no-ui': !uiStore.hasUi }">
+      <AppNavigation />
+      <main class="main">
         <RouterView />
       </main>
     </div>
@@ -41,6 +41,8 @@ if (link == null) {
 }
 link.href = favicon;
 
+document.title = "XO Lite";
+
 const xenApiStore = useXenApiStore();
 const { pool } = usePoolStore().subscribe();
 useChartTheme();
@@ -90,9 +92,5 @@ whenever(
   flex: 1;
   height: calc(100vh - 8rem);
   background-color: var(--background-color-secondary);
-
-  &.no-ui {
-    height: 100vh;
-  }
 }
 </style>

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

@@ -24,7 +24,6 @@
 </template>
 
 <script lang="ts" setup>
-import { usePageTitleStore } from "@/stores/page-title.store";
 import { storeToRefs } from "pinia";
 import { onMounted, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
@@ -34,7 +33,6 @@ import UiButton from "@/components/ui/UiButton.vue";
 import { useXenApiStore } from "@/stores/xen-api.store";
 
 const { t } = useI18n();
-usePageTitleStore().setTitle(t("login"));
 const xenApiStore = useXenApiStore();
 const { isConnecting } = storeToRefs(xenApiStore);
 const login = ref("root");
@@ -64,7 +62,7 @@ async function handleSubmit() {
       isInvalidPassword.value = true;
       error.value = t("password-invalid");
     } else {
-      error.value = t("error-occurred");
+      error.value = t("error-occured");
       console.error(err);
     }
   }

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

@@ -7,12 +7,12 @@
 </template>
 
 <script
-  generic="T extends XenApiRecord<RawObjectType>, I extends T['uuid']"
+  generic="T extends XenApiRecord<string>, I extends T['uuid']"
   lang="ts"
   setup
 >
 import UiSpinner from "@/components/ui/UiSpinner.vue";
-import type { RawObjectType, XenApiRecord } from "@/libs/xen-api";
+import type { XenApiRecord } from "@/libs/xen-api";
 import ObjectNotFoundView from "@/views/ObjectNotFoundView.vue";
 import { computed } from "vue";
 import { useRouter } from "vue-router";

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

@@ -3,11 +3,11 @@
 </template>
 
 <script lang="ts" setup>
-import { useXenApiStore } from "@/stores/xen-api.store";
-import VncClient from "@novnc/novnc/core/rfb";
-import { promiseTimeout } from "@vueuse/shared";
 import { fibonacci } from "iterable-backoff";
 import { computed, onBeforeUnmount, ref, watchEffect } from "vue";
+import VncClient from "@novnc/novnc/core/rfb";
+import { useXenApiStore } from "@/stores/xen-api.store";
+import { promiseTimeout } from "@vueuse/shared";
 
 const N_TOTAL_TRIES = 8;
 const FIBONACCI_MS_ARRAY: number[] = Array.from(

@xen-orchestra/lite/src/components/component-story/ComponentStory.vue

@@ -33,7 +33,7 @@
     </AppMenu>
   </UiTabBar>
 
-  <div :class="{ 'full-width': fullWidthComponent }" class="tabs">
+  <div class="tabs">
     <UiCard v-if="selectedTab === TAB.NONE" class="tab-content">
       <i>No configuration defined</i>
     </UiCard>
@@ -102,11 +102,11 @@ import StorySettingParams from "@/components/component-story/StorySettingParams.
 import StorySlotParams from "@/components/component-story/StorySlotParams.vue";
 import AppMenu from "@/components/menu/AppMenu.vue";
 import MenuItem from "@/components/menu/MenuItem.vue";
-import UiIcon from "@/components/ui/icon/UiIcon.vue";
 import UiButton from "@/components/ui/UiButton.vue";
 import UiCard from "@/components/ui/UiCard.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import UiCounter from "@/components/ui/UiCounter.vue";
+import UiIcon from "@/components/ui/icon/UiIcon.vue";
 import UiTab from "@/components/ui/UiTab.vue";
 import UiTabBar from "@/components/ui/UiTabBar.vue";
 import {
@@ -140,7 +140,6 @@ const props = defineProps<{
       settings?: Record<string, any>;
     }
   >;
-  fullWidthComponent?: boolean;
 }>();
 
 enum TAB {
@@ -330,10 +329,6 @@ const applyPreset = (preset: {
   padding: 1rem;
   gap: 1rem;
 
-  &.full-width {
-    flex-direction: column;
-  }
-
   .tab-content {
     flex: 1;
     height: auto;

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

@@ -34,6 +34,7 @@ const {
   isReady: isVmReady,
   records: vms,
   hasError: hasVmError,
+  runningVms,
 } = useVmStore().subscribe();
 
 const {
@@ -54,7 +55,5 @@ const activeHostsCount = computed(
 
 const totalVmsCount = computed(() => vms.value.length);
 
-const activeVmsCount = computed(
-  () => vms.value.filter((vm) => vm.power_state === "Running").length
-);
+const activeVmsCount = computed(() => runningVms.value.length);
 </script>

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

@@ -1,17 +0,0 @@
-<template>
-  <UiCard>
-    <UiCardTitle :count="pendingTasks.length">{{ $t("tasks") }}</UiCardTitle>
-    <TasksTable :pending-tasks="pendingTasks" />
-  </UiCard>
-</template>
-
-<script lang="ts" setup>
-import TasksTable from "@/components/tasks/TasksTable.vue";
-import UiCard from "@/components/ui/UiCard.vue";
-import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import { useTaskStore } from "@/stores/task.store";
-
-const { pendingTasks } = useTaskStore().subscribe();
-</script>
-
-<style lang="postcss" scoped></style>

@xen-orchestra/lite/src/components/tasks/TasksTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <UiTable :color="hasError ? 'error' : undefined" class="tasks-table">
+  <UiTable class="tasks-table" :color="hasError ? 'error' : undefined">
     <thead>
       <tr>
         <th>{{ $t("name") }}</th>
@@ -20,9 +20,6 @@
           <UiSpinner class="loader" />
         </td>
       </tr>
-      <tr v-else-if="!hasTasks">
-        <td class="no-tasks" colspan="5">{{ $t("no-tasks") }}</td>
-      </tr>
       <template v-else>
         <TaskRow
           v-for="task in pendingTasks"
@@ -38,35 +35,20 @@
 
 <script lang="ts" setup>
 import TaskRow from "@/components/tasks/TaskRow.vue";
-import UiSpinner from "@/components/ui/UiSpinner.vue";
 import UiTable from "@/components/ui/UiTable.vue";
-import type { XenApiTask } from "@/libs/xen-api";
+import UiSpinner from "@/components/ui/UiSpinner.vue";
 import { useTaskStore } from "@/stores/task.store";
-import { computed } from "vue";
+import type { XenApiTask } from "@/libs/xen-api";
 
-const props = defineProps<{
+defineProps<{
   pendingTasks: XenApiTask[];
-  finishedTasks?: XenApiTask[];
+  finishedTasks: XenApiTask[];
 }>();
 
 const { hasError, isFetching } = useTaskStore().subscribe();
-
-const hasTasks = computed(
-  () => props.pendingTasks.length > 0 || (props.finishedTasks?.length ?? 0) > 0
-);
 </script>
 
 <style lang="postcss" scoped>
-.tasks-table {
-  width: 100%;
-}
-
-.no-tasks {
-  text-align: center;
-  color: var(--color-blue-scale-300);
-  font-style: italic;
-}
-
 td[colspan="5"] {
   text-align: center;
 }

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

@@ -6,7 +6,6 @@
       class="left"
     >
       <slot>{{ left }}</slot>
-      <UiCounter class="count" v-if="count > 0" :value="count" color="info" />
     </component>
     <component
       :is="subtitle ? 'h6' : 'h5'"
@@ -19,17 +18,11 @@
 </template>
 
 <script lang="ts" setup>
-import UiCounter from "@/components/ui/UiCounter.vue";
-
-withDefaults(
-  defineProps<{
-    subtitle?: boolean;
-    left?: string;
-    right?: string;
-    count?: number;
-  }>(),
-  { count: 0 }
-);
+defineProps<{
+  subtitle?: boolean;
+  left?: string;
+  right?: string;
+}>();
 </script>
 
 <style lang="postcss" scoped>
@@ -62,9 +55,6 @@ withDefaults(
   font-size: var(--section-title-left-size);
   font-weight: var(--section-title-left-weight);
   color: var(--section-title-left-color);
-  display: flex;
-  align-items: center;
-  gap: 2rem;
 }
 
 .right {
@@ -72,8 +62,4 @@ withDefaults(
   font-weight: var(--section-title-right-weight);
   color: var(--section-title-right-color);
 }
-
-.count {
-  font-size: 1.6rem;
-}
 </style>

@xen-orchestra/lite/src/components/ui/resources/UiResource.vue

@@ -1,50 +0,0 @@
-<template>
-  <li class="ui-resource">
-    <UiIcon :icon="icon" class="icon" />
-    <div class="separator" />
-    <div class="label">{{ label }}</div>
-    <div class="count">{{ count }}</div>
-  </li>
-</template>
-
-<script lang="ts" setup>
-import UiIcon from "@/components/ui/icon/UiIcon.vue";
-import type { IconDefinition } from "@fortawesome/fontawesome-common-types";
-
-defineProps<{
-  icon: IconDefinition;
-  label: string;
-  count: string | number;
-}>();
-</script>
-
-<style lang="postcss" scoped>
-.ui-resource {
-  display: flex;
-  align-items: center;
-}
-
-.icon {
-  color: var(--color-extra-blue-base);
-  font-size: 3.2rem;
-}
-
-.separator {
-  height: 4.5rem;
-  width: 0;
-  border-left: 0.1rem solid var(--color-extra-blue-base);
-  background-color: var(--color-extra-blue-base);
-  margin: 0 1.5rem;
-}
-
-.label {
-  font-size: 1.6rem;
-  font-weight: 700;
-}
-
-.count {
-  font-size: 1.4rem;
-  font-weight: 400;
-  margin-left: 2rem;
-}
-</style>

@xen-orchestra/lite/src/components/ui/resources/UiResources.vue

@@ -1,13 +0,0 @@
-<template>
-  <ul class="ui-resources">
-    <slot />
-  </ul>
-</template>
-
-<style lang="postcss" scoped>
-.ui-resources {
-  display: flex;
-  gap: 1rem 5.4rem;
-  flex-wrap: wrap;
-}
-</style>

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

@@ -1,14 +1,13 @@
 import type {
   RawXenApiRecord,
   XenApiHost,
+  XenApiHostMetrics,
   XenApiRecord,
   XenApiVm,
   VM_OPERATION,
-  RawObjectType,
-  XenApiHostMetrics,
 } from "@/libs/xen-api";
 import type { Filter } from "@/types/filter";
-import type { XenApiRecordSubscription } from "@/types/subscription";
+import type { Subscription } from "@/types/xapi-collection";
 import { faSquareCheck } from "@fortawesome/free-regular-svg-icons";
 import { faFont, faHashtag, faList } from "@fortawesome/free-solid-svg-icons";
 import { utcParse } from "d3-time-format";
@@ -117,14 +116,14 @@ export function getStatsLength(stats?: object | any[]) {
 
 export function isHostRunning(
   host: XenApiHost,
-  hostMetricsSubscription: XenApiRecordSubscription<XenApiHostMetrics>
+  hostMetricsSubscription: Subscription<XenApiHostMetrics, object>
 ) {
   return hostMetricsSubscription.getByOpaqueRef(host.metrics)?.live === true;
 }
 
 export function getHostMemory(
   host: XenApiHost,
-  hostMetricsSubscription: XenApiRecordSubscription<XenApiHostMetrics>
+  hostMetricsSubscription: Subscription<XenApiHostMetrics, object>
 ) {
   const hostMetrics = hostMetricsSubscription.getByOpaqueRef(host.metrics);
 
@@ -137,7 +136,7 @@ export function getHostMemory(
   }
 }
 
-export const buildXoObject = <T extends XenApiRecord<RawObjectType>>(
+export const buildXoObject = <T extends XenApiRecord<string>>(
   record: RawXenApiRecord<T>,
   params: { opaqueRef: T["$ref"] }
 ) => {

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

@@ -90,17 +90,14 @@ export enum VM_OPERATION {
 
 declare const __brand: unique symbol;
 
-export interface XenApiRecord<Name extends RawObjectType> {
+export interface XenApiRecord<Name extends string> {
   $ref: string & { [__brand]: `${Name}Ref` };
   uuid: string & { [__brand]: `${Name}Uuid` };
 }
 
-export type RawXenApiRecord<T extends XenApiRecord<RawObjectType>> = Omit<
-  T,
-  "$ref"
->;
+export type RawXenApiRecord<T extends XenApiRecord<string>> = Omit<T, "$ref">;
 
-export interface XenApiPool extends XenApiRecord<"pool"> {
+export interface XenApiPool extends XenApiRecord<"Pool"> {
   cpu_info: {
     cpu_count: string;
   };
@@ -108,7 +105,7 @@ export interface XenApiPool extends XenApiRecord<"pool"> {
   name_label: string;
 }
 
-export interface XenApiHost extends XenApiRecord<"host"> {
+export interface XenApiHost extends XenApiRecord<"Host"> {
   address: string;
   name_label: string;
   metrics: XenApiHostMetrics["$ref"];
@@ -117,13 +114,13 @@ export interface XenApiHost extends XenApiRecord<"host"> {
   software_version: { product_version: string };
 }
 
-export interface XenApiSr extends XenApiRecord<"SR"> {
+export interface XenApiSr extends XenApiRecord<"Sr"> {
   name_label: string;
   physical_size: number;
   physical_utilisation: number;
 }
 
-export interface XenApiVm extends XenApiRecord<"VM"> {
+export interface XenApiVm extends XenApiRecord<"Vm"> {
   current_operations: Record<string, VM_OPERATION>;
   guest_metrics: string;
   metrics: XenApiVmMetrics["$ref"];
@@ -138,24 +135,24 @@ export interface XenApiVm extends XenApiRecord<"VM"> {
   VCPUs_at_startup: number;
 }
 
-export interface XenApiConsole extends XenApiRecord<"console"> {
+export interface XenApiConsole extends XenApiRecord<"Console"> {
   protocol: string;
   location: string;
 }
 
-export interface XenApiHostMetrics extends XenApiRecord<"host_metrics"> {
+export interface XenApiHostMetrics extends XenApiRecord<"HostMetrics"> {
   live: boolean;
   memory_free: number;
   memory_total: number;
 }
 
-export interface XenApiVmMetrics extends XenApiRecord<"VM_metrics"> {
+export interface XenApiVmMetrics extends XenApiRecord<"VmMetrics"> {
   VCPUs_number: number;
 }
 
-export type XenApiVmGuestMetrics = XenApiRecord<"VM_guest_metrics">;
+export type XenApiVmGuestMetrics = XenApiRecord<"VmGuestMetrics">;
 
-export interface XenApiTask extends XenApiRecord<"task"> {
+export interface XenApiTask extends XenApiRecord<"Task"> {
   name_label: string;
   resident_on: XenApiHost["$ref"];
   created: string;
@@ -164,61 +161,17 @@ export interface XenApiTask extends XenApiRecord<"task"> {
   progress: number;
 }
 
-export interface XenApiMessage<T extends RawObjectType = RawObjectType>
-  extends XenApiRecord<"message"> {
-  body: string;
-  cls: T;
+export interface XenApiMessage extends XenApiRecord<"Message"> {
   name: string;
-  obj_uuid: RawTypeToRecord<T>["uuid"];
-  priority: number;
-  timestamp: string;
+  cls: RawObjectType;
 }
 
-export type XenApiAlarmType =
-  | "cpu_usage"
-  | "disk_usage"
-  | "fs_usage"
-  | "log_fs_usage"
-  | "mem_usage"
-  | "memory_free_kib"
-  | "network_usage"
-  | "physical_utilisation"
-  | "sr_io_throughput_total_per_host";
-
-export interface XenApiAlarm extends XenApiMessage {
-  level: number;
-  triggerLevel: number;
-  type: XenApiAlarmType;
-}
-
-export type RawTypeToRecord<T extends RawObjectType> = T extends "SR"
-  ? XenApiSr
-  : T extends "VM"
-  ? XenApiVm
-  : T extends "VM_guest_metrics"
-  ? XenApiVmGuestMetrics
-  : T extends "VM_metrics"
-  ? XenApiVmMetrics
-  : T extends "console"
-  ? XenApiConsole
-  : T extends "host"
-  ? XenApiHost
-  : T extends "host_metrics"
-  ? XenApiHostMetrics
-  : T extends "message"
-  ? XenApiMessage
-  : T extends "pool"
-  ? XenApiPool
-  : T extends "task"
-  ? XenApiTask
-  : never;
-
 type WatchCallbackResult = {
   id: string;
   class: ObjectType;
   operation: "add" | "mod" | "del";
-  ref: XenApiRecord<RawObjectType>["$ref"];
-  snapshot: RawXenApiRecord<XenApiRecord<RawObjectType>>;
+  ref: XenApiRecord<string>["$ref"];
+  snapshot: RawXenApiRecord<XenApiRecord<string>>;
 };
 
 type WatchCallback = (results: WatchCallbackResult[]) => void;
@@ -331,17 +284,16 @@ export default class XenApi {
     return fetch(url, { signal: abortSignal });
   }
 
-  async loadRecords<
-    T extends RawObjectType,
-    R extends RawTypeToRecord<T> = RawTypeToRecord<T>
-  >(type: T): Promise<R[]> {
-    const result = await this.#call<{ [key: string]: R }>(
+  async loadRecords<T extends XenApiRecord<string>>(
+    type: RawObjectType
+  ): Promise<T[]> {
+    const result = await this.#call<{ [key: string]: RawXenApiRecord<T> }>(
       `${type}.get_all_records`,
       [this.sessionId]
     );
 
     return Object.entries(result).map(([opaqueRef, record]) =>
-      buildXoObject(record, { opaqueRef: opaqueRef as R["$ref"] })
+      buildXoObject(record, { opaqueRef: opaqueRef as T["$ref"] })
     );
   }
 

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

@@ -18,7 +18,6 @@
   "community": "Community",
   "community-name": "{name} community",
   "console": "Console",
-  "console-unavailable": "Console unavailable",
   "copy": "Copy",
   "cpu-provisioning": "CPU provisioning",
   "cpu-usage": "CPU usage",
@@ -33,7 +32,7 @@
   "do-you-have-needs": "You have needs and/or expectations? Let us know",
   "edit-config": "Edit config",
   "error-no-data": "Error, can't collect data.",
-  "error-occurred": "An error has occurred",
+  "error-occured": "An error has occurred",
   "export": "Export",
   "export-table-to": "Export table to {type}",
   "export-vms": "Export VMs",
@@ -78,11 +77,8 @@
   "news": "News",
   "news-name": "{name} news",
   "new-features-are-coming": "New features are coming soon!",
-  "no-tasks": "No tasks",
-  "not-found": "Not found",
   "object": "Object",
   "object-not-found": "Object {id} can't be found…",
-  "open-in-new-window": "Open in new window",
   "or": "Or",
   "page-not-found": "This page is not to be found…",
   "password": "Password",
@@ -91,7 +87,6 @@
   "please-confirm": "Please confirm",
   "pool-cpu-usage": "Pool CPU Usage",
   "pool-ram-usage": "Pool RAM Usage",
-  "power-on-for-console": "Power on your VM to access its console",
   "power-state": "Power state",
   "property": "Property",
   "ram-usage": "RAM usage",
@@ -115,6 +110,7 @@
   "settings": "Settings",
   "shutdown": "Shutdown",
   "snapshot": "Snapshot",
+  "selected-vms-in-execution": "Some selected VMs are running",
   "sort-by": "Sort by",
   "stacked-cpu-usage": "Stacked CPU usage",
   "stacked-ram-usage": "Stacked RAM usage",
@@ -131,6 +127,7 @@
   "system": "System",
   "task": {
     "estimated-end": "Estimated end",
+    "page-title": "Tasks | (1) Tasks | ({n}) Tasks",
     "progress": "Progress",
     "started": "Started"
   },

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

@@ -18,7 +18,6 @@
   "community": "Communauté",
   "community-name": "Communauté {name}",
   "console": "Console",
-  "console-unavailable": "Console indisponible",
   "copy": "Copier",
   "cpu-provisioning": "Provisionnement CPU",
   "cpu-usage": "Utilisation CPU",
@@ -33,7 +32,7 @@
   "do-you-have-needs": "Vous avez des besoins et/ou des attentes ? Faites le nous savoir",
   "edit-config": "Modifier config",
   "error-no-data": "Erreur, impossible de collecter les données.",
-  "error-occurred": "Une erreur est survenue",
+  "error-occured": "Une erreur est survenue",
   "export": "Exporter",
   "export-table-to": "Exporter le tableau en {type}",
   "export-vms": "Exporter les VMs",
@@ -78,11 +77,8 @@
   "news": "Actualités",
   "news-name": "Actualités {name}",
   "new-features-are-coming": "De nouvelles fonctionnalités arrivent bientôt !",
-  "no-tasks": "Aucune tâche",
-  "not-found": "Non trouvé",
   "object": "Objet",
   "object-not-found": "L'objet {id} est introuvable…",
-  "open-in-new-window": "Ouvrir dans une nouvelle fenêtre",
   "or": "Ou",
   "page-not-found": "Cette page est introuvable…",
   "password": "Mot de passe",
@@ -91,7 +87,6 @@
   "please-confirm": "Veuillez confirmer",
   "pool-cpu-usage": "Utilisation CPU du Pool",
   "pool-ram-usage": "Utilisation RAM du Pool",
-  "power-on-for-console": "Allumez votre VM pour accéder à sa console",
   "power-state": "État d'alimentation",
   "property": "Propriété",
   "ram-usage": "Utilisation de la RAM",
@@ -115,6 +110,7 @@
   "settings": "Paramètres",
   "shutdown": "Arrêter",
   "snapshot": "Instantané",
+  "selected-vms-in-execution": "Certaines VMs sélectionnées sont en cours d'exécution",
   "sort-by": "Trier par",
   "stacked-cpu-usage": "Utilisation CPU empilée",
   "stacked-ram-usage": "Utilisation RAM empilée",
@@ -131,6 +127,7 @@
   "system": "Système",
   "task": {
     "estimated-end": "Fin estimée",
+    "page-title": "Tâches | (1) Tâches | ({n}) Tâches",
     "progress": "Progression",
     "started": "Démarré"
   },

@xen-orchestra/lite/src/router/index.ts

@@ -33,7 +33,7 @@ const router = createRouter({
     },
     {
       path: "/:pathMatch(.*)*",
-      name: "not-found",
+      name: "notFound",
       component: () => import("@/views/PageNotFoundView.vue"),
     },
   ],

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

@@ -1,33 +1,28 @@
-import type { XenApiAlarm } from "@/libs/xen-api";
+import type { XenApiMessage } from "@/libs/xen-api";
 import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import type {
-  DeferExtension,
-  Options,
-  Subscription,
-  XenApiRecordExtension,
-} from "@/types/subscription";
+import { createSubscribe } from "@/types/xapi-collection";
 import { defineStore } from "pinia";
 import { computed } from "vue";
 
-type Extensions = [XenApiRecordExtension<XenApiAlarm>, DeferExtension];
-
 export const useAlarmStore = defineStore("alarm", () => {
   const messageCollection = useXapiCollectionStore().get("message");
 
-  const subscribe = <O extends Options<Extensions>>(options?: O) => {
-    const subscription = messageCollection.subscribe(options);
+  const subscribe = createSubscribe<XenApiMessage, []>((options) => {
+    const originalSubscription = messageCollection.subscribe(options);
 
     const extendedSubscription = {
       records: computed(() =>
-        subscription.records.value.filter((record) => record.name === "alarm")
+        originalSubscription.records.value.filter(
+          (record) => record.name === "alarm"
+        )
       ),
     };
 
     return {
-      ...subscription,
+      ...originalSubscription,
       ...extendedSubscription,
-    } as Subscription<Extensions, O>;
-  };
+    };
+  });
 
   return {
     ...messageCollection,

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

@@ -1,88 +0,0 @@
-import { isHostRunning } from "@/libs/utils";
-import type {
-  GRANULARITY,
-  HostStats,
-  XapiStatsResponse,
-} from "@/libs/xapi-stats";
-import type { XenApiHost, XenApiHostMetrics } from "@/libs/xen-api";
-import { useXenApiStore } from "@/stores/xen-api.store";
-import type {
-  Extension,
-  XenApiRecordExtension,
-  XenApiRecordSubscription,
-} from "@/types/subscription";
-import type { PartialSubscription } from "@/types/subscription";
-import { computed } from "vue";
-import type { ComputedRef } from "vue";
-
-type GetStatsExtension = Extension<{
-  getStats: (
-    hostUuid: XenApiHost["uuid"],
-    granularity: GRANULARITY,
-    ignoreExpired: boolean,
-    opts: { abortSignal?: AbortSignal }
-  ) => Promise<XapiStatsResponse<HostStats> | undefined> | undefined;
-}>;
-
-type RunningHostsExtension = Extension<
-  { runningHosts: ComputedRef<XenApiHost[]> },
-  { hostMetricsSubscription: XenApiRecordSubscription<XenApiHostMetrics> }
->;
-
-export type HostExtensions = [
-  XenApiRecordExtension<XenApiHost>,
-  GetStatsExtension,
-  RunningHostsExtension
-];
-
-export const getStatsSubscription = (
-  hostSubscription: XenApiRecordSubscription<XenApiHost>
-): PartialSubscription<GetStatsExtension> => {
-  const xenApiStore = useXenApiStore();
-
-  return {
-    getStats: (
-      hostUuid,
-      granularity,
-      ignoreExpired = false,
-      { abortSignal }
-    ) => {
-      const host = hostSubscription.getByUuid(hostUuid);
-
-      if (host === undefined) {
-        throw new Error(`Host ${hostUuid} could not be found.`);
-      }
-
-      const xapiStats = xenApiStore.isConnected
-        ? xenApiStore.getXapiStats()
-        : undefined;
-
-      return xapiStats?._getAndUpdateStats<HostStats>({
-        abortSignal,
-        host,
-        ignoreExpired,
-        uuid: host.uuid,
-        granularity,
-      });
-    },
-  };
-};
-
-export const runningHostsSubscription = (
-  hostSubscription: XenApiRecordSubscription<XenApiHost>,
-  hostMetricsSubscription:
-    | XenApiRecordSubscription<XenApiHostMetrics>
-    | undefined
-): PartialSubscription<RunningHostsExtension> | undefined => {
-  if (hostMetricsSubscription === undefined) {
-    return undefined;
-  }
-
-  return {
-    runningHosts: computed(() =>
-      hostSubscription.records.value.filter((host) =>
-        isHostRunning(host, hostMetricsSubscription)
-      )
-    ),
-  };
-};

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

@@ -1,28 +1,88 @@
-import { sortRecordsByNameLabel } from "@/libs/utils";
-import type { HostExtensions } from "@/stores/host.extension";
-import {
-  getStatsSubscription,
-  runningHostsSubscription,
-} from "@/stores/host.extension";
+import { isHostRunning, sortRecordsByNameLabel } from "@/libs/utils";
+import type {
+  GRANULARITY,
+  HostStats,
+  XapiStatsResponse,
+} from "@/libs/xapi-stats";
+import type { XenApiHost, XenApiHostMetrics } from "@/libs/xen-api";
 import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import type { Options, Subscription } from "@/types/subscription";
+import { useXenApiStore } from "@/stores/xen-api.store";
+import type { Subscription } from "@/types/xapi-collection";
+import { createSubscribe } from "@/types/xapi-collection";
 import { defineStore } from "pinia";
+import { computed, type ComputedRef } from "vue";
+
+type GetStats = (
+  hostUuid: XenApiHost["uuid"],
+  granularity: GRANULARITY,
+  ignoreExpired: boolean,
+  opts: { abortSignal?: AbortSignal }
+) => Promise<XapiStatsResponse<HostStats> | undefined> | undefined;
+
+type GetStatsExtension = {
+  getStats: GetStats;
+};
+
+type RunningHostsExtension = [
+  { runningHosts: ComputedRef<XenApiHost[]> },
+  { hostMetricsSubscription: Subscription<XenApiHostMetrics, any> }
+];
+
+type Extensions = [GetStatsExtension, RunningHostsExtension];
 
 export const useHostStore = defineStore("host", () => {
+  const xenApiStore = useXenApiStore();
   const hostCollection = useXapiCollectionStore().get("host");
 
   hostCollection.setSort(sortRecordsByNameLabel);
 
-  const subscribe = <O extends Options<HostExtensions>>(options?: O) => {
-    const subscription = hostCollection.subscribe(options);
-    const { hostMetricsSubscription } = options ?? {};
+  const subscribe = createSubscribe<XenApiHost, Extensions>((options) => {
+    const originalSubscription = hostCollection.subscribe(options);
 
+    const getStats: GetStats = (
+      hostUuid,
+      granularity,
+      ignoreExpired = false,
+      { abortSignal }
+    ) => {
+      const host = originalSubscription.getByUuid(hostUuid);
+
+      if (host === undefined) {
+        throw new Error(`Host ${hostUuid} could not be found.`);
+      }
+
+      const xapiStats = xenApiStore.isConnected
+        ? xenApiStore.getXapiStats()
+        : undefined;
+
+      return xapiStats?._getAndUpdateStats<HostStats>({
+        abortSignal,
+        host,
+        ignoreExpired,
+        uuid: host.uuid,
+        granularity,
+      });
+    };
+
+    const extendedSubscription = {
+      getStats,
+    };
+
+    const hostMetricsSubscription = options?.hostMetricsSubscription;
+
+    const runningHostsSubscription = hostMetricsSubscription !== undefined && {
+      runningHosts: computed(() =>
+        originalSubscription.records.value.filter((host) =>
+          isHostRunning(host, hostMetricsSubscription)
+        )
+      ),
+    };
     return {
-      ...subscription,
-      ...getStatsSubscription(subscription),
-      ...runningHostsSubscription(subscription, hostMetricsSubscription),
-    } as Subscription<HostExtensions, O>;
-  };
+      ...originalSubscription,
+      ...extendedSubscription,
+      ...runningHostsSubscription,
+    };
+  });
 
   return {
     ...hostCollection,

@xen-orchestra/lite/src/stores/page-title.store.ts

@@ -1,92 +0,0 @@
-import { useTitle } from "@vueuse/core";
-import { defineStore } from "pinia";
-import {
-  computed,
-  type MaybeRefOrGetter,
-  onBeforeUnmount,
-  reactive,
-  toRef,
-  watch,
-} from "vue";
-
-const PAGE_TITLE_SUFFIX = "XO Lite";
-
-interface PageTitleConfig {
-  object: { name_label: string } | undefined;
-  title: string | undefined;
-  count: number | undefined;
-}
-
-export const usePageTitleStore = defineStore("page-title", () => {
-  const pageTitleConfig = reactive<PageTitleConfig>({
-    count: undefined,
-    title: undefined,
-    object: undefined,
-  });
-
-  const generatedPageTitle = computed(() => {
-    const { object, title, count } = pageTitleConfig;
-    const parts = [];
-
-    if (count !== undefined && count > 0) {
-      parts.push(`(${count})`);
-    }
-
-    if (title !== undefined && object !== undefined) {
-      parts.push(`${title} - ${object.name_label}`);
-    } else if (title !== undefined) {
-      parts.push(title);
-    } else if (object !== undefined) {
-      parts.push(object.name_label);
-    }
-
-    if (parts.length === 0) {
-      return undefined;
-    }
-
-    return parts.join(" ");
-  });
-
-  useTitle(generatedPageTitle, {
-    titleTemplate: computed(() =>
-      generatedPageTitle.value === undefined
-        ? PAGE_TITLE_SUFFIX
-        : `%s - ${PAGE_TITLE_SUFFIX}`
-    ),
-  });
-
-  const setPageTitleConfig = <T extends keyof PageTitleConfig>(
-    configKey: T,
-    value: MaybeRefOrGetter<PageTitleConfig[T]>
-  ) => {
-    const stop = watch(
-      toRef(value),
-      (newValue) =>
-        (pageTitleConfig[configKey] = newValue as PageTitleConfig[T]),
-      {
-        immediate: true,
-      }
-    );
-
-    onBeforeUnmount(() => {
-      stop();
-      pageTitleConfig[configKey] = undefined;
-    });
-  };
-
-  const setObject = (
-    object: MaybeRefOrGetter<{ name_label: string } | undefined>
-  ) => setPageTitleConfig("object", object);
-
-  const setTitle = (title: MaybeRefOrGetter<string | undefined>) =>
-    setPageTitleConfig("title", title);
-
-  const setCount = (count: MaybeRefOrGetter<number | undefined>) =>
-    setPageTitleConfig("count", count);
-
-  return {
-    setObject,
-    setTitle,
-    setCount,
-  };
-});

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

@@ -1,36 +1,31 @@
 import { getFirst } from "@/libs/utils";
 import type { XenApiPool } from "@/libs/xen-api";
 import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import type {
-  Extension,
-  Options,
-  PartialSubscription,
-  Subscription,
-  XenApiRecordExtension,
-} from "@/types/subscription";
+import { createSubscribe } from "@/types/xapi-collection";
 import { defineStore } from "pinia";
 import { computed, type ComputedRef } from "vue";
 
-type PoolExtension = Extension<{
+type PoolExtension = {
   pool: ComputedRef<XenApiPool | undefined>;
-}>;
+};
 
-type Extensions = [XenApiRecordExtension<XenApiPool>, PoolExtension];
+type Extensions = [PoolExtension];
 
 export const usePoolStore = defineStore("pool", () => {
   const poolCollection = useXapiCollectionStore().get("pool");
-  const subscribe = <O extends Options<Extensions>>(options?: O) => {
-    const subscription = poolCollection.subscribe(options);
 
-    const extendedSubscription: PartialSubscription<PoolExtension> = {
-      pool: computed(() => getFirst(subscription.records.value)),
+  const subscribe = createSubscribe<XenApiPool, Extensions>((options) => {
+    const originalSubscription = poolCollection.subscribe(options);
+
+    const extendedSubscription = {
+      pool: computed(() => getFirst(originalSubscription.records.value)),
     };
 
     return {
-      ...subscription,
+      ...originalSubscription,
       ...extendedSubscription,
-    } as Subscription<Extensions, O>;
-  };
+    };
+  });
 
   return {
     ...poolCollection,

@xen-orchestra/lite/src/stores/task.extension.ts

@@ -1,56 +0,0 @@
-import useArrayRemovedItemsHistory from "@/composables/array-removed-items-history.composable";
-import useCollectionFilter from "@/composables/collection-filter.composable";
-import useCollectionSorter from "@/composables/collection-sorter.composable";
-import useFilteredCollection from "@/composables/filtered-collection.composable";
-import useSortedCollection from "@/composables/sorted-collection.composable";
-import type { XenApiTask } from "@/libs/xen-api";
-import type {
-  Extension,
-  PartialSubscription,
-  XenApiRecordExtension,
-  XenApiRecordSubscription,
-} from "@/types/subscription";
-import type { ComputedRef, Ref } from "vue";
-
-type AdditionalTasksExtension = Extension<{
-  pendingTasks: ComputedRef<XenApiTask[]>;
-  finishedTasks: Ref<XenApiTask[]>;
-}>;
-
-export type TaskExtensions = [
-  XenApiRecordExtension<XenApiTask>,
-  AdditionalTasksExtension
-];
-
-export const additionalTasksSubscription = (
-  taskSubscription: XenApiRecordSubscription<XenApiTask>
-): PartialSubscription<AdditionalTasksExtension> => {
-  const { compareFn } = useCollectionSorter<XenApiTask>({
-    initialSorts: ["-created"],
-  });
-
-  const { predicate } = useCollectionFilter({
-    initialFilters: [
-      "!name_label:|(SR.scan host.call_plugin)",
-      "status:pending",
-    ],
-  });
-
-  const sortedTasks = useSortedCollection(taskSubscription.records, compareFn);
-
-  return {
-    pendingTasks: useFilteredCollection<XenApiTask>(sortedTasks, predicate),
-    finishedTasks: useArrayRemovedItemsHistory(
-      sortedTasks,
-      (task) => task.uuid,
-      {
-        limit: 50,
-        onRemove: (tasks) =>
-          tasks.map((task) => ({
-            ...task,
-            finished: new Date().toISOString(),
-          })),
-      }
-    ),
-  };
-};

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

@@ -1,22 +1,6 @@
-import {
-  additionalTasksSubscription,
-  type TaskExtensions,
-} from "@/stores/task.extension";
 import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import type { Options, Subscription } from "@/types/subscription";
 import { defineStore } from "pinia";
 
-export const useTaskStore = defineStore("task", () => {
-  const tasksCollection = useXapiCollectionStore().get("task");
-
-  const subscribe = <O extends Options<TaskExtensions>>(options?: O) => {
-    const subscription = tasksCollection.subscribe(options);
-
-    return {
-      ...subscription,
-      ...additionalTasksSubscription(subscription),
-    } as Subscription<TaskExtensions, O>;
-  };
-
-  return { ...tasksCollection, subscribe };
-});
+export const useTaskStore = defineStore("task", () =>
+  useXapiCollectionStore().get("task")
+);

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

@@ -1,7 +1,6 @@
 import { useBreakpoints, useColorMode } from "@vueuse/core";
 import { defineStore } from "pinia";
 import { computed, ref } from "vue";
-import { useRoute } from "vue-router";
 
 export const useUiStore = defineStore("ui", () => {
   const currentHostOpaqueRef = ref();
@@ -14,14 +13,10 @@ export const useUiStore = defineStore("ui", () => {
 
   const isMobile = computed(() => !isDesktop.value);
 
-  const route = useRoute();
-  const hasUi = computed(() => route.query.ui !== "0");
-
   return {
     colorMode,
     currentHostOpaqueRef,
     isDesktop,
     isMobile,
-    hasUi,
   };
 });

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

@@ -1,108 +0,0 @@
-import type {
-  GRANULARITY,
-  VmStats,
-  XapiStatsResponse,
-} from "@/libs/xapi-stats";
-import { POWER_STATE, type XenApiHost, type XenApiVm } from "@/libs/xen-api";
-import { useXenApiStore } from "@/stores/xen-api.store";
-import type {
-  Extension,
-  PartialSubscription,
-  XenApiRecordExtension,
-  XenApiRecordSubscription,
-} from "@/types/subscription";
-import { computed, type ComputedRef } from "vue";
-
-type RecordsByHostRefExtension = Extension<{
-  recordsByHostRef: ComputedRef<Map<XenApiHost["$ref"], XenApiVm[]>>;
-}>;
-
-type RunningVmsExtension = Extension<{
-  runningVms: ComputedRef<XenApiVm[]>;
-}>;
-
-type GetStatsExtension = Extension<
-  {
-    getStats: (
-      id: XenApiVm["uuid"],
-      granularity: GRANULARITY,
-      ignoreExpired: boolean,
-      opts: { abortSignal?: AbortSignal }
-    ) => Promise<XapiStatsResponse<VmStats> | undefined> | undefined;
-  },
-  { hostSubscription: XenApiRecordSubscription<XenApiHost> }
->;
-
-export type VmExtensions = [
-  XenApiRecordExtension<XenApiVm>,
-  RecordsByHostRefExtension,
-  RunningVmsExtension,
-  GetStatsExtension
-];
-
-export const recordsByHostRefSubscription = (
-  vmSubscription: XenApiRecordSubscription<XenApiVm>
-): PartialSubscription<RecordsByHostRefExtension> => ({
-  recordsByHostRef: computed(() => {
-    const vmsByHostOpaqueRef = new Map<XenApiHost["$ref"], XenApiVm[]>();
-
-    vmSubscription.records.value.forEach((vm) => {
-      if (!vmsByHostOpaqueRef.has(vm.resident_on)) {
-        vmsByHostOpaqueRef.set(vm.resident_on, []);
-      }
-
-      vmsByHostOpaqueRef.get(vm.resident_on)?.push(vm);
-    });
-
-    return vmsByHostOpaqueRef;
-  }),
-});
-
-export const runningVmsSubscription = (
-  vmSubscription: XenApiRecordSubscription<XenApiVm>
-): PartialSubscription<RunningVmsExtension> => ({
-  runningVms: computed(() =>
-    vmSubscription.records.value.filter(
-      (vm) => vm.power_state === POWER_STATE.RUNNING
-    )
-  ),
-});
-
-export const getStatsSubscription = (
-  vmSubscription: XenApiRecordSubscription<XenApiVm>,
-  hostSubscription: XenApiRecordSubscription<XenApiHost> | undefined
-): PartialSubscription<GetStatsExtension> | undefined => {
-  if (hostSubscription === undefined) {
-    return;
-  }
-
-  return {
-    getStats: (id, granularity, ignoreExpired = false, { abortSignal }) => {
-      const xenApiStore = useXenApiStore();
-
-      if (!xenApiStore.isConnected) {
-        return undefined;
-      }
-
-      const vm = vmSubscription.getByUuid(id);
-
-      if (vm === undefined) {
-        throw new Error(`VM ${id} could not be found.`);
-      }
-
-      const host = hostSubscription.getByOpaqueRef(vm.resident_on);
-
-      if (host === undefined) {
-        throw new Error(`VM ${id} is halted or host could not be found.`);
-      }
-
-      return xenApiStore.getXapiStats()._getAndUpdateStats<VmStats>({
-        abortSignal,
-        host,
-        ignoreExpired,
-        uuid: vm.uuid,
-        granularity,
-      });
-    },
-  };
-};

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

@@ -1,13 +1,36 @@
 import { sortRecordsByNameLabel } from "@/libs/utils";
-import {
-  getStatsSubscription,
-  recordsByHostRefSubscription,
-  runningVmsSubscription,
-  type VmExtensions,
-} from "@/stores/vm.extension";
+import type {
+  GRANULARITY,
+  VmStats,
+  XapiStatsResponse,
+} from "@/libs/xapi-stats";
+import type { XenApiHost, XenApiVm } from "@/libs/xen-api";
+import { POWER_STATE } from "@/libs/xen-api";
 import { useXapiCollectionStore } from "@/stores/xapi-collection.store";
-import type { Options, Subscription } from "@/types/subscription";
+import { useXenApiStore } from "@/stores/xen-api.store";
+import { createSubscribe, type Subscription } from "@/types/xapi-collection";
 import { defineStore } from "pinia";
+import { computed, type ComputedRef } from "vue";
+
+type GetStats = (
+  id: XenApiVm["uuid"],
+  granularity: GRANULARITY,
+  ignoreExpired: boolean,
+  opts: { abortSignal?: AbortSignal }
+) => Promise<XapiStatsResponse<VmStats> | undefined> | undefined;
+type DefaultExtension = {
+  recordsByHostRef: ComputedRef<Map<XenApiHost["$ref"], XenApiVm[]>>;
+  runningVms: ComputedRef<XenApiVm[]>;
+};
+
+type GetStatsExtension = [
+  {
+    getStats: GetStats;
+  },
+  { hostSubscription: Subscription<XenApiHost, object> }
+];
+
+type Extensions = [DefaultExtension, GetStatsExtension];
 
 export const useVmStore = defineStore("vm", () => {
   const vmCollection = useXapiCollectionStore().get("VM");
@@ -18,16 +41,82 @@ export const useVmStore = defineStore("vm", () => {
 
   vmCollection.setSort(sortRecordsByNameLabel);
 
-  const subscribe = <O extends Options<VmExtensions>>(options?: O) => {
-    const subscription = vmCollection.subscribe(options);
+  const subscribe = createSubscribe<XenApiVm, Extensions>((options) => {
+    const originalSubscription = vmCollection.subscribe(options);
+
+    const extendedSubscription = {
+      recordsByHostRef: computed(() => {
+        const vmsByHostOpaqueRef = new Map<XenApiHost["$ref"], XenApiVm[]>();
+
+        originalSubscription.records.value.forEach((vm) => {
+          if (!vmsByHostOpaqueRef.has(vm.resident_on)) {
+            vmsByHostOpaqueRef.set(vm.resident_on, []);
+          }
+
+          vmsByHostOpaqueRef.get(vm.resident_on)?.push(vm);
+        });
+
+        return vmsByHostOpaqueRef;
+      }),
+      runningVms: computed(() =>
+        originalSubscription.records.value.filter(
+          (vm) => vm.power_state === POWER_STATE.RUNNING
+        )
+      ),
+    };
+
+    const hostSubscription = options?.hostSubscription;
+
+    const getStatsSubscription:
+      | {
+          getStats: GetStats;
+        }
+      | undefined =
+      hostSubscription !== undefined
+        ? {
+            getStats: (
+              id,
+              granularity,
+              ignoreExpired = false,
+              { abortSignal }
+            ) => {
+              const xenApiStore = useXenApiStore();
+
+              if (!xenApiStore.isConnected) {
+                return undefined;
+              }
+
+              const vm = originalSubscription.getByUuid(id);
+
+              if (vm === undefined) {
+                throw new Error(`VM ${id} could not be found.`);
+              }
+
+              const host = hostSubscription.getByOpaqueRef(vm.resident_on);
+
+              if (host === undefined) {
+                throw new Error(
+                  `VM ${id} is halted or host could not be found.`
+                );
+              }
+
+              return xenApiStore.getXapiStats()._getAndUpdateStats<VmStats>({
+                abortSignal,
+                host,
+                ignoreExpired,
+                uuid: vm.uuid,
+                granularity,
+              });
+            },
+          }
+        : undefined;
 
     return {
-      ...subscription,
-      ...recordsByHostRefSubscription(subscription),
-      ...runningVmsSubscription(subscription),
-      ...getStatsSubscription(subscription, options?.hostSubscription),
-    } as Subscription<VmExtensions, O>;
-  };
+      ...originalSubscription,
+      ...extendedSubscription,
+      ...getStatsSubscription,
+    };
+  });
 
   return {
     ...vmCollection,

@xen-orchestra/lite/src/stores/xapi-collection.store.ts

@@ -1,23 +1,25 @@
-import type { RawObjectType, RawTypeToRecord } from "@/libs/xen-api";
+import type { RawObjectType, XenApiRecord } from "@/libs/xen-api";
 import { useXenApiStore } from "@/stores/xen-api.store";
 import type {
-  DeferExtension,
-  Options,
+  RawTypeToObject,
+  SubscribeOptions,
   Subscription,
-  XenApiRecordExtension,
-} from "@/types/subscription";
+} from "@/types/xapi-collection";
 import { tryOnUnmounted, whenever } from "@vueuse/core";
 import { defineStore } from "pinia";
 import { computed, readonly, ref } from "vue";
 
 export const useXapiCollectionStore = defineStore("xapiCollection", () => {
-  const collections = ref(new Map());
+  const collections = ref(
+    new Map<RawObjectType, ReturnType<typeof createXapiCollection<any>>>()
+  );
 
-  function get<T extends RawObjectType>(
-    type: T
-  ): ReturnType<typeof createXapiCollection<T>> {
+  function get<
+    T extends RawObjectType,
+    S extends XenApiRecord<string> = RawTypeToObject[T]
+  >(type: T): ReturnType<typeof createXapiCollection<S>> {
     if (!collections.value.has(type)) {
-      collections.value.set(type, createXapiCollection(type));
+      collections.value.set(type, createXapiCollection<S>(type));
     }
 
     return collections.value.get(type)!;
@@ -26,11 +28,8 @@ export const useXapiCollectionStore = defineStore("xapiCollection", () => {
   return { get };
 });
 
-const createXapiCollection = <
-  T extends RawObjectType,
-  R extends RawTypeToRecord<T> = RawTypeToRecord<T>
->(
-  type: T
+const createXapiCollection = <T extends XenApiRecord<string>>(
+  type: RawObjectType
 ) => {
   const isReady = ref(false);
   const isFetching = ref(false);
@@ -38,31 +37,31 @@ const createXapiCollection = <
   const lastError = ref<string>();
   const hasError = computed(() => lastError.value !== undefined);
   const subscriptions = ref(new Set<symbol>());
-  const recordsByOpaqueRef = ref(new Map<R["$ref"], R>());
-  const recordsByUuid = ref(new Map<R["uuid"], R>());
-  const filter = ref<(record: R) => boolean>();
-  const sort = ref<(record1: R, record2: R) => 1 | 0 | -1>();
+  const recordsByOpaqueRef = ref(new Map<T["$ref"], T>());
+  const recordsByUuid = ref(new Map<T["uuid"], T>());
+  const filter = ref<(record: T) => boolean>();
+  const sort = ref<(record1: T, record2: T) => 1 | 0 | -1>();
   const xenApiStore = useXenApiStore();
 
-  const setFilter = (newFilter: (record: R) => boolean) =>
+  const setFilter = (newFilter: (record: T) => boolean) =>
     (filter.value = newFilter);
 
-  const setSort = (newSort: (record1: R, record2: R) => 1 | 0 | -1) =>
+  const setSort = (newSort: (record1: T, record2: T) => 1 | 0 | -1) =>
     (sort.value = newSort);
 
-  const records = computed<R[]>(() => {
+  const records = computed<T[]>(() => {
     const records = Array.from(recordsByOpaqueRef.value.values()).sort(
       sort.value
     );
     return filter.value !== undefined ? records.filter(filter.value) : records;
   });
 
-  const getByOpaqueRef = (opaqueRef: R["$ref"]) =>
+  const getByOpaqueRef = (opaqueRef: T["$ref"]) =>
     recordsByOpaqueRef.value.get(opaqueRef);
 
-  const getByUuid = (uuid: R["uuid"]) => recordsByUuid.value.get(uuid);
+  const getByUuid = (uuid: T["uuid"]) => recordsByUuid.value.get(uuid);
 
-  const hasUuid = (uuid: R["uuid"]) => recordsByUuid.value.has(uuid);
+  const hasUuid = (uuid: T["uuid"]) => recordsByUuid.value.has(uuid);
 
   const hasSubscriptions = computed(() => subscriptions.value.size > 0);
 
@@ -70,7 +69,7 @@ const createXapiCollection = <
     try {
       isFetching.value = true;
       lastError.value = undefined;
-      const records = await xenApiStore.getXapi().loadRecords<T, R>(type);
+      const records = await xenApiStore.getXapi().loadRecords<T>(type);
       recordsByOpaqueRef.value.clear();
       recordsByUuid.value.clear();
       records.forEach(add);
@@ -82,17 +81,17 @@ const createXapiCollection = <
     }
   };
 
-  const add = (record: R) => {
+  const add = (record: T) => {
     recordsByOpaqueRef.value.set(record.$ref, record);
     recordsByUuid.value.set(record.uuid, record);
   };
 
-  const update = (record: R) => {
+  const update = (record: T) => {
     recordsByOpaqueRef.value.set(record.$ref, record);
     recordsByUuid.value.set(record.uuid, record);
   };
 
-  const remove = (opaqueRef: R["$ref"]) => {
+  const remove = (opaqueRef: T["$ref"]) => {
     if (!recordsByOpaqueRef.value.has(opaqueRef)) {
       return;
     }
@@ -107,11 +106,9 @@ const createXapiCollection = <
     () => fetchAll()
   );
 
-  type Extensions = [XenApiRecordExtension<R>, DeferExtension];
-
-  function subscribe<O extends Options<Extensions>>(
+  function subscribe<O extends SubscribeOptions<any>>(
     options?: O
-  ): Subscription<Extensions, O> {
+  ): Subscription<T, O> {
     const id = Symbol();
 
     tryOnUnmounted(() => {
@@ -134,14 +131,14 @@ const createXapiCollection = <
 
     if (options?.immediate !== false) {
       start();
-      return subscription as Subscription<Extensions, O>;
+      return subscription as unknown as Subscription<T, O>;
     }
 
     return {
       ...subscription,
       start,
       isStarted: computed(() => subscriptions.value.has(id)),
-    } as Subscription<Extensions, O>;
+    } as unknown as Subscription<T, O>;
   }
 
   const unsubscribe = (id: symbol) => subscriptions.value.delete(id);

@xen-orchestra/lite/src/stories/ui-resource.story.vue

@@ -1,70 +0,0 @@
-<template>
-  <ComponentStory
-    v-slot="{ properties }"
-    :params="[
-      iconProp().preset(faRocket),
-      prop('label').required().str().widget().preset('Rockets'),
-      prop('count')
-        .required()
-        .type('string | number')
-        .widget(text())
-        .preset('175'),
-    ]"
-    :presets="presets"
-  >
-    <UiResource v-bind="properties" />
-  </ComponentStory>
-</template>
-
-<script lang="ts" setup>
-import ComponentStory from "@/components/component-story/ComponentStory.vue";
-import UiResource from "@/components/ui/resources/UiResource.vue";
-import { iconProp, prop } from "@/libs/story/story-param";
-import { text } from "@/libs/story/story-widget";
-import {
-  faDatabase,
-  faDisplay,
-  faMemory,
-  faMicrochip,
-  faNetworkWired,
-  faRocket,
-} from "@fortawesome/free-solid-svg-icons";
-
-const presets = {
-  VMs: {
-    props: {
-      icon: faDisplay,
-      count: 1,
-      label: "VMs",
-    },
-  },
-  vCPUs: {
-    props: {
-      icon: faMicrochip,
-      count: 4,
-      label: "vCPUs",
-    },
-  },
-  RAM: {
-    props: {
-      icon: faMemory,
-      count: 2,
-      label: "RAM",
-    },
-  },
-  SR: {
-    props: {
-      icon: faDatabase,
-      count: 1,
-      label: "SR",
-    },
-  },
-  Interfaces: {
-    props: {
-      icon: faNetworkWired,
-      count: 2,
-      label: "Interfaces",
-    },
-  },
-};
-</script>

@xen-orchestra/lite/src/stories/ui-resources.story.md

@@ -1,11 +0,0 @@
-# Example
-
-```vue-template
-<UiResources>
-  <UiResource :icon="faDisplay" count="1" label="VMs" />
-  <UiResource :icon="faMicrochip" count="4" label="vCPUs" />
-  <UiResource :icon="faMemory" count="2" label="RAM" />
-  <UiResource :icon="faDatabase" count="1" label="SR" />
-  <UiResource :icon="faNetworkWired" count="2" label="Interfaces" />
-</UiResources>
-```

@xen-orchestra/lite/src/stories/ui-resources.story.vue

@@ -1,28 +0,0 @@
-<template>
-  <ComponentStory
-    :params="[slot().help('One or multiple `UiResource`')]"
-    full-width-component
-  >
-    <UiResources>
-      <UiResource :icon="faDisplay" count="1" label="VMs" />
-      <UiResource :icon="faMicrochip" count="4" label="vCPUs" />
-      <UiResource :icon="faMemory" count="2" label="RAM" />
-      <UiResource :icon="faDatabase" count="1" label="SR" />
-      <UiResource :icon="faNetworkWired" count="2" label="Interfaces" />
-    </UiResources>
-  </ComponentStory>
-</template>
-
-<script lang="ts" setup>
-import ComponentStory from "@/components/component-story/ComponentStory.vue";
-import UiResource from "@/components/ui/resources/UiResource.vue";
-import UiResources from "@/components/ui/resources/UiResources.vue";
-import { slot } from "@/libs/story/story-param";
-import {
-  faDatabase,
-  faDisplay,
-  faMemory,
-  faMicrochip,
-  faNetworkWired,
-} from "@fortawesome/free-solid-svg-icons";
-</script>

@xen-orchestra/lite/src/types/subscription.ts

@@ -1,74 +0,0 @@
-import type { XenApiRecord } from "@/libs/xen-api";
-import type { ComputedRef, Ref } from "vue";
-
-type SimpleExtension<Value extends object> = { type: "simple"; value: Value };
-
-type ConditionalExtension<Value extends object, Condition extends object> = {
-  type: "conditional";
-  value: Value;
-  condition: Condition;
-};
-
-type UnpackExtension<E, Options> = E extends SimpleExtension<infer Value>
-  ? Value
-  : E extends ConditionalExtension<infer Value, infer Condition>
-  ? Options extends Condition
-    ? Value
-    : object
-  : object;
-
-export type Extension<
-  Value extends object,
-  Condition extends object | undefined = undefined
-> = Condition extends object
-  ? ConditionalExtension<Value, Condition>
-  : SimpleExtension<Value>;
-
-export type Options<Extensions extends any[]> = Extensions extends [
-  infer First,
-  ...infer Rest
-]
-  ? First extends ConditionalExtension<any, infer Condition>
-    ? Rest extends any[]
-      ? Partial<Condition> & Options<Rest>
-      : Partial<Condition>
-    : Rest extends any[]
-    ? Options<Rest>
-    : object
-  : object;
-
-export type Subscription<
-  Extensions extends any[],
-  Options extends object
-> = Extensions extends [infer First, ...infer Rest]
-  ? UnpackExtension<First, Options> & Subscription<Rest, Options>
-  : object;
-
-export type PartialSubscription<E> = E extends SimpleExtension<infer Value>
-  ? Value
-  : E extends ConditionalExtension<infer Value, any>
-  ? Value
-  : never;
-
-export type XenApiRecordExtension<T extends XenApiRecord<any>> = Extension<{
-  records: ComputedRef<T[]>;
-  getByOpaqueRef: (opaqueRef: T["$ref"]) => T | undefined;
-  getByUuid: (uuid: T["uuid"]) => T | undefined;
-  hasUuid: (uuid: T["uuid"]) => boolean;
-  isReady: Readonly<Ref<boolean>>;
-  isFetching: Readonly<Ref<boolean>>;
-  isReloading: ComputedRef<boolean>;
-  hasError: ComputedRef<boolean>;
-  lastError: Readonly<Ref<string | undefined>>;
-}>;
-
-export type DeferExtension = Extension<
-  {
-    start: () => void;
-    isStarted: ComputedRef<boolean>;
-  },
-  { immediate: false }
->;
-
-export type XenApiRecordSubscription<T extends XenApiRecord<any>> =
-  PartialSubscription<XenApiRecordExtension<T>>;

@xen-orchestra/lite/src/types/xapi-collection.ts

@@ -0,0 +1,140 @@
+import type {
+  XenApiConsole,
+  XenApiHost,
+  XenApiHostMetrics,
+  XenApiMessage,
+  XenApiPool,
+  XenApiRecord,
+  XenApiSr,
+  XenApiTask,
+  XenApiVm,
+  XenApiVmGuestMetrics,
+  XenApiVmMetrics,
+} from "@/libs/xen-api";
+import type { ComputedRef, Ref } from "vue";
+
+type DefaultExtension<T extends XenApiRecord<string>> = {
+  records: ComputedRef<T[]>;
+  getByOpaqueRef: (opaqueRef: T["$ref"]) => T | undefined;
+  getByUuid: (uuid: T["uuid"]) => T | undefined;
+  hasUuid: (uuid: T["uuid"]) => boolean;
+  isReady: Readonly<Ref<boolean>>;
+  isFetching: Readonly<Ref<boolean>>;
+  isReloading: ComputedRef<boolean>;
+  hasError: ComputedRef<boolean>;
+  lastError: Readonly<Ref<string | undefined>>;
+};
+
+type DeferExtension = [
+  {
+    start: () => void;
+    isStarted: ComputedRef<boolean>;
+  },
+  { immediate: false }
+];
+
+type DefaultExtensions<T extends XenApiRecord<string>> = [
+  DefaultExtension<T>,
+  DeferExtension
+];
+
+type GenerateSubscribeOptions<Extensions extends any[]> = Extensions extends [
+  infer FirstExtension,
+  ...infer RestExtension
+]
+  ? FirstExtension extends [object, infer FirstCondition]
+    ? FirstCondition & GenerateSubscribeOptions<RestExtension>
+    : GenerateSubscribeOptions<RestExtension>
+  : object;
+
+export type SubscribeOptions<Extensions extends any[]> = Partial<
+  GenerateSubscribeOptions<Extensions> &
+    GenerateSubscribeOptions<DefaultExtensions<any>>
+>;
+
+type GenerateSubscription<
+  Options extends object,
+  Extensions extends any[]
+> = Extensions extends [infer FirstExtension, ...infer RestExtension]
+  ? FirstExtension extends [infer FirstObject, infer FirstCondition]
+    ? Options extends FirstCondition
+      ? FirstObject & GenerateSubscription<Options, RestExtension>
+      : GenerateSubscription<Options, RestExtension>
+    : FirstExtension & GenerateSubscription<Options, RestExtension>
+  : object;
+
+export type Subscription<
+  T extends XenApiRecord<string>,
+  Options extends object,
+  Extensions extends any[] = []
+> = GenerateSubscription<Options, Extensions> &
+  GenerateSubscription<Options, DefaultExtensions<T>>;
+
+export function createSubscribe<
+  T extends XenApiRecord<string>,
+  Extensions extends any[],
+  Options extends object = SubscribeOptions<Extensions>
+>(builder: (options?: Options) => Subscription<T, Options, Extensions>) {
+  return function subscribe<O extends Options>(
+    options?: O
+  ): Subscription<T, O, Extensions> {
+    return builder(options);
+  };
+}
+
+export type RawTypeToObject = {
+  Bond: never;
+  Certificate: never;
+  Cluster: never;
+  Cluster_host: never;
+  DR_task: never;
+  Feature: never;
+  GPU_group: never;
+  PBD: never;
+  PCI: never;
+  PGPU: never;
+  PIF: never;
+  PIF_metrics: never;
+  PUSB: never;
+  PVS_cache_storage: never;
+  PVS_proxy: never;
+  PVS_server: never;
+  PVS_site: never;
+  SDN_controller: never;
+  SM: never;
+  SR: XenApiSr;
+  USB_group: never;
+  VBD: never;
+  VBD_metrics: never;
+  VDI: never;
+  VGPU: never;
+  VGPU_type: never;
+  VIF: never;
+  VIF_metrics: never;
+  VLAN: never;
+  VM: XenApiVm;
+  VMPP: never;
+  VMSS: never;
+  VM_guest_metrics: XenApiVmGuestMetrics;
+  VM_metrics: XenApiVmMetrics;
+  VUSB: never;
+  blob: never;
+  console: XenApiConsole;
+  crashdump: never;
+  host: XenApiHost;
+  host_cpu: never;
+  host_crashdump: never;
+  host_metrics: XenApiHostMetrics;
+  host_patch: never;
+  message: XenApiMessage;
+  network: never;
+  network_sriov: never;
+  pool: XenApiPool;
+  pool_patch: never;
+  pool_update: never;
+  role: never;
+  secret: never;
+  subject: never;
+  task: XenApiTask;
+  tunnel: never;
+};

@xen-orchestra/lite/src/views/ObjectNotFoundView.vue

@@ -9,8 +9,6 @@
 </template>
 
 <script setup lang="ts">
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
 import UiButton from "@/components/ui/UiButton.vue";
 
@@ -18,8 +16,6 @@ defineProps<{
   id: string;
 }>();
 
-usePageTitleStore().setTitle(useI18n().t("not-found"));
-
 const router = useRouter();
 </script>
 

@xen-orchestra/lite/src/views/PageNotFoundView.vue

@@ -10,13 +10,10 @@
 </template>
 
 <script setup lang="ts">
-import UiButton from "@/components/ui/UiButton.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
+import UiButton from "@/components/ui/UiButton.vue";
 
 const router = useRouter();
-usePageTitleStore().setTitle(useI18n().t("not-found"));
 </script>
 
 <style lang="postcss" scoped>

@xen-orchestra/lite/src/views/StoryView.vue

@@ -6,7 +6,6 @@
 </template>
 
 <script lang="ts" setup>
-import { usePageTitleStore } from "@/stores/page-title.store";
 import { computed } from "vue";
 import { useRouter } from "vue-router";
 import { faBook } from "@fortawesome/free-solid-svg-icons";
@@ -21,8 +20,6 @@ const title = computed(() => {
 
   return `${currentRoute.value.meta.storyTitle} Story`;
 });
-
-usePageTitleStore().setTitle(title);
 </script>
 
 <style lang="postcss" scoped></style>

@xen-orchestra/lite/src/views/host/HostDashboardView.vue

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("dashboard"));
 </script>

@xen-orchestra/lite/src/views/host/HostRootView.vue

@@ -8,22 +8,17 @@
 import ObjectNotFoundWrapper from "@/components/ObjectNotFoundWrapper.vue";
 import type { XenApiHost } from "@/libs/xen-api";
 import { useHostStore } from "@/stores/host.store";
-import { usePageTitleStore } from "@/stores/page-title.store";
 import { useUiStore } from "@/stores/ui.store";
-import { computed, watchEffect } from "vue";
+import { watchEffect } from "vue";
 import { useRoute } from "vue-router";
 
 const { hasUuid, isReady, getByUuid } = useHostStore().subscribe();
 const route = useRoute();
 const uiStore = useUiStore();
 
-const currentHost = computed(() =>
-  getByUuid(route.params.uuid as XenApiHost["uuid"])
-);
-
 watchEffect(() => {
-  uiStore.currentHostOpaqueRef = currentHost.value?.$ref;
+  uiStore.currentHostOpaqueRef = getByUuid(
+    route.params.uuid as XenApiHost["uuid"]
+  )?.$ref;
 });
-
-usePageTitleStore().setObject(currentHost);
 </script>

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

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("alarms"));
 </script>

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

@@ -21,7 +21,7 @@
       </UiCardGroup>
     </UiCardGroup>
     <UiCardGroup>
-      <PoolDashboardTasks class="tasks" />
+      <UiCardComingSoon class="tasks" title="Tasks" />
     </UiCardGroup>
   </div>
 </template>
@@ -31,24 +31,8 @@ export const N_ITEMS = 5;
 </script>
 
 <script lang="ts" setup>
-import PoolDashboardTasks from "@/components/pool/dashboard/PoolDashboardTasks.vue";
-import PoolCpuUsageChart from "@/components/pool/dashboard/cpuUsage/PoolCpuUsageChart.vue";
-import PoolDashboardCpuProvisioning from "@/components/pool/dashboard/PoolDashboardCpuProvisioning.vue";
-import PoolDashboardCpuUsage from "@/components/pool/dashboard/PoolDashboardCpuUsage.vue";
-import PoolDashboardNetworkChart from "@/components/pool/dashboard/PoolDashboardNetworkChart.vue";
-import PoolDashboardRamUsage from "@/components/pool/dashboard/PoolDashboardRamUsage.vue";
-import PoolDashboardStatus from "@/components/pool/dashboard/PoolDashboardStatus.vue";
-import PoolDashboardStorageUsage from "@/components/pool/dashboard/PoolDashboardStorageUsage.vue";
-import PoolDashboardRamUsageChart from "@/components/pool/dashboard/ramUsage/PoolRamUsage.vue";
-import UiCardComingSoon from "@/components/ui/UiCardComingSoon.vue";
 import UiCardGroup from "@/components/ui/UiCardGroup.vue";
-import useFetchStats from "@/composables/fetch-stats.composable";
-import { GRANULARITY, type HostStats, type VmStats } from "@/libs/xapi-stats";
-import type { XenApiHost, XenApiVm } from "@/libs/xen-api";
 import { useHostMetricsStore } from "@/stores/host-metrics.store";
-import { useHostStore } from "@/stores/host.store";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useVmStore } from "@/stores/vm.store";
 import {
   IK_HOST_LAST_WEEK_STATS,
   IK_HOST_STATS,
@@ -56,9 +40,20 @@ import {
 } from "@/types/injection-keys";
 import { differenceBy } from "lodash-es";
 import { provide, watch } from "vue";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("dashboard"));
+import UiCardComingSoon from "@/components/ui/UiCardComingSoon.vue";
+import PoolCpuUsageChart from "@/components/pool/dashboard/cpuUsage/PoolCpuUsageChart.vue";
+import PoolDashboardCpuUsage from "@/components/pool/dashboard/PoolDashboardCpuUsage.vue";
+import PoolDashboardNetworkChart from "@/components/pool/dashboard/PoolDashboardNetworkChart.vue";
+import PoolDashboardCpuProvisioning from "@/components/pool/dashboard/PoolDashboardCpuProvisioning.vue";
+import PoolDashboardRamUsage from "@/components/pool/dashboard/PoolDashboardRamUsage.vue";
+import PoolDashboardRamUsageChart from "@/components/pool/dashboard/ramUsage/PoolRamUsage.vue";
+import PoolDashboardStatus from "@/components/pool/dashboard/PoolDashboardStatus.vue";
+import PoolDashboardStorageUsage from "@/components/pool/dashboard/PoolDashboardStorageUsage.vue";
+import useFetchStats from "@/composables/fetch-stats.composable";
+import { GRANULARITY, type HostStats, type VmStats } from "@/libs/xapi-stats";
+import type { XenApiHost, XenApiVm } from "@/libs/xen-api";
+import { useHostStore } from "@/stores/host.store";
+import { useVmStore } from "@/stores/vm.store";
 
 const hostMetricsSubscription = useHostMetricsStore().subscribe();
 
@@ -129,18 +124,6 @@ runningVms.value.forEach((vm) => vmRegister(vm));
   padding: 1rem;
 }
 
-@media (min-width: 768px) {
-  .pool-dashboard-view {
-    column-count: 2;
-  }
-}
-
-@media (min-width: 1500px) {
-  .pool-dashboard-view {
-    column-count: 3;
-  }
-}
-
 .alarms,
 .tasks {
   flex: 1;

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

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("hosts"));
 </script>

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

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("network"));
 </script>

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

@@ -10,11 +10,6 @@
 <script lang="ts" setup>
 import PoolHeader from "@/components/pool/PoolHeader.vue";
 import PoolTabBar from "@/components/pool/PoolTabBar.vue";
-import { usePoolStore } from "@/stores/pool.store";
-import { usePageTitleStore } from "@/stores/page-title.store";
-
-const { pool } = usePoolStore().subscribe();
-usePageTitleStore().setObject(pool);
 </script>
 
 <style lang="postcss" scoped></style>

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

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("stats"));
 </script>

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

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("storage"));
 </script>

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

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("system"));
 </script>

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

@@ -4,29 +4,58 @@
       {{ $t("tasks") }}
       <UiCounter :value="pendingTasks.length" color="info" />
     </UiTitle>
+
     <TasksTable :finished-tasks="finishedTasks" :pending-tasks="pendingTasks" />
-    <UiCardSpinner v-if="!isReady" />
   </UiCard>
 </template>
 
 <script lang="ts" setup>
 import TasksTable from "@/components/tasks/TasksTable.vue";
 import UiCard from "@/components/ui/UiCard.vue";
-import UiCardSpinner from "@/components/ui/UiCardSpinner.vue";
 import UiCounter from "@/components/ui/UiCounter.vue";
 import UiTitle from "@/components/ui/UiTitle.vue";
+import useArrayRemovedItemsHistory from "@/composables/array-removed-items-history.composable";
+import useCollectionFilter from "@/composables/collection-filter.composable";
+import useCollectionSorter from "@/composables/collection-sorter.composable";
+import useFilteredCollection from "@/composables/filtered-collection.composable";
+import useSortedCollection from "@/composables/sorted-collection.composable";
+import type { XenApiTask } from "@/libs/xen-api";
 import { useTaskStore } from "@/stores/task.store";
-import { usePageTitleStore } from "@/stores/page-title.store";
+import { useTitle } from "@vueuse/core";
+import { computed } from "vue";
 import { useI18n } from "vue-i18n";
 
-const { pendingTasks, finishedTasks, isReady, hasError } =
-  useTaskStore().subscribe();
-
+const { records, hasError } = useTaskStore().subscribe();
 const { t } = useI18n();
 
-const titleStore = usePageTitleStore();
-titleStore.setTitle(t("tasks"));
-titleStore.setCount(() => pendingTasks.value.length);
+const { compareFn } = useCollectionSorter<XenApiTask>({
+  initialSorts: ["-created"],
+});
+
+const allTasks = useSortedCollection(records, compareFn);
+
+const { predicate } = useCollectionFilter({
+  initialFilters: ["!name_label:|(SR.scan host.call_plugin)", "status:pending"],
+});
+
+const pendingTasks = useFilteredCollection<XenApiTask>(allTasks, predicate);
+
+const finishedTasks = useArrayRemovedItemsHistory(
+  allTasks,
+  (task) => task.uuid,
+  {
+    limit: 50,
+    onRemove: (tasks) =>
+      tasks.map((task) => ({
+        ...task,
+        finished: new Date().toISOString(),
+      })),
+  }
+);
+
+useTitle(
+  computed(() => t("task.page-title", { n: pendingTasks.value.length }))
+);
 </script>
 
 <style lang="postcss" scoped>

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

@@ -38,7 +38,6 @@ import UiCard from "@/components/ui/UiCard.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import VmsActionsBar from "@/components/vm/VmsActionsBar.vue";
 import { POWER_STATE } from "@/libs/xen-api";
-import { usePageTitleStore } from "@/stores/page-title.store";
 import { useUiStore } from "@/stores/ui.store";
 import { useVmStore } from "@/stores/vm.store";
 import type { Filters } from "@/types/filter";
@@ -47,13 +46,9 @@ import { storeToRefs } from "pinia";
 import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 
-const { t } = useI18n();
-
-const titleStore = usePageTitleStore();
-titleStore.setTitle(t("vms"));
-
 const { records: vms } = useVmStore().subscribe();
 const { isMobile, isDesktop } = storeToRefs(useUiStore());
+const { t } = useI18n();
 
 const filters: Filters = {
   name_label: { label: t("name"), type: "string" },
@@ -67,8 +62,6 @@ const filters: Filters = {
 };
 
 const selectedVmsRefs = ref([]);
-
-titleStore.setCount(() => selectedVmsRefs.value.length);
 </script>
 
 <style lang="postcss" scoped>

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

@@ -157,7 +157,6 @@
 </template>
 
 <script lang="ts" setup>
-import { usePageTitleStore } from "@/stores/page-title.store";
 import { computed } from "vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import UiIcon from "@/components/ui/icon/UiIcon.vue";
@@ -182,9 +181,7 @@ import UiKeyValueRow from "@/components/ui/UiKeyValueRow.vue";
 
 const xoLiteVersion = XO_LITE_VERSION;
 const xoLiteGitHead = XO_LITE_GIT_HEAD;
-const { t, locale } = useI18n();
-
-usePageTitleStore().setTitle(() => t("settings"));
+const { locale } = useI18n();
 
 const { pool } = usePoolStore().subscribe();
 const { getByOpaqueRef: getHost } = useHostStore().subscribe();

@xen-orchestra/lite/src/views/vm/VmAlarmsView.vue

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("alarms"));
 </script>

@xen-orchestra/lite/src/views/vm/VmConsoleView.vue

@@ -1,46 +1,21 @@
 <template>
-  <div :class="{ 'no-ui': !uiStore.hasUi }" class="vm-console-view">
-    <div v-if="hasError">{{ $t("error-occurred") }}</div>
-    <UiSpinner v-else-if="!isReady" class="spinner" />
-    <div v-else-if="!isVmRunning" class="not-running">
-      <div><img alt="" src="@/assets/monitor.svg" /></div>
-      {{ $t("power-on-for-console") }}
-    </div>
-    <template v-else-if="vm && vmConsole">
-      <RemoteConsole
-        :is-console-available="isConsoleAvailable"
-        :location="vmConsole.location"
-        class="remote-console"
-      />
-      <div class="open-in-new-window">
-        <RouterLink
-          v-if="uiStore.hasUi"
-          :to="{ query: { ui: '0' } }"
-          class="link"
-          target="_blank"
-        >
-          <UiIcon :icon="faArrowUpRightFromSquare" />
-          {{ $t("open-in-new-window") }}
-        </RouterLink>
-      </div>
-    </template>
-  </div>
+  <div v-if="!isReady">Loading...</div>
+  <div v-else-if="!isVmRunning">Console is only available for running VMs.</div>
+  <RemoteConsole
+    v-else-if="vm && vmConsole"
+    :location="vmConsole.location"
+    :is-console-available="!isOperationsPending(vm, STOP_OPERATIONS)"
+  />
 </template>
 
 <script lang="ts" setup>
-import RemoteConsole from "@/components/RemoteConsole.vue";
-import UiIcon from "@/components/ui/icon/UiIcon.vue";
-import UiSpinner from "@/components/ui/UiSpinner.vue";
-import { isOperationsPending } from "@/libs/utils";
 import { POWER_STATE, VM_OPERATION, type XenApiVm } from "@/libs/xen-api";
-import { useConsoleStore } from "@/stores/console.store";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useUiStore } from "@/stores/ui.store";
-import { useVmStore } from "@/stores/vm.store";
-import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { computed } from "vue";
-import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
+import RemoteConsole from "@/components/RemoteConsole.vue";
+import { useConsoleStore } from "@/stores/console.store";
+import { useVmStore } from "@/stores/vm.store";
+import { isOperationsPending } from "@/libs/utils";
 
 const STOP_OPERATIONS = [
   VM_OPERATION.SHUTDOWN,
@@ -52,27 +27,15 @@ const STOP_OPERATIONS = [
   VM_OPERATION.SUSPEND,
 ];
 
-usePageTitleStore().setTitle(useI18n().t("console"));
-
 const route = useRoute();
-const uiStore = useUiStore();
 
-const {
-  isReady: isVmReady,
-  getByUuid: getVmByUuid,
-  hasError: hasVmError,
-} = useVmStore().subscribe();
+const { isReady: isVmReady, getByUuid: getVmByUuid } = useVmStore().subscribe();
 
-const {
-  isReady: isConsoleReady,
-  getByOpaqueRef: getConsoleByOpaqueRef,
-  hasError: hasConsoleError,
-} = useConsoleStore().subscribe();
+const { isReady: isConsoleReady, getByOpaqueRef: getConsoleByOpaqueRef } =
+  useConsoleStore().subscribe();
 
 const isReady = computed(() => isVmReady.value && isConsoleReady.value);
 
-const hasError = computed(() => hasVmError.value || hasConsoleError.value);
-
 const vm = computed(() => getVmByUuid(route.params.uuid as XenApiVm["uuid"]));
 
 const isVmRunning = computed(
@@ -88,74 +51,4 @@ const vmConsole = computed(() => {
 
   return getConsoleByOpaqueRef(consoleOpaqueRef);
 });
-
-const isConsoleAvailable = computed(
-  () =>
-    vm.value !== undefined && !isOperationsPending(vm.value, STOP_OPERATIONS)
-);
 </script>
-
-<style lang="postcss" scoped>
-.vm-console-view {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: calc(100% - 14.5rem);
-
-  &.no-ui {
-    height: 100%;
-  }
-}
-
-.spinner {
-  color: var(--color-extra-blue-base);
-  display: flex;
-  margin: auto;
-  width: 10rem;
-  height: 10rem;
-}
-
-.remote-console {
-  flex: 1;
-  max-width: 100%;
-  height: 100%;
-}
-
-.not-running,
-.not-available {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-  text-align: center;
-  gap: 4rem;
-  color: var(--color-extra-blue-base);
-  font-size: 3.6rem;
-}
-
-.open-in-new-window {
-  position: absolute;
-  top: 0;
-  right: 0;
-  overflow: hidden;
-
-  & > .link {
-    display: flex;
-    align-items: center;
-    gap: 1rem;
-    background-color: var(--color-extra-blue-base);
-    color: var(--color-blue-scale-500);
-    text-decoration: none;
-    padding: 1.5rem;
-    font-size: 1.6rem;
-    border-radius: 0 0 0 0.8rem;
-    white-space: nowrap;
-    transform: translateX(calc(100% - 4.5rem));
-    transition: transform 0.2s ease-in-out;
-
-    &:hover {
-      transform: translateX(0);
-    }
-  }
-}
-</style>

@xen-orchestra/lite/src/views/vm/VmDashboardView.vue

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("dashboard"));
 </script>

@xen-orchestra/lite/src/views/vm/VmNetworkView.vue

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("network"));
 </script>

@xen-orchestra/lite/src/views/vm/VmRootView.vue

@@ -1,9 +1,7 @@
 <template>
   <ObjectNotFoundWrapper :is-ready="isReady" :uuid-checker="hasUuid">
-    <template v-if="uiStore.hasUi">
-      <VmHeader />
-      <VmTabBar :uuid="vm!.uuid" />
-    </template>
+    <VmHeader />
+    <VmTabBar :uuid="vm!.uuid" />
     <RouterView />
   </ObjectNotFoundWrapper>
 </template>
@@ -13,7 +11,6 @@ import ObjectNotFoundWrapper from "@/components/ObjectNotFoundWrapper.vue";
 import VmHeader from "@/components/vm/VmHeader.vue";
 import VmTabBar from "@/components/vm/VmTabBar.vue";
 import type { XenApiVm } from "@/libs/xen-api";
-import { usePageTitleStore } from "@/stores/page-title.store";
 import { useUiStore } from "@/stores/ui.store";
 import { useVmStore } from "@/stores/vm.store";
 import { whenever } from "@vueuse/core";
@@ -25,5 +22,4 @@ const { getByUuid, hasUuid, isReady } = useVmStore().subscribe();
 const uiStore = useUiStore();
 const vm = computed(() => getByUuid(route.params.uuid as XenApiVm["uuid"]));
 whenever(vm, (vm) => (uiStore.currentHostOpaqueRef = vm.resident_on));
-usePageTitleStore().setObject(vm);
 </script>

@xen-orchestra/lite/src/views/vm/VmStatsView.vue

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("stats"));
 </script>

@xen-orchestra/lite/src/views/vm/VmStorageView.vue

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("storage"));
 </script>

@xen-orchestra/lite/src/views/vm/VmSystemView.vue

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("system"));
 </script>

@xen-orchestra/lite/src/views/vm/VmTasksView.vue

@@ -4,8 +4,4 @@
 
 <script lang="ts" setup>
 import PageUnderConstruction from "@/components/PageUnderConstruction.vue";
-import { usePageTitleStore } from "@/stores/page-title.store";
-import { useI18n } from "vue-i18n";
-
-usePageTitleStore().setTitle(useI18n().t("tasks"));
 </script>

@xen-orchestra/mixins/Hooks.mjs

@@ -11,18 +11,10 @@ const runHook = async (emitter, hook, onResult = noop) => {
   const listeners = emitter.listeners(hook)
   await Promise.all(
     listeners.map(async listener => {
-      const handle = setInterval(() => {
-        warn(
-          `${hook} ${listener.name || 'anonymous'} listener is still running`,
-          listener.name ? undefined : { source: listener.toString() }
-        )
-      }, 5e3)
       try {
         onResult(await listener.call(emitter))
       } catch (error) {
         warn(`${hook} failure`, { error })
-      } finally {
-        clearInterval(handle)
       }
     })
   )

@xen-orchestra/mixins/package.json

@@ -14,7 +14,7 @@
     "url": "https://vates.fr"
   },
   "license": "AGPL-3.0-or-later",
-  "version": "0.11.0",
+  "version": "0.10.2",
   "engines": {
     "node": ">=15.6"
   },

@xen-orchestra/openflow/package.json

@@ -30,7 +30,7 @@
     "rimraf": "^5.0.1"
   },
   "dependencies": {
-    "@vates/read-chunk": "^1.2.0"
+    "@vates/read-chunk": "^1.1.1"
   },
   "author": {
     "name": "Vates SAS",

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

@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.0",
-    "@vates/read-chunk": "^1.2.0",
+    "@vates/read-chunk": "^1.1.1",
     "ansi-colors": "^4.1.1",
     "app-conf": "^2.3.0",
     "content-type": "^1.0.4",

@xen-orchestra/proxy/app/mixins/api.mjs

@@ -58,7 +58,7 @@ const ndJsonStream = asyncIteratorToStream(async function* (responseId, iterable
 
 export default class Api {
   constructor(app, { appVersion, httpServer }) {
-    this._ajv = new Ajv({ allErrors: true, useDefaults: true })
+    this._ajv = new Ajv({ allErrors: true })
     this._methods = { __proto__: null }
     const PREFIX = '/api/v1'
     const router = new Router({ prefix: PREFIX }).post('/', async ctx => {

@xen-orchestra/proxy/app/mixins/backups.mjs

@@ -174,15 +174,12 @@ export default class Backups {
           },
         ],
         fetchPartitionFiles: [
-          ({ disk: diskId, format, remote, partition: partitionId, paths }) =>
-            Disposable.use(this.getAdapter(remote), adapter =>
-              adapter.fetchPartitionFiles(diskId, partitionId, paths, format)
-            ),
+          ({ disk: diskId, remote, partition: partitionId, paths }) =>
+            Disposable.use(this.getAdapter(remote), adapter => adapter.fetchPartitionFiles(diskId, partitionId, paths)),
           {
             description: 'fetch files from partition',
             params: {
               disk: { type: 'string' },
-              format: { type: 'string', default: 'zip' },
               partition: { type: 'string', optional: true },
               paths: { type: 'array', items: { type: 'string' } },
               remote: { type: 'object' },

@xen-orchestra/proxy/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@xen-orchestra/proxy",
-  "version": "0.26.30",
+  "version": "0.26.29",
   "license": "AGPL-3.0-or-later",
   "description": "XO Proxy used to remotely execute backup jobs",
   "keywords": [
@@ -32,13 +32,13 @@
     "@vates/decorate-with": "^2.0.0",
     "@vates/disposable": "^0.1.4",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/backups": "^0.40.0",
+    "@xen-orchestra/backups": "^0.39.0",
     "@xen-orchestra/fs": "^4.0.1",
     "@xen-orchestra/log": "^0.6.0",
     "@xen-orchestra/mixin": "^0.1.0",
-    "@xen-orchestra/mixins": "^0.11.0",
+    "@xen-orchestra/mixins": "^0.10.2",
     "@xen-orchestra/self-signed": "^0.1.3",
-    "@xen-orchestra/xapi": "^3.0.0",
+    "@xen-orchestra/xapi": "^2.2.1",
     "ajv": "^8.0.3",
     "app-conf": "^2.3.0",
     "async-iterator-to-stream": "^1.1.0",
@@ -60,7 +60,7 @@
     "source-map-support": "^0.5.16",
     "stoppable": "^1.0.6",
     "xdg-basedir": "^5.1.0",
-    "xen-api": "^1.3.4",
+    "xen-api": "^1.3.3",
     "xo-common": "^0.8.0"
   },
   "devDependencies": {

@xen-orchestra/vmware-explorer/VhdEsxiSeSparse.mjs

@@ -1,54 +1,18 @@
 import _computeGeometryForSize from 'vhd-lib/_computeGeometryForSize.js'
 import { createFooter, createHeader } from 'vhd-lib/_createFooterHeader.js'
-import { DISK_TYPES, FOOTER_SIZE } from 'vhd-lib/_constants.js'
+import { FOOTER_SIZE } from 'vhd-lib/_constants.js'
 import { notEqual, strictEqual } from 'node:assert'
 import { unpackFooter, unpackHeader } from 'vhd-lib/Vhd/_utils.js'
 import { VhdAbstract } from 'vhd-lib'
 
-// one big difference with the other versions of VMDK is that the grain tables are actually sparse, they are pre-allocated but not used in grain order,
-// so we have to read the grain directory to know where to find the grain tables
+// from https://github.com/qemu/qemu/commit/98eb9733f4cf2eeab6d12db7e758665d2fd5367b#
 
-const SE_SPARSE_DIR_NON_ALLOCATED = 0
-const SE_SPARSE_DIR_ALLOCATED = 1
-
-const SE_SPARSE_GRAIN_NON_ALLOCATED = 0 // check in parent
-const SE_SPARSE_GRAIN_UNMAPPED = 1 // grain has been unmapped, but index of previous grain still readable for reclamation
-const SE_SPARSE_GRAIN_ZERO = 2
-const SE_SPARSE_GRAIN_ALLOCATED = 3
-
-const VHD_BLOCK_SIZE_BYTES = 2 * 1024 * 1024
-const GRAIN_SIZE_BYTES = 4 * 1024
-const GRAIN_TABLE_COUNT = 4 * 1024
-
-const ones = n => (1n << BigInt(n)) - 1n
-
-function asNumber(n) {
-  if (n > Number.MAX_SAFE_INTEGER)
+function readInt64(buffer, index) {
+  const n = buffer.readBigInt64LE(index * 8 /* size of an int64 in bytes */)
+  if (n > Number.MAX_SAFE_INTEGER) {
     throw new Error(`can't handle ${n} ${Number.MAX_SAFE_INTEGER} ${n & 0x00000000ffffffffn}`)
-  return Number(n)
-}
-
-const readInt64 = (buffer, index) => asNumber(buffer.readBigInt64LE(index * 8))
-
-/**
- * @returns {{topNibble: number, low60: bigint}} topNibble is the first 4 bits of the 64 bits entry, indexPart is the remaining 60 bits
- */
-function readTaggedEntry(buffer, index) {
-  const entry = buffer.readBigInt64LE(index * 8)
-  return { topNibble: Number(entry >> 60n), low60: entry & ones(60) }
-}
-
-function readSeSparseDir(buffer, index) {
-  const { topNibble, low60 } = readTaggedEntry(buffer, index)
-  return { type: topNibble, tableIndex: asNumber(low60) }
-}
-
-function readSeSparseTable(buffer, index) {
-  const { topNibble, low60 } = readTaggedEntry(buffer, index)
-  // https://lists.gnu.org/archive/html/qemu-block/2019-06/msg00934.html
-  const topIndexPart = low60 >> 48n // bring the top 12 bits down
-  const bottomIndexPart = (low60 & ones(48)) << 12n // bring the bottom 48 bits up
-  return { type: topNibble, grainIndex: asNumber(bottomIndexPart | topIndexPart) }
+  }
+  return +n
 }
 
 export default class VhdEsxiSeSparse extends VhdAbstract {
@@ -61,22 +25,27 @@ export default class VhdEsxiSeSparse extends VhdAbstract {
   #header
   #footer
 
-  #grainIndex // Map blockId => []
+  #grainDirectory
+  // as we will read all grain with data with load everything in memory
+  // in theory , that can be 512MB of data for a 2TB fully allocated
+  // but our use case is to transfer a relatively small diff
+  // and random access is expensive in HTTP, and migration is a one time cors
+  // so let's go with naive approach, and future me will have to handle a more
+  // clever approach if necessary
+  // grain at zero won't be stored
 
-  #grainDirOffsetBytes
-  #grainDirSizeBytes
-  #grainTableOffsetBytes
-  #grainOffsetBytes
+  #grainMap = new Map()
+
+  #grainSize
+  #grainTableSize
+  #grainTableOffset
+  #grainOffset
 
   static async open(esxi, datastore, path, parentVhd, opts) {
     const vhd = new VhdEsxiSeSparse(esxi, datastore, path, parentVhd, opts)
     await vhd.readHeaderAndFooter()
     return vhd
   }
-
-  get path() {
-    return this.#path
-  }
   constructor(esxi, datastore, path, parentVhd, { lookMissingBlockInParent = true } = {}) {
     super()
     this.#esxi = esxi
@@ -94,149 +63,156 @@ export default class VhdEsxiSeSparse extends VhdAbstract {
     return this.#footer
   }
 
+  async #readGrain(start, length = 4 * 1024) {
+    return (await this.#esxi.download(this.#datastore, this.#path, `${start}-${start + length - 1}`)).buffer()
+  }
+
   containsBlock(blockId) {
-    notEqual(this.#grainIndex, undefined, "bat must be loaded to use contain blocks'")
+    notEqual(this.#grainDirectory, undefined, "bat must be loaded to use contain blocks'")
+
+    // a grain table is 4096 entries of 4KB
+    // a grain table cover 8 vhd blocks
+    // grain table always exists in sespars
+
+    // depending on the paramters we also look into the parent data
     return (
-      this.#grainIndex.get(blockId) !== undefined ||
+      this.#grainDirectory.readInt32LE(blockId * 4) !== 0 ||
       (this.#lookMissingBlockInParent && this.#parentVhd.containsBlock(blockId))
     )
   }
 
-  async #read(start, length) {
-    const buffer = await (
-      await this.#esxi.download(this.#datastore, this.#path, `${start}-${start + length - 1}`)
-    ).buffer()
-    strictEqual(buffer.length, length)
-    return buffer
+  async #read(start, end) {
+    return (await this.#esxi.download(this.#datastore, this.#path, `${start}-${end}`)).buffer()
   }
 
   async readHeaderAndFooter() {
-    const vmdkHeaderBuffer = await this.#read(0, 2048)
+    const buffer = await this.#read(0, 2048)
+    strictEqual(buffer.readBigInt64LE(0), 0xcafebaben)
 
-    strictEqual(vmdkHeaderBuffer.readBigInt64LE(0), 0xcafebaben)
-    strictEqual(readInt64(vmdkHeaderBuffer, 1), 0x200000001) // version 2.1
+    strictEqual(readInt64(buffer, 1), 0x200000001) // version 2.1
 
-    this.#grainDirOffsetBytes = readInt64(vmdkHeaderBuffer, 16) * 512
-    // console.log('grainDirOffsetBytes', this.#grainDirOffsetBytes)
-    this.#grainDirSizeBytes = readInt64(vmdkHeaderBuffer, 17) * 512
-    // console.log('grainDirSizeBytes', this.#grainDirSizeBytes)
+    const capacity = readInt64(buffer, 2)
+    const grain_size = readInt64(buffer, 3)
 
-    const grainSizeSectors = readInt64(vmdkHeaderBuffer, 3)
-    const grainSizeBytes = grainSizeSectors * 512 // 8 sectors = 4KB default
-    strictEqual(grainSizeBytes, GRAIN_SIZE_BYTES) // we only support default grain size
+    const grain_tables_offset = readInt64(buffer, 18)
+    const grain_tables_size = readInt64(buffer, 19)
+    this.#grainOffset = readInt64(buffer, 24)
 
-    this.#grainTableOffsetBytes = readInt64(vmdkHeaderBuffer, 18) * 512
-    // console.log('grainTableOffsetBytes', this.#grainTableOffsetBytes)
+    this.#grainSize = grain_size * 512 // 8 sectors / 4KB default
+    this.#grainTableOffset = grain_tables_offset * 512
+    this.#grainTableSize = grain_tables_size * 512
 
-    const grainTableCount = (readInt64(vmdkHeaderBuffer, 4) * 512) / 8 // count is the number of 64b entries in each tables
-    // console.log('grainTableCount', grainTableCount)
-    strictEqual(grainTableCount, GRAIN_TABLE_COUNT) // we only support tables of 4096 entries (default)
-
-    this.#grainOffsetBytes = readInt64(vmdkHeaderBuffer, 24) * 512
-    // console.log('grainOffsetBytes', this.#grainOffsetBytes)
-
-    const sizeBytes = readInt64(vmdkHeaderBuffer, 2) * 512
-    // console.log('sizeBytes', sizeBytes)
-
-    const nbBlocks = Math.ceil(sizeBytes / VHD_BLOCK_SIZE_BYTES)
-    this.#header = unpackHeader(createHeader(nbBlocks))
-    const geometry = _computeGeometryForSize(sizeBytes)
+    const size = capacity * grain_size * 512
+    this.#header = unpackHeader(createHeader(Math.ceil(size / (4096 * 512))))
+    const geometry = _computeGeometryForSize(size)
+    const actualSize = geometry.actualSize
     this.#footer = unpackFooter(
-      createFooter(sizeBytes, Math.floor(Date.now() / 1000), geometry, FOOTER_SIZE, DISK_TYPES.DYNAMIC)
+      createFooter(actualSize, Math.floor(Date.now() / 1000), geometry, FOOTER_SIZE, this.#parentVhd.footer.diskType)
     )
   }
 
   async readBlockAllocationTable() {
-    this.#grainIndex = new Map()
+    const CHUNK_SIZE = 64 * 512
 
-    const tableSizeBytes = GRAIN_TABLE_COUNT * 8
-    const grainDirBuffer = await this.#read(this.#grainDirOffsetBytes, this.#grainDirSizeBytes)
-    // read the grain dir ( first level )
-    for (let grainDirIndex = 0; grainDirIndex < grainDirBuffer.length / 8; grainDirIndex++) {
-      const { type: grainDirType, tableIndex } = readSeSparseDir(grainDirBuffer, grainDirIndex)
-      if (grainDirType === SE_SPARSE_DIR_NON_ALLOCATED) {
-        // no grain table allocated at all in this grain dir
+    strictEqual(this.#grainTableSize % CHUNK_SIZE, 0)
+
+    for (let chunkIndex = 0, grainIndex = 0; chunkIndex < this.#grainTableSize / CHUNK_SIZE; chunkIndex++) {
+      process.stdin.write('.')
+      const start = chunkIndex * CHUNK_SIZE + this.#grainTableOffset
+      const end = start + 4096 * 8 - 1
+      const buffer = await this.#read(start, end)
+      for (let indexInChunk = 0; indexInChunk < 4096; indexInChunk++) {
+        const entry = buffer.readBigInt64LE(indexInChunk * 8)
+        switch (entry) {
+          case 0n: // not allocated, go to parent
+            break
+          case 1n: // unmapped
+            break
+        }
+        if (entry > 3n) {
+          this.#grainMap.set(grainIndex)
+          grainIndex++
+        }
+      }
+    }
+
+    // read grain directory and the grain tables
+    const nbBlocks = this.header.maxTableEntries
+    this.#grainDirectory = await this.#read(2048 /* header length */, 2048 + nbBlocks * 4 - 1)
+  }
+
+  // we're lucky : a grain address can address exacty a full block
+  async readBlock(blockId) {
+    notEqual(this.#grainDirectory, undefined, 'grainDirectory is not loaded')
+    const sectorOffset = this.#grainDirectory.readInt32LE(blockId * 4)
+
+    const buffer = (await this.#parentVhd.readBlock(blockId)).buffer
+
+    if (sectorOffset === 0) {
+      strictEqual(this.#lookMissingBlockInParent, true, "shouldn't have empty block in a delta alone")
+      return {
+        id: blockId,
+        bitmap: buffer.slice(0, 512),
+        data: buffer.slice(512),
+        buffer,
+      }
+    }
+    const offset = sectorOffset * 512
+
+    const graintable = await this.#read(offset, offset + 4096 * 4 /* grain table length */ - 1)
+
+    strictEqual(graintable.length, 4096 * 4)
+    // we have no guaranty that data are order or contiguous
+    // let's construct ranges to limit the number of queries
+    let rangeStart, offsetStart, offsetEnd
+
+    const changeRange = async (index, offset) => {
+      if (offsetStart !== undefined) {
+        // if there was a
+        if (offset === offsetEnd) {
+          offsetEnd++
+          return
+        }
+        const grains = await this.#read(offsetStart * 512, offsetEnd * 512 - 1)
+        grains.copy(buffer, (rangeStart + 1) /* block bitmap */ * 512)
+      }
+      if (offset) {
+        // we're at the beginning of a range present in the file
+        rangeStart = index
+        offsetStart = offset
+        offsetEnd = offset + 1
+      } else {
+        // we're at the beginning of a range from the parent or empty
+        rangeStart = undefined
+        offsetStart = undefined
+        offsetEnd = undefined
+      }
+    }
+
+    for (let i = 0; i < graintable.length / 4; i++) {
+      const grainOffset = graintable.readInt32LE(i * 4)
+      if (grainOffset === 0) {
+        await changeRange()
+        // from parent
         continue
       }
-      strictEqual(grainDirType, SE_SPARSE_DIR_ALLOCATED)
-      // read the corresponding grain table ( second level )
-      const grainTableBuffer = await this.#read(
-        this.#grainTableOffsetBytes + tableIndex * tableSizeBytes,
-        tableSizeBytes
-      )
-      // offset in bytes if >0, grainType if <=0
-      let grainOffsets = []
-      let blockId = grainDirIndex * 8
-
-      const addGrain = val => {
-        grainOffsets.push(val)
-        // 4096 block of 4Kb per dir entry =>16MB/grain dir
-        // 1 block = 2MB
-        // 512 grain => 1 block
-        // 8 block per dir entry
-        if (grainOffsets.length === 512) {
-          this.#grainIndex.set(blockId, grainOffsets)
-          grainOffsets = []
-          blockId++
-        }
+      if (grainOffset === 1) {
+        await changeRange()
+        // this is a emptied grain, no data, don't look into parent
+        buffer.fill(0, (i + 1) /* block bitmap */ * 512)
       }
 
-      for (let grainTableIndex = 0; grainTableIndex < grainTableBuffer.length / 8; grainTableIndex++) {
-        const { type: grainType, grainIndex } = readSeSparseTable(grainTableBuffer, grainTableIndex)
-        if (grainType === SE_SPARSE_GRAIN_ALLOCATED) {
-          // this is ok in 32 bits int with VMDK smaller than 2TB
-          const offsetByte = grainIndex * GRAIN_SIZE_BYTES + this.#grainOffsetBytes
-          addGrain(offsetByte)
-        } else {
-          // multiply by -1 to differenciate type and offset
-          // no offset can be zero
-          addGrain(-grainType)
-        }
-      }
-      strictEqual(grainOffsets.length, 0)
-    }
-  }
-
-  async readBlock(blockId) {
-    let changed = false
-    const parentBlock = await this.#parentVhd.readBlock(blockId)
-    const parentBuffer = parentBlock.buffer
-    const grainOffsets = this.#grainIndex.get(blockId) // may be undefined if the child contains block and lookMissingBlockInParent=true
-    const EMPTY_GRAIN = Buffer.alloc(GRAIN_SIZE_BYTES, 0)
-    for (const index in grainOffsets) {
-      const value = grainOffsets[index]
-      let data
-      if (value > 0) {
-        // it's the offset in byte of a grain type SE_SPARSE_GRAIN_ALLOCATED
-        data = await this.#read(value, GRAIN_SIZE_BYTES)
-      } else {
-        // back to the real grain type
-        const type = value * -1
-        switch (type) {
-          case SE_SPARSE_GRAIN_ZERO:
-          case SE_SPARSE_GRAIN_UNMAPPED:
-            data = EMPTY_GRAIN
-            break
-          case SE_SPARSE_GRAIN_NON_ALLOCATED:
-            /* from parent */
-            break
-          default:
-            throw new Error(`can't handle grain type ${type}`)
-        }
-      }
-      if (data) {
-        changed = true
-        data.copy(parentBuffer, index * GRAIN_SIZE_BYTES + 512 /* block bitmap */)
+      if (grainOffset > 1) {
+        // non empty grain
+        await changeRange(i, grainOffset)
       }
     }
-    // no need to copy if data all come from parent
-    return changed
-      ? {
-          id: blockId,
-          bitmap: parentBuffer.slice(0, 512),
-          data: parentBuffer.slice(512),
-          buffer: parentBuffer,
-        }
-      : parentBlock
+    await changeRange()
+    return {
+      id: blockId,
+      bitmap: buffer.slice(0, 512),
+      data: buffer.slice(512),
+      buffer,
+    }
   }
 }

@xen-orchestra/vmware-explorer/openDeltaVmdkAsVhd.mjs

@@ -1,10 +1,13 @@
-import VHDEsxiSeSparse from './VhdEsxiSeSparse.mjs'
 import VhdEsxiCowd from './VhdEsxiCowd.mjs'
+// import VhdEsxiSeSparse from "./VhdEsxiSeSparse.mjs";
 
 export default async function openDeltaVmdkasVhd(esxi, datastore, path, parentVhd, opts) {
   let vhd
   if (path.endsWith('-sesparse.vmdk')) {
-    vhd = new VHDEsxiSeSparse(esxi, datastore, path, parentVhd, opts)
+    throw new Error(
+      `sesparse VMDK reading is not functional yet ${path}. For now, this VM can only be migrated if it doesn't have any snapshots and if it is halted.`
+    )
+    // vhd = new VhdEsxiSeSparse(esxi, datastore, path, parentVhd, opts)
   } else {
     if (path.endsWith('-delta.vmdk')) {
       vhd = new VhdEsxiCowd(esxi, datastore, path, parentVhd, opts)

@xen-orchestra/vmware-explorer/package.json

@@ -1,11 +1,11 @@
 {
   "license": "ISC",
   "private": false,
-  "version": "0.3.0",
+  "version": "0.2.3",
   "name": "@xen-orchestra/vmware-explorer",
   "dependencies": {
-    "@vates/node-vsphere-soap": "^2.0.0",
-    "@vates/read-chunk": "^1.2.0",
+    "@vates/node-vsphere-soap": "^1.0.0",
+    "@vates/read-chunk": "^1.1.1",
     "@vates/task": "^0.2.0",
     "@xen-orchestra/log": "^0.6.0",
     "lodash": "^4.17.21",

@xen-orchestra/xapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/xapi",
-  "version": "3.0.0",
+  "version": "2.2.1",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/xapi",
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "repository": {
@@ -16,7 +16,7 @@
   },
   "main": "./index.mjs",
   "peerDependencies": {
-    "xen-api": "^1.3.4"
+    "xen-api": "^1.3.3"
   },
   "scripts": {
     "postversion": "npm publish --access public",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@vates/async-each": "^1.0.0",
     "@vates/decorate-with": "^2.0.0",
-    "@vates/nbd-client": "^2.0.0",
+    "@vates/nbd-client": "^1.2.1",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/log": "^0.6.0",
     "d3-time-format": "^3.0.0",

@xen-orchestra/xapi/vdi.mjs

@@ -64,8 +64,12 @@ class Vdi {
     })
   }
 
-  async _getNbdClient(ref) {
-    const nbdInfos = await this.call('VDI.get_nbd_info', ref)
+  async _getNbdClient(ref) { 
+    const nbdInfos = [{
+      address:'172.16.210.14',
+      port: 8077,
+      exportname: 'bench_export'
+  }]//await this.call('VDI.get_nbd_info', ref)
     if (nbdInfos.length > 0) {
       // a little bit of randomization to spread the load
       const nbdInfo = nbdInfos[Math.floor(Math.random() * nbdInfos.length)]
@@ -94,13 +98,15 @@ class Vdi {
 
       query.base = baseRef
     }
+
+    
     let nbdClient, stream
     try {
-      if (this._preferNbd) {
+      if (this._preferNbd || true) {
         nbdClient = await this._getNbdClient(ref)
       }
       // the raw nbd export does not need to peek ath the vhd source
-      if (nbdClient !== undefined && format === VDI_FORMAT_RAW) {
+      if (nbdClient !== undefined && format === VDI_FORMAT_RAW || true) {
         stream = createNbdRawStream(nbdClient)
       } else {
         // raw export without nbd or vhd exports needs a resource stream

CHANGELOG.md

@@ -1,67 +1,8 @@
 # ChangeLog
 
-## **5.85.0** (2023-07-31)
-
-<img id="latest" src="https://badgen.net/badge/channel/latest/yellow" alt="Channel: latest" />
-
-### Highlights
-
-- [Import/From VMWare] Support ESXi 6.5+ with snapshot (PR [#6909](https://github.com/vatesfr/xen-orchestra/pull/6909))
-- [Netbox] New major version. BREAKING: in order for this new version to work, you need to assign the type `virtualization > vminterface` to the custom field `UUID` in your Netbox instance. [See documentation](https://xen-orchestra.com/docs/advanced.html#netbox). [#6038](https://github.com/vatesfr/xen-orchestra/issues/6038) [#6135](https://github.com/vatesfr/xen-orchestra/issues/6135) [#6024](https://github.com/vatesfr/xen-orchestra/issues/6024) [#6036](https://github.com/vatesfr/xen-orchestra/issues/6036) [Forum#6070](https://xcp-ng.org/forum/topic/6070) [Forum#6149](https://xcp-ng.org/forum/topic/6149) [Forum#6332](https://xcp-ng.org/forum/topic/6332) [Forum#6902](https://xcp-ng.org/forum/topic/6902) (PR [#6950](https://github.com/vatesfr/xen-orchestra/pull/6950))
-  - Synchronize VM description
-  - Synchronize VM platform
-  - Fix duplicated VMs in Netbox after disconnecting one pool
-  - Migrating a VM from one pool to another keeps VM data added manually
-  - Fix largest IP prefix being picked instead of smallest
-  - Fix synchronization not working if some pools are unavailable
-  - Better error messages
-- [Backup/File restore] Faster and more robust ZIP export
-- [Backup/File restore] Add faster tar+gzip (`.tgz`) export
-
-### Enhancements
-
-- [Backup/Restore] Button to open the raw log in the REST API (PR [#6936](https://github.com/vatesfr/xen-orchestra/pull/6936))
-- [RPU] Avoid migration of VMs on hosts without missing patches (PR [#6943](https://github.com/vatesfr/xen-orchestra/pull/6943))
-- [Settings/Users] Show users authentication methods (PR [#6962](https://github.com/vatesfr/xen-orchestra/pull/6962))
-- [Settings/Users] User external authentication methods can be manually removed (PR [#6962](https://github.com/vatesfr/xen-orchestra/pull/6962))
-
-### Bug fixes
-
-- [Incremental Backup & Replication] Attempt to work around HVM multiplier issues when creating VMs on older XAPIs (PR [#6866](https://github.com/vatesfr/xen-orchestra/pull/6866))
-- [REST API] Fix VDI export when NBD is enabled
-- [XO Config Cloud Backup] Improve wording about passphrase (PR [#6938](https://github.com/vatesfr/xen-orchestra/pull/6938))
-- [Pool] Fix IPv6 handling when adding hosts
-- [New SR] Send provided NFS version to XAPI when probing a share
-- [Backup/exports] Show more information on error ` stream has ended with not enough data (actual: xxx, expected: 512)` (PR [#6940](https://github.com/vatesfr/xen-orchestra/pull/6940))
-- [Backup] Fix incremental replication with multiple SRs (PR [#6811](https://github.com/vatesfr/xen-orchestra/pull/6811))
-- [New VM] Order interfaces by device as done on a VM Network tab (PR [#6944](https://github.com/vatesfr/xen-orchestra/pull/6944))
-- Users can no longer sign in using their XO password if they are using other authentication providers (PR [#6962](https://github.com/vatesfr/xen-orchestra/pull/6962))
-
-### Released packages
-
-- @vates/read-chunk 1.2.0
-- @vates/fuse-vhd 2.0.0
-- xen-api 1.3.4
-- @vates/nbd-client 2.0.0
-- @vates/node-vsphere-soap 2.0.0
-- @xen-orchestra/xapi 3.0.0
-- @xen-orchestra/backups 0.40.0
-- @xen-orchestra/backups-cli 1.0.10
-- complex-matcher 0.7.1
-- @xen-orchestra/mixins 0.11.0
-- @xen-orchestra/proxy 0.26.30
-- @xen-orchestra/vmware-explorer 0.3.0
-- xo-server-audit 0.10.4
-- xo-server-netbox 1.0.0
-- xo-server-transport-xmpp 0.1.2
-- xo-server-auth-github 0.3.0
-- xo-server-auth-google 0.3.0
-- xo-web 5.122.2
-- xo-server 5.120.2
-
 ## **5.84.0** (2023-06-30)
 
-<img id="stable" src="https://badgen.net/badge/channel/stable/green" alt="Channel: stable" />
+<img id="latest" src="https://badgen.net/badge/channel/latest/yellow" alt="Channel: latest" />
 
 ### Highlights
 
@@ -110,6 +51,8 @@
 
 ## **5.83.3** (2023-06-23)
 
+<img id="stable" src="https://badgen.net/badge/channel/stable/green" alt="Channel: stable" />
+
 ### Bug fixes
 
 - [Settings/Servers] Fix connecting using an explicit IPv6 address

CHANGELOG.unreleased.md

@@ -7,11 +7,18 @@
 
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
+- [Backup/Restore] Button to open the raw log in the REST API (PR [#6936](https://github.com/vatesfr/xen-orchestra/pull/6936))
+
 ### Bug fixes
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
-- [LDAP] Mark the _Id attribute_ setting as required
+- [Incremental Backup & Replication] Attempt to work around HVM multiplier issues when creating VMs on older XAPIs (PR [#6866](https://github.com/vatesfr/xen-orchestra/pull/6866))
+- [REST API] Fix VDI export when NBD is enabled
+- [XO Config Cloud Backup] Improve wording about passphrase (PR [#6938](https://github.com/vatesfr/xen-orchestra/pull/6938))
+- [Pool] Fix IPv6 handling when adding hosts
+- [New SR] Send provided NFS version to XAPI when probing a share
+- [Backup/exports] Show more information on error ` stream has ended with not enough data (actual: xxx, expected: 512)` (PR [#6940](https://github.com/vatesfr/xen-orchestra/pull/6940))
 
 ### Packages to release
 
@@ -29,8 +36,18 @@
 
 <!--packages-start-->
 
+- @vates/fuse-vhd major
+- @vates/nbd-client major
+- @vates/node-vsphere-soap major
+- @xen-orchestra/backups minor
+- @xen-orchestra/vmware-explorer minor
+- @xen-orchestra/xapi major
+- @vates/read-chunk minor
+- complex-matcher patch
+- xen-api patch
 - xo-server patch
-- xo-server-auth-ldap patch
-- xo-web patch
+- xo-server-transport-xmpp patch
+- xo-server-audit patch
+- xo-web minor
 
 <!--packages-end-->

docs/advanced.md

@@ -354,7 +354,7 @@ XO will try to find the right prefix for each IP address. If it can't find a pre
 - Add a UUID custom field:
   - Go to Other > Custom fields > Add
   - Create a custom field called "uuid" (lower case!)
-  - Assign it to object types `virtualization > cluster`, `virtualization > virtual machine` and `virtualization > vminterface`
+  - Assign it to object types `virtualization > cluster` and `virtualization > virtual machine`
 
 ![](./assets/customfield.png)
 

packages/complex-matcher/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "complex-matcher",
-  "version": "0.7.1",
+  "version": "0.7.0",
   "license": "ISC",
   "description": "Advanced search syntax used in XO",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/complex-matcher",

packages/vhd-lib/createStreamNbd.js

@@ -15,7 +15,7 @@ const { fuHeader, checksumStruct } = require('./_structs')
 const assert = require('node:assert')
 
 exports.createNbdRawStream = async function createRawStream(nbdClient) {
-  const stream = Readable.from(nbdClient.readBlocks())
+  const stream = Readable.from(nbdClient.readBlocks(524288))
 
   stream.on('error', () => nbdClient.disconnect())
   stream.on('end', () => nbdClient.disconnect())

packages/vhd-lib/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@vates/async-each": "^1.0.0",
     "@vates/diff": "^0.1.0",
-    "@vates/read-chunk": "^1.2.0",
+    "@vates/read-chunk": "^1.1.1",
     "@vates/stream-reader": "^0.1.0",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/fs": "^4.0.1",

packages/xapi-explore-sr/package.json

@@ -40,7 +40,7 @@
     "human-format": "^1.0.0",
     "lodash": "^4.17.4",
     "pw": "^0.0.4",
-    "xen-api": "^1.3.4"
+    "xen-api": "^1.3.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.1.5",

packages/xen-api/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "xen-api",
-  "version": "1.3.4",
+  "version": "1.3.3",
   "license": "ISC",
   "description": "Connector to the Xen API",
   "keywords": [

packages/xo-server-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-audit",
-  "version": "0.10.4",
+  "version": "0.10.3",
   "license": "AGPL-3.0-or-later",
   "description": "Audit plugin for XO-Server",
   "keywords": [

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

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-auth-github",
-  "version": "0.3.0",
+  "version": "0.2.2",
   "license": "AGPL-3.0-or-later",
   "description": "GitHub authentication plugin for XO-Server",
   "keywords": [

packages/xo-server-auth-github/src/index.js

@@ -38,7 +38,7 @@ class AuthGitHubXoPlugin {
     this._unregisterPassportStrategy = xo.registerPassportStrategy(
       new Strategy(this._conf, async (accessToken, refreshToken, profile, done) => {
         try {
-          done(null, await xo.registerUser2('github', { id: profile.id, name: profile.username }))
+          done(null, await xo.registerUser('github', profile.username))
         } catch (error) {
           done(error.message)
         }

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

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-auth-google",
-  "version": "0.3.0",
+  "version": "0.2.2",
   "license": "AGPL-3.0-or-later",
   "description": "Google authentication plugin for XO-Server",
   "keywords": [

packages/xo-server-auth-google/src/index.js

@@ -52,10 +52,7 @@ class AuthGoogleXoPlugin {
         try {
           done(
             null,
-            await xo.registerUser2('google', {
-              id: profile.id,
-              name: conf.scope === 'email' ? profile.emails[0].value : profile.displayName,
-            })
+            await xo.registerUser('google', conf.scope === 'email' ? profile.emails[0].value : profile.displayName)
           )
         } catch (error) {
           done(error.message)