beatsaber-bot-core 0.2.0-rc.13 → 0.2.0-rc.14

package/dist/cjs/components/utils/format.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/components/utils/format.ts"],"sourcesContent":["import dayjs from 'dayjs'\nimport duration from 'dayjs/plugin/duration'\nimport relativeTime from 'dayjs/plugin/relativeTime'\nimport zh from 'dayjs/locale/zh-cn'\ndayjs.extend(duration)\ndayjs.extend(relativeTime)\nexport const formatDuration = (duration: number) => {\n  const d = dayjs.duration(duration, 'second')\n  return d.format('m[m]s[s]')\n}\n\n// export const formatDuration = (duration: number) => {\n//   return dayjs.duration(duration,'seconds').format('mm:ss')\n// }\n\nexport const formatTime = (time: string) => {\n  return dayjs(time).locale(zh).fromNow()\n}\n\nexport function formatRelativeTimeByDay(time: string | number | Date) {\n  let res = dayjs().diff(dayjs(time), 'd')\n  let unit = 'd'\n  if (res <= 0) {\n    res = dayjs().diff(dayjs(time), 'h')\n    unit = 'h'\n  }\n  if (res <= 0) {\n    res = dayjs().diff(dayjs(time), 'm')\n    unit = 'm'\n  }\n  return `${res}${unit}`\n}\n\nexport const formatNumber = (number: number) => {\n  // 1.11w\n  try {\n    if (number > 10000) {\n      return `${(number / 10000.0).toFixed(2)}w`\n    }\n    // 1.11k\n    if (number > 1000) {\n      return `${(number / 1000.0).toFixed(2)}k`\n    }\n    return number.toString()\n  } catch (e) {\n    return '0'\n  }\n}\n\nexport function numberWithCommas(x: number) {\n  return x.toString().replace(/\\B(?=(\\d{3})+(?!\\d))/g, ',')\n}\nexport const formatDate = (time: Date | undefined, template?: string) => {\n  if (!time) return undefined\n  return dayjs(time).format(template ?? 'YYYY-MM-DD')\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,sBAAqB;AACrB,0BAAyB;AACzB,mBAAe;AACf,aAAAA,QAAM,OAAO,gBAAAC,OAAQ;AACrB,aAAAD,QAAM,OAAO,oBAAAE,OAAY;AAClB,MAAM,iBAAiB,CAACD,cAAqB;AAClD,QAAM,IAAI,aAAAD,QAAM,SAASC,WAAU,QAAQ;AAC3C,SAAO,EAAE,OAAO,UAAU;AAC5B;AAMO,MAAM,aAAa,CAAC,SAAiB;AAC1C,aAAO,aAAAD,SAAM,IAAI,EAAE,OAAO,aAAAG,OAAE,EAAE,QAAQ;AACxC;AAEO,SAAS,wBAAwB,MAA8B;AACpE,MAAI,UAAM,aAAAH,SAAM,EAAE,SAAK,aAAAA,SAAM,IAAI,GAAG,GAAG;AACvC,MAAI,OAAO;AACX,MAAI,OAAO,GAAG;AACZ,cAAM,aAAAA,SAAM,EAAE,SAAK,aAAAA,SAAM,IAAI,GAAG,GAAG;AACnC,WAAO;AAAA,EACT;AACA,MAAI,OAAO,GAAG;AACZ,cAAM,aAAAA,SAAM,EAAE,SAAK,aAAAA,SAAM,IAAI,GAAG,GAAG;AACnC,WAAO;AAAA,EACT;AACA,SAAO,GAAG,GAAG,GAAG,IAAI;AACtB;AAEO,MAAM,eAAe,CAAC,WAAmB;AAE9C,MAAI;AACF,QAAI,SAAS,KAAO;AAClB,aAAO,IAAI,SAAS,KAAS,QAAQ,CAAC,CAAC;AAAA,IACzC;AAEA,QAAI,SAAS,KAAM;AACjB,aAAO,IAAI,SAAS,KAAQ,QAAQ,CAAC,CAAC;AAAA,IACxC;AACA,WAAO,OAAO,SAAS;AAAA,EACzB,SAAS,GAAG;AACV,WAAO;AAAA,EACT;AACF;AAEO,SAAS,iBAAiB,GAAW;AAC1C,SAAO,EAAE,SAAS,EAAE,QAAQ,yBAAyB,GAAG;AAC1D;AACO,MAAM,aAAa,CAAC,MAAwB,aAAsB;AACvE,MAAI,CAAC,KAAM,QAAO;AAClB,aAAO,aAAAA,SAAM,IAAI,EAAE,OAAO,8BAAY,YAAY;AACpD;","names":["dayjs","duration","relativeTime","zh"]}
+{"version":3,"sources":["../../../../src/components/utils/format.ts"],"sourcesContent":["import dayjs from 'dayjs'\nimport duration from 'dayjs/plugin/duration.js'\nimport relativeTime from 'dayjs/plugin/relativeTime.js'\nimport zh from 'dayjs/locale/zh-cn.js'\ndayjs.extend(duration)\ndayjs.extend(relativeTime)\nexport const formatDuration = (duration: number) => {\n  const d = dayjs.duration(duration, 'second')\n  return d.format('m[m]s[s]')\n}\n\n// export const formatDuration = (duration: number) => {\n//   return dayjs.duration(duration,'seconds').format('mm:ss')\n// }\n\nexport const formatTime = (time: string) => {\n  return dayjs(time).locale(zh).fromNow()\n}\n\nexport function formatRelativeTimeByDay(time: string | number | Date) {\n  let res = dayjs().diff(dayjs(time), 'd')\n  let unit = 'd'\n  if (res <= 0) {\n    res = dayjs().diff(dayjs(time), 'h')\n    unit = 'h'\n  }\n  if (res <= 0) {\n    res = dayjs().diff(dayjs(time), 'm')\n    unit = 'm'\n  }\n  return `${res}${unit}`\n}\n\nexport const formatNumber = (number: number) => {\n  // 1.11w\n  try {\n    if (number > 10000) {\n      return `${(number / 10000.0).toFixed(2)}w`\n    }\n    // 1.11k\n    if (number > 1000) {\n      return `${(number / 1000.0).toFixed(2)}k`\n    }\n    return number.toString()\n  } catch (e) {\n    return '0'\n  }\n}\n\nexport function numberWithCommas(x: number) {\n  return x.toString().replace(/\\B(?=(\\d{3})+(?!\\d))/g, ',')\n}\nexport const formatDate = (time: Date | undefined, template?: string) => {\n  if (!time) return undefined\n  return dayjs(time).format(template ?? 'YYYY-MM-DD')\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,sBAAqB;AACrB,0BAAyB;AACzB,mBAAe;AACf,aAAAA,QAAM,OAAO,gBAAAC,OAAQ;AACrB,aAAAD,QAAM,OAAO,oBAAAE,OAAY;AAClB,MAAM,iBAAiB,CAACD,cAAqB;AAClD,QAAM,IAAI,aAAAD,QAAM,SAASC,WAAU,QAAQ;AAC3C,SAAO,EAAE,OAAO,UAAU;AAC5B;AAMO,MAAM,aAAa,CAAC,SAAiB;AAC1C,aAAO,aAAAD,SAAM,IAAI,EAAE,OAAO,aAAAG,OAAE,EAAE,QAAQ;AACxC;AAEO,SAAS,wBAAwB,MAA8B;AACpE,MAAI,UAAM,aAAAH,SAAM,EAAE,SAAK,aAAAA,SAAM,IAAI,GAAG,GAAG;AACvC,MAAI,OAAO;AACX,MAAI,OAAO,GAAG;AACZ,cAAM,aAAAA,SAAM,EAAE,SAAK,aAAAA,SAAM,IAAI,GAAG,GAAG;AACnC,WAAO;AAAA,EACT;AACA,MAAI,OAAO,GAAG;AACZ,cAAM,aAAAA,SAAM,EAAE,SAAK,aAAAA,SAAM,IAAI,GAAG,GAAG;AACnC,WAAO;AAAA,EACT;AACA,SAAO,GAAG,GAAG,GAAG,IAAI;AACtB;AAEO,MAAM,eAAe,CAAC,WAAmB;AAE9C,MAAI;AACF,QAAI,SAAS,KAAO;AAClB,aAAO,IAAI,SAAS,KAAS,QAAQ,CAAC,CAAC;AAAA,IACzC;AAEA,QAAI,SAAS,KAAM;AACjB,aAAO,IAAI,SAAS,KAAQ,QAAQ,CAAC,CAAC;AAAA,IACxC;AACA,WAAO,OAAO,SAAS;AAAA,EACzB,SAAS,GAAG;AACV,WAAO;AAAA,EACT;AACF;AAEO,SAAS,iBAAiB,GAAW;AAC1C,SAAO,EAAE,SAAS,EAAE,QAAQ,yBAAyB,GAAG;AAC1D;AACO,MAAM,aAAa,CAAC,MAAwB,aAAsB;AACvE,MAAI,CAAC,KAAM,QAAO;AAClB,aAAO,aAAAA,SAAM,IAAI,EAAE,OAAO,8BAAY,YAAY;AACpD;","names":["dayjs","duration","relativeTime","zh"]}

package/dist/cjs/config.js

@@ -2,6 +2,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -12,5 +16,40 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var config_exports = {};
+__export(config_exports, {
+  configSchema: () => configSchema
+});
 module.exports = __toCommonJS(config_exports);
+var import_infra = require("@/infra");
+var import_v4 = require("zod/v4");
+const cronSchema = import_v4.z.object({
+  enabled: import_v4.z.boolean().optional().default(false),
+  cron: import_v4.z.string().optional()
+}).optional().default({ enabled: false });
+const configSchema = import_v4.z.object({
+  s3: import_infra.s3ConfigSchema.default({ enabled: false }).optional(),
+  render: import_infra.renderSchema,
+  beatsaver: import_v4.z.object({
+    host: import_v4.z.string().default("https://api.beatsaver.com").optional(),
+    wsURL: import_v4.z.string().default("wss://ws.beatsaver.com/maps").optional(),
+    oauthClientId: import_v4.z.string().optional(),
+    oauthClientSecret: import_v4.z.string().optional()
+  }).default({
+    host: "https://api.beatsaver.com",
+    wsURL: "wss://ws.beatsaver.com/maps"
+  }).optional(),
+  beatleader: import_v4.z.object({
+    oauthClientId: import_v4.z.string().optional(),
+    oauthClientSecret: import_v4.z.string().optional()
+  }).default({}).optional(),
+  cron: import_v4.z.object({
+    temp: cronSchema
+  }).default({
+    temp: { enabled: false }
+  }).optional()
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  configSchema
+});
 //# sourceMappingURL=config.js.map

package/dist/cjs/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config.ts"],"sourcesContent":["import type { S3Config, RenderConfig } from \"@/infra\";\n\n\nexport interface Config {\n  s3: {\n    enabled: boolean\n  } & S3Config\n  render: RenderConfig\n  minRawMatchMapIdLength: number\n\n  beatSaverHost: string\n  beatSaverWSURL: string\n  bsOauthClientId: string\n  bsOauthClientSecret: string\n\n  blOauthClientId: string\n  blOauthClientSecret: string\n  bsNotifyMonitorCron: ScheduleTaskConfig\n  tokenRefreshCron: ScheduleTaskConfig\n  tempCron: ScheduleTaskConfig\n}\n\ninterface ScheduleTaskConfig {\n  cron: string\n  enabled: boolean\n}\n"],"mappings":";;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../../src/config.ts"],"sourcesContent":["import { renderSchema, s3ConfigSchema } from '@/infra'\nimport {z} from 'zod/v4'\n\nconst cronSchema = z.object({\n  enabled: z.boolean().optional().default(false),\n  cron: z.string().optional(),\n}).optional().default({ enabled: false })\n\nexport const configSchema = z.object({\n  s3: s3ConfigSchema.default({ enabled: false }).optional(),\n  render: renderSchema,\n  beatsaver: z.object({\n    host: z.string().default('https://api.beatsaver.com').optional(),\n    wsURL: z.string().default('wss://ws.beatsaver.com/maps').optional(),\n    oauthClientId: z.string().optional(),\n    oauthClientSecret: z.string().optional(),\n  }).default({\n    host: 'https://api.beatsaver.com',\n    wsURL: 'wss://ws.beatsaver.com/maps',\n  }).optional(),\n  beatleader: z.object({\n    oauthClientId: z.string().optional(),\n    oauthClientSecret: z.string().optional(),\n  }).default({}).optional(),\n  cron: z.object({\n    temp: cronSchema,\n  }).default({\n    temp: {enabled: false},\n  }).optional()\n})\n\nexport type Config = z.infer<typeof configSchema>\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA6C;AAC7C,gBAAgB;AAEhB,MAAM,aAAa,YAAE,OAAO;AAAA,EAC1B,SAAS,YAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,KAAK;AAAA,EAC7C,MAAM,YAAE,OAAO,EAAE,SAAS;AAC5B,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,MAAM,CAAC;AAEjC,MAAM,eAAe,YAAE,OAAO;AAAA,EACnC,IAAI,4BAAe,QAAQ,EAAE,SAAS,MAAM,CAAC,EAAE,SAAS;AAAA,EACxD,QAAQ;AAAA,EACR,WAAW,YAAE,OAAO;AAAA,IAClB,MAAM,YAAE,OAAO,EAAE,QAAQ,2BAA2B,EAAE,SAAS;AAAA,IAC/D,OAAO,YAAE,OAAO,EAAE,QAAQ,6BAA6B,EAAE,SAAS;AAAA,IAClE,eAAe,YAAE,OAAO,EAAE,SAAS;AAAA,IACnC,mBAAmB,YAAE,OAAO,EAAE,SAAS;AAAA,EACzC,CAAC,EAAE,QAAQ;AAAA,IACT,MAAM;AAAA,IACN,OAAO;AAAA,EACT,CAAC,EAAE,SAAS;AAAA,EACZ,YAAY,YAAE,OAAO;AAAA,IACnB,eAAe,YAAE,OAAO,EAAE,SAAS;AAAA,IACnC,mBAAmB,YAAE,OAAO,EAAE,SAAS;AAAA,EACzC,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,SAAS;AAAA,EACxB,MAAM,YAAE,OAAO;AAAA,IACb,MAAM;AAAA,EACR,CAAC,EAAE,QAAQ;AAAA,IACT,MAAM,EAAC,SAAS,MAAK;AAAA,EACvB,CAAC,EAAE,SAAS;AACd,CAAC;","names":[]}

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["import {botCommands} from \"./cmd\";\nimport {getScheduleTasks} from \"./schedules\";\nimport {Config} from \"./config\";\n\nexport * from './interface'\nexport * from './schedules'\nexport * from './config'\nexport * from './cmd'\nexport * from './ws'\nexport * from './utils'\nexport * from './service'\nexport * from './infra'\n\nexport const getBot = <T>(config: Config) => ({\n  commands: botCommands<T>(),\n  schedule: getScheduleTasks(config),\n})\n\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAA0B;AAC1B,uBAA+B;AAG/B,0BAAc,wBAJd;AAKA,0BAAc,wBALd;AAMA,0BAAc,qBANd;AAOA,0BAAc,kBAPd;AAQA,0BAAc,iBARd;AASA,0BAAc,oBATd;AAUA,0BAAc,sBAVd;AAWA,0BAAc,oBAXd;AAaO,MAAM,SAAS,CAAI,YAAoB;AAAA,EAC5C,cAAU,wBAAe;AAAA,EACzB,cAAU,mCAAiB,MAAM;AACnC;","names":[]}
+{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["import {botCommands} from \"./cmd\";\nimport {getScheduleTasks} from \"./schedules\";\nimport type {Config} from \"./config\";\n\nexport * from './interface'\nexport * from './schedules'\nexport * from './config'\nexport * from './cmd'\nexport * from './ws'\nexport * from './utils'\nexport * from './service'\nexport * from './infra'\n\nexport const getBot = <T>(config: Config) => ({\n  commands: botCommands<T>(),\n  schedule: getScheduleTasks(config),\n})\n\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAA0B;AAC1B,uBAA+B;AAG/B,0BAAc,wBAJd;AAKA,0BAAc,wBALd;AAMA,0BAAc,qBANd;AAOA,0BAAc,kBAPd;AAQA,0BAAc,iBARd;AASA,0BAAc,oBATd;AAUA,0BAAc,sBAVd;AAWA,0BAAc,oBAXd;AAaO,MAAM,SAAS,CAAI,YAAoB;AAAA,EAC5C,cAAU,wBAAe;AAAA,EACzB,cAAU,mCAAiB,MAAM;AACnC;","names":[]}

package/dist/cjs/infra/index.js

@@ -19,8 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var infra_exports = {};
 __export(infra_exports, {
   I18nService: () => import_i18n.I18nService,
-  S3Config: () => import_s3.S3Config,
-  S3Service: () => import_s3.S3Service
+  S3Service: () => import_s3.S3Service,
+  s3ConfigSchema: () => import_s3.s3ConfigSchema
 });
 module.exports = __toCommonJS(infra_exports);
 __reExport(infra_exports, require("./support/render"), module.exports);
@@ -29,8 +29,8 @@ var import_s3 = require("./s3");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   I18nService,
-  S3Config,
   S3Service,
+  s3ConfigSchema,
   ...require("./support/render")
 });
 //# sourceMappingURL=index.js.map

