Revert "fix: 优化eval间接调用"

This reverts commit 3fc8c81.

package.json

@@ -269,7 +269,9 @@
     "sass-loader": "^13.0.0",
     "source-map-support": "^0.5.21",
     "style-loader": "^3.0.0",
+    "sucrase": "^3.29.0",
     "ts-jest": "^29.0.5",
+    "ts-node": "^10.9.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "tsx": "^3.12.2",
     "typescript": "^5.0.0-beta",

src/renderer/services/exchange.ts

@@ -95,7 +95,7 @@ export async function GetGlobalBondFromEastmoney() {
       low: string;
       change: string;
       percent: string;
-    }[] = (0, eval)(`(()=>{
+    }[] = eval(`(()=>{
       ${script};
       return data.slice(1).map((item)=>{
         const [area,code,name,date,time,price,high,low,change,percent] = item.split(',');

src/renderer/services/fund.ts

@@ -14,7 +14,7 @@ export async function FromEastmoney(code: string) {
       responseType: 'text',
     });
     if (body.startsWith('jsonpgz')) {
-      const fund: Fund.ResponseItem = (0, eval)(body);
+      const fund: Fund.ResponseItem = eval(body);
       if (fund === undefined) {
         return await GetEtfFundHourFromEastMoney(code);
       } else {
@@ -281,7 +281,7 @@ export async function FromFund123(code: string) {
     const $ = cheerio.load(html);
     const script = $('script').eq(2).html();
     const fixscript = script?.replace(/window\.context/g, 'const o');
-    const context = (0, eval)(`(() => {
+    const context = eval(`(() => {
       ${fixscript}
       return o;
     })()`);
@@ -568,7 +568,7 @@ export async function FromFund10jqka(code: string) {
       },
     });
 
-    const string = (0, eval)(`(()=>{
+    const string = eval(`(()=>{
       const ${script};
       return vm_fd_${data.hqcode};
     })()`);
@@ -959,7 +959,7 @@ export async function GetQDIIFundFromFund123(code: string) {
     const $ = cheerio.load(html);
     const script = $('script').eq(2).html();
     const fixscript = script?.replace(/window\.context/g, 'const o');
-    const context = (0, eval)(`(() => {
+    const context = eval(`(() => {
       ${fixscript}
       return o;
     })()`);
@@ -1279,7 +1279,7 @@ export async function GetRankDataFromEasemoney(type: string) {
         ed: `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`,
       },
     });
-    return (0, eval)(`(() => {
+    return eval(`(() => {
       ${body}
       return rankData.datas;
     })()`);
@@ -1294,7 +1294,7 @@ export async function GetFundRatingFromEasemoney() {
     const { body: html } = await request('http://fund.eastmoney.com/data/fundrating.html', { responseType: 'text' });
     const $ = cheerio.load(html);
     const script = $('#fundinfo').find('script').html();
-    const fundinfos = (0, eval)(`(() => {
+    const fundinfos = eval(`(() => {
       ${script}
       return fundinfos;
     })()`);

src/renderer/services/news.ts

@@ -10,7 +10,7 @@ export async function GetLiveList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -29,7 +29,7 @@ export async function GetFocusList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -48,7 +48,7 @@ export async function GetListedList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -67,7 +67,7 @@ export async function GetGlobalList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -86,7 +86,7 @@ export async function GetGoodsList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -105,7 +105,7 @@ export async function GetExchangeList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -124,7 +124,7 @@ export async function GetBondList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -143,7 +143,7 @@ export async function GetFundList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -162,7 +162,7 @@ export async function GetChinaList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -181,7 +181,7 @@ export async function GetUsaList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -200,7 +200,7 @@ export async function GetEuList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -219,7 +219,7 @@ export async function GetUkList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -238,7 +238,7 @@ export async function GetJpList() {
       },
     });
 
-    const list: News.ResponseItem[] = (0, eval)(`(()=>{
+    const list: News.ResponseItem[] = eval(`(()=>{
       ${script}
       return ajaxResult.LivesList;
     })()`);
@@ -272,7 +272,7 @@ export async function GetRecent(keyword: string, pageindex: number, type: string
         cb: 'cb',
       },
     });
-    const data = (0, eval)(script);
+    const data = eval(script);
     return {
       total: data.hitsTotal > 100 ? 100 : data.hitsTotal,
       list: data.result.cmsArticleWebOld,

src/renderer/services/stock.ts

@@ -63,7 +63,7 @@ export async function SearchFromEastmoney(keyword: string) {
         cb: 'cb',
       },
     });
-    const data = (0, eval)(script);
+    const data = eval(script);
 
     return (
       data.result.codetableLabelWeb.labelList.map((item: any) => {

src/renderer/services/zindex.ts

@@ -170,7 +170,7 @@ export async function GetEconomyIndexFromEastmoney(market: number) {
         _: Date.now(),
       },
     });
-    const data = (0, eval)(body);
+    const data = eval(body);
     const result = data.map((item: string) => {
       return item.split(',');
     });
@@ -421,7 +421,7 @@ export async function GetRemoteZindexConfig() {
       },
     }
   );
-  const a1 = (0, eval)(b1);
+  const a1 = eval(b1);
   const { body: b2 } = await request(
     `http://32.push2.eastmoney.com/api/qt/clist/get?pn=1&pz=5&po=1&np=1&ut=bd1d9ddb04089700cf9c27f6f7426281&fltt=2&invt=2&fid=f3&fs=m:1+t:1`,
     {
@@ -433,7 +433,7 @@ export async function GetRemoteZindexConfig() {
       },
     }
   );
-  const a2 = (0, eval)(b2);
+  const a2 = eval(b2);
   const { body: b3 } = await request(
     `http://32.push2.eastmoney.com/api/qt/clist/get?&pn=1&pz=5&po=1&np=1&ut=bd1d9ddb04089700cf9c27f6f7426281&fltt=2&invt=2&fid=f3&fs=m:0+t:5`,
     {
@@ -445,7 +445,7 @@ export async function GetRemoteZindexConfig() {
       },
     }
   );
-  const a3 = (0, eval)(b3);
+  const a3 = eval(b3);
   const result = [...a1, ...a2, ...a3];
   return result;
 }

src/renderer/utils/index.ts

@@ -105,7 +105,7 @@ export function GetVariblesColor(): Record<keyof typeof CONST.VARIBLES, string>
 
 export function Parsepingzhongdata(code: string) {
   try {
-    return (0, eval)(`(() => {
+    return eval(`(() => {
       ${code}
       return {
         /*基金持仓股票代码(新市场号)*/
@@ -151,7 +151,7 @@ export function Parsepingzhongdata(code: string) {
 
 export function ParseRemoteFunds(code: string) {
   try {
-    return (0, eval)(`(() => {
+    return eval(`(() => {
       ${code}
       return r;
     })()`);