@openclaw/feishu 2026.3.13 → 2026.5.2-beta.1
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/api.ts +31 -0
- package/channel-entry.ts +20 -0
- package/channel-plugin-api.ts +1 -0
- package/contract-api.ts +16 -0
- package/index.ts +70 -53
- package/openclaw.plugin.json +1827 -4
- package/package.json +32 -7
- package/runtime-api.ts +55 -0
- package/secret-contract-api.ts +5 -0
- package/security-contract-api.ts +1 -0
- package/session-key-api.ts +1 -0
- package/setup-api.ts +3 -0
- package/setup-entry.test.ts +14 -0
- package/setup-entry.ts +13 -0
- package/src/accounts.test.ts +95 -7
- package/src/accounts.ts +199 -117
- package/src/app-registration.ts +331 -0
- package/src/approval-auth.test.ts +24 -0
- package/src/approval-auth.ts +25 -0
- package/src/async.test.ts +35 -0
- package/src/async.ts +43 -1
- package/src/audio-preflight.runtime.ts +9 -0
- package/src/bitable.test.ts +131 -0
- package/src/bitable.ts +59 -22
- package/src/bot-content.ts +474 -0
- package/src/bot-group-name.test.ts +108 -0
- package/src/bot-runtime-api.ts +12 -0
- package/src/bot-sender-name.ts +125 -0
- package/src/bot.broadcast.test.ts +463 -0
- package/src/bot.card-action.test.ts +519 -5
- package/src/bot.checkBotMentioned.test.ts +92 -20
- package/src/bot.helpers.test.ts +118 -0
- package/src/bot.stripBotMention.test.ts +13 -21
- package/src/bot.test.ts +1334 -401
- package/src/bot.ts +778 -775
- package/src/card-action.ts +408 -40
- package/src/card-interaction.test.ts +129 -0
- package/src/card-interaction.ts +159 -0
- package/src/card-test-helpers.ts +47 -0
- package/src/card-ux-approval.ts +65 -0
- package/src/card-ux-launcher.test.ts +99 -0
- package/src/card-ux-launcher.ts +121 -0
- package/src/card-ux-shared.ts +33 -0
- package/src/channel-runtime-api.ts +16 -0
- package/src/channel.runtime.ts +47 -0
- package/src/channel.test.ts +914 -3
- package/src/channel.ts +1253 -309
- package/src/chat-schema.ts +5 -4
- package/src/chat.test.ts +135 -28
- package/src/chat.ts +68 -10
- package/src/client.test.ts +212 -103
- package/src/client.ts +115 -21
- package/src/comment-dispatcher-runtime-api.ts +6 -0
- package/src/comment-dispatcher.test.ts +169 -0
- package/src/comment-dispatcher.ts +107 -0
- package/src/comment-handler-runtime-api.ts +3 -0
- package/src/comment-handler.test.ts +486 -0
- package/src/comment-handler.ts +309 -0
- package/src/comment-reaction.test.ts +166 -0
- package/src/comment-reaction.ts +259 -0
- package/src/comment-shared.test.ts +182 -0
- package/src/comment-shared.ts +406 -0
- package/src/comment-target.ts +44 -0
- package/src/config-schema.test.ts +63 -1
- package/src/config-schema.ts +31 -4
- package/src/conversation-id.test.ts +18 -0
- package/src/conversation-id.ts +199 -0
- package/src/dedup-runtime-api.ts +1 -0
- package/src/dedup.ts +33 -95
- package/src/directory.static.ts +61 -0
- package/src/directory.test.ts +116 -20
- package/src/directory.ts +60 -92
- package/src/doc-schema.ts +1 -1
- package/src/docx-batch-insert.test.ts +39 -38
- package/src/docx-batch-insert.ts +55 -19
- package/src/docx-color-text.ts +9 -4
- package/src/docx-table-ops.test.ts +53 -0
- package/src/docx-table-ops.ts +52 -34
- package/src/docx-types.ts +38 -0
- package/src/docx.account-selection.test.ts +12 -3
- package/src/docx.test.ts +314 -74
- package/src/docx.ts +278 -122
- package/src/drive-schema.ts +47 -1
- package/src/drive.test.ts +1219 -0
- package/src/drive.ts +614 -13
- package/src/dynamic-agent.ts +10 -4
- package/src/event-types.ts +45 -0
- package/src/external-keys.ts +1 -1
- package/src/lifecycle.test-support.ts +220 -0
- package/src/media.test.ts +403 -26
- package/src/media.ts +509 -132
- package/src/mention-target.types.ts +5 -0
- package/src/mention.ts +32 -51
- package/src/message-action-contract.ts +13 -0
- package/src/monitor-state-runtime-api.ts +7 -0
- package/src/monitor-transport-runtime-api.ts +7 -0
- package/src/monitor.account.ts +218 -312
- package/src/monitor.acp-init-failure.lifecycle.test-support.ts +219 -0
- package/src/monitor.bot-identity.ts +86 -0
- package/src/monitor.bot-menu-handler.ts +165 -0
- package/src/monitor.bot-menu.lifecycle.test-support.ts +224 -0
- package/src/monitor.bot-menu.test.ts +178 -0
- package/src/monitor.broadcast.reply-once.lifecycle.test-support.ts +264 -0
- package/src/monitor.card-action.lifecycle.test-support.ts +373 -0
- package/src/monitor.cleanup.test.ts +376 -0
- package/src/monitor.comment-notice-handler.ts +105 -0
- package/src/monitor.comment.test.ts +937 -0
- package/src/monitor.comment.ts +1386 -0
- package/src/monitor.lifecycle.test.ts +4 -0
- package/src/monitor.message-handler.ts +339 -0
- package/src/monitor.reaction.lifecycle.test-support.ts +68 -0
- package/src/monitor.reaction.test.ts +108 -48
- package/src/monitor.startup.test.ts +11 -9
- package/src/monitor.startup.ts +26 -16
- package/src/monitor.state.ts +20 -5
- package/src/monitor.synthetic-error.ts +18 -0
- package/src/monitor.test-mocks.ts +2 -2
- package/src/monitor.transport.ts +220 -60
- package/src/monitor.ts +15 -10
- package/src/monitor.webhook-e2e.test.ts +65 -7
- package/src/monitor.webhook-security.test.ts +122 -0
- package/src/monitor.webhook.test-helpers.ts +44 -26
- package/src/outbound-runtime-api.ts +1 -0
- package/src/outbound.test.ts +616 -37
- package/src/outbound.ts +623 -81
- package/src/perm-schema.ts +1 -1
- package/src/perm.ts +1 -7
- package/src/pins.ts +108 -0
- package/src/policy.test.ts +297 -117
- package/src/policy.ts +142 -29
- package/src/post.ts +7 -6
- package/src/probe.test.ts +14 -9
- package/src/probe.ts +26 -16
- package/src/processing-claims.ts +59 -0
- package/src/qr-terminal.ts +1 -0
- package/src/reactions.ts +4 -34
- package/src/reasoning-preview.test.ts +59 -0
- package/src/reasoning-preview.ts +20 -0
- package/src/reply-dispatcher-runtime-api.ts +7 -0
- package/src/reply-dispatcher.test.ts +660 -29
- package/src/reply-dispatcher.ts +407 -154
- package/src/runtime.ts +6 -3
- package/src/secret-contract.ts +145 -0
- package/src/secret-input.ts +1 -13
- package/src/security-audit-shared.ts +69 -0
- package/src/security-audit.test.ts +61 -0
- package/src/security-audit.ts +1 -0
- package/src/send-result.ts +1 -1
- package/src/send-target.test.ts +9 -3
- package/src/send-target.ts +10 -4
- package/src/send.reply-fallback.test.ts +105 -2
- package/src/send.test.ts +386 -4
- package/src/send.ts +414 -95
- package/src/sequential-key.test.ts +72 -0
- package/src/sequential-key.ts +28 -0
- package/src/sequential-queue.test.ts +92 -0
- package/src/sequential-queue.ts +16 -0
- package/src/session-conversation.ts +42 -0
- package/src/session-route.ts +48 -0
- package/src/setup-core.ts +51 -0
- package/src/{onboarding.test.ts → setup-surface.test.ts} +52 -21
- package/src/setup-surface.ts +581 -0
- package/src/streaming-card.test.ts +138 -2
- package/src/streaming-card.ts +134 -18
- package/src/subagent-hooks.test.ts +603 -0
- package/src/subagent-hooks.ts +397 -0
- package/src/targets.ts +3 -13
- package/src/test-support/lifecycle-test-support.ts +453 -0
- package/src/thread-bindings.test.ts +143 -0
- package/src/thread-bindings.ts +330 -0
- package/src/tool-account-routing.test.ts +66 -8
- package/src/tool-account.test.ts +44 -0
- package/src/tool-account.ts +40 -17
- package/src/tool-factory-test-harness.ts +11 -8
- package/src/tool-result.ts +3 -1
- package/src/tools-config.ts +1 -1
- package/src/types.ts +16 -15
- package/src/typing.ts +10 -6
- package/src/wiki-schema.ts +1 -1
- package/src/wiki.ts +1 -7
- package/subagent-hooks-api.ts +31 -0
- package/tsconfig.json +16 -0
- package/src/feishu-command-handler.ts +0 -59
- package/src/onboarding.status.test.ts +0 -25
- package/src/onboarding.ts +0 -489
- package/src/send-message.ts +0 -71
- package/src/targets.test.ts +0 -70
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
|
|
3
|
+
const resolveFeishuRuntimeAccountMock = vi.hoisted(() => vi.fn());
|
|
4
|
+
const createFeishuClientMock = vi.hoisted(() => vi.fn());
|
|
5
|
+
const createReplyPrefixContextMock = vi.hoisted(() => vi.fn());
|
|
6
|
+
const createCommentTypingReactionLifecycleMock = vi.hoisted(() => vi.fn());
|
|
7
|
+
const deliverCommentThreadTextMock = vi.hoisted(() => vi.fn());
|
|
8
|
+
const createReplyDispatcherWithTypingMock = vi.hoisted(() => vi.fn());
|
|
9
|
+
const getFeishuRuntimeMock = vi.hoisted(() => vi.fn());
|
|
10
|
+
|
|
11
|
+
vi.mock("./accounts.js", () => ({
|
|
12
|
+
resolveFeishuRuntimeAccount: resolveFeishuRuntimeAccountMock,
|
|
13
|
+
}));
|
|
14
|
+
|
|
15
|
+
vi.mock("./client.js", () => ({
|
|
16
|
+
createFeishuClient: createFeishuClientMock,
|
|
17
|
+
}));
|
|
18
|
+
|
|
19
|
+
vi.mock("./comment-dispatcher-runtime-api.js", () => ({
|
|
20
|
+
createReplyPrefixContext: createReplyPrefixContextMock,
|
|
21
|
+
}));
|
|
22
|
+
|
|
23
|
+
vi.mock("./comment-reaction.js", () => ({
|
|
24
|
+
createCommentTypingReactionLifecycle: createCommentTypingReactionLifecycleMock,
|
|
25
|
+
}));
|
|
26
|
+
|
|
27
|
+
vi.mock("./drive.js", () => ({
|
|
28
|
+
deliverCommentThreadText: deliverCommentThreadTextMock,
|
|
29
|
+
}));
|
|
30
|
+
|
|
31
|
+
vi.mock("./runtime.js", () => ({
|
|
32
|
+
getFeishuRuntime: getFeishuRuntimeMock,
|
|
33
|
+
}));
|
|
34
|
+
|
|
35
|
+
import { createFeishuCommentReplyDispatcher } from "./comment-dispatcher.js";
|
|
36
|
+
|
|
37
|
+
describe("createFeishuCommentReplyDispatcher", () => {
|
|
38
|
+
function createTestCommentReplyDispatcher() {
|
|
39
|
+
createFeishuCommentReplyDispatcher({
|
|
40
|
+
cfg: {} as never,
|
|
41
|
+
agentId: "main",
|
|
42
|
+
runtime: { log: vi.fn(), error: vi.fn() } as never,
|
|
43
|
+
accountId: "main",
|
|
44
|
+
fileToken: "doc_token_1",
|
|
45
|
+
fileType: "docx",
|
|
46
|
+
commentId: "comment_1",
|
|
47
|
+
replyId: "reply_1",
|
|
48
|
+
isWholeComment: false,
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function latestReplyDispatcherOptions() {
|
|
53
|
+
const options = createReplyDispatcherWithTypingMock.mock.calls.at(-1)?.[0];
|
|
54
|
+
expect(options).toBeDefined();
|
|
55
|
+
if (!options) {
|
|
56
|
+
throw new Error("expected reply dispatcher options");
|
|
57
|
+
}
|
|
58
|
+
return options as {
|
|
59
|
+
deliver: (payload: { text: string }, phase: { kind: string }) => Promise<void> | void;
|
|
60
|
+
onCleanup?: () => Promise<void> | void;
|
|
61
|
+
onReplyStart?: () => Promise<void> | void;
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
beforeEach(() => {
|
|
66
|
+
vi.clearAllMocks();
|
|
67
|
+
resolveFeishuRuntimeAccountMock.mockReturnValue({
|
|
68
|
+
accountId: "main",
|
|
69
|
+
appId: "app_id",
|
|
70
|
+
appSecret: "app_secret",
|
|
71
|
+
domain: "feishu",
|
|
72
|
+
config: {},
|
|
73
|
+
});
|
|
74
|
+
createFeishuClientMock.mockReturnValue({});
|
|
75
|
+
createReplyPrefixContextMock.mockReturnValue({
|
|
76
|
+
responsePrefix: undefined,
|
|
77
|
+
responsePrefixContextProvider: undefined,
|
|
78
|
+
});
|
|
79
|
+
deliverCommentThreadTextMock.mockResolvedValue({
|
|
80
|
+
delivery_mode: "reply_comment",
|
|
81
|
+
reply_id: "reply_1",
|
|
82
|
+
});
|
|
83
|
+
createCommentTypingReactionLifecycleMock.mockReturnValue({
|
|
84
|
+
start: vi.fn(async () => {}),
|
|
85
|
+
cleanup: vi.fn(async () => {}),
|
|
86
|
+
});
|
|
87
|
+
createReplyDispatcherWithTypingMock.mockImplementation(() => ({
|
|
88
|
+
dispatcher: {
|
|
89
|
+
markComplete: vi.fn(),
|
|
90
|
+
waitForIdle: vi.fn(async () => {}),
|
|
91
|
+
},
|
|
92
|
+
replyOptions: {},
|
|
93
|
+
markDispatchIdle: vi.fn(),
|
|
94
|
+
markRunComplete: vi.fn(),
|
|
95
|
+
}));
|
|
96
|
+
getFeishuRuntimeMock.mockReturnValue({
|
|
97
|
+
channel: {
|
|
98
|
+
text: {
|
|
99
|
+
resolveTextChunkLimit: vi.fn(() => 4000),
|
|
100
|
+
resolveChunkMode: vi.fn(() => "line"),
|
|
101
|
+
chunkTextWithMode: vi.fn((text: string) => [text]),
|
|
102
|
+
},
|
|
103
|
+
reply: {
|
|
104
|
+
createReplyDispatcherWithTyping: createReplyDispatcherWithTypingMock,
|
|
105
|
+
resolveHumanDelayConfig: vi.fn(() => undefined),
|
|
106
|
+
},
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
it("sends final comment text without waiting for typing cleanup", async () => {
|
|
112
|
+
let resolveCleanup: (() => void) | undefined;
|
|
113
|
+
const cleanup = vi.fn(
|
|
114
|
+
() =>
|
|
115
|
+
new Promise<void>((resolve) => {
|
|
116
|
+
resolveCleanup = resolve;
|
|
117
|
+
}),
|
|
118
|
+
);
|
|
119
|
+
createCommentTypingReactionLifecycleMock.mockReturnValue({
|
|
120
|
+
start: vi.fn(async () => {}),
|
|
121
|
+
cleanup,
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
createTestCommentReplyDispatcher();
|
|
125
|
+
|
|
126
|
+
const options = latestReplyDispatcherOptions();
|
|
127
|
+
const deliverPromise = Promise.resolve(
|
|
128
|
+
options.deliver({ text: "hello world" }, { kind: "final" }),
|
|
129
|
+
);
|
|
130
|
+
const status = await Promise.race([
|
|
131
|
+
deliverPromise.then(() => "done"),
|
|
132
|
+
new Promise<string>((resolve) => setTimeout(() => resolve("pending"), 0)),
|
|
133
|
+
]);
|
|
134
|
+
|
|
135
|
+
expect(status).toBe("done");
|
|
136
|
+
expect(deliverCommentThreadTextMock).toHaveBeenCalledWith(
|
|
137
|
+
expect.anything(),
|
|
138
|
+
expect.objectContaining({
|
|
139
|
+
file_token: "doc_token_1",
|
|
140
|
+
file_type: "docx",
|
|
141
|
+
comment_id: "comment_1",
|
|
142
|
+
content: "hello world",
|
|
143
|
+
is_whole_comment: false,
|
|
144
|
+
}),
|
|
145
|
+
);
|
|
146
|
+
expect(cleanup).not.toHaveBeenCalled();
|
|
147
|
+
|
|
148
|
+
void options.onCleanup?.();
|
|
149
|
+
expect(cleanup).toHaveBeenCalledTimes(1);
|
|
150
|
+
|
|
151
|
+
resolveCleanup?.();
|
|
152
|
+
await deliverPromise;
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
it("starts the typing reaction from dispatcher onReplyStart", async () => {
|
|
156
|
+
const start = vi.fn(async () => {});
|
|
157
|
+
createCommentTypingReactionLifecycleMock.mockReturnValue({
|
|
158
|
+
start,
|
|
159
|
+
cleanup: vi.fn(async () => {}),
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
createTestCommentReplyDispatcher();
|
|
163
|
+
|
|
164
|
+
const options = latestReplyDispatcherOptions();
|
|
165
|
+
await options.onReplyStart?.();
|
|
166
|
+
|
|
167
|
+
expect(start).toHaveBeenCalledTimes(1);
|
|
168
|
+
});
|
|
169
|
+
});
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
|
|
2
|
+
import { resolveFeishuRuntimeAccount } from "./accounts.js";
|
|
3
|
+
import { createFeishuClient } from "./client.js";
|
|
4
|
+
import {
|
|
5
|
+
createReplyPrefixContext,
|
|
6
|
+
type ClawdbotConfig,
|
|
7
|
+
type ReplyPayload,
|
|
8
|
+
type RuntimeEnv,
|
|
9
|
+
} from "./comment-dispatcher-runtime-api.js";
|
|
10
|
+
import { createCommentTypingReactionLifecycle } from "./comment-reaction.js";
|
|
11
|
+
import type { CommentFileType } from "./comment-target.js";
|
|
12
|
+
import { deliverCommentThreadText } from "./drive.js";
|
|
13
|
+
import { getFeishuRuntime } from "./runtime.js";
|
|
14
|
+
|
|
15
|
+
type CreateFeishuCommentReplyDispatcherParams = {
|
|
16
|
+
cfg: ClawdbotConfig;
|
|
17
|
+
agentId: string;
|
|
18
|
+
runtime: RuntimeEnv;
|
|
19
|
+
accountId?: string;
|
|
20
|
+
fileToken: string;
|
|
21
|
+
fileType: CommentFileType;
|
|
22
|
+
commentId: string;
|
|
23
|
+
replyId?: string;
|
|
24
|
+
isWholeComment?: boolean;
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
export function createFeishuCommentReplyDispatcher(
|
|
28
|
+
params: CreateFeishuCommentReplyDispatcherParams,
|
|
29
|
+
) {
|
|
30
|
+
const core = getFeishuRuntime();
|
|
31
|
+
const prefixContext = createReplyPrefixContext({
|
|
32
|
+
cfg: params.cfg,
|
|
33
|
+
agentId: params.agentId,
|
|
34
|
+
channel: "feishu",
|
|
35
|
+
accountId: params.accountId,
|
|
36
|
+
});
|
|
37
|
+
const account = resolveFeishuRuntimeAccount({ cfg: params.cfg, accountId: params.accountId });
|
|
38
|
+
const client = createFeishuClient(account);
|
|
39
|
+
const textChunkLimit = core.channel.text.resolveTextChunkLimit(
|
|
40
|
+
params.cfg,
|
|
41
|
+
"feishu",
|
|
42
|
+
params.accountId,
|
|
43
|
+
{
|
|
44
|
+
fallbackLimit: 4000,
|
|
45
|
+
},
|
|
46
|
+
);
|
|
47
|
+
const chunkMode = core.channel.text.resolveChunkMode(params.cfg, "feishu");
|
|
48
|
+
const typingReaction = createCommentTypingReactionLifecycle({
|
|
49
|
+
cfg: params.cfg,
|
|
50
|
+
fileToken: params.fileToken,
|
|
51
|
+
fileType: params.fileType,
|
|
52
|
+
replyId: params.replyId,
|
|
53
|
+
accountId: params.accountId,
|
|
54
|
+
runtime: params.runtime,
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
const { dispatcher, replyOptions, markDispatchIdle, markRunComplete } =
|
|
58
|
+
core.channel.reply.createReplyDispatcherWithTyping({
|
|
59
|
+
responsePrefix: prefixContext.responsePrefix,
|
|
60
|
+
responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
|
|
61
|
+
humanDelay: core.channel.reply.resolveHumanDelayConfig(params.cfg, params.agentId),
|
|
62
|
+
onReplyStart: async () => {
|
|
63
|
+
await typingReaction.start();
|
|
64
|
+
},
|
|
65
|
+
deliver: async (payload: ReplyPayload, info) => {
|
|
66
|
+
if (info.kind !== "final") {
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
const reply = resolveSendableOutboundReplyParts(payload);
|
|
70
|
+
if (!reply.hasText) {
|
|
71
|
+
if (reply.hasMedia) {
|
|
72
|
+
params.runtime.log?.(
|
|
73
|
+
`feishu[${params.accountId ?? "default"}]: comment reply ignored media-only payload for comment=${params.commentId}`,
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
const chunks = core.channel.text.chunkTextWithMode(reply.text, textChunkLimit, chunkMode);
|
|
79
|
+
for (const chunk of chunks) {
|
|
80
|
+
await deliverCommentThreadText(client, {
|
|
81
|
+
file_token: params.fileToken,
|
|
82
|
+
file_type: params.fileType,
|
|
83
|
+
comment_id: params.commentId,
|
|
84
|
+
content: chunk,
|
|
85
|
+
is_whole_comment: params.isWholeComment,
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
},
|
|
89
|
+
onError: (err, info) => {
|
|
90
|
+
params.runtime.error?.(
|
|
91
|
+
`feishu[${params.accountId ?? "default"}]: comment dispatcher failed kind=${info.kind} comment=${params.commentId}: ${String(err)}`,
|
|
92
|
+
);
|
|
93
|
+
},
|
|
94
|
+
onCleanup: () => {
|
|
95
|
+
void typingReaction.cleanup();
|
|
96
|
+
},
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
return {
|
|
100
|
+
dispatcher,
|
|
101
|
+
replyOptions,
|
|
102
|
+
markDispatchIdle,
|
|
103
|
+
markRunComplete,
|
|
104
|
+
startTypingReaction: typingReaction.start,
|
|
105
|
+
cleanupTypingReaction: typingReaction.cleanup,
|
|
106
|
+
};
|
|
107
|
+
}
|