@dnax/core 0.66.0 → 0.66.3

package/app/ctrl.ts

@@ -20,6 +20,25 @@ const actions = [
   "listActivity",
 ];
 
+const forbiddenPipelineOperators = [
+  "$merge",
+  "$out",
+  "$currentOp",
+  "$function",
+  "$accumulator",
+  "$collMod",
+  "$collStats",
+  "$explain",
+  "$indexStats",
+  "$planCacheStats",
+  "$where",
+  "$listLocalSessions",
+  "$listSessions",
+  "$search",
+  "$listCatalog",
+  "$unionWith",
+];
+
 function getAction(action: string) {
   if (actions?.includes(action)) {
     return true;
@@ -27,4 +46,4 @@ function getAction(action: string) {
   return false;
 }
 
-export { getAction };
+export { getAction, forbiddenPipelineOperators };

package/app/hono.ts

@@ -6,6 +6,8 @@ import path from "path";
 import mime from "mime-types";
 import { setApiStudio } from "./studio";
 import { Hono } from "hono";
+import { compress } from "hono/compress";
+
 import { getCookie, setCookie } from "hono/cookie";
 import colors from "@colors/colors/safe";
 import { serveStatic, getConnInfo } from "hono/bun";
@@ -24,7 +26,7 @@ import {
   pick,
   stringToBoolean,
 } from "../utils";
-import { getAction } from "./ctrl";
+import { forbiddenPipelineOperators, getAction } from "./ctrl";
 import { getCollection } from "../lib/collection";
 import { useRest } from "../driver/mongo/rest";
 import moment from "moment";
@@ -42,6 +44,7 @@ import { logger } from "hono/logger";
 import { csrf } from "hono/csrf";
 import { v4 } from "uuid";
 import type { SearchParams } from "meilisearch";
+import { utils } from "..";
 const cache = bentoCache.namespace("DNAX_API");
 const app = new Hono();
 const API_PATH = "/api";
@@ -92,6 +95,7 @@ function HonoInstance(): typeof app {
     })
   );
   app.use(secureHeaders());
+  //app.use(compress());
 
   //eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjoibm9tIiwiaWF0IjoxNzE3Nzc0MDQzLCJleHAiOjE3MTc3NzQxMDN9.Ud4-0y8pa4SMIcSn8PU1A-sjC-hT4ZVe_u3AdChyIJU
   // Middlewares Injection
