nesoi 3.3.24 → 3.3.26

package/lib/engine/transaction/trx_engine.js

@@ -38,7 +38,7 @@ class TrxEngine {
             origin: new bucket_model_schema_1.$BucketModelField('origin', 'origin', 'string', 'Origin', true),
             module: new bucket_model_schema_1.$BucketModelField('module', 'module', 'string', 'Module', true),
             start: new bucket_model_schema_1.$BucketModelField('start', 'start', 'datetime', 'Start', true),
-            end: new bucket_model_schema_1.$BucketModelField('end', 'end', 'datetime', 'Start', false),
+            end: new bucket_model_schema_1.$BucketModelField('end', 'end', 'datetime', 'End', false),
         }), new bucket_graph_schema_1.$BucketGraph(), {});
         this.adapter = config?.adapter?.(module.schema) || new memory_bucket_adapter_1.MemoryBucketAdapter(this.$TrxBucket, {});
     }
@@ -48,9 +48,10 @@ class TrxEngine {
     async get(id, origin, idempotent = false) {
         const _origin = origin ?? this.origin;
         let trx;
+        // New transaction
         if (!id) {
             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)}`);
+            log_1.Log.info('module', this.module.name, `Begin${idempotent ? '*' : ''} ${(0, log_1.scopeTag)('trx', trx.id + trx.root.id)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
             for (const wrap of this.config?.wrap || []) {
                 await wrap.begin(trx, this.services);
             }
@@ -60,38 +61,52 @@ class TrxEngine {
                     origin: trx.origin,
                     start: trx.start,
                     end: trx.end,
-                    module: this.module.name
+                    module: this.module.name,
                 });
             }
             return trx;
         }
+        // Chain/Continue transaction
         else {
+            const trxData = await this.adapter.get(this.innerTrx.root, id);
+            // If a transaction is being continued it cannot become idempotent,
+            // since the data it needs is inside the transaction.
+            // > Started as NOT idempotent on this module, is NEVER idempotent
+            // This only affects services which need this info for deciding whether
+            // to commit/rollback a transaction. The trx engine still uses the requested
+            // idempotent value to decide whether to run or not a commit/rollback,
+            // because otherwise it would commit/rollback partially idempotent transactions
+            // before they're actually finished.
+            if (trxData)
+                idempotent = false;
+            // Differently, a transaction with specific id which doesn't exist can
+            // be either an ongoing idempotent transaction from this module or an
+            // external transaction starting at a different module.
+            // On either case, it's allowed to become idempotent.
+            // > Not stored, can become idempotent.
+            // if (!trxData) idempotent = idempotent;
+            trx = new trx_1.Trx(this, this.module, _origin, idempotent, undefined, id);
+            // (Continue*)
             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);
+                log_1.Log.info('module', this.module.name, `Continue* ${(0, log_1.scopeTag)('trx', id)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
                 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);
+            // (Continue)
             if (trxData) {
-                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, _origin, idempotent), {
-                    id: trxData.id,
-                    origin: trxData.origin,
-                    start: trxData.start,
-                    end: trxData.end
-                });
+                // Update transaction with data read from adapter
+                trx.start = trxData.start;
+                trx.end = trxData.end;
+                log_1.Log.info('module', this.module.name, `Continue ${(0, log_1.scopeTag)('trx', trx.id + trx.root.id)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
                 for (const wrap of this.config?.wrap || []) {
                     await wrap.continue(trx, this.services);
                 }
             }
+            // (Chain)
             else {
-                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);
+                log_1.Log.info('module', this.module.name, `Chain ${(0, log_1.scopeTag)('trx', id + trx.root.id)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
                 for (const wrap of this.config?.wrap || []) {
                     await wrap.begin(trx, this.services);
                 }
@@ -100,7 +115,7 @@ class TrxEngine {
                     origin: _origin,
                     start: trx.start,
                     end: trx.end,
-                    module: this.module.name
+                    module: this.module.name,
                 });
             }
         }
@@ -111,10 +126,10 @@ class TrxEngine {
         try {
             await this.authenticate(trx.root, tokens, users);
             const output = await fn(trx.root);
-            await this.commit(trx, output);
+            await this.commit(trx, output, idempotent);
         }
         catch (e) {
-            await this.rollback(trx, e);
+            await this.rollback(trx, e, idempotent);
         }
         return trx.status();
     }
@@ -124,16 +139,16 @@ class TrxEngine {
         try {
             await this.authenticate(trx.root, authn, users);
             output = await fn(trx.root);
-            await this.hold(trx, output);
+            await this.hold(trx, output, idempotent);
         }
         catch (e) {
-            await this.rollback(trx, e);
+            await this.rollback(trx, e, idempotent);
         }
         return {
             id: trx.id,
             status: trx.status(),
-            commit: () => this.commit(trx, output),
-            rollback: (error) => this.rollback(trx, error)
+            commit: () => this.commit(trx, output, idempotent),
+            rollback: (error) => this.rollback(trx, error, idempotent)
         };
     }
     /* Metadata sharing between modules */
@@ -173,54 +188,54 @@ class TrxEngine {
         trx_node_1.TrxNode.addAuthn(node, _tokens, _users);
     }
     //
-    async hold(trx, output) {
+    async hold(trx, output, idempotent) {
         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)
+        if (idempotent)
             return trx;
         await this.adapter.put(this.innerTrx.root, {
             id: trx.id,
             origin: this.origin,
             start: trx.start,
             end: trx.end,
-            module: this.module.name
+            module: this.module.name,
         });
         return trx;
     }
-    async commit(trx, output) {
+    async commit(trx, output, idempotent) {
         trx_node_1.TrxNode.ok(trx.root, output);
         trx.end = datetime_1.NesoiDatetime.now();
-        if (trx.idempotent)
+        if (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 trx_1.Trx.onCommit(trx);
+        log_1.Log.info('module', this.module.name, `Commit ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)} (held: ${Object.keys(trx.holds).length})`);
         await this.adapter.put(this.innerTrx.root, {
             id: trx.id,
             origin: this.origin,
             start: trx.start,
             end: trx.end,
-            module: this.module.name
+            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) {
+    async rollback(trx, error, idempotent) {
         log_1.Log.error('module', this.module.name, `[${error.status}] ${error.toString()}`, error.stack);
         trx_node_1.TrxNode.error(trx.root, error);
         trx.end = datetime_1.NesoiDatetime.now();
-        if (trx.idempotent)
+        if (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 trx_1.Trx.onRollback(trx);
+        log_1.Log.warn('module', this.module.name, `Rollback ${(0, log_1.scopeTag)('trx', trx.id)} @ ${(0, log_1.anyScopeTag)(this.origin)} (held: ${Object.keys(trx.holds).length})`);
         await this.adapter.put(this.innerTrx.root, {
             id: trx.id,
             origin: this.origin,
             start: trx.start,
             end: trx.end,
-            module: this.module.name
+            module: this.module.name,
         });
-        await trx_1.Trx.onRollback(trx);
         for (const wrap of this.config?.wrap || []) {
             await wrap.rollback(trx, this.services);
         }

package/lib/engine/transaction/trx_node.js

@@ -55,7 +55,7 @@ class TrxNode {
             this.id = id || (Math.random() + 1).toString(36).substring(7);
         }
         else {
-            this.id = '#';
+            this.id = '#' + (Math.random() + 1).toString(36).substring(7);
         }
         this.globalId = `${this.trx.id}.${this.id}`;
     }

package/package.json

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