@remnawave/xtls-sdk 0.0.8 → 0.0.81-dev.1.8.6

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 (76) hide show
  1. package/build/index-local.d.ts +10 -0
  2. package/build/index-local.d.ts.map +1 -0
  3. package/build/index-local.js +21 -0
  4. package/build/src/common/utils/decode-user/constants/account-types.d.ts +0 -18
  5. package/build/src/common/utils/decode-user/constants/account-types.d.ts.map +1 -1
  6. package/build/src/common/utils/decode-user/constants/account-types.js +1 -28
  7. package/build/src/common/utils/decode-user/types/decoded-user.type.d.ts +0 -4
  8. package/build/src/common/utils/decode-user/types/decoded-user.type.d.ts.map +1 -1
  9. package/build/src/handler/handler.service.d.ts +2 -60
  10. package/build/src/handler/handler.service.d.ts.map +1 -1
  11. package/build/src/handler/handler.service.js +2 -207
  12. package/build/src/handler/models/index.d.ts +0 -1
  13. package/build/src/handler/models/index.d.ts.map +1 -1
  14. package/build/src/handler/models/index.js +0 -1
  15. package/build/src/stats/stats.service.d.ts +1 -27
  16. package/build/src/stats/stats.service.d.ts.map +1 -1
  17. package/build/src/stats/stats.service.js +0 -53
  18. package/build/src/xray-protos/app/commander/config.d.ts +0 -2
  19. package/build/src/xray-protos/app/commander/config.d.ts.map +1 -1
  20. package/build/src/xray-protos/app/commander/config.js +1 -16
  21. package/build/src/xray-protos/app/log/config.d.ts +0 -1
  22. package/build/src/xray-protos/app/log/config.d.ts.map +1 -1
  23. package/build/src/xray-protos/app/log/config.js +0 -16
  24. package/build/src/xray-protos/app/policy/config.d.ts +0 -1
  25. package/build/src/xray-protos/app/policy/config.d.ts.map +1 -1
  26. package/build/src/xray-protos/app/policy/config.js +1 -16
  27. package/build/src/xray-protos/app/proxyman/command/command.d.ts +0 -36
  28. package/build/src/xray-protos/app/proxyman/command/command.d.ts.map +1 -1
  29. package/build/src/xray-protos/app/proxyman/command/command.js +1 -210
  30. package/build/src/xray-protos/app/proxyman/config.d.ts +14 -1
  31. package/build/src/xray-protos/app/proxyman/config.d.ts.map +1 -1
  32. package/build/src/xray-protos/app/proxyman/config.js +63 -19
  33. package/build/src/xray-protos/app/stats/command/command.d.ts +0 -10
  34. package/build/src/xray-protos/app/stats/command/command.d.ts.map +1 -1
  35. package/build/src/xray-protos/app/stats/command/command.js +0 -8
  36. package/build/src/xray-protos/common/net/network.d.ts +2 -0
  37. package/build/src/xray-protos/common/net/network.d.ts.map +1 -1
  38. package/build/src/xray-protos/common/net/network.js +7 -0
  39. package/build/src/xray-protos/common/protocol/user.d.ts +1 -1
  40. package/build/src/xray-protos/core/config.d.ts +9 -0
  41. package/build/src/xray-protos/core/config.d.ts.map +1 -1
  42. package/build/src/xray-protos/core/config.js +19 -1
  43. package/build/src/xray-protos/proxy/dns/config.d.ts +0 -1
  44. package/build/src/xray-protos/proxy/dns/config.d.ts.map +1 -1
  45. package/build/src/xray-protos/proxy/dns/config.js +1 -27
  46. package/build/src/xray-protos/proxy/dokodemo/config.d.ts +10 -1
  47. package/build/src/xray-protos/proxy/dokodemo/config.d.ts.map +1 -1
  48. package/build/src/xray-protos/proxy/dokodemo/config.js +34 -0
  49. package/build/src/xray-protos/proxy/freedom/config.d.ts +2 -11
  50. package/build/src/xray-protos/proxy/freedom/config.d.ts.map +1 -1
  51. package/build/src/xray-protos/proxy/freedom/config.js +17 -181
  52. package/build/src/xray-protos/proxy/http/config.d.ts +2 -0
  53. package/build/src/xray-protos/proxy/http/config.d.ts.map +1 -1
  54. package/build/src/xray-protos/proxy/http/config.js +16 -1
  55. package/build/src/xray-protos/proxy/shadowsocks_2022/config.d.ts +5 -4
  56. package/build/src/xray-protos/proxy/shadowsocks_2022/config.d.ts.map +1 -1
  57. package/build/src/xray-protos/proxy/shadowsocks_2022/config.js +48 -16
  58. package/build/src/xray-protos/proxy/socks/config.d.ts +12 -1
  59. package/build/src/xray-protos/proxy/socks/config.d.ts.map +1 -1
  60. package/build/src/xray-protos/proxy/socks/config.js +73 -3
  61. package/build/src/xray-protos/proxy/wireguard/config.d.ts +1 -1
  62. package/build/src/xray-protos/proxy/wireguard/config.d.ts.map +1 -1
  63. package/build/src/xray-protos/proxy/wireguard/config.js +8 -8
  64. package/build/src/xray-protos/transport/global/config.d.ts +29 -0
  65. package/build/src/xray-protos/transport/global/config.d.ts.map +1 -0
  66. package/build/src/xray-protos/transport/global/config.js +71 -0
  67. package/build/src/xray-protos/transport/internet/config.d.ts +27 -15
  68. package/build/src/xray-protos/transport/internet/config.d.ts.map +1 -1
  69. package/build/src/xray-protos/transport/internet/config.js +84 -150
  70. package/package.json +3 -3
  71. package/build/src/handler/models/get-inbound-users/get-inbound-users.response.model.d.ts +0 -7
  72. package/build/src/handler/models/get-inbound-users/get-inbound-users.response.model.d.ts.map +0 -1
  73. package/build/src/handler/models/get-inbound-users/get-inbound-users.response.model.js +0 -10
  74. package/build/src/handler/models/get-inbound-users/index.d.ts +0 -2
  75. package/build/src/handler/models/get-inbound-users/index.d.ts.map +0 -1
  76. package/build/src/handler/models/get-inbound-users/index.js +0 -17
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/xray-protos/proxy/freedom/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/xray-protos/proxy/freedom/config.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@
5
5
  // protoc v5.28.3
