@openfeature/flagd-provider 0.13.3 → 0.14.0

package/index.cjs.js

@@ -5,6 +5,7 @@ var grpcJs = require('@grpc/grpc-js');
 var connectivityState = require('@grpc/grpc-js/build/src/connectivity-state');
 var lruCache = require('lru-cache');
 var node_util = require('node:util');
+var node_fs = require('node:fs');
 var flagdCore = require('@openfeature/flagd-core');
 var fs = require('fs');
 
@@ -43,13 +44,23 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 const EVENT_CONFIGURATION_CHANGE = 'configuration_change';
 const EVENT_PROVIDER_READY = 'provider_ready';
 const DEFAULT_MAX_CACHE_SIZE = 1000;
+const DEFAULT_RETRY_GRACE_PERIOD = 5;
+const DEFAULT_MAX_BACKOFF_MS = 12000;
+const FLAGD_SELECTOR_HEADER = 'flagd-selector';
 
 const DEFAULT_CONFIG = {
+    deadlineMs: 500,
+    streamDeadlineMs: 600000,
     host: 'localhost',
     tls: false,
     selector: '',
     cache: 'lru',
     maxCacheSize: DEFAULT_MAX_CACHE_SIZE,
+    contextEnricher: (syncContext) => syncContext !== null && syncContext !== void 0 ? syncContext : {},
+    retryBackoffMs: 1000,
+    retryBackoffMaxMs: DEFAULT_MAX_BACKOFF_MS,
+    keepAliveTime: 0,
+    retryGracePeriod: DEFAULT_RETRY_GRACE_PERIOD,
 };
 const DEFAULT_RPC_CONFIG = Object.assign(Object.assign({}, DEFAULT_CONFIG), { resolverType: 'rpc', port: 8013 });
 const DEFAULT_IN_PROCESS_CONFIG = Object.assign(Object.assign({}, DEFAULT_CONFIG), { resolverType: 'in-process', port: 8015 });
@@ -57,45 +68,82 @@ var ENV_VAR;
 (function (ENV_VAR) {
     ENV_VAR["FLAGD_HOST"] = "FLAGD_HOST";
     ENV_VAR["FLAGD_PORT"] = "FLAGD_PORT";
+    ENV_VAR["FLAGD_SYNC_PORT"] = "FLAGD_SYNC_PORT";
+    ENV_VAR["FLAGD_DEADLINE_MS"] = "FLAGD_DEADLINE_MS";
+    ENV_VAR["FLAGD_STREAM_DEADLINE_MS"] = "FLAGD_STREAM_DEADLINE_MS";
     ENV_VAR["FLAGD_TLS"] = "FLAGD_TLS";
     ENV_VAR["FLAGD_SOCKET_PATH"] = "FLAGD_SOCKET_PATH";
+    ENV_VAR["FLAGD_SERVER_CERT_PATH"] = "FLAGD_SERVER_CERT_PATH";
     ENV_VAR["FLAGD_CACHE"] = "FLAGD_CACHE";
     ENV_VAR["FLAGD_MAX_CACHE_SIZE"] = "FLAGD_MAX_CACHE_SIZE";
     ENV_VAR["FLAGD_SOURCE_SELECTOR"] = "FLAGD_SOURCE_SELECTOR";
     ENV_VAR["FLAGD_RESOLVER"] = "FLAGD_RESOLVER";
     ENV_VAR["FLAGD_OFFLINE_FLAG_SOURCE_PATH"] = "FLAGD_OFFLINE_FLAG_SOURCE_PATH";
     ENV_VAR["FLAGD_DEFAULT_AUTHORITY"] = "FLAGD_DEFAULT_AUTHORITY";
+    ENV_VAR["FLAGD_RETRY_BACKOFF_MS"] = "FLAGD_RETRY_BACKOFF_MS";
+    ENV_VAR["FLAGD_RETRY_BACKOFF_MAX_MS"] = "FLAGD_RETRY_BACKOFF_MAX_MS";
+    ENV_VAR["FLAGD_KEEP_ALIVE_TIME_MS"] = "FLAGD_KEEP_ALIVE_TIME_MS";
+    ENV_VAR["FLAGD_FATAL_STATUS_CODES"] = "FLAGD_FATAL_STATUS_CODES";
+    ENV_VAR["FLAGD_RETRY_GRACE_PERIOD"] = "FLAGD_RETRY_GRACE_PERIOD";
 })(ENV_VAR || (ENV_VAR = {}));
