diff --git a/CHANGELOG.md b/CHANGELOG.md
index c90a2ae5..399ba92b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,29 @@
+### [1.5.6] - 2023.10.27
+
+#### 优化
+
+- 优化文件支持性相关错误信息显示逻辑
+
+#### 修复
+
+- 修复部分谱面读取逻辑与本体不一致的问题
+
 ### [1.5.5] - 2023.10.12
 
 #### 新内容
 
-- 重新添加`视频录制`复选框，该项选中时，画面内出现半透明的摄像机图标：
-  - 未播放时点击图标切换自动(默认值)/手动录制
-  - 自动录制时(图标为摄像机开启)，以任何方式开始播放都会自动开始录制
-  - 手动录制时(图标为摄像机关闭)，播放时点击图标切换开始/结束录制
-  - 录制状态下图标为红色，否则为绿色
-  - 无论是手动录制还是自动录制，以任何方式停止播放都会结束录制
-  - 结束录制会打开录制预览的窗口，可在此进行预览或将视频保存到本地
-  - 未录制时，可长按图标重新打开最近一次的录制预览窗口
-  - 可拖动图标以改变位置，拖动时不会触发点击/长按操作
+- 重新添加`视频录制`复选框，该项选中时：
+  - 会在画面内显示一个带摄像机图标的半透明悬浮按钮
+  - 播放前，点击按钮切换录制模式(自动/手动模式)
+    - 自动模式(图标为摄像机开启)：以任何方式播放都会自动开始录制
+    - 手动模式(图标为摄像机关闭)：不会自动开始录制，需手动点击按钮录制
+  - 播放时，点击按钮切换录制状态(开始/结束录制)
+    - 按钮为红色表示正在录制，绿色表示未录制
+    - 暂停/继续播放不会影响录制状态
+    - 只有在播放时才能进行录制，以任何方式结束播放都会自动结束录制
+  - 结束录制后，会自动打开录制预览窗口，可对录制结果进行预览或保存到本地
+  - 未录制时，长按按钮可再次打开录制预览窗口，预览上一次录制结果
+  - 通过拖动按钮改变其位置，拖动时不会触发点击/长按操作
 
 #### 更改
 
@@ -140,7 +153,7 @@
 #### 优化
 
 - 优化谱面镜像逻辑
-- 优化不支持类型错误信息的显示
+- 优化兼容性相关错误信息显示逻辑
 - 为不支持或禁用全屏功能的浏览器提供兼容 (充满屏幕)
 - 优化图片着色，避免 iOS 15.6+ 出现`InvalidStateError`错误信息
   - 感谢 [@luch4736](https://space.bilibili.com/481266830) 提供 `iPad Pro (2016)` 设备支持
@@ -163,7 +176,7 @@
 
 #### 修复
 
-- 修复长度超过一定值的`Hold`在旋转一定角度时不正常显示的问题
+- 修复长度超过一定值的`Hold`在旋转一定角度时显示异常的问题
 
 ### [1.4.18] - 2022.5.23
 
@@ -215,7 +228,7 @@
 
 #### 修复
 
-- 修复部分包含时间异常事件的谱面不正常显示的问题
+- 修复部分包含时间异常事件的谱面显示异常的问题
 
 #### 已删除
 
diff --git a/package.json b/package.json
index 464685bf..69ae2027 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sim-phi-vite",
   "private": true,
-  "version": "1.5.5",
+  "version": "1.5.6",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -17,18 +17,18 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@types/eslint": "^8.44.3",
-    "@types/md5": "^2.3.3",
-    "@types/prompts": "^2.4.5",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3",
-    "eslint": "^8.50.0",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@types/eslint": "^8.44.6",
+    "@types/md5": "^2.3.4",
+    "@types/prompts": "^2.4.7",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
+    "@typescript-eslint/parser": "^6.9.0",
+    "eslint": "^8.52.0",
     "eslint-plugin-rulesdir": "^0.2.2",
     "picocolors": "^1.0.0",
     "prompts": "^2.4.2",
     "typescript": "^5.2.2",
-    "vite": "^4.4.9"
+    "vite": "^4.5.0"
   }
 }
diff --git a/scripts/meta.json b/scripts/meta.json
index 9c81ff1b..5940d308 100644
--- a/scripts/meta.json
+++ b/scripts/meta.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.5.5",
+  "version": "1.5.6",
   "pubdate": 1611795955,
-  "lastupdate": 1697125670
+  "lastupdate": 1698412304
 }
diff --git a/src/components/Checkbox.ts b/src/components/Checkbox.ts
index 8d9742d2..32fce573 100644
--- a/src/components/Checkbox.ts
+++ b/src/components/Checkbox.ts
@@ -26,14 +26,14 @@ export class Checkbox {
     return this;
   }
   public appendBefore(node: HTMLElement): this {
-    if (node.parentNode == null) { throw new Error('Node must have a parent node') }
+    if (node.parentNode == null) throw new Error('Node must have a parent node');
     node.parentNode.insertBefore(this.container, node);
     return this;
   }
   public toggle(): void {
     this.checked = !this.checkbox.checked;
   }
