Compare commits

..

10 Commits

Author SHA1 Message Date
d1c5760329 chore: 更新Dockerfile添加镜像更新脚本并运行
All checks were successful
Build Server / Compile DLL (push) Successful in 10m13s
- 更新Dockerfile以添加镜像更新脚本并运行以确保获取最新的镜像。
2025-07-19 15:40:32 +08:00
95b658527a chore: 优化Docker构建流程删除缓存命令
Some checks failed
Build Server / Compile DLL (push) Failing after 2m24s
- 删除清理缓存的命令以优化Docker构建过程。
2025-07-19 15:26:36 +08:00
64347726f0 fix: 修复清理缓存路径中的环境变量问题
Some checks failed
Build Server / Compile DLL (push) Has been cancelled
- 修复清理缓存路径中的环境变量问题以确保脚本有效运行。
2025-07-19 15:25:57 +08:00
b96edf83a5 refactor: 优化容器缓存清理逻辑
Some checks failed
Build Server / Compile DLL (push) Failing after 2m39s
- 优化容器缓存清理逻辑,增加对Pacman和Yay缓存的清除。
2025-07-18 23:02:31 +08:00
97b4c38863 feat: 添加数据验证功能确保图像有效性
Some checks failed
Build Server / Compile DLL (push) Failing after 1m54s
- 在项目依赖中添加了@hono/zod-validator和zod包。
- 添加依赖库"@hono/zod-validator"和"zod"以增强数据验证功能。
- 添加了请求验证以确保提供了有效的图像文件。
2025-07-18 22:50:23 +08:00
7fca8d8df6 Update Dockerfile
All checks were successful
Build Server / Compile DLL (push) Successful in 4m1s
2025-07-09 00:08:05 -04:00
79e1da12e8 refactor: 优化临时文件命名以提高一致性
All checks were successful
Build Server / Compile DLL (push) Successful in 3m56s
- 优化临时文件命名后缀以提高一致性和通用性。
2025-07-08 01:21:49 +08:00
721bd2bb5c 优化Dockerfile,添加清理缓存和临时文件步骤。
All checks were successful
Build Server / Compile DLL (push) Successful in 3m56s
2025-07-08 01:17:25 +08:00
fffa977d18 chore: 简化Docker镜像标签命名格式
All checks were successful
Build Server / Compile DLL (push) Successful in 4m14s
- 调整Docker镜像标签格式,移除架构信息以简化标签命名。
2025-07-08 01:01:16 +08:00
eaa8ae41d5 chore: 增强构建环境功能,添加git安装
All checks were successful
Build Server / Compile DLL (push) Successful in 4m38s
- 添加git安装以增强构建环境功能。
2025-07-08 00:54:52 +08:00
6 changed files with 37 additions and 24 deletions

View File

@@ -34,4 +34,4 @@ jobs:
context: .
file: Dockerfile
push: true
tags: ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-${{ env.ARCH }}
tags: ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest

View File

@@ -1,16 +1,19 @@
FROM archlinux:base-devel AS lib
WORKDIR /src
RUN pacman -Syu --noconfirm cmake python nodejs && \
RUN pacman -Syu --noconfirm git cmake python nodejs && \
git clone https://github.com/swigger/wechat-ocr.git wcocr && \
sed -i 's/v3.21.0/v3.21.2/g' wcocr/CMakeLists.txt && \
mkdir -p wcocr/build && cd wcocr/build && cmake .. && make -j$(nproc)
FROM greyltc/archlinux-aur:yay AS runner
WORKDIR /app
RUN aur-install bun-bin wechat-bin
COPY . .
COPY --from=lib /src/wcocr/build/libwcocr.so .
RUN bun install --frozen-lockfile
# update mirrorlist
ADD https://raw.githubusercontent.com/greyltc/docker-archlinux/master/get-new-mirrors.sh /usr/bin/get-new-mirrors
RUN chmod +x /usr/bin/get-new-mirrors && \
get-new-mirrors
RUN aur-install bun-bin wechat-bin && \
bun install --frozen-lockfile
EXPOSE 3000

View File

@@ -4,7 +4,9 @@
"": {
"name": "wxocr",
"dependencies": {
"@hono/zod-validator": "^0.7.1",
"hono": "^4.8.4",
"zod": "^4.0.5",
},
"devDependencies": {
"@antfu/eslint-config": "^4.16.2",
@@ -67,6 +69,8 @@
"@eslint/plugin-kit": ["@eslint/plugin-kit@0.3.3", "", { "dependencies": { "@eslint/core": "^0.15.1", "levn": "^0.4.1" } }, "sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag=="],
"@hono/zod-validator": ["@hono/zod-validator@0.7.1", "", { "peerDependencies": { "hono": ">=3.9.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-8+vJT1RvezAx5sN7hiZ5Mis0RMuFL77nBEcqQQgT9ufoLkxr+7ll461WlBJQcGoQSY6EGMClVae19v3s/7bbgQ=="],
"@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="],
"@humanfs/node": ["@humanfs/node@0.16.6", "", { "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" } }, "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw=="],
@@ -633,6 +637,8 @@
"yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
"zod": ["zod@4.0.5", "", {}, "sha512-/5UuuRPStvHXu7RS+gmvRf4NXrNxpSllGwDnCBcJZtQsKrviYXm54yDGV2KYNLT5kq0lHGcl7lqWJLgSaG+tgA=="],
"zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
"@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="],

View File

@@ -11,7 +11,9 @@
"typescript": "^5.8.3"
},
"dependencies": {
"hono": "^4.8.4"
"@hono/zod-validator": "^0.7.1",
"hono": "^4.8.4",
"zod": "^4.0.5"
},
"devDependencies": {
"@antfu/eslint-config": "^4.16.2",

View File

@@ -1,28 +1,31 @@
import { zValidator } from '@hono/zod-validator'
import { Hono } from 'hono'
import { Buffer } from 'node:buffer'
import { z } from 'zod'
import { WechatOCRClient } from './wcocr'
const app = new Hono()
const client = new WechatOCRClient()
app.post('/ocr', async (c) => {
const formData = await c.req.formData()
const imageFile = formData.get('image')
app.post(
'/ocr',
zValidator('form', z.object({
image: z.instanceof(File, { message: 'Image file is required' }),
})),
async (c) => {
const { image } = c.req.valid('form')
if (!imageFile || typeof imageFile === 'string') {
return c.json({ error: 'Image file is required' }, 400)
}
const imageBuffer = Buffer.from(await image.arrayBuffer())
const imageBuffer = Buffer.from(await imageFile.arrayBuffer())
try {
const result = await client.recognize(imageBuffer)
return c.json(JSON.parse(result))
} catch (error) {
console.error('OCR processing error:', error)
return c.json({ error: 'Failed to process image' }, 500)
}
})
try {
const result = await client.recognize(imageBuffer)
return c.json(JSON.parse(result))
} catch (error) {
console.error('OCR processing error:', error)
return c.json({ error: 'Failed to process image' }, 500)
}
},
)
export default app

View File

@@ -65,7 +65,7 @@ export class WechatOCRClient {
}
public async recognize(image: Buffer): Promise<string> {
const tempPath = join(tmpdir(), `wechat-ocr-temp-${randomBytes(16).toString('hex')}.png`)
const tempPath = join(tmpdir(), `wechat-ocr-${randomBytes(16).toString('hex')}.tmp`)
await writeFile(tempPath, image)
try {
@@ -78,6 +78,5 @@ export class WechatOCRClient {
public close() {
WechatOCRFFI.symbols.stop_ocr()
console.log('OCR resources cleaned up.')
}
}