dsh-llm-roster 0.5.5 → 0.5.6

package/README.md

@@ -416,10 +416,10 @@ want it:
 work too. A picture in a .zip is at most 16 MB, and one you upload at most 4 MB.
 
 **Thumbnails.** Where pictures show small (the roster's cards, the album, the summon's cards, the pickers), the roster
-sends a thumbnail 320 wide, made from the picture with [sharp](https://sharp.pixelplumbing.com) and kept in DSH's home
+sends a thumbnail 320 wide, made from the picture with [@napi-rs/image](https://image.napi.rs) and kept in DSH's home
 (`llm-roster/thumbs/`). A pack's are made in the background as it is added or chosen, any other as it is first shown;
 a picture that changes gets a new one. Her page, the summon's banner and the album's viewer show the picture itself.
-sharp is an optional dependency, installed with the roster where it has a build for the machine (Linux, macOS and
+@napi-rs/image is an optional dependency, installed with the roster where it has a build for the machine (Linux, macOS and
 Windows on x64 and Arm); without it, every picture is sent whole.
 
 To make a pack by hand, export one (or start a new empty one, choose pictures and export it), change what you like,
@@ -489,7 +489,7 @@ its own album (the Earned ✦ are DSH's, in `stars.json`, so every browser share
 | [`plugin/client.js`](plugin/client.js) | The web half (React from DSH). It puts the avatar in the `conversation.input.right` slot and renders the roster dialog and the Plugins page. It switches models through `modelDirectories.directoryFor(session).select()`. It writes model lists and `apiKeyEnv` with `remote.settings.mutate`, stores keys with `remote.credentials.set`, and reads catalogs with `remote.llm.discoverModels`. |
 | [`plugin/index.js`](plugin/index.js) | The DSH plugin (`llm-roster`). It mounts the routes on DSH's API, resolves keys through DSH's credential store, then the environment, and watches DSH's model calls (`llm/stream`, passed along untouched) for why they fail. |
 | [`plugin/stars.js`](plugin/stars.js) | The summon's Earned ✦: dropped by model calls that work, spent on summons, added by cheat codes. |
-| [`plugin/thumbs.js`](plugin/thumbs.js) | The pictures' thumbnails, made with sharp (when it is installed) and kept in DSH's home. |
+| [`plugin/thumbs.js`](plugin/thumbs.js) | The pictures' thumbnails, made with @napi-rs/image (when it is installed) and kept in DSH's home. |
 | [`plugin/failures.js`](plugin/failures.js) | Why calls failed lately: kept by provider and model, counted, let go when a call succeeds again. |
 | [`plugin/server.js`](plugin/server.js) | The routes, below. |
 | [`plugin/roster.js`](plugin/roster.js) | Which character and tier each model is, the lineup, the picture and avatar each one wears, the pack in use, set-aside providers, and the provider each character goes through. |
@@ -537,7 +537,7 @@ The routes are on DSH's API, behind its sign-in and for its owner only:
 ## Development
 
 ```sh
-npm install                                           # sharp, for the thumbnails (optional: their tests are skipped without it)
+npm install                                           # @napi-rs/image, for the thumbnails (optional: their tests are skipped without it)
 npm test                                              # node --test: the server half, art packs and the summon odds, no DSH or network needed
 python3 tools/import-art.py ~/Projects/DiscordStudyBot  # art/ again from a ChimeraArchiveHarness checkout
 python3 tools/draw-art.py --dry-run                   # the other characters' tiers: what it would draw

package/README.zh-CN.md

@@ -265,7 +265,7 @@ knights/
 
 `.webp` 能让立绘包最小（内置卡面每张约 100–450 KB，质量 86）；`.png`、`.jpg` 和 `.gif` 也可以。.zip 中的一张图片最大 16 MB，你上传的图片最大 4 MB。
 
-**缩略图。** 在图片显示得很小的地方（名册卡片、图鉴、召唤卡片、选择器），名册会发送宽 320 的缩略图，用 [sharp](https://sharp.pixelplumbing.com) 从原图生成并保存在 DSH 主目录（`llm-roster/thumbs/`）。立绘包的缩略图会在添加或选择该立绘包时于后台生成，其他图片在首次显示时生成；图片变化后会生成新的缩略图。她的页面、召唤横幅和图鉴查看器会显示原图本身。sharp 是可选依赖，在名册有对应机器构建的地方随名册一起安装（Linux、macOS 和 Windows 的 x64 与 Arm）；没有它时，每张图片都会原样发送。
+**缩略图。** 在图片显示得很小的地方（名册卡片、图鉴、召唤卡片、选择器），名册会发送宽 320 的缩略图，用 [@napi-rs/image](https://image.napi.rs) 从原图生成并保存在 DSH 主目录（`llm-roster/thumbs/`）。立绘包的缩略图会在添加或选择该立绘包时于后台生成，其他图片在首次显示时生成；图片变化后会生成新的缩略图。她的页面、召唤横幅和图鉴查看器会显示原图本身。@napi-rs/image 是可选依赖，在名册有对应机器构建的地方随名册一起安装（Linux、macOS 和 Windows 的 x64 与 Arm）；没有它时，每张图片都会原样发送。
 
 要手工制作立绘包，可以先导出一个（或新建一个空白立绘包，选择图片后导出），改成你喜欢的样子，重新压缩并导入。要分享立绘包，把它的文件夹放到 GitHub 上；任何人都可以通过链接拉取。你拥有的立绘包保存在 `~/.dsh/llm-roster/packs/<name>/`，你的改动保存在 `~/.dsh/llm-roster/changes/<name>/`；立绘包的文件也可以在那里直接编辑，名册下次打开时会显示这些改动。
 
@@ -322,7 +322,7 @@ knights/
 | [`plugin/client.js`](plugin/client.js) | 网页端部分（使用 DSH 的 React）。它把头像放进 `conversation.input.right` 插槽，并渲染名册对话框和“插件”页面。它通过 `modelDirectories.directoryFor(session).select()` 切换模型，通过 `remote.settings.mutate` 写入模型列表和 `apiKeyEnv`，通过 `remote.credentials.set` 保存密钥，并通过 `remote.llm.discoverModels` 读取目录。 |
 | [`plugin/index.js`](plugin/index.js) | DSH 插件（`llm-roster`）。它把路由挂载到 DSH 的 API 上，先通过 DSH 的凭据存储解析密钥，再尝试环境变量，并监视 DSH 的模型调用（`llm/stream`，原样转发）以了解失败原因。 |
 | [`plugin/stars.js`](plugin/stars.js) | 召唤的赚取 ✦：由成功的模型调用掉落，在召唤中扣除，通过作弊码增加。 |
-| [`plugin/thumbs.js`](plugin/thumbs.js) | 图片的缩略图：用 sharp（安装时）生成，保存在 DSH 主目录中。 |
+| [`plugin/thumbs.js`](plugin/thumbs.js) | 图片的缩略图：用 @napi-rs/image（安装时）生成，保存在 DSH 主目录中。 |
 | [`plugin/failures.js`](plugin/failures.js) | 最近调用失败原因：按服务商和模型保存、计数，调用成功后放掉。 |
 | [`plugin/server.js`](plugin/server.js) | 下面的路由。 |
 | [`plugin/roster.js`](plugin/roster.js) | 每个模型对应哪个角色和层级、阵容、每个模型所用的立绘和头像、当前使用的立绘包、搁置的服务商，以及每个角色经哪个服务商使用。 |
@@ -368,7 +368,7 @@ knights/
 ## 开发
 
 ```sh
-npm install                                           # sharp，用于缩略图（可选：没有它时相关测试会被跳过）
+npm install                                           # @napi-rs/image，用于缩略图（可选：没有它时相关测试会被跳过）
 npm test                                              # node --test：测试服务端部分、立绘包和召唤概率，不需要 DSH 或网络
 python3 tools/import-art.py ~/Projects/DiscordStudyBot  # 从 ChimeraArchiveHarness 检出重新生成 art/
 python3 tools/draw-art.py --dry-run                   # 其他角色的层级：预览将绘制的内容

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-llm-roster",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "A gacha-style character roster for DeepSeek Harness: an avatar beside the model picker, and a roster of your models as characters, with their art, Artificial Analysis rankings, keys, balance and which models are in use.",
   "type": "module",
   "license": "MIT AND CC-BY-NC-SA-4.0",
@@ -37,7 +37,7 @@
     "test": "node --test"
   },
   "optionalDependencies": {
-    "sharp": "^0.34.5"
+    "@napi-rs/image": "^1.16.0"
   },
   "dsh": {
     "bundle": {

package/plugin/server.js

@@ -19,7 +19,7 @@
 //     POST /api/llm-roster.unpark     { provider } → what was kept of it
 //     POST /api/llm-roster.route      { character, provider | null }: the provider her lineup goes through
 //     GET  /api/llm-roster.image      ?art=<folder>/<file> (a picture of the pack in use: `deepseek/high.webp`; or of the
-//                                     pack `&pack=<id>`); `&size=thumb`: its thumbnail (320 wide, when sharp is there)
+//                                     pack `&pack=<id>`); `&size=thumb`: its thumbnail (320 wide, when @napi-rs/image is there)
 //     GET  /api/llm-roster.packs      your art packs, the one in use, and the ones that come with the roster
 //     POST /api/llm-roster.packs      { use: '<id>' } | { create: '<name>' } | { remove: '<id>' } | { discard: '<id>' } |
 //                                     { fetch: '<GitHub or .zip link>' } | { add: '<file>' }: one that comes with the

package/plugin/thumbs.js

@@ -1,6 +1,7 @@
 // Thumbnails of the art packs' pictures, for what shows them small (the roster's cards, the album, the summon's cards,
-// the pickers); the full pictures are for a character's page, the banner and the viewer. They are made with sharp, when
-// it is installed (an optional dependency: without it, every picture is served whole), kept in DSH's home
+// the pickers); the full pictures are for a character's page, the banner and the viewer. They are made with
+// @napi-rs/image, when it is installed (an optional dependency, prebuilt, with no install script: pnpm refuses one that
+// has one; without it, every picture is served whole), kept in DSH's home
 // (llm-roster/thumbs/), each named by its picture's file, size and time, so a changed picture gets a new one; a pack's
 // are made in the background as it is added or chosen, and any other as it is first asked for.
 import crypto from 'node:crypto'
@@ -11,17 +12,17 @@ export const WIDTH = 320 // wide enough for a card twice over on a sharp screen
 const QUALITY = 80
 const KEPT = 2000 // thumbnails kept at most (the oldest go first)
 
-let found // the sharp module, once looked for (null: none)
-const sharpModule = async () => {
+let found // @napi-rs/image's Transformer, once looked for (null: none)
+const imageModule = async () => {
   if (found === undefined) {
-    try { found = (await import('sharp')).default ?? null } catch { found = null }
+    try { found = (await import('@napi-rs/image')).Transformer ?? null } catch { found = null }
   }
   return found
 }
 
 export class Thumbs {
-  /** `load`: how sharp is found (for the tests: one that finds none). */
-  constructor (folder, { load = sharpModule } = {}) {
+  /** `load`: how the image library is found (for the tests: one that finds none). */
+  constructor (folder, { load = imageModule } = {}) {
     this.root = folder ? path.join(folder, 'thumbs') : null
     this.load = load
     this.making = new Map() // a thumbnail's file → its making
@@ -30,8 +31,8 @@ export class Thumbs {
     this.warming = false
   }
 
-  /** The thumbnail's file for a picture's (`file`): made now if need be; null to serve the picture itself (no sharp, a
-   * picture already small, an animated GIF, or one it cannot read). */
+  /** The thumbnail's file for a picture's (`file`): made now if need be; null to serve the picture itself (no image
+   * library, a picture already small, an animated GIF, or one it cannot read). */
   async of (file) {
     if (!this.root || !file || /\.gif$/i.test(file) || this.whole.has(file)) return null
     let stat
@@ -41,13 +42,15 @@ export class Thumbs {
     if (fs.existsSync(target)) return target
     if (this.making.has(target)) return this.making.get(target)
     const making = (async () => {
-      const sharp = await this.load()
-      if (!sharp) return null
-      const about = await sharp(file).metadata()
+      const Transformer = await this.load()
+      if (!Transformer) return null
+      const bytes = fs.readFileSync(file)
+      const about = await new Transformer(bytes).metadata()
       if (!about.width || about.width <= WIDTH) { this.whole.add(file); return null }
+      const small = await new Transformer(bytes).resize(WIDTH).webp(QUALITY)
       fs.mkdirSync(this.root, { recursive: true })
       const temporary = `${target}.${process.pid}.tmp`
-      await sharp(file).resize({ width: WIDTH }).webp({ quality: QUALITY }).toFile(temporary)
+      fs.writeFileSync(temporary, small)
       fs.renameSync(temporary, target)
       return target
     })().catch(() => null).finally(() => this.making.delete(target))