maidraw 0.13.0 → 0.13.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,10 +1,9 @@
1
- import { Cache } from "./cache";
1
+ import { Cache } from "@saltcute/cache";
2
2
  import axios, { type AxiosInstance } from "axios";
3
3
  export declare abstract class BaseScoreAdapter {
4
- private static _cache;
5
- protected get cache(): Cache<unknown>;
4
+ protected cache: Cache<object>;
6
5
  protected axios: AxiosInstance;
7
- protected logger: import("loglayer").LogLayer;
6
+ protected logger: import("loglayer", { with: { "resolution-mode": "import" } }).LogLayer;
8
7
  constructor({ baseUrl, name }?: {
9
8
  baseUrl?: string;
10
9
  name?: string;
@@ -4,20 +4,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.BaseScoreAdapter = void 0;
7
- const cache_1 = require("./cache");
8
- const logger_1 = require("./logger");
7
+ const cache_1 = require("@saltcute/cache");
8
+ const logger_1 = require("@saltcute/logger");
9
9
  const axios_1 = __importDefault(require("axios"));
10
10
  class BaseScoreAdapter {
11
- static _cache = new cache_1.Cache();
12
- get cache() {
13
- return BaseScoreAdapter._cache;
14
- }
11
+ cache;
15
12
  axios;
16
13
  logger;
17
14
  constructor({ baseUrl, name } = {}) {
18
15
  // biome-ignore lint/style/useNamingConvention: external library axios violates naming convention
19
16
  this.axios = axios_1.default.create({ baseURL: baseUrl });
20
- this.logger = logger_1.logger.child().withGroup(["maidraw", "adapter", name || "base-adapter"]);
17
+ this.logger = logger_1.globalLogger.child().withPrefix(`[${["maidraw", "adapter", name || "base-adapter"].join("/")}]`);
18
+ this.cache = new cache_1.Cache(["maidraw", "adapter", name || "base-adapter"].join("/"));
21
19
  }
22
20
  maxLogLength = 1000;
23
21
  async get(endpoint, data,
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/common/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/common/adapter.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.ThemeManager = exports.Theme = void 0;
7
7
  const node_fs_1 = __importDefault(require("node:fs"));
8
- const logger_1 = require("../logger");
8
+ const logger_1 = require("@saltcute/logger");
9
9
  const glob_1 = require("glob");
10
10
  const upath_1 = __importDefault(require("upath"));
11
11
  const v4_1 = __importDefault(require("zod/v4"));
@@ -30,7 +30,7 @@ exports.Theme = Theme;
30
30
  class ThemeManager {
31
31
  schema;
32
32
  _defaultTheme;
33
- logger = logger_1.logger.child().withGroup(["maidraw", "painter", "theme_manager"]);
33
+ logger = logger_1.globalLogger.child().withPrefix(`[${["maidraw", "painter", "theme_manager"].join("/")}]`);
34
34
  static ELEMENT = v4_1.default.object({
35
35
  type: v4_1.default.string(),
36
36
  x: v4_1.default.number(),
@@ -91,7 +91,7 @@ class ThemeManager {
91
91
  return false;
92
92
  }
93
93
  catch (e) {
94
- logger_1.logger.withError(e).error(`Failed to validate the theme at ${path}`);
94
+ this.logger.withError(e).error(`Failed to validate the theme at ${path}`);
95
95
  return false;
96
96
  }
97
97
  }
@@ -1 +1 @@
1
- {"version":3,"file":"theme.js","sourceRoot":"","sources":["../../../src/common/painter/theme.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,2CAAwC;AACxC,+BAAgC;AAChC,kDAA0B;AAC1B,gDAAuB;AAEvB,MAAa,KAAK;IAEO;IACD;IAFpB,YACqB,QAAgB,EACjB,OAAU;QADT,aAAQ,GAAR,QAAQ,CAAQ;QACjB,YAAO,GAAP,OAAO,CAAG;IAC3B,CAAC;IAEG,OAAO,CAAC,IAAY;QACvB,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC7C,IAAI,iBAAE,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,iBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;;YACjD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;CACJ;AAZD,sBAYC;AACD,MAAa,YAAY;IAgCD;IAER;IAjCJ,MAAM,GAAG,eAAM,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;IAE5E,MAAM,CAAU,OAAO,GAAG,YAAC,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,YAAC,CAAC,MAAM,EAAE;QAChB,CAAC,EAAE,YAAC,CAAC,MAAM,EAAE;QACb,CAAC,EAAE,YAAC,CAAC,MAAM,EAAE;KAChB,CAAC,CAAC;IAEI,MAAM,CAAU,QAAQ,GAAG,YAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhF,MAAM,CAAU,WAAW,GAAG,YAAC,CAAC,MAAM,CAAC;QAC1C,IAAI,EAAE,YAAC,CAAC,MAAM,EAAE;KACnB,CAAC,CAAC;IAEI,MAAM,CAAU,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;QACxD,WAAW,EAAE,YAAC,CAAC,MAAM,EAAE;QACvB,KAAK,EAAE,YAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACxB,MAAM,EAAE,YAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC5B,CAAC,CAAC;IAEK,YAAY,GAAoD,IAAI,GAAG,EAAE,CAAC;IAElF,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IACD,IAAY,YAAY,CAAC,KAAa;QAClC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC/B,CAAC;IACL,CAAC;IACD,YACoB,MAAc,EAC9B,cAAwB,EAAE,EAClB,aAAqB;QAFb,WAAM,GAAN,MAAM,CAAQ;QAEtB,kBAAa,GAAb,aAAa,CAAQ;QAE7B,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,IAAA,eAAQ,EAAC,eAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;YACpE,KAAK,MAAM,YAAY,IAAI,SAAS,EAAE,CAAC;gBACnC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5B,CAAC;QACL,CAAC;IACL,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC,IAAI,CAAC;QACvB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5F,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACM,GAAG,CAAC,SAAiB;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IACM,GAAG,CAAC,SAAiB;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC;IAChG,CAAC;IACM,IAAI,CAAC,IAAY;QACpB,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/C,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,eAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;gBACjF,OAAO,IAAI,CAAC;YAChB,CAAC;;gBAAM,OAAO,KAAK,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,eAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;YACrE,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;;AAtEL,oCAuEC"}
1
+ {"version":3,"file":"theme.js","sourceRoot":"","sources":["../../../src/common/painter/theme.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,6CAAgD;AAChD,+BAAgC;AAChC,kDAA0B;AAC1B,gDAAuB;AAEvB,MAAa,KAAK;IAEO;IACD;IAFpB,YACqB,QAAgB,EACjB,OAAU;QADT,aAAQ,GAAR,QAAQ,CAAQ;QACjB,YAAO,GAAP,OAAO,CAAG;IAC3B,CAAC;IAEG,OAAO,CAAC,IAAY;QACvB,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC7C,IAAI,iBAAE,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,iBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;;YACjD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;CACJ;AAZD,sBAYC;AACD,MAAa,YAAY;IAgCD;IAER;IAjCJ,MAAM,GAAG,qBAAY,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEpG,MAAM,CAAU,OAAO,GAAG,YAAC,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,YAAC,CAAC,MAAM,EAAE;QAChB,CAAC,EAAE,YAAC,CAAC,MAAM,EAAE;QACb,CAAC,EAAE,YAAC,CAAC,MAAM,EAAE;KAChB,CAAC,CAAC;IAEI,MAAM,CAAU,QAAQ,GAAG,YAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhF,MAAM,CAAU,WAAW,GAAG,YAAC,CAAC,MAAM,CAAC;QAC1C,IAAI,EAAE,YAAC,CAAC,MAAM,EAAE;KACnB,CAAC,CAAC;IAEI,MAAM,CAAU,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;QACxD,WAAW,EAAE,YAAC,CAAC,MAAM,EAAE;QACvB,KAAK,EAAE,YAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACxB,MAAM,EAAE,YAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC5B,CAAC,CAAC;IAEK,YAAY,GAAoD,IAAI,GAAG,EAAE,CAAC;IAElF,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IACD,IAAY,YAAY,CAAC,KAAa;QAClC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC/B,CAAC;IACL,CAAC;IACD,YACoB,MAAc,EAC9B,cAAwB,EAAE,EAClB,aAAqB;QAFb,WAAM,GAAN,MAAM,CAAQ;QAEtB,kBAAa,GAAb,aAAa,CAAQ;QAE7B,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,IAAA,eAAQ,EAAC,eAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;YACpE,KAAK,MAAM,YAAY,IAAI,SAAS,EAAE,CAAC;gBACnC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5B,CAAC;QACL,CAAC;IACL,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC,IAAI,CAAC;QACvB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5F,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACM,GAAG,CAAC,SAAiB;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IACM,GAAG,CAAC,SAAiB;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC;IAChG,CAAC;IACM,IAAI,CAAC,IAAY;QACpB,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/C,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,eAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;gBACjF,OAAO,IAAI,CAAC;YAChB,CAAC;;gBAAM,OAAO,KAAK,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;YAC1E,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;;AAtEL,oCAuEC"}
@@ -2,6 +2,6 @@ import type { Regions } from "gcm-database-local/maimai";
2
2
  export declare const DX_LATEST = 65;
3
3
  export declare const EX_LATEST = 60;
4
4
  export declare const CN_LATEST = 55;
5
- export declare function findMinorVersion(major: number, minor: number, region: Regions): 0 | 5 | 10 | 85 | 35 | 65 | 15 | 25 | 40 | 20 | 50 | 95 | 45 | 30 | 60 | 90 | 55 | 99 | 80 | 70 | null;
6
- export declare function findNewerMinorVersion(major: number, minor: number, region: Regions): 0 | 5 | 10 | 85 | 35 | 65 | 15 | 25 | 40 | 20 | 50 | 95 | 45 | 30 | 60 | 90 | 55 | 99 | 80 | 70 | null;
7
- export declare function findOlderMinorVersion(major: number, minor: number, region: Regions): 0 | 5 | 10 | 85 | 35 | 65 | 15 | 25 | 40 | 20 | 50 | 95 | 45 | 30 | 60 | 90 | 55 | 99 | 80 | 70 | null;
5
+ export declare function findMinorVersion(major: number, minor: number, region: Regions): 0 | 5 | 10 | 85 | 35 | 65 | 15 | 25 | 40 | 20 | 50 | 30 | 60 | 90 | 55 | 99 | 95 | 80 | 70 | 45 | null;
6
+ export declare function findNewerMinorVersion(major: number, minor: number, region: Regions): 0 | 5 | 10 | 85 | 35 | 65 | 15 | 25 | 40 | 20 | 50 | 30 | 60 | 90 | 55 | 99 | 95 | 80 | 70 | 45 | null;
7
+ export declare function findOlderMinorVersion(major: number, minor: number, region: Regions): 0 | 5 | 10 | 85 | 35 | 65 | 15 | 25 | 40 | 20 | 50 | 30 | 60 | 90 | 55 | 99 | 95 | 80 | 70 | 45 | null;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "maidraw",
3
- "version": "0.13.0",
3
+ "version": "0.13.2",
4
4
  "description": "A simple library to draw geki/chu/mai images",
5
5
  "main": "dist/index.js",
6
6
  "exports": {
@@ -38,25 +38,22 @@
38
38
  },
39
39
  "homepage": "https://github.com/saltcute/maidraw#readme",
40
40
  "dependencies": {
41
- "@loglayer/log-level-manager-global": "^2.2.0",
42
- "@loglayer/transport-pino": "^3.2.0",
43
- "axios": "^1.7.2",
44
- "canvas": "^3.1.0",
45
- "color": "^4.2.3",
41
+ "@saltcute/cache": "^1.0.3",
42
+ "@saltcute/logger": "^1.0.1",
43
+ "axios": "^1.18.0",
44
+ "canvas": "^3.2.3",
45
+ "color": "^5.0.3",
46
46
  "gcm-database": "^1.0.3",
47
47
  "gcm-database-local": "^1.0.8",
48
- "glob": "^11.0.0",
48
+ "glob": "^13.0.6",
49
49
  "linebreak": "^1.1.0",
50
50
  "lodash": "^4.17.21",
51
- "memory-cache": "^0.2.0",
52
51
  "node-canvas-with-twemoji-and-discord-emoji": "^1.2.2",
53
- "pino": "^10.3.1",
54
- "redis": "^6.0.0",
55
52
  "rg-stats": "^1.2.1",
56
- "sharp": "^0.33.5",
53
+ "sharp": "^0.35.2",
57
54
  "string-template": "^1.0.0",
58
- "upath": "^2.0.1",
59
- "zod": "^4.1.5"
55
+ "upath": "^3.0.7",
56
+ "zod": "^4.4.3"
60
57
  },
61
58
  "devDependencies": {
62
59
  "@biomejs/biome": "^2.5.0",
@@ -70,7 +67,7 @@
70
67
  "typescript": "^6.0.3"
71
68
  },
72
69
  "allowScripts": {
73
- "canvas@3.1.0": true,
74
- "sharp@0.33.5": true
70
+ "sharp@0.33.5": true,
71
+ "canvas@3.2.3": true
75
72
  }
76
73
  }
@@ -1,9 +0,0 @@
1
- export declare class Cache<T> {
2
- private logger;
3
- private memCache;
4
- private redisClient;
5
- private isRedisAvailable;
6
- constructor();
7
- get(key: string): Promise<any>;
8
- put(key: string, value: T, ttl: number): Promise<void>;
9
- }
@@ -1,61 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Cache = void 0;
4
- const memory_cache_1 = require("memory-cache");
5
- const redis_1 = require("redis");
6
- const logger_1 = require("./logger");
7
- class Cache {
8
- logger = logger_1.logger.child().withGroup(["maidraw", "cache"]);
9
- memCache;
10
- redisClient;
11
- isRedisAvailable = true;
12
- constructor() {
13
- this.memCache = new memory_cache_1.Cache();
14
- this.redisClient = (0, redis_1.createClient)();
15
- this.redisClient.on("error", async () => {
16
- this.logger.error("Redis connection error, using memory-cache");
17
- this.isRedisAvailable = false;
18
- this.redisClient.destroy();
19
- });
20
- this.redisClient.connect();
21
- }
22
- async get(key) {
23
- if (this.isRedisAvailable) {
24
- const redisValue = await this.redisClient.get(key);
25
- if (redisValue) {
26
- try {
27
- return JSON.parse(redisValue);
28
- }
29
- catch {
30
- return Buffer.from(redisValue, "base64");
31
- }
32
- }
33
- }
34
- else
35
- return this.memCache.get(key);
36
- }
37
- async put(key, value, ttl) {
38
- if (this.isRedisAvailable) {
39
- if (Buffer.isBuffer(value)) {
40
- await this.redisClient.set(key, value.toString("base64"), {
41
- expiration: {
42
- type: "EX",
43
- value: Math.trunc(ttl / 1000),
44
- },
45
- });
46
- }
47
- else {
48
- await this.redisClient.set(key, JSON.stringify(value), {
49
- expiration: {
50
- type: "EX",
51
- value: Math.trunc(ttl / 1000),
52
- },
53
- });
54
- }
55
- }
56
- else
57
- this.memCache.put(key, value, ttl);
58
- }
59
- }
60
- exports.Cache = Cache;
61
- //# sourceMappingURL=cache.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/common/cache.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AACjD,iCAAqC;AACrC,qCAAkC;AAClC,MAAa,KAAK;IACN,MAAM,GAAG,eAAM,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAExD,QAAQ,CAAC;IACT,WAAW,CAAC;IAEZ,gBAAgB,GAAG,IAAI,CAAC;IAChC;QACI,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAQ,EAAa,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,IAAA,oBAAY,GAAE,CAAC;QAClC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAChE,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;YAC9B,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,GAAW;QACjB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,UAAU,EAAE,CAAC;gBACb,IAAI,CAAC;oBACD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAClC,CAAC;gBAAC,MAAM,CAAC;oBACL,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;QACL,CAAC;;YAAM,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAAQ,EAAE,GAAW;QACxC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtD,UAAU,EAAE;wBACR,IAAI,EAAE,IAAI;wBACV,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC;qBAChC;iBACJ,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACnD,UAAU,EAAE;wBACR,IAAI,EAAE,IAAI;wBACV,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC;qBAChC;iBACJ,CAAC,CAAC;YACP,CAAC;QACL,CAAC;;YAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;CACJ;AAhDD,sBAgDC"}
@@ -1,2 +0,0 @@
1
- import { LogLayer } from "loglayer";
2
- export declare const logger: LogLayer;
@@ -1,17 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.logger = void 0;
4
- const log_level_manager_global_1 = require("@loglayer/log-level-manager-global");
5
- const transport_pino_1 = require("@loglayer/transport-pino");
6
- const loglayer_1 = require("loglayer");
7
- const pino_1 = require("pino");
8
- const p = (0, pino_1.pino)({
9
- level: "trace", // Enable all log levels
10
- });
11
- exports.logger = new loglayer_1.LogLayer({
12
- transport: new transport_pino_1.PinoTransport({
13
- logger: p,
14
- }),
15
- }).withLogLevelManager(new log_level_manager_global_1.GlobalLogLevelManager());
16
- exports.logger.setLevel(loglayer_1.LogLevel.info);
17
- //# sourceMappingURL=logger.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;AAAA,iFAA2E;AAC3E,6DAAyD;AACzD,uCAA8C;AAC9C,+BAA4B;AAE5B,MAAM,CAAC,GAAG,IAAA,WAAI,EAAC;IACX,KAAK,EAAE,OAAO,EAAE,wBAAwB;CAC3C,CAAC,CAAC;AAEU,QAAA,MAAM,GAAG,IAAI,mBAAQ,CAAC;IAC/B,SAAS,EAAE,IAAI,8BAAa,CAAC;QACzB,MAAM,EAAE,CAAC;KACZ,CAAC;CACL,CAAC,CAAC,mBAAmB,CAAC,IAAI,gDAAqB,EAAE,CAAC,CAAC;AAEpD,cAAM,CAAC,QAAQ,CAAC,mBAAQ,CAAC,IAAI,CAAC,CAAC"}