elderwand 0.1.71 → 0.1.72

package/BaseController/BaseController.js

@@ -7,6 +7,7 @@
  var mv = require('mv');
  var fs = require('fs');
  var path = require('path');
+ const archiver = require('archiver');
 //var utils = rekuire('/lib/utils');
 var extend = require('util')._extend;
 var ObjectId = require('mongoose').Types.ObjectId
@@ -24,7 +25,7 @@ module.exports.inherit = function (child) {
 	 child.super = {};
 	 child.elements = []
 	 child.coveredMethods = [];
-	 child.coveredMethods.push("load"); 
+	 child.coveredMethods.push("load");
 	 child.load = function (req, res, next, id) {
 	 	if(ObjectId.isValid(id)){
 		 	child.model.load(id, function (err, model) {
@@ -122,7 +123,7 @@ module.exports.inherit = function (child) {
 
 		var page = parseInt(req.anyKey.page > 0 ? req.anyKey.page : 1) - 1;
 		var perPage = parseInt(req.anyKey.perPage > 0 ? req.anyKey.perPage : 10);
-		var text = req.anyKey.q 
+		var text = req.anyKey.q
 		var options = {
 			perPage: perPage,
 			page: page,
@@ -134,7 +135,7 @@ module.exports.inherit = function (child) {
 		if(child.model.generateCriteria){
 			options.criteria.inject(child.model.generateCriteria(req.anyKey))
 		}
-  
+
 		if(child.model.listByUserOptions){
 			options.criteria = child.model.listByUserOptions(options, req.user, callback)
 		}else{
@@ -245,7 +246,7 @@ module.exports.inherit = function (child) {
 						res.statusData = "Error"
 						res.redirect('/login/');
 					}
-				})	
+				})
 			});
 		} else {
 			//EWLog("yetki", child.singularName, req[child.singularName])
@@ -260,7 +261,7 @@ module.exports.inherit = function (child) {
 		}
 	};
 
-	/** 
+	/**
 	 * Edit an article
 	 */
 
@@ -340,7 +341,7 @@ module.exports.inherit = function (child) {
 							if(err){
 								res.errors.push(err)
 								req.flash('error', err.message);
-							} 
+							}
 							if(error){
 								res.errors.push(error)
 								req.flash('error', error.message);
@@ -468,7 +469,7 @@ module.exports.inherit = function (child) {
 	 	}
 		var page = parseInt(req.anyKey.page > 0 ? req.anyKey.page : 1) - 1;
 		var perPage = parseInt(req.anyKey.perPage > 0 ? req.anyKey.perPage : 10);
-		var text = req.anyKey.q 
+		var text = req.anyKey.q
 		var options = {
 			perPage: perPage,
 			page: page,
@@ -480,7 +481,7 @@ module.exports.inherit = function (child) {
 		var ids = req.anyKey.ids
 		if(ids.indexOf("all") == -1){
 			options["criteria"] = {_id: {$in: ids}}
-		}  
+		}
 		var criteria = {}
 		if(child.model.listByUserOptions){
 			criteria = child.model.listByUserOptions(options, req.user, callback)
@@ -512,7 +513,7 @@ module.exports.inherit = function (child) {
 		if(req.csrfToken){
 			data.csrf_token = req.csrfToken()
 		}
-		callback(data); 
+		callback(data);
 	};
 	child.super.loadRelatedData = child.loadRelatedData
 	child.coveredMethods.push("authFilter");
@@ -544,13 +545,57 @@ module.exports.inherit = function (child) {
 
 	};
 	child.coveredMethods.push("lookFile");
-	child.lookFile = function(req, res){ 
+	child.lookFile = function(req, res){
 			if(req[child.singularName] && req[child.singularName].canSeeByUser(req.user)){
 				res.sendFile(path.resolve('uploads/' + child.singularName + "/" + req[child.singularName]['id'] + '/' + req.params.fileName))
-			}else{ 
+			}else{
 				res.json({error: "You are not authorized"})
 			}
 	}
+  child.coveredMethods.push("lookMultipleFiles");
+  child.lookMultipleFiles = function(req, res) {
+    if (req[child.singularName] && req[child.singularName].canSeeByUser(req.user)) {
+      const zipNames = req.params.zipName.split(',').map(name => name.trim());
+      const id = req[child.singularName]._id.toString();
+      const uploadPath = path.resolve('uploads', child.singularName, id.toString());
+      const zipFileName = `${id}.zip`;
+      const zipFilePath = path.join(uploadPath, zipFileName);
+      const output = fs.createWriteStream(zipFilePath);
+      const archive = archiver('zip');
+
+      output.on('close', function() {
+          console.log(`Zip dosyası oluşturuldu: ${zipFilePath} (${archive.pointer()} toplam bayt)`);
+          res.download(zipFilePath, function(err) {
+              if (err) {
+                  console.error('İndirme işlemi başarısız:', err);
+              }
+              fs.unlink(zipFilePath, (err) => {
+                  if (err) console.error('Zip dosyası silinemedi:', err);
+              });
+          });
+      });
+
+      archive.on('error', function(err) {
+          console.error('Arşivleme hatası:', err);
+          return res.status(500).json({ error: 'Zipping failed' });
+      });
+
+      archive.pipe(output);
+
+      zipNames.forEach(file => {
+          const filePath = path.join(uploadPath, file);
+          if (fs.existsSync(filePath)) {
+              archive.file(filePath, { name: file });
+          } else {
+              console.warn(`Dosya mevcut değil: ${filePath}`);
+          }
+      });
+
+      archive.finalize();
+      } else {
+          res.json({ error: "Yetkiniz yok" });
+      }
+  };
 
 	child.coveredMethods.push("uploadFile");
 	child.uploadFile = function(req, res){
@@ -561,17 +606,17 @@ module.exports.inherit = function (child) {
 					res.json({error:error, err:err})
 				}
 			})
-	}  
+	}
 	child.coveredMethods.push("handleFiles");
 	child.handleFiles = function(req, res, next){
 			if(req[child.singularName] && req[child.singularName].canEditByUser(req.user)){
 				if (!fs.existsSync(path.resolve('uploads/' + child.singularName))){
 					fs.mkdirSync(path.resolve('uploads/' + child.singularName));
-				}	   
+				}
 				if (!fs.existsSync(path.resolve('uploads/' + child.singularName + "/" + req[child.singularName].id))){
 					fs.mkdirSync(path.resolve('uploads/' + child.singularName + "/" + req[child.singularName].id));
-				}	  
-				var needToSave = false 
+				}
+				var needToSave = false
 
 				if(req.files == null){
 					req.files = {}
@@ -586,7 +631,7 @@ module.exports.inherit = function (child) {
 							req[child.singularName].walk(key, [])
 						}
 						async.each(req.files[key], function(file, tick){
-							file["dataPath"] = path.resolve('uploads/' + child.singularName + "/" + req[child.singularName].id + '/' + file.name) 
+							file["dataPath"] = path.resolve('uploads/' + child.singularName + "/" + req[child.singularName].id + '/' + file.name)
 							var item = req[child.singularName].walk(key);
 							item.push(file.name)
 							mv(file.newPath, file.dataPath, tick)
@@ -595,18 +640,18 @@ module.exports.inherit = function (child) {
 						if(req[child.singularName].walk(key) == undefined || req[child.singularName].walk(key) == null){
 							req[child.singularName].walk(key, {})
 						}
-						req.files[key]["dataPath"] = path.resolve('uploads/' + child.singularName + "/" + req[child.singularName].id + '/' + req.files[key].name) 
+						req.files[key]["dataPath"] = path.resolve('uploads/' + child.singularName + "/" + req[child.singularName].id + '/' + req.files[key].name)
 						req[child.singularName].walk(key, req.files[key].name);
 						mv(req.files[key].newPath, req.files[key].dataPath, next)
 					}
 				}, function(err){
 					//EWLog(needToSave)
 					if(needToSave){
-						req[child.singularName].save(next) 
+						req[child.singularName].save(next)
 					}else{
 						next()
 					}
-				})     
+				})
 			}else{
 				req.flash('info', 'Bu işlemi yapmak için yetkiniz yok');
 				if(req.user){
@@ -617,7 +662,7 @@ module.exports.inherit = function (child) {
 					return res.redirect('/login');
 				}
 			}
-	}  
+	}
 	child.apify = function(funcName){
 		var method = function(req, res){
 			var argsPre = arguments.toArrayEW();
@@ -625,13 +670,13 @@ module.exports.inherit = function (child) {
 			res.redirect = function(name){
 				var data = {
 					status: res.statusData,
-					type:"redirect", 
+					type:"redirect",
 					name:name,
 					model:res.model,
 					flash:res.flashData
 				}
 				data[child.singularName] = res.model
-				res.json(data);  
+				res.json(data);
 			}
 			res._render = res.redirect
 			res.render = function(name, model){
@@ -643,21 +688,21 @@ module.exports.inherit = function (child) {
 					flash:res.flashData
 				}
 				data[child.singularName] = res.model
-				res.json(data);  
+				res.json(data);
 			}
 			res._flash = res.flash
 			res.flash = function(name, message){
 				if(res.flashData == undefined || res.flashData == null){
 						res.flashData = []
 				}
-				res.flashData.push({name:name, message:message});  
+				res.flashData.push({name:name, message:message});
 			}
 			req._flash = req.flash
 			req.flash = function(name, message){
 				if(res.flashData == undefined || res.flashData == null){
 					res.flashData = []
 				}
-				res.flashData.push({name:name, message:message});  
+				res.flashData.push({name:name, message:message});
 			}
 			child[funcName].apply(this, argsPre);
 		}
@@ -670,7 +715,7 @@ module.exports.inherit = function (child) {
 			}else if(req.body[child.singularName + 'Id']){
 				child.load(req, res, function(){
 					method.apply(this, argsInner)
-				}, req.body[child.singularName + 'Id']) 
+				}, req.body[child.singularName + 'Id'])
 			}else if(req.query[child.singularName + 'Id']){
 				child.load(req, res, function(){
 					method.apply(this, argsInner)
@@ -691,7 +736,7 @@ module.exports.inherit = function (child) {
 				}
 			}
 		}
-	};		
+	};
 	child.apifyAllRequests();*/
 
 
