Windows x86

.gitignore

@@ -5,7 +5,6 @@ Data/
 /GPUCache
 C#/
 ServiceGrid/
-Releases/
 old_code
 *.exe
 *.ini

ElectronJS/README.md

@@ -2,9 +2,11 @@
 
 Remember to update EasySpider.crx everytime the extension updates.
 
+## Run Instruction
 
+On Windows, you need to install `VS Build Tools 2017` (double click the vs_BuildTools.exe in this folder, then select and install the `Visual Studio Build Tools 2017` component) first for node-gyp to install `node-windows-manager`.
 
-## Run Instruction
+```bash
 
 ```
 npm install
@@ -25,8 +27,18 @@ npm run make
 ```
 
 ## For windows x64
-打开下面两个cmd即可打包
+
+依次执行下面两个cmd即可打包
+
 ```
 package_win64.cmd
 clean_win64.cmd
 ```
+
+## For Windows x86
+依次执行下面两个cmd即可打包
+
+```
+package_win32.cmd
+clean_win32.cmd
+```

ElectronJS/clean_win32.cmd

@@ -0,0 +1,10 @@
+move out\EasySpider-win32-ia32 out\EasySpider
+rmdir /s /q out\EasySpider\resources\app\chrome_win64
+rmdir /s /q out\EasySpider\resources\app\Data
+rmdir /s /q out\EasySpider\resources\app\.idea
+rmdir/s /q out\EasySpider\resources\app\tasks
+rmdir /s /q out\EasySpider\resources\app\execution_instances
+rmdir /s /q out\EasySpider\resources\app\user_data
+rmdir /s /q ..\Releases\EasySpider_windows_amd64\EasySpider
+del out\EasySpider\resources\app\vs_BuildTools.exe
+move out\EasySpider ..\Releases\EasySpider_windows_386\EasySpider

ElectronJS/clean_win64.cmd

@@ -3,7 +3,8 @@ rmdir /s /q out\EasySpider\resources\app\chrome_win32
 rmdir /s /q out\EasySpider\resources\app\Data
 rmdir /s /q out\EasySpider\resources\app\.idea
 rmdir/s /q out\EasySpider\resources\app\tasks
-rmdir/s /q out\EasySpider\resources\app\user-data
+rmdir/s /q out\EasySpider\resources\app\user_data
 rmdir /s /q out\EasySpider\resources\app\execution_instances
 rmdir /s /q ..\Releases\EasySpider_windows_amd64\EasySpider
+del out\EasySpider\resources\app\tasks\vs_BuildTools.exe
 move out\EasySpider ..\Releases\EasySpider_windows_amd64\EasySpider

ElectronJS/package-lock.json

@@ -11,12 +11,9 @@
       "dependencies": {
         "@jitsi/robotjs": "^0.6.11",
         "electron-squirrel-startup": "^1.0.0",
-        "ffi-napi": "^4.0.3",
         "http": "^0.0.1-security",
         "node-window-manager": "^2.2.4",
-        "ref-napi": "^3.0.3",
         "selenium-webdriver": "^4.8.0",
-        "win32-api": "^20.4.1",
         "ws": "^8.12.0"
       },
       "devDependencies": {
@@ -734,17 +731,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@waiting/shared-types": {
-      "version": "20.13.0",
-      "resolved": "https://registry.npmjs.org/@waiting/shared-types/-/shared-types-20.13.0.tgz",
-      "integrity": "sha512-OiMocNStZbtkf8LEwrbtAuiI3WtwXo+Aoqhz6jP6i9KSogNDsEMccJRz5wq+gVeO2qEcymn5J2NyK7vR/icgBg==",
-      "engines": {
-        "node": ">=14.16.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.7.4"
-      }
-    },
     "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1415,6 +1401,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -2521,28 +2508,6 @@
         "pend": "~1.2.0"
       }
     },
-    "node_modules/ffi-napi": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/ffi-napi/-/ffi-napi-4.0.3.tgz",
-      "integrity": "sha512-PMdLCIvDY9mS32RxZ0XGb95sonPRal8aqRhLbeEtWKZTe2A87qRFG9HjOhvG8EX2UmQw5XNRMIOT+1MYlWmdeg==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-uv-event-loop-napi-h": "^1.0.5",
-        "node-addon-api": "^3.0.0",
-        "node-gyp-build": "^4.2.1",
-        "ref-napi": "^2.0.1 || ^3.0.2",
-        "ref-struct-di": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ffi-napi/node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
-    },
     "node_modules/filename-reserved-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
@@ -2846,19 +2811,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-symbol-from-current-process-h": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-from-current-process-h/-/get-symbol-from-current-process-h-1.0.2.tgz",
-      "integrity": "sha512-syloC6fsCt62ELLrr1VKBM1ggOpMdetX9hTrdW77UQdcApPHLmf7CI7OKcN1c9kYuNxKcDe4iJ4FY9sX3aw2xw=="
-    },
-    "node_modules/get-uv-event-loop-napi-h": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/get-uv-event-loop-napi-h/-/get-uv-event-loop-napi-h-1.0.6.tgz",
-      "integrity": "sha512-t5c9VNR84nRoF+eLiz6wFrEp1SE2Acg0wS+Ysa2zF0eROes+LzOfuTaVHxGy8AbS8rq7FHEJzjnCZo1BupwdJg==",
-      "dependencies": {
-        "get-symbol-from-current-process-h": "^1.0.1"
-      }
-    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -3917,7 +3869,8 @@
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
@@ -4693,60 +4646,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/ref-napi": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/ref-napi/-/ref-napi-3.0.3.tgz",
-      "integrity": "sha512-LiMq/XDGcgodTYOMppikEtJelWsKQERbLQsYm0IOOnzhwE9xYZC7x8txNnFC9wJNOkPferQI4vD4ZkC0mDyrOA==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-symbol-from-current-process-h": "^1.0.2",
-        "node-addon-api": "^3.0.0",
-        "node-gyp-build": "^4.2.1"
-      },
-      "engines": {
-        "node": ">= 10.0"
-      }
-    },
-    "node_modules/ref-napi/node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
-    },
-    "node_modules/ref-struct-di": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ref-struct-di/-/ref-struct-di-1.1.1.tgz",
-      "integrity": "sha512-2Xyn/0Qgz89VT+++WP0sTosdm9oeowLP23wRJYhG4BFdMUrLj3jhwHZNEytYNYgtPKLNTP3KJX4HEgBvM1/Y2g==",
-      "dependencies": {
-        "debug": "^3.1.0"
-      }
-    },
-    "node_modules/ref-struct-di/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/ref-union-di": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ref-union-di/-/ref-union-di-1.0.1.tgz",
-      "integrity": "sha512-JWSF2BwNVtCgmEfoDGMh8S1KO07oq+T8L7cBHwcsmQmeXDZd9JNlrxU+ebSHs+jsf0qrqFFWXMCmj94Tcl26TA==",
-      "peer": true,
-      "dependencies": {
-        "debug": "^3.1.0"
-      }
-    },
-    "node_modules/ref-union-di/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "peer": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -5481,19 +5380,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "node_modules/unique-filename": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz",
@@ -5623,39 +5509,6 @@
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
-    "node_modules/win32-api": {
-      "version": "20.4.1",
-      "resolved": "https://registry.npmjs.org/win32-api/-/win32-api-20.4.1.tgz",
-      "integrity": "sha512-STbeoFsVndgc5eMmXcvmuuoWM2S8mOh/0V2w/gmYAFSI+FPoYDjGhvntrvhvoFMec8AC2ReI2LSkb8KGyEqhPQ==",
-      "dependencies": {
-        "win32-def": "^20.4.1"
-      },
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "ffi-napi": "^4.0.3",
-        "ref-napi": "^3.0.3",
-        "ref-struct-di": "^1.1.1",
-        "ref-union-di": "^1.0.1"
-      }
-    },
-    "node_modules/win32-def": {
-      "version": "20.4.1",
-      "resolved": "https://registry.npmjs.org/win32-def/-/win32-def-20.4.1.tgz",
-      "integrity": "sha512-d2y6pN/ebLU4Vsu4JepzeEtdWTVcAkJIiAFZiPjT/mjac2YYvhM4jM2bGKdt8usJNxAI2o7YiF0ytdVDQO6Qdg==",
-      "dependencies": {
-        "@waiting/shared-types": "^20.11.0"
-      },
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "ref-napi": "^3.0.3",
-        "ref-struct-di": "^1.1.1",
-        "ref-union-di": "^1.0.1"
-      }
-    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",

ElectronJS/package.json

@@ -32,12 +32,9 @@
   "dependencies": {
     "@jitsi/robotjs": "^0.6.11",
     "electron-squirrel-startup": "^1.0.0",
-    "ffi-napi": "^4.0.3",
     "http": "^0.0.1-security",
     "node-window-manager": "^2.2.4",
-    "ref-napi": "^3.0.3",
     "selenium-webdriver": "^4.8.0",
-    "win32-api": "^20.4.1",
     "ws": "^8.12.0"
   },
   "config": {

ElectronJS/package_win32.cmd

@@ -0,0 +1,17 @@
+@echo off
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+if '%errorlevel%' NEQ '0' (
+goto UACPrompt
+) else ( goto gotAdmin )
+:UACPrompt
+echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+"%temp%\getadmin.vbs"
+exit /B
+:gotAdmin
+if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
+pushd "%CD%"
+CD /D "%~dp0"
+
+rmdir /s /q out
+npm run package

ElectronJS/package_win64.cmd

@@ -16,9 +16,3 @@ CD /D "%~dp0"
 rmdir /s /q C:\Users\q9823\AppData\Local\Temp\electron-packager
 rmdir /s /q out
 npm run package
-move out\EasySpider-win32-x64 out\EasySpider
-rmdir /s /q out\EasySpider\resources\app\chrome_win32
-rmdir /s /q out\EasySpider\resources\app\Data
-rmdir /s /q out\EasySpider\resources\app\.idea
-rmdir/s /q out\EasySpider\resources\app\tasks
-rmdir /s /q out\EasySpider\resources\app\execution_instances

ExecuteStage/generateEXE_win32.cmd

@@ -0,0 +1,5 @@
+rmdir /s /q build
+rmdir /s /q dist
+pyinstaller -F --icon=favicon.ico easyspider_executestage.py
+del ..\ElectronJS\chrome_win32\easyspider_executestage.exe
+move dist\easyspider_executestage.exe ..\ElectronJS\chrome_win32\easyspider_executestage.exe

Releases/.gitignore

@@ -0,0 +1 @@
+*.7z

Releases/EasySpider_windows_386/.gitignore

@@ -0,0 +1 @@
+EasySpider/

Releases/EasySpider_windows_386/EasySpider.bat

@@ -0,0 +1 @@
+start EasySpider/EasySpider.exe

Releases/EasySpider_windows_386/config.json

@@ -0,0 +1 @@
+{"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data"}

Releases/EasySpider_windows_386/readme.txt

@@ -0,0 +1,6 @@
+这个软件绝对不是特洛伊木马/病毒！如果被像 Windows Defender 这样的杀毒软件误认为是病毒，请进行恢复，或者打开“EasySpider.bat”来运行我们的软件。
+
+The software is totally not trojan/virus! If mistaken by antivirus software such as windows defender as a virus, please recover it, or open "EasySpider.bat" to run our software instead.
+
+
+可以从其他机器导入任务，只需要把其他机器的tasks文件夹里的.json文件放入此目录的tasks文件夹里即可。同理执行号文件可以通过复制execution_instances文件夹中的.json文件来导入。注意，两个文件夹里的.json文件只支持命名为大于0的数字。

Releases/EasySpider_windows_386/tasks/33.json

@@ -0,0 +1 @@
+{"id":33,"name":"JD","url":"https://www.jd.com","links":"https://www.jd.com","containJudge":false,"desc":"https://www.jd.com","inputParameters":[{"id":0,"name":"urlList_0","nodeId":1,"nodeName":"打开网页","value":"https://www.jd.com","desc":"要采集的网址列表,多行以\\n分开","type":"string","exampleValue":"https://www.jd.com"},{"id":1,"name":"inputText_1","nodeName":"输入文字","nodeId":2,"desc":"要输入的文本，如京东搜索框输入：电脑","type":"string","exampleValue":"123","value":"123"}],"outputParameters":[],"graph":[{"index":0,"id":0,"parentId":0,"type":-1,"option":0,"title":"root","sequence":[1,2,3],"parameters":{"history":1,"tabIndex":0,"useLoop":false,"xpath":"","wait":0},"isInLoop":false},{"id":1,"index":1,"parentId":0,"type":0,"option":1,"title":"打开网页","sequence":[],"isInLoop":false,"position":0,"parameters":{"useLoop":false,"xpath":"","wait":0,"url":"https://www.jd.com","links":"https://www.jd.com","scrollType":0,"scrollCount":0}},{"id":2,"index":2,"parentId":0,"type":0,"option":4,"title":"输入文字","sequence":[],"isInLoop":false,"position":1,"parameters":{"history":4,"tabIndex":-1,"useLoop":false,"xpath":"//*[@id=\"key\"]","wait":0,"value":"123"}},{"id":3,"index":3,"parentId":0,"type":0,"option":2,"title":"点击元素","sequence":[],"isInLoop":false,"position":2,"parameters":{"history":4,"tabIndex":-1,"useLoop":false,"xpath":"//*[@id=\"search-btn\"]/i[1]","wait":0,"scrollType":0,"scrollCount":0,"paras":[]}}]}

Releases/EasySpider_windows_amd64/.gitignore

@@ -0,0 +1 @@
+EasySpider/

Releases/EasySpider_windows_amd64/EasySpider.bat

@@ -0,0 +1 @@
+start EasySpider/EasySpider.exe

Releases/EasySpider_windows_amd64/config.json

@@ -0,0 +1 @@
+{"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data"}

Releases/EasySpider_windows_amd64/readme.txt

@@ -0,0 +1,6 @@
+这个软件绝对不是特洛伊木马/病毒！如果被像 Windows Defender 这样的杀毒软件误认为是病毒，请进行恢复，或者打开“EasySpider.bat”来运行我们的软件。
+
+The software is totally not trojan/virus! If mistaken by antivirus software such as windows defender as a virus, please recover it, or open "EasySpider.bat" to run our software instead.
+
+
+可以从其他机器导入任务，只需要把其他机器的tasks文件夹里的.json文件放入此目录的tasks文件夹里即可。同理执行号文件可以通过复制execution_instances文件夹中的.json文件来导入。注意，两个文件夹里的.json文件只支持命名为大于0的数字。