docpouch-client 1.1.2 → 1.1.4

package/dist/index.d.ts

@@ -11,6 +11,18 @@ export default class docPouchClient {
      * @type {string}
      */
     baseUrl: string;
+    /**
+     * The port number to use for HTTP and WebSocket connections when the
+     * base URL does not already include an explicit port. Stored from
+     * the constructor argument so the {@link request} method can
+     * build full URLs (e.g. for the OIDC dynamic client registration
+     * endpoint at `/oidc/reg`) even when the caller passes a host
+     * without a port. A port that already appears in the base URL
+     * takes precedence.
+     *
+     * @type {number}
+     */
+    port: number;
     /**
      * Socket.IO socket instance for real-time communication with the server.
      *
@@ -58,8 +70,14 @@ export default class docPouchClient {
     /**
      * 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 {string} host - The base URL for the server. May be a bare
+     *   host (`http://localhost`), a host with an explicit port
+     *   (`http://localhost:3030`), or a full URL with a path. When the
+     *   value does not already contain a port number, the supplied
+     *   `port` argument is appended to every HTTP request built by
+     *   {@link request} (in addition to the WebSocket connection).
+     * @param {number} [port=80] - The port number to use when the
+     *   `host` does not already specify one (default is 80).
      * @param {(event: I_EventString, data: I_WsMessage) => void} [callback] - Optional callback function for socket events.
      */
     constructor(host: string, port?: number, callback?: (event: I_EventString, data: I_WsMessage) => void);

package/dist/index.js

@@ -9,8 +9,14 @@ export default class docPouchClient {
     /**
      * 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 {string} host - The base URL for the server. May be a bare
+     *   host (`http://localhost`), a host with an explicit port
+     *   (`http://localhost:3030`), or a full URL with a path. When the
+     *   value does not already contain a port number, the supplied
+     *   `port` argument is appended to every HTTP request built by
+     *   {@link request} (in addition to the WebSocket connection).
+     * @param {number} [port=80] - The port number to use when the
+     *   `host` does not already specify one (default is 80).
      * @param {(event: I_EventString, data: I_WsMessage) => void} [callback] - Optional callback function for socket events.
      */
     constructor(host, port = 80, callback) {
@@ -47,6 +53,7 @@ export default class docPouchClient {
          */
         this.events = {};
         this.baseUrl = host;
+        this.port = port;
         const socketUrl = host.includes('://') ? host : `https://${host}`;
         const socketUrlWithPort = socketUrl.includes(':') && !socketUrl.endsWith(':')
             ? socketUrl
@@ -619,8 +626,13 @@ export default class docPouchClient {
             return false;
         }
         // Check URL query parameters for logout confirmation
-        const urlParams = new URLSearchParams(window.location.search);
-        const logoutParam = urlParams.get('logout');
+        // Also check hash parameters for hash-mode routing compatibility
+        const searchParams = new URLSearchParams(window.location.search);
+        const hashQuery = window.location.hash.includes('?')
+            ? window.location.hash.split('?')[1]
+            : window.location.hash.replace(/^#\/?/, '');
+        const hashParams = new URLSearchParams(hashQuery);
+        const logoutParam = searchParams.get('logout') || hashParams.get('logout');
         // If logout parameter is explicitly 'no', user cancelled
         if (logoutParam === 'no') {
             // Clear the logout in progress flag
@@ -649,7 +661,7 @@ export default class docPouchClient {
         if (logoutParam === null) {
             // Check if this is a post-logout redirect - assume logout was successful
             // unless there's an error parameter
-            const errorParam = urlParams.get('error');
+            const errorParam = searchParams.get('error') || hashParams.get('error');
             if (!errorParam) {
                 // Clear the logout in progress flag
                 if (typeof window !== 'undefined' && window.sessionStorage) {
@@ -831,7 +843,16 @@ export default class docPouchClient {
             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 trimmedBaseUrl = this.baseUrl.endsWith('/') ? this.baseUrl.slice(0, -1) : this.baseUrl;
+        // If the caller's `host` already includes a port (e.g.
+        // `http://localhost:3030`) we must not append `this.port` or
+        // the URL would end up like `http://localhost:3030:3030` or
+        // `http://localhost:3030:80`. Only fall back to the constructor
+        // `port` argument when the URL has no port of its own.
+        const hasExplicitPort = /:\d+(?=\/|$)/.test(trimmedBaseUrl);
+        const normalizedBaseUrl = !hasExplicitPort && this.port
+            ? `${trimmedBaseUrl}:${this.port}`
+            : trimmedBaseUrl;
         const url = `${normalizedBaseUrl}${normalizedEndpoint}`;
         const response = await fetch(url, options);
         if (!response.ok) {

package/package.json

@@ -1,41 +1,41 @@
-{
-  "name": "docpouch-client",
-  "version": "1.1.2",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.js"
-    }
-  },
-  "type": "module",
-  "scripts": {
-    "build": "tsc -p tsconfig.build.json",
-    "test": "node --experimental-vm-modules --no-warnings ./node_modules/jest/bin/jest.js --forceExit --silent"
-  },
-  "keywords": [
-    "docPouch",
-    "API"
-  ],
-  "author": "Jan Frecè",
-  "license": "MIT",
-  "description": "Client SDK for DocPouch API - supports JWT and OIDC authentication",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/BFH-JTF/docpouch-client.git"
-  },
-  "devDependencies": {
-    "@types/express": "^5.0.6",
-    "@types/jest": "^30.0.0",
-    "@types/node": "^25.9.1",
-    "express": "^5.2.1",
-    "jest": "^30.4.2",
-    "socket.io": "^4.8.3",
-    "ts-jest": "^29.4.10",
-    "typescript": "^6.0.3"
-  },
-  "dependencies": {
-    "socket.io-client": "^4.8.3"
-  }
-}
+{
+  "name": "docpouch-client",
+  "version": "1.1.4",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.js"
+    }
+  },
+  "type": "module",
+  "scripts": {
+    "build": "tsc -p tsconfig.build.json",
+    "test": "node --experimental-vm-modules --no-warnings ./node_modules/jest/bin/jest.js --forceExit --silent"
+  },
+  "keywords": [
+    "docPouch",
+    "API"
+  ],
+  "author": "Jan Frecè",
+  "license": "MIT",
+  "description": "Client SDK for DocPouch API - supports JWT and OIDC authentication",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/BFH-JTF/docpouch-client.git"
+  },
+  "devDependencies": {
+    "@types/express": "^5.0.6",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^25.9.1",
+    "express": "^5.2.1",
+    "jest": "^30.4.2",
+    "socket.io": "^4.8.3",
+    "ts-jest": "^29.4.10",
+    "typescript": "^6.0.3"
+  },
+  "dependencies": {
+    "socket.io-client": "^4.8.3"
+  }
+}

package/test-post-logout.js

@@ -1,24 +0,0 @@
-// Test script to verify post_logout_redirect_uris functionality
-const fs = require('fs');
-
-// Read the built client to verify the changes
-const clientCode = fs.readFileSync('dist/index.js', 'utf8');
-
-console.log('Checking for post_logout_redirect_uris support...');
-
-// Check if the interfaces include post_logout_redirect_uris
-const hasRegistrationInterface = clientCode.includes('post_logout_redirect_uris?: string[]');
-const hasResponseInterface = clientCode.includes('post_logout_redirect_uris?: string[]');
-
-// Check if logout methods use postLogoutRedirectUri
-const usesPostLogoutUri = clientCode.includes('this.oidcConfig.postLogoutRedirectUri');
-
-console.log('I_OidcClientRegistration has post_logout_redirect_uris:', hasRegistrationInterface);
-console.log('I_OidcClientResponse has post_logout_redirect_uris:', hasResponseInterface);
-console.log('Logout methods use postLogoutRedirectUri:', usesPostLogoutUri);
-
-if (hasRegistrationInterface && hasResponseInterface && usesPostLogoutUri) {
-    console.log('✅ All post_logout_redirect_uris functionality is properly implemented!');
-} else {
-    console.log('❌ Some post_logout_redirect_uris functionality is missing');
-}