Compare commits

...

3 Commits

Author SHA1 Message Date
a203384c2e chore(release): publish
- @egg/lark-msg-tool@1.6.1
2024-10-12 03:06:20 +00:00
cbecd886f4 chore(package): 更新lock文件
All checks were successful
/ release (push) Successful in 27s
2024-10-12 03:05:57 +00:00
850cf6af51 style(lark-msg): 格式化代码
Some checks failed
/ release (push) Failing after 21s
2024-10-12 03:05:20 +00:00
7 changed files with 49 additions and 28 deletions

View File

@ -2,6 +2,9 @@
"cSpell.words": [
"commitlint",
"tseslint",
"Xauthor",
"Xicon",
"Xname",
"yingbo",
"zhaoyingbo"
]

3
package-lock.json generated
View File

@ -12122,11 +12122,10 @@
},
"packages/lark-msg-tool": {
"name": "@egg/lark-msg-tool",
"version": "1.6.0",
"version": "1.6.1",
"license": "ISC",
"dependencies": {
"@egg/logger": "^1.4.3",
"lodash": "*",
"winston": "*"
},
"devDependencies": {

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.6.1](http://yingbo.im:3000/zhaoyingbo/egg_tools/compare/@egg/lark-msg-tool@1.6.0...@egg/lark-msg-tool@1.6.1) (2024-10-12)
**Note:** Version bump only for package @egg/lark-msg-tool
# [1.6.0](http://yingbo.im:3000/zhaoyingbo/egg_tools/compare/@egg/lark-msg-tool@1.5.0...@egg/lark-msg-tool@1.6.0) (2024-10-12)
### Features

View File

@ -1,6 +1,6 @@
{
"name": "@egg/lark-msg-tool",
"version": "1.6.0",
"version": "1.6.1",
"description": "Lark Msg Tools for Egg projects",
"type": "module",
"main": "src/index.ts",
@ -22,7 +22,6 @@
},
"dependencies": {
"@egg/logger": "^1.4.3",
"lodash": "*",
"winston": "*"
}
}

View File

@ -1,4 +1,4 @@
import { LarkEvent, LarkAction } from "../types"
import { LarkAction, LarkEvent } from "../types"
class LarkBody {
protected body: LarkEvent.Data | LarkAction.Data
@ -87,7 +87,9 @@ class LarkBody {
*/
private getMsgText(body: LarkEvent.Data): string {
try {
const { text }: { text: string } = JSON.parse(body?.event?.message?.content)
const { text }: { text: string } = JSON.parse(
body?.event?.message?.content
)
// 去掉@_user_1相关的内容例如 '@_user_1 测试' -> '测试'
const textWithoutAt = text.replace(/@_user_\d+/g, "")
return textWithoutAt
@ -164,4 +166,4 @@ class LarkBody {
}
}
export default LarkBody
export default LarkBody

View File

@ -1,9 +1,13 @@
import logger from "@egg/logger"
import _ from "lodash"
import { Logger } from "winston"
import { baseErrorCard, basePendingCard, baseSuccessCard } from "./component";
type FunctionMap = Record<string, { Xname: string; Xauthor: string, Xicon: string }>
import { baseErrorCard, basePendingCard, baseSuccessCard } from "./component"
type FunctionMap = Record<
string,
{ Xname: string; Xauthor: string; Xicon: string }
>
type CardMap = Record<string, any>
@ -33,7 +37,7 @@ class LarkCard {
requestId: string,
cardMap: CardMap,
tempMap: TempMap,
functionMap: FunctionMap,
functionMap: FunctionMap
) {
this.stringify = stringify
this.requestId = requestId
@ -72,7 +76,14 @@ class LarkCard {
* @returns
*/
child(func: string, stringify: boolean = true) {
return new LarkCard(func, stringify, this.requestId, this.cardMap, this.tempMap, this.functionMap)
return new LarkCard(
func,
stringify,
this.requestId,
this.cardMap,
this.tempMap,
this.functionMap
)
}
/**
@ -83,19 +94,21 @@ class LarkCard {
*/
genCard(
cardKey: keyof typeof this.cardMap,
variables: { [key: string]: any },
variables: { [key: string]: any }
) {
const card = this.cardMap[cardKey]
if (!card) {
this.logger.error(`Card ${cardKey} not found`)
throw new Error(`Card ${cardKey} not found`);
throw new Error(`Card ${cardKey} not found`)
}
const finalVariables: Record<string, any> = {
...variables,
requestId: this.requestId,
...this.functionMap[this.funcName],
}
this.logger.debug(`Card ${cardKey} final variables: ${JSON.stringify(finalVariables)}`)
this.logger.debug(
`Card ${cardKey} final variables: ${JSON.stringify(finalVariables)}`
)
/**
*
@ -133,7 +146,9 @@ class LarkCard {
}
const content = traverseAndReplace(card)
this.logger.debug(`Card ${cardKey} final content: ${JSON.stringify(content)}`)
this.logger.debug(
`Card ${cardKey} final content: ${JSON.stringify(content)}`
)
return this.stringify ? JSON.stringify(content) : content
}
@ -174,14 +189,16 @@ class LarkCard {
const tempId = this.tempMap[tempKey]
if (!tempId) {
this.logger.error(`Temp ${tempKey} not found`)
throw new Error(`Temp ${tempKey} not found`);
throw new Error(`Temp ${tempKey} not found`)
}
const finalVariables: Record<string, any> = {
...variables,
requestId: this.requestId,
...this.functionMap[this.funcName],
}
this.logger.debug(`Temp ${tempKey} final variables: ${JSON.stringify(finalVariables)}`)
this.logger.debug(
`Temp ${tempKey} final variables: ${JSON.stringify(finalVariables)}`
)
const content = {
type: "template",
data: {
@ -193,9 +210,11 @@ class LarkCard {
template_variable: finalVariables,
},
}
this.logger.debug(`Temp ${tempKey} final content: ${JSON.stringify(content)}`)
this.logger.debug(
`Temp ${tempKey} final content: ${JSON.stringify(content)}`
)
return this.stringify ? JSON.stringify(content) : content
}
}
export default LarkCard
export default LarkCard

View File

@ -1,12 +1,7 @@
import _ from "lodash"
import { LarkAction, LarkEvent } from "./types"
import * as CardComponent from "./Card/component"
import LarkCard from "./Card"
import LarkBody from "./Body"
import LarkCard from "./Card"
import * as CardComponent from "./Card/component"
import { LarkAction, LarkEvent } from "./types"
/**
* Options
@ -21,4 +16,4 @@ export const genCardOptions = (options: Record<string, string>) => {
}))
}
export { LarkAction, LarkEvent, CardComponent, LarkCard, LarkBody }
export { CardComponent, LarkAction, LarkBody, LarkCard, LarkEvent }