telegram-botbuilder 1.5.1 → 1.6.0

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.
Files changed (8) hide show
  1. package/lib/bot-service.d.ts.map +1 -1
  2. package/lib/bot-service.js +44 -12
  3. package/lib/bot-service.js.map +1 -1
  4. package/lib/bot-struct.d.ts +3 -0
  5. package/lib/bot-struct.d.ts.map +1 -1
  6. package/package.json +2 -2
  7. package/src/bot-service.ts +48 -12
  8. package/src/bot-struct.ts +3 -1
package/lib/bot-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bot-service.d.ts","sourceRoot":"","sources":["../src/bot-service.ts"],"names":[],"mappings":"AAAA,OAAO,WAAsD,MAAO,uBAAuB,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,EAAuD,oBAAoB,EAAe,kBAAkB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClK,OAAO,YAAY,MAAM,QAAQ,CAAC;AAOlC,qBAAa,UAAU;IACd,IAAI,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,OAAO,CAAY;IACpB,YAAY,EAAE,YAAY,CAAC;IAClC,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,QAAQ,CAAmB;IAE5B,GAAG,CAAC,IAAI,EAAE,oBAAoB;IAGrC,OAAO,CAAC,KAAK;YAKC,MAAM;IAgBpB,OAAO,CAAC,QAAQ;gBAIH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,kBAAkB;IAmFpF,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY;YAGN,eAAe;IAchB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAqDpD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAI/C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG7C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE/C;AACD,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAE9F;AACD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,GAAG,MAAM,CAoB3E"}
1
+ {"version":3,"file":"bot-service.d.ts","sourceRoot":"","sources":["../src/bot-service.ts"],"names":[],"mappings":"AAAA,OAAO,WAAsD,MAAO,uBAAuB,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,EAAuD,oBAAoB,EAAe,kBAAkB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClK,OAAO,YAAY,MAAM,QAAQ,CAAC;AAOlC,qBAAa,UAAU;IACd,IAAI,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,OAAO,CAAY;IACpB,YAAY,EAAE,YAAY,CAAC;IAClC,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,QAAQ,CAAmB;IAG5B,GAAG,CAAC,IAAI,EAAE,oBAAoB;IAKrC,OAAO,CAAC,KAAK;YAOC,MAAM;IAkBpB,OAAO,CAAC,QAAQ;gBAIH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,kBAAkB;IAyFpF,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,YAAY;YAIN,eAAe;IAchB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAqEpD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAI/C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG7C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE/C;AACD,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAI9F;AACD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,GAAG,MAAM,CAoB3E"}
package/lib/bot-service.js CHANGED
@@ -43,14 +43,17 @@ class BotBuilder {
43
43
  _userdialogs;
44
44
  _middleware = [];
45
45
  _mwbreak = {};
46
+ // Adds a middleware function to the bot
46
47
  use(func) {
47
48
  this._middleware.push(func);
48
49
  }
50
+ // Waits for the middleware break-down event to be emitted
49
51
  _mwba(desc) {
50
52
  return new Promise(r => {
51
53
  this.ActionSystem.once(`mwb_${desc}`, r);
52
54
  });
53
55
  }
56
+ // Runs all middleware functions and waits for the result
54
57
  async _runmw(chat, msg) {
55
58
  let desc = `${chat}_${msg.message_id || msg.id}`;
56
59
  let mwb = this._mwbreak[desc];
@@ -67,8 +70,9 @@ class BotBuilder {
67
70
  this.ActionSystem.emit(`mwb_${desc}`, res);
68
71
  return res;
69
72
  }
73
+ // Generates a hash for a button based on the dialog and button properties
70
74
  _hashbtn(dia, btn) {
71
- return hash([dia.id, { a: btn.action, b: btn.text, c: btn.url }]);
75
+ return hash([dia.id, { a: btn.action, b: btn.text, c: btn.url, d: btn.mini_app }]);
72
76
  }
73
77
  constructor(schema, token, options) {
74
78
  this._bot = new node_telegram_bot_api_1.default(token, options);
@@ -120,10 +124,14 @@ class BotBuilder {
120
124
  }
121
125
  });
122
126
  this._bot.on('callback_query', async (query) => {
127
+ if (!this._userdialogs[query.message.chat.id]) {
128
+ this._userdialogs[query.message.chat.id] = { dialog: this._schema.start, lastid: query.message?.message_id || this._userdialogs[query.message.chat.id].lastid || -1, waiter: { statewait: false, descriptor: '' } };
129
+ }
130
+ else {
131
+ this._userdialogs[query.message.chat.id].lastid = query.message?.message_id || this._userdialogs[query.message.chat.id].lastid || -1;
132
+ }
123
133
  if (await this._runmw(query.message.chat.id, query))
124
134
  return;
125
- if (!this._userdialogs[query.message.chat.id])
126
- this._userdialogs[query.message.chat.id] = { dialog: this._schema.start, lastid: query.message?.message_id || -1, waiter: { statewait: false, descriptor: '' } };
127
135
  this._activateButton(query.message.chat.id, query.data);
128
136
  });
129
137
  this._bot.on('document', async (msg) => {
@@ -145,6 +153,8 @@ class BotBuilder {
145
153
  });
146
154
  });
