emitter and router rework. added request and response from ingest so other projects can use

Author: cblanquera

package.json

@@ -67,16 +67,20 @@
       "import": "./esm/data/ReadonlySet.js"
     },
     "./EventEmitter": {
-      "require": "./cjs/event/EventEmitter.js",
-      "import": "./esm/event/EventEmitter.js"
+      "require": "./cjs/emitter/EventEmitter.js",
+      "import": "./esm/emitter/EventEmitter.js"
     },
-    "./EventRouter": {
-      "require": "./cjs/event/EventRouter.js",
-      "import": "./esm/event/EventRouter.js"
+    "./ExpressEmitter": {
+      "require": "./cjs/emitter/ExpressEmitter.js",
+      "import": "./esm/emitter/ExpressEmitter.js"
     },
-    "./EventTerminal": {
-      "require": "./cjs/event/EventTerminal.js",
-      "import": "./esm/event/EventTerminal.js"
+    "./HttpEmitter": {
+      "require": "./cjs/emitter/HttpEmitter.js",
+      "import": "./esm/emitter/HttpEmitter.js"
+    },
+    "./RouteEmitter": {
+      "require": "./cjs/emitter/RouteEmitter.js",
+      "import": "./esm/emitter/RouteEmitter.js"
     },
     "./ItemQueue": {
       "require": "./cjs/queue/ItemQueue.js",
@@ -86,6 +90,30 @@
       "require": "./cjs/queue/TaskQueue.js",
       "import": "./esm/queue/TaskQueue.js"
     },
+    "./HttpRouter": {
+      "require": "./cjs/router/HttpRouter.js",
+      "import": "./esm/router/HttpRouter.js"
+    },
+    "./Request": {
+      "require": "./cjs/router/Request.js",
+      "import": "./esm/router/Request.js"
+    },
+    "./Response": {
+      "require": "./cjs/router/Response.js",
+      "import": "./esm/router/Response.js"
+    },
+    "./Router": {
+      "require": "./cjs/router/Router.js",
+      "import": "./esm/router/Router.js"
+    },
+    "./Session": {
+      "require": "./cjs/router/Session.js",
+      "import": "./esm/router/Session.js"
+    },
+    "./Terminal": {
+      "require": "./cjs/router/Terminal.js",
+      "import": "./esm/router/Terminal.js"
+    },
     "./FileLoader": {
       "require": "./cjs/system/FileLoader.js",
       "import": "./esm/system/FileLoader.js"
@@ -110,11 +138,18 @@
       "ReadonlyMap": [ "./cjs/data/ReadonlyMap.d.ts" ],
       "ReadonlyNest": [ "./cjs/data/ReadonlyNest.d.ts" ],
       "ReadonlySet": [ "./cjs/data/ReadonlySet.d.ts" ],
-      "EventEmitter": [ "./cjs/event/EventEmitter.d.ts" ],
-      "EventRouter": [ "./cjs/event/EventRouter.d.ts" ],
-      "EventTerminal": [ "./cjs/event/EventTerminal.d.ts" ],
+      "EventEmitter": [ "./cjs/emitter/EventEmitter.d.ts" ],
+      "ExpressEmitter": [ "./cjs/emitter/ExpressEmitter.d.ts" ],
+      "HttpEmitter": [ "./cjs/emitter/HttpEmitter.d.ts" ],
+      "RouteEmitter": [ "./cjs/emitter/RouteEmitter.d.ts" ],
       "ItemQueue": [ "./cjs/queue/ItemQueue.d.ts" ],
       "TaskQueue": [ "./cjs/queue/TaskQueue.d.ts" ],
+      "HttpRouter": [ "./cjs/router/HttpRouter.d.ts" ],
+      "Request": [ "./cjs/router/Request.d.ts" ],
+      "Response": [ "./cjs/router/Response.d.ts" ],
+      "Router": [ "./cjs/router/Router.d.ts" ],
+      "Session": [ "./cjs/router/Session.d.ts" ],
+      "Terminal": [ "./cjs/router/Terminal.d.ts" ],
       "FileLoader": [ "./cjs/system/FileLoader.d.ts" ],
       "NodeFS": [ "./cjs/system/NodeFS.d.ts" ]
     }
@@ -138,7 +173,8 @@
     "report": "nyc report -r lcov"
   },
   "dependencies": {
-    "@inquirer/prompts": "7.1.0"
+    "@inquirer/prompts": "7.1.0",
+    "cookie": "1.0.2"
   },
   "devDependencies": {
     "@types/chai": "4.3.20",

src/data/Nest.ts

@@ -160,6 +160,26 @@ export default class Nest<M extends UnknownNest = UnknownNest>
   }
 }
 
