@adonisjs/http-server 6.5.0-0 → 6.6.1-0

package/build/factories/http_context.js

@@ -1,5 +1,5 @@
 import { Container } from '@adonisjs/fold';
-import { LoggerFactory } from '@adonisjs/logger/test_factories/logger';
+import { LoggerFactory } from '@adonisjs/logger/factories';
 import { RequestFactory } from './request.js';
 import { ResponseFactory } from './response.js';
 import { HttpContext } from '../src/http_context/main.js';

package/build/factories/request.js

@@ -1,7 +1,7 @@
 import { Socket } from 'node:net';
 import proxyAddr from 'proxy-addr';
 import { IncomingMessage, ServerResponse } from 'node:http';
-import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption';
+import { EncryptionFactory } from '@adonisjs/encryption/factories';
 import { Request } from '../src/request.js';
 import { QsParserFactory } from './qs_parser_factory.js';
 export class RequestFactory {

package/build/factories/response.js

@@ -1,6 +1,6 @@
 import { Socket } from 'node:net';
 import { IncomingMessage, ServerResponse } from 'node:http';
-import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption';
+import { EncryptionFactory } from '@adonisjs/encryption/factories';
 import { RouterFactory } from './router.js';
 import { Response } from '../src/response.js';
 import { QsParserFactory } from './qs_parser_factory.js';

package/build/factories/router.js

@@ -1,11 +1,11 @@
-import { AppFactory } from '@adonisjs/application/test_factories/app';
-import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption';
+import { AppFactory } from '@adonisjs/application/factories';
+import { EncryptionFactory } from '@adonisjs/encryption/factories';
 import { Router } from '../src/router/main.js';
 import { QsParserFactory } from './qs_parser_factory.js';
 export class RouterFactory {
     #parameters = {};
     #getApp() {
-        return this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url));
+        return (this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url), () => { }));
     }
     #createEncryption() {
         return this.#parameters.encryption || new EncryptionFactory().create();

package/build/factories/server_factory.js

@@ -1,7 +1,7 @@
 import { Logger } from '@adonisjs/logger';
 import { Emitter } from '@adonisjs/events';
-import { AppFactory } from '@adonisjs/application/test_factories/app';
-import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption';
+import { AppFactory } from '@adonisjs/application/factories';
+import { EncryptionFactory } from '@adonisjs/encryption/factories';
 import { Server } from '../src/server/main.js';
 import { defineConfig } from '../src/define_config.js';
 export class ServerFactory {
@@ -16,7 +16,7 @@ export class ServerFactory {
         return defineConfig(this.#parameters.config || {});
     }
     #getApp() {
-        return this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url));
+        return (this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url), () => { }));
     }
     #createEncryption() {
         return this.#parameters.encryption || new EncryptionFactory().create();

package/build/src/request.d.ts

