nesoi 3.1.6 → 3.1.8

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

@@ -11,7 +11,8 @@ import { MachineTrxNode } from './nodes/machine.trx_node';
 import { AnyUsers, AuthnRequest } from '../auth/authn';
 import { Enum } from "../../elements/entities/constants/constants";
 import { KeysOfUnion } from '../util/type';
-type TrxNodeBlock = 'bucket' | 'message' | 'job' | 'resource' | 'machine' | 'queue' | 'controller';
+import { TopicTrxNode } from './nodes/topic.trx_node';
+type TrxNodeBlock = 'bucket' | 'message' | 'job' | 'resource' | 'machine' | 'queue' | 'topic' | 'controller';
 export type TrxNodeStatus = {
     id: string;
     scope: 'root' | `${string}::${TrxNodeBlock}:${string}` | `${string}::virtual`;
@@ -58,6 +59,7 @@ export declare class TrxNode<Space extends $Space, M extends $Module, Authn exte
     resource<Name extends keyof M['resources'], Resource extends M['resources'][Name]>(name: Name): ResourceTrxNode<M, Resource>;
     machine<Name extends keyof M['machines'], Machine extends M['machines'][Name]>(name: Name): MachineTrxNode<M, Machine>;
     queue<Name extends keyof M['queues'], Queue extends M['queues'][Name]>(name: Name): QueueTrxNode<M, Queue>;
+    topic<Name extends keyof M['topics'], topic extends M['topics'][Name]>(name: Name): TopicTrxNode<M, topic>;
     authenticate(authnRequest: AuthnRequest<keyof Authn>): Promise<TrxNode<$Space, $Module, Authn>>;
     token<U extends keyof Authn & keyof M['#authn']>(provider: U): string;
     user<U extends keyof Authn & keyof M['#authn']>(provider: U): M['#authn'][U];

package/lib/engine/transaction/trx_node.js

@@ -12,6 +12,7 @@ const machine_trx_node_1 = require("./nodes/machine.trx_node");
 const constants_1 = require("../../elements/entities/constants/constants");
 const i18n_1 = require("../util/i18n");
 const datetime_1 = require("../data/datetime");
+const topic_trx_node_1 = require("./nodes/topic.trx_node");
 /*
     Transaction Node
 */
@@ -129,6 +130,13 @@ class TrxNode {
         }
         return new queue_trx_node_1.QueueTrxNode(this, queue);
     }