+/**
+ * Returns the parsed form data from the request body (if any)
+ */
+export function formDataToObject(type: string, body: string) {
+  return type.endsWith('/json') 
+    ? objectFromJson(body)
+    : type.endsWith('/x-www-form-urlencoded')
+    ? objectFromQuery(body)
+    : type.startsWith('multipart/form-data')
+    ? objectFromFormData(body)
+    : {} as Record<string, unknown>;
+};
+
+/**
+ * Returns true if the value is a native JS object
+ */
+export function isObject(value: unknown) {
+  return typeof value === 'object' && value?.constructor?.name === 'Object';
+};
+
 /**
  * Transforms an object into an array
  */
@@ -183,6 +203,60 @@ export function makeObject(array: any[]): NestedObject<unknown> {
   return Object.assign({}, array as unknown);
 }
 
+/**
+ * Returns the parsed data from the given cli arguments
+ */
+export function objectFromArgs(args: string) {
+  if (args) {
+    const nest = new Nest();
+    nest.withArgs.set(args);
+    return nest.get();
+  }
+  return {};
+}
+
+/**
+ * Transform JSON string into object
+ * This is usually from body application/json
+ * or text/json
+ */
+export function objectFromJson(json: string) {
+  if (json.startsWith('{')) {
+    return JSON.parse(json) as Record<string, unknown>;
+  }
+  return {} as Record<string, unknown>;
+};
+
+/**
+ * Transform query string into object
+ * This is usually from URL.search or 
+ * body application/x-www-form-urlencoded
+ */
+export function objectFromQuery(query: string) {
+  if (query.startsWith('?')) {
+    query = query.substring(1);
+  }
+  if (query) {
+    const nest = new Nest();
+    nest.withQuery.set(query);
+    return nest.get();
+  }
+  return {};
+};
+
+/**
+ * Transform form data into object
+ * This is usually from body multipart/form-data
+ */
+export function objectFromFormData(data: string) {
+  if (data) {
+    const nest = new Nest();
+    nest.withFormData.set(data);
+    return nest.get();
+  }
+  return {};
+};
+
 /**
  * Returns true if object keys is all numbers
  */

src/event/EventEmitter.ts src/emitter/EventEmitter.tssrc/event/EventEmitter.ts renamed to src/emitter/EventEmitter.ts

