fix: Youdao translator has only one result

package.json

@@ -1,6 +1,6 @@
 {
   "name": "youdao.translator",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "description": "Elegant translation tool",
   "main": "index.js",
   "scripts": {
@@ -12,9 +12,17 @@
   "devDependencies": {
     "rimraf": "^3.0.2",
     "rollup": "^2.59.0",
+    "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-copy": "^3.4.0",
+    "rollup-plugin-json": "^4.0.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-ts": "^1.4.7",
     "rollup-plugin-uglify": "^6.0.4",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.5"
+  },
+  "dependencies": {
+    "@types/boolbase": "^1.0.3",
+    "@types/cheerio": "^0.22.35",
+    "cheerio": "^1.0.0-rc.12"
   }
 }

rollup.config.js

@@ -1,6 +1,9 @@
 import ts from 'rollup-plugin-ts'
 import copy from 'rollup-plugin-copy'
 import { uglify } from 'rollup-plugin-uglify'
+import nodeResolve from 'rollup-plugin-node-resolve'
+import commonjs from 'rollup-plugin-commonjs';
+import json from 'rollup-plugin-json'
 
 export default {
   input: 'src/index.ts',
@@ -16,6 +19,9 @@ export default {
       { src: 'runtime/*', dest: 'dist/runtime' },
       { src: 'assets/*', dest: 'dist/assets' }
     ]}),
+    nodeResolve(),
+    commonjs(),
+    json(),
     uglify()
   ]
 }

src/adapters/adapter.ts

@@ -17,6 +17,6 @@ export interface Adapter {
 
   url :(word: string) => string;
 
-  parse: (response: any) => Result[]
+  parse: (response: any) => Promise<Result[]>
 }
 

src/adapters/baidu.ts

@@ -42,7 +42,7 @@ class Baidu implements Adapter {
     return "https://fanyi-api.baidu.com/api/trans/vip/translate?" + params.toString();
   }
 
-  parse(data: any): Result[] {
+  async parse(data: any): Promise<Result[]> {
     if (data.error_code) {
       return this.parseError(data.error_code);
     }

src/adapters/youdao.ts

@@ -1,5 +1,6 @@
 import { Adapter, Result } from "./adapter";
 import md5 from "../libs/md5";
+import cheerio from "cheerio";
 
 class Youdao implements Adapter {
   key: string;
@@ -40,16 +41,14 @@ class Youdao implements Adapter {
     return "https://openapi.youdao.com/api?" + params.toString();
   }
 
-  parse(data: any): Result[] {
+  async parse(data: any): Promise<Result[]> {
     if (data.errorCode !== "0") {
       return this.parseError(data.errorCode);
     }
 
-    const { translation, basic, web } = data;
-
+    const { translation, webdict, web } = data;
     this.parseTranslation(translation);
-    this.parseBasic(basic);
-    this.parseWeb(web);
+    await this.parseWebdict(webdict);
 
     return this.results;
   }
@@ -77,6 +76,51 @@ class Youdao implements Adapter {
     }
   }
 
+  // Thanks for @VWagen1989's solution
+  // https://github.com/whyliam/whyliam.workflows.youdao/issues/125#issuecomment-2119263993
+  private async parseWebdict(t: any) {
+    var url = t && t["url"]
+    await fetch(url)
+    .then(response => {
+      if (response.ok) {
+        return response.text();
+      }
+      throw new Error('Network response was not ok.');
+    })
+    .then(html => {
+      const $ = cheerio.load(html);
+      $('div.content-wrp.dict-container.opened').each((i, el) => {
+        this.parseResultItems($(el), $);
+      })
+    })
+    .catch(error => {
+      console.error('There has been a problem with your fetch operation:', error);
+    });
+  }
+
+  private parseResultItems(item, $) {
+    let e = this.word
+    // Tricky: It will just get the first trans-container.
+    // Because the others will not be available until you click the button to expand.
+    const tc = item.find('div[class^="trans-container"]');
+
+    let phonetics: string[] = [];
+    tc.find('span.phonetic').each((i, el) => {
+      const label = $(el).parent('span').contents().first().text().trim();
+      const phoneticText = $(el).text().trim();
+      phonetics.push(`${label} ${phoneticText}`);
+    });
+    const phoneticsCombined = phonetics.join('; ');
+    if (phoneticsCombined != '') {
+      this.addResult(phoneticsCombined, "回车可听发音", e, e);
+    }
+
+    // Extract translation results
+    item.find('ul li, ul a.clickable').each((i, el) => {
+      this.addResult($(el).text().trim(), this.word, e, e);
+    });
+  }
+
   private parseWeb(web: any) {
     if (web) {
       web.forEach((item, index) => {

src/translator.ts

@@ -24,7 +24,7 @@ class Translator implements ITranslator{
     // fetch
     const response = await redaxios.create().get(url);
     // parse
-    const result = this.adapter.parse(response.data);
+    const result = await this.adapter.parse(response.data);
     // compose
     return new Workflow().compose(result).output();
   }

tsconfig.json

@@ -9,6 +9,7 @@
     "strict": true,
     "esModuleInterop": false,
     "outDir": "out-tsc",
+    "allowSyntheticDefaultImports": true,
     "rootDir": "./"
   },
   "include": [