+    topic(name) {
+        const topic = this.module.topics[name];
+        if (!topic) {
+            throw error_1.NesoiError.Module.TopicNotIncluded(this.module, name);
+        }
+        return new topic_trx_node_1.TopicTrxNode(this, topic);
+    }
     // Authentication
     async authenticate(authnRequest) {
         const newNode = new TrxNode(this.scope, this.trx, this, this.module, this.authn);

package/lib/engine/util/crypto.d.ts

@@ -1,6 +1,5 @@
-export declare class Crypto {
-    static DEFAULTS: {
-        algorithm: string;
+export declare class NesoiCrypto {
+    static C: {
         /**
          * NIST recommends 96 bits or 12 bytes IV for GCM
          * to promote interoperability, efficiency, and
@@ -17,14 +16,6 @@ export declare class Crypto {
          * */
         salt_bytes: number;
     };
-    /**
-     * To prevent rainbow table attacks
-     * */
-    static getIV(): Buffer;
-    /**
-     * To prevent rainbow table attacks
-     * */
-    static getSalt(): Buffer;
     /**
      *
      * @param {Buffer} password - The password to be used for generating key
@@ -36,7 +27,7 @@ export declare class Crypto {
      * @param {string} payload - The clear text message to be encrypted
      * @param {string} key - The key to be used for encryption
      */
-    static encrypt(value: any, key: string): string;
+    static encrypt(value: any, key: string): Promise<string>;
     /**
      *
      * @param {Buffer} ciphertext - Cipher text
@@ -46,5 +37,5 @@ export declare class Crypto {
      * the Buffer after the decryption to prevent the message text
      * and the key from lingering in the memory
      */
-    static decrypt(ciphertext: string, key: string): any;
+    static decrypt(ciphertext: string, key: string): Promise<any>;
 }

package/lib/engine/util/crypto.js

@@ -6,28 +6,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Crypto = void 0;
+exports.NesoiCrypto = void 0;
 const crypto_1 = __importDefault(require("crypto"));
-class Crypto {
-    /**
-     * To prevent rainbow table attacks
-     * */
-    static getIV() {
-        return crypto_1.default.randomBytes(this.DEFAULTS.iv_bytes);
-    }
-    /**
-     * To prevent rainbow table attacks
-     * */
-    static getSalt() {
-        return crypto_1.default.randomBytes(this.DEFAULTS.salt_bytes);
-    }
+class NesoiCrypto {
     /**
      *
      * @param {Buffer} password - The password to be used for generating key
      *
      */
     static getKeyFromPassword(password, salt) {
-        const buffer = crypto_1.default.scryptSync(password, salt, this.DEFAULTS.key_bytes);
+        const buffer = crypto_1.default.scryptSync(password, salt, this.C.key_bytes);
         const str = buffer.toString();
         buffer.fill(0);
         return str;
@@ -37,16 +25,15 @@ class Crypto {
      * @param {string} payload - The clear text message to be encrypted
      * @param {string} key - The key to be used for encryption
      */
-    static encrypt(value, key) {
-        const payload = JSON.stringify(value);
-        const iv = this.getIV();
-        const cipher = crypto_1.default.createCipheriv(this.DEFAULTS.algorithm, key, iv);
-        let encrypted = cipher.update(payload);
-        encrypted = Buffer.concat([encrypted, cipher.final()]);
-        const buffer = Buffer.concat([iv, encrypted]);
-        const str = buffer.toString();
-        buffer.fill(0);
-        return str;
+    static async encrypt(value, key) {
+        const iv = crypto_1.default.randomBytes(this.C.iv_bytes);
+        const aes_key = await crypto_1.default.subtle.importKey('raw', Buffer.from(key), 'AES-GCM', true, ['encrypt', 'decrypt']);
+        const encrypted = await crypto_1.default.subtle.encrypt({
+            name: 'AES-GCM',
+            iv,
+            tagLength: 128,
+        }, aes_key, Buffer.from(JSON.stringify(value)));
+        return Buffer.concat([Buffer.from(iv), Buffer.from(encrypted)]).toString('base64');
     }
     /**
      *
@@ -57,20 +44,22 @@ class Crypto {
      * the Buffer after the decryption to prevent the message text
      * and the key from lingering in the memory
      */
-    static decrypt(ciphertext, key) {
-        const iv = ciphertext.slice(0, 12);
-        const encryptedMessage = ciphertext.slice(12, -16);
-        const decipher = crypto_1.default.createDecipheriv(this.DEFAULTS.algorithm, key, iv);
-        const payload = decipher.update(encryptedMessage, 'utf8');
-        const buffer = Buffer.concat([payload, decipher.final()]);
-        const str = buffer.toString();
-        buffer.fill(0);
-        return JSON.parse(str);
+    static async decrypt(ciphertext, key) {
+        const buffer = Uint8Array.from(Buffer.from(ciphertext, 'base64'));
+        const iv = buffer.slice(0, this.C.iv_bytes);
+        const payload = buffer.slice(this.C.iv_bytes);
+        const aes_key = await crypto_1.default.subtle.importKey('raw', Buffer.from(key), 'AES-GCM', true, ['encrypt', 'decrypt']);
+        const decrypted = await crypto_1.default.subtle.decrypt({
+            name: 'AES-GCM',
+            iv: Buffer.from(iv),
+            tagLength: 128
+        }, aes_key, Buffer.from(payload));
+        const decoded = Buffer.from(decrypted).toString('utf8');
+        return JSON.parse(decoded);
     }
 }
-exports.Crypto = Crypto;
-Crypto.DEFAULTS = {
-    algorithm: 'aes-256',
+exports.NesoiCrypto = NesoiCrypto;
+NesoiCrypto.C = {
     /**
      * NIST recommends 96 bits or 12 bytes IV for GCM
      * to promote interoperability, efficiency, and

package/lib/engine/util/log.d.ts

@@ -1,7 +1,7 @@
 import { $BlockType } from "../../elements/blocks/block.schema";
 declare const LogLevel: readonly ["off", "error", "warn", "info", "debug", "trace"];
 export type LogLevel = typeof LogLevel[number];
-export type LogScope = $BlockType | 'compiler' | 'trx' | 'daemon' | 'app' | 'module' | 'layer' | 'message' | 'bucket' | 'job' | 'resource' | 'controller' | 'queue' | 'constants' | 'externals';
+export type LogScope = $BlockType | 'compiler' | 'trx' | 'daemon' | 'app' | 'module' | 'layer' | 'message' | 'bucket' | 'job' | 'resource' | 'controller' | 'queue' | 'topic' | 'constants' | 'externals';
 export declare function scopeTag(scope: LogScope, scope_id: string): string;
 export declare function anyScopeTag(scopeWithId: string): string;
 export declare class Log {

package/lib/engine/util/log.js

@@ -24,6 +24,7 @@ function scopeTag(scope, scope_id) {
         controller: 'lightblue',
         machine: 'lightblue',
         queue: 'lightblue',
+        topic: 'lightblue',
     }[scope] || 'lightgray';
     return (0, string_1.colored)(`${scope}:${scope_id}`, color);
 }

package/lib/schema.d.ts

@@ -8,7 +8,8 @@ import { $Job } from './elements/blocks/job/job.schema';
 import { $Resource } from './elements/blocks/resource/resource.schema';
 import { $Queue } from './elements/blocks/queue/queue.schema';
 import { $Externals } from './elements/edge/externals/externals.schema';
-export type BuilderType = 'constants' | 'externals' | 'message' | 'bucket' | 'job' | 'resource' | 'machine' | 'controller' | 'queue';
+import { $Topic } from './elements/blocks/topic/topic.schema';
+export type BuilderType = 'constants' | 'externals' | 'message' | 'bucket' | 'job' | 'resource' | 'machine' | 'controller' | 'queue' | 'topic';
 export type $Space = {
     authnUsers: {
         [x: string]: User;
@@ -42,6 +43,9 @@ export type $Module = {
     queues: {
         [x: string]: $Queue;
     };
+    topics: {
+        [x: string]: $Topic;
+    };
     '#input': $Message;
     '#authn': AnyUsers;
     '#services': Record<string, any>;

package/package.json

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