koishi-plugin-warframe 1.4.5 → 1.4.6

package/README.md

@@ -6,20 +6,24 @@ Toolkit for warframe. **(In development)**
 
 ## Commands
 
-| Command Name             | Default Alias          | Description                                                                                 |
-| ------------------------ | ---------------------- | ------------------------------------------------------------------------------------------- |
-| wmi [name:string]        |                        | Warframe market orders.                                                                     |
-| wmr [name:string]        |                        | Warframe market orders.                                                                     |
-| arbitration [day:number] | arbi, 仲裁, 仲裁表     | High-value arbitration schedule. The arg decide how long in days to display, defaults to 3. |
-| fissure                  | 裂缝, 裂隙             | Current fissures.                                                                           |
-| spfissure                | 钢铁裂缝, 钢铁裂隙     | Current steelpath fissures.                                                                 |
-| rjfissure                | 九重天裂缝, 九重天裂隙 | Current railjack fissures.                                                                  |
-| circuit                  | 灵化, 灵化之源         | Weekly rewards of circuit, both warframe parts and incarnons.                               |
-| relic [name:string]      | 遗物, 核桃             | Relic rewards with corresponding data, including wfm medium price and ducats value.         |
-| weekly                   | 周常                   | Weekly mission info (archon hunt, deep archimedea, temporal archimedea)                     |
-| environment              | env, 地球, 福尔图娜    | Region environment (time)                                                                   |
-| voidtrader               | 虚空商人, 奸商         | Void trader info                                                                            |
+| Command Name                                                         | Default Alias          | Description                                                                                 |
+| -------------------------------------------------------------------- | ---------------------- | ------------------------------------------------------------------------------------------- |
+| wmi \<name:string\>                                                    |                        | Warframe market orders.                                                                     |
+| wmr \<name:string\>                                                    |                        | Warframe market orders.                                                                     |
+| arbitration [day:number]                                             | arbi, 仲裁, 仲裁表     | High-value arbitration schedule. The arg decide how long in days to display, defaults to 3. |
+| fissure                                                              | 裂缝, 裂隙             | Current fissures.                                                                           |
+| spfissure                                                            | 钢铁裂缝, 钢铁裂隙     | Current steelpath fissures.                                                                 |
+| rjfissure                                                            | 九重天裂缝, 九重天裂隙 | Current railjack fissures.                                                                  |
+| circuit                                                              | 灵化, 灵化之源         | Weekly rewards of circuit, both warframe parts and incarnons.                               |
+| relic \<name:string\>                                                  | 遗物, 核桃             | Relic rewards with corresponding data, including wfm medium price and ducats value.         |
+| weekly                                                               | 周常                   | Weekly mission info (archon hunt, deep archimedea, temporal archimedea)                     |
+| environment                                                          | env, 地球, 福尔图娜    | Region environment (time)                                                                   |
+| voidtrader                                                           | 虚空商人, 奸商         | Void trader info                                                                            |
+| riven                                                                |                        | Analyze riven stats                                                                         |
+| rivenstat \<weaponType:string\> \<statType:string\> \<disposition:number\> | 紫卡数值               | Get riven stat range                                                                        |
 
 ## Install
 
 Search `koishi-plugin-warframe` in koishi dependency manager, not in plugin market.
+
+The npm source is suggested to be the `https://registry.npmjs.com` before installing, because the package `warframe-public-export-plus` is unavailable on some mirrors.

package/lib/index.d.ts

@@ -27,6 +27,24 @@ export const msToHumanReadable: (ms: number) => string;
  * @returns
  */
 export function createAsyncCache<T>(factory: AsyncCacheFactory<T>, ttlMs?: number): AsyncCache<T>;
+export class CacheStorage<T> {
+    private _limit;
+    private _storage;
+    /**
+     *
+     * @param limit defaults to 100.
+     */
+    constructor(limit?: number);
+    /**
+     * Get or set caches.
+     * @param hash The identity of data.
+     * @param fetchFn The function to get the data.
+     * @returns `Promise<T>` or `undefined`.
+     */
+    get(hash: string, fetchFn: () => Promise<T>): Promise<T>;
+    clear(): void;
+    get size(): number;
+}
 export const normalizeName: (text: string) => string;
 export const fullWidthToHalfWidth: (text: string) => string;
 export const removeSpace: (text: string) => string;

package/lib/index.js

@@ -92,6 +92,56 @@ function createAsyncCache(factory, ttlMs = 6e4) {
   return { get, update };
 }
 __name(createAsyncCache, "createAsyncCache");
