string | | 密钥
| | [param0.isDryRun] |boolean | false | 是否演练
| | [param0.mainBranch] |string | "'develop'" | 主分支
| +| [param0.whiteBranchReg] |Regexp | /^release\|develop\|hotfix\\/.+$/ | 不处理的分支正则
| diff --git a/package.json b/package.json index 69388cfb..7e8d3cb1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "t-comm", - "version": "1.3.90", + "version": "1.3.94", "description": "丰富易用的工具库", "main": "lib/index.js", "module": "lib/index.esm.js", diff --git a/src/console/image.ts b/src/console/image.ts new file mode 100644 index 00000000..cbb6638b --- /dev/null +++ b/src/console/image.ts @@ -0,0 +1,41 @@ +export const consoleImage = function (url: string) { + const image = new Image(); + image.onload = function (this: any) { + // @ts-ignore + const isChromium = navigator.userAgent.match(/chrome|chromium|crios/i) && !!window.chrome; + const style = [ + 'font-size: 0px;', + !isChromium ? `line-height: ${this.height}px;` : '', + `padding: ${this.height / 2}px ${this.width / 2}px;`, + `background: url(${url}) center center no-repeat;`, + 'background-size: contain;', + ].join(' '); + console.log('%c ', style); + }; + image.src = url; +}; + +/** + * 获取图片，并转 base64 + * + * @param url 图片链接 + * @returns 获取结果 + * @example + * ```ts + * getBase64FromUrl(imgUrl).then(consoleImage); + * ``` + */ +export async function getBase64FromUrl(url: string) { + const data = await fetch(url); + const blob = await data.blob(); + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.readAsDataURL(blob); + reader.onloadend = () => { + const base64data = reader.result; + resolve(base64data); + }; + reader.onerror = reject; + }); +} + diff --git a/src/console/index.ts b/src/console/index.ts new file mode 100644 index 00000000..7111a1e8 --- /dev/null +++ b/src/console/index.ts @@ -0,0 +1,4 @@ +export { + consoleImage, + getBase64FromUrl, +} from './image'; diff --git a/src/daily-merge/daily-merge.ts b/src/daily-merge/daily-merge.ts index 500b56bf..bc9ed3be 100644 --- a/src/daily-merge/daily-merge.ts +++ b/src/daily-merge/daily-merge.ts @@ -4,13 +4,9 @@ import { getOneProjectDetail } from '../tgit/project'; import { execCommand } from '../node/node-command'; import { batchSendWxRobotMarkdown } from '../wecom-robot/batch-send'; import { getGitCommitInfo } from '../git/git'; +import { shouldInclude, DEFAULT_WHITE_REG } from './helper'; -const WHITE_BRANCH_LIST = [ - 'develop', - 'release', -]; - const CHAT_ID = ['ALL']; @@ -26,10 +22,13 @@ async function getBranches({ baseUrl, repoName, privateToken, + whiteBranchReg, }: { baseUrl: string; repoName: string; privateToken: string; + + whiteBranchReg?: RegExp }) { const res = await getBranchesByProjectName({ projectName: repoName, @@ -48,9 +47,10 @@ async function getBranches({ return false; }); + console.log('[Origin Branches]', list.map(item => item?.name)); - const branches = list.filter(branch => WHITE_BRANCH_LIST.indexOf(branch.name) <= -1); - console.log('[branches]', branches.map(item => item?.name)); + const branches = list.filter(branch => shouldInclude(branch.name, whiteBranchReg)); + console.log('[Filter Branches]', branches.map(item => item?.name)); return branches; } @@ -177,6 +177,7 @@ async function sendSendMsg(content: string, webhookUrl: string) { * @param {string} param0.privateToken 密钥 * @param {boolean} [param0.isDryRun=false] 是否演练 * @param {string} [param0.mainBranch='develop'] 主分支 + * @param {Regexp} [param0.whiteBranchReg=/^release\|develop\|hotfix\\/.+$/] 不处理的分支正则 * @returns {*} * @example * @@ -206,6 +207,8 @@ export async function dailyMerge({ isDryRun = false, mainBranch = 'develop', + + whiteBranchReg = DEFAULT_WHITE_REG, }: { webhookUrl: string; appName: string; @@ -217,6 +220,8 @@ export async function dailyMerge({ isDryRun?: boolean; mainBranch?: string; + + whiteBranchReg?: RegExp; }) { console.log('\nSTART Daily Merge =====>'); if (!baseUrl) { @@ -233,6 +238,8 @@ export async function dailyMerge({ baseUrl, repoName, privateToken, + + whiteBranchReg, }); if (!branches || !branches.length) { diff --git a/src/daily-merge/helper.ts b/src/daily-merge/helper.ts new file mode 100644 index 00000000..eb5d900d --- /dev/null +++ b/src/daily-merge/helper.ts @@ -0,0 +1,5 @@ +export const DEFAULT_WHITE_REG = /^release|develop|hotfix\/.+$/; + +export function shouldInclude(branch = '', reg = DEFAULT_WHITE_REG) { + return !reg.test(branch); +} diff --git a/src/index.ts b/src/index.ts index 83b18998..7b8dcbab 100644 --- a/src/index.ts +++ b/src/index.ts @@ -9,6 +9,7 @@ export * from './city'; export * from './clipboard'; export * from './color'; export * from './component'; +export * from './console'; export * from './constant'; export * from './cookie'; export * from './cron'; diff --git a/src/msdk/msdk.ts b/src/msdk/msdk.ts index 7663e19c..1c4631a7 100644 --- a/src/msdk/msdk.ts +++ b/src/msdk/msdk.ts @@ -123,7 +123,7 @@ export function callJsBrowserAdapter() { }); } } else if (env.isSlugSdk) { - loader('https://tiem-cdn.qq.com/slugteam/sdk/browser_adapt.js', () => { + loader('https://image-1251917893.file.myqcloud.com/igame/common/js/browser_adapt_20240702.js', () => { resolve(true); }); } diff --git a/src/v-console/config.ts b/src/v-console/config.ts index 264a9938..0782a236 100644 --- a/src/v-console/config.ts +++ b/src/v-console/config.ts @@ -128,3 +128,36 @@ export const COMMIT_LIST = [ label: 'Last Commit Hash', }, ]; + + +export const AEGIS_PERFORMANCE_KEY = '__AEGIS_PERFORMANCE'; +export const AEGIS_PERFORMANCE_LIST = [ + { + key: 'dnsLookup', + label: 'Aegis DNS 查询', + }, + { + key: 'tcp', + label: 'Aegis TCP 链接', + }, + { + key: 'ttfb', + label: 'Aegis SSL 建连', + }, + { + key: 'contentDownload', + label: 'Aegis contentDownload', + }, + { + key: 'resourceDownload', + label: 'Aegis resourceDownload', + }, + { + key: 'domParse', + label: 'Aegis DOM解析', + }, + { + key: 'firstScreenTiming', + label: 'Aegis 首屏耗时', + }, +]; diff --git a/src/v-console/plugin/version.ts b/src/v-console/plugin/version.ts index 59e3b1db..397eeb10 100644 --- a/src/v-console/plugin/version.ts +++ b/src/v-console/plugin/version.ts @@ -4,6 +4,9 @@ import { V_CONSOLE_DOM, BUILD_LIST, COMMIT_LIST, + + AEGIS_PERFORMANCE_KEY, + AEGIS_PERFORMANCE_LIST, } from '../config'; import type { IPlugin } from '../types'; @@ -41,6 +44,8 @@ function renderPlugin(callback: Function) { }) .concat(EMPTY_LINE) .concat(getVersionHtml()) + .concat(EMPTY_LINE) + .concat(getAegisPerformanceInfo()) .join('\n'); html += ` @@ -183,3 +188,20 @@ function getVersionHtml() { EMPTY_LINE, ].join('\n'); } + + +function getAegisPerformanceInfo() { + const perfInfo = (window[AEGIS_PERFORMANCE_KEY as any] || {}) as any; + + const perfHtmlList = AEGIS_PERFORMANCE_LIST.map((item) => { + const { key, label } = item; + return `