🐛 Fix: url image download bug & tencent cos url encode bug

Author: Molunerfinn

src/plugins/uploader/tcyun.ts

@@ -142,9 +142,9 @@ const handle = async (ctx: IPicGo): Promise<IPicGo | boolean> => {
           delete img.base64Image
           delete img.buffer
           if (customUrl) {
-            img.imgUrl = `${customUrl}/${path}${img.fileName}${optionUrl}`
+            img.imgUrl = `${customUrl}/${encodeURIComponent(path)}${encodeURIComponent(img.fileName)}${optionUrl}`
           } else {
-            img.imgUrl = `https://${tcYunOptions.bucket}.cos.${tcYunOptions.area}.myqcloud.com/${path}${img.fileName}${optionUrl}`
+            img.imgUrl = `https://${tcYunOptions.bucket}.cos.${tcYunOptions.area}.myqcloud.com/${encodeURIComponent(path)}${encodeURIComponent(img.fileName)}${optionUrl}`
           }
         } else {
           throw new Error(res.body.msg)

src/types/index.ts

@@ -189,15 +189,28 @@ export type AxiosResponse<T = any, U = any> = import('axios').AxiosResponse<T, U
 
 export type AxiosRequestConfig<T = any> = import('axios').AxiosRequestConfig<T>
 
+export interface IRequestOptionsWithFullResponse {
+  resolveWithFullResponse: true
+}
+
+export interface IRequestOptionsWithJson {
+  json: true
+}
+
+export interface IRequestOptionsWithResponseTypeArrayBuffer {
+  responseType: 'arraybuffer'
+}
+
 /**
- * T is the config type
- * U is the response data type
+ * T is the response data type
+ * U is the config type
  */
-export type IResponse<T, U> = U extends {
-  resolveWithFullResponse: true
-} ? IFullResponse<T, U> : U extends {
-    json: true
-  } ? T : string
+export type IResponse<T, U> = U extends IRequestOptionsWithFullResponse
+  ? IFullResponse<T, U>
+  : U extends IRequestOptionsWithJson
+    ? T
+    : U extends IRequestOptionsWithResponseTypeArrayBuffer ?
+      Buffer : string
 
 /**
  * the old request lib will be removed in v1.5.0+

src/utils/common.ts

@@ -15,15 +15,15 @@ export const isUrl = (url: string): boolean => (url.startsWith('http://') || url
 export const isUrlEncode = (url: string): boolean => {
   url = url || ''
   try {
-    return url !== decodeURI(url)
+    return url !== decodeURIComponent(url)
   } catch (e) {
     // if some error caught, try to let it go
     return true
   }
 }
 export const handleUrlEncode = (url: string): string => {
   if (!isUrlEncode(url)) {
-    url = encodeURI(url)
+    url = encodeURIComponent(url)
   }
   return url
 }
@@ -70,7 +70,9 @@ export const getURLFile = async (url: string): Promise<IPathTransformedImgInfo>
   const requestFn = new Promise<IPathTransformedImgInfo>((resolve, reject) => {
     (async () => {
       try {
-        const res = await axios.get(url)
+        const res = await axios.get(url, {
+          responseType: 'arraybuffer'
+        })
           .then((resp) => {
             const contentType = resp.headers['content-type']
             if (contentType?.includes('image')) {
@@ -94,11 +96,12 @@ export const getURLFile = async (url: string): Promise<IPathTransformedImgInfo>
             reason: `${url} is not image`
           })
         }
-      } catch {
+      } catch (error: any) {
         clearTimeout(timeoutId)
         resolve({
           success: false,
-          reason: `request ${url} error`
+          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+          reason: `request ${url} error, ${error?.message ?? ''}`
         })
       }
     })().catch(reject)