147
155
  this._bot.onText(/\/start/, async (msg) => {
156
+ if (this._schema.enable_start === false)
157
+ return;
148
158
  if (await this._runmw(msg.chat.id, msg))
149
159
  return;
150
160
  if (this._userdialogs[msg.chat.id] != undefined)
@@ -154,12 +164,15 @@ class BotBuilder {
154
164
  this.ChangeDialog(msg.chat.id, this._schema.start);
155
165
  });
156
166
  }
167
+ // Returns the dialog with the specified ID
157
168
  _getDialog(id) {
158
169
  return this._schema.content.find(x => x.id === id);
159
170
  }
171
+ // Returns the button with the specified callback hash
160
172
  _getButton(callback) {
161
173
  return this._schema.buttons?.find(x => x._callback === callback);
162
174
  }
175
+ // Returns the index of the button with the specified callback hash
163
176
  _getButtonID(callback) {
164
177
  return this._schema.buttons?.findIndex(x => x._callback === callback);
165
178
  }
@@ -179,6 +192,8 @@ class BotBuilder {
179
192
  }
180
193
  }
181
194
  async ChangeDialog(chat, id) {
195
+ if (this._userdialogs[chat] == undefined)
196
+ this._userdialogs[chat] = { dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' } };
182
197
  if (typeof id != 'string') {
183
198
  this._userdialogs[chat].dialog = id.id;
184
199
  }
@@ -206,36 +221,51 @@ class BotBuilder {
206
221
  btn.text = typeof btn.text === 'function' ? await btn.text(chat) : btn.text;
207
222
  if (btn.url != undefined)
208
223
  btn.url = typeof btn.url == 'function' ? await btn.url(chat) : btn.url;
224
+ if (btn.mini_app != undefined)
225
+ btn.mini_app = typeof btn.mini_app == 'function' ? await btn.mini_app(chat) : btn.mini_app;
209
226
  btn._callback = this._hashbtn(dialog, btn);
210
227
  let psid = this._getButtonID(btn._callback);
211
228
  if (psid == -1)
212
229
  this._schema.buttons?.push(btn);
213
- markup[b].push({ text: (btn.text || ''), callback_data: btn._callback, url: btn.url });
230
+ markup[b].push({ text: (btn.text || ''), callback_data: (btn.mini_app ? undefined : btn._callback), url: btn.url, web_app: (btn.mini_app != undefined ? { url: btn.mini_app } : undefined) });
214
231
  }
215
232
  }
216
233
  }
217
234
  if (dialog == undefined)
218
- markup = [[{ text: "Меню", callback_data: this._schema.start }]]; // FIX RAND BTN
235
+ markup = [[{ text: "Reload", callback_data: this._schema.start }]]; // FIX RAND BTN
219
236
  let text = typeof dialog?.text === 'function' ? await dialog?.text(chat) : dialog?.text;
