@fastybird/smart-panel-backend 1.1.0-alpha.63 → 1.1.0-alpha.65

package/dist/modules/devices/services/device-creation-context.js

@@ -0,0 +1,315 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceCreationSettlementError = exports.CreationSettlement = exports.DeviceCreationContext = void 0;
+const sqlite_data_source_1 = require("../../../common/database/sqlite-data-source");
+const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
+const devices_constants_1 = require("../devices.constants");
+const controller_publication_context_1 = require("./controller-publication-context");
+const pinned = new WeakSet();
+const records = new WeakMap();
+const admitted = new WeakSet();
+const admission = Symbol('internal-device-creation');
+const logger = (0, extension_logger_service_1.createExtensionLogger)(devices_constants_1.DEVICES_MODULE_NAME, 'DeviceCreationContext');
+class DeviceCreationContext {
+    constructor(manager, allowedType, capability) {
+        this.manager = manager;
+        this.allowedType = allowedType;
+        this.publications = [];
+        this.active = true;
+        if (capability !== admission || !manager.queryRunner?.isTransactionActive)
+            throw new Error('Device creation requires an admitted transaction');
+        admitted.add(this);
+    }
+    static async runPinned(writer, catalog, ownerCurrent, operation, settlement, sealBorrowed, publicationGuard) {
+        let context;
+        let record;
+        try {
+            const result = await writer(async (manager) => {
+                if (!context || manager !== record.manager)
+                    throw new Error('Original creation manager required');
+                try {
+                    settlement.result = { value: await operation(context) };
+                }
+                catch (cause) {
+                    record.failure ??= { cause };
+                }
+                record.phase = 'DRAINING';
+                context.active = false;
+                while (record.children.size)
+                    await Promise.all(record.children);
+                context.checkPinned(record);
+                if (!settlement.result)
+                    throw new Error('Creation result is missing');
+                await sealBorrowed?.(manager);
+                record.phase = 'READY';
+                return settlement.result.value;
+            }, (manager) => {
+                if (record)
+                    throw new Error('Creation owner cannot be replaced');
+                const receipt = (0, sqlite_data_source_1.observeSqliteOuterOutcome)(manager);
+                settlement.receipt = receipt;
+                context = new DeviceCreationContext(manager, 'virtual', admission);
+                record = {
+                    manager,
+                    runner: manager.queryRunner,
+                    catalog,
+                    ownerCurrent,
+                    phase: 'OPEN',
+                    children: new Set(),
+                    contexts: new Set(),
+                    publications: context.publications,
+                };
+                pinned.add(context);
+                records.set(context, record);
+                record.contexts.add(context);
+                (0, sqlite_data_source_1.registerSqliteCommitGuard)(manager, () => record.phase === 'READY' &&
+                    !record.failure &&
+                    record.children.size === 0 &&
+                    manager === record.manager &&
+                    manager.queryRunner === record.runner &&
+                    record.runner.manager === manager &&
+                    record.runner.isTransactionActive &&
+                    record.ownerCurrent() &&
+                    record.catalog.current());
+                context.checkPinned(record);
+            });
+            if (settlement.outcome !== 'committed')
+                throw new Error('Missing original native creation ACK');
+            let eligible = () => catalog.current();
+            try {
+                if (publicationGuard)
+                    eligible = publicationGuard();
+            }
+            catch {
+                eligible = () => false;
+            }
+            await new controller_publication_context_1.ControllerPublicationContext(eligible).run(async () => {
+                for (const publication of context.publications) {
+                    try {
+                        if (!catalog.current())
+                            throw new Error('Original creation publication registration expired');
+                        await publication.publish();
+                    }
+                    catch (cause) {
+                        settlement.legacyPublicationFailure ??= Object.freeze({ cause });
+                        logger.error('Device creation committed, but post-commit publication failed', cause instanceof Error ? cause : new Error('Creation publication rejected', { cause }));
+                    }
+                }
+            });
+            return result;
+        }
+        catch (cause) {
+            throw new DeviceCreationSettlementError(settlement, record?.failure ? record.failure.cause : cause, cause);
+        }
+        finally {
+            if (record) {
+                record.phase = 'SETTLED';
+                record.children.clear();
+                record.catalog = undefined;
+                record.ownerCurrent = () => false;
+                record.failure = undefined;
+                for (const own of record.contexts) {
+                    own.active = false;
+                    records.delete(own);
+                    own.node = undefined;
+                }
+                record.contexts.clear();
+            }
+            if (context) {
+                context.active = false;
+                context.publications.length = 0;
+                records.delete(context);
+            }
+        }
+    }
+    static check(context, work) {
+        if (!this.isPinned(context))
+            return work();
+        context.assertActive();
+        return work().then((result) => {
+            context.assertActive();
+            return result;
+        });
+    }
+    assertPublication() {
+        if (pinned.has(this) && records.get(this)?.catalog.current() !== true)
+            throw new Error('Original creation dispatch expired');
+    }
+    static assertGenuine(context) {
+        if (context !== undefined && !admitted.has(context))
+            throw new Error('Genuine device creation context required');
+    }
+    assertParent(id) {
+        this.assertActive();
+        if (this.node?.parentId !== id)
+            throw new Error('Original creation parent required');
+    }
+    static isPinned(context) {
+        return context !== undefined && pinned.has(context);
+    }
+    catalog(kind, input, work) {
+        const record = records.get(this);
+        if (!admitted.has(this) || !this.active)
+            throw new Error('Device creation context is not active');
+        if (!record ||
+            (this.node ? this.node.started || this.node.kind !== kind || this.node.input !== input : record.phase !== 'OPEN'))
+            throw new Error('Creation catalog admission is closed');
+        this.checkPinned(record);
+        let resolve;
+        let reject;
+        const task = new Promise((yes, no) => {
+            resolve = yes;
+            reject = no;
+        });
+        const child = new DeviceCreationContext(this.manager, this.allowedType, admission);
+        pinned.add(child);
+        records.set(child, record);
+        record.contexts.add(child);
+        const settled = task.then(() => finish(), (cause) => {
+            record.failure ??= { cause };
+            finish();
+        });
+        const finish = () => {
+            child.active = false;
+            record.children.delete(settled);
+        };
+        record.children.add(settled);
+        try {
+            child.node = this.node ?? catalogNode(kind, input);
+            child.node.started = true;
+            resolve(work(child));
+        }
+        catch (cause) {
+            reject(cause);
+        }
+        return task;
+    }
+    descendants() {
+        this.assertActive();
+        return this.node.children.map((node) => node.input);
+    }
+    child(index) {
+        this.assertActive();
+        const node = this.node.children[index];
+        if (!node || node.started)
+            throw new Error('Original catalog descendant required');
+        const child = new DeviceCreationContext(this.manager, this.allowedType, admission);
+        child.node = node;
+        pinned.add(child);
+        records.set(child, records.get(this));
+        records.get(this).contexts.add(child);
+        return child;
+    }
+    mapping(kind) {
+        this.assertActive();
+        return records.get(this).catalog[kind];
+    }
+    assertActive() {
+        if (!admitted.has(this) || !this.active)
+            throw new Error('Device creation context is not active');
+        if (pinned.has(this)) {
+            const record = records.get(this);
+            if (!record || (record.phase !== 'OPEN' && !(record.phase === 'DRAINING' && this.node?.started)))
+                throw new Error('Creation catalog admission is closed');
+            this.checkPinned(record);
+        }
+    }
+    checkPinned(record) {
+        if (record.failure)
+            throw record.failure.cause;
+        if (this.manager !== record.manager ||
+            this.manager.queryRunner !== record.runner ||
+            record.runner.manager !== this.manager ||
+            !record.runner.isTransactionActive ||
+            !record.ownerCurrent() ||
+            !record.catalog.current()) {
+            record.failure ??= { cause: new Error('Original creation owner or catalog expired') };
+            throw record.failure.cause;
+        }
+    }
+    static async run(writer, allowedType, operation, afterCommit, outputPropertyId) {
+        let context;
+        const result = await writer(async (manager) => {
+            context = new DeviceCreationContext(manager, allowedType, admission);
+            try {
+                return await operation(context);
+            }
+            finally {
+                context.active = false;
+            }
+        });
+        if (context.manager.queryRunner?.isTransactionActive)
+            throw new Error('Device creation publications require the owning COMMIT');
+        const failures = [];
+        let activated = false;
+        try {
+            await afterCommit(result);
+            activated = true;
+        }
+        catch (error) {
+            failures.push({ stage: 'activation', error });
+        }
+        for (const publication of context.publications) {
+            if (publication.requiresActivation && !activated)
+                continue;
+            try {
+                await publication.publish();
+            }
+            catch (error) {
+                failures.push({ stage: 'publication', error });
+            }
+        }
+        context.publications.length = 0;
+        for (const failure of failures)
+            logger.error(`Device creation committed for ${allowedType}${outputPropertyId ? ` output=${outputPropertyId}` : ''}, but post-commit ${failure.stage} failed`, failure.error instanceof Error
+                ? failure.error
+                : new Error('Post-commit callback rejected', { cause: failure.error }));
+        return result;
+    }
+    assertType(type) {
+        this.assertActive();
+        if (!admitted.has(this) ||
+            !this.active ||
+            !this.manager.queryRunner?.isTransactionActive ||
+            type !== this.allowedType)
+            throw new Error('Device creation context is not active for this integration');
+    }
+    defer(publication, requiresActivation = false) {
+        this.assertType(this.allowedType);
+        if (pinned.has(this) && requiresActivation) {
+            const record = records.get(this);
+            record.failure ??= {
+                cause: new Error('Activation-dependent publication is not supported on the pinned creation path'),
+            };
+            throw record.failure.cause;
+        }
+        (pinned.has(this) ? records.get(this).publications : this.publications).push({
+            publish: publication,
+            requiresActivation,
+        });
+    }
+}
+exports.DeviceCreationContext = DeviceCreationContext;
+function catalogNode(kind, input, parentId) {
+    const children = kind === 'device'
+        ? (input.channels ?? []).map((channel) => catalogNode('channel', { ...channel, device: input.id }, input.id))
+        : kind === 'channel'
+            ? (input.properties ?? []).map((property) => catalogNode('property', property, input.id))
+            : [];
+    return { kind, input, children, parentId };
+}
+class CreationSettlement {
+    get outcome() {
+        return this.receipt?.outcome ?? 'not_started';
+    }
+}
+exports.CreationSettlement = CreationSettlement;
+class DeviceCreationSettlementError extends Error {
+    constructor(settlement, cause, settlementCause) {
+        super('Device creation settlement failed', { cause });
+        this.settlement = settlement;
+        this.settlementCause = settlementCause;
+    }
+}
+exports.DeviceCreationSettlementError = DeviceCreationSettlementError;
+//# sourceMappingURL=device-creation-context.js.map