-  public hook(callback = (_arg0: HTMLInputElement, _arg1: HTMLDivElement) => {}): this {
+  public hook(callback: (arg0: HTMLInputElement, arg1: HTMLDivElement) => void): this {
     callback(this.checkbox, this.container);
     return this;
   }
diff --git a/src/components/HitEvents.ts b/src/components/HitEvents.ts
index ecf646e2..5e841b43 100644
--- a/src/components/HitEvents.ts
+++ b/src/components/HitEvents.ts
@@ -1,23 +1,27 @@
-export class HitEvents extends Array {
+interface HitEventsOptions<T> {
+  updateCallback?: (arg0: T) => boolean;
+  iterateCallback?: (arg0: T) => void;
+}
+export class HitEvents<T> extends Array<T> {
   public update: () => void;
   public animate: () => void;
   public constructor({
-    updateCallback = (..._arg: any[]): boolean => false,
-    iterateCallback = (..._arg: any[]) => {}
-  } = {}) {
+    updateCallback = () => false,
+    iterateCallback = () => {}
+  }: HitEventsOptions<T> = {}) {
     super();
     this.update = this.defilter.bind(this, updateCallback);
     this.animate = this.iterate.bind(this, iterateCallback);
   }
-  private defilter(predicate: (arg0: unknown) => boolean): this {
+  private defilter(predicate: (arg0: T) => boolean): this {
     let i = this.length;
     while (i--) if (predicate(this[i])) this.splice(i, 1);
     return this;
   }
-  private iterate(callback: (arg0: unknown) => void): void {
+  private iterate(callback: (arg0: T) => void): void {
     for (const i of this) callback(i);
   }
-  public add(value: unknown): void {
+  public add(value: T): void {
     this[this.length] = value;
   }
   public clear(): void {
diff --git a/src/components/StatusManager.ts b/src/components/StatusManager.ts
index 696701d3..09ede902 100644
--- a/src/components/StatusManager.ts
+++ b/src/components/StatusManager.ts
@@ -31,18 +31,18 @@ export class StatusManager {
     if (node instanceof HTMLInputElement || node instanceof HTMLSelectElement) {
       const property = node.type === 'checkbox' ? 'checked' : 'value';
       const value = this.get(key);
-      if (value !== undefined) { ((node as HTMLInputElement)[property] as string) = value }
+      if (value !== undefined) ((node as HTMLInputElement)[property] as string) = value;
       node.addEventListener('change', () => {
         this.set(key, (node as HTMLInputElement)[property] as string);
       });
-      if (dispatch as boolean) { node.dispatchEvent(new Event('change')) }
+      if (dispatch as boolean) node.dispatchEvent(new Event('change'));
     } else if (node instanceof HTMLTextAreaElement) {
       const value = this.get(key);
-      if (value !== undefined) { (node.value as unknown) = value }
+      if (value !== undefined) (node.value as unknown) = value;
       node.addEventListener('change', () => {
         this.set(key, node.value);
       });
-      if (dispatch as boolean) { node.dispatchEvent(new Event('change')) }
-    } else { throw new Error('Node must be <input>, <select> or <textarea>') }
+      if (dispatch as boolean) node.dispatchEvent(new Event('change'));
+    } else throw new Error('Node must be <input>, <select> or <textarea>');
   }
 }
diff --git a/src/core.ts b/src/core.ts
index 706be645..266da1f5 100644
--- a/src/core.ts
+++ b/src/core.ts
@@ -1,79 +1,10 @@
-// type ArrayMapParameters<T> = typeof Array.prototype.map<T>;
-// type ArrayMapCallback<T> = Parameters<ArrayMapParameters<T>>[0];
-namespace To {
-  export function int(a: unknown): number {
-    return Number(a) | 0;
-  }
-  export function float(a: unknown): number {
-    return Number(a) || 0;
-  }
-  export function bool(a: unknown): boolean {
-    return Boolean(a);
-  }
-  export function str(a: unknown): string {
-    return String(a);
-  }
-  // export function arr<T>(a: unknown, callbackfn: ArrayMapCallback<T>): T[] {
-  //   return Array.isArray(a) ? a.map(callbackfn) : [];
-  // }
-  export function arr<T>(a: unknown, constructor: new (b: Record<string, unknown>) => T): T[] {
-    return Array.isArray(a) ? a.map((i?: Record<string, unknown>) => new constructor(i || {})) : [];
-  }
-}
-// const to = {
-//   int(a: unknown): number {
-//     return Number(a) | 0;
-//   },
-//   float(a: unknown): number {
-//     return Number(a) || 0;
-//   },
-//   bool(a: unknown): boolean {
-//     return Boolean(a);
-//   },
-//   str(a: unknown): string {
-//     return String(a);
-//   },
-//   // arr<T>(a: unknown, callbackfn: ArrayMapCallback<T>): T[] {
-//   //   return Array.isArray(a) ? a.map(callbackfn) : [];
-//   // },
-//   arr<T>(a: unknown, constructor: new (b: Record<string, unknown>) => T): T[] {
-//     return Array.isArray(a) ? a.map((i?: Record<string, unknown>) => new constructor(i || {})) : [];
-//   }
-// };
-class SpeedEvent {
-  public startTime: number;
-  public endTime: number;
-  public value: number;
-  public floorPosition: number;
-  public floorPosition2: number;
-  public constructor(event: Record<string, unknown>) {
-    this.startTime = To.int(event.startTime);
-    this.endTime = To.int(event.endTime);
-    this.value = To.float(event.value);
-    this.floorPosition = To.float(event.floorPosition);
-    this.floorPosition2 = To.float(event.floorPosition2);
-  }
-}
+// import { JudgeLineEvent } from './utils/Chart';
 interface SpeedEventExtends extends SpeedEvent {
+  floorPosition: number;
+  floorPosition2: number;
   startSeconds: number;
   endSeconds: number;
 }
-class Note {
-  public type: number;
-  public time: number;
-  public positionX: number;
-  public holdTime: number;
-  public speed: number;
-  public floorPosition: number;
-  public constructor(note: Record<string, unknown>) {
-    this.type = To.int(note.type);
-    this.time = To.int(note.time);
-    this.positionX = To.float(note.positionX);
-    this.holdTime = To.int(note.holdTime);
-    this.speed = To.float(note.speed);
-    this.floorPosition = To.float(note.floorPosition);
-  }
-}
 export interface NoteExtends extends Note {
   maxVisiblePos: number;
   offsetX: number;
@@ -104,50 +35,10 @@ export interface NoteExtends extends Note {
   holdBroken: boolean;
   statOffset: number;
 }
-class LineEvent {
-  public startTime: number;
-  public endTime: number;
-  public start: number;
-  public end: number;
-  public start2: number;
-  public end2: number;
-  public constructor(event: Record<string, unknown>) {
-    this.startTime = To.int(event.startTime);
-    this.endTime = To.int(event.endTime);
-    this.start = To.float(event.start);
-    this.end = To.float(event.end);
-    this.start2 = To.float(event.start2);
-    this.end2 = To.float(event.end2);
-  }
-}
-interface LineEventExtends extends LineEvent {
+interface LineEventExtends extends JudgeLineEvent {
   startSeconds: number;
   endSeconds: number;
 }
-class JudgeLine {
-  public numOfNotes: number;
-  public numOfNotesAbove: number;
-  public numOfNotesBelow: number;
-  public bpm: number;
-  public speedEvents: SpeedEvent[];
-  public notesAbove: Note[];
-  public notesBelow: Note[];
-  public judgeLineDisappearEvents: LineEvent[];
-  public judgeLineMoveEvents: LineEvent[];
-  public judgeLineRotateEvents: LineEvent[];
-  public constructor(line: Record<string, unknown>) {
-    this.numOfNotes = To.int(line.numOfNotes);
-    this.numOfNotesAbove = To.int(line.numOfNotesAbove);
-    this.numOfNotesBelow = To.int(line.numOfNotesBelow);
-    this.bpm = To.float(line.bpm);
-    this.speedEvents = To.arr(line.speedEvents, SpeedEvent);
-    this.notesAbove = To.arr(line.notesAbove, Note);
-    this.notesBelow = To.arr(line.notesBelow, Note);
-    this.judgeLineDisappearEvents = To.arr(line.judgeLineDisappearEvents, LineEvent);
-    this.judgeLineMoveEvents = To.arr(line.judgeLineMoveEvents, LineEvent);
-    this.judgeLineRotateEvents = To.arr(line.judgeLineRotateEvents, LineEvent);
-  }
-}
 export interface JudgeLineExtends extends JudgeLine {
   lineId: number;
   offsetX: number;
@@ -177,18 +68,6 @@ export interface JudgeLineExtends extends JudgeLine {
   imageL: [ImageBitmap, ImageBitmap, null, ImageBitmap];
   imageC: boolean;
 }
-class Chart {
-  public formatVersion: number;
-  public offset: number;
-  public numOfNotes: number;
-  public judgeLineList: JudgeLine[];
-  public constructor(chart: Record<string, unknown>) {
-    this.formatVersion = To.int(chart.formatVersion);
-    this.offset = To.float(chart.offset);
-    this.numOfNotes = To.int(chart.numOfNotes);
-    this.judgeLineList = To.arr(chart.judgeLineList, JudgeLine);
-  }
-}
 interface ChartExtends extends Chart {
   maxSeconds: number;
   judgeLineList: JudgeLineExtends[];
@@ -323,27 +202,6 @@ export class Renderer {
     this._setLowResFactor(1);
     this.resizeCanvas();
   }
-  // public get bgImage(): ImageBitmap {
-  //   if (!this._bgImage) throw new Error('No background image');
-  //   return this._bgImage;
-  // }
-  // public set bgImage(value: ImageBitmap) {
-  //   this._bgImage = value;
-  // }
-  // public get bgImageBlur(): ImageBitmap {
-  //   if (!this._bgImageBlur) throw new Error('No background image');
-  //   return this._bgImageBlur;
-  // }
-  // public set bgImageBlur(value: ImageBitmap) {
-  //   this._bgImageBlur = value;
-  // }
-  // public get bgMusic(): AudioBuffer {
-  //   if (!this._bgMusic) throw new Error('No background music');
-  //   return this._bgMusic;
-  // }
-  // public set bgMusic(value: AudioBuffer) {
-  //   this._bgMusic = value;
-  // }
   // config
   public setNoteScale(num = 1): void {
     this.noteScale = num;
@@ -384,7 +242,7 @@ export class Renderer {
     this.initialized = true;
   }
   // note预处理
-  public prerenderChart(chart: Record<string, unknown>): void {
+  public prerenderChart(chart: Chart): void {
     this.lines.length = 0;
     this.notes.length = 0;
     this.taps.length = 0;
@@ -392,7 +250,20 @@ export class Renderer {
     this.flicks.length = 0;
     this.holds.length = 0;
     this.tapholds.length = 0;
-    const chartNew = new Chart(chart) as ChartExtends;
+    const chartNew = chart.duplicate() as ChartExtends;
+    for (const i of chartNew.judgeLineList) {
+      let y = Math.fround(i.speedEvents[0].startTime / i.bpm * 1.875);
+      let y2 = y; // float32
+      for (const j of i.speedEvents) {
+        j.floorPosition = y;
+        j.floorPosition2 = y2;
+        const dy = (j.endTime - j.startTime) / i.bpm * 1.875;
+        y += dy * j.value;
+        y2 += Math.fround(Math.fround(dy) * j.value);
+        y = Math.fround(y);
+        y2 = Math.fround(y2);
+      }
+    }
     const ss = {
       aniStart: 1e9,
       aniEnd: 0,
@@ -414,7 +285,7 @@ export class Renderer {
         i.startSeconds = i.startTime / bpm * 1.875;
         i.endSeconds = i.endTime / bpm * 1.875;
         if (i.startTime > 1 - 1e6) aniUpdate(i.startSeconds);
-        if (i.endTime < 1e9) aniUpdate(i.endSeconds);
+        if (i.endTime < 1e9 && i.endTime !== events[events.length - 1].endTime) aniUpdate(i.endSeconds);
       }
     };
     // 获取note最大可见位置
@@ -465,10 +336,10 @@ export class Renderer {
       i.rotation = 0;
       i.positionY = 0; // 临时过渡用
       i.positionY2 = 0;
-      i.speedEvents = normalizeSpeedEvent(i.speedEvents) as SpeedEventExtends[];
-      i.judgeLineDisappearEvents = normalizeLineEvent(i.judgeLineDisappearEvents) as LineEventExtends[];
-      i.judgeLineMoveEvents = normalizeLineEvent(i.judgeLineMoveEvents) as LineEventExtends[];
-      i.judgeLineRotateEvents = normalizeLineEvent(i.judgeLineRotateEvents) as LineEventExtends[];
+      // i.speedEvents = normalizeSpeedEvent(i.speedEvents) as SpeedEventExtends[];
+      // i.judgeLineDisappearEvents = normalizeLineEvent(i.judgeLineDisappearEvents) as LineEventExtends[];
+      // i.judgeLineMoveEvents = normalizeLineEvent(i.judgeLineMoveEvents) as LineEventExtends[];
+      // i.judgeLineRotateEvents = normalizeLineEvent(i.judgeLineRotateEvents) as LineEventExtends[];
       i.disappearEventsIndex = 0;
       i.moveEventsIndex = 0;
       i.rotateEventsIndex = 0;
@@ -529,10 +400,10 @@ export class Renderer {
       line.moveEventsIndex = 0;
       line.rotateEventsIndex = 0;
       if (time == null) continue;
-      while (line.speedEventsIndex < line.speedEvents.length && line.speedEvents[line.speedEventsIndex].startSeconds < time) line.speedEventsIndex++;
-      while (line.disappearEventsIndex < line.judgeLineDisappearEvents.length && line.judgeLineDisappearEvents[line.disappearEventsIndex].startSeconds < time) line.disappearEventsIndex++;
-      while (line.moveEventsIndex < line.judgeLineMoveEvents.length && line.judgeLineMoveEvents[line.moveEventsIndex].startSeconds < time) line.moveEventsIndex++;
-      while (line.rotateEventsIndex < line.judgeLineRotateEvents.length && line.judgeLineRotateEvents[line.rotateEventsIndex].startSeconds < time) line.rotateEventsIndex++;
+      while (line.speedEventsIndex < line.speedEvents.length && line.speedEvents[line.speedEventsIndex].endSeconds < time) line.speedEventsIndex++;
+      while (line.disappearEventsIndex < line.judgeLineDisappearEvents.length && line.judgeLineDisappearEvents[line.disappearEventsIndex].endSeconds < time) line.disappearEventsIndex++;
+      while (line.moveEventsIndex < line.judgeLineMoveEvents.length && line.judgeLineMoveEvents[line.moveEventsIndex].endSeconds < time) line.moveEventsIndex++;
+      while (line.rotateEventsIndex < line.judgeLineRotateEvents.length && line.judgeLineRotateEvents[line.rotateEventsIndex].endSeconds < time) line.rotateEventsIndex++;
     }
   }
   public updateByTime(time: number): void {
@@ -599,6 +470,7 @@ export class Renderer {
           const isHidden = i.maxVisiblePos < line.positionY2;
           i.alpha = isHidden || this.enableVP && getGoodY(i) * 0.6 > 2 ? 0 : i.type === 3 && i.speed === 0 ? 0 : 1;
         } else {
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
           i.frameCount = i.frameCount == null ? 0 : i.frameCount + 1;
           if (i.type === 3) {
             i.showPoint = true;
@@ -637,78 +509,78 @@ export class Renderer {
     this.lineScale = canvasfg.width > canvasfg.height * 0.75 ? canvasfg.height / 18.75 : canvasfg.width / 14.0625; // 判定线、文字缩放
   }
 }
-// 规范判定线事件
-function normalizeLineEvent(events: LineEvent[]) {
-  const oldEvents = events.map(i => new LineEvent(i as unknown as Record<string, unknown>)); // 深拷贝
-  if (!oldEvents.length) return [new LineEvent({ startTime: -999999, endTime: 1e9 })]; // 如果没有事件，添加一个默认事件(以后添加warning)
-  const newEvents = [
-    new LineEvent({
-      startTime: -999999,
-      endTime: 0,
-      start: oldEvents[0].start,
-      end: oldEvents[0].start,
-      start2: oldEvents[0].start2,
-      end2: oldEvents[0].start2
-    })
-  ]; // 以1-1e6开头
-  oldEvents.push(new LineEvent({
-    startTime: oldEvents[oldEvents.length - 1].endTime,
-    endTime: 1e9,
-    start: oldEvents[oldEvents.length - 1].end,
-    end: oldEvents[oldEvents.length - 1].end,
-    start2: oldEvents[oldEvents.length - 1].end2,
-    end2: oldEvents[oldEvents.length - 1].end2
-  })); // 以1e9结尾
-  for (const i2 of oldEvents) {
-    // 保证时间连续性
-    if (i2.startTime > i2.endTime) continue;
-    const i1 = newEvents[newEvents.length - 1];
-    if (i1.endTime > i2.endTime) {
-      // 忽略
-    } else if (i1.endTime === i2.startTime) newEvents.push(i2);
-    else if (i1.endTime < i2.startTime) {
-      newEvents.push(new LineEvent({
-        startTime: i1.endTime,
-        endTime: i2.startTime,
-        start: i1.end,
-        end: i1.end,
-        start2: i1.end2,
-        end2: i1.end2
-      }), i2);
-    } else if (i1.endTime > i2.startTime) {
-      newEvents.push(new LineEvent({
-        startTime: i1.endTime,
-        endTime: i2.endTime,
-        start: (i2.start * (i2.endTime - i1.endTime) + i2.end * (i1.endTime - i2.startTime)) / (i2.endTime - i2.startTime),
-        end: i1.end,
-        start2: (i2.start2 * (i2.endTime - i1.endTime) + i2.end2 * (i1.endTime - i2.startTime)) / (i2.endTime - i2.startTime),
-        end2: i1.end2
-      }));
-    }
-  }
-  // 合并相同变化率事件
-  const newEvents2 = [newEvents.shift()!];
-  for (const i2 of newEvents) {
-    const i1 = newEvents2[newEvents2.length - 1];
-    const d1 = i1.endTime - i1.startTime;
-    const d2 = i2.endTime - i2.startTime;
-    if (i2.startTime === i2.endTime) {
-      // 忽略
-    } else if (i1.end === i2.start && i1.end2 === i2.start2 && (i1.end - i1.start) * d2 === (i2.end - i2.start) * d1 && (i1.end2 - i1.start2) * d2 === (i2.end2 - i2.start2) * d1) {
-      i1.endTime = i2.endTime;
-      i1.end = i2.end;
-      i1.end2 = i2.end2;
-    } else newEvents2.push(i2);
-  }
-  return newEvents2;
-}
-// 规范speedEvents
-function normalizeSpeedEvent(events: SpeedEvent[]) {
-  const newEvents = [];
-  for (const i2 of events) {
-    const i1 = newEvents[newEvents.length - 1];
-    if (i1?.value === i2.value) i1.endTime = i2.endTime;
-    else newEvents.push(i2);
-  }
-  return newEvents;
-}
+// // 规范判定线事件
+// function normalizeLineEvent(events: JudgeLineEvent[]) {
+//   const oldEvents = events.map(i => new JudgeLineEvent(i as unknown as Record<string, unknown>)); // 深拷贝
+//   if (!oldEvents.length) return [new JudgeLineEvent({ startTime: -999999, endTime: 1e9 })]; // 如果没有事件，添加一个默认事件(以后添加warning)
+//   const newEvents = [
+//     new JudgeLineEvent({
+//       startTime: -999999,
+//       endTime: 0,
+//       start: oldEvents[0].start,
+//       end: oldEvents[0].start,
+//       start2: oldEvents[0].start2,
+//       end2: oldEvents[0].start2
+//     })
+//   ]; // 以1-1e6开头
+//   oldEvents.push(new JudgeLineEvent({
+//     startTime: oldEvents[oldEvents.length - 1].endTime,
+//     endTime: 1e9,
+//     start: oldEvents[oldEvents.length - 1].end,
+//     end: oldEvents[oldEvents.length - 1].end,
+//     start2: oldEvents[oldEvents.length - 1].end2,
+//     end2: oldEvents[oldEvents.length - 1].end2
+//   })); // 以1e9结尾
+//   for (const i2 of oldEvents) {
+//     // 保证时间连续性
+//     if (i2.startTime > i2.endTime) continue;
+//     const i1 = newEvents[newEvents.length - 1];
+//     if (i1.endTime > i2.endTime) {
+//       // 忽略
+//     } else if (i1.endTime === i2.startTime) newEvents.push(i2);
+//     else if (i1.endTime < i2.startTime) {
+//       newEvents.push(new JudgeLineEvent({
+//         startTime: i1.endTime,
+//         endTime: i2.startTime,
+//         start: i1.end,
+//         end: i1.end,
+//         start2: i1.end2,
+//         end2: i1.end2
+//       }), i2);
+//     } else if (i1.endTime > i2.startTime) {
+//       newEvents.push(new JudgeLineEvent({
+//         startTime: i1.endTime,
+//         endTime: i2.endTime,
+//         start: (i2.start * (i2.endTime - i1.endTime) + i2.end * (i1.endTime - i2.startTime)) / (i2.endTime - i2.startTime),
+//         end: i1.end,
+//         start2: (i2.start2 * (i2.endTime - i1.endTime) + i2.end2 * (i1.endTime - i2.startTime)) / (i2.endTime - i2.startTime),
+//         end2: i1.end2
+//       }));
+//     }
+//   }
+//   // 合并相同变化率事件
+//   const newEvents2 = [newEvents.shift()!];
+//   for (const i2 of newEvents) {
+//     const i1 = newEvents2[newEvents2.length - 1];
+//     const d1 = i1.endTime - i1.startTime;
+//     const d2 = i2.endTime - i2.startTime;
+//     if (i2.startTime === i2.endTime) {
+//       // 忽略
+//     } else if (i1.end === i2.start && i1.end2 === i2.start2 && (i1.end - i1.start) * d2 === (i2.end - i2.start) * d1 && (i1.end2 - i1.start2) * d2 === (i2.end2 - i2.start2) * d1) {
+//       i1.endTime = i2.endTime;
+//       i1.end = i2.end;
+//       i1.end2 = i2.end2;
+//     } else newEvents2.push(i2);
+//   }
+//   return newEvents2;
+// }
+// // 规范speedEvents
+// function normalizeSpeedEvent(events: SpeedEvent[]) {
+//   const newEvents = [];
+//   for (const i2 of events) {
+//     const i1 = newEvents[newEvents.length - 1];
+//     if (i1?.value === i2.value) i1.endTime = i2.endTime;
+//     else newEvents.push(i2);
+//   }
+//   return newEvents;
+// }
diff --git a/src/extends/format.d.ts b/src/extends/format.d.ts
index 586dc104..c0ddbd36 100644
--- a/src/extends/format.d.ts
+++ b/src/extends/format.d.ts
@@ -1,10 +1,15 @@
-interface Chart {
-  formatVersion: number;
+type Chart = import('../utils/Chart').Chart;
+type Note = import('../utils/Chart').Note;
+type JudgeLine = import('../utils/Chart').JudgeLine;
+type SpeedEvent = import('../utils/Chart').SpeedEvent;
+type JudgeLineEvent = import('../utils/Chart').JudgeLineEvent;
+interface ChartPGS {
+  formatVersion?: number;
   offset: number;
-  numOfNotes: number;
-  judgeLineList: JudgeLine[];
+  numOfNotes?: number;
+  judgeLineList: JudgeLinePGS[];
 }
-interface Note {
+interface NotePGS {
   type: number;
   time: number;
   positionX: number;
@@ -12,31 +17,31 @@ interface Note {
   speed: number;
   floorPosition: number;
 }
-interface JudgeLine {
+interface JudgeLinePGS {
   bpm: number;
-  numOfNotes: number;
-  numOfNotesAbove: number;
-  numOfNotesBelow: number;
-  notesAbove: Note[];
-  notesBelow: Note[];
-  speedEvents: SpeedEvent[];
-  judgeLineDisappearEvents: JudgeLineEvent[];
-  judgeLineMoveEvents: JudgeLineEvent[];
-  judgeLineRotateEvents: JudgeLineEvent[];
+  numOfNotes?: number;
+  numOfNotesAbove?: number;
+  numOfNotesBelow?: number;
+  notesAbove?: NotePGS[];
+  notesBelow?: NotePGS[];
+  speedEvents: SpeedEventPGS[];
+  judgeLineDisappearEvents: JudgeLineEventPGS[];
+  judgeLineMoveEvents: JudgeLineEventPGS[];
+  judgeLineRotateEvents: JudgeLineEventPGS[];
 }
-interface SpeedEvent {
+interface SpeedEventPGS {
   startTime: number;
   endTime: number;
   value: number;
-  floorPosition: number;
+  floorPosition?: number;
   floorPosition2?: number; // float32
   floorPositionMin?: number;
 }
-interface JudgeLineEvent {
+interface JudgeLineEventPGS {
   startTime: number;
   endTime: number;
   start: number;
   end: number;
-  start2: number;
-  end2: number;
+  start2?: number;
+  end2?: number;
 }
diff --git a/src/extends/pec/LinePec.ts b/src/extends/pec/LinePec.ts
index 5c88accb..8fe42412 100644
--- a/src/extends/pec/LinePec.ts
+++ b/src/extends/pec/LinePec.ts
@@ -35,7 +35,7 @@ export class LinePec {
     this.alphaEvents = [];
     this.moveEvents = [];
     this.rotateEvents = [];
-    if (!isNaN(bpm)) { this.bpm = bpm }
+    if (!isNaN(bpm)) this.bpm = bpm;
   }
   public pushNote(type: number, time: number, positionX: number, holdTime: number, speed: number, isAbove: boolean, isFake: boolean): void {
     this.notes.push({ type, time, positionX, holdTime, speed, isAbove, isFake });
@@ -52,7 +52,7 @@ export class LinePec {
   public pushRotateEvent(startTime: number, endTime: number, value: number, motionType: number): void {
     this.rotateEvents.push({ startTime, endTime, value, motionType });
   }
-  public format(): JudgeLine {
+  public format(): JudgeLinePGS {
     const sortFn = (a: { time: number }, b: { time: number }) => a.time - b.time;
     const sortFn2 = (a: { startTime: number; endTime: number }, b: { startTime: number; endTime: number }) => a.startTime - b.startTime + (a.endTime - b.endTime);
     // 不单独判断以避免误差
@@ -60,15 +60,15 @@ export class LinePec {
       formatVersion: 3,
       offset: 0,
       bpm: this.bpm,
-      speedEvents: [] as SpeedEvent[],
+      speedEvents: [] as SpeedEventPGS[],
       numOfNotes: 0,
       numOfNotesAbove: 0,
       numOfNotesBelow: 0,
-      notesAbove: [] as Note[],
-      notesBelow: [] as Note[],
-      judgeLineDisappearEvents: [] as JudgeLineEvent[],
-      judgeLineMoveEvents: [] as JudgeLineEvent[],
-      judgeLineRotateEvents: [] as JudgeLineEvent[]
+      notesAbove: [] as NotePGS[],
+      notesBelow: [] as NotePGS[],
+      judgeLineDisappearEvents: [] as JudgeLineEventPGS[],
+      judgeLineMoveEvents: [] as JudgeLineEventPGS[],
+      judgeLineRotateEvents: [] as JudgeLineEventPGS[]
     };
     const pushDisappearEvent = (startTime: number, endTime: number, start: number, end: number) => {
       result.judgeLineDisappearEvents.push({ startTime, endTime, start, end, start2: 0, end2: 0 });
@@ -97,9 +97,9 @@ export class LinePec {
       let v2 = 0;
       let v3 = 0;
       for (const e of result.speedEvents) {
-        if (time > e.endTime) { continue }
-        if (time < e.startTime) { break }
-        v1 = e.floorPosition;
+        if (time > e.endTime) continue;
+        if (time < e.startTime) break;
+        v1 = e.floorPosition!;
         v2 = e.value;
         v3 = time - e.startTime;
       }
@@ -113,12 +113,12 @@ export class LinePec {
       };
       if (i.isAbove) {
         result.notesAbove.push(note);
-        if (i.isFake) { continue }
+        if (i.isFake) continue;
         result.numOfNotes++;
         result.numOfNotesAbove++;
       } else {
         result.notesBelow.push(note);
-        if (i.isFake) { continue }
+        if (i.isFake) continue;
         result.numOfNotes++;
         result.numOfNotesBelow++;
       }
diff --git a/src/extends/pec/pec2json.ts b/src/extends/pec/pec2json.ts
index d8ec048d..e92f7871 100644
--- a/src/extends/pec/pec2json.ts
+++ b/src/extends/pec/pec2json.ts
@@ -31,7 +31,7 @@ interface LineCommand {
   text: string;
 }
 interface PecParseResult {
-  data: string;
+  data: ChartPGS;
   messages: string[];
   format: string;
 }
@@ -47,20 +47,20 @@ export function parse(pec: string, filename: string): PecParseResult {
     formatVersion: 3,
     offset: 0,
     numOfNotes: 0,
-    judgeLineList: [] as JudgeLine[]
+    judgeLineList: [] as JudgeLinePGS[]
   };
   const warnings = []; //
   let ptr = 0;
   data2.offset = isNaN(Number(data[ptr])) ? 0 : Number(data[ptr++]);
   while (ptr < data.length) {
     const command = data[ptr++];
-    if (command === '') { continue }
+    if (command === '') continue;
     if (command === 'bp') {
       const time = Number(data[ptr++]);
       const bpm = Number(data[ptr++]);
       data2.bpmList.push({ time, bpm });
     } else if (command.startsWith('n')) {
-      if (!'1234'.includes(command[1])) { throw new Error(`Unsupported Command: ${command}`) }
+      if (!'1234'.includes(command[1])) throw new Error(`Unsupported Command: ${command}`);
       const cmd = {} as NoteCommand;
       const type = command[1];
       cmd.type = Number(type);
@@ -75,30 +75,30 @@ export function parse(pec: string, filename: string): PecParseResult {
       cmd.size = (data[ptr++] || '').startsWith('&') ? Number(data[ptr++]) : (ptr--, 1);
       data2.notes.push(cmd);
     } else if (command.startsWith('c')) {
-      if (!'vpdamrf'.includes(command[1])) { throw new Error(`Unsupported Command: ${command}`) }
+      if (!'vpdamrf'.includes(command[1])) throw new Error(`Unsupported Command: ${command}`);
       const cmd = {} as LineCommand;
       const type = command[1];
       cmd.type = type;
       cmd.lineId = Number(data[ptr++]);
       cmd.time = Number(data[ptr++]);
-      if ('v'.includes(type)) { cmd.speed = Number(data[ptr++]) }
+      if ('v'.includes(type)) cmd.speed = Number(data[ptr++]);
       cmd.time2 = 'mrf'.includes(type) ? Number(data[ptr++]) : cmd.time;
-      if ('pm'.includes(type)) { cmd.offsetX = Number(data[ptr++]) }
-      if ('pm'.includes(type)) { cmd.offsetY = Number(data[ptr++]) }
-      if ('dr'.includes(type)) { cmd.rotation = Number(data[ptr++]) }
-      if ('af'.includes(type)) { cmd.alpha = Number(data[ptr++]) }
-      if ('mr'.includes(type)) { cmd.motionType = Number(data[ptr++]) }
+      if ('pm'.includes(type)) cmd.offsetX = Number(data[ptr++]);
+      if ('pm'.includes(type)) cmd.offsetY = Number(data[ptr++]);
+      if ('dr'.includes(type)) cmd.rotation = Number(data[ptr++]);
+      if ('af'.includes(type)) cmd.alpha = Number(data[ptr++]);
+      if ('mr'.includes(type)) cmd.motionType = Number(data[ptr++]);
       cmd.text = `c${Object.values(cmd).join(' ')}`;
-      if ('pdaf'.includes(type)) { cmd.motionType = 1 }
+      if ('pdaf'.includes(type)) cmd.motionType = 1;
       data2.lines.push(cmd);
-    } else { throw new Error(`Unexpected Command: ${command}`) }
+    } else throw new Error(`Unexpected Command: ${command}`);
   }
   result.offset = data2.offset / 1e3 - 0.175; // v18x固定延迟
   // bpm变速
-  if (!data2.bpmList.length) { throw new Error('Invalid pec file') }
+  if (!data2.bpmList.length) throw new Error('Invalid pec file');
   const bpmList = new BpmList(data2.bpmList[0].bpm); // FIXME: 考虑合适的bpm范围
   data2.bpmList.sort((a, b) => a.time - b.time).forEach((i, idx, arr) => {
-    if (arr[idx + 1]?.time <= 0) { return } // 过滤负数
+    if (arr[idx + 1]?.time <= 0) return; // 过滤负数
     bpmList.push(i.time < 0 ? 0 : i.time, arr[idx + 1]?.time ?? 1e9, i.bpm);
   });
   // note和判定线事件
@@ -124,29 +124,27 @@ export function parse(pec: string, filename: string): PecParseResult {
     }
     linesPec[i.lineId] ??= new LinePec(bpmList.baseBpm);
     // 变速
-    if (i.type === 'v') {
-      linesPec[i.lineId].pushSpeedEvent(t1, i.speed / 7.0); // 6.0??
-    }
+    if (i.type === 'v') linesPec[i.lineId].pushSpeedEvent(t1, i.speed / 7.0);
     // 不透明度
     if (i.type === 'a' || i.type === 'f') {
       linesPec[i.lineId].pushAlphaEvent(t1, t2, Math.max(i.alpha / 255, 0), i.motionType); // 暂不支持alpha值扩展
-      if (i.alpha < 0) { warnings.push(`检测到负数Alpha:${i.alpha}(将被视为0)\n位于:"${i.text}"\n来自${filename}`) }
+      if (i.alpha < 0) warnings.push(`检测到负数Alpha:${i.alpha}(将被视为0)\n位于:"${i.text}"\n来自${filename}`);
     }
     // 移动
     if (i.type === 'p' || i.type === 'm') {
       linesPec[i.lineId].pushMoveEvent(t1, t2, i.offsetX / 2048, i.offsetY / 1400, isMotion(i.motionType) ? i.motionType : 1);
-      if (!isMotion(i.motionType)) { warnings.push(`未知的缓动类型:${i.motionType}(将被视为1)\n位于:"${i.text}"\n来自${filename}`) }
+      if (!isMotion(i.motionType)) warnings.push(`未知的缓动类型:${i.motionType}(将被视为1)\n位于:"${i.text}"\n来自${filename}`);
     }
     // 旋转
     if (i.type === 'd' || i.type === 'r') {
       linesPec[i.lineId].pushRotateEvent(t1, t2, -i.rotation, isMotion(i.motionType) ? i.motionType : 1);
-      if (!isMotion(i.motionType)) { warnings.push(`未知的缓动类型:${i.motionType}(将被视为1)\n位于:"${i.text}"\n来自${filename}`) }
+      if (!isMotion(i.motionType)) warnings.push(`未知的缓动类型:${i.motionType}(将被视为1)\n位于:"${i.text}"\n来自${filename}`);
     }
   }
   for (const i of linesPec) {
     const judgeLine = i.format();
     result.judgeLineList.push(judgeLine);
-    result.numOfNotes += judgeLine.numOfNotes;
+    result.numOfNotes += judgeLine.numOfNotes!;
   }
-  return { data: JSON.stringify(result), messages: warnings, format: 'PEC' };
+  return { data: result, messages: warnings, format: 'PEC' };
 }
diff --git a/src/extends/pec/rpe2json.ts b/src/extends/pec/rpe2json.ts
index bbe68f89..459e1da9 100644
--- a/src/extends/pec/rpe2json.ts
+++ b/src/extends/pec/rpe2json.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable @typescript-eslint/naming-convention */
 import { type BeatArray, BpmList } from './BpmList';
 import { easing } from './easing.js';
@@ -173,7 +174,7 @@ function getRotateValue(e: LineEventRPE2[], t: number, d: boolean) {
     if (t < startTime) break;
     if (d && t === startTime) break;
     if (t >= endTime) result = end;
-    else { result = start + (t - startTime) * (end - start) / (endTime - startTime) }
+    else result = start + (t - startTime) * (end - start) / (endTime - startTime);
   }
   return result;
 }
@@ -241,11 +242,11 @@ function mergeFather(child: LineRPE1, father: LineRPE1) {
   child.moveEvents = moveEvents;
 }
 interface EventLayer {
-  moveXEvents: LineEventRPE[];
-  moveYEvents: LineEventRPE[];
-  rotateEvents: LineEventRPE[];
-  alphaEvents: LineEventRPE[];
-  speedEvents: LineEventRPE[];
+  moveXEvents?: LineEventRPE[];
+  moveYEvents?: LineEventRPE[];
+  rotateEvents?: LineEventRPE[];
+  alphaEvents?: LineEventRPE[];
+  speedEvents?: LineEventRPE[];
 }
 class EventLayer1 {
   public moveXEvents: LineEventRPE2[];
@@ -272,7 +273,9 @@ class EventLayer1 {
   public pushAlphaEvent(startTime: number, endTime: number, start: number, end: number, easingFn?: (t: number) => number) {
     this.alphaEvents.push({ startTime, endTime, start, end, easingFn });
   }
-  public pushSpeedEvent(startTime: number, endTime: number, start: number, end: number) { this.speedEvents.push({ startTime, endTime, start, end }) }
+  public pushSpeedEvent(startTime: number, endTime: number, start: number, end: number) {
+    this.speedEvents.push({ startTime, endTime, start, end });
+  }
 }
 interface NoteRPE {
   type: number;
@@ -321,8 +324,12 @@ class LineRPE1 {
   public pushNote(type: number, time: number, positionX: number, holdTime: number, speed: number, isAbove: boolean, isFake: boolean, isHide: boolean) {
     this.notes.push({ type, time, positionX, holdTime, speed, isAbove, isFake, isHidden: isHide });
   }
-  public setId(id = NaN) { this.id = id }
-  public setFather(fatherLine: LineRPE1 | null) { this.father = fatherLine }
+  public setId(id = NaN) {
+    this.id = id;
+  }
+  public setFather(fatherLine: LineRPE1 | null) {
+    this.father = fatherLine;
+  }
   public preset() {
     const sortFn2 = (a: { startTime: number }, b: { startTime: number }) => a.startTime - b.startTime;
     const events = [];
@@ -365,15 +372,15 @@ class LineRPE1 {
     this.fitFather([], onwarning);
     const result = {
       bpm: this.bpm,
-      speedEvents: [] as SpeedEvent[],
+      speedEvents: [] as SpeedEventPGS[],
       numOfNotes: 0,
       numOfNotesAbove: 0,
       numOfNotesBelow: 0,
-      notesAbove: [] as Note[],
-      notesBelow: [] as Note[],
-      judgeLineDisappearEvents: [] as JudgeLineEvent[],
-      judgeLineMoveEvents: [] as JudgeLineEvent[],
-      judgeLineRotateEvents: [] as JudgeLineEvent[]
+      notesAbove: [] as NotePGS[],
+      notesBelow: [] as NotePGS[],
+      judgeLineDisappearEvents: [] as JudgeLineEventPGS[],
+      judgeLineMoveEvents: [] as JudgeLineEventPGS[],
+      judgeLineRotateEvents: [] as JudgeLineEventPGS[]
     };
     for (const i of this.moveEvents!) {
       result.judgeLineMoveEvents.push({
@@ -428,7 +435,7 @@ class LineRPE1 {
       for (const e of result.speedEvents) {
         if (time > e.endTime) continue;
         if (time < e.startTime) break;
-        v1 = e.floorPosition;
+        v1 = e.floorPosition!;
         v2 = e.value;
         v3 = time - e.startTime;
         vmin = e.floorPositionMin!;
@@ -509,7 +516,7 @@ interface JudgeLineRPEExtends extends JudgeLineRPE {
   judgeLineRPE: LineRPE1;
 }
 export function parse(pec: string, filename: string): {
-  data: string;
+  data: ChartPGS;
   messages: BetterMessage[];
   info: Record<string, string>;
   line: Record<string, string>[];
@@ -518,7 +525,7 @@ export function parse(pec: string, filename: string): {
   const data = JSON.parse(pec) as RPEData;
   const meta = data.META || data;
   if (!meta?.RPEVersion) throw new Error('Invalid rpe file');
-  const result = { formatVersion: 3, offset: 0, numOfNotes: 0, judgeLineList: [] as JudgeLine[] };
+  const result = { formatVersion: 3, offset: 0, numOfNotes: 0, judgeLineList: [] } as ChartPGS;
   const warnings = [] as BetterMessage[];
   const warn = (code: number, name: string, message: string) => warnings.push({ host: 'RPE2JSON', code, name, message, target: filename });
   warn(0, 'RPEVersionNotice', `RPE谱面兼容建设中...\n检测到RPE版本:${meta.RPEVersion}`);
@@ -555,7 +562,7 @@ export function parse(pec: string, filename: string): {
   });
   // bpm变速
   const bpmList = new BpmList(data.BPMList[0].bpm);
-  for (const i of data.BPMList) { i.time = i.startTime[0] + i.startTime[1] / i.startTime[2] }
+  for (const i of data.BPMList) i.time = i.startTime[0] + i.startTime[1] / i.startTime[2];
   data.BPMList.sort((a: { time: number }, b: { time: number }) => a.time - b.time).forEach((i, idx, arr) => {
     if (arr[idx + 1]?.time <= 0) return; // 过滤负数
     bpmList.push(i.time < 0 ? 0 : i.time, arr[idx + 1]?.time ?? 1e9, i.bpm);
@@ -589,35 +596,35 @@ export function parse(pec: string, filename: string): {
     for (const e of i.eventLayers) {
       if (!e) continue; // 有可能是null
       const layer = new EventLayer1();
-      for (const j of e.moveXEvents ?? []) {
+      for (const j of e.moveXEvents || []) {
         const startTime = bpmList.calc2(j.startTime);
         const endTime = bpmList.calc2(j.endTime);
         const { fn, code } = getEasingFn(j, startTime, endTime);
         getWarning(code, j);
         layer.pushMoveXEvent(startTime, endTime, j.start, j.end, fn);
       }
-      for (const j of e.moveYEvents ?? []) {
+      for (const j of e.moveYEvents || []) {
         const startTime = bpmList.calc2(j.startTime);
         const endTime = bpmList.calc2(j.endTime);
         const { fn, code } = getEasingFn(j, startTime, endTime);
         getWarning(code, j);
         layer.pushMoveYEvent(startTime, endTime, j.start, j.end, fn);
       }
-      for (const j of e.rotateEvents ?? []) {
+      for (const j of e.rotateEvents || []) {
         const startTime = bpmList.calc2(j.startTime);
         const endTime = bpmList.calc2(j.endTime);
         const { fn, code } = getEasingFn(j, startTime, endTime);
         getWarning(code, j);
         layer.pushRotateEvent(startTime, endTime, j.start, j.end, fn);
       }
-      for (const j of e.alphaEvents ?? []) {
+      for (const j of e.alphaEvents || []) {
         const startTime = bpmList.calc2(j.startTime);
         const endTime = bpmList.calc2(j.endTime);
         const { fn, code } = getEasingFn(j, startTime, endTime);
         getWarning(code, j);
         layer.pushAlphaEvent(startTime, endTime, j.start, j.end, fn);
       }
-      for (const j of e.speedEvents ?? []) {
+      for (const j of e.speedEvents || []) {
         const startTime = bpmList.calc2(j.startTime);
         const endTime = bpmList.calc2(j.endTime);
         layer.pushSpeedEvent(startTime, endTime, j.start, j.end);
@@ -635,9 +642,9 @@ export function parse(pec: string, filename: string): {
     const lineRPE = i.judgeLineRPE; // TODO: 待优化
     const judgeLine = lineRPE.format({ onwarning: (msg: string) => warn(1, 'OtherWarning', `${msg}`) });
     result.judgeLineList.push(judgeLine);
-    result.numOfNotes += judgeLine.numOfNotes;
+    result.numOfNotes! += judgeLine.numOfNotes;
   }
-  return { data: JSON.stringify(result), messages: warnings, info, line, format };
+  return { data: result, messages: warnings, info, line, format };
   function getWarning(code: EasingCode, le: LineEventRPE) {
     if (code === EasingCode.TypeNotSupported) warn(1, 'EasingTypeWarning', `未知的缓动类型:${le.easingType}(将被视为1)\n位于:"${JSON.stringify(le)}"`);
     if (code === EasingCode.LeftEqualsRight) warn(1, 'EasingClipWarning', `检测到easingLeft等于easingRight(将被视为线性)\n位于:"${JSON.stringify(le)}"`);
diff --git a/src/index.ts b/src/index.ts
index d38d256b..d71f84b6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -224,10 +224,10 @@ const chartsMD5 = new Map() as Map<string, string>;
 const chartsFormat = new Map() as Map<string, string>;
 const chartLineData: ChartLineData[] = []; // Line.csv
 const chartInfoData: ChartInfoData[] = []; // Info.csv
-selectNoteScale.addEventListener('change', evt => { app.setNoteScale(Number((evt.target as HTMLSelectElement).value)) });
-selectAspectRatio.addEventListener('change', evt => { stage.resize(Number((evt.target as HTMLSelectElement).value)) });
-selectBackgroundDim.addEventListener('change', evt => { app.brightness = Number((evt.target as HTMLSelectElement).value) });
-checkHighLight.addEventListener('change', evt => { app.multiHint = (evt.target as HTMLInputElement).checked });
+selectNoteScale.addEventListener('change', evt => app.setNoteScale(Number((evt.target as HTMLSelectElement).value)));
+selectAspectRatio.addEventListener('change', evt => stage.resize(Number((evt.target as HTMLSelectElement).value)));
+selectBackgroundDim.addEventListener('change', evt => app.brightness = Number((evt.target as HTMLSelectElement).value));
+checkHighLight.addEventListener('change', evt => app.multiHint = (evt.target as HTMLInputElement).checked);
 const status = new StatusManager('sim-phi-status').init(data => data.resetCfg);
 status.reg('feedback', checkFeedback);
 status.reg('imageBlur', checkImageBlur);
@@ -250,7 +250,7 @@ enableVP.checkbox.dispatchEvent(new Event('change'));
 const enableFR = new Checkbox('使用单精度浮点运算').appendBefore(resetCfg.container).hook(status.reg.bind(status, 'enableFR'));
 enableFR.checkbox.addEventListener('change', evt => app.enableFR = (evt.target as HTMLInputElement).checked);
 enableFR.checkbox.dispatchEvent(new Event('change'));
-selectflip.addEventListener('change', evt => { app.mirrorView(Number((evt.target as HTMLInputElement).value)) });
+selectflip.addEventListener('change', evt => app.mirrorView(Number((evt.target as HTMLInputElement).value)));
 status.reg('selectFlip', selectflip);
 selectspeed.addEventListener('change', evt => {
   const dict = { slowest: -9, slower: -4, faster: 3, fastest: 5 } as Record<string, number | undefined>;
@@ -986,10 +986,10 @@ async function readResource(raw: {
     }));
   } else {
     res1.push(...Object.entries(res0).map(async([name, src]) => {
-      const [url, ext] = src.split('|');
+      const [url, ext] = src.split('|') as [string, string | null];
       await fetch(url, { referrerPolicy: 'no-referrer' }).then(async a => a.blob()).then(async blob => {
         const img = await createImageBitmap(blob);
-        if (ext?.startsWith('m')) {
+        if (ext != null && ext.startsWith('m')) {
           const data = ImgAny.decode(img, Number(ext.slice(1)));
           img.close();
           res[name] = await audio.decode(data).catch(async(_err: DOMException | Error) => {
@@ -1489,7 +1489,7 @@ class LineImage {
     return this.imageFC;
   }
   public async getAP() {
-    if (this.imageAP == null) this.imageAP = await Promise.resolve(null); // imgShader(this.image, '#a3ffac');
+    /* if (this.imageAP == null) */ this.imageAP = await Promise.resolve(null); // imgShader(this.image, '#a3ffac');
     return this.imageAP;
   }
   public async getMP() {
@@ -1542,8 +1542,8 @@ const updateLevelText = (type: number) => {
   return [diffString, levelString].join('\u2002Lv.');
 };
 levelText = updateLevelText(-1);
-selectDifficulty.addEventListener('change', () => { levelText = updateLevelText(0) });
-selectLevel.addEventListener('change', () => { levelText = updateLevelText(1) });
+selectDifficulty.addEventListener('change', () => levelText = updateLevelText(0));
+selectLevel.addEventListener('change', () => levelText = updateLevelText(1));
 selectVolume.addEventListener('change', evt => {
   const volume = Number((evt.target as HTMLInputElement).value);
   app.musicVolume = Math.min(1, 1 / volume);
@@ -1629,7 +1629,7 @@ async function atStop(): Promise<void> {
     }
     for (const i of main.before.values()) await i();
     audio.play(res.mute, { loop: true, isOut: false }); // 播放空音频(避免音画不同步)
-    app.prerenderChart(main.modify(charts.get(selectchart.value)!) as unknown as Record<string, unknown>); // TODO: 重构
+    app.prerenderChart(main.modify(charts.get(selectchart.value)!));
     const md5 = chartsMD5.get(selectchart.value)!;
     const format = chartsFormat.get(selectchart.value)!;
     stat.level = Number(/\d+$/.exec(levelText));
diff --git a/src/lib.d.ts b/src/lib.d.ts
index fddd2e54..c7f88f32 100644
--- a/src/lib.d.ts
+++ b/src/lib.d.ts
@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 interface Navigator {
   /** Available only in iOS */
-  readonly standalone: boolean;
+  readonly standalone?: boolean;
 }
 interface Oggmented {
   OggmentedAudioContext: typeof AudioContext;
diff --git a/src/plugins/export.js b/src/plugins/export.js
index c6ccb6f2..c7957cf6 100644
--- a/src/plugins/export.js
+++ b/src/plugins/export.js
@@ -21,7 +21,7 @@ function callback() {
 }
 /**
  * 导出json
- * @param {Chart} json
+ * @param {ChartPGS} json
  */
 function chartify(json) {
   const newChart = {
@@ -31,7 +31,7 @@ function chartify(json) {
     judgeLineList: []
   };
   for (const i of json.judgeLineList) {
-    /** @type {JudgeLine} */
+    /** @type {JudgeLinePGS} */
     const newLine = {
       numOfNotes: i.numOfNotes,
       numOfNotesAbove: i.numOfNotesAbove,
diff --git a/src/plugins/gauge.js b/src/plugins/gauge.js
index d1d3a0ae..bce43a75 100644
--- a/src/plugins/gauge.js
+++ b/src/plugins/gauge.js
@@ -25,7 +25,7 @@ function callback(checkbox, _container) {
   });
   status.reg('enableGauge', checkbox);
 }
-/** @type {[Chart,...number[]]} */
+/** @type {[ChartPGS,...number[]]} */
 const flags = [null, 0, 0, 0, 0, 0, 0, 0];
 let factor = 0;
 let lastTime = 0;
diff --git a/src/plugins/skin.js b/src/plugins/skin.js
index 1d84b651..85442a7e 100644
--- a/src/plugins/skin.js
+++ b/src/plugins/skin.js
@@ -100,20 +100,26 @@ function skin() {
       const img = await createImageBitmap(new Blob([entries.get('Hold').buffer]));
       const noteScale = 1089 / img.width;
       const [bottom, top] = config.holdAtlas;
+      const imgHoldEnd = bottom ? await createImageBitmap(img, 0, 0, img.width, bottom) : hook.res.NoImageBlack;
+      const imgHold = await createImageBitmap(img, 0, bottom, img.width, img.height - bottom - top);
+      const imgHoldHead = top ? await createImageBitmap(img, 0, img.height - top, img.width, top) : hook.res.NoImageBlack;
       const compacted = config.holdCompact;
-      hook.noteRender.update('HoldEnd', await createImageBitmap(img, 0, 0, img.width, bottom), noteScale, compacted);
-      hook.noteRender.update('Hold', await createImageBitmap(img, 0, bottom, img.width, img.height - bottom - top), noteScale, compacted);
-      hook.noteRender.update('HoldHead', await createImageBitmap(img, 0, img.height - top, img.width, top), noteScale, compacted);
+      hook.noteRender.update('HoldEnd', imgHoldEnd, noteScale, compacted);
+      hook.noteRender.update('Hold', imgHold, noteScale, compacted);
+      hook.noteRender.update('HoldHead', imgHoldHead, noteScale, compacted);
       if (entries.has('HoldHL')) {
         const img2 = await createImageBitmap(new Blob([entries.get('HoldHL').buffer]));
         const [bottom2, top2] = config.holdAtlasHL || config.holdAtlasMH || config.holdAtlas;
-        hook.noteRender.update('HoldEndHL', await createImageBitmap(img2, 0, 0, img2.width, bottom2), noteScale, compacted);
-        hook.noteRender.update('HoldHL', await createImageBitmap(img2, 0, bottom2, img2.width, img2.height - bottom2 - top2), noteScale, compacted);
-        hook.noteRender.update('HoldHeadHL', await createImageBitmap(img2, 0, img2.height - top2, img2.width, top2), noteScale, compacted);
+        const imgHoldEndHL = bottom2 ? await createImageBitmap(img2, 0, 0, img2.width, bottom2) : hook.res.NoImageBlack;
+        const imgHoldHL = await createImageBitmap(img2, 0, bottom2, img2.width, img2.height - bottom2 - top2);
+        const imgHoldHeadHL = top2 ? await createImageBitmap(img2, 0, img2.height - top2, img2.width, top2) : hook.res.NoImageBlack;
+        hook.noteRender.update('HoldEndHL', imgHoldEndHL, noteScale, compacted);
+        hook.noteRender.update('HoldHL', imgHoldHL, noteScale, compacted);
+        hook.noteRender.update('HoldHeadHL', imgHoldHeadHL, noteScale, compacted);
       } else {
-        hook.noteRender.update('HoldEndHL', await createImageBitmap(img, 0, 0, img.width, bottom), noteScale, compacted);
-        hook.noteRender.update('HoldHL', await createImageBitmap(img, 0, bottom, img.width, img.height - bottom - top), noteScale, compacted);
-        hook.noteRender.update('HoldHeadHL', await createImageBitmap(img, 0, img.height - top, img.width, top), noteScale, compacted);
+        hook.noteRender.update('HoldEndHL', imgHoldEnd, noteScale, compacted);
+        hook.noteRender.update('HoldHL', imgHold, noteScale, compacted);
+        hook.noteRender.update('HoldHeadHL', imgHoldHead, noteScale, compacted);
       }
     }
     if (entries.has('Flick')) {
diff --git a/src/utils/Chart.ts b/src/utils/Chart.ts
new file mode 100644
index 00000000..353c403a
--- /dev/null
+++ b/src/utils/Chart.ts
@@ -0,0 +1,123 @@
+import Type from './Type';
+export class SpeedEvent {
+  public startTime: number;
+  public endTime: number;
+  public value: number;
+  public constructor(event: Record<string, unknown>) {
+    this.startTime = Type.int(event.startTime);
+    this.endTime = Type.int(event.endTime);
+    this.value = Type.float(event.value);
+  }
+}
+export class Note {
+  public type: number;
+  public time: number;
+  public positionX: number;
+  public holdTime: number;
+  public speed: number;
+  public floorPosition: number;
+  public constructor(note: Record<string, unknown>) {
+    this.type = Type.int(note.type);
+    this.time = Type.int(note.time);
+    this.positionX = Type.float(note.positionX);
+    this.holdTime = Type.int(note.holdTime);
+    this.speed = Type.float(note.speed);
+    this.floorPosition = Type.float(note.floorPosition);
+  }
+}
+export class JudgeLineEvent {
+  public startTime: number;
+  public endTime: number;
+  public start: number;
+  public end: number;
+  public start2: number;
+  public end2: number;
+  public constructor(event: Record<string, unknown>) {
+    this.startTime = Type.int(event.startTime);
+    this.endTime = Type.int(event.endTime);
+    this.start = Type.float(event.start);
+    this.end = Type.float(event.end);
+    this.start2 = Type.float(event.start2);
+    this.end2 = Type.float(event.end2);
+  }
+}
+export class JudgeLine {
+  public numOfNotes: number;
+  public numOfNotesAbove: number;
+  public numOfNotesBelow: number;
+  public bpm: number;
+  public speedEvents: SpeedEvent[];
+  public notesAbove: Note[];
+  public notesBelow: Note[];
+  public judgeLineDisappearEvents: JudgeLineEvent[];
+  public judgeLineMoveEvents: JudgeLineEvent[];
+  public judgeLineRotateEvents: JudgeLineEvent[];
+  public constructor(line: Record<string, unknown>) {
+    this.numOfNotes = Type.int(line.numOfNotes);
+    this.numOfNotesAbove = Type.int(line.numOfNotesAbove);
+    this.numOfNotesBelow = Type.int(line.numOfNotesBelow);
+    this.bpm = Type.float(line.bpm);
+    this.speedEvents = Type.arr(line.speedEvents, SpeedEvent);
+    this.notesAbove = Type.arr(line.notesAbove, Note);
+    this.notesBelow = Type.arr(line.notesBelow, Note);
+    if (line.numOfNotesAbove == null) this.numOfNotesAbove = this.notesAbove.length;
+    if (line.numOfNotesBelow == null) this.numOfNotesBelow = this.notesBelow.length;
+    if (line.numOfNotes == null) this.numOfNotes = this.numOfNotesAbove + this.numOfNotesBelow;
+    this.judgeLineDisappearEvents = Type.arr(line.judgeLineDisappearEvents, JudgeLineEvent);
+    this.judgeLineMoveEvents = Type.arr(line.judgeLineMoveEvents, JudgeLineEvent);
+    this.judgeLineRotateEvents = Type.arr(line.judgeLineRotateEvents, JudgeLineEvent);
+  }
+}
+export class Chart {
+  public formatVersion: number;
+  public offset: number;
+  public numOfNotes: number;
+  public judgeLineList: JudgeLine[];
+  public constructor(input?: Record<string, unknown>) {
+    const chart = input || {};
+    this.formatVersion = Type.int(chart.formatVersion);
+    this.offset = Type.float(chart.offset);
+    this.numOfNotes = Type.int(chart.numOfNotes);
+    this.judgeLineList = Type.arr(chart.judgeLineList, JudgeLine);
+    if (chart.numOfNotes == null) this.numOfNotes = this.judgeLineList.reduce((a, b) => a + b.numOfNotes, 0);
+  }
+  public duplicate(): Chart {
+    return Type.obj(this, Chart);
+  }
+}
+export function structChart(chart: ChartPGS): Chart {
+  const result = Type.obj(chart, Chart);
+  switch (result.formatVersion) {
+    case 1:
+      for (const line of result.judgeLineList) {
+        for (const evt of line.judgeLineMoveEvents) {
+          evt.start2 = evt.start % 1000 / 520;
+          evt.end2 = evt.end % 1000 / 520;
+          evt.start = Math.floor(evt.start / 1000) / 880;
+          evt.end = Math.floor(evt.end / 1000) / 880;
+        }
+      } // fallthrough
+    case 3:
+    case 3473:
+      break;
+    default:
+      throw new Error(`Unsupported formatVersion: ${result.formatVersion}`);
+  }
+  const errors = [];
+  const numOfLines = result.judgeLineList.length;
+  // if (result.offset < 0) throw new Error('Offset must be non-negative');
+  // if (result.numOfNotes <= 0) throw new Error('At least one note is required');
+  for (let i = 0; i < numOfLines; i++) {
+    const line = result.judgeLineList[i];
+    const subErrors = [];
+    if (line.bpm <= 0) subErrors.push(`Expected bpm > 0, but got ${line.bpm}`);
+    if (!line.speedEvents.length) subErrors.push('Expected at least 1 item in speedEvents, but got 0');
+    if (!line.judgeLineDisappearEvents.length) subErrors.push('Expected at least 1 item in judgeLineDisappearEvents, but got 0');
+    if (!line.judgeLineMoveEvents.length) subErrors.push('Expected at least 1 item in judgeLineMoveEvents, but got 0');
+    if (!line.judgeLineRotateEvents.length) subErrors.push('Expected at least 1 item in judgeLineRotateEvents, but got 0');
+    if (subErrors.length) errors.push(`JudgeLine ${i}:\n${subErrors.map(e => `  ${e}`).join('\n')}`);
+  }
+  if (errors.length) throw new Error(`Invalid chart input\n${errors.map(e => `  ${e.split('\n').join('\n  ')}`).join('\n')}`);
+  if (!numOfLines) throw new Error('No judge lines available');
+  return result;
+}
diff --git a/src/utils/Type.ts b/src/utils/Type.ts
new file mode 100644
index 00000000..aedc1eec
--- /dev/null
+++ b/src/utils/Type.ts
@@ -0,0 +1,21 @@
+namespace Type {
+  export function int(a: unknown): number {
+    return Number(a) | 0;
+  }
+  export function float(a: unknown): number {
+    return Number(a) || 0;
+  }
+  export function bool(a: unknown): boolean {
+    return Boolean(a);
+  }
+  export function str(a: unknown): string {
+    return String(a);
+  }
+  export function arr<T>(a: unknown, constructor: new (b: Record<string, unknown>) => T): T[] {
+    return Array.isArray(a) ? a.map((i?: Record<string, unknown>) => new constructor(i || {})) : [];
+  }
+  export function obj<T>(a: unknown, constructor: new (b: Record<string, unknown>) => T): T {
+    return new constructor((a as Record<string, unknown> | null) || {});
+  }
+}
+export default Type;
diff --git a/src/utils/fixme.ts b/src/utils/fixme.ts
index 9fcda66f..d439a39c 100644
--- a/src/utils/fixme.ts
+++ b/src/utils/fixme.ts
@@ -3,7 +3,7 @@ import { audio } from '../external';
 export async function fixme(raw: Record<string, unknown>, res: Record<string, unknown>): Promise<void> {
   const entries = ['Tap', 'TapHL', 'Drag', 'DragHL', 'HoldHead', 'HoldHeadHL', 'Hold', 'HoldHL', 'HoldEnd', 'Flick', 'FlickHL', 'HitFXRaw'];
   if (raw.image == null) raw.image = {};
-  const { image } = raw as { image: Record<string, string> };
+  const { image } = raw as { image: Record<string, string | null> };
   for (const entry of entries) {
     if (image[entry] == null) image[entry] = '|8080';
   }
diff --git a/src/utils/reader-.ts b/src/utils/reader-.ts
index 4206cd45..4230a1cf 100644
--- a/src/utils/reader-.ts
+++ b/src/utils/reader-.ts
@@ -1,6 +1,6 @@
 import Pec from '../extends/pec/index';
 import { reader } from './reader';
-import { structChart } from './structChart';
+import { structChart } from './Chart';
 import { structInfoData, structLineData } from './structInfo';
 import md5 from 'md5';
 reader.use({
@@ -40,6 +40,7 @@ if (Object.hasOwn(self, 'webp')) {
     pattern: /\.webp$/i,
     type: 'binary',
     async read(i: ByteData) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       const webp2canvas = Object.getOwnPropertyDescriptor(self, 'webp')?.value.default as (buffer: ArrayBuffer) => Promise<HTMLCanvasElement>;
       const img = await webp2canvas(i.buffer);
       const bitmap = await createImageBitmap(img);
diff --git a/src/utils/reader.ts b/src/utils/reader.ts
index fa856011..5d03f980 100644
--- a/src/utils/reader.ts
+++ b/src/utils/reader.ts
@@ -1,6 +1,6 @@
 import { parseCSV } from './parseCSV';
 import { stringify } from './stringify';
-import { structChart } from './structChart';
+import { structChart } from './Chart';
 import { structInfoData, structLineData } from './structInfo';
 import md5 from 'md5';
 // @ts-expect-error: vite-plugin-worker-loader
@@ -57,6 +57,7 @@ export class ZipReader extends EventTarget {
   public read(result0: ByteData): void {
     if (!this.worker) {
       this.dispatchEvent(new CustomEvent('loadstart'));
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
       const worker = new Zip() as Worker; // 以后考虑indexedDB存储url
       worker.addEventListener('message', msg => {
         const handler = async() => {
@@ -138,9 +139,11 @@ const readerInit: ReaderInit[] = [
     pattern: /\.json$/i,
     type: 'json',
     read(i: ByteData) {
-      const jsonData = structChart(i.text!, (_, value) => typeof value === 'number' ? Math.fround(value) : value as unknown);
+      const text = i.text!;
+      const json = JSON.parse(text, (_, value) => typeof value === 'number' ? Math.fround(value) : value as unknown) as ChartPGS;
+      const jsonData = structChart(json);
       const format = `PGS(${jsonData.formatVersion})`;
-      return { type: 'chart', name: i.name, md5: md5(i.text!), data: jsonData, format };
+      return { type: 'chart', name: i.name, md5: md5(text), data: jsonData, format };
     }
   }, {
     pattern: /\.(png|jpg|jpeg|gif|bmp|webp|svg)$/i,
@@ -175,9 +178,9 @@ async function defaultDecode(arraybuffer: ArrayBuffer) {
   // return actx.decodeAudioData(arraybuffer);
   return new Promise((resolve: (value: AudioBuffer) => void, reject) => {
     const a = actx.decodeAudioData(arraybuffer, resolve, reject);
-    if (a instanceof Promise) { a.then(resolve, reject) }
+    if (a instanceof Promise) a.then(resolve, reject);
   }).catch(err => {
-    if (err == null) { throw new DOMException('Unable to decode audio data', 'EncodingError') }
+    if (err == null) throw new DOMException('Unable to decode audio data', 'EncodingError');
     throw err;
   });
 }
@@ -206,7 +209,7 @@ function createReader(define: ((readerInit: ReaderInit) => ByteReader)) {
           errorHandler(reader, err as Error);
         }
       }
-      return { type: 'unknown', name, data: readers[0].pattern.test(name) ? errors : '' };
+      return { type: 'unknown', name, data: errors.join('\n') }; // TODO: 完善错误信息
     },
     use(reader: ReaderInit | ReaderInit[]) {
       if (Array.isArray(reader)) {
diff --git a/src/utils/structChart.ts b/src/utils/structChart.ts
deleted file mode 100644
index b0461016..00000000
--- a/src/utils/structChart.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-type Reviver = Parameters<typeof JSON.parse>[1];
-export function structChart(text: string, reviver?: Reviver): Chart {
-  const chart = (typeof reviver === 'function' ? JSON.parse(text, reviver) : JSON.parse(text)) as Chart; // test
-  if (chart.formatVersion === undefined) throw new Error('Invalid chart file');
-  switch (Number(chart.formatVersion) | 0) {
-    case 1:
-      for (const i of chart.judgeLineList) {
-        for (const j of i.judgeLineMoveEvents) {
-          j.start2 = j.start % 1000 / 520;
-          j.end2 = j.end % 1000 / 520;
-          j.start = Math.floor(j.start / 1000) / 880;
-          j.end = Math.floor(j.end / 1000) / 880;
-        }
-      } // fallthrough
-    case 3:
-      for (const i of chart.judgeLineList) {
-        let y = 0;
-        let y2 = 0; // float32
-        for (const j of i.speedEvents) {
-          if (j.startTime < 0) j.startTime = 0;
-          j.floorPosition = y;
-          j.floorPosition2 = y2;
-          y += (j.endTime - j.startTime) / i.bpm * 1.875 * j.value;
-          y2 += Math.fround(Math.fround((j.endTime - j.startTime) / i.bpm * 1.875) * j.value);
-          y = Math.fround(y);
-          y2 = Math.fround(y2);
-        }
-      } // fallthrough
-    case 3473:
-      for (const i of chart.judgeLineList) {
-        if (i.numOfNotes == null) {
-          i.numOfNotes = 0;
-          for (const j of i.notesAbove) {
-            if (j.type === 1) i.numOfNotes++;
-            if (j.type === 2) i.numOfNotes++;
-            if (j.type === 3) i.numOfNotes++;
-            if (j.type === 4) i.numOfNotes++;
-          }
-          for (const j of i.notesBelow) {
-            if (j.type === 1) i.numOfNotes++;
-            if (j.type === 2) i.numOfNotes++;
-            if (j.type === 3) i.numOfNotes++;
-            if (j.type === 4) i.numOfNotes++;
-          }
-        }
-      }
-      if (chart.numOfNotes == null) {
-        chart.numOfNotes = 0;
-        for (const i of chart.judgeLineList) chart.numOfNotes += i.numOfNotes;
-      }
-      break;
-    default:
-      throw new Error(`Unsupported formatVersion: ${chart.formatVersion}`);
-  }
-  return chart;
-}
diff --git a/src/utils/structInfo.ts b/src/utils/structInfo.ts
index 5f56573d..a3e780ce 100644
--- a/src/utils/structInfo.ts
+++ b/src/utils/structInfo.ts
@@ -1,7 +1,7 @@
-export function structInfoData(record: Record<string, string>[], path: string): ChartInfoData[] {
+export function structInfoData(record: Record<string, string | null>[], path: string): ChartInfoData[] {
   const result = [];
   for (const i of record) {
-    if (!i.Chart) continue;
+    if (i.Chart == null) continue;
     const data: ChartInfoData = { chart: i.Chart };
     if (i.Name != null) data.name = i.Name;
     if (i.Musician != null) data.artist = i.Musician; // Alternative
@@ -39,17 +39,17 @@ export function structInfoData(record: Record<string, string>[], path: string):
     }
     result.push(data);
     if (path) {
-      if (data.chart != null) data.chart = `${path}/${data.chart}`;
+      data.chart = `${path}/${data.chart}`;
       if (data.music != null) data.music = `${path}/${data.music}`;
       if (data.image != null) data.image = `${path}/${data.image}`;
     }
   }
   return result;
 }
-export function structLineData(record: Record<string, string>[], path: string): ChartLineData[] {
+export function structLineData(record: Record<string, string | null>[], path: string): ChartLineData[] {
   const result = [];
   for (const i of record) {
-    if (!i.Chart) continue;
+    if (i.Chart == null) continue;
     const data: ChartLineData = { chart: i.Chart };
     if (i.LineId != null) data.lineId = Number(i.LineId);
     if (i.Image != null) data.image = i.Image;
@@ -87,7 +87,7 @@ export function structLineData(record: Record<string, string>[], path: string):
     }
     result.push(data);
     if (path) {
-      if (data.chart != null) data.chart = `${path}/${data.chart}`;
+      data.chart = `${path}/${data.chart}`;
       if (data.image != null) data.image = `${path}/${data.image}`;
     }
   }
diff --git a/src/zip.worker.ts b/src/zip.worker.ts
index 295da067..b0977374 100644
--- a/src/zip.worker.ts
+++ b/src/zip.worker.ts
@@ -7,7 +7,7 @@ let total = 0;
 //   'https://cdn.bootcdn.net/ajax/libs/jszip/3.10.1/jszip.min.js', //
 //   'https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js'
 // ];
-// for (const url of urls) try { importScripts(url); break } catch (e) { continue }
+// for (const url of urls) try { importScripts(url); break } catch (e) continue;
 import { loadAsync } from 'jszip'; // 踩坑：linux文件名区分大小写，JSZip将报错
 interface Data { name: string; path: string; buffer: ArrayBuffer }
 function readZip(data: Data) { // JSZip
diff --git a/tools/eslint-config-ts.cjs b/tools/eslint-config-ts.cjs
index f5a471d2..5122a693 100644
--- a/tools/eslint-config-ts.cjs
+++ b/tools/eslint-config-ts.cjs
@@ -12,62 +12,79 @@ module.exports = {
     '@typescript-eslint/ban-ts-comment': ['error', { 'ts-nocheck': 'allow-with-description' }],
     '@typescript-eslint/brace-style': ['error', '1tbs', { allowSingleLine: true }],
     '@typescript-eslint/consistent-type-imports': ['error', { disallowTypeAnnotations: false }],
-    '@typescript-eslint/explicit-function-return-type': 'off', // qwq
+    '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/indent': ['error', 2, { SwitchCase: 1 }],
     '@typescript-eslint/lines-around-comment': ['error', { beforeBlockComment: false }],
     '@typescript-eslint/lines-between-class-members': ['error', 'never'],
-    '@typescript-eslint/no-confusing-void-expression': 'off', // qwq
+    '@typescript-eslint/max-params': 'off',
+    '@typescript-eslint/member-ordering': ['error', { default: memberOrdering() }],
+    '@typescript-eslint/naming-convention': ['error', ...defaultNamingConvention(), { selector: 'import', format: null }],
+    '@typescript-eslint/no-confusing-void-expression': 'off',
     '@typescript-eslint/no-empty-function': 'off',
     '@typescript-eslint/no-explicit-any': ['error', { fixToUnknown: true, ignoreRestArgs: true }],
     '@typescript-eslint/no-extra-parens': ['error', 'all', { enforceForSequenceExpressions: false }],
     '@typescript-eslint/no-floating-promises': 'off',
     '@typescript-eslint/no-invalid-void-type': ['error', { allowAsThisParameter: true }],
-    '@typescript-eslint/no-magic-numbers': 'off', // qwq
+    '@typescript-eslint/no-magic-numbers': 'off',
     '@typescript-eslint/no-namespace': 'off',
-    '@typescript-eslint/no-non-null-assertion': 'off', // qwq
+    '@typescript-eslint/no-non-null-assertion': 'off',
     '@typescript-eslint/no-type-alias': 'off',
-    '@typescript-eslint/no-unnecessary-condition': 'off', // qwq
-    '@typescript-eslint/no-unsafe-call': 'off', // qwq
-    '@typescript-eslint/no-unsafe-member-access': 'off', // qwq
     '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
     '@typescript-eslint/no-use-before-define': ['error', 'nofunc'],
     '@typescript-eslint/object-curly-spacing': ['error', 'always'],
-    '@typescript-eslint/prefer-nullish-coalescing': 'off', // qwq
-    '@typescript-eslint/prefer-readonly-parameter-types': 'off', // qwq
+    '@typescript-eslint/prefer-destructuring': 'off',
+    '@typescript-eslint/prefer-nullish-coalescing': 'off',
+    '@typescript-eslint/prefer-readonly-parameter-types': 'off',
     '@typescript-eslint/quotes': ['error', 'single'],
     '@typescript-eslint/semi': ['error', 'always', { omitLastInOneLineBlock: true }],
-    '@typescript-eslint/space-before-function-paren': ['error', 'never'],
-    '@typescript-eslint/member-ordering': [
-      'error',
-      {
-        default: [
-          // Index signature
-          'signature',
-          'call-signature',
-          // Fields
-          'static-field',
-          'instance-field',
-          'abstract-field',
-          'decorated-field',
-          'field',
-          // Static initialization
-          'static-initialization',
-          // Constructors
-          'constructor',
-          // Getters and setters
-          ['static-get', 'static-set'],
-          ['instance-get', 'instance-set'],
-          ['abstract-get', 'abstract-set'],
-          ['decorated-get', 'decorated-set'],
-          ['get', 'set'],
-          // Methods
-          'static-method',
-          'instance-method',
-          'abstract-method',
-          'decorated-method',
-          'method'
-        ]
-      }
-    ]
+    '@typescript-eslint/space-before-function-paren': ['error', 'never']
   }
 };
+function memberOrdering() {
+  return [
+    'signature',
+    'call-signature',
+    // Fields
+    'static-field',
+    'instance-field',
+    'abstract-field',
+    'decorated-field',
+    'field',
+    // Static initialization
+    'static-initialization',
+    // Constructors
+    'constructor',
+    // Getters and setters
+    ['static-get', 'static-set'],
+    ['instance-get', 'instance-set'],
+    ['abstract-get', 'abstract-set'],
+    ['decorated-get', 'decorated-set'],
+    ['get', 'set'],
+    // Methods
+    'static-method',
+    'instance-method',
+    'abstract-method',
+    'decorated-method',
+    'method'
+  ];
+}
+function defaultNamingConvention() {
+  return [
+    {
+      selector: 'default',
+      format: ['camelCase'],
+      leadingUnderscore: 'allow',
+      trailingUnderscore: 'allow'
+    },
+    {
+      selector: 'variable',
+      format: ['camelCase', 'UPPER_CASE'],
+      leadingUnderscore: 'allow',
+      trailingUnderscore: 'allow'
+    },
+    {
+      selector: 'typeLike',
+      format: ['PascalCase']
+    }
+  ];
+}
diff --git a/tools/eslint-config.cjs b/tools/eslint-config.cjs
index 2766d5a4..49a17cf3 100644
--- a/tools/eslint-config.cjs
+++ b/tools/eslint-config.cjs
@@ -78,7 +78,8 @@ module.exports = {
     'space-before-function-paren': ['error', 'never'],
     'spaced-comment': ['error', 'always', { block: { balanced: true } }],
     'rulesdir/no-magic-words': ['error', { words: ['lchz\\x68', 'Phi\\x67ros', 'sim\\x70hi', 'f\\x75ck'] }],
-    'rulesdir/single-line-control-statement-spacing': 'error',
+    'rulesdir/no-single-line-braces': 'error',
+    'rulesdir/single-line-spacing': 'error',
     'rulesdir/space-before-inline-comments': 'error',
     'wrap-regex': 'off' // someday will be never
   }
diff --git a/tools/eslint-rules/no-single-line-braces.cjs b/tools/eslint-rules/no-single-line-braces.cjs
new file mode 100644
index 00000000..f11a2ab7
--- /dev/null
+++ b/tools/eslint-rules/no-single-line-braces.cjs
@@ -0,0 +1,46 @@
+'use strict';
+/** @type {import('eslint').Rule.RuleModule} */
+module.exports = {
+  meta: {
+    type: 'layout',
+    docs: {
+      description: 'Disallow braces for single line statements.'
+    },
+    fixable: 'whitespace'
+  },
+  create(context) {
+    return {
+      IfStatement(node) {
+        qwq(node.consequent);
+        if (node.alternate) qwq(node.alternate);
+      },
+      ForStatement(node) { qwq(node.body) },
+      ForInStatement(node) { qwq(node.body) },
+      ForOfStatement(node) { qwq(node.body) },
+      WhileStatement(node) { qwq(node.body) },
+      DoWhileStatement(node) { qwq(node.body) }
+    };
+    function qwq(node) {
+      if (node.type === 'BlockStatement' && node.body.length === 1) {
+        if (node.loc.end.line === node.loc.start.line) {
+          context.report({
+            node,
+            message: 'Unexpected braces for single line statement.',
+            fix(fixer) {
+              const { sourceCode } = context;
+              const openingBrace = sourceCode.getFirstToken(node);
+              const closingBrace = sourceCode.getLastToken(node);
+              const firstValueToken = sourceCode.getFirstToken(node.body[0]);
+              const lastValueToken = sourceCode.getLastToken(node.body[0]);
+              console.log(lastValueToken);
+              return [
+                fixer.removeRange([openingBrace.range[0], firstValueToken.range[0]]),
+                fixer.removeRange([lastValueToken.range[1], closingBrace.range[1]])
+              ];
+            }
+          });
+        }
+      }
+    }
+  }
+};
diff --git a/tools/eslint-rules/single-line-control-statement-spacing.cjs b/tools/eslint-rules/single-line-spacing.cjs
similarity index 100%
rename from tools/eslint-rules/single-line-control-statement-spacing.cjs
rename to tools/eslint-rules/single-line-spacing.cjs