220
237
  try {
221
238
  let imgs = (dialog != undefined && dialog.images != undefined) ? (typeof dialog.images == 'function' ? await dialog.images(chat) : dialog.images) : undefined;
222
239
  if (dialog != undefined && imgs != undefined) {
223
240
  if (Array.isArray(imgs) && imgs.length > 1) {
224
- await this._bot.sendMediaGroup(chat, imgs.map(x => { return { media: x }; })); // * WARN currently not support image group with text
241
+ let res_msg = await this._bot.sendMediaGroup(chat, imgs.map(x => { return { media: x }; })); // * WARN currently not support image group with text
242
+ this._userdialogs[chat].lastid = res_msg.pop()?.message_id || this._userdialogs[chat].lastid;
243
+ this._userdialogs[chat].last_type = 'image';
225
244
  }
226
245
  else {
227
246
  let img = Array.isArray(imgs) ? imgs[0] : imgs;
228
- await this._bot.sendPhoto(chat, img, { caption: text || "", parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined });
247
+ let res_msg = await this._bot.sendPhoto(chat, img, { caption: text || "", parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined });
248
+ this._userdialogs[chat].lastid = res_msg.message_id || this._userdialogs[chat].lastid;
249
+ this._userdialogs[chat].last_type = 'image';
250
+ }
251
+ }
252
+ else {
253
+ if (this._userdialogs[chat].last_type == 'default')
254
+ await this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined });
255
+ else {
256
+ await this._bot.deleteMessage(chat, this._userdialogs[chat].lastid);
257
+ let res_msg = await this._bot.sendMessage(chat, text || "404", { parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined });
258
+ this._userdialogs[chat].lastid = res_msg.message_id || this._userdialogs[chat].lastid;
259
+ this._userdialogs[chat].last_type = 'default';
229
260
  }
230
261
  }
231
- else
232
- await this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined });
233
262
  }
234
263
  catch (e) {
235
264
  if (e.message == bypass_str)
236
265
  return;
237
- let msg = await this._bot.sendMessage(chat, text || "404", { parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined });
238
- this._userdialogs[chat].lastid = msg.message_id;
266
+ let res_msg = await this._bot.sendMessage(chat, text || "404", { parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined });
267
+ this._userdialogs[chat].lastid = res_msg.message_id || this._userdialogs[chat].lastid;
268
+ this._userdialogs[chat].last_type = 'default';
239
269
  }
240
270
  }
