@dnax/core 0.20.2 → 0.21.1

package/app/index.ts

@@ -25,6 +25,7 @@ async function runApp(config?: configRunApp, clb?: Function) {
   await loadCfg(); // Load Config
 
   const PORT = Cfg.server?.port || process.env?.PORT || 4000;
+  const CLUSTER_MODE = Cfg?.clusterMode ?? false;
   /*  const PORT_SOCKET = Cfg.server?.socket?.port || 9000;
 
   // available port Socket
@@ -37,81 +38,90 @@ async function runApp(config?: configRunApp, clb?: Function) {
   }); */
 
   // available port Server
-  await findPort.isAvailable(PORT).then(async (available: boolean) => {
-    // Start App server
-    if (available) {
-      // Load all ressouce
-      await init();
-      const HonoApp = HonoInstance();
-      //await loadSocket(HonoApp);
-      //BeforeStart
-      if (config?.beforeStart) {
-        for (const fn of config?.beforeStart) {
-          await fn();
-        }
+  await findPort
+    .isAvailable(PORT)
+    .then(async (available: boolean) => {
+      // Start App server
+      if (!available && !Cfg?.clusterMode) {
+        console.error(`⚠️ Port ${PORT} is not available`);
+        console.log("");
+        process.exit();
       }
 
-      var server = Bun.serve({
-        port: PORT,
-        fetch: (req, server) => {
-          if (server.upgrade(req)) {
-            // handle authentication
-            return;
+      if (available) {
+        // Load all ressouce
+        await init();
+        const HonoApp = HonoInstance();
+        //await loadSocket(HonoApp);
+        //BeforeStart
+        if (config?.beforeStart) {
+          for (const fn of config?.beforeStart) {
+            await fn();
           }
+        }
 
-          return HonoApp.fetch(req, server);
-        },
-        maxRequestBodySize: 1024 * 1024 * 900,
-        websocket: webSocketServer(server),
-      });
+        var server: any = Bun.serve({
+          port: PORT,
+          reusePort: CLUSTER_MODE,
+          fetch: (req, server) => {
+            if (server.upgrade(req)) {
+              // handle authentication
+              return;
+            }
 
-      console.log();
-      let info = "";
-      info += "SERVER :".gray.italic.underline;
-      info += `\n`;
-      info += `\n`;
-      info +=
-        `Env:  ${
-          process.env.NODE_ENV === "production"
-            ? "production"
-            : process.env?.NODE_ENV || "development"
-        }`.italic.blue.green + "\n";
-      info += `Server: http://localhost:${PORT}\n`.italic.blue;
-      info += `\n`;
-      info += "TENANTS  :".gray.italic.underline;
-      info += `\n`;
-      Cfg.tenants?.map((t: any) => {
-        info += `\n${t?.name?.blue || "_"} : ${t?.id?.green}`.italic;
-      });
-      info += `\n`;
+            return HonoApp.fetch(req, server);
+          },
+          maxRequestBodySize: 1024 * 1024 * 900,
+          websocket: webSocketServer(server),
+        });
 
-      if (clb) clb();
+        console.log();
+        let info = "";
+        info += "SERVER :".gray.italic.underline;
+        info += `\n`;
+        info += `\n`;
+        info +=
+          `Env:  ${
+            process.env.NODE_ENV === "production"
+              ? "production"
+              : process.env?.NODE_ENV || "development"
+          }`.italic.blue.green + "\n";
+        info += `Server: http://localhost:${PORT}\n`.italic.blue;
+        info += `\n`;
+        info += "TENANTS  :".gray.italic.underline;
+        info += `\n`;
+        Cfg.tenants?.map((t: any) => {
+          info += `\n${t?.name?.blue || "_"} : ${t?.id?.green}`.italic;
+        });
+        info += `\n`;
 
-      console.log(
-        boxen(info, {
-          borderStyle: "round",
-          title: `@dnax/server ${pkg.version}`.italic,
-          padding: 1,
-          dimBorder: true,
-          titleAlignment: "center",
-          //float: "center",
-          //margin: 1,
-          borderColor: "gray",
-        })
-      );
+        if (clb) clb();
 
-      //AfterStart
-      if (config?.afterStart) {
-        for (const fn of config?.afterStart) {
-          await fn();
+        console.log(
+          boxen(info, {
+            borderStyle: "round",
+            title: `@dnax/server ${pkg.version}`.italic,
+            padding: 1,
+            dimBorder: true,
+            titleAlignment: "center",
+            //float: "center",
+            //margin: 1,
+            borderColor: "gray",
+          })
+        );
+
+        //AfterStart
+        if (config?.afterStart) {
+          for (const fn of config?.afterStart) {
+            await fn();
+          }
         }
       }
-    } else {
-      console.error(`⚠️ Port ${PORT} is not available`);
-      console.log("");
-      process.exit();
-    }
-  });
+    })
+    .catch((err: any) => {
+      console.error("Warning", err?.message);
+      process.exit(1);
+    });
 }
 
 //process.on("exit", async () => {});

package/config/index.ts

@@ -23,6 +23,8 @@ const Cfg: Config = {
 };
 
 function setCfg(config: Config) {
+  if (!config?.clusterMode) Cfg.clusterMode = true;
+  Cfg.clusterMode = config?.clusterMode ?? false;
   Cfg.server = config.server;
   Cfg.tenants = config?.tenants;
   Cfg.email = config?.email;

package/driver/mongo/rest.ts

@@ -204,6 +204,7 @@ class useRest {
         if (col?.hooks?.beforeOperation && useHook) {
           await col.hooks.beforeOperation({
             io: Cfg.io,
+            error: fn.error,
             sharedData: sharedData,
             pipeline: pipeline,
             c: this.#c,
@@ -278,6 +279,7 @@ class useRest {
           await col.hooks.beforeOperation({
             sharedData: sharedData,
             io: Cfg.io,
+            error: fn.error,
             data: data,
             c: this.#c,
             driver: "mongodb",
@@ -399,6 +401,7 @@ class useRest {
         if (col?.hooks?.beforeOperation && useHook) {
           await col.hooks.beforeOperation({
             sharedData: sharedData,
+            error: fn.error,
             data: toJson(data),
             io: Cfg.io,
             c: this.#c,
@@ -575,6 +578,7 @@ class useRest {
           await col.hooks.beforeOperation({
             sharedData: sharedData,
             c: this.#c,
+            error: fn.error,
             driver: "mongodb",
             io: Cfg.io,
             action: "find",
@@ -701,6 +705,7 @@ class useRest {
           await col.hooks.beforeOperation({
             sharedData: sharedData,
             c: this.#c,
+            error: fn.error,
             driver: "mongodb",
             io: Cfg.io,
             action: "find",
@@ -811,6 +816,7 @@ class useRest {
             sharedData: sharedData,
             id: id,
             io: Cfg.io,
+            error: fn.error,
             c: this.#c,
             driver: "mongodb",
             action: "findOne",
@@ -926,6 +932,7 @@ class useRest {
             sharedData: sharedData,
             id: id,
             io: Cfg.io,
+            error: fn.error,
             c: this.#c,
             driver: "mongodb",
             action: "updateOne",
@@ -1083,6 +1090,7 @@ class useRest {
             sharedData: sharedData,
             filter: filter || {},
             c: this.#c,
+            error: fn.error,
             io: Cfg.io,
             driver: "mongodb",
             action: "findOneAndUpdate",
@@ -1202,6 +1210,7 @@ class useRest {
             sharedData: sharedData,
             ids: ids,
             c: this.#c,
+            error: fn.error,
             driver: "mongodb",
             io: Cfg.io,
             action: "updateMany",
@@ -1367,6 +1376,8 @@ class useRest {
             c: this.#c,
             io: Cfg.io,
             driver: "mongodb",
+            error: fn.error,
+
             action: "deleteOne",
             session: sessionStorage(),
             rest: new useRest({
@@ -1468,6 +1479,7 @@ class useRest {
             ids: ids,
             c: this.#c,
             driver: "mongodb",
+            error: fn.error,
             io: Cfg.io,
             action: "deleteMany",
             session: sessionStorage(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.20.2",
+  "version": "0.21.1",
   "module": "index.ts",
   "type": "module",
   "bin": {

package/types/arktype.ts

@@ -0,0 +1 @@
+import { type } from "arktype";

package/types/index.ts

@@ -203,6 +203,7 @@ export type hooksCtx = (ctx: {
   rest: InstanceType<typeof useRest>;
   session?: sessionCtx;
   io: socketIoType;
+  error: typeof fn.error;
 }) => any;
 
 export type ctxApi = {
@@ -377,7 +378,7 @@ export type Config = {
     driver: "mistral" | "openai" | "gemini";
     key: string;
   };
-
+  clusterMode?: boolean;
   server: {
     id?: string;
     logger?: Boolean | loggerFunction;

package/utils/index.ts

@@ -345,7 +345,7 @@ class contextError extends Error {
 
 const fn = {
   error: (message: string, code: number) => {
-    throw new contextError(message || "unknow", code);
+    throw new contextError(message || "", code);
   },
 };