nesoi 3.3.19 → 3.3.21

package/lib/engine/transaction/trx_engine.js

@@ -32,7 +32,7 @@ class TrxEngine {
         this.authnProviders = authnProviders;
         this.config = config;
         this.services = services;
-        this.innerTrx = new trx_1.Trx(this, this.module, `trx:${origin}`);
+        this.innerTrx = new trx_1.Trx(this, this.module, `trx:${origin}`, true);
         this.$TrxBucket = new elements_1.$Bucket(this.module.name, '__trx__', `Transaction of Module '${this.module.name}'`, new bucket_model_schema_1.$BucketModel({
             id: new bucket_model_schema_1.$BucketModelField('id', 'id', 'string', 'ID', true),
             origin: new bucket_model_schema_1.$BucketModelField('origin', 'origin', 'string', 'Origin', true),
@@ -45,39 +45,59 @@ class TrxEngine {
     getModule() {
         return this.module;
     }
-    async get(id) {
+    async get(id, origin, idempotent = false) {
+        const _origin = origin ?? this.origin;
         let trx;
         if (!id) {
-            trx = new trx_1.Trx(this, this.module, this.origin);
-            log_1.Log.info('module', this.module.name, `Begin ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
-            await this.adapter.create(this.innerTrx.root, {
-                id: trx.id,
-                origin: trx.origin,
-                start: trx.start,
-                end: trx.end,
-                module: this.module.name
-            });
+            trx = new trx_1.Trx(this, this.module, _origin, idempotent);
+            log_1.Log.info('module', this.module.name, `Begin ${(0, log_1.scopeTag)('trx', trx.id)}${idempotent ? '*' : ''} @ ${(0, log_1.anyScopeTag)(_origin)}`);
+            for (const wrap of this.config?.wrap || []) {
+                await wrap.begin(trx, this.services);
+            }
+            if (!idempotent) {
+                await this.adapter.create(this.innerTrx.root, {
+                    id: trx.id,
+                    origin: trx.origin,
+                    start: trx.start,
+                    end: trx.end,
+                    module: this.module.name
+                });
+            }
             return trx;
         }
         else {
+            if (idempotent) {
+                log_1.Log.debug('module', this.module.name, `Continue Idempotent ${(0, log_1.scopeTag)('trx', id)}* @ ${(0, log_1.anyScopeTag)(_origin)}`);
+                const trx = new trx_1.Trx(this, this.module, _origin, idempotent, undefined, id);
+                for (const wrap of this.config?.wrap || []) {
+                    await wrap.continue(trx, this.services);
+                }
+                return trx;
+            }
             const trxData = await this.adapter.get(this.innerTrx.root, id);
             if (trxData) {
-                log_1.Log.info('module', this.module.name, `Continue ${(0, log_1.scopeTag)('trx', trxData.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
+                log_1.Log.debug('module', this.module.name, `Continue ${(0, log_1.scopeTag)('trx', trxData.id)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
                 // Objects read from adapters are not the proper JS class, so they don't
                 // carry methods. This must be used to recover the methods.
-                trx = Object.assign(new trx_1.Trx(this, this.module, this.origin), {
+                trx = Object.assign(new trx_1.Trx(this, this.module, _origin, idempotent), {
                     id: trxData.id,
                     origin: trxData.origin,
                     start: trxData.start,
                     end: trxData.end
                 });
+                for (const wrap of this.config?.wrap || []) {
+                    await wrap.continue(trx, this.services);
+                }
             }
             else {
-                log_1.Log.info('module', this.module.name, `Chain ${(0, log_1.scopeTag)('trx', id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
-                trx = new trx_1.Trx(this, this.module, this.origin, undefined, id);
+                log_1.Log.info('module', this.module.name, `Chain ${(0, log_1.scopeTag)('trx', id)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
+                trx = new trx_1.Trx(this, this.module, _origin, idempotent, undefined, id);
+                for (const wrap of this.config?.wrap || []) {
+                    await wrap.begin(trx, this.services);
+                }
                 await this.adapter.create(this.innerTrx.root, {
                     id: trx.id,
-                    origin: this.origin,
+                    origin: _origin,
                     start: trx.start,
                     end: trx.end,
                     module: this.module.name
@@ -86,17 +106,11 @@ class TrxEngine {
         }
         return trx;
     }
-    async trx(fn, id, tokens, users) {
-        const trx = await this.get(id);
+    async trx(fn, id, tokens, users, origin, idempotent = false) {
+        const trx = await this.get(id, origin, idempotent);
         try {
             await this.authenticate(trx.root, tokens, users);
-            let output;
-            if (this.config?.wrap) {
-                output = await this.config?.wrap(trx, fn, this.services);
-            }
-            else {
-                output = await fn(trx.root);
-            }
+            const output = await fn(trx.root);
             await this.commit(trx, output);
         }
         catch (e) {
@@ -104,17 +118,12 @@ class TrxEngine {
         }
         return trx.status();
     }
-    async trx_hold(fn, id, authn, users) {
-        const trx = await this.get(id);
+    async trx_hold(fn, id, authn, users, origin, idempotent = false) {
+        const trx = await this.get(id, origin, idempotent);
         let output = {};
         try {
             await this.authenticate(trx.root, authn, users);
-            if (this.config?.wrap) {
-                output = await this.config?.wrap(trx, fn, this.services);
-            }
-            else {
-                output = await fn(trx.root);
-            }
+            output = await fn(trx.root);
             await this.hold(trx, output);
         }
         catch (e) {
@@ -146,6 +155,8 @@ class TrxEngine {
         const _users = { ...users };
         const _tokens = {};
         for (const providerName in this.authnProviders) {
+            if (providerName in _users)
+                continue;
             const provider = this.authnProviders[providerName];
             if (!provider) {
                 throw error_1.NesoiError.Auth.NoProviderRegisteredForModule(this.module.name, providerName);
@@ -163,8 +174,10 @@ class TrxEngine {
     }
     //
     async hold(trx, output) {
-        log_1.Log.info('module', this.module.name, `Hold ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
+        log_1.Log.debug('module', this.module.name, `Hold ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
         trx_node_1.TrxNode.hold(trx.root, output);
+        if (trx.idempotent)
+            return trx;
         await this.adapter.put(this.innerTrx.root, {
             id: trx.id,
             origin: this.origin,
@@ -175,9 +188,11 @@ class TrxEngine {
         return trx;
     }
     async commit(trx, output) {
-        log_1.Log.info('module', this.module.name, `Commit ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
         trx_node_1.TrxNode.ok(trx.root, output);
         trx.end = datetime_1.NesoiDatetime.now();
+        if (trx.idempotent)
+            return trx;
+        log_1.Log.info('module', this.module.name, `Commit ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
         await this.adapter.put(this.innerTrx.root, {
             id: trx.id,
             origin: this.origin,
@@ -186,13 +201,18 @@ class TrxEngine {
             module: this.module.name
         });
         await trx_1.Trx.onCommit(trx);
+        for (const wrap of this.config?.wrap || []) {
+            await wrap.commit(trx, this.services);
+        }
         return trx;
     }
     async rollback(trx, error) {
         log_1.Log.error('module', this.module.name, `[${error.status}] ${error.toString()}`, error.stack);
-        log_1.Log.warn('module', this.module.name, `Rollback ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
         trx_node_1.TrxNode.error(trx.root, error);
         trx.end = datetime_1.NesoiDatetime.now();
+        if (trx.idempotent)
+            return trx;
+        log_1.Log.warn('module', this.module.name, `Rollback ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)}`);
         await this.adapter.put(this.innerTrx.root, {
             id: trx.id,
             origin: this.origin,
@@ -201,6 +221,9 @@ class TrxEngine {
             module: this.module.name
         });
         await trx_1.Trx.onRollback(trx);
+        for (const wrap of this.config?.wrap || []) {
+            await wrap.rollback(trx, this.services);
+        }
         return trx;
     }
 }

package/lib/engine/transaction/trx_node.d.ts

@@ -56,7 +56,7 @@ export declare class TrxNode<Space extends $Space, M extends $Module, AuthUsers
     message<Raw extends M['#input']['#raw'], Msg extends $Message = M['messages'][Raw['$'] & keyof M['messages']]>(raw: Raw): Promise<M['#input']['#parsed']>;
     value<K extends keyof M['constants']['values']>(name: K): M['constants']['values'][K]['value'];
     enum<EnumName extends keyof M['constants']['enums']>(name: EnumName): Enum<M['constants']['enums'][EnumName]>;
-    cache(config: Record<keyof M['buckets'], 'eager'>): this;
+    cache(config: Partial<Record<keyof M['buckets'], 'eager'>>): this;
     bucket<Name extends keyof M['buckets'], Bucket extends M['buckets'][Name]>(name: Name): BucketTrxNode<M, Bucket>;
     job<Name extends keyof M['jobs'], Job extends M['jobs'][Name]>(name: Name): JobTrxNode<M, Job>;
     static jobWithCustomCtx<M extends $Module, JobName extends keyof M['jobs'], Job extends M['jobs'][JobName]>(node: AnyTrxNode, name: string, ctx?: Record<string, any>): JobTrxNode<M, Job>;

package/lib/engine/transaction/trx_node.js

@@ -120,7 +120,6 @@ class TrxNode {
         }
         return new constants_1.Enum(this.module.schema.constants.enums[key]);
     }
-    // Blocks
     /*
         Cache
     */
@@ -132,6 +131,7 @@ class TrxNode {
         }
         return this;
     }
+    // Blocks
     bucket(name) {
         const tag = dependency_1.Tag.fromNameOrShort(this.module.name, 'bucket', name);
         return new bucket_trx_node_1.BucketTrxNode(this, tag);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nesoi",
-    "version": "3.3.19",
+    "version": "3.3.21",
     "description": "Declarative framework for data-driven applications",
     "repository": {
         "type": "git",