Merge branch 'dev'

Author: wh131462

.gitignore

@@ -27,6 +27,7 @@ dist-ssr
 *.sw?
 coverage
 coverage/**
+src/*
 
 # store file
 resources/stores/*

TO-DO.md

@@ -13,7 +13,7 @@
         2. 难度筛选
         3. 通过率
 - [ ] 登陆和提交到leetcode
-- [ ] 真随机一题实现
+
 - [ ] 国际化
 - [ ] 插件制作-WS/VS code
 - [ ] fork脚本的编写
@@ -27,7 +27,6 @@
 
 ### 代码优化及基础建设
 
-- [ ] 优化随机题目的随机方式，减少请求
 - [ ] e2e测试集成和仿真环境搭建
 
 ## 已完归档
@@ -53,3 +52,5 @@
 - [x] 19.基础参数设置与缓存
 - [x] 20.添加语言的设定
 - [x] 21.store文件升级冲突引起的报错无感修复
+- [x] 22.优化随机题目的随机方式，减少请求
+- [x] 23.真随机一题实现

common/constants/question.const.js

@@ -1,13 +1,13 @@
+// region 项目相关
 // 默认语言
 export const DefaultLang = 'javascript'
-
 // 默认版本号
 export const DefaultVer = '0.0.0'
-
 // 包名
 export const PackageName = 'leetcode-practice'
 // github 主账号
-export const GITHUB_HOST = 'wh131462'
+export const GITHUB_HOST = 'EternalHeartTeam'
+// endregion
 // region 域名列表
 // npm 主域名
 export const NPM_URL = 'https://registry.npmjs.org/'
@@ -18,3 +18,7 @@ export const GITHUB_URL = 'https://github.com/'
 // gitee
 export const GITEE_URL = 'https://gitee.com/'
 // endregion
+// region 实用变量
+// 默认请求数据数量限制
+export const DefaultLimit = 50
+// endregion

common/utils/create-check/createUtil.js

@@ -23,7 +23,10 @@ export function create(mode, question, baseDir) {
   })
 }
 
-export async function createQuestionByTitleSlug(titleSlug, baseDir = process.cwd()) {
+export async function createQuestionByTitleSlug(
+  titleSlug,
+  baseDir = process.cwd(),
+) {
   const { question } = await getQuestionIdBySlug(titleSlug)
 
   await createQuestionById(question.questionId, baseDir)
@@ -35,5 +38,4 @@ export async function createQuestionById(id, baseDir) {
     process.exit(0)
   }
   await create('identity', question, baseDir)
-  //  process.exit(0)
 }

common/utils/question-handler/getRandomId.js

@@ -1,18 +1,13 @@
-import { existsSync, mkdirSync, readdirSync } from 'node:fs'
-import { normalize } from 'node:path'
+import { readdirSync } from 'node:fs'
 import { getQuestionListJson } from '#resources/headers/questionListJson.js'
+import { graphql } from '#common/utils/http/graphql.js'
+import { DefaultLimit } from '#common/constants/question.const.js'
 
 /**
- * todo 需要先获取全部题目列表 需要处理随机的问题
- * @returns {*[]}
+ * 获取指定页数的ids
  */
