http-request-manager 18.5.18 → 18.5.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-request-manager",
-  "version": "18.5.18",
+  "version": "18.5.20",
   "homepage": "https://wavecoders.ca",
   "author": "Mike Bonifacio <wavecoders@gmail.com> (http://wavecoders@gmail.com/)",
   "description": "This is an Angular Module containing Components/Services using Material",

package/types/http-request-manager.d.ts

@@ -216,12 +216,17 @@ declare class ChannelInfo implements ChannelInfoInterface {
 
 interface WSUserInterface {
     sessionId: string;
-    content: any;
+    ldap?: string;
+    name?: string;
+    email?: string;
+    [key: string]: any;
 }
 declare class WSUser implements WSUserInterface {
     sessionId: string;
-    content: any;
-    constructor(sessionId: string, content: any);
+    ldap: string;
+    name: string;
+    email: string;
+    constructor(sessionId?: string, ldap?: string, name?: string, email?: string);
     static adapt(item?: any): WSUser;
 }
 
@@ -321,19 +326,13 @@ declare class DatabaseManagerService extends DbService {
 }
 
 interface ChannelMessageInterface {
-    sessionId: string;
+    sessionId: any;
     content: any;
-    message: string;
-    users: WSUser[];
-    issued: number;
 }
 declare class ChannelMessage implements ChannelMessageInterface {
-    sessionId: string;
+    sessionId: any;
     content: any;
-    message: string;
-    users: WSUser[];
-    issued: number;
-    constructor(sessionId: string, content: any, message?: string, users?: WSUser[], issued?: number);
+    constructor(sessionId?: any, content?: any);
     static adapt(item?: any): ChannelMessage;
 }
 
@@ -385,7 +384,7 @@ declare class HTTPManagerStateService<T extends {
     userAction$: Observable<any>;
     wsConnection: boolean;
     wsOptions: WSOptions;
-    connectionStatus$?: Observable<boolean>;
+    connectionStatus$: Observable<boolean>;
     constructor(apiOptions: ApiRequest, dataType: DataType | undefined, database?: DatabaseStorage | undefined);
     setApiRequestOptions(apiOptions?: ApiRequest, dataType?: DataType, database?: DatabaseStorage): void;
     private setupConnectionStatus;
@@ -414,6 +413,42 @@ declare class HTTPManagerStateService<T extends {
     readonly fetchStream: (options?: RequestOptions) => ((observableOrValue?: any) => rxjs.Subscription) | ((observableOrValue: any) => rxjs.Subscription);
     private wsCommunication;
     wsMessaging(message: ChannelMessage, channels?: string[]): void;
+    /**
+     * Subscribe to a single channel
+     */
+    subscribeToChannel(channel: string): void;
+    /**
+     * Subscribe to multiple channels at once
+     */
+    subscribeToChannels(channels: string[]): void;
+    /**
+     * Unsubscribe from a channel
+     */
+    unsubscribeFromChannel(channel: string): void;
+    /**
+     * Get observable of currently subscribed channels
+     */
+    get subscribedChannels$(): Observable<Set<string>>;
+    /**
+     * Get current subscribed channels synchronously
+     */
+    getSubscribedChannels(): Set<string>;
+    /**
+     * Create a new channel on the server
+     */
+    createChannel(channel: string): void;
+    /**
+     * Delete a channel from the server
+     */
+    deleteChannel(channel: string): void;
+    /**
+     * Request list of all channels from server
+     */
+    getAllChannels(): void;
+    /**
+     * Get users in a specific channel
+     */
+    getUsersInChannel(channel: string): void;
     private isEmpty;
     private updateRequestOptions;
     static ɵfac: i0.ɵɵFactoryDeclaration<HTTPManagerStateService<any>, never>;
@@ -427,14 +462,25 @@ declare class WebsocketService {
     private connectionStatus;
     connectionStatus$: Observable<boolean>;
     private isSubscribed;
+    private subscribedChannels;
+    subscribedChannels$: Observable<Set<string>>;
+    private lastOptions;
     private getSessionId;
     private sendSubscribe;
     connect(options: WSOptions, jwtToken: string): void;
     disconnect(): void;
     subscribeToChannel(channelName: string): void;
+    subscribeToChannels(channelNames: string[]): void;
+    unsubscribeFromChannel(channel: string): void;
     unsubscribeToChannel(channel: string): void;
+    getSubscribedChannels(): Set<string>;
     sendBroadcast(content: any): void;
     sendMessageInChannel(channel: string, content: any): void;
+    /**
+     * Send a message to a specific channel for channel-based messaging
+     * This uses the 'message' type which broadcasts to all subscribers in the channel
+     */
+    sendChannelMessage(channel: string, content: any): void;
     sendMessageToUser(user: string, content: any): void;
     getAllChannels(): void;
     createChannel(channel: string): void;
@@ -1453,7 +1499,7 @@ declare class StateRequestServiceDemo extends HTTPManagerStateService<any> {
     nextRetry$: rxjs.Observable<number>;
     constructor();
     updateConnection(server: string, wsServer: string, jwtToken: string, user: any): void;
-    sendMessage(data: ChannelMessage): void;
+    sendMessage(data: ChannelMessage, channels?: string[]): void;
     getAllChannels(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<StateRequestServiceDemo, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<StateRequestServiceDemo>;
@@ -1472,7 +1518,7 @@ declare class RequestManagerWsDemoComponent implements OnInit {
     user$: Observable<WSUser | null>;
     attempts$: Observable<number>;
     nextRetry$: Observable<number>;
-    connectionStatus$: Observable<boolean> | undefined;
+    connectionStatus$: Observable<boolean>;
     data$: Observable<any>;
     isPending$: Observable<boolean>;
     ngOnInit(): void;
@@ -1579,27 +1625,26 @@ declare class WsDataControlComponent implements OnInit {
     static ɵcmp: i0.ɵɵComponentDeclaration<WsDataControlComponent, "app-ws-data-control", never, { "server": { "alias": "server"; "required": false; }; "wsServer": { "alias": "wsServer"; "required": false; }; "jwtToken": { "alias": "jwtToken"; "required": false; }; "user": { "alias": "user"; "required": false; }; "path": { "alias": "path"; "required": false; }; "wsChannel": { "alias": "wsChannel"; "required": false; }; }, {}, never, never, false, never>;
 }
 
-declare class WsMessagingComponent implements OnInit {
+declare class WsMessagingComponent implements OnInit, OnDestroy {
     server: string;
     wsServer: string;
     jwtToken: string;
     user: any;
+    private destroy$;
     fb: FormBuilder;
     stateRequestServiceDemo: StateRequestServiceDemo;
-    channels$: Observable<string[] | null>;
+    channels$: Observable<string[]>;
     user$: Observable<WSUser | null>;
-    users$: Observable<any[]>;
     data$: Observable<any>;
-    connectionStatus$: Observable<boolean> | undefined;
+    connectionStatus$: Observable<boolean>;
     messages: _angular_forms.FormGroup<{
-        channels: FormControl<WSUser[] | null>;
-        toUsers: FormControl<WSUser[] | null>;
+        channels: FormControl<string[] | null>;
         content: FormControl<string | null>;
     }>;
     get channels(): FormControl;
-    get toUsers(): FormControl;
     get content(): FormControl;
     get isValid(): boolean;
+    get selectedChannels(): any;
     communicationMessages$: Observable<any[]>;
     latestCommunicationMessages$: Observable<any>;
     chat$: Observable<{
@@ -1607,8 +1652,8 @@ declare class WsMessagingComponent implements OnInit {
         messages: any[];
     } | any>;
     ngOnInit(): void;
+    ngOnDestroy(): void;
     onSendMessage(user: WSUser): void;
-    onSendAlert(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<WsMessagingComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<WsMessagingComponent, "app-ws-messaging", never, { "server": { "alias": "server"; "required": false; }; "wsServer": { "alias": "wsServer"; "required": false; }; "jwtToken": { "alias": "jwtToken"; "required": false; }; "user": { "alias": "user"; "required": false; }; }, {}, never, never, false, never>;
 }