🐛 Fix: output empty after uploading when using isolate context

PicGo · May 9, 2021 · 79c228b · 79c228b
1 parent a0fbe68
commit 79c228b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/core/Lifecycle.ts b/src/core/Lifecycle.ts
@@ -98,9 +98,11 @@ class Lifecycle extends EventEmitter {
     let msg = ''
     const length = ctx.output.length
     for (let i = 0; i < length; i++) {
-      msg += handleUrlEncode(ctx.output[i].imgUrl)
-      if (i !== length - 1) {
-        msg += '\n'
+      if (typeof ctx.output[i].imgUrl !== 'undefined') {
+        msg += handleUrlEncode(ctx.output[i].imgUrl!)
+        if (i !== length - 1) {
+          msg += '\n'
+        }
       }
       delete ctx.output[i].base64Image
       delete ctx.output[i].buffer

diff --git a/src/core/PicGo.ts b/src/core/PicGo.ts
@@ -197,17 +197,17 @@ class PicGo extends EventEmitter implements IPicGo {
               fs.remove(imgPath).catch((e) => { this.log.error(e) })
             }
           })
-          await this.lifecycle.start([imgPath])
-          return this.output
+          const { output } = await this.lifecycle.start([imgPath])
+          return output
         }
       } catch (e) {
         this.emit(IBuildInEvent.FAILED, e)
         throw e
       }
     } else {
       // upload from path
-      await this.lifecycle.start(input)
-      return this.output
+      const { output } = await this.lifecycle.start(input)
+      return output
     }
   }
 }

diff --git a/src/types/index.d.ts b/src/types/index.d.ts
@@ -173,6 +173,7 @@ interface IImgInfo {
   width?: number
   height?: number
   extname?: string
+  imgUrl?: string
   [propName: string]: any
 }