@@ -506,6 +510,15 @@ function HonoInstance(): typeof app {
 
         // aggregate
         if (action == "aggregate") {
+          if (
+            utils.containsForbiddenOperators(
+              body?.pipeline || [],
+              forbiddenPipelineOperators
+            ) &&
+            !col?.customApi?.aggregate
+          ) {
+            return fn.error("Forbidden operators in pipeline", 403);
+          }
           response = await rest.aggregate(collection, body.pipeline || []);
         }
 

package/app/index.ts

@@ -9,10 +9,10 @@ import pidusage from "pidusage";
 import "@colors/colors";
 import pkg from "../package.json";
 import findPort from "find-open-port";
-import { Server } from "socket.io";
 import { webSocketServer } from "../lib/socket/instance";
 import { HonoInstance } from "./hono";
 import { utils } from "..";
+import type { Server } from "bun";
 type configRunApp = {
   register?: Array<Function>;
   beforeStart?: Array<Function>;
@@ -21,7 +21,7 @@ type configRunApp = {
   destroy?: Array<Function>;
   dbSync?: Array<Function>;
 };
-async function runApp(config?: configRunApp, clb?: Function) {
+async function runApp(config?: configRunApp, clb?: Function): Promise<Server> {
   hookDatabase.cb = config?.dbSync || [];
   await loadCfg(); // Load Config
 
@@ -39,7 +39,7 @@ async function runApp(config?: configRunApp, clb?: Function) {
   }); */
 
   // available port Server
-  await findPort
+  return await findPort
     .isAvailable(PORT)
     .then(async (available: boolean) => {
       // Start App server
@@ -76,36 +76,48 @@ async function runApp(config?: configRunApp, clb?: Function) {
           websocket: webSocketServer(server),
         });
 
-        console.log();
+        let serverName =
+          process.env.SERVER_NAME || Cfg?.server?.name || "SERVER";
+
+        /*      console.log(
+          boxen(`SERVER : ${PORT}`, {
+            borderStyle: "round",
+            title: `@dnax/server ${pkg.version}`,
+            padding: 1,
+            dimBorder: true,
+            titleAlignment: "center",
+            //float: "center",
+            //margin: 1,
+            borderColor: "gray",
+          })
+        ); */
         let info = "";
-        info += "SERVER :".gray.italic.underline;
+        let envName = process.env?.NODE_ENV || "dev";
+        info += `${serverName}`.gray.underline.bold;
         info += `\n`;
         info += `\n`;
-        info +=
-          `Env:  ${
-            process.env.NODE_ENV === "production"
-              ? "production"
-              : process.env?.NODE_ENV || "development"
-          }`.green + "\n";
-        info += `Server: http://localhost:${PORT}\n`.green;
+        info += `Env: ${envName}`.green.bold + "\n";
+        info += `url: http://localhost:${PORT}\n`.gray.bold;
         //info += `Jwt Secret: ${Cfg.server.jwt?.secret}\n`.gray;
         info += `\n`;
-        info += "TENANTS  :".gray.italic.underline;
+        info += "TENANTS :".gray.underline.bold;
         info += `\n`;
         Cfg.tenants?.map((t: any) => {
-          info += `\n${t?.name?.blue || "_"} : ${t?.id?.green}`.italic;
+          info += `\n${t?.name?.blue || "_"} : ${t?.id?.green}`.bold;
         });
         info += `\n\n`;
         info += `🔄 ${new Date().toLocaleString()}`.gray;
 
         if (clb) clb();
 
+        console.log();
         console.log(
           boxen(info, {
-            borderStyle: "round",
+            borderStyle: "double",
             title: `@dnax/server ${pkg.version}`,
-            padding: 1,
+            padding: 1.5,
             dimBorder: true,
+
             titleAlignment: "center",
             //float: "center",
             //margin: 1,
@@ -122,6 +134,8 @@ async function runApp(config?: configRunApp, clb?: Function) {
           }
         }
       }
+
+      return server;
     })
     .catch((err: any) => {
       console.error("Warning", err?.message);

package/bin/{index.ts → _.ts}

@@ -37,7 +37,7 @@ ch.watch(".", {
     /node_modules|node_modules\/.*/,
     /node_modules/,
     /(^|[\/\\])\../,
-    "*/node_modules",
+    "node_modules/**/*",
     ".env.*",
     ".env",
     ".nitro",

package/driver/mongo/rest.ts

@@ -73,6 +73,8 @@ const omitUpdate = [
   "$set.updatedAt",
   "$unset",
   "$rename",
+  "$replaceRoot",
+  "$replaceWith",
 ];
 
 class useRest {
@@ -258,7 +260,7 @@ class useRest {
         let result = {
           docs: [],
         };
-
+        let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         let useHook = options?.useHook ?? this.#useHook;
         let sharedData = {};
         let col = getCollection(collection, this.#tenant_id);
@@ -297,6 +299,21 @@ class useRest {
           });
         }
 
+        if (col?.customApi?.aggregate && useCustomApi) {
+          let result = await col?.customApi?.aggregate({
+            error: fn.error,
+            io: Cfg.io,
+            session: sessionStorage(),
+            pipeline: toJson(pipeline),
+            rest: new useRest({
+              useHook: false,
+              tenant_id: this.#tenant_id,
+              useCustomApi: false,
+            }),
+          });
+          return resolve(result);
+        }
+
         result.docs = await this.#tenant.database.db
           ?.collection(collection)
           .aggregate(toBson(pipeline), {

package/index.ts

@@ -11,6 +11,7 @@ import { FilesystemSftpAdapter, MinioAdapter } from "./lib/media";
 import { crypt } from "./lib/crypto";
 import { contextStorage } from "./lib/asyncLocalStorage";
 import { Cron as Task } from "croner";
+import { useWorkflow } from "./lib/workflow";
 import { serveStatic } from "hono/bun";
 // Adapter
 
@@ -37,4 +38,5 @@ export {
   $,
   contextStorage,
   Adapter,
+  //useWorkflow,
 };

package/lib/collection.ts

@@ -14,6 +14,7 @@ import consola from "consola";
 
 async function loadAllCollections() {
   let collections: Collection[] = [];
+  //collections.push(workflowCol);
   if (Cfg.tenants) {
     for await (let t of Cfg.tenants) {
       let tenantPath = `${t.dir}/collections/**/**.model.{ts,js}`;

package/lib/workflow/index.ts

@@ -0,0 +1,84 @@
+import { useRest } from "../../driver/mongo";
+import { v4 } from "uuid";
+
+type WorkFlowConfig = {
+  tenant_id: string;
+  version?: string;
+};
+
+type StepMeta = {
+  ms?: number;
+  [key: string]: any;
+};
+
+type StepStatus = "done" | "failed";
+
+type StepFunction<TData = any> = (ctx: {
+  rest: useRest;
+  traceId: string;
+  data: TData;
+  meta?: Record<string, any>;
+  output: any;
+}) => Promise<void>;
+
+type Step = {
+  name: string;
+  handler: StepFunction;
+};
+
+class Workflow<Tdata> {
+  name: string;
+  config: WorkFlowConfig;
+  #rest: useRest;
+  traceId?: string;
+  #steps: Step[] = [];
+  constructor(name: string, config: WorkFlowConfig) {
+    this.name = name;
+    this.config = config;
+    this.#rest = new useRest({
+      tenant_id: config.tenant_id,
+    });
+  }
+
+  step(name: string, handler: StepFunction<Tdata>) {
+    this.#steps.push({
+      name,
+      handler,
+    });
+    return this;
+  }
+
+  async run(data: Tdata, traceId?: string): Promise<void> {
+    this.traceId = traceId || v4();
+    let output: any = {};
+    for (const step of this.#steps) {
+      let startAt = Date.now();
+      let ev = {
+        name: step.name,
+        traceId: this.traceId,
+        duration: 0,
+        status: "pending",
+        startedAt: new Date(),
+        endedAt: new Date(),
+      };
+      output = await step.handler({
+        rest: this.#rest,
+        traceId: this.traceId,
+        data,
+        output,
+      });
+      let endAt = Date.now();
+      // duration en ms
+      let duration = endAt - startAt;
+      ev.duration = duration;
+      ev.status = "done";
+      ev.endedAt = new Date();
+    }
+  }
+}
+
+function useWorkflow<T>(name: string, config: WorkFlowConfig) {
+  return new Workflow<T>(name, config);
+}
+
+export { useWorkflow };

package/lib/workflow/types.ts

@@ -0,0 +1,64 @@
+import { useRest } from "../../driver/mongo";
+
+export type StepActions = {
+  done: (comment?: string) => void;
+  fail: (comment?: string) => void;
+  abort: (comment?: string) => void;
+};
+
+export type Step<Name extends string = string> = {
+  name: Name;
+  description?: string;
+  exec: (ctx: { data: any; rest: useRest; action?: StepActions }) => void;
+};
+
+export type stepData = {
+  name: string;
+  data: any;
+  at: Date;
+  comment?: string;
+  description?: string;
+  status: "done" | "failed" | "aborted";
+  traceId: string;
+  ms: number;
+};
+
+export type EventStep = {
+  status: "failed" | "aborted" | "done";
+  data: any;
+  at: Date;
+  name: string;
+};
+
+export type WorkflowData = {
+  _id: string;
+  name: string;
+  traceId: string;
+  currentStep: string;
+  steps: stepData[];
+  events: [];
+  status:
+    | "processing"
+    | "completed"
+    | "failed"
+    | "aborted"
+    | "cancelled"
+    | "initialized";
+};
+
+export type WorkflowType = {
+  traceId: string;
+  _id: string;
+  name: string;
+  currentStep: string;
+  failedAtStep?: string;
+  steps: Step[];
+  events: [];
+  completedIf: () => boolean;
+  failedIf: () => boolean;
+  abortedIf: () => boolean;
+};
+
+export type StepInstance = {
+  run: (stepName: string, data?: any) => Promise<void>;
+};

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@dnax/core",
-  "version": "0.66.0",
+  "version": "0.66.3",
   "module": "index.ts",
   "type": "module",
-  "bin": {
-    "dnaxi": "./bin/index.ts"
-  },
+  "bin": {},
   "devDependencies": {
     "@types/bun": "latest",
     "@types/dot-object": "^2.1.6",
@@ -22,7 +20,6 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@clack/prompts": "^0.10.0",
     "@colors/colors": "^1.6.0",
     "@lukeed/ms": "^2.0.2",
     "bentocache": "^1.2.1",
@@ -47,14 +44,13 @@
     "mingo": "^6.5.0",
     "minio": "^8.0.5",
     "moment": "^2.30.1",
-    "mongodb": "6.15.0",
+    "mongodb": "6.17.0",
     "nodemailer": "^6.9.14",
     "pidusage": "^4.0.0",
     "pizzip": "^3.1.8",
     "radash": "^12.1.0",
     "rfc6902": "^5.1.2",
     "sharp": "^0.33.5",
-    "signaldb": "^0.24.5",
     "ssh2": "^1.16.0",
     "ufo": "^1.5.4",
     "urlencode": "^2.0.0",

package/types/index.ts

@@ -3,6 +3,7 @@ import { Cron } from "croner";
 //import type{ updateParams } from "./../driver/mongo/@types";
 //import * as v from "valibot";
 import type { Db, MongoClient } from "mongodb";
+import { WorkflowInstance } from "../lib/workflow";
 
 import { useRest } from "../driver/mongo/rest";
 import { sessionStorage } from "../lib/asyncLocalStorage";
@@ -271,6 +272,7 @@ export type ctxApi = {
   session?: sessionCtx;
   io: socketIoType;
   params?: findParam;
+  pipeline?: Array<object>;
   id?: string;
   ids?: string[];
   error: typeof fn.error;
@@ -307,6 +309,7 @@ export type Collection = {
     filesystemAdapter?: any;
   };
   customApi?: {
+    aggregate?: (ctx: ctxApi) => Array<object> | null | undefined;
     insertOne?: (ctx: ctxApi) => object | null | undefined;
     insertMany?: (ctx: ctxApi) => Array<object> | null | undefined;
     updateOne?: (ctx: ctxApi) => object | null | undefined;
@@ -546,6 +549,7 @@ export type Config = {
     onError?: (error: ApiError) => Promise<ApiError> | ApiError | void;
   };
   server: {
+    name?: string;
     id?: string;
     logger?: Boolean | loggerFunction;
     whiteListIps?: Array<string>;

package/utils/index.ts

@@ -540,6 +540,15 @@ const file = {
   },
 };
 
+function containsForbiddenOperators(
+  pipeline: any[],
+  forbiddenOperators: string[]
+): boolean {
+  return pipeline.some((stage) =>
+    Object.keys(stage).some((operator) => forbiddenOperators.includes(operator))
+  );
+}
+
 const contextError = ContextError;
 export {
   file,
@@ -575,4 +584,5 @@ export {
   deepEqual,
   applyPatch,
   createPatch,
+  containsForbiddenOperators,
 };