maidraw 0.4.5 → 0.4.7

package/dist/mai/chart/database.js

@@ -7,7 +7,8 @@ exports.Database = void 0;
 const fs_1 = __importDefault(require("fs"));
 const upath_1 = __importDefault(require("upath"));
 const axios_1 = __importDefault(require("axios"));
-const memory_cache_1 = require("memory-cache");
+const cache_1 = require("../../lib/cache");
+const __1 = require("..");
 class Database {
     static localDatabasePath = "";
     static setLocalDatabasePath(path) {
@@ -16,7 +17,7 @@ class Database {
     static hasLocalDatabase() {
         return fs_1.default.existsSync(this.localDatabasePath);
     }
-    static cache = new memory_cache_1.Cache();
+    static cache = new cache_1.Cache();
     static async cacheJackets(ids) {
         const promises = [];
         for (const id of ids) {
@@ -25,34 +26,40 @@ class Database {
         await Promise.all(promises);
     }
     static async fecthJacket(id) {
-        const cached = this.cache.get(`jacket-${id}`);
-        if (cached)
+        const cacheKey = `maimai-jacket-${id}`;
+        const cached = await this.cache.get(cacheKey);
+        if (cached instanceof Buffer) {
+            __1.Maimai.logger.trace(`GET Jacket-${id}, cache HIT`);
             return cached;
+        }
         else {
+            __1.Maimai.logger.trace(`GET Jacket-${id}, cache MISS`);
             const jacket = await this.downloadJacket(id);
             if (jacket)
-                this.cache.put(`jacket-${id}`, jacket, 1000 * 60 * 60);
+                this.cache.put(cacheKey, jacket, 1000 * 60 * 60);
             return jacket;
         }
     }
     static async downloadJacket(id) {
-        if (id > 10000)
-            id -= 10000;
-        const localFilePath = upath_1.default.join(this.localDatabasePath, "assets", "jackets", `${id.toString().padStart(6, "0")}.png`);
+        id = id % 10000;
+        const localFilePath = upath_1.default.join(this.localDatabasePath, "assets", "maimai", "jackets", `${id.toString().padStart(6, "0")}.png`);
         if (fs_1.default.existsSync(localFilePath)) {
+            __1.Maimai.logger.trace(`GET Jacket-${id}, database HIT`);
             return fs_1.default.readFileSync(localFilePath);
         }
-        // return null;
-        // console.log(`Downloading jacket ${id}`);
-        return await axios_1.default
+        const beginTimestamp = Date.now();
+        const res = await axios_1.default
             .get(`https://assets2.lxns.net/maimai/jacket/${id}.png`, {
             responseType: "arraybuffer",
         })
             .then((res) => res.data)
             .catch((e) => null);
+        const timeDifference = Date.now() - beginTimestamp;
+        __1.Maimai.logger.trace(`GET Jacket-${id}, database MISS, took ${timeDifference}ms`);
+        return res;
     }
     static getLocalChart(id, difficulty) {
-        const localFilePath = upath_1.default.join(this.localDatabasePath, "assets", "charts", `${id.toString().padStart(6, "0")}`, `${difficulty}.json`);
+        const localFilePath = upath_1.default.join(this.localDatabasePath, "assets", "maimai", "charts", `${id.toString().padStart(6, "0")}`, `${difficulty}.json`);
         if (fs_1.default.existsSync(localFilePath)) {
             return JSON.parse(fs_1.default.readFileSync(localFilePath, "utf-8"));
         }

package/dist/mai/chart/database.js.map

@@ -1 +1 @@
-{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../src/mai/chart/database.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,kDAA0B;AAC1B,kDAA0B;AAC1B,+CAAqC;AAGrC,MAAa,QAAQ;IACT,MAAM,CAAC,iBAAiB,GAAW,EAAE,CAAC;IAEvC,MAAM,CAAC,oBAAoB,CAAC,IAAY;QAC3C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,gBAAgB;QAC1B,OAAO,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACjD,CAAC;IAEO,MAAM,CAAC,KAAK,GAAG,IAAI,oBAAK,EAAkB,CAAC;IAC5C,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAa;QAC1C,MAAM,QAAQ,GAAmB,EAAE,CAAC;QACpC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACnB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IACM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAU;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC9C,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;aACrB,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,MAAM;gBAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACnE,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IACM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAU;QACzC,IAAI,EAAE,GAAG,KAAK;YAAE,EAAE,IAAI,KAAK,CAAC;QAC5B,MAAM,aAAa,GAAG,eAAK,CAAC,IAAI,CAC5B,IAAI,CAAC,iBAAiB,EACtB,QAAQ,EACR,SAAS,EACT,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAC1C,CAAC;QACF,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,OAAO,YAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC;QACD,eAAe;QACf,2CAA2C;QAC3C,OAAO,MAAM,eAAK;aACb,GAAG,CAAC,0CAA0C,EAAE,MAAM,EAAE;YACrD,YAAY,EAAE,aAAa;SAC9B,CAAC;aACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;aACvB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACM,MAAM,CAAC,aAAa,CACvB,EAAU,EACV,UAAuB;QAEvB,MAAM,aAAa,GAAG,eAAK,CAAC,IAAI,CAC5B,IAAI,CAAC,iBAAiB,EACtB,QAAQ,EACR,QAAQ,EACR,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EACnC,GAAG,UAAU,OAAO,CACvB,CAAC;QACF,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;;AA/DL,4BAgEC"}
+{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../src/mai/chart/database.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,kDAA0B;AAC1B,kDAA0B;AAC1B,8CAA2C;AAE3C,0BAA4B;AAE5B,MAAa,QAAQ;IACT,MAAM,CAAC,iBAAiB,GAAW,EAAE,CAAC;IAEvC,MAAM,CAAC,oBAAoB,CAAC,IAAY;QAC3C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,gBAAgB;QAC1B,OAAO,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACjD,CAAC;IAEO,MAAM,CAAC,KAAK,GAAG,IAAI,aAAK,EAAE,CAAC;IAC5B,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAa;QAC1C,MAAM,QAAQ,GAAmB,EAAE,CAAC;QACpC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACnB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IACM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAU;QACtC,MAAM,QAAQ,GAAG,iBAAiB,EAAE,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,MAAM,YAAY,MAAM,EAAE,CAAC;YAC3B,UAAM,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,UAAM,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,MAAM;gBAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7D,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IACM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAU;QACzC,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;QAChB,MAAM,aAAa,GAAG,eAAK,CAAC,IAAI,CAC5B,IAAI,CAAC,iBAAiB,EACtB,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAC1C,CAAC;QACF,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,UAAM,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;YACtD,OAAO,YAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,MAAM,eAAK;aAClB,GAAG,CAAC,0CAA0C,EAAE,MAAM,EAAE;YACrD,YAAY,EAAE,aAAa;SAC9B,CAAC;aACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;aACvB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;QACnD,UAAM,CAAC,MAAM,CAAC,KAAK,CACf,cAAc,EAAE,yBAAyB,cAAc,IAAI,CAC9D,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IACM,MAAM,CAAC,aAAa,CACvB,EAAU,EACV,UAAuB;QAEvB,MAAM,aAAa,GAAG,eAAK,CAAC,IAAI,CAC5B,IAAI,CAAC,iBAAiB,EACtB,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EACnC,GAAG,UAAU,OAAO,CACvB,CAAC;QACF,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;;AA1EL,4BA2EC"}

package/dist/mai/index.d.ts

@@ -1,6 +1,8 @@
 import { Best50 } from "./best50";
 import { Chart } from "./chart";
+import Bunyan from "bunyan";
 export declare class Maimai {
+    static logger: Bunyan;
     static Best50: typeof Best50;
     static Chart: typeof Chart;
 }

package/dist/mai/index.js

@@ -1,9 +1,43 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Maimai = void 0;
 const best50_1 = require("./best50");
 const chart_1 = require("./chart");
+const bunyan_1 = __importDefault(require("bunyan"));
 class Maimai {
+    static logger = new bunyan_1.default({
+        name: "maidraw.maimai",
+        streams: [
+            {
+                stream: process.stdout,
+                level: (() => {
+                    switch (process.env.LOG_LEVEL) {
+                        case "trace":
+                            return bunyan_1.default.TRACE;
+                        case "debug":
+                            return bunyan_1.default.DEBUG;
+                        case "info":
+                            return bunyan_1.default.INFO;
+                        case "warn":
+                            return bunyan_1.default.WARN;
+                        case "error":
+                            return bunyan_1.default.ERROR;
+                        case "fatal":
+                            return bunyan_1.default.FATAL;
+                        default:
+                            return bunyan_1.default.INFO;
+                    }
+                })(),
+            },
+            {
+                stream: process.stderr,
+                level: bunyan_1.default.ERROR,
+            },
+        ],
+    });
     static Best50 = best50_1.Best50;
     static Chart = chart_1.Chart;
 }

package/dist/mai/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mai/index.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAClC,mCAAgC;AAEhC,MAAa,MAAM;IACf,MAAM,CAAC,MAAM,GAAG,eAAM,CAAC;IACvB,MAAM,CAAC,KAAK,GAAG,aAAK,CAAC;;AAFzB,wBAGC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mai/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAkC;AAClC,mCAAgC;AAEhC,oDAA4B;AAE5B,MAAa,MAAM;IACR,MAAM,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC;QAC9B,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE;YACL;gBACI,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,CAAC,GAAG,EAAE;oBACT,QAAQ,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;wBAC5B,KAAK,OAAO;4BACR,OAAO,gBAAM,CAAC,KAAK,CAAC;wBACxB,KAAK,OAAO;4BACR,OAAO,gBAAM,CAAC,KAAK,CAAC;wBACxB,KAAK,MAAM;4BACP,OAAO,gBAAM,CAAC,IAAI,CAAC;wBACvB,KAAK,MAAM;4BACP,OAAO,gBAAM,CAAC,IAAI,CAAC;wBACvB,KAAK,OAAO;4BACR,OAAO,gBAAM,CAAC,KAAK,CAAC;wBACxB,KAAK,OAAO;4BACR,OAAO,gBAAM,CAAC,KAAK,CAAC;wBACxB;4BACI,OAAO,gBAAM,CAAC,IAAI,CAAC;oBAC3B,CAAC;gBACL,CAAC,CAAC,EAAE;aACP;YACD;gBACI,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,gBAAM,CAAC,KAAK;aACtB;SACJ;KACJ,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,GAAG,eAAM,CAAC;IACvB,MAAM,CAAC,KAAK,GAAG,aAAK,CAAC;;AAhCzB,wBAiCC"}

package/dist/mai/type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/mai/type.ts"],"names":[],"mappings":";;;AAAA,IAAY,WAOX;AAPD,WAAY,WAAW;IACnB,+CAAK,CAAA;IACL,qDAAQ,CAAA;IACR,iDAAM,CAAA;IACN,iDAAM,CAAA;IACN,qDAAQ,CAAA;IACR,+CAAK,CAAA;AACT,CAAC,EAPW,WAAW,2BAAX,WAAW,QAOtB;AAED,IAAY,WAMX;AAND,WAAY,WAAW;IACnB,6CAAI,CAAA;IACJ,yDAAU,CAAA;IACV,mEAAe,CAAA;IACf,2DAAW,CAAA;IACX,qEAAgB,CAAA;AACpB,CAAC,EANW,WAAW,2BAAX,WAAW,QAMtB;AAED,IAAY,UAOX;AAPD,WAAY,UAAU;IAClB,2CAAI,CAAA;IACJ,qDAAS,CAAA;IACT,qDAAS,CAAA;IACT,+DAAc,CAAA;IACd,2DAAY,CAAA;IACZ,qEAAiB,CAAA;AACrB,CAAC,EAPW,UAAU,0BAAV,UAAU,QAOrB;AAED,IAAY,iBAeX;AAfD,WAAY,iBAAiB;IACzB,mDAAC,CAAA;IACD,mDAAC,CAAA;IACD,mDAAC,CAAA;IACD,qDAAE,CAAA;IACF,uDAAG,CAAA;IACH,mDAAC,CAAA;IACD,qDAAE,CAAA;IACF,uDAAG,CAAA;IACH,mDAAC,CAAA;IACD,qDAAE,CAAA;IACF,sDAAE,CAAA;IACF,wDAAG,CAAA;IACH,wDAAG,CAAA;IACH,0DAAI,CAAA;AACR,CAAC,EAfW,iBAAiB,iCAAjB,iBAAiB,QAe5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maidraw",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Kasumi module for maimai bot",
   "main": "dist/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "clean": "rimraf dist/*",
     "make": "npm run clean && npm run lint && npm run build",
     "lint": "prettier './src/**/*.ts' --write",
-    "test": "npm run make && node ./test/testDraw.js"
+    "test": "export LOG_LEVEL=trace && npm run make && node ./test/test.js"
   },
   "repository": {
     "type": "git",

package/dist/type.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":";;;AAAA,IAAY,WAOX;AAPD,WAAY,WAAW;IACnB,+CAAK,CAAA;IACL,qDAAQ,CAAA;IACR,iDAAM,CAAA;IACN,iDAAM,CAAA;IACN,qDAAQ,CAAA;IACR,+CAAK,CAAA;AACT,CAAC,EAPW,WAAW,2BAAX,WAAW,QAOtB;AAED,IAAY,WAMX;AAND,WAAY,WAAW;IACnB,6CAAI,CAAA;IACJ,yDAAU,CAAA;IACV,mEAAe,CAAA;IACf,2DAAW,CAAA;IACX,qEAAgB,CAAA;AACpB,CAAC,EANW,WAAW,2BAAX,WAAW,QAMtB;AAED,IAAY,UAOX;AAPD,WAAY,UAAU;IAClB,2CAAI,CAAA;IACJ,qDAAS,CAAA;IACT,qDAAS,CAAA;IACT,+DAAc,CAAA;IACd,2DAAY,CAAA;IACZ,qEAAiB,CAAA;AACrB,CAAC,EAPW,UAAU,0BAAV,UAAU,QAOrB;AAED,IAAY,iBAeX;AAfD,WAAY,iBAAiB;IACzB,mDAAC,CAAA;IACD,mDAAC,CAAA;IACD,mDAAC,CAAA;IACD,qDAAE,CAAA;IACF,uDAAG,CAAA;IACH,mDAAC,CAAA;IACD,qDAAE,CAAA;IACF,uDAAG,CAAA;IACH,mDAAC,CAAA;IACD,qDAAE,CAAA;IACF,sDAAE,CAAA;IACF,wDAAG,CAAA;IACH,wDAAG,CAAA;IACH,0DAAI,CAAA;AACR,CAAC,EAfW,iBAAiB,iCAAjB,iBAAiB,QAe5B"}