@xbibzlibrary/telebibz 0.1.9 → 0.1.11
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.id.md +3 -12
- package/README.md +28 -8
- package/README.zh-CN.md +2 -11
- package/assets/readme-preview.html +2 -2
- package/dist/src/branding/terminal.js +1 -1
- package/dist/src/branding/terminal.js.map +1 -1
- package/dist/src/core/bot.d.ts +11 -4
- package/dist/src/core/bot.d.ts.map +1 -1
- package/dist/src/core/bot.js +40 -19
- package/dist/src/core/bot.js.map +1 -1
- package/dist/src/index.d.ts +0 -2
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +0 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/observability/logger.d.ts +6 -0
- package/dist/src/observability/logger.d.ts.map +1 -1
- package/dist/src/observability/logger.js +56 -11
- package/dist/src/observability/logger.js.map +1 -1
- package/dist/src/state/conversation.d.ts +10 -1
- package/dist/src/state/conversation.d.ts.map +1 -1
- package/dist/src/state/conversation.js +20 -2
- package/dist/src/state/conversation.js.map +1 -1
- package/dist/src/testing.d.ts.map +1 -1
- package/dist/src/testing.js +1 -9
- package/dist/src/testing.js.map +1 -1
- package/dist-cjs/src/branding/terminal.js +1 -1
- package/dist-cjs/src/core/bot.js +40 -19
- package/dist-cjs/src/index.js +0 -2
- package/dist-cjs/src/observability/logger.js +56 -11
- package/dist-cjs/src/state/conversation.js +21 -2
- package/dist-cjs/src/testing.js +1 -9
- package/docs/API.id.md +7 -95
- package/docs/API.md +33 -88
- package/docs/API.zh-CN.md +7 -95
- package/package.json +1 -2
- package/APPROVAL_FEATURE.md +0 -73
- package/dist/src/approval/approval.d.ts +0 -66
- package/dist/src/approval/approval.d.ts.map +0 -1
- package/dist/src/approval/approval.js +0 -105
- package/dist/src/approval/approval.js.map +0 -1
- package/dist/src/branding/branding.d.ts +0 -17
- package/dist/src/branding/branding.d.ts.map +0 -1
- package/dist/src/branding/branding.js +0 -35
- package/dist/src/branding/branding.js.map +0 -1
- package/dist-cjs/src/approval/approval.js +0 -110
- package/dist-cjs/src/branding/branding.js +0 -39
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/observability/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/observability/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export interface ConversationState {
|
|
|
7
7
|
status: "active" | "completed" | "cancelled";
|
|
8
8
|
updatedAt: number;
|
|
9
9
|
}
|
|
10
|
+
export declare function conversationKeyFromContext<S extends object>(ctx: Context<S>): string;
|
|
10
11
|
export declare class ConversationFlow<S extends object = Record<string, unknown>> {
|
|
11
12
|
readonly ctx: Context<S>;
|
|
12
13
|
readonly state: ConversationState;
|
|
@@ -39,8 +40,16 @@ export interface WizardStep<S extends object = Record<string, unknown>> {
|
|
|
39
40
|
}
|
|
40
41
|
export declare class Wizard<S extends object = Record<string, unknown>> {
|
|
41
42
|
private readonly stepsList;
|
|
43
|
+
private readonly defaultManager;
|
|
44
|
+
constructor(manager?: ConversationManager<S>);
|
|
42
45
|
step(step: WizardStep<S>): this;
|
|
43
|
-
|
|
46
|
+
/**
|
|
47
|
+
* Runs the active step for a conversation key. The default manager belongs to
|
|
48
|
+
* this Wizard instance and is intentionally reused across updates; passing a
|
|
49
|
+
* manager is useful when the application owns persistent storage explicitly.
|
|
50
|
+
*/
|
|
51
|
+
run(ctx: Context<S>, key?: string, manager?: ConversationManager<S>): Promise<ConversationState>;
|
|
44
52
|
get steps(): readonly WizardStep<S>[];
|
|
53
|
+
get manager(): ConversationManager<S>;
|
|
45
54
|
}
|
|
46
55
|
//# sourceMappingURL=conversation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../src/state/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEpE,MAAM,WAAW,iBAAiB;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,MAAM,EAAE,QAAQ,GAAG,WAAW,GAAG,WAAW,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE;AAEnK,qBAAa,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1D,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAAE,QAAQ,CAAC,KAAK,EAAE,iBAAiB;gBAAlD,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAW,KAAK,EAAE,iBAAiB;IACvE,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAA8B;IACnE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IACnC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAClC,IAAI,IAAI,IAAI;IACZ,QAAQ,IAAI,IAAI;IAChB,QAAQ,IAAI,IAAI;IAChB,MAAM,IAAI,IAAI;CACf;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACzE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBAEzC,OAAO,GAAE,OAAO,CAAC,MAAM,EAAE,iBAAiB,CAAkD;IAIxG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,iBAAiB;IAOzF,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAEzC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAQnE,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAStB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAShD,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAQhC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUpD,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../src/state/conversation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { MemoryStorage } from "../storage/storage.js";
|
|
2
|
+
export function conversationKeyFromContext(ctx) {
|
|
3
|
+
return ctx.chat?.id !== undefined ? `${ctx.chat.id}:${ctx.from?.id ?? "anonymous"}` : `update:${ctx.update.update_id}`;
|
|
4
|
+
}
|
|
2
5
|
export class ConversationFlow {
|
|
3
6
|
ctx;
|
|
4
7
|
state;
|
|
@@ -89,8 +92,11 @@ export class ConversationManager {
|
|
|
89
92
|
const step = steps[state.step];
|
|
90
93
|
if (!step)
|
|
91
94
|
state.status = "completed";
|
|
92
|
-
else
|
|
95
|
+
else {
|
|
93
96
|
await step(flow);
|
|
97
|
+
if (state.step >= steps.length)
|
|
98
|
+
state.status = "completed";
|
|
99
|
+
}
|
|
94
100
|
state.updatedAt = Date.now();
|
|
95
101
|
await this.storage.set(key, state);
|
|
96
102
|
this.active.set(key, state);
|
|
@@ -99,8 +105,20 @@ export class ConversationManager {
|
|
|
99
105
|
}
|
|
100
106
|
export class Wizard {
|
|
101
107
|
stepsList = [];
|
|
108
|
+
defaultManager;
|
|
109
|
+
constructor(manager) {
|
|
110
|
+
this.defaultManager = manager ?? new ConversationManager();
|
|
111
|
+
}
|
|
102
112
|
step(step) { this.stepsList.push(step); return this; }
|
|
103
|
-
|
|
113
|
+
/**
|
|
114
|
+
* Runs the active step for a conversation key. The default manager belongs to
|
|
115
|
+
* this Wizard instance and is intentionally reused across updates; passing a
|
|
116
|
+
* manager is useful when the application owns persistent storage explicitly.
|
|
117
|
+
*/
|
|
118
|
+
async run(ctx, key = conversationKeyFromContext(ctx), manager) {
|
|
119
|
+
return (manager ?? this.defaultManager).run(ctx, key, "wizard", this.stepsList.map((step) => step.run));
|
|
120
|
+
}
|
|
104
121
|
get steps() { return this.stepsList; }
|
|
122
|
+
get manager() { return this.defaultManager; }
|
|
105
123
|
}
|
|
106
124
|
//# sourceMappingURL=conversation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../../src/state/conversation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../../src/state/conversation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,qBAAa,aAAc,YAAW,SAAS;IAC7C,QAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAM;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoG;IAC9H,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;IAChH,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;CAC3E;AAED,wBAAgB,gBAAgB,CAAC,SAAS,GAAE,OAAO,CAAC,MAAM,CAAM,GAAG,MAAM,CAA+L;AACxQ,wBAAgB,wBAAwB,CAAC,SAAS,GAAE,OAAO,CAAC,MAAM,CAAM,GAAG,MAAM,CAehF;AACD,wBAAgB,aAAa,IAAI;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,SAAS,EAAE,aAAa,CAAA;CAAE,CAItE;AACD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,GAAE,MAA2B,GAAG,OAAO,CAA6E"}
|
package/dist/src/testing.js
CHANGED
|
@@ -26,15 +26,7 @@ export function createMockCallbackUpdate(overrides = {}) {
|
|
|
26
26
|
export function createTestBot() {
|
|
27
27
|
const transport = new MockTransport();
|
|
28
28
|
transport.respond("getMe", { ok: true, result: { id: 99, is_bot: true, first_name: "TestBot", username: "test_bot" } });
|
|
29
|
-
|
|
30
|
-
async get(key) {
|
|
31
|
-
if (key !== "telebibz:approval:99")
|
|
32
|
-
return undefined;
|
|
33
|
-
return { key, botId: 99, status: "approved", nonce: "test-approved", requestedAt: Date.now() };
|
|
34
|
-
},
|
|
35
|
-
async set() { },
|
|
36
|
-
};
|
|
37
|
-
return { bot: new Bot({ token: "123456:TEST_TOKEN", transport, approval: { store: approvalStore } }), transport };
|
|
29
|
+
return { bot: new Bot({ token: "123456:TEST_TOKEN", transport }), transport };
|
|
38
30
|
}
|
|
39
31
|
export function createMockContext(bot, update = createMockUpdate()) { return new Context({ update, api: bot.api, session: {}, services: {} }); }
|
|
40
32
|
//# sourceMappingURL=testing.js.map
|
package/dist/src/testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../src/testing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../src/testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ function buildTerminalBranding(options = {}) {
|
|
|
36
36
|
color(line(title), ANSI.blue),
|
|
37
37
|
color(line(exports.TERMINAL_BRAND_TEXT), ANSI.magenta),
|
|
38
38
|
color(`╚${horizontal}╝`, ANSI.cyan),
|
|
39
|
-
color("
|
|
39
|
+
color("Runtime logs: colorful structured output.", ANSI.dim),
|
|
40
40
|
].join("\n");
|
|
41
41
|
}
|
|
42
42
|
function printTerminalBranding(options = {}) {
|
package/dist-cjs/src/core/bot.js
CHANGED
|
@@ -9,9 +9,9 @@ const router_js_1 = require("../router/router.js");
|
|
|
9
9
|
const events_js_1 = require("./events.js");
|
|
10
10
|
const storage_js_1 = require("../storage/storage.js");
|
|
11
11
|
const plugin_js_1 = require("../plugins/plugin.js");
|
|
12
|
-
const approval_js_1 = require("../approval/approval.js");
|
|
13
12
|
const logger_js_1 = require("../observability/logger.js");
|
|
14
13
|
const terminal_js_1 = require("../branding/terminal.js");
|
|
14
|
+
const conversation_js_1 = require("../state/conversation.js");
|
|
15
15
|
class Bot {
|
|
16
16
|
api;
|
|
17
17
|
router;
|
|
@@ -19,7 +19,6 @@ class Bot {
|
|
|
19
19
|
plugins;
|
|
20
20
|
session;
|
|
21
21
|
services;
|
|
22
|
-
approval;
|
|
23
22
|
token;
|
|
24
23
|
logger;
|
|
25
24
|
middlewares = [];
|
|
@@ -48,7 +47,6 @@ class Bot {
|
|
|
48
47
|
},
|
|
49
48
|
});
|
|
50
49
|
this.plugins = new plugin_js_1.PluginManager(this);
|
|
51
|
-
this.approval = new approval_js_1.ApprovalGate(this.api, config.approval);
|
|
52
50
|
this.pollingOptions = {
|
|
53
51
|
timeout: config.polling?.timeout ?? 30,
|
|
54
52
|
limit: config.polling?.limit ?? 100,
|
|
@@ -67,26 +65,43 @@ class Bot {
|
|
|
67
65
|
onText(text, handler) { this.router.text(text, handler); return this; }
|
|
68
66
|
onRegex(expression, handler) { this.router.regex(expression, handler); return this; }
|
|
69
67
|
usePlugin(plugin) { this.plugins.use(plugin); return this; }
|
|
68
|
+
/**
|
|
69
|
+
* Routes subsequent messages to the active Wizard step for the same chat/user.
|
|
70
|
+
* The application starts the wizard once with `wizard.run(ctx, key)`; this
|
|
71
|
+
* middleware keeps routing replies until the wizard is completed or cancelled.
|
|
72
|
+
*/
|
|
73
|
+
useWizard(wizard, options = {}) {
|
|
74
|
+
const cancelCommand = options.cancelCommand ?? "/cancel";
|
|
75
|
+
this.use(async (ctx, next) => {
|
|
76
|
+
const message = ctx.message;
|
|
77
|
+
const key = (0, conversation_js_1.conversationKeyFromContext)(ctx);
|
|
78
|
+
const state = await wizard.manager.getAsync(key);
|
|
79
|
+
if (!message?.text || state?.status !== "active") {
|
|
80
|
+
await next();
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
if (message.text.trim() === cancelCommand) {
|
|
84
|
+
wizard.manager.cancel(key);
|
|
85
|
+
await ctx.reply("Conversation cancelled.");
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
await wizard.run(ctx, key);
|
|
89
|
+
});
|
|
90
|
+
return this;
|
|
91
|
+
}
|
|
70
92
|
async init() {
|
|
71
93
|
if (this.statusValue === "initialized" || this.statusValue === "running")
|
|
72
94
|
return this;
|
|
73
95
|
this.logger.info("bot.initializing");
|
|
74
|
-
const animation = (0, terminal_js_1.startTerminalAnimation)("Connecting to Telegram and
|
|
96
|
+
const animation = (0, terminal_js_1.startTerminalAnimation)("Connecting to Telegram and initializing bot");
|
|
75
97
|
try {
|
|
76
98
|
this.me = await this.api.methods.getMe();
|
|
77
|
-
const approval = await this.approval.check({ bot: this.me });
|
|
78
|
-
if (!approval.allowed) {
|
|
79
|
-
this.statusValue = "awaiting-approval";
|
|
80
|
-
this.logger.warn("approval.pending", { botId: this.me.id, status: approval.status });
|
|
81
|
-
animation.stop("Approval request sent; waiting for developer decision");
|
|
82
|
-
return this;
|
|
83
|
-
}
|
|
84
99
|
this.statusValue = "initialized";
|
|
85
100
|
this.logger.info("bot.initialized", { botId: this.me.id, username: this.me.username });
|
|
86
101
|
await this.events.emit("bot:initialized", { bot: this });
|
|
87
102
|
await this.plugins.setup();
|
|
88
103
|
await this.plugins.start();
|
|
89
|
-
animation.stop("
|
|
104
|
+
animation.stop("Bot initialized; ready to start");
|
|
90
105
|
return this;
|
|
91
106
|
}
|
|
92
107
|
catch (error) {
|
|
@@ -99,8 +114,6 @@ class Bot {
|
|
|
99
114
|
if (options.mode !== "polling")
|
|
100
115
|
throw new Error("Use createWebhookHandler() for webhook mode.");
|
|
101
116
|
await this.init();
|
|
102
|
-
if (this.statusValue === "awaiting-approval")
|
|
103
|
-
return;
|
|
104
117
|
if (this.statusValue === "running")
|
|
105
118
|
return;
|
|
106
119
|
this.statusValue = "starting";
|
|
@@ -146,15 +159,12 @@ class Bot {
|
|
|
146
159
|
?? update.edited_business_message
|
|
147
160
|
?? update.guest_message
|
|
148
161
|
?? update.callback_query?.message;
|
|
149
|
-
const key =
|
|
162
|
+
const key = this.conversationKey(update);
|
|
150
163
|
const session = await this.session.get(key) ?? {};
|
|
151
164
|
if (!this.me)
|
|
152
165
|
await this.init();
|
|
153
|
-
if (
|
|
154
|
-
if (update.callback_query)
|
|
155
|
-
await this.approval.handleCallback(update.callback_query);
|
|
166
|
+
if (!this.me)
|
|
156
167
|
return;
|
|
157
|
-
}
|
|
158
168
|
const ctx = new context_js_1.Context({ update, api: this.api, session, services: this.services });
|
|
159
169
|
await this.events.emit("update", { update });
|
|
160
170
|
if (message) {
|
|
@@ -180,6 +190,17 @@ class Bot {
|
|
|
180
190
|
throw error;
|
|
181
191
|
}
|
|
182
192
|
}
|
|
193
|
+
conversationKey(update) {
|
|
194
|
+
const message = update.message
|
|
195
|
+
?? update.edited_message
|
|
196
|
+
?? update.channel_post
|
|
197
|
+
?? update.edited_channel_post
|
|
198
|
+
?? update.business_message
|
|
199
|
+
?? update.edited_business_message
|
|
200
|
+
?? update.guest_message
|
|
201
|
+
?? update.callback_query?.message;
|
|
202
|
+
return message?.chat?.id !== undefined ? `${message.chat.id}:${message.from?.id ?? "anonymous"}` : `update:${update.update_id}`;
|
|
203
|
+
}
|
|
183
204
|
async waitForRetry(delayMs, signal) {
|
|
184
205
|
if (signal.aborted)
|
|
185
206
|
return false;
|
package/dist-cjs/src/index.js
CHANGED
|
@@ -31,9 +31,7 @@ __exportStar(require("./utils/text.js"), exports);
|
|
|
31
31
|
__exportStar(require("./state/conversation.js"), exports);
|
|
32
32
|
__exportStar(require("./state/forms.js"), exports);
|
|
33
33
|
__exportStar(require("./state/menu.js"), exports);
|
|
34
|
-
__exportStar(require("./approval/approval.js"), exports);
|
|
35
34
|
__exportStar(require("./telegram-features.js"), exports);
|
|
36
|
-
__exportStar(require("./branding/branding.js"), exports);
|
|
37
35
|
var terminal_js_1 = require("./branding/terminal.js");
|
|
38
36
|
Object.defineProperty(exports, "buildTerminalBranding", { enumerable: true, get: function () { return terminal_js_1.buildTerminalBranding; } });
|
|
39
37
|
Object.defineProperty(exports, "printTerminalBranding", { enumerable: true, get: function () { return terminal_js_1.printTerminalBranding; } });
|
|
@@ -6,13 +6,30 @@ exports.summarizeUpdate = summarizeUpdate;
|
|
|
6
6
|
exports.createLogger = createLogger;
|
|
7
7
|
const priorities = { silent: 99, error: 0, warn: 1, info: 2, debug: 3, trace: 4 };
|
|
8
8
|
const defaultRedactKeys = ["token", "secret", "password", "authorization", "cookie", "private_key", "api_key", "npm_token", "bot_token"];
|
|
9
|
+
const ANSI = {
|
|
10
|
+
reset: "\u001b[0m",
|
|
11
|
+
dim: "\u001b[2m",
|
|
12
|
+
red: "\u001b[31m",
|
|
13
|
+
yellow: "\u001b[33m",
|
|
14
|
+
green: "\u001b[32m",
|
|
15
|
+
cyan: "\u001b[36m",
|
|
16
|
+
blue: "\u001b[34m",
|
|
17
|
+
magenta: "\u001b[35m",
|
|
18
|
+
};
|
|
9
19
|
function isObject(value) { return typeof value === "object" && value !== null; }
|
|
10
20
|
function shouldRedact(key, keys) { const normalized = key.toLowerCase().replace(/[-_]/g, ""); return keys.some((candidate) => normalized.includes(candidate.toLowerCase().replace(/[-_]/g, ""))); }
|
|
21
|
+
function redactString(value) {
|
|
22
|
+
return value
|
|
23
|
+
.replace(/\b\d{6,12}:[A-Za-z0-9_-]{20,}\b/g, "[REDACTED_TELEGRAM_TOKEN]")
|
|
24
|
+
.replace(/\bnpm_[A-Za-z0-9]{20,}\b/g, "[REDACTED_NPM_TOKEN]");
|
|
25
|
+
}
|
|
11
26
|
function safeValue(value, keys, seen = new WeakSet()) {
|
|
27
|
+
if (typeof value === "string")
|
|
28
|
+
return redactString(value);
|
|
12
29
|
if (typeof value === "bigint")
|
|
13
30
|
return `${value}n`;
|
|
14
31
|
if (value instanceof Error)
|
|
15
|
-
return { name: value.name, message: value.message, stack: value.stack };
|
|
32
|
+
return safeValue({ name: value.name, message: value.message, stack: value.stack }, keys, seen);
|
|
16
33
|
if (Array.isArray(value)) {
|
|
17
34
|
if (seen.has(value))
|
|
18
35
|
return "[Circular]";
|
|
@@ -74,29 +91,57 @@ function summarizeUpdate(update, includeContent = false) {
|
|
|
74
91
|
}
|
|
75
92
|
return summary;
|
|
76
93
|
}
|
|
77
|
-
function
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
94
|
+
function levelColor(level) {
|
|
95
|
+
if (level === "error")
|
|
96
|
+
return ANSI.red;
|
|
97
|
+
if (level === "warn")
|
|
98
|
+
return ANSI.yellow;
|
|
99
|
+
if (level === "debug")
|
|
100
|
+
return ANSI.blue;
|
|
101
|
+
if (level === "trace")
|
|
102
|
+
return ANSI.magenta;
|
|
103
|
+
return ANSI.green;
|
|
104
|
+
}
|
|
105
|
+
function formatEntry(entry, color, format) {
|
|
106
|
+
if (format === "json") {
|
|
107
|
+
const line = JSON.stringify(entry);
|
|
108
|
+
return color ? `${ANSI.dim}${line}${ANSI.reset}` : line;
|
|
109
|
+
}
|
|
110
|
+
const time = entry.timestamp.slice(11, 23);
|
|
111
|
+
const label = entry.level.toUpperCase().padEnd(5, " ");
|
|
112
|
+
const context = entry.context && Object.keys(entry.context).length ? ` ${JSON.stringify(entry.context)}` : "";
|
|
113
|
+
const line = `${time} ${label} ${entry.event}${context}`;
|
|
114
|
+
return color ? `${levelColor(entry.level)}${line}${ANSI.reset}` : line;
|
|
115
|
+
}
|
|
116
|
+
function createDefaultSink(options, redactKeys) {
|
|
117
|
+
const stream = options.stream ?? process.stdout;
|
|
118
|
+
const color = options.color ?? Boolean(stream.isTTY && !process.env.NO_COLOR);
|
|
119
|
+
const format = options.format ?? "pretty";
|
|
120
|
+
return (entry) => {
|
|
121
|
+
const safeEntry = redact(entry, redactKeys);
|
|
122
|
+
const line = formatEntry(safeEntry, color, format);
|
|
123
|
+
stream.write(`${line}\n`);
|
|
124
|
+
};
|
|
85
125
|
}
|
|
86
126
|
class Logger {
|
|
87
127
|
level;
|
|
128
|
+
format;
|
|
129
|
+
color;
|
|
88
130
|
includeUpdateContent;
|
|
89
131
|
sink;
|
|
90
132
|
redactKeys;
|
|
91
133
|
baseContext;
|
|
92
134
|
constructor(options = {}) {
|
|
93
135
|
this.level = options.level ?? "info";
|
|
136
|
+
this.format = options.format ?? "pretty";
|
|
137
|
+
const stream = options.stream ?? process.stdout;
|
|
138
|
+
this.color = options.color ?? Boolean(stream.isTTY && !process.env.NO_COLOR);
|
|
94
139
|
this.includeUpdateContent = options.includeUpdateContent ?? false;
|
|
95
|
-
this.sink = options.sink ?? defaultSink;
|
|
96
140
|
this.redactKeys = options.redactKeys ?? defaultRedactKeys;
|
|
141
|
+
this.sink = options.sink ?? createDefaultSink({ color: this.color, format: this.format, stream }, this.redactKeys);
|
|
97
142
|
this.baseContext = options.context ?? {};
|
|
98
143
|
}
|
|
99
|
-
child(context) { return new Logger({ level: this.level, sink: this.sink, includeUpdateContent: this.includeUpdateContent, redactKeys: this.redactKeys, context: { ...this.baseContext, ...context } }); }
|
|
144
|
+
child(context) { return new Logger({ level: this.level, format: this.format, color: this.color, sink: this.sink, includeUpdateContent: this.includeUpdateContent, redactKeys: this.redactKeys, context: { ...this.baseContext, ...context } }); }
|
|
100
145
|
trace(event, context) { this.write("trace", event, context); }
|
|
101
146
|
debug(event, context) { this.write("debug", event, context); }
|
|
102
147
|
info(event, context) { this.write("info", event, context); }
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Wizard = exports.ConversationManager = exports.ConversationFlow = void 0;
|
|
4
|
+
exports.conversationKeyFromContext = conversationKeyFromContext;
|
|
4
5
|
const storage_js_1 = require("../storage/storage.js");
|
|
6
|
+
function conversationKeyFromContext(ctx) {
|
|
7
|
+
return ctx.chat?.id !== undefined ? `${ctx.chat.id}:${ctx.from?.id ?? "anonymous"}` : `update:${ctx.update.update_id}`;
|
|
8
|
+
}
|
|
5
9
|
class ConversationFlow {
|
|
6
10
|
ctx;
|
|
7
11
|
state;
|
|
@@ -93,8 +97,11 @@ class ConversationManager {
|
|
|
93
97
|
const step = steps[state.step];
|
|
94
98
|
if (!step)
|
|
95
99
|
state.status = "completed";
|
|
96
|
-
else
|
|
100
|
+
else {
|
|
97
101
|
await step(flow);
|
|
102
|
+
if (state.step >= steps.length)
|
|
103
|
+
state.status = "completed";
|
|
104
|
+
}
|
|
98
105
|
state.updatedAt = Date.now();
|
|
99
106
|
await this.storage.set(key, state);
|
|
100
107
|
this.active.set(key, state);
|
|
@@ -104,8 +111,20 @@ class ConversationManager {
|
|
|
104
111
|
exports.ConversationManager = ConversationManager;
|
|
105
112
|
class Wizard {
|
|
106
113
|
stepsList = [];
|
|
114
|
+
defaultManager;
|
|
115
|
+
constructor(manager) {
|
|
116
|
+
this.defaultManager = manager ?? new ConversationManager();
|
|
117
|
+
}
|
|
107
118
|
step(step) { this.stepsList.push(step); return this; }
|
|
108
|
-
|
|
119
|
+
/**
|
|
120
|
+
* Runs the active step for a conversation key. The default manager belongs to
|
|
121
|
+
* this Wizard instance and is intentionally reused across updates; passing a
|
|
122
|
+
* manager is useful when the application owns persistent storage explicitly.
|
|
123
|
+
*/
|
|
124
|
+
async run(ctx, key = conversationKeyFromContext(ctx), manager) {
|
|
125
|
+
return (manager ?? this.defaultManager).run(ctx, key, "wizard", this.stepsList.map((step) => step.run));
|
|
126
|
+
}
|
|
109
127
|
get steps() { return this.stepsList; }
|
|
128
|
+
get manager() { return this.defaultManager; }
|
|
110
129
|
}
|
|
111
130
|
exports.Wizard = Wizard;
|
package/dist-cjs/src/testing.js
CHANGED
|
@@ -34,14 +34,6 @@ function createMockCallbackUpdate(overrides = {}) {
|
|
|
34
34
|
function createTestBot() {
|
|
35
35
|
const transport = new MockTransport();
|
|
36
36
|
transport.respond("getMe", { ok: true, result: { id: 99, is_bot: true, first_name: "TestBot", username: "test_bot" } });
|
|
37
|
-
|
|
38
|
-
async get(key) {
|
|
39
|
-
if (key !== "telebibz:approval:99")
|
|
40
|
-
return undefined;
|
|
41
|
-
return { key, botId: 99, status: "approved", nonce: "test-approved", requestedAt: Date.now() };
|
|
42
|
-
},
|
|
43
|
-
async set() { },
|
|
44
|
-
};
|
|
45
|
-
return { bot: new bot_js_1.Bot({ token: "123456:TEST_TOKEN", transport, approval: { store: approvalStore } }), transport };
|
|
37
|
+
return { bot: new bot_js_1.Bot({ token: "123456:TEST_TOKEN", transport }), transport };
|
|
46
38
|
}
|
|
47
39
|
function createMockContext(bot, update = createMockUpdate()) { return new context_js_1.Context({ update, api: bot.api, session: {}, services: {} }); }
|