diff --git a/lib/editor/tunnel.js b/lib/editor/tunnel.js index 8360045..9e8070e 100644 --- a/lib/editor/tunnel.js +++ b/lib/editor/tunnel.js @@ -190,7 +190,7 @@ class EditorTunnel { }).catch(_err => { // debug(`proxy [${request.method}] ${fullUrl} : error ${_err.toString()}`) // ↓ useful for debugging but noisy due to .map files - // console.log(err) + // console.log(_err) // console.log(JSON.stringify(request)) this.socket?.send(JSON.stringify({ id: request.id, diff --git a/lib/template/template-settings.js b/lib/template/template-settings.js index e24252f..fb39f36 100644 --- a/lib/template/template-settings.js +++ b/lib/template/template-settings.js @@ -2,7 +2,6 @@ const settings = require('./settings.json') const editorTheme = settings.editorTheme || {} const themeName = editorTheme.theme || 'forge-light' const themeSettings = settings[themeName] || {} -const { default: got } = import('got') const { existsSync, readFileSync } = require('fs') settings.editorTheme.header = settings.editorTheme.header || {} @@ -25,9 +24,10 @@ const auth = { return authCache[token].result } } + const { default: got } = await import('got') try { const result = await got.get(`${settings.flowforge.forgeURL}/api/v1/devices/${deviceId}/editor/token`, { - timeout: 2000, + timeout: { request: 2000 }, headers: { 'x-access-token': token, 'user-agent': 'FlowForge Device Agent Node-RED admin auth' @@ -43,6 +43,7 @@ const auth = { return { username, permissions } } } catch (err) { + console.log('error getting new token', err) } }, users: async function (username) {