@trigger.dev/redis-worker 4.5.0-rc.5 → 4.5.0-rc.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.
package/dist/index.js CHANGED
@@ -3450,9 +3450,9 @@ var require_lodash2 = __commonJS({
3450
3450
  }
3451
3451
  });
3452
3452
 
3453
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/lodash.js
3453
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/lodash.js
3454
3454
  var require_lodash3 = __commonJS({
3455
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/lodash.js"(exports$1) {
3455
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/lodash.js"(exports$1) {
3456
3456
  Object.defineProperty(exports$1, "__esModule", { value: true });
3457
3457
  exports$1.isArguments = exports$1.defaults = exports$1.noop = void 0;
3458
3458
  var defaults = require_lodash();
@@ -3581,9 +3581,9 @@ var require_ms = __commonJS({
3581
3581
  }
3582
3582
  });
3583
3583
 
3584
- // ../../node_modules/.pnpm/debug@4.3.7_supports-color@10.0.0/node_modules/debug/src/common.js
3584
+ // ../../node_modules/.pnpm/debug@4.4.3_supports-color@10.0.0/node_modules/debug/src/common.js
3585
3585
  var require_common = __commonJS({
3586
- "../../node_modules/.pnpm/debug@4.3.7_supports-color@10.0.0/node_modules/debug/src/common.js"(exports$1, module) {
3586
+ "../../node_modules/.pnpm/debug@4.4.3_supports-color@10.0.0/node_modules/debug/src/common.js"(exports$1, module) {
3587
3587
  function setup(env2) {
3588
3588
  createDebug.debug = createDebug;
3589
3589
  createDebug.default = createDebug;
@@ -3684,50 +3684,64 @@ var require_common = __commonJS({
3684
3684
  createDebug.namespaces = namespaces;
3685
3685
  createDebug.names = [];
3686
3686
  createDebug.skips = [];
3687
- let i;
3688
- const split = (typeof namespaces === "string" ? namespaces : "").split(/[\s,]+/);
3689
- const len = split.length;
3690
- for (i = 0; i < len; i++) {
3691
- if (!split[i]) {
3692
- continue;
3687
+ const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(/\s+/g, ",").split(",").filter(Boolean);
3688
+ for (const ns of split) {
3689
+ if (ns[0] === "-") {
3690
+ createDebug.skips.push(ns.slice(1));
3691
+ } else {
3692
+ createDebug.names.push(ns);
3693
3693
  }
3694
- namespaces = split[i].replace(/\*/g, ".*?");
3695
- if (namespaces[0] === "-") {
3696
- createDebug.skips.push(new RegExp("^" + namespaces.slice(1) + "$"));
3694
+ }
3695
+ }
3696
+ function matchesTemplate(search, template) {
3697
+ let searchIndex = 0;
3698
+ let templateIndex = 0;
3699
+ let starIndex = -1;
3700
+ let matchIndex = 0;
3701
+ while (searchIndex < search.length) {
3702
+ if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === "*")) {
3703
+ if (template[templateIndex] === "*") {
3704
+ starIndex = templateIndex;
3705
+ matchIndex = searchIndex;
3706
+ templateIndex++;
3707
+ } else {
3708
+ searchIndex++;
3709
+ templateIndex++;
3710
+ }
3711
+ } else if (starIndex !== -1) {
3712
+ templateIndex = starIndex + 1;
3713
+ matchIndex++;
3714
+ searchIndex = matchIndex;
3697
3715
  } else {
3698
- createDebug.names.push(new RegExp("^" + namespaces + "$"));
3716
+ return false;
3699
3717
  }
3700
3718
  }
3719
+ while (templateIndex < template.length && template[templateIndex] === "*") {
3720
+ templateIndex++;
3721
+ }
3722
+ return templateIndex === template.length;
3701
3723
  }
3702
3724
  function disable() {
3703
3725
  const namespaces = [
3704
- ...createDebug.names.map(toNamespace),
3705
- ...createDebug.skips.map(toNamespace).map((namespace) => "-" + namespace)
3726
+ ...createDebug.names,
3727
+ ...createDebug.skips.map((namespace) => "-" + namespace)
3706
3728
  ].join(",");
3707
3729
  createDebug.enable("");
3708
3730
  return namespaces;
3709
3731
  }
3710
3732
  function enabled(name) {
3711
- if (name[name.length - 1] === "*") {
3712
- return true;
3713
- }
3714
- let i;
3715
- let len;
3716
- for (i = 0, len = createDebug.skips.length; i < len; i++) {
3717
- if (createDebug.skips[i].test(name)) {
3733
+ for (const skip of createDebug.skips) {
3734
+ if (matchesTemplate(name, skip)) {
3718
3735
  return false;
3719
3736
  }
3720
3737
  }
3721
- for (i = 0, len = createDebug.names.length; i < len; i++) {
3722
- if (createDebug.names[i].test(name)) {
3738
+ for (const ns of createDebug.names) {
3739
+ if (matchesTemplate(name, ns)) {
3723
3740
  return true;
3724
3741
  }
3725
3742
  }
3726
3743
  return false;
3727
3744
  }
3728
- function toNamespace(regexp) {
3729
- return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
3730
- }
3731
3745
  function coerce(val) {
3732
3746
  if (val instanceof Error) {
3733
3747
  return val.stack || val.message;
@@ -3744,9 +3758,9 @@ var require_common = __commonJS({
3744
3758
  }
3745
3759
  });
3746
3760
 
3747
- // ../../node_modules/.pnpm/debug@4.3.7_supports-color@10.0.0/node_modules/debug/src/browser.js
3761
+ // ../../node_modules/.pnpm/debug@4.4.3_supports-color@10.0.0/node_modules/debug/src/browser.js
3748
3762
  var require_browser = __commonJS({
3749
- "../../node_modules/.pnpm/debug@4.3.7_supports-color@10.0.0/node_modules/debug/src/browser.js"(exports$1, module) {
3763
+ "../../node_modules/.pnpm/debug@4.4.3_supports-color@10.0.0/node_modules/debug/src/browser.js"(exports$1, module) {
3750
3764
  exports$1.formatArgs = formatArgs;
3751
3765
  exports$1.save = save;
3752
3766
  exports$1.load = load;
@@ -3888,7 +3902,7 @@ var require_browser = __commonJS({
3888
3902
  function load() {
3889
3903
  let r;
3890
3904
  try {
3891
- r = exports$1.storage.getItem("debug");
3905
+ r = exports$1.storage.getItem("debug") || exports$1.storage.getItem("DEBUG");
3892
3906
  } catch (error) {
3893
3907
  }
3894
3908
  if (!r && typeof process !== "undefined" && "env" in process) {
@@ -4054,9 +4068,9 @@ var init_supports_color = __esm({
4054
4068
  }
4055
4069
  });
4056
4070
 
4057
- // ../../node_modules/.pnpm/debug@4.3.7_supports-color@10.0.0/node_modules/debug/src/node.js
4071
+ // ../../node_modules/.pnpm/debug@4.4.3_supports-color@10.0.0/node_modules/debug/src/node.js
4058
4072
  var require_node = __commonJS({
4059
- "../../node_modules/.pnpm/debug@4.3.7_supports-color@10.0.0/node_modules/debug/src/node.js"(exports$1, module) {
4073
+ "../../node_modules/.pnpm/debug@4.4.3_supports-color@10.0.0/node_modules/debug/src/node.js"(exports$1, module) {
4060
4074
  var tty2 = __require("tty");
4061
4075
  var util = __require("util");
4062
4076
  exports$1.init = init;
@@ -4228,9 +4242,9 @@ var require_node = __commonJS({
4228
4242
  }
4229
4243
  });
4230
4244
 
4231
- // ../../node_modules/.pnpm/debug@4.3.7_supports-color@10.0.0/node_modules/debug/src/index.js
4245
+ // ../../node_modules/.pnpm/debug@4.4.3_supports-color@10.0.0/node_modules/debug/src/index.js
4232
4246
  var require_src = __commonJS({
4233
- "../../node_modules/.pnpm/debug@4.3.7_supports-color@10.0.0/node_modules/debug/src/index.js"(exports$1, module) {
4247
+ "../../node_modules/.pnpm/debug@4.4.3_supports-color@10.0.0/node_modules/debug/src/index.js"(exports$1, module) {
4234
4248
  if (typeof process === "undefined" || process.type === "renderer" || process.browser === true || process.__nwjs) {
4235
4249
  module.exports = require_browser();
4236
4250
  } else {
@@ -4239,9 +4253,9 @@ var require_src = __commonJS({
4239
4253
  }
4240
4254
  });
4241
4255
 
4242
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/debug.js
4256
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/debug.js
4243
4257
  var require_debug = __commonJS({
4244
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/debug.js"(exports$1) {
4258
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/debug.js"(exports$1) {
4245
4259
  Object.defineProperty(exports$1, "__esModule", { value: true });
4246
4260
  exports$1.genRedactedString = exports$1.getStringValue = exports$1.MAX_ARGUMENT_LENGTH = void 0;
4247
4261
  var debug_1 = require_src();
@@ -4324,9 +4338,9 @@ var require_debug = __commonJS({
4324
4338
  }
4325
4339
  });
4326
4340
 
4327
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/constants/TLSProfiles.js
4341
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/constants/TLSProfiles.js
4328
4342
  var require_TLSProfiles = __commonJS({
4329
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/constants/TLSProfiles.js"(exports$1) {
4343
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/constants/TLSProfiles.js"(exports$1) {
4330
4344
  Object.defineProperty(exports$1, "__esModule", { value: true });
4331
4345
  var RedisCloudCA = `-----BEGIN CERTIFICATE-----
4332
4346
  MIIDTzCCAjegAwIBAgIJAKSVpiDswLcwMA0GCSqGSIb3DQEBBQUAMD4xFjAUBgNV
@@ -4475,9 +4489,9 @@ WD9f
4475
4489
  }
4476
4490
  });
4477
4491
 
4478
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/index.js
4492
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/index.js
4479
4493
  var require_utils2 = __commonJS({
4480
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/index.js"(exports$1) {
4494
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/index.js"(exports$1) {
4481
4495
  Object.defineProperty(exports$1, "__esModule", { value: true });
4482
4496
  exports$1.noop = exports$1.defaults = exports$1.Debug = exports$1.zipMap = exports$1.CONNECTION_CLOSED_ERROR_MSG = exports$1.shuffle = exports$1.sample = exports$1.resolveTLSProfile = exports$1.parseURL = exports$1.optimizeErrorStack = exports$1.toArg = exports$1.convertMapToArray = exports$1.convertObjectToArray = exports$1.timeout = exports$1.packObject = exports$1.isInt = exports$1.wrapMultiResult = exports$1.convertBufferToString = void 0;
4483
4497
  var url_1 = __require("url");
@@ -4680,9 +4694,9 @@ var require_utils2 = __commonJS({
4680
4694
  }
4681
4695
  });
4682
4696
 
4683
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/Command.js
4697
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/Command.js
4684
4698
  var require_Command = __commonJS({
4685
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/Command.js"(exports$1) {
4699
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/Command.js"(exports$1) {
4686
4700
  Object.defineProperty(exports$1, "__esModule", { value: true });
4687
4701
  var commands_1 = require_built();
4688
4702
  var calculateSlot = require_lib();
@@ -4978,9 +4992,9 @@ var require_Command = __commonJS({
4978
4992
  }
4979
4993
  });
4980
4994
 
4981
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/errors/ClusterAllFailedError.js
4995
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/errors/ClusterAllFailedError.js
4982
4996
  var require_ClusterAllFailedError = __commonJS({
4983
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/errors/ClusterAllFailedError.js"(exports$1) {
4997
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/errors/ClusterAllFailedError.js"(exports$1) {
4984
4998
  Object.defineProperty(exports$1, "__esModule", { value: true });
4985
4999
  var redis_errors_1 = require_redis_errors();
4986
5000
  var ClusterAllFailedError = class extends redis_errors_1.RedisError {
@@ -4998,9 +5012,9 @@ var require_ClusterAllFailedError = __commonJS({
4998
5012
  }
4999
5013
  });
5000
5014
 
5001
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/ScanStream.js
5015
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/ScanStream.js
5002
5016
  var require_ScanStream = __commonJS({
5003
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/ScanStream.js"(exports$1) {
5017
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/ScanStream.js"(exports$1) {
5004
5018
  Object.defineProperty(exports$1, "__esModule", { value: true });
5005
5019
  var stream_1 = __require("stream");
5006
5020
  var ScanStream = class extends stream_1.Readable {
@@ -5028,6 +5042,9 @@ var require_ScanStream = __commonJS({
5028
5042
  if (this.opt.count) {
5029
5043
  args.push("COUNT", String(this.opt.count));
5030
5044
  }
5045
+ if (this.opt.noValues) {
5046
+ args.push("NOVALUES");
5047
+ }
5031
5048
  this.opt.redis[this.opt.command](args, (err, res) => {
5032
5049
  if (err) {
5033
5050
  this.emit("error", err);
@@ -5048,9 +5065,9 @@ var require_ScanStream = __commonJS({
5048
5065
  }
5049
5066
  });
5050
5067
 
5051
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/autoPipelining.js
5068
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/autoPipelining.js
5052
5069
  var require_autoPipelining = __commonJS({
5053
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/autoPipelining.js"(exports$1) {
5070
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/autoPipelining.js"(exports$1) {
5054
5071
  Object.defineProperty(exports$1, "__esModule", { value: true });
5055
5072
  exports$1.executeWithAutoPipelining = exports$1.getFirstValueInFlattenedArray = exports$1.shouldUseAutoPipelining = exports$1.notAllowedAutoPipelineCommands = exports$1.kCallbacks = exports$1.kExec = void 0;
5056
5073
  var lodash_1 = require_lodash3();
@@ -5169,9 +5186,9 @@ var require_autoPipelining = __commonJS({
5169
5186
  }
5170
5187
  });
5171
5188
 
5172
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/Script.js
5189
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/Script.js
5173
5190
  var require_Script = __commonJS({
5174
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/Script.js"(exports$1) {
5191
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/Script.js"(exports$1) {
5175
5192
  Object.defineProperty(exports$1, "__esModule", { value: true });
5176
5193
  var crypto_1 = __require("crypto");
5177
5194
  var Command_1 = require_Command();
@@ -5233,9 +5250,9 @@ var require_Script = __commonJS({
5233
5250
  }
5234
5251
  });
5235
5252
 
5236
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/Commander.js
5253
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/Commander.js
5237
5254
  var require_Commander = __commonJS({
5238
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/Commander.js"(exports$1) {
5255
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/Commander.js"(exports$1) {
5239
5256
  Object.defineProperty(exports$1, "__esModule", { value: true });
5240
5257
  var commands_1 = require_built();
5241
5258
  var autoPipelining_1 = require_autoPipelining();
@@ -5348,9 +5365,9 @@ var require_Commander = __commonJS({
5348
5365
  }
5349
5366
  });
5350
5367
 
5351
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/Pipeline.js
5368
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/Pipeline.js
5352
5369
  var require_Pipeline = __commonJS({
5353
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/Pipeline.js"(exports$1) {
5370
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/Pipeline.js"(exports$1) {
5354
5371
  Object.defineProperty(exports$1, "__esModule", { value: true });
5355
5372
  var calculateSlot = require_lib();
5356
5373
  var commands_1 = require_built();
@@ -5651,9 +5668,9 @@ var require_Pipeline = __commonJS({
5651
5668
  }
5652
5669
  });
5653
5670
 
5654
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/transaction.js
5671
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/transaction.js
5655
5672
  var require_transaction = __commonJS({
5656
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/transaction.js"(exports$1) {
5673
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/transaction.js"(exports$1) {
5657
5674
  Object.defineProperty(exports$1, "__esModule", { value: true });
5658
5675
  exports$1.addTransactionSupport = void 0;
5659
5676
  var utils_1 = require_utils2();
@@ -5743,9 +5760,9 @@ var require_transaction = __commonJS({
5743
5760
  }
5744
5761
  });
5745
5762
 
5746
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/applyMixin.js
5763
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/applyMixin.js
5747
5764
  var require_applyMixin = __commonJS({
5748
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/utils/applyMixin.js"(exports$1) {
5765
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/utils/applyMixin.js"(exports$1) {
5749
5766
  Object.defineProperty(exports$1, "__esModule", { value: true });
5750
5767
  function applyMixin(derivedConstructor, mixinConstructor) {
5751
5768
  Object.getOwnPropertyNames(mixinConstructor.prototype).forEach((name) => {
@@ -5756,9 +5773,9 @@ var require_applyMixin = __commonJS({
5756
5773
  }
5757
5774
  });
5758
5775
 
5759
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/ClusterOptions.js
5776
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/ClusterOptions.js
5760
5777
  var require_ClusterOptions = __commonJS({
5761
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/ClusterOptions.js"(exports$1) {
5778
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/ClusterOptions.js"(exports$1) {
5762
5779
  Object.defineProperty(exports$1, "__esModule", { value: true });
5763
5780
  exports$1.DEFAULT_CLUSTER_OPTIONS = void 0;
5764
5781
  var dns_1 = __require("dns");
@@ -5777,14 +5794,15 @@ var require_ClusterOptions = __commonJS({
5777
5794
  resolveSrv: dns_1.resolveSrv,
5778
5795
  dnsLookup: dns_1.lookup,
5779
5796
  enableAutoPipelining: false,
5780
- autoPipeliningIgnoredCommands: []
5797
+ autoPipeliningIgnoredCommands: [],
5798
+ shardedSubscribers: false
5781
5799
  };
5782
5800
  }
5783
5801
  });
5784
5802
 
5785
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/util.js
5803
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/util.js
5786
5804
  var require_util = __commonJS({
5787
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/util.js"(exports$1) {
5805
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/util.js"(exports$1) {
5788
5806
  Object.defineProperty(exports$1, "__esModule", { value: true });
5789
5807
  exports$1.getConnectionName = exports$1.weightSrvRecords = exports$1.groupSrvRecords = exports$1.getUniqueHostnamesFromOptions = exports$1.normalizeNodeOptions = exports$1.nodeKeyToRedisOptions = exports$1.getNodeKey = void 0;
5790
5808
  var utils_1 = require_utils2();
@@ -5881,20 +5899,22 @@ var require_util = __commonJS({
5881
5899
  }
5882
5900
  });
5883
5901
 
5884
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/ClusterSubscriber.js
5902
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/ClusterSubscriber.js
5885
5903
  var require_ClusterSubscriber = __commonJS({
5886
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/ClusterSubscriber.js"(exports$1) {
5904
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/ClusterSubscriber.js"(exports$1) {
5887
5905
  Object.defineProperty(exports$1, "__esModule", { value: true });
5888
5906
  var util_1 = require_util();
5889
5907
  var utils_1 = require_utils2();
5890
5908
  var Redis_1 = require_Redis();
5891
5909
  var debug = (0, utils_1.Debug)("cluster:subscriber");
5892
5910
  var ClusterSubscriber = class {
5893
- constructor(connectionPool, emitter) {
5911
+ constructor(connectionPool, emitter, isSharded = false) {
5894
5912
  this.connectionPool = connectionPool;
5895
5913
  this.emitter = emitter;
5914
+ this.isSharded = isSharded;
5896
5915
  this.started = false;
5897
5916
  this.subscriber = null;
5917
+ this.slotRange = [];
5898
5918
  this.onSubscriberEnd = () => {
5899
5919
  if (!this.started) {
5900
5920
  debug("subscriber has disconnected, but ClusterSubscriber is not started, so not reconnecting.");
@@ -5923,6 +5943,21 @@ var require_ClusterSubscriber = __commonJS({
5923
5943
  getInstance() {
5924
5944
  return this.subscriber;
5925
5945
  }
5946
+ /**
5947
+ * Associate this subscriber to a specific slot range.
5948
+ *
5949
+ * Returns the range or an empty array if the slot range couldn't be associated.
5950
+ *
5951
+ * BTW: This is more for debugging and testing purposes.
5952
+ *
5953
+ * @param range
5954
+ */
5955
+ associateSlotRange(range) {
5956
+ if (this.isSharded) {
5957
+ this.slotRange = range;
5958
+ }
5959
+ return this.slotRange;
5960
+ }
5926
5961
  start() {
5927
5962
  this.started = true;
5928
5963
  this.selectSubscriber();
@@ -5934,7 +5969,9 @@ var require_ClusterSubscriber = __commonJS({
5934
5969
  this.subscriber.disconnect();
5935
5970
  this.subscriber = null;
5936
5971
  }
5937
- debug("stopped");
5972
+ }
5973
+ isStarted() {
5974
+ return this.started;
5938
5975
  }
5939
5976
  selectSubscriber() {
5940
5977
  const lastActiveSubscriber = this.lastActiveSubscriber;
@@ -5954,13 +5991,16 @@ var require_ClusterSubscriber = __commonJS({
5954
5991
  }
5955
5992
  const { options } = sampleNode;
5956
5993
  debug("selected a subscriber %s:%s", options.host, options.port);
5994
+ let connectionPrefix = "subscriber";
5995
+ if (this.isSharded)
5996
+ connectionPrefix = "ssubscriber";
5957
5997
  this.subscriber = new Redis_1.default({
5958
5998
  port: options.port,
5959
5999
  host: options.host,
5960
6000
  username: options.username,
5961
6001
  password: options.password,
5962
6002
  enableReadyCheck: true,
5963
- connectionName: (0, util_1.getConnectionName)("subscriber", options.connectionName),
6003
+ connectionName: (0, util_1.getConnectionName)(connectionPrefix, options.connectionName),
5964
6004
  lazyConnect: true,
5965
6005
  tls: options.tls,
5966
6006
  // Don't try to reconnect the subscriber connection. If the connection fails
@@ -6000,9 +6040,7 @@ var require_ClusterSubscriber = __commonJS({
6000
6040
  }
6001
6041
  for (const event of [
6002
6042
  "message",
6003
- "messageBuffer",
6004
- "smessage",
6005
- "smessageBuffer"
6043
+ "messageBuffer"
6006
6044
  ]) {
6007
6045
  this.subscriber.on(event, (arg1, arg2) => {
6008
6046
  this.emitter.emit(event, arg1, arg2);
@@ -6013,15 +6051,25 @@ var require_ClusterSubscriber = __commonJS({
6013
6051
  this.emitter.emit(event, arg1, arg2, arg3);
6014
6052
  });
6015
6053
  }
6054
+ if (this.isSharded == true) {
6055
+ for (const event of [
6056
+ "smessage",
6057
+ "smessageBuffer"
6058
+ ]) {
6059
+ this.subscriber.on(event, (arg1, arg2) => {
6060
+ this.emitter.emit(event, arg1, arg2);
6061
+ });
6062
+ }
6063
+ }
6016
6064
  }
6017
6065
  };
6018
6066
  exports$1.default = ClusterSubscriber;
6019
6067
  }
6020
6068
  });
6021
6069
 
6022
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/ConnectionPool.js
6070
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/ConnectionPool.js
6023
6071
  var require_ConnectionPool = __commonJS({
6024
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/ConnectionPool.js"(exports$1) {
6072
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/ConnectionPool.js"(exports$1) {
6025
6073
  Object.defineProperty(exports$1, "__esModule", { value: true });
6026
6074
  var events_1 = __require("events");
6027
6075
  var utils_1 = require_utils2();
@@ -6051,6 +6099,39 @@ var require_ConnectionPool = __commonJS({
6051
6099
  const sampleKey = (0, utils_1.sample)(keys);
6052
6100
  return this.nodes[role][sampleKey];
6053
6101
  }
6102
+ /**
6103
+ * Add a master node to the pool
6104
+ * @param node
6105
+ */
6106
+ addMasterNode(node) {
6107
+ const key = (0, util_1.getNodeKey)(node.options);
6108
+ const redis = this.createRedisFromOptions(node, node.options.readOnly);
6109
+ if (!node.options.readOnly) {
6110
+ this.nodes.all[key] = redis;
6111
+ this.nodes.master[key] = redis;
6112
+ return true;
6113
+ }
6114
+ return false;
6115
+ }
6116
+ /**
6117
+ * Creates a Redis connection instance from the node options
6118
+ * @param node
6119
+ * @param readOnly
6120
+ */
6121
+ createRedisFromOptions(node, readOnly) {
6122
+ const redis = new Redis_1.default((0, utils_1.defaults)({
6123
+ // Never try to reconnect when a node is lose,
6124
+ // instead, waiting for a `MOVED` error and
6125
+ // fetch the slots again.
6126
+ retryStrategy: null,
6127
+ // Offline queue should be enabled so that
6128
+ // we don't need to wait for the `ready` event
6129
+ // before sending commands to the node.
6130
+ enableOfflineQueue: true,
6131
+ readOnly
6132
+ }, node, this.redisOptions, { lazyConnect: true }));
6133
+ return redis;
6134
+ }
6054
6135
  /**
6055
6136
  * Find or create a connection to the node
6056
6137
  */
@@ -6079,17 +6160,7 @@ var require_ConnectionPool = __commonJS({
6079
6160
  }
6080
6161
  } else {
6081
6162
  debug("Connecting to %s as %s", key, readOnly ? "slave" : "master");
6082
- redis = new Redis_1.default((0, utils_1.defaults)({
6083
- // Never try to reconnect when a node is lose,
6084
- // instead, waiting for a `MOVED` error and
6085
- // fetch the slots again.
6086
- retryStrategy: null,
6087
- // Offline queue should be enabled so that
6088
- // we don't need to wait for the `ready` event
6089
- // before sending commands to the node.
6090
- enableOfflineQueue: true,
6091
- readOnly
6092
- }, node, this.redisOptions, { lazyConnect: true }));
6163
+ redis = this.createRedisFromOptions(node, readOnly);
6093
6164
  this.nodes.all[key] = redis;
6094
6165
  this.nodes[readOnly ? "slave" : "master"][key] = redis;
6095
6166
  redis.once("end", () => {
@@ -6462,9 +6533,9 @@ var require_denque = __commonJS({
6462
6533
  }
6463
6534
  });
6464
6535
 
6465
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/DelayQueue.js
6536
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/DelayQueue.js
6466
6537
  var require_DelayQueue = __commonJS({
6467
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/DelayQueue.js"(exports$1) {
6538
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/DelayQueue.js"(exports$1) {
6468
6539
  Object.defineProperty(exports$1, "__esModule", { value: true });
6469
6540
  var utils_1 = require_utils2();
6470
6541
  var Deque = require_denque();
@@ -6517,9 +6588,210 @@ var require_DelayQueue = __commonJS({
6517
6588
  }
6518
6589
  });
6519
6590
 
6520
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/index.js
6591
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/ClusterSubscriberGroup.js
6592
+ var require_ClusterSubscriberGroup = __commonJS({
6593
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/ClusterSubscriberGroup.js"(exports$1) {
6594
+ Object.defineProperty(exports$1, "__esModule", { value: true });
6595
+ var utils_1 = require_utils2();
6596
+ var ClusterSubscriber_1 = require_ClusterSubscriber();
6597
+ var ConnectionPool_1 = require_ConnectionPool();
6598
+ var util_1 = require_util();
6599
+ var calculateSlot = require_lib();
6600
+ var debug = (0, utils_1.Debug)("cluster:subscriberGroup");
6601
+ var ClusterSubscriberGroup = class {
6602
+ /**
6603
+ * Register callbacks
6604
+ *
6605
+ * @param cluster
6606
+ */
6607
+ constructor(cluster) {
6608
+ this.cluster = cluster;
6609
+ this.shardedSubscribers = /* @__PURE__ */ new Map();
6610
+ this.clusterSlots = [];
6611
+ this.subscriberToSlotsIndex = /* @__PURE__ */ new Map();
6612
+ this.channels = /* @__PURE__ */ new Map();
6613
+ cluster.on("+node", (redis) => {
6614
+ this._addSubscriber(redis);
6615
+ });
6616
+ cluster.on("-node", (redis) => {
6617
+ this._removeSubscriber(redis);
6618
+ });
6619
+ cluster.on("refresh", () => {
6620
+ this._refreshSlots(cluster);
6621
+ });
6622
+ }
6623
+ /**
6624
+ * Get the responsible subscriber.
6625
+ *
6626
+ * Returns null if no subscriber was found
6627
+ *
6628
+ * @param slot
6629
+ */
6630
+ getResponsibleSubscriber(slot) {
6631
+ const nodeKey = this.clusterSlots[slot][0];
6632
+ return this.shardedSubscribers.get(nodeKey);
6633
+ }
6634
+ /**
6635
+ * Adds a channel for which this subscriber group is responsible
6636
+ *
6637
+ * @param channels
6638
+ */
6639
+ addChannels(channels) {
6640
+ const slot = calculateSlot(channels[0]);
6641
+ channels.forEach((c) => {
6642
+ if (calculateSlot(c) != slot)
6643
+ return -1;
6644
+ });
6645
+ const currChannels = this.channels.get(slot);
6646
+ if (!currChannels) {
6647
+ this.channels.set(slot, channels);
6648
+ } else {
6649
+ this.channels.set(slot, currChannels.concat(channels));
6650
+ }
6651
+ return [...this.channels.values()].flatMap((v) => v).length;
6652
+ }
6653
+ /**
6654
+ * Removes channels for which the subscriber group is responsible by optionally unsubscribing
6655
+ * @param channels
6656
+ */
6657
+ removeChannels(channels) {
6658
+ const slot = calculateSlot(channels[0]);
6659
+ channels.forEach((c) => {
6660
+ if (calculateSlot(c) != slot)
6661
+ return -1;
6662
+ });
6663
+ const slotChannels = this.channels.get(slot);
6664
+ if (slotChannels) {
6665
+ const updatedChannels = slotChannels.filter((c) => !channels.includes(c));
6666
+ this.channels.set(slot, updatedChannels);
6667
+ }
6668
+ return [...this.channels.values()].flatMap((v) => v).length;
6669
+ }
6670
+ /**
6671
+ * Disconnect all subscribers
6672
+ */
6673
+ stop() {
6674
+ for (const s of this.shardedSubscribers.values()) {
6675
+ s.stop();
6676
+ }
6677
+ }
6678
+ /**
6679
+ * Start all not yet started subscribers
6680
+ */
6681
+ start() {
6682
+ for (const s of this.shardedSubscribers.values()) {
6683
+ if (!s.isStarted()) {
6684
+ s.start();
6685
+ }
6686
+ }
6687
+ }
6688
+ /**
6689
+ * Add a subscriber to the group of subscribers
6690
+ *
6691
+ * @param redis
6692
+ */
6693
+ _addSubscriber(redis) {
6694
+ const pool2 = new ConnectionPool_1.default(redis.options);
6695
+ if (pool2.addMasterNode(redis)) {
6696
+ const sub = new ClusterSubscriber_1.default(pool2, this.cluster, true);
6697
+ const nodeKey = (0, util_1.getNodeKey)(redis.options);
6698
+ this.shardedSubscribers.set(nodeKey, sub);
6699
+ sub.start();
6700
+ this._resubscribe();
6701
+ this.cluster.emit("+subscriber");
6702
+ return sub;
6703
+ }
6704
+ return null;
6705
+ }
6706
+ /**
6707
+ * Removes a subscriber from the group
6708
+ * @param redis
6709
+ */
6710
+ _removeSubscriber(redis) {
6711
+ const nodeKey = (0, util_1.getNodeKey)(redis.options);
6712
+ const sub = this.shardedSubscribers.get(nodeKey);
6713
+ if (sub) {
6714
+ sub.stop();
6715
+ this.shardedSubscribers.delete(nodeKey);
6716
+ this._resubscribe();
6717
+ this.cluster.emit("-subscriber");
6718
+ }
6719
+ return this.shardedSubscribers;
6720
+ }
6721
+ /**
6722
+ * Refreshes the subscriber-related slot ranges
6723
+ *
6724
+ * Returns false if no refresh was needed
6725
+ *
6726
+ * @param cluster
6727
+ */
6728
+ _refreshSlots(cluster) {
6729
+ if (this._slotsAreEqual(cluster.slots)) {
6730
+ debug("Nothing to refresh because the new cluster map is equal to the previous one.");
6731
+ } else {
6732
+ debug("Refreshing the slots of the subscriber group.");
6733
+ this.subscriberToSlotsIndex = /* @__PURE__ */ new Map();
6734
+ for (let slot = 0; slot < cluster.slots.length; slot++) {
6735
+ const node = cluster.slots[slot][0];
6736
+ if (!this.subscriberToSlotsIndex.has(node)) {
6737
+ this.subscriberToSlotsIndex.set(node, []);
6738
+ }
6739
+ this.subscriberToSlotsIndex.get(node).push(Number(slot));
6740
+ }
6741
+ this._resubscribe();
6742
+ this.clusterSlots = JSON.parse(JSON.stringify(cluster.slots));
6743
+ this.cluster.emit("subscribersReady");
6744
+ return true;
6745
+ }
6746
+ return false;
6747
+ }
6748
+ /**
6749
+ * Resubscribes to the previous channels
6750
+ *
6751
+ * @private
6752
+ */
6753
+ _resubscribe() {
6754
+ if (this.shardedSubscribers) {
6755
+ this.shardedSubscribers.forEach((s, nodeKey) => {
6756
+ const subscriberSlots = this.subscriberToSlotsIndex.get(nodeKey);
6757
+ if (subscriberSlots) {
6758
+ s.associateSlotRange(subscriberSlots);
6759
+ subscriberSlots.forEach((ss) => {
6760
+ const redis = s.getInstance();
6761
+ const channels = this.channels.get(ss);
6762
+ if (channels && channels.length > 0) {
6763
+ if (redis) {
6764
+ redis.ssubscribe(channels);
6765
+ redis.on("ready", () => {
6766
+ redis.ssubscribe(channels);
6767
+ });
6768
+ }
6769
+ }
6770
+ });
6771
+ }
6772
+ });
6773
+ }
6774
+ }
6775
+ /**
6776
+ * Deep equality of the cluster slots objects
6777
+ *
6778
+ * @param other
6779
+ * @private
6780
+ */
6781
+ _slotsAreEqual(other) {
6782
+ if (this.clusterSlots === void 0)
6783
+ return false;
6784
+ else
6785
+ return JSON.stringify(this.clusterSlots) === JSON.stringify(other);
6786
+ }
6787
+ };
6788
+ exports$1.default = ClusterSubscriberGroup;
6789
+ }
6790
+ });
6791
+
6792
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/index.js
6521
6793
  var require_cluster = __commonJS({
6522
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/cluster/index.js"(exports$1) {
6794
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/cluster/index.js"(exports$1) {
6523
6795
  Object.defineProperty(exports$1, "__esModule", { value: true });
6524
6796
  var commands_1 = require_built();
6525
6797
  var events_1 = __require("events");
@@ -6539,12 +6811,14 @@ var require_cluster = __commonJS({
6539
6811
  var DelayQueue_1 = require_DelayQueue();
6540
6812
  var util_1 = require_util();
6541
6813
  var Deque = require_denque();
6814
+ var ClusterSubscriberGroup_1 = require_ClusterSubscriberGroup();
6542
6815
  var debug = (0, utils_1.Debug)("cluster");
6543
6816
  var REJECT_OVERWRITTEN_COMMANDS = /* @__PURE__ */ new WeakSet();
6544
6817
  var Cluster = class _Cluster extends Commander_1.default {
6545
6818
  /**
6546
6819
  * Creates an instance of Cluster.
6547
6820
  */
6821
+ //TODO: Add an option that enables or disables sharded PubSub
6548
6822
  constructor(startupNodes, options = {}) {
6549
6823
  super();
6550
6824
  this.slots = [];
@@ -6555,6 +6829,7 @@ var require_cluster = __commonJS({
6555
6829
  this.delayQueue = new DelayQueue_1.default();
6556
6830
  this.offlineQueue = new Deque();
6557
6831
  this.isRefreshing = false;
6832
+ this._refreshSlotsCacheCallbacks = [];
6558
6833
  this._autoPipelines = /* @__PURE__ */ new Map();
6559
6834
  this._runningAutoPipelines = /* @__PURE__ */ new Set();
6560
6835
  this._readyDelayedCallbacks = [];
@@ -6562,6 +6837,8 @@ var require_cluster = __commonJS({
6562
6837
  events_1.EventEmitter.call(this);
6563
6838
  this.startupNodes = startupNodes;
6564
6839
  this.options = (0, utils_1.defaults)({}, options, ClusterOptions_1.DEFAULT_CLUSTER_OPTIONS, this.options);
6840
+ if (this.options.shardedSubscribers == true)
6841
+ this.shardedSubscribers = new ClusterSubscriberGroup_1.default(this);
6565
6842
  if (this.options.redisOptions && this.options.redisOptions.keyPrefix && !this.options.keyPrefix) {
6566
6843
  this.options.keyPrefix = this.options.redisOptions.keyPrefix;
6567
6844
  }
@@ -6662,6 +6939,9 @@ var require_cluster = __commonJS({
6662
6939
  }
6663
6940
  });
6664
6941
  this.subscriber.start();
6942
+ if (this.options.shardedSubscribers) {
6943
+ this.shardedSubscribers.start();
6944
+ }
6665
6945
  }).catch((err) => {
6666
6946
  this.setStatus("close");
6667
6947
  this.handleCloseEvent(err);
@@ -6686,6 +6966,9 @@ var require_cluster = __commonJS({
6686
6966
  }
6687
6967
  this.clearNodesRefreshInterval();
6688
6968
  this.subscriber.stop();
6969
+ if (this.options.shardedSubscribers) {
6970
+ this.shardedSubscribers.stop();
6971
+ }
6689
6972
  if (status === "wait") {
6690
6973
  this.setStatus("close");
6691
6974
  this.handleCloseEvent();
@@ -6706,6 +6989,9 @@ var require_cluster = __commonJS({
6706
6989
  }
6707
6990
  this.clearNodesRefreshInterval();
6708
6991
  this.subscriber.stop();
6992
+ if (this.options.shardedSubscribers) {
6993
+ this.shardedSubscribers.stop();
6994
+ }
6709
6995
  if (status === "wait") {
6710
6996
  const ret = (0, standard_as_callback_1.default)(Promise.resolve("OK"), callback);
6711
6997
  setImmediate(function() {
@@ -6770,19 +7056,20 @@ var require_cluster = __commonJS({
6770
7056
  * @ignore
6771
7057
  */
6772
7058
  refreshSlotsCache(callback) {
7059
+ if (callback) {
7060
+ this._refreshSlotsCacheCallbacks.push(callback);
7061
+ }
6773
7062
  if (this.isRefreshing) {
6774
- if (callback) {
6775
- process.nextTick(callback);
6776
- }
6777
7063
  return;
6778
7064
  }
6779
7065
  this.isRefreshing = true;
6780
7066
  const _this = this;
6781
7067
  const wrapper = (error) => {
6782
7068
  this.isRefreshing = false;
6783
- if (callback) {
6784
- callback(error);
7069
+ for (const callback2 of this._refreshSlotsCacheCallbacks) {
7070
+ callback2(error);
6785
7071
  }
7072
+ this._refreshSlotsCacheCallbacks = [];
6786
7073
  };
6787
7074
  const nodes = (0, utils_1.shuffle)(this.connectionPool.getNodes());
6788
7075
  let lastNodeError = null;
@@ -6884,7 +7171,21 @@ var require_cluster = __commonJS({
6884
7171
  if (node && node.redis) {
6885
7172
  redis = node.redis;
6886
7173
  } else if (Command_1.default.checkFlag("ENTER_SUBSCRIBER_MODE", command.name) || Command_1.default.checkFlag("EXIT_SUBSCRIBER_MODE", command.name)) {
6887
- redis = _this.subscriber.getInstance();
7174
+ if (_this.options.shardedSubscribers == true && (command.name == "ssubscribe" || command.name == "sunsubscribe")) {
7175
+ const sub = _this.shardedSubscribers.getResponsibleSubscriber(targetSlot);
7176
+ let status = -1;
7177
+ if (command.name == "ssubscribe")
7178
+ status = _this.shardedSubscribers.addChannels(command.getKeys());
7179
+ if (command.name == "sunsubscribe")
7180
+ status = _this.shardedSubscribers.removeChannels(command.getKeys());
7181
+ if (status !== -1) {
7182
+ redis = sub.getInstance();
7183
+ } else {
7184
+ command.reject(new redis_errors_1.AbortError("Can't add or remove the given channels. Are they in the same slot?"));
7185
+ }
7186
+ } else {
7187
+ redis = _this.subscriber.getInstance();
7188
+ }
6888
7189
  if (!redis) {
6889
7190
  command.reject(new redis_errors_1.AbortError("No subscriber for the cluster"));
6890
7191
  return;
@@ -7081,13 +7382,16 @@ var require_cluster = __commonJS({
7081
7382
  }
7082
7383
  }
7083
7384
  natMapper(nodeKey) {
7084
- if (this.options.natMap && typeof this.options.natMap === "object") {
7085
- const key = typeof nodeKey === "string" ? nodeKey : `${nodeKey.host}:${nodeKey.port}`;
7086
- const mapped = this.options.natMap[key];
7087
- if (mapped) {
7088
- debug("NAT mapping %s -> %O", key, mapped);
7089
- return Object.assign({}, mapped);
7090
- }
7385
+ const key = typeof nodeKey === "string" ? nodeKey : `${nodeKey.host}:${nodeKey.port}`;
7386
+ let mapped = null;
7387
+ if (this.options.natMap && typeof this.options.natMap === "function") {
7388
+ mapped = this.options.natMap(key);
7389
+ } else if (this.options.natMap && typeof this.options.natMap === "object") {
7390
+ mapped = this.options.natMap[key];
7391
+ }
7392
+ if (mapped) {
7393
+ debug("NAT mapping %s -> %O", key, mapped);
7394
+ return Object.assign({}, mapped);
7091
7395
  }
7092
7396
  return typeof nodeKey === "string" ? (0, util_1.nodeKeyToRedisOptions)(nodeKey) : nodeKey;
7093
7397
  }
@@ -7105,6 +7409,7 @@ var require_cluster = __commonJS({
7105
7409
  duplicatedConnection.cluster("SLOTS", (0, utils_1.timeout)((err, result) => {
7106
7410
  duplicatedConnection.disconnect();
7107
7411
  if (err) {
7412
+ debug("error encountered running CLUSTER.SLOTS: %s", err);
7108
7413
  return callback(err);
7109
7414
  }
7110
7415
  if (this.status === "disconnecting" || this.status === "close" || this.status === "end") {
@@ -7268,9 +7573,9 @@ var require_cluster = __commonJS({
7268
7573
  }
7269
7574
  });
7270
7575
 
7271
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/AbstractConnector.js
7576
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/AbstractConnector.js
7272
7577
  var require_AbstractConnector = __commonJS({
7273
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/AbstractConnector.js"(exports$1) {
7578
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/AbstractConnector.js"(exports$1) {
7274
7579
  Object.defineProperty(exports$1, "__esModule", { value: true });
7275
7580
  var utils_1 = require_utils2();
7276
7581
  var debug = (0, utils_1.Debug)("AbstractConnector");
@@ -7299,9 +7604,9 @@ var require_AbstractConnector = __commonJS({
7299
7604
  }
7300
7605
  });
7301
7606
 
7302
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/StandaloneConnector.js
7607
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/StandaloneConnector.js
7303
7608
  var require_StandaloneConnector = __commonJS({
7304
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/StandaloneConnector.js"(exports$1) {
7609
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/StandaloneConnector.js"(exports$1) {
7305
7610
  Object.defineProperty(exports$1, "__esModule", { value: true });
7306
7611
  var net_1 = __require("net");
7307
7612
  var tls_1 = __require("tls");
@@ -7363,9 +7668,9 @@ var require_StandaloneConnector = __commonJS({
7363
7668
  }
7364
7669
  });
7365
7670
 
7366
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/SentinelConnector/SentinelIterator.js
7671
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/SentinelConnector/SentinelIterator.js
7367
7672
  var require_SentinelIterator = __commonJS({
7368
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/SentinelConnector/SentinelIterator.js"(exports$1) {
7673
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/SentinelConnector/SentinelIterator.js"(exports$1) {
7369
7674
  Object.defineProperty(exports$1, "__esModule", { value: true });
7370
7675
  function isSentinelEql(a, b) {
7371
7676
  return (a.host || "127.0.0.1") === (b.host || "127.0.0.1") && (a.port || 26379) === (b.port || 26379);
@@ -7402,9 +7707,9 @@ var require_SentinelIterator = __commonJS({
7402
7707
  }
7403
7708
  });
7404
7709
 
7405
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/SentinelConnector/FailoverDetector.js
7710
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/SentinelConnector/FailoverDetector.js
7406
7711
  var require_FailoverDetector = __commonJS({
7407
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/SentinelConnector/FailoverDetector.js"(exports$1) {
7712
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/SentinelConnector/FailoverDetector.js"(exports$1) {
7408
7713
  Object.defineProperty(exports$1, "__esModule", { value: true });
7409
7714
  exports$1.FailoverDetector = void 0;
7410
7715
  var utils_1 = require_utils2();
@@ -7449,9 +7754,9 @@ var require_FailoverDetector = __commonJS({
7449
7754
  }
7450
7755
  });
7451
7756
 
7452
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/SentinelConnector/index.js
7757
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/SentinelConnector/index.js
7453
7758
  var require_SentinelConnector = __commonJS({
7454
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/SentinelConnector/index.js"(exports$1) {
7759
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/SentinelConnector/index.js"(exports$1) {
7455
7760
  Object.defineProperty(exports$1, "__esModule", { value: true });
7456
7761
  exports$1.SentinelIterator = void 0;
7457
7762
  var net_1 = __require("net");
@@ -7588,7 +7893,14 @@ var require_SentinelConnector = __commonJS({
7588
7893
  sentinelNatResolve(item) {
7589
7894
  if (!item || !this.options.natMap)
7590
7895
  return item;
7591
- return this.options.natMap[`${item.host}:${item.port}`] || item;
7896
+ const key = `${item.host}:${item.port}`;
7897
+ let result = item;
7898
+ if (typeof this.options.natMap === "function") {
7899
+ result = this.options.natMap(key) || item;
7900
+ } else if (typeof this.options.natMap === "object") {
7901
+ result = this.options.natMap[key] || item;
7902
+ }
7903
+ return result;
7592
7904
  }
7593
7905
  connectToSentinel(endpoint, options) {
7594
7906
  const redis = new Redis_1.default({
@@ -7707,9 +8019,9 @@ var require_SentinelConnector = __commonJS({
7707
8019
  }
7708
8020
  });
7709
8021
 
7710
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/index.js
8022
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/index.js
7711
8023
  var require_connectors = __commonJS({
7712
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/connectors/index.js"(exports$1) {
8024
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/connectors/index.js"(exports$1) {
7713
8025
  Object.defineProperty(exports$1, "__esModule", { value: true });
7714
8026
  exports$1.SentinelConnector = exports$1.StandaloneConnector = void 0;
7715
8027
  var StandaloneConnector_1 = require_StandaloneConnector();
@@ -7719,9 +8031,9 @@ var require_connectors = __commonJS({
7719
8031
  }
7720
8032
  });
7721
8033
 
7722
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/errors/MaxRetriesPerRequestError.js
8034
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/errors/MaxRetriesPerRequestError.js
7723
8035
  var require_MaxRetriesPerRequestError = __commonJS({
7724
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/errors/MaxRetriesPerRequestError.js"(exports$1) {
8036
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/errors/MaxRetriesPerRequestError.js"(exports$1) {
7725
8037
  Object.defineProperty(exports$1, "__esModule", { value: true });
7726
8038
  var redis_errors_1 = require_redis_errors();
7727
8039
  var MaxRetriesPerRequestError = class extends redis_errors_1.AbortError {
@@ -7738,9 +8050,9 @@ var require_MaxRetriesPerRequestError = __commonJS({
7738
8050
  }
7739
8051
  });
7740
8052
 
7741
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/errors/index.js
8053
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/errors/index.js
7742
8054
  var require_errors = __commonJS({
7743
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/errors/index.js"(exports$1) {
8055
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/errors/index.js"(exports$1) {
7744
8056
  Object.defineProperty(exports$1, "__esModule", { value: true });
7745
8057
  exports$1.MaxRetriesPerRequestError = void 0;
7746
8058
  var MaxRetriesPerRequestError_1 = require_MaxRetriesPerRequestError();
@@ -8155,9 +8467,9 @@ var require_redis_parser = __commonJS({
8155
8467
  }
8156
8468
  });
8157
8469
 
8158
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/SubscriptionSet.js
8470
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/SubscriptionSet.js
8159
8471
  var require_SubscriptionSet = __commonJS({
8160
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/SubscriptionSet.js"(exports$1) {
8472
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/SubscriptionSet.js"(exports$1) {
8161
8473
  Object.defineProperty(exports$1, "__esModule", { value: true });
8162
8474
  var SubscriptionSet = class {
8163
8475
  constructor() {
@@ -8196,9 +8508,9 @@ var require_SubscriptionSet = __commonJS({
8196
8508
  }
8197
8509
  });
8198
8510
 
8199
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/DataHandler.js
8511
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/DataHandler.js
8200
8512
  var require_DataHandler = __commonJS({
8201
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/DataHandler.js"(exports$1) {
8513
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/DataHandler.js"(exports$1) {
8202
8514
  Object.defineProperty(exports$1, "__esModule", { value: true });
8203
8515
  var Command_1 = require_Command();
8204
8516
  var utils_1 = require_utils2();
@@ -8221,9 +8533,10 @@ var require_DataHandler = __commonJS({
8221
8533
  this.returnReply(reply);
8222
8534
  }
8223
8535
  });
8224
- redis.stream.on("data", (data) => {
8536
+ redis.stream.prependListener("data", (data) => {
8225
8537
  parser.execute(data);
8226
8538
  });
8539
+ redis.stream.resume();
8227
8540
  }
8228
8541
  returnFatalError(err) {
8229
8542
  err.message += ". Please report this.";
@@ -8398,9 +8711,9 @@ var require_DataHandler = __commonJS({
8398
8711
  }
8399
8712
  });
8400
8713
 
8401
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/redis/event_handler.js
8714
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/redis/event_handler.js
8402
8715
  var require_event_handler = __commonJS({
8403
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/redis/event_handler.js"(exports$1) {
8716
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/redis/event_handler.js"(exports$1) {
8404
8717
  Object.defineProperty(exports$1, "__esModule", { value: true });
8405
8718
  exports$1.readyHandler = exports$1.errorHandler = exports$1.closeHandler = exports$1.connectHandler = void 0;
8406
8719
  var redis_errors_1 = require_redis_errors();
@@ -8664,9 +8977,9 @@ var require_event_handler = __commonJS({
8664
8977
  }
8665
8978
  });
8666
8979
 
8667
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/redis/RedisOptions.js
8980
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/redis/RedisOptions.js
8668
8981
  var require_RedisOptions = __commonJS({
8669
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/redis/RedisOptions.js"(exports$1) {
8982
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/redis/RedisOptions.js"(exports$1) {
8670
8983
  Object.defineProperty(exports$1, "__esModule", { value: true });
8671
8984
  exports$1.DEFAULT_REDIS_OPTIONS = void 0;
8672
8985
  exports$1.DEFAULT_REDIS_OPTIONS = {
@@ -8719,9 +9032,9 @@ var require_RedisOptions = __commonJS({
8719
9032
  }
8720
9033
  });
8721
9034
 
8722
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/Redis.js
9035
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/Redis.js
8723
9036
  var require_Redis = __commonJS({
8724
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/Redis.js"(exports$1) {
9037
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/Redis.js"(exports$1) {
8725
9038
  Object.defineProperty(exports$1, "__esModule", { value: true });
8726
9039
  var commands_1 = require_built();
8727
9040
  var events_1 = __require("events");
@@ -9058,6 +9371,9 @@ var require_Redis = __commonJS({
9058
9371
  if (Command_1.default.checkFlag("WILL_DISCONNECT", command.name)) {
9059
9372
  this.manuallyClosing = true;
9060
9373
  }
9374
+ if (this.options.socketTimeout !== void 0 && this.socketTimeoutTimer === void 0) {
9375
+ this.setSocketTimeout();
9376
+ }
9061
9377
  }
9062
9378
  if (command.name === "select" && (0, utils_1.isInt)(command.args[0])) {
9063
9379
  const db = parseInt(command.args[0], 10);
@@ -9069,6 +9385,19 @@ var require_Redis = __commonJS({
9069
9385
  }
9070
9386
  return command.promise;
9071
9387
  }
9388
+ setSocketTimeout() {
9389
+ this.socketTimeoutTimer = setTimeout(() => {
9390
+ this.stream.destroy(new Error(`Socket timeout. Expecting data, but didn't receive any in ${this.options.socketTimeout}ms.`));
9391
+ this.socketTimeoutTimer = void 0;
9392
+ }, this.options.socketTimeout);
9393
+ this.stream.once("data", () => {
9394
+ clearTimeout(this.socketTimeoutTimer);
9395
+ this.socketTimeoutTimer = void 0;
9396
+ if (this.commandQueue.length === 0)
9397
+ return;
9398
+ this.setSocketTimeout();
9399
+ });
9400
+ }
9072
9401
  scanStream(options) {
9073
9402
  return this.createScanStream("scan", { options });
9074
9403
  }
@@ -9312,9 +9641,9 @@ var require_Redis = __commonJS({
9312
9641
  }
9313
9642
  });
9314
9643
 
9315
- // ../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/index.js
9644
+ // ../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/index.js
9316
9645
  var require_built3 = __commonJS({
9317
- "../../node_modules/.pnpm/ioredis@5.3.2/node_modules/ioredis/built/index.js"(exports$1, module) {
9646
+ "../../node_modules/.pnpm/ioredis@5.6.1/node_modules/ioredis/built/index.js"(exports$1, module) {
9318
9647
  Object.defineProperty(exports$1, "__esModule", { value: true });
9319
9648
  exports$1.print = exports$1.ReplyError = exports$1.SentinelIterator = exports$1.SentinelConnector = exports$1.AbstractConnector = exports$1.Pipeline = exports$1.ScanStream = exports$1.Command = exports$1.Cluster = exports$1.Redis = exports$1.default = void 0;
9320
9649
  exports$1 = module.exports = require_Redis().default;