refactor: format and add accompany type

src/client.ts

@@ -28,7 +28,7 @@ export class Client {
       }, 50);
     } catch (error: unknown) {
       core.setFailed(error as any);
-      process.exit(1);
+      throw error;
     }
   }
 
@@ -50,7 +50,7 @@ export class Client {
       }
     } catch (error: unknown) {
       core.setFailed(error as any);
-      process.exit(1);
+      throw error;
     }
   }
 
@@ -63,6 +63,7 @@ export class Client {
       }
       ans.push(...res);
     }
+
     return ans
       .map((u) => ({ uid: u.uid, username: u.username, level: u.guard_level }))
       .sort((lhs, rhs) => (lhs.level ?? 3) - (rhs.level ?? 3));

src/main.ts

@@ -14,10 +14,11 @@ function today(): string {
 }
 
 async function run(): Promise<void> {
-  const roomid = core.getInput('roomid');
   const ruid = core.getInput('ruid');
-  const client = new Client(roomid, ruid);
+  const roomid = core.getInput('roomid');
+  const outDir = core.getInput('outDir');
 
+  const client = new Client(roomid, ruid);
   const list = await client.get();
 
   {
@@ -31,8 +32,8 @@ async function run(): Promise<void> {
       );
     }
   }
+
   {
-    const outDir = core.getInput('outDir');
     const csvname = path.join(outDir, `${today()}.csv`);
     const content = toCSV(list);
     core.info(`---------------------------------------`);

src/output.ts

@@ -8,19 +8,23 @@ export function getType(level?: number): string {
 }
 
 export function toCSV(list: User[]): string {
-  const text = ['rank,uid,username,type'];
+  const text = ['rank,uid,username,type,accompany'];
   let cnt = 1;
   for (const user of list) {
-    text.push(`${cnt++},${user.uid},${user.username},${getType(user.level)}`);
+    text.push(
+      `${cnt++},${user.uid},${user.username},${getType(user.level)},${user.accompany ?? ''}`
+    );
   }
   return text.join('\n');
 }
 
 export function toMarkdown(list: User[]): string {
-  const text = ['|序号|UID|用户名|大航海|', '|:-:|:-:|:-:|:-:|'];
+  const text = ['|序号|UID|用户名|大航海|陪伴天数|', '|:-:|:-:|:-:|:-:|:-:|'];
   let cnt = 1;
   for (const user of list) {
-    text.push(`|${cnt++}|${user.uid}|${user.username}|${getType(user.level)}|`);
+    text.push(
+      `|${cnt++}|${user.uid}|${user.username}|${getType(user.level)}|${user.accompany ?? ''}|`
+    );
   }
   return text.join('\n');
 }

src/types.ts

@@ -1,5 +1,23 @@
 export interface User {
+  /**
+   * Captain uid
+   */
   uid: number;
+
+  /**
+   * Captain username (at fetched time)
+   */
   username: string;
+
+  /**
+   * Captain level: 3 for 舰长, 2 for 提督, 1 for 总督
+   *
+   * @default 3
+   */
   level?: number;
+
+  /**
+   * Captain accompany length (number of days)
+   */
+  accompany?: number;
 }