@wabot-dev/framework 0.2.0-beta.10 → 0.2.0-beta.12

package/dist/src/addon/chat-controller/cmd/CmdChannel.js

@@ -1,14 +1,16 @@
-import { __decorate } from 'tslib';
+import { __decorate, __metadata } from 'tslib';
 import { injectable } from '../../../core/injection/index.js';
 import * as readline from 'readline';
 import * as fs from 'fs';
 import * as path from 'path';
 import { Random } from '../../../core/random/Random.js';
+import { Auth } from '../../../core/auth/Auth.js';
 
 var CmdChannel_1;
 const chatIdPath = '.cmd-channel/id.json';
 const authInfoPath = '.cmd-channel/auth-info.json';
 let CmdChannel = CmdChannel_1 = class CmdChannel {
+    auth;
     authInfo = undefined;
     chatId = undefined;
     rl = readline.createInterface({
@@ -16,6 +18,9 @@ let CmdChannel = CmdChannel_1 = class CmdChannel {
         output: process.stdout,
     });
     callBack = null;
+    constructor(auth) {
+        this.auth = auth;
+    }
     listen(callback) {
         this.callBack = callback;
     }
@@ -55,18 +60,18 @@ let CmdChannel = CmdChannel_1 = class CmdChannel {
                 reply: (message) => {
                     console.log(`\n[${message.senderName}]: ${message.text}\n`);
                     this.rl.prompt();
+                    if (this.auth.isAssigned()) {
+                        writeJsonToFile(authInfoPath, this.auth.require());
+                    }
                 },
-                authInfo: this.authInfo || undefined,
-                setAuthInfo: (authInfo) => {
-                    this.authInfo = authInfo || null;
-                    writeJsonToFile(authInfoPath, this.authInfo);
-                },
+                injectInstances: [[Auth, this.auth]],
             });
         });
     }
 };
 CmdChannel = CmdChannel_1 = __decorate([
-    injectable()
+    injectable(),
+    __metadata("design:paramtypes", [Auth])
 ], CmdChannel);
 function writeJsonToFile(filename, data) {
     const filePath = path.resolve(process.cwd(), filename);

package/dist/src/addon/chat-controller/socket/SocketChannel.js

@@ -10,6 +10,7 @@ import { SocketChannelConfig } from './SocketChannelConfig.js';
 import '../../../core/validation/metadata/ValidationMetadataStore.js';
 import { isNotEmpty } from '../../../core/validation/validators/is-not-empty/@isNotEmpty.js';
 import { isString } from '../../../core/validation/validators/is-string/@isString.js';
+import { Auth } from '../../../core/auth/Auth.js';
 
 var SocketChannel_1;
 class SocketChannelReceivedMessage {
@@ -43,6 +44,10 @@ let SocketChannel = SocketChannel_1 = class SocketChannel {
     configController() {
         const channel = this;
         let SocketChannelController = class SocketChannelController {
+            auth;
+            constructor(auth) {
+                this.auth = auth;
+            }
             onMessage(message, socket) {
                 if (!channel.callBack)
                     return;
@@ -64,10 +69,10 @@ let SocketChannel = SocketChannel_1 = class SocketChannel {
                     reply: (message) => {
                         socket.emit('message', message);
                     },
-                    authInfo: socket.data.authInfo,
-                    setAuthInfo: (authInfo) => {
-                        socket.data.authInfo = authInfo;
-                    },
+                    injectInstances: [
+                        [Socket, socket],
+                        [Auth, this.auth],
+                    ],
                 });
             }
         };
@@ -79,7 +84,8 @@ let SocketChannel = SocketChannel_1 = class SocketChannel {
         ], SocketChannelController.prototype, "onMessage", null);
         SocketChannelController = __decorate([
             socketController(channel.config.namespace),
-            handshakeMiddlewares(channel.config.handshakeMidlewares ?? [])
+            handshakeMiddlewares(channel.config.handshakeMidlewares ?? []),
+            __metadata("design:paramtypes", [Auth])
         ], SocketChannelController);
         this.controller = SocketChannelController;
     }

package/dist/src/feature/chat-controller/runChatControllers.js

@@ -62,18 +62,15 @@ function runChatControllers(controllers) {
                     chat,
                     ...channelMessage,
                 });
+                if (channelMessage.injectInstances) {
+                    for (const [token, instance] of channelMessage.injectInstances) {
+                        chatContainer.registerInstance(token, instance);
+                    }
+                }
                 const chatController = chatContainer.resolve(channelMetadata.controllerConstructor);
                 const receivedMessage = {
                     message: channelMessage.message,
-                    reply: (message) => {
-                        channelMessage.reply(message);
-                        if (channelMessage.setAuthInfo) {
-                            const auth = chatContainer.resolve(Auth);
-                            if (auth.wasOverrided()) {
-                                channelMessage.setAuthInfo(auth['authInfo'] || undefined);
-                            }
-                        }
-                    },
+                    reply: channelMessage.reply,
                 };
                 chatController[channelMetadata.functionName](receivedMessage);
             });

package/dist/src/feature/socket-controller/metadata/@handshakeMiddlewares.js

@@ -6,7 +6,7 @@ function handshakeMiddlewares(middlewares) {
         const store = container.resolve(SocketControllerMetadataStore);
         for (const mw of middlewares) {
             store.saveHandshakeMiddlewareMetadata({
-                controllerConstructor: target.constructor,
+                controllerConstructor: target,
                 middlewareConstructor: mw,
             });
         }

package/dist/src/feature/socket-controller/runSocketControllers.js

@@ -25,6 +25,7 @@ function runSocketControllers(controllers) {
                     await middleware.handle(socket, connectionContainer);
                 }
                 socket.data.connectionContainer = connectionContainer;
+                connectionContainer.registerInstance(Socket, socket);
                 next();
             }
             catch (err) {

package/dist/src/index.d.ts

@@ -709,8 +709,7 @@ interface IReceivedMessage {
 
 interface IChannelMessage extends IReceivedMessage {
     chatConnection: IChatConnection;
-    authInfo?: IStorableData;
-    setAuthInfo?: (authInfo: IStorableData | undefined) => void;
+    injectInstances?: [any, any][];
 }
 
 interface IChatChannel {
@@ -1263,10 +1262,12 @@ declare class WabotChatAdapter implements IChatAdapter {
 declare function cmd(): (target: object, propertyKey: string | symbol) => void;
 
 declare class CmdChannel implements IChatChannel {
+    private auth;
     private authInfo;
     private chatId;
     private rl;
     private callBack;
+    constructor(auth: Auth<any>);
     listen(callback: (message: IChannelMessage) => void): void;
     connect(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.2.0-beta.10",
+  "version": "0.2.0-beta.12",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",