@dnax/core 0.13.8 → 0.14.1

package/app/hono.ts

@@ -364,7 +364,7 @@ function HonoInstance(): typeof app {
       // Exec service
       if (action == "execService") {
         if (!service) return fn.error("Service not found", 404);
-        let fx = service.exec || service.fx;
+        let fx = service?.exec || service?.fx;
         if (fx) {
           response = await fx({
             io: Cfg.io,

package/app/index.ts

@@ -4,6 +4,8 @@ import { init } from "../lib";
 import { hookDatabase } from "../lib/database";
 import killPort from "kill-port";
 import boxen from "boxen";
+import { loadSocket } from "../lib/socket";
+import pidusage from "pidusage";
 import "@colors/colors";
 import pkg from "../package.json";
 import findPort from "find-open-port";
@@ -39,6 +41,7 @@ async function runApp(config?: configRunApp, clb?: Function) {
       // Load all ressouce
       await init();
       const HonoApp = HonoInstance();
+      await loadSocket(HonoApp);
       //BeforeStart
       if (config?.beforeStart) {
         for (const fn of config?.beforeStart) {

package/driver/mongo/rest.ts

@@ -71,6 +71,11 @@ class useRest {
   #tenant_id: string;
   #session: ClientSession | null | undefined;
   #useCustomApi: boolean = true;
+  /**
+  Direct Api Mongo , use it with caution
+   */
+  db: Tenant["database"]["db"];
+
   constructor(options: options) {
     this.#c = options.c;
     this.#useCustomApi = options.useCustomApi ?? true;
@@ -78,6 +83,8 @@ class useRest {
     this.#session = null;
     this.#tenant = getTenant(this.#tenant_id);
     this.#useHook = options?.useHook ?? true;
+    this.db = this.#tenant.database.db;
+
     /*  if (options?.useHook == undefined || options?.useHook == null) {
       this.#useHook = true;
     } else {

package/lib/index.ts

@@ -4,7 +4,7 @@ import { loadEndpoints } from "./endpoint";
 import { loadServices } from "./service";
 import { initCron } from "./cron";
 import { loadPermissions } from "./permissions";
-import { loadSocket } from "./socket";
+
 import { loadAutoRoutes } from "./routes";
 // load all ressource
 async function init(cf = { app: null }) {
@@ -22,9 +22,6 @@ async function init(cf = { app: null }) {
   // load Service
   loadServices();
 
-  // load Socket
-  await loadSocket();
-
   // load all loadEndpoints
   await loadEndpoints();
 

package/lib/service.ts

@@ -36,7 +36,7 @@ async function loadServices() {
 
 function getService(name: string, tenant_id: string): Service | undefined {
   return Cfg.services?.find(
-    (s) => s?.tenant_id == tenant_id && s?.name == name && s?.fx
+    (s) => s?.tenant_id == tenant_id && s?.name == name && (s?.fx || s?.exec)
   );
 }
 

package/lib/socket.ts

@@ -1,19 +1,17 @@
 import { Cfg } from "../config";
 import { Server } from "socket.io";
+import type { Hono } from "hono";
+import { createServer } from "http";
 import consola from "consola";
 import { Glob } from "bun";
 import path from "path";
 import { useRest } from "../driver/mongo";
-async function loadSocket() {
-  var io = new Server(Number(Cfg.server?.socket?.port || 9000), {
-    cors: {
-      ...Cfg.server.cors,
-      credentials: true,
-    },
-  });
-  /*  io.on("connection", (socket) => {
+async function loadSocket(app: InstanceType<typeof Hono>) {
+  let httpServer = createServer(app.fetch);
+  var io = new Server(httpServer);
+  io.on("connection", (socket) => {
     console.log("ok");
-  }); */
+  });
   if (Cfg.tenants) {
     for await (let t of Cfg.tenants) {
       let tenantPath = `${t.dir}/sockets/**/**.ws.{ts,js}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.13.8",
+  "version": "0.14.1",
   "module": "index.ts",
   "type": "module",
   "bin": {
@@ -11,6 +11,7 @@
     "@types/fs-extra": "^11.0.4",
     "@types/mime-types": "^2.1.4",
     "@types/nodemailer": "^6.4.15",
+    "@types/pidusage": "^2.0.5",
     "@types/uuid": "^10.0.0"
   },
   "peerDependencies": {
@@ -37,7 +38,7 @@
     "find-open-port": "^2.0.3",
     "fs-extra": "^11.2.0",
     "generate-unique-id": "^2.0.3",
-    "groq-sdk": "^0.7.0",
+    "groq-sdk": "^0.8.0",
     "hono": "^4.6.3",
     "joi": "^17.13.3",
     "json-joy": "^16.8.0",
@@ -45,14 +46,15 @@
     "mime-types": "^2.1.35",
     "mingo": "^6.4.15",
     "moment": "^2.30.1",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.10.0",
     "nodemailer": "^6.9.14",
     "ollama": "^0.5.9",
-    "openai": "^4.71.1",
+    "openai": "^4.72.0",
+    "pidusage": "^3.0.2",
     "radash": "^12.1.0",
     "sharp": "^0.33.5",
     "signaldb": "^0.18.0",
-    "socket.io": "^4.7.5",
+    "socket.io": "^4.8.1",
     "ufo": "^1.5.3",
     "urlencode": "^2.0.0",
     "uuid": "^10.0.0"

package/types/index.ts

@@ -164,7 +164,7 @@ export type sessionCtx = {
     token?: string;
     _v?: object;
     role?: string | null | undefined;
-    expireIn?: string;
+    expiresIn?: string;
   }) => void;
   get: () => {
     state: object;