@@ -4,6 +4,7 @@ import type {
   TaskItem,
   Event, 
   EventMap, 
+  EventData,
   EventName,
   EventHook, 
   EventMatch
@@ -19,15 +20,14 @@ import TaskQueue from '../queue/TaskQueue';
  * right after the event has triggered.
  */
 export default class EventEmitter<M extends EventMap> {
-  //Event regular expression map
-  public readonly regexp = new Set<string>();
   //called after each task
   protected _after?: EventHook<M[keyof M]>;
   //called before each task
   protected _before?: EventHook<M[keyof M]>;
   //Static event data analyzer
   protected _event?: Event<M[keyof M]>;
   //A route map to task queues
+  //ie. { event -> [ ...{ item, priority } ] }
   protected _listeners: { [ K in keyof M ]?: Set<TaskItem<M[K]>> } = {};
 
   /**
@@ -95,68 +95,24 @@ export default class EventEmitter<M extends EventMap> {
    */
   public match(event: string) {
     const matches = new Map<string, EventMatch>();
-    //first do the obvious match
+    //exact match
     if (typeof this.listeners[event] !== 'undefined') {
-      const data: EventMatch['data'] = { args: [], params: {} };
+      //this is a placeholder for class extensions...
+      const data: EventData = { args: [], params: {} };
       matches.set(event, { event, pattern: event, data });
     }
-    //next do the calculated matches
-    this.regexp.forEach(pattern => {
-      //make regexp so we can compare against the trigger
-      const regexp = new RegExp(
-        // pattern,
-        pattern.substring(
-          pattern.indexOf('/') + 1,
-          pattern.lastIndexOf('/')
-        ),
-        // flag
-        pattern.substring(
-          pattern.lastIndexOf('/') + 1
-        )
-      );
-      //because String.matchAll only works for global flags ...
-      const data: EventMatch['data'] = { args: [], params: {} };
-      if (regexp.flags.indexOf('g') === -1) {
-        const match = event.match(regexp);
-        if (!match || !match.length) {
-          return;
-        }
-        if (Array.isArray(match)) {
-          data.args = match.slice();
-          data.args.shift();
-        }
-      } else {
-        const match = Array.from(event.matchAll(regexp));
-        if (!Array.isArray(match[0]) || !match[0].length) {
-          return;
-        }
-
-        data.args = match[0].slice();
-        data.args.shift();
-      }
-      matches.set(pattern, { event, pattern, data });
-    });
-
+    //return all the matches
     return matches;
   }
 
   /**
    * Adds a callback to the given event listener
    */
   public on<N extends EventName<M>>(
-    event: N|RegExp, 
+    event: N, 
     action: Task<M[N]>,
     priority = 0
   ) {
-    //if it is a regexp object
-    if (event instanceof RegExp) {
-      //make it into a string
-      event = event.toString() as N;
-      //go ahead and add the pattern
-      //set guarantees uniqueness
-      this.regexp.add(event);
-    }
-
     //add the event to the listeners
     if (typeof this._listeners[event] === 'undefined') {
       this._listeners[event] = new Set<TaskItem<M[N]>>();
@@ -182,27 +138,7 @@ export default class EventEmitter<M extends EventMap> {
       //then loop the observers
       const tasks = this._listeners[event] as Set<TaskItem<M[keyof M]>>;
       tasks.forEach(task => {
-        queue.add(async (...args) => {
-          //set the current
-          this._event = { ...match, ...task, args, action: task.item };
-          //before hook
-          if (typeof this._before === 'function' 
-            && await this._before(this._event) === false
-          ) {
-            return false;
-          }
-          //if this is the same event, call the 
-          //method, if the method returns false
-          if (await task.item(...args) === false) {
-            return false;
-          }
-          //after hook
-          if (typeof this._after === 'function' 
-            && await this._after(this._event) === false
-          ) {
-            return false;
-          }
-        }, task.priority);
+        queue.add(this._task(match, task), task.priority);
       });
     }
 
@@ -228,8 +164,6 @@ export default class EventEmitter<M extends EventMap> {
    * Allows events from other emitters to apply here
    */
   public use(emitter: EventEmitter<M>) {
-    //first concat their regexp with this one
-    emitter.regexp.forEach(pattern => this.regexp.add(pattern));
     //next this listen to what they were listening to
     //event listeners = event -> Set
     //loop through the listeners of the emitter
@@ -249,4 +183,32 @@ export default class EventEmitter<M extends EventMap> {
     }
     return this;
   }
+
+  /**
+   * Returns a task for the given event and task
+   * Allows for class extensions to overload this method
+   */
+  protected _task(match: EventMatch, task: TaskItem<M[keyof M]>) {
+    return async (...args: M[keyof M]) => {
+      //set the current
+      this._event = { ...match, ...task, args, action: task.item };
+      //before hook
+      if (typeof this._before === 'function' 
+        && await this._before(this._event) === false
+      ) {
+        return false;
+      }
+      //if this is the same event, call the 
+      //method, if the method returns false
+      if (await task.item(...args) === false) {
+        return false;
+      }
+      //after hook
+      if (typeof this._after === 'function' 
+        && await this._after(this._event) === false
+      ) {
+        return false;
+      }
+    };
+  }
 }