.gitignore

@@ -2,4 +2,3 @@
 /dist
 /.vscode
 out/
-release/

main.js

@@ -5,8 +5,6 @@ const { SensorController } = require('./src/business/sensor-controller')
 const { UsbSerialBridge } = require('./src/business/usb-serial-bridge')
 const pkg = require('./package.json')
 
-if (require('electron-squirrel-startup')) app.quit()
-
 const cacheDir = app.getPath('userData')
 const cacheFile = path.join(cacheDir, 'app-cache.json')
 const fileRoot = path.join(cacheDir, 'files')

package.json

@@ -1,13 +1,12 @@
 {
-  "name": "光伏pc端应用",
+  "name": "photovoltaic-pc",
   "version": "1.0.0",
-  "description": "光伏pc端应用photovoltaic-pc",
+  "description": "光伏pc端应用",
   "main": "main.js",
   "scripts": {
     "start": "electron-forge start",
-    "package": "electron-builder --dir",
+    "package": "electron-forge package",
-    "make": "electron-builder --win nsis",
+    "make": "electron-forge make",
-    "make:squirrel": "electron-forge make",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
@@ -22,58 +21,10 @@
     "@electron-forge/plugin-auto-unpack-natives": "^7.11.2",
     "@electron-forge/plugin-fuses": "^7.11.2",
     "@electron/fuses": "^1.8.0",
-    "electron": "^43.2.0",
+    "electron": "^43.2.0"
-    "electron-builder": "^26.15.3"
   },
   "dependencies": {
     "electron-squirrel-startup": "^1.0.1",
     "serialport": "^13.0.0"
-  },
-  "build": {
-    "appId": "com.bestway.photovoltaic.pc",
-    "productName": "photovoltaic-pc",
-    "asar": true,
-    "asarUnpack": [
-      "**/*.node"
-    ],
-    "npmRebuild": false,
-    "directories": {
-      "output": "release"
-    },
-    "files": [
-      "main.js",
-      "preload.js",
-      "package.json",
-      "dist/**/*",
-      "src/**/*",
-      "node_modules/**/*",
-      "!out/**/*",
-      "!release/**/*",
-      "!.git/**/*",
-      "!.vs/**/*",
-      "!.vscode/**/*"
-    ],
-    "win": {
-      "target": [
-        {
-          "target": "nsis",
-          "arch": [
-            "x64"
-          ]
-        }
-      ],
-      "artifactName": "${productName}-${version}-${arch}-Setup.${ext}",
-      "signAndEditExecutable": false
-    },
-    "nsis": {
-      "oneClick": false,
-      "perMachine": false,
-      "allowToChangeInstallationDirectory": true,
-      "createDesktopShortcut": true,
-      "createStartMenuShortcut": true,
-      "shortcutName": "photovoltaic-pc",
-      "runAfterFinish": true,
-      "deleteAppDataOnUninstall": false
-    }
   }
 }

preload.js

@@ -10,7 +10,6 @@
 const { contextBridge, ipcRenderer } = require('electron')
 const nodeNet = require('net')
 const dns = require('dns')
-const { execFile } = require('child_process')
 
 function tryConnect(host, port, timeout) {
   return new Promise((resolve) => {
@@ -23,41 +22,17 @@ function tryConnect(host, port, timeout) {
   })
 }
 
-function normalizePingHost(input) {
-  const raw = String(input || '').trim()
-  if (!raw) return ''
-  try {
-    return new URL(raw).hostname
-  } catch {}
-  return raw.replace(/^https?:\/\//i, '').split('/')[0].split(':')[0]
-}
-
-function trySystemPing(host, timeout) {
-  return new Promise((resolve) => {
-    const wait = Math.max(1000, Number(timeout) || 2000)
-    execFile('ping', ['-n', '1', '-w', String(wait), host], { windowsHide: true }, (err) => {
-      resolve(!err)
-    })
-  })
-}
-
 const net = {
   async ping(host, timeout) {
-    const target = normalizePingHost(host)
-    if (!target) return false
-    const wait = Math.max(1000, Number(timeout) || 2000)
-    const isIp = nodeNet.isIP(target) !== 0
-
     try {
-      if (!isIp) await dns.promises.lookup(target)
+      await dns.promises.resolve(host)
     } catch {
-      if (!await trySystemPing(target, wait)) return false
+      return false
     }
-
+    for (const port of [443, 80]) {
-    for (const port of [443, 80, 53]) {
+      if (await tryConnect(host, port, timeout)) return true
-      if (await tryConnect(target, port, wait)) return true
     }
-    return trySystemPing(target, wait)
+    return false
   }
 }