@bettergi/types 0.0.11 → 0.0.13

package/csharp/System/IAsyncDisposable.d.ts

@@ -0,0 +1,10 @@
+import "./Threading/Tasks/ValueTask";
+
+declare global {
+  namespace System {
+    interface IAsyncDisposable {
+      disposeAsync(): System.Threading.Tasks.ValueTask;
+    }
+  }
+}
+export {};

package/csharp/System/IDisposable.d.ts

@@ -0,0 +1,9 @@
+declare global {
+  namespace System {
+    interface IDisposable {
+      dispose(): void;
+    }
+  }
+}
+
+export {};

package/csharp/System/IEquatable.d.ts

@@ -0,0 +1,8 @@
+declare global {
+  namespace System {
+    interface IEquatable<T> {
+      equals(other: T | null): boolean;
+    }
+  }
+}
+export {};

package/csharp/System/Runtime/Serialization/IDeserializationCallback.d.ts

@@ -0,0 +1,9 @@
+declare global {
+  namespace System.Runtime.Serialization {
+    interface IDeserializationCallback {
+      onDeserialization(sender: any): void;
+    }
+  }
+}
+
+export {};

package/csharp/System/Runtime/Serialization/ISerializable.d.ts

@@ -0,0 +1,9 @@
+declare global {
+  namespace System.Runtime.Serialization {
+    interface ISerializable {
+      // TODO: 待补充（如果有必要）
+    }
+  }
+}
+
+export {};

package/csharp/System/Threading/CancellationToken.d.ts

@@ -0,0 +1,58 @@
+import "../IEquatable";
+import "./CancellationTokenRegistration";
+import "./WaitHandle";
+
+declare global {
+  namespace System.Threading {
+    class CancellationToken implements System.IEquatable<CancellationToken> {
+      isCancellationRequested: boolean;
+
+      canBeCanceled: boolean;
+
+      waitHandle: System.Threading.WaitHandle;
+
+      register(callback: () => void): System.Threading.CancellationTokenRegistration;
+
+      register(
+        callback: () => void,
+        useSynchronizationContext: boolean
+      ): System.Threading.CancellationTokenRegistration;
+
+      register(
+        callback: (obj: any) => void,
+        state: any
+      ): System.Threading.CancellationTokenRegistration;
+
+      register(
+        callback: (obj: any) => System.Threading.CancellationToken,
+        state: any
+      ): System.Threading.CancellationTokenRegistration;
+
+      register(
+        callback: (obj: any) => void,
+        state: any,
+        useSynchronizationContext: boolean
+      ): System.Threading.CancellationTokenRegistration;
+
+      unsafeRegister(
+        callback: (obj: any) => void,
+        state: any
+      ): System.Threading.CancellationTokenRegistration;
+
+      unsafeRegister(
+        callback: (obj: any) => System.Threading.CancellationToken,
+        state: any
+      ): System.Threading.CancellationTokenRegistration;
+
+      equals(other: CancellationToken | null): boolean;
+
+      throwIfCancellationRequested(): void;
+
+      static readonly none: System.Threading.CancellationToken;
+
+      constructor(canceled: boolean);
+    }
+  }
+  export import CancellationToken = System.Threading.CancellationToken;
+}
+export {};

package/csharp/System/Threading/CancellationTokenRegistration.d.ts

@@ -0,0 +1,27 @@
+import "../IAsyncDisposable";
+import "../IDisposable";
+import "../IEquatable";
+
+declare global {
+  namespace System.Threading {
+    class CancellationTokenRegistration
+      implements
+        System.IEquatable<CancellationTokenRegistration>,
+        System.IDisposable,
+        System.IAsyncDisposable
+    {
+      dispose(): void;
+
+      disposeAsync(): System.Threading.Tasks.ValueTask;
+
+      token: System.Threading.CancellationToken;
+
+      unregister(): boolean;
+
+      equals(other: CancellationTokenRegistration | null): boolean;
+
+      equals(other: System.Threading.CancellationTokenRegistration | null): boolean;
+    }
+  }
+}
+export {};

package/csharp/System/Threading/CancellationTokenSource.d.ts

