@rockster/core 0.0.2 → 0.1.0

package/core/core.controller.js

@@ -37,6 +37,7 @@ const global_1 = require("../global");
 const worker_threads_1 = require("worker_threads");
 const radash_1 = require("radash");
 const docs_module_1 = require("../docs/docs.module");
+const compile_all_task_post_hooks_1 = require("../tasks/functions/compile-all-task-post-hooks");
 let CoreController = class CoreController {
     constructor(moduleController, databaseController, cacheController, httpController, webSocketController, actionRouter, authController, storageController, jobsController, workersController, nodeControlService, translationsController, formsController) {
         this.moduleController = moduleController;
@@ -81,11 +82,13 @@ let CoreController = class CoreController {
             const interceptor = core.interceptors[property];
             interceptor.instance = await (0, class_injector_1.createInstance)(interceptor.executor);
         }));
+        await (0, compile_all_task_post_hooks_1.compileAllTaskPostHooks)();
         // Init storage, translations and forms
         await this.storageController.start();
         await this.translationsController.start();
         await this.formsController.start();
         events.push(...await this.moduleController.load(docs_module_1.DocsModule));
+        // Before database init
         // Init dabatase and cache connection
         await this.databaseController.initialize();
         await this.cacheController.initialize();
@@ -103,7 +106,7 @@ let CoreController = class CoreController {
                 .active(controller);
         }
         if (core.isAuthRequired && !core.isAuthEnabled) {
-            this.logger.throw(new Error('To use entities protector you need active authentication with @Authentication'));
+            this.logger.throw(new Error('Authentication is required but was not activated'));
         }
         // Init jobs
         await this.jobsController.init();