@@ -62,6 +62,10 @@ export declare class Request extends Macroable {
     cookiesList(): Record<string, any>;
     cookie(key: string, defaultValue?: string): any;
     encryptedCookie(key: string, defaultValue?: string): any;
+    plainCookie(key: string, options?: {
+        defaultValue?: string;
+        encoded?: boolean;
+    }): any;
     plainCookie(key: string, defaultValue?: string, encoded?: boolean): any;
     hasValidSignature(purpose?: string): boolean;
     toJSON(): {

package/build/src/request.js

@@ -3,6 +3,7 @@ import fresh from 'fresh';
 import typeIs from 'type-is';
 import accepts from 'accepts';
 import { isIP } from 'node:net';
+import is from '@sindresorhus/is';
 import proxyaddr from 'proxy-addr';
 import lodash from '@poppinss/utils/lodash';
 import { safeEqual } from '@poppinss/utils';
@@ -278,9 +279,13 @@ export class Request extends Macroable {
         this.#initiateCookieParser();
         return this.#cookieParser.decrypt(key) || defaultValue;
     }
-    plainCookie(key, defaultValue, encoded) {
+    plainCookie(key, defaultValueOrOptions, encoded) {
         this.#initiateCookieParser();
-        return this.#cookieParser.decode(key, encoded) || defaultValue;
+        if (is.object(defaultValueOrOptions)) {
+            return (this.#cookieParser.decode(key, defaultValueOrOptions?.encoded) ||
+                defaultValueOrOptions.defaultValue);
+        }
+        return this.#cookieParser.decode(key, encoded) || defaultValueOrOptions;
     }
     hasValidSignature(purpose) {
         const { signature, ...rest } = this.qs();

package/build/src/response.d.ts

@@ -15,7 +15,13 @@ export declare class Response extends Macroable {
     get hasLazyBody(): boolean;
     get hasContent(): boolean;
     get hasStream(): boolean;
+    get hasFileToStream(): boolean;
     get content(): [any, boolean, (string | undefined)?] | undefined;
+    get outgoingStream(): ResponseStream | undefined;
+    get fileToStream(): {
+        path: string;
+        generateEtag: boolean;
+    } | undefined;
     lazyBody: Partial<{
         content: [any, boolean, string?];
         stream: [ResponseStream, ((error: NodeJS.ErrnoException) => [string, number?])?];

package/build/src/response.js

@@ -32,11 +32,25 @@ export class Response extends Macroable {
         return !!this.lazyBody.content;
     }
     get hasStream() {
-        return !!(this.lazyBody.stream || this.lazyBody.fileToStream);
+        return !!this.lazyBody.stream;
+    }
+    get hasFileToStream() {
+        return !!this.lazyBody.fileToStream;
     }
     get content() {
         return this.lazyBody.content;
     }
+    get outgoingStream() {
+        return this.lazyBody.stream?.[0];
+    }
+    get fileToStream() {
+        return this.lazyBody.fileToStream
+            ? {
+                path: this.lazyBody.fileToStream[0],
+                generateEtag: this.lazyBody.fileToStream[1],
+            }
+            : undefined;
+    }
     lazyBody = {};
     ctx;
     constructor(request, response, encryption, config, router, qs) {
@@ -267,6 +281,7 @@ export class Response extends Macroable {
     }
     removeHeader(key) {
         key = key.toLowerCase();
+        this.response.removeHeader(key);
         if (this.#headers[key]) {
             delete this.#headers[key.toLowerCase()];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "6.5.0-0",
+  "version": "6.6.1-0",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -39,12 +39,12 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^6.8.0-0",
-    "@adonisjs/config": "^4.1.3-0",
-    "@adonisjs/encryption": "^5.1.0-0",
-    "@adonisjs/events": "^8.4.3-0",
-    "@adonisjs/fold": "^9.9.0-0",
-    "@adonisjs/logger": "^5.3.0-0",
+    "@adonisjs/application": "^7.0.0-0",
+    "@adonisjs/config": "^4.2.0-0",
+    "@adonisjs/encryption": "^5.1.2-0",
+    "@adonisjs/events": "^8.4.5-0",
+    "@adonisjs/fold": "^9.9.2-0",
+    "@adonisjs/logger": "^5.4.1-0",
     "@commitlint/cli": "^17.4.2",
     "@commitlint/config-conventional": "^17.4.2",
     "@fastify/middie": "^8.1.0",
@@ -54,7 +54,7 @@
     "@japa/run-failed-tests": "^1.1.0",
     "@japa/runner": "^2.2.2",
     "@japa/spec-reporter": "^1.3.2",
-    "@swc/core": "^1.3.27",
+    "@swc/core": "^1.3.29",
     "@types/accepts": "^1.3.5",
     "@types/content-disposition": "^0.5.5",
     "@types/cookie": "^0.5.1",
@@ -80,7 +80,7 @@
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-adonis": "^3.0.3",
     "eslint-plugin-prettier": "^4.2.1",
-    "fastify": "^4.11.0",
+    "fastify": "^4.12.0",
     "fs-extra": "^11.1.0",
     "github-label-sync": "^2.2.0",
     "http-status-codes": "^2.2.0",
@@ -97,12 +97,12 @@
     "@poppinss/macroable": "^1.0.0-0",
     "@poppinss/matchit": "^3.1.2",
     "@poppinss/middleware": "^3.1.0",
-    "@poppinss/utils": "^6.4.0-0",
+    "@poppinss/utils": "^6.5.0-0",
     "@sindresorhus/is": "^5.3.0",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "cookie": "^0.5.0",
-    "cuid": "^2.1.8",
+    "cuid": "^3.0.0",
     "destroy": "^1.2.0",
     "encodeurl": "^1.0.2",
     "etag": "^1.8.1",
@@ -117,11 +117,11 @@
     "youch": "^3.2.2"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^6.8.0-0",
-    "@adonisjs/encryption": "^5.1.0-0",
-    "@adonisjs/events": "^8.4.3-0",
-    "@adonisjs/fold": "^9.9.0-0",
-    "@adonisjs/logger": "^5.3.0-0"
+    "@adonisjs/application": "^7.0.0-0",
+    "@adonisjs/encryption": "^5.1.2-0",
+    "@adonisjs/events": "^8.4.5-0",
+    "@adonisjs/fold": "^9.9.2-0",
+    "@adonisjs/logger": "^5.4.1-0"
   },
   "repository": {
     "type": "git",