@@ -707,13 +752,13 @@ module.exports.inherit = function (child) {
 				res.redirect = function(name){
 					var data = {
 						status: res.statusData,
-						type:"redirect", 
+						type:"redirect",
 						name:name,
 						model:res.model,
 						flash:res.flashData
 					}
 					data[child.singularName] = res.model
-					res.json(data);  
+					res.json(data);
 				}
 				res._render = res.redirect
 				res.render = function(name, model){
@@ -725,21 +770,21 @@ module.exports.inherit = function (child) {
 						flash:res.flashData
 					}
 					data[child.singularName] = res.model
-					res.json(data);  
+					res.json(data);
 				}
 				res._flash = res.flash
 				res.flash = function(name, message){
 					if(res.flashData == undefined || res.flashData == null){
 							res.flashData = []
 					}
-					res.flashData.push({name:name, message:message});  
+					res.flashData.push({name:name, message:message});
 				}
 				req._flash = req.flash
 				req.flash = function(name, message){
 					if(res.flashData == undefined || res.flashData == null){
 						res.flashData = []
 					}
-					res.flashData.push({name:name, message:message});  
+					res.flashData.push({name:name, message:message});
 				}
 			}
 
@@ -756,12 +801,12 @@ module.exports.inherit = function (child) {
 				var params = getParamNames(obj);
 				if(params[0] == "req" && params[1] == "res" && params.length == 2){
 					//EWLog(child.pluralName, key)
-					this.apify(key);  
+					this.apify(key);
 					this.acceptCheck(key);
 				}
 			}
 		}