package/dist/cjs/infra/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/infra/index.ts"],"sourcesContent":["export * from './support/render'\nexport { I18nService } from './i18n'\nexport { S3Service, S3Config } from './s3'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAc,6BAAd;AACA,kBAA4B;AAC5B,gBAAoC;","names":[]}
+{"version":3,"sources":["../../../src/infra/index.ts"],"sourcesContent":["export * from './support/render'\nexport { I18nService } from './i18n'\nexport { S3Service, type S3Config, s3ConfigSchema } from './s3'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAc,6BAAd;AACA,kBAA4B;AAC5B,gBAAyD;","names":[]}

package/dist/cjs/infra/s3/index.js

@@ -2,9 +2,22 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -49,11 +62,27 @@ var __async = (__this, __arguments, generator) => {
 };
 var s3_exports = {};
 __export(s3_exports, {
-  S3Service: () => S3Service
+  S3Service: () => S3Service,
+  s3ConfigSchema: () => s3ConfigSchema,
+  strictS3ConfigSchema: () => strictS3ConfigSchema
 });
 module.exports = __toCommonJS(s3_exports);
 var import_client_s3 = require("@aws-sdk/client-s3");
-var import_crypto = __toESM(require("crypto"));
+var import_crypto = __toESM(require("crypto"), 1);
+var import_v4 = require("zod/v4");
+const strictS3ConfigSchema = import_v4.z.object({
+  s3AccessKey: import_v4.z.string(),
+  s3SecretKey: import_v4.z.string(),
+  endpoint: import_v4.z.string(),
+  baseURL: import_v4.z.string(),
+  bucketName: import_v4.z.string(),
+  region: import_v4.z.string().optional(),
+  keyPrefix: import_v4.z.string().optional()
+});
+const s3ConfigSchema = import_v4.z.discriminatedUnion("enabled", [
+  import_v4.z.object(__spreadValues({ enabled: import_v4.z.literal(true) }, strictS3ConfigSchema.shape)),
+  import_v4.z.object({ enabled: import_v4.z.literal(false) })
+]);
 class S3Service {
   constructor(config) {
     __publicField(this, "s3Client");
@@ -109,6 +138,8 @@ class S3Service {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  S3Service
+  S3Service,
+  s3ConfigSchema,
+  strictS3ConfigSchema
 });
 //# sourceMappingURL=index.js.map

package/dist/cjs/infra/s3/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/infra/s3/index.ts"],"sourcesContent":["import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3'\nimport crypto from 'crypto'\n\nexport interface S3Config {\n  s3AccessKey: string\n  s3SecretKey: string\n  endpoint: string\n  region: string | undefined\n  bucketName: string\n  keyPrefix: string\n  baseURL: string\n}\n\nexport class S3Service {\n  private s3Client: S3Client\n  private readonly bucket: string\n  private readonly keyPrefix: string = ''\n  private readonly baseURL: string = ''\n  constructor(config: S3Config) {\n    const s3 = new S3Client({\n      region: config.region ?? 'auto',\n      endpoint: config.endpoint,\n      credentials: {\n        accessKeyId: config.s3AccessKey,\n        secretAccessKey: config.s3SecretKey,\n      },\n    })\n    this.bucket = config.bucketName\n    this.keyPrefix = config.keyPrefix\n    this.baseURL = config.baseURL\n    this.s3Client = s3\n  }\n  async uploadImgWithUrl(url: string, mimeType?: string): Promise<string> {\n    const res = await fetch(url).then((it) => it.arrayBuffer())\n    const buf = Buffer.from(res)\n    // @ts-ignore\n    const md5 = crypto.createHash('md5').update(buf).digest('hex')\n    const key = this.keyPrefix ? `${this.keyPrefix}-${md5}` : md5\n    const params = {\n      Bucket: this.bucket,\n      Key: key,\n      Body: buf,\n      ContentType: mimeType ?? 'image/png',\n    }\n    const command = new PutObjectCommand(params)\n    const data = await this.s3Client.send(command)\n    return `${this.baseURL}${key}`\n  }\n  async uploadImg(buffer: Buffer, mimeType?: string): Promise<string> {\n    // md5 digest\n    // @ts-ignore\n    const md5 = crypto.createHash('md5').update(buffer).digest('hex')\n    const key = this.keyPrefix ? `${this.keyPrefix}-${md5}` : md5\n    const params = {\n      Bucket: this.bucket,\n      Key: key,\n      Body: buffer,\n      ContentType: mimeType ?? 'image/png',\n    }\n    const command = new PutObjectCommand(params)\n    const data = await this.s3Client.send(command)\n    return `${this.baseURL}${key}`\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA2C;AAC3C,oBAAmB;AAYZ,MAAM,UAAU;AAAA,EAKrB,YAAY,QAAkB;AAJ9B,wBAAQ;AACR,wBAAiB;AACjB,wBAAiB,aAAoB;AACrC,wBAAiB,WAAkB;AAjBrC;AAmBI,UAAM,KAAK,IAAI,0BAAS;AAAA,MACtB,SAAQ,YAAO,WAAP,YAAiB;AAAA,MACzB,UAAU,OAAO;AAAA,MACjB,aAAa;AAAA,QACX,aAAa,OAAO;AAAA,QACpB,iBAAiB,OAAO;AAAA,MAC1B;AAAA,IACF,CAAC;AACD,SAAK,SAAS,OAAO;AACrB,SAAK,YAAY,OAAO;AACxB,SAAK,UAAU,OAAO;AACtB,SAAK,WAAW;AAAA,EAClB;AAAA,EACM,iBAAiB,KAAa,UAAoC;AAAA;AACtE,YAAM,MAAM,MAAM,MAAM,GAAG,EAAE,KAAK,CAAC,OAAO,GAAG,YAAY,CAAC;AAC1D,YAAM,MAAM,OAAO,KAAK,GAAG;AAE3B,YAAM,MAAM,cAAAA,QAAO,WAAW,KAAK,EAAE,OAAO,GAAG,EAAE,OAAO,KAAK;AAC7D,YAAM,MAAM,KAAK,YAAY,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK;AAC1D,YAAM,SAAS;AAAA,QACb,QAAQ,KAAK;AAAA,QACb,KAAK;AAAA,QACL,MAAM;AAAA,QACN,aAAa,8BAAY;AAAA,MAC3B;AACA,YAAM,UAAU,IAAI,kCAAiB,MAAM;AAC3C,YAAM,OAAO,MAAM,KAAK,SAAS,KAAK,OAAO;AAC7C,aAAO,GAAG,KAAK,OAAO,GAAG,GAAG;AAAA,IAC9B;AAAA;AAAA,EACM,UAAU,QAAgB,UAAoC;AAAA;AAGlE,YAAM,MAAM,cAAAA,QAAO,WAAW,KAAK,EAAE,OAAO,MAAM,EAAE,OAAO,KAAK;AAChE,YAAM,MAAM,KAAK,YAAY,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK;AAC1D,YAAM,SAAS;AAAA,QACb,QAAQ,KAAK;AAAA,QACb,KAAK;AAAA,QACL,MAAM;AAAA,QACN,aAAa,8BAAY;AAAA,MAC3B;AACA,YAAM,UAAU,IAAI,kCAAiB,MAAM;AAC3C,YAAM,OAAO,MAAM,KAAK,SAAS,KAAK,OAAO;AAC7C,aAAO,GAAG,KAAK,OAAO,GAAG,GAAG;AAAA,IAC9B;AAAA;AACF;","names":["crypto"]}
+{"version":3,"sources":["../../../../src/infra/s3/index.ts"],"sourcesContent":["import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3'\nimport crypto from 'crypto'\nimport {z} from \"zod/v4\";\n\nexport interface S3Config {\n  s3AccessKey: string\n  s3SecretKey: string\n  endpoint: string\n  region?: string\n  bucketName: string\n  keyPrefix?: string\n  baseURL: string\n}\n\n\n\nexport const strictS3ConfigSchema = z.object({\n  s3AccessKey: z.string(),\n  s3SecretKey: z.string(),\n  endpoint: z.string(),\n  baseURL: z.string(),\n  bucketName: z.string(),\n  region: z.string().optional(),\n  keyPrefix: z.string().optional(),\n})\n\nexport const s3ConfigSchema = z.discriminatedUnion('enabled', [\n  z.object({ enabled: z.literal(true), ...strictS3ConfigSchema.shape }),\n  z.object({ enabled: z.literal(false),}),\n])\n\nexport class S3Service {\n  private s3Client: S3Client\n  private readonly bucket: string\n  private readonly keyPrefix: string = ''\n  private readonly baseURL: string = ''\n  constructor(config: S3Config) {\n    const s3 = new S3Client({\n      region: config.region ?? 'auto',\n      endpoint: config.endpoint,\n      credentials: {\n        accessKeyId: config.s3AccessKey,\n        secretAccessKey: config.s3SecretKey,\n      },\n    })\n    this.bucket = config.bucketName\n    this.keyPrefix = config.keyPrefix\n    this.baseURL = config.baseURL\n    this.s3Client = s3\n  }\n  async uploadImgWithUrl(url: string, mimeType?: string): Promise<string> {\n    const res = await fetch(url).then((it) => it.arrayBuffer())\n    const buf = Buffer.from(res)\n    // @ts-ignore\n    const md5 = crypto.createHash('md5').update(buf).digest('hex')\n    const key = this.keyPrefix ? `${this.keyPrefix}-${md5}` : md5\n    const params = {\n      Bucket: this.bucket,\n      Key: key,\n      Body: buf,\n      ContentType: mimeType ?? 'image/png',\n    }\n    const command = new PutObjectCommand(params)\n    const data = await this.s3Client.send(command)\n    return `${this.baseURL}${key}`\n  }\n  async uploadImg(buffer: Buffer, mimeType?: string): Promise<string> {\n    // md5 digest\n    // @ts-ignore\n    const md5 = crypto.createHash('md5').update(buffer).digest('hex')\n    const key = this.keyPrefix ? `${this.keyPrefix}-${md5}` : md5\n    const params = {\n      Bucket: this.bucket,\n      Key: key,\n      Body: buffer,\n      ContentType: mimeType ?? 'image/png',\n    }\n    const command = new PutObjectCommand(params)\n    const data = await this.s3Client.send(command)\n    return `${this.baseURL}${key}`\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA2C;AAC3C,oBAAmB;AACnB,gBAAgB;AAcT,MAAM,uBAAuB,YAAE,OAAO;AAAA,EAC3C,aAAa,YAAE,OAAO;AAAA,EACtB,aAAa,YAAE,OAAO;AAAA,EACtB,UAAU,YAAE,OAAO;AAAA,EACnB,SAAS,YAAE,OAAO;AAAA,EAClB,YAAY,YAAE,OAAO;AAAA,EACrB,QAAQ,YAAE,OAAO,EAAE,SAAS;AAAA,EAC5B,WAAW,YAAE,OAAO,EAAE,SAAS;AACjC,CAAC;AAEM,MAAM,iBAAiB,YAAE,mBAAmB,WAAW;AAAA,EAC5D,YAAE,OAAO,iBAAE,SAAS,YAAE,QAAQ,IAAI,KAAM,qBAAqB,MAAO;AAAA,EACpE,YAAE,OAAO,EAAE,SAAS,YAAE,QAAQ,KAAK,EAAE,CAAC;AACxC,CAAC;AAEM,MAAM,UAAU;AAAA,EAKrB,YAAY,QAAkB;AAJ9B,wBAAQ;AACR,wBAAiB;AACjB,wBAAiB,aAAoB;AACrC,wBAAiB,WAAkB;AAnCrC;AAqCI,UAAM,KAAK,IAAI,0BAAS;AAAA,MACtB,SAAQ,YAAO,WAAP,YAAiB;AAAA,MACzB,UAAU,OAAO;AAAA,MACjB,aAAa;AAAA,QACX,aAAa,OAAO;AAAA,QACpB,iBAAiB,OAAO;AAAA,MAC1B;AAAA,IACF,CAAC;AACD,SAAK,SAAS,OAAO;AACrB,SAAK,YAAY,OAAO;AACxB,SAAK,UAAU,OAAO;AACtB,SAAK,WAAW;AAAA,EAClB;AAAA,EACM,iBAAiB,KAAa,UAAoC;AAAA;AACtE,YAAM,MAAM,MAAM,MAAM,GAAG,EAAE,KAAK,CAAC,OAAO,GAAG,YAAY,CAAC;AAC1D,YAAM,MAAM,OAAO,KAAK,GAAG;AAE3B,YAAM,MAAM,cAAAA,QAAO,WAAW,KAAK,EAAE,OAAO,GAAG,EAAE,OAAO,KAAK;AAC7D,YAAM,MAAM,KAAK,YAAY,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK;AAC1D,YAAM,SAAS;AAAA,QACb,QAAQ,KAAK;AAAA,QACb,KAAK;AAAA,QACL,MAAM;AAAA,QACN,aAAa,8BAAY;AAAA,MAC3B;AACA,YAAM,UAAU,IAAI,kCAAiB,MAAM;AAC3C,YAAM,OAAO,MAAM,KAAK,SAAS,KAAK,OAAO;AAC7C,aAAO,GAAG,KAAK,OAAO,GAAG,GAAG;AAAA,IAC9B;AAAA;AAAA,EACM,UAAU,QAAgB,UAAoC;AAAA;AAGlE,YAAM,MAAM,cAAAA,QAAO,WAAW,KAAK,EAAE,OAAO,MAAM,EAAE,OAAO,KAAK;AAChE,YAAM,MAAM,KAAK,YAAY,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK;AAC1D,YAAM,SAAS;AAAA,QACb,QAAQ,KAAK;AAAA,QACb,KAAK;AAAA,QACL,MAAM;AAAA,QACN,aAAa,8BAAY;AAAA,MAC3B;AACA,YAAM,UAAU,IAAI,kCAAiB,MAAM;AAC3C,YAAM,OAAO,MAAM,KAAK,SAAS,KAAK,OAAO;AAC7C,aAAO,GAAG,KAAK,OAAO,GAAG,GAAG;AAAA,IAC9B;AAAA;AACF;","names":["crypto"]}

package/dist/cjs/infra/support/fetch/index.js

@@ -31,20 +31,29 @@ const rofetch = (0, import_ofetch.createFetch)({
     retryDelay: 400
   }
 });
-const ofetch = new import_ofetch.Fetch(rofetch);
+const ofetch = new import_ofetch.Fetch();
 const createFetch = (logger) => {
   return ofetch.extend({
     onRequest: (context) => {
       logger.debug(`[fetch -->] ${context.options.baseURL}${context.request}`);
+      logger.debug(`[fetch -->] ${JSON.stringify(context.options, null, 2)}`);
     },
     onResponse: (context) => {
       logger.debug(`[fetch <--] ${context.request} ${context.response.status}`);
+      switch (context.options.responseType) {
+        case "text":
+          logger.debug(`[fetch <--] ${context.response._data}`);
+          break;
+        case "json":
+          logger.debug(`[fetch -->] ${JSON.stringify(context.response._data, null, 2)}`);
+          break;
+      }
     },
-    onResponseError: (context) => {
-      if (context.response.status === 404) {
+    onResponseError({ request, response, options, error }) {
+      logger.debug(`response error ${response.statusText}`, error);
+      if (response.status === 404) {
         throw new import_error.NotFoundError();
       }
-      throw context.error;
     },
     ignoreResponseError: false
   });

package/dist/cjs/infra/support/fetch/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/infra/support/fetch/index.ts"],"sourcesContent":["import { createFetch as c, Fetch } from './ofetch'\nimport { Logger } from '@/interface'\nimport { NotFoundError } from './error'\n\nconst rofetch = c({\n  defaults: {\n    retryStatusCodes: [400, 408, 409, 425, 429, 502, 503, 504],\n    retry: 2,\n    retryDelay: 400,\n  },\n})\n\nconst ofetch = new Fetch(rofetch)\n\nexport const createFetch = (logger: Logger) => {\n  return ofetch.extend({\n    onRequest: (context) => {\n      logger.debug(`[fetch -->] ${context.options.baseURL}${context.request}`)\n    },\n    onResponse: (context) => {\n      logger.debug(`[fetch <--] ${context.request} ${context.response.status}`)\n    },\n    onResponseError: (context) => {\n      if (context.response.status === 404) {\n        throw new NotFoundError()\n      }\n      throw context.error\n    },\n    ignoreResponseError: false,\n  })\n}\n\nexport { Fetch } from './ofetch'\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAwC;AAExC,mBAA8B;AA8B9B,IAAAA,iBAAsB;AA5BtB,MAAM,cAAU,cAAAC,aAAE;AAAA,EAChB,UAAU;AAAA,IACR,kBAAkB,CAAC,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,GAAG;AAAA,IACzD,OAAO;AAAA,IACP,YAAY;AAAA,EACd;AACF,CAAC;AAED,MAAM,SAAS,IAAI,oBAAM,OAAO;AAEzB,MAAM,cAAc,CAAC,WAAmB;AAC7C,SAAO,OAAO,OAAO;AAAA,IACnB,WAAW,CAAC,YAAY;AACtB,aAAO,MAAM,eAAe,QAAQ,QAAQ,OAAO,GAAG,QAAQ,OAAO,EAAE;AAAA,IACzE;AAAA,IACA,YAAY,CAAC,YAAY;AACvB,aAAO,MAAM,eAAe,QAAQ,OAAO,IAAI,QAAQ,SAAS,MAAM,EAAE;AAAA,IAC1E;AAAA,IACA,iBAAiB,CAAC,YAAY;AAC5B,UAAI,QAAQ,SAAS,WAAW,KAAK;AACnC,cAAM,IAAI,2BAAc;AAAA,MAC1B;AACA,YAAM,QAAQ;AAAA,IAChB;AAAA,IACA,qBAAqB;AAAA,EACvB,CAAC;AACH;","names":["import_ofetch","c"]}
+{"version":3,"sources":["../../../../../src/infra/support/fetch/index.ts"],"sourcesContent":["import { createFetch as c, Fetch } from './ofetch'\nimport { Logger } from '@/interface'\nimport { NotFoundError } from './error'\n\nconst rofetch = c({\n  defaults: {\n    retryStatusCodes: [400, 408, 409, 425, 429, 502, 503, 504],\n    retry: 2,\n    retryDelay: 400,\n  },\n})\n\nconst ofetch = new Fetch()\n\nexport const createFetch = (logger: Logger) => {\n  return ofetch.extend({\n    onRequest: (context) => {\n      logger.debug(`[fetch -->] ${context.options.baseURL}${context.request}`)\n      logger.debug(`[fetch -->] ${JSON.stringify(context.options, null, 2)}`)\n    },\n    onResponse: (context) => {\n      logger.debug(`[fetch <--] ${context.request} ${context.response.status}`)\n      switch (context.options.responseType) {\n        case 'text':\n          logger.debug(`[fetch <--] ${context.response._data}`)\n          break\n        case \"json\":\n          logger.debug(`[fetch -->] ${JSON.stringify(context.response._data, null, 2)}`)\n          break\n      }\n    },\n    onResponseError({ request, response, options, error }) {\n      logger.debug(`response error ${response.statusText}`, error)\n      if (response.status === 404) {\n        throw new NotFoundError()\n      }\n    },\n    ignoreResponseError: false,\n  })\n}\n\nexport { Fetch } from './ofetch'\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAwC;AAExC,mBAA8B;AAuC9B,IAAAA,iBAAsB;AArCtB,MAAM,cAAU,cAAAC,aAAE;AAAA,EAChB,UAAU;AAAA,IACR,kBAAkB,CAAC,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,GAAG;AAAA,IACzD,OAAO;AAAA,IACP,YAAY;AAAA,EACd;AACF,CAAC;AAED,MAAM,SAAS,IAAI,oBAAM;AAElB,MAAM,cAAc,CAAC,WAAmB;AAC7C,SAAO,OAAO,OAAO;AAAA,IACnB,WAAW,CAAC,YAAY;AACtB,aAAO,MAAM,eAAe,QAAQ,QAAQ,OAAO,GAAG,QAAQ,OAAO,EAAE;AACvE,aAAO,MAAM,eAAe,KAAK,UAAU,QAAQ,SAAS,MAAM,CAAC,CAAC,EAAE;AAAA,IACxE;AAAA,IACA,YAAY,CAAC,YAAY;AACvB,aAAO,MAAM,eAAe,QAAQ,OAAO,IAAI,QAAQ,SAAS,MAAM,EAAE;AACxE,cAAQ,QAAQ,QAAQ,cAAc;AAAA,QACpC,KAAK;AACH,iBAAO,MAAM,eAAe,QAAQ,SAAS,KAAK,EAAE;AACpD;AAAA,QACF,KAAK;AACH,iBAAO,MAAM,eAAe,KAAK,UAAU,QAAQ,SAAS,OAAO,MAAM,CAAC,CAAC,EAAE;AAC7E;AAAA,MACJ;AAAA,IACF;AAAA,IACA,gBAAgB,EAAE,SAAS,UAAU,SAAS,MAAM,GAAG;AACrD,aAAO,MAAM,kBAAkB,SAAS,UAAU,IAAI,KAAK;AAC3D,UAAI,SAAS,WAAW,KAAK;AAC3B,cAAM,IAAI,2BAAc;AAAA,MAC1B;AAAA,IACF;AAAA,IACA,qBAAqB;AAAA,EACvB,CAAC;AACH;","names":["import_ofetch","c"]}

package/dist/cjs/infra/support/fetch/ofetch.js

@@ -56,25 +56,18 @@ var __async = (__this, __arguments, generator) => {
 var ofetch_exports = {};
 __export(ofetch_exports, {
   Fetch: () => Fetch,
-  createFetch: () => import_ofetch2.createFetch,
-  rofetch: () => rofetch
+  createFetch: () => import_ofetch2.createFetch
 });
 module.exports = __toCommonJS(ofetch_exports);
 var import_ofetch = require("ofetch");
-var import_error = require("./error");
 var import_ofetch2 = require("ofetch");
 const rofetch = (0, import_ofetch.createFetch)({
   defaults: {
-    retryStatusCodes: [400, 408, 409, 425, 429, 500, 502, 503, 504],
-    retry: 3,
+    retryStatusCodes: [408, 409, 425, 429, 500, 502, 503, 504],
+    retry: 2,
     retryDelay: 800
   }
 }).create({
-  onResponseError({ request, response, options }) {
-    if (response.status === 404) {
-      throw new import_error.NotFoundError();
-    }
-  },
   onRequestError({ request, error }) {
   }
 });
@@ -99,6 +92,7 @@ class Fetch {
           body: f
         });
       }
+      console.debug();
       const res = yield this.ofetchInstance(request, opt);
       return res;
     });
@@ -131,7 +125,6 @@ class Fetch {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Fetch,
-  createFetch,
-  rofetch
+  createFetch
 });
 //# sourceMappingURL=ofetch.js.map

package/dist/cjs/infra/support/fetch/ofetch.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/infra/support/fetch/ofetch.ts"],"sourcesContent":["import { $Fetch, createFetch, FetchOptions, ResponseType } from 'ofetch'\nimport { NotFoundError } from './error'\n\nexport const rofetch = createFetch({\n  defaults: {\n    retryStatusCodes: [400, 408, 409, 425, 429, 500, 502, 503, 504],\n    retry: 3,\n    retryDelay: 800,\n  },\n}).create({\n  onResponseError({ request, response, options }) {\n    if (response.status === 404) {\n      throw new NotFoundError()\n    }\n  },\n  onRequestError({ request, error }) {},\n})\n\nexport type ExtendFetchOptions<R extends ResponseType = ResponseType, T = any> = {\n  form?: Record<string, any>\n} & FetchOptions<R, T>\n\nexport class Fetch {\n  private options?: FetchOptions\n  private ofetchInstance: $Fetch\n  constructor(fetchInstance?: $Fetch, options?: FetchOptions) {\n    this.options = options\n    this.ofetchInstance = fetchInstance ?? rofetch\n  }\n   async fetch<T, R extends ResponseType>(request: string, options?: ExtendFetchOptions<R, T>) {\n    let opt = {\n      ...options,\n      ...this.options\n    } as ExtendFetchOptions<R, T>\n    if(opt.form) {\n      const form = new FormData()\n      let f = opt.form\n      Object.entries(form).forEach(([key, value]) => form.append(key, value))\n      opt = {\n        ...opt,\n        headers: {\n          ...opt.headers,\n          'Content-Type': 'multipart/form-data'\n        },\n        body: f\n      }\n    }\n\n    const res = await this.ofetchInstance<T, R>(request, opt)\n    return res\n  }\n  get<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch<T, R>(request, { ...options, method: 'GET' })\n  }\n  post<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch<T, R>(request, { ...options, method: 'POST' })\n  }\n  put<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch(request, { ...options, method: 'PUT' })\n  }\n  patch<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch(request, { ...options, method: 'PATCH' })\n  }\n  delete<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch(request, { ...options, method: 'DELETE' })\n  }\n  head(request: string, options?: FetchOptions) {\n    return this.fetch(request, { ...options, method: 'HEAD' })\n  }\n\n  extend(options: FetchOptions) {\n    return new Fetch(this.ofetchInstance, { ...this.options, ...options })\n  }\n  baseUrl(url: string) {\n    return this.extend({ baseURL: url })\n  }\n}\n\nexport { createFetch } from 'ofetch'\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAgE;AAChE,mBAA8B;AA4F9B,IAAAA,iBAA4B;AA1FrB,MAAM,cAAU,2BAAY;AAAA,EACjC,UAAU;AAAA,IACR,kBAAkB,CAAC,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,GAAG;AAAA,IAC9D,OAAO;AAAA,IACP,YAAY;AAAA,EACd;AACF,CAAC,EAAE,OAAO;AAAA,EACR,gBAAgB,EAAE,SAAS,UAAU,QAAQ,GAAG;AAC9C,QAAI,SAAS,WAAW,KAAK;AAC3B,YAAM,IAAI,2BAAc;AAAA,IAC1B;AAAA,EACF;AAAA,EACA,eAAe,EAAE,SAAS,MAAM,GAAG;AAAA,EAAC;AACtC,CAAC;AAMM,MAAM,MAAM;AAAA,EAGjB,YAAY,eAAwB,SAAwB;AAF5D,wBAAQ;AACR,wBAAQ;AAEN,SAAK,UAAU;AACf,SAAK,iBAAiB,wCAAiB;AAAA,EACzC;AAAA,EACO,MAAiC,SAAiB,SAAoC;AAAA;AAC3F,UAAI,MAAM,kCACL,UACA,KAAK;AAEV,UAAG,IAAI,MAAM;AACX,cAAM,OAAO,IAAI,SAAS;AAC1B,YAAI,IAAI,IAAI;AACZ,eAAO,QAAQ,IAAI,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM,KAAK,OAAO,KAAK,KAAK,CAAC;AACtE,cAAM,iCACD,MADC;AAAA,UAEJ,SAAS,iCACJ,IAAI,UADA;AAAA,YAEP,gBAAgB;AAAA,UAClB;AAAA,UACA,MAAM;AAAA,QACR;AAAA,MACF;AAEA,YAAM,MAAM,MAAM,KAAK,eAAqB,SAAS,GAAG;AACxD,aAAO;AAAA,IACT;AAAA;AAAA,EACA,IACE,SACA,SACA;AACA,WAAO,KAAK,MAAY,SAAS,iCAAK,UAAL,EAAc,QAAQ,MAAM,EAAC;AAAA,EAChE;AAAA,EACA,KACE,SACA,SACA;AACA,WAAO,KAAK,MAAY,SAAS,iCAAK,UAAL,EAAc,QAAQ,OAAO,EAAC;AAAA,EACjE;AAAA,EACA,IACE,SACA,SACA;AACA,WAAO,KAAK,MAAM,SAAS,iCAAK,UAAL,EAAc,QAAQ,MAAM,EAAC;AAAA,EAC1D;AAAA,EACA,MACE,SACA,SACA;AACA,WAAO,KAAK,MAAM,SAAS,iCAAK,UAAL,EAAc,QAAQ,QAAQ,EAAC;AAAA,EAC5D;AAAA,EACA,OACE,SACA,SACA;AACA,WAAO,KAAK,MAAM,SAAS,iCAAK,UAAL,EAAc,QAAQ,SAAS,EAAC;AAAA,EAC7D;AAAA,EACA,KAAK,SAAiB,SAAwB;AAC5C,WAAO,KAAK,MAAM,SAAS,iCAAK,UAAL,EAAc,QAAQ,OAAO,EAAC;AAAA,EAC3D;AAAA,EAEA,OAAO,SAAuB;AAC5B,WAAO,IAAI,MAAM,KAAK,gBAAgB,kCAAK,KAAK,UAAY,QAAS;AAAA,EACvE;AAAA,EACA,QAAQ,KAAa;AACnB,WAAO,KAAK,OAAO,EAAE,SAAS,IAAI,CAAC;AAAA,EACrC;AACF;","names":["import_ofetch"]}
+{"version":3,"sources":["../../../../../src/infra/support/fetch/ofetch.ts"],"sourcesContent":["import { $Fetch, createFetch, FetchOptions, ResponseType } from 'ofetch'\n\n\nconst rofetch = createFetch({\n  defaults: {\n    retryStatusCodes: [408, 409, 425, 429, 500, 502, 503, 504],\n    retry: 2,\n    retryDelay: 800,\n  },\n}).create({\n\n  onRequestError({ request, error }) {\n\n  },\n})\n\nexport type ExtendFetchOptions<R extends ResponseType = ResponseType, T = any> = {\n  form?: Record<string, any>\n} & FetchOptions<R, T>\n\nexport class Fetch {\n  private options?: FetchOptions\n  private ofetchInstance: $Fetch\n  constructor(fetchInstance?: $Fetch, options?: FetchOptions) {\n    this.options = options\n    this.ofetchInstance = fetchInstance ?? rofetch\n  }\n   async fetch<T, R extends ResponseType>(request: string, options?: ExtendFetchOptions<R, T>) {\n    let opt = {\n      ...options,\n      ...this.options\n    } as ExtendFetchOptions<R, T>\n    if(opt.form) {\n      const form = new FormData()\n      let f = opt.form\n      Object.entries(form).forEach(([key, value]) => form.append(key, value))\n      opt = {\n        ...opt,\n        headers: {\n          ...opt.headers,\n          'Content-Type': 'multipart/form-data'\n        },\n        body: f\n      }\n    }\n    console.debug()\n    const res = await this.ofetchInstance<T, R>(request, opt)\n    return res\n  }\n  get<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch<T, R>(request, { ...options, method: 'GET' })\n  }\n  post<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch<T, R>(request, { ...options, method: 'POST' })\n  }\n  put<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch(request, { ...options, method: 'PUT' })\n  }\n  patch<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch(request, { ...options, method: 'PATCH' })\n  }\n  delete<T = any, R extends ResponseType = 'json'>(\n    request: string,\n    options?: ExtendFetchOptions<R>\n  ) {\n    return this.fetch(request, { ...options, method: 'DELETE' })\n  }\n  head(request: string, options?: FetchOptions) {\n    return this.fetch(request, { ...options, method: 'HEAD' })\n  }\n\n  extend(options: FetchOptions) {\n    return new Fetch(this.ofetchInstance, { ...this.options, ...options })\n  }\n  baseUrl(url: string) {\n    return this.extend({ baseURL: url })\n  }\n}\n\nexport { createFetch } from 'ofetch'\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAgE;AA2FhE,IAAAA,iBAA4B;AAxF5B,MAAM,cAAU,2BAAY;AAAA,EAC1B,UAAU;AAAA,IACR,kBAAkB,CAAC,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,KAAK,GAAG;AAAA,IACzD,OAAO;AAAA,IACP,YAAY;AAAA,EACd;AACF,CAAC,EAAE,OAAO;AAAA,EAER,eAAe,EAAE,SAAS,MAAM,GAAG;AAAA,EAEnC;AACF,CAAC;AAMM,MAAM,MAAM;AAAA,EAGjB,YAAY,eAAwB,SAAwB;AAF5D,wBAAQ;AACR,wBAAQ;AAEN,SAAK,UAAU;AACf,SAAK,iBAAiB,wCAAiB;AAAA,EACzC;AAAA,EACO,MAAiC,SAAiB,SAAoC;AAAA;AAC3F,UAAI,MAAM,kCACL,UACA,KAAK;AAEV,UAAG,IAAI,MAAM;AACX,cAAM,OAAO,IAAI,SAAS;AAC1B,YAAI,IAAI,IAAI;AACZ,eAAO,QAAQ,IAAI,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM,KAAK,OAAO,KAAK,KAAK,CAAC;AACtE,cAAM,iCACD,MADC;AAAA,UAEJ,SAAS,iCACJ,IAAI,UADA;AAAA,YAEP,gBAAgB;AAAA,UAClB;AAAA,UACA,MAAM;AAAA,QACR;AAAA,MACF;AACA,cAAQ,MAAM;AACd,YAAM,MAAM,MAAM,KAAK,eAAqB,SAAS,GAAG;AACxD,aAAO;AAAA,IACT;AAAA;AAAA,EACA,IACE,SACA,SACA;AACA,WAAO,KAAK,MAAY,SAAS,iCAAK,UAAL,EAAc,QAAQ,MAAM,EAAC;AAAA,EAChE;AAAA,EACA,KACE,SACA,SACA;AACA,WAAO,KAAK,MAAY,SAAS,iCAAK,UAAL,EAAc,QAAQ,OAAO,EAAC;AAAA,EACjE;AAAA,EACA,IACE,SACA,SACA;AACA,WAAO,KAAK,MAAM,SAAS,iCAAK,UAAL,EAAc,QAAQ,MAAM,EAAC;AAAA,EAC1D;AAAA,EACA,MACE,SACA,SACA;AACA,WAAO,KAAK,MAAM,SAAS,iCAAK,UAAL,EAAc,QAAQ,QAAQ,EAAC;AAAA,EAC5D;AAAA,EACA,OACE,SACA,SACA;AACA,WAAO,KAAK,MAAM,SAAS,iCAAK,UAAL,EAAc,QAAQ,SAAS,EAAC;AAAA,EAC7D;AAAA,EACA,KAAK,SAAiB,SAAwB;AAC5C,WAAO,KAAK,MAAM,SAAS,iCAAK,UAAL,EAAc,QAAQ,OAAO,EAAC;AAAA,EAC3D;AAAA,EAEA,OAAO,SAAuB;AAC5B,WAAO,IAAI,MAAM,KAAK,gBAAgB,kCAAK,KAAK,UAAY,QAAS;AAAA,EACvE;AAAA,EACA,QAAQ,KAAa;AACnB,WAAO,KAAK,OAAO,EAAE,SAAS,IAAI,CAAC;AAAA,EACrC;AACF;","names":["import_ofetch"]}

package/dist/cjs/infra/support/render/index.js

@@ -19,6 +19,18 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -56,19 +68,37 @@ var __async = (__this, __arguments, generator) => {
 var render_exports = {};
 __export(render_exports, {
   CFBrowserRendering: () => CFBrowserRendering,
-  PuppeteerOptions: () => import_puppeteer.RenderOptions,
   PuppeteerRendering: () => PuppeteerRendering,
   RemoteBrowserGetter: () => RemoteBrowserGetter,
-  getImageRender: () => getImageRender
+  getImageRender: () => getImageRender,
+  renderSchema: () => renderSchema
 });
 module.exports = __toCommonJS(render_exports);
 var import_puppeteer = require("./puppeteer");
 var import_puppeteer_core = require("puppeteer-core");
-var import_fetch = require("../../../infra/support/fetch");
+var import_fetch = require("@/infra/support/fetch");
+var import_v4 = require("zod/v4");
+const common = import_v4.z.object({
+  defaultWaitTimeout: import_v4.z.number().optional(),
+  waitTimeout: import_v4.z.number().optional()
+});
+const cfConfig = import_v4.z.object({
+  cfAccountId: import_v4.z.string().min(1, "Cloudflare account id is required"),
+  cfAPIKey: import_v4.z.string().min(1, "Cloudflare API key is required")
+});
+const puppeteerConfig = import_v4.z.object({
+  puppeteerURL: import_v4.z.string().describe("remote puppeteer url, eg: wss://browserless/xxx, https://browserless/xxx").optional()
+});
+const strictRenderConfig = import_v4.z.discriminatedUnion("mode", [
+  import_v4.z.object(__spreadValues(__spreadValues({ mode: import_v4.z.literal("cf") }, cfConfig.shape), common.shape)),
+  import_v4.z.object(__spreadValues(__spreadValues({ mode: import_v4.z.literal("puppeteer") }, puppeteerConfig.shape), common.shape)),
+  import_v4.z.object(__spreadValues({ mode: import_v4.z.literal("custom") }, common.shape))
+]);
+const renderSchema = strictRenderConfig.and(import_v4.z.object(__spreadValues(__spreadValues(__spreadValues({}, cfConfig.shape), puppeteerConfig.shape), common.shape)).partial());
 class CFBrowserRendering {
-  constructor(accountId, cfAPIKey) {
+  constructor(accountId, cfAPIKey, logger) {
     __publicField(this, "f");
-    this.f = new import_fetch.Fetch().baseUrl(`https://api.cloudflare.com/client/v4/accounts/${accountId}`).extend({
+    this.f = (0, import_fetch.createFetch)(logger).baseUrl(`https://api.cloudflare.com/client/v4/accounts/${accountId}`).extend({
       headers: {
         Authorization: `Bearer ${cfAPIKey}`
       }
@@ -79,7 +109,8 @@ class CFBrowserRendering {
       responseType: "arrayBuffer",
       body: __spreadProps(__spreadValues({
         "screenshotOptions": {
-          quality: 90
+          quality: 90,
+          type: "webp"
         }
       }, body), {
         "viewport": {
@@ -132,27 +163,30 @@ const RemoteBrowserGetter = (addr) => {
   }
   return () => p.connect(opt);
 };
-const getImageRender = (cfg) => {
+const getImageRender = (config) => {
+  const _a = config, { logger, render, browserGetter } = _a, _cfg = __objRest(_a, ["logger", "render", "browserGetter"]);
+  const cfg = strictRenderConfig.parse(_cfg);
   if (cfg.mode === "cf") {
-    return new CFBrowserRendering(cfg.cfAccountId, cfg.cfAPIKey);
+    return new CFBrowserRendering(cfg.cfAccountId, cfg.cfAPIKey, logger);
   }
   if (cfg.mode === "custom") {
-    if (!cfg.render) throw new Error("please provide custom img render");
-    return cfg.render;
+    if (!render) throw new Error("please provide custom img render");
+    return render;
   }
   if (cfg.puppeteerURL) {
     return new PuppeteerRendering(RemoteBrowserGetter(cfg.puppeteerURL));
   }
-  if (cfg.browserGetter) {
-    return new PuppeteerRendering(cfg.browserGetter);
+  if (browserGetter) {
+    return new PuppeteerRendering(browserGetter);
   }
+  return null;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CFBrowserRendering,
-  PuppeteerOptions,
   PuppeteerRendering,
   RemoteBrowserGetter,
-  getImageRender
+  getImageRender,
+  renderSchema
 });
 //# sourceMappingURL=index.js.map

package/dist/cjs/infra/support/render/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/infra/support/render/index.ts"],"sourcesContent":["import {html2imgBuffer, RenderOptions, url2imgBuffer} from \"./puppeteer\";\nimport {Browser, Puppeteer} from \"puppeteer-core\";\nimport {Fetch} from \"@/infra/support/fetch\";\nexport {RenderOptions as PuppeteerOptions}\nexport interface ImageRender {\n  html2img: (html: string, opt: RenderOptions) => Promise<Buffer>\n  url2img:  (url: string, opt: RenderOptions) => Promise<Buffer>\n}\n\nexport type RenderConfig = {\n  mode: 'cf' | 'puppeteer' | 'custom'\n  puppeteerURL?: string\n  defaultWaitTimeout?: number\n  waitTimeout?: number\n  cfAccountId?: string,\n  cfAPIKey?: string,\n}\n\nexport class CFBrowserRendering implements ImageRender {\n  f: Fetch\n  constructor(accountId: string, cfAPIKey: string) {\n    this.f = new Fetch()\n      .baseUrl(`https://api.cloudflare.com/client/v4/accounts/${accountId}`)\n      .extend({\n        headers: {\n          Authorization: `Bearer ${cfAPIKey}`\n        },\n      })\n  }\n  private post(body) {\n    return this.f.post('/browser-rendering/screenshot', {\n      responseType: 'arrayBuffer',\n      body: {\n        \"screenshotOptions\": {\n          quality: 90\n        },\n        ...body,\n        \"viewport\": {\n          \"width\": 3840,\n          \"height\": 2160,\n          \"deviceScaleFactor\": 2,\n        },\n        \"gotoOptions\": {\n          \"waitUntil\": \"networkidle0\",\n          \"timeout\": 30000\n        },\n      }\n    })\n  }\n\n\n\n  async html2img (html: string, opt: RenderOptions) {\n    const buf = await this.post({html: html, ...opt})\n    return Buffer.from(buf)\n  }\n  async url2img (url: string, opt: RenderOptions) {\n    const buf = await this.post({url: url, ...opt})\n    return Buffer.from(buf)\n  }\n}\n\nexport class PuppeteerRendering implements ImageRender {\n  constructor(private browserGetter: () => Promise<Browser>) {\n  }\n  async html2img (html: string, opt: RenderOptions) {\n    return html2imgBuffer(this.browserGetter, html, opt)\n  }\n  async url2img (html: string, opt: RenderOptions) {\n    return url2imgBuffer(this.browserGetter, html, opt)\n  }\n}\n\n\nexport const RemoteBrowserGetter = (addr: string) => {\n  const p = new Puppeteer()\n  let opt = {}\n  if(addr.startsWith('ws')) {\n    opt = { browserWSEndpoint: addr }\n  }else if(addr.startsWith('http')) {\n    opt = { browserURL: addr }\n  }\n  return () => p.connect(opt)\n}\n\n\n\nexport const getImageRender = (cfg: RenderConfig & {render?: ImageRender,browserGetter?: () => Promise<Browser>}) => {\n  if(cfg.mode === 'cf') {\n    return new CFBrowserRendering(cfg.cfAccountId, cfg.cfAPIKey)\n  }\n  if(cfg.mode === 'custom') {\n    if(!cfg.render) throw new Error(\"please provide custom img render\")\n    return  cfg.render\n  }\n  if(cfg.puppeteerURL) {\n    return new PuppeteerRendering(RemoteBrowserGetter(cfg.puppeteerURL))\n  }\n  if(cfg.browserGetter) {\n    return new PuppeteerRendering(cfg.browserGetter)\n  }\n}\n\nexport type CreateImageRenderOption = Parameters<typeof getImageRender>[0]\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA2D;AAC3D,4BAAiC;AACjC,mBAAoB;AAgBb,MAAM,mBAA0C;AAAA,EAErD,YAAY,WAAmB,UAAkB;AADjD;AAEE,SAAK,IAAI,IAAI,mBAAM,EAChB,QAAQ,iDAAiD,SAAS,EAAE,EACpE,OAAO;AAAA,MACN,SAAS;AAAA,QACP,eAAe,UAAU,QAAQ;AAAA,MACnC;AAAA,IACF,CAAC;AAAA,EACL;AAAA,EACQ,KAAK,MAAM;AACjB,WAAO,KAAK,EAAE,KAAK,iCAAiC;AAAA,MAClD,cAAc;AAAA,MACd,MAAM;AAAA,QACJ,qBAAqB;AAAA,UACnB,SAAS;AAAA,QACX;AAAA,SACG,OAJC;AAAA,QAKJ,YAAY;AAAA,UACV,SAAS;AAAA,UACT,UAAU;AAAA,UACV,qBAAqB;AAAA,QACvB;AAAA,QACA,eAAe;AAAA,UACb,aAAa;AAAA,UACb,WAAW;AAAA,QACb;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAIM,SAAU,MAAc,KAAoB;AAAA;AAChD,YAAM,MAAM,MAAM,KAAK,KAAK,iBAAC,QAAe,IAAI;AAChD,aAAO,OAAO,KAAK,GAAG;AAAA,IACxB;AAAA;AAAA,EACM,QAAS,KAAa,KAAoB;AAAA;AAC9C,YAAM,MAAM,MAAM,KAAK,KAAK,iBAAC,OAAa,IAAI;AAC9C,aAAO,OAAO,KAAK,GAAG;AAAA,IACxB;AAAA;AACF;AAEO,MAAM,mBAA0C;AAAA,EACrD,YAAoB,eAAuC;AAAvC;AAAA,EACpB;AAAA,EACM,SAAU,MAAc,KAAoB;AAAA;AAChD,iBAAO,iCAAe,KAAK,eAAe,MAAM,GAAG;AAAA,IACrD;AAAA;AAAA,EACM,QAAS,MAAc,KAAoB;AAAA;AAC/C,iBAAO,gCAAc,KAAK,eAAe,MAAM,GAAG;AAAA,IACpD;AAAA;AACF;AAGO,MAAM,sBAAsB,CAAC,SAAiB;AACnD,QAAM,IAAI,IAAI,gCAAU;AACxB,MAAI,MAAM,CAAC;AACX,MAAG,KAAK,WAAW,IAAI,GAAG;AACxB,UAAM,EAAE,mBAAmB,KAAK;AAAA,EAClC,WAAS,KAAK,WAAW,MAAM,GAAG;AAChC,UAAM,EAAE,YAAY,KAAK;AAAA,EAC3B;AACA,SAAO,MAAM,EAAE,QAAQ,GAAG;AAC5B;AAIO,MAAM,iBAAiB,CAAC,QAAsF;AACnH,MAAG,IAAI,SAAS,MAAM;AACpB,WAAO,IAAI,mBAAmB,IAAI,aAAa,IAAI,QAAQ;AAAA,EAC7D;AACA,MAAG,IAAI,SAAS,UAAU;AACxB,QAAG,CAAC,IAAI,OAAQ,OAAM,IAAI,MAAM,kCAAkC;AAClE,WAAQ,IAAI;AAAA,EACd;AACA,MAAG,IAAI,cAAc;AACnB,WAAO,IAAI,mBAAmB,oBAAoB,IAAI,YAAY,CAAC;AAAA,EACrE;AACA,MAAG,IAAI,eAAe;AACpB,WAAO,IAAI,mBAAmB,IAAI,aAAa;AAAA,EACjD;AACF;","names":[]}
+{"version":3,"sources":["../../../../../src/infra/support/render/index.ts"],"sourcesContent":["import {html2imgBuffer, type RenderOptions, url2imgBuffer} from \"./puppeteer\";\nimport {Browser, Puppeteer} from \"puppeteer-core\";\nimport {Fetch, createFetch} from \"@/infra/support/fetch\";\nimport {Logger} from \"@/interface\";\nimport {z} from \"zod/v4\";\nexport type {RenderOptions as PuppeteerOptions}\nexport interface ImageRender {\n  html2img: (html: string, opt: RenderOptions) => Promise<Buffer>\n  url2img:  (url: string, opt: RenderOptions) => Promise<Buffer>\n}\n\nconst common = z.object({\n  defaultWaitTimeout: z.number().optional(),\n  waitTimeout: z.number().optional(),\n})\n\nconst cfConfig = z.object({\n  cfAccountId: z.string().min(1, \"Cloudflare account id is required\"),\n  cfAPIKey: z.string().min(1, \"Cloudflare API key is required\"),\n})\n\nconst puppeteerConfig = z.object({\n  puppeteerURL: z.string().describe(\"remote puppeteer url, eg: wss://browserless/xxx, https://browserless/xxx\").optional(),\n})\n\nconst strictRenderConfig = z.discriminatedUnion('mode', [\n  z.object({ mode: z.literal('cf'), ...cfConfig.shape, ...common.shape }),\n  z.object({ mode: z.literal('puppeteer'), ...puppeteerConfig.shape, ...common.shape }),\n  z.object({ mode: z.literal('custom'), ...common.shape }),\n])\n\nexport const renderSchema = strictRenderConfig\n  .and(z.object({\n    ...cfConfig.shape,\n    ...puppeteerConfig.shape,\n    ...common.shape\n  }).partial())\n\nexport type RenderConfig = z.infer<typeof renderSchema>\n\ntype StrictRenderConfig = z.infer<typeof strictRenderConfig>\n\n\n\n\nexport class CFBrowserRendering implements ImageRender {\n  f: Fetch\n  constructor(accountId: string, cfAPIKey: string, logger: Logger) {\n    this.f = createFetch(logger)\n      .baseUrl(`https://api.cloudflare.com/client/v4/accounts/${accountId}`)\n      .extend({\n        headers: {\n          Authorization: `Bearer ${cfAPIKey}`\n        },\n      })\n  }\n  private post(body) {\n    return this.f.post('/browser-rendering/screenshot', {\n      responseType: 'arrayBuffer',\n      body: {\n        \"screenshotOptions\": {\n          quality: 90,\n          type: 'webp'\n        },\n        ...body,\n        \"viewport\": {\n          \"width\": 3840,\n          \"height\": 2160,\n          \"deviceScaleFactor\": 2,\n        },\n        \"gotoOptions\": {\n          \"waitUntil\": \"networkidle0\",\n          \"timeout\": 30000\n        },\n      }\n    })\n  }\n\n\n\n  async html2img (html: string, opt: RenderOptions) {\n    const buf = await this.post({html: html, ...opt})\n    return Buffer.from(buf)\n  }\n  async url2img (url: string, opt: RenderOptions) {\n    const buf = await this.post({url: url, ...opt})\n    return Buffer.from(buf)\n  }\n}\n\nexport class PuppeteerRendering implements ImageRender {\n  constructor(private browserGetter: () => Promise<Browser>) {\n  }\n  async html2img (html: string, opt: RenderOptions) {\n    return html2imgBuffer(this.browserGetter, html, opt)\n  }\n  async url2img (html: string, opt: RenderOptions) {\n    return url2imgBuffer(this.browserGetter, html, opt)\n  }\n}\n\n\nexport const RemoteBrowserGetter = (addr: string) => {\n  const p = new Puppeteer()\n  let opt = {}\n  if(addr.startsWith('ws')) {\n    opt = { browserWSEndpoint: addr }\n  }else if(addr.startsWith('http')) {\n    opt = { browserURL: addr }\n  }\n  return () => p.connect(opt)\n}\n\ntype ImageRenderCreateOptions = StrictRenderConfig & {\n  logger: Logger,\n  render?: ImageRender,\n  browserGetter?: () => Promise<Browser>\n}\n\n\nexport const getImageRender = (config: ImageRenderCreateOptions) => {\n  const { logger, render, browserGetter, ..._cfg} = config\n  const cfg = strictRenderConfig.parse(_cfg)\n  if(cfg.mode === 'cf') {\n    return new CFBrowserRendering(cfg.cfAccountId, cfg.cfAPIKey, logger)\n  }\n  if(cfg.mode === 'custom') {\n    if(!render) throw new Error(\"please provide custom img render\")\n    return render\n  }\n  if(cfg.puppeteerURL) {\n    return new PuppeteerRendering(RemoteBrowserGetter(cfg.puppeteerURL))\n  }\n  if(browserGetter) {\n    return new PuppeteerRendering(browserGetter)\n  }\n  return null\n}\n\nexport type CreateImageRenderOption = Parameters<typeof getImageRender>[0]\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAgE;AAChE,4BAAiC;AACjC,mBAAiC;AAEjC,gBAAgB;AAOhB,MAAM,SAAS,YAAE,OAAO;AAAA,EACtB,oBAAoB,YAAE,OAAO,EAAE,SAAS;AAAA,EACxC,aAAa,YAAE,OAAO,EAAE,SAAS;AACnC,CAAC;AAED,MAAM,WAAW,YAAE,OAAO;AAAA,EACxB,aAAa,YAAE,OAAO,EAAE,IAAI,GAAG,mCAAmC;AAAA,EAClE,UAAU,YAAE,OAAO,EAAE,IAAI,GAAG,gCAAgC;AAC9D,CAAC;AAED,MAAM,kBAAkB,YAAE,OAAO;AAAA,EAC/B,cAAc,YAAE,OAAO,EAAE,SAAS,0EAA0E,EAAE,SAAS;AACzH,CAAC;AAED,MAAM,qBAAqB,YAAE,mBAAmB,QAAQ;AAAA,EACtD,YAAE,OAAO,gCAAE,MAAM,YAAE,QAAQ,IAAI,KAAM,SAAS,QAAU,OAAO,MAAO;AAAA,EACtE,YAAE,OAAO,gCAAE,MAAM,YAAE,QAAQ,WAAW,KAAM,gBAAgB,QAAU,OAAO,MAAO;AAAA,EACpF,YAAE,OAAO,iBAAE,MAAM,YAAE,QAAQ,QAAQ,KAAM,OAAO,MAAO;AACzD,CAAC;AAEM,MAAM,eAAe,mBACzB,IAAI,YAAE,OAAO,iDACT,SAAS,QACT,gBAAgB,QAChB,OAAO,MACX,EAAE,QAAQ,CAAC;AASP,MAAM,mBAA0C;AAAA,EAErD,YAAY,WAAmB,UAAkB,QAAgB;AADjE;AAEE,SAAK,QAAI,0BAAY,MAAM,EACxB,QAAQ,iDAAiD,SAAS,EAAE,EACpE,OAAO;AAAA,MACN,SAAS;AAAA,QACP,eAAe,UAAU,QAAQ;AAAA,MACnC;AAAA,IACF,CAAC;AAAA,EACL;AAAA,EACQ,KAAK,MAAM;AACjB,WAAO,KAAK,EAAE,KAAK,iCAAiC;AAAA,MAClD,cAAc;AAAA,MACd,MAAM;AAAA,QACJ,qBAAqB;AAAA,UACnB,SAAS;AAAA,UACT,MAAM;AAAA,QACR;AAAA,SACG,OALC;AAAA,QAMJ,YAAY;AAAA,UACV,SAAS;AAAA,UACT,UAAU;AAAA,UACV,qBAAqB;AAAA,QACvB;AAAA,QACA,eAAe;AAAA,UACb,aAAa;AAAA,UACb,WAAW;AAAA,QACb;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAIM,SAAU,MAAc,KAAoB;AAAA;AAChD,YAAM,MAAM,MAAM,KAAK,KAAK,iBAAC,QAAe,IAAI;AAChD,aAAO,OAAO,KAAK,GAAG;AAAA,IACxB;AAAA;AAAA,EACM,QAAS,KAAa,KAAoB;AAAA;AAC9C,YAAM,MAAM,MAAM,KAAK,KAAK,iBAAC,OAAa,IAAI;AAC9C,aAAO,OAAO,KAAK,GAAG;AAAA,IACxB;AAAA;AACF;AAEO,MAAM,mBAA0C;AAAA,EACrD,YAAoB,eAAuC;AAAvC;AAAA,EACpB;AAAA,EACM,SAAU,MAAc,KAAoB;AAAA;AAChD,iBAAO,iCAAe,KAAK,eAAe,MAAM,GAAG;AAAA,IACrD;AAAA;AAAA,EACM,QAAS,MAAc,KAAoB;AAAA;AAC/C,iBAAO,gCAAc,KAAK,eAAe,MAAM,GAAG;AAAA,IACpD;AAAA;AACF;AAGO,MAAM,sBAAsB,CAAC,SAAiB;AACnD,QAAM,IAAI,IAAI,gCAAU;AACxB,MAAI,MAAM,CAAC;AACX,MAAG,KAAK,WAAW,IAAI,GAAG;AACxB,UAAM,EAAE,mBAAmB,KAAK;AAAA,EAClC,WAAS,KAAK,WAAW,MAAM,GAAG;AAChC,UAAM,EAAE,YAAY,KAAK;AAAA,EAC3B;AACA,SAAO,MAAM,EAAE,QAAQ,GAAG;AAC5B;AASO,MAAM,iBAAiB,CAAC,WAAqC;AAClE,QAAkD,aAA1C,UAAQ,QAAQ,cAzH1B,IAyHoD,IAAR,iBAAQ,IAAR,CAAlC,UAAQ,UAAQ;AACxB,QAAM,MAAM,mBAAmB,MAAM,IAAI;AACzC,MAAG,IAAI,SAAS,MAAM;AACpB,WAAO,IAAI,mBAAmB,IAAI,aAAa,IAAI,UAAU,MAAM;AAAA,EACrE;AACA,MAAG,IAAI,SAAS,UAAU;AACxB,QAAG,CAAC,OAAQ,OAAM,IAAI,MAAM,kCAAkC;AAC9D,WAAO;AAAA,EACT;AACA,MAAG,IAAI,cAAc;AACnB,WAAO,IAAI,mBAAmB,oBAAoB,IAAI,YAAY,CAAC;AAAA,EACrE;AACA,MAAG,eAAe;AAChB,WAAO,IAAI,mBAAmB,aAAa;AAAA,EAC7C;AACA,SAAO;AACT;","names":[]}

package/dist/cjs/interface/cmd/builder.js

@@ -42,7 +42,7 @@ __export(builder_exports, {
   CommandBuilder: () => CommandBuilder
 });
 module.exports = __toCommonJS(builder_exports);
-var import_errors = require("../../infra/errors");
+var import_errors = require("@/infra/errors");
 class CommandBuilder {
   constructor() {
     __publicField(this, "name");

package/dist/cjs/schedules/index.js

@@ -22,12 +22,13 @@ __export(schedules_exports, {
 module.exports = __toCommonJS(schedules_exports);
 var import_temp = require("./temp");
 const getScheduleTasks = (config) => {
+  var _a, _b, _c, _d, _e;
   return [
     {
       name: "lb-rank-notifier",
       handler: import_temp.LBScoreMonitor,
-      cron: config.tempCron.cron,
-      enabled: config.tempCron.enabled
+      cron: (_b = (_a = config.cron) == null ? void 0 : _a.temp) == null ? void 0 : _b.cron,
+      enabled: (_e = (_d = (_c = config.cron) == null ? void 0 : _c.temp) == null ? void 0 : _d.enabled) != null ? _e : false
     }
   ];
 };

package/dist/cjs/schedules/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/schedules/index.ts"],"sourcesContent":["import { Config } from '@/config'\nimport { LBScoreMonitor } from './temp'\n\n\nexport const getScheduleTasks = (config: Config) => {\n  return [\n    {\n      name: 'lb-rank-notifier',\n      handler: LBScoreMonitor,\n      cron: config.tempCron.cron,\n      enabled: config.tempCron.enabled,\n    },\n  ]\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAA+B;AAGxB,MAAM,mBAAmB,CAAC,WAAmB;AAClD,SAAO;AAAA,IACL;AAAA,MACE,MAAM;AAAA,MACN,SAAS;AAAA,MACT,MAAM,OAAO,SAAS;AAAA,MACtB,SAAS,OAAO,SAAS;AAAA,IAC3B;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../src/schedules/index.ts"],"sourcesContent":["import { Config } from '@/config'\nimport { LBScoreMonitor } from './temp'\n\n\nexport const getScheduleTasks = (config: Config) => {\n  return [\n    {\n      name: 'lb-rank-notifier',\n      handler: LBScoreMonitor,\n      cron: config.cron?.temp?.cron,\n      enabled: config.cron?.temp?.enabled ?? false,\n    },\n  ]\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAA+B;AAGxB,MAAM,mBAAmB,CAAC,WAAmB;AAJpD;AAKE,SAAO;AAAA,IACL;AAAA,MACE,MAAM;AAAA,MACN,SAAS;AAAA,MACT,OAAM,kBAAO,SAAP,mBAAa,SAAb,mBAAmB;AAAA,MACzB,UAAS,wBAAO,SAAP,mBAAa,SAAb,mBAAmB,YAAnB,YAA8B;AAAA,IACzC;AAAA,EACF;AACF;","names":[]}

package/dist/cjs/service/api/base/aioclient.js

@@ -42,7 +42,7 @@ __export(aioclient_exports, {
   AIOSaberClient: () => AIOSaberClient
 });
 module.exports = __toCommonJS(aioclient_exports);
-var import_fetch = require("../../../infra/support/fetch");
+var import_fetch = require("@/infra/support/fetch");
 class AIOSaberClient {
   constructor(logger) {
     __publicField(this, "f");

package/dist/cjs/service/api/base/blclient.js

@@ -42,7 +42,7 @@ __export(blclient_exports, {
   BeatLeaderClient: () => BeatLeaderClient
 });
 module.exports = __toCommonJS(blclient_exports);
-var import_fetch = require("../../../infra/support/fetch");
+var import_fetch = require("@/infra/support/fetch");
 class BeatLeaderClient {
   constructor(opt) {
     __publicField(this, "f");

package/dist/cjs/service/api/base/bsclient.js

@@ -55,8 +55,8 @@ __export(bsclient_exports, {
   BeatSaverClient: () => BeatSaverClient
 });
 module.exports = __toCommonJS(bsclient_exports);
-var import_fetch = require("../../../infra/support/fetch");
-var import_error = require("../../../infra/support/fetch/error");
+var import_fetch = require("@/infra/support/fetch");
+var import_error = require("@/infra/support/fetch/error");
 class BeatSaverClient {
   constructor(opt) {
     __publicField(this, "f");

package/dist/cjs/service/api/base/ssclient.js

@@ -42,8 +42,8 @@ __export(ssclient_exports, {
   ScoreSaberClient: () => ScoreSaberClient
 });
 module.exports = __toCommonJS(ssclient_exports);
-var import_fetch = require("../../../infra/support/fetch");
-var import_error = require("../../../infra/support/fetch/error");
+var import_fetch = require("@/infra/support/fetch");
+var import_error = require("@/infra/support/fetch/error");
 class ScoreSaberClient {
   constructor(logger) {
     __publicField(this, "f");

package/dist/cjs/service/api/index.js

@@ -56,18 +56,27 @@ __export(api_exports, {
 });
 module.exports = __toCommonJS(api_exports);
 var import_base = require("./base");
-var import_errors = require("../../infra/errors");
-var import_error = require("../../infra/support/fetch/error");
+var import_errors = require("@/infra/errors");
+var import_error = require("@/infra/support/fetch/error");
 var import_sortScore = require("./sortScore");
-var import_bsorDecoder = require("../../components/utils/bl/bsorDecoder");
+var import_bsorDecoder = require("@/components/utils/bl/bsorDecoder");
 class APIService {
   constructor(cfg, logger) {
     __publicField(this, "BeatLeader");
     __publicField(this, "ScoreSaber");
     __publicField(this, "BeatSaver");
     __publicField(this, "AIOSaber");
-    this.BeatSaver = new import_base.BeatSaverClient({ logger });
-    this.BeatLeader = new import_base.BeatLeaderClient({ logger });
+    this.BeatSaver = new import_base.BeatSaverClient({
+      logger,
+      host: cfg.beatsaver.host,
+      client_id: cfg.beatsaver.oauthClientId,
+      client_secret: cfg.beatsaver.oauthClientSecret
+    });
+    this.BeatLeader = new import_base.BeatLeaderClient({
+      logger,
+      client_id: cfg.beatleader.oauthClientId,
+      client_secret: cfg.beatleader.oauthClientSecret
+    });
     this.ScoreSaber = new import_base.ScoreSaberClient(logger);
     this.AIOSaber = new import_base.AIOSaberClient(logger);
   }