@tinyhttp/app 2.0.19 → 2.0.22

package/dist/app.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { Server } from 'http';
-import type { Request } from './request';
-import type { Response } from './response';
-import type { ErrorHandler } from './onError';
+import type { Request } from './request.js';
+import type { Response } from './response.js';
+import type { ErrorHandler } from './onError.js';
 import { Middleware, Handler, NextFunction, Router, UseMethodParams } from '@tinyhttp/router';
 /**
  * tinyhttp App has a few settings for toggling features
@@ -13,6 +13,7 @@ export declare type AppSettings = Partial<{
     bindAppToReqRes: boolean;
     xPoweredBy: string | boolean;
     enableReqRoute: boolean;
+    views: string;
 }>;
 /**
  * Function that processes the template

package/dist/extend.d.ts

@@ -1,7 +1,7 @@
-import { Request } from './request';
+import { Request } from './request.js';
 import type { NextFunction } from '@tinyhttp/router';
-import type { Response } from './response';
-import { App } from './app';
+import type { Response } from './response.js';
+import { App } from './app.js';
 /**
  * Extends Request and Response objects with custom properties and methods
  */

package/dist/index.d.ts

@@ -1,12 +1,12 @@
-export { App } from './app';
-export type { AppSettings, TemplateEngineOptions, TemplateFunc } from './app';
-export * from './request';
-import type { Request } from './request';
-export * from './response';
-import type { Response } from './response';
-export { extendMiddleware } from './extend';
-export { onErrorHandler } from './onError';
-export type { ErrorHandler } from './onError';
+export { App } from './app.js';
+export type { AppSettings, TemplateEngineOptions, TemplateFunc } from './app.js';
+export * from './request.js';
+import type { Request } from './request.js';
+export * from './response.js';
+import type { Response } from './response.js';
+export { extendMiddleware } from './extend.js';
+export { onErrorHandler } from './onError.js';
+export type { ErrorHandler } from './onError.js';
 import type { NextFunction, Handler as RHandler, AsyncHandler as RAsyncHandler, SyncHandler as RSyncHandler, Middleware } from '@tinyhttp/router';
 export declare type Handler = RHandler<Request, Response>;
 export declare type AsyncHandler = RAsyncHandler<Request, Response>;

package/dist/index.js

@@ -8,8 +8,8 @@ import { Router, pushMiddleware } from '@tinyhttp/router';
 import { getResponseHeader, setHeader, send, json, status, sendStatus, sendFile, setContentType, setLocationHeader, setLinksHeader, setVaryHeader, setCookie, clearCookie, formatResponse, redirect, attachment, download, append } from '@tinyhttp/res';
 import { parse } from 'regexparam';
 
