fix

angular.json

@@ -58,7 +58,12 @@
             "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
-              "src/assets"
+              "src/assets",
+              {
+                "glob": "**/*",
+                "input": "./node_modules/candy/res/",
+                "output": "./candy/res/"
+              }
             ],
             "styles": [
               "src/styles.scss"

main.js

@@ -154,7 +154,7 @@ async function createWindow() {
     minWidth: 1024,
     minHeight: 640,
     frame: process.platform === 'darwin',
-    webPreferences: { nodeIntegration: true, contextIsolation: false, enableRemoteModule: true, webviewTag: true },
+    webPreferences: { nodeIntegration: true, contextIsolation: false, enableRemoteModule: true, webviewTag: true, webSecurity: false },
     titleBarStyle: process.platform === 'darwin' ? 'hidden' : undefined
   });
 

package-lock.json

 {
   "name": "mycard",
-  "version": "0.0.0",
+  "version": "3.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mycard",
-      "version": "0.0.0",
+      "version": "3.1.0",
       "dependencies": {
         "@electron/remote": "^1.2.1",
         "bootstrap": "^5.1.0",
@@ -16,6 +16,7 @@
         "electron-sudo": "github:mycard/electron-sudo#mycard",
         "electron-updater": "^4.3.9",
         "font-awesome": "^4.7.0",
+        "jquery": "^3.6.0",
         "raw-socket": "^1.7.0",
         "vue": "^2.6.14"
       },
@@ -37,21 +38,21 @@
         "@types/bootstrap": "^5.1.4",
         "@types/ini": "^1.3.30",
         "@types/jquery": "^3.5.6",
+        "@types/lodash-es": "^4.17.4",
         "@types/mousetrap": "^1.6.8",
         "@types/mustache": "^4.1.2",
         "@types/node": "^16.4.13",
-        "aria2": "^3.0.1",
+        "aria2": "^4.1.2",
         "candy": "https://github.com/moecube/candy/releases/download/v2.2.0/candy.tar.gz",
         "candy-shop": "github:candy-chat/candy-plugins",
-        "copy-webpack-plugin": "^9.0.1",
         "electron": "^14.0.0",
         "electron-builder": "^22.11.7",
         "electron-builder-notarize": "^1.2.0",
         "exports-loader": "^3.0.0",
         "imports-loader": "^3.0.0",
         "ini": "^2.0.0",
-        "jquery": "^3.6.0",
         "jquery-i18n": "github:recurser/jquery-i18n",
+        "lodash-es": "^4.17.21",
         "mousetrap": "^1.6.5",
         "mustache": "^4.2.0",
         "reconnecting-websocket": "^4.4.0",
@@ -3175,6 +3176,21 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
+    "node_modules/@types/lodash": {
+      "version": "4.14.172",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
+      "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==",
+      "dev": true
+    },
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.4.tgz",
+      "integrity": "sha512-BBz79DCJbD2CVYZH67MBeHZRX++HF+5p8Mo5MzjZi64Wac39S3diedJYHZtScbRVf4DjZyN6LzA0SB0zy+HSSQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
     "node_modules/@types/minimatch": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -3839,18 +3855,16 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/aria2": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/aria2/-/aria2-3.0.1.tgz",
-      "integrity": "sha512-aPB6KAq8UEHhJj5Yxs1Dg9670xYJoNAAB82S994xpUM2lnkJ5BqGAvK3Ladl58WikGcoBAC8P0yvxm6yrUSy4w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/aria2/-/aria2-4.1.2.tgz",
+      "integrity": "sha512-qTBr2RY8RZQmiUmbj2KXFvkErNxU4aTHZszszzwhE8svy2PEVX+IYR/c4Rp9Tuw4QkeU8cylGy6McV6Yl8i7Qw==",
       "dev": true,
       "dependencies": {
-        "commander": "^2.9.0",
-        "node-fetch": "^2.1.2",
-        "polygoat": "^1.1.4",
-        "ws": "^5.1.1"
+        "node-fetch": "^2.6.1",
+        "ws": "^7.4.0"
       },
-      "bin": {
-        "aria2rpc": "bin/cli.js"
+      "engines": {
+        "node": ">= 10"
       }
     },
     "node_modules/arr-diff": {
@@ -10680,8 +10694,7 @@
     "node_modules/jquery": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-      "dev": true
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
     },
     "node_modules/jquery-i18n": {
       "version": "1.1.2",
@@ -11062,6 +11075,12 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "devOptional": true
     },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+      "dev": true
+    },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -13053,12 +13072,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/polygoat": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/polygoat/-/polygoat-1.1.4.tgz",
-      "integrity": "sha1-Mp+aDRstSkUUniU5Ujxvff2FCl8=",
-      "dev": true
-    },
     "node_modules/portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -17388,28 +17401,6 @@
         "xmldom": "0.5.0"
       }
     },
