@mearl/daemon-core 3.0.1 → 3.0.2

package/dist/preset-installation.d.ts

@@ -38,6 +38,10 @@ export declare class PresetInstallationStore {
         signal?: AbortSignal;
         confirm?: () => Promise<void>;
     }): Promise<PresetInstallReceipt>;
+    uninstall(expectedRevision: string, beforeRemove?: (selection: {
+        path: string;
+        sha256: string;
+    }) => void): Promise<CapabilityActivation | undefined>;
     rollback(expectedRevision: string): Promise<void>;
     collectGarbage(): Promise<void>;
     private collectLocked;

package/dist/preset-installation.js

@@ -1,10 +1,10 @@
 import { createHash, randomUUID } from 'node:crypto';
-import { constants, closeSync, fstatSync, lstatSync, linkSync, mkdirSync, openSync, readSync, readdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { constants, closeSync, fstatSync, lstatSync, linkSync, mkdirSync, openSync, readSync, readdirSync, renameSync, rmSync, writeFileSync, } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { withRecordLock } from './registry.js';
-import { mergePresetDefaults, prepareNodeBundleSnapshot, prepareCapabilitySnapshot, verifyCapabilityActivation, resolveCapabilityConfig, MAX_CAPABILITY_SELECTION_BYTES, parseSetupManagement } from '@mearl/preset';
-import { BundleError, MAX_BROWSER_STORAGE_BYTES, presetRequiresBrowser, validateBundleManifest, verifyPreset, verifyBrowserPreset, verifyPreparedPreset } from '@mearl/preset/bundles';
+import { mergePresetDefaults, prepareNodeBundleSnapshot, prepareCapabilitySnapshot, verifyCapabilityActivation, resolveCapabilityConfig, MAX_CAPABILITY_SELECTION_BYTES, parseSetupManagement, } from '@mearl/preset';
+import { BundleError, MAX_BROWSER_STORAGE_BYTES, presetRequiresBrowser, validateBundleManifest, verifyPreset, verifyBrowserPreset, verifyPreparedPreset, } from '@mearl/preset/bundles';
 const digest = (bytes) => createHash('sha256').update(bytes).digest('hex');
 const hashPattern = /^[a-f0-9]{64}$/;
 const MAX_RECEIPT_BYTES = 16 * 1024 * 1024;
@@ -56,7 +56,8 @@ function atomicWrite(file, bytes) {
     }
 }
 function revision(state) {
-    return state.activation?.installationRevision ?? (state.activation ? `node:${state.activation.revision}` : null);
+    return (state.activation?.installationRevision ??
+        (state.activation ? `node:${state.activation.revision}` : null));
 }
 function overrides(value) {
     if (Object.hasOwn(value, 'management'))
@@ -72,7 +73,8 @@ export class PresetInstallationStore {
     mearlApiVersion;
     pointer;
     constructor(options = {}) {
-        this.directory = resolve(options.directory ?? (process.env.MEARL_CAPABILITY_DIR || join(homedir(), '.mearl/capabilities')));
+        this.directory = resolve(options.directory ??
+            (process.env.MEARL_CAPABILITY_DIR || join(homedir(), '.mearl/capabilities')));
         this.mearlApiVersion = options.mearlApiVersion ?? '1.0.0';
         this.pointer = join(this.directory, 'active-node.json');
     }
@@ -94,10 +96,28 @@ export class PresetInstallationStore {
             const receiptBytes = readBounded(join(this.directory, 'installations', `${activation.installationRevision}.json`), MAX_RECEIPT_BYTES);
             const receipt = JSON.parse(receiptBytes.toString('utf8'));
             const { revision: receiptRevision, ...data } = receipt;
-            if (receiptRevision !== activation.installationRevision || digest(JSON.stringify(data)) !== receiptRevision || data.schemaVersion !== 1 ||
-                Object.keys(data).some(key => !['schemaVersion', 'snapshot', 'bundles', 'browserRevision', 'nodeRevision', 'managedModules', 'nodeSyncRequired', 'browserSyncRequired', 'overrides'].includes(key)) || typeof data.nodeSyncRequired !== 'boolean' || (data.browserSyncRequired !== undefined && typeof data.browserSyncRequired !== 'boolean') ||
-                data.nodeRevision !== activation.revision || !Array.isArray(data.bundles) || data.bundles.length > 64 ||
-                !Array.isArray(data.managedModules) || new Set(data.managedModules).size !== data.managedModules.length || data.managedModules.some(id => typeof id !== 'string' || !Object.hasOwn(activation.modules, id))) {
+            if (receiptRevision !== activation.installationRevision ||
+                digest(JSON.stringify(data)) !== receiptRevision ||
+                data.schemaVersion !== 1 ||
+                Object.keys(data).some(key => ![
+                    'schemaVersion',
+                    'snapshot',
+                    'bundles',
+                    'browserRevision',
+                    'nodeRevision',
+                    'managedModules',
+                    'nodeSyncRequired',
+                    'browserSyncRequired',
+                    'overrides',
+                ].includes(key)) ||
+                typeof data.nodeSyncRequired !== 'boolean' ||
+                (data.browserSyncRequired !== undefined && typeof data.browserSyncRequired !== 'boolean') ||
+                data.nodeRevision !== activation.revision ||
+                !Array.isArray(data.bundles) ||
+                data.bundles.length > 64 ||
+                !Array.isArray(data.managedModules) ||
+                new Set(data.managedModules).size !== data.managedModules.length ||
+                data.managedModules.some(id => typeof id !== 'string' || !Object.hasOwn(activation.modules, id))) {
                 throw new BundleError('BUNDLE_INTEGRITY', 'Installed preset receipt does not match its selection');
             }
             const acceptedOverrides = overrides(data.overrides);
@@ -111,8 +131,18 @@ export class PresetInstallationStore {
             });
             if (total > MAX_BROWSER_STORAGE_BYTES)
                 throw new BundleError('BUNDLE_QUOTA', 'Installed preset resources exceed 64 MiB');
-            const bundles = options.verifyResources === false ? [] : metadata.map(bundle => ({ ...bundle, resources: Object.fromEntries(Object.entries(bundle.manifest.resources).map(([name, entry]) => [name, readBounded(join(this.directory, 'blobs', `${entry.sha256}.bin`), entry.byteLength)])) }));
-            for (const entry of options.verifyResources === false ? [] : Object.values(activation.modules)) {
+            const bundles = options.verifyResources === false
+                ? []
+                : metadata.map(bundle => ({
+                    ...bundle,
+                    resources: Object.fromEntries(Object.entries(bundle.manifest.resources).map(([name, entry]) => [
+                        name,
+                        readBounded(join(this.directory, 'blobs', `${entry.sha256}.bin`), entry.byteLength),
+                    ])),
+                }));
+            for (const entry of options.verifyResources === false
+                ? []
+                : Object.values(activation.modules)) {
                 const bytes = readBounded(join(this.directory, 'objects', `${entry.sha256}.cjs`), entry.byteLength);
                 if (bytes.byteLength !== entry.byteLength || digest(bytes) !== entry.sha256)
                     throw new BundleError('BUNDLE_INTEGRITY', 'Installed Node object is missing or corrupt');
@@ -121,15 +151,21 @@ export class PresetInstallationStore {
         });
         if (options.verifyResources === false) {
             const graph = await verifyPreset(captured.receipt.snapshot, this.mearlApiVersion);
-            await verifyBrowserPreset({ source: graph.snapshot.source, manifests: graph.snapshot.manifests, packageTargets: graph.snapshot.packageTargets,
-                bundleRevisions: Object.fromEntries(Object.entries(graph.snapshot.bundleRevisions).filter(([id]) => graph.preset.packages[id].targets?.includes('browser'))), revision: captured.receipt.browserRevision }, this.mearlApiVersion);
+            await verifyBrowserPreset({
+                source: graph.snapshot.source,
+                manifests: graph.snapshot.manifests,
+                packageTargets: graph.snapshot.packageTargets,
+                bundleRevisions: Object.fromEntries(Object.entries(graph.snapshot.bundleRevisions).filter(([id]) => graph.preset.packages[id].targets?.includes('browser'))),
+                revision: captured.receipt.browserRevision,
+            }, this.mearlApiVersion);
             return { rawHash, activation, receipt: captured.receipt, preset: graph.preset };
         }
         const prepared = await verifyPreparedPreset({ snapshot: captured.receipt.snapshot, bundles: captured.bundles }, this.mearlApiVersion);
         if (prepared.browser.snapshot.revision !== captured.receipt.browserRevision)
             throw new BundleError('BUNDLE_INTEGRITY', 'Installed browser projection does not match');
         const selected = await prepareNodeBundleSnapshot(prepared.bundles.filter(bundle => prepared.preset.packages[bundle.manifest.id].targets?.includes('node')), 'native-host', this.mearlApiVersion, resolveCapabilityConfig(mergePresetDefaults(prepared.preset.defaults, captured.receipt.overrides)));
-        if (Object.keys(selected.snapshot.modules).length !== captured.receipt.managedModules.length || captured.receipt.managedModules.some(id => !Object.hasOwn(selected.snapshot.modules, id)) ||
+        if (Object.keys(selected.snapshot.modules).length !== captured.receipt.managedModules.length ||
+            captured.receipt.managedModules.some(id => !Object.hasOwn(selected.snapshot.modules, id)) ||
             Object.entries(selected.snapshot.modules).some(([id, entry]) => JSON.stringify(entry) !== JSON.stringify(activation.modules[id])) ||
             Object.entries(selected.snapshot.bindings).some(([hook, entry]) => JSON.stringify(entry) !== JSON.stringify(activation.bindings[hook])) ||
             Object.values(activation.bindings).filter(entry => captured.receipt.managedModules.includes(entry.module)).length !== Object.keys(selected.snapshot.bindings).length) {
@@ -140,7 +176,10 @@ export class PresetInstallationStore {
     async apply(input, options) {
         options.signal?.throwIfAborted();
         const acceptedOverrides = options.overrides === undefined ? undefined : overrides(options.overrides);
-        const [current, prepared] = await Promise.all([this.current({ verifyResources: false }), verifyPreparedPreset(input, this.mearlApiVersion)]);
+        const [current, prepared] = await Promise.all([
+            this.current({ verifyResources: false }),
+            verifyPreparedPreset(input, this.mearlApiVersion),
+        ]);
         if (revision(current) !== options.expectedRevision)
             throw new BundleError('BUNDLE_CONFLICT', 'The installed preset changed');
         const selected = await prepareNodeBundleSnapshot(prepared.bundles.filter(bundle => prepared.preset.packages[bundle.manifest.id].targets?.includes('node')), 'native-host', this.mearlApiVersion, resolveCapabilityConfig(mergePresetDefaults(prepared.preset.defaults, acceptedOverrides ?? current.receipt?.overrides ?? {})));
@@ -156,20 +195,36 @@ export class PresetInstallationStore {
         const bindings = Object.fromEntries(Object.entries(current.activation?.bindings ?? {}).filter(([, entry]) => Object.hasOwn(unmanaged, entry.module)));
         if (Object.keys(selected.snapshot.bindings).some(hook => Object.hasOwn(bindings, hook)))
             throw new BundleError('BUNDLE_CONFLICT', 'A preset hook conflicts with an independently installed Node module');
-        const snapshot = await prepareCapabilitySnapshot({ schemaVersion: 1, modules: { ...unmanaged, ...selected.snapshot.modules }, bindings: { ...bindings, ...selected.snapshot.bindings } });
+        const snapshot = await prepareCapabilitySnapshot({
+            schemaVersion: 1,
+            modules: { ...unmanaged, ...selected.snapshot.modules },
+            bindings: { ...bindings, ...selected.snapshot.bindings },
+        });
         const data = {
-            schemaVersion: 1, snapshot: prepared.snapshot,
-            bundles: prepared.bundles.map(({ source, revision, manifest }) => ({ source, revision, manifest })),
-            browserRevision: prepared.browser.snapshot.revision, nodeRevision: snapshot.revision,
-            managedModules: Object.keys(selected.snapshot.modules), overrides: acceptedOverrides ?? current.receipt?.overrides ?? {},
-            nodeSyncRequired: Boolean(current.receipt?.nodeSyncRequired || current.receipt?.managedModules.length || Object.values(prepared.preset.packages).some(entry => entry.enabled !== false && entry.targets?.includes('node'))),
+            schemaVersion: 1,
+            snapshot: prepared.snapshot,
+            bundles: prepared.bundles.map(({ source, revision, manifest }) => ({
+                source,
+                revision,
+                manifest,
+            })),
+            browserRevision: prepared.browser.snapshot.revision,
+            nodeRevision: snapshot.revision,
+            managedModules: Object.keys(selected.snapshot.modules),
+            overrides: acceptedOverrides ?? current.receipt?.overrides ?? {},
+            nodeSyncRequired: Boolean(current.receipt?.nodeSyncRequired ||
+                current.receipt?.managedModules.length ||
+                Object.values(prepared.preset.packages).some(entry => entry.enabled !== false && entry.targets?.includes('node'))),
             browserSyncRequired: Boolean(current.receipt?.browserSyncRequired || presetRequiresBrowser(prepared.preset)),
         };
         const receipt = { ...data, revision: digest(JSON.stringify(data)) };
         const receiptBytes = JSON.stringify(receipt);
         if (Buffer.byteLength(receiptBytes) > MAX_RECEIPT_BYTES)
             throw new BundleError('BUNDLE_QUOTA', 'Preset installation receipt exceeds 16 MiB');
-        const activation = { ...snapshot, installationRevision: receipt.revision };
+        const activation = {
+            ...snapshot,
+            installationRevision: receipt.revision,
+        };
         await options.confirm?.();
         withRecordLock(this.pointer, () => {
             this.assertCurrent(current.rawHash);
@@ -198,6 +253,29 @@ export class PresetInstallationStore {
         });
         return receipt;
     }
+    async uninstall(expectedRevision, beforeRemove) {
+        const current = await this.current({ verifyResources: false });
+        if (current.receipt?.revision !== expectedRevision || !current.activation || !current.rawHash) {
+            throw new BundleError('BUNDLE_CONFLICT', 'The installed preset changed before removal');
+        }
+        const managed = new Set(current.receipt.managedModules);
+        const modules = Object.fromEntries(Object.entries(current.activation.modules).filter(([id]) => !managed.has(id)));
+        const bindings = Object.fromEntries(Object.entries(current.activation.bindings).filter(([, entry]) => Object.hasOwn(modules, entry.module)));
+        const remaining = Object.keys(modules).length
+            ? await prepareCapabilitySnapshot({ schemaVersion: 1, modules, bindings })
+            : undefined;
+        const sha256 = current.rawHash;
+        withRecordLock(this.pointer, () => {
+            this.assertCurrent(sha256);
+            beforeRemove?.({ path: this.pointer, sha256 });
+            rmSync(join(this.directory, 'rollback.json'), { force: true });
+            if (remaining)
+                atomicWrite(this.pointer, JSON.stringify(remaining));
+            else
+                rmSync(this.pointer);
+        });
+        return remaining;
+    }
     async rollback(expectedRevision) {
         const current = await this.current({ verifyResources: false });
         if (current.activation?.installationRevision !== expectedRevision)
@@ -220,7 +298,11 @@ export class PresetInstallationStore {
         const current = await this.current({ verifyResources: false });
         const raw = optionalFile(join(this.directory, 'rollback.json'), POINTER_BYTES + 256);
         const record = raw && JSON.parse(raw.toString('utf8'));
-        const previous = record?.candidate === current.activation?.installationRevision && record.previous !== null ? await verifyCapabilityActivation(record.previous) : undefined;
+        const previous = record &&
+            record.candidate === current.activation?.installationRevision &&
+            record.previous !== null
+            ? await verifyCapabilityActivation(record.previous)
+            : undefined;
         withRecordLock(this.pointer, () => {
             this.assertCurrent(current.rawHash);
             for (const child of ['blobs', 'objects', 'installations'])
@@ -238,7 +320,11 @@ export class PresetInstallationStore {
                 for (const entry of Object.values(bundle.manifest.resources))
                     blobs.add(entry.sha256);
         }
-        for (const [directory, extension, retained] of [['blobs', '.bin', blobs], ['objects', '.cjs', modules], ['installations', '.json', receipts]]) {
+        for (const [directory, extension, retained] of [
+            ['blobs', '.bin', blobs],
+            ['objects', '.cjs', modules],
+            ['installations', '.json', receipts],
+        ]) {
             for (const name of readdirSync(join(this.directory, directory))) {
                 const id = name.slice(0, -extension.length);
                 if (name.endsWith(extension) && hashPattern.test(id) && !retained.has(id))
@@ -247,7 +333,9 @@ export class PresetInstallationStore {
         }
     }
 }
-export function presetSelectionRevision(state) { return revision(state); }
+export function presetSelectionRevision(state) {
+    return revision(state);
+}
 /** Reads accepted local metadata without loading capability factories, browsers or network sources. */
 export async function readInstallationManagement(options = {}) {
     const current = await new PresetInstallationStore(options).current({ verifyResources: false });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/daemon-core",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Shared Node daemon lifecycle primitives for Mearl — process liveness, JSON record registry, log rotation, and a detached daemon manager",
   "type": "module",
   "main": "dist/index.js",
@@ -44,7 +44,7 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@mearl/preset": "3.0.1"
+    "@mearl/preset": "3.0.2"
   },
   "repository": {
     "type": "git",