mwc-proxy 0.0.2 → 0.0.3

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.
Files changed (3) hide show
  1. package/dist/signal-client.d.ts.map +1 -1
  2. package/dist/signal-client.js +19 -11
  3. package/package.json +4 -1
package/dist/signal-client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"signal-client.d.ts","sourceRoot":"","sources":["../src/signal-client.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,mBAAmB,GAAG;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,wGAAwG;IACxG,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAC5B,CAAA;CACJ,CAAA;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,UAAU,CAAC,CAAgB;IACnC,OAAO,CAAC,YAAY,CAAI;IACxB,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,aAAa,CAAQ;gBAEjB,OAAO,EAAE,OAAO,CAAC,mBAAmB,CAAC;YAuBnC,oBAAoB;YA6BpB,WAAW;IAQzB,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,KAAK;IAQb,OAAO,CAAC,kBAAkB;IA+D1B,IAAI;IAOJ,SAAS,IAAI,OAAO;CAGvB"}
1
+ {"version":3,"file":"signal-client.d.ts","sourceRoot":"","sources":["../src/signal-client.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,mBAAmB,GAAG;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,wGAAwG;IACxG,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAC5B,CAAA;CACJ,CAAA;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,UAAU,CAAC,CAAgB;IACnC,OAAO,CAAC,YAAY,CAAI;IACxB,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,aAAa,CAAQ;gBAEjB,OAAO,EAAE,OAAO,CAAC,mBAAmB,CAAC;YAuBnC,oBAAoB;YAqCpB,WAAW;IAQzB,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,KAAK;IAQb,OAAO,CAAC,kBAAkB;IA+D1B,IAAI;IAOJ,SAAS,IAAI,OAAO;CAGvB"}
package/dist/signal-client.js CHANGED
@@ -40,17 +40,26 @@ class SignalClient {
40
40
  async runSelfCheckAndStart() {
41
41
  const port = this.options.listenPort;
42
42
  const urlRoot = (this.options.urlRoot ?? '').replace(/\/$/, '');
43
+ const path = `${urlRoot}/connect`;
43
44
  try {
44
- const publicIp = await this.getPublicIp();
45
- if (!publicIp) {
46
- console.warn('Signal: could not get public IP, skipping signal server integration');
47
- this.selfCheckDone = true;
48
- return;
45
+ let selfCheckUrl;
46
+ if (this.options.domain) {
47
+ const base = this.options.domain.replace(/\/$/, '');
48
+ selfCheckUrl = `https://${base}/${path.replace(/^\//, '')}`;
49
+ }
50
+ else {
51
+ const publicIp = await this.getPublicIp();
52
+ if (!publicIp) {
53
+ console.warn('Signal: could not get public IP, skipping signal server integration');
54
+ this.selfCheckDone = true;
55
+ return;
56
+ }
57
+ selfCheckUrl = `http://${publicIp}:${port}${path}`;
49
58
  }
50
- const ok = await this.selfCheckLoop(publicIp, port, urlRoot);
59
+ const ok = await this.selfCheckLoop(selfCheckUrl);
51
60
  this.selfCheckDone = true;
52
61
  if (!ok) {
53
- console.warn(`Signal: self-check failed (not reachable at ${publicIp}:${port}), skipping signal server integration`);
62
+ console.warn(`Signal: self-check failed (not reachable at ${selfCheckUrl}), skipping signal server integration`);
54
63
  return;
55
64
  }
56
65
  this.selfCheckPassed = true;
@@ -69,11 +78,10 @@ class SignalClient {
69
78
  return null;
70
79
  }
71
80
  }
72
- selfCheckLoop(publicIp, port, urlRoot) {
81
+ selfCheckLoop(url) {
73
82
  return new Promise((resolve) => {
74
- const path = `${urlRoot}/connect`;
75
- const url = `http://${publicIp}:${port}${path}`;
76
- const req = http_1.default.get(url, (res) => {
83
+ const protocol = url.startsWith('https') ? https_1.default : http_1.default;
84
+ const req = protocol.get(url, (res) => {
77
85
  if (res.statusCode === 502) {
78
86
  resolve(false);
79
87
  return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mwc-proxy",
3
- "version": "0.0.2",
3
+ "version": "0.0.3",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "exports": {
@@ -40,6 +40,9 @@
40
40
  "socks": "^2.8.0",
41
41
  "yggdrasil": "^1.6.0"
42
42
  },
43
+ "patchedDependencies": {
44
+ "prismarine-auth@2.7.0": "patches/prismarine-auth@2.7.0.patch"
45
+ },
43
46
  "repository": "https://github.com/zardoy/mwc-proxy",
44
47
  "engines": {
45
48
  "node": "^12.20.0 || ^14.13.1 || >=16.0.0"