-export async function getAllIds() {
-  const total = await getCount()
-  const randomSkip = total
-  const res = await fetch(
-    'https://leetcode.cn/graphql/',
-    getQuestionListJson(0),
-  ).then(res => res.json())
+export async function getIds(index, limit = DefaultLimit) {
+  const res = await graphql(getQuestionListJson(index, limit))
   return res?.data?.problemsetQuestionList?.questions?.map(
     q => q.frontendQuestionId,
   )
@@ -21,25 +16,45 @@ export async function getAllIds() {
  * 获取总数
  * @returns {Promise<any>}
  */
-export async function getCount() {
-  return fetch('https://leetcode.cn/graphql/', getQuestionListJson(0))
-    .then(res => res.json())
-    .then(res => res?.data?.problemsetQuestionList?.total)
+export function getCount() {
+  return graphql(getQuestionListJson(0)).then(
+    res => res?.data?.problemsetQuestionList?.total,
+  )
 }
 /**
- * 读取本地存在的所有题目 并随机题目
+ * 获取随机的一个id  只要保证没有存在过就可以
  */
 export async function getRandomId() {
+  // 去除所有的标题 剩下的就是id
   const parse = name => name.replace(/\.[a-zA-Z0-9-]+$/i, '')
-  // src 目录
-  const src = normalize('./src/')
-  // 不存在就创建
-  existsSync(src) || mkdirSync(src)
-  // 所有本地题目
-  const allLocalIds = readdirSync(src).map(o => parse(o))
-  const allIds = await getAllIds()
-  const filtered = allIds.filter(o => !allLocalIds.includes(o))
-  return filtered[random(filtered.length)]
+  // 获取一个 递归的获取 总会有一个 直到数量到达最大值
+  const getOne = async (waitIndexList, localIds) => {
+    const randomIndex = waitIndexList[random(waitIndexList.length)]
+    const ids = await getIds(randomIndex)
+    // 过滤后的结果
+    const filtered = ids.filter(o => !localIds.includes(o))
+    if (randomIndex === undefined)
+      return null
+    if (filtered.length) {
+      return filtered[random(filtered.length)]
+    }
+    else {
+      waitIndexList.splice(waitIndexList.findIndex(i => i === randomIndex))
+      return await getOne(waitIndexList, localIds)
+    }
+  }
+  // 所有本地题目的id
+  const allLocalIds = readdirSync(process.cwd()).map(parse)
+  // 最大的数量
+  const maxLength = await getCount()
+  const waitIndexList = Array.from({
+    length: Math.ceil(maxLength / DefaultLimit),
+  }).map((_, i) => i)
+  const one = await getOne(waitIndexList, allLocalIds)
+  if (one === null)
+    console.log('恭喜！你已经刷完了所有的题目！')
+  else
+    return one
 }
 /**
  * 获取长度内的随机数组下标

common/utils/question-handler/showLogs.js

@@ -1,4 +1,5 @@
 import v8 from 'node:v8'
+import { Table } from 'console-table-printer'
 import { getFileSize } from '../functions/sizeUtil.js'
 import { isSameData } from '../functions/isSameData.js'
 import { setDataStructure } from './parseStructure.js'
@@ -59,5 +60,24 @@ export function showLogs(fnName, paramMap, compareMap) {
     )
     logsItems.push(logItem)
   })
-  console.table(logsItems)
+
+  const logTable = new Table({
+    columns: [
+      { name: '测试结果', title: '测试结果', alignment: 'center', maxLen: 10 },
+      { name: '预期结果', title: '预期结果', alignment: 'center', maxLen: 40 },
+      { name: '执行结果', title: '执行结果', alignment: 'center', maxLen: 40 },
+      { name: '执行用时', title: '执行用时', alignment: 'center', maxLen: 10 },
+      { name: '内存占用', title: '内存占用', alignment: 'center', maxLen: 10 },
+    ],
+  })
+  logsItems.forEach((item) => {
+    for (const key in item) {
+      if (key === '预期结果' || key === '执行结果') {
+        item[key]
+          = item[key]?.length >= 40 ? `${item[key].slice(0, 37)}...` : item[key]
+      }
+    }
+    logTable.addRow(item, { color: item.测试结果 === '通过' ? 'green' : 'red' })
+  })
+  logTable.printTable()
 }

common/view/finder.view.js

@@ -1,9 +1,15 @@
 import select from '@inquirer/select'
+import input from '@inquirer/input'
+
 import {
   getHot100QuestionListJSCode,
   getTitleSlugList,
 } from '#common/utils/question-handler/getHot100QuestionList.js'
-import { createQuestionByTitleSlug } from '#common/utils/create-check/createUtil.js'
+import {
+  createQuestionById,
+  createQuestionByTitleSlug,
+} from '#common/utils/create-check/createUtil.js'
+import { getQuestionByKeyword } from '#common/utils/question-getter/getQuestionByKeyword.js'
 
 async function hotMode() {
   const createMode = await select({
@@ -32,21 +38,23 @@ async function hotMode() {
 }
 
 async function keywordMode() {
-  const data = await getQuestionByKeyword(
-    await inquirer.prompt(questionKeyword, null),
-  )
-  const questionList = [
-    {
-      type: 'list',
-      name: 'chooseQuestion',
-      message: '请选择题目',
-      choices: [],
-    },
-  ]
-  const list = []
-  data.map(q => list.push(q.titleCn))
-  questionList[0].choices = list.join(',')
-  console.log(list)
+  const keyword = await input({ message: '请输入关键词', name: 'keyword' })
+  const data = await getQuestionByKeyword(keyword)
+  const list = data?.map((q) => {
+    return {
+      name: `${q.frontendQuestionId}.${q.titleCn}`,
+      value: q.frontendQuestionId,
+    }
+  })
+  const listQuestion = {
+    type: 'list',
+    name: 'chooseQuestion',
+    message: '请选择题目',
+    choices: list,
+  }
+  const chooseQuestion = await select(listQuestion)
+  console.log(chooseQuestion)
+  await createQuestionById(chooseQuestion, process.cwd())
 }
 async function selectMode() {}