-const trustRemoteAddress = ({ connection }) => {
-    const val = connection.remoteAddress;
+const trustRemoteAddress = ({ socket }) => {
+    const val = socket.remoteAddress;
     if (typeof val === 'function')
         return val;
     if (typeof val === 'boolean' && val === true)
@@ -169,7 +169,7 @@ class App extends Router {
         this.engines = {};
         this.onError = (options === null || options === void 0 ? void 0 : options.onError) || onErrorHandler;
         this.noMatchHandler = (options === null || options === void 0 ? void 0 : options.noMatchHandler) || this.onError.bind(null, { code: 404 });
-        this.settings = options.settings || { xPoweredBy: true };
+        this.settings = options.settings || { xPoweredBy: true, views: process.cwd() };
         this.applyExtensions = options === null || options === void 0 ? void 0 : options.applyExtensions;
         this.attach = (req, res) => setImmediate(this.handler.bind(this, req, res, undefined), req, res);
     }
@@ -206,7 +206,7 @@ class App extends Router {
      * @param cb Callback that consumes error and html
      */
     render(file, data = {}, cb, options = {}) {
-        options.viewsFolder = options.viewsFolder || `${process.cwd()}/views`;
+        options.viewsFolder = options.viewsFolder || this.settings.views || `${process.cwd()}/views`;
         options.ext = options.ext || file.slice(file.lastIndexOf('.') + 1) || 'ejs';
         options._locals = options._locals || {};
         options.cache = options.cache || process.env.NODE_ENV === 'production';

package/dist/onError.d.ts

@@ -1,5 +1,5 @@
 import type { NextFunction } from '@tinyhttp/router';
-import type { Request } from './request';
-import type { Response } from './response';
+import type { Request } from './request.js';
+import type { Response } from './response.js';
 export declare type ErrorHandler = (err: any, req: Request, res: Response, next?: NextFunction) => void;
 export declare const onErrorHandler: ErrorHandler;

package/dist/request.d.ts

@@ -1,17 +1,22 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { IncomingMessage } from 'http';
 import { ParsedUrlQuery } from 'querystring';
 import { Options, Ranges } from 'header-range-parser';
-import { App } from './app';
+import { App } from './app.js';
 import type { Middleware, Handler } from '@tinyhttp/router';
-import type { Response } from './response';
+import type { Response } from './response.js';
 import type { URLParams } from '@tinyhttp/req';
+import type { Socket } from 'net';
+import type { TLSSocket } from 'tls';
 export { getURLParams } from '@tinyhttp/req';
 export declare const getRouteFromApp: ({ middleware }: App, h: Handler<Request, Response>) => Middleware<Request, Response>;
 export declare const getProtocol: (req: Request) => Protocol;
 export declare const getHostname: (req: Request) => string | undefined;
-export declare const getIP: (req: Pick<IncomingMessage, 'headers' | 'connection'>) => string | undefined;
-export declare const getIPs: (req: Pick<IncomingMessage, 'headers' | 'connection'>) => string[] | undefined;
+export declare const getIP: (req: Pick<Request, 'headers' | 'connection' | 'socket'>) => string | undefined;
+export declare const getIPs: (req: Pick<Request, 'headers' | 'connection' | 'socket'>) => string[] | undefined;
 export declare const getSubdomains: (req: Request, subdomainOffset?: number) => string[];
 export declare type Connection = IncomingMessage['socket'] & {
     encrypted: boolean;
@@ -26,6 +31,7 @@ export interface Request extends IncomingMessage {
     query: ParsedUrlQuery;
     params: URLParams;
     connection: Connection;
+    socket: TLSSocket | Socket;
     route?: Middleware;
     protocol: Protocol;
     secure: boolean;

package/dist/response.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { ServerResponse } from 'http';
 import type { SerializeOptions } from '@tinyhttp/cookie';
-import { Request } from './request';
-import { App, TemplateEngineOptions } from './app';
+import { Request } from './request.js';
+import { App, TemplateEngineOptions } from './app.js';
 import type { ReadStreamOptions, FormatProps, DownloadOptions } from '@tinyhttp/res';
 export declare const renderTemplate: <O>(_req: Request, res: Response, app: App) => (file: string, data?: Record<string, any>, options?: Partial<{
     cache: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinyhttp/app",
-  "version": "2.0.19",
+  "version": "2.0.22",
   "description": "0-legacy, tiny & fast web framework as a replacement of Express",
   "type": "module",
   "homepage": "https://tinyhttp.v1rtl.site",
@@ -32,16 +32,15 @@
   "author": "v1rtl",
   "license": "MIT",
   "dependencies": {
-    "@tinyhttp/cookie": "2.0.3",
-    "@tinyhttp/proxy-addr": "2.0.3",
-    "@tinyhttp/req": "2.0.12",
-    "@tinyhttp/res": "2.0.15",
-    "@tinyhttp/router": "2.0.4",
+    "@tinyhttp/cookie": "2.0.4",
+    "@tinyhttp/proxy-addr": "2.0.4",
+    "@tinyhttp/req": "2.0.13",
+    "@tinyhttp/res": "2.0.17",
+    "@tinyhttp/router": "2.0.5",
     "header-range-parser": "1.1.3",
     "regexparam": "^2.0.0"
   },
   "scripts": {
     "build": "rollup -c"
-  },
-  "readme": "# @tinyhttp/app\n\nThe core of tinyhttp. Contains the `App`, `Request` and `Response`. Additionally, it provides special tinyhttp-specific types.\n\n## Install\n\n```sh\npnpm i @tinyhttp/app\n```\n\n## Example\n\n```ts\nimport { App } from '@tinyhttp/app'\nimport type { Request, Response, NextFunction } from '@tinyhttp/app'\n\nnew App()\n  .use((req: Request, res: Response, next: NextFunction) => {\n    console.log('Did a request')\n    next()\n  })\n  .get('/', (_, res) => res.send('<h1>Hello World</h1>'))\n  .get('/page/:page', (req, res) => res.send(`You opened ${req.params.page}`))\n  .listen(3000)\n```\n"
+  }
 }