memory-sri 1.1.12 → 1.2.1

package/README.md

@@ -89,33 +89,27 @@ Memory.delall();
 ### Task
 #### Task function
 ```bash
-const sayhi = () => {
-  console.log('hello world !');
-}
-const test = (a, b) => {
-  let c = test1(a, b);
-  let d = test2(a, b);
-  return c * d;
-}
-const test1 = (a, b) => {
+const plus = function(a, b){
   return a + b;
 }
-const test2 = (a, b) => {
-  return b - a;
-}
-let tests = {
-  value: "I Just want to test return data only !"
-};
-const testJson = (value) => {
-  return value;
-}
 ```
 
 #### Task usage
 ```bash
-Memory.task(sayhi);
-Memory.task(test, [2, 5]);
-Memory.task(testJson, tests);
+// "test" is name of task
+// { user: 1 } is data send to task
+// retry 3 time, maximum 5 time
+Task.addtask("test", { user: 1 }, 3);
+```
+
+```bash
+Task.runtask("test", async function () {
+  console.log("Running with data:", this.data);
+  let a = 1;
+  let b = 2;
+  let c = plus(a, b);
+  console.log(`result: ${c}`);
+});
 ```
 
 ### Key Features:

package/index.d.ts

@@ -4,4 +4,5 @@ export function multiple(): any;
 export function set(identifier: string, data?: any, time?: number): any;
 export function del(identifier: string): any;
 export function delall(): any;
-export function task(taskFn?: any, args?: any): any;
+export function addtask(name?: any, data?: any, retries?: any): any;
+export function runtask(name?: any, taskFn?: any): any;

package/index.js

@@ -1 +1,17 @@
-module.exports = require('./lib/main');
+const Task = require("./lib/main");
+
+const plus = function (a, b) {
+  return a + b;
+};
+
+Task.addtask("test", { user: 1 }, 3);
+
+Task.runtask("test", async function () {
+  console.log("Running with data:", this.data);
+  let a = 1;
+  let b = 2;
+  let c = plus(a, b);
+  console.log(`result: ${c}`);
+});
+
+module.exports = Task;

package/lib/main.js

@@ -2,7 +2,7 @@
  * module dependencies
  */
 const Memory = require("./memory");
-const Worker = require("./worker");
+const Task = require("./worker");
 
 /**
  * expose object
@@ -22,11 +22,15 @@ memory.version = "1.1.11";
  * @param {Object} [data]
  * @api public
  */
-memory.get = function getSearch(identifier = "a501cf48-9e8a-497e-a158-f87081503425") {
+memory.get = function getSearch(
+  identifier = "a501cf48-9e8a-497e-a158-f87081503425"
+) {
   return Memory.get(identifier);
 };
 
-memory.ttl = function getTimeout(identifier = "a501cf48-9e8a-497e-a158-f87081503425") {
+memory.ttl = function getTimeout(
+  identifier = "a501cf48-9e8a-497e-a158-f87081503425"
+) {
   return Memory.ttl(identifier);
 };
 
@@ -40,7 +44,9 @@ memory.set = function setData(identifier, data = [], time = 259200) {
   return Worker.addTask(setTask(identifier, data, limittime), data);
 };
 
-memory.del = function delData(identifier = "a501cf48-9e8a-497e-a158-f87081503425") {
+memory.del = function delData(
+  identifier = "a501cf48-9e8a-497e-a158-f87081503425"
+) {
   return Worker.addTask(delTask(identifier), identifier);
 };
 
@@ -55,17 +61,9 @@ memory.delall = function delAllData() {
  * @param {Object} [args]
  * @api public
  */
-memory.task = function addTaskWorker(taskFn, args = []) {
-  if (Array.isArray(args)) {
-    return Worker.addTask(() => taskFn(...args), args);
-  } else if (args !== undefined && args !== null) {
-    return Worker.addTask(() => taskFn(args), args);
-  } else {
-    return "No arguments provided for the task";
-  }
-};
 
-memory.isLog = Worker.logTask;
+memory.addtask = Task.addTask;
+memory.runtask = Task.runTask;
 
 /**
  * private util functions

package/lib/worker.js

@@ -1,52 +1,70 @@
 /**
  * expose object
  */
-let Worker = module.exports;
-
-const tasks = [];
+let Task = module.exports;
+let tasks = [];
+let isProcessing = false;
 let taskId = 0;
-let isLogging = false;
+let registeredFns = {};
+
+/**
+ * Add a job into the queue (before the processor is defined)
+ */
+Task.addTask = function (name = "temp", data = {}, retries = 1) {
+  taskId += 1;
+  retries = !retries ? 1 : retries > 5 ? 5 : retries;
+
+  const task = {
+    id: taskId,
+    name,
+    data,
+    attempts: 0,
+    maxAttempts: retries,
+  };
+
+  tasks.push(task);
+  processTasks();
 
-Worker.logTask = function logTaskService(flag) {
-  isLogging = !!flag;
-  return isLogging;
+  return { id: task.id };
 };
 
-/* set task */
-Worker.addTask = function addTaskService(taskFn, data) {
+/**
+ * Register a processor for a task name
+ */
+Task.runTask = function (name, taskFn) {
   if (typeof taskFn !== "function") {
-    logData(`Task must be a function`);
-    return null;
+    throw new Error("Task must be a function");
   }
-  taskId += 1;
-  tasks.push({ id: taskId, run: taskFn });
-  logData(`Task queued with ID: ${taskId}`);
+  registeredFns[name] = taskFn;
   processTasks();
-  return {
-    id: taskId,
-    data: data,
-  };
 };
 
 /**
  * private util functions
  */
 async function processTasks() {
-  await new Promise((resolve) => setTimeout(resolve, 1000));
-  if (tasks.length === 0) return;
+  if (isProcessing) return;
+  isProcessing = true;
+
+  while (tasks.length > 0) {
+    const task = tasks.shift();
+    const fn = registeredFns[task.name];
+
+    if (!fn) {
+      // processor not defined yet → put it back and stop
+      tasks.unshift(task);
+      break;
+    }
 
-  const currentTasks = tasks.splice(0, tasks.length);
-  for (const taskObj of currentTasks) {
     try {
-      await taskObj.run();
-      logData(`Task_id: ${taskObj.id} completed`);
+      task.attempts += 1;
+      await fn.call({ data: task.data, id: task.id, name: task.name });
     } catch (err) {
-      logData(`Task_id: ${taskObj.id} failed`);
-      logData(err);
+      if (task.attempts < task.maxAttempts) {
+        tasks.push(task);
+      }
     }
   }
-}
 
-function logData(data) {
-  if (isLogging) console.log(data);
+  isProcessing = false;
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "memory-sri",
-  "version": "1.1.12",
+  "version": "1.2.1",
   "description": "A simple and customizable memory data per 1 loadbalance",
   "scripts": {
     "test": "npx jest ---coverage=false --detectOpenHandles --forceExit",
-    "exit": "echo \"No tests specified\" && exit 0"
+    "exit": "echo \"No tests specified\" && exit 0",
+    "dev": "node index.js"
   },
   "author": "Santipap Eiamsamlee",
   "license": "MIT",