-    "node_modules/strophe.js/node_modules/ws": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/strophejs-plugin-caps": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/strophejs-plugin-caps/-/strophejs-plugin-caps-1.1.3.tgz",
@@ -19655,12 +19646,24 @@
       }
     },
     "node_modules/ws": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
-      "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
       "dev": true,
-      "dependencies": {
-        "async-limiter": "~1.0.0"
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/xdg-basedir": {
@@ -22060,6 +22063,21 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
+    "@types/lodash": {
+      "version": "4.14.172",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
+      "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==",
+      "dev": true
+    },
+    "@types/lodash-es": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.4.tgz",
+      "integrity": "sha512-BBz79DCJbD2CVYZH67MBeHZRX++HF+5p8Mo5MzjZi64Wac39S3diedJYHZtScbRVf4DjZyN6LzA0SB0zy+HSSQ==",
+      "dev": true,
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
     "@types/minimatch": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -22639,15 +22657,13 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "aria2": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/aria2/-/aria2-3.0.1.tgz",
-      "integrity": "sha512-aPB6KAq8UEHhJj5Yxs1Dg9670xYJoNAAB82S994xpUM2lnkJ5BqGAvK3Ladl58WikGcoBAC8P0yvxm6yrUSy4w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/aria2/-/aria2-4.1.2.tgz",
+      "integrity": "sha512-qTBr2RY8RZQmiUmbj2KXFvkErNxU4aTHZszszzwhE8svy2PEVX+IYR/c4Rp9Tuw4QkeU8cylGy6McV6Yl8i7Qw==",
       "dev": true,
       "requires": {
-        "commander": "^2.9.0",
-        "node-fetch": "^2.1.2",
-        "polygoat": "^1.1.4",
-        "ws": "^5.1.1"
+        "node-fetch": "^2.6.1",
+        "ws": "^7.4.0"
       }
     },
     "arr-diff": {
@@ -27916,8 +27932,7 @@
     "jquery": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-      "dev": true
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
     },
     "jquery-i18n": {
       "version": "git+ssh://git@github.com/recurser/jquery-i18n.git#513d1493729a1bb3c5c1937fb8604cf2aedb7884",
@@ -28214,6 +28229,12 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "devOptional": true
     },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+      "dev": true
+    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -29741,12 +29762,6 @@
         }
       }
     },
-    "polygoat": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/polygoat/-/polygoat-1.1.4.tgz",
-      "integrity": "sha1-Mp+aDRstSkUUniU5Ujxvff2FCl8=",
-      "dev": true
-    },
     "portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -33011,16 +33026,6 @@
         "abab": "^2.0.3",
         "ws": "^7.0.0",
         "xmldom": "0.5.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-          "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
-          "dev": true,
-          "optional": true,
-          "requires": {}
-        }
       }
     },
     "strophejs-plugin-caps": {
@@ -34790,13 +34795,11 @@
       }
     },
     "ws": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
-      "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
       "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
+      "requires": {}
     },
     "xdg-basedir": {
       "version": "4.0.0",

package.json

@@ -26,6 +26,7 @@
     "electron-sudo": "github:mycard/electron-sudo#mycard",
     "electron-updater": "^4.3.9",
     "font-awesome": "^4.7.0",
+    "jquery": "^3.6.0",
     "raw-socket": "^1.7.0",
     "vue": "^2.6.14"
   },
@@ -47,21 +48,21 @@
     "@types/bootstrap": "^5.1.4",
     "@types/ini": "^1.3.30",
     "@types/jquery": "^3.5.6",
+    "@types/lodash-es": "^4.17.4",
     "@types/mousetrap": "^1.6.8",
     "@types/mustache": "^4.1.2",
     "@types/node": "^16.4.13",
-    "aria2": "^3.0.1",
+    "aria2": "^4.1.2",
     "candy": "https://github.com/moecube/candy/releases/download/v2.2.0/candy.tar.gz",
     "candy-shop": "github:candy-chat/candy-plugins",
-    "copy-webpack-plugin": "^9.0.1",
     "electron": "^14.0.0",
     "electron-builder": "^22.11.7",
     "electron-builder-notarize": "^1.2.0",
     "exports-loader": "^3.0.0",
     "imports-loader": "^3.0.0",
     "ini": "^2.0.0",
-    "jquery": "^3.6.0",
     "jquery-i18n": "github:recurser/jquery-i18n",
+    "lodash-es": "^4.17.21",
     "mousetrap": "^1.6.5",
     "mustache": "^4.2.0",
     "reconnecting-websocket": "^4.4.0",

src/app/ygopro/ygopro.component.ts

@@ -23,7 +23,7 @@ import { App } from '../shared/app';
 import { AppsService } from '../apps.service';
 import { LoginService } from '../login/login.service';
 import { SettingsService } from '../settings.service';
-import _ from 'lodash';
+import _ from 'lodash-es';
 import fg from 'fast-glob';
 import { HttpClient } from '@angular/common/http';
 import WillNavigateEvent = Electron.WillNavigateEvent;
