Set Strophe log level

Update strophe.
conversejs · Mar 24, 2024 · 3a4810b · 3a4810b
1 parent ec93d85
commit 3a4810b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/headless/package.json b/src/headless/package.json
@@ -43,7 +43,7 @@
     "pluggable.js": "3.0.1",
     "sizzle": "^2.3.5",
     "sprintf-js": "^1.1.2",
-    "strophe.js": "strophe/strophejs#a02d8932d6d6175a72833f7493b5ca9562438509",
+    "strophe.js": "strophe/strophejs#d6cb60012fd243a1c3f1033e8acd6c80264d65cf",
     "urijs": "^1.19.10"
   },
   "devDependencies": {}

diff --git a/src/headless/shared/connection/api.js b/src/headless/shared/connection/api.js
@@ -2,7 +2,7 @@ import events_api from '../api/events.js';
 import { Connection, MockConnection } from './index.js';
 import { PREBIND } from '../constants.js';
 import { Strophe } from 'strophe.js';
-import { getConnectionServiceURL, setUpXMLLogging } from './utils.js';
+import { getConnectionServiceURL, setStropheLogLevel } from './utils.js';
 import { isSameDomain } from '../../utils/jid.js';
 import { isTestEnv } from '../../utils/session.js';
 import { settings_api } from '../settings/api.js';
@@ -40,7 +40,7 @@ export default {
             })
         );
 
-        setUpXMLLogging(connection);
+        setStropheLogLevel();
         /**
          * Triggered once the `Connection` constructor has been initialized, which
          * will be responsible for managing the connection to the XMPP server.

diff --git a/src/headless/shared/connection/utils.js b/src/headless/shared/connection/utils.js
@@ -6,19 +6,19 @@ export function generateResource () {
     return `/converse.js-${Math.floor(Math.random() * 139749528).toString()}`;
 }
 
-export function setUpXMLLogging (connection) {
+export function setStropheLogLevel () {
+    const level = settings_api.get('loglevel');
+    Strophe.setLogLevel(Strophe.LogLevel[level.toUpperCase()]);
+
     const lmap = {};
     lmap[Strophe.LogLevel.DEBUG] = 'debug';
     lmap[Strophe.LogLevel.INFO] = 'info';
     lmap[Strophe.LogLevel.WARN] = 'warn';
     lmap[Strophe.LogLevel.ERROR] = 'error';
     lmap[Strophe.LogLevel.FATAL] = 'fatal';
 
-    Strophe.log = (level, msg) => log.log(msg, lmap[level]);
+    Strophe.log = (l, msg) => log.log(msg, lmap[l]);
     Strophe.error = (msg) => log.error(msg);
-
-    connection.xmlInput = (body) => log.debug(body.outerHTML, 'color: darkgoldenrod');
-    connection.xmlOutput = (body) => log.debug(body.outerHTML, 'color: darkcyan');
 }
 
 export function getConnectionServiceURL () {

diff --git a/src/headless/types/shared/connection/utils.d.ts b/src/headless/types/shared/connection/utils.d.ts
@@ -1,4 +1,4 @@
 export function generateResource(): string;
-export function setUpXMLLogging(connection: any): void;
+export function setStropheLogLevel(): void;
 export function getConnectionServiceURL(): any;
 //# sourceMappingURL=utils.d.ts.map
diff --git a/src/shared/rich-text.js b/src/shared/rich-text.js
@@ -335,7 +335,6 @@ export class RichText extends String {
      * @param { Object } template - The lit TemplateResult instance
      */
     addTemplateResult (begin, end, template) {
-        console.log(`addTemplateResult called with ${begin}, ${end}, ${template}`);
         this.references.push({ begin, end, template });
     }
 

diff --git a/src/shared/tests/mock.js b/src/shared/tests/mock.js
@@ -696,7 +696,7 @@ async function _initConverse (settings) {
         discover_connection_methods: false,
         enable_smacks: false,
         i18n: 'en',
-        loglevel: window.location.pathname === 'debug.html' ? 'debug' : 'warn',
+        loglevel: window.location.pathname === 'debug.html' ? 'debug' : 'error',
         no_trimming: true,
         persistent_store: 'localStorage',
         play_sounds: false,