-	};	
+	};
 	child.apifyAllRequests = child.apifyAllRequests
 };
 var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elderwand",
-  "version": "0.1.71",
+  "version": "0.1.72",
   "description": "Mamtas Technology Internal Framework",
   "main": "./node_modules/.bin/nodemon index.js",
   "scripts": {

package/threads/threads.js

@@ -262,13 +262,18 @@ exports.createWorker = function(path, usageLimit, initPath){
     worker.__postMessage({type:"INIT", path:initPath});
     return worker;
 };
-exports.checkWorkQueue = function(worker){
+exports.checkWorkQueue = function(worker,  q){
     if(worker && worker.usageLimit > 0 && worker.used > worker.usageLimit){
         //console.log("terminated overly used call");
         worker.terminate();
         delete worker;
         return exports.checkWorkQueue();
     }
+    if(q){
+        q = q + 1
+    }else{
+        q = 1
+    }
     var result = false;
     //EWLog(workers.length, jobQueue.length)
     if(jobQueue.length > 0){
@@ -301,8 +306,10 @@ exports.checkWorkQueue = function(worker){
         }
     }
 
-    if(jobQueue.length > 0 && workers.length < MAX_WORKING_THREADS){
-        exports.checkWorkQueue(worker);
+    if(jobQueue.length > 0 && 
+        workers.length < MAX_WORKING_THREADS && 
+        q < 5){
+        exports.checkWorkQueue(worker, q);
         //EWLog(">>>>", workers.length, jobQueue.length)
     }
     //console.log("jobQueue.length", jobQueue.length, workers.length);