chore: 更新Dockerfile添加镜像更新脚本并运行

- 更新Dockerfile以添加镜像更新脚本并运行以确保获取最新的镜像。

.gitea/workflows/build.yaml

@@ -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

Dockerfile

@@ -1,18 +1,20 @@
-# FROM greyltc/archlinux-aur:yay AS lib
-# WORKDIR /src
-# RUN yay -Syu --noconfirm 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 archlinux:base-devel AS lib
+WORKDIR /src
+RUN pacman -Syu --noconfirm git cmake python nodejs && \
+    git clone https://github.com/swigger/wechat-ocr.git wcocr && \
+    mkdir -p wcocr/build && cd wcocr/build && cmake .. && make -j$(nproc)
 
-FROM greyltc/archlinux-aur:yay
+FROM greyltc/archlinux-aur:yay AS runner
 WORKDIR /app
+COPY . .
+COPY --from=lib /src/wcocr/build/libwcocr.so .
+# 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 && \
-    echo "Hello World"
-# COPY --from=lib /src/wcocr/build/libwcocr.so .
-# COPY src/index.ts .
-# RUN bun install hono
+    bun install --frozen-lockfile
 
-# EXPOSE 3000
+EXPOSE 3000
 
-# CMD ["bun", "src/index.ts"]
+CMD ["bun", "src/index.ts"]

bun.lock

@@ -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=="],

package.json

@@ -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",

src/index.ts

@@ -1,7 +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.get('/', c => c.text('Hello World'))
+app.post(
+  '/ocr',
+  zValidator('form', z.object({
+    image: z.instanceof(File, { message: 'Image file is required' }),
+  })),
+  async (c) => {
+    const { image } = c.req.valid('form')
+
+    const imageBuffer = Buffer.from(await image.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)
+    }
+  },
+)
 
 export default app

src/wcocr.ts

@@ -2,10 +2,14 @@ import type { Pointer } from 'bun:ffi'
 
 import { CString, dlopen, FFIType, JSCallback, suffix } from 'bun:ffi'
 import { Buffer } from 'node:buffer'
+import { randomBytes } from 'node:crypto'
+import { rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
 
 const libPath = `libwcocr.${suffix}`
 
-const WechatOCR = dlopen(libPath, {
+const WechatOCRFFI = dlopen(libPath, {
   wechat_ocr: {
     args: [
       FFIType.cstring, // ocr_exe路径
@@ -21,59 +25,58 @@ const WechatOCR = dlopen(libPath, {
   },
 })
 
-// 主函数
-async function callWechatOcr(
-  ocrExe: string,
-  wechatDir: string,
-  imgfn: string,
-): Promise<string> {
-  return new Promise((resolve, reject) => {
-    // 创建回调函数
-    const callback = new JSCallback(
-      (argPtr: Pointer) => {
-        const arg = new CString(argPtr).toString()
-        resolve(arg)
-        callback.close() // 释放回调
-      },
-      {
-        args: [FFIType.ptr],
-        returns: FFIType.void,
-      },
-    )
+export class WechatOCRClient {
+  private ocrExe: string
+  private wechatDir: string
 
-    // 调用wechat_ocr函数
-    const result = WechatOCR.symbols.wechat_ocr(
-      Buffer.from(`${ocrExe}\0`), // 转换为C字符串
-      Buffer.from(`${wechatDir}\0`),
-      Buffer.from(`${imgfn}\0`),
-      callback, // 直接传递JSCallback实例
-    )
+  constructor(options?: { ocrExe?: string, wechatDir?: string }) {
+    this.ocrExe = options?.ocrExe ?? '/opt/wechat/wxocr'
+    this.wechatDir = options?.wechatDir ?? '/opt/wechat'
+  }
 
-    if (!result) {
-      callback.close()
-      reject(new Error('OCR调用失败'))
+  private async _callWechatOcr(imgfn: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+      // 创建回调函数
+      const callback = new JSCallback(
+        (argPtr: Pointer) => {
+          const arg = new CString(argPtr).toString()
+          resolve(arg)
+          callback.close() // 释放回调
+        },
+        {
+          args: [FFIType.ptr],
+          returns: FFIType.void,
+        },
+      )
+
+      // 调用wechat_ocr函数
+      const result = WechatOCRFFI.symbols.wechat_ocr(
+        Buffer.from(`${this.ocrExe}\0`), // 转换为C字符串
+        Buffer.from(`${this.wechatDir}\0`),
+        Buffer.from(`${imgfn}\0`),
+        callback, // 直接传递JSCallback实例
+      )
+
+      if (!result) {
+        callback.close()
+        reject(new Error('OCR call failed'))
+      }
+    })
+  }
+
+  public async recognize(image: Buffer): Promise<string> {
+    const tempPath = join(tmpdir(), `wechat-ocr-${randomBytes(16).toString('hex')}.tmp`)
+    await writeFile(tempPath, image)
+
+    try {
+      const result = await this._callWechatOcr(tempPath)
+      return result
+    } finally {
+      await rm(tempPath, { force: true })
     }
-  })
-}
+  }
 
-async function main() {
-  // 请在这里替换为你的实际路径
-  const ocrExe = '/opt/wechat/wxocr'
-  const wechatDir = '/opt/wechat'
-  const imgfn = '/home/imbytecat/Pictures/Screenshots/Screenshot_07-Jul_10-00-20_9907.png'
-
-  console.log('OCR开始...')
-  try {
-    const result = await callWechatOcr(ocrExe, wechatDir, imgfn)
-    console.log('OCR结果:', result)
-  } catch (error) {
-    console.error('OCR错误:', error)
-  } finally {
-    // 清理资源
-    WechatOCR.symbols.stop_ocr()
-    console.log('OCR结束...')
+  public close() {
+    WechatOCRFFI.symbols.stop_ocr()
   }
 }
-
-// 运行主函数
-main()