te.js 1.1.5 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "te.js",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "A nodejs framework",
   "type": "module",
   "main": "te.js",
@@ -27,7 +27,7 @@
     "formidable": "^3.5.1",
     "mime": "^4.0.1",
     "statuses": "^2.0.1",
-    "tej-env": "^1.1.0",
+    "tej-env": "^1.1.1",
     "tej-logger": "^1.2.1"
   },
   "lint-staged": {

package/server/ammo.js

@@ -1,112 +1,112 @@
-import { statusAndData } from './ammo/dispatch-helper.js';
-import {
-  isStatusCode,
-  toStatusCode,
-  toStatusMessage,
-} from '../utils/status-codes.js';
-import html from '../utils/tejas-entrypoint-html.js';
-import ammoEnhancer from './ammo/enhancer.js';
-import TejError from './error.js';
-
-class Ammo {
-  constructor(req, res) {
-    this.req = req;
-    this.res = res;
-
-    this.GET = false;
-    this.POST = false;
-    this.PUT = false;
-    this.DELETE = false;
-    this.PATCH = false;
-    this.HEAD = false;
-    this.OPTIONS = false;
-
-    // Request related data
-    this.ip = undefined;
-    this.headers = undefined;
-    this.payload = undefined;
-    this.method = undefined;
-
-    // URL related data
-    this.protocol = undefined;
-    this.hostname = undefined;
-    this.path = undefined;
-    this.endpoint = undefined;
-
-    this.fullURL = undefined;
-
-    // Response related data
-    this.dispatchedData = undefined;
-  }
-
-  async enhance() {
-    await ammoEnhancer(this);
-
-    this.GET = this.method === 'GET';
-    this.POST = this.method === 'POST';
-    this.PUT = this.method === 'PUT';
-    this.DELETE = this.method === 'DELETE';
-    this.PATCH = this.method === 'PATCH';
-    this.HEAD = this.method === 'HEAD';
-    this.OPTIONS = this.method === 'OPTIONS';
-  }
-
-  fire() {
-    const { statusCode, data, contentType } = statusAndData(arguments);
-    const contentTypeHeader = { 'Content-Type': contentType };
-
-    this.dispatchedData = data;
-
-    this.res.writeHead(statusCode, contentTypeHeader);
-    this.res.write(data ?? '');
-    this.res.end();
-  }
-
-  notFound() {
-    throw new TejError(404, 'Not Found');
-  }
-
-  notAllowed() {
-    throw new TejError(405, 'Method Not Allowed');
-  }
-
-  unauthorized() {
-    throw new TejError(401, 'Unauthorized');
-  }
-
-  defaultEntry() {
-    this.fire(html);
-  }
-
-  throw() {
-    const errCode = arguments[0];
-    const err = arguments[1];
-
-    let errMsg = err instanceof Error ? err.message : err.toString();
-
-    if (errCode && isStatusCode(errCode)) {
-      if (!errMsg) errMsg = toStatusMessage(errCode);
-      this.fire(errCode, errMsg);
-      return;
-    }
-
-    if (err instanceof Error) {
-      const errMessage = err.message;
-
-      if (!isNaN(parseInt(errMessage))) {
-        // Execute when errMessage is a number. Notice ! in front of isNan
-        const message = toStatusMessage(errMessage) ?? toStatusMessage(500);
-        this.fire(message, message);
-        return;
-      }
-
-      const code = toStatusCode(errMsg) ?? 500;
-      this.fire(code, errMsg);
-      return;
-    }
-
-    this.fire(err);
-  }
-}
-
-export default Ammo;
+import { statusAndData } from './ammo/dispatch-helper.js';
+import {
+  isStatusCode,
+  toStatusCode,
+  toStatusMessage,
+} from '../utils/status-codes.js';
+import html from '../utils/tejas-entrypoint-html.js';
+import ammoEnhancer from './ammo/enhancer.js';
+import TejError from './error.js';
+
+class Ammo {
+  constructor(req, res) {
+    this.req = req;
+    this.res = res;
+
+    this.GET = false;
+    this.POST = false;
+    this.PUT = false;
+    this.DELETE = false;
+    this.PATCH = false;
+    this.HEAD = false;
+    this.OPTIONS = false;
+
+    // Request related data
+    this.ip = undefined;
+    this.headers = undefined;
+    this.payload = undefined;
+    this.method = undefined;
+
+    // URL related data
+    this.protocol = undefined;
+    this.hostname = undefined;
+    this.path = undefined;
+    this.endpoint = undefined;
+
+    this.fullURL = undefined;
+
+    // Response related data
+    this.dispatchedData = undefined;
+  }
+
+  async enhance() {
+    await ammoEnhancer(this);
+
+    this.GET = this.method === 'GET';
+    this.POST = this.method === 'POST';
+    this.PUT = this.method === 'PUT';
+    this.DELETE = this.method === 'DELETE';
+    this.PATCH = this.method === 'PATCH';
+    this.HEAD = this.method === 'HEAD';
+    this.OPTIONS = this.method === 'OPTIONS';
+  }
+
+  fire() {
+    const { statusCode, data, contentType } = statusAndData(arguments);
+    const contentTypeHeader = { 'Content-Type': contentType };
+
+    this.dispatchedData = data;
+
+    this.res.writeHead(statusCode, contentTypeHeader);
+    this.res.write(data ?? '');
+    this.res.end();
+  }
+
+  notFound() {
+    throw new TejError(404, 'Not Found');
+  }
+
+  notAllowed() {
+    throw new TejError(405, 'Method Not Allowed');
+  }
+
+  unauthorized() {
+    throw new TejError(401, 'Unauthorized');
+  }
+
+  defaultEntry() {
+    this.fire(html);
+  }
+
+  throw() {
+    const errCode = arguments[0];
+    const err = arguments[1];
+
+    let errMsg = err instanceof Error ? err.message : err.toString();
+
+    if (errCode && isStatusCode(errCode)) {
+      if (!errMsg) errMsg = toStatusMessage(errCode);
+      this.fire(errCode, errMsg);
+      return;
+    }
+
+    if (err instanceof Error) {
+      const errMessage = err.message;
+
+      if (!isNaN(parseInt(errMessage))) {
+        // Execute when errMessage is a number. Notice ! in front of isNan
+        const message = toStatusMessage(errMessage) ?? toStatusMessage(500);
+        this.fire(message, message);
+        return;
+      }
+
+      const code = toStatusCode(errMsg) ?? 500;
+      this.fire(code, errMsg);
+      return;
+    }
+
+    this.fire(err);
+  }
+}
+
+export default Ammo;

package/server/handler.js

@@ -35,8 +35,7 @@ const executeChain = async (target, ammo) => {
 const errorHandler = (ammo, err) => {
   if (env('LOG_EXCEPTIONS')) errorLogger.error(err);
 
-  if (err instanceof TejError)
-    return ammo.throw(err.code, err);
+  if (err instanceof TejError) return ammo.throw(err.code, err);
 
   ammo.throw(500, err);
 };
@@ -44,22 +43,24 @@ const errorHandler = (ammo, err) => {
 const handler = async (req, res) => {
   const target = targetRegistry.aim(req.method, req.url.split('?')[0]);
   const ammo = new Ammo(req, res);
-  await ammo.enhance();
-
-  if (env('LOG_HTTP_REQUESTS')) logHttpRequest(ammo);
 
   try {
     if (target) {
+      await ammo.enhance();
+
+      if (env('LOG_HTTP_REQUESTS')) logHttpRequest(ammo);
       await executeChain(target, ammo);
+
     } else {
       if (req.url === '/') {
         ammo.defaultEntry();
       } else {
         errorHandler(
           ammo,
-          new TejError(404,
-            `No target found for URL ${ammo.fullURL} with method ${ammo.method}`
-          )
+          new TejError(
+            404,
+            `No target found for URL ${ammo.fullURL} with method ${ammo.method}`,
+          ),
         );
       }
     }

package/utils/auto-register.js

@@ -1,16 +1,17 @@
 import fs from 'node:fs/promises';
+import path from 'path';
 
 const findTargetFiles = async () => {
   if (!process.env.DIR_TARGETS) return;
-  const fullPath = `${process.cwd()}\\${process.env.DIR_TARGETS}`;
+  const fullPath = path.join(process.cwd(), process.env.DIR_TARGETS);
   const directory = await fs.readdir(fullPath, {
     withFileTypes: true,
-    recursive: true
+    recursive: true,
   });
 
   return directory.filter(
-    (file) => file.isFile() && file.name.endsWith('target.js'));
-
+    (file) => file.isFile() && file.name.endsWith('target.js'),
+  );
 };
 
 export { findTargetFiles };