+var CacheStorage = class {
+  static {
+    __name(this, "CacheStorage");
+  }
+  _limit;
+  _storage;
+  /**
+   *
+   * @param limit defaults to 100.
+   */
+  constructor(limit = 100) {
+    if (limit <= 0) {
+      throw new Error("Size of cache storage must be larger than 0!");
+    }
+    this._limit = limit;
+    this._storage = /* @__PURE__ */ new Map();
+  }
+  /**
+   * Get or set caches.
+   * @param hash The identity of data.
+   * @param fetchFn The function to get the data.
+   * @returns `Promise<T>` or `undefined`.
+   */
+  async get(hash, fetchFn) {
+    const existingPromise = this._storage.get(hash);
+    if (existingPromise) {
+      this._storage.delete(hash);
+      this._storage.set(hash, existingPromise);
+      return existingPromise;
+    }
+    const promise = fetchFn().catch((err) => {
+      this._storage.delete(hash);
+      throw err;
+    });
+    this._storage.set(hash, promise);
+    if (this._storage.size > this._limit) {
+      const oldestKey = this._storage.keys().next().value;
+      if (oldestKey) {
+        this._storage.delete(oldestKey);
+      }
+    }
+    return promise;
+  }
+  clear() {
+    this._storage.clear();
+  }
+  get size() {
+    return this._storage.size;
+  }
+};
 
 // src/utils/text.ts
 var normalizeName = /* @__PURE__ */ __name((text) => fullWidthToHalfWidth(text).toLowerCase().replace(/[·'\-+()【】\[\]{}，。！？；：_]/g, "").replace(/\s+/g, ""), "normalizeName");
@@ -294,11 +344,13 @@ var relicToFullNameZH = /* @__PURE__ */ __name((tier, category) => {
 }, "relicToFullNameZH");
 
 // src/utils/ocr.ts
-var extractTextFromImage = /* @__PURE__ */ __name(async (image, secret) => {
-  if (image instanceof Blob) {
-    const buffer = await image.arrayBuffer();
-    image = Buffer.from(buffer).toString("base64");
-  }
+var import_node_crypto = __toESM(require("node:crypto"));
+var ocrCache = new CacheStorage(100);
+var getImageBase64Hash = /* @__PURE__ */ __name((base64) => {
+  const pureBase64 = base64.replace(/^data:image\/\w+;base64,/, "");
+  return import_node_crypto.default.createHash("sha256").update(pureBase64, "base64").digest("hex");
+}, "getImageBase64Hash");
+var getTextFromTencentOCR = /* @__PURE__ */ __name(async (image, secret) => {
   const tencentcloud = require("tencentcloud-sdk-nodejs-ocr");
   const ocrClient = tencentcloud.ocr.v20181119.Client;
   const clientConfig = {
@@ -314,15 +366,27 @@ var extractTextFromImage = /* @__PURE__ */ __name(async (image, secret) => {
     }
   };
   const client = new ocrClient(clientConfig);
+  const { TextDetections } = await client.GeneralAccurateOCR({
+    ImageBase64: image
+  });
+  const result = TextDetections?.map((t) => t.DetectedText).filter(
+    Boolean
+  );
+  return result;
+}, "getTextFromTencentOCR");
+var extractTextFromImage = /* @__PURE__ */ __name(async (image, secret) => {
+  if (image instanceof Blob) {
+    const buffer = await image.arrayBuffer();
+    image = Buffer.from(buffer).toString("base64");
+  }
+  const imageHash = getImageBase64Hash(image);
   try {
-    const result = await client.GeneralAccurateOCR({
-      ImageBase64: image
-    });
-    return result.TextDetections?.map((t) => t.DetectedText).filter(
-      (v) => !!v
+    return await ocrCache.get(
+      imageHash,
+      () => getTextFromTencentOCR(image, secret)
     );
   } catch (err) {
-    console.error("error", err);
+    console.error("Ocr request error!", err);
     return void 0;
   }
 }, "extractTextFromImage");
@@ -50550,6 +50614,9 @@ var parseOCRResult = /* @__PURE__ */ __name(async (ocrResult) => {
     if (input === "伤害") {
       return standard === "基础伤害" ? 1 : 0;
     }
+    if (input === "弹药最大值") {
+      return standard === "弹药上限" ? 1 : 0;
+    }
     if (standard === "基础伤害" && input.match(/^伤害$|近战伤害/)) {
       return 1;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-warframe",
   "description": "WF Toolkit",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "license": "GPL-3.0",
   "scripts": {
     "build": "yakumo build",