docpouch-client 0.8.9 → 0.8.11

package/dist/index.d.ts

@@ -106,7 +106,6 @@ export interface I_UserCreation {
     isAdmin: boolean;
 }
 export interface I_UserUpdate {
-    _id: string;
     name?: string;
     password?: string;
     email?: string;
@@ -142,7 +141,6 @@ export interface I_DocumentCreationOwned extends I_DocumentCreation {
     owner: string;
 }
 export interface I_DocumentUpdate extends I_DocumentQuery {
-    _id: string;
     content?: any;
     description?: string;
 }
@@ -178,7 +176,6 @@ export interface I_StructureCreation {
     fields: I_StructureField[];
 }
 export interface I_StructureUpdate {
-    _id?: string;
     name?: string;
     description?: string;
     fields?: I_StructureField[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docpouch-client",
-  "version": "0.8.9",
+  "version": "0.8.11",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -27,10 +27,10 @@
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
-    "@types/node": "^24.0.7",
-    "jest": "^30.0.3",
-    "ts-jest": "^29.4.0",
-    "typescript": "^5.8.3"
+    "@types/node": "^24.3.0",
+    "jest": "^30.0.5",
+    "ts-jest": "^29.4.1",
+    "typescript": "^5.9.2"
   },
   "dependencies": {
     "socket.io-client": "^4.8.1"

package/src/index.ts

@@ -5,511 +5,509 @@ import packetJson from '../package.json'
  * Client for interacting with docPouch API.
  */
 export default class docPouchClient {
-  /**
-   * The base URL of the server.
-   *
-   * @type {string}
-   */
-  baseUrl: string;
-  /**
-   * Socket.IO socket instance for real-time communication with the server.
-   *
-   * @type {Socket}
-   */
-  socket: Socket;
-  /**
-   * Callback function to handle socket events.
-   *
-   * @type {(event: I_EventString, data: I_WsMessage) => void}
-   */
-  callbackFunction;
-  /**
-   * Flag indicating whether real-time synchronization is enabled.
-   *
-   * @type {boolean}
-   */
-  realTimeSync: boolean = false;
-  /**
-   * Authentication token used to authorize requests.
-   *
-   * @private
-   * @type {string | null}
-   */
-  private authToken: string | null = null;
-  /**
-   * Flag indicating whether a connection attempt is in progress.
-   *
-   * @private
-   * @type {boolean}
-   */
-  private connectionInProgress = false;
-
-  /**
-   * Creates an instance of docPouchClient.
-   *
-   * @param {string} host - The base URL for the server.
-   * @param {number} [port=80] - The port number to connect to (default is 80).
-   * @param {(event: I_EventString, data: I_WsMessage) => void} [callback] - Optional callback function for socket events.
-   */
-  constructor(host: string, port: number = 80, callback?: (event: I_EventString, data: I_WsMessage) => void) {
-    this.baseUrl = host;
-    const socketUrl = host.includes('://') ? host : `https://${host}`;
-    const socketUrlWithPort = socketUrl.includes(':') && !socketUrl.endsWith(':')
-        ? socketUrl
-        : `${socketUrl}:${port}`;
-
-    console.log(`Initializing Socket.IO with URL: ${socketUrlWithPort}, path: /socket.io`);
-
-    this.socket = io(`${socketUrlWithPort}`, {
-      autoConnect: false,
-      transports: ['websocket'],  // Try websocket only first
-      reconnection: true,
-      reconnectionAttempts: 5,
-      reconnectionDelay: 1000,
-      forceNew: true,  // Force a new connection
-      auth: {
-        token: null  // Will be set later
-      },
-      path: '/socket.io'
-    });
-
-    this.callbackFunction = callback;
-
-    this.setupPermanentSocketListeners();
-  }
-
-  /**
-   * Sets the real-time synchronization status.
-   *
-   * @param {boolean} newRealTimeSync - The new real-time sync setting (true/false).
-   */
-  setRealTimeSync(newRealTimeSync: boolean) {
-    console.log(`Setting realtime sync to: ${newRealTimeSync}. Current setting: ${this.realTimeSync}`);
-
-    // Skip if the setting isn't changing
-    if (newRealTimeSync === this.realTimeSync) {
-      console.log("Realtime sync setting unchanged, skipping");
-      return;
+    /**
+     * The base URL of the server.
+     *
+     * @type {string}
+     */
+    baseUrl: string;
+    /**
+     * Socket.IO socket instance for real-time communication with the server.
+     *
+     * @type {Socket}
+     */
+    socket: Socket;
+    /**
+     * Callback function to handle socket events.
+     *
+     * @type {(event: I_EventString, data: I_WsMessage) => void}
+     */
+    callbackFunction;
+    /**
+     * Flag indicating whether real-time synchronization is enabled.
+     *
+     * @type {boolean}
+     */
+    realTimeSync: boolean = false;
+    /**
+     * Authentication token used to authorize requests.
+     *
+     * @private
+     * @type {string | null}
+     */
+    private authToken: string | null = null;
+    /**
+     * Flag indicating whether a connection attempt is in progress.
+     *
+     * @private
+     * @type {boolean}
+     */
+    private connectionInProgress = false;
+
+    /**
+     * Creates an instance of docPouchClient.
+     *
+     * @param {string} host - The base URL for the server.
+     * @param {number} [port=80] - The port number to connect to (default is 80).
+     * @param {(event: I_EventString, data: I_WsMessage) => void} [callback] - Optional callback function for socket events.
+     */
+    constructor(host: string, port: number = 80, callback?: (event: I_EventString, data: I_WsMessage) => void) {
+        this.baseUrl = host;
+        const socketUrl = host.includes('://') ? host : `https://${host}`;
+        const socketUrlWithPort = socketUrl.includes(':') && !socketUrl.endsWith(':')
+            ? socketUrl
+            : `${socketUrl}:${port}`;
+
+        console.log(`Initializing Socket.IO with URL: ${socketUrlWithPort}, path: /socket.io`);
+
+        this.socket = io(`${socketUrlWithPort}`, {
+            autoConnect: false,
+            transports: ['websocket'],  // Try websocket only first
+            reconnection: true,
+            reconnectionAttempts: 5,
+            reconnectionDelay: 1000,
+            forceNew: true,  // Force a new connection
+            auth: {
+                token: null  // Will be set later
+            },
+            path: '/socket.io'
+        });
+
+        this.callbackFunction = callback;
+
+        this.setupPermanentSocketListeners();
     }
 
-    this.realTimeSync = newRealTimeSync;
-
-    if (newRealTimeSync && this.authToken) {
-      console.log("Activating realtime updates");
-
-      // Ensure we're not in the middle of another connection attempt
-      if (this.connectionInProgress) {
-        console.log("Connection already in progress, waiting before initializing");
-        setTimeout(() => this.initWebSocket(), 500);
-      } else {
-        this.initWebSocket();
-      }
-    } else if (!newRealTimeSync) {
-      console.log("Deactivating realtime updates");
-      if (this.socket.connected) {
-        console.log("Disconnecting socket");
-        this.socket.disconnect();
-      }
+    /**
+     * Sets the real-time synchronization status.
+     *
+     * @param {boolean} newRealTimeSync - The new real-time sync setting (true/false).
+     */
+    setRealTimeSync(newRealTimeSync: boolean) {
+        console.log(`Setting realtime sync to: ${newRealTimeSync}. Current setting: ${this.realTimeSync}`);
+
+        // Skip if the setting isn't changing
+        if (newRealTimeSync === this.realTimeSync) {
+            console.log("Realtime sync setting unchanged, skipping");
+            return;
+        }
+
+        this.realTimeSync = newRealTimeSync;
+
+        if (newRealTimeSync && this.authToken) {
+            console.log("Activating realtime updates");
+
+            // Ensure we're not in the middle of another connection attempt
+            if (this.connectionInProgress) {
+                console.log("Connection already in progress, waiting before initializing");
+                setTimeout(() => this.initWebSocket(), 500);
+            } else {
+                this.initWebSocket();
+            }
+        } else if (!newRealTimeSync) {
+            console.log("Deactivating realtime updates");
+            if (this.socket.connected) {
+                console.log("Disconnecting socket");
+                this.socket.disconnect();
+            }
+        }
     }
-  }
 
-  // User Administration Endpoints
-  async login(credentials: I_UserLogin): Promise<I_LoginResponse | null> {
-    const response = await this.request<I_LoginResponse>('/users/login', 'POST', credentials, false);
-    if (response.token) {
-      this.authToken = response.token;
+    // User Administration Endpoints
+    async login(credentials: I_UserLogin): Promise<I_LoginResponse | null> {
+        const response = await this.request<I_LoginResponse>('/users/login', 'POST', credentials, false);
+        if (response.token) {
+            this.authToken = response.token;
 
-      // Reconnect websocket with new token if realtime sync is enabled
-      if (this.realTimeSync) {
-        this.initWebSocket();
-      }
+            // Reconnect websocket with new token if realtime sync is enabled
+            if (this.realTimeSync) {
+                this.initWebSocket();
+            }
 
-      return {token: response.token, isAdmin: response.isAdmin, userName: response.userName};
+            return {token: response.token, isAdmin: response.isAdmin, userName: response.userName};
+        }
+        return null;
     }
-    return null;
-  }
 
-  async listUsers(): Promise<I_UserEntry[]> {
-    return await this.request<I_UserEntry[]>('/users/list', 'GET');
-  }
+    async listUsers(): Promise<I_UserEntry[]> {
+        return await this.request<I_UserEntry[]>('/users/list', 'GET');
+    }
 
-  async updateUser(userID: string, userData: I_UserUpdate): Promise<void> {
-    await this.request<void>(`/users/update/${userID}`, 'PATCH', userData);
-  }
+    async updateUser(userID: string, userData: I_UserUpdate): Promise<void> {
+        await this.request<void>(`/users/update/${userID}`, 'PATCH', userData);
+    }
 
-  async createUser(userData: I_UserCreation): Promise<I_UserDisplay> {
-    return await this.request<I_UserDisplay>('/users/create', 'POST', userData);
-  }
+    async createUser(userData: I_UserCreation): Promise<I_UserDisplay> {
+        return await this.request<I_UserDisplay>('/users/create', 'POST', userData);
+    }
 
-  async removeUser(userID: string): Promise<void> {
-    await this.request<void>(`/users/remove/${userID}`, 'DELETE');
-  }
+    async removeUser(userID: string): Promise<void> {
+        await this.request<void>(`/users/remove/${userID}`, 'DELETE');
+    }
 
-  // Document Management Endpoints
-  async createDocument(document: I_DocumentEntry): Promise<I_DocumentEntry> {
-    return await this.request<I_DocumentEntry>('/docs/create', 'POST', document);
-  }
+    // Document Management Endpoints
+    async createDocument(document: I_DocumentEntry): Promise<I_DocumentEntry> {
+        return await this.request<I_DocumentEntry>('/docs/create', 'POST', document);
+    }
 
-  async listDocuments(): Promise<I_DocumentEntry[]> {
-    return await this.request<I_DocumentEntry[]>('/docs/list', 'GET');
-  }
+    async listDocuments(): Promise<I_DocumentEntry[]> {
+        return await this.request<I_DocumentEntry[]>('/docs/list', 'GET');
+    }
 
-  async fetchDocument(queryObject: I_DocumentQuery): Promise<I_DocumentEntry[]> {
-    return await this.request<I_DocumentEntry[]>(`/docs/fetch/`, 'POST', queryObject);
-  }
+    async fetchDocument(queryObject: I_DocumentQuery): Promise<I_DocumentEntry[]> {
+        return await this.request<I_DocumentEntry[]>(`/docs/fetch/`, 'POST', queryObject);
+    }
 
-  async updateDocument(documentID: string, documentData: I_DocumentEntry): Promise<void> {
-    await this.request<void>(`/docs/update/${documentID}`, 'PATCH', documentData);
-  }
+    async updateDocument(documentID: string, documentData: I_DocumentEntry): Promise<void> {
+        await this.request<void>(`/docs/update/${documentID}`, 'PATCH', documentData);
+    }
 
-  async removeDocument(documentID: string): Promise<void> {
-    await this.request<void>(`/docs/remove/${documentID}`, 'DELETE');
-  }
+    async removeDocument(documentID: string): Promise<void> {
+        await this.request<void>(`/docs/remove/${documentID}`, 'DELETE');
+    }
 
-  // Data Structure Endpoints
-  async createStructure(structure: I_StructureCreation): Promise<I_DataStructure> {
-    return await this.request<I_DataStructure>('/structures/create', 'POST', structure);
-  }
+    // Data Structure Endpoints
+    async createStructure(structure: I_StructureCreation): Promise<I_DataStructure> {
+        return await this.request<I_DataStructure>('/structures/create', 'POST', structure);
+    }
 
-  async getStructures(): Promise<I_DataStructure[]> {
-    return await this.request<I_DataStructure[]>('/structures/list', 'GET');
-  }
+    async getStructures(): Promise<I_DataStructure[]> {
+        return await this.request<I_DataStructure[]>('/structures/list', 'GET');
+    }
 
-  async updateStructure(structureID: string, structureData: I_DataStructure): Promise<void> {
-    await this.request<void>(`/structures/update/${structureID}`, 'PATCH', structureData);
-  }
+    async updateStructure(structureID: string, structureData: I_DataStructure): Promise<void> {
+        await this.request<void>(`/structures/update/${structureID}`, 'PATCH', structureData);
+    }
 
-  async removeStructure(structureID: string): Promise<void> {
-    await this.request<void>(`/structures/remove/${structureID}`, 'DELETE');
-  }
+    async removeStructure(structureID: string): Promise<void> {
+        await this.request<void>(`/structures/remove/${structureID}`, 'DELETE');
+    }
 
-  // Data Type Endpoints
-  async createType(type: I_DocumentType): Promise<I_DocumentType> {
-    return await this.request<I_DocumentType>('/types/write', 'POST', type);
-  }
+    // Data Type Endpoints
+    async createType(type: I_DocumentType): Promise<I_DocumentType> {
+        return await this.request<I_DocumentType>('/types/write', 'POST', type);
+    }
 
-  async removeType(typeID: string) {
-    return await this.request<void>(`/types/remove/${typeID}`, 'DELETE');
-  }
+    async removeType(typeID: string) {
+        return await this.request<void>(`/types/remove/${typeID}`, 'DELETE');
+    }
 
-  async getTypes(): Promise<I_DocumentType[]> {
-    return await this.request<I_DocumentType[]>('/types/list', 'GET');
-  }
+    async getTypes(): Promise<I_DocumentType[]> {
+        return await this.request<I_DocumentType[]>('/types/list', 'GET');
+    }
 
-  async updateType(updatedType: I_DocumentType): Promise<void> {
-    await this.request<void>(`/types/write`, 'POST', updatedType);
-  }
+    async updateType(updatedType: I_DocumentType): Promise<void> {
+        await this.request<void>(`/types/write`, 'POST', updatedType);
+    }
 
-  setToken(token: string | null): void {
-    console.log("Setting token to:", token ? "***token***" : "null");
+    setToken(token: string | null): void {
+        console.log("Setting token to:", token ? "***token***" : "null");
 
-    const tokenChanged = this.authToken !== token;
-    this.authToken = token;
+        const tokenChanged = this.authToken !== token;
+        this.authToken = token;
 
-    if (!tokenChanged) {
-      console.log("Token unchanged, no need to reconnect");
-      return;
-    }
+        if (!tokenChanged) {
+            console.log("Token unchanged, no need to reconnect");
+            return;
+        }
 
-    // If we have a new token and realtime sync is enabled
-    if (token && this.realTimeSync) {
-      console.log("New token set, will initialize WebSocket");
-
-      // Ensure any existing connection is closed first
-      if (this.socket.connected) {
-        console.log("Disconnecting existing socket before reconnecting with new token");
-        this.socket.disconnect();
-      }
-
-      // Wait a moment for the disconnect to complete
-      setTimeout(() => {
-        console.log("Initializing WebSocket with new token");
-        this.initWebSocket();
-      }, 300);
-    }
-    // If token was cleared or realtime sync is disabled
-    else if (this.socket.connected) {
-      console.log("Token cleared or realtime sync disabled, disconnecting");
-      this.socket.disconnect();
-    }
-  }
-
-  getVersion() {
-    return packetJson.version;
-  }
-
-  debugSocketConnection(): void {
-    console.log("Socket connection debug info:");
-    console.log("- Connected:", this.socket.connected);
-    console.log("- Socket ID:", this.socket.id);
-    console.log("- Auth token present:", !!this.authToken);
-    console.log("- Connection in progress:", this.connectionInProgress);
-    console.log("- Realtime sync enabled:", this.realTimeSync);
-    console.log("- Socket options:", this.socket.io.opts);
-
-    // Try to force reconnection
-    if (!this.socket.connected && this.authToken && this.realTimeSync) {
-      console.log("Attempting to force reconnection...");
-      this.socket.auth = {token: this.authToken};
-      this.socket.connect();
+        // If we have a new token and realtime sync is enabled
+        if (token && this.realTimeSync) {
+            console.log("New token set, will initialize WebSocket");
+
+            // Ensure any existing connection is closed first
+            if (this.socket.connected) {
+                console.log("Disconnecting existing socket before reconnecting with new token");
+                this.socket.disconnect();
+            }
+
+            // Wait a moment for the disconnect to complete
+            setTimeout(() => {
+                console.log("Initializing WebSocket with new token");
+                this.initWebSocket();
+            }, 300);
+        }
+        // If token was cleared or realtime sync is disabled
+        else if (this.socket.connected) {
+            console.log("Token cleared or realtime sync disabled, disconnecting");
+            this.socket.disconnect();
+        }
     }
-  }
-
-  /**
-   * Sets up permanent socket listeners for the client.
-   *
-   * @private
-   */
-  private setupPermanentSocketListeners() {
-    // These are permanent listeners that won't be removed
-    this.socket.on('connect_error', (error) => {
-      console.error('Socket connection error:', error.message);
-      this.connectionInProgress = false;
-    });
-
-    this.socket.on('connect', () => {
-      console.log('Socket connected successfully with ID:', this.socket.id);
-      this.connectionInProgress = false;
-    });
-
-    this.socket.on('disconnect', (reason) => {
-      console.log('Socket disconnected. Reason:', reason);
-      this.connectionInProgress = false;
-    });
-
-    this.socket.on('error', (error) => {
-      console.error('Socket error:', error);
-      this.connectionInProgress = false;
-    });
-  }
-
-  /**
-   * Initializes the WebSocket connection with the server.
-   *
-   * @private
-   */
-  private initWebSocket() {
-    console.log("initWebSocket called. Auth token present:", !!this.authToken,
-        "Connection in progress:", this.connectionInProgress,
-        "Socket connected:", this.socket.connected);
-
-    if (!this.authToken) {
-      console.log("Skipping WebSocket initialization: No auth token");
-      return;
+
+    getVersion() {
+        return packetJson.version;
     }
 
-    if (this.connectionInProgress) {
-      console.log("Connection already in progress, skipping initialization");
-      return;
+    debugSocketConnection(): void {
+        console.log("Socket connection debug info:");
+        console.log("- Connected:", this.socket.connected);
+        console.log("- Socket ID:", this.socket.id);
+        console.log("- Auth token present:", !!this.authToken);
+        console.log("- Connection in progress:", this.connectionInProgress);
+        console.log("- Realtime sync enabled:", this.realTimeSync);
+        console.log("- Socket options:", this.socket.io.opts);
+
+        // Try to force reconnection
+        if (!this.socket.connected && this.authToken && this.realTimeSync) {
+            console.log("Attempting to force reconnection...");
+            this.socket.auth = {token: this.authToken};
+            this.socket.connect();
+        }
     }
 
-    if (this.socket.connected) {
-      console.log("Socket already connected with ID:", this.socket.id);
-      return;
+    /**
+     * Sets up permanent socket listeners for the client.
+     *
+     * @private
+     */
+    private setupPermanentSocketListeners() {
+        // These are permanent listeners that won't be removed
+        this.socket.on('connect_error', (error) => {
+            console.error('Socket connection error:', error.message);
+            this.connectionInProgress = false;
+        });
+
+        this.socket.on('connect', () => {
+            console.log('Socket connected successfully with ID:', this.socket.id);
+            this.connectionInProgress = false;
+        });
+
+        this.socket.on('disconnect', (reason) => {
+            console.log('Socket disconnected. Reason:', reason);
+            this.connectionInProgress = false;
+        });
+
+        this.socket.on('error', (error) => {
+            console.error('Socket error:', error);
+            this.connectionInProgress = false;
+        });
     }
 
-    this.connectionInProgress = true;
+    /**
+     * Initializes the WebSocket connection with the server.
+     *
+     * @private
+     */
+    private initWebSocket() {
+        console.log("initWebSocket called. Auth token present:", !!this.authToken,
+            "Connection in progress:", this.connectionInProgress,
+            "Socket connected:", this.socket.connected);
+
+        if (!this.authToken) {
+            console.log("Skipping WebSocket initialization: No auth token");
+            return;
+        }
 
-    try {
-      console.log("Setting up WebSocket connection with token");
+        if (this.connectionInProgress) {
+            console.log("Connection already in progress, skipping initialization");
+            return;
+        }
 
-      // Update the auth token
-      this.socket.auth = {token: this.authToken};
+        if (this.socket.connected) {
+            console.log("Socket already connected with ID:", this.socket.id);
+            return;
+        }
 
-      // Remove any dynamic event listeners that might have been added
-      this.socket.offAny();
+        this.connectionInProgress = true;
 
-      // Set up event handler for application events
-      this.socket.onAny((event: I_EventString, data: I_WsMessage) => {
-        if (event === "heartbeatPing") {
-          console.log("Ping event received:", data);
-          this.socket.emit("heartbeatPong", Date.now());
-        } else if (this.callbackFunction) {
-          this.callbackFunction(event, data);
-        }
-      });
+        try {
+            console.log("Setting up WebSocket connection with token");
 
-      // Connect to the server
-      console.log("Connecting socket with auth token");
-      this.socket.connect();
+            // Update the auth token
+            this.socket.auth = {token: this.authToken};
 
-      // Add a timeout to detect if connection is taking too long
-      setTimeout(() => {
-        if (this.connectionInProgress) {
-          console.warn("Socket connection attempt timed out after 5 seconds");
-          this.connectionInProgress = false;
+            // Remove any dynamic event listeners that might have been added
+            this.socket.offAny();
+
+            // Set up event handler for application events
+            this.socket.onAny((event: I_EventString, data: I_WsMessage) => {
+                if (event === "heartbeatPing") {
+                    console.log("Ping event received:", data);
+                    this.socket.emit("heartbeatPong", Date.now());
+                } else if (this.callbackFunction) {
+                    this.callbackFunction(event, data);
+                }
+            });
 
-          // If we're still not connected after the timeout, try again with polling
-          if (!this.socket.connected) {
-            console.log("Retrying connection with polling transport");
-            this.socket.io.opts.transports = ['polling', 'websocket'];
+            // Connect to the server
+            console.log("Connecting socket with auth token");
             this.socket.connect();
-          }
+
+            // Add a timeout to detect if connection is taking too long
+            setTimeout(() => {
+                if (this.connectionInProgress) {
+                    console.warn("Socket connection attempt timed out after 5 seconds");
+                    this.connectionInProgress = false;
+
+                    // If we're still not connected after the timeout, try again with polling
+                    if (!this.socket.connected) {
+                        console.log("Retrying connection with polling transport");
+                        this.socket.io.opts.transports = ['polling', 'websocket'];
+                        this.socket.connect();
+                    }
+                }
+            }, 5000);
+        } catch (error) {
+            console.error('Error in initWebSocket:', error);
+            this.connectionInProgress = false;
         }
-      }, 5000);
-    } catch (error) {
-      console.error('Error in initWebSocket:', error);
-      this.connectionInProgress = false;
-    }
-  }
-
-  private async request<T>(endpoint: string, method: string, body?: any, requiresAuth: boolean = true): Promise<T> {
-    const headers: HeadersInit = {
-      'Content-Type': 'application/json',
-    };
-
-    if (requiresAuth && this.authToken)
-      headers['Authorization'] = `Bearer ${this.authToken}`;
-    if (this.socket.id)
-      headers['X-Socket-ID'] = this.socket.id;
-
-    const options: RequestInit = {
-      method,
-      headers,
-      body: body ? JSON.stringify(body) : undefined
-    };
-
-    const normalizedEndpoint = endpoint.startsWith('/') ? endpoint : `/${endpoint}`;
-    const normalizedBaseUrl = this.baseUrl.endsWith('/') ? this.baseUrl.slice(0, -1) : this.baseUrl;
-    const url = `${normalizedBaseUrl}${normalizedEndpoint}`;
-    const response = await fetch(url, options);
-
-    if (!response.ok) {
-      if (response.status === 401 || response.status === 403) {
-        this.authToken = null;
-      }
-      throw new Error(`API error: ${response.status} ${response.statusText}`);
     }
 
-    return await response.json() as T;
-  }
+    private async request<T>(endpoint: string, method: string, body?: any, requiresAuth: boolean = true): Promise<T> {
+        const headers: HeadersInit = {
+            'Content-Type': 'application/json',
+        };
+
+        if (requiresAuth && this.authToken)
+            headers['Authorization'] = `Bearer ${this.authToken}`;
+        if (this.socket.id)
+            headers['X-Socket-ID'] = this.socket.id;
+
+        const options: RequestInit = {
+            method,
+            headers,
+            body: body ? JSON.stringify(body) : undefined
+        };
+
+        const normalizedEndpoint = endpoint.startsWith('/') ? endpoint : `/${endpoint}`;
+        const normalizedBaseUrl = this.baseUrl.endsWith('/') ? this.baseUrl.slice(0, -1) : this.baseUrl;
+        const url = `${normalizedBaseUrl}${normalizedEndpoint}`;
+        const response = await fetch(url, options);
+
+        if (!response.ok) {
+            if (response.status === 401 || response.status === 403) {
+                this.authToken = null;
+            }
+            throw new Error(`API error: ${response.status} ${response.statusText}`);
+        }
+
+        return await response.json() as T;
+    }
 }
 
 // Common type definitions for both frontend and backend
 
 // User related types
 export interface I_UserEntry extends I_UserCreation {
-  _id: string;
+    _id: string;
 }
 
 export interface I_UserLogin {
-  name: string;
-  password: string;
+    name: string;
+    password: string;
 }
 
 export interface I_UserCreation {
-  name: string;
-  password: string;
-  email?: string;
-  department: string;
-  group: string;
-  isAdmin: boolean;
+    name: string;
+    password: string;
+    email?: string;
+    department: string;
+    group: string;
+    isAdmin: boolean;
 }
 
 export interface I_UserUpdate {
-  _id: string;
-  name?: string;
-  password?: string;
-  email?: string;
-  department?: string;
-  group?: string;
-  isAdmin?: boolean;
+    name?: string;
+    password?: string;
+    email?: string;
+    department?: string;
+    group?: string;
+    isAdmin?: boolean;
 }
 
 export interface I_UserDisplay {
-  _id: string;
-  username: string;
-  department: string;
-  group: string;
-  email?: string;
+    _id: string;
+    username: string;
+    department: string;
+    group: string;
+    email?: string;
 }
 
 export interface I_LoginResponse {
-  token: string;
-  isAdmin: boolean;
-  userName: string;
+    token: string;
+    isAdmin: boolean;
+    userName: string;
 }
 
 // Document related types
 export interface I_DocumentEntry extends I_DocumentCreationOwned {
-  _id: string;
+    _id: string;
 }
 
 export interface I_DocumentCreation {
-  title: string;
-  description?: string;
-  type: number;
-  subType: number;
-  content: any;
-  shareWithGroup: boolean;
-  shareWithDepartment: boolean;
+    title: string;
+    description?: string;
+    type: number;
+    subType: number;
+    content: any;
+    shareWithGroup: boolean;
+    shareWithDepartment: boolean;
 }
 
 
 export interface I_DocumentCreationOwned extends I_DocumentCreation {
-  owner: string;
+    owner: string;
 }
 
 export interface I_DocumentUpdate extends I_DocumentQuery {
-  _id: string;
-  content?: any;
-  description?: string;
+    content?: any;
+    description?: string;
 }
 
 export interface I_DocumentQuery {
-  _id?: string;
-  owner?: string;
-  title?: string;
-  type?: number;
-  subType?: number;
-  shareWithGroup?: boolean;
-  shareWithDepartment?: boolean;
+    _id?: string;
+    owner?: string;
+    title?: string;
+    type?: number;
+    subType?: number;
+    shareWithGroup?: boolean;
+    shareWithDepartment?: boolean;
 }
 
 
 // Structure related types
 export interface I_DataStructure {
-  _id?: string | undefined;
-  name: string;
-  description: string;
-  fields: I_StructureField[];
+    _id?: string | undefined;
+    name: string;
+    description: string;
+    fields: I_StructureField[];
 }
 
 export interface I_StructureField {
-  name: string;
-  type: string;
-  items?: string;
+    name: string;
+    type: string;
+    items?: string;
 }
 
 export interface I_StructureEntry {
-  _id?: string;
-  name: string;
-  description: string;
-  fields: I_StructureField[];
+    _id?: string;
+    name: string;
+    description: string;
+    fields: I_StructureField[];
 }
 
 
 export interface I_StructureCreation {
-  name: string;
-  description?: string;
-  fields: I_StructureField[];
+    name: string;
+    description?: string;
+    fields: I_StructureField[];
 }
 
 export interface I_StructureUpdate {
-    _id?: string;
-  name?: string;
-  description?: string;
-  fields?: I_StructureField[];
+    _id?: string
+    name?: string;
+    description?: string;
+    fields?: I_StructureField[];
 }
 
 // Document type related types
 export interface I_DocumentType {
-  _id?: string;
-  type: number;
-  subType: number;
-  name: string;
-  description?: string;
-  defaultStructureID?: string;
+    _id?: string;
+    type: number;
+    subType: number;
+    name: string;
+    description?: string;
+    defaultStructureID?: string;
 }
 
 // WebSocket-related types
@@ -518,16 +516,16 @@ export type I_EventString = 'heartbeatPong' | "heartbeatPing" | "newDocument" |
     "removedUser" | "removedStructure" | "removedDocument" | "removedType";
 
 export interface I_WsMessage {
-  newDocument?: I_DocumentEntry;
-  newStructure?: I_StructureEntry;
-  newUser?: I_UserEntry;
-  removedID?: string;
-  changedDocument?: I_DocumentUpdate;
-  changedStructure?: I_StructureUpdate;
-  changedUser?: I_UserUpdate;
-  confirmSubscription?: boolean;
-  confirmUnsubscription?: boolean;
-  heartbeatPing?: number;
-  heartbeatPong?: number;
-  newType?: I_DocumentType;
+    newDocument?: I_DocumentEntry;
+    newStructure?: I_StructureEntry;
+    newUser?: I_UserEntry;
+    removedID?: string;
+    changedDocument?: I_DocumentUpdate;
+    changedStructure?: I_StructureUpdate;
+    changedUser?: I_UserUpdate;
+    confirmSubscription?: boolean;
+    confirmUnsubscription?: boolean;
+    heartbeatPing?: number;
+    heartbeatPong?: number;
+    newType?: I_DocumentType;
 }