@adonisjs/session 7.0.0-1 → 7.0.0-2

package/build/providers/session_provider.d.ts

@@ -1,5 +1,6 @@
-import { ApplicationService } from '@adonisjs/core/types';
+import type { ApplicationService } from '@adonisjs/core/types';
 export default class SessionProvider {
+    #private;
     protected app: ApplicationService;
     constructor(app: ApplicationService);
     /**

package/build/providers/session_provider.js

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 import { extendHttpContext } from '../src/bindings/http_context.js';
-import { extendApiClient } from '../src/bindings/api_client.js';
+import SessionMiddleware from '../src/session_middleware.js';
 export default class SessionProvider {
     app;
     constructor(app) {
@@ -24,20 +24,32 @@ export default class SessionProvider {
             const config = this.app.config.get('session', {});
             return new SessionManager(config, encryption, redis);
         });
+        this.app.container.bind(SessionMiddleware, async () => {
+            const session = await this.app.container.make('session');
+            return new SessionMiddleware(session);
+        });
+    }
+    /**
+     * Register Japa API Client bindings
+     */
+    async #registerApiClientBindings(session) {
+        if (this.app.getEnvironment() === 'test') {
+            const { extendApiClient } = await import('../src/bindings/api_client.js');
+            extendApiClient(session);
+        }
     }
     /**
      * Register bindings
      */
     async boot() {
-        const sessionManager = await this.app.container.make('session');
+        const session = await this.app.container.make('session');
         /**
          * Add `session` getter to the HttpContext class
          */
-        extendHttpContext(sessionManager);
+        extendHttpContext(session);
         /**
-         * Add some macros and getter to japa/api-client classes for
-         * easier testing
+         * Extend Japa API Client
          */
-        extendApiClient(sessionManager);
+        await this.#registerApiClientBindings(session);
     }
 }

package/build/src/drivers/file.js

@@ -6,11 +6,10 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
+import { access, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
 import { Exception } from '@poppinss/utils';
 import { MessageBuilder } from '@poppinss/utils';
-import { ensureFile, outputFile, remove } from 'fs-extra/esm';
-import { readFile } from 'node:fs/promises';
 /**
  * File driver to read/write session to filesystem
  */
@@ -28,13 +27,47 @@ export class FileDriver {
     #getFilePath(sessionId) {
         return join(this.#config.file.location, `${sessionId}.txt`);
     }
+    /**
+     * Check if the given path exists or not
+     */
+    async #pathExists(path) {
+        try {
+            await access(path);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Output file with contents to the given path
+     */
+    async #outputFile(path, content) {
+        const pathDirname = dirname(path);
+        const dirExists = await this.#pathExists(pathDirname);
+        if (!dirExists) {
+            await mkdir(pathDirname, { recursive: true });
+        }
+        await writeFile(path, content, 'utf-8');
+    }
+    /**
+     * Ensure the file exists. Create it if missing
+     */
+    async #ensureFile(path) {
+        const pathDirname = dirname(path);
+        const dirExists = await this.#pathExists(pathDirname);
+        if (!dirExists) {
+            await mkdir(pathDirname, { recursive: true });
+            await writeFile(path, '', 'utf-8');
+        }
+    }
     /**
      * Returns file contents. A new file will be created if it's
      * missing.
      */
     async read(sessionId) {
         const filePath = this.#getFilePath(sessionId);
-        await ensureFile(filePath);
+        await this.#ensureFile(filePath);
         const contents = await readFile(filePath, 'utf-8');
         if (!contents.trim()) {
             return null;
@@ -56,13 +89,13 @@ export class FileDriver {
             throw new Error('Session file driver expects an object of values');
         }
         const message = new MessageBuilder().build(values, undefined, sessionId);
-        await outputFile(this.#getFilePath(sessionId), message);
+        await this.#outputFile(this.#getFilePath(sessionId), message);
     }
     /**
      * Cleanup session file by removing it
      */
     async destroy(sessionId) {
-        await remove(this.#getFilePath(sessionId));
+        await rm(this.#getFilePath(sessionId), { force: true });
     }
     /**
      * Writes the value by reading it from the store

package/build/src/session_middleware.d.ts

@@ -1,5 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
 import type { NextFn } from '@adonisjs/core/types/http';
+import { SessionManager } from './session_manager.js';
 export default class SessionMiddleware {
+    protected session: SessionManager;
+    constructor(session: SessionManager);
     handle(ctx: HttpContext, next: NextFn): Promise<void>;
 }

package/build/src/session_middleware.js

@@ -1,7 +1,10 @@
 export default class SessionMiddleware {
+    session;
+    constructor(session) {
+        this.session = session;
+    }
     async handle(ctx, next) {
-        const sessionManager = (await ctx.containerResolver.make('session'));
-        if (!sessionManager.isEnabled()) {
+        if (!this.session.isEnabled()) {
             return;
         }
         /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/session",
   "description": "Session provider for AdonisJS",
-  "version": "7.0.0-1",
+  "version": "7.0.0-2",
   "engines": {
     "node": ">=18.16.0"
   },
@@ -53,7 +53,6 @@
     "@japa/runner": "3.0.0-6",
     "@poppinss/dev-utils": "^2.0.3",
     "@swc/core": "^1.3.70",
-    "@types/fs-extra": "^11.0.1",
     "@types/node": "^20.4.2",
     "@types/set-cookie-parser": "^2.4.3",
     "@types/supertest": "^2.0.12",
@@ -71,8 +70,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@poppinss/utils": "6.5.0-3",
-    "fs-extra": "^11.1.1"
+    "@poppinss/utils": "6.5.0-3"
   },
   "peerDependencies": {
     "@adonisjs/core": "6.1.5-10",
@@ -81,6 +79,9 @@
   "peerDependenciesMeta": {
     "@adonisjs/redis": {
       "optional": true
+    },
+    "@japa/api-client": {
+      "optional": true
     }
   },
   "author": "virk,adonisjs",