6
6
  // source: proxy/freedom/config.proto
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
- exports.Config = exports.Noise = exports.Fragment = exports.DestinationOverride = exports.Config_DomainStrategy = exports.protobufPackage = void 0;
8
+ exports.Config = exports.Fragment = exports.DestinationOverride = exports.Config_DomainStrategy = exports.protobufPackage = void 0;
9
9
  exports.config_DomainStrategyFromJSON = config_DomainStrategyFromJSON;
10
10
  exports.config_DomainStrategyToJSON = config_DomainStrategyToJSON;
11
11
  /* eslint-disable */
@@ -295,138 +295,14 @@ exports.Fragment = {
295
295
  },
296
296
  };
297
297
  typeRegistry_1.messageTypeRegistry.set(exports.Fragment.$type, exports.Fragment);
298
- function createBaseNoise() {
299
- return {
300
- $type: "xray.proxy.freedom.Noise",
301
- lengthMin: 0,
302
- lengthMax: 0,
303
- delayMin: 0,
304
- delayMax: 0,
305
- strNoise: new Uint8Array(0),
306
- };
307
- }
308
- exports.Noise = {
309
- $type: "xray.proxy.freedom.Noise",
310
- encode(message, writer = new wire_1.BinaryWriter()) {
311
- if (message.lengthMin !== 0) {
312
- writer.uint32(8).uint64(message.lengthMin);
313
- }
314
- if (message.lengthMax !== 0) {
315
- writer.uint32(16).uint64(message.lengthMax);
316
- }
317
- if (message.delayMin !== 0) {
318
- writer.uint32(24).uint64(message.delayMin);
319
- }
320
- if (message.delayMax !== 0) {
321
- writer.uint32(32).uint64(message.delayMax);
322
- }
323
- if (message.strNoise.length !== 0) {
324
- writer.uint32(42).bytes(message.strNoise);
325
- }
326
- return writer;
327
- },
328
- decode(input, length) {
329
- const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
330
- let end = length === undefined ? reader.len : reader.pos + length;
331
- const message = createBaseNoise();
332
- while (reader.pos < end) {
333
- const tag = reader.uint32();
334
- switch (tag >>> 3) {
335
- case 1: {
336
- if (tag !== 8) {
337
- break;
338
- }
339
- message.lengthMin = longToNumber(reader.uint64());
340
- continue;
341
- }
342
- case 2: {
343
- if (tag !== 16) {
344
- break;
345
- }
346
- message.lengthMax = longToNumber(reader.uint64());
347
- continue;
348
- }
349
- case 3: {
350
- if (tag !== 24) {
351
- break;
352
- }
353
- message.delayMin = longToNumber(reader.uint64());
354
- continue;
355
- }
356
- case 4: {
357
- if (tag !== 32) {
358
- break;
359
- }
360
- message.delayMax = longToNumber(reader.uint64());
361
- continue;
362
- }
363
- case 5: {
364
- if (tag !== 42) {
365
- break;
366
- }
367
- message.strNoise = reader.bytes();
368
- continue;
369
- }
370
- }
371
- if ((tag & 7) === 4 || tag === 0) {
372
- break;
373
- }
374
- reader.skip(tag & 7);
375
- }
376
- return message;
377
- },
378
- fromJSON(object) {
379
- return {
380
- $type: exports.Noise.$type,
381
- lengthMin: isSet(object.lengthMin) ? globalThis.Number(object.lengthMin) : 0,
382
- lengthMax: isSet(object.lengthMax) ? globalThis.Number(object.lengthMax) : 0,
383
- delayMin: isSet(object.delayMin) ? globalThis.Number(object.delayMin) : 0,
384
- delayMax: isSet(object.delayMax) ? globalThis.Number(object.delayMax) : 0,
385
- strNoise: isSet(object.strNoise) ? bytesFromBase64(object.strNoise) : new Uint8Array(0),
386
- };
387
- },
388
- toJSON(message) {
389
- const obj = {};
390
- if (message.lengthMin !== 0) {
391
- obj.lengthMin = Math.round(message.lengthMin);
392
- }
393
- if (message.lengthMax !== 0) {
394
- obj.lengthMax = Math.round(message.lengthMax);
395
- }
396
- if (message.delayMin !== 0) {
397
- obj.delayMin = Math.round(message.delayMin);
398
- }
399
- if (message.delayMax !== 0) {
400
- obj.delayMax = Math.round(message.delayMax);
401
- }
402
- if (message.strNoise.length !== 0) {
403
- obj.strNoise = base64FromBytes(message.strNoise);
404
- }
405
- return obj;
406
- },
407
- create(base) {
408
- return exports.Noise.fromPartial(base ?? {});
409
- },
410
- fromPartial(object) {
411
- const message = createBaseNoise();
412
- message.lengthMin = object.lengthMin ?? 0;
413
- message.lengthMax = object.lengthMax ?? 0;
414
- message.delayMin = object.delayMin ?? 0;
415
- message.delayMax = object.delayMax ?? 0;
416
- message.strNoise = object.strNoise ?? new Uint8Array(0);
417
- return message;
418
- },
419
- };
420
- typeRegistry_1.messageTypeRegistry.set(exports.Noise.$type, exports.Noise);
421
298
  function createBaseConfig() {
422
299
  return {
423
300
  $type: "xray.proxy.freedom.Config",
424
301
  domainStrategy: 0,
302
+ timeout: 0,
425
303
  destinationOverride: undefined,
426
304
  userLevel: 0,
427
305
  fragment: undefined,
428
- proxyProtocol: 0,
429
- noises: [],
430
306
  };
431
307
  }