@@ -112,6 +115,7 @@ let CoreController = class CoreController {
         const server = await this.httpController.listen(port);
         // WebSocket service
         if (core.options.router) {
+            this.logger.log('WebSocket service is disabled');
         }
         else {
             protocols.push('webSocket');
@@ -123,7 +127,14 @@ let CoreController = class CoreController {
         await this
             .nodeControlService
             .registerNode();
+        this.logAppActionsAndRoutes();
+        this.logger.log(`Application started [${protocols}] on port {${port}}`);
+    }
+    logAppActionsAndRoutes() {
         const actions = {};
+        this.logger.log('=================ROUTES==================');
+        this.httpController.routes.forEach(route => this.logger.log(`Route {${route.method}:${route.path}} successfully loaded`));
+        this.logger.log('===============END ROUTES================');
         core.actions.forEach((action) => {
             const name = (0, radash_1.camel)(action
                 .objectClass
@@ -134,10 +145,11 @@ let CoreController = class CoreController {
                 actions[name] = [];
             actions[name].push(action);
         });
+        this.logger.log('=================ACTIONS=================');
         Object.getOwnPropertyNames(actions).forEach((objectKey) => {
             this.logger.log(`Actions $${objectKey}.{${actions[objectKey].map((action) => action.name).join(',')}} loaded`);
         });
-        this.logger.log(`Application started [${protocols}] on port {${port}}`);
+        this.logger.log('===============END ACTIONS===============');
     }
     async initAsWorker(module) {
         // Load Modules
@@ -149,6 +161,7 @@ let CoreController = class CoreController {
             const executor = interceptor.executor;
             interceptor.instance = await (0, class_injector_1.createInstance)(executor);
         }));
+        await (0, compile_all_task_post_hooks_1.compileAllTaskPostHooks)();
         // Config jobs
         await this.jobsController.configJobs();
         // Init dabatase and cache connection

package/core/core.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.controller.js","sourceRoot":"./","sources":["core/core.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qBAAmB;AACnB,6CAA0C;AAC1C,mEAA+D;AAC/D,yEAAqE;AACrE,6DAAyD;AACzD,gEAA4D;AAG5D,8CAAoD;AAEpD,8DAA0D;AAC1D,8DAA0D;AAC1D,iEAA6D;AAC7D,wCAA+C;AAC/C,6DAAyD;AACzD,sEAAkE;AAClE,wEAAoE;AACpE,sDAA0D;AAC1D,wEAAoE;AACpE,0EAAqE;AACrE,qFAAiF;AACjF,gEAA4D;AAC5D,6DAKkC;AAClC,sCAGmB;AACnB,mDAGwB;AACxB,mCAA+B;AAC/B,qDAAiD;AAG1C,IAAM,cAAc,GAApB,MAAM,cAAc;IAIxB,YACa,gBAAkC,EAClC,kBAAsC,EACtC,eAAgC,EAChC,cAA8B,EAC9B,mBAAwC,EACxC,YAA2B,EAC3B,cAA8B,EAC9B,iBAAoC,EACpC,cAA8B,EAC9B,iBAAoC,EACpC,kBAAsC,EACtC,sBAA8C,EAC9C,eAAgC;QAZhC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAe;QAC3B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,oBAAe,GAAf,eAAe,CAAiB;QAfnC,WAAM,GAAG,IAAI,eAAM,CAAC,MAAM,CAAC,CAAC;IAgBlC,CAAC;IAGC,AAAN,KAAK,CAAC,IAAI,CACc,MAAoB,EACnB,OAAoB;QAE1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,IAAA,+BAAc,EAAC,8BAAa,CAAC,CAAC;QAElD,IAAI,CAAC,6BAAY,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QAC5B,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACnB,MAAM,IAAI;iBACN,iBAAiB;iBACjB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CACnB,MAAM,EACN,IAAI,CAAC,OAAO,CAAC,IAAI,CACnB,CAAC;IACL,CAAC;IAES,KAAK,CAAC,UAAU,CACvB,MAAoB,EACpB,IAAY;QAGZ,OAAO;QACP,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC;QAE3B,eAAe;QACf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM;aACpB,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC;aACtC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACrB,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAChD,WAAW,CAAC,QAAQ,GAAG,MAAM,IAAA,+BAAc,EAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC,CAAC;QAEP,uCAAuC;QACvC,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC;QAC1C,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,wBAAU,CAAC,CAAC,CAAC;QAE7D,qCAAqC;QACrC,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,mBAAmB,EAAE,CAAC;QACrC,CAAC;QAED,OAAO;QACP,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,IAAI;iBACnB,OAAO;iBACP,QAAQ;iBACR,UAAU,CAAC;YACf,MAAM,IAAI;iBACN,cAAc;iBACd,MAAM,CAAC,UAAU,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC,CAAC;QACjH,CAAC;QAED,YAAY;QACZ,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAEjC,eAAe;QACf,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEtD,oBAAoB;QACpB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAE1B,CAAC;aAAM,CAAC;YACL,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,IAAI;aACN,kBAAkB;aAClB,YAAY,EAAE,CAAC;QAEnB,MAAM,OAAO,GAAG,EAA6B,CAAC;QAE9C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,MAAM;iBACrB,WAAW;iBACX,IAAI;iBACJ,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;iBACxB,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAC9B,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAClH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,SAAS,cAAc,IAAI,GAAG,CAAC,CAAC;IAC3E,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,MAAoB;QAE9C,eAAe;QACf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC/D,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM;aACpB,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC;aACtC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACrB,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;YACtC,WAAW,CAAC,QAAQ,GAAG,MAAM,IAAA,+BAAc,EAAC,QAAQ,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC,CAAC;QAEP,cAAc;QACd,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;QAEvC,qCAAqC;QACrC,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,mBAAmB,EAAE,CAAC;QACrC,CAAC;QAED,2BAAU,CAAC,WAAW,CAAC,IAAA,8BAAa,EAAC;YAClC,IAAI,EAAE,8BAAiB,CAAC,IAAI;SAC9B,CAAC,CAAC,CAAC;QAEJ,eAAe;QACf,2BAAU,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACtC,MAAM,OAAO,GAAG,IAAA,8BAAa,EAAC,KAAK,CAAC,CAAC;YACrC,QAAO,OAAO,CAAC,IAAI,EAAE,CAAC;gBACnB,KAAK,8BAAiB,CAAC,OAAO;oBAC3B,MAAM,KAAK,GAAG,MAAM,IAAI;yBACpB,cAAc;yBACd,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC7B,2BAAU,CAAC,WAAW,CAAC,IAAA,8BAAa,EAAC;wBAClC,IAAI,EAAE,8BAAiB,CAAC,SAAS;wBACjC,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,KAAK,EAAE,KAAK;qBACd,CAAC,CAAC,CAAA;oBACH,MAAM;YACZ,CAAC;QACJ,CAAC,CAAC,CAAC;IACN,CAAC;IAES,KAAK,CAAC,eAAe,CAC5B,MAAc;QAEd,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;CACH,CAAA;AAzLY,wCAAc;AAqBlB;IADL,IAAA,yBAAQ,GAAE;IAEP,WAAA,IAAA,uBAAM,EAAC,oBAAW,CAAC,CAAA;IACnB,WAAA,IAAA,uBAAM,EAAC,qBAAY,CAAC,CAAA;;;;0CAuBvB;yBA9CS,cAAc;IAD1B,IAAA,2BAAU,GAAE;qCAMqB,oCAAgB;QACd,wCAAkB;QACrB,kCAAe;QAChB,gCAAc;QACT,gCAAmB;QAC1B,8BAAa;QACX,gCAAc;QACX,2BAAiB;QACpB,gCAAc;QACX,sCAAiB;QAChB,yCAAkB;QACd,gDAAsB;QAC7B,kCAAe;GAjBnC,cAAc,CAyL1B"}
+{"version":3,"file":"core.controller.js","sourceRoot":"./","sources":["core/core.controller.ts"],"names":[],"mappings":"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"}

package/core/functions/create-interceptor.js

@@ -16,7 +16,7 @@ const decorator = (interceptor, params) => {
             const object = core
                 .storage
                 .createObject(target);
-            object.interceptors.push({
+            object.postInterceptors.push({
                 name: interceptor.name,
                 params
             });
@@ -57,7 +57,7 @@ const createExecuteInterceptors = (filters, object, property) => {
         return isExists.length > 0;
     };
     const executes = [
-        ...object.interceptors.filter(filter),
+        ...object.postInterceptors.filter(filter),
         ...property ? property.interceptors.filter(filter) : []
     ];
     return async (args, isAfter = false) => {

package/core/functions/create-interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-interceptor.js","sourceRoot":"./","sources":["core/functions/create-interceptor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-interceptor.js","sourceRoot":"./","sources":["core/functions/create-interceptor.ts"],"names":[],"mappings":"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"}

package/core/functions/resolve-action-transactional.d.ts

@@ -0,0 +1,3 @@
+import { ObjectNote, PropertyNote } from "@rockster/class-memory";
+import { IControllerObject, IControllerProperty } from "../../controllers/interfaces";
+export declare function resolveActionTransactional(object: ObjectNote<IControllerObject>, property: PropertyNote<IControllerProperty>): boolean;

package/core/functions/resolve-action-transactional.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveActionTransactional = resolveActionTransactional;
+function resolveActionTransactional(object, property) {
+    if (property.useTransaction !== undefined) {
+        return property.useTransaction;
+    }
+    return object.transactionalDefault ?? false;
+}
+//# sourceMappingURL=resolve-action-transactional.js.map

package/core/functions/resolve-action-transactional.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-action-transactional.js","sourceRoot":"./","sources":["core/functions/resolve-action-transactional.ts"],"names":[],"mappings":";;AAMA,gEAQC;AARD,SAAgB,0BAA0B,CACvC,MAAqC,EACrC,QAA2C;IAE3C,IAAI,QAAQ,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACzC,OAAO,QAAQ,CAAC,cAAc,CAAC;IAClC,CAAC;IACD,OAAO,MAAM,CAAC,oBAAoB,IAAI,KAAK,CAAC;AAC/C,CAAC"}

package/core/interfaces/action-def.d.ts

@@ -1,10 +1,6 @@
 import { Instantiable } from "@rockster/common";
-import { IRequestContext } from "./request-context";
-import { PendingAction } from "./pending-action";
 import { IActionDocs } from "./action-docs";
-export type ActionHandle = {
-    (action: PendingAction, context: IRequestContext): Promise<void>;
-};
+import { ActionHandle } from "./action-handle";
 export type ActionDef = {
     objectClass: Instantiable;
     path: string;
@@ -13,4 +9,5 @@ export type ActionDef = {
     execute: ActionHandle;
     secure: boolean;
     docs?: IActionDocs;
+    transactional: boolean;
 };

package/core/interfaces/action-docs.d.ts

@@ -1,5 +1,16 @@
 import { HttpMethod, Instantiable } from "@rockster/common";
 import { DocsControllerActionType } from "@rockster/common/docs";
+/** A scope key required by an action, surfaced in the generated docs/SDK. */
+export interface IActionDocsScopeKey {
+    /** Action slot the key guards: default | query | create | modify | remove. */
+    slot: string;
+    /** Scope context the key belongs to (workspace | account | project | …). */
+    contextName: string;
+    /** Scope key name (e.g. "vh_registry_read"). */
+    name: string;
+    /** Scope service resolver used to resolve the context id, when set. */
+    resolverHandler?: string;
+}
 export interface IActionDocs {
     type: DocsControllerActionType;
     controller: string;
@@ -18,6 +29,10 @@ export interface IActionDocs {
     httpMethod?: HttpMethod;
     isResponseArray?: boolean;
     isSecure?: boolean;
+    /** True when guarded by a special auth strategy (see createAuthenticationInterceptor). */
+    authenticated?: boolean;
+    /** Scope keys required to call the action (empty = login only). */
+    keys?: IActionDocsScopeKey[];
     description?: string;
     exposeGroups?: string[];
     validateGroups?: string[];

package/core/interfaces/action-handle.d.ts

@@ -0,0 +1,5 @@
+import { PendingAction } from "./pending-action";
+import { IRequestContext } from "./request-context";
+export type ActionHandle = {
+    (action: PendingAction, context: IRequestContext): Promise<void>;
+};

package/core/interfaces/action-handle.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=action-handle.js.map

package/core/interfaces/action-handle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"action-handle.js","sourceRoot":"./","sources":["core/interfaces/action-handle.ts"],"names":[],"mappings":""}

package/core/interfaces/core-options.d.ts

@@ -20,6 +20,7 @@ export type CoreOptions = {
     onCreateHttpServer?: OnCreateHttpServer;
     onRequestError?: (error: Error) => void;
     port?: number;
+    /** true: entire `/request` in one transaction (legacy). false/undefined: per-action @Transaction / Controller. */
     transaction?: boolean;
     docs?: DocsOptions;
     locale?: LocaleOptions;

package/core/interfaces/interceptor.d.ts

@@ -15,9 +15,9 @@ export type InterceptorExecutorArgs<Extra = any, Params = any> = {
     property?: PropertyNote<IControllerProperty>;
     extra?: Extra;
     params?: Params;
+    result?: any;
     req?: HttpRequest;
     res?: HttpResponse;
-    result?: any;
 };
 export type InterceptorExecutor = {
     intercept(args: InterceptorExecutorArgs): Promise<any>;

package/core/interfaces/object.d.ts

@@ -7,10 +7,11 @@ import { InterceptorExecute } from "./interceptor";
 import { IQueryObject } from "../../query/interfaces";
 import { IJobObject } from "../../jobs/interfaces";
 import { ITaskObject } from "../../tasks/interfaces/task-object";
+import { IEntityDtoObject } from "../../database/interfaces/entity-dto-object";
 export interface IObject {
     type: ObjectType;
     initialized?: boolean;
-    interceptors?: InterceptorExecute[];
+    postInterceptors?: InterceptorExecute[];
     description?: string;
 }
-export type Object = IObject & (IModuleObject | IEntityObject | IAuthObject | IControllerObject | IQueryObject | IJobObject | ITaskObject);
+export type Object = IObject & (IModuleObject | IEntityObject | IAuthObject | IControllerObject | IQueryObject | IJobObject | ITaskObject | IEntityDtoObject);

package/core/interfaces/request-context.d.ts

@@ -4,8 +4,8 @@ import { EntityManager } from "typeorm";
 import { IncomingHttpHeaders } from "http";
 import { RequestCallbacks } from "./request-callbacks";
 import { RequestCallbackHandle } from "./request-callback-handle";
-import { Client } from "../../web-socket";
-import { HttpRequest } from "../../http";
+import { Client } from "../../web-socket/interfaces/client";
+import { HttpRequest } from "../../http/interfaces/http-request";
 export type OnEndRequest = {
     (action: string, handle: RequestCallbackHandle): Promise<void> | void;
 };
@@ -19,6 +19,11 @@ export interface IRequestContext<Session = CurrentSession> {
     isAuthenticated?: boolean;
     session?: Session;
     entityManager?: EntityManager;
+    /**
+     * Per-request store shared by scope resolvers (and, afterwards, the action
+     * handler) so data loaded while resolving authorization is not re-queried.
+     */
+    scopeStore?: Map<string, unknown>;
     headers?: IncomingHttpHeaders;
     callbacks: RequestCallbacks;
     onSuccess: OnEndRequest;

package/core/services/request-executor.d.ts

@@ -2,6 +2,14 @@ import { PendingAction, IRequestContext } from "../interfaces";
 export declare class RequestExecutor {
     executeByDataSource(context: IRequestContext): Promise<import("@rockster/common").Dictionary<any>>;
     executeByTransaction(context: IRequestContext): Promise<import("@rockster/common").Dictionary<any>>;
+    /**
+     * Ordered segments: consecutive actions with the same `transactional` flag share one
+     * TypeORM transaction or none. `onBefore` runs for all actions first (via executeBefore).
+     */
+    executeByMixed(context: IRequestContext): Promise<import("@rockster/common").Dictionary<any>>;
+    protected getTransactionalSegments(pendings: PendingAction[]): PendingAction[][];
+    protected executeDataSourceForSegment(context: IRequestContext, segment: PendingAction[]): Promise<void>;
+    protected executeActionsForSegment(context: IRequestContext, segment: PendingAction[]): Promise<void>;
     protected executeBefore(context: IRequestContext): Promise<void>;
     protected executeActions(context: IRequestContext): Promise<void>;
     protected executeSuccessCallbacks(context: IRequestContext): Promise<void>;

package/core/services/request-executor.js

@@ -37,6 +37,93 @@ let RequestExecutor = class RequestExecutor {
         await this.executeSuccessCallbacks(context);
         return context.response;
     }
+    /**
+     * Ordered segments: consecutive actions with the same `transactional` flag share one
+     * TypeORM transaction or none. `onBefore` runs for all actions first (via executeBefore).
+     */
+    async executeByMixed(context) {
+        await this.executeBefore(context);
+        const segments = this.getTransactionalSegments(context.pendings);
+        for (const segment of segments) {
+            const transactional = segment[0].action.transactional;
+            if (transactional) {
+                await this.executeActionsForSegment(context, segment);
+            }
+            else {
+                await this.executeDataSourceForSegment(context, segment);
+            }
+        }
+        await this.executeSuccessCallbacks(context);
+        return context.response;
+    }
+    getTransactionalSegments(pendings) {
+        if (pendings.length === 0) {
+            return [];
+        }
+        const segments = [];
+        let current = [pendings[0]];
+        let currentMode = pendings[0].action.transactional;
+        for (let i = 1; i < pendings.length; i++) {
+            const p = pendings[i];
+            if (p.action.transactional === currentMode) {
+                current.push(p);
+            }
+            else {
+                segments.push(current);
+                current = [p];
+                currentMode = p.action.transactional;
+            }
+        }
+        segments.push(current);
+        return segments;
+    }
+    async executeDataSourceForSegment(context, segment) {
+        for (const pending of segment) {
+            try {
+                await pending.action.execute(pending, context);
+            }
+            catch (error) {
+                error.requestRef = pending.requestRef;
+                throw error;
+            }
+        }
+    }
+    async executeActionsForSegment(context, segment) {
+        let actionError;
+        const dataSource = core.database.dataSource;
+        const queryRunner = dataSource.createQueryRunner();
+        const entityManager = queryRunner.manager;
+        context.entityManager = entityManager;
+        await transaction_context_1.transactionContextStore.run({ entityManager }, async () => {
+            try {
+                await queryRunner.connect();
+                await queryRunner.startTransaction();
+                for (const pending of segment) {
+                    try {
+                        await pending.action.execute(pending, context);
+                    }
+                    catch (error) {
+                        error.requestRef = pending.requestRef;
+                        actionError = error;
+                        await this
+                            .executeErrorCallbacks(error, pending, context);
+                        throw error;
+                    }
+                }
+                await queryRunner.commitTransaction();
+            }
+            catch (error) {
+                await queryRunner.rollbackTransaction();
+            }
+            finally {
+                await queryRunner.release();
+                context.entityManager = undefined;
+            }
+        });
+        if (actionError) {
+            throw actionError;
+        }
+    }
     async executeBefore(context) {
         for (const pending of context.pendings) {
             try {
@@ -79,6 +166,7 @@ let RequestExecutor = class RequestExecutor {
             }
             finally {
                 await queryRunner.release();
+                context.entityManager = undefined;
             }
         });
         if (actionError) {

package/core/services/request-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-executor.js","sourceRoot":"./","sources":["core/services/request-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-executor.js","sourceRoot":"./","sources":["core/services/request-executor.ts"],"names":[],"mappings":"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"}

package/core/services/request-router.js

@@ -19,6 +19,7 @@ const database_1 = require("../../database");
 const use_auth_1 = require("../../security/functions/use-auth");
 const class_pipe_1 = require("@rockster/class-pipe");
 const common_1 = require("@rockster/common");
+const request_context_1 = require("../contexts/request-context");
 let RequestRouter = class RequestRouter {
     constructor(contextBuilder, requestExecutor) {
         this.contextBuilder = contextBuilder;
@@ -33,15 +34,15 @@ let RequestRouter = class RequestRouter {
     }
     postRequest(http) {
         const method = common_1.HttpMethod.post;
-        const transaction = (0, database_1.useTransaction)();
-        const execute = transaction
+        const globalTransaction = (0, database_1.useTransaction)();
+        const execute = globalTransaction
             ? this
                 .requestExecutor
                 .executeByTransaction
                 .bind(this.requestExecutor)
             : this
                 .requestExecutor
-                .executeByDataSource
+                .executeByMixed
                 .bind(this.requestExecutor);
         http.addRoute(method, this.requestPath, async (req, res) => {
             try {
@@ -58,7 +59,7 @@ let RequestRouter = class RequestRouter {
                 if (req.isWs) {
                     requestContext.session = req.session;
                 }
-                const result = await execute(requestContext);
+                const result = await request_context_1.requestContextStore.run(requestContext, () => execute(requestContext));
                 res.status(common_1.HttpStatus.ok).json(result);
             }
             catch (error) {

package/core/services/request-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-router.js","sourceRoot":"./","sources":["core/services/request-router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-router.js","sourceRoot":"./","sources":["core/services/request-router.ts"],"names":[],"mappings":"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"}

package/database/database.controller.d.ts

@@ -4,18 +4,16 @@ import { ObjectNote } from "@rockster/class-memory";
 import { ObjectLoader } from "../core";
 import { IEntityObject } from "./interfaces";
 import { PathsBuilder } from "./services/paths-builder";
-import { ProtectBuilder } from "./services/protect-builder";
 import { JsonbIndexCreator } from "./services/jsonb-index-creator";
 export declare class DatabaseController extends ObjectLoader<IEntityObject> {
     protected pathsBuilder: PathsBuilder;
-    protected protectBuilder: ProtectBuilder;
     protected jsonbIndexCreator: JsonbIndexCreator;
     static _objects: ObjectNote<IEntityObject>[];
     static _dataSource: DataSource;
     protected get objects(): ObjectNote<IEntityObject>[];
     get dataSource(): DataSource;
     protected set dataSource(value: DataSource);
-    constructor(pathsBuilder: PathsBuilder, protectBuilder: ProtectBuilder, jsonbIndexCreator: JsonbIndexCreator);
+    constructor(pathsBuilder: PathsBuilder, jsonbIndexCreator: JsonbIndexCreator);
     addMigrations(migrations: (string | Function)[]): Promise<void>;
     build(targets: Instantiable[]): Promise<void>;
     initialize(): Promise<void>;

package/database/database.controller.js

@@ -17,7 +17,6 @@ const logger_1 = require("@rockster/logger");
 const core_1 = require("../core");
 const common_1 = require("../common");
 const paths_builder_1 = require("./services/paths-builder");
-const protect_builder_1 = require("./services/protect-builder");
 const env_1 = require("./env");
 const typeorm_naming_strategies_1 = require("typeorm-naming-strategies");
 const jsonb_index_creator_1 = require("./services/jsonb-index-creator");
@@ -27,10 +26,9 @@ let DatabaseController = DatabaseController_1 = class DatabaseController extends
     set dataSource(value) {
         DatabaseController_1._dataSource = value;
     }
-    constructor(pathsBuilder, protectBuilder, jsonbIndexCreator) {
+    constructor(pathsBuilder, jsonbIndexCreator) {
         super();
         this.pathsBuilder = pathsBuilder;
-        this.protectBuilder = protectBuilder;
         this.jsonbIndexCreator = jsonbIndexCreator;
     }
     async addMigrations(migrations) {
@@ -52,7 +50,6 @@ let DatabaseController = DatabaseController_1 = class DatabaseController extends
         super.load(this.objects, common_1.ObjectType.entity, targets);
         await this.each(async (object) => {
             await this.pathsBuilder.build(object);
-            await this.protectBuilder.build(object);
         });
     }
     async initialize() {
@@ -86,7 +83,6 @@ DatabaseController._objects = [];
 exports.DatabaseController = DatabaseController = DatabaseController_1 = __decorate([
     (0, class_injector_1.Injectable)(),
     __metadata("design:paramtypes", [paths_builder_1.PathsBuilder,
-        protect_builder_1.ProtectBuilder,
         jsonb_index_creator_1.JsonbIndexCreator])
 ], DatabaseController);
 //# sourceMappingURL=database.controller.js.map

package/database/database.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"database.controller.js","sourceRoot":"./","sources":["database/database.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"database.controller.js","sourceRoot":"./","sources":["database/database.controller.ts"],"names":[],"mappings":"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"}

package/database/decorators/entity.decorator.d.ts

@@ -1,2 +1,4 @@
 import { IEntityOptions } from "../interfaces";
-export declare const Entity: (options?: IEntityOptions) => (target: any) => void;
+import { GetTypeCallback } from "@rockster/common";
+export declare function Entity(entity: GetTypeCallback): any;
+export declare function Entity(options?: IEntityOptions): any;

package/database/decorators/entity.decorator.js

@@ -1,11 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Entity = void 0;
+exports.Entity = Entity;
 const entity_decorator_1 = require("../functions/entity-decorator");
-const Entity = (options) => {
+const object_type_1 = require("../../common/interfaces/enum/object-type");
+function Entity(getEntityOrOptions) {
     return (target) => {
-        (0, entity_decorator_1.entityDecorator)(target, options);
+        if (typeof getEntityOrOptions === "function") {
+            const objectNote = core
+                .storage
+                .createObject(target);
+            objectNote.entity = getEntityOrOptions;
+            objectNote.type = object_type_1.ObjectType.entityDto;
+        }
+        else {
+            (0, entity_decorator_1.entityDecorator)(target, getEntityOrOptions);
+        }
     };
-};
-exports.Entity = Entity;
+}
 //# sourceMappingURL=entity.decorator.js.map

package/database/decorators/entity.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity.decorator.js","sourceRoot":"./","sources":["database/decorators/entity.decorator.ts"],"names":[],"mappings":";;;AACA,oEAAgE;AAEzD,MAAM,MAAM,GAAG,CAAC,OAAwB,EAAE,EAAE;IAChD,OAAO,CAAC,MAAM,EAAE,EAAE;QACf,IAAA,kCAAe,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC,CAAA;AACJ,CAAC,CAAA;AAJY,QAAA,MAAM,UAIlB"}
+{"version":3,"file":"entity.decorator.js","sourceRoot":"./","sources":["database/decorators/entity.decorator.ts"],"names":[],"mappings":";;AASA,wBAYC;AApBD,oEAAgE;AAIhE,0EAAsE;AAItE,SAAgB,MAAM,CAAC,kBAAqD;IACzE,OAAO,CAAC,MAAM,EAAE,EAAE;QACf,IAAI,OAAO,kBAAkB,KAAK,UAAU,EAAE,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI;iBACnB,OAAO;iBACP,YAAY,CAAC,MAAM,CAAiC,CAAC;YACzD,UAAU,CAAC,MAAM,GAAG,kBAAkB,CAAC;YACvC,UAAU,CAAC,IAAI,GAAG,wBAAU,CAAC,SAAS,CAAC;QAC1C,CAAC;aAAM,CAAC;YACL,IAAA,kCAAe,EAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC/C,CAAC;IACJ,CAAC,CAAA;AACJ,CAAC"}

package/database/decorators/external-column.decorator.d.ts

@@ -0,0 +1,17 @@
+import { GetTypeCallback } from '../../common/interfaces/get-type-callback';
+/**
+ * Optional flags for ExternalColumn (same idea as RelationOptions).
+ */
+export interface ExternalColumnOptions {
+    /**
+     * Property keys on this entity that must be loaded from the DB whenever this external column appears
+     * in the query select (e.g. `clientId`, `routerId` for a resolver that calls an external API).
+     */
+    selectDependencies?: string[];
+}
+/**
+ * Marks a property as an external column: value is not from DB but from the resolver class returned by `resolverType`.
+ * Same callback pattern as Relation: `() => YourInjectableResolver` avoids circular imports.
+ * The resolver is invoked in batch before `transform` when this path (or nested selects under it) is selected.
+ */
+export declare function ExternalColumn(resolverType: GetTypeCallback, options?: ExternalColumnOptions): (target: any, propertyKey: string) => void;