-const getEnvVarConfig = () => {
+function getEnvVarConfig() {
     var _a;
-    return (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (process.env[ENV_VAR.FLAGD_HOST] && {
+    let provider = undefined;
+    if (process.env[ENV_VAR.FLAGD_RESOLVER] &&
+        (process.env[ENV_VAR.FLAGD_RESOLVER].toLowerCase() === 'rpc' ||
+            process.env[ENV_VAR.FLAGD_RESOLVER].toLowerCase() === 'in-process')) {
+        provider = process.env[ENV_VAR.FLAGD_RESOLVER].toLowerCase();
+    }
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (process.env[ENV_VAR.FLAGD_HOST] && {
         host: process.env[ENV_VAR.FLAGD_HOST],
     })), (Number(process.env[ENV_VAR.FLAGD_PORT]) && {
         port: Number(process.env[ENV_VAR.FLAGD_PORT]),
+    })), (Number(process.env[ENV_VAR.FLAGD_SYNC_PORT]) && {
+        port: Number(process.env[ENV_VAR.FLAGD_SYNC_PORT]),
+    })), (Number(process.env[ENV_VAR.FLAGD_DEADLINE_MS]) && {
+        deadlineMs: Number(process.env[ENV_VAR.FLAGD_DEADLINE_MS]),
+    })), (Number(process.env[ENV_VAR.FLAGD_STREAM_DEADLINE_MS]) && {
+        streamDeadlineMs: Number(process.env[ENV_VAR.FLAGD_STREAM_DEADLINE_MS]),
     })), (process.env[ENV_VAR.FLAGD_TLS] && {
-        tls: ((_a = process.env[ENV_VAR.FLAGD_TLS]) === null || _a === undefined ? undefined : _a.toLowerCase()) === 'true',
+        tls: ((_a = process.env[ENV_VAR.FLAGD_TLS]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true',
     })), (process.env[ENV_VAR.FLAGD_SOCKET_PATH] && {
         socketPath: process.env[ENV_VAR.FLAGD_SOCKET_PATH],
+    })), (process.env[ENV_VAR.FLAGD_SERVER_CERT_PATH] && {
+        certPath: process.env[ENV_VAR.FLAGD_SERVER_CERT_PATH],
     })), ((process.env[ENV_VAR.FLAGD_CACHE] === 'lru' || process.env[ENV_VAR.FLAGD_CACHE] === 'disabled') && {
         cache: process.env[ENV_VAR.FLAGD_CACHE],
     })), (process.env[ENV_VAR.FLAGD_MAX_CACHE_SIZE] && {
         maxCacheSize: Number(process.env[ENV_VAR.FLAGD_MAX_CACHE_SIZE]),
     })), (process.env[ENV_VAR.FLAGD_SOURCE_SELECTOR] && {
         selector: process.env[ENV_VAR.FLAGD_SOURCE_SELECTOR],
-    })), ((process.env[ENV_VAR.FLAGD_RESOLVER] === 'rpc' || process.env[ENV_VAR.FLAGD_RESOLVER] === 'in-process') && {
-        resolverType: process.env[ENV_VAR.FLAGD_RESOLVER],
+    })), (provider && {
+        resolverType: provider,
     })), (process.env[ENV_VAR.FLAGD_OFFLINE_FLAG_SOURCE_PATH] && {
         offlineFlagSourcePath: process.env[ENV_VAR.FLAGD_OFFLINE_FLAG_SOURCE_PATH],
     })), (process.env[ENV_VAR.FLAGD_DEFAULT_AUTHORITY] && {
         defaultAuthority: process.env[ENV_VAR.FLAGD_DEFAULT_AUTHORITY],
-    })));
-};
+    })), (Number(process.env[ENV_VAR.FLAGD_RETRY_BACKOFF_MS]) && {
+        retryBackoffMs: Number(process.env[ENV_VAR.FLAGD_RETRY_BACKOFF_MS]),
+    })), (Number(process.env[ENV_VAR.FLAGD_RETRY_BACKOFF_MAX_MS]) && {
+        retryBackoffMaxMs: Number(process.env[ENV_VAR.FLAGD_RETRY_BACKOFF_MAX_MS]),
+    })), (Number(process.env[ENV_VAR.FLAGD_KEEP_ALIVE_TIME_MS]) && {
+        keepAliveTime: Number(process.env[ENV_VAR.FLAGD_KEEP_ALIVE_TIME_MS]),
+    })), (process.env[ENV_VAR.FLAGD_FATAL_STATUS_CODES] && {
+        fatalStatusCodes: process.env[ENV_VAR.FLAGD_FATAL_STATUS_CODES]
+            .split(',')
+            .map((code) => code.trim())
+            .filter((code) => code.length > 0),
+    })), (process.env[ENV_VAR.FLAGD_RETRY_GRACE_PERIOD] && {
+        retryGracePeriod: Number(process.env[ENV_VAR.FLAGD_RETRY_GRACE_PERIOD]),
+    }));
+}
 function getConfig(options = {}) {
+    var _a, _b;
     const envVarConfig = getEnvVarConfig();
     const defaultConfig = options.resolverType == 'in-process' || envVarConfig.resolverType == 'in-process'
         ? DEFAULT_IN_PROCESS_CONFIG
         : DEFAULT_RPC_CONFIG;
-    return Object.assign(Object.assign(Object.assign({}, defaultConfig), envVarConfig), options);
+    return Object.assign(Object.assign(Object.assign(Object.assign({}, defaultConfig), envVarConfig), options), { streamDeadlineMs: (_b = (_a = options.streamDeadlineMs) !== null && _a !== void 0 ? _a : envVarConfig.streamDeadlineMs) !== null && _b !== void 0 ? _b : DEFAULT_CONFIG.streamDeadlineMs });
 }
 
 /**
@@ -121,10 +169,85 @@ function getConfig(options = {}) {
 // WebAssembly optimizations to do native i64 multiplication and divide
 var wasm = null;
 try {
-  wasm = new WebAssembly.Instance(new WebAssembly.Module(new Uint8Array([
-    0, 97, 115, 109, 1, 0, 0, 0, 1, 13, 2, 96, 0, 1, 127, 96, 4, 127, 127, 127, 127, 1, 127, 3, 7, 6, 0, 1, 1, 1, 1, 1, 6, 6, 1, 127, 1, 65, 0, 11, 7, 50, 6, 3, 109, 117, 108, 0, 1, 5, 100, 105, 118, 95, 115, 0, 2, 5, 100, 105, 118, 95, 117, 0, 3, 5, 114, 101, 109, 95, 115, 0, 4, 5, 114, 101, 109, 95, 117, 0, 5, 8, 103, 101, 116, 95, 104, 105, 103, 104, 0, 0, 10, 191, 1, 6, 4, 0, 35, 0, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 126, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 127, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 128, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 129, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 130, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11
-  ])), {}).exports;
-} catch (e) {
+  wasm = new WebAssembly.Instance(
+    new WebAssembly.Module(
+      new Uint8Array([
+        // \0asm
+        0, 97, 115, 109,
+        // version 1
+        1, 0, 0, 0,
+
+        // section "type"
+        1, 13, 2,
+        // 0, () => i32
+        96, 0, 1, 127,
+        // 1, (i32, i32, i32, i32) => i32
+        96, 4, 127, 127, 127, 127, 1, 127,
+
+        // section "function"
+        3, 7, 6,
+        // 0, type 0
+        0,
+        // 1, type 1
+        1,
+        // 2, type 1
+        1,
+        // 3, type 1
+        1,
+        // 4, type 1
+        1,
+        // 5, type 1
+        1,
+
+        // section "global"
+        6, 6, 1,
+        // 0, "high", mutable i32
+        127, 1, 65, 0, 11,
+
+        // section "export"
+        7, 50, 6,
+        // 0, "mul"
+        3, 109, 117, 108, 0, 1,
+        // 1, "div_s"
+        5, 100, 105, 118, 95, 115, 0, 2,
+        // 2, "div_u"
+        5, 100, 105, 118, 95, 117, 0, 3,
+        // 3, "rem_s"
+        5, 114, 101, 109, 95, 115, 0, 4,
+        // 4, "rem_u"
+        5, 114, 101, 109, 95, 117, 0, 5,
+        // 5, "get_high"
+        8, 103, 101, 116, 95, 104, 105, 103, 104, 0, 0,
+
+        // section "code"
+        10, 191, 1, 6,
+        // 0, "get_high"
+        4, 0, 35, 0, 11,
+        // 1, "mul"
+        36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32,
+        3, 173, 66, 32, 134, 132, 126, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4,
+        167, 11,
+        // 2, "div_s"
+        36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32,
+        3, 173, 66, 32, 134, 132, 127, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4,
+        167, 11,
+        // 3, "div_u"
+        36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32,
+        3, 173, 66, 32, 134, 132, 128, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4,
+        167, 11,
+        // 4, "rem_s"
+        36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32,
+        3, 173, 66, 32, 134, 132, 129, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4,
+        167, 11,
+        // 5, "rem_u"
+        36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32,
+        3, 173, 66, 32, 134, 132, 130, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4,
+        167, 11,
+      ]),
+    ),
+    {},
+  ).exports;
+} catch {
   // no wasm support :(
 }
 
@@ -139,7 +262,6 @@ try {
  * @constructor
  */
 function Long(low, high, unsigned) {
-
   /**
    * The low 32 bits as a signed value.
    * @type {number}
@@ -239,25 +361,21 @@ function fromInt(value, unsigned) {
   var obj, cachedObj, cache;
   if (unsigned) {
     value >>>= 0;
-    if (cache = (0 <= value && value < 256)) {
+    if ((cache = 0 <= value && value < 256)) {
       cachedObj = UINT_CACHE[value];
-      if (cachedObj)
-        return cachedObj;
+      if (cachedObj) return cachedObj;
     }
     obj = fromBits(value, 0, true);
-    if (cache)
-      UINT_CACHE[value] = obj;
+    if (cache) UINT_CACHE[value] = obj;
     return obj;
   } else {
     value |= 0;
-    if (cache = (-128 <= value && value < 128)) {
+    if ((cache = -128 <= value && value < 128)) {
       cachedObj = INT_CACHE[value];
-      if (cachedObj)
-        return cachedObj;
+      if (cachedObj) return cachedObj;
     }
     obj = fromBits(value, value < 0 ? -1 : 0, false);
-    if (cache)
-      INT_CACHE[value] = obj;
+    if (cache) INT_CACHE[value] = obj;
     return obj;
   }
 }
@@ -278,22 +396,20 @@ Long.fromInt = fromInt;
  * @inner
  */
 function fromNumber(value, unsigned) {
-  if (isNaN(value))
-    return unsigned ? UZERO : ZERO;
+  if (isNaN(value)) return unsigned ? UZERO : ZERO;
   if (unsigned) {
-    if (value < 0)
-      return UZERO;
-    if (value >= TWO_PWR_64_DBL)
-      return MAX_UNSIGNED_VALUE;
+    if (value < 0) return UZERO;
+    if (value >= TWO_PWR_64_DBL) return MAX_UNSIGNED_VALUE;
   } else {
-    if (value <= -9223372036854776e3)
-      return MIN_VALUE;
-    if (value + 1 >= TWO_PWR_63_DBL)
-      return MAX_VALUE;
+    if (value <= -9223372036854776e3) return MIN_VALUE;
+    if (value + 1 >= TWO_PWR_63_DBL) return MAX_VALUE;
   }
-  if (value < 0)
-    return fromNumber(-value, unsigned).neg();
-  return fromBits((value % TWO_PWR_32_DBL) | 0, (value / TWO_PWR_32_DBL) | 0, unsigned);
+  if (value < 0) return fromNumber(-value, unsigned).neg();
+  return fromBits(
+    value % TWO_PWR_32_DBL | 0,
+    (value / TWO_PWR_32_DBL) | 0,
+    unsigned,
+  );
 }
 
 /**
@@ -344,24 +460,26 @@ var pow_dbl = Math.pow; // Used 4 times (4*8 to 15+4)
  * @inner
  */
 function fromString(str, unsigned, radix) {
-  if (str.length === 0)
-    throw Error('empty string');
-  if (typeof unsigned === 'number') {
+  if (str.length === 0) throw Error("empty string");
+  if (typeof unsigned === "number") {
     // For goog.math.long compatibility
     radix = unsigned;
     unsigned = false;
   } else {
     unsigned = !!unsigned;
   }
-  if (str === "NaN" || str === "Infinity" || str === "+Infinity" || str === "-Infinity")
+  if (
+    str === "NaN" ||
+    str === "Infinity" ||
+    str === "+Infinity" ||
+    str === "-Infinity"
+  )
     return unsigned ? UZERO : ZERO;
   radix = radix || 10;
-  if (radix < 2 || 36 < radix)
-    throw RangeError('radix');
+  if (radix < 2 || 36 < radix) throw RangeError("radix");
 
   var p;
-  if ((p = str.indexOf('-')) > 0)
-    throw Error('interior hyphen');
+  if ((p = str.indexOf("-")) > 0) throw Error("interior hyphen");
   else if (p === 0) {
     return fromString(str.substring(1), unsigned, radix).neg();
   }
@@ -404,18 +522,20 @@ Long.fromString = fromString;
  * @inner
  */
 function fromValue(val, unsigned) {
-  if (typeof val === 'number')
-    return fromNumber(val, unsigned);
-  if (typeof val === 'string')
-    return fromString(val, unsigned);
+  if (typeof val === "number") return fromNumber(val, unsigned);
+  if (typeof val === "string") return fromString(val, unsigned);
   // Throws for non-objects, converts non-instanceof Long:
-  return fromBits(val.low, val.high, typeof unsigned === 'boolean' ? unsigned : val.unsigned);
+  return fromBits(
+    val.low,
+    val.high,
+    typeof unsigned === "boolean" ? unsigned : val.unsigned,
+  );
 }
 
 /**
  * Converts the specified value to a Long using the appropriate from* function for its type.
  * @function
- * @param {!Long|number|string|!{low: number, high: number, unsigned: boolean}} val Value
+ * @param {!Long|number|bigint|string|!{low: number, high: number, unsigned: boolean}} val Value
  * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
  * @returns {!Long}
  */
@@ -530,7 +650,7 @@ Long.NEG_ONE = NEG_ONE;
  * @type {!Long}
  * @inner
  */
-var MAX_VALUE = fromBits(0xFFFFFFFF | 0, 0x7FFFFFFF | 0, false);
+var MAX_VALUE = fromBits(0xffffffff | 0, 0x7fffffff | 0, false);
 
 /**
  * Maximum signed value.
@@ -542,7 +662,7 @@ Long.MAX_VALUE = MAX_VALUE;
  * @type {!Long}
  * @inner
  */
-var MAX_UNSIGNED_VALUE = fromBits(0xFFFFFFFF | 0, 0xFFFFFFFF | 0, true);
+var MAX_UNSIGNED_VALUE = fromBits(0xffffffff | 0, 0xffffffff | 0, true);
 
 /**
  * Maximum unsigned value.
@@ -584,7 +704,7 @@ LongPrototype.toInt = function toInt() {
  */
 LongPrototype.toNumber = function toNumber() {
   if (this.unsigned)
-    return ((this.high >>> 0) * TWO_PWR_32_DBL) + (this.low >>> 0);
+    return (this.high >>> 0) * TWO_PWR_32_DBL + (this.low >>> 0);
   return this.high * TWO_PWR_32_DBL + (this.low >>> 0);
 };
 
@@ -598,11 +718,10 @@ LongPrototype.toNumber = function toNumber() {
  */
 LongPrototype.toString = function toString(radix) {
   radix = radix || 10;
-  if (radix < 2 || 36 < radix)
-    throw RangeError('radix');
-  if (this.isZero())
-    return '0';
-  if (this.isNegative()) { // Unsigned Longs are never negative
+  if (radix < 2 || 36 < radix) throw RangeError("radix");
+  if (this.isZero()) return "0";
+  if (this.isNegative()) {
+    // Unsigned Longs are never negative
     if (this.eq(MIN_VALUE)) {
       // We need to change the Long value before it can be negated, so we remove
       // the bottom-most digit in this base and then recurse to do the rest.
@@ -610,26 +729,23 @@ LongPrototype.toString = function toString(radix) {
         div = this.div(radixLong),
         rem1 = div.mul(radixLong).sub(this);
       return div.toString(radix) + rem1.toInt().toString(radix);
-    } else
-      return '-' + this.neg().toString(radix);
+    } else return "-" + this.neg().toString(radix);
   }
 
   // Do several (6) digits each time through the loop, so as to
   // minimize the calls to the very expensive emulated div.
   var radixToPower = fromNumber(pow_dbl(radix, 6), this.unsigned),
     rem = this;
-  var result = '';
+  var result = "";
   while (true) {
     var remDiv = rem.div(radixToPower),
       intval = rem.sub(remDiv.mul(radixToPower)).toInt() >>> 0,
       digits = intval.toString(radix);
     rem = remDiv;
-    if (rem.isZero())
-      return digits + result;
+    if (rem.isZero()) return digits + result;
     else {
-      while (digits.length < 6)
-        digits = '0' + digits;
-      result = '' + digits + result;
+      while (digits.length < 6) digits = "0" + digits;
+      result = "" + digits + result;
     }
   }
 };
@@ -676,15 +792,30 @@ LongPrototype.getLowBitsUnsigned = function getLowBitsUnsigned() {
  * @returns {number}
  */
 LongPrototype.getNumBitsAbs = function getNumBitsAbs() {
-  if (this.isNegative()) // Unsigned Longs are never negative
+  if (this.isNegative())
+    // Unsigned Longs are never negative
     return this.eq(MIN_VALUE) ? 64 : this.neg().getNumBitsAbs();
   var val = this.high != 0 ? this.high : this.low;
-  for (var bit = 31; bit > 0; bit--)
-    if ((val & (1 << bit)) != 0)
-      break;
+  for (var bit = 31; bit > 0; bit--) if ((val & (1 << bit)) != 0) break;
   return this.high != 0 ? bit + 33 : bit + 1;
 };
 
+/**
+ * Tests if this Long can be safely represented as a JavaScript number.
+ * @this {!Long}
+ * @returns {boolean}
+ */
+LongPrototype.isSafeInteger = function isSafeInteger() {
+  // 2^53-1 is the maximum safe value
+  var top11Bits = this.high >> 21;
+  // [0, 2^53-1]
+  if (!top11Bits) return true;
+  // > 2^53-1
+  if (this.unsigned) return false;
+  // [-2^53, -1] except -2^53
+  return top11Bits === -1 && !(this.low === 0 && this.high === -2097152);
+};
+
 /**
  * Tests if this Long's value equals zero.
  * @this {!Long}
@@ -739,13 +870,16 @@ LongPrototype.isEven = function isEven() {
 /**
  * Tests if this Long's value equals the specified's.
  * @this {!Long}
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.equals = function equals(other) {
-  if (!isLong(other))
-    other = fromValue(other);
-  if (this.unsigned !== other.unsigned && (this.high >>> 31) === 1 && (other.high >>> 31) === 1)
+  if (!isLong(other)) other = fromValue(other);
+  if (
+    this.unsigned !== other.unsigned &&
+    this.high >>> 31 === 1 &&
+    other.high >>> 31 === 1
+  )
     return false;
   return this.high === other.high && this.low === other.low;
 };
@@ -753,7 +887,7 @@ LongPrototype.equals = function equals(other) {
 /**
  * Tests if this Long's value equals the specified's. This is an alias of {@link Long#equals}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.eq = LongPrototype.equals;
@@ -761,7 +895,7 @@ LongPrototype.eq = LongPrototype.equals;
 /**
  * Tests if this Long's value differs from the specified's.
  * @this {!Long}
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.notEquals = function notEquals(other) {
@@ -771,7 +905,7 @@ LongPrototype.notEquals = function notEquals(other) {
 /**
  * Tests if this Long's value differs from the specified's. This is an alias of {@link Long#notEquals}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.neq = LongPrototype.notEquals;
@@ -779,7 +913,7 @@ LongPrototype.neq = LongPrototype.notEquals;
 /**
  * Tests if this Long's value differs from the specified's. This is an alias of {@link Long#notEquals}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.ne = LongPrototype.notEquals;
@@ -787,7 +921,7 @@ LongPrototype.ne = LongPrototype.notEquals;
 /**
  * Tests if this Long's value is less than the specified's.
  * @this {!Long}
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.lessThan = function lessThan(other) {
@@ -797,7 +931,7 @@ LongPrototype.lessThan = function lessThan(other) {
 /**
  * Tests if this Long's value is less than the specified's. This is an alias of {@link Long#lessThan}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.lt = LongPrototype.lessThan;
@@ -805,7 +939,7 @@ LongPrototype.lt = LongPrototype.lessThan;
 /**
  * Tests if this Long's value is less than or equal the specified's.
  * @this {!Long}
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.lessThanOrEqual = function lessThanOrEqual(other) {
@@ -815,7 +949,7 @@ LongPrototype.lessThanOrEqual = function lessThanOrEqual(other) {
 /**
  * Tests if this Long's value is less than or equal the specified's. This is an alias of {@link Long#lessThanOrEqual}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.lte = LongPrototype.lessThanOrEqual;
@@ -823,7 +957,7 @@ LongPrototype.lte = LongPrototype.lessThanOrEqual;
 /**
  * Tests if this Long's value is less than or equal the specified's. This is an alias of {@link Long#lessThanOrEqual}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.le = LongPrototype.lessThanOrEqual;
@@ -831,7 +965,7 @@ LongPrototype.le = LongPrototype.lessThanOrEqual;
 /**
  * Tests if this Long's value is greater than the specified's.
  * @this {!Long}
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.greaterThan = function greaterThan(other) {
@@ -841,7 +975,7 @@ LongPrototype.greaterThan = function greaterThan(other) {
 /**
  * Tests if this Long's value is greater than the specified's. This is an alias of {@link Long#greaterThan}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.gt = LongPrototype.greaterThan;
@@ -849,7 +983,7 @@ LongPrototype.gt = LongPrototype.greaterThan;
 /**
  * Tests if this Long's value is greater than or equal the specified's.
  * @this {!Long}
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) {
@@ -859,7 +993,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) {
 /**
  * Tests if this Long's value is greater than or equal the specified's. This is an alias of {@link Long#greaterThanOrEqual}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.gte = LongPrototype.greaterThanOrEqual;
@@ -867,7 +1001,7 @@ LongPrototype.gte = LongPrototype.greaterThanOrEqual;
 /**
  * Tests if this Long's value is greater than or equal the specified's. This is an alias of {@link Long#greaterThanOrEqual}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {boolean}
  */
 LongPrototype.ge = LongPrototype.greaterThanOrEqual;
@@ -875,32 +1009,30 @@ LongPrototype.ge = LongPrototype.greaterThanOrEqual;
 /**
  * Compares this Long's value with the specified's.
  * @this {!Long}
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {number} 0 if they are the same, 1 if the this is greater and -1
  *  if the given one is greater
  */
 LongPrototype.compare = function compare(other) {
-  if (!isLong(other))
-    other = fromValue(other);
-  if (this.eq(other))
-    return 0;
+  if (!isLong(other)) other = fromValue(other);
+  if (this.eq(other)) return 0;
   var thisNeg = this.isNegative(),
     otherNeg = other.isNegative();
-  if (thisNeg && !otherNeg)
-    return -1;
-  if (!thisNeg && otherNeg)
-    return 1;
+  if (thisNeg && !otherNeg) return -1;
+  if (!thisNeg && otherNeg) return 1;
   // At this point the sign bits are the same
-  if (!this.unsigned)
-    return this.sub(other).isNegative() ? -1 : 1;
+  if (!this.unsigned) return this.sub(other).isNegative() ? -1 : 1;
   // Both are positive if at least one is unsigned
-  return (other.high >>> 0) > (this.high >>> 0) || (other.high === this.high && (other.low >>> 0) > (this.low >>> 0)) ? -1 : 1;
+  return other.high >>> 0 > this.high >>> 0 ||
+    (other.high === this.high && other.low >>> 0 > this.low >>> 0)
+    ? -1
+    : 1;
 };
 
 /**
  * Compares this Long's value with the specified's. This is an alias of {@link Long#compare}.
  * @function
- * @param {!Long|number|string} other Other value
+ * @param {!Long|number|bigint|string} other Other value
  * @returns {number} 0 if they are the same, 1 if the this is greater and -1
  *  if the given one is greater
  */
@@ -912,8 +1044,7 @@ LongPrototype.comp = LongPrototype.compare;
  * @returns {!Long} Negated Long
  */
 LongPrototype.negate = function negate() {
-  if (!this.unsigned && this.eq(MIN_VALUE))
-    return MIN_VALUE;
+  if (!this.unsigned && this.eq(MIN_VALUE)) return MIN_VALUE;
   return this.not().add(ONE);
 };
 
@@ -927,56 +1058,57 @@ LongPrototype.neg = LongPrototype.negate;
 /**
  * Returns the sum of this and the specified Long.
  * @this {!Long}
- * @param {!Long|number|string} addend Addend
+ * @param {!Long|number|bigint|string} addend Addend
  * @returns {!Long} Sum
  */
 LongPrototype.add = function add(addend) {
-  if (!isLong(addend))
-    addend = fromValue(addend);
+  if (!isLong(addend)) addend = fromValue(addend);
 
   // Divide each number into 4 chunks of 16 bits, and then sum the chunks.
 
   var a48 = this.high >>> 16;
-  var a32 = this.high & 0xFFFF;
+  var a32 = this.high & 0xffff;
   var a16 = this.low >>> 16;
-  var a00 = this.low & 0xFFFF;
+  var a00 = this.low & 0xffff;
 
   var b48 = addend.high >>> 16;
-  var b32 = addend.high & 0xFFFF;
+  var b32 = addend.high & 0xffff;
   var b16 = addend.low >>> 16;
-  var b00 = addend.low & 0xFFFF;
+  var b00 = addend.low & 0xffff;
 
-  var c48 = 0, c32 = 0, c16 = 0, c00 = 0;
+  var c48 = 0,
+    c32 = 0,
+    c16 = 0,
+    c00 = 0;
   c00 += a00 + b00;
   c16 += c00 >>> 16;
-  c00 &= 0xFFFF;
+  c00 &= 0xffff;
   c16 += a16 + b16;
   c32 += c16 >>> 16;
-  c16 &= 0xFFFF;
+  c16 &= 0xffff;
   c32 += a32 + b32;
   c48 += c32 >>> 16;
-  c32 &= 0xFFFF;
+  c32 &= 0xffff;
   c48 += a48 + b48;
-  c48 &= 0xFFFF;
+  c48 &= 0xffff;
   return fromBits((c16 << 16) | c00, (c48 << 16) | c32, this.unsigned);
 };
 
 /**
  * Returns the difference of this and the specified Long.
  * @this {!Long}
- * @param {!Long|number|string} subtrahend Subtrahend
+ * @param {!Long|number|bigint|string} subtrahend Subtrahend
  * @returns {!Long} Difference
  */
 LongPrototype.subtract = function subtract(subtrahend) {
-  if (!isLong(subtrahend))
-    subtrahend = fromValue(subtrahend);
+  if (!isLong(subtrahend)) subtrahend = fromValue(subtrahend);
   return this.add(subtrahend.neg());
 };
 
 /**
  * Returns the difference of this and the specified Long. This is an alias of {@link Long#subtract}.
  * @function
- * @param {!Long|number|string} subtrahend Subtrahend
+ * @param {!Long|number|bigint|string} subtrahend Subtrahend
  * @returns {!Long} Difference
  */
 LongPrototype.sub = LongPrototype.subtract;
@@ -984,38 +1116,27 @@ LongPrototype.sub = LongPrototype.subtract;
 /**
  * Returns the product of this and the specified Long.
  * @this {!Long}
- * @param {!Long|number|string} multiplier Multiplier
+ * @param {!Long|number|bigint|string} multiplier Multiplier
  * @returns {!Long} Product
  */
 LongPrototype.multiply = function multiply(multiplier) {
-  if (this.isZero())
-    return this;
-  if (!isLong(multiplier))
-    multiplier = fromValue(multiplier);
+  if (this.isZero()) return this;
+  if (!isLong(multiplier)) multiplier = fromValue(multiplier);
 
   // use wasm support if present
   if (wasm) {
-    var low = wasm["mul"](this.low,
-      this.high,
-      multiplier.low,
-      multiplier.high);
+    var low = wasm["mul"](this.low, this.high, multiplier.low, multiplier.high);
     return fromBits(low, wasm["get_high"](), this.unsigned);
   }
 
-  if (multiplier.isZero())
-    return this.unsigned ? UZERO : ZERO;
-  if (this.eq(MIN_VALUE))
-    return multiplier.isOdd() ? MIN_VALUE : ZERO;
-  if (multiplier.eq(MIN_VALUE))
-    return this.isOdd() ? MIN_VALUE : ZERO;
+  if (multiplier.isZero()) return this.unsigned ? UZERO : ZERO;
+  if (this.eq(MIN_VALUE)) return multiplier.isOdd() ? MIN_VALUE : ZERO;
+  if (multiplier.eq(MIN_VALUE)) return this.isOdd() ? MIN_VALUE : ZERO;
 
   if (this.isNegative()) {
-    if (multiplier.isNegative())
-      return this.neg().mul(multiplier.neg());
-    else
-      return this.neg().mul(multiplier).neg();
-  } else if (multiplier.isNegative())
-    return this.mul(multiplier.neg()).neg();
+    if (multiplier.isNegative()) return this.neg().mul(multiplier.neg());
+    else return this.neg().mul(multiplier).neg();
+  } else if (multiplier.isNegative()) return this.mul(multiplier.neg()).neg();
 
   // If both longs are small, use float multiplication
   if (this.lt(TWO_PWR_24) && multiplier.lt(TWO_PWR_24))
@@ -1025,43 +1146,46 @@ LongPrototype.multiply = function multiply(multiplier) {
   // We can skip products that would overflow.
 
   var a48 = this.high >>> 16;
-  var a32 = this.high & 0xFFFF;
+  var a32 = this.high & 0xffff;
   var a16 = this.low >>> 16;
-  var a00 = this.low & 0xFFFF;
+  var a00 = this.low & 0xffff;
 
   var b48 = multiplier.high >>> 16;
-  var b32 = multiplier.high & 0xFFFF;
+  var b32 = multiplier.high & 0xffff;
   var b16 = multiplier.low >>> 16;
-  var b00 = multiplier.low & 0xFFFF;
+  var b00 = multiplier.low & 0xffff;
 
-  var c48 = 0, c32 = 0, c16 = 0, c00 = 0;
+  var c48 = 0,
+    c32 = 0,
+    c16 = 0,
+    c00 = 0;
   c00 += a00 * b00;
   c16 += c00 >>> 16;
-  c00 &= 0xFFFF;
+  c00 &= 0xffff;
   c16 += a16 * b00;
   c32 += c16 >>> 16;
-  c16 &= 0xFFFF;
+  c16 &= 0xffff;
   c16 += a00 * b16;
   c32 += c16 >>> 16;
-  c16 &= 0xFFFF;
+  c16 &= 0xffff;
   c32 += a32 * b00;
   c48 += c32 >>> 16;
-  c32 &= 0xFFFF;
+  c32 &= 0xffff;
   c32 += a16 * b16;
   c48 += c32 >>> 16;
-  c32 &= 0xFFFF;
+  c32 &= 0xffff;
   c32 += a00 * b32;
   c48 += c32 >>> 16;
-  c32 &= 0xFFFF;
+  c32 &= 0xffff;
   c48 += a48 * b00 + a32 * b16 + a16 * b32 + a00 * b48;
-  c48 &= 0xFFFF;
+  c48 &= 0xffff;
   return fromBits((c16 << 16) | c00, (c48 << 16) | c32, this.unsigned);
 };
 
 /**
  * Returns the product of this and the specified Long. This is an alias of {@link Long#multiply}.
  * @function
- * @param {!Long|number|string} multiplier Multiplier
+ * @param {!Long|number|bigint|string} multiplier Multiplier
  * @returns {!Long} Product
  */
 LongPrototype.mul = LongPrototype.multiply;
@@ -1070,23 +1194,24 @@ LongPrototype.mul = LongPrototype.multiply;
  * Returns this Long divided by the specified. The result is signed if this Long is signed or
  *  unsigned if this Long is unsigned.
  * @this {!Long}
- * @param {!Long|number|string} divisor Divisor
+ * @param {!Long|number|bigint|string} divisor Divisor
  * @returns {!Long} Quotient
  */
 LongPrototype.divide = function divide(divisor) {
-  if (!isLong(divisor))
-    divisor = fromValue(divisor);
-  if (divisor.isZero())
-    throw Error('division by zero');
+  if (!isLong(divisor)) divisor = fromValue(divisor);
+  if (divisor.isZero()) throw Error("division by zero");
 
   // use wasm support if present
   if (wasm) {
     // guard against signed division overflow: the largest
     // negative number / -1 would be 1 larger than the largest
     // positive number, due to two's complement.
-    if (!this.unsigned &&
+    if (
+      !this.unsigned &&
       this.high === -2147483648 &&
-      divisor.low === -1 && divisor.high === -1) {
+      divisor.low === -1 &&
+      divisor.high === -1
+    ) {
       // be consistent with non-wasm code path
       return this;
     }
@@ -1094,22 +1219,20 @@ LongPrototype.divide = function divide(divisor) {
       this.low,
       this.high,
       divisor.low,
-      divisor.high
+      divisor.high,
     );
     return fromBits(low, wasm["get_high"](), this.unsigned);
   }
 
-  if (this.isZero())
-    return this.unsigned ? UZERO : ZERO;
+  if (this.isZero()) return this.unsigned ? UZERO : ZERO;
   var approx, rem, res;
   if (!this.unsigned) {
     // This section is only relevant for signed longs and is derived from the
     // closure library as a whole.
     if (this.eq(MIN_VALUE)) {
       if (divisor.eq(ONE) || divisor.eq(NEG_ONE))
-        return MIN_VALUE;  // recall that -MIN_VALUE == MIN_VALUE
-      else if (divisor.eq(MIN_VALUE))
-        return ONE;
+        return MIN_VALUE; // recall that -MIN_VALUE == MIN_VALUE
+      else if (divisor.eq(MIN_VALUE)) return ONE;
       else {
         // At this point, we have |other| >= 2, so |this/other| < |MIN_VALUE|.
         var halfThis = this.shr(1);
@@ -1122,23 +1245,19 @@ LongPrototype.divide = function divide(divisor) {
           return res;
         }
       }
-    } else if (divisor.eq(MIN_VALUE))
-      return this.unsigned ? UZERO : ZERO;
+    } else if (divisor.eq(MIN_VALUE)) return this.unsigned ? UZERO : ZERO;
     if (this.isNegative()) {
-      if (divisor.isNegative())
-        return this.neg().div(divisor.neg());
+      if (divisor.isNegative()) return this.neg().div(divisor.neg());
       return this.neg().div(divisor).neg();
-    } else if (divisor.isNegative())
-      return this.div(divisor.neg()).neg();
+    } else if (divisor.isNegative()) return this.div(divisor.neg()).neg();
     res = ZERO;
   } else {
     // The algorithm below has not been made for unsigned longs. It's therefore
     // required to take special care of the MSB prior to running it.
-    if (!divisor.unsigned)
-      divisor = divisor.toUnsigned();
-    if (divisor.gt(this))
-      return UZERO;
-    if (divisor.gt(this.shru(1))) // 15 >>> 1 = 7 ; with divisor = 8 ; true
+    if (!divisor.unsigned) divisor = divisor.toUnsigned();
+    if (divisor.gt(this)) return UZERO;
+    if (divisor.gt(this.shru(1)))
+      // 15 >>> 1 = 7 ; with divisor = 8 ; true
       return UONE;
     res = UZERO;
   }
@@ -1157,8 +1276,7 @@ LongPrototype.divide = function divide(divisor) {
     // We will tweak the approximate result by changing it in the 48-th digit or
     // the smallest non-fractional digit, whichever is larger.
     var log2 = Math.ceil(Math.log(approx) / Math.LN2),
-      delta = (log2 <= 48) ? 1 : pow_dbl(2, log2 - 48),
-
+      delta = log2 <= 48 ? 1 : pow_dbl(2, log2 - 48),
       // Decrease the approximation until it is smaller than the remainder.  Note
       // that if it is too large, the product overflows and is negative.
       approxRes = fromNumber(approx),
@@ -1171,8 +1289,7 @@ LongPrototype.divide = function divide(divisor) {
 
     // We know the answer can't be zero... and actually, zero would cause
     // infinite recursion since we would make no progress.
-    if (approxRes.isZero())
-      approxRes = ONE;
+    if (approxRes.isZero()) approxRes = ONE;
 
     res = res.add(approxRes);
     rem = rem.sub(approxRem);
@@ -1183,7 +1300,7 @@ LongPrototype.divide = function divide(divisor) {
 /**
  * Returns this Long divided by the specified. This is an alias of {@link Long#divide}.
  * @function
- * @param {!Long|number|string} divisor Divisor
+ * @param {!Long|number|bigint|string} divisor Divisor
  * @returns {!Long} Quotient
  */
 LongPrototype.div = LongPrototype.divide;
@@ -1191,12 +1308,11 @@ LongPrototype.div = LongPrototype.divide;
 /**
  * Returns this Long modulo the specified.
  * @this {!Long}
- * @param {!Long|number|string} divisor Divisor
+ * @param {!Long|number|bigint|string} divisor Divisor
  * @returns {!Long} Remainder
  */
 LongPrototype.modulo = function modulo(divisor) {
-  if (!isLong(divisor))
-    divisor = fromValue(divisor);
+  if (!isLong(divisor)) divisor = fromValue(divisor);
 
   // use wasm support if present
   if (wasm) {
@@ -1204,7 +1320,7 @@ LongPrototype.modulo = function modulo(divisor) {
       this.low,
       this.high,
       divisor.low,
-      divisor.high
+      divisor.high,
     );
     return fromBits(low, wasm["get_high"](), this.unsigned);
   }
@@ -1215,7 +1331,7 @@ LongPrototype.modulo = function modulo(divisor) {
 /**
  * Returns this Long modulo the specified. This is an alias of {@link Long#modulo}.
  * @function
- * @param {!Long|number|string} divisor Divisor
+ * @param {!Long|number|bigint|string} divisor Divisor
  * @returns {!Long} Remainder
  */
 LongPrototype.mod = LongPrototype.modulo;
@@ -1223,7 +1339,7 @@ LongPrototype.mod = LongPrototype.modulo;
 /**
  * Returns this Long modulo the specified. This is an alias of {@link Long#modulo}.
  * @function
- * @param {!Long|number|string} divisor Divisor
+ * @param {!Long|number|bigint|string} divisor Divisor
  * @returns {!Long} Remainder
  */
 LongPrototype.rem = LongPrototype.modulo;
@@ -1274,36 +1390,33 @@ LongPrototype.ctz = LongPrototype.countTrailingZeros;
 /**
  * Returns the bitwise AND of this Long and the specified.
  * @this {!Long}
- * @param {!Long|number|string} other Other Long
+ * @param {!Long|number|bigint|string} other Other Long
  * @returns {!Long}
  */
 LongPrototype.and = function and(other) {
-  if (!isLong(other))
-    other = fromValue(other);
+  if (!isLong(other)) other = fromValue(other);
   return fromBits(this.low & other.low, this.high & other.high, this.unsigned);
 };
 
 /**
  * Returns the bitwise OR of this Long and the specified.
  * @this {!Long}
- * @param {!Long|number|string} other Other Long
+ * @param {!Long|number|bigint|string} other Other Long
  * @returns {!Long}
  */
 LongPrototype.or = function or(other) {
-  if (!isLong(other))
-    other = fromValue(other);
+  if (!isLong(other)) other = fromValue(other);
   return fromBits(this.low | other.low, this.high | other.high, this.unsigned);
 };
 
 /**
  * Returns the bitwise XOR of this Long and the given one.
  * @this {!Long}
- * @param {!Long|number|string} other Other Long
+ * @param {!Long|number|bigint|string} other Other Long
  * @returns {!Long}
  */
 LongPrototype.xor = function xor(other) {
-  if (!isLong(other))
-    other = fromValue(other);
+  if (!isLong(other)) other = fromValue(other);
   return fromBits(this.low ^ other.low, this.high ^ other.high, this.unsigned);
 };
 
@@ -1314,14 +1427,15 @@ LongPrototype.xor = function xor(other) {
  * @returns {!Long} Shifted Long
  */
 LongPrototype.shiftLeft = function shiftLeft(numBits) {
-  if (isLong(numBits))
-    numBits = numBits.toInt();
-  if ((numBits &= 63) === 0)
-    return this;
+  if (isLong(numBits)) numBits = numBits.toInt();
+  if ((numBits &= 63) === 0) return this;
   else if (numBits < 32)
-    return fromBits(this.low << numBits, (this.high << numBits) | (this.low >>> (32 - numBits)), this.unsigned);
-  else
-    return fromBits(0, this.low << (numBits - 32), this.unsigned);
+    return fromBits(
+      this.low << numBits,
+      (this.high << numBits) | (this.low >>> (32 - numBits)),
+      this.unsigned,
+    );
+  else return fromBits(0, this.low << (numBits - 32), this.unsigned);
 };
 
 /**
@@ -1339,14 +1453,20 @@ LongPrototype.shl = LongPrototype.shiftLeft;
  * @returns {!Long} Shifted Long
  */
 LongPrototype.shiftRight = function shiftRight(numBits) {
-  if (isLong(numBits))
-    numBits = numBits.toInt();
-  if ((numBits &= 63) === 0)
-    return this;
+  if (isLong(numBits)) numBits = numBits.toInt();
+  if ((numBits &= 63) === 0) return this;
   else if (numBits < 32)
-    return fromBits((this.low >>> numBits) | (this.high << (32 - numBits)), this.high >> numBits, this.unsigned);
+    return fromBits(
+      (this.low >>> numBits) | (this.high << (32 - numBits)),
+      this.high >> numBits,
+      this.unsigned,
+    );
   else
-    return fromBits(this.high >> (numBits - 32), this.high >= 0 ? 0 : -1, this.unsigned);
+    return fromBits(
+      this.high >> (numBits - 32),
+      this.high >= 0 ? 0 : -1,
+      this.unsigned,
+    );
 };
 
 /**
@@ -1366,7 +1486,12 @@ LongPrototype.shr = LongPrototype.shiftRight;
 LongPrototype.shiftRightUnsigned = function shiftRightUnsigned(numBits) {
   if (isLong(numBits)) numBits = numBits.toInt();
   if ((numBits &= 63) === 0) return this;
-  if (numBits < 32) return fromBits((this.low >>> numBits) | (this.high << (32 - numBits)), this.high >>> numBits, this.unsigned);
+  if (numBits < 32)
+    return fromBits(
+      (this.low >>> numBits) | (this.high << (32 - numBits)),
+      this.high >>> numBits,
+      this.unsigned,
+    );
   if (numBits === 32) return fromBits(this.high, 0, this.unsigned);
   return fromBits(this.high >>> (numBits - 32), 0, this.unsigned);
 };
@@ -1399,12 +1524,20 @@ LongPrototype.rotateLeft = function rotateLeft(numBits) {
   if ((numBits &= 63) === 0) return this;
   if (numBits === 32) return fromBits(this.high, this.low, this.unsigned);
   if (numBits < 32) {
-    b = (32 - numBits);
-    return fromBits(((this.low << numBits) | (this.high >>> b)), ((this.high << numBits) | (this.low >>> b)), this.unsigned);
+    b = 32 - numBits;
+    return fromBits(
+      (this.low << numBits) | (this.high >>> b),
+      (this.high << numBits) | (this.low >>> b),
+      this.unsigned,
+    );
   }
   numBits -= 32;
-  b = (32 - numBits);
-  return fromBits(((this.high << numBits) | (this.low >>> b)), ((this.low << numBits) | (this.high >>> b)), this.unsigned);
+  b = 32 - numBits;
+  return fromBits(
+    (this.high << numBits) | (this.low >>> b),
+    (this.low << numBits) | (this.high >>> b),
+    this.unsigned,
+  );
 };
 /**
  * Returns this Long with bits rotated to the left by the given amount. This is an alias of {@link Long#rotateLeft}.
@@ -1426,12 +1559,20 @@ LongPrototype.rotateRight = function rotateRight(numBits) {
   if ((numBits &= 63) === 0) return this;
   if (numBits === 32) return fromBits(this.high, this.low, this.unsigned);
   if (numBits < 32) {
-    b = (32 - numBits);
-    return fromBits(((this.high << b) | (this.low >>> numBits)), ((this.low << b) | (this.high >>> numBits)), this.unsigned);
+    b = 32 - numBits;
+    return fromBits(
+      (this.high << b) | (this.low >>> numBits),
+      (this.low << b) | (this.high >>> numBits),
+      this.unsigned,
+    );
   }
   numBits -= 32;
-  b = (32 - numBits);
-  return fromBits(((this.low << b) | (this.high >>> numBits)), ((this.high << b) | (this.low >>> numBits)), this.unsigned);
+  b = 32 - numBits;
+  return fromBits(
+    (this.low << b) | (this.high >>> numBits),
+    (this.high << b) | (this.low >>> numBits),
+    this.unsigned,
+  );
 };
 /**
  * Returns this Long with bits rotated to the right by the given amount. This is an alias of {@link Long#rotateRight}.
@@ -1447,8 +1588,7 @@ LongPrototype.rotr = LongPrototype.rotateRight;
  * @returns {!Long} Signed long
  */
 LongPrototype.toSigned = function toSigned() {
-  if (!this.unsigned)
-    return this;
+  if (!this.unsigned) return this;
   return fromBits(this.low, this.high, false);
 };
 
@@ -1458,8 +1598,7 @@ LongPrototype.toSigned = function toSigned() {
  * @returns {!Long} Unsigned long
  */
 LongPrototype.toUnsigned = function toUnsigned() {
-  if (this.unsigned)
-    return this;
+  if (this.unsigned) return this;
   return fromBits(this.low, this.high, true);
 };
 
@@ -1483,13 +1622,13 @@ LongPrototype.toBytesLE = function toBytesLE() {
     lo = this.low;
   return [
     lo & 0xff,
-    lo >>> 8 & 0xff,
-    lo >>> 16 & 0xff,
+    (lo >>> 8) & 0xff,
+    (lo >>> 16) & 0xff,
     lo >>> 24,
     hi & 0xff,
-    hi >>> 8 & 0xff,
-    hi >>> 16 & 0xff,
-    hi >>> 24
+    (hi >>> 8) & 0xff,
+    (hi >>> 16) & 0xff,
+    hi >>> 24,
   ];
 };
 
@@ -1503,13 +1642,13 @@ LongPrototype.toBytesBE = function toBytesBE() {
     lo = this.low;
   return [
     hi >>> 24,
-    hi >>> 16 & 0xff,
-    hi >>> 8 & 0xff,
+    (hi >>> 16) & 0xff,
+    (hi >>> 8) & 0xff,
     hi & 0xff,
     lo >>> 24,
-    lo >>> 16 & 0xff,
-    lo >>> 8 & 0xff,
-    lo & 0xff
+    (lo >>> 16) & 0xff,
+    (lo >>> 8) & 0xff,
+    lo & 0xff,
   ];
 };
 
@@ -1521,7 +1660,9 @@ LongPrototype.toBytesBE = function toBytesBE() {
  * @returns {Long} The corresponding Long value
  */
 Long.fromBytes = function fromBytes(bytes, unsigned, le) {
-  return le ? Long.fromBytesLE(bytes, unsigned) : Long.fromBytesBE(bytes, unsigned);
+  return le
+    ? Long.fromBytesLE(bytes, unsigned)
+    : Long.fromBytesBE(bytes, unsigned);
 };
 
 /**
@@ -1532,15 +1673,9 @@ Long.fromBytes = function fromBytes(bytes, unsigned, le) {
  */
 Long.fromBytesLE = function fromBytesLE(bytes, unsigned) {
   return new Long(
-    bytes[0] |
-    bytes[1] << 8 |
-    bytes[2] << 16 |
-    bytes[3] << 24,
-    bytes[4] |
-    bytes[5] << 8 |
-    bytes[6] << 16 |
-    bytes[7] << 24,
-    unsigned
+    bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24),
+    bytes[4] | (bytes[5] << 8) | (bytes[6] << 16) | (bytes[7] << 24),
+    unsigned,
   );
 };
 
@@ -1552,18 +1687,45 @@ Long.fromBytesLE = function fromBytesLE(bytes, unsigned) {
  */
 Long.fromBytesBE = function fromBytesBE(bytes, unsigned) {
   return new Long(
-    bytes[4] << 24 |
-    bytes[5] << 16 |
-    bytes[6] << 8 |
-    bytes[7],
-    bytes[0] << 24 |
-    bytes[1] << 16 |
-    bytes[2] << 8 |
-    bytes[3],
-    unsigned
+    (bytes[4] << 24) | (bytes[5] << 16) | (bytes[6] << 8) | bytes[7],
+    (bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3],
+    unsigned,
   );
 };
 
+// Support conversion to/from BigInt where available
+if (typeof BigInt === "function") {
+  /**
+   * Returns a Long representing the given big integer.
+   * @function
+   * @param {number} value The big integer value
+   * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+   * @returns {!Long} The corresponding Long value
+   */
+  Long.fromBigInt = function fromBigInt(value, unsigned) {
+    var lowBits = Number(BigInt.asIntN(32, value));
+    var highBits = Number(BigInt.asIntN(32, value >> BigInt(32)));
+    return fromBits(lowBits, highBits, unsigned);
+  };
+
+  // Override
+  Long.fromValue = function fromValueWithBigInt(value, unsigned) {
+    if (typeof value === "bigint") return fromBigInt(value, unsigned);
+    return fromValue(value, unsigned);
+  };
+
+  /**
+   * Converts the Long to its big integer representation.
+   * @this {!Long}
+   * @returns {bigint}
+   */
+  LongPrototype.toBigInt = function toBigInt() {
+    var lowBigInt = BigInt(this.low >>> 0);
+    var highBigInt = BigInt(this.unsigned ? this.high >>> 0 : this.high);
+    return (highBigInt << BigInt(32)) | lowBigInt;
+  };
+}
+
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 function getDefaultExportFromCjs (x) {
@@ -4399,12 +4561,12 @@ const Struct = {
         return obj;
     },
     create(base) {
-        return Struct.fromPartial(base !== null && base !== undefined ? base : {});
+        return Struct.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a;
         const message = createBaseStruct();
-        message.fields = Object.entries((_a = object.fields) !== null && _a !== undefined ? _a : {}).reduce((acc, [key, value]) => {
+        message.fields = Object.entries((_a = object.fields) !== null && _a !== void 0 ? _a : {}).reduce((acc, [key, value]) => {
             if (value !== undefined) {
                 acc[key] = value;
             }
@@ -4472,7 +4634,7 @@ const Struct_FieldsEntry = {
         return message;
     },
     fromJSON(object) {
-        return { key: isSet$2(object.key) ? String(object.key) : "", value: isSet$2(object === null || object === undefined ? undefined : object.value) ? object.value : undefined };
+        return { key: isSet$2(object.key) ? String(object.key) : "", value: isSet$2(object === null || object === void 0 ? void 0 : object.value) ? object.value : undefined };
     },
     toJSON(message) {
         const obj = {};
@@ -4485,13 +4647,13 @@ const Struct_FieldsEntry = {
         return obj;
     },
     create(base) {
-        return Struct_FieldsEntry.fromPartial(base !== null && base !== undefined ? base : {});
+        return Struct_FieldsEntry.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseStruct_FieldsEntry();
-        message.key = (_a = object.key) !== null && _a !== undefined ? _a : "";
-        message.value = (_b = object.value) !== null && _b !== undefined ? _b : undefined;
+        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : "";
+        message.value = (_b = object.value) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
@@ -4611,17 +4773,17 @@ const Value = {
         return obj;
     },
     create(base) {
-        return Value.fromPartial(base !== null && base !== undefined ? base : {});
+        return Value.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b, _c, _d, _e, _f;
         const message = createBaseValue();
-        message.nullValue = (_a = object.nullValue) !== null && _a !== undefined ? _a : undefined;
-        message.numberValue = (_b = object.numberValue) !== null && _b !== undefined ? _b : undefined;
-        message.stringValue = (_c = object.stringValue) !== null && _c !== undefined ? _c : undefined;
-        message.boolValue = (_d = object.boolValue) !== null && _d !== undefined ? _d : undefined;
-        message.structValue = (_e = object.structValue) !== null && _e !== undefined ? _e : undefined;
-        message.listValue = (_f = object.listValue) !== null && _f !== undefined ? _f : undefined;
+        message.nullValue = (_a = object.nullValue) !== null && _a !== void 0 ? _a : undefined;
+        message.numberValue = (_b = object.numberValue) !== null && _b !== void 0 ? _b : undefined;
+        message.stringValue = (_c = object.stringValue) !== null && _c !== void 0 ? _c : undefined;
+        message.boolValue = (_d = object.boolValue) !== null && _d !== void 0 ? _d : undefined;
+        message.structValue = (_e = object.structValue) !== null && _e !== void 0 ? _e : undefined;
+        message.listValue = (_f = object.listValue) !== null && _f !== void 0 ? _f : undefined;
         return message;
     },
     wrap(value) {
@@ -4653,19 +4815,19 @@ const Value = {
         if (message.stringValue !== undefined) {
             return message.stringValue;
         }
-        else if ((message === null || message === undefined ? undefined : message.numberValue) !== undefined) {
+        else if ((message === null || message === void 0 ? void 0 : message.numberValue) !== undefined) {
             return message.numberValue;
         }
-        else if ((message === null || message === undefined ? undefined : message.boolValue) !== undefined) {
+        else if ((message === null || message === void 0 ? void 0 : message.boolValue) !== undefined) {
             return message.boolValue;
         }
-        else if ((message === null || message === undefined ? undefined : message.structValue) !== undefined) {
+        else if ((message === null || message === void 0 ? void 0 : message.structValue) !== undefined) {
             return message.structValue;
         }
-        else if ((message === null || message === undefined ? undefined : message.listValue) !== undefined) {
+        else if ((message === null || message === void 0 ? void 0 : message.listValue) !== undefined) {
             return message.listValue;
         }
-        else if ((message === null || message === undefined ? undefined : message.nullValue) !== undefined) {
+        else if ((message === null || message === void 0 ? void 0 : message.nullValue) !== undefined) {
             return null;
         }
         return undefined;
@@ -4703,32 +4865,32 @@ const ListValue = {
         return message;
     },
     fromJSON(object) {
-        return { values: Array.isArray(object === null || object === undefined ? undefined : object.values) ? [...object.values] : [] };
+        return { values: Array.isArray(object === null || object === void 0 ? void 0 : object.values) ? [...object.values] : [] };
     },
     toJSON(message) {
         var _a;
         const obj = {};
-        if ((_a = message.values) === null || _a === undefined ? undefined : _a.length) {
+        if ((_a = message.values) === null || _a === void 0 ? void 0 : _a.length) {
             obj.values = message.values;
         }
         return obj;
     },
     create(base) {
-        return ListValue.fromPartial(base !== null && base !== undefined ? base : {});
+        return ListValue.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a;
         const message = createBaseListValue();
-        message.values = ((_a = object.values) === null || _a === undefined ? undefined : _a.map((e) => e)) || [];
+        message.values = ((_a = object.values) === null || _a === void 0 ? void 0 : _a.map((e) => e)) || [];
         return message;
     },
     wrap(array) {
         const result = createBaseListValue();
-        result.values = array !== null && array !== undefined ? array : [];
+        result.values = array !== null && array !== void 0 ? array : [];
         return result;
     },
     unwrap(message) {
-        if ((message === null || message === undefined ? undefined : message.hasOwnProperty("values")) && Array.isArray(message.values)) {
+        if ((message === null || message === void 0 ? void 0 : message.hasOwnProperty("values")) && Array.isArray(message.values)) {
             return message.values;
         }
         else {
@@ -4744,357 +4906,6 @@ function isSet$2(value) {
 }
 
 /* eslint-disable */
-function createBaseResolveAllRequest() {
-    return { context: undefined };
-}
-const ResolveAllRequest = {
-    encode(message, writer = _m0.Writer.create()) {
-        if (message.context !== undefined) {
-            Struct.encode(Struct.wrap(message.context), writer.uint32(10).fork()).ldelim();
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseResolveAllRequest();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    if (tag !== 10) {
-                        break;
-                    }
-                    message.context = Struct.unwrap(Struct.decode(reader, reader.uint32()));
-                    continue;
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skipType(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return { context: isObject$1(object.context) ? object.context : undefined };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.context !== undefined) {
-            obj.context = message.context;
-        }
-        return obj;
-    },
-    create(base) {
-        return ResolveAllRequest.fromPartial(base !== null && base !== undefined ? base : {});
-    },
-    fromPartial(object) {
-        var _a;
-        const message = createBaseResolveAllRequest();
-        message.context = (_a = object.context) !== null && _a !== undefined ? _a : undefined;
-        return message;
-    },
-};
-function createBaseResolveAllResponse() {
-    return { flags: {}, metadata: undefined };
-}
-const ResolveAllResponse = {
-    encode(message, writer = _m0.Writer.create()) {
-        Object.entries(message.flags).forEach(([key, value]) => {
-            ResolveAllResponse_FlagsEntry.encode({ key: key, value }, writer.uint32(10).fork()).ldelim();
-        });
-        if (message.metadata !== undefined) {
-            Struct.encode(Struct.wrap(message.metadata), writer.uint32(18).fork()).ldelim();
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseResolveAllResponse();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    if (tag !== 10) {
-                        break;
-                    }
-                    const entry1 = ResolveAllResponse_FlagsEntry.decode(reader, reader.uint32());
-                    if (entry1.value !== undefined) {
-                        message.flags[entry1.key] = entry1.value;
-                    }
-                    continue;
-                case 2:
-                    if (tag !== 18) {
-                        break;
-                    }
-                    message.metadata = Struct.unwrap(Struct.decode(reader, reader.uint32()));
-                    continue;
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skipType(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            flags: isObject$1(object.flags)
-                ? Object.entries(object.flags).reduce((acc, [key, value]) => {
-                    acc[key] = AnyFlag.fromJSON(value);
-                    return acc;
-                }, {})
-                : {},
-            metadata: isObject$1(object.metadata) ? object.metadata : undefined,
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.flags) {
-            const entries = Object.entries(message.flags);
-            if (entries.length > 0) {
-                obj.flags = {};
-                entries.forEach(([k, v]) => {
-                    obj.flags[k] = AnyFlag.toJSON(v);
-                });
-            }
-        }
-        if (message.metadata !== undefined) {
-            obj.metadata = message.metadata;
-        }
-        return obj;
-    },
-    create(base) {
-        return ResolveAllResponse.fromPartial(base !== null && base !== undefined ? base : {});
-    },
-    fromPartial(object) {
-        var _a, _b;
-        const message = createBaseResolveAllResponse();
-        message.flags = Object.entries((_a = object.flags) !== null && _a !== undefined ? _a : {}).reduce((acc, [key, value]) => {
-            if (value !== undefined) {
-                acc[key] = AnyFlag.fromPartial(value);
-            }
-            return acc;
-        }, {});
-        message.metadata = (_b = object.metadata) !== null && _b !== undefined ? _b : undefined;
-        return message;
-    },
-};
-function createBaseResolveAllResponse_FlagsEntry() {
-    return { key: "", value: undefined };
-}
-const ResolveAllResponse_FlagsEntry = {
-    encode(message, writer = _m0.Writer.create()) {
-        if (message.key !== "") {
-            writer.uint32(10).string(message.key);
-        }
-        if (message.value !== undefined) {
-            AnyFlag.encode(message.value, writer.uint32(18).fork()).ldelim();
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseResolveAllResponse_FlagsEntry();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    if (tag !== 10) {
-                        break;
-                    }
-                    message.key = reader.string();
-                    continue;
-                case 2:
-                    if (tag !== 18) {
-                        break;
-                    }
-                    message.value = AnyFlag.decode(reader, reader.uint32());
-                    continue;
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skipType(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            key: isSet$1(object.key) ? String(object.key) : "",
-            value: isSet$1(object.value) ? AnyFlag.fromJSON(object.value) : undefined,
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.key !== "") {
-            obj.key = message.key;
-        }
-        if (message.value !== undefined) {
-            obj.value = AnyFlag.toJSON(message.value);
-        }
-        return obj;
-    },
-    create(base) {
-        return ResolveAllResponse_FlagsEntry.fromPartial(base !== null && base !== undefined ? base : {});
-    },
-    fromPartial(object) {
-        var _a;
-        const message = createBaseResolveAllResponse_FlagsEntry();
-        message.key = (_a = object.key) !== null && _a !== undefined ? _a : "";
-        message.value = (object.value !== undefined && object.value !== null)
-            ? AnyFlag.fromPartial(object.value)
-            : undefined;
-        return message;
-    },
-};
-function createBaseAnyFlag() {
-    return {
-        reason: "",
-        variant: "",
-        boolValue: undefined,
-        stringValue: undefined,
-        doubleValue: undefined,
-        objectValue: undefined,
-        metadata: undefined,
-    };
-}
-const AnyFlag = {
-    encode(message, writer = _m0.Writer.create()) {
-        if (message.reason !== "") {
-            writer.uint32(10).string(message.reason);
-        }
-        if (message.variant !== "") {
-            writer.uint32(18).string(message.variant);
-        }
-        if (message.boolValue !== undefined) {
-            writer.uint32(24).bool(message.boolValue);
-        }
-        if (message.stringValue !== undefined) {
-            writer.uint32(34).string(message.stringValue);
-        }
-        if (message.doubleValue !== undefined) {
-            writer.uint32(41).double(message.doubleValue);
-        }
-        if (message.objectValue !== undefined) {
-            Struct.encode(Struct.wrap(message.objectValue), writer.uint32(50).fork()).ldelim();
-        }
-        if (message.metadata !== undefined) {
-            Struct.encode(Struct.wrap(message.metadata), writer.uint32(58).fork()).ldelim();
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseAnyFlag();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    if (tag !== 10) {
-                        break;
-                    }
-                    message.reason = reader.string();
-                    continue;
-                case 2:
-                    if (tag !== 18) {
-                        break;
-                    }
-                    message.variant = reader.string();
-                    continue;
-                case 3:
-                    if (tag !== 24) {
-                        break;
-                    }
-                    message.boolValue = reader.bool();
-                    continue;
-                case 4:
-                    if (tag !== 34) {
-                        break;
-                    }
-                    message.stringValue = reader.string();
-                    continue;
-                case 5:
-                    if (tag !== 41) {
-                        break;
-                    }
-                    message.doubleValue = reader.double();
-                    continue;
-                case 6:
-                    if (tag !== 50) {
-                        break;
-                    }
-                    message.objectValue = Struct.unwrap(Struct.decode(reader, reader.uint32()));
-                    continue;
-                case 7:
-                    if (tag !== 58) {
-                        break;
-                    }
-                    message.metadata = Struct.unwrap(Struct.decode(reader, reader.uint32()));
-                    continue;
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skipType(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return {
-            reason: isSet$1(object.reason) ? String(object.reason) : "",
-            variant: isSet$1(object.variant) ? String(object.variant) : "",
-            boolValue: isSet$1(object.boolValue) ? Boolean(object.boolValue) : undefined,
-            stringValue: isSet$1(object.stringValue) ? String(object.stringValue) : undefined,
-            doubleValue: isSet$1(object.doubleValue) ? Number(object.doubleValue) : undefined,
-            objectValue: isObject$1(object.objectValue) ? object.objectValue : undefined,
-            metadata: isObject$1(object.metadata) ? object.metadata : undefined,
-        };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.reason !== "") {
-            obj.reason = message.reason;
-        }
-        if (message.variant !== "") {
-            obj.variant = message.variant;
-        }
-        if (message.boolValue !== undefined) {
-            obj.boolValue = message.boolValue;
-        }
-        if (message.stringValue !== undefined) {
-            obj.stringValue = message.stringValue;
-        }
-        if (message.doubleValue !== undefined) {
-            obj.doubleValue = message.doubleValue;
-        }
-        if (message.objectValue !== undefined) {
-            obj.objectValue = message.objectValue;
-        }
-        if (message.metadata !== undefined) {
-            obj.metadata = message.metadata;
-        }
-        return obj;
-    },
-    create(base) {
-        return AnyFlag.fromPartial(base !== null && base !== undefined ? base : {});
-    },
-    fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const message = createBaseAnyFlag();
-        message.reason = (_a = object.reason) !== null && _a !== undefined ? _a : "";
-        message.variant = (_b = object.variant) !== null && _b !== undefined ? _b : "";
-        message.boolValue = (_c = object.boolValue) !== null && _c !== undefined ? _c : undefined;
-        message.stringValue = (_d = object.stringValue) !== null && _d !== undefined ? _d : undefined;
-        message.doubleValue = (_e = object.doubleValue) !== null && _e !== undefined ? _e : undefined;
-        message.objectValue = (_f = object.objectValue) !== null && _f !== undefined ? _f : undefined;
-        message.metadata = (_g = object.metadata) !== null && _g !== undefined ? _g : undefined;
-        return message;
-    },
-};
 function createBaseResolveBooleanRequest() {
     return { flagKey: "", context: undefined };
 }
@@ -5152,28 +4963,28 @@ const ResolveBooleanRequest = {
         return obj;
     },
     create(base) {
-        return ResolveBooleanRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveBooleanRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseResolveBooleanRequest();
-        message.flagKey = (_a = object.flagKey) !== null && _a !== undefined ? _a : "";
-        message.context = (_b = object.context) !== null && _b !== undefined ? _b : undefined;
+        message.flagKey = (_a = object.flagKey) !== null && _a !== void 0 ? _a : "";
+        message.context = (_b = object.context) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
 function createBaseResolveBooleanResponse() {
-    return { value: false, reason: "", variant: "", metadata: undefined };
+    return { value: undefined, reason: "", variant: undefined, metadata: undefined };
 }
 const ResolveBooleanResponse = {
     encode(message, writer = _m0.Writer.create()) {
-        if (message.value === true) {
+        if (message.value !== undefined) {
             writer.uint32(8).bool(message.value);
         }
         if (message.reason !== "") {
             writer.uint32(18).string(message.reason);
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             writer.uint32(26).string(message.variant);
         }
         if (message.metadata !== undefined) {
@@ -5222,21 +5033,21 @@ const ResolveBooleanResponse = {
     },
     fromJSON(object) {
         return {
-            value: isSet$1(object.value) ? Boolean(object.value) : false,
+            value: isSet$1(object.value) ? Boolean(object.value) : undefined,
             reason: isSet$1(object.reason) ? String(object.reason) : "",
-            variant: isSet$1(object.variant) ? String(object.variant) : "",
+            variant: isSet$1(object.variant) ? String(object.variant) : undefined,
             metadata: isObject$1(object.metadata) ? object.metadata : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.value === true) {
+        if (message.value !== undefined) {
             obj.value = message.value;
         }
         if (message.reason !== "") {
             obj.reason = message.reason;
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             obj.variant = message.variant;
         }
         if (message.metadata !== undefined) {
@@ -5245,15 +5056,15 @@ const ResolveBooleanResponse = {
         return obj;
     },
     create(base) {
-        return ResolveBooleanResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveBooleanResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b, _c, _d;
         const message = createBaseResolveBooleanResponse();
-        message.value = (_a = object.value) !== null && _a !== undefined ? _a : false;
-        message.reason = (_b = object.reason) !== null && _b !== undefined ? _b : "";
-        message.variant = (_c = object.variant) !== null && _c !== undefined ? _c : "";
-        message.metadata = (_d = object.metadata) !== null && _d !== undefined ? _d : undefined;
+        message.value = (_a = object.value) !== null && _a !== void 0 ? _a : undefined;
+        message.reason = (_b = object.reason) !== null && _b !== void 0 ? _b : "";
+        message.variant = (_c = object.variant) !== null && _c !== void 0 ? _c : undefined;
+        message.metadata = (_d = object.metadata) !== null && _d !== void 0 ? _d : undefined;
         return message;
     },
 };
@@ -5314,28 +5125,28 @@ const ResolveStringRequest = {
         return obj;
     },
     create(base) {
-        return ResolveStringRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveStringRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseResolveStringRequest();
-        message.flagKey = (_a = object.flagKey) !== null && _a !== undefined ? _a : "";
-        message.context = (_b = object.context) !== null && _b !== undefined ? _b : undefined;
+        message.flagKey = (_a = object.flagKey) !== null && _a !== void 0 ? _a : "";
+        message.context = (_b = object.context) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
 function createBaseResolveStringResponse() {
-    return { value: "", reason: "", variant: "", metadata: undefined };
+    return { value: undefined, reason: "", variant: undefined, metadata: undefined };
 }
 const ResolveStringResponse = {
     encode(message, writer = _m0.Writer.create()) {
-        if (message.value !== "") {
+        if (message.value !== undefined) {
             writer.uint32(10).string(message.value);
         }
         if (message.reason !== "") {
             writer.uint32(18).string(message.reason);
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             writer.uint32(26).string(message.variant);
         }
         if (message.metadata !== undefined) {
@@ -5384,21 +5195,21 @@ const ResolveStringResponse = {
     },
     fromJSON(object) {
         return {
-            value: isSet$1(object.value) ? String(object.value) : "",
+            value: isSet$1(object.value) ? String(object.value) : undefined,
             reason: isSet$1(object.reason) ? String(object.reason) : "",
-            variant: isSet$1(object.variant) ? String(object.variant) : "",
+            variant: isSet$1(object.variant) ? String(object.variant) : undefined,
             metadata: isObject$1(object.metadata) ? object.metadata : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.value !== "") {
+        if (message.value !== undefined) {
             obj.value = message.value;
         }
         if (message.reason !== "") {
             obj.reason = message.reason;
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             obj.variant = message.variant;
         }
         if (message.metadata !== undefined) {
@@ -5407,15 +5218,15 @@ const ResolveStringResponse = {
         return obj;
     },
     create(base) {
-        return ResolveStringResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveStringResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b, _c, _d;
         const message = createBaseResolveStringResponse();
-        message.value = (_a = object.value) !== null && _a !== undefined ? _a : "";
-        message.reason = (_b = object.reason) !== null && _b !== undefined ? _b : "";
-        message.variant = (_c = object.variant) !== null && _c !== undefined ? _c : "";
-        message.metadata = (_d = object.metadata) !== null && _d !== undefined ? _d : undefined;
+        message.value = (_a = object.value) !== null && _a !== void 0 ? _a : undefined;
+        message.reason = (_b = object.reason) !== null && _b !== void 0 ? _b : "";
+        message.variant = (_c = object.variant) !== null && _c !== void 0 ? _c : undefined;
+        message.metadata = (_d = object.metadata) !== null && _d !== void 0 ? _d : undefined;
         return message;
     },
 };
@@ -5476,28 +5287,28 @@ const ResolveFloatRequest = {
         return obj;
     },
     create(base) {
-        return ResolveFloatRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveFloatRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseResolveFloatRequest();
-        message.flagKey = (_a = object.flagKey) !== null && _a !== undefined ? _a : "";
-        message.context = (_b = object.context) !== null && _b !== undefined ? _b : undefined;
+        message.flagKey = (_a = object.flagKey) !== null && _a !== void 0 ? _a : "";
+        message.context = (_b = object.context) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
 function createBaseResolveFloatResponse() {
-    return { value: 0, reason: "", variant: "", metadata: undefined };
+    return { value: undefined, reason: "", variant: undefined, metadata: undefined };
 }
 const ResolveFloatResponse = {
     encode(message, writer = _m0.Writer.create()) {
-        if (message.value !== 0) {
+        if (message.value !== undefined) {
             writer.uint32(9).double(message.value);
         }
         if (message.reason !== "") {
             writer.uint32(18).string(message.reason);
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             writer.uint32(26).string(message.variant);
         }
         if (message.metadata !== undefined) {
@@ -5546,21 +5357,21 @@ const ResolveFloatResponse = {
     },
     fromJSON(object) {
         return {
-            value: isSet$1(object.value) ? Number(object.value) : 0,
+            value: isSet$1(object.value) ? Number(object.value) : undefined,
             reason: isSet$1(object.reason) ? String(object.reason) : "",
-            variant: isSet$1(object.variant) ? String(object.variant) : "",
+            variant: isSet$1(object.variant) ? String(object.variant) : undefined,
             metadata: isObject$1(object.metadata) ? object.metadata : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.value !== 0) {
+        if (message.value !== undefined) {
             obj.value = message.value;
         }
         if (message.reason !== "") {
             obj.reason = message.reason;
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             obj.variant = message.variant;
         }
         if (message.metadata !== undefined) {
@@ -5569,15 +5380,15 @@ const ResolveFloatResponse = {
         return obj;
     },
     create(base) {
-        return ResolveFloatResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveFloatResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b, _c, _d;
         const message = createBaseResolveFloatResponse();
-        message.value = (_a = object.value) !== null && _a !== undefined ? _a : 0;
-        message.reason = (_b = object.reason) !== null && _b !== undefined ? _b : "";
-        message.variant = (_c = object.variant) !== null && _c !== undefined ? _c : "";
-        message.metadata = (_d = object.metadata) !== null && _d !== undefined ? _d : undefined;
+        message.value = (_a = object.value) !== null && _a !== void 0 ? _a : undefined;
+        message.reason = (_b = object.reason) !== null && _b !== void 0 ? _b : "";
+        message.variant = (_c = object.variant) !== null && _c !== void 0 ? _c : undefined;
+        message.metadata = (_d = object.metadata) !== null && _d !== void 0 ? _d : undefined;
         return message;
     },
 };
@@ -5638,28 +5449,28 @@ const ResolveIntRequest = {
         return obj;
     },
     create(base) {
-        return ResolveIntRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveIntRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseResolveIntRequest();
-        message.flagKey = (_a = object.flagKey) !== null && _a !== undefined ? _a : "";
-        message.context = (_b = object.context) !== null && _b !== undefined ? _b : undefined;
+        message.flagKey = (_a = object.flagKey) !== null && _a !== void 0 ? _a : "";
+        message.context = (_b = object.context) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
 function createBaseResolveIntResponse() {
-    return { value: "0", reason: "", variant: "", metadata: undefined };
+    return { value: undefined, reason: "", variant: undefined, metadata: undefined };
 }
 const ResolveIntResponse = {
     encode(message, writer = _m0.Writer.create()) {
-        if (message.value !== "0") {
+        if (message.value !== undefined) {
             writer.uint32(8).int64(message.value);
         }
         if (message.reason !== "") {
             writer.uint32(18).string(message.reason);
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             writer.uint32(26).string(message.variant);
         }
         if (message.metadata !== undefined) {
@@ -5708,21 +5519,21 @@ const ResolveIntResponse = {
     },
     fromJSON(object) {
         return {
-            value: isSet$1(object.value) ? String(object.value) : "0",
+            value: isSet$1(object.value) ? String(object.value) : undefined,
             reason: isSet$1(object.reason) ? String(object.reason) : "",
-            variant: isSet$1(object.variant) ? String(object.variant) : "",
+            variant: isSet$1(object.variant) ? String(object.variant) : undefined,
             metadata: isObject$1(object.metadata) ? object.metadata : undefined,
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.value !== "0") {
+        if (message.value !== undefined) {
             obj.value = message.value;
         }
         if (message.reason !== "") {
             obj.reason = message.reason;
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             obj.variant = message.variant;
         }
         if (message.metadata !== undefined) {
@@ -5731,15 +5542,15 @@ const ResolveIntResponse = {
         return obj;
     },
     create(base) {
-        return ResolveIntResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveIntResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b, _c, _d;
         const message = createBaseResolveIntResponse();
-        message.value = (_a = object.value) !== null && _a !== undefined ? _a : "0";
-        message.reason = (_b = object.reason) !== null && _b !== undefined ? _b : "";
-        message.variant = (_c = object.variant) !== null && _c !== undefined ? _c : "";
-        message.metadata = (_d = object.metadata) !== null && _d !== undefined ? _d : undefined;
+        message.value = (_a = object.value) !== null && _a !== void 0 ? _a : undefined;
+        message.reason = (_b = object.reason) !== null && _b !== void 0 ? _b : "";
+        message.variant = (_c = object.variant) !== null && _c !== void 0 ? _c : undefined;
+        message.metadata = (_d = object.metadata) !== null && _d !== void 0 ? _d : undefined;
         return message;
     },
 };
@@ -5800,18 +5611,18 @@ const ResolveObjectRequest = {
         return obj;
     },
     create(base) {
-        return ResolveObjectRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveObjectRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseResolveObjectRequest();
-        message.flagKey = (_a = object.flagKey) !== null && _a !== undefined ? _a : "";
-        message.context = (_b = object.context) !== null && _b !== undefined ? _b : undefined;
+        message.flagKey = (_a = object.flagKey) !== null && _a !== void 0 ? _a : "";
+        message.context = (_b = object.context) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
 function createBaseResolveObjectResponse() {
-    return { value: undefined, reason: "", variant: "", metadata: undefined };
+    return { value: undefined, reason: "", variant: undefined, metadata: undefined };
 }
 const ResolveObjectResponse = {
     encode(message, writer = _m0.Writer.create()) {
@@ -5821,7 +5632,7 @@ const ResolveObjectResponse = {
         if (message.reason !== "") {
             writer.uint32(18).string(message.reason);
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             writer.uint32(26).string(message.variant);
         }
         if (message.metadata !== undefined) {
@@ -5872,7 +5683,7 @@ const ResolveObjectResponse = {
         return {
             value: isObject$1(object.value) ? object.value : undefined,
             reason: isSet$1(object.reason) ? String(object.reason) : "",
-            variant: isSet$1(object.variant) ? String(object.variant) : "",
+            variant: isSet$1(object.variant) ? String(object.variant) : undefined,
             metadata: isObject$1(object.metadata) ? object.metadata : undefined,
         };
     },
@@ -5884,7 +5695,7 @@ const ResolveObjectResponse = {
         if (message.reason !== "") {
             obj.reason = message.reason;
         }
-        if (message.variant !== "") {
+        if (message.variant !== undefined) {
             obj.variant = message.variant;
         }
         if (message.metadata !== undefined) {
@@ -5893,15 +5704,15 @@ const ResolveObjectResponse = {
         return obj;
     },
     create(base) {
-        return ResolveObjectResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return ResolveObjectResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b, _c, _d;
         const message = createBaseResolveObjectResponse();
-        message.value = (_a = object.value) !== null && _a !== undefined ? _a : undefined;
-        message.reason = (_b = object.reason) !== null && _b !== undefined ? _b : "";
-        message.variant = (_c = object.variant) !== null && _c !== undefined ? _c : "";
-        message.metadata = (_d = object.metadata) !== null && _d !== undefined ? _d : undefined;
+        message.value = (_a = object.value) !== null && _a !== void 0 ? _a : undefined;
+        message.reason = (_b = object.reason) !== null && _b !== void 0 ? _b : "";
+        message.variant = (_c = object.variant) !== null && _c !== void 0 ? _c : undefined;
+        message.metadata = (_d = object.metadata) !== null && _d !== void 0 ? _d : undefined;
         return message;
     },
 };
@@ -5962,13 +5773,13 @@ const EventStreamResponse = {
         return obj;
     },
     create(base) {
-        return EventStreamResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return EventStreamResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseEventStreamResponse();
-        message.type = (_a = object.type) !== null && _a !== undefined ? _a : "";
-        message.data = (_b = object.data) !== null && _b !== undefined ? _b : undefined;
+        message.type = (_a = object.type) !== null && _a !== void 0 ? _a : "";
+        message.data = (_b = object.data) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
@@ -6000,7 +5811,7 @@ const EventStreamRequest = {
         return obj;
     },
     create(base) {
-        return EventStreamRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return EventStreamRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(_) {
         const message = createBaseEventStreamRequest();
@@ -6008,17 +5819,8 @@ const EventStreamRequest = {
     },
 };
 const ServiceService = {
-    resolveAll: {
-        path: "/flagd.evaluation.v1.Service/ResolveAll",
-        requestStream: false,
-        responseStream: false,
-        requestSerialize: (value) => Buffer.from(ResolveAllRequest.encode(value).finish()),
-        requestDeserialize: (value) => ResolveAllRequest.decode(value),
-        responseSerialize: (value) => Buffer.from(ResolveAllResponse.encode(value).finish()),
-        responseDeserialize: (value) => ResolveAllResponse.decode(value),
-    },
     resolveBoolean: {
-        path: "/flagd.evaluation.v1.Service/ResolveBoolean",
+        path: "/flagd.evaluation.v2.Service/ResolveBoolean",
         requestStream: false,
         responseStream: false,
         requestSerialize: (value) => Buffer.from(ResolveBooleanRequest.encode(value).finish()),
@@ -6027,7 +5829,7 @@ const ServiceService = {
         responseDeserialize: (value) => ResolveBooleanResponse.decode(value),
     },
     resolveString: {
-        path: "/flagd.evaluation.v1.Service/ResolveString",
+        path: "/flagd.evaluation.v2.Service/ResolveString",
         requestStream: false,
         responseStream: false,
         requestSerialize: (value) => Buffer.from(ResolveStringRequest.encode(value).finish()),
@@ -6036,7 +5838,7 @@ const ServiceService = {
         responseDeserialize: (value) => ResolveStringResponse.decode(value),
     },
     resolveFloat: {
-        path: "/flagd.evaluation.v1.Service/ResolveFloat",
+        path: "/flagd.evaluation.v2.Service/ResolveFloat",
         requestStream: false,
         responseStream: false,
         requestSerialize: (value) => Buffer.from(ResolveFloatRequest.encode(value).finish()),
@@ -6045,7 +5847,7 @@ const ServiceService = {
         responseDeserialize: (value) => ResolveFloatResponse.decode(value),
     },
     resolveInt: {
-        path: "/flagd.evaluation.v1.Service/ResolveInt",
+        path: "/flagd.evaluation.v2.Service/ResolveInt",
         requestStream: false,
         responseStream: false,
         requestSerialize: (value) => Buffer.from(ResolveIntRequest.encode(value).finish()),
@@ -6054,7 +5856,7 @@ const ServiceService = {
         responseDeserialize: (value) => ResolveIntResponse.decode(value),
     },
     resolveObject: {
-        path: "/flagd.evaluation.v1.Service/ResolveObject",
+        path: "/flagd.evaluation.v2.Service/ResolveObject",
         requestStream: false,
         responseStream: false,
         requestSerialize: (value) => Buffer.from(ResolveObjectRequest.encode(value).finish()),
@@ -6063,7 +5865,7 @@ const ServiceService = {
         responseDeserialize: (value) => ResolveObjectResponse.decode(value),
     },
     eventStream: {
-        path: "/flagd.evaluation.v1.Service/EventStream",
+        path: "/flagd.evaluation.v2.Service/EventStream",
         requestStream: false,
         responseStream: true,
         requestSerialize: (value) => Buffer.from(EventStreamRequest.encode(value).finish()),
@@ -6072,7 +5874,7 @@ const ServiceService = {
         responseDeserialize: (value) => EventStreamResponse.decode(value),
     },
 };
-const ServiceClient = grpcJs.makeGenericClientConstructor(ServiceService, "flagd.evaluation.v1.Service");
+const ServiceClient = grpcJs.makeGenericClientConstructor(ServiceService, "flagd.evaluation.v2.Service");
 function longToString(long) {
     return long.toString();
 }
@@ -6087,6 +5889,10 @@ function isSet$1(value) {
     return value !== null && value !== undefined;
 }
 
+/**
+ * Get the string name of a gRPC status code.
+ */
+const statusName = (code) => grpcJs.status[code];
 const closeStreamIfDefined = (stream) => {
     /**
      * cancel() is necessary to prevent calls from hanging the process, so we need to we need to remove all the
@@ -6101,6 +5907,122 @@ const closeStreamIfDefined = (stream) => {
         stream.destroy();
     }
 };
+/**
+ * Creates gRPC channel credentials based on TLS and certificate path configuration.
+ * @returns Channel credentials for gRPC connection
+ */
+const createChannelCredentials = (tls, certPath) => {
+    if (!tls) {
+        return grpcJs.credentials.createInsecure();
+    }
+    if (certPath && node_fs.existsSync(certPath)) {
+        const rootCerts = node_fs.readFileSync(certPath);
+        return grpcJs.credentials.createSsl(rootCerts);
+    }
+    return grpcJs.credentials.createSsl();
+};
+/**
+ * Mapping of configuration options to gRPC client options.
+ */
+const CONFIG_TO_GRPC_OPTIONS = [
+    { configKey: 'defaultAuthority', grpcKey: 'grpc.default_authority' },
+    { configKey: 'keepAliveTime', grpcKey: 'grpc.keepalive_time_ms', condition: (time) => Number(time) > 0 },
+];
+/**
+ * Builds gRPC client options from config.
+ */
+function buildClientOptions(config) {
+    const options = {
+        'grpc.service_config': buildRetryPolicy(['flagd.evaluation.v1.Service', 'flagd.evaluation.v2.Service', 'flagd.sync.v1.FlagSyncService'], config.retryBackoffMs, config.retryBackoffMaxMs),
+    };
+    for (const { configKey, grpcKey, condition } of CONFIG_TO_GRPC_OPTIONS) {
+        const value = config[configKey];
+        if (value !== undefined && (!condition || condition(value))) {
+            options[grpcKey] = value;
+        }
+    }
+    return options;
+}
+/**
+ * Builds RetryPolicy for gRPC client options.
+ * @param serviceNames Array of service names to configure retry policy for
+ * @param retryBackoffMs Initial backoff duration in milliseconds
+ * @param retryBackoffMaxMs Maximum backoff duration in milliseconds
+ * @returns gRPC client options with retry policy
+ */
+const buildRetryPolicy = (serviceNames, retryBackoffMs, retryBackoffMaxMs) => {
+    const initialBackoff = retryBackoffMs !== null && retryBackoffMs !== void 0 ? retryBackoffMs : 1000;
+    const maxBackoff = retryBackoffMaxMs !== null && retryBackoffMaxMs !== void 0 ? retryBackoffMaxMs : 120000;
+    const retryPolicy = {
+        maxAttempts: 3,
+        initialBackoff: `${Math.round(initialBackoff / 1000).toFixed(2)}s`,
+        maxBackoff: `${Math.round(maxBackoff / 1000).toFixed(2)}s`,
+        backoffMultiplier: 2,
+        retryableStatusCodes: [statusName(grpcJs.status.UNAVAILABLE), statusName(grpcJs.status.UNKNOWN)],
+    };
+    return JSON.stringify({
+        loadBalancingConfig: [],
+        methodConfig: [
+            {
+                name: serviceNames.map((serviceName) => ({ service: serviceName })),
+                retryPolicy,
+            },
+        ],
+    });
+};
+/**
+ * Converts an array of gRPC status code strings to a Set of numeric codes.
+ * @param fatalStatusCodes Array of status code strings.
+ * @param logger Optional logger for warning about unknown codes
+ * @returns Set of numeric status codes
+ */
+const createFatalStatusCodesSet = (fatalStatusCodes, logger) => {
+    if (!(fatalStatusCodes === null || fatalStatusCodes === void 0 ? void 0 : fatalStatusCodes.length)) {
+        return new Set();
+    }
+    return fatalStatusCodes.reduce((codes, codeStr) => {
+        const numericCode = grpcJs.status[codeStr];
+        if (typeof numericCode === 'number') {
+            codes.add(numericCode);
+        }
+        else {
+            logger === null || logger === void 0 ? void 0 : logger.warn(`Unknown gRPC status code: "${codeStr}"`);
+        }
+        return codes;
+    }, new Set());
+};
+/**
+ * Checks if an error is a fatal gRPC status code that should not be retried.
+ * This should only be checked on the first connection attempt.
+ *
+ * @param err The error to check
+ * @param initialized Whether the connection has been successfully initialized
+ * @param fatalStatusCodes Set of numeric status codes considered fatal
+ * @returns True if the error is fatal and should not be retried
+ */
+const isFatalStatusCodeError = (err, initialized, fatalStatusCodes) => {
+    if (initialized) {
+        return false;
+    }
+    const serviceError = err;
+    return (serviceError === null || serviceError === void 0 ? void 0 : serviceError.code) !== undefined && fatalStatusCodes.has(serviceError.code);
+};
+/**
+ * Handles a fatal gRPC status code error by logging it.
+ * Should only be called when isFatalStatusCodeError returns true.
+ *
+ * @param err The error to handle
+ * @param logger Optional logger for error logging
+ * @param disconnectCallback Callback to invoke with the error message
+ * @param rejectConnect Optional callback to reject the connection promise
+ */
+const handleFatalStatusCodeError = (err, logger, disconnectCallback, rejectConnect) => {
+    const serviceError = err;
+    logger === null || logger === void 0 ? void 0 : logger.error(`Encountered fatal status code ${serviceError.code} (${serviceError.message}) on first connection, will not retry`);
+    const errorMessage = `PROVIDER_FATAL: ${serviceError.message}`;
+    disconnectCallback(errorMessage);
+    rejectConnect === null || rejectConnect === void 0 ? void 0 : rejectConnect(new serverSdk.ProviderFatalError(serviceError.message));
+};
 
 class GRPCService {
     get _cacheActive() {
@@ -6111,9 +6033,11 @@ class GRPCService {
         this.logger = logger;
         this._cacheEnabled = false;
         this._eventStream = undefined;
+        this._initialized = false;
+        this._errorThrottled = false;
         this.onRejected = (err) => {
             // map the errors
-            switch (err === null || err === undefined ? undefined : err.code) {
+            switch (err === null || err === void 0 ? void 0 : err.code) {
                 case grpcJs.status.DATA_LOSS:
                     throw new serverSdk.ParseError(err.details);
                 case grpcJs.status.INVALID_ARGUMENT:
@@ -6123,95 +6047,128 @@ class GRPCService {
                 case grpcJs.status.UNAVAILABLE:
                     throw new serverSdk.FlagNotFoundError(err.details);
                 default:
-                    throw new serverSdk.GeneralError(err === null || err === undefined ? undefined : err.details);
+                    throw new serverSdk.GeneralError(err === null || err === void 0 ? void 0 : err.details);
             }
         };
-        const { host, port, tls, socketPath, defaultAuthority } = config;
-        let clientOptions;
-        if (defaultAuthority) {
-            clientOptions = {
-                'grpc.default_authority': defaultAuthority,
-            };
-        }
+        const { host, port, tls, socketPath, certPath } = config;
+        const clientOptions = buildClientOptions(config);
+        const channelCredentials = createChannelCredentials(tls, certPath);
+        this._maxBackoffMs = config.retryBackoffMaxMs || DEFAULT_MAX_BACKOFF_MS;
         this._client = client
             ? client
-            : new ServiceClient(socketPath ? `unix://${socketPath}` : `${host}:${port}`, tls ? grpcJs.credentials.createSsl() : grpcJs.credentials.createInsecure(), clientOptions);
+            : new ServiceClient(socketPath ? `unix://${socketPath}` : `${host}:${port}`, channelCredentials, clientOptions);
+        this._deadline = config.deadlineMs;
+        this._streamDeadline = config.streamDeadlineMs;
         if (config.cache === 'lru') {
             this._cacheEnabled = true;
             this._cache = new lruCache.LRUCache({ maxSize: config.maxCacheSize || DEFAULT_MAX_CACHE_SIZE, sizeCalculation: () => 1 });
         }
+        this._fatalStatusCodes = createFatalStatusCodesSet(config.fatalStatusCodes, logger);
+        // create metadata with the flagd-selector header if selector is configured
+        this._metadata = new grpcJs.Metadata();
+        if (config.selector) {
+            this._metadata.set(FLAGD_SELECTOR_HEADER, config.selector);
+        }
+    }
+    clearCache() {
+        var _a;
+        (_a = this._cache) === null || _a === void 0 ? void 0 : _a.clear();
     }
     connect(reconnectCallback, changedCallback, disconnectCallback) {
         return new Promise((resolve, reject) => this.listen(reconnectCallback, changedCallback, disconnectCallback, resolve, reject));
     }
     disconnect() {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             closeStreamIfDefined(this._eventStream);
             this._client.close();
         });
     }
-    resolveBoolean(flagKey, _, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
-            return this.resolve(this._client.resolveBoolean, flagKey, context, logger);
+    resolveBoolean(flagKey, defaultValue, context, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.resolve(this._client.resolveBoolean, flagKey, defaultValue, context, logger);
         });
     }
-    resolveString(flagKey, _, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
-            return this.resolve(this._client.resolveString, flagKey, context, logger);
+    resolveString(flagKey, defaultValue, context, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.resolve(this._client.resolveString, flagKey, defaultValue, context, logger);
         });
     }
-    resolveNumber(flagKey, _, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
-            return this.resolve(this._client.resolveFloat, flagKey, context, logger);
+    resolveNumber(flagKey, defaultValue, context, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.resolve(this._client.resolveFloat, flagKey, defaultValue, context, logger);
         });
     }
-    resolveObject(flagKey, _, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
-            return this.resolve(this._client.resolveObject, flagKey, context, logger);
+    resolveObject(flagKey, defaultValue, context, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.resolve(this._client.resolveObject, flagKey, defaultValue, context, logger);
         });
     }
     listen(reconnectCallback, changedCallback, disconnectCallback, resolveConnect, rejectConnect) {
         var _a;
-        (_a = this.logger) === null || _a === undefined ? undefined : _a.debug(`${FlagdProvider.name}: connecting stream...`);
+        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`${FlagdProvider.name}: connecting stream...`);
         // close the previous stream if we're reconnecting
         closeStreamIfDefined(this._eventStream);
-        const stream = this._client.eventStream({}, {});
-        stream.on('error', (err) => {
-            rejectConnect === null || rejectConnect === undefined ? undefined : rejectConnect(err);
-            this.handleError(reconnectCallback, changedCallback, disconnectCallback);
-        });
-        stream.on('data', (message) => {
-            var _a;
-            if (message.type === EVENT_PROVIDER_READY) {
-                (_a = this.logger) === null || _a === undefined ? undefined : _a.debug(`${FlagdProvider.name}: streaming connection established with flagd`);
-                // if resolveConnect is undefined, this is a reconnection; we only want to fire the reconnect callback in that case
-                if (resolveConnect) {
-                    resolveConnect();
-                }
-                else {
-                    reconnectCallback();
+        // wait for connection to be stable
+        this._client.waitForReady(Date.now() + this._deadline, (err) => {
+            if (err) {
+                // Check if error is a fatal status code on first connection only
+                if (isFatalStatusCodeError(err, this._initialized, this._fatalStatusCodes)) {
+                    handleFatalStatusCodeError(err, this.logger, disconnectCallback, rejectConnect);
+                    return;
                 }
+                rejectConnect === null || rejectConnect === void 0 ? void 0 : rejectConnect(err);
+                this.handleError(reconnectCallback, changedCallback, disconnectCallback);
             }
-            else if (message.type === EVENT_CONFIGURATION_CHANGE) {
-                this.handleFlagsChanged(message, changedCallback);
+            else {
+                const streamDeadline = this._streamDeadline != 0 ? Date.now() + this._streamDeadline : undefined;
+                const stream = this._client.eventStream({}, { deadline: streamDeadline });
+                stream.on('error', (err) => {
+                    // In cases where we get an explicit error status, we add a delay.
+                    // This prevents tight loops when errors are returned immediately, typically by intervening proxies like Envoy.
+                    this._errorThrottled = true;
+                    // Check if error is a fatal status code on first connection only
+                    if (isFatalStatusCodeError(err, this._initialized, this._fatalStatusCodes)) {
+                        handleFatalStatusCodeError(err, this.logger, disconnectCallback, rejectConnect);
+                        return;
+                    }
+                    rejectConnect === null || rejectConnect === void 0 ? void 0 : rejectConnect(err);
+                    this.handleError(reconnectCallback, changedCallback, disconnectCallback);
+                });
+                stream.on('data', (message) => {
+                    var _a;
+                    if (message.type === EVENT_PROVIDER_READY) {
+                        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`${FlagdProvider.name}: streaming connection established with flagd`);
+                        this._initialized = true;
+                        // if resolveConnect is undefined, this is a reconnection; we only want to fire the reconnect callback in that case
+                        if (resolveConnect) {
+                            resolveConnect();
+                        }
+                        else {
+                            reconnectCallback();
+                        }
+                    }
+                    else if (message.type === EVENT_CONFIGURATION_CHANGE) {
+                        this.handleFlagsChanged(message, changedCallback);
+                    }
+                });
+                this._eventStream = stream;
             }
         });
-        this._eventStream = stream;
     }
     handleFlagsChanged(message, changedCallback) {
         var _a;
         if (message.data) {
             const data = message.data;
-            (_a = this.logger) === null || _a === undefined ? undefined : _a.debug(`${FlagdProvider.name}: got message: ${JSON.stringify(data, undefined, 2)}`);
-            if (data && typeof data === 'object' && 'flags' in data && (data === null || data === undefined ? undefined : data['flags'])) {
+            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`${FlagdProvider.name}: got message: ${JSON.stringify(data, undefined, 2)}`);
+            if (data && typeof data === 'object' && 'flags' in data && (data === null || data === void 0 ? void 0 : data['flags'])) {
                 const flagChangeMessage = data;
                 const flagsChanged = Object.keys(flagChangeMessage.flags || []);
                 if (this._cacheEnabled) {
                     // remove each changed key from cache
                     flagsChanged.forEach((key) => {
                         var _a, _b;
-                        if ((_a = this._cache) === null || _a === undefined ? undefined : _a.delete(key)) {
-                            (_b = this.logger) === null || _b === undefined ? undefined : _b.debug(`${FlagdProvider.name}: evicted key: ${key} from cache.`);
+                        if ((_a = this._cache) === null || _a === void 0 ? void 0 : _a.delete(key)) {
+                            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`${FlagdProvider.name}: evicted key: ${key} from cache.`);
                         }
                     });
                 }
@@ -6220,34 +6177,38 @@ class GRPCService {
         }
     }
     reconnect(reconnectCallback, changedCallback, disconnectCallback) {
-        const channel = this._client.getChannel();
-        channel.watchConnectivityState(channel.getConnectivityState(true), Infinity, () => {
-            this.listen(reconnectCallback, changedCallback, disconnectCallback);
-        });
+        setTimeout(() => this.listen(reconnectCallback, changedCallback, disconnectCallback), this._errorThrottled ? this._maxBackoffMs : 0);
+        this._errorThrottled = false;
     }
     handleError(reconnectCallback, changedCallback, disconnectCallback) {
         var _a, _b;
         disconnectCallback('streaming connection error, will attempt reconnect...');
-        (_a = this.logger) === null || _a === undefined ? undefined : _a.error(`${FlagdProvider.name}: streaming connection error, will attempt reconnect...`);
-        (_b = this._cache) === null || _b === undefined ? undefined : _b.clear();
+        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error(`${FlagdProvider.name}: streaming connection error, will attempt reconnect...`);
+        (_b = this._cache) === null || _b === void 0 ? void 0 : _b.clear();
         this.reconnect(reconnectCallback, changedCallback, disconnectCallback);
     }
-    resolve(promise, flagKey, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
+    resolve(promise, flagKey, defaultValue, context, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const resolver = node_util.promisify(promise);
             if (this._cacheActive) {
-                const cached = (_a = this._cache) === null || _a === undefined ? undefined : _a.get(flagKey);
+                const cached = (_a = this._cache) === null || _a === void 0 ? void 0 : _a.get(flagKey);
                 if (cached) {
                     return Object.assign(Object.assign({}, cached), { reason: serverSdk.StandardResolutionReasons.CACHED });
                 }
             }
-            // invoke the passed resolver method
+            // invoke the passed resolver method with metadata for selector support
             const response = yield resolver
-                .call(this._client, { flagKey, context })
+                .call(this._client, { flagKey, context }, this._metadata)
                 .then((resolved) => resolved, this.onRejected);
+            let value = response.value;
+            // When no default variant is configured, the server returns an empty/zero proto
+            // value with reason=DEFAULT. In that case, return the caller's code default value.
+            if (response.reason === serverSdk.StandardResolutionReasons.DEFAULT && !response.variant) {
+                value = defaultValue;
+            }
             const resolved = {
-                value: response.value,
+                value,
                 reason: response.reason,
                 variant: response.variant,
                 flagMetadata: response.metadata,
@@ -6255,7 +6216,7 @@ class GRPCService {
             logger.debug(`${FlagdProvider.name}: resolved flag with key: ${resolved.value}, variant: ${response.variant}, reason: ${response.reason}`);
             if (this._cacheActive && response.reason === serverSdk.StandardResolutionReasons.STATIC) {
                 // cache this static value
-                (_b = this._cache) === null || _b === undefined ? undefined : _b.set(flagKey, resolved);
+                (_b = this._cache) === null || _b === void 0 ? void 0 : _b.set(flagKey, resolved);
             }
             return resolved;
         });
@@ -6269,9 +6230,9 @@ class FileFetch {
         this._logger = logger;
     }
     connect(dataFillCallback, _, changedCallback) {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            (_a = this._logger) === null || _a === undefined ? undefined : _a.debug('Starting file sync connection');
+            (_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug('Starting file sync connection');
             try {
                 const output = yield fs.promises.readFile(this._filename, encoding);
                 // Don't emit the change event for the initial read
@@ -6296,13 +6257,13 @@ class FileFetch {
                     throw err;
                 }
                 else {
-                    switch (err === null || err === undefined ? undefined : err.code) {
+                    switch (err === null || err === void 0 ? void 0 : err.code) {
                         case 'ENOENT':
                             throw new serverSdk.GeneralError(`File not found: ${this._filename}`);
                         case 'EACCES':
                             throw new serverSdk.GeneralError(`File not accessible: ${this._filename}`);
                         default:
-                            (_b = this._logger) === null || _b === undefined ? undefined : _b.debug(`Error reading file: ${err}`);
+                            (_b = this._logger) === null || _b === void 0 ? void 0 : _b.debug(`Error reading file: ${err}`);
                             throw new serverSdk.GeneralError();
                     }
                 }
@@ -6310,7 +6271,7 @@ class FileFetch {
         });
     }
     disconnect() {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             fs.unwatchFile(this._filename);
         });
     }
@@ -6374,24 +6335,27 @@ const SyncFlagsRequest = {
         return obj;
     },
     create(base) {
-        return SyncFlagsRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return SyncFlagsRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseSyncFlagsRequest();
-        message.providerId = (_a = object.providerId) !== null && _a !== undefined ? _a : "";
-        message.selector = (_b = object.selector) !== null && _b !== undefined ? _b : "";
+        message.providerId = (_a = object.providerId) !== null && _a !== void 0 ? _a : "";
+        message.selector = (_b = object.selector) !== null && _b !== void 0 ? _b : "";
         return message;
     },
 };
 function createBaseSyncFlagsResponse() {
-    return { flagConfiguration: "" };
+    return { flagConfiguration: "", syncContext: undefined };
 }
 const SyncFlagsResponse = {
     encode(message, writer = _m0.Writer.create()) {
         if (message.flagConfiguration !== "") {
             writer.uint32(10).string(message.flagConfiguration);
         }
+        if (message.syncContext !== undefined) {
+            Struct.encode(Struct.wrap(message.syncContext), writer.uint32(18).fork()).ldelim();
+        }
         return writer;
     },
     decode(input, length) {
@@ -6407,6 +6371,12 @@ const SyncFlagsResponse = {
                     }
                     message.flagConfiguration = reader.string();
                     continue;
+                case 2:
+                    if (tag !== 18) {
+                        break;
+                    }
+                    message.syncContext = Struct.unwrap(Struct.decode(reader, reader.uint32()));
+                    continue;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -6416,22 +6386,29 @@ const SyncFlagsResponse = {
         return message;
     },
     fromJSON(object) {
-        return { flagConfiguration: isSet(object.flagConfiguration) ? String(object.flagConfiguration) : "" };
+        return {
+            flagConfiguration: isSet(object.flagConfiguration) ? String(object.flagConfiguration) : "",
+            syncContext: isObject(object.syncContext) ? object.syncContext : undefined,
+        };
     },
     toJSON(message) {
         const obj = {};
         if (message.flagConfiguration !== "") {
             obj.flagConfiguration = message.flagConfiguration;
         }
+        if (message.syncContext !== undefined) {
+            obj.syncContext = message.syncContext;
+        }
         return obj;
     },
     create(base) {
-        return SyncFlagsResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return SyncFlagsResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a;
+        var _a, _b;
         const message = createBaseSyncFlagsResponse();
-        message.flagConfiguration = (_a = object.flagConfiguration) !== null && _a !== undefined ? _a : "";
+        message.flagConfiguration = (_a = object.flagConfiguration) !== null && _a !== void 0 ? _a : "";
+        message.syncContext = (_b = object.syncContext) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
@@ -6492,13 +6469,13 @@ const FetchAllFlagsRequest = {
         return obj;
     },
     create(base) {
-        return FetchAllFlagsRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return FetchAllFlagsRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a, _b;
         const message = createBaseFetchAllFlagsRequest();
-        message.providerId = (_a = object.providerId) !== null && _a !== undefined ? _a : "";
-        message.selector = (_b = object.selector) !== null && _b !== undefined ? _b : "";
+        message.providerId = (_a = object.providerId) !== null && _a !== void 0 ? _a : "";
+        message.selector = (_b = object.selector) !== null && _b !== void 0 ? _b : "";
         return message;
     },
 };
@@ -6544,12 +6521,12 @@ const FetchAllFlagsResponse = {
         return obj;
     },
     create(base) {
-        return FetchAllFlagsResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return FetchAllFlagsResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a;
         const message = createBaseFetchAllFlagsResponse();
-        message.flagConfiguration = (_a = object.flagConfiguration) !== null && _a !== undefined ? _a : "";
+        message.flagConfiguration = (_a = object.flagConfiguration) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
@@ -6581,7 +6558,7 @@ const GetMetadataRequest = {
         return obj;
     },
     create(base) {
-        return GetMetadataRequest.fromPartial(base !== null && base !== undefined ? base : {});
+        return GetMetadataRequest.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(_) {
         const message = createBaseGetMetadataRequest();
@@ -6630,12 +6607,12 @@ const GetMetadataResponse = {
         return obj;
     },
     create(base) {
-        return GetMetadataResponse.fromPartial(base !== null && base !== undefined ? base : {});
+        return GetMetadataResponse.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
         var _a;
         const message = createBaseGetMetadataResponse();
-        message.metadata = (_a = object.metadata) !== null && _a !== undefined ? _a : undefined;
+        message.metadata = (_a = object.metadata) !== null && _a !== void 0 ? _a : undefined;
         return message;
     },
 };
@@ -6658,6 +6635,7 @@ const FlagSyncServiceService = {
         responseSerialize: (value) => Buffer.from(FetchAllFlagsResponse.encode(value).finish()),
         responseDeserialize: (value) => FetchAllFlagsResponse.decode(value),
     },
+    /** @deprecated */
     getMetadata: {
         path: "/flagd.sync.v1.FlagSyncService/GetMetadata",
         requestStream: false,
@@ -6680,7 +6658,8 @@ function isSet(value) {
  * Implements the gRPC sync contract to fetch flag data.
  */
 class GrpcFetch {
-    constructor(config, syncServiceClient, logger) {
+    constructor(config, setSyncContext, syncServiceClient, logger) {
+        this._errorThrottled = false;
         /**
          * Initialized will be set to true once the initial connection is successful
          * and the first payload has been received. Subsequent reconnects will not
@@ -6693,63 +6672,88 @@ class GrpcFetch {
          * false if the connection is lost.
          */
         this._isConnected = false;
-        const { host, port, tls, socketPath, selector, defaultAuthority } = config;
-        let clientOptions;
-        if (defaultAuthority) {
-            clientOptions = {
-                'grpc.default_authority': defaultAuthority,
-            };
-        }
+        const { host, port, tls, socketPath, certPath, selector } = config;
+        const clientOptions = buildClientOptions(config);
+        const channelCredentials = createChannelCredentials(tls, certPath);
         this._syncClient = syncServiceClient
             ? syncServiceClient
-            : new FlagSyncServiceClient(socketPath ? `unix://${socketPath}` : `${host}:${port}`, tls ? grpcJs.credentials.createSsl() : grpcJs.credentials.createInsecure(), clientOptions);
+            : new FlagSyncServiceClient(socketPath ? `unix://${socketPath}` : `${host}:${port}`, channelCredentials, clientOptions);
+        this._deadlineMs = config.deadlineMs;
+        this._maxBackoffMs = config.retryBackoffMaxMs || DEFAULT_MAX_BACKOFF_MS;
+        this._streamDeadlineMs = config.streamDeadlineMs;
+        this._setSyncContext = setSyncContext;
         this._logger = logger;
+        // For backward compatibility during the deprecation period, we send the selector in both:
+        // 1. The request field (deprecated, for older flagd versions)
+        // 2. The gRPC metadata header 'flagd-selector' (new standard)
         this._request = { providerId: '', selector: selector ? selector : '' };
+        this._fatalStatusCodes = createFatalStatusCodesSet(config.fatalStatusCodes, logger);
+        // Create metadata with the flagd-selector header
+        this._metadata = new grpcJs.Metadata();
+        if (selector) {
+            this._metadata.set(FLAGD_SELECTOR_HEADER, selector);
+        }
     }
     connect(dataCallback, reconnectCallback, changedCallback, disconnectCallback) {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             yield new Promise((resolve, reject) => this.listen(dataCallback, reconnectCallback, changedCallback, disconnectCallback, resolve, reject));
             this._initialized = true;
         });
     }
     disconnect() {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            (_a = this._logger) === null || _a === undefined ? undefined : _a.debug('Disconnecting gRPC sync connection');
+            (_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug('Disconnecting gRPC sync connection');
             closeStreamIfDefined(this._syncStream);
             this._syncClient.close();
         });
     }
     listen(dataCallback, reconnectCallback, changedCallback, disconnectCallback, resolveConnect, rejectConnect) {
         var _a;
-        (_a = this._logger) === null || _a === undefined ? undefined : _a.debug('Starting gRPC sync connection');
+        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug('Starting gRPC sync connection');
         closeStreamIfDefined(this._syncStream);
         try {
-            this._syncStream = this._syncClient.syncFlags(this._request);
-            this._syncStream.on('data', (data) => {
-                var _a, _b, _c, _d;
-                (_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug(`Received sync payload`);
-                try {
-                    const changes = dataCallback(data.flagConfiguration);
-                    if (this._initialized && changes.length > 0) {
-                        changedCallback(changes);
-                    }
-                }
-                catch (err) {
-                    (_b = this._logger) === null || _b === void 0 ? void 0 : _b.debug('Error processing sync payload: ', (_c = err === null || err === void 0 ? void 0 : err.message) !== null && _c !== void 0 ? _c : 'unknown error');
-                }
-                if (resolveConnect) {
-                    resolveConnect();
+            // wait for connection to be stable
+            this._syncClient.waitForReady(Date.now() + this._deadlineMs, (err) => {
+                if (err) {
+                    this.handleError(err, dataCallback, reconnectCallback, changedCallback, disconnectCallback, rejectConnect);
                 }
-                else if (!this._isConnected) {
-                    // Not the first connection and there's no active connection.
-                    (_d = this._logger) === null || _d === void 0 ? void 0 : _d.debug('Reconnected to gRPC sync');
-                    reconnectCallback();
+                else {
+                    const streamDeadline = this._streamDeadlineMs != 0 ? Date.now() + this._streamDeadlineMs : undefined;
+                    const stream = this._syncClient.syncFlags(this._request, this._metadata, { deadline: streamDeadline });
+                    stream.on('data', (data) => {
+                        var _a, _b, _c, _d;
+                        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug(`Received sync payload`);
+                        try {
+                            if (data.syncContext) {
+                                this._setSyncContext(data.syncContext);
+                            }
+                            const changes = dataCallback(data.flagConfiguration);
+                            if (this._initialized && changes.length > 0) {
+                                changedCallback(changes);
+                            }
+                        }
+                        catch (err) {
+                            (_b = this._logger) === null || _b === void 0 ? void 0 : _b.debug('Error processing sync payload: ', (_c = err === null || err === void 0 ? void 0 : err.message) !== null && _c !== void 0 ? _c : 'unknown error');
+                        }
+                        if (resolveConnect) {
+                            resolveConnect();
+                        }
+                        else if (!this._isConnected) {
+                            // Not the first connection and there's no active connection.
+                            (_d = this._logger) === null || _d === void 0 ? void 0 : _d.debug('Reconnected to gRPC sync');
+                            reconnectCallback();
+                        }
+                        this._isConnected = true;
+                    });
+                    stream.on('error', (err) => {
+                        // In cases where we get an explicit error status, we add a delay.
+                        // This prevents tight loops when errors are returned immediately, typically by intervening proxies like Envoy.
+                        this._errorThrottled = true;
+                        this.handleError(err, dataCallback, reconnectCallback, changedCallback, disconnectCallback, rejectConnect);
+                    });
+                    this._syncStream = stream;
                 }
-                this._isConnected = true;
-            });
-            this._syncStream.on('error', (err) => {
-                this.handleError(err, dataCallback, reconnectCallback, changedCallback, disconnectCallback, rejectConnect);
             });
         }
         catch (err) {
@@ -6758,57 +6762,64 @@ class GrpcFetch {
     }
     handleError(err, dataCallback, reconnectCallback, changedCallback, disconnectCallback, rejectConnect) {
         var _a, _b, _c;
-        (_a = this._logger) === null || _a === undefined ? undefined : _a.error('Connection error, attempting to reconnect');
-        (_b = this._logger) === null || _b === undefined ? undefined : _b.debug(err);
+        // Check if error is a fatal status code on first connection only
+        if (isFatalStatusCodeError(err, this._initialized, this._fatalStatusCodes)) {
+            this._isConnected = false;
+            handleFatalStatusCodeError(err, this._logger, disconnectCallback, rejectConnect);
+            return;
+        }
+        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.error('Connection error, attempting to reconnect');
+        (_b = this._logger) === null || _b === void 0 ? void 0 : _b.debug(err);
         this._isConnected = false;
-        const errorMessage = (_c = err === null || err === undefined ? undefined : err.message) !== null && _c !== undefined ? _c : 'Failed to connect to syncFlags stream';
+        const errorMessage = (_c = err === null || err === void 0 ? void 0 : err.message) !== null && _c !== void 0 ? _c : 'Failed to connect to syncFlags stream';
         disconnectCallback(errorMessage);
-        rejectConnect === null || rejectConnect === undefined ? undefined : rejectConnect(new serverSdk.GeneralError(errorMessage));
+        rejectConnect === null || rejectConnect === void 0 ? void 0 : rejectConnect(new serverSdk.GeneralError(errorMessage));
         this.reconnect(dataCallback, reconnectCallback, changedCallback, disconnectCallback);
     }
     reconnect(dataCallback, reconnectCallback, changedCallback, disconnectCallback) {
-        const channel = this._syncClient.getChannel();
-        channel.watchConnectivityState(channel.getConnectivityState(true), Infinity, () => {
-            this.listen(dataCallback, reconnectCallback, changedCallback, disconnectCallback);
-        });
+        setTimeout(() => this.listen(dataCallback, reconnectCallback, changedCallback, disconnectCallback), this._errorThrottled ? this._maxBackoffMs : 0);
+        this._errorThrottled = false;
     }
 }
 
 class InProcessService {
-    constructor(config, dataFetcher, logger) {
+    constructor(config, setSyncContext, dataFetcher, logger) {
         this.config = config;
         this._flagdCore = new flagdCore.FlagdCore(undefined, logger);
         this._dataFetcher = dataFetcher
             ? dataFetcher
             : config.offlineFlagSourcePath
                 ? new FileFetch(config.offlineFlagSourcePath, logger)
-                : new GrpcFetch(config, undefined, logger);
+                : new GrpcFetch(config, setSyncContext, undefined, logger);
+    }
+    clearCache() {
+        // in-process service does not cache flags
     }
     connect(reconnectCallback, changedCallback, disconnectCallback) {
         return this._dataFetcher.connect(this.setFlagConfiguration.bind(this), reconnectCallback, changedCallback, disconnectCallback);
     }
     disconnect() {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             this._dataFetcher.disconnect();
         });
     }
     resolveBoolean(flagKey, defaultValue, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.evaluate('boolean', flagKey, defaultValue, context, logger);
         });
     }
     resolveNumber(flagKey, defaultValue, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.evaluate('number', flagKey, defaultValue, context, logger);
         });
     }
     resolveString(flagKey, defaultValue, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.evaluate('string', flagKey, defaultValue, context, logger);
         });
     }
     resolveObject(flagKey, defaultValue, context, logger) {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.evaluate('object', flagKey, defaultValue, context, logger);
         });
     }
@@ -6831,6 +6842,15 @@ class InProcessService {
     }
 }
 
+class SyncMetadataHook {
+    constructor(enrichedContext) {
+        this.enrichedContext = enrichedContext;
+    }
+    before(hookContext, hookHints) {
+        return this.enrichedContext();
+    }
+}
+
 class FlagdProvider {
     /**
      * Construct a new flagd provider.
@@ -6840,36 +6860,58 @@ class FlagdProvider {
      * @param service optional internal service implementation, should not be needed for production
      */
     constructor(options, logger, service) {
+        var _a;
         this.logger = logger;
         this.metadata = {
             name: 'flagd',
         };
         this.runsOn = 'server';
         this.events = new serverSdk.OpenFeatureEventEmitter();
+        this.syncContext = null;
+        this._isErrorState = false;
         const config = getConfig(options);
-        this._service = service
-            ? service
-            : config.resolverType === 'in-process'
-                ? new InProcessService(config, undefined, logger)
-                : new GRPCService(config, undefined, logger);
+        this._retryGracePeriod = (_a = config.retryGracePeriod) !== null && _a !== void 0 ? _a : DEFAULT_RETRY_GRACE_PERIOD;
+        if (service === undefined) {
+            if (config.resolverType === 'in-process') {
+                this._service = new InProcessService(config, this.setSyncContext.bind(this), undefined, logger);
+                if ((config === null || config === void 0 ? void 0 : config.offlineFlagSourcePath) === undefined) {
+                    this.hooks = [new SyncMetadataHook(() => config.contextEnricher(this.getSyncContext()))];
+                }
+            }
+            else {
+                this._service = new GRPCService(config, undefined, logger);
+            }
+        }
+        else {
+            this._service = service;
+        }
+    }
+    setSyncContext(context) {
+        this.syncContext = context;
+    }
+    getSyncContext() {
+        return this.syncContext;
     }
     initialize() {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
             try {
                 yield this._service.connect(this.handleReconnect.bind(this), this.handleChanged.bind(this), this.handleError.bind(this));
+                this.clearErrorTimer();
+                this._isErrorState = false;
                 (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`${this.metadata.name}: ready`);
             }
             catch (err) {
-                (_b = this.logger) === null || _b === undefined ? undefined : _b.error(`${this.metadata.name}: error during initialization: ${err === null || err === undefined ? undefined : err.message}`);
-                (_c = this.logger) === null || _c === undefined ? undefined : _c.debug(err);
+                (_b = this.logger) === null || _b === void 0 ? void 0 : _b.error(`${this.metadata.name}: error during initialization: ${err === null || err === void 0 ? void 0 : err.message}`);
+                (_c = this.logger) === null || _c === void 0 ? void 0 : _c.debug(err);
                 throw err;
             }
         });
     }
     onClose() {
         var _a;
-        (_a = this.logger) === null || _a === undefined ? undefined : _a.debug(`${this.metadata.name}: shutting down`);
+        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`${this.metadata.name}: shutting down`);
+        this.clearErrorTimer();
         return this._service.disconnect();
     }
     resolveBooleanEvaluation(flagKey, defaultValue, transformedContext, logger) {
@@ -6885,14 +6927,35 @@ class FlagdProvider {
         return this._service.resolveObject(flagKey, defaultValue, transformedContext, logger);
     }
     handleReconnect() {
+        this.clearErrorTimer();
+        this._isErrorState = false;
         this.events.emit(serverSdk.ProviderEvents.Ready);
     }
     handleError(message) {
-        this.events.emit(serverSdk.ProviderEvents.Error, { message });
+        if (this._isErrorState) {
+            return;
+        }
+        this._isErrorState = true;
+        this.events.emit(serverSdk.ProviderEvents.Stale, { message });
+        this._errorTimer = setTimeout(() => {
+            var _a;
+            if (this._isErrorState) {
+                (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error(`${this.metadata.name}: not reconnected within ${this._retryGracePeriod}s grace period, emitting ERROR`);
+                this._service.clearCache();
+                this.events.emit(serverSdk.ProviderEvents.Error, { message });
+            }
+            this._errorTimer = undefined;
+        }, this._retryGracePeriod * 1000);
     }
     handleChanged(flagsChanged) {
         this.events.emit(serverSdk.ProviderEvents.ConfigurationChanged, { flagsChanged });
     }
+    clearErrorTimer() {
+        if (this._errorTimer) {
+            clearTimeout(this._errorTimer);
+            this._errorTimer = undefined;
+        }
+    }
 }
 
 exports.FlagdProvider = FlagdProvider;