Merge branch 'feature/ui'

This commit is contained in:
geekgeekrun
2026-01-26 22:06:21 +08:00
24 changed files with 559 additions and 330 deletions

View File

@@ -149,9 +149,10 @@ jobs:
- name: Display structure of downloaded files
run: ls -llR geekgeekrun-ui@${{ github.sha }}
- name: Create release
- name: Create release for public
uses: ncipollo/release-action@v1
with:
repo: geekgeekrun
prerelease: true
allowUpdates: true
artifacts: geekgeekrun-ui@${{ github.sha }}/*

View File

@@ -11,6 +11,7 @@
"author": "geekgeekrun",
"license": "ISC",
"dependencies": {
"@geekgeekrun/puppeteer-extra-plugin-laodeng": "workspace:*",
"cheerio": "1.0.0-rc.12",
"dayjs": "^1.11.10",
"json5": "^2.2.3",
@@ -18,7 +19,6 @@
"puppeteer": "24.19.0",
"puppeteer-extra": "3.3.6",
"puppeteer-extra-plugin-stealth": "2.11.2",
"@geekgeekrun/puppeteer-extra-plugin-laodeng": "workspace:*",
"rimraf": "^3.0.2",
"tapable": "^2.2.1"
},
@@ -30,5 +30,10 @@
},
"engines": {
"pnpm": "=8.15.9"
},
"pnpm": {
"patchedDependencies": {
"find-chrome-bin@2.0.4": "patches/find-chrome-bin@2.0.4.patch"
}
}
}

View File

@@ -1,4 +1,4 @@
{
export default {
"code": 0,
"message": "Success",
"zpData": {

View File

@@ -56,10 +56,11 @@ function combineWithZero(arr, min, max) {
}
export function* combineFiltersWithConstraintsGenerator(selectedFilters) {
const { salaryList, experienceList, degreeList, scaleList, industryList } =
const { cityList, salaryList, experienceList, degreeList, scaleList, industryList } =
selectedFilters;
// 生成符合限制条件的组合
const cityComb = combineWithZero(cityList, 0, 1) // Salary: 0-1 个
const salaryComb = combineWithZero(salaryList, 0, 1) // Salary: 0-1 个
const experienceComb = combineWithZero(experienceList, 0, experienceList.length) // Experience: 0 个或更多
const degreeComb = combineWithZero(degreeList, 0, degreeList.length) // Degree: 0 个或更多
@@ -67,17 +68,20 @@ export function* combineFiltersWithConstraintsGenerator(selectedFilters) {
const industryComb = combineWithZero(industryList, 0, 3) // Industry: 0-3 个
// 通过迭代生成所有组合
for (const salary of salaryComb) {
for (const experience of experienceComb) {
for (const degree of degreeComb) {
for (const scale of scaleComb) {
for (const industry of industryComb) {
yield {
salaryList: salary,
experienceList: experience,
degreeList: degree,
scaleList: scale,
industryList: industry
for (const city of cityComb) {
for (const salary of salaryComb) {
for (const experience of experienceComb) {
for (const degree of degreeComb) {
for (const scale of scaleComb) {
for (const industry of industryComb) {
yield {
cityList: city,
salaryList: salary,
experienceList: experience,
degreeList: degree,
scaleList: scale,
industryList: industry
}
}
}
}
@@ -92,6 +96,7 @@ export function* combineFiltersWithConstraintsGenerator(selectedFilters) {
// 计算符合限制条件的组合数量
export function calculateTotalCombinations(selectedFilters, includeEmptyCondition) {
const {
cityList = [],
salaryList = [],
experienceList = [],
degreeList = [],
@@ -100,13 +105,14 @@ export function calculateTotalCombinations(selectedFilters, includeEmptyConditio
} = selectedFilters
// 生成符合限制条件的组合
const cityComb = combineWithZero(cityList, 0, 1) // City: 0-1 个
const salaryComb = combineWithZero(salaryList, 0, 1) // Salary: 0-1 个
const experienceComb = combineWithZero(experienceList, 0, experienceList.length) // Experience: 0 个或更多
const degreeComb = combineWithZero(degreeList, 0, degreeList.length) // Degree: 0 个或更多
const scaleComb = combineWithZero(scaleList, 0, scaleList.length) // Scale: 0 个或更多
const industryComb = combineWithZero(industryList, 0, 3) // Industry: 0-3 个
let result = [salaryComb, experienceComb, degreeComb, scaleComb, industryComb].reduce((accu, cur) => {
let result = [cityComb, salaryComb, experienceComb, degreeComb, scaleComb, industryComb].reduce((accu, cur) => {
return accu * cur.length
}, 1)
if (!includeEmptyCondition) {
@@ -146,6 +152,7 @@ export function formatStaticCombineFilters(rawStaticCombineRecommendJobFilterCon
const conditions = Array.from(map.values())
const result = conditions.map((condition) => {
return {
cityList: condition.city ? [condition.city] : [],
salaryList: condition.salary ? [condition.salary] : [],
experienceList: condition.experience ? [condition.experience] : [],
degreeList: condition.degree ? [condition.degree] : [],
@@ -155,6 +162,7 @@ export function formatStaticCombineFilters(rawStaticCombineRecommendJobFilterCon
})
if (!result.length) {
result.push({
cityList: [],
salaryList: [],
experienceList: [],
degreeList: [],

View File

@@ -1,6 +1,7 @@
{
"combineRecommendJobFilterType": 1,
"anyCombineRecommendJobFilter": {
"cityList": [],
"salaryList": [],
"experienceList": [],
"degreeList": [],

View File

@@ -38,6 +38,18 @@ import {
} from './constant.mjs'
import { parseSalary } from "@geekgeekrun/sqlite-plugin/dist/utils/parser"
import { waitForSageTimeOrJustContinue } from './sage-time.mjs'
import cityGroupData from './cityGroup.mjs'
const flattedCityList = []
;(cityGroupData?.zpData?.cityGroup ?? []).forEach(it => {
const firstChar = it.firstChar
it.cityList.forEach(city => {
flattedCityList.push({
...city,
firstChar
})
})
})
const jobFilterConditionsMapByCode = {}
Object.values(jobFilterConditions).forEach(arr => {
arr.forEach(option => {
@@ -406,6 +418,7 @@ export function testIfJobTitleOrDescriptionSuit (jobInfo, matchLogic) {
async function setFilterCondition (selectedFilters) {
const {
cityList = [],
salaryList = [],
experienceList = [],
degreeList = [],
@@ -413,9 +426,9 @@ async function setFilterCondition (selectedFilters) {
industryList = []
} = selectedFilters
const placeholderTexts = ['薪资待遇', '工作经验', '学历要求', '公司行业', '公司规模']
const optionKaPrefixes = ['sel-job-rec-salary-', 'sel-job-rec-exp-', 'sel-job-rec-degree-', 'sel-industry-', 'sel-job-rec-scale-']
const conditionArr = [salaryList, experienceList, degreeList, industryList, scaleList]
const placeholderTexts = ['城市', '薪资待遇', '工作经验', '学历要求', '公司行业', '公司规模']
const optionKaPrefixes = ['switch_city_dialog_open', 'sel-job-rec-salary-', 'sel-job-rec-exp-', 'sel-job-rec-degree-', 'sel-industry-', 'sel-job-rec-scale-']
const conditionArr = [cityList, salaryList, experienceList, degreeList, industryList, scaleList]
console.log('current filter condition----')
for (let i = 0; i < placeholderTexts.length; i++) {
@@ -434,10 +447,15 @@ async function setFilterCondition (selectedFilters) {
const placeholderText = placeholderTexts[i]
const filterDropdownProxy = await (async () => {
const jsHandle = (await page.evaluateHandle((placeholderText) => {
const filterBar = document.querySelector('.page-jobs-main .filter-condition-inner')
const dropdownEntry = filterBar.__vue__.$children.find(it => it.placeholder === placeholderText)
return dropdownEntry.$el
}, placeholderText)).asElement();
if (placeholderText === '城市') {
return document.querySelector('.page-jobs-main .filter-condition-inner [ka="switch_city_dialog_open"]')
}
else {
const filterBar = document.querySelector('.page-jobs-main .filter-condition-inner')
const dropdownEntry = filterBar.__vue__.$children.find(it => it.placeholder === placeholderText)
return dropdownEntry?.$el
}
}, placeholderText))?.asElement();
return jsHandle
})()
if (!filterDropdownProxy) {
@@ -446,88 +464,143 @@ async function setFilterCondition (selectedFilters) {
const currentFilterConditions = conditionArr[i];
const filterDropdownCssList = await filterDropdownProxy.evaluate(el => Array.from(el.classList));
if (!filterDropdownCssList.includes('is-select') && !currentFilterConditions.length) {
continue
} else {
const filterDropdownElBBox = await filterDropdownProxy.boundingBox()
await page.mouse.move(
filterDropdownElBBox.x + filterDropdownElBBox.width / 2,
filterDropdownElBBox.y + filterDropdownElBBox.height / 2,
)
await sleepWithRandomDelay(500)
if (placeholderText === '城市') {
const onPageSelectedCity = filterDropdownCssList.includes('active') ? (await filterDropdownProxy.evaluate(el => el.textContent.trim())) : null
if (!onPageSelectedCity && !currentFilterConditions.length) {
continue
} else if (onPageSelectedCity === (currentFilterConditions[0] ?? null)) {
continue
} else {
if (!currentFilterConditions.length) {
const clearButtonHandle = await page.$(`.page-jobs-main .filter-condition-inner [ka="empty-filter"]`)
await clearButtonHandle.click()
}
else {
await filterDropdownProxy?.click()
await page.waitForFunction(() => {
const dialogEl = document.querySelector('.city-select-dialog')
return dialogEl && window.getComputedStyle(dialogEl).display !== 'none'
})
const citySelectWrapperProxy = await page.waitForSelector('.city-select-wrapper')
let targetCityElJsHandle = (await page.evaluateHandle((cityName) => {
const targetCityEl = [...document.querySelectorAll('.city-select-dialog .city-select-wrapper ul.city-list-hot li')].find(it => it.textContent.trim() === cityName) ?? null
return targetCityEl
}, currentFilterConditions[0]))?.asElement()
if (!targetCityElJsHandle) {
const targetCityItem = flattedCityList.find(it => it.name === currentFilterConditions[0])
if (!targetCityItem) {
// unexpected condition
continue
}
const firstChar = targetCityItem.firstChar
const targetCityCharListEntryHandle = await page.$(`xpath///*[contains(@class, "city-select-dialog")]//*[contains(@class, "city-select-wrapper")]//ul[contains(@class, "city-char-list")]//li[contains(text(), '${firstChar.toUpperCase()}')]`)
await targetCityCharListEntryHandle.click()
targetCityElJsHandle = (await page.evaluateHandle((cityName) => {
const targetCityEl = [...document.querySelectorAll('.city-select-dialog .city-select-wrapper .list-select-list a')].find(it => it.textContent.trim() === cityName) ?? null
return targetCityEl
}, currentFilterConditions[0]))?.asElement()
}
if (!targetCityElJsHandle) {
// unexpected condition
continue
}
await targetCityElJsHandle.click()
await sleep(1000)
}
}
}
else {
if (!filterDropdownCssList.includes('is-select') && !currentFilterConditions.length) {
continue
} else {
await filterDropdownProxy.scrollIntoView()
const filterDropdownElBBox = await filterDropdownProxy.boundingBox()
await page.mouse.move(
filterDropdownElBBox.x + filterDropdownElBBox.width / 2,
filterDropdownElBBox.y + filterDropdownElBBox.height / 2,
)
await sleepWithRandomDelay(500)
const optionKaPrefix = optionKaPrefixes[i]
if (!currentFilterConditions.length) {
if (placeholderText === '公司行业') {
const activeOptionElAtCurrentFilterProxyList = await page.$$(`.page-jobs-main .filter-condition-inner .active[ka^="${optionKaPrefix}"]`)
for (const it of activeOptionElAtCurrentFilterProxyList) {
await it.click()
const optionKaPrefix = optionKaPrefixes[i]
if (!currentFilterConditions.length) {
if (placeholderText === '公司行业') {
const activeOptionElAtCurrentFilterProxyList = await page.$$(`.page-jobs-main .filter-condition-inner .active[ka^="${optionKaPrefix}"]`)
for (const it of activeOptionElAtCurrentFilterProxyList) {
await it.click()
}
} else {
// select 不限 immediately
const buxianOptionElProxy = await page.$(`.page-jobs-main .filter-condition-inner [ka="${optionKaPrefix}${0}"]`)
await buxianOptionElProxy.click()
}
} else {
// select 不限 immediately
const buxianOptionElProxy = await page.$(`.page-jobs-main .filter-condition-inner [ka="${optionKaPrefix}${0}"]`)
await buxianOptionElProxy.click()
}
} else {
//#region uncheck options perviously checked but not existed in current filter.
const activeOptionElAtCurrentFilterProxyList = await page.$$(`.page-jobs-main .filter-condition-inner .active[ka^="${optionKaPrefix}"]`)
const activeOptionValues = (await Promise.all(
activeOptionElAtCurrentFilterProxyList.map(elProxy => {
return elProxy.evaluate((el) => {
return el.getAttribute('ka')
//#region uncheck options perviously checked but not existed in current filter.
const activeOptionElAtCurrentFilterProxyList = await page.$$(`.page-jobs-main .filter-condition-inner .active[ka^="${optionKaPrefix}"]`)
const activeOptionValues = (await Promise.all(
activeOptionElAtCurrentFilterProxyList.map(elProxy => {
return elProxy.evaluate((el) => {
return el.getAttribute('ka')
})
})
})
)).map(it => it.replace(optionKaPrefix, '')).map(Number)
if (placeholderText !== '薪资待遇') {
for(let i = 0; i < activeOptionValues.length; i++) {
let activeValue
)).map(it => it.replace(optionKaPrefix, '')).map(Number)
if (placeholderText !== '薪资待遇') {
for(let i = 0; i < activeOptionValues.length; i++) {
let activeValue
if (placeholderText === '公司行业') {
activeValue = industryFilterConditionsMapByIndex[activeOptionValues[i]]?.code
} else {
activeValue = activeOptionValues[i]
}
const activeOptionElProxy = activeOptionElAtCurrentFilterProxyList[i]
if (!currentFilterConditions.includes(activeValue)) {
await activeOptionElProxy.click()
}
}
}
//#endregion
//#region only click the one which we need check, don't change already checked.
const conditionToCheck = currentFilterConditions.filter(it => {
if (placeholderText === '公司行业') {
activeValue = industryFilterConditionsMapByIndex[activeOptionValues[i]]?.code
return !activeOptionValues.map(value => industryFilterConditionsMapByIndex[value].code).includes(it);
} else {
activeValue = activeOptionValues[i]
return !activeOptionValues.includes(it)
}
const activeOptionElProxy = activeOptionElAtCurrentFilterProxyList[i]
if (!currentFilterConditions.includes(activeValue)) {
await activeOptionElProxy.click()
})
for(let j = 0; j < conditionToCheck.length; j++) {
let optionValue
if (placeholderText === '公司行业') {
optionValue = industryFilterConditionCodeToIndexMap[conditionToCheck[j]]
} else {
optionValue = conditionToCheck[j]
}
await sleepWithRandomDelay(500)
await filterDropdownProxy.scrollIntoView()
const filterDropdownElBBox = await filterDropdownProxy.boundingBox()
await page.mouse.move(
filterDropdownElBBox.x + filterDropdownElBBox.width / 2,
filterDropdownElBBox.y + filterDropdownElBBox.height / 2,
)
await sleepWithRandomDelay(500)
const optionElProxy = await page.$(`.page-jobs-main .filter-condition-inner [ka="${optionKaPrefix}${optionValue}"]`)
if (!optionElProxy) {
continue;
}
await optionElProxy.click()
}
//#endregion
//#region move out dropdown entry to make dropdown hidden
const navBarLogoElProxy = await page.$(`[ka="header-home-logo"]`)
if (navBarLogoElProxy) {
const navBarLogoElBBox = await navBarLogoElProxy.boundingBox()
await page.mouse.move(
navBarLogoElBBox.x + navBarLogoElBBox.width / 2,
navBarLogoElBBox.y + navBarLogoElBBox.height / 2,
)
}
//#endregion
}
//#endregion
//#region only click the one which we need check, don't change already checked.
const conditionToCheck = currentFilterConditions.filter(it => {
if (placeholderText === '公司行业') {
return !activeOptionValues.map(value => industryFilterConditionsMapByIndex[value].code).includes(it);
} else {
return !activeOptionValues.includes(it)
}
})
for(let j = 0; j < conditionToCheck.length; j++) {
let optionValue
if (placeholderText === '公司行业') {
optionValue = industryFilterConditionCodeToIndexMap[conditionToCheck[j]]
} else {
optionValue = conditionToCheck[j]
}
await sleepWithRandomDelay(500)
const optionElProxy = await page.$(`.page-jobs-main .filter-condition-inner [ka="${optionKaPrefix}${optionValue}"]`)
if (!optionElProxy) {
continue;
}
await optionElProxy.click()
}
//#endregion
//#region move out dropdown entry to make dropdown hidden
const navBarLogoElProxy = await page.$(`[ka="header-home-logo"]`)
if (navBarLogoElProxy) {
const navBarLogoElBBox = await navBarLogoElProxy.boundingBox()
await page.mouse.move(
navBarLogoElBBox.x + navBarLogoElBBox.width / 2,
navBarLogoElBBox.y + navBarLogoElBBox.height / 2,
)
}
//#endregion
await sleepWithRandomDelay(500)
}
await sleepWithRandomDelay(500)
}
}
}
@@ -685,9 +758,12 @@ async function toRecommendPage (hooks) {
? formatStaticCombineFilters(staticCombineRecommendJobFilterConditions)
: combineFiltersWithConstraintsGenerator(anyCombineRecommendJobFilter)
let expectJobList
let filterConditionIndex = -1
iterateFilterCondition: for (
const filterCondition of filterConditions
) {
filterConditionIndex++
console.log(`current filter condition index to apply: ${filterConditionIndex}`, JSON.stringify(filterCondition))
findInCurrentFilterCondition: while(true) {
await sleepWithRandomDelay(2500)

File diff suppressed because one or more lines are too long

View File

@@ -7,15 +7,13 @@
"productName": "GeekGeekRun",
"homepage": "https://github.com/geekgeekrun",
"scripts": {},
"devDependencies": {
"puppeteer": "^24.19.0"
},
"dependencies": {
"puppeteer-extra": "^3.3.6",
"puppeteer-extra-plugin": "^3.2.3"
},
"peerDependencies": {
"playwright-extra": "*",
"puppeteer": "^24.19.0",
"puppeteer-extra": "*"
},
"peerDependenciesMeta": {

View File

@@ -30,9 +30,8 @@ export async function main() {
const { puppeteer } = await initPuppeteer()
const browser = await puppeteer.launch({
headless: false,
args: [
`--load-extension=${editThisCookieExtensionPath}`
]
pipe: true,
enableExtensions: [editThisCookieExtensionPath]
})
const closeAttachedSet = new WeakSet()

View File

@@ -1,6 +1,6 @@
{
"name": "geekgeekrun-ui",
"version": "0.12.0",
"version": "0.14.1",
"description": "Boss 炸弹 - 自动开聊Boss助力每位打工人求职",
"main": "./out/main/index.js",
"author": "geekgeekrun",
@@ -72,7 +72,7 @@
"element-plus": "^2.8.4",
"eslint": "^8.56.0",
"eslint-plugin-vue": "^9.20.1",
"find-chrome-bin": "^2.0.1",
"find-chrome-bin": "^2.0.4",
"js-yaml": "^4.1.0",
"normalize.css": "^8.0.1",
"prettier": "^3.2.4",
@@ -89,4 +89,4 @@
"vue-router": "^4.2.5",
"vue-tsc": "^1.8.27"
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 109 KiB

View File

@@ -1,7 +1,7 @@
{
"version": "0.12.0",
"buildVersion": 26,
"buildTime": 1766591012661,
"buildHash": "0928b402fb5019b587ddec62825c9c2f4a5a11fb",
"version": "0.14.1",
"buildVersion": 31,
"buildTime": 1769428838471,
"buildHash": "a92b9ce0403a8fc816568cf3eb106a89a6afddf0",
"name": "geekgeekrun-ui"
}

View File

@@ -11,6 +11,7 @@ export enum DOWNLOAD_ERROR_EXIT_CODE {
export const checkAndDownloadDependenciesForInit = async () => {
process.on('disconnect', () => app.exit())
process.on('uncaughtException', () => app.exit(DOWNLOAD_ERROR_EXIT_CODE.DOWNLOAD_ERROR))
app.dock?.hide()
let pipe: null | fs.WriteStream = null
try {

View File

@@ -130,7 +130,7 @@ export async function findAndLocateUserInstalledChromiumExecutableSync(): Promis
const findChrome: typeof import('find-chrome-bin').findChrome = (await import('find-chrome-bin'))
.findChrome
const targetBrowser = await findChrome({
min: exceptChromiumMainVersion
min: exceptChromiumMainVersion + 1
})
if (!targetBrowser?.executablePath) {
throw new Error('NO_EXPECT_CHROMIUM_FOUND')

View File

@@ -371,7 +371,8 @@ export async function launchBossSite() {
const { puppeteer } = await initPuppeteer()
const browser = await puppeteer.launch({
headless: false,
args: [`--load-extension=${editThisCookieExtensionPath}`]
pipe: true,
enableExtensions: [editThisCookieExtensionPath]
})
let [page] = await browser.pages()
for (let i = 0; i < bossCookies.length; i++) {

View File

@@ -1,5 +1,40 @@
<template>
<div class="job-combo-filter">
<div class="filter-item">
<div font-size-12px>城市</div>
<div
style="
align-items: center;
background-color: var(--el-input-bg-color, var(--el-fill-color-blank));
background-image: none;
border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
"
pl4px
pr4px
flex
justify-between
items-center
>
<city-chooser
v-model="modelValue.cityList"
gt-show-scene="any-combine-boss-recommend-filter"
>
<template #default="{ showDialog }">
<div flex justify-between items-center>
<div font-size-12px>
<template v-if="modelValue.cityList?.length"
>已选择<span ml3px mr3px>{{ modelValue.cityList?.length }}</span
>个城市</template
>
<template v-else><i color-gray>未选择城市</i></template>
</div>
<el-button size="small" @click="showDialog" pl4px pr4px>选择</el-button>
</div>
</template>
</city-chooser>
</div>
</div>
<div class="filter-item">
<div font-size-12px>薪资待遇</div>
<el-select
@@ -10,7 +45,7 @@
collapse-tags-tooltip
>
<el-option
v-for="it in conditions.salaryList.filter(it => it.code !== 0)"
v-for="it in conditions.salaryList.filter((it) => it.code !== 0)"
:key="it.code"
:value="it.code"
:label="it.name"
@@ -27,7 +62,7 @@
collapse-tags-tooltip
>
<el-option
v-for="it in conditions.experienceList.filter(it => it.code !== 0)"
v-for="it in conditions.experienceList.filter((it) => it.code !== 0)"
:key="it.code"
:value="it.code"
:label="it.name"
@@ -44,7 +79,7 @@
collapse-tags-tooltip
>
<el-option
v-for="it in conditions.degreeList.filter(it => it.code !== 0)"
v-for="it in conditions.degreeList.filter((it) => it.code !== 0)"
:key="it.code"
:value="it.code"
:label="it.name"
@@ -84,7 +119,7 @@
collapse-tags-tooltip
>
<el-option
v-for="it in conditions.scaleList.filter(it => it.code !== 0)"
v-for="it in conditions.scaleList.filter((it) => it.code !== 0)"
:key="it.code"
:value="it.code"
:label="it.name"
@@ -97,6 +132,7 @@
<script lang="ts" setup>
import conditions from '@geekgeekrun/geek-auto-start-chat-with-boss/internal-config/job-filter-conditions-20241002.json'
import industryFilterExemption from '@geekgeekrun/geek-auto-start-chat-with-boss/internal-config/job-filter-industry-filter-exemption-20241002.json'
import CityChooser from '@renderer/page/MainLayout/GeekAutoStartChatWithBoss/components/CityChooser.vue'
import { PropType } from 'vue'
defineProps({

View File

@@ -71,6 +71,25 @@
</div>
</template>
</el-table-column>
<el-table-column :resizable="false" label="城市" prop="city">
<template #default="{ row }">
<city-chooser
v-model="row.city"
:multiple="false"
gt-show-scene="static-combine-boss-recommend-filter"
>
<template #default="{ showDialog }">
<div flex justify-between items-center>
<div font-size-12px lh-1.2em>
<template v-if="row.city">{{ row.city }}</template>
<template v-else><i color-gray>未选择城市</i></template>
</div>
<el-button size="small" pl4px pr4px @click="showDialog">选择</el-button>
</div>
</template>
</city-chooser>
</template>
</el-table-column>
<el-table-column :resizable="false" label="薪资待遇" prop="salary">
<template #default="{ row }">
<el-select
@@ -183,6 +202,7 @@ import conditions from '@geekgeekrun/geek-auto-start-chat-with-boss/internal-con
import industryFilterExemption from '@geekgeekrun/geek-auto-start-chat-with-boss/internal-config/job-filter-industry-filter-exemption-20241002.json'
import { ArrowUp, ArrowDown, Delete, Plus } from '@element-plus/icons-vue'
import { computed, PropType } from 'vue'
import CityChooser from '@renderer/page/MainLayout/GeekAutoStartChatWithBoss/components/CityChooser.vue'
import { getStaticCombineFilterKey } from '@geekgeekrun/geek-auto-start-chat-with-boss/combineCalculator.mjs'

View File

@@ -11,9 +11,11 @@
</template>
<script lang="ts" setup>
import { ref, onUnmounted, PropType } from 'vue'
import { ref, onUnmounted, PropType, h } from 'vue'
import { ElMessageBox } from 'element-plus'
import { gtagRenderer } from '@renderer/utils/gtag'
import { sleep } from '@geekgeekrun/utils/sleep.mjs'
import FailMessage from './FailMessage.vue'
const props = defineProps({
dependenciesStatus: {
@@ -36,12 +38,24 @@ const downloadProcessExitCode = ref(0)
const processDownloadBrowser = async () => {
downloadProcessExitCode.value = 0
browserDownloadPercentage.value = 0
try {
await electron.ipcRenderer.invoke('setup-dependencies')
browserDownloadPercentage.value = 100
} catch (err) {
downloadProcessExitCode.value = 1
throw err
let restRetriedTime = 2
while (restRetriedTime > 0) {
try {
try {
await electron.ipcRenderer.invoke('setup-dependencies')
browserDownloadPercentage.value = 100
} catch (err) {
downloadProcessExitCode.value = 1
throw err
}
break
} catch (err) {
restRetriedTime--
if (restRetriedTime === 0) {
throw err
}
await sleep(5000)
}
}
}
@@ -68,12 +82,13 @@ const processTasks = async () => {
await p
} catch {
gtagRenderer('encounter_error_when_download_deps')
await ElMessageBox.confirm('需要重试吗?', '核心组件下载失败', {
await ElMessageBox.confirm(h(FailMessage), {
closeOnClickModal: false,
closeOnPressEscape: false,
showClose: false,
type: 'error',
cancelButtonText: '退出程序'
cancelButtonText: '退出程序',
confirmButtonText: '重试'
})
.then(() => {
gtagRenderer('start_retry_download_deps')

View File

@@ -0,0 +1,34 @@
<template>
<div>
<p>核心组件下载失败请重试</p>
<br />
<br />
<p>
<b text-orange>提示</b>由于网络颠簸如果多次重试仍然失败&nbsp;<el-button
size="small"
type="primary"
font-size-14px
@click="handleOpenChromeDownloadPage"
>点击此处</el-button
>&nbsp;下载最新版本 Google Chrome
浏览器安装完毕后重新打开本程序程序会自动检测该浏览器并使用它
</p>
</div>
</template>
<script lang="ts" setup>
import { gtagRenderer } from '@renderer/utils/gtag'
import debounce from 'lodash-es/debounce'
const { ipcRenderer } = electron
const handleOpenChromeDownloadPage = debounce(
async () => {
gtagRenderer('open_chrome_download_page_clicked')
ipcRenderer.send('open-external-link', 'https://www.google.cn/chrome/')
},
1000,
{ leading: true, trailing: false }
)
</script>
<style scoped></style>

View File

@@ -1,56 +1,26 @@
<template>
<div>
<div v-if="modelValue?.length">
<div>当前已选择城市</div>
<div flex flex-wrap gap-10px>
<el-tag v-for="it in modelValue" :key="it">
{{ it }}
</el-tag>
</div>
</div>
<div v-else>
<div>当前未选择任何期望城市将不会按照城市进行筛选</div>
</div>
<div
line-height-1
:style="{
marginTop: modelValue?.length ? '10px' : ''
}"
>
<el-button
size="small"
type="primary"
@click="
() => {
isDialogVisible = true
gtagRenderer('choose_city_entry_button_clicked')
}
"
>选择城市</el-button
>
<el-button
v-if="modelValue?.length"
size="small"
type="danger"
@click="handleClearSelectedCitiesInModelValue"
>清空已选择的所有城市</el-button
>
</div>
<div w-full>
<slot
:model-value="modelValue"
:show-dialog="() => (isDialogVisible = true)"
:clear-value="handleClearSelectedCitiesInModelValue"
></slot>
<el-dialog
v-model="isDialogVisible"
width="1000px"
title="请选择城市"
:show-close="false"
append-to-body
@open="handleDialogOpen"
@closed="handleDialogClosed"
>
<el-tabs v-model="activeTabName">
<el-tab-pane
:style="{ height: '300px', overflow: 'auto' }"
:style="{ height: '260px', overflow: 'auto' }"
label="热门城市"
name="热门城市"
>
<el-checkbox-group v-model="selectedCities">
<el-checkbox-group v-if="multiple" v-model="selectedCities">
<div
:style="{
display: 'grid',
@@ -66,6 +36,23 @@
</el-checkbox>
</div>
</el-checkbox-group>
<el-radio-group v-else v-model="selectedCities" w-full>
<div
w-full
:style="{
display: 'grid',
gridTemplateColumns: '1fr 1fr 1fr 1fr'
}"
>
<el-radio
v-for="op in hotCityList.filter((it) => it.code !== 100010000)"
:key="op.code"
:label="op.name"
>
{{ op.name }}
</el-radio>
</div>
</el-radio-group>
</el-tab-pane>
<el-tab-pane
v-for="it in cityGroupsByAlphabetMap.keys()"
@@ -75,8 +62,8 @@
:value="it"
>
<div v-for="group in cityGroupsByAlphabetMap.get(it)" :key="group.firstChar">
{{ group.firstChar }}
<el-checkbox-group v-model="selectedCities">
<div pt4px pb4px>{{ group.firstChar }}</div>
<el-checkbox-group v-if="multiple" v-model="selectedCities">
<div
:style="{
display: 'grid',
@@ -88,6 +75,19 @@
</el-checkbox>
</div>
</el-checkbox-group>
<el-radio-group v-else v-model="selectedCities" w-full>
<div
w-full
:style="{
display: 'grid',
gridTemplateColumns: '1fr 1fr 1fr 1fr'
}"
>
<el-radio v-for="op in group.cityList" :key="op.code" :label="op.name">
{{ op.name }}
</el-radio>
</div>
</el-radio-group>
</div>
</el-tab-pane>
</el-tabs>
@@ -95,19 +95,66 @@
<div
:style="{
display: 'flex',
alignItems: 'center',
alignItems: multiple ? 'end' : 'center',
justifyContent: 'space-between'
}"
>
<div>
<el-button
v-if="selectedCities.length"
type="danger"
@click="handleClearSelectedCitiesInDialog"
>清空已选择的所有城市</el-button
>
<div flex flex-1 mr12px text-left flex-col>
<template v-if="selectedCities?.length">
<div
flex
flex-items-center
font-size-14px
flex-0
ws-nowrap
:class="{ mb10px: multiple }"
>
<el-button
v-if="multiple && selectedCities?.length"
type="danger"
size="small"
@click="handleClearSelectedCitiesInDialog"
>清空已选择的所有城市</el-button
>
<template v-if="!multiple">
<span ml6px font-size-13px class="color-#999">已选择:</span>
<el-tag
closable
@close="
() => {
selectedCities = null
gtagRenderer('remove_selected_cities_in_dialog_clicked', {
gtShowScene: props.gtShowScene,
multiple: Boolean(multiple)
})
}
"
>{{ selectedCities }}</el-tag
>
</template>
</div>
<div v-if="multiple" flex flex-1 flex-wrap gap-6px of-auto max-h-160px>
<span font-size-13px class="color-#999" flex items-center>已选择:</span>
<el-tag
v-for="(city, index) in selectedCities"
:key="city"
closable
@close="
() => {
;(selectedCities ?? []).splice(index, 1)
gtagRenderer('remove_selected_cities_in_dialog_clicked', {
gtShowScene: props.gtShowScene,
multiple: Boolean(multiple)
})
}
"
>
{{ city }}</el-tag
>
</div>
</template>
</div>
<div>
<div flex-0 ws-nowrap>
<el-button @click="handleCancelClicked">取消</el-button>
<el-button type="primary" @click="handleConfirmClicked">确定</el-button>
</div>
@@ -119,12 +166,21 @@
<script lang="ts" setup>
import { PropType, ref } from 'vue'
import cityGroupData from '../../../../../../common/constant/cityGroup.json'
import cityGroupData from '@geekgeekrun/geek-auto-start-chat-with-boss/cityGroup.mjs'
import { gtagRenderer } from '@renderer/utils/gtag'
import { ElRadioGroup } from 'element-plus'
const props = defineProps({
modelValue: {
type: Array as PropType<string[]>
type: [Array, String] as PropType<string[] | string | null>,
default: null
},
multiple: {
type: Boolean,
default: true
},
gtShowScene: {
type: String
}
})
const emits = defineEmits(['update:modelValue'])
@@ -132,7 +188,7 @@ const { hotCityList, cityGroup } = cityGroupData.zpData
const activeTabName = ref('热门城市')
const isDialogVisible = ref(false)
const selectedCities = ref([])
const selectedCities = ref(null)
const cityGroupsByAlphabetMap = ref(
new Map(['ABCDE', 'FGHJ', 'KLMN', 'PQRST', 'WXYZ'].map((it) => [it, []]))
@@ -151,30 +207,38 @@ for (const group of cityGroup) {
function handleDialogOpen() {
activeTabName.value = '热门城市'
selectedCities.value = [...(props.modelValue ?? [])]
gtagRenderer('choose_city_dialog_open')
selectedCities.value = props.multiple ? [...(props.modelValue ?? [])] : props.modelValue
gtagRenderer('choose_city_dialog_open', { gtShowScene: props.gtShowScene })
}
function handleCancelClicked() {
gtagRenderer('choose_city_cancel_button_clicked')
gtagRenderer('choose_city_cancel_button_clicked', { gtShowScene: props.gtShowScene })
isDialogVisible.value = false
}
function handleConfirmClicked() {
gtagRenderer('choose_city_confirm_button_clicked', { value: selectedCities.value.join(',') })
gtagRenderer('choose_city_confirm_button_clicked', {
gtShowScene: props.gtShowScene,
value: Array.isArray(selectedCities.value)
? selectedCities.value.join(',')
: selectedCities.value
})
isDialogVisible.value = false
emits('update:modelValue', [...(selectedCities.value ?? [])])
emits(
'update:modelValue',
props.multiple ? [...(selectedCities.value ?? [])] : selectedCities.value
)
}
function handleDialogClosed() {
selectedCities.value = []
gtagRenderer('choose_city_dialog_closed')
selectedCities.value = props.multiple ? [] : null
gtagRenderer('choose_city_dialog_closed', { gtShowScene: props.gtShowScene })
}
function handleClearSelectedCitiesInModelValue() {
emits('update:modelValue', [])
gtagRenderer('clear_selected_cities_in_mv_clicked')
emits('update:modelValue', (selectedCities.value = props.multiple ? [] : null))
gtagRenderer('clear_selected_cities_in_mv_clicked', { gtShowScene: props.gtShowScene })
}
function handleClearSelectedCitiesInDialog() {
selectedCities.value = []
gtagRenderer('clear_selected_cities_in_dialog_clicked')
selectedCities.value = props.multiple ? [] : null
gtagRenderer('clear_selected_cities_in_dialog_clicked', { gtShowScene: props.gtShowScene })
}
</script>

View File

@@ -314,7 +314,47 @@
width: '100%'
}"
>
<city-chooser v-model="formContent.expectCityList" />
<city-chooser v-model="formContent.expectCityList">
<template #default="{ modelValue, showDialog, clearValue }">
<div v-if="modelValue?.length">
<div>当前已选择城市:</div>
<div flex flex-wrap gap-10px>
<el-tag v-for="it in modelValue" :key="it">
{{ it }}
</el-tag>
</div>
</div>
<div v-else>
<div>当前未选择任何期望城市,将不会按照城市进行筛选</div>
</div>
<div
line-height-1
:style="{
marginTop: modelValue?.length ? '10px' : ''
}"
>
<el-button
size="small"
type="primary"
@click="
() => {
// isDialogVisible = true
showDialog()
gtagRenderer('choose_city_entry_button_clicked')
}
"
>选择城市</el-button
>
<el-button
v-if="modelValue?.length"
size="small"
type="danger"
@click="clearValue"
>清空已选择的所有城市</el-button
>
</div>
</template>
</city-chooser>
</div>
</el-form-item>
<div

Binary file not shown.

Before

Width:  |  Height:  |  Size: 793 KiB

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

@@ -0,0 +1,23 @@
diff --git a/src/win32/index.js b/src/win32/index.js
index 53e2279e4a0c51dfe0725100005fafed2c6537a5..d9de7840e2ad0bfe625e6067cc764cee220035f1 100644
--- a/src/win32/index.js
+++ b/src/win32/index.js
@@ -15,12 +15,13 @@ export function findChromeBinaryOnWin32(canary) {
].filter(Boolean)
let result
-
- prefixes.forEach(prefix => {
+ for (const prefix of prefixes) {
let chromePath = join(prefix, suffix)
- if (canAccess(chromePath)) result = chromePath
- })
-
+ if (canAccess(chromePath)) {
+ result = chromePath
+ break
+ }
+ }
return result
}

169
pnpm-lock.yaml generated
View File

@@ -4,6 +4,11 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
patchedDependencies:
find-chrome-bin@2.0.4:
hash: hlvcqc4im4z7xkxtwwtz6sdzui
path: patches/find-chrome-bin@2.0.4.patch
importers:
.:
@@ -56,16 +61,15 @@ importers:
playwright-extra:
specifier: '*'
version: 4.3.6
puppeteer:
specifier: ^24.19.0
version: 24.19.0(typescript@5.3.3)
puppeteer-extra:
specifier: ^3.3.6
version: 3.3.6(puppeteer@24.19.0)
puppeteer-extra-plugin:
specifier: ^3.2.3
version: 3.2.3(playwright-extra@4.3.6)(puppeteer-extra@3.3.6)
devDependencies:
puppeteer:
specifier: ^24.19.0
version: 24.19.0(typescript@5.3.3)
packages/launch-bosszhipin-login-page-with-preload-extension:
dependencies:
@@ -249,8 +253,8 @@ importers:
specifier: ^9.20.1
version: 9.20.1(eslint@8.56.0)
find-chrome-bin:
specifier: ^2.0.1
version: 2.0.1
specifier: ^2.0.4
version: 2.0.4(patch_hash=hlvcqc4im4z7xkxtwwtz6sdzui)
js-yaml:
specifier: ^4.1.0
version: 4.1.0
@@ -1444,19 +1448,21 @@ packages:
resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==}
dev: true
/@puppeteer/browsers@1.9.0:
resolution: {integrity: sha512-QwguOLy44YBGC8vuPP2nmpX4MUN2FzWbsnvZJtiCzecU3lHmVZkaC1tq6rToi9a200m8RzlVtDyxCS0UIDrxUg==}
engines: {node: '>=16.3.0'}
/@puppeteer/browsers@2.10.10:
resolution: {integrity: sha512-3ZG500+ZeLql8rE0hjfhkycJjDj0pI/btEh3L9IkWUYcOrgP0xCNRq3HbtbqOPbvDhFaAWD88pDFtlLv8ns8gA==}
engines: {node: '>=18'}
hasBin: true
dependencies:
debug: 4.3.4
debug: 4.4.3
extract-zip: 2.0.1
progress: 2.0.3
proxy-agent: 6.3.1
tar-fs: 3.0.4
unbzip2-stream: 1.4.3
proxy-agent: 6.5.0
semver: 7.7.3
tar-fs: 3.1.1
yargs: 17.7.2
transitivePeerDependencies:
- bare-abort-controller
- bare-buffer
- supports-color
dev: true
@@ -1476,6 +1482,7 @@ packages:
- bare-abort-controller
- bare-buffer
- supports-color
dev: false
/@puppeteer/browsers@2.11.0:
resolution: {integrity: sha512-n6oQX6mYkG8TRPuPXmbPidkUbsSRalhmaaVAQxvH1IkQy63cwsH+kOjB3e4cpCDHg0aSvsiX9bQ4s2VB6mGWUQ==}
@@ -2398,15 +2405,6 @@ packages:
transitivePeerDependencies:
- supports-color
/agent-base@7.1.0:
resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
engines: {node: '>= 14'}
dependencies:
debug: 4.4.3
transitivePeerDependencies:
- supports-color
dev: true
/agent-base@7.1.4:
resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
engines: {node: '>= 14'}
@@ -2772,10 +2770,12 @@ packages:
/buffer@5.7.1:
resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
requiresBuild: true
dependencies:
base64-js: 1.5.1
ieee754: 1.2.1
dev: true
optional: true
/buffer@6.0.3:
resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
@@ -2943,6 +2943,7 @@ packages:
devtools-protocol: 0.0.1495869
mitt: 3.0.1
zod: 3.25.76
dev: false
/chromium-pickle-js@0.2.0:
resolution: {integrity: sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==}
@@ -3120,6 +3121,7 @@ packages:
js-yaml: 4.1.0
parse-json: 5.2.0
typescript: 5.3.3
dev: false
/crc@3.8.0:
resolution: {integrity: sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==}
@@ -3307,6 +3309,7 @@ packages:
/devtools-protocol@0.0.1495869:
resolution: {integrity: sha512-i+bkd9UYFis40RcnkW7XrOprCujXRAHg62IVh/Ah3G8MmNXpCGt1m0dTFhSdx/AVs8XEMbdOGRwdkR1Bcta8AA==}
dev: false
/diff@4.0.2:
resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
@@ -3580,6 +3583,7 @@ packages:
resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
dependencies:
is-arrayish: 0.2.1
dev: false
/es-errors@1.3.0:
resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
@@ -3935,14 +3939,17 @@ packages:
to-regex-range: 5.0.1
dev: true
/find-chrome-bin@2.0.1:
resolution: {integrity: sha512-aDwC2y0dLxt0GFmQ+q8bqBCZ10VW9zYT/lNV806tRDqDAh5XpkTWulB96RKDHDuKu36m/dEvhmhD5IU237oOTg==}
/find-chrome-bin@2.0.4(patch_hash=hlvcqc4im4z7xkxtwwtz6sdzui):
resolution: {integrity: sha512-iKiqIb7FsA0hwnq0vvDay4RsmHUFLvWVquTb59XVlxfHS68XaWZfEjriF2vTZ3k/plicyKZxMJLqxKt10kSOtQ==}
engines: {node: '>=18.0.0'}
dependencies:
'@puppeteer/browsers': 1.9.0
'@puppeteer/browsers': 2.10.10
transitivePeerDependencies:
- bare-abort-controller
- bare-buffer
- supports-color
dev: true
patched: true
/find-up@5.0.0:
resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
@@ -4348,16 +4355,6 @@ packages:
- supports-color
dev: true
/http-proxy-agent@7.0.0:
resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
engines: {node: '>= 14'}
dependencies:
agent-base: 7.1.0
debug: 4.4.3
transitivePeerDependencies:
- supports-color
dev: true
/http-proxy-agent@7.0.2:
resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
engines: {node: '>= 14'}
@@ -4383,16 +4380,6 @@ packages:
transitivePeerDependencies:
- supports-color
/https-proxy-agent@7.0.2:
resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
engines: {node: '>= 14'}
dependencies:
agent-base: 7.1.0
debug: 4.4.3
transitivePeerDependencies:
- supports-color
dev: true
/https-proxy-agent@7.0.6:
resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
engines: {node: '>= 14'}
@@ -4488,15 +4475,15 @@ packages:
resolution: {integrity: sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==}
engines: {node: '>= 12'}
/ip@1.1.8:
resolution: {integrity: sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==}
dev: true
/ip@2.0.0:
resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==}
requiresBuild: true
dev: false
optional: true
/is-arrayish@0.2.1:
resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
dev: false
/is-binary-path@2.1.0:
resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
@@ -4639,6 +4626,7 @@ packages:
/json-parse-even-better-errors@2.3.1:
resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
dev: false
/json-schema-traverse@0.4.1:
resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
@@ -4725,6 +4713,7 @@ packages:
/lines-and-columns@1.2.4:
resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
dev: false
/local-pkg@0.4.3:
resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
@@ -5017,6 +5006,7 @@ packages:
/mitt@3.0.1:
resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
dev: false
/mixin-object@2.0.1:
resolution: {integrity: sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==}
@@ -5026,10 +5016,6 @@ packages:
is-extendable: 0.1.1
dev: false
/mkdirp-classic@0.5.3:
resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
dev: true
/mkdirp@1.0.4:
resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
engines: {node: '>=10'}
@@ -5320,22 +5306,6 @@ packages:
dev: false
optional: true
/pac-proxy-agent@7.0.1:
resolution: {integrity: sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==}
engines: {node: '>= 14'}
dependencies:
'@tootallnate/quickjs-emscripten': 0.23.0
agent-base: 7.1.0
debug: 4.4.3
get-uri: 6.0.2
http-proxy-agent: 7.0.0
https-proxy-agent: 7.0.2
pac-resolver: 7.0.0
socks-proxy-agent: 8.0.2
transitivePeerDependencies:
- supports-color
dev: true
/pac-proxy-agent@7.2.0:
resolution: {integrity: sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==}
engines: {node: '>= 14'}
@@ -5351,15 +5321,6 @@ packages:
transitivePeerDependencies:
- supports-color
/pac-resolver@7.0.0:
resolution: {integrity: sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==}
engines: {node: '>= 14'}
dependencies:
degenerator: 5.0.1
ip: 1.1.8
netmask: 2.0.2
dev: true
/pac-resolver@7.0.1:
resolution: {integrity: sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==}
engines: {node: '>= 14'}
@@ -5381,6 +5342,7 @@ packages:
error-ex: 1.3.2
json-parse-even-better-errors: 2.3.1
lines-and-columns: 1.2.4
dev: false
/parse5-htmlparser2-tree-adapter@6.0.1:
resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==}
@@ -5566,22 +5528,6 @@ packages:
err-code: 2.0.3
retry: 0.12.0
/proxy-agent@6.3.1:
resolution: {integrity: sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==}
engines: {node: '>= 14'}
dependencies:
agent-base: 7.1.0
debug: 4.4.3
http-proxy-agent: 7.0.0
https-proxy-agent: 7.0.2
lru-cache: 7.18.3
pac-proxy-agent: 7.0.1
proxy-from-env: 1.1.0
socks-proxy-agent: 8.0.2
transitivePeerDependencies:
- supports-color
dev: true
/proxy-agent@6.5.0:
resolution: {integrity: sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==}
engines: {node: '>= 14'}
@@ -5627,6 +5573,7 @@ packages:
- bufferutil
- supports-color
- utf-8-validate
dev: false
/puppeteer-extra-plugin-stealth@2.11.2(puppeteer-extra@3.3.6):
resolution: {integrity: sha512-bUemM5XmTj9i2ZerBzsk2AN5is0wHMNE6K0hXBzBXOzP5m5G3Wl0RHhiqKeHToe/uIH8AoZiGhc1tCkLZQPKTQ==}
@@ -5753,6 +5700,7 @@ packages:
- supports-color
- typescript
- utf-8-validate
dev: false
/queue-microtask@1.2.3:
resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
@@ -6041,17 +5989,6 @@ packages:
dev: false
optional: true
/socks-proxy-agent@8.0.2:
resolution: {integrity: sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==}
engines: {node: '>= 14'}
dependencies:
agent-base: 7.1.0
debug: 4.4.3
socks: 2.7.1
transitivePeerDependencies:
- supports-color
dev: true
/socks-proxy-agent@8.0.5:
resolution: {integrity: sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==}
engines: {node: '>= 14'}
@@ -6065,9 +6002,12 @@ packages:
/socks@2.7.1:
resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
requiresBuild: true
dependencies:
ip: 2.0.0
smart-buffer: 4.2.0
dev: false
optional: true
/socks@2.8.7:
resolution: {integrity: sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==}
@@ -6254,14 +6194,6 @@ packages:
engines: {node: '>=6'}
dev: false
/tar-fs@3.0.4:
resolution: {integrity: sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==}
dependencies:
mkdirp-classic: 0.5.3
pump: 3.0.0
tar-stream: 3.1.7
dev: true
/tar-fs@3.1.1:
resolution: {integrity: sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==}
dependencies:
@@ -6336,6 +6268,7 @@ packages:
/through@2.3.8:
resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
dev: false
/tiny-typed-emitter@2.1.0:
resolution: {integrity: sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==}
@@ -6454,6 +6387,7 @@ packages:
/typed-query-selector@2.12.0:
resolution: {integrity: sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==}
dev: false
/typeorm@0.3.11(sqlite3@5.1.6)(ts-node@10.9.2):
resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
@@ -6545,13 +6479,6 @@ packages:
resolution: {integrity: sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==}
dev: true
/unbzip2-stream@1.4.3:
resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
dependencies:
buffer: 5.7.1
through: 2.3.8
dev: true
/unconfig@0.3.11:
resolution: {integrity: sha512-bV/nqePAKv71v3HdVUn6UefbsDKQWRX+bJIkiSm0+twIds6WiD2bJLWWT3i214+J/B4edufZpG2w7Y63Vbwxow==}
dependencies:
@@ -6992,6 +6919,7 @@ packages:
optional: true
utf-8-validate:
optional: true
dev: false
/xml-name-validator@4.0.0:
resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
@@ -7084,3 +7012,4 @@ packages:
/zod@3.25.76:
resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
dev: false