beatsaber-bot-core 0.2.0-dev.25 → 0.2.0-dev.27

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.
package/lib/cmd/score.js CHANGED
@@ -21,9 +21,9 @@ exports.default = () => new builder_1.CommandBuilder()
21
21
  preference = await c.userPreference.getUserPreference(uid);
22
22
  }
23
23
  const { blAccount, ssAccount } = await c.db.getUserAccountsByUid(uid);
24
- let accountId = interface_1.Platform.BL && blAccount?.platformUid;
25
- accountId ||= interface_1.Platform.SS && ssAccount?.platformUid;
26
- if (!accountId) {
24
+ let account = interface_1.Platform.BL && blAccount;
25
+ account ||= interface_1.Platform.SS && ssAccount;
26
+ if (!account) {
27
27
  throw new errors_1.AccountBindingNotFoundError();
28
28
  }
29
29
  let diffOption;
@@ -35,10 +35,10 @@ exports.default = () => new builder_1.CommandBuilder()
35
35
  }
36
36
  // 从 input 中提取出 mapId
37
37
  const mapId = c.input;
38
- const score = await c.api.BeatLeader.getScoreByPlayerIdAndMapId(accountId, mapId, diffOption).catch((e) => {
38
+ const score = await c.api.BeatLeader.getScoreByPlayerIdAndMapId(account.platformUid, mapId, diffOption).catch((e) => {
39
39
  if (e instanceof errors_1.ScoreNotFoundError) {
40
40
  throw new errors_1.ScoreNotFoundError({
41
- user: accountId,
41
+ user: account.platformUname,
42
42
  id: mapId,
43
43
  diff: diffOption?.difficulty,
44
44
  mode: c.options.m,
@@ -1 +1 @@
1
- {"version":3,"file":"score.js","sourceRoot":"","sources":["../../src/cmd/score.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"score.js","sourceRoot":"","sources":["../../src/cmd/score.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,2CAAsC;AACtC,mCAAqC;AACrC,qCAIiB;AACjB,mDAA6C;AAC7C,kBAAe,GAAG,EAAE,CAClB,IAAI,wBAAc,EAAE;KACjB,OAAO,CAAC,OAAO,CAAC,CAAC,aAAa;KAC9B,SAAS,CAAC,GAAG,EAAE,iBAAiB,CAAC;KACjC,SAAS,CAAC,GAAG,EAAE,mBAAmB,CAAC;KACnC,SAAS,CAAC,GAAG,EAAE,aAAa,CAAC;KAC7B,QAAQ,CAAC,SAAS,CAAC;KACnB,QAAQ,CAAC,QAAQ,CAAC;KAClB,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACvB,kCAAkC;IAClC,IAAI,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;IACxB,IAAI,UAAU,GAAG,CAAC,CAAC,cAAc,CAAA;IACjC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxD,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC9B,UAAU,GAAG,MAAM,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAA;IACrE,IAAI,OAAO,GAAG,oBAAQ,CAAC,EAAE,IAAI,SAAS,CAAA;IACtC,OAAO,KAAK,oBAAQ,CAAC,EAAE,IAAI,SAAS,CAAA;IACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,oCAA2B,EAAE,CAAA;IACzC,CAAC;IAED,IAAI,UAAU,CAAA;IACd,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAC/B,UAAU,GAAG;YACX,UAAU,EAAE,IAAA,mBAAW,EAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACpC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SAClB,CAAA;IACH,CAAC;IAED,qBAAqB;IACrB,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAA;IAErB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,0BAA0B,CAC7D,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,UAAU,CACX,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACZ,IAAI,CAAC,YAAY,2BAAkB,EAAE,CAAC;YACpC,MAAM,IAAI,2BAAkB,CAAC;gBAC3B,IAAI,EAAE,OAAO,CAAC,aAAa;gBAC3B,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,UAAU,EAAE,UAAU;gBAC5B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;aAClB,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,oBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAQ,CAAC,EAAE,CAAA;IAChE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,MAAM;SACvB,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC;SACtD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACX,IAAI,CAAC,YAAY,6BAAY,EAAE,CAAC;YAC9B,MAAM,IAAI,yBAAgB,EAAE,CAAA;QAC9B,CAAC;IACH,CAAC,CAAC,CAAA;IACJ,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;AACpC,CAAC,CAAC,CAAA"}
@@ -10,6 +10,7 @@ const render_1 = require("../img-render/render");
10
10
  const interface_1 = require("../interface");
11
11
  const utils_1 = require("../utils");
12
12
  const errors_1 = require("../errors");
13
+ const puppeteer_core_1 = require("puppeteer-core");
13
14
  const noop = () => { };
14
15
  class RenderService {
15
16
  config;
@@ -26,6 +27,11 @@ class RenderService {
26
27
  onRenderError,
27
28
  onRenderStart,
28
29
  userPreference,
30
+ }).catch((e) => {
31
+ if (e instanceof puppeteer_core_1.TimeoutError) {
32
+ throw new errors_1.ImageRenderError();
33
+ }
34
+ throw e;
29
35
  });
30
36
  }
31
37
  _renderRank = async (accountId, platform, api, renderOpts) => {
@@ -58,6 +64,11 @@ class RenderService {
58
64
  userPreference,
59
65
  onRenderError,
60
66
  onRenderStart,
67
+ }).catch((e) => {
68
+ if (e instanceof puppeteer_core_1.TimeoutError) {
69
+ throw new errors_1.ImageRenderError();
70
+ }
71
+ throw e;
61
72
  });
62
73
  }
63
74
  _renderScore = async (scoreId, platform, api, renderOpts) => {
@@ -100,6 +111,11 @@ class RenderService {
100
111
  userPreference,
101
112
  onRenderError,
102
113
  onRenderStart,
114
+ }).catch((e) => {
115
+ if (e instanceof puppeteer_core_1.TimeoutError) {
116
+ throw new errors_1.ImageRenderError();
117
+ }
118
+ throw e;
103
119
  });
104
120
  }
105
121
  async renderUrl(url, onRenderStart) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/img-render/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/img-render/index.ts"],"names":[],"mappings":";;;;;;AACA,qCAKiB;AACjB,4DAAyC;AAGzC,gDAA6C;AAE7C,2CAAiD;AACjD,mCAA4D;AAC5D,qCAA2C;AAC3C,mDAA6C;AAE7C,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;AAUrB,MAAsB,aAAa;IACjC,MAAM,CAAQ;IACd,GAAG,CAAY;IACf,UAAU,CAAuB;IACjC,wBAAwB,CAA0B;IAClD,uBAAuB,CAAyB;IAChD,KAAK,CAAC,UAAU,CACd,SAAiB,EACjB,QAAkB,EAClB,cAAoC,EACpC,aAA0B,EAC1B,aAA2B;IAC3B,oDAAoD;;QAEpD,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;YACrD,GAAG,IAAI,CAAC,UAAU;YAClB,IAAI,EAAE,OAAO;YACb,aAAa;YACb,aAAa;YACb,cAAc;SACC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,YAAY,6BAAY,EAAE,CAAC;gBAC9B,MAAM,IAAI,yBAAgB,EAAE,CAAA;YAC9B,CAAC;YACD,MAAM,CAAC,CAAA;QACT,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,WAAW,GAAG,KAAK,EACjB,SAAiB,EACjB,QAAkB,EAClB,GAAe,EACf,UAAwB,EACxB,EAAE;QACF,MAAM,EAAE,GACN,CAAC,MAAM,UAAU,CAAC,cAAc,CAAC,GAAG,CAClC,QAAQ,IAAI,oBAAQ,CAAC,EAAE;YACrB,CAAC,CAAC,qBAAa,CAAC,kBAAkB,CAAC,GAAG;YACtC,CAAC,CAAC,qBAAa,CAAC,kBAAkB,CAAC,GAAG,CACzC,CAAC,IAAI,iCAAiC,CAAA;QACzC,sBAAsB;QACtB,qCAAqC;QACrC,4EAA4E;QAC5E,6BAA6B;QAC7B,iBAAiB;QACjB,eAAe;QACf,qCAAqC;QACrC,MAAM;QACN,IAAI;QACJ,IAAI,QAAQ,IAAI,oBAAQ,CAAC,EAAE,EAAE,CAAC;YAC5B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GACxB,MAAM,GAAG,CAAC,UAAU,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAA;YAC7D,EAAE;YACF,OAAO,IAAI,CAAC,wBAAwB,CAClC,IAAA,gBAAO,EAAC,IAAA,wBAAe,EAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAC9C,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,aAAa,CACzB,CAAA;QACH,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GACxB,MAAM,GAAG,CAAC,UAAU,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAA;QAClE,OAAO,IAAI,CAAC,wBAAwB,CAClC,IAAA,gBAAO,EAAC,IAAA,wBAAe,EAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAC9C,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,aAAa,CACzB,CAAA;IACH,CAAC,CAAA;IAED,KAAK,CAAC,WAAW,CACf,OAAe,EACf,QAAkB,EAClB,cAAoC,EACpC,aAA0B,EAC1B,aAA2B;IAC3B,oDAAoD;;QAEpD,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;YACpD,GAAG,IAAI,CAAC,UAAU;YAClB,IAAI,EAAE,OAAO;YACb,cAAc;YACd,aAAa;YACb,aAAa;SACE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,YAAY,6BAAY,EAAE,CAAC;gBAC9B,MAAM,IAAI,yBAAgB,EAAE,CAAA;YAC9B,CAAC;YACD,MAAM,CAAC,CAAA;QACT,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,YAAY,GAAG,KAAK,EAClB,OAAe,EACf,QAAkB,EAClB,GAAe,EACf,UAAwB,EACxB,EAAE;QACF,MAAM,EAAE,GACN,CAAC,MAAM,UAAU,CAAC,cAAc,CAAC,GAAG,CAClC,qBAAa,CAAC,UAAU,CAAC,GAAG,CAC7B,CAAC,IAAI,iCAAiC,CAAA;QACzC,IAAI,CAAC;YACH,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,SAAS,CACtE,CAAC,CACF;iBACE,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBACpB,OAAO,CAAC,GAAG,CACT,2BAA2B,OAAO,qBAAqB,KAAK,WAAW,CAAC,EAAE,CAC3E,CAAA;YACH,CAAC,CAAC;iBACD,yBAAyB,CAAC,OAAO,CAAC;iBAClC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAChB,MAAM,IAAI,yBAAgB,EAAE,CAAA;YAC9B,CAAC,CAAC,CAAA;YAEJ,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,GACnD,MAAM,GAAG,CAAC,UAAU,CAAC,SAAS,CAC5B,CAAC,CACF,CAAC,yCAAyC,CACzC,KAAK,CAAC,aAAa,EACnB,KAAK,CAAC,IAAI,EACV,KAAK,CAAC,MAAM,CAAC,OAAO,CACrB,CAAA;YACH,OAAO,IAAI,CAAC,wBAAwB,CAClC,IAAA,gBAAO,EACL,IAAA,2BAAkB,EAChB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,KAAK,EACL,SAAS,EACT,IAAI,EACJ,EAAE,CACH,CACF,EACD,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,aAAa,CACzB,CAAA;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,yBAAgB,EAAE,CAAA;QAC9B,CAAC;IACH,CAAC,CAAA;IAED,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,cAAoC,EACpC,aAA0B,EAC1B,aAA2B;IAC3B,oDAAoD;;QAEpD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QACzD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE;YAC1B,GAAG,IAAI,CAAC,UAAU;YAClB,IAAI,EAAE,OAAO;YACb,cAAc;YACd,aAAa;YACb,aAAa;SACE,CAAC,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,SAAS,CACb,GAAU,EACV,cAAoC,EACpC,gBAA4B,IAAI,EAChC,gBAA6B,IAAI;IACjC,oDAAoD;;QAEpD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE;YAC1B,GAAG,IAAI,CAAC,UAAU;YAClB,IAAI,EAAE,OAAO;YACb,cAAc;YACd,aAAa;YACb,aAAa;SACE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,YAAY,6BAAY,EAAE,CAAC;gBAC9B,MAAM,IAAI,yBAAgB,EAAE,CAAA;YAC9B,CAAC;YACD,MAAM,CAAC,CAAA;QACT,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,aAA0B;QACrD,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;QACzD,CAAC;IACH,CAAC;IAED,UAAU,GAAG,KAAK,EAAE,KAAY,EAAE,UAAwB,EAAE,EAAE;QAC5D,qCAAqC;QACrC,kCAAkC;QAClC,2CAA2C;QAC3C,kBAAkB;QAClB,uCAAuC;QACvC,QAAQ;QACR,mBAAmB;QACnB,qBAAqB;QACrB,QAAQ;QACR,MAAM;QACN,IAAI;QACJ,MAAM,YAAY,GAAG,MAAM,IAAA,gBAAY,EACrC,6CAA6C,KAAK,CAAC,EAAE,EAAE,CACxD,CAAA;QACD,MAAM,UAAU,GAAG,MAAM,IAAA,gBAAY,EACnC,8BAA8B,KAAK,CAAC,EAAE,EAAE,CACzC,CAAA;QACD,OAAO,IAAI,CAAC,wBAAwB,CAClC,IAAA,gBAAO,EAAC,IAAA,qBAAY,EAAC,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,EACtD,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,aAAa,CACzB,CAAA;IACH,CAAC,CAAA;CACF;AApND,sCAoNC;AAED,MAAM,YAAY;IACR,QAAQ,CAAY;IACpB,cAAc,CAAY;IAC1B,cAAc,CAAa;IAEnC,gBAAe,CAAC;IAEhB,OAAO,CAAC,IAAgB;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,aAAa,CAAC,IAAiB;QAC7B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
@@ -44,15 +44,23 @@ exports.canvasHelper = {
44
44
  };
45
45
  const canvasBuilder = async () => {
46
46
  try {
47
- const { createCanvas: _createCanvas } = await Promise.resolve().then(() => __importStar(require('canvas')));
47
+ const { createCanvas: _createCanvas } = await Promise.resolve().then(() => __importStar(require('@napi-rs/canvas')));
48
48
  exports.canvasHelper.createCanvas = _createCanvas;
49
49
  exports.canvasHelper.canvasToDataURL = (canvas) => {
50
- return canvas.toDataURL('image/png');
50
+ return canvas.encode('png');
51
51
  };
52
52
  exports.canvasHelper.enable = true;
53
53
  }
54
54
  catch (err) {
55
55
  try {
56
+ const { createCanvas: _createCanvas } = await Promise.resolve().then(() => __importStar(require('canvas')));
57
+ exports.canvasHelper.createCanvas = _createCanvas;
58
+ exports.canvasHelper.canvasToDataURL = (canvas) => {
59
+ return canvas.toDataURL('image/png');
60
+ };
61
+ exports.canvasHelper.enable = true;
62
+ }
63
+ catch (err) {
56
64
  const { Canvas } = await Promise.resolve().then(() => __importStar(require('skia-canvas')));
57
65
  exports.canvasHelper.createCanvas = (h, w) => {
58
66
  return new Canvas(h, w);
@@ -62,8 +70,6 @@ const canvasBuilder = async () => {
62
70
  };
63
71
  exports.canvasHelper.enable = true;
64
72
  }
65
- catch (err) {
66
- }
67
73
  }
68
74
  };
69
75
  canvasBuilder().then(() => console.log(`canvas init over: enable: ${exports.canvasHelper.enable}`));
@@ -1 +1 @@
1
- {"version":3,"file":"canvas.js","sourceRoot":"","sources":["../../../src/img-render/utils/canvas.js"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,sCAAsC;AACtC,mEAAmE;AACnE,oBAAoB;AACpB,yCAAyC;AACzC,wCAAwC;AACxC,IAAI;AACJ,EAAE;AACF,oDAAoD;AACpD,yDAAyD;AACzD,2CAA2C;AAC3C,yCAAyC;AACzC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;AAGS,QAAA,YAAY,GAAG;IAC1B,YAAY,EAAE,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE,GAAC,OAAO,EAAE,CAAA,CAAA,CAAC;IAChC,MAAM,EAAE,KAAK;IACb,eAAe,EAAE,CAAC,MAAM,EAAC,EAAE,CAAC,EAAE;CAC/B,CAAA;AAED,MAAM,aAAa,GAAG,KAAK,IAAG,EAAE;IAC9B,IAAI,CAAC;QACH,MAAM,EAAC,YAAY,EAAE,aAAa,EAAC,GAAG,wDAAa,QAAQ,GAAC,CAAA;QAC5D,oBAAY,CAAC,YAAY,GAAG,aAAa,CAAA;QACzC,oBAAY,CAAC,eAAe,GAAG,CAAC,MAAM,EAAC,EAAE;YACvC,OAAO,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;QACtC,CAAC,CAAA;QACD,oBAAY,CAAC,MAAM,GAAG,IAAI,CAAA;IAC5B,CAAC;IAAA,OAAM,GAAG,EAAE,CAAC;QACX,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAC,GAAG,wDAAa,aAAa,GAAC,CAAA;YAC5C,oBAAY,CAAC,YAAY,GAAG,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE;gBACjC,OAAO,IAAI,MAAM,CAAC,CAAC,EAAC,CAAC,CAAC,CAAA;YACxB,CAAC,CAAA;YACD,oBAAY,CAAC,eAAe,GAAG,CAAC,MAAM,EAAC,EAAE;gBACvC,OAAO,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;YAC1C,CAAC,CAAA;YACD,oBAAY,CAAC,MAAM,GAAG,IAAI,CAAA;QAC5B,CAAC;QAAA,OAAM,GAAG,EAAE,CAAC;QAEb,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,aAAa,EAAE,CAAC,IAAI,CAAC,GAAE,EAAE,CAAA,OAAO,CAAC,GAAG,CAAC,6BAA6B,oBAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"canvas.js","sourceRoot":"","sources":["../../../src/img-render/utils/canvas.js"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,sCAAsC;AACtC,mEAAmE;AACnE,oBAAoB;AACpB,yCAAyC;AACzC,wCAAwC;AACxC,IAAI;AACJ,EAAE;AACF,oDAAoD;AACpD,yDAAyD;AACzD,2CAA2C;AAC3C,yCAAyC;AACzC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;AAGS,QAAA,YAAY,GAAG;IAC1B,YAAY,EAAE,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE,GAAC,OAAO,EAAE,CAAA,CAAA,CAAC;IAChC,MAAM,EAAE,KAAK;IACb,eAAe,EAAE,CAAC,MAAM,EAAC,EAAE,CAAC,EAAE;CAC/B,CAAA;AAED,MAAM,aAAa,GAAG,KAAK,IAAG,EAAE;IAC9B,IAAI,CAAC;QAEH,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,wDAAa,iBAAiB,GAAC,CAAA;QACvE,oBAAY,CAAC,YAAY,GAAG,aAAa,CAAA;QACzC,oBAAY,CAAC,eAAe,GAAG,CAAC,MAAM,EAAC,EAAE;YACvC,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC7B,CAAC,CAAA;QACD,oBAAY,CAAC,MAAM,GAAG,IAAI,CAAA;IAE5B,CAAC;IAAA,OAAM,GAAG,EAAE,CAAC;QACX,IAAI,CAAC;YACH,MAAM,EAAC,YAAY,EAAE,aAAa,EAAC,GAAG,wDAAa,QAAQ,GAAC,CAAA;YAC5D,oBAAY,CAAC,YAAY,GAAG,aAAa,CAAA;YACzC,oBAAY,CAAC,eAAe,GAAG,CAAC,MAAM,EAAC,EAAE;gBACvC,OAAO,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;YACtC,CAAC,CAAA;YACD,oBAAY,CAAC,MAAM,GAAG,IAAI,CAAA;QAE5B,CAAC;QAAA,OAAM,GAAG,EAAE,CAAC;YACX,MAAM,EAAC,MAAM,EAAC,GAAG,wDAAa,aAAa,GAAC,CAAA;YAC5C,oBAAY,CAAC,YAAY,GAAG,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE;gBACjC,OAAO,IAAI,MAAM,CAAC,CAAC,EAAC,CAAC,CAAC,CAAA;YACxB,CAAC,CAAA;YACD,oBAAY,CAAC,eAAe,GAAG,CAAC,MAAM,EAAC,EAAE;gBACvC,OAAO,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;YAC1C,CAAC,CAAA;YACD,oBAAY,CAAC,MAAM,GAAG,IAAI,CAAA;QAC5B,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,aAAa,EAAE,CAAC,IAAI,CAAC,GAAE,EAAE,CAAA,OAAO,CAAC,GAAG,CAAC,6BAA6B,oBAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "beatsaber-bot-core",
3
3
  "description": "一个用于新版 Steam 家庭的库存监控 Bot 插件",
4
- "version": "0.2.0-dev.25",
4
+ "version": "0.2.0-dev.27",
5
5
  "types": "lib/index.d.ts",
6
6
  "files": [
7
7
  "lib"
@@ -66,7 +66,8 @@
66
66
  },
67
67
  "peerDependencies": {
68
68
  "canvas": "^2.11.2",
69
- "skia-canvas": "^1.0.1"
69
+ "skia-canvas": "^1.0.1",
70
+ "@napi-rs/canvas": "^0.1.61"
70
71
  },
71
72
  "typesVersions": {
72
73
  "*": {