241
271
  AttachDataWait(chat, descriptor) {
@@ -251,7 +281,9 @@ function ChangeDialog(id) {
251
281
  return (chat, _bot) => { return _bot.ChangeDialog(chat, id); };
252
282
  }
253
283
  function CallbackAction(descriptor, ...args) {
254
- return async (chat, _bot, ..._args) => { return typeof descriptor == 'function' ? await descriptor(chat, ...args, ..._args) : _bot.ActionSystem.emit(descriptor, chat, ...args, ..._args); };
284
+ return async (chat, _bot, ..._args) => {
285
+ return typeof descriptor == 'function' ? await descriptor(chat, ...args, ..._args) : _bot.ActionSystem.emit(descriptor, chat, ...args, ..._args);
286
+ };
255
287
  }
256
288
  function WaitForData(descriptor) {
257
289
  return async (chat, _bot) => {
package/lib/bot-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bot-service.js","sourceRoot":"","sources":["../src/bot-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bot-service.js","sourceRoot":"","sources":["../src/bot-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuPA,oCAEC;AACD,wCAIC;AACD,kCAoBC;AAnRD,kFAA4F;AAE5F,oDAAkC;AAClC,2BAA0C;AAC1C,+CAAiC;AACjC,IAAI,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAElC,MAAM,UAAU,GAAG,+KAA+K,CAAC;AAEnM,MAAa,UAAU;IACd,IAAI,CAAc;IACjB,OAAO,CAAY;IACpB,YAAY,CAAe;IAC1B,YAAY,CAAa;IACzB,WAAW,GAA2B,EAAE,CAAC;IACzC,QAAQ,GAAgB,EAAE,CAAC;IAEnC,wCAAwC;IACjC,GAAG,CAAC,IAA0B;QACnC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,0DAA0D;IAClD,KAAK,CAAC,IAAY;QACxB,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,yDAAyD;IACjD,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,GAAoD;QACrF,IAAI,IAAI,GAAG,GAAG,IAAI,IAAK,GAA2B,CAAC,UAAU,IAAK,GAAiC,CAAC,EAAE,EAAE,CAAC;QACzG,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,OAAO,GAAG,KAAK,SAAS;YAAE,OAAO,GAAG,CAAC;QACzC,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAE3B,IAAI,GAAG,GAAG,KAAK,CAAC;QAChB,KAAK,IAAI,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,GAAG,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACnC,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAC3C,OAAO,GAAG,CAAC;IACb,CAAC;IAED,0EAA0E;IAClE,QAAQ,CAAC,GAAc,EAAE,GAAW;QAC1C,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,EAAC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,YAAa,MAAc,EAAE,KAAa,EAAE,OAAwC;QAClF,IAAI,CAAC,IAAI,GAAG,IAAI,+BAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,MAAmB,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;QAE1B,IAAI,CAAC,YAAY,GAAG,IAAI,gBAAY,EAAE,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QAEvB,4DAA4D;QAC5D,IAAI,CAAC;YACH,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;gBACjE,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAA;gBAC/C,IAAI,OAAO,KAAK,IAAI,UAAU;oBAAE,SAAS;gBAEzC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;oBAC1C,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;oBACzB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;wBAClD,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;wBAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;wBAClE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAClC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAGV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAC,CAAA;YACxK,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;gBAAE,OAAO;YAEhD,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAE,CAAC,MAAO,CAAC,SAAS,EAAE,CAAC;gBAC/C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;gBACjD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBACrE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YACpF,CAAC;YAED,gBAAgB;YAChB,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACvC,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACtC,IAAI,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC5G,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;wBACnB,IAAI,OAAO,GAAG,CAAC,MAAM,IAAI,UAAU;4BAAE,MAAM,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAG,MAAM,CAAC,CAAC,CAAwB,CAAC,CAAC;6BACvG,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;4BAAE,KAAK,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM;gCAAE,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAG,MAAM,CAAC,CAAC,CAAwB,CAAC,CAAC;oBACtI,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/C,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAC,CAAA;YACrN,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;YACzI,CAAC;YACD,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC;gBAAE,OAAO;YAE7D,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,IAAK,CAAC,CAAA;QAC3D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAC,CAAA;YACxK,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;gBAAE,OAAO;YAEhD,IAAI,CAAC,GAAG,CAAC,QAAQ;gBAAE,OAAO;YAC1B,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS;gBAAE,OAAO;YACtD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC5D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;gBACjD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBACrE,IAAI,OAAO,GAAG,IAAA,iBAAY,EAAC,CAAC,EAAE,MAAM,CAAC,CAAC;gBACtC,IAAA,WAAM,EAAC,CAAC,CAAC,CAAC;gBACV,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACnF,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACxC,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,KAAK,KAAK;gBAAE,OAAO;YAChD,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;gBAAE,OAAO;YAEhD,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,SAAS;gBAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACpJ,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAC,CAAA;YACvH,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,2CAA2C;IACnC,UAAU,CAAC,EAAU;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,sDAAsD;IAC9C,UAAU,CAAC,QAAgB;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC;IACnE,CAAC;IAED,mEAAmE;IAC3D,YAAY,CAAC,QAAgB;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC;IACxE,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,IAAY,EAAE,GAAuB;QACjE,IAAI,IAAI,CAAC;QACT,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;;YACpD,IAAI,GAAG,GAAG,CAAC;QAEhB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;YAChC,KAAK,IAAI,GAAG,IAAK,IAAI,EAAE,MAAmB,EAAE,CAAC;gBAC3C,MAAM,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,EAAE,MAAgB,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,EAAE,MAAiB,CAAA,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAY,EAAE,EAAmB;QACzD,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,SAAS;YAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAC,CAAA;QAE1J,IAAI,OAAO,EAAE,IAAI,QAAQ,EAAE,CAAC;YAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;QACtC,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC7C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;YACjD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,CAAA;QACrF,CAAC;QAED,IAAI,MAA6B,CAAC;QAClC,IAAI,OAAO,EAAE,IAAI,QAAQ,EAAE,CAAC;YAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAAC,CAAC;aACvD,CAAC;YAAC,MAAM,GAAG,EAAe,CAAC;QAAC,CAAC;QAElC,IAAI,IAAI,GAAkB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,MAAM,EAAE,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QAE5I,IAAI,MAAM,GAAyC,SAAS,CAAC;QAC7D,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,GAAG,EAAE,CAAC;YACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;gBACf,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxB,GAAG,CAAC,IAAI,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;oBAC5E,IAAI,GAAG,CAAC,GAAG,IAAI,SAAS;wBAAE,GAAG,CAAC,GAAG,GAAG,OAAO,GAAG,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;oBACjG,IAAI,GAAG,CAAC,QAAQ,IAAI,SAAS;wBAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,GAAG,CAAC,QAAQ,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAC1H,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAO,EAAE,GAAG,CAAC,CAAC;oBAC5C,IAAI,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC5C,IAAI,IAAI,IAAI,CAAC,CAAC;wBAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;oBAChD,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAChM,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,MAAM,IAAI,SAAS;YAAE,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe;QAC5G,IAAI,IAAI,GAAG,OAAO,MAAM,EAAE,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC;QAExF,IAAI,CAAC;YACH,IAAI,IAAI,GAAG,CAAC,MAAM,IAAI,SAAS,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9J,IAAI,MAAM,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;gBAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3C,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,CAAC,EAAqB,CAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qDAAqD;oBACpK,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;oBAC7F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,OAAO,CAAC;gBAC9C,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,IAAI,CAAC;oBAC9C,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;oBAC/J,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;oBACtF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,OAAO,CAAC;gBAC9C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,SAAS;oBAAE,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;qBACjP,CAAC;oBACJ,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;oBACpE,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,IAAI,KAAK,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;oBACrJ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;oBACtF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC;gBAChD,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAK,CAAW,CAAC,OAAO,IAAI,UAAU;gBAAE,OAAO;YAC/C,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,IAAI,KAAK,EAAE,EAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;YACrJ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;YACtF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC;QAChD,CAAC;IACH,CAAC;IACM,cAAc,CAAC,IAAY,EAAE,UAAkB;QACpD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;QACvD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;IAClD,CAAC;IACM,OAAO,CAAC,IAAY,EAAE,OAAe;QAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,EAAC,UAAU,EAAE,MAAM,EAAC,CAAC,CAAC;IACpE,CAAC;CACF;AA5OD,gCA4OC;AAED,SAAgB,YAAY,CAAC,EAAU;IACrC,OAAO,CAAC,IAAY,EAAE,IAAgB,EAAE,EAAE,GAAG,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACrF,CAAC;AACD,SAAgB,cAAc,CAAC,UAAuC,EAAE,GAAG,IAAW;IACpF,OAAO,KAAK,EAAE,IAAY,EAAE,IAAgB,EAAE,GAAG,KAAY,EAAE,EAAE;QAC/D,OAAO,OAAO,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;IACnJ,CAAC,CAAC;AACJ,CAAC;AACD,SAAgB,WAAW,CAAC,UAAuC;IACjE,OAAO,KAAK,EAAE,IAAY,EAAE,IAAgB,EAAE,EAAE;QAC9C,IAAI,OAAO,UAAU,IAAI,QAAQ,EAAE,CAAC;YAClC,IAAI,MAAM,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAClC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;gBACrB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,GAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAA,CAAA,CAAC,CAAC,CAAC;gBACvH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,MAAM,EAAE,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,GAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,UAAU,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAA,CAAA,CAAC,CAAC,CAAC;YACjJ,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;YAC/B,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAChC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;gBACrB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBACzC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,EAAE,UAAU,CAAC,CAAC;gBACrD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
package/lib/bot-struct.d.ts CHANGED
@@ -17,6 +17,7 @@ export interface Button {
17
17
  text?: TextFunc;
18
18
  action?: Action[] | Action;
19
19
  url?: TextFunc;
20
+ mini_app?: TextFunc;
20
21
  }
21
22
  export interface BotButton extends Button {
22
23
  _callback: string;
@@ -25,6 +26,7 @@ export interface Schema {
25
26
  start: string;
26
27
  content: Dialog[];
27
28
  commands?: Command[];
29
+ enable_start?: boolean;
28
30
  }
29
31
  export interface BotSchema extends Schema {
30
32
  content: BotDialog[];
@@ -42,6 +44,7 @@ export interface UserDialog {
42
44
  statewait: boolean;
43
45
  descriptor: string;
44
46
  };
47
+ last_type?: 'default' | 'image';
45
48
  };
46
49
  }
47
50
  export interface MWBreakDown {
package/lib/bot-struct.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bot-struct.d.ts","sourceRoot":"","sources":["../src/bot-struct.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bot-struct.d.ts","sourceRoot":"","sources":["../src/bot-struct.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "telegram-botbuilder",
3
- "version": "1.5.1",
3
+ "version": "1.6.0",
4
4
  "main": "lib/index.js",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
7
7
  },
8
8
  "keywords": [],
9
- "author": "",
9
+ "author": "zxcpadik",
10
10
  "license": "ISC",
11
11
  "description": "",
12
12
  "dependencies": {
package/src/bot-service.ts CHANGED
@@ -15,14 +15,19 @@ export class BotBuilder {
15
15
  private _middleware: BotBuilderMiddleware[] = [];
16
16
  private _mwbreak: MWBreakDown = {};
17
17
 
18
+ // Adds a middleware function to the bot
18
19
  public use(func: BotBuilderMiddleware) {
19
20
  this._middleware.push(func);
20
21
  }
22
+
23
+ // Waits for the middleware break-down event to be emitted
21
24
  private _mwba(desc: string): Promise<boolean> {
22
25
  return new Promise(r => {
23
26
  this.ActionSystem.once(`mwb_${desc}`, r)
24
27
  });
25
28
  }
29
+
30
+ // Runs all middleware functions and waits for the result
26
31
  private async _runmw(chat: number, msg: TelegramBot.Message | TelegramBot.CallbackQuery) {
27
32
  let desc = `${chat}_${(msg as TelegramBot.Message).message_id || (msg as TelegramBot.CallbackQuery).id}`;
28
33
  let mwb = this._mwbreak[desc];
@@ -34,13 +39,15 @@ export class BotBuilder {
34
39
  for (let mw of this._middleware) {
35
40
  res = res || await mw(chat, msg);
36
41
  }
42
+
37
43
  this._mwbreak[desc] = res;
38
44
  this.ActionSystem.emit(`mwb_${desc}`, res);
39
45
  return res;
40
46
  }
41
47
 
48
+ // Generates a hash for a button based on the dialog and button properties
42
49
  private _hashbtn(dia: BotDialog, btn: Button) {
43
- return hash([dia.id, {a: btn.action, b: btn.text, c: btn.url}]);
50
+ return hash([dia.id, {a: btn.action, b: btn.text, c: btn.url, d: btn.mini_app }]);
44
51
  }
45
52
 
46
53
  constructor (schema: Schema, token: string, options?: TelegramBot.ConstructorOptions) {
@@ -56,14 +63,14 @@ export class BotBuilder {
56
63
  for (let fp_di = 0; fp_di < this._schema.content.length; fp_di++) {
57
64
  let fp_db = this._schema.content[fp_di].buttons
58
65
  if (typeof fp_db == 'function') continue;
59
-
66
+
60
67
  for (let fp_by = 0; fp_db.length; fp_by++) {
61
68
  let fp_ln = fp_db[fp_by];
62
69
  for (let fp_bx = 0; fp_bx < fp_ln.length; fp_bx++) {
63
70
  let fp_b = fp_db[fp_by][fp_bx];
64
71
  fp_b._callback = this._hashbtn(this._schema.content[fp_di], fp_b);
65
72
  this._schema.buttons.push(fp_b);
66
- }
73
+ }
67
74
  }
68
75
  }
69
76
  } catch {}
@@ -94,9 +101,13 @@ export class BotBuilder {
94
101
  });
95
102
 
96
103
  this._bot.on('callback_query', async (query) => {
104
+ if (!this._userdialogs[query.message!.chat.id]) {
105
+ this._userdialogs[query.message!.chat.id] = {dialog: this._schema.start, lastid: query.message?.message_id || this._userdialogs[query.message!.chat.id].lastid || -1, waiter: { statewait: false, descriptor: '' }}
106
+ } else {
107
+ this._userdialogs[query.message!.chat.id].lastid = query.message?.message_id || this._userdialogs[query.message!.chat.id].lastid || -1;
108
+ }
97
109
  if (await this._runmw(query.message!.chat.id, query)) return;
98
110
 
99
- if (!this._userdialogs[query.message!.chat.id]) this._userdialogs[query.message!.chat.id] = {dialog: this._schema.start, lastid: query.message?.message_id || -1, waiter: { statewait: false, descriptor: '' }}
100
111
  this._activateButton(query.message!.chat.id, query.data!)
101
112
  });
102
113
 
@@ -117,6 +128,7 @@ export class BotBuilder {
117
128
  });
118
129
 
119
130
  this._bot.onText(/\/start/, async (msg) => {
131
+ if (this._schema.enable_start === false) return;
120
132
  if (await this._runmw(msg.chat.id, msg)) return;
121
133
 
122
134
  if (this._userdialogs[msg.chat.id] != undefined) this._bot.deleteMessage(msg.chat.id, this._userdialogs[msg.chat.id].lastid).catch(() => undefined);
@@ -126,15 +138,21 @@ export class BotBuilder {
126
138
  });
127
139
  }
128
140
 
141
+ // Returns the dialog with the specified ID
129
142
  private _getDialog(id: string) {
130
143
  return this._schema.content.find(x => x.id === id);
131
144
  }
145
+
146
+ // Returns the button with the specified callback hash
132
147
  private _getButton(callback: string) {
133
148
  return this._schema.buttons?.find(x => x._callback === callback);
134
149
  }
150
+
151
+ // Returns the index of the button with the specified callback hash
135
152
  private _getButtonID(callback: string) {
136
153
  return this._schema.buttons?.findIndex(x => x._callback === callback);
137
154
  }
155
+
138
156
  private async _activateButton(chat: number, btn: string | BotButton) {
139
157
  let _btn;
140
158
  if (typeof btn === 'string') _btn = this._getButton(btn);
@@ -150,6 +168,8 @@ export class BotBuilder {
150
168
  }
151
169
 
152
170
  public async ChangeDialog(chat: number, id: string | Dialog) {
171
+ if (this._userdialogs[chat] == undefined) this._userdialogs[chat] = {dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' }}
172
+
153
173
  if (typeof id != 'string') {
154
174
  this._userdialogs[chat].dialog = id.id;
155
175
  } else {
@@ -175,31 +195,45 @@ export class BotBuilder {
175
195
  for (let btn of btns[b]) {
176
196
  btn.text = typeof btn.text === 'function' ? await btn.text(chat) : btn.text;
177
197
  if (btn.url != undefined) btn.url = typeof btn.url == 'function' ? await btn.url(chat) : btn.url;
198
+ if (btn.mini_app != undefined) btn.mini_app = typeof btn.mini_app == 'function' ? await btn.mini_app(chat) : btn.mini_app;
178
199
  btn._callback = this._hashbtn(dialog!, btn);
179
200
  let psid = this._getButtonID(btn._callback);
180
201
  if (psid == -1) this._schema.buttons?.push(btn);
181
- markup[b].push({ text: (btn.text || ''), callback_data: btn._callback, url: btn.url });
202
+ markup[b].push({ text: (btn.text || ''), callback_data: (btn.mini_app ? undefined : btn._callback), url: btn.url, web_app: (btn.mini_app != undefined ? { url: btn.mini_app } : undefined) });
182
203
  }
183
204
  }
184
205
  }
185
206
 
186
- if (dialog == undefined) markup = [[{text: "Меню", callback_data: this._schema.start}]]; // FIX RAND BTN
207
+ if (dialog == undefined) markup = [[{ text: "Reload", callback_data: this._schema.start }]]; // FIX RAND BTN
187
208
  let text = typeof dialog?.text === 'function' ? await dialog?.text(chat) : dialog?.text;
188
209
 
189
210
  try {
190
211
  let imgs = (dialog != undefined && dialog.images != undefined) ? (typeof dialog.images == 'function' ? await dialog.images(chat) : dialog.images) : undefined;
191
212
  if (dialog != undefined && imgs != undefined) {
192
213
  if (Array.isArray(imgs) && imgs.length > 1) {
193
- await this._bot.sendMediaGroup(chat, imgs.map(x => { return { media: x } as InputMediaPhoto })); // * WARN currently not support image group with text
214
+ let res_msg = await this._bot.sendMediaGroup(chat, imgs.map(x => { return { media: x } as InputMediaPhoto })); // * WARN currently not support image group with text
215
+ this._userdialogs[chat].lastid = res_msg.pop()?.message_id || this._userdialogs[chat].lastid;
216
+ this._userdialogs[chat].last_type = 'image';
194
217
  } else {
195
218
  let img = Array.isArray(imgs) ? imgs[0]: imgs;
196
- await this._bot.sendPhoto(chat, img, { caption: text || "", parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup} : undefined });
219
+ let res_msg = await this._bot.sendPhoto(chat, img, { caption: text || "", parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup} : undefined });
220
+ this._userdialogs[chat].lastid = res_msg.message_id || this._userdialogs[chat].lastid;
221
+ this._userdialogs[chat].last_type = 'image';
197
222
  }
198
- } else await this._bot.editMessageText(text || "404", {chat_id: chat, message_id: this._userdialogs[chat].lastid, parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined })
223
+ } else {
224
+ if (this._userdialogs[chat].last_type == 'default') await this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup } : undefined });
225
+ else {
226
+ await this._bot.deleteMessage(chat, this._userdialogs[chat].lastid);
227
+ let res_msg = await this._bot.sendMessage(chat, text || "404", {parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup} : undefined });
228
+ this._userdialogs[chat].lastid = res_msg.message_id || this._userdialogs[chat].lastid;
229
+ this._userdialogs[chat].last_type = 'default';
230
+ }
231
+ }
199
232
  } catch (e) {
200
233
  if ((e as Error).message == bypass_str) return;
201
- let msg = await this._bot.sendMessage(chat, text || "404", {parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup} : undefined });
202
- this._userdialogs[chat].lastid = msg.message_id;
234
+ let res_msg = await this._bot.sendMessage(chat, text || "404", {parse_mode: 'HTML', reply_markup: markup ? { inline_keyboard: markup} : undefined });
235
+ this._userdialogs[chat].lastid = res_msg.message_id || this._userdialogs[chat].lastid;
236
+ this._userdialogs[chat].last_type = 'default';
203
237
  }
