dsh-dingtalk 0.3.6 → 0.3.8

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/lib/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { registerUpdates } from '@stardustlc/dsh-updates';
2
- import { resolveDingTalkConfig } from './config.js';
2
+ import { describeWebhookProblem, resolveDingTalkConfig, DINGTALK_SECRET_ENV } from './config.js';
3
3
  import { DingTalkClient } from './client.js';
4
4
  export const name = 'tool-dingtalk';
5
5
  export const inject = ['tools'];
@@ -41,11 +41,15 @@ function executionSignal(exec) {
41
41
  const signal = exec?.signal;
42
42
  return signal instanceof AbortSignal ? signal : undefined;
43
43
  }
44
+ /**
45
+ * 成功回执只留用户需要的信息:发到哪、发了什么标题。
46
+ * 原来把 errcode=0 / errmsg=ok 也摆出来,属于协议噪声;错误路径由 client 抛中文指引。
47
+ */
44
48
  function renderNotify(value) {
45
49
  if (value.msgtype === 'markdown') {
46
- return oneText('已通过钉钉机器人发送 Markdown 消息(标题「' + value.title + '」),钉钉返回 errcode=' + value.errcode + ',errmsg=' + value.errmsg);
50
+ return oneText('已发送 Markdown 消息到钉钉群(标题「' + value.title + '」)。如需核对,请查看群消息。');
47
51
  }
48
- return oneText('已通过钉钉机器人发送文本消息,钉钉返回 errcode=' + value.errcode + ',errmsg=' + value.errmsg);
52
+ return oneText('已发送文本消息到钉钉群。如需核对,请查看群消息。');
49
53
  }
50
54
  export function apply(ctx, config = {}) {
51
55
  registerUpdates(ctx, { name: "dsh-dingtalk" });
@@ -82,9 +86,9 @@ export function apply(ctx, config = {}) {
82
86
  async execute(rawArgs, exec) {
83
87
  const args = rawArgs;
84
88
  if (typeof args.title !== 'string' || args.title.trim() === '')
85
- throw new Error('title 不能为空');
89
+ throw new Error('title 不能为空:请提供显示在钉钉卡片顶部的消息标题。');
86
90
  if (typeof args.text !== 'string' || args.text.trim() === '')
87
- throw new Error('text 不能为空');
91
+ throw new Error('text 不能为空:请提供 Markdown 正文(钉钉单条消息有长度上限,过长请分段发送)。');
88
92
  const result = await getClient().sendMarkdown(args.title, args.text, executionSignal(exec));
89
93
  return { ok: true, msgtype: 'markdown', title: args.title, errcode: result.errcode, errmsg: result.errmsg };
90
94
  },
@@ -103,7 +107,7 @@ export function apply(ctx, config = {}) {
103
107
  async execute(rawArgs, exec) {
104
108
  const args = rawArgs;
105
109
  if (typeof args.content !== 'string' || args.content.trim() === '')
106
- throw new Error('content 不能为空');
110
+ throw new Error('content 不能为空:请提供要发送的纯文本内容。');
107
111
  const result = await getClient().sendText(args.content, executionSignal(exec));
108
112
  return { ok: true, msgtype: 'text', title: '', errcode: result.errcode, errmsg: result.errmsg };
109
113
  },
@@ -122,26 +126,46 @@ export function apply(ctx, config = {}) {
122
126
  const c = (item ?? {});
123
127
  lines.push('- ' + String(c.name) + ':' + (c.ok === true ? '✅ ' + String(c.detail ?? '') : '❌ ' + String(c.detail ?? '')));
124
128
  }
129
+ if (rec.ok !== true) {
130
+ lines.push('', '下一步:');
131
+ lines.push(' · 在 profile 的 cordis.patch.yml 里覆盖 tool-dingtalk 行,填完整 webhook(含 access_token);secret 建议放环境变量 DSH_DINGTALK_SECRET,改完重启 DSH。');
132
+ lines.push(' · 发送失败时先看错误里的钉钉 errcode:310000 是加签不匹配,120001 是 token 失效,按提示改配置后重新运行 dingtalk_health。');
133
+ }
125
134
  return oneText(lines.join('\n'));
126
135
  },
127
136
  },
128
137
  async execute() {
129
138
  const checks = [];
130
139
  let ok = true;
140
+ // 自检只做本地校验:既不发消息,也不触网,避免「自检」把告警群刷屏。
141
+ const webhook = typeof config?.webhook === 'string' ? config.webhook.trim() : '';
142
+ const webhookProblem = describeWebhookProblem(webhook);
143
+ if (webhookProblem === undefined) {
144
+ checks.push({ name: 'webhook', ok: true, detail: '已配置(https://oapi.dingtalk.com/robot/send?access_token=***)' });
145
+ }
146
+ else {
147
+ ok = false;
148
+ checks.push({ name: 'webhook', ok: false, detail: webhookProblem + ':请从钉钉群「自定义机器人」设置里复制完整地址,填到 tool-dingtalk 行的 webhook 后重启' });
149
+ }
150
+ const configuredSecret = typeof config?.secret === 'string' ? config.secret.trim() : '';
151
+ const envSecret = (process.env[DINGTALK_SECRET_ENV] ?? '').trim();
152
+ if (configuredSecret !== '')
153
+ checks.push({ name: '加签密钥', ok: true, detail: '已配置(加签模式,来源:配置里的 secret)' });
154
+ else if (envSecret !== '')
155
+ checks.push({ name: '加签密钥', ok: true, detail: '已配置(加签模式,来源:环境变量 ' + DINGTALK_SECRET_ENV + ')' });
156
+ else
157
+ checks.push({ name: '加签密钥', ok: true, detail: '未配置(关键词/IP 白名单模式;若机器人开启加签,发送会返回 310000)' });
131
158
  try {
132
159
  const resolved = resolveDingTalkConfig(config);
133
- checks.push({ name: 'webhook', ok: true, detail: '已配置' });
134
- const secret = resolved.secret;
135
- checks.push({ name: '加签密钥', ok: true, detail: typeof secret === 'string' && secret !== '' ? '已配置(加签模式)' : '未配置(关键词/白名单模式)' });
160
+ checks.push({ name: '请求超时', ok: true, detail: resolved.timeoutMs + 'ms(1000-60000,可用 timeoutMs 调整)' });
136
161
  }
137
- catch (error) {
138
- ok = false;
139
- checks.push({ name: 'webhook', ok: false, detail: error instanceof Error ? error.message : String(error) });
162
+ catch {
163
+ checks.push({ name: '请求超时', ok: true, detail: '默认 10000ms(webhook 未就绪时不做完整解析)' });
140
164
  }
141
165
  return { ok, plugin: 'dsh-dingtalk', checks };
142
166
  },
143
167
  });