@@ -0,0 +1,51 @@
+import "../IDisposable";
+import "../TimeProvider";
+import "../TimeSpan";
+import "./CancellationToken";
+
+declare global {
+  namespace System.Threading {
+    class CancellationTokenSource implements System.IDisposable {
+      isCancellationRequested: boolean;
+
+      token: System.Threading.CancellationToken;
+
+      cancel(): void;
+
+      cancel(throwOnFirstException: boolean): void;
+
+      cancelAsync(): Promise<void>;
+
+      cancelAfter(delay: System.TimeSpan): void;
+
+      cancelAfter(millisecondsDelay: number): void;
+
+      tryReset(): boolean;
+
+      dispose(): void;
+
+      static createLinkedTokenSource(
+        token1: System.Threading.CancellationToken,
+        token2: System.Threading.CancellationToken
+      ): System.Threading.CancellationTokenSource;
+
+      static createLinkedTokenSource(
+        token: System.Threading.CancellationToken
+      ): System.Threading.CancellationTokenSource;
+
+      static createLinkedTokenSource(
+        tokens: System.Threading.CancellationToken[]
+      ): System.Threading.CancellationTokenSource;
+
+      constructor();
+
+      constructor(delay: System.TimeSpan);
+
+      constructor(delay: System.TimeSpan, timeProvider: System.TimeProvider);
+
+      constructor(millisecondsDelay: number);
+    }
+  }
+  export import CancellationTokenSource = System.Threading.CancellationTokenSource;
+}
+export {};

package/csharp/System/Threading/ITimer.d.ts

@@ -0,0 +1,12 @@
+import "../IAsyncDisposable";
+import "../IDisposable";
+import "../TimeSpan";
+
+declare global {
+  namespace System.Threading {
+    interface ITimer extends System.IDisposable, System.IAsyncDisposable {
+      change(dueTime: System.TimeSpan, period: System.TimeSpan): boolean;
+    }
+  }
+}
+export {};

package/csharp/System/Threading/Tasks/ValueTask.d.ts

@@ -0,0 +1,12 @@
+import "../../IEquatable";
+
+declare global {
+  namespace System.Threading.Tasks {
+    class ValueTask implements IEquatable<ValueTask> {
+      equals(other: System.Threading.Tasks.ValueTask | null): boolean;
+
+      // TODO: 待补充（如果有必要）
+    }
+  }
+}
+export {};

package/csharp/System/Threading/WaitHandle.d.ts

@@ -0,0 +1,8 @@
+declare global {
+  namespace System.Threading {
+    abstract class WaitHandle {
+      // TODO: 待补充（如果有必要）
+    }
+  }
+}
+export {};

package/csharp/System/TimeProvider.d.ts

@@ -0,0 +1,31 @@
+import "../System/Threading/ITimer";
+import "./DateTimeOffset";
+import "./TimeSpan";
+
+declare global {
+  namespace System {
+    abstract class TimeProvider {
+      abstract getUtcNow(): System.DateTimeOffset;
+
+      abstract getLocalNow(): System.DateTimeOffset;
+
+      abstract timestampFrequency: bigint;
+
+      abstract getTimestamp(): bigint;
+
+      getElapsedTime(startingTimestamp: bigint, endingTimestamp: bigint): System.TimeSpan;
+
+      getElapsedTime(startingTimestamp: bigint): System.TimeSpan;
+
+      createTimer(
+        callback: (state: any) => void,
+        state: any,
+        dueTime: System.TimeSpan,
+        period: System.TimeSpan
+      ): System.Threading.ITimer;
+
+      static system: System.TimeProvider;
+    }
+  }
+}
+export {};

package/csharp/System/TimeSpan.d.ts

@@ -0,0 +1,8 @@
+declare global {
+  namespace System {
+    class TimeSpan {
+      // TODO: 待补充（如果有必要）
+    }
+  }
+}
+export {};

package/csharp/System/Windows/Media/Matrix.d.ts

