@dnax/core 0.70.2 → 0.70.3

package/driver/mongo/utils.ts

@@ -139,12 +139,6 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
     });
   }
 
-  if (params?.$sortInclude) {
-    pipeline.push({
-      $sort: params?.$sortInclude,
-    });
-  }
-
   if (params?.$projectInclude) {
     pipeline.push({
       $project: params.$projectInclude,
@@ -164,6 +158,12 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
     });
   }
 
+  if (params?.$sortInclude) {
+    pipeline.push({
+      $sort: params?.$sortInclude,
+    });
+  }
+
   return pipeline || [];
 }
 

package/lib/bento/index.ts

@@ -35,7 +35,7 @@ function useCache(
     stores: {
       dataCache: bentostore().useL1Layer(
         memoryDriver({
-          maxSize: "100mb",
+          maxSize: options?.maxSize || "200mb",
         })
       ),
     },

package/lib/media/sftp.ts

@@ -29,46 +29,42 @@ class FilesystemSftpAdapter {
     this.type = "sftp";
     this.conn = new Client({
       captureRejections: true,
-
       //captureRejections: true,
     });
+
+    this.connect()
+      .then((e) => {
+        e.conn.end();
+      })
+      .catch((err) => {
+        consola.error(`SFTP: Failed to connect ${this.config.host}`.red);
+      });
+    // this.conn.
     return this;
   }
 
   async syncCollectionMedia(col: Collection) {
     if (!this.config?.remoteDir) this.config.remoteDir = "/home/" + col?.slug;
-    await this.connect()
-      .then((e) => {
-        let visibility = col?.media?.visibility || "public";
 
-        let dirToWatch = path.join(
-          process.cwd(),
-          BASE_DIR,
-          col?.slug,
-          visibility
-        );
-        dirToWatch = path.resolve(dirToWatch);
-        const watcher = chokidar.watch(dirToWatch, {
-          persistent: true,
-          ignoreInitial: true,
-          ignored: this.config.ignorePatterns || [],
-        });
+    let visibility = col?.media?.visibility || "public";
+    let dirToWatch = path.join(process.cwd(), BASE_DIR, col?.slug, visibility);
+    dirToWatch = path.resolve(dirToWatch);
+    const watcher = chokidar.watch(dirToWatch, {
+      persistent: true,
+      ignoreInitial: true,
+      ignored: this.config.ignorePatterns || [],
+    });
 
-        watcher.on("all", (event, filePath) => {
-          if (event == "change" || event == "add") {
-            //consola.info(`SFTP: ${event} ${filePath}`);
-            let remotePath = path.join(
-              this.config.remoteDir,
-              path.basename(filePath)
-            );
-            this.put(filePath, remotePath);
-          }
-        });
-      })
-      .catch((err) => {
-        consola.error(`SFTP: Failed to connect ${this.config.host}`.red);
-        consola.error(err?.message || err);
-      });
+    watcher.on("all", (event, filePath) => {
+      if (event == "change" || event == "add") {
+        //consola.info(`SFTP: ${event} ${filePath}`);
+        let remotePath = path.join(
+          this.config.remoteDir,
+          path.basename(filePath)
+        );
+        this.put(filePath, remotePath);
+      }
+    });
   }
 
   connect(): Promise<{ sftp: SFTPWrapper; conn: Client }> {
@@ -98,6 +94,7 @@ class FilesystemSftpAdapter {
         remotePath,
         {
           mode: 0o777,
+          // concurrency
         },
         (err) => {
           conn.end();
@@ -107,6 +104,7 @@ class FilesystemSftpAdapter {
           if (err) {
             reject(err?.message);
           }
+
           resolve(true);
         }
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.70.2",
+  "version": "0.70.3",
   "module": "index.ts",
   "type": "module",
   "bin": {},
@@ -13,11 +13,10 @@
     "@types/minio": "^7.1.1",
     "@types/nodemailer": "^6.4.17",
     "@types/pidusage": "^2.0.5",
-    "@types/ssh2-sftp-client": "^9.0.4",
     "@types/uuid": "^10.0.0"
   },
   "peerDependencies": {
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
   },
   "dependencies": {
     "@colors/colors": "^1.6.0",