@goodandready/dsh-messenger-gateway 0.4.15 → 0.4.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -0
- package/README.ru.md +4 -0
- package/README.zh.md +1 -1
- package/lib/adapters/index.js +2 -0
- package/lib/adapters/telegram-inbound.js +148 -141
- package/lib/adapters/telegram.js +47 -7
- package/lib/client.js +26 -0
- package/lib/config.js +18 -8
- package/lib/gateway.js +27 -3
- package/lib/index.js +43 -1
- package/lib/proxy.js +669 -0
- package/lib/secret-guard.js +52 -0
- package/lib/telegram-errors.js +0 -0
- package/lib/telegram-format.js +67 -1
- package/package.json +1 -1
package/lib/gateway.js
CHANGED
|
@@ -44,6 +44,8 @@ export class Gateway {
|
|
|
44
44
|
this.pendingAsks = new Map()
|
|
45
45
|
this.adapters = new Map()
|
|
46
46
|
this.adapterList = []
|
|
47
|
+
// true после stop(): start() обязан прекратить работу, если его обогнали.
|
|
48
|
+
this.stopped = false
|
|
47
49
|
this.disposeListener = undefined
|
|
48
50
|
this.idleTimer = undefined
|
|
49
51
|
this.callbackIndex = new Map()
|
|
@@ -218,6 +220,7 @@ export class Gateway {
|
|
|
218
220
|
}
|
|
219
221
|
|
|
220
222
|
async start() {
|
|
223
|
+
this.stopped = false
|
|
221
224
|
const onHost = (session, event) => this.handleHostEvent(session, event)
|
|
222
225
|
const unsubs = [
|
|
223
226
|
this.ctx.on('session/event', onHost),
|
|
@@ -241,22 +244,41 @@ export class Gateway {
|
|
|
241
244
|
isUserAllowed: (id) => this.isUserAllowed(id),
|
|
242
245
|
logger: this.ctx.logger,
|
|
243
246
|
})
|
|
247
|
+
const dropAdapter = (adapter) => {
|
|
248
|
+
this.adapters.delete(adapter.name)
|
|
249
|
+
this.adapterList = this.adapterList.filter((item) => item !== adapter)
|
|
250
|
+
if (this.tgAdapter === adapter) this.tgAdapter = undefined
|
|
251
|
+
}
|
|
244
252
|
for (const adapter of adapters) {
|
|
253
|
+
// Регистрируем адаптер ДО `await adapter.start()`: старт адаптера — это
|
|
254
|
+
// сетевые вызовы (getMe/setMyCommands/deleteWebhook), и если за это время
|
|
255
|
+
// придёт stop() (перезагрузка настроек вызывает sync() -> stop()+start()),
|
|
256
|
+
// незарегистрированный адаптер не будет остановлен, а его цикл getUpdates
|
|
257
|
+
// останется жить вечно. Несколько таких «утекших» поллеров забирают одни и
|
|
258
|
+
// те же апдейты у Telegram — бот отвечает на команду по 2–N раз.
|
|
259
|
+
this.adapterList.push(adapter)
|
|
260
|
+
this.adapters.set(adapter.name, adapter)
|
|
261
|
+
if (adapter.name === 'telegram') this.tgAdapter = adapter
|
|
245
262
|
try {
|
|
246
263
|
await adapter.start()
|
|
247
|
-
this.
|
|
248
|
-
|
|
249
|
-
|
|
264
|
+
if (this.stopped) {
|
|
265
|
+
try { adapter.stop() } catch (e) { this.logger?.debug?.('adapter stop error:', e?.message || e) }
|
|
266
|
+
dropAdapter(adapter)
|
|
267
|
+
return
|
|
268
|
+
}
|
|
250
269
|
this.ctx.logger?.info?.(`dsh-messenger-gateway: ${adapter.name} started`)
|
|
251
270
|
} catch (err) {
|
|
271
|
+
dropAdapter(adapter)
|
|
252
272
|
this.ctx.logger?.warn?.(`dsh-messenger-gateway: ${adapter.name}: ${err.message}`)
|
|
253
273
|
}
|
|
254
274
|
}
|
|
275
|
+
if (this.stopped) return
|
|
255
276
|
if (this.adapters.has('telegram')) {
|
|
256
277
|
await this.syncTelegramCommands().catch((err) => {
|
|
257
278
|
this.ctx.logger?.warn?.(`Initial syncTelegramCommands: ${err?.message || err}`)
|
|
258
279
|
})
|
|
259
280
|
}
|
|
281
|
+
if (this.stopped) return
|
|
260
282
|
const rawIdle = Number(this.config.agent?.idleTimeoutMs)
|
|
261
283
|
const idleMs = Number.isFinite(rawIdle) && rawIdle > 0 ? rawIdle : 86_400_000
|
|
262
284
|
this.idleTimer = setInterval(() => this.reapIdle(), Math.min(idleMs, 60_000))
|
|
@@ -265,12 +287,14 @@ export class Gateway {
|
|
|
265
287
|
}
|
|
266
288
|
|
|
267
289
|
stop() {
|
|
290
|
+
this.stopped = true
|
|
268
291
|
if (this.scheduler) this.scheduler.stop()
|
|
269
292
|
if (this.disposeListener) this.disposeListener()
|
|
270
293
|
if (this.idleTimer) clearInterval(this.idleTimer)
|
|
271
294
|
for (const a of this.adapterList) { try { a.stop() } catch (e) { this.logger?.debug?.('adapter stop error:', e?.message || e) } }
|
|
272
295
|
this.adapterList = []
|
|
273
296
|
this.adapters.clear()
|
|
297
|
+
this.tgAdapter = undefined
|
|
274
298
|
for (const chat of this.chats.values()) chat.dispose().catch((e) => this.logger?.debug?.('dispose error:', e?.message || e))
|
|
275
299
|
this.chats.clear()
|
|
276
300
|
this.sessionToChat.clear()
|
package/lib/index.js
CHANGED
|
@@ -12,6 +12,8 @@ import {
|
|
|
12
12
|
import { listHomes } from './homes.js'
|
|
13
13
|
export { plainConfig } from './config.js'
|
|
14
14
|
import { Config, plainConfig, resolveInternalBaseUrl } from './config.js'
|
|
15
|
+
import { describeProxy } from './proxy.js'
|
|
16
|
+
import { readSecrets, restoreSecrets } from './secret-guard.js'
|
|
15
17
|
import { setupSettings } from './settings-bridge.js'
|
|
16
18
|
|
|
17
19
|
export const name = '@goodandready/dsh-messenger-gateway'
|
|
@@ -33,6 +35,7 @@ function resolveConfig(raw) {
|
|
|
33
35
|
|
|
34
36
|
function publicConfig(cfg, gw, ctx) {
|
|
35
37
|
const internalBaseURL = gw?.baseUrl?.() || resolveInternalBaseUrl(cfg, ctx)
|
|
38
|
+
const proxy = describeProxy(cfg.telegram?.proxyUrl)
|
|
36
39
|
return {
|
|
37
40
|
enabled: cfg.enabled,
|
|
38
41
|
internalBaseURL,
|
|
@@ -58,6 +61,12 @@ function publicConfig(cfg, gw, ctx) {
|
|
|
58
61
|
webhookPath: cfg.telegram.webhookPath,
|
|
59
62
|
webhookSecretConfigured: Boolean(String(cfg.telegram.webhookSecret || '').trim()),
|
|
60
63
|
botTokenConfigured: Boolean(String(cfg.telegram.botToken || '').trim()),
|
|
64
|
+
proxyUrl: cfg.telegram.proxyUrl || '',
|
|
65
|
+
apiRoot: cfg.telegram.apiRoot || '',
|
|
66
|
+
proxyActive: Boolean(proxy.active),
|
|
67
|
+
proxyLabel: proxy.label || '',
|
|
68
|
+
proxySource: proxy.source || '',
|
|
69
|
+
proxyError: proxy.error || '',
|
|
61
70
|
voiceMode: cfg.telegram.voiceMode,
|
|
62
71
|
quickActions: cfg.telegram.quickActions !== false,
|
|
63
72
|
artifactPreviews: cfg.telegram.artifactPreviews !== false,
|
|
@@ -150,6 +159,30 @@ export function apply(ctx, config) {
|
|
|
150
159
|
const turnStarts = new Map()
|
|
151
160
|
const getWebServer = () => ctx.get?.('webServer') || ctx.webServer
|
|
152
161
|
|
|
162
|
+
// Секреты (botToken и т. п.) не отдаются браузеру, а карточка сохраняет секции
|
|
163
|
+
// целиком — без этой защиты каждое сохранение (например, смена прокси) затирало
|
|
164
|
+
// бы токен пустым значением. См. lib/secret-guard.js.
|
|
165
|
+
let knownSecrets
|
|
166
|
+
const guardSecrets = async (cfg) => {
|
|
167
|
+
const current = readSecrets(cfg)
|
|
168
|
+
if (knownSecrets === undefined) {
|
|
169
|
+
knownSecrets = current
|
|
170
|
+
return
|
|
171
|
+
}
|
|
172
|
+
const { config: fixed, restored } = restoreSecrets(knownSecrets, cfg)
|
|
173
|
+
if (!restored.length) {
|
|
174
|
+
knownSecrets = current
|
|
175
|
+
return
|
|
176
|
+
}
|
|
177
|
+
knownSecrets = readSecrets(fixed)
|
|
178
|
+
ctx.logger?.warn?.(`dsh-messenger-gateway: settings write cleared secret fields (${restored.join(', ')}); restoring the previous values`)
|
|
179
|
+
try {
|
|
180
|
+
await settingsApi.replace(Config(fixed))
|
|
181
|
+
} catch (err) {
|
|
182
|
+
ctx.logger?.warn?.(`dsh-messenger-gateway: could not restore secret fields: ${err?.message || err}`)
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
|
|
153
186
|
let webhookRouteDispose = null
|
|
154
187
|
let currentWebhookPath = ''
|
|
155
188
|
|
|
@@ -199,10 +232,19 @@ export function apply(ctx, config) {
|
|
|
199
232
|
})
|
|
200
233
|
}
|
|
201
234
|
|
|
235
|
+
let lastSyncSignature
|
|
202
236
|
const sync = () => {
|
|
203
237
|
syncWebhookRoute()
|
|
204
|
-
if (gateway) { gateway.stop(); gateway = undefined }
|
|
205
238
|
const effective = source()
|
|
239
|
+
// DSH sends several events for one settings write, and restarting the gateway
|
|
240
|
+
// drops live sessions and resets the Telegram polling offset. Restart only
|
|
241
|
+
// when the resolved config actually changed.
|
|
242
|
+
let signature
|
|
243
|
+
try { signature = JSON.stringify(effective) } catch { signature = undefined }
|
|
244
|
+
if (gateway && signature !== undefined && signature === lastSyncSignature) return
|
|
245
|
+
lastSyncSignature = signature
|
|
246
|
+
guardSecrets(effective).catch((err) => ctx.logger?.warn?.(`dsh-messenger-gateway: secret guard failed: ${err?.message || err}`))
|
|
247
|
+
if (gateway) { gateway.stop(); gateway = undefined }
|
|
206
248
|
if (effective.enabled === false) return
|
|
207
249
|
gateway = new Gateway(ctx, effective, {
|
|
208
250
|
persistAllowedUserIds: async (ids) => {
|