package/dist/modules/devices/services/device-creation-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-creation-context.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/device-creation-context.ts"],"names":[],"mappings":"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"}

package/dist/modules/devices/services/device-structure-lock.service.d.ts

@@ -3,11 +3,16 @@ export declare class DeviceStructureLockService {
     private readonly queue;
     private activeReaders;
     private writerActive;
+    hasCurrentStructuralLease(): boolean;
+    captureExclusiveOwner(): () => boolean;
     runShared<T>(fn: () => Promise<T>): Promise<T>;
     runExclusive<T>(fn: () => Promise<T>): Promise<T>;
+    runExclusiveReleased<T>(fn: () => Promise<T>): Promise<T>;
     private enqueue;
+    private captureQueued;
     private drain;
     private execute;
+    private executeReleased;
     private runNested;
     private waitForNestedOperations;
 }

package/dist/modules/devices/services/device-structure-lock.service.js

@@ -16,16 +16,30 @@ let DeviceStructureLockService = class DeviceStructureLockService {
         this.activeReaders = 0;
         this.writerActive = false;
     }
+    hasCurrentStructuralLease() {
+        return this.context.getStore()?.active === true;
+    }
+    captureExclusiveOwner() {
+        const storage = this.context;
+        const owner = storage.getStore();
+        if (!owner?.active || !owner.accepting || owner.mode !== 'exclusive')
+            throw new Error('An accepting exclusive device structure owner is required');
+        return () => this.context === storage &&
+            storage.getStore() === owner &&
+            owner.active &&
+            owner.accepting &&
+            owner.mode === 'exclusive';
+    }
     async runShared(fn) {
         const context = this.context.getStore();
-        if (context?.active) {
+        if (context?.active && context.accepting) {
             return this.runNested(context, fn);
         }
         return this.enqueue('shared', fn);
     }
     async runExclusive(fn) {
         const context = this.context.getStore();
-        if (context?.active) {
+        if (context?.active && context.accepting) {
             if (context.mode === 'shared') {
                 throw new Error('Device structure lock cannot be upgraded from shared to exclusive');
             }
@@ -33,12 +47,32 @@ let DeviceStructureLockService = class DeviceStructureLockService {
         }
         return this.enqueue('exclusive', fn);
     }
+    async runExclusiveReleased(fn) {
+        const context = this.context.getStore();
+        if (context?.active && context.accepting) {
+            throw new Error('Release-aware device structure work requires a top-level caller');
+        }
+        return new Promise((resolve, reject) => {
+            this.queue.push({
+                mode: 'exclusive',
+                fn: this.captureQueued(fn),
+                resolve,
+                reject,
+                releaseBeforeSettlement: true,
+            });
+            this.drain();
+        });
+    }
     enqueue(mode, fn) {
         return new Promise((resolve, reject) => {
-            this.queue.push({ mode, fn, resolve, reject });
+            this.queue.push({ mode, fn: this.captureQueued(fn), resolve, reject });
             this.drain();
         });
     }
+    captureQueued(fn) {
+        const resume = node_async_hooks_1.AsyncLocalStorage.snapshot();
+        return (context) => resume(() => this.context.run(context, fn));
+    }
     drain() {
         if (this.writerActive || this.queue.length === 0) {
             return;
@@ -63,9 +97,13 @@ let DeviceStructureLockService = class DeviceStructureLockService {
         }
     }
     execute(request) {
-        const context = { mode: request.mode, active: true, nestedOperations: new Set() };
+        if (request.releaseBeforeSettlement) {
+            this.executeReleased(request);
+            return;
+        }
+        const context = { mode: request.mode, active: true, accepting: true, nestedOperations: new Set() };
         void Promise.resolve()
-            .then(() => this.context.run(context, request.fn))
+            .then(() => request.fn(context))
             .then(async (value) => {
             await this.waitForNestedOperations(context);
             request.resolve(value);
@@ -84,14 +122,27 @@ let DeviceStructureLockService = class DeviceStructureLockService {
             this.drain();
         });
     }
+    executeReleased(request) {
+        const context = { mode: 'exclusive', active: true, accepting: true, nestedOperations: new Set() };
+        const release = () => {
+            context.active = false;
+            this.writerActive = false;
+            this.drain();
+        };
+        void Promise.resolve()
+            .then(() => request.fn(context))
+            .then(async (value) => {
+            await this.waitForNestedOperations(context);
+            release();
+            request.resolve(value);
+        }, async (error) => {
+            await this.waitForNestedOperations(context);
+            release();
+            request.reject(error);
+        });
+    }
     runNested(context, fn) {
-        let operation;
-        try {
-            operation = Promise.resolve(fn());
-        }
-        catch (error) {
-            operation = Promise.reject(error instanceof Error ? error : new Error(String(error)));
-        }
+        const operation = new Promise((resolve) => resolve(fn()));
         context.nestedOperations.add(operation);
         void operation.then(() => context.nestedOperations.delete(operation), () => context.nestedOperations.delete(operation));
         return operation;
@@ -100,6 +151,7 @@ let DeviceStructureLockService = class DeviceStructureLockService {
         while (context.nestedOperations.size > 0) {
             await Promise.allSettled(context.nestedOperations);
         }
+        context.accepting = false;
     }
 };
 exports.DeviceStructureLockService = DeviceStructureLockService;

package/dist/modules/devices/services/device-structure-lock.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"device-structure-lock.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/device-structure-lock.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"device-structure-lock.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/device-structure-lock.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/devices/services/device-validation.service.d.ts

@@ -85,7 +85,6 @@ export declare class DeviceValidationService {
     private validateDeviceChannelConstraints;
     private validateChannelProperties;
     private validatePropertyConstraints;
-    private permissionSatisfied;
     private validatePropertyAgainstSpec;
     private calculateSummary;
     private validateChannelStructure;

package/dist/modules/devices/services/device-validation.service.js

@@ -13,6 +13,7 @@ exports.DeviceValidationService = exports.ValidationIssueType = exports.Validati
 const common_1 = require("@nestjs/common");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
 const devices_constants_1 = require("../devices.constants");
+const property_permissions_utils_1 = require("../utils/property-permissions.utils");
 const schema_utils_1 = require("../utils/schema.utils");
 const devices_service_1 = require("./devices.service");
 var ValidationIssueSeverity;
@@ -395,18 +396,6 @@ let DeviceValidationService = class DeviceValidationService {
             }
         }
     }
-    permissionSatisfied(requiredPermission, propertyPermissions) {
-        if (propertyPermissions.has(requiredPermission)) {
-            return true;
-        }
-        if (requiredPermission === devices_constants_1.PermissionType.READ_ONLY && propertyPermissions.has(devices_constants_1.PermissionType.READ_WRITE)) {
-            return true;
-        }
-        if (requiredPermission === devices_constants_1.PermissionType.WRITE_ONLY && propertyPermissions.has(devices_constants_1.PermissionType.READ_WRITE)) {
-            return true;
-        }
-        return false;
-    }
     validatePropertyAgainstSpec(channel, property, spec, issues) {
         let dataTypeValid;
         let expectedDataTypes;
@@ -433,7 +422,7 @@ let DeviceValidationService = class DeviceValidationService {
         }
         if (spec.permissions && spec.permissions.length > 0) {
             const propertyPermissions = new Set(property.permissions);
-            const unsatisfiedPermissions = spec.permissions.filter((requiredPerm) => !this.permissionSatisfied(requiredPerm, propertyPermissions));
+            const unsatisfiedPermissions = spec.permissions.filter((requiredPerm) => !(0, property_permissions_utils_1.permissionSatisfied)(requiredPerm, propertyPermissions));
             if (unsatisfiedPermissions.length > 0) {
                 issues.push({
                     type: ValidationIssueType.INVALID_PERMISSIONS,
@@ -771,7 +760,7 @@ let DeviceValidationService = class DeviceValidationService {
         }
         if (spec.permissions && spec.permissions.length > 0 && property.permissions) {
             const propertyPermissions = new Set(property.permissions);
-            const unsatisfiedPermissions = spec.permissions.filter((requiredPerm) => !this.permissionSatisfied(requiredPerm, propertyPermissions));
+            const unsatisfiedPermissions = spec.permissions.filter((requiredPerm) => !(0, property_permissions_utils_1.permissionSatisfied)(requiredPerm, propertyPermissions));
             if (unsatisfiedPermissions.length > 0) {
                 issues.push({
                     type: ValidationIssueType.INVALID_PERMISSIONS,