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

package/dist/types/index.d.ts

@@ -1,46 +1,61 @@
-import { ScreenshotOptions, Viewport, Browser } from 'puppeteer-core';
+import { z } from 'zod/v4';
 import * as ofetch from 'ofetch';
 import { $Fetch, FetchOptions, ResponseType } from 'ofetch';
+import { ScreenshotOptions, Viewport, Browser } from 'puppeteer-core';
 
-/**
- * Extends Puppeteer's ScreenshotOptions to include an optional viewport setting
- * and a selector for element-specific screenshots.
- */
-interface RenderOptions$1 extends ScreenshotOptions {
-    /**
-     * Sets the viewport of the page.
-     */
-    viewport?: Viewport;
-    /**
-     * A CSS selector for an element to screenshot. If provided, the output
-     * will be a screenshot of just this element.
-     */
-    selector?: string;
-    /**
-     * The maximum time in milliseconds to wait for the selector to appear.
-     * If the element is not found within this time, an error will be thrown.
-     * Defaults to Puppeteer's default (usually 30000ms).
-     */
-    timeout?: number;
-}
-
-type ExtendFetchOptions<R extends ResponseType = ResponseType, T = any> = {
-    form?: Record<string, any>;
-} & FetchOptions<R, T>;
-declare class Fetch {
-    private options?;
-    private ofetchInstance;
-    constructor(fetchInstance?: $Fetch, options?: FetchOptions);
-    fetch<T, R extends ResponseType>(request: string, options?: ExtendFetchOptions<R, T>): Promise<ofetch.MappedResponseType<R, T>>;
-    get<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, T>>;
-    post<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, T>>;
-    put<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, any>>;
-    patch<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, any>>;
-    delete<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, any>>;
-    head(request: string, options?: FetchOptions): Promise<any>;
-    extend(options: FetchOptions): Fetch;
-    baseUrl(url: string): Fetch;
-}
+declare const configSchema: z.ZodObject<{
+    s3: z.ZodOptional<z.ZodDefault<z.ZodDiscriminatedUnion<[z.ZodObject<{
+        s3AccessKey: z.ZodString;
+        s3SecretKey: z.ZodString;
+        endpoint: z.ZodString;
+        baseURL: z.ZodString;
+        bucketName: z.ZodString;
+        region: z.ZodOptional<z.ZodString>;
+        keyPrefix: z.ZodOptional<z.ZodString>;
+        enabled: z.ZodLiteral<true>;
+    }, z.core.$strip>, z.ZodObject<{
+        enabled: z.ZodLiteral<false>;
+    }, z.core.$strip>]>>>;
+    render: z.ZodIntersection<z.ZodDiscriminatedUnion<[z.ZodObject<{
+        defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+        waitTimeout: z.ZodOptional<z.ZodNumber>;
+        cfAccountId: z.ZodString;
+        cfAPIKey: z.ZodString;
+        mode: z.ZodLiteral<"cf">;
+    }, z.core.$strip>, z.ZodObject<{
+        defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+        waitTimeout: z.ZodOptional<z.ZodNumber>;
+        puppeteerURL: z.ZodOptional<z.ZodString>;
+        mode: z.ZodLiteral<"puppeteer">;
+    }, z.core.$strip>, z.ZodObject<{
+        defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+        waitTimeout: z.ZodOptional<z.ZodNumber>;
+        mode: z.ZodLiteral<"custom">;
+    }, z.core.$strip>]>, z.ZodObject<{
+        defaultWaitTimeout: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        waitTimeout: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        puppeteerURL: z.ZodOptional<z.ZodOptional<z.ZodString>>;
+        cfAccountId: z.ZodOptional<z.ZodString>;
+        cfAPIKey: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    beatsaver: z.ZodOptional<z.ZodDefault<z.ZodObject<{
+        host: z.ZodOptional<z.ZodDefault<z.ZodString>>;
+        wsURL: z.ZodOptional<z.ZodDefault<z.ZodString>>;
+        oauthClientId: z.ZodOptional<z.ZodString>;
+        oauthClientSecret: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    beatleader: z.ZodOptional<z.ZodDefault<z.ZodObject<{
+        oauthClientId: z.ZodOptional<z.ZodString>;
+        oauthClientSecret: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    cron: z.ZodOptional<z.ZodDefault<z.ZodObject<{
+        temp: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+            enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+            cron: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>>;
+    }, z.core.$strip>>>;
+}, z.core.$strip>;
+type Config = z.infer<typeof configSchema>;
 
 interface ScoreSaberItem {
     score: SSScore;
@@ -487,6 +502,24 @@ interface BLSocial {
     [property: string]: any;
 }
 
+type ExtendFetchOptions<R extends ResponseType = ResponseType, T = any> = {
+    form?: Record<string, any>;
+} & FetchOptions<R, T>;
+declare class Fetch {
+    private options?;
+    private ofetchInstance;
+    constructor(fetchInstance?: $Fetch, options?: FetchOptions);
+    fetch<T, R extends ResponseType>(request: string, options?: ExtendFetchOptions<R, T>): Promise<ofetch.MappedResponseType<R, T>>;
+    get<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, T>>;
+    post<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, T>>;
+    put<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, any>>;
+    patch<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, any>>;
+    delete<T = any, R extends ResponseType = 'json'>(request: string, options?: ExtendFetchOptions<R>): Promise<ofetch.MappedResponseType<R, any>>;
+    head(request: string, options?: FetchOptions): Promise<any>;
+    extend(options: FetchOptions): Fetch;
+    baseUrl(url: string): Fetch;
+}
+
 interface ScoresaberLeaderboardResp {
     scores: SSScore[];
     metadata: Metadata;
@@ -709,6 +742,94 @@ declare class UserPreferenceStore {
     configEntries(): Promise<Record<string, any>>;
 }
 
+/**
+ * Extends Puppeteer's ScreenshotOptions to include an optional viewport setting
+ * and a selector for element-specific screenshots.
+ */
+interface RenderOptions$1 extends ScreenshotOptions {
+    /**
+     * Sets the viewport of the page.
+     */
+    viewport?: Viewport;
+    /**
+     * A CSS selector for an element to screenshot. If provided, the output
+     * will be a screenshot of just this element.
+     */
+    selector?: string;
+    /**
+     * The maximum time in milliseconds to wait for the selector to appear.
+     * If the element is not found within this time, an error will be thrown.
+     * Defaults to Puppeteer's default (usually 30000ms).
+     */
+    timeout?: number;
+}
+
+interface ImageRender {
+    html2img: (html: string, opt: RenderOptions$1) => Promise<Buffer>;
+    url2img: (url: string, opt: RenderOptions$1) => Promise<Buffer>;
+}
+declare const strictRenderConfig: z.ZodDiscriminatedUnion<[z.ZodObject<{
+    defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+    waitTimeout: z.ZodOptional<z.ZodNumber>;
+    cfAccountId: z.ZodString;
+    cfAPIKey: z.ZodString;
+    mode: z.ZodLiteral<"cf">;
+}, z.core.$strip>, z.ZodObject<{
+    defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+    waitTimeout: z.ZodOptional<z.ZodNumber>;
+    puppeteerURL: z.ZodOptional<z.ZodString>;
+    mode: z.ZodLiteral<"puppeteer">;
+}, z.core.$strip>, z.ZodObject<{
+    defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+    waitTimeout: z.ZodOptional<z.ZodNumber>;
+    mode: z.ZodLiteral<"custom">;
+}, z.core.$strip>]>;
+declare const renderSchema: z.ZodIntersection<z.ZodDiscriminatedUnion<[z.ZodObject<{
+    defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+    waitTimeout: z.ZodOptional<z.ZodNumber>;
+    cfAccountId: z.ZodString;
+    cfAPIKey: z.ZodString;
+    mode: z.ZodLiteral<"cf">;
+}, z.core.$strip>, z.ZodObject<{
+    defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+    waitTimeout: z.ZodOptional<z.ZodNumber>;
+    puppeteerURL: z.ZodOptional<z.ZodString>;
+    mode: z.ZodLiteral<"puppeteer">;
+}, z.core.$strip>, z.ZodObject<{
+    defaultWaitTimeout: z.ZodOptional<z.ZodNumber>;
+    waitTimeout: z.ZodOptional<z.ZodNumber>;
+    mode: z.ZodLiteral<"custom">;
+}, z.core.$strip>]>, z.ZodObject<{
+    defaultWaitTimeout: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+    waitTimeout: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+    puppeteerURL: z.ZodOptional<z.ZodOptional<z.ZodString>>;
+    cfAccountId: z.ZodOptional<z.ZodString>;
+    cfAPIKey: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>>;
+type RenderConfig = z.infer<typeof renderSchema>;
+type StrictRenderConfig = z.infer<typeof strictRenderConfig>;
+declare class CFBrowserRendering implements ImageRender {
+    f: Fetch;
+    constructor(accountId: string, cfAPIKey: string, logger: Logger);
+    private post;
+    html2img(html: string, opt: RenderOptions$1): Promise<Buffer>;
+    url2img(url: string, opt: RenderOptions$1): Promise<Buffer>;
+}
+declare class PuppeteerRendering implements ImageRender {
+    private browserGetter;
+    constructor(browserGetter: () => Promise<Browser>);
+    html2img(html: string, opt: RenderOptions$1): Promise<Buffer>;
+    url2img(html: string, opt: RenderOptions$1): Promise<Buffer>;
+}
+declare const RemoteBrowserGetter: (addr: string) => () => Promise<Browser>;
+type ImageRenderCreateOptions = StrictRenderConfig & {
+    logger: Logger;
+    render?: ImageRender;
+    browserGetter?: () => Promise<Browser>;
+};
+declare const getImageRender: (config: ImageRenderCreateOptions) => ImageRender;
+type CreateImageRenderOption = Parameters<typeof getImageRender>[0];
+
 type RenderOption = RenderOptions & RenderOptions$1;
 type RenderOptions = {
     userPreference?: UserPreferenceStore;
@@ -726,8 +847,10 @@ interface IRenderService {
 declare class RenderService implements IRenderService {
     private api;
     private imageRender;
-    constructor(api: APIService, imageRender: ImageRender);
-    static create(imgRenderConfig: CreateImageRenderOption, api: APIService): RenderService;
+    private constructor();
+    static create(imgRenderConfig: CreateImageRenderOption & {
+        api: APIService;
+    }): RenderService;
     renderRank(accountId: string, platform: Platform, renderOpts?: RenderOption): Promise<Buffer>;
     renderScore(scoreId: string, renderOpts?: RenderOption): Promise<Buffer>;
     renderMapById(mapId: string, renderOption: RenderOption): Promise<Buffer>;
@@ -890,86 +1013,6 @@ type Services<T> = {
     db: DB<T>;
 };
 
-interface ImageRender {
-    html2img: (html: string, opt: RenderOptions$1) => Promise<Buffer>;
-    url2img: (url: string, opt: RenderOptions$1) => Promise<Buffer>;
-}
-type RenderConfig = {
-    mode: 'cf' | 'puppeteer' | 'custom';
-    puppeteerURL?: string;
-    defaultWaitTimeout?: number;
-    waitTimeout?: number;
-    cfAccountId?: string;
-    cfAPIKey?: string;
-};
-declare class CFBrowserRendering implements ImageRender {
-    f: Fetch;
-    constructor(accountId: string, cfAPIKey: string);
-    private post;
-    html2img(html: string, opt: RenderOptions$1): Promise<Buffer>;
-    url2img(url: string, opt: RenderOptions$1): Promise<Buffer>;
-}
-declare class PuppeteerRendering implements ImageRender {
-    private browserGetter;
-    constructor(browserGetter: () => Promise<Browser>);
-    html2img(html: string, opt: RenderOptions$1): Promise<Buffer>;
-    url2img(html: string, opt: RenderOptions$1): Promise<Buffer>;
-}
-declare const RemoteBrowserGetter: (addr: string) => () => Promise<Browser>;
-declare const getImageRender: (cfg: RenderConfig & {
-    render?: ImageRender;
-    browserGetter?: () => Promise<Browser>;
-}) => ImageRender;
-type CreateImageRenderOption = Parameters<typeof getImageRender>[0];
-
-declare class I18nService {
-    obj: any;
-    constructor(config?: any);
-    mergeConfig(lang: string, obj: any): void;
-    loadLang(lang: string): void;
-    tran(path: string, params?: {}, lang?: string): string;
-}
-
-interface S3Config {
-    s3AccessKey: string;
-    s3SecretKey: string;
-    endpoint: string;
-    region: string | undefined;
-    bucketName: string;
-    keyPrefix: string;
-    baseURL: string;
-}
-declare class S3Service {
-    private s3Client;
-    private readonly bucket;
-    private readonly keyPrefix;
-    private readonly baseURL;
-    constructor(config: S3Config);
-    uploadImgWithUrl(url: string, mimeType?: string): Promise<string>;
-    uploadImg(buffer: Buffer, mimeType?: string): Promise<string>;
-}
-
-interface Config {
-    s3: {
-        enabled: boolean;
-    } & S3Config;
-    render: RenderConfig;
-    minRawMatchMapIdLength: number;
-    beatSaverHost: string;
-    beatSaverWSURL: string;
-    bsOauthClientId: string;
-    bsOauthClientSecret: string;
-    blOauthClientId: string;
-    blOauthClientSecret: string;
-    bsNotifyMonitorCron: ScheduleTaskConfig;
-    tokenRefreshCron: ScheduleTaskConfig;
-    tempCron: ScheduleTaskConfig;
-}
-interface ScheduleTaskConfig {
-    cron: string;
-    enabled: boolean;
-}
-
 type ScheduleTaskCtx<T> = {
     config: Config;
     logger: Logger;
@@ -1027,6 +1070,45 @@ declare const handleWSEventWithCache: (fnThat: any, fn: any, ttl: any, eventPars
 declare const sleep: (millsec?: number) => Promise<void>;
 declare const convertDiff: (diff: string | null) => any;
 
+declare class I18nService {
+    obj: any;
+    constructor(config?: any);
+    mergeConfig(lang: string, obj: any): void;
+    loadLang(lang: string): void;
+    tran(path: string, params?: {}, lang?: string): string;
+}
+
+interface S3Config {
+    s3AccessKey: string;
+    s3SecretKey: string;
+    endpoint: string;
+    region?: string;
+    bucketName: string;
+    keyPrefix?: string;
+    baseURL: string;
+}
+declare const s3ConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
+    s3AccessKey: z.ZodString;
+    s3SecretKey: z.ZodString;
+    endpoint: z.ZodString;
+    baseURL: z.ZodString;
+    bucketName: z.ZodString;
+    region: z.ZodOptional<z.ZodString>;
+    keyPrefix: z.ZodOptional<z.ZodString>;
+    enabled: z.ZodLiteral<true>;
+}, z.core.$strip>, z.ZodObject<{
+    enabled: z.ZodLiteral<false>;
+}, z.core.$strip>]>;
+declare class S3Service {
+    private s3Client;
+    private readonly bucket;
+    private readonly keyPrefix;
+    private readonly baseURL;
+    constructor(config: S3Config);
+    uploadImgWithUrl(url: string, mimeType?: string): Promise<string>;
+    uploadImg(buffer: Buffer, mimeType?: string): Promise<string>;
+}
+
 declare const getBot: <T>(config: Config) => {
     commands: Command<T>[];
     schedule: {
@@ -1037,4 +1119,4 @@ declare const getBot: <T>(config: Config) => {
     }[];
 };
 
-export { APIService, BeatSaverWSHandler, BeatleaderWSHandler, type BotService, CFBrowserRendering, type CmdAlias, type CmdContext, type CmdExecutor, type CmdOption, type Command, type Config, type CreateImageRenderOption, type DB, type Extend, I18nService, type ImageRender, type Logger, type OptionType, Platform, type RenderOptions$1 as PuppeteerOptions, PuppeteerRendering, type RelateAccount, type RelateChannelInfo, RemoteBrowserGetter, type RenderConfig, RenderService, type S3Config, S3Service, type Services, type Session, type SubDetailWithGroupRes, type SubInfoRes, type SubWithGroupRes, type Subscribe, type SubscribeMember, type UserPreference, type WSHandler, botCommands, convertDiff, getBot, getImageRender, getScheduleTasks, handleWSEventWithCache, parsePlatform, sleep };
+export { APIService, BeatSaverWSHandler, BeatleaderWSHandler, type BotService, CFBrowserRendering, type CmdAlias, type CmdContext, type CmdExecutor, type CmdOption, type Command, type Config, type CreateImageRenderOption, type DB, type Extend, I18nService, type ImageRender, type Logger, type OptionType, Platform, type RenderOptions$1 as PuppeteerOptions, PuppeteerRendering, type RelateAccount, type RelateChannelInfo, RemoteBrowserGetter, type RenderConfig, RenderService, type S3Config, S3Service, type Services, type Session, type SubDetailWithGroupRes, type SubInfoRes, type SubWithGroupRes, type Subscribe, type SubscribeMember, type UserPreference, type WSHandler, botCommands, configSchema, convertDiff, getBot, getImageRender, getScheduleTasks, handleWSEventWithCache, parsePlatform, renderSchema, s3ConfigSchema, sleep };

package/package.json

@@ -1,42 +1,50 @@
 {
   "name": "beatsaber-bot-core",
   "description": "Beatsaber bot",
-  "version": "0.2.0-rc.13",
+  "version": "0.2.0-rc.14",
   "files": [
     "dist"
   ],
   "license": "MIT",
+  "type": "module",
   "author": {
     "name": "ktKongTong",
     "email": "kt@ktlab.io"
   },
   "exports": {
     ".": {
+      "types": "./dist/types/index.d.ts",
       "require": "./dist/cjs/index.js",
-      "types": "./dist/types/index.d.ts"
+      "import": "./dist/esm/index.js"
     },
     "./interface": {
+      "types": "./dist/types/index.d.ts",
       "require": "./dist/cjs/interface/index.js",
-      "types": "./dist/types/index.d.ts"
+      "import": "./dist/esm/interface/index.js"
     },
     "./interface/*": {
+      "types": "./dist/types/index.d.ts",
       "require": "./dist/cjs/interface/**/*.js",
-      "types": "./dist/types/index.d.ts"
+      "import": "./dist/esm/interface/**/*.js"
     },
     "./service": {
+      "types": "./dist/types/index.d.ts",
       "require": "./dist/cjs/service/*.js",
-      "types": "./dist/types/index.d.ts"
+      "import": "./dist/esm/service/*.js"
     },
     "./service/*": {
       "require": "./dist/cjs/service/*/index.js",
+      "import": "./dist/esm/service/*/index.js",
       "types": "./dist/types/index.d.ts"
     },
     "./infra": {
       "require": "./dist/cjs/infra/index.js",
+      "import": "./dist/esm/infra/index.js",
       "types": "./dist/types/index.d.ts"
     },
     "./infra/*": {
       "require": "./dist/cjs/infra/*/index.js",
+      "import": "./dist/esm/infra/*/index.js",
       "types": "./dist/types/index.d.ts"
     }
   },
@@ -60,11 +68,13 @@
     "puppeteer-core": "^24.11.2",
     "react": "^19",
     "react-dom": "^19",
-    "@napi-rs/canvas": "^0.1.73"
+    "@napi-rs/canvas": "^0.1.73",
+    "zod": "^3.25.71"
   },
   "scripts": {
-    "fix-path-alias": "tsc-alias --outDir dist/cjs && tsc-alias --outDir dist/esm",
+    "fix-path-alias": " tsc-alias --outDir dist/esm",
     "copy-yml-resource": "node scripts/build.mjs",
+    "up": "tsup",
     "build": "tsup && pnpm run copy-yml-resource && pnpm run fix-path-alias",
     "pub": "pnpm run build && pnpm publish"
   }