mirror of
https://github.com/opelly27/streetmerchant.git
synced 2026-05-20 05:17:35 +00:00
fix(proxy): build proxyList correctly
Also remove unnecessary `all` npm script.
This commit is contained in:
@@ -3,7 +3,6 @@
|
|||||||
"description": "The world's easiest, most powerful stock checker",
|
"description": "The world's easiest, most powerful stock checker",
|
||||||
"main": "src/index.ts",
|
"main": "src/index.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"all": "npm run compile && npm run lint && npm run test",
|
|
||||||
"fix": "gts fix",
|
"fix": "gts fix",
|
||||||
"lint": "gts lint",
|
"lint": "gts lint",
|
||||||
"clean": "gts clean",
|
"clean": "gts clean",
|
||||||
|
|||||||
+3
-3
@@ -158,7 +158,7 @@ function envOrNumberMax(
|
|||||||
return number ?? 0;
|
return number ?? 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadProxyList(filename: string): string[] {
|
function loadProxyList(filename: string): string[] | undefined {
|
||||||
try {
|
try {
|
||||||
return readFileSync(`${filename}.proxies`)
|
return readFileSync(`${filename}.proxies`)
|
||||||
.toString()
|
.toString()
|
||||||
@@ -166,7 +166,7 @@ function loadProxyList(filename: string): string[] {
|
|||||||
.split('\n')
|
.split('\n')
|
||||||
.map(x => x.trim());
|
.map(x => x.trim());
|
||||||
} catch {
|
} catch {
|
||||||
return [];
|
return undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -412,7 +412,7 @@ const store = {
|
|||||||
|
|
||||||
let proxyList = loadProxyList(name);
|
let proxyList = loadProxyList(name);
|
||||||
|
|
||||||
if (proxyList.length === 0) {
|
if (!proxyList) {
|
||||||
proxyList = loadProxyList('global');
|
proxyList = loadProxyList('global');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ import {
|
|||||||
import {isAbsolute, join, normalize, relative} from 'path';
|
import {isAbsolute, join, normalize, relative} from 'path';
|
||||||
import {logger} from '../logger';
|
import {logger} from '../logger';
|
||||||
|
|
||||||
const approot = join(__dirname, '../../../');
|
const approot = join(__dirname, '../../');
|
||||||
const webroot = join(approot, './web');
|
const webroot = join(approot, './web');
|
||||||
|
|
||||||
const contentTypeMap: Record<string, string> = {
|
const contentTypeMap: Record<string, string> = {
|
||||||
|
|||||||
Reference in New Issue
Block a user