@@ -0,0 +1,80 @@
+import "../Vector";
+
+declare global {
+  namespace System.Windows.Media {
+    class Matrix {
+      identity: Matrix;
+
+      readonly determinant: number;
+
+      readonly hasInverse: boolean;
+
+      readonly isIdentity: boolean;
+
+      m11: number;
+
+      m12: number;
+
+      m21: number;
+
+      m22: number;
+
+      offsetX: number;
+
+      offsetY: number;
+
+      append(matrix: Matrix): void;
+
+      prepend(matrix: Matrix): void;
+
+      rotate(angle: number): void;
+
+      rotatePrepend(angle: number): void;
+
+      rotateAt(angle: number, centerX: number, centerY: number): void;
+
+      rotateAtPrepend(angle: number, centerX: number, centerY: number): void;
+
+      scale(scaleX: number, scaleY: number): void;
+
+      scalePrepend(scaleX: number, scaleY: number): void;
+
+      scaleAt(scaleX: number, scaleY: number, centerX: number, centerY: number): void;
+
+      scaleAtPrepend(scaleX: number, scaleY: number, centerX: number, centerY: number): void;
+
+      skew(skewX: number, skewY: number): void;
+
+      skewPrepend(skewX: number, skewY: number): void;
+
+      translate(offsetX: number, offsetY: number): void;
+
+      translatePrepend(offsetX: number, offsetY: number): void;
+
+      transform(point: System.Windows.Point): System.Windows.Point;
+
+      transform(points: System.Windows.Point[]): void;
+
+      transform(vector: System.Windows.Vector): System.Windows.Vector;
+
+      transform(vectors: System.Windows.Vector[]): void;
+
+      invert(): void;
+
+      setIdentity(): void;
+
+      multiply(trans1: Matrix, trans2: Matrix): Matrix;
+
+      constructor(
+        m11: number,
+        m12: number,
+        m21: number,
+        m22: number,
+        offsetX: number,
+        offsetY: number
+      );
+    }
+  }
+}
+
+export {};

package/csharp/System/Windows/Point.d.ts