@@ -708,9 +708,9 @@ export class YGOProComponent implements OnInit, OnDestroy {
         data.arena_rank = data2.arena_rank;
         data.exp_rank_ex = exp_rank_ex;
         data.arena_rank_ex = arena_rank_ex;
-        if (start_time !== data.start_time) {
+        // if (start_time !== data.start_time) {
           this.appsService.showResult('projects/ygopro-result/end_YGOPro_single.html', data, 202, 222);
-        }
+        // }
       });
     } catch (error) {
       console.log(error);

webpack.config.js

-const CopyPlugin = require('copy-webpack-plugin');
-
 module.exports = {
   target: 'electron-renderer',
   externals: {
     bufferutil: 'commonjs2 bufferutil',
     'utf-8-validate': 'commonjs2 utf-8-validate',
     'raw-socket': 'commonjs2 raw-socket',
+    'electron-store': 'commonjs2 electron-store',
   },
-  plugins: [
-    new CopyPlugin({
-      patterns: [{ from: 'node_modules/candy/res', to: 'candy/res' }],
-    }),
-  ],
   module: {
     rules: [
       {
         test: require.resolve('candy'),
         use: [
-          {
-            loader: 'imports-loader',
-            options: {
-              imports: ['default jquery jQuery', 'default mustache Mustache'],
-            },
-          },
-          {
-            loader: 'exports-loader',
-            options: {
-              exports: ['Candy'],
-            },
-          },
+          { loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'default mustache Mustache'] } },
+          { loader: 'exports-loader', options: { exports: ['Candy'] } },
         ],
       },
       {
         test: require.resolve('jquery-i18n/jquery.i18n.js'),
-        loader: 'imports-loader',
-        options: {
-          type: 'commonjs',
-          imports: 'single jquery jQuery',
-        },
+        use: [{ loader: 'imports-loader', options: { type: 'commonjs', imports: 'single jquery jQuery' } }],
       },
       {
         test: require.resolve('candy-shop/notifyme/candy.js'),
         use: [
-          {
-            loader: 'imports-loader',
-            options: {
-              imports: ['default jquery jQuery', 'named candy Candy'],
-            },
-          },
-          {
-            loader: 'exports-loader',
-            options: {
-              exports: ['default CandyShop.NotifyMe'],
-            },
-          },
+          { loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
+          { loader: 'exports-loader', options: { exports: ['default CandyShop.NotifyMe'] } },
         ],
       },
       {
         test: require.resolve('candy-shop/namecomplete/candy.js'),
         use: [
-          {
-            loader: 'imports-loader',
-            options: {
-              imports: ['default jquery jQuery', 'named candy Candy'],
-            },
-          },
-          {
-            loader: 'exports-loader',
-            options: {
-              exports: ['default CandyShop.NameComplete'],
-            },
-          },
+          { loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
+          { loader: 'exports-loader', options: { exports: ['default CandyShop.NameComplete'] } },
         ],
       },
       {
         test: require.resolve('candy-shop/modify-role/candy.js'),
         use: [
-          {
-            loader: 'imports-loader',
-            options: {
-              imports: ['default jquery jQuery', 'named candy Candy'],
-            },
-          },
-          {
-            loader: 'exports-loader',
-            options: {
-              exports: ['default CandyShop.ModifyRole'],
-            },
-          },
+          { loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
+          { loader: 'exports-loader', options: { exports: ['default CandyShop.ModifyRole'] } },
         ],
       },
       {
         test: require.resolve('candy-shop/me-does/candy.js'),
         use: [
-          {
-            loader: 'imports-loader',
-            options: {
-              imports: ['default jquery jQuery', 'named candy Candy'],
-            },
-          },
-          {
-            loader: 'exports-loader',
-            options: {
-              exports: ['default CandyShop.MeDoes'],
-            },
-          },
+          { loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
+          { loader: 'exports-loader', options: { exports: ['default CandyShop.MeDoes'] } },
         ],
       },
       {
         test: require.resolve('candy-shop/notifications/candy.js'),
         use: [
-          {
-            loader: 'imports-loader',
-            options: {
-              imports: ['default jquery jQuery', 'named candy Candy'],
-            },
-          },
-          {
-            loader: 'exports-loader',
-            options: {
-              exports: ['default CandyShop.Notifications'],
-            },
-          },
+          { loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
+          { loader: 'exports-loader', options: { exports: ['default CandyShop.Notifications'] } },
         ],
       },
       {
         test: require.resolve('candy-shop/refocus/candy.js'),
         use: [
-          {
-            loader: 'imports-loader',
-            options: {
-              imports: ['default jquery jQuery', 'named candy Candy'],
-            },
-          },
-          {
-            loader: 'exports-loader',
-            options: {
-              exports: ['default CandyShop.Refocus'],
-            },
-          },
+          { loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
+          { loader: 'exports-loader', options: { exports: ['default CandyShop.Refocus'] } },
         ],
       },
     ],