432
308
  exports.Config = {
@@ -435,6 +311,9 @@ exports.Config = {
435
311
  if (message.domainStrategy !== 0) {
436
312
  writer.uint32(8).int32(message.domainStrategy);
437
313
  }
314
+ if (message.timeout !== 0) {
315
+ writer.uint32(16).uint32(message.timeout);
316
+ }
438
317
  if (message.destinationOverride !== undefined) {
439
318
  exports.DestinationOverride.encode(message.destinationOverride, writer.uint32(26).fork()).join();
440
319
  }
@@ -444,12 +323,6 @@ exports.Config = {
444
323
  if (message.fragment !== undefined) {
445
324
  exports.Fragment.encode(message.fragment, writer.uint32(42).fork()).join();
446
325
  }
447
- if (message.proxyProtocol !== 0) {
448
- writer.uint32(48).uint32(message.proxyProtocol);
449
- }
450
- for (const v of message.noises) {
451
- exports.Noise.encode(v, writer.uint32(58).fork()).join();
452
- }
453
326
  return writer;
454
327
  },
455
328
  decode(input, length) {
@@ -466,6 +339,13 @@ exports.Config = {
466
339
  message.domainStrategy = reader.int32();
467
340
  continue;
468
341
  }
342
+ case 2: {
343
+ if (tag !== 16) {
344
+ break;
345
+ }
346
+ message.timeout = reader.uint32();
347
+ continue;
348
+ }
469
349
  case 3: {
470
350
  if (tag !== 26) {
471
351
  break;
@@ -487,20 +367,6 @@ exports.Config = {
487
367
  message.fragment = exports.Fragment.decode(reader, reader.uint32());
488
368
  continue;
489
369
  }
490
- case 6: {
491
- if (tag !== 48) {
492
- break;
493
- }
494
- message.proxyProtocol = reader.uint32();
495
- continue;
496
- }
497
- case 7: {
498
- if (tag !== 58) {
499
- break;
500
- }
501
- message.noises.push(exports.Noise.decode(reader, reader.uint32()));
502
- continue;
503
- }
504
370
  }
505
371
  if ((tag & 7) === 4 || tag === 0) {
506
372
  break;
@@ -513,13 +379,12 @@ exports.Config = {
513
379
  return {
514
380
  $type: exports.Config.$type,
515
381
  domainStrategy: isSet(object.domainStrategy) ? config_DomainStrategyFromJSON(object.domainStrategy) : 0,
382
+ timeout: isSet(object.timeout) ? globalThis.Number(object.timeout) : 0,
516
383
  destinationOverride: isSet(object.destinationOverride)
517
384
  ? exports.DestinationOverride.fromJSON(object.destinationOverride)
518
385
  : undefined,
519
386
  userLevel: isSet(object.userLevel) ? globalThis.Number(object.userLevel) : 0,
520
387
  fragment: isSet(object.fragment) ? exports.Fragment.fromJSON(object.fragment) : undefined,
521
- proxyProtocol: isSet(object.proxyProtocol) ? globalThis.Number(object.proxyProtocol) : 0,
522
- noises: globalThis.Array.isArray(object?.noises) ? object.noises.map((e) => exports.Noise.fromJSON(e)) : [],
523
388
  };
524
389
  },
525
390
  toJSON(message) {
@@ -527,6 +392,9 @@ exports.Config = {
527
392
  if (message.domainStrategy !== 0) {
528
393
  obj.domainStrategy = config_DomainStrategyToJSON(message.domainStrategy);
529
394
  }
395
+ if (message.timeout !== 0) {
396
+ obj.timeout = Math.round(message.timeout);
397
+ }
530
398
  if (message.destinationOverride !== undefined) {
531
399
  obj.destinationOverride = exports.DestinationOverride.toJSON(message.destinationOverride);
532
400
  }
@@ -536,12 +404,6 @@ exports.Config = {
536
404
  if (message.fragment !== undefined) {
537
405
  obj.fragment = exports.Fragment.toJSON(message.fragment);
538
406
  }
539
- if (message.proxyProtocol !== 0) {
540
- obj.proxyProtocol = Math.round(message.proxyProtocol);
541
- }
542
- if (message.noises?.length) {
543
- obj.noises = message.noises.map((e) => exports.Noise.toJSON(e));
544
- }
545
407
  return obj;
546
408
  },
547
409
  create(base) {
@@ -550,6 +412,7 @@ exports.Config = {
550
412
  fromPartial(object) {
551
413
  const message = createBaseConfig();
552
414
  message.domainStrategy = object.domainStrategy ?? 0;
415
+ message.timeout = object.timeout ?? 0;
553
416
  message.destinationOverride = (object.destinationOverride !== undefined && object.destinationOverride !== null)
554
417
  ? exports.DestinationOverride.fromPartial(object.destinationOverride)
555
418
  : undefined;
@@ -557,37 +420,10 @@ exports.Config = {
557
420
  message.fragment = (object.fragment !== undefined && object.fragment !== null)
558
421
  ? exports.Fragment.fromPartial(object.fragment)
559
422
  : undefined;
560
- message.proxyProtocol = object.proxyProtocol ?? 0;
561
- message.noises = object.noises?.map((e) => exports.Noise.fromPartial(e)) || [];
562
423
  return message;
563
424
  },
564
425
  };
565
426
  typeRegistry_1.messageTypeRegistry.set(exports.Config.$type, exports.Config);
566
- function bytesFromBase64(b64) {
567
- if (globalThis.Buffer) {
568
- return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
569
- }
570
- else {
571
- const bin = globalThis.atob(b64);
572
- const arr = new Uint8Array(bin.length);
573
- for (let i = 0; i < bin.length; ++i) {
574
- arr[i] = bin.charCodeAt(i);
575
- }
576
- return arr;
577
- }
578
- }
579
- function base64FromBytes(arr) {
580
- if (globalThis.Buffer) {
581
- return globalThis.Buffer.from(arr).toString("base64");
582
- }
583
- else {
584
- const bin = [];
585
- arr.forEach((byte) => {
586
- bin.push(globalThis.String.fromCharCode(byte));
587
- });
588
- return globalThis.btoa(bin.join(""));
589
- }
590
- }
591
427
  function longToNumber(int64) {
592
428
  const num = globalThis.Number(int64.toString());
593
429
  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
@@ -9,6 +9,8 @@ export interface Account {
9
9
  /** Config for HTTP proxy server. */
10
10
  export interface ServerConfig {
11
11
  $type: "xray.proxy.http.ServerConfig";
12
+ /** @deprecated */
13
+ timeout: number;
12
14
  accounts: {
13
15
  [key: string]: string;
14
16
  };
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/xray-protos/proxy/http/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/xray-protos/proxy/http/config.ts"],"names":[],"mappings":"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"}
@@ -83,11 +83,14 @@ exports.Account = {
83
83
  };
84
84
  typeRegistry_1.messageTypeRegistry.set(exports.Account.$type, exports.Account);
85
85
  function createBaseServerConfig() {
86
- return { $type: "xray.proxy.http.ServerConfig", accounts: {}, allowTransparent: false, userLevel: 0 };
86
+ return { $type: "xray.proxy.http.ServerConfig", timeout: 0, accounts: {}, allowTransparent: false, userLevel: 0 };
87
87
  }
88
88
  exports.ServerConfig = {
89
89
  $type: "xray.proxy.http.ServerConfig",
90
90
  encode(message, writer = new wire_1.BinaryWriter()) {
91
+ if (message.timeout !== 0) {
92
+ writer.uint32(8).uint32(message.timeout);
93
+ }
91
94
  Object.entries(message.accounts).forEach(([key, value]) => {
92
95
  exports.ServerConfig_AccountsEntry.encode({ $type: "xray.proxy.http.ServerConfig.AccountsEntry", key: key, value }, writer.uint32(18).fork()).join();
93
96
  });
@@ -106,6 +109,13 @@ exports.ServerConfig = {
106
109
  while (reader.pos < end) {
107
110
  const tag = reader.uint32();
108
111
  switch (tag >>> 3) {
112
+ case 1: {
113
+ if (tag !== 8) {
114
+ break;
115
+ }
116
+ message.timeout = reader.uint32();
117
+ continue;
118
+ }
109
119
  case 2: {
110
120
  if (tag !== 18) {
111
121
  break;
@@ -141,6 +151,7 @@ exports.ServerConfig = {
141
151
  fromJSON(object) {
142
152
  return {
143
153
  $type: exports.ServerConfig.$type,
154
+ timeout: isSet(object.timeout) ? globalThis.Number(object.timeout) : 0,
144
155
  accounts: isObject(object.accounts)
145
156
  ? Object.entries(object.accounts).reduce((acc, [key, value]) => {
146
157
  acc[key] = String(value);
@@ -153,6 +164,9 @@ exports.ServerConfig = {
153
164
  },
154
165
  toJSON(message) {
155
166
  const obj = {};
167
+ if (message.timeout !== 0) {
168
+ obj.timeout = Math.round(message.timeout);
169
+ }
156
170
  if (message.accounts) {
157
171
  const entries = Object.entries(message.accounts);
158
172
  if (entries.length > 0) {
@@ -175,6 +189,7 @@ exports.ServerConfig = {
175
189
  },
176
190
  fromPartial(object) {
177
191
  const message = createBaseServerConfig();
192
+ message.timeout = object.timeout ?? 0;
178
193
  message.accounts = Object.entries(object.accounts ?? {}).reduce((acc, [key, value]) => {
179
194
  if (value !== undefined) {
180
195
  acc[key] = globalThis.String(value);
@@ -1,7 +1,6 @@
1
1
  import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
2
2
  import { IPOrDomain } from "../../common/net/address";
3
3
  import { Network } from "../../common/net/network";
4
- import { User } from "../../common/protocol/user";
5
4
  export declare const protobufPackage = "xray.proxy.shadowsocks_2022";
6
5
  export interface ServerConfig {
7
6
  $type: "xray.proxy.shadowsocks_2022.ServerConfig";
@@ -33,9 +32,11 @@ export interface RelayServerConfig {
33
32
  destinations: RelayDestination[];
34
33
  network: Network[];
35
34
  }
36
- export interface Account {
37
- $type: "xray.proxy.shadowsocks_2022.Account";
35
+ export interface User {
36
+ $type: "xray.proxy.shadowsocks_2022.User";
38
37
  key: string;
38
+ email: string;
39
+ level: number;
39
40
  }
40
41
  export interface ClientConfig {
41
42
  $type: "xray.proxy.shadowsocks_2022.ClientConfig";
@@ -50,7 +51,7 @@ export declare const ServerConfig: MessageFns<ServerConfig, "xray.proxy.shadowso
50
51
  export declare const MultiUserServerConfig: MessageFns<MultiUserServerConfig, "xray.proxy.shadowsocks_2022.MultiUserServerConfig">;
51
52
  export declare const RelayDestination: MessageFns<RelayDestination, "xray.proxy.shadowsocks_2022.RelayDestination">;
52
53
  export declare const RelayServerConfig: MessageFns<RelayServerConfig, "xray.proxy.shadowsocks_2022.RelayServerConfig">;
53
- export declare const Account: MessageFns<Account, "xray.proxy.shadowsocks_2022.Account">;
54
+ export declare const User: MessageFns<User, "xray.proxy.shadowsocks_2022.User">;
54
55
  export declare const ClientConfig: MessageFns<ClientConfig, "xray.proxy.shadowsocks_2022.ClientConfig">;
55
56
  type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
56
57
  export type DeepPartial<T> = T extends Builtin ? T : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/xray-protos/proxy/shadowsocks_2022/config.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAkC,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGlD,eAAO,MAAM,eAAe,gCAAgC,CAAC;AAE7D,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,0CAA0C,CAAC;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,mDAAmD,CAAC;IAC3D,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,8CAA8C,CAAC;IACtD,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,+CAA+C,CAAC;IACvD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,gBAAgB,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,qCAAqC,CAAC;IAC7C,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,0CAA0C,CAAC;IAClD,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAMD,eAAO,MAAM,YAAY,EAAE,UAAU,CAAC,YAAY,EAAE,0CAA0C,CAqI7F,CAAC;AAQF,eAAO,MAAM,qBAAqB,EAAE,UAAU,CAC5C,qBAAqB,EACrB,mDAAmD,CAsHpD,CAAC;AAeF,eAAO,MAAM,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAAE,8CAA8C,CA2HzG,CAAC;AAQF,eAAO,MAAM,iBAAiB,EAAE,UAAU,CAAC,iBAAiB,EAAE,+CAA+C,CAuH5G,CAAC;AAQF,eAAO,MAAM,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,qCAAqC,CAsD9E,CAAC;AAgBF,eAAO,MAAM,YAAY,EAAE,UAAU,CAAC,YAAY,EAAE,0CAA0C,CA2I7F,CAAC;AAIF,KAAK,OAAO,GAAG,IAAI,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAEpF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,GAAG,CAAC,GAC9C,CAAC,SAAS,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GACtE,CAAC,SAAS,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAChE,CAAC,SAAS,EAAE,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACvE,OAAO,CAAC,CAAC,CAAC,CAAC;AAMf,MAAM,WAAW,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM;IAC7C,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAClB,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC;IACxD,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;IAC7D,QAAQ,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;IACzB,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;IAC5B,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACjC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;CACxC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/xray-protos/proxy/shadowsocks_2022/config.ts"],"names":[],"mappings":"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"}
@@ -5,12 +5,11 @@
5
5
  // protoc v5.28.3
6
6
  // source: proxy/shadowsocks_2022/config.proto
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
- exports.ClientConfig = exports.Account = exports.RelayServerConfig = exports.RelayDestination = exports.MultiUserServerConfig = exports.ServerConfig = exports.protobufPackage = void 0;
8
+ exports.ClientConfig = exports.User = exports.RelayServerConfig = exports.RelayDestination = exports.MultiUserServerConfig = exports.ServerConfig = exports.protobufPackage = void 0;
9
9
  /* eslint-disable */
10
10
  const wire_1 = require("@bufbuild/protobuf/wire");
11
11
  const address_1 = require("../../common/net/address");
12
12
  const network_1 = require("../../common/net/network");
13
- const user_1 = require("../../common/protocol/user");
14
13
  const typeRegistry_1 = require("../../typeRegistry");
15
14
  exports.protobufPackage = "xray.proxy.shadowsocks_2022";
16
15
  function createBaseServerConfig() {
@@ -151,7 +150,7 @@ exports.MultiUserServerConfig = {
151
150
  writer.uint32(18).string(message.key);
152
151
  }
153
152
  for (const v of message.users) {
154
- user_1.User.encode(v, writer.uint32(26).fork()).join();
153
+ exports.User.encode(v, writer.uint32(26).fork()).join();
155
154
  }
156
155
  writer.uint32(34).fork();
157
156
  for (const v of message.network) {
@@ -185,7 +184,7 @@ exports.MultiUserServerConfig = {
185
184
  if (tag !== 26) {
186
185
  break;
187
186
  }
188
- message.users.push(user_1.User.decode(reader, reader.uint32()));
187
+ message.users.push(exports.User.decode(reader, reader.uint32()));
189
188
  continue;
190
189
  }
191
190
  case 4: {
@@ -215,7 +214,7 @@ exports.MultiUserServerConfig = {
215
214
  $type: exports.MultiUserServerConfig.$type,
216
215
  method: isSet(object.method) ? globalThis.String(object.method) : "",
217
216
  key: isSet(object.key) ? globalThis.String(object.key) : "",
218
- users: globalThis.Array.isArray(object?.users) ? object.users.map((e) => user_1.User.fromJSON(e)) : [],
217
+ users: globalThis.Array.isArray(object?.users) ? object.users.map((e) => exports.User.fromJSON(e)) : [],
219
218
  network: globalThis.Array.isArray(object?.network) ? object.network.map((e) => (0, network_1.networkFromJSON)(e)) : [],
220
219
  };
221
220
  },
@@ -228,7 +227,7 @@ exports.MultiUserServerConfig = {
228
227
  obj.key = message.key;
229
228
  }
230
229
  if (message.users?.length) {
231
- obj.users = message.users.map((e) => user_1.User.toJSON(e));
230
+ obj.users = message.users.map((e) => exports.User.toJSON(e));
232
231
  }
233
232
  if (message.network?.length) {
234
233
  obj.network = message.network.map((e) => (0, network_1.networkToJSON)(e));
@@ -242,7 +241,7 @@ exports.MultiUserServerConfig = {
242
241
  const message = createBaseMultiUserServerConfig();
243
242
  message.method = object.method ?? "";
244
243
  message.key = object.key ?? "";
245
- message.users = object.users?.map((e) => user_1.User.fromPartial(e)) || [];
244
+ message.users = object.users?.map((e) => exports.User.fromPartial(e)) || [];
246
245
  message.network = object.network?.map((e) => e) || [];
247
246
  return message;
248
247
  },
@@ -485,21 +484,27 @@ exports.RelayServerConfig = {
485
484
  },
486
485
  };
487
486
  typeRegistry_1.messageTypeRegistry.set(exports.RelayServerConfig.$type, exports.RelayServerConfig);
488
- function createBaseAccount() {
489
- return { $type: "xray.proxy.shadowsocks_2022.Account", key: "" };
487
+ function createBaseUser() {
488
+ return { $type: "xray.proxy.shadowsocks_2022.User", key: "", email: "", level: 0 };
490
489
  }
491
- exports.Account = {
492
- $type: "xray.proxy.shadowsocks_2022.Account",
490
+ exports.User = {
491
+ $type: "xray.proxy.shadowsocks_2022.User",
493
492
  encode(message, writer = new wire_1.BinaryWriter()) {
494
493
  if (message.key !== "") {
495
494
  writer.uint32(10).string(message.key);
496
495
  }
496
+ if (message.email !== "") {
497
+ writer.uint32(18).string(message.email);
498
+ }
499
+ if (message.level !== 0) {
500
+ writer.uint32(24).int32(message.level);
501
+ }
497
502
  return writer;
498
503
  },
499
504
  decode(input, length) {
500
505
  const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
501
506
  let end = length === undefined ? reader.len : reader.pos + length;
502
- const message = createBaseAccount();
507
+ const message = createBaseUser();
503
508
  while (reader.pos < end) {
504
509
  const tag = reader.uint32();
505
510
  switch (tag >>> 3) {
@@ -510,6 +515,20 @@ exports.Account = {
510
515
  message.key = reader.string();
511
516
  continue;
512
517
  }
518
+ case 2: {
519
+ if (tag !== 18) {
520
+ break;
521
+ }
522
+ message.email = reader.string();
523
+ continue;
524
+ }
525
+ case 3: {
526
+ if (tag !== 24) {
527
+ break;
528
+ }
529
+ message.level = reader.int32();
530
+ continue;
531
+ }
513
532
  }
514
533
  if ((tag & 7) === 4 || tag === 0) {
515
534
  break;
@@ -519,25 +538,38 @@ exports.Account = {
519
538
  return message;
520
539
  },
521
540
  fromJSON(object) {
522
- return { $type: exports.Account.$type, key: isSet(object.key) ? globalThis.String(object.key) : "" };
541
+ return {
542
+ $type: exports.User.$type,
543
+ key: isSet(object.key) ? globalThis.String(object.key) : "",
544
+ email: isSet(object.email) ? globalThis.String(object.email) : "",
545
+ level: isSet(object.level) ? globalThis.Number(object.level) : 0,
546
+ };
523
547
  },
524
548
  toJSON(message) {
525
549
  const obj = {};
526
550
  if (message.key !== "") {
527
551
  obj.key = message.key;
528
552
  }
553
+ if (message.email !== "") {
554
+ obj.email = message.email;
555
+ }
556
+ if (message.level !== 0) {
557
+ obj.level = Math.round(message.level);
558
+ }
529
559
  return obj;
530
560
  },
531
561
  create(base) {
532
- return exports.Account.fromPartial(base ?? {});
562
+ return exports.User.fromPartial(base ?? {});
533
563
  },
534
564
  fromPartial(object) {
535
- const message = createBaseAccount();
565
+ const message = createBaseUser();
536
566
  message.key = object.key ?? "";
567
+ message.email = object.email ?? "";
568
+ message.level = object.level ?? 0;
537
569
  return message;
538
570
  },
539
571
  };
540
- typeRegistry_1.messageTypeRegistry.set(exports.Account.$type, exports.Account);
572
+ typeRegistry_1.messageTypeRegistry.set(exports.User.$type, exports.User);
541
573
  function createBaseClientConfig() {
542
574
  return {
543
575
  $type: "xray.proxy.shadowsocks_2022.ClientConfig",
@@ -4,7 +4,7 @@ import { ServerEndpoint } from "../../common/protocol/server_spec";
4
4
  export declare const protobufPackage = "xray.proxy.socks";
5
5
  /** AuthType is the authentication type of Socks proxy. */
6
6
  export declare enum AuthType {
7
- /** NO_AUTH - NO_AUTH is for anonymous authentication. */
7
+ /** NO_AUTH - NO_AUTH is for anounymous authentication. */
8
8
  NO_AUTH = 0,
9
9
  /** PASSWORD - PASSWORD is for username/password authentication. */
10
10
  PASSWORD = 1,
@@ -12,6 +12,14 @@ export declare enum AuthType {
12
12
  }
13
13
  export declare function authTypeFromJSON(object: any): AuthType;
14
14
  export declare function authTypeToJSON(object: AuthType): string;
15
+ export declare enum Version {
16
+ SOCKS5 = 0,
17
+ SOCKS4 = 1,
18
+ SOCKS4A = 2,
19
+ UNRECOGNIZED = -1
20
+ }
21
+ export declare function versionFromJSON(object: any): Version;
22
+ export declare function versionToJSON(object: Version): string;
15
23
  /** Account represents a Socks account. */
16
24
  export interface Account {
17
25
  $type: "xray.proxy.socks.Account";
@@ -27,6 +35,8 @@ export interface ServerConfig {
27
35
  };
28
36
  address: IPOrDomain | undefined;
29
37
  udpEnabled: boolean;
38
+ /** @deprecated */
39
+ timeout: number;
30
40
  userLevel: number;
31
41
  }
32
42
  export interface ServerConfig_AccountsEntry {
@@ -39,6 +49,7 @@ export interface ClientConfig {
39
49
  $type: "xray.proxy.socks.ClientConfig";
40
50
  /** Sever is a list of Socks server addresses. */
41
51
  server: ServerEndpoint[];
52
+ version: Version;
42
53
  }
43
54
  export declare const Account: MessageFns<Account, "xray.proxy.socks.Account">;
44
55
  export declare const ServerConfig: MessageFns<ServerConfig, "xray.proxy.socks.ServerConfig">;
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/xray-protos/proxy/socks/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/xray-protos/proxy/socks/config.ts"],"names":[],"mappings":"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"}