🎉 Release: v2.4.0-beta.10

ISSUES CLOSED: #428

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
   "eslint.enable": true,
   "eslint.alwaysShowStatus": true,
+  "eslint.format.enable": true,
   "eslint.validate": [
     "javascript",
     "javascriptreact",
@@ -23,5 +24,8 @@
     "source.fixAll.eslint": "explicit",
     "source.organizeImports": "never"
   },
-  "prettier.enable": false
-}
+  "prettier.enable": false,
+  "[typescript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  },
+}

CHANGELOG.md

@@ -1,3 +1,20 @@
+# :tada: 2.4.0-beta.10 (2025-06-08)
+
+
+### :sparkles: Features
+
+* finish form uploader for picgo server ([9841418](https://github.com/Molunerfinn/PicGo/commit/9841418))
+* **server:** add support for form upload in PicGo Server ([#1327](https://github.com/Molunerfinn/PicGo/issues/1327)) ([a928b4c](https://github.com/Molunerfinn/PicGo/commit/a928b4c)), closes [#428](https://github.com/Molunerfinn/PicGo/issues/428)
+
+
+### :bug: Bug Fixes
+
+* auto-copy url can't be turned off ([#1300](https://github.com/Molunerfinn/PicGo/issues/1300)) ([dacb926](https://github.com/Molunerfinn/PicGo/commit/dacb926))
+* encoded url filename unreadable ([2bd5d06](https://github.com/Molunerfinn/PicGo/commit/2bd5d06))
+* unable to use clip in wayland ([#1301](https://github.com/Molunerfinn/PicGo/issues/1301)) ([7df37a2](https://github.com/Molunerfinn/PicGo/commit/7df37a2))
+
+
+
 # :tada: 2.4.0-beta.9 (2024-12-02)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "picgo",
-  "version": "2.4.0-beta.9",
+  "version": "2.4.0-beta.10",
   "private": true,
   "scripts": {
     "build": "vue-cli-service electron:build",
@@ -34,7 +34,8 @@
     "lowdb": "^1.0.0",
     "marked": "^7.0.4",
     "mitt": "^3.0.0",
-    "picgo": "^1.5.8",
+    "multer": "^1.4.5-lts.1",
+    "picgo": "^1.5.9",
     "qrcode.vue": "^3.3.3",
     "shell-path": "2.1.0",
     "uuid": "^9.0.0",
@@ -54,6 +55,7 @@
     "@types/inquirer": "^6.5.0",
     "@types/js-yaml": "^4.0.5",
     "@types/lowdb": "^1.0.9",
+    "@types/multer": "^1.4.12",
     "@types/node": "^16.10.2",
     "@types/request-promise-native": "^1.0.17",
     "@types/semver": "^7.3.8",

public/linux.sh

@@ -17,18 +17,13 @@ if [ "$XDG_SESSION_TYPE" = "x11" ]; then
     echo $filePath
   fi
 elif [ "$XDG_SESSION_TYPE" = "wayland" ]; then
-  command -v wl-copy >/dev/null 2>&1 || { echo >&1 "no wl-clipboard"; exit 1; }
-  filePath=`wl-copy -o 2>/dev/null | grep ^file:// | cut -c8-`
-  if [ ! -n "$filePath" ] ;then
-    if
-        wl-copy -t image/png -o >/dev/null 2>&1
-      then
-        wl-copy -t image/png image/png -o >$1 2>/dev/null
-        echo $1
-    else
-        echo "no image"
-    fi
+  command -v wl-paste >/dev/null 2>&1 || { echo >&1 "no wl-clipboard"; exit 1; }
+  isImage=`wl-paste --list-types | grep image`
+  if [ -n "$isImage" ]; then
+    wl-paste --type image/png > $1 2>/dev/null
+    echo $1
   else
-    echo $filePath
+    echo "no image"
+    exit 1
   fi
 fi

src/main/apis/app/uploader/index.ts

@@ -21,6 +21,7 @@ import path from 'path'
 import { privacyManager } from '~/main/utils/privacyManager'
 import writeFile from 'write-file-atomic'
 import { CLIPBOARD_IMAGE_FOLDER } from '~/universal/utils/static'
+import { cleanupFormUploaderFiles } from '~/main/utils/cleanupFormUploaderFiles'
 
 const waitForRename = (window: BrowserWindow, id: number): Promise<string|null> => {
   return new Promise((resolve) => {
@@ -176,6 +177,7 @@ class Uploader {
       return false
     } finally {
       ipcMain.removeAllListeners(GET_RENAME_FILE_NAME)
+      cleanupFormUploaderFiles(img)
     }
   }
 }

src/main/apis/core/datastore/dbChecker.ts

@@ -5,6 +5,7 @@ import { app as APP } from 'electron'
 import { getLogger } from '@core/utils/localLogger'
 import dayjs from 'dayjs'
 import { T } from '~/main/i18n'
+import { FORM_IMAGE_FOLDER } from '~/universal/utils/static'
 const STORE_PATH = APP.getPath('userData')
 const configFilePath = path.join(STORE_PATH, 'data.json')
 const configFileBackupPath = path.join(STORE_PATH, 'data.bak.json')
@@ -131,9 +132,19 @@ function getGalleryDBPath (): {
   }
 }
 
+function getFormImageFolderPath (): string {
+  const STORE_PATH = dbPathDir()
+  const formImagesPath = path.join(STORE_PATH, FORM_IMAGE_FOLDER)
+  if (!fs.existsSync(formImagesPath)) {
+    fs.mkdirSync(formImagesPath, { recursive: true })
+  }
+  return formImagesPath
+}
+
 export {
   dbChecker,
   dbPathChecker,
   dbPathDir,
-  getGalleryDBPath
+  getGalleryDBPath,
+  getFormImageFolderPath
 }

src/main/server/index.ts

@@ -7,6 +7,7 @@ import {
 import picgo from '@core/picgo'
 import logger from '@core/picgo/logger'
 import axios from 'axios'
+import formUploader from './middlewares/formUploader'
 
 class Server {
   private httpServer: http.Server
@@ -56,6 +57,8 @@ class Server {
             success: false
           }
         })
+      } else if (formUploader.isFileUpload(request)) {
+        formUploader.handleFileUpload(request, response)
       } else {
         let body: string = ''
         let postObj: IObj

src/main/server/middlewares/formUploader.ts

@@ -0,0 +1,125 @@
+import http from 'http'
+import multer from 'multer'
+import path from 'path'
+import fs from 'fs'
+import { dbPathDir } from 'apis/core/datastore/dbChecker'
+import logger from '@core/picgo/logger'
+import { handleResponse } from '../utils'
+import routers from '../routerManager'
+import { FORM_IMAGE_FOLDER } from '~/universal/utils/static'
+
+// Multer 错误类型定义
+export interface MulterError extends Error {
+  code: string
+  field?: string
+  storageErrors?: any[]
+}
+
+// Multer 中间件适配器类型
+export type MulterMiddleware = (
+  req: http.IncomingMessage,
+  res: http.ServerResponse,
+  callback: (error?: MulterError) => void
+) => void;
+
+// 扩展 multer 函数的返回类型
+declare module 'multer' {
+  interface Multer {
+    array(fieldname: string, maxCount?: number): MulterMiddleware;
+    single(fieldname: string): MulterMiddleware;
+    fields(fields: { name: string; maxCount?: number }[]): MulterMiddleware;
+    none(): MulterMiddleware;
+  }
+}
+
+class FormUploader {
+  private upload!: multer.Multer
+  private formImagesPath!: string
+
+  constructor () {
+    this.initializeStorage()
+    this.setupMulter()
+  }
+
+  private initializeStorage () {
+    const STORE_PATH = dbPathDir()
+    this.formImagesPath = path.join(STORE_PATH, FORM_IMAGE_FOLDER)
+    if (!fs.existsSync(this.formImagesPath)) {
+      fs.mkdirSync(this.formImagesPath, { recursive: true })
+    }
+  }
+
+  private setupMulter () {
+    const storage = multer.diskStorage({
+      destination: (req: http.IncomingMessage, file: Express.Multer.File, cb: (error: Error | null, destination: string) => void) => {
+        cb(null, this.formImagesPath)
+      },
+      filename: (req: http.IncomingMessage, file: Express.Multer.File, cb: (error: Error | null, filename: string) => void) => {
+        cb(null, file.originalname || Date.now() + path.extname(file.originalname))
+      }
+    })
+
+    this.upload = multer({
+      storage
+    })
+  }
+
+  /**
+   * 处理文件上传的中间件
+   */
+  public handleFileUpload = (request: http.IncomingMessage, response: http.ServerResponse): void => {
+    logger.info('[PicGo Server] handling file upload')
+
+    this.upload.array('files')(request, response, async (err?: MulterError) => {
+      if (err) {
+        logger.error('[PicGo Server] file upload error', err)
+        return handleResponse({
+          response,
+          body: {
+            success: false,
+            message: 'File upload failed'
+          }
+        })
+      }
+
+      try {
+        const files = request.files
+        if (!files || files.length === 0) {
+          return handleResponse({
+            response,
+            body: {
+              success: false,
+              message: 'No files were uploaded'
+            }
+          })
+        }
+        const filePaths = files.map((file) => file.path)
+        logger.info('[PicGo Server] files uploaded: ' + filePaths.join(', '))
+
+        const handler = routers.getHandler(request.url!)
+        handler!({
+          list: filePaths,
+          response
+        })
+      } catch (err: any) {
+        logger.error('[PicGo Server] process upload files error', err)
+        handleResponse({
+          response,
+          body: {
+            success: false,
+            message: 'Failed to process uploaded files'
+          }
+        })
+      }
+    })
+  }
+
+  /**
+   * 检查请求是否为文件上传
+   */
+  public isFileUpload (request: http.IncomingMessage): boolean {
+    return !!(request.headers['content-type'] && request.headers['content-type'].includes('multipart/form-data'))
+  }
+}
+
+export default new FormUploader()

src/main/utils/cleanupFormUploaderFiles.ts

@@ -0,0 +1,24 @@
+import path from 'path'
+import fs from 'fs-extra'
+import { getFormImageFolderPath } from '@core/datastore/dbChecker'
+import logger from '@core/picgo/logger'
+
+export const cleanupFormUploaderFiles = (filePathList?: string[]): void => {
+  const formImageFolderPath = getFormImageFolderPath()
+  if (Array.isArray(filePathList)) {
+    filePathList.forEach(async filePath => {
+      try {
+        // 检查文件路径是否在 formImageFolderPath 目录下
+        const relativePath = path.relative(formImageFolderPath, filePath)
+        const isWithinFolder = !relativePath.startsWith('..') && !path.isAbsolute(relativePath)
+
+        if (isWithinFolder && await fs.pathExists(filePath)) {
+          await fs.remove(filePath)
+          logger.info(`[PicGo] Deleted temp file: ${filePath}`)
+        }
+      } catch (error: any) {
+        logger.error(`[PicGo] Failed to delete temp file ${filePath}:`, error)
+      }
+    })
+  }
+}

src/main/utils/common.ts

@@ -4,7 +4,7 @@ import { clipboard, Notification, dialog } from 'electron'
 import { handleUrlEncode } from '~/universal/utils/common'
 
 export const handleCopyUrl = (str: string): void => {
-  if (db.get('settings.autoCopy') !== false) {
+  if (db.get('settings.autoCopyUrl') !== false) {
     clipboard.writeText(str)
   }
 }

src/renderer/pages/PicGoSetting.vue

@@ -103,7 +103,7 @@ async function initData () {
     form.uploadNotification = settings.uploadNotification || false
     form.miniWindowOnTop = settings.miniWindowOnTop || false
     form.logLevel = initLogLevel(settings.logLevel || [])
-    form.autoCopyUrl = settings.autoCopy === undefined ? true : settings.autoCopy
+    form.autoCopyUrl = settings.autoCopyUrl === undefined ? true : settings.autoCopyUrl
     form.checkBetaUpdate = settings.checkBetaUpdate === undefined ? true : settings.checkBetaUpdate
     form.useBuiltinClipboard = settings.useBuiltinClipboard === undefined ? false : settings.useBuiltinClipboard
     form.language = settings.language ?? 'zh-CN'

src/universal/types/global.d.ts

@@ -7,3 +7,17 @@ declare var notificationList: IAppNotification[]
 declare module 'epipebomb' {
   export default function epipebomb(stream: NodeJS.Process['stdout'], callback: () => void): void
 }
+
+// 扩展原生 IncomingMessage，添加 multer 字段
+declare module 'http' {
+  interface IncomingMessage {
+    files?: {
+      path: string;
+      originalname: string;
+      mimetype: string;
+      size: number;
+      [key: string]: any;
+    }[];
+    body?: any;
+  }
+}

src/universal/utils/static.ts

@@ -1,4 +1,5 @@
 export const CLIPBOARD_IMAGE_FOLDER = 'picgo-clipboard-images'
+export const FORM_IMAGE_FOLDER = 'picgo-form-images'
 export const RELEASE_URL = 'https://api.github.com/repos/Molunerfinn/PicGo/releases'
 export const RELEASE_URL_BACKUP = 'https://picgo-release.molunerfinn.com'
 export const STABLE_RELEASE_URL = 'https://github.com/Molunerfinn/PicGo/releases/latest'

yarn.lock

@@ -2906,6 +2906,13 @@
   resolved "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
+"@types/multer@^1.4.12":
+  version "1.4.12"
+  resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.12.tgz#da67bd0c809f3a63fe097c458c0d4af1fea50ab7"
+  integrity sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg==
+  dependencies:
+    "@types/express" "*"
+
 "@types/node@*", "@types/node@^14.6.2", "@types/node@^16.10.2":
   version "16.11.18"
   resolved "https://registry.npmjs.org/@types/node/-/node-16.11.18.tgz#39ed7c52943b0cee6d7299b717707bd51b1f90b9"
@@ -3950,6 +3957,11 @@ app-builder-lib@23.3.3:
     tar "^6.1.11"
     temp-file "^3.4.0"
 
+append-field@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
+  integrity sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==
+
 arch@^2.1.1:
   version "2.2.0"
   resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
@@ -4472,6 +4484,13 @@ builtins@^5.0.1:
   dependencies:
     semver "^7.0.0"
 
+busboy@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
+  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
+  dependencies:
+    streamsearch "^1.1.0"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -5019,7 +5038,7 @@ concat-map@0.0.1:
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.6.2:
+concat-stream@^1.5.2, concat-stream@^1.6.2:
   version "1.6.2"
   resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -9344,6 +9363,19 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+multer@^1.4.5-lts.1:
+  version "1.4.5-lts.1"
+  resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.5-lts.1.tgz#803e24ad1984f58edffbc79f56e305aec5cfd1ac"
+  integrity sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==
+  dependencies:
+    append-field "^1.0.0"
+    busboy "^1.0.0"
+    concat-stream "^1.5.2"
+    mkdirp "^0.5.4"
+    object-assign "^4.1.1"
+    type-is "^1.6.4"
+    xtend "^4.0.0"
+
 multicast-dns@^7.2.5:
   version "7.2.5"
   resolved "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
@@ -9539,7 +9571,7 @@ number-is-nan@^1.0.0:
   resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -9986,10 +10018,10 @@ pend@~1.2.0:
   resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
-picgo@^1.5.8:
-  version "1.5.8"
-  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.5.8.tgz#5c66a88219aec4e139886f242a49cedc2b7f1c48"
-  integrity sha512-z3ATQJeELMkn+g3Cyf3l/AEvSmrDmrFF2bn8ZY/69kEPhixx9NTEpsfRvMeIlLPQM1BTu+ZZ25XWLnPYu5hliA==
+picgo@^1.5.9:
+  version "1.5.9"
+  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.5.9.tgz#2ff46958c3f53203d7d13b870a1ae4be90aaa3e3"
+  integrity sha512-6jO53RdHBP9tl9w6fwm+WtlU6qeYMsZAH9HsXZDkyXqQYMRdQ7t2K4BXZo3DQJ76ebYD40fDHAaIW92k7m2A0w==
   dependencies:
     "@picgo/i18n" "^1.0.0"
     "@picgo/store" "^2.0.2"
@@ -11580,6 +11612,11 @@ stream-browserify@3.0.0:
     inherits "~2.0.4"
     readable-stream "^3.5.0"
 
+streamsearch@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
+  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
+
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -12210,7 +12247,7 @@ type-fest@^0.8.1:
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-is@~1.6.18:
+type-is@^1.6.4, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
   integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==