hansjone/dsh-im-ops
1
0
Fork 0
mirror of https://github.com/hansjone/dsh-im-ops.git synced 2026-10-09 01:53:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: send test messages during bot connection checks

Browse source
This commit is contained in:
xmanrui 2026-08-19 03:52:52 +08:00
parent 94da24538f
commit fb61c4235f
78 changed files with 3460 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

32
plugin-src/host/channels/dingtalk/rpc.mjs
View file

@ -1,6 +1,10 @@
import QRCode from 'qrcode';
import { resolveRpcAuthority } from '../../rpc-authority.mjs';
import { publicWorkspaceError, SET_WORKSPACE_ENDPOINT, validWorkspacePayload } from '../shared/workspace-rpc.mjs';
import {
connectionTestTargetUnavailable,
publicConnectionTestResult,
} from '../../../../src/channels/shared/connection-test.mjs';
export const DINGTALK_RPC_CHANNEL = '/dingtalk';
export const DINGTALK_ENDPOINTS = Object.freeze({
@ -69,9 +73,11 @@ function payloadFailure(endpoint, payload) {
: 'bot.bind-credentials requires Client ID and Client Secret.';
}
if (endpoint === DINGTALK_ENDPOINTS.reconnectBot) {
return exactKeys(payload, ['botId']) && validId(payload.botId)
return exactKeys(payload, ['botId', 'sendTest'])
&& validId(payload.botId)
&& (payload.sendTest === undefined || payload.sendTest === true)
? null
: 'bot.reconnect requires a botId.';
: 'bot.reconnect requires a botId and optional sendTest=true.';
}
if (endpoint === DINGTALK_ENDPOINTS.deleteBot) {
return exactKeys(payload, ['botId', 'confirm']) && validId(payload.botId) && payload.confirm === true
@ -210,7 +216,27 @@ export function createDingtalkRpcHandler(controller, { encodeQr = qrDataUrl } =
} else if (endpoint === DINGTALK_ENDPOINTS.bindCredentials) {
value = await publicStatus(await controller.bindCredentials(payload), cachedEncode);
} else if (endpoint === DINGTALK_ENDPOINTS.reconnectBot) {
value = await publicStatus(await controller.reconnectBot(payload.botId), cachedEncode);
const snapshot = await controller.reconnectBot(payload.botId);
if (signal?.aborted) return cancelled();
let testMessage;
if (payload.sendTest === true) {
const connected = snapshot?.bots?.some(
(bot) => bot?.botId === payload.botId && bot?.connected === true,
);
if (!connected || typeof controller.sendConnectionTest !== 'function') {
testMessage = publicConnectionTestResult(
connectionTestTargetUnavailable('钉钉机器人'),
);
} else {
try {
await controller.sendConnectionTest(payload.botId);
testMessage = publicConnectionTestResult();
} catch (error) {
testMessage = publicConnectionTestResult(error);
}
}
}
value = await publicStatus({ ...snapshot, ...(testMessage ? { testMessage } : {}) }, cachedEncode);
} else if (endpoint === DINGTALK_ENDPOINTS.deleteBot) {
value = await publicStatus(await controller.deleteBot(payload.botId), cachedEncode);
} else if (endpoint === DINGTALK_ENDPOINTS.setWorkspace) {

37
plugin-src/host/channels/feishu/rpc.mjs
View file

@ -1,4 +1,5 @@
import QRCode from 'qrcode';
import { publicConnectionTestResult } from '../../../../src/channels/shared/connection-test.mjs';
import { resolveRpcAuthority } from '../../rpc-authority.mjs';
import { publicWorkspaceError, validWorkspacePayload } from '../shared/workspace-rpc.mjs';
import {
@ -258,8 +259,14 @@ function validPayload(endpoint, payload) {
? null
: 'Disconnect requires removeCredentials=true.';
}
if (endpoint === FEISHU_MULTI_ENDPOINTS.reconnectBot
|| endpoint === FEISHU_MULTI_ENDPOINTS.disconnectBot) {
if (endpoint === FEISHU_MULTI_ENDPOINTS.reconnectBot) {
return hasOnlyKeys(payload, new Set(['botId', 'sendTest']))
&& safeOpaqueId(payload.botId)
&& (payload.sendTest === undefined || typeof payload.sendTest === 'boolean')
? null
: 'A valid botId and optional sendTest flag are required.';
}
if (endpoint === FEISHU_MULTI_ENDPOINTS.disconnectBot) {
return hasOnlyKeys(payload, new Set(['botId'])) && safeOpaqueId(payload.botId)
? null
: 'A single valid botId is required.';
@ -431,7 +438,31 @@ export function createFeishuRpcHandler(controller, { encodeQr = qrCodeDataUrl }
value = await toPublicFeishuStatus(await controller.disconnect(), { encodeQr: cachedEncodeQr });
} else if (endpoint === FEISHU_MULTI_ENDPOINTS.reconnectBot) {
if (typeof controller.reconnectBot !== 'function') throw new Error('Multi-bot reconnect is unavailable');
value = await toPublicFeishuStatus(await controller.reconnectBot(payload.botId), { encodeQr: cachedEncodeQr });
const checked = await controller.reconnectBot(payload.botId);
if (signal?.aborted) return cancelled();
value = await toPublicFeishuStatus(checked, { encodeQr: cachedEncodeQr });
if (payload.sendTest === true) {
let testError = null;
const connected = checked?.bots?.some(
(bot) => bot?.botId === payload.botId && bot.connected === true,
) === true;
if (!connected) {
testError = new Error('Feishu bot is not connected');
testError.code = 'test-target-unavailable';
} else {
try {
if (typeof controller.sendConnectionTest !== 'function') {
const unavailable = new Error('Connection test is unavailable');
unavailable.code = 'test-target-unavailable';
throw unavailable;
}
await controller.sendConnectionTest(payload.botId);
} catch (error) {
testError = error;
}
}
value = { ...value, testMessage: publicConnectionTestResult(testError) };
}
} else if (endpoint === FEISHU_MULTI_ENDPOINTS.disconnectBot) {
if (typeof controller.disconnectBot !== 'function') throw new Error('Multi-bot disconnect is unavailable');
value = await toPublicFeishuStatus(await controller.disconnectBot(payload.botId), { encodeQr: cachedEncodeQr });

37
plugin-src/host/channels/qq/rpc.mjs
View file

@ -1,4 +1,8 @@
import QRCode from 'qrcode';
import {
connectionTestTargetUnavailable,
publicConnectionTestResult,
} from '../../../../src/channels/shared/connection-test.mjs';
import { resolveRpcAuthority } from '../../rpc-authority.mjs';
import { publicWorkspaceError, SET_WORKSPACE_ENDPOINT, validWorkspacePayload } from '../shared/workspace-rpc.mjs';
@ -53,7 +57,10 @@ function payloadFailure(endpoint, payload) {
? null : 'bot.bind-credentials requires AppID and AppSecret.';
}
if (endpoint === QQ_ENDPOINTS.reconnectBot) {
return exactKeys(payload, ['botId']) && validId(payload.botId) ? null : 'bot.reconnect requires a botId.';
return exactKeys(payload, ['botId', 'sendTest'])
&& validId(payload.botId)
&& (payload.sendTest === undefined || payload.sendTest === true)
? null : 'bot.reconnect requires a botId and accepts only sendTest=true.';
}
if (endpoint === QQ_ENDPOINTS.deleteBot) {
return exactKeys(payload, ['botId', 'confirm']) && validId(payload.botId) && payload.confirm === true
@ -125,7 +132,33 @@ export function createQqRpcHandler(controller, { encodeQr = qrDataUrl } = {}) {
} else if (endpoint === QQ_ENDPOINTS.bindCredentials) {
value = await publicStatus(await controller.bindCredentials(payload), cachedEncode);
} else if (endpoint === QQ_ENDPOINTS.reconnectBot) {
value = await publicStatus(await controller.reconnectBot(payload.botId), cachedEncode);
const snapshot = await controller.reconnectBot(payload.botId);
if (signal?.aborted) {
return { ok: false, error: { code: 'cancelled', message: 'The request was cancelled.' } };
}
let testMessage;
if (payload.sendTest === true) {
const connected = snapshot?.bots?.some(
(bot) => bot?.botId === payload.botId && bot?.connected === true,
) === true;
if (!connected || typeof controller.sendConnectionTest !== 'function') {
testMessage = publicConnectionTestResult(
connectionTestTargetUnavailable('QQ机器人'),
);
} else {
let testError = null;
try {
await controller.sendConnectionTest(payload.botId);
} catch (error) {
testError = error;
}
testMessage = publicConnectionTestResult(testError);
}
}
value = await publicStatus({
...snapshot,
...(testMessage ? { testMessage } : {}),
}, cachedEncode);
} else if (endpoint === QQ_ENDPOINTS.setWorkspace) {
if (typeof controller.updateWorkspace !== 'function') throw new Error('Workspace update is unavailable');
value = await publicStatus(

26
plugin-src/host/channels/shared/rpc.mjs
View file

@ -1,4 +1,5 @@
import { resolveRpcAuthority } from '../../rpc-authority.mjs';
import { publicConnectionTestResult } from '../../../../src/channels/shared/connection-test.mjs';
import {
publicWorkspaceError,
SET_WORKSPACE_ENDPOINT,
@ -44,7 +45,8 @@ function payloadFailure(endpoint, payload) {
? null : 'bot.bind-credentials requires a Bot Token.';
}
if (endpoint === TOKEN_BOT_ENDPOINTS.reconnectBot) {
return exactKeys(payload, ['botId']) && validId(payload.botId)
return exactKeys(payload, ['botId', 'sendTest']) && validId(payload.botId)
&& (payload.sendTest === undefined || typeof payload.sendTest === 'boolean')
? null : 'bot.reconnect requires a botId.';
}
if (endpoint === TOKEN_BOT_ENDPOINTS.deleteBot) {
@ -105,6 +107,28 @@ export function createTokenBotRpcHandler(controller, { channel }) {
value = await controller.bindCredentials(payload);
} else if (endpoint === TOKEN_BOT_ENDPOINTS.reconnectBot) {
value = await controller.reconnectBot(payload.botId);
if (signal?.aborted) {
return { ok: false, error: { code: 'cancelled', message: 'The request was cancelled.' } };
}
if (payload.sendTest === true) {
let testError = null;
try {
if (value?.bots?.find((bot) => bot?.botId === payload.botId)?.connected !== true) {
const unavailable = new Error('Bot is not connected');
unavailable.code = 'test-target-unavailable';
throw unavailable;
}
if (typeof controller.sendConnectionTest !== 'function') {
const unavailable = new Error('Connection test is unavailable');
unavailable.code = 'test-target-unavailable';
throw unavailable;
}
await controller.sendConnectionTest(payload.botId);
} catch (error) {
testError = error;
}
value = { ...value, testMessage: publicConnectionTestResult(testError) };
}
} else if (endpoint === TOKEN_BOT_ENDPOINTS.setWorkspace) {
if (typeof controller.updateWorkspace !== 'function') throw new Error('Workspace update is unavailable');
value = await controller.updateWorkspace(payload.botId, payload.workspace);

30
plugin-src/host/channels/slack/rpc.mjs
View file

@ -1,4 +1,5 @@
import { resolveRpcAuthority } from '../../rpc-authority.mjs';
import { publicConnectionTestResult } from '../../../../src/channels/shared/connection-test.mjs';
import {
publicWorkspaceError,
SET_WORKSPACE_ENDPOINT,
@ -53,7 +54,8 @@ function payloadFailure(endpoint, payload) {
? null : 'bot.bind-credentials requires xoxb Bot Token and xapp App Token.';
}
if (endpoint === SLACK_ENDPOINTS.reconnectBot) {
return exactKeys(payload, ['botId']) && validId(payload.botId)
return exactKeys(payload, ['botId', 'sendTest']) && validId(payload.botId)
&& (payload.sendTest === undefined || typeof payload.sendTest === 'boolean')
? null : 'bot.reconnect requires a botId.';
}
if (endpoint === SLACK_ENDPOINTS.deleteBot) {
@ -114,7 +116,31 @@ export function createSlackRpcHandler(controller) {
let value;
if (endpoint === SLACK_ENDPOINTS.status) value = await controller.status();
else if (endpoint === SLACK_ENDPOINTS.bindCredentials) value = await controller.bindCredentials(payload);
else if (endpoint === SLACK_ENDPOINTS.reconnectBot) value = await controller.reconnectBot(payload.botId);
else if (endpoint === SLACK_ENDPOINTS.reconnectBot) {
value = await controller.reconnectBot(payload.botId);
if (signal?.aborted) {
return { ok: false, error: { code: 'cancelled', message: 'The request was cancelled.' } };
}
if (payload.sendTest === true) {
let testError = null;
try {
if (value?.bots?.find((bot) => bot?.botId === payload.botId)?.connected !== true) {
const unavailable = new Error('Bot is not connected');
unavailable.code = 'test-target-unavailable';
throw unavailable;
}
if (typeof controller.sendConnectionTest !== 'function') {
const unavailable = new Error('Connection test is unavailable');
unavailable.code = 'test-target-unavailable';
throw unavailable;
}
await controller.sendConnectionTest(payload.botId);
} catch (error) {
testError = error;
}
value = { ...value, testMessage: publicConnectionTestResult(testError) };
}
}
else if (endpoint === SLACK_ENDPOINTS.setWorkspace) {
if (typeof controller.updateWorkspace !== 'function') throw new Error('Workspace update is unavailable');
value = await controller.updateWorkspace(payload.botId, payload.workspace);

33
plugin-src/host/channels/wecom/rpc.mjs
View file

@ -1,6 +1,10 @@
import QRCode from 'qrcode';
import { resolveRpcAuthority } from '../../rpc-authority.mjs';
import { publicWorkspaceError, SET_WORKSPACE_ENDPOINT, validWorkspacePayload } from '../shared/workspace-rpc.mjs';
import {
connectionTestTargetUnavailable,
publicConnectionTestResult,
} from '../../../../src/channels/shared/connection-test.mjs';
export const WECOM_RPC_CHANNEL = '/wecom';
export const WECOM_ENDPOINTS = Object.freeze({
@ -53,7 +57,10 @@ function payloadFailure(endpoint, payload) {
? null : 'bot.bind-credentials requires Bot ID and Secret.';
}
if (endpoint === WECOM_ENDPOINTS.reconnectBot) {
return exactKeys(payload, ['botId']) && validId(payload.botId) ? null : 'bot.reconnect requires a botId.';
return exactKeys(payload, ['botId', 'sendTest'])
&& validId(payload.botId)
&& (payload.sendTest === undefined || payload.sendTest === true)
? null : 'bot.reconnect requires a botId and optional sendTest=true.';
}
if (endpoint === WECOM_ENDPOINTS.deleteBot) {
return exactKeys(payload, ['botId', 'confirm']) && validId(payload.botId) && payload.confirm === true
@ -130,7 +137,29 @@ export function createWecomRpcHandler(controller, { encodeQr = qrDataUrl } = {})
} else if (endpoint === WECOM_ENDPOINTS.bindCredentials) {
value = await publicStatus(await controller.bindCredentials(payload), cachedEncode);
} else if (endpoint === WECOM_ENDPOINTS.reconnectBot) {
value = await publicStatus(await controller.reconnectBot(payload.botId), cachedEncode);
const snapshot = await controller.reconnectBot(payload.botId);
if (signal?.aborted) {
return { ok: false, error: { code: 'cancelled', message: 'The request was cancelled.' } };
}
let testMessage;
if (payload.sendTest === true) {
const connected = snapshot?.bots?.some(
(bot) => bot?.botId === payload.botId && bot?.connected === true,
);
if (!connected || typeof controller.sendConnectionTest !== 'function') {
testMessage = publicConnectionTestResult(
connectionTestTargetUnavailable('企业微信机器人'),
);
} else {
try {
await controller.sendConnectionTest(payload.botId);
testMessage = publicConnectionTestResult();
} catch (error) {
testMessage = publicConnectionTestResult(error);
}
}
}
value = await publicStatus({ ...snapshot, ...(testMessage ? { testMessage } : {}) }, cachedEncode);
} else if (endpoint === WECOM_ENDPOINTS.setWorkspace) {
if (typeof controller.updateWorkspace !== 'function') throw new Error('Workspace update is unavailable');
value = await publicStatus(

32
plugin-src/host/channels/weixin/rpc.mjs
View file

@ -5,6 +5,10 @@ import {
SET_WORKSPACE_ENDPOINT,
validWorkspacePayload,
} from '../shared/workspace-rpc.mjs';
import {
connectionTestTargetUnavailable,
publicConnectionTestResult,
} from '../../../../src/channels/shared/connection-test.mjs';
export const WEIXIN_RPC_CHANNEL = '/weixin';
export const WEIXIN_ENDPOINTS = Object.freeze({
@ -55,9 +59,11 @@ function payloadFailure(endpoint, payload) {
: 'provision.verify requires an attemptId and a 4-to-8-digit code.';
}
if (endpoint === WEIXIN_ENDPOINTS.reconnectBot) {
return exactKeys(payload, ['botId']) && validId(payload.botId)
return exactKeys(payload, ['botId', 'sendTest'])
&& validId(payload.botId)
&& (payload.sendTest === undefined || payload.sendTest === true)
? null
: 'bot.reconnect requires a botId.';
: 'bot.reconnect requires a botId and optional sendTest=true.';
}
if (endpoint === WEIXIN_ENDPOINTS.deleteBot) {
return exactKeys(payload, ['botId', 'confirm']) && validId(payload.botId) && payload.confirm === true
@ -165,7 +171,27 @@ export function createWeixinRpcHandler(controller, { encodeQr = qrDataUrl } = {}
value = await controller.cancelProvisioning(payload.attemptId);
if (!value) return badRequest('The provisioning attempt no longer exists.');
} else if (endpoint === WEIXIN_ENDPOINTS.reconnectBot) {
value = await publicStatus(await controller.reconnectBot(payload.botId), cachedEncode);
const snapshot = await controller.reconnectBot(payload.botId);
if (signal?.aborted) return cancelled();
let testMessage;
if (payload.sendTest === true) {
const connected = snapshot?.bots?.some(
(bot) => bot?.botId === payload.botId && bot?.connected === true,
);
if (!connected || typeof controller.sendConnectionTest !== 'function') {
testMessage = publicConnectionTestResult(
connectionTestTargetUnavailable('微信机器人'),
);
} else {
try {
await controller.sendConnectionTest(payload.botId);
testMessage = publicConnectionTestResult();
} catch (error) {
testMessage = publicConnectionTestResult(error);
}
}
}
value = await publicStatus({ ...snapshot, ...(testMessage ? { testMessage } : {}) }, cachedEncode);
} else if (endpoint === WEIXIN_ENDPOINTS.setWorkspace) {
if (typeof controller.updateWorkspace !== 'function') throw new Error('Workspace update is unavailable');
value = await publicStatus(

34
plugin-src/host/channels/whatsapp/rpc.mjs
View file

@ -1,5 +1,6 @@
import QRCode from 'qrcode';
import { publicConnectionTestResult } from '../../../../src/channels/shared/connection-test.mjs';
import { resolveRpcAuthority } from '../../rpc-authority.mjs';
import { publicWorkspaceError, SET_WORKSPACE_ENDPOINT, validWorkspacePayload } from '../shared/workspace-rpc.mjs';
@ -39,8 +40,9 @@ function payloadFailure(endpoint, payload) {
? null : `${endpoint} requires an attemptId.`;
}
if (endpoint === WHATSAPP_ENDPOINTS.reconnectBot) {
return exactKeys(payload, ['botId']) && validId(payload.botId)
? null : 'bot.reconnect requires a botId.';
return exactKeys(payload, ['botId', 'sendTest']) && validId(payload.botId)
&& (payload.sendTest === undefined || typeof payload.sendTest === 'boolean')
? null : 'bot.reconnect requires a botId and optional sendTest flag.';
}
if (endpoint === WHATSAPP_ENDPOINTS.deleteBot) {
return exactKeys(payload, ['botId', 'confirm']) && validId(payload.botId)
@ -119,7 +121,33 @@ export function createWhatsappRpcHandler(controller, { encodeQr = qrDataUrl } =
} else if (endpoint === WHATSAPP_ENDPOINTS.cancelProvisioning) {
value = sanitizePublic(await controller.cancelProvisioning(payload.attemptId));
} else if (endpoint === WHATSAPP_ENDPOINTS.reconnectBot) {
value = await publicStatus(await controller.reconnectBot(payload.botId), cachedEncode);
const checked = await controller.reconnectBot(payload.botId);
if (signal?.aborted) {
return { ok: false, error: { code: 'cancelled', message: 'The request was cancelled.' } };
}
value = await publicStatus(checked, cachedEncode);
if (payload.sendTest === true) {
let testError = null;
const connected = checked?.bots?.some(
(bot) => bot?.botId === payload.botId && bot.connected === true,
) === true;
if (!connected) {
testError = new Error('WhatsApp bot is not connected');
testError.code = 'test-target-unavailable';
} else {
try {
if (typeof controller.sendConnectionTest !== 'function') {
const unavailable = new Error('Connection test is unavailable');
unavailable.code = 'test-target-unavailable';
throw unavailable;
}
await controller.sendConnectionTest(payload.botId);
} catch (error) {
testError = error;
}
}
value = { ...value, testMessage: publicConnectionTestResult(testError) };
}
} else if (endpoint === WHATSAPP_ENDPOINTS.setWorkspace) {
if (typeof controller.updateWorkspace !== 'function') throw new Error('Workspace update is unavailable');
value = await publicStatus(