@futdevpro/nts-dynamo 1.6.18 → 1.6.20

package/src/_services/socket/socket-server.service.ts

@@ -35,7 +35,8 @@ export abstract class DynamoNTS_SocketServerService<
   get port(): number { return this.params.port; }
   get security(): DynamoNTS_SocketSecurity { return this.params.security; }
 
-  protected socketServer: SocketIO.Server;
+  protected openSocketServer: SocketIO.Server;
+  protected secureSocketServer: SocketIO.Server;
 
   private connectEvent: DynamoNTS_SocketEvent<SocketIO.Socket>;
   protected incomingEvents: DynamoNTS_SocketEvent<any>[];
@@ -49,7 +50,8 @@ export abstract class DynamoNTS_SocketServerService<
   protected abstract getPresenceFromSubscrioptionEventContent(socketSubscription: T_SubscriptionContent, socket: SocketIO.Socket): Promise<T_Presence>;
   protected presences: T_Presence[] = [];
 
-  protected log: boolean = dynamoNTS_globalSettings.logSetup;
+  protected logSetup: boolean;
+  protected logFn: boolean = true;
 
   defaultErrorUserMsg = 
     `We encountered an unhandled Socket Error, ` +
@@ -59,12 +61,13 @@ export abstract class DynamoNTS_SocketServerService<
     super();
 
     try {
+      this.logSetup = dynamoNTS_globalSettings.logSetup;
       this.params = this.getServiceParams();
       this.incomingEvents = this.getIncomingEvents() ?? [];
       
       this.prepareEvents();
 
-      if (this.log) console.log(`Socket Server Service setup done: ${this.params.name} (${this.params.port}) serurity: ${this.params.security}\n`);
+      if (this.logSetup) console.log(`Socket Server Service setup done: ${this.params.name} (${this.params.port}) serurity: ${this.params.security}\n`);
     } catch (error) {
       Dynamo_Log.error(`Socket Server Service setup failed: ${this.params?.name} (${this.params?.port})`, error);
     }
@@ -142,10 +145,16 @@ export abstract class DynamoNTS_SocketServerService<
     }
   }
 
-  async setupSocketServer(newSocketServer: SocketIO.Server): Promise<void> {
+  async setupSocketServer(newSocketServer: SocketIO.Server, security: DynamoNTS_SocketSecurity.open | DynamoNTS_SocketSecurity.secure, successCallback: () => void): Promise<SocketIO.Server> {
     try {
-      this.socketServer = newSocketServer;
-      this.socketServer.on(DynamoNTS_SocketEventType.connection, async (socket: SocketIO.Socket) => {
+      if (this.logFn) console.log('\nfn:. setupSocketServer');
+      /* if (security === DynamoNTS_SocketSecurity.open) {
+        this.openSocketServer = newSocketServer;
+      } else {
+        this.secureSocketServer = newSocketServer;
+      } */
+      /* (security === DynamoNTS_SocketSecurity.open ? this.openSocketServer : this.secureSocketServer) */
+      newSocketServer.on(DynamoNTS_SocketEventType.connection, async (socket: SocketIO.Socket) => {
         let issuer: string;
         
         for (let i = 0; i < this.connectEvent.preProcessess.length; i++) {
@@ -184,15 +193,31 @@ export abstract class DynamoNTS_SocketServerService<
             }
           });
         });
-
       });
-
-      this.socketServer.listen(this.params.port);
-
+        
+      newSocketServer.listen(this.params.port);
+      /* if (security === DynamoNTS_SocketSecurity.open) {
+        this.openSocketServer = newSocketServer;
+        this.openSocketServer.listen(this.params.port);
+      } else {
+        this.secureSocketServer = newSocketServer;
+        this.secureSocketServer.listen(this.params.port);
+      } */
+      
       console.log(
         `\nsocket service setup finished: ${this.params.name}` + 
         `\nsocket server listening on port: ${this.params.port}`
       );
+
+      successCallback();
+      
+      if (security === DynamoNTS_SocketSecurity.open) {
+        this.openSocketServer = newSocketServer;
+        return this.openSocketServer;
+      } else {
+        this.secureSocketServer = newSocketServer;
+        return this.secureSocketServer;
+      }
     } catch (error) {
       Dynamo_Log.error(`Socket Server Service - Deep Setup failed: ${this.params?.name} (${this.params?.port})`, error);
       throw error;
@@ -246,7 +271,7 @@ export abstract class DynamoNTS_SocketServerService<
 
   emitEvent(event: string, content: any): void {
     try {
-      this.socketServer.emit(event, content);
+      this.openSocketServer.emit(event, content);
     } catch (error) {
       Dynamo_Log.error(`Socket Event Emit (${event}) failed: ${this.params?.name} (${this.params?.port})`, error);
       throw error;