nesoi 3.3.30 → 3.4.1

package/lib/engine/data/error.js

@@ -229,6 +229,10 @@ var NesoiError;
             return new BaseError('Bucket.FieldNotFound', `Field '${$.path}' not found on bucket '${$.bucket}'`, Status.NOT_FOUND, $);
         }
         Bucket.FieldNotFound = FieldNotFound;
+        function IdempotentTransaction($) {
+            return new BaseError('Bucket.IdempotentTransaction', `Action '${$.action}' on bucket '${$.bucket}' not allowed for idempotent transaction ${$.trx}`, Status.NOT_FOUND, $);
+        }
+        Bucket.IdempotentTransaction = IdempotentTransaction;
         let Graph;
         (function (Graph) {
             function LinkNotFound($) {
@@ -292,6 +296,10 @@ var NesoiError;
         })(Fieldpath = Bucket.Fieldpath || (Bucket.Fieldpath = {}));
         let Model;
         (function (Model) {
+            function InvalidModelpath($) {
+                return new BaseError('Bucket.Model.InvalidModelpath', `Modelpath '${$.modelpath}' not found on bucket '${$.bucket}'`, Status.BAD_REQUEST, $);
+            }
+            Model.InvalidModelpath = InvalidModelpath;
             function InvalidEnum($) {
                 return new BaseError('Bucket.Model.InvalidEnum', `Value '${$.value}' for bucket '${$.bucket}' doesn't match the options: ${$.options}.`, Status.BAD_REQUEST, $);
             }
@@ -312,6 +320,14 @@ var NesoiError;
                 return new BaseError('Bucket.Model.InvalidNesoiDatetime', `Value '${$.value}' for bucket '${$.bucket}' is not a Nesoi datetime.`, Status.BAD_REQUEST, $);
             }
             Model.InvalidNesoiDatetime = InvalidNesoiDatetime;
+            function InvalidNesoiDuration($) {
+                return new BaseError('Bucket.Model.InvalidNesoiDuration', `Value '${$.value}' for bucket '${$.bucket}' is not a Nesoi duration.`, Status.BAD_REQUEST, $);
+            }
+            Model.InvalidNesoiDuration = InvalidNesoiDuration;
+            function InvalidNesoiDecimal($) {
+                return new BaseError('Bucket.Model.InvalidNesoiDecimal', `Value '${$.value}' for bucket '${$.bucket}' is not a Nesoi decimal.`, Status.BAD_REQUEST, $);
+            }
+            Model.InvalidNesoiDecimal = InvalidNesoiDecimal;
         })(Model = Bucket.Model || (Bucket.Model = {}));
         let Drive;
         (function (Drive) {

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

@@ -165,8 +165,12 @@ export declare class BucketTrxNode<M extends $Module, $ extends $Bucket> {
      * so the behavior depends on the bucket used.
      */
     deleteMany(ids: $['#data']['id'][]): Promise<void>;
-    buildOne<V extends ViewName<$>, Obj extends ViewObj<$, V>>(obj: $['#data'], view: V): Promise<Obj>;
-    buildMany<V extends ViewName<$>, Obj extends ViewObj<$, V>>(objs: $['#data'][], view: V): Promise<Obj[]>;
+    buildOne<V extends ViewName<$>, Obj extends ViewObj<$, V>>(obj: $['#data'], view: V, flags?: {
+        serialize: boolean;
+    }): Promise<Obj>;
+    buildMany<V extends ViewName<$>, Obj extends ViewObj<$, V>>(objs: $['#data'][], view: V, flags?: {
+        serialize: boolean;
+    }): Promise<Obj[]>;
     /**
      * Methods to use the Bucket's drive (file storage).
      */
@@ -231,6 +235,8 @@ export declare class BucketUnsafeTrxNode<M extends $Module, $ extends $Bucket> {
 export declare class BucketDriveTrxNode<M extends $Module, $ extends $Bucket> {
     private bucketTrx;
     private drive;
+    private tag;
+    private trx;
     constructor(bucketTrx: BucketTrxNode<M, $>, drive: DriveAdapter);
     /**
      * Read the contents of a File of this bucket's drive

package/lib/engine/transaction/nodes/bucket.trx_node.js

@@ -41,6 +41,10 @@ class BucketTrxNode {
     */
     async wrap(action, input, fn, fmtTrxOut, idempotent = false) {
         const wrapped = async (parentTrx, bucket) => {
+            const trx_idempotent = parentTrx.trx.idempotent;
+            if (trx_idempotent && !idempotent) {
+                throw error_1.NesoiError.Bucket.IdempotentTransaction({ bucket: this.tag.full, trx: this.trx.globalId, action });
+            }
             const trx = trx_node_1.TrxNode.makeChildNode(parentTrx, bucket.schema.module, 'bucket', bucket.schema.name);
             trx_node_1.TrxNode.open(trx, action, input);
             let out;
@@ -55,6 +59,10 @@ class BucketTrxNode {
         };
         if (this.external) {
             const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag, idempotent);
+            // The if below is not strictly necessary but avoids a warning.
+            if (idempotent) {
+                return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            }
             return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
@@ -322,11 +330,11 @@ class BucketTrxNode {
     /*
         Build
     */
-    async buildOne(obj, view) {
-        return this.wrap('buildOne', { obj }, (trx, bucket) => bucket.buildOne(trx, obj, view), () => undefined);
+    async buildOne(obj, view, flags) {
+        return this.wrap('buildOne', { obj }, (trx, bucket) => bucket.buildOne(trx, obj, view, flags), () => undefined);
     }
-    async buildMany(objs, view) {
-        return this.wrap('buildMany', { objs }, (trx, bucket) => bucket.buildMany(trx, objs, view), () => undefined);
+    async buildMany(objs, view, flags) {
+        return this.wrap('buildMany', { objs }, (trx, bucket) => bucket.buildMany(trx, objs, view, flags), () => undefined);
     }
     /*
         Drive
@@ -456,9 +464,13 @@ exports.BucketUnsafeTrxNode = BucketUnsafeTrxNode;
 class BucketDriveTrxNode {
     bucketTrx;
     drive;
+    tag;
+    trx;
     constructor(bucketTrx, drive) {
         this.bucketTrx = bucketTrx;
         this.drive = drive;
+        this.tag = bucketTrx.tag;
+        this.trx = bucketTrx.trx;
     }
     /**
      * Read the contents of a File of this bucket's drive

package/lib/engine/transaction/nodes/bucket_query.trx_node.js

@@ -71,7 +71,7 @@ class BucketQueryTrxNode {
         };
         if (this.external) {
             const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag, true);
-            return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
+            return ext.run(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {
             return wrapped(this.trx, this.bucket);

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

@@ -13,5 +13,8 @@ export declare class ExternalTrxNode<M extends $Module, $ extends $Topic> {
     private daemon;
     constructor(trx: TrxNode<any, M, any>, tag: Tag, idempotent?: boolean);
     run_and_hold(element: (trx: AnyTrxNode) => any, fn: (trx: AnyTrxNode, element: any) => Promise<any>): Promise<any>;
-    run(element: (trx: AnyTrxNode) => any, fn: (trx: AnyTrxNode, element: any) => Promise<any>): Promise<any>;
+    run_isolated(element: (trx: AnyTrxNode) => any, fn: (trx: AnyTrxNode, element: any) => Promise<any>): Promise<any>;
+    run(element: (trx: AnyTrxNode) => any, fn: (trx: AnyTrxNode, element: any) => Promise<any>, options?: {
+        isolated?: boolean;
+    }): Promise<any>;
 }

package/lib/engine/transaction/nodes/external.trx_node.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalTrxNode = void 0;
 const trx_node_1 = require("../trx_node");
 const error_1 = require("../../data/error");
+const log_1 = require("../../util/log");
 /**
  * @category Engine
  * @subcategory Transaction
@@ -23,25 +24,26 @@ class ExternalTrxNode {
         this.daemon = _module.daemon;
     }
     async run_and_hold(element, fn) {
-        const root = this.trx.trx;
+        if (this.idempotent) {
+            log_1.Log.debug('trx', 'external', `Attempt to hold idempotent external node of transaction ${this.trx.globalId} on ${this.tag.full} ignored. Running without hold.`);
+            return this.run(element, fn);
+        }
+        const parent = this.trx.trx;
         const module = trx_node_1.TrxNode.getModule(this.trx);
         const trx = trx_node_1.TrxNode.makeChildNode(this.trx, module.name, 'externals', this.tag.full);
         trx_node_1.TrxNode.open(trx, '~', {
             tag: this.tag
         });
+        const origin = module.name + '::trx:' + parent.id;
+        const tag = this.tag.module + '::trx:' + parent.id;
         let out;
         try {
             const dtrx = await this.daemon.trx(this.tag.module)
-                .origin('ext:' + root.id)
-                // This can be overriden by the TrxEngine if the root
-                // it not idempotent (which makes it not idempotent)
-                .idempotent(this.idempotent);
-            let idempotent = false;
+                .origin(origin);
             const hold = await dtrx
                 .auth_inherit(trx)
                 .run_and_hold(async (extTrx) => {
                 try {
-                    idempotent = extTrx.trx.idempotent;
                     return await fn(extTrx, element(extTrx));
                 }
                 catch (e) {
@@ -50,15 +52,13 @@ class ExternalTrxNode {
                 finally {
                     trx_node_1.TrxNode.merge(trx, extTrx);
                 }
-            }, root.id);
+            }, parent.id);
             if (hold.status.state === 'error') {
                 throw hold.status.error;
             }
             out = hold.status.output;
-            if (!idempotent) {
-                if (!(root.id in root.holds)) {
-                    root.holds[root.id] = hold;
-                }
+            if (!(tag in parent.holds)) {
+                parent.holds[tag] = hold;
             }
         }
         catch (e) {
@@ -67,8 +67,11 @@ class ExternalTrxNode {
         trx_node_1.TrxNode.ok(trx, out);
         return out;
     }
-    async run(element, fn) {
-        const root = this.trx.trx;
+    async run_isolated(element, fn) {
+        return this.run(element, fn, { isolated: true });
+    }
+    async run(element, fn, options) {
+        const parent = this.trx.trx;
         const module = trx_node_1.TrxNode.getModule(this.trx);
         const trx = trx_node_1.TrxNode.makeChildNode(this.trx, module.name, 'externals', this.tag.full);
         trx_node_1.TrxNode.open(trx, '~', {
@@ -77,10 +80,7 @@ class ExternalTrxNode {
         let out;
         try {
             const dtrx = await this.daemon.trx(this.tag.module)
-                .origin('ext:' + root.id)
-                // This can be overriden by the TrxEngine if the root
-                // it not idempotent (which makes it not idempotent)
-                .idempotent(this.idempotent);
+                .origin(module.name + '::trx:' + parent.id);
             const res = await dtrx
                 .auth_inherit(trx)
                 .run(async (extTrx) => {
@@ -93,7 +93,7 @@ class ExternalTrxNode {
                 finally {
                     trx_node_1.TrxNode.merge(trx, extTrx);
                 }
-            }, root.id);
+            }, options?.isolated ? undefined : parent.id, this.idempotent);
             if (res.state === 'error') {
                 throw res.error;
             }

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

@@ -1,7 +1,6 @@
 import { $Module } from "../../../schema";
-import { AnyTrxNode, TrxNode } from '../trx_node';
+import { TrxNode } from '../trx_node';
 import { $Job } from "../../../elements/blocks/job/job.schema";
-import { Job } from "../../../elements/blocks/job/job";
 import { Message } from "../../../elements/entities/message/message";
 import { JobInput } from "../../../elements/blocks/job/job.types";
 import { Tag } from "../../dependency";
@@ -15,8 +14,10 @@ export declare class JobTrxNode<M extends $Module, $ extends $Job> {
     private ctx?;
     private external;
     private job?;
+    private _idempotent;
     constructor(trx: TrxNode<any, M, any>, tag: Tag, ctx?: Record<string, any> | undefined);
-    wrap(action: string, input: Record<string, any>, fn: (trx: AnyTrxNode, element: Job<any, M, $>) => Promise<any>, fmtTrxOut?: (out: any) => any): Promise<any>;
+    get idempotent(): this;
+    private wrap;
     run(message: JobInput<$>): Promise<$['#output']>;
     forward(message: Message<$['#input']>): Promise<$['#output']>;
 }

package/lib/engine/transaction/nodes/job.trx_node.js

@@ -15,6 +15,7 @@ class JobTrxNode {
     ctx;
     external;
     job;
+    _idempotent = false;
     constructor(trx, tag, ctx) {
         this.trx = trx;
         this.tag = tag;
@@ -28,6 +29,10 @@ class JobTrxNode {
             }
         }
     }
+    get idempotent() {
+        this._idempotent = true;
+        return this;
+    }
     /*
         Wrap
     */
@@ -46,8 +51,7 @@ class JobTrxNode {
             return out;
         };
         if (this.external) {
-            const root = this.trx.trx;
-            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag, root.idempotent);
+            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag, this._idempotent);
             return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {

package/lib/engine/transaction/nodes/resource.trx_node.js

@@ -44,7 +44,8 @@ class ResourceTrxNode {
             return out;
         };
         if (this.external) {
-            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag);
+            const idempotent = action === 'view' || action === 'query';
+            const ext = new external_trx_node_1.ExternalTrxNode(this.trx, this.tag, idempotent);
             return ext.run_and_hold(trx => dependency_1.Tag.element(this.tag, trx), wrapped);
         }
         else {

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

@@ -20,8 +20,9 @@ export declare class TrxStatus<Output> {
     state?: TrxState | undefined;
     output?: Output | undefined;
     error?: NesoiError.BaseError | undefined;
+    idempotent: boolean;
     nodes: TrxNodeStatus[];
-    constructor(id: string, origin: TrxOrigin, start: NesoiDatetime, end?: NesoiDatetime | undefined, state?: TrxState | undefined, output?: Output | undefined, error?: NesoiError.BaseError | undefined, nodes?: TrxNodeStatus[]);
+    constructor(id: string, origin: TrxOrigin, start: NesoiDatetime, end?: NesoiDatetime | undefined, state?: TrxState | undefined, output?: Output | undefined, error?: NesoiError.BaseError | undefined, idempotent?: boolean, nodes?: TrxNodeStatus[]);
     summary(): string;
 }
 /**
@@ -67,8 +68,8 @@ export declare class Trx<S extends $Space, M extends $Module, AuthUsers extends
      * to the transaction. Elements should not modify the transaction.
      */
     static set(node: AnyTrxNode, key: string, value: any): AnyTrx;
-    static onCommit(trx: AnyTrx): Promise<void>;
-    static onRollback(trx: AnyTrx): Promise<void>;
+    static commitHolds(trx: AnyTrx): Promise<void>;
+    static rollbackHolds(trx: AnyTrx): Promise<void>;
 }
 export type AnyTrx = Trx<any, any, any>;
 export {};

package/lib/engine/transaction/trx.js

@@ -22,8 +22,9 @@ class TrxStatus {
     state;
     output;
     error;
+    idempotent;
     nodes;
-    constructor(id, origin, start, end, state, output, error, nodes = []) {
+    constructor(id, origin, start, end, state, output, error, idempotent = false, nodes = []) {
         this.id = id;
         this.origin = origin;
         this.start = start;
@@ -31,10 +32,11 @@ class TrxStatus {
         this.state = state;
         this.output = output;
         this.error = error;
+        this.idempotent = idempotent;
         this.nodes = nodes;
     }
     summary() {
-        const state = this.state ? (0, string_1.colored)(`[${this.state}]`, {
+        const state = this.state ? (0, string_1.colored)(`[${this.state}]${this.idempotent ? '*' : ''}`, {
             'open': 'lightblue',
             'hold': 'yellow',
             'ok': 'lightgreen',
@@ -42,10 +44,13 @@ class TrxStatus {
         }[this.state]) : 'unknown';
         let str = `${state} ${this.id} ${(0, log_1.anyScopeTag)(this.origin)} `;
         str += (0, string_1.colored)(`[${this.end ? (this.end.epoch - this.start.epoch) : -1}ms]\n`, 'brown');
-        function print(nodes, l = 1) {
+        function print(nodes, idempotent, l = 1) {
             let str = '';
             nodes.forEach(node => {
-                const state = node.state ? (0, string_1.colored)(`[${node.state}]`, {
+                if (node.ext?.idempotent !== undefined) {
+                    idempotent = node.ext.idempotent;
+                }
+                const state = node.state ? (0, string_1.colored)(`[${node.state}]${idempotent ? '*' : ''}`, {
                     'open': 'lightblue',
                     'hold': 'yellow',
                     'ok': 'lightgreen',
@@ -53,11 +58,11 @@ class TrxStatus {
                 }[node.state] || 'lightred') : 'unknown';
                 str += `${'-'.repeat(l)}${state} ${node.id} ${(0, log_1.anyScopeTag)(node.scope)} ${node.action} ${node.cached_buckets > 0 ? `[cached: ${node.cached_buckets}]` : ''}`;
                 str += (0, string_1.colored)(` [${node.app}ms]\n`, 'brown');
-                str += print(node.nodes, l + 1);
+                str += print(node.nodes, idempotent, l + 1);
             });
             return str;
         }
-        return str + print(this.nodes);
+        return str + print(this.nodes, this.idempotent);
     }
 }
 exports.TrxStatus = TrxStatus;
@@ -83,7 +88,7 @@ class Trx {
         this.id = id || (Math.random() + 1).toString(36).substring(7);
         this.origin = origin;
         this.idempotent = idempotent ?? false;
-        this.root = root || new trx_node_1.TrxNode('root', this, undefined, module, auth, false, id);
+        this.root = root || new trx_node_1.TrxNode('root', this, undefined, module, auth, false);
         this.nodes = nodes || {};
     }
     addNode(node) {
@@ -94,7 +99,7 @@ class Trx {
         const state = this.root.state;
         const output = this.root.output;
         const error = this.root.error;
-        return new TrxStatus(this.id, this.origin, this.start, this.end, state, output, error, this.root.status().nodes);
+        return new TrxStatus(this.id, this.origin, this.start, this.end, state, output, error, this.idempotent, this.root.status().nodes);
     }
     /**
      * Cache
@@ -146,13 +151,12 @@ class Trx {
         return trx;
     }
     //
-    static async onCommit(trx) {
+    static async commitHolds(trx) {
         for (const h in trx.holds) {
             await trx.holds[h].commit();
         }
     }
-    static async onRollback(trx) {
-        trx.end = datetime_1.NesoiDatetime.now();
+    static async rollbackHolds(trx) {
         for (const h in trx.holds) {
             const error = `rollback ${trx.id}`;
             await trx.holds[h].rollback(error);

package/lib/engine/transaction/trx_engine.config.d.ts

@@ -1,4 +1,4 @@
-import { $Module, $Space } from "../../elements";
+import { $Bucket, $Module, $Space } from "../../elements";
 import { BucketAdapter } from "../../elements/entities/bucket/adapters/bucket_adapter";
 import { Trx } from './trx';
 import { AnyUsers } from '../auth/authn';
@@ -7,9 +7,13 @@ import { TrxData } from './trx_engine';
 export type TrxEngineWrapFn<S extends $Space, M extends $Module> = (trx: TrxNode<S, M, any>) => Promise<any>;
 export type TrxEngineConfig<S extends $Space, M extends $Module, AuthUsers extends AnyUsers, Services extends Record<string, any>> = {
     /**
-     * Adapter used to store transactions of this module.
+     * Adapter used to temporarily store transactions of this module, while they happen.
      */
-    adapter?: (schema: M) => BucketAdapter<TrxData>;
+    adapter?: (schema: $Bucket) => BucketAdapter<TrxData>;
+    /**
+     * Adapter used to log transactions of this module once they're finished.
+     */
+    log_adapter?: (schema: $Bucket) => BucketAdapter<TrxData>;
     wrap?: {
         begin: <T extends Trx<S, M, AuthUsers>>(trx: T, services: Services) => Promise<void>;
         continue: <T extends Trx<S, M, AuthUsers>>(trx: T, services: Services) => Promise<void>;

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

@@ -1,7 +1,7 @@
 import { $Module, $Space } from "../../schema";
 import { Module } from '../module';
 import { AnyTrx, Trx, TrxStatus } from './trx';
-import { TrxNode, TrxNodeStatus } from './trx_node';
+import { TrxNode, TrxNodeState, TrxNodeStatus } from './trx_node';
 import { AnyAuthnProviders, AnyUsers, AuthRequest } from '../auth/authn';
 import { BucketAdapterConfig } from "../../elements/entities/bucket/adapters/bucket_adapter";
 import { TrxEngineConfig } from './trx_engine.config';
@@ -12,6 +12,7 @@ import { DriveAdapter } from "../../elements/entities/drive/drive_adapter";
 export type TrxEngineOrigin = `app:${string}` | `plugin:${string}`;
 export type TrxData = {
     id: AnyTrx['id'];
+    state: TrxNodeState;
     origin: AnyTrx['origin'];
     module: string;
     start: AnyTrx['start'];
@@ -43,16 +44,19 @@ export declare class TrxEngine<S extends $Space, M extends $Module, AuthUsers ex
      */
     private innerTrx;
     private adapter;
+    private log_adapter?;
     constructor(origin: TrxEngineOrigin, module: Module<S, M>, authnProviders?: AuthUsers | undefined, config?: TrxEngineConfig<S, M, any, any> | undefined, services?: Record<string, IService>);
     getModule(): Module<S, M>;
-    get(id?: string, origin?: string, idempotent?: boolean): Promise<Trx<S, M, any>>;
+    get(id?: string, origin?: string, req_idempotent?: boolean): Promise<Trx<S, M, any>>;
     trx(fn: (trx: TrxNode<S, M, any>) => Promise<TrxNodeStatus>, id?: string, tokens?: AuthRequest<keyof AuthUsers>, users?: Partial<AuthUsers>, origin?: string, idempotent?: boolean): Promise<TrxStatus<any>>;
-    trx_hold(fn: (trx: TrxNode<S, M, any>) => Promise<any>, id?: string, authn?: AuthRequest<keyof AuthUsers>, users?: Partial<AuthUsers>, origin?: string, idempotent?: boolean): Promise<HeldTrxNode<any>>;
+    trx_hold(fn: (trx: TrxNode<S, M, any>) => Promise<any>, id?: string, authn?: AuthRequest<keyof AuthUsers>, users?: Partial<AuthUsers>, origin?: string): Promise<HeldTrxNode<any>>;
     getBucketMetadata(tag: Tag): BucketMetadata;
     getBucketDrive(tag: Tag): DriveAdapter | undefined;
     authenticate(node: TrxNode<S, M, any>, tokens?: AuthRequest<keyof AuthUsers>, users?: AnyUsers, force?: boolean): Promise<void>;
     private hold;
+    private ok;
     private commit;
+    private error;
     private rollback;
 }
 export type AnyTrxEngine = TrxEngine<any, any, any>;