@pinnacle0/webpack-util 0.7.1 → 0.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/SystemProxySettingsUtil.d.ts +1 -0
- package/src/SystemProxySettingsUtil.js +15 -0
- package/src/SystemProxySettingsUtil.js.map +1 -1
- package/src/WebpackServerStarter.d.ts +4 -0
- package/src/WebpackServerStarter.js +13 -8
- package/src/WebpackServerStarter.js.map +1 -1
package/package.json
CHANGED
|
@@ -32,6 +32,21 @@ class SystemProxySettingsUtil {
|
|
|
32
32
|
}
|
|
33
33
|
return null;
|
|
34
34
|
}
|
|
35
|
+
static isV2RayDockerRunning() {
|
|
36
|
+
try {
|
|
37
|
+
const output = (0, child_process_1.execSync)("docker ps", { encoding: "utf8" });
|
|
38
|
+
const lines = output.split("\n");
|
|
39
|
+
for (const line of lines) {
|
|
40
|
+
if (line.includes("v2ray")) {
|
|
41
|
+
return true;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
console.error("Error checking if V2Ray Docker container is running:", error);
|
|
47
|
+
}
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
35
50
|
static parseRawWebProxySettings(raw) {
|
|
36
51
|
const setting = raw.split("\n").reduce((settings, line) => {
|
|
37
52
|
const [key, value] = line.split(":").map(s => s.trim());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SystemProxySettingsUtil.js","sourceRoot":"","sources":["../../src/SystemProxySettingsUtil.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,
|
|
1
|
+
{"version":3,"file":"SystemProxySettingsUtil.js","sourceRoot":"","sources":["../../src/SystemProxySettingsUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,10 @@ export interface WebpackServerStarterOptions extends Pick<WebpackConfigGenerator
|
|
|
10
10
|
* Default: true
|
|
11
11
|
*/
|
|
12
12
|
useSystemSocksProxy?: boolean | string;
|
|
13
|
+
/**
|
|
14
|
+
* Will use this socks proxy if v2Ray Docker is running
|
|
15
|
+
*/
|
|
16
|
+
v2RaySocksProxyOnDocker?: string;
|
|
13
17
|
};
|
|
14
18
|
interceptExpressApp?: (app: NonNullable<Application>) => void;
|
|
15
19
|
}
|
|
@@ -36,7 +36,7 @@ class rspackServerStarter {
|
|
|
36
36
|
this.apiProxy = apiProxy
|
|
37
37
|
? [
|
|
38
38
|
{
|
|
39
|
-
agent: this.createAPISocksProxyAgent((_a = apiProxy.useSystemSocksProxy) !== null && _a !== void 0 ? _a : true),
|
|
39
|
+
agent: this.createAPISocksProxyAgent((_a = apiProxy.useSystemSocksProxy) !== null && _a !== void 0 ? _a : true, apiProxy.v2RaySocksProxyOnDocker),
|
|
40
40
|
context: apiProxy.context,
|
|
41
41
|
target: apiProxy.target,
|
|
42
42
|
secure: false,
|
|
@@ -120,17 +120,22 @@ class rspackServerStarter {
|
|
|
120
120
|
proxy: this.apiProxy,
|
|
121
121
|
}, (0, core_1.rspack)(this.rspackConfig));
|
|
122
122
|
}
|
|
123
|
-
createAPISocksProxyAgent(useSocksProxy) {
|
|
123
|
+
createAPISocksProxyAgent(useSocksProxy, v2RaySocksProxyOnDocker) {
|
|
124
124
|
if (useSocksProxy === false)
|
|
125
125
|
return null;
|
|
126
|
+
let url;
|
|
126
127
|
if (typeof useSocksProxy === "string") {
|
|
127
|
-
|
|
128
|
-
|
|
128
|
+
url = useSocksProxy;
|
|
129
|
+
}
|
|
130
|
+
else if (SystemProxySettingsUtil_1.SystemProxySettingsUtil.isV2RayDockerRunning() && v2RaySocksProxyOnDocker) {
|
|
131
|
+
url = v2RaySocksProxyOnDocker;
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
const settings = SystemProxySettingsUtil_1.SystemProxySettingsUtil.get();
|
|
135
|
+
if (!settings)
|
|
136
|
+
return null;
|
|
137
|
+
url = `socks://${settings.server}:${settings.port}`;
|
|
129
138
|
}
|
|
130
|
-
const settings = SystemProxySettingsUtil_1.SystemProxySettingsUtil.get();
|
|
131
|
-
if (!settings)
|
|
132
|
-
return null;
|
|
133
|
-
const url = `socks://${settings.server}:${settings.port}`;
|
|
134
139
|
this.logger.info(["Using socks proxy:", url]);
|
|
135
140
|
return new socks_proxy_agent_1.SocksProxyAgent(url);
|
|
136
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebpackServerStarter.js","sourceRoot":"","sources":["../../src/WebpackServerStarter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iEAA4D;AAC5D,gDAAwB;AACxB,uCAAoC;AAIpC,mDAAmD;AAEnD,qEAAgE;AAChE,yDAAkD;AAClD,uEAAkE;
|
|
1
|
+
{"version":3,"file":"WebpackServerStarter.js","sourceRoot":"","sources":["../../src/WebpackServerStarter.ts"],"names":[],"mappings":"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"}
|