dsh-dingtalk 0.2.2 → 0.3.0

package/lib/client.d.ts

@@ -27,8 +27,8 @@ export declare class DingTalkClient {
     private readonly fetchImpl;
     constructor(options: DingTalkClientOptions);
     /** 发送 Markdown 消息：{ msgtype: 'markdown', markdown: { title, text } } */
-    sendMarkdown(title: string, text: string): Promise<DingTalkSendResult>;
+    sendMarkdown(title: string, text: string, signal?: AbortSignal): Promise<DingTalkSendResult>;
     /** 发送纯文本消息：{ msgtype: 'text', text: { content } } */
-    sendText(content: string): Promise<DingTalkSendResult>;
+    sendText(content: string, signal?: AbortSignal): Promise<DingTalkSendResult>;
     private post;
 }

package/lib/client.js

@@ -31,52 +31,64 @@ export class DingTalkClient {
         this.fetchImpl = options.fetchImpl ?? defaultFetch;
     }
     /** 发送 Markdown 消息：{ msgtype: 'markdown', markdown: { title, text } } */
-    async sendMarkdown(title, text) {
-        return this.post({ msgtype: 'markdown', markdown: { title, text } });
+    async sendMarkdown(title, text, signal) {
+        return this.post({ msgtype: 'markdown', markdown: { title, text } }, signal);
     }
     /** 发送纯文本消息：{ msgtype: 'text', text: { content } } */
-    async sendText(content) {
-        return this.post({ msgtype: 'text', text: { content } });
+    async sendText(content, signal) {
+        return this.post({ msgtype: 'text', text: { content } }, signal);
     }
-    async post(payload) {
+    async post(payload, signal) {
+        signal?.throwIfAborted();
         const url = signedUrl(this.webhook, this.secret || undefined);
+        const parsedUrl = new URL(url);
+        const redact = (text) => [url, this.webhook, this.secret, parsedUrl.searchParams.get('access_token'), parsedUrl.searchParams.get('sign')]
+            .filter((value) => typeof value === 'string' && value !== '')
+            .reduce((safe, value) => safe.replaceAll(value, '[已隐藏]').replaceAll(encodeURIComponent(value), '[已隐藏]'), text);
         const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(), this.timeoutMs);
-        let response;
+        const requestSignal = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
+        const timer = setTimeout(() => controller.abort(new Error('请求超时')), this.timeoutMs);
         try {
-            response = await this.fetchImpl(url, {
+            const response = await this.fetchImpl(url, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(payload),
-                signal: controller.signal,
+                signal: requestSignal,
             });
+            requestSignal.throwIfAborted();
+            if (!response.ok) {
+                const body = await response.text().catch(() => '');
+                requestSignal.throwIfAborted();
+                throw new DingTalkError('钉钉机器人返回 HTTP ' + response.status + '：' + body.slice(0, 200));
+            }
+            let body;
+            try {
+                body = await response.json();
+            }
+            catch (error) {
+                requestSignal.throwIfAborted();
+                throw new DingTalkError('钉钉机器人返回非 JSON 响应（HTTP ' + response.status + '）');
+            }
+            requestSignal.throwIfAborted();
+            const result = body;
+            if (!Number.isSafeInteger(result?.errcode))
+                throw new DingTalkError('钉钉机器人返回格式异常：缺少 errcode');
+            if (result.errcode !== 0)
+                throw new DingTalkError(dingTalkErrorMessage(result.errcode, result.errmsg ?? ''), result.errcode);
+            return result;
         }
         catch (error) {
+            signal?.throwIfAborted();
+            if (controller.signal.aborted)
+                throw new DingTalkError('钉钉机器人请求超时，尚未确认远端是否收到；请先核对群消息，再决定是否重发。');
+            if (error instanceof DingTalkError)
+                throw new DingTalkError(redact(error.message), error.errcode);
             const message = error instanceof Error ? error.message : String(error);
-            const hint = /abort/i.test(message) ? '（请求超时）' : '';
-            throw new DingTalkError('钉钉机器人请求失败' + hint + '：' + message);
+            const safe = redact(message);
+            throw new DingTalkError('钉钉机器人请求失败：' + safe);
         }
         finally {
             clearTimeout(timer);
         }
-        if (!response.ok) {
-            const body = await response.text().catch(() => '');
-            throw new DingTalkError('钉钉机器人返回 HTTP ' + response.status + '：' + body.slice(0, 200));
-        }
-        let body;
-        try {
-            body = await response.json();
-        }
-        catch {
-            throw new DingTalkError('钉钉机器人返回非 JSON 响应（HTTP ' + response.status + '）');
-        }
-        const result = body;
-        if (typeof result?.errcode !== 'number') {
-            throw new DingTalkError('钉钉机器人返回格式异常：缺少 errcode');
-        }
-        if (result.errcode !== 0) {
-            throw new DingTalkError(dingTalkErrorMessage(result.errcode, result.errmsg ?? ''), result.errcode);
-        }
-        return result;
     }
 }

package/lib/index.js

@@ -1,3 +1,4 @@
+import { registerUpdates } from '@stardustlc/dsh-updates';
 import { resolveDingTalkConfig } from './config.js';
 import { DingTalkClient } from './client.js';
 export const name = 'tool-dingtalk';
@@ -36,6 +37,10 @@ const notifySchema = {
 function oneText(text) {
     return [{ type: 'text', text }];
 }
+function executionSignal(exec) {
+    const signal = exec?.signal;
+    return signal instanceof AbortSignal ? signal : undefined;
+}
 function renderNotify(value) {
     if (value.msgtype === 'markdown') {
         return oneText('已通过钉钉机器人发送 Markdown 消息（标题「' + value.title + '」），钉钉返回 errcode=' + value.errcode + '，errmsg=' + value.errmsg);
@@ -43,6 +48,7 @@ function renderNotify(value) {
     return oneText('已通过钉钉机器人发送文本消息，钉钉返回 errcode=' + value.errcode + '，errmsg=' + value.errmsg);
 }
 export function apply(ctx, config = {}) {
+    registerUpdates(ctx, { name: "dsh-dingtalk" });
     let client = null;
     let fingerprint = '';
     const getClient = () => {
@@ -72,13 +78,14 @@ export function apply(ctx, config = {}) {
             schema: notifySchema,
             render: (_args, value) => renderNotify(value),
         },
-        async execute(rawArgs) {
+        timeoutMs: 65000,
+        async execute(rawArgs, exec) {
             const args = rawArgs;
             if (typeof args.title !== 'string' || args.title.trim() === '')
                 throw new Error('title 不能为空');
             if (typeof args.text !== 'string' || args.text.trim() === '')
                 throw new Error('text 不能为空');
-            const result = await getClient().sendMarkdown(args.title, args.text);
+            const result = await getClient().sendMarkdown(args.title, args.text, executionSignal(exec));
             return { ok: true, msgtype: 'markdown', title: args.title, errcode: result.errcode, errmsg: result.errmsg };
         },
     });
@@ -92,11 +99,12 @@ export function apply(ctx, config = {}) {
             schema: notifySchema,
             render: (_args, value) => renderNotify(value),
         },
-        async execute(rawArgs) {
+        timeoutMs: 65000,
+        async execute(rawArgs, exec) {
             const args = rawArgs;
             if (typeof args.content !== 'string' || args.content.trim() === '')
                 throw new Error('content 不能为空');
-            const result = await getClient().sendText(args.content);
+            const result = await getClient().sendText(args.content, executionSignal(exec));
             return { ok: true, msgtype: 'text', title: '', errcode: result.errcode, errmsg: result.errmsg };
         },
     });