@catalogicus-international/n8n-nodes-telegram-advance 0.2.0 → 0.2.2

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.
@@ -63,8 +63,11 @@ class TelegramAdvanceWebhookTrigger {
63
63
  [WEBHOOK_NAME]: {
64
64
  async checkExists() {
65
65
  const url = this.getNodeWebhookUrl(WEBHOOK_NAME);
66
- if (!url)
66
+ if (!url) {
67
+ this.logger.warn('[TelegramAdvanceWebhookTrigger] checkExists: n8n returned an empty webhook URL. ' +
68
+ 'Check WEBHOOK_URL / N8N_HOST / N8N_PROTOCOL on the n8n server.');
67
69
  return false;
70
+ }
68
71
  const secret = await (0, transport_1.readWebhookSecret)(this);
69
72
  if (secret)
70
73
  return false;
@@ -82,25 +85,47 @@ class TelegramAdvanceWebhookTrigger {
82
85
  },
83
86
  async create() {
84
87
  const url = this.getNodeWebhookUrl(WEBHOOK_NAME);
85
- if (!url)
86
- return false;
88
+ if (!url) {
89
+ throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Cannot register the Telegram webhook: n8n produced an empty webhook URL.', {
90
+ description: 'This is a server configuration problem, not a node problem. Telegram needs a ' +
91
+ 'public HTTPS URL. Set WEBHOOK_URL (or N8N_HOST + N8N_PROTOCOL=https) on the n8n ' +
92
+ 'instance so it can build the webhook URL, then re-activate the workflow.',
93
+ });
94
+ }
87
95
  const allowedUpdates = (0, triggerShared_1.webhookAllowedUpdates)(this.getNodeParameter('updates', ['message']));
88
96
  const secret = await (0, transport_1.readWebhookSecret)(this);
89
97
  const transport = await (0, transport_1.createTransport)(this);
90
- await transport.call('setWebhook', {
91
- url,
92
- allowed_updates: allowedUpdates,
93
- ...(secret ? { secret_token: secret } : {}),
94
- });
98
+ try {
99
+ await transport.call('setWebhook', {
100
+ url,
101
+ allowed_updates: allowedUpdates,
102
+ ...(secret ? { secret_token: secret } : {}),
103
+ });
104
+ }
105
+ catch (error) {
106
+ const reason = error instanceof Error ? error.message : String(error);
107
+ throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Telegram rejected setWebhook for URL ${url}: ${reason}`, {
108
+ description: 'Telegram requires a publicly reachable HTTPS URL on port 443/80/88/8443 with a ' +
109
+ 'valid certificate. Verify the URL above opens from the public internet and that ' +
110
+ 'WEBHOOK_URL on the n8n server matches it.',
111
+ });
112
+ }
95
113
  return true;
96
114
  },
97
115
  async delete() {
98
116
  const url = this.getNodeWebhookUrl(WEBHOOK_NAME);
99
117
  const transport = await (0, transport_1.createTransport)(this);
100
- const info = await transport.call('getWebhookInfo');
101
- if (info.url !== url)
102
- return true;
103
- await transport.call('deleteWebhook', { drop_pending_updates: false });
118
+ try {
119
+ const info = await transport.call('getWebhookInfo');
120
+ if (info.url !== url)
121
+ return true;
122
+ await transport.call('deleteWebhook', { drop_pending_updates: false });
123
+ }
124
+ catch (error) {
125
+ const reason = error instanceof Error ? error.message : String(error);
126
+ this.logger.warn(`[TelegramAdvanceWebhookTrigger] delete: could not clear the Telegram webhook (${reason}). ` +
127
+ 'It may still be registered; re-check with getWebhookInfo if updates keep arriving.');
128
+ }
104
129
  return true;
105
130
  },
106
131
  },
@@ -1 +1 @@
1
- {"version":3,"file":"TelegramAdvanceWebhookTrigger.node.js","sourceRoot":"","sources":["../../../nodes/TelegramAdvanceWebhookTrigger/TelegramAdvanceWebhookTrigger.node.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TelegramAdvanceWebhookTrigger.node.js","sourceRoot":"","sources":["../../../nodes/TelegramAdvanceWebhookTrigger/TelegramAdvanceWebhookTrigger.node.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,40 @@ exports.readWebhookSecret = readWebhookSecret;
7
7
  exports.redisConfigId = redisConfigId;
8
8
  const crypto_1 = require("crypto");
9
9
  const shared_1 = require("./shared");
10
+ const WEBHOOK_SECRET_PATTERN = /^[A-Za-z0-9_-]{1,256}$/;
11
+ function isRecord(value) {
12
+ return typeof value === 'object' && value !== null;
13
+ }
14
+ function parseMaybeJson(value) {
15
+ if (typeof value !== 'string')
16
+ return value;
17
+ try {
18
+ return JSON.parse(value);
19
+ }
20
+ catch {
21
+ return value;
22
+ }
23
+ }
24
+ function telegramDescriptionFrom(value) {
25
+ if (!isRecord(value))
26
+ return undefined;
27
+ if (typeof value.description === 'string')
28
+ return value.description;
29
+ for (const key of ['data', 'body', 'error', 'response']) {
30
+ const nested = telegramDescriptionFrom(parseMaybeJson(value[key]));
31
+ if (nested)
32
+ return nested;
33
+ }
34
+ return undefined;
35
+ }
36
+ function formatTelegramRequestError(method, error) {
37
+ const description = telegramDescriptionFrom(error);
38
+ if (description)
39
+ return new Error(description);
40
+ if (error instanceof Error)
41
+ return error;
42
+ return new Error(`Telegram API method ${method} failed: ${String(error)}`);
43
+ }
10
44
  function computeBotHash(baseUrl, accessToken) {
11
45
  return (0, crypto_1.createHash)('sha256').update(`${baseUrl}\0${accessToken}`).digest('hex');
12
46
  }
@@ -18,13 +52,19 @@ class HttpTelegramTransport {
18
52
  this.botHash = computeBotHash(baseUrl, accessToken);
19
53
  }
20
54
  async call(method, body = {}, options = {}) {
21
- const response = (await this.httpRequest({
22
- method: 'POST',
23
- url: `${this.baseUrl}/bot${this.accessToken}/${method}`,
24
- body,
25
- json: true,
26
- ...(options.timeoutMs ? { timeout: options.timeoutMs } : {}),
27
- }));
55
+ let response;
56
+ try {
57
+ response = (await this.httpRequest({
58
+ method: 'POST',
59
+ url: `${this.baseUrl}/bot${this.accessToken}/${method}`,
60
+ body,
61
+ json: true,
62
+ ...(options.timeoutMs ? { timeout: options.timeoutMs } : {}),
63
+ }));
64
+ }
65
+ catch (error) {
66
+ throw formatTelegramRequestError(method, error);
67
+ }
28
68
  if (!response.ok) {
29
69
  throw new Error(response.description || `Telegram API method ${method} failed`);
30
70
  }
@@ -57,7 +97,11 @@ async function readRedisConfig(context) {
57
97
  async function readWebhookSecret(context) {
58
98
  var _a;
59
99
  const credentials = await context.getCredentials('telegramAdvanceApi');
60
- return String((_a = credentials.webhookSecret) !== null && _a !== void 0 ? _a : '').trim();
100
+ const secret = String((_a = credentials.webhookSecret) !== null && _a !== void 0 ? _a : '').trim();
101
+ if (secret && !WEBHOOK_SECRET_PATTERN.test(secret)) {
102
+ throw new Error('Webhook Secret Token is invalid. Telegram accepts only 1-256 characters: A-Z, a-z, 0-9, _ and -.');
103
+ }
104
+ return secret;
61
105
  }
62
106
  function redisConfigId(config) {
63
107
  return (0, crypto_1.createHash)('sha256').update(`${config.url}\0${config.namespace}`).digest('hex');
@@ -1 +1 @@
1
- {"version":3,"file":"transport.js","sourceRoot":"","sources":["../../nodes/transport.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"transport.js","sourceRoot":"","sources":["../../nodes/transport.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@catalogicus-international/n8n-nodes-telegram-advance",
3
- "version": "0.2.0",
3
+ "version": "0.2.2",
4
4
  "description": "Native Telegram approval, choice, and reply workflows for n8n without external response pages",
5
5
  "license": "MIT",
6
6
  "packageManager": "pnpm@9.15.0",