feat: support sub-deepl

Author: geekdada

package.json

@@ -9,8 +9,8 @@
   "scripts": {
     "clean": "rimraf build && rimraf release",
     "build": "run-s clean && cross-env NODE_ENV=production rollup -c rollup.config.js",
-    "bundle": "node scripts/bundle.js",
-    "bundle:watch": "nodemon --watch build scripts/bundle.js",
+    "bundle": "cross-env NODE_ENV=production node scripts/bundle.js",
+    "bundle:watch": "cross-env NODE_ENV=development nodemon --watch build scripts/bundle.js",
     "make-release": "run-s build bundle update-appcast",
     "dev": "run-s clean && cross-env NODE_ENV=development rollup -c rollup.config.js --watch",
     "type-check": "tsc --noEmit",
@@ -25,6 +25,7 @@
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
+    "@rollup/plugin-replace": "^2.3.4",
     "@rollup/plugin-typescript": "^6.1.0",
     "@types/adm-zip": "^0.4.33",
     "@types/jsonfile": "^6.0.0",

rollup.config.js

@@ -5,6 +5,7 @@ import commonjs from '@rollup/plugin-commonjs'
 import resolve from '@rollup/plugin-node-resolve'
 import nodePolyfills from 'rollup-plugin-node-polyfills'
 import typescript from '@rollup/plugin-typescript'
+import replace from '@rollup/plugin-replace'
 
 export default {
   input: join(__dirname, './src/main.ts'),
@@ -28,6 +29,11 @@ export default {
     commonjs({
       include: ['node_modules/**'],
     }),
+    replace({
+      'process.env.NODE_ENV': JSON.stringify(
+        process.env.NODE_ENV || 'development',
+      ),
+    }),
     nodePolyfills(),
     typescript({}),
   ],

scripts/bundle.js

@@ -35,6 +35,14 @@ function generateInfo() {
             title: 'Sub DeepL',
             value: 'sub-deepl',
           },
+          ...(process.env.NODE_ENV === 'development'
+            ? [
+                {
+                  title: 'Local',
+                  value: 'local',
+                },
+              ]
+            : null),
         ],
       },
       {

src/api.ts

@@ -1,36 +1,52 @@
 import { RequestCallbackResponse, RequestObject } from '../types/global'
 
 export class Api {
-  constructor(private provider: 'deepl' | 'sub-deepl', private token: string) {}
+  constructor(
+    private provider: 'deepl' | 'sub-deepl' | 'local',
+    private token: string,
+  ) {}
 
   private get baseUrl(): string {
     switch (this.provider) {
       case 'deepl':
         return 'https://api.deepl.com'
       case 'sub-deepl':
         return 'https://sub-deepl-api.nerdynerd.org'
+      case 'local':
+        return 'http://localhost:1337'
     }
   }
 
   async request<T = Record<string, unknown>>(
     requestObject: Omit<RequestObject, 'handler' | 'header'>,
   ): Promise<RequestCallbackResponse<T>> {
     try {
+      const body: Record<string, any> = {
+        ...requestObject.body,
+        auth_key: this.token,
+      }
+      let url = `${this.baseUrl}${requestObject.url}`
+
+      if (this.provider !== 'deepl') {
+        if (['GET', 'HEAD', 'DELETE'].includes(requestObject.method)) {
+          body.token = body.auth_key
+        } else {
+          url = `${url}?token=${this.token}`
+        }
+      }
+
       return await $http.request({
         ...requestObject,
-        url: `${this.baseUrl}${requestObject.url}`,
+        url,
         header: {
           'Content-Type': 'application/x-www-form-urlencoded',
         },
-        body: {
-          ...requestObject.body,
-          auth_key: this.token,
-        },
+        body,
       })
     } catch (e) {
       Object.assign(e, {
         _type: 'network',
-        _message: '接口请求错误',
+        _message: '接口请求错误 ' + e.message,
       })
 
       throw e

src/main.ts

@@ -35,7 +35,7 @@ export function translate(
         text: string
       }>
     }>({
-      method: 'GET',
+      method: 'POST',
       url: '/v2/translate',
       body: {
         text: query.text,
@@ -47,36 +47,24 @@ export function translate(
     })
 
     if (response.error) {
-      $log.error(response.error)
-      completion({
-        error: {
-          type: 'api',
-          message: '接口请求错误',
-        },
-      })
-    } else {
       const { statusCode } = response.response
 
-      if (statusCode > 299) {
-        let reason: ErrorType
+      let reason: ErrorType
 
-        if (statusCode >= 400 && statusCode < 500) {
-          reason = 'param'
-        } else {
-          reason = 'api'
-        }
-
-        completion({
-          error: {
-            type: reason,
-            message: translateStatusCode(statusCode),
-            addtion: response.data,
-          },
-        })
-
-        return
+      if (statusCode >= 400 && statusCode < 500) {
+        reason = 'param'
+      } else {
+        reason = 'api'
       }
 
+      completion({
+        error: {
+          type: reason,
+          message: `接口响应错误 ${translateStatusCode(statusCode)}`,
+          addtion: JSON.stringify(response),
+        },
+      })
+    } else {
       const translations = response.data?.translations
 
       if (!translations || !translations.length) {
@@ -98,11 +86,11 @@ export function translate(
       })
     }
   })().catch((err) => {
-    $log.error(err)
     completion({
       error: {
         type: err._type || 'unknown',
         message: err._message || '未知错误',
+        addtion: err._addtion,
       },
     })
   })

src/utils.ts

@@ -22,7 +22,7 @@ export const translateStatusCode = (code: number): string => {
     case 400:
       return 'Bad request. Please check error message and your parameters.'
     case 403:
-      return 'Authorization failed. Please supply a valid auth_key parameter.'
+      return 'Authorization failed. Please supply a valid token.'
     case 404:
       return 'The requested resource could not be found.'
     case 413:

types/global.d.ts

@@ -12,16 +12,16 @@ interface $info {
 }
 
 interface $log {
-  info(obj: string | Record<string, unknown>): void
-  error(obj: string | Record<string, unknown>): void
+  info(obj?: string | Record<string, unknown>): void
+  error(obj?: string | Record<string, unknown>): void
 }
 
 interface $http {
   request<T>(requestObject: RequestObject): Promise<RequestCallbackResponse<T>>
 }
 
 export interface RequestObject {
-  method: 'GET' | 'POST' | 'DELETE'
+  method: 'GET' | 'POST' | 'DELETE' | 'HEAD'
   url: string
   header?: Record<string, string>
   body?: Record<string, unknown>
@@ -51,7 +51,7 @@ export interface RequestCallbackResponse<T = Record<string, unknown>> {
 
 interface $option {
   token: string
-  provider: 'deepl' | 'sub-deepl'
+  provider: 'deepl' | 'sub-deepl' | 'local'
   formality: 'default' | 'more' | 'less'
 }
 

yarn.lock

@@ -240,6 +240,14 @@
     is-module "^1.0.0"
     resolve "^1.17.0"
 
+"@rollup/plugin-replace@^2.3.4":
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.4.tgz#7dd84c17755d62b509577f2db37eb524d7ca88ca"
+  integrity sha512-waBhMzyAtjCL1GwZes2jaE9MjuQ/DQF2BatH3fRivUF3z0JBFrU0U6iBNC/4WR+2rLKhaAhPWDNPYp4mI6RqdQ==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    magic-string "^0.25.7"
+
 "@rollup/plugin-typescript@^6.1.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-6.1.0.tgz#289e7f0ea12fd659bd13ad59dda73b9055538b83"