@@ -1,7 +1,41 @@
-export interface Point {
-  /** 目标水平位置（像素） */
-  x: number;
+import "./Media/Matrix";
+import "./Vector";
 
-  /** 目标垂直位置（像素） */
-  y: number;
+declare global {
+  namespace System.Windows {
+    class Point {
+      x: number;
+
+      y: number;
+
+      offset(offsetX: number, offsetY: number): void;
+
+      multiply(
+        point: System.Windows.Point,
+        matrix: System.Windows.Media.Matrix
+      ): System.Windows.Point;
+
+      equals(point: System.Windows.Point): boolean;
+
+      static add(point: System.Windows.Point, vector: System.Windows.Vector): System.Windows.Point;
+
+      static subtract(
+        point: System.Windows.Point,
+        vector: System.Windows.Vector
+      ): System.Windows.Point;
+
+      static subtract(
+        point1: System.Windows.Point,
+        point2: System.Windows.Point
+      ): System.Windows.Vector;
+
+      static equals(point1: System.Windows.Point, point2: System.Windows.Point): boolean;
+
+      static parse(source: string): System.Windows.Point;
+
+      constructor(x: number, y: number);
+    }
+  }
 }
+
+export {};

package/csharp/System/Windows/Vector.d.ts

@@ -0,0 +1,51 @@
+import "./Media/Matrix";
+import "./Point";
+
+declare global {
+  namespace System.Windows {
+    class Vector {
+      length: number;
+
+      lengthSquared: number;
+
+      normalize(): void;
+
+      negate(): void;
+
+      static crossProduct(vector1: System.Windows.Vector, vector2: System.Windows.Vector): number;
+
+      static angleBetween(vector1: System.Windows.Vector, vector2: System.Windows.Vector): number;
+
+      static add(
+        vector1: System.Windows.Vector,
+        vector2: System.Windows.Vector
+      ): System.Windows.Vector;
+
+      static subtract(
+        vector1: System.Windows.Vector,
+        vector2: System.Windows.Vector
+      ): System.Windows.Vector;
+
+      static add(vector: System.Windows.Vector, point: System.Windows.Point): System.Windows.Point;
+
+      static multiply(vector: System.Windows.Vector, scalar: number): System.Windows.Vector;
+
+      static multiply(scalar: number, vector: System.Windows.Vector): System.Windows.Vector;
+
+      static divide(vector: System.Windows.Vector, scalar: number): System.Windows.Vector;
+
+      static multiply(
+        vector: System.Windows.Vector,
+        matrix: System.Windows.Media.Matrix
+      ): System.Windows.Vector;
+
+      static multiply(vector1: System.Windows.Vector, vector2: System.Windows.Vector): number;
+
+      static determinant(vector1: System.Windows.Vector, vector2: System.Windows.Vector): number;
+
+      constructor(x: number, y: number);
+    }
+  }
+}
+
+export {};

package/modules/dispatcher.d.ts

@@ -1,5 +1,9 @@
 import "../csharp/BetterGenshinImpact/Core/Script/Dependence/Model/RealtimeTimer";
 import "../csharp/BetterGenshinImpact/Core/Script/Dependence/Model/SoloTask";
+import "../csharp/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainParam";
+import "../csharp/BetterGenshinImpact/GameTask/AutoFight/AutoFightParam";
+import "../csharp/System/Threading/CancellationToken";
+import "../csharp/System/Threading/CancellationTokenSource";
 
 declare global {
   /** @since 0.32.5 */
@@ -15,21 +19,68 @@ declare global {
      * @param timer 实时任务触发器
      * @since 0.32.5
      */
-    function addTimer(timer: RealtimeTimer): void;
+    function addTimer(timer: BetterGenshinImpact.Core.Script.Dependence.Model.RealtimeTimer): void;
 
     /**
      * 添加实时任务（不会清理之前的任务）
      * @param timer 实时任务触发器
      * @since 0.43.5
      */
-    function addTrigger(timer: RealtimeTimer): void;
+    function addTrigger(
+      timer: BetterGenshinImpact.Core.Script.Dependence.Model.RealtimeTimer
+    ): void;
 
     /**
      * 运行独立任务
      * @param soloTask 独立任务
      * @since 0.34.5
      */
-    function runTask(soloTask: SoloTask): Promise<void>;
+    function runTask(
+      soloTask: BetterGenshinImpact.Core.Script.Dependence.Model.SoloTask,
+      customCts: System.Threading.CancellationTokenSource
+    ): Promise<void>;
+
+    /**
+     * 运行独立任务
+     * @param soloTask 独立任务
+     * @since 0.45.1
+     */
+    function runTask(
+      soloTask: BetterGenshinImpact.Core.Script.Dependence.Model.SoloTask,
+      customCt?: System.Threading.CancellationToken
+    ): Promise<void>;
+
+    /**
+     * 获取关联的取消令牌源
+     * @since 0.46.0
+     */
+    function getLinkedCancellationTokenSource(): System.Threading.CancellationTokenSource;
+
+    /**
+     * 获取关联的取消令牌
+     * @since 0.46.0
+     */
+    function getLinkedCancellationToken(): System.Threading.CancellationToken;
+
+    /**
+     * 运行自动秘境任务
+     * @param param 秘境任务参数
+     * @since 0.52.0
+     */
+    function runAutoDomainTask(
+      param: BetterGenshinImpact.GameTask.AutoDomain.AutoDomainParam,
+      customCt?: System.Threading.CancellationToken
+    ): Promise<void>;
+
+    /**
+     * 运行自动战斗任务
+     * @param param 战斗任务参数
+     * @since 0.52.0
+     */
+    function runAutoFightTask(
+      param: BetterGenshinImpact.GameTask.AutoFight.AutoFightParam,
+      customCt?: System.Threading.CancellationToken
+    ): Promise<void>;
   }
 }
 

package/modules/file.d.ts

@@ -18,21 +18,21 @@ declare global {
     function isFolder(path: string): boolean;
 
     /**
-     * 读取文件文本（支持文件扩展名：`.txt`, `.json`, `.log`, `.csv`, `.xml`, `.html`, `.css`）
+     * 读取文件文本（支持文件扩展名：`.txt`, `.json`, `.log`, `.csv`, `.xml`, `.html`, `.css`, `.png`, `.jpg`, `.jpeg`, `.bmp`, `.tiff`, `.webp`）
      * @param path 文件路径（相对于脚本根目录）
      * @since 0.32.3
      */
     function readTextSync(path: string): string;
 
     /**
-     * 读取文件文本（支持文件扩展名：`.txt`, `.json`, `.log`, `.csv`, `.xml`, `.html`, `.css`）
+     * 读取文件文本（支持文件扩展名：`.txt`, `.json`, `.log`, `.csv`, `.xml`, `.html`, `.css`, `.png`, `.jpg`, `.jpeg`, `.bmp`, `.tiff`, `.webp`）
      * @param path 文件路径（相对于脚本根目录）
      * @since 0.32.3
      */
     function readText(path: string): Promise<string>;
 
     /**
-     * 读取文件文本（支持文件扩展名：`.txt`, `.json`, `.log`, `.csv`, `.xml`, `.html`, `.css`）
+     * 读取文件文本（支持文件扩展名：`.txt`, `.json`, `.log`, `.csv`, `.xml`, `.html`, `.css`, `.png`, `.jpg`, `.jpeg`, `.bmp`, `.tiff`, `.webp`）
      * @param path 文件路径（相对于脚本根目录）
      * @param callbackFunc 回调函数
      * @since 0.32.3

package/modules/genshin.d.ts

@@ -132,15 +132,26 @@ declare global {
     /**
      * 获取当前在小地图上的 [Teyvat大地图] 位置坐标
      * @since 0.44.3
+     * @deprecated 已弃用
      */
     function getPositionFromMap(): Point2f;
 
     /**
      * 获取当前在小地图上的 [指定大地图] 位置坐标
      * @param mapName 大地图名称
+     * @param cacheTimeMs 缓存时间（毫秒，默认值：900）
      * @since 0.44.9
      */
-    function getPositionFromMap(mapName: BigMap): Point2f;
+    function getPositionFromMap(mapName: BigMap, cacheTimeMs?: number): Point2f;
+
+    /**
+     * 获取当前在小地图上的 [指定大地图] 位置坐标（仅在给定坐标附近匹配）
+     * @param mapName 大地图名称
+     * @param x 大地图坐标水平位置（像素）
+     * @param y 大地图坐标垂直位置（像素）
+     * @since 0.48.0
+     */
+    function getPositionFromMap(mapName: BigMap, x: number, y: number): Point2f;
 
     /**
      * 切换队伍
@@ -149,6 +160,12 @@ declare global {
      */
     function switchParty(partyName: string): Promise<boolean>;
 
+    /**
+     * 清除当前调度器的队伍缓存
+     * @since 0.48.0
+     */
+    function clearPartyCache(): void;
+
     /**
      * 点击空月祝福
      * @since 0.37.4

package/modules/globalMethod.d.ts

@@ -1,9 +1,7 @@
-import { ImageRegion } from "../csharp/BetterGenshinImpact/GameTask/Model/Area/ImageRegion";
-import { KeyCode } from "../csharp/BetterGenshinImpact/Helpers/User32Helper";
+import { KeyCode } from "@/csharp/BetterGenshinImpact/Helpers/User32Helper";
+import "../csharp/BetterGenshinImpact/GameTask/Model/Area/ImageRegion";
 
 declare global {
-  var global: typeof globalThis;
-
   /**
    * 休眠执行指定时长
    * @param duration - 休眠时长（毫秒）
@@ -130,7 +128,13 @@ declare global {
    * 捕获当前游戏窗口内容
    * @since 0.34.5
    */
-  function captureGameRegion(): ImageRegion;
+  function captureGameRegion(): BetterGenshinImpact.GameTask.Model.Area.ImageRegion;
+
+  /**
+   * 当前队伍 角色名称 数组
+   * @since 0.48.0
+   */
+  function getAvatars(): string[];
 
   /**
    * 模拟输入文本

package/modules/http.d.ts

@@ -1,14 +1,3 @@
-type HttpReponse = {
-  /** 状态码 */
-  status_code: number;
-
-  /** 响应头 */
-  headers: Record<string, string>;
-
-  /** 响应体 */
-  body: string;
-};
-
 declare global {
   /** @since 0.52.0 */
   namespace http {
@@ -21,16 +10,7 @@ declare global {
      * @since 0.52.0
      */
     function request(
-      method:
-        | "GET"
-        | "PUT"
-        | "POST"
-        | "DELETE"
-        | "HEAD"
-        | "OPTIONS"
-        | "TRACE"
-        | "PATCH"
-        | "CONNECT",
+      method: HttpMethod,
       url: string,
       body?: string,
       headersJson?: string
@@ -38,4 +18,26 @@ declare global {
   }
 }
 
+type HttpMethod =
+  | "GET"
+  | "PUT"
+  | "POST"
+  | "DELETE"
+  | "HEAD"
+  | "OPTIONS"
+  | "TRACE"
+  | "PATCH"
+  | "CONNECT";
+
+type HttpReponse = {
+  /** 状态码 */
+  status_code: number;
+
+  /** 响应头 */
+  headers: Record<string, string>;
+
+  /** 响应体 */
+  body: string;
+};
+
 export {};