From 4d28113f9bc1e07f97aeea3395afee3dd0abb4a0 Mon Sep 17 00:00:00 2001 From: justorez Date: Thu, 1 Feb 2024 20:16:19 +0800 Subject: [PATCH] build: optimize bundle size (1.1MB to 364KB) --- package.json | 9 +-- pnpm-lock.yaml | 208 +++++-------------------------------------------- src/index.ts | 4 +- src/sdk.ts | 28 +++---- src/zip.ts | 4 +- 5 files changed, 40 insertions(+), 213 deletions(-) diff --git a/package.json b/package.json index 49a952b..ade24d0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pica-cli", "author": "justorez", - "version": "1.3.0", + "version": "1.3.1", "description": "😉 哔咔漫画下载器", "packageManager": "pnpm@8.14.3", "type": "module", @@ -66,7 +66,9 @@ ], "license": "MIT", "devDependencies": { - "@inquirer/prompts": "^3.3.2", + "@inquirer/checkbox": "^1.5.2", + "@inquirer/input": "^1.2.16", + "@inquirer/select": "^1.3.3", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3", @@ -74,7 +76,6 @@ "@types/debug": "^4.1.12", "@types/node": "^20.11.7", "@types/progress": "^2.0.7", - "@types/tough-cookie": "^4.0.5", "@typescript-eslint/eslint-plugin": "^6.20.0", "@typescript-eslint/parser": "^6.20.0", "@vitest/ui": "^1.2.2", @@ -99,14 +100,12 @@ "rollup-plugin-esbuild": "^6.1.1", "rollup-plugin-visualizer": "^5.12.0", "simple-git-hooks": "^2.9.0", - "tough-cookie": "^4.1.3", "tslib": "^2.6.2", "tsx": "^4.7.0", "typescript": "^5.3.3", "vitest": "^1.2.2" }, "dependencies": { - "axios-cookiejar-support": "^5.0.0", "chalk": "^5.3.0", "supports-color": "^9.4.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3578cc..2c09ed7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,9 +5,6 @@ settings: excludeLinksFromLockfile: false dependencies: - axios-cookiejar-support: - specifier: ^5.0.0 - version: 5.0.0(axios@1.6.7)(supports-color@9.4.0)(tough-cookie@4.1.3) chalk: specifier: ^5.3.0 version: 5.3.0 @@ -16,9 +13,15 @@ dependencies: version: 9.4.0 devDependencies: - '@inquirer/prompts': - specifier: ^3.3.2 - version: 3.3.2 + '@inquirer/checkbox': + specifier: ^1.5.2 + version: 1.5.2 + '@inquirer/input': + specifier: ^1.2.16 + version: 1.2.16 + '@inquirer/select': + specifier: ^1.3.3 + version: 1.3.3 '@rollup/plugin-commonjs': specifier: ^25.0.7 version: 25.0.7(rollup@4.9.6) @@ -40,9 +43,6 @@ devDependencies: '@types/progress': specifier: ^2.0.7 version: 2.0.7 - '@types/tough-cookie': - specifier: ^4.0.5 - version: 4.0.5 '@typescript-eslint/eslint-plugin': specifier: ^6.20.0 version: 6.20.0(@typescript-eslint/parser@6.20.0)(eslint@8.56.0)(supports-color@9.4.0)(typescript@5.3.3) @@ -115,9 +115,6 @@ devDependencies: simple-git-hooks: specifier: ^2.9.0 version: 2.9.0 - tough-cookie: - specifier: ^4.1.3 - version: 4.1.3 tslib: specifier: ^2.6.2 version: 2.6.2 @@ -620,15 +617,6 @@ packages: figures: 3.2.0 dev: true - /@inquirer/confirm@2.0.17: - resolution: {integrity: sha512-EqzhGryzmGpy2aJf6LxJVhndxYmFs+m8cxXzf8nejb1DE3sabf6mUgBcp4J0jAUEiAcYzqmkqRr7LPFh/WdnXA==} - engines: {node: '>=14.18.0'} - dependencies: - '@inquirer/core': 6.0.0 - '@inquirer/type': 1.1.6 - chalk: 4.1.2 - dev: true - /@inquirer/core@6.0.0: resolution: {integrity: sha512-fKi63Khkisgda3ohnskNf5uZJj+zXOaBvOllHsOkdsXRA/ubQLJQrZchFFi57NKbZzkTunXiBMdvWOv71alonw==} engines: {node: '>=14.18.0'} @@ -649,26 +637,6 @@ packages: wrap-ansi: 6.2.0 dev: true - /@inquirer/editor@1.2.15: - resolution: {integrity: sha512-gQ77Ls09x5vKLVNMH9q/7xvYPT6sIs5f7URksw+a2iJZ0j48tVS6crLqm2ugG33tgXHIwiEqkytY60Zyh5GkJQ==} - engines: {node: '>=14.18.0'} - dependencies: - '@inquirer/core': 6.0.0 - '@inquirer/type': 1.1.6 - chalk: 4.1.2 - external-editor: 3.1.0 - dev: true - - /@inquirer/expand@1.1.16: - resolution: {integrity: sha512-TGLU9egcuo+s7PxphKUCnJnpCIVY32/EwPCLLuu+gTvYiD8hZgx8Z2niNQD36sa6xcfpdLY6xXDBiL/+g1r2XQ==} - engines: {node: '>=14.18.0'} - dependencies: - '@inquirer/core': 6.0.0 - '@inquirer/type': 1.1.6 - chalk: 4.1.2 - figures: 3.2.0 - dev: true - /@inquirer/input@1.2.16: resolution: {integrity: sha512-Ou0LaSWvj1ni+egnyQ+NBtfM1885UwhRCMtsRt2bBO47DoC1dwtCa+ZUNgrxlnCHHF0IXsbQHYtIIjFGAavI4g==} engines: {node: '>=14.18.0'} @@ -678,40 +646,6 @@ packages: chalk: 4.1.2 dev: true - /@inquirer/password@1.1.16: - resolution: {integrity: sha512-aZYZVHLUXZ2gbBot+i+zOJrks1WaiI95lvZCn1sKfcw6MtSSlYC8uDX8sTzQvAsQ8epHoP84UNvAIT0KVGOGqw==} - engines: {node: '>=14.18.0'} - dependencies: - '@inquirer/core': 6.0.0 - '@inquirer/type': 1.1.6 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - dev: true - - /@inquirer/prompts@3.3.2: - resolution: {integrity: sha512-k52mOMRvTUejrqyF1h8Z07chC+sbaoaUYzzr1KrJXyj7yaX7Nrh0a9vktv8TuocRwIJOQMaj5oZEmkspEcJFYQ==} - engines: {node: '>=14.18.0'} - dependencies: - '@inquirer/checkbox': 1.5.2 - '@inquirer/confirm': 2.0.17 - '@inquirer/core': 6.0.0 - '@inquirer/editor': 1.2.15 - '@inquirer/expand': 1.1.16 - '@inquirer/input': 1.2.16 - '@inquirer/password': 1.1.16 - '@inquirer/rawlist': 1.2.16 - '@inquirer/select': 1.3.3 - dev: true - - /@inquirer/rawlist@1.2.16: - resolution: {integrity: sha512-pZ6TRg2qMwZAOZAV6TvghCtkr53dGnK29GMNQ3vMZXSNguvGqtOVc4j/h1T8kqGJFagjyfBZhUPGwNS55O5qPQ==} - engines: {node: '>=14.18.0'} - dependencies: - '@inquirer/core': 6.0.0 - '@inquirer/type': 1.1.6 - chalk: 4.1.2 - dev: true - /@inquirer/select@1.3.3: resolution: {integrity: sha512-RzlRISXWqIKEf83FDC9ZtJ3JvuK1l7aGpretf41BCWYrvla2wU8W8MTRNMiPrPJ+1SIqrRC1nZdZ60hD9hRXLg==} engines: {node: '>=14.18.0'} @@ -1015,10 +949,6 @@ packages: resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==} dev: true - /@types/tough-cookie@4.0.5: - resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} - dev: true - /@types/wrap-ansi@3.0.0: resolution: {integrity: sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==} dev: true @@ -1237,15 +1167,6 @@ packages: engines: {node: '>=6.0'} dev: true - /agent-base@7.1.0(supports-color@9.4.0): - resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} - engines: {node: '>= 14'} - dependencies: - debug: 4.3.4(supports-color@9.4.0) - transitivePeerDependencies: - - supports-color - dev: false - /ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1311,22 +1232,7 @@ packages: /asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - - /axios-cookiejar-support@5.0.0(axios@1.6.7)(supports-color@9.4.0)(tough-cookie@4.1.3): - resolution: {integrity: sha512-4zdO95qgsKp0OX+LUwD0MRWdD0r5YsQBpTi3ULHLL87qU58QZl3O3UQF58fZTzcdGtxYPtcotyXT7sNWDE37ug==} - engines: {node: '>=18.0.0'} - peerDependencies: - axios: '>=0.20.0' - tough-cookie: '>=4.0.0' - dependencies: - axios: 1.6.7(debug@4.3.4) - http-cookie-agent: 6.0.1(supports-color@9.4.0)(tough-cookie@4.1.3) - tough-cookie: 4.1.3 - transitivePeerDependencies: - - deasync - - supports-color - - undici - dev: false + dev: true /axios@1.6.7(debug@4.3.4): resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==} @@ -1336,6 +1242,7 @@ packages: proxy-from-env: 1.1.0 transitivePeerDependencies: - debug + dev: true /balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} @@ -1401,10 +1308,6 @@ packages: resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - /chardet@0.7.0: - resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} - dev: true - /check-error@1.0.3: resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} dependencies: @@ -1465,6 +1368,7 @@ packages: engines: {node: '>= 0.8'} dependencies: delayed-stream: 1.0.0 + dev: true /commander@11.1.0: resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} @@ -1499,6 +1403,7 @@ packages: dependencies: ms: 2.1.2 supports-color: 9.4.0 + dev: true /deep-eql@4.1.3: resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==} @@ -1524,6 +1429,7 @@ packages: /delayed-stream@1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} + dev: true /diff-sequences@29.6.3: resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} @@ -1798,15 +1704,6 @@ packages: strip-final-newline: 3.0.0 dev: true - /external-editor@3.1.0: - resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} - engines: {node: '>=4'} - dependencies: - chardet: 0.7.0 - iconv-lite: 0.4.24 - tmp: 0.0.33 - dev: true - /fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true @@ -1903,6 +1800,7 @@ packages: optional: true dependencies: debug: 4.3.4(supports-color@9.4.0) + dev: true /foreground-child@3.1.1: resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} @@ -1919,6 +1817,7 @@ packages: asynckit: 0.4.0 combined-stream: 1.0.8 mime-types: 2.1.35 + dev: true /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -2044,37 +1943,11 @@ packages: function-bind: 1.1.2 dev: true - /http-cookie-agent@6.0.1(supports-color@9.4.0)(tough-cookie@4.1.3): - resolution: {integrity: sha512-AhPCqG7i3K8OVWORyuULoP7/Xv90wf14jBAKyLqjKpaJyGjutiwryYV+Lj1jqPYnQtbQFimwSaeY7NXw22TckQ==} - engines: {node: '>=18.0.0'} - peerDependencies: - deasync: ^0.1.26 - tough-cookie: ^4.0.0 - undici: ^5.11.0 || ^6.0.0 - peerDependenciesMeta: - deasync: - optional: true - undici: - optional: true - dependencies: - agent-base: 7.1.0(supports-color@9.4.0) - tough-cookie: 4.1.3 - transitivePeerDependencies: - - supports-color - dev: false - /human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} dev: true - /iconv-lite@0.4.24: - resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} - engines: {node: '>=0.10.0'} - dependencies: - safer-buffer: 2.1.2 - dev: true - /ignore@5.3.0: resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==} engines: {node: '>= 4'} @@ -2368,12 +2241,14 @@ packages: /mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} + dev: true /mime-types@2.1.35: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} dependencies: mime-db: 1.52.0 + dev: true /mime@4.0.1: resolution: {integrity: sha512-5lZ5tyrIfliMXzFtkYyekWbtRXObT9OWa8IwQ5uxTBDHucNNwniRqo0yInflj+iYi5CBa6qxadGzGarDfuEOxA==} @@ -2432,6 +2307,7 @@ packages: /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + dev: true /mute-stream@1.0.0: resolution: {integrity: sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==} @@ -2511,11 +2387,6 @@ packages: strip-ansi: 7.1.0 dev: true - /os-tmpdir@1.0.2: - resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} - engines: {node: '>=0.10.0'} - dev: true - /p-limit@3.1.0: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} @@ -2655,16 +2526,12 @@ packages: /proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - - /psl@1.9.0: - resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} + dev: true /punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} - - /querystringify@2.2.0: - resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} + dev: true /queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} @@ -2679,9 +2546,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /requires-port@1.0.0: - resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} - /resolve-from@4.0.0: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} @@ -2800,10 +2664,6 @@ packages: queue-microtask: 1.2.3 dev: true - /safer-buffer@2.1.2: - resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - dev: true - /semver@7.5.4: resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} engines: {node: '>=10'} @@ -3000,13 +2860,6 @@ packages: engines: {node: '>=14.0.0'} dev: true - /tmp@0.0.33: - resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} - engines: {node: '>=0.6.0'} - dependencies: - os-tmpdir: 1.0.2 - dev: true - /to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -3019,15 +2872,6 @@ packages: engines: {node: '>=6'} dev: true - /tough-cookie@4.1.3: - resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==} - engines: {node: '>=6'} - dependencies: - psl: 1.9.0 - punycode: 2.3.1 - universalify: 0.2.0 - url-parse: 1.5.10 - /ts-api-utils@1.0.3(typescript@5.3.3): resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} engines: {node: '>=16.13.0'} @@ -3093,22 +2937,12 @@ packages: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} dev: true - /universalify@0.2.0: - resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} - engines: {node: '>= 4.0.0'} - /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.3.1 dev: true - /url-parse@1.5.10: - resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} - dependencies: - querystringify: 2.2.0 - requires-port: 1.0.0 - /vite-node@1.2.2(@types/node@20.11.7)(supports-color@9.4.0): resolution: {integrity: sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==} engines: {node: ^18.0.0 || >=20.0.0} diff --git a/src/index.ts b/src/index.ts index 240e1d0..ee6dac4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,7 +8,9 @@ import { isValidComicId } from './utils' import ora from 'ora' -import { select, checkbox, input } from '@inquirer/prompts' +import input from '@inquirer/input' +import select from '@inquirer/select' +import checkbox from '@inquirer/checkbox' import ProgressBar from 'progress' import { Comic } from './types' import pLimit from 'p-limit' diff --git a/src/sdk.ts b/src/sdk.ts index b87a71d..629c865 100644 --- a/src/sdk.ts +++ b/src/sdk.ts @@ -1,6 +1,4 @@ import axios, { AxiosError } from 'axios' -import { wrapper } from 'axios-cookiejar-support' -import { CookieJar } from 'tough-cookie' import headers from './data/headers.json' import { createHmac } from 'node:crypto' import path from 'node:path' @@ -30,24 +28,20 @@ export class Pica { retryMap = new Map() // constructor() { - const jar = new CookieJar() const httpProxy = process.env.PICA_PROXY ? new URL(process.env.PICA_PROXY as string) : false - this.api = wrapper( - axios.create({ - baseURL: 'https://picaapi.picacomic.com/', - // baseURL: 'https://api.manhuapica.com/', - jar, - proxy: httpProxy - ? { - protocol: httpProxy.protocol, - host: httpProxy.hostname, - port: Number(httpProxy.port) - } - : false - }) - ) + this.api = axios.create({ + baseURL: 'https://picaapi.picacomic.com/', + // baseURL: 'https://api.manhuapica.com/', + proxy: httpProxy + ? { + protocol: httpProxy.protocol, + host: httpProxy.hostname, + port: Number(httpProxy.port) + } + : false + }) this.api.interceptors.request.use((config) => { const method = config.method const url = config.url?.replace(/^\/|\/$/g, '') // url 首尾不能有 "/" diff --git a/src/zip.ts b/src/zip.ts index 05d522d..903b0c6 100644 --- a/src/zip.ts +++ b/src/zip.ts @@ -23,9 +23,7 @@ function main() { return } - log.info( - `${pico.cyan(comics.length)} 本漫画等待打包：${pico.cyan(comics.join(', '))}` - ) + log.info(`${comics.length}本漫画等待打包：${pico.cyan(comics.join(', '))}`) for (const comic of comics) { const comicRoot = path.join(root, comic)