204
238
  }
205
239
  public AttachDataWait(chat: number, descriptor: string) {
@@ -215,7 +249,9 @@ export function ChangeDialog(id: string): Action {
215
249
  return (chat: number, _bot: BotBuilder) => { return _bot.ChangeDialog(chat, id); };
216
250
  }
217
251
  export function CallbackAction(descriptor: string | CallbackActionFunc, ...args: any[]): Action {
218
- return async (chat: number, _bot: BotBuilder, ..._args: any[]) => { return typeof descriptor == 'function' ? await descriptor(chat, ...args, ..._args) : _bot.ActionSystem.emit(descriptor, chat, ...args, ..._args); };
252
+ return async (chat: number, _bot: BotBuilder, ..._args: any[]) => {
253
+ return typeof descriptor == 'function' ? await descriptor(chat, ...args, ..._args) : _bot.ActionSystem.emit(descriptor, chat, ...args, ..._args);
254
+ };
219
255
  }
220
256
  export function WaitForData(descriptor: string | CallbackActionFunc): Action {
221
257
  return async (chat: number, _bot: BotBuilder) => {
package/src/bot-struct.ts CHANGED
@@ -22,6 +22,7 @@ export interface Button {
22
22
  text?: TextFunc;
23
23
  action?: Action[] | Action;
24
24
  url?: TextFunc;
25
+ mini_app?: TextFunc;
25
26
  }
26
27
  export interface BotButton extends Button {
27
28
  _callback: string;
@@ -31,6 +32,7 @@ export interface Schema {
31
32
  start: string;
32
33
  content: Dialog[];
33
34
  commands?: Command[];
35
+ enable_start?: boolean;
34
36
  }
35
37
  export interface BotSchema extends Schema {
36
38
  content: BotDialog[];
@@ -43,7 +45,7 @@ export interface Command {
43
45
  }
44
46
 
45
47
  export interface UserDialog {
46
- [key: number]: {dialog: string, lastid: number, waiter: { statewait: boolean, descriptor: string }};
48
+ [key: number]: {dialog: string, lastid: number, waiter: { statewait: boolean, descriptor: string }, last_type?: 'default' | 'image' };
47
49
  }
48
50
  export interface MWBreakDown {
49
51
  [key: string]: boolean | undefined | null;