diff --git a/package-lock.json b/package-lock.json index 3ea70a1..326b4ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "redlight", - "version": "1.1.0", + "version": "1.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "redlight", - "version": "1.1.0", + "version": "1.2.0", "dependencies": { "axios": "^1.7.0", "bcryptjs": "^2.4.3", diff --git a/package.json b/package.json index 097f831..cdb315b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "redlight", "private": true, - "version": "1.1.0", + "version": "1.2.0", "type": "module", "scripts": { "dev": "concurrently -n client,server -c blue,green \"vite\" \"node --watch server/index.js\"", diff --git a/server/config/bbb.js b/server/config/bbb.js index 4851c90..fb345e0 100644 --- a/server/config/bbb.js +++ b/server/config/bbb.js @@ -70,12 +70,22 @@ async function apiCall(apiCallName, params = {}, xmlBody = null) { const tokens = []; tokens.push(`time=${formatUTC(new Date())}`); tokens.push(`method=${xmlBody ? 'POST' : 'GET'}`); - tokens.push(`path=${apiCallName}`); + // include standard BBB api base path + let apiBasePath = '/bigbluebutton/api'; + try { + const u = new URL(BBB_URL); + apiBasePath = (u.pathname || '/bigbluebutton/api').replace(/\/$/, ''); + } catch (e) { + // keep default + } + // ensure single slash separation + const fullPath = `${apiBasePath}/${apiCallName}`.replace(/\/\/+/, '/'); + tokens.push(`path=${fullPath}`); tokens.push(`format=xml`); tokens.push(`status=${response.status}`); tokens.push(`duration=${(duration).toFixed(2)}`); - const bbbCode = result && result.response && result.response.returncode ? result.response.returncode : '-'; - tokens.push(`bbb_returncode=${bbbCode}`); + const returnCode = result && result.response && result.response.returncode ? result.response.returncode : '-'; + tokens.push(`returncode=${returnCode}`); const safeParams = sanitizeParams(params); tokens.push(`params=${safeParams}`); console.info(tokens.join(' ')); diff --git a/server/routes/federation.js b/server/routes/federation.js index 55c4ec2..4d55fa9 100644 --- a/server/routes/federation.js +++ b/server/routes/federation.js @@ -38,7 +38,7 @@ export function wellKnownHandler(req, res) { federation_api: '/api/federation', public_key: getPublicKey(), software: 'Redlight', - version: '1.1.0', + version: '1.2.0', }); }