@dnax/core 0.18.4 → 0.18.6

package/app/hono.ts

@@ -251,6 +251,8 @@ function HonoInstance(): typeof app {
     }
   });
 
+  //
+
   // API REST
   app.post(cleanPath(API_PATH), async (c) => {
     try {
@@ -262,7 +264,7 @@ function HonoInstance(): typeof app {
       var response;
       var parseBody;
       var body;
-      var { action, collection, cleanDeep, useCache, name } =
+      var { action, collection, cleanDeep, useCache, name, toolkit } =
         c.req.query() as Q;
       if (
         c.req.raw?.headers
@@ -297,8 +299,14 @@ function HonoInstance(): typeof app {
         throw new contextError(`Action ${action} not found`, 400);
       }
 
-      // Exec service
+      if (action == "execToolkit") {
+        let tookit = toolkit;
+
+        return;
+      }
+
       if (action == "execService") {
+        // Exec service
         if (!service) return fn.error("Service not found", 404);
         let fx = service?.exec || service?.fx;
         if (fx) {

package/define/index.ts

@@ -24,6 +24,8 @@ function Config(
     | "permissions"
     | "cwd"
     | "collections"
+    | "io"
+    | "ia"
     | "endpoints"
     | "services"
     | "crons"

package/index.ts

@@ -7,9 +7,16 @@ import { $ } from "bun";
 import define from "./define";
 import * as utils from "./utils";
 import { dataCache } from "./lib/bento";
+import { FilesystemSftpAdapter } from "./lib/media";
 import { crypt } from "./lib/crypto";
 import { contextStorage } from "./lib/asyncLocalStorage";
 
+// Adapter
+
+const Adapter = {
+  FilesystemSftpAdapter,
+};
+
 /**
  *  v is internal data validation and based of Joi validation.
  *  Note : v is an alias of Joi object API .
@@ -27,4 +34,5 @@ export {
   crypt,
   $,
   contextStorage,
+  Adapter,
 };

package/lib/index.ts

@@ -7,6 +7,7 @@ import { loadPermissions } from "./permissions";
 import { loadSocket } from "../lib/socket";
 import { loadAutoRoutes } from "./routes";
 import { initScript } from "../lib/scripts";
+import { syncAdapterFileSystem } from "./media";
 // load all ressource
 async function init(cf = { app: null }) {
   await loadSocket();
@@ -24,6 +25,9 @@ async function init(cf = { app: null }) {
   // load Service
   loadServices();
 
+  // sync all adapter file system
+  syncAdapterFileSystem();
+
   // load all loadEndpoints
   await loadEndpoints();
 

package/lib/media/SyncAdapter.ts

@@ -0,0 +1,22 @@
+import { Cfg } from "../../config";
+import { FilesystemSftpAdapter } from "../media/sftp";
+async function syncAdapterFileSystem() {
+  const mediaCollections = Cfg.collections?.filter(
+    (col) => col.type == "media" && col?.media?.enabled
+  );
+
+  mediaCollections?.map((col) => {
+    if (col?.media?.filesystemAdapter) {
+      let currentAdapter = col?.media?.filesystemAdapter;
+      // for sftp
+      if (currentAdapter?.type == "sftp") {
+        let setAdapter = col?.media?.filesystemAdapter as InstanceType<
+          typeof FilesystemSftpAdapter
+        >;
+        setAdapter.init(col);
+      }
+    }
+  });
+}
+
+export { syncAdapterFileSystem };

package/lib/{media.ts → media/index.ts}

@@ -1,4 +1,6 @@
 import { cleanDoubleSlashes } from "ufo";
+import { FilesystemSftpAdapter } from "./sftp";
+import { syncAdapterFileSystem } from "./SyncAdapter";
 import fs from "fs";
 import { v4 } from "uuid";
 type driverOptions = {
@@ -71,4 +73,4 @@ class MediaDrive {
   }
 }
 
-export { MediaDrive };
+export { MediaDrive, FilesystemSftpAdapter, syncAdapterFileSystem };

package/lib/media/sftp.ts

@@ -0,0 +1,123 @@
+type args = "--delete";
+type config = {
+  host: string;
+  port?: number;
+  username: string;
+  password: string;
+  remoteDir: string;
+  ignorePatterns?: string[];
+  args?: args[];
+};
+import Client from "ssh2-sftp-client";
+import chokidar from "chokidar";
+import fs from "fs-extra";
+import path from "path";
+import { cleanDoubleSlashes } from "ufo";
+import type { Collection } from "../../types";
+
+class FilesystemSftpAdapter {
+  #sftp;
+  type: "sftp" = "sftp";
+  #connected: Boolean = false;
+  config;
+  constructor(config: config) {
+    this.config = config;
+    this.config.port = config?.port || 22;
+    this.#sftp = new Client();
+    this.type = "sftp";
+    return this;
+  }
+
+  async connect() {
+    await this.#sftp
+      .connect(this.config)
+      .then((e) => {
+        this.#connected = true;
+      })
+      .catch((err) => {
+        console.log(err, "error");
+      });
+  }
+
+  async sync(
+    p: string,
+    type: "add" | "change" | "unlink" | "addDir" | "unlinkDir"
+  ) {
+    try {
+      let remotePathDest =
+        this.config.remoteDir + p?.replace(process.cwd(), "");
+      let remoteDir = path.dirname(remotePathDest);
+
+      //let remoteFile = remotePathDest.replace(/\\/g, "/");
+
+      if (fs.existsSync(p)) {
+        let stats = fs.statSync(p);
+        if (stats.isFile()) {
+          await this.#sftp.mkdir(remoteDir, true).catch();
+          // Téléverser le fichier
+          let alreadyExists = await this.#sftp.exists(remotePathDest);
+          if (!alreadyExists) {
+            await this.#sftp.put(p, remotePathDest, {}).catch((err) => {
+              console.error("Fichier televerser", err?.message);
+            });
+          }
+        }
+      } else {
+        // Supprimer le fichier
+        this.#sftp.delete(remotePathDest);
+      }
+    } catch (err: any) {
+      console.error(err?.message);
+    }
+  }
+
+  watchDir(dir: string) {
+    try {
+      let local_dir = cleanDoubleSlashes(dir);
+      const watcher = chokidar.watch(path.resolve(local_dir), {
+        persistent: true,
+        ignoreInitial: false,
+        ignored: this?.config?.ignorePatterns || [],
+      });
+
+      watcher
+        .on("add", (path) => this.sync(path, "add"))
+        .on("change", (path) => this.sync(path, "change"))
+        .on("unlink", (path) => this.sync(path, "unlink"))
+        .on("addDir", (path) => this.sync(path, "addDir"))
+        .on("unlinkDir", (path) => this.sync(path, "unlinkDir"));
+    } catch (err: any) {
+      console.error(err?.message);
+    }
+  }
+
+  async init(col: Collection) {
+    let buildPath = "/uploads/";
+    if (!col?.media?.visibility && col?.media?.enabled) {
+      col.media.visibility = "public";
+    }
+    buildPath += col?.slug + "/" + col?.media?.visibility;
+    let watchLocalDir = path.resolve(process.cwd() + "/" + buildPath);
+
+    await this.connect().then(async (ops) => {
+      let remoteDir = this.config.remoteDir + buildPath;
+
+      let remoteDirExisis = await this.#sftp.exists(remoteDir);
+
+      //console.log("remoteDirExisis", remoteDir, remoteDirExisis);
+
+      if (!remoteDirExisis) {
+        await this.#sftp.mkdir(remoteDir, true).catch((err) => {});
+        // console.log("Watch", watchLocalDir);
+
+        setTimeout(() => {
+          this.watchDir(watchLocalDir);
+        }, 1000);
+      } else {
+        this.watchDir(watchLocalDir);
+      }
+    });
+  }
+}
+
+export { FilesystemSftpAdapter };

package/lib/schema.ts

@@ -19,7 +19,7 @@ function buildSchema(col: Collection) {
     }
 
     if (f?.type == "uuid") {
-      propertySchema[f.name] = v.string();
+      propertySchema[f.name] = v.string().uuid();
     }
 
     if (f?.type == "random") {
@@ -33,7 +33,7 @@ function buildSchema(col: Collection) {
       propertySchema[f.name] = v.string().optional();
     }
 
-    if (f?.type.match(/(string|richText|textarea|markdown)/)) {
+    if (f?.type.match(/(string|richText|textarea|markdown|color)/)) {
       propertySchema[f.name] = v.string();
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.18.4",
+  "version": "0.18.6",
   "module": "index.ts",
   "type": "module",
   "bin": {
@@ -8,13 +8,14 @@
   },
   "devDependencies": {
     "@types/bun": "latest",
+    "@types/dot-object": "^2.1.6",
     "@types/fs-extra": "^11.0.4",
+    "@types/jsonwebtoken": "9.0.6",
     "@types/mime-types": "^2.1.4",
     "@types/nodemailer": "^6.4.15",
     "@types/pidusage": "^2.0.5",
-    "@types/uuid": "^10.0.0",
-    "@types/dot-object": "^2.1.6",
-    "@types/jsonwebtoken": "9.0.6"
+    "@types/ssh2-sftp-client": "^9.0.4",
+    "@types/uuid": "^10.0.0"
   },
   "peerDependencies": {
     "typescript": "^5.0.0"
@@ -23,7 +24,6 @@
     "@clack/prompts": "^0.7.0",
     "@colors/colors": "^1.6.0",
     "@lukeed/ms": "^2.0.2",
-    "@orama/orama": "^2.0.23",
     "bentocache": "^1.0.0-beta.9",
     "boxen": "^7.1.1",
     "chokidar": "3.6.0",
@@ -54,6 +54,7 @@
     "rfc6902": "^5.1.2",
     "sharp": "^0.33.5",
     "signaldb": "^0.24.0",
+    "ssh2-sftp-client": "^11.0.0",
     "ufo": "^1.5.3",
     "urlencode": "^2.0.0",
     "uuid": "^10.0.0"

package/types/index.ts

@@ -69,6 +69,7 @@ export type Field = {
     | "number"
     | "integer"
     | "password"
+    | "color"
     | "random"
     | "relationship"
     | "string"
@@ -238,6 +239,7 @@ export type Collection = {
      * Mimie type to accept
      */
     accept?: Array<string> | string;
+    filesystemAdapter?: any;
   };
   customApi?: {
     insertOne?: (ctx: ctxApi) => object | null | undefined;
@@ -428,7 +430,10 @@ export type Config = {
   io?: any;
 };
 
+export type Toolkit = "database" | "activity" | "tasks" | "server";
+
 export type Q = {
+  toolkit: Toolkit;
   name: string;
   useCache: boolean;
   cleanDeep: boolean;
@@ -449,7 +454,8 @@ export type Q = {
     | "upload"
     | "execService"
     | "batch"
-    | "count";
+    | "count"
+    | "execToolkit";
 };
 
 export type routeOption = {