144
168
  }
145
- export { resolveDingTalkConfig, DINGTALK_SECRET_ENV, DEFAULT_TIMEOUT_MS, clampInt } from './config.js';
169
+ export { resolveDingTalkConfig, describeWebhookProblem, DINGTALK_SECRET_ENV, DEFAULT_TIMEOUT_MS, clampInt } from './config.js';
146
170
  export { DingTalkClient, DingTalkError, dingTalkErrorMessage } from './client.js';
147
171
  export { computeDingTalkSign, signedUrl, dingTalkTimestamp } from './sign.js';
@@ -437,7 +437,7 @@ function __stardustUpdatesClient(ctx, React, require, shared) {
437
437
  }
438
438
 
439
439
  /* STARDUSTLC_UPDATE_CLIENT_BODY_START */
440
- window.__ModuleLoader__.load(__stardustUpdatesWrap({id:"dsh-dingtalk",factory:require=>({apply(){}})},{"name":"dsh-dingtalk","version":"0.1.0","hasWorkbench":false,"packageVersion":"0.3.6","label":"钉钉","labelEn":"DingTalk","suiteComponent":true}));
440
+ window.__ModuleLoader__.load(__stardustUpdatesWrap({id:"dsh-dingtalk",factory:require=>({apply(){}})},{"name":"dsh-dingtalk","version":"0.1.0","hasWorkbench":false,"packageVersion":"0.3.8","label":"钉钉","labelEn":"DingTalk","suiteComponent":true}));
441
441
 
442
442
  /* STARDUSTLC_UPDATE_CLIENT_BODY_END */
443
443
  })();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-dingtalk",
3
- "version": "0.3.6",
3
+ "version": "0.3.8",
4
4
  "description": "DSH 钉钉通知:向自定义群机器人发送文本或 Markdown,支持签名配置与自检。欢迎提交 issues 和 PR。",
5
5
  "type": "module",
6
6
  "main": "lib/index.js",
@@ -29,8 +29,8 @@
29
29
  ],
30
30
  "scripts": {
31
31
  "build": "tsc && node scripts/build-updates.mjs",
32
- "prepublishOnly": "pnpm run build",
33
- "test": "pnpm run build && node --test \"test/*.test.mjs\""
32
+ "prepublishOnly": "npm run build",
33
+ "test": "npm run build && node --test \"test/*.test.mjs\""
34
34
  },
35
35
  "keywords": [
36
36
  "dsh-plugin",