@osdk/client 2.4.2 → 2.5.0-beta.10

package/build/cjs/{chunk-633AI7EA.cjs → chunk-GVGP7T5P.cjs}

@@ -2,17 +2,17 @@
 
 var chunkQ7SFCCGT_cjs = require('./chunk-Q7SFCCGT.cjs');
 var shared_net_errors = require('@osdk/shared.net.errors');
-var shared_net_fetch = require('@osdk/shared.net.fetch');
-var invariant8 = require('tiny-invariant');
 var api = require('@osdk/api');
+var invariant5 = require('tiny-invariant');
+var shared_net_fetch = require('@osdk/shared.net.fetch');
 var WebSocket = require('isomorphic-ws');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var invariant8__default = /*#__PURE__*/_interopDefault(invariant8);
+var invariant5__default = /*#__PURE__*/_interopDefault(invariant5);
 var WebSocket__default = /*#__PURE__*/_interopDefault(WebSocket);
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
 var Action_exports = {};
 chunkQ7SFCCGT_cjs.__export(Action_exports, {
   apply: () => apply,
@@ -89,7 +89,7 @@ function parseUrl(baseUrl, endpointPath) {
   return new URL(`api${endpointPath}`, baseUrl);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
 var _apply = [1, "/v2/ontologies/{0}/actions/{1}/apply", 3];
 function apply($ctx, ...args) {
   return foundryPlatformFetch($ctx, _apply, ...args);
@@ -103,7 +103,7 @@ function applyBatch($ctx, ...args) {
   return foundryPlatformFetch($ctx, _applyBatch, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
 var ActionTypeV2_exports = {};
 chunkQ7SFCCGT_cjs.__export(ActionTypeV2_exports, {
   get: () => get,
@@ -123,7 +123,7 @@ function getByRid($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getByRid, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
 var Attachment_exports = {};
 chunkQ7SFCCGT_cjs.__export(Attachment_exports, {
   get: () => get2,
@@ -148,7 +148,7 @@ function get2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _get2, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
 var MediaReferenceProperty_exports = {};
 chunkQ7SFCCGT_cjs.__export(MediaReferenceProperty_exports, {
   getMediaContent: () => getMediaContent,
@@ -173,7 +173,7 @@ function uploadMedia($ctx, ...args) {
   return foundryPlatformFetch($ctx, _uploadMedia, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
 var ObjectTypeV2_exports = {};
 chunkQ7SFCCGT_cjs.__export(ObjectTypeV2_exports, {
   get: () => get3,
@@ -203,7 +203,7 @@ function getOutgoingLinkType($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOutgoingLinkType, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
 var OntologyInterface_exports = {};
 chunkQ7SFCCGT_cjs.__export(OntologyInterface_exports, {
   aggregate: () => aggregate,
@@ -243,7 +243,7 @@ function getOutgoingInterfaceLinkType($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getOutgoingInterfaceLinkType, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
 var OntologyObjectSet_exports = {};
 chunkQ7SFCCGT_cjs.__export(OntologyObjectSet_exports, {
   aggregate: () => aggregate2,
@@ -278,7 +278,7 @@ function aggregate2($ctx, ...args) {
   return foundryPlatformFetch($ctx, _aggregate2, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
 var Query_exports = {};
 chunkQ7SFCCGT_cjs.__export(Query_exports, {
   execute: () => execute
@@ -288,7 +288,7 @@ function execute($ctx, ...args) {
   return foundryPlatformFetch($ctx, _execute, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
 var QueryType_exports = {};
 chunkQ7SFCCGT_cjs.__export(QueryType_exports, {
   get: () => get6,
@@ -303,7 +303,7 @@ function get6($ctx, ...args) {
   return foundryPlatformFetch($ctx, _get6, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
 var TimeSeriesPropertyV2_exports = {};
 chunkQ7SFCCGT_cjs.__export(TimeSeriesPropertyV2_exports, {
   getFirstPoint: () => getFirstPoint,
@@ -323,7 +323,7 @@ function streamPoints($ctx, ...args) {
   return foundryPlatformFetch($ctx, _streamPoints, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.28.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
 var TimeSeriesValueBankProperty_exports = {};
 chunkQ7SFCCGT_cjs.__export(TimeSeriesValueBankProperty_exports, {
   getLatestValue: () => getLatestValue,
@@ -337,6 +337,187 @@ var _streamValues = [1, "/v2/ontologies/{0}/objects/{1}/{2}/timeseries/{3}/strea
 function streamValues($ctx, ...args) {
   return foundryPlatformFetch($ctx, _streamValues, ...args);
 }
+function extractNamespace(fqApiName) {
+  const last = fqApiName.lastIndexOf(".");
+  if (last === -1) return [void 0, fqApiName];
+  return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];
+}
+function modernToLegacyWhereClause(whereClause, objectOrInterface) {
+  if ("$and" in whereClause) {
+    return {
+      type: "and",
+      value: whereClause.$and.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface))
+    };
+  } else if ("$or" in whereClause) {
+    return {
+      type: "or",
+      value: whereClause.$or.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface))
+    };
+  } else if ("$not" in whereClause) {
+    return {
+      type: "not",
+      value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface)
+    };
+  }
+  const parts = Object.entries(whereClause);
+  if (parts.length === 1) {
+    return handleWherePair(parts[0], objectOrInterface);
+  }
+  return {
+    type: "and",
+    value: parts.map((v) => handleWherePair(v, objectOrInterface))
+  };
+}
+function makeGeoFilterBbox(bbox, filterType, propertyIdentifier, field) {
+  return {
+    type: filterType === "$within" ? "withinBoundingBox" : "intersectsBoundingBox",
+    /**
+     * This is a bit ugly, but did this so that propertyIdentifier only shows up in the return object if its defined,
+     * this makes it so we don't need to go update our entire test bed either to include a field which may change in near future.
+     * Once we solidify that this is the way forward, I can remove field and clean this up
+     */
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: {
+      topLeft: {
+        type: "Point",
+        coordinates: [bbox[0], bbox[3]]
+      },
+      bottomRight: {
+        type: "Point",
+        coordinates: [bbox[2], bbox[1]]
+      }
+    }
+  };
+}
+function makeGeoFilterPolygon(coordinates, filterType, propertyIdentifier, field) {
+  return {
+    type: filterType,
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: {
+      type: "Polygon",
+      coordinates
+    }
+  };
+}
+function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector) {
+  !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Defined key values are only allowed when they are not undefined.") : invariant5__default.default(false) : void 0;
+  const propertyIdentifier = structFieldSelector != null ? {
+    type: "structField",
+    ...structFieldSelector,
+    propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, objectOrInterface)
+  } : void 0;
+  const field = structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : void 0;
+  if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
+    return {
+      type: "eq",
+      ...propertyIdentifier != null && {
+        propertyIdentifier
+      },
+      field,
+      value: filter
+    };
+  }
+  const keysOfFilter = Object.keys(filter);
+  const hasDollarSign = keysOfFilter.some((key) => key.startsWith("$"));
+  !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant5__default.default(false) : void 0;
+  if (!hasDollarSign) {
+    const structFilter = Object.entries(filter);
+    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant5__default.default(false) : void 0;
+    const structFieldApiName = keysOfFilter[0];
+    return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
+      propertyApiName: fieldName,
+      structFieldApiName
+    });
+  }
+  const firstKey = keysOfFilter[0];
+  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false) : invariant5__default.default(false) : void 0;
+  if (firstKey === "$ne") {
+    return {
+      type: "not",
+      value: {
+        type: "eq",
+        ...propertyIdentifier != null && {
+          propertyIdentifier
+        },
+        field,
+        value: filter[firstKey]
+      }
+    };
+  }
+  if (firstKey === "$within") {
+    const withinBody = filter[firstKey];
+    if (Array.isArray(withinBody)) {
+      return makeGeoFilterBbox(withinBody, firstKey, propertyIdentifier, field);
+    } else if ("$bbox" in withinBody && withinBody.$bbox != null) {
+      return makeGeoFilterBbox(withinBody.$bbox, firstKey, propertyIdentifier, field);
+    } else if ("$distance" in withinBody && "$of" in withinBody && withinBody.$distance != null && withinBody.$of != null) {
+      return {
+        type: "withinDistanceOf",
+        ...propertyIdentifier != null && {
+          propertyIdentifier
+        },
+        field,
+        value: {
+          center: Array.isArray(withinBody.$of) ? {
+            type: "Point",
+            coordinates: withinBody.$of
+          } : withinBody.$of,
+          distance: {
+            value: withinBody.$distance[0],
+            unit: api.DistanceUnitMapping[withinBody.$distance[1]]
+          }
+        }
+      };
+    } else {
+      const coordinates = "$polygon" in withinBody ? withinBody.$polygon : withinBody.coordinates;
+      return makeGeoFilterPolygon(coordinates, "withinPolygon", propertyIdentifier, fieldName);
+    }
+  }
+  if (firstKey === "$intersects") {
+    const intersectsBody = filter[firstKey];
+    if (Array.isArray(intersectsBody)) {
+      return makeGeoFilterBbox(intersectsBody, firstKey, propertyIdentifier, field);
+    } else if ("$bbox" in intersectsBody && intersectsBody.$bbox != null) {
+      return makeGeoFilterBbox(intersectsBody.$bbox, firstKey, propertyIdentifier, field);
+    } else {
+      const coordinates = "$polygon" in intersectsBody ? intersectsBody.$polygon : intersectsBody.coordinates;
+      return makeGeoFilterPolygon(coordinates, "intersectsPolygon", propertyIdentifier, field);
+    }
+  }
+  if (firstKey === "$containsAllTerms" || firstKey === "$containsAnyTerm") {
+    return {
+      type: firstKey.substring(1),
+      ...propertyIdentifier != null && {
+        propertyIdentifier
+      },
+      field,
+      value: typeof filter[firstKey] === "string" ? filter[firstKey] : filter[firstKey]["term"],
+      fuzzy: typeof filter[firstKey] === "string" ? false : filter[firstKey]["fuzzySearch"] ?? false
+    };
+  }
+  return {
+    type: firstKey.substring(1),
+    ...propertyIdentifier != null && {
+      propertyIdentifier
+    },
+    field,
+    value: filter[firstKey]
+  };
+}
+function fullyQualifyPropName(fieldName, objectOrInterface) {
+  if (objectOrInterface.type === "interface") {
+    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
+    const [fieldApiNamespace, fieldShortName] = extractNamespace(fieldName);
+    return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : fieldName;
+  }
+  return fieldName;
+}
 var addUserAgentAndRequestContextHeaders = (client, withMetadata) => ({
   ...client,
   fetch: shared_net_fetch.createFetchHeaderMutator(client.fetch, (headers) => {
@@ -356,7 +537,7 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       }
       const objOrInterfaceDef2 = def2.type === "object" ? await clientCtx.ontologyProvider.getObjectDefinition(def2.apiName) : await clientCtx.ontologyProvider.getInterfaceDefinition(def2.apiName);
       const linkDef2 = objOrInterfaceDef2.links[objectSet.link];
-      !linkDef2 ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant8__default.default(false) : void 0;
+      !linkDef2 ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant5__default.default(false) : void 0;
       return objOrInterfaceDef2.type === "object" ? {
         apiName: objOrInterfaceDef2.links[objectSet.link].targetType,
         type: "object"
@@ -385,7 +566,14 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
     case "asType":
     case "nearestNeighbors":
       return extractObjectOrInterfaceType(clientCtx, objectSet.objectSet);
-    case "intersect":
+    case "intersect": {
+      const objectSets2 = objectSet.objectSets;
+      const objectSetTypes2 = await Promise.all(objectSets2.map((os) => extractObjectOrInterfaceType(clientCtx, os)));
+      const filteredObjectTypes2 = objectSetTypes2.filter(Boolean);
+      const firstInterfaceType = filteredObjectTypes2.find((val) => val?.type === "interface");
+      !firstInterfaceType ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Missing interface type in intersect objectset scope'`) : invariant5__default.default(false) : void 0;
+      return firstInterfaceType;
+    }
     case "subtract":
     case "union":
       const objectSets = objectSet.objectSets;
@@ -394,7 +582,7 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       const firstObjectType = filteredObjectTypes[0];
       !filteredObjectTypes.every((val) => {
         return val?.apiName === firstObjectType?.apiName && val?.type === firstObjectType?.type;
-      }) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Can only have one object type when doing intersects, subtract, union") : invariant8__default.default(false) : void 0;
+      }) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Can only have one object type when doing subtract, union") : invariant5__default.default(false) : void 0;
       return filteredObjectTypes[0];
     case "static":
     case "reference":
@@ -406,7 +594,7 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       }
       const objOrInterfaceDef = def.type === "object" ? await clientCtx.ontologyProvider.getObjectDefinition(def.apiName) : await clientCtx.ontologyProvider.getInterfaceDefinition(def.apiName);
       const linkDef = objOrInterfaceDef.links[objectSet.interfaceLink];
-      !linkDef ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Missing link definition for '${objectSet.interfaceLink}'`) : invariant8__default.default(false) : void 0;
+      !linkDef ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Missing link definition for '${objectSet.interfaceLink}'`) : invariant5__default.default(false) : void 0;
       return objOrInterfaceDef.type === "object" ? {
         apiName: objOrInterfaceDef.links[objectSet.interfaceLink].targetType,
         type: "object"
@@ -416,7 +604,7 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       };
     // We don't have to worry about new object sets being added and doing a runtime break and breaking people since the OSDK is always constructing these.
     default:
-      process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Unsupported object set type for deriving object or interface type,`) : invariant8__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Unsupported object set type for deriving object or interface type,`) : invariant5__default.default(false) ;
   }
 }
 async function extractRdpDefinition(clientCtx, objectSet) {
@@ -436,7 +624,7 @@ async function extractRdpDefinitionInternal(clientCtx, objectSet, methodInputObj
       }
       const objDef = await clientCtx.ontologyProvider.getObjectDefinition(childObjectType);
       const linkDef = objDef.links[objectSet.link];
-      !linkDef ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant8__default.default(false) : void 0;
+      !linkDef ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Missing link definition for '${objectSet.link}'`) : invariant5__default.default(false) : void 0;
       return {
         definitions: definitions2,
         childObjectType: objDef.links[objectSet.link].targetType
@@ -522,13 +710,13 @@ async function extractRdpDefinitionInternal(clientCtx, objectSet, methodInputObj
         ...acc,
         ...definitions2
       }), {});
-      !(Object.keys(definitions).length === 0) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Object sets combined using intersect, subtract, or union must not contain any derived property definitions") : invariant8__default.default(false) : void 0;
+      !(Object.keys(definitions).length === 0) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Object sets combined using intersect, subtract, or union must not contain any derived property definitions") : invariant5__default.default(false) : void 0;
       const firstValidChildObjectType = objectSetTypes.find(({
         childObjectType
       }) => childObjectType != null)?.childObjectType;
       !objectSetTypes.every(({
         childObjectType
-      }) => childObjectType === firstValidChildObjectType || childObjectType == null) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "All object sets in an intersect, subtract, or union must have the same child object type") : invariant8__default.default(false) : void 0;
+      }) => childObjectType === firstValidChildObjectType || childObjectType == null) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "All object sets in an intersect, subtract, or union must have the same child object type") : invariant5__default.default(false) : void 0;
       return {
         definitions: {},
         childObjectType: firstValidChildObjectType
@@ -540,9 +728,9 @@ async function extractRdpDefinitionInternal(clientCtx, objectSet, methodInputObj
       };
     // We don't have to worry about new object sets being added and doing a runtime break and breaking people since the OSDK is always constructing these.
     case "interfaceLinkSearchAround":
-      process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant8__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant5__default.default(false) ;
     default:
-      process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant8__default.default(false) ;
+      process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Unsupported object set type for Runtime Derived Properties`) : invariant5__default.default(false) ;
   }
 }
 
@@ -591,16 +779,46 @@ function resolveInterfaceObjectSet(objectSet, interfaceTypeApiName, args) {
     }]
   } : objectSet;
 }
+async function fetchStaticRidPage(client, rids, args, useSnapshot = false) {
+  const requestBody = await applyFetchArgs(args, {
+    objectSet: {
+      type: "static",
+      objects: rids
+    },
+    select: args?.$select ?? [],
+    excludeRid: !args?.$includeRid,
+    snapshot: useSnapshot
+  }, client, {
+    type: "object",
+    apiName: ""
+  });
+  const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, {
+    osdkMetadata: void 0
+  }), await client.ontologyRid, requestBody, {
+    preview: true
+  });
+  return Promise.resolve({
+    data: await client.objectFactory2(client, result.data, void 0, {}, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings),
+    nextPageToken: result.nextPageToken,
+    totalCount: result.totalCount
+  });
+}
 async function fetchInterfacePage(client, interfaceType, args, objectSet, useSnapshot = false) {
   if (args.$__UNSTABLE_useOldInterfaceApis) {
-    const result2 = await OntologyInterface_exports.search(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, interfaceType.apiName, applyFetchArgs(args, {
+    const baseRequestBody = {
       augmentedProperties: {},
       augmentedSharedPropertyTypes: {},
       otherInterfaceTypes: [],
       selectedObjectTypes: [],
-      selectedSharedPropertyTypes: args.$select ?? [],
+      selectedSharedPropertyTypes: args.$select ? [...args.$select] : [],
       where: objectSetToSearchJsonV2(objectSet, interfaceType.apiName)
-    }), {
+    };
+    const requestBody2 = await applyFetchArgs(args, baseRequestBody, client, interfaceType);
+    if (requestBody2.selectedSharedPropertyTypes.length > 0) {
+      const remapped = remapPropertyNames(interfaceType, requestBody2.selectedSharedPropertyTypes);
+      requestBody2.selectedSharedPropertyTypes = Array.from(remapped);
+    }
+    const result2 = await OntologyInterface_exports.search(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, interfaceType.apiName, requestBody2, {
       preview: true
     });
     result2.data = await client.objectFactory(
@@ -614,13 +832,15 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
     return result2;
   }
   const resolvedInterfaceObjectSet = resolveInterfaceObjectSet(objectSet, interfaceType.apiName, args);
-  const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, applyFetchArgs(args, {
+  const requestBody = await buildAndRemapRequestBody(args, {
     objectSet: resolvedInterfaceObjectSet,
-    select: args?.$select ?? [],
+    select: args?.$select ? [...args.$select] : [],
     excludeRid: !args?.$includeRid,
     snapshot: useSnapshot
-  }), {
-    preview: true
+  }, client, interfaceType);
+  const result = await OntologyObjectSet_exports.loadMultipleObjectTypes(addUserAgentAndRequestContextHeaders(client, interfaceType), await client.ontologyRid, requestBody, {
+    preview: true,
+    branch: client.branch
   });
   return Promise.resolve({
     data: await client.objectFactory2(client, result.data, (await extractObjectOrInterfaceType(client, resolvedInterfaceObjectSet))?.apiName ?? interfaceType.apiName, {}, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings),
@@ -655,35 +875,71 @@ async function fetchPageWithErrorsInternal(client, objectType, objectSet, args =
 async function fetchPage(client, objectType, args, objectSet = resolveBaseObjectSetType(objectType)) {
   return fetchPageInternal(client, objectType, objectSet, args);
 }
-function applyFetchArgs(args, body) {
+async function buildAndRemapRequestBody(args, baseBody, client, objectType) {
+  const requestBody = await applyFetchArgs(args, baseBody, client, objectType);
+  if (requestBody.select != null && requestBody.select.length > 0) {
+    const remapped = remapPropertyNames(objectType, requestBody.select);
+    return {
+      ...requestBody,
+      select: remapped
+    };
+  }
+  return requestBody;
+}
+function remapPropertyNames(objectOrInterface, propertyNames) {
+  if (objectOrInterface == null) {
+    return propertyNames;
+  }
+  if (objectOrInterface.type === "interface") {
+    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
+    return propertyNames.map((name) => {
+      const [fieldApiNamespace, fieldShortName] = extractNamespace(name);
+      return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : name;
+    });
+  }
+  return propertyNames;
+}
+async function applyFetchArgs(args, body, _client, objectType) {
   if (args?.$nextPageToken) {
     body.pageToken = args.$nextPageToken;
   }
   if (args?.$pageSize != null) {
     body.pageSize = args.$pageSize;
   }
-  if (args?.$orderBy != null) {
-    body.orderBy = {
-      fields: Object.entries(args.$orderBy).map(([field, direction]) => ({
-        field,
-        direction
-      }))
-    };
+  const orderBy = args?.$orderBy;
+  if (orderBy) {
+    if (orderBy === "relevance") {
+      body.orderBy = {
+        orderType: "relevance",
+        fields: []
+      };
+    } else {
+      const orderByEntries = Object.entries(orderBy);
+      const fieldNames = orderByEntries.map(([field]) => field);
+      const remappedFields = remapPropertyNames(objectType, fieldNames);
+      body.orderBy = {
+        fields: orderByEntries.map(([, direction], index) => ({
+          field: remappedFields[index],
+          direction
+        }))
+      };
+    }
   }
   return body;
 }
 async function fetchObjectPage(client, objectType, args, objectSet, useSnapshot = false) {
   void client.ontologyProvider.getObjectDefinition(objectType.apiName);
-  const r = await OntologyObjectSet_exports.load(addUserAgentAndRequestContextHeaders(client, objectType), await client.ontologyRid, applyFetchArgs(args, {
+  const requestBody = await buildAndRemapRequestBody(args, {
     objectSet,
-    // We have to do the following case because LoadObjectSetRequestV2 isn't readonly
-    select: args?.$select ?? [],
-    // FIXME?
+    select: args?.$select ? [...args.$select] : [],
     excludeRid: !args?.$includeRid,
     snapshot: useSnapshot
-  }));
+  }, client, objectType);
+  const r = await OntologyObjectSet_exports.load(addUserAgentAndRequestContextHeaders(client, objectType), await client.ontologyRid, requestBody, {
+    branch: client.branch
+  });
   return Promise.resolve({
-    data: await client.objectFactory(client, r.data, void 0, void 0, await extractRdpDefinition(client, objectSet), args.$select),
+    data: await client.objectFactory(client, r.data, void 0, void 0, await extractRdpDefinition(client, objectSet), args.$select, false),
     nextPageToken: r.nextPageToken,
     totalCount: r.totalCount
   });
@@ -805,187 +1061,6 @@ async function fetchSingleWithErrors(client, objectType, args, objectSet) {
     };
   }
 }
-function extractNamespace(fqApiName) {
-  const last = fqApiName.lastIndexOf(".");
-  if (last === -1) return [void 0, fqApiName];
-  return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];
-}
-function modernToLegacyWhereClause(whereClause, objectOrInterface) {
-  if ("$and" in whereClause) {
-    return {
-      type: "and",
-      value: whereClause.$and.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface))
-    };
-  } else if ("$or" in whereClause) {
-    return {
-      type: "or",
-      value: whereClause.$or.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface))
-    };
-  } else if ("$not" in whereClause) {
-    return {
-      type: "not",
-      value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface)
-    };
-  }
-  const parts = Object.entries(whereClause);
-  if (parts.length === 1) {
-    return handleWherePair(parts[0], objectOrInterface);
-  }
-  return {
-    type: "and",
-    value: parts.map((v) => handleWherePair(v, objectOrInterface))
-  };
-}
-function makeGeoFilterBbox(bbox, filterType, propertyIdentifier, field) {
-  return {
-    type: filterType === "$within" ? "withinBoundingBox" : "intersectsBoundingBox",
-    /**
-     * This is a bit ugly, but did this so that propertyIdentifier only shows up in the return object if its defined,
-     * this makes it so we don't need to go update our entire test bed either to include a field which may change in near future.
-     * Once we solidify that this is the way forward, I can remove field and clean this up
-     */
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: {
-      topLeft: {
-        type: "Point",
-        coordinates: [bbox[0], bbox[3]]
-      },
-      bottomRight: {
-        type: "Point",
-        coordinates: [bbox[2], bbox[1]]
-      }
-    }
-  };
-}
-function makeGeoFilterPolygon(coordinates, filterType, propertyIdentifier, field) {
-  return {
-    type: filterType,
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: {
-      type: "Polygon",
-      coordinates
-    }
-  };
-}
-function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector) {
-  !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Defined key values are only allowed when they are not undefined.") : invariant8__default.default(false) : void 0;
-  const propertyIdentifier = structFieldSelector != null ? {
-    type: "structField",
-    ...structFieldSelector,
-    propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, objectOrInterface)
-  } : void 0;
-  const field = structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : void 0;
-  if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
-    return {
-      type: "eq",
-      ...propertyIdentifier != null && {
-        propertyIdentifier
-      },
-      field,
-      value: filter
-    };
-  }
-  const keysOfFilter = Object.keys(filter);
-  const hasDollarSign = keysOfFilter.some((key) => key.startsWith("$"));
-  !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant8__default.default(false) : void 0;
-  if (!hasDollarSign) {
-    const structFilter = Object.entries(filter);
-    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant8__default.default(false) : void 0;
-    const structFieldApiName = keysOfFilter[0];
-    return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
-      propertyApiName: fieldName,
-      structFieldApiName
-    });
-  }
-  const firstKey = keysOfFilter[0];
-  !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false) : invariant8__default.default(false) : void 0;
-  if (firstKey === "$ne") {
-    return {
-      type: "not",
-      value: {
-        type: "eq",
-        ...propertyIdentifier != null && {
-          propertyIdentifier
-        },
-        field,
-        value: filter[firstKey]
-      }
-    };
-  }
-  if (firstKey === "$within") {
-    const withinBody = filter[firstKey];
-    if (Array.isArray(withinBody)) {
-      return makeGeoFilterBbox(withinBody, firstKey, propertyIdentifier, field);
-    } else if ("$bbox" in withinBody && withinBody.$bbox != null) {
-      return makeGeoFilterBbox(withinBody.$bbox, firstKey, propertyIdentifier, field);
-    } else if ("$distance" in withinBody && "$of" in withinBody && withinBody.$distance != null && withinBody.$of != null) {
-      return {
-        type: "withinDistanceOf",
-        ...propertyIdentifier != null && {
-          propertyIdentifier
-        },
-        field,
-        value: {
-          center: Array.isArray(withinBody.$of) ? {
-            type: "Point",
-            coordinates: withinBody.$of
-          } : withinBody.$of,
-          distance: {
-            value: withinBody.$distance[0],
-            unit: api.DistanceUnitMapping[withinBody.$distance[1]]
-          }
-        }
-      };
-    } else {
-      const coordinates = "$polygon" in withinBody ? withinBody.$polygon : withinBody.coordinates;
-      return makeGeoFilterPolygon(coordinates, "withinPolygon", propertyIdentifier, fieldName);
-    }
-  }
-  if (firstKey === "$intersects") {
-    const intersectsBody = filter[firstKey];
-    if (Array.isArray(intersectsBody)) {
-      return makeGeoFilterBbox(intersectsBody, firstKey, propertyIdentifier, field);
-    } else if ("$bbox" in intersectsBody && intersectsBody.$bbox != null) {
-      return makeGeoFilterBbox(intersectsBody.$bbox, firstKey, propertyIdentifier, field);
-    } else {
-      const coordinates = "$polygon" in intersectsBody ? intersectsBody.$polygon : intersectsBody.coordinates;
-      return makeGeoFilterPolygon(coordinates, "intersectsPolygon", propertyIdentifier, field);
-    }
-  }
-  if (firstKey === "$containsAllTerms" || firstKey === "$containsAnyTerm") {
-    return {
-      type: firstKey.substring(1),
-      ...propertyIdentifier != null && {
-        propertyIdentifier
-      },
-      field,
-      value: typeof filter[firstKey] === "string" ? filter[firstKey] : filter[firstKey]["term"],
-      fuzzy: typeof filter[firstKey] === "string" ? false : filter[firstKey]["fuzzySearch"] ?? false
-    };
-  }
-  return {
-    type: firstKey.substring(1),
-    ...propertyIdentifier != null && {
-      propertyIdentifier
-    },
-    field,
-    value: filter[firstKey]
-  };
-}
-function fullyQualifyPropName(fieldName, objectOrInterface) {
-  if (objectOrInterface.type === "interface") {
-    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
-    const [fieldApiNamespace, fieldShortName] = extractNamespace(fieldName);
-    return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : fieldName;
-  }
-  return fieldName;
-}
 function derivedPropertyDefinitionFactory(wireDefinition, definitionMap) {
   const definition = {
     abs() {
@@ -1052,12 +1127,12 @@ function derivedPropertyDefinitionFactory(wireDefinition, definitionMap) {
 var getDefinitionFromMap = (arg, definitionMap) => {
   if (typeof arg === "object") {
     const definition = definitionMap.get(arg);
-    !definition ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Derived Property is not defined") : invariant8__default.default(false) : void 0;
+    !definition ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Derived Property is not defined") : invariant5__default.default(false) : void 0;
     return definition;
   } else if (typeof arg === "number") {
-    process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Literals for derived properties are not yet supported") : invariant8__default.default(false) ;
+    process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Literals for derived properties are not yet supported") : invariant5__default.default(false) ;
   }
-  process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Invalid argument type for a derived property") : invariant8__default.default(false) ;
+  process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Invalid argument type for a derived property") : invariant5__default.default(false) ;
 };
 
 // src/derivedProperties/createWithPropertiesObjectSet.ts
@@ -1079,7 +1154,7 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
     },
     aggregate: (aggregation, opt) => {
       const splitAggregation = aggregation.split(":");
-      !(splitAggregation.length === 2 || splitAggregation[0] === "$count") ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Invalid aggregation format") : invariant8__default.default(false) : void 0;
+      !(splitAggregation.length === 2 || splitAggregation[0] === "$count") ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Invalid aggregation format") : invariant5__default.default(false) : void 0;
       const [aggregationPropertyName, aggregationOperation] = splitAggregation;
       let aggregationOperationDefinition;
       switch (aggregationOperation) {
@@ -1117,7 +1192,7 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
             break;
           }
         default:
-          process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Invalid aggregation operation " + aggregationOperation) : invariant8__default.default(false) ;
+          process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Invalid aggregation operation " + aggregationOperation) : invariant5__default.default(false) ;
       }
       const wrappedObjectSet = {
         type: "selection",
@@ -1149,6 +1224,23 @@ function createWithPropertiesObjectSet(objectType, objectSet, definitionMap, fro
       const selectorResult = derivedPropertyDefinitionFactory(wrappedObjectSet, definitionMap);
       definitionMap.set(selectorResult, wrappedObjectSet);
       return selectorResult;
+    },
+    constant: {
+      double: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Not supported") : invariant5__default.default(false) ;
+      },
+      integer: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Not supported") : invariant5__default.default(false) ;
+      },
+      long: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Not supported") : invariant5__default.default(false) ;
+      },
+      datetime: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Not supported") : invariant5__default.default(false) ;
+      },
+      timestamp: (value) => {
+        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Not supported") : invariant5__default.default(false) ;
+      }
     }
   };
 }
@@ -1158,7 +1250,7 @@ function legacyToModernSingleAggregationResult(entry) {
     if (parts[0] === "count") {
       return accumulator;
     }
-    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "assumed we were getting a `${key}.${type}`") : invariant8__default.default(false) : void 0;
+    !(parts.length === 2) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "assumed we were getting a `${key}.${type}`") : invariant5__default.default(false) : void 0;
     const property = parts[0];
     const metricType = parts[1];
     if (!(property in accumulator)) {
@@ -1257,9 +1349,11 @@ async function aggregate3(clientCtx, objectType, objectSet = resolveBaseObjectSe
     objectSet,
     groupBy: body.groupBy,
     aggregation: body.aggregation
+  }, {
+    branch: clientCtx.branch
   });
   if (!req.$groupBy) {
-    !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "no group by clause should mean only one data result") : invariant8__default.default(false) : void 0;
+    !(result.data.length === 1) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "no group by clause should mean only one data result") : invariant5__default.default(false) : void 0;
     return {
       ...aggregationToCountResult(result.data[0]),
       ...legacyToModernSingleAggregationResult(result.data[0])
@@ -1298,7 +1392,50 @@ var WIRE_OBJECT_SET_TYPES = /* @__PURE__ */ new Set(["base", "filter", "intersec
 function isWireObjectSet(o) {
   return o != null && typeof o === "object" && WIRE_OBJECT_SET_TYPES.has(o.type);
 }
+
+// src/util/exponentialBackoff.ts
+var DEFAULT_OPTIONS = {
+  initialDelayMs: 1e3,
+  maxDelayMs: 6e4,
+  multiplier: 2,
+  jitterFactor: 0.3
+};
+var ExponentialBackoff = class {
+  attempt = 0;
+  constructor(options = {}) {
+    this.options = {
+      ...DEFAULT_OPTIONS,
+      ...options
+    };
+  }
+  calculateDelay() {
+    const {
+      initialDelayMs,
+      maxDelayMs,
+      multiplier,
+      jitterFactor
+    } = this.options;
+    const baseDelay = Math.min(initialDelayMs * Math.pow(multiplier, this.attempt), maxDelayMs);
+    const jitter = baseDelay * jitterFactor * (Math.random() * 2 - 1);
+    const delayWithJitter = Math.max(0, baseDelay + jitter);
+    this.attempt++;
+    return Math.round(delayWithJitter);
+  }
+  reset() {
+    this.attempt = 0;
+  }
+  getAttempt() {
+    return this.attempt;
+  }
+};
+
+// src/objectSet/ObjectSetListenerWebsocket.ts
 var MINIMUM_RECONNECT_DELAY_MS = 5 * 1e3;
+var EXPONENTIAL_BACKOFF_INITIAL_DELAY_MS = 1e3;
+var EXPONENTIAL_BACKOFF_MAX_DELAY_MS = 6e4;
+var EXPONENTIAL_BACKOFF_MULTIPLIER = 2;
+var EXPONENTIAL_BACKOFF_JITTER_FACTOR = 0.3;
+var WEBSOCKET_IDLE_DISCONNECT_DELAY_MS = 15e3;
 function doNothing() {
 }
 function fillOutListener({
@@ -1334,6 +1471,8 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   #ws;
   #lastWsConnect = 0;
   #client;
+  #backoff;
+  #isFirstConnection = true;
   #logger;
   /**
    * map of requestId to all active subscriptions at the time of the request
@@ -1352,10 +1491,16 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   } = {}) {
     this.MINIMUM_RECONNECT_DELAY_MS = minimumReconnectDelayMs;
     this.#client = client;
+    this.#backoff = new ExponentialBackoff({
+      initialDelayMs: EXPONENTIAL_BACKOFF_INITIAL_DELAY_MS,
+      maxDelayMs: EXPONENTIAL_BACKOFF_MAX_DELAY_MS,
+      multiplier: EXPONENTIAL_BACKOFF_MULTIPLIER,
+      jitterFactor: EXPONENTIAL_BACKOFF_JITTER_FACTOR
+    });
     this.#logger = client.logger?.child({}, {
       msgPrefix: "<OSW> "
     });
-    !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Stack must be a URL") : invariant8__default.default(false) : void 0;
+    !(client.baseUrl.startsWith("https://") || client.baseUrl.startsWith("http://")) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Stack must be a URL") : invariant5__default.default(false) : void 0;
   }
   async subscribe(objectType, objectSet, listener, properties = []) {
     const objOrInterfaceDef = objectType.type === "object" ? await this.#client.ontologyProvider.getObjectDefinition(objectType.apiName) : await this.#client.ontologyProvider.getInterfaceDefinition(objectType.apiName);
@@ -1452,16 +1597,12 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     if (this.#maybeDisconnectTimeout) {
       clearTimeout(this.#maybeDisconnectTimeout);
     }
-    this.#maybeDisconnectTimeout = setTimeout(
-      () => {
-        this.#maybeDisconnectTimeout = void 0;
-        if (this.#subscriptions.size === 0) {
-          this.#cycleWebsocket();
-        }
-      },
-      15e3
-      /* ms */
-    );
+    this.#maybeDisconnectTimeout = setTimeout(() => {
+      this.#maybeDisconnectTimeout = void 0;
+      if (this.#subscriptions.size === 0) {
+        this.#cycleWebsocket();
+      }
+    }, WEBSOCKET_IDLE_DISCONNECT_DELAY_MS);
   }
   async #ensureWebsocket() {
     if (this.#ws == null) {
@@ -1472,10 +1613,16 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       const url = constructWebsocketUrl(baseUrl, await this.#client.ontologyRid);
       const token = await tokenProvider();
       if (this.#ws == null) {
-        const nextConnectTime = (this.#lastWsConnect ?? 0) + this.MINIMUM_RECONNECT_DELAY_MS;
-        if (nextConnectTime > Date.now()) {
+        if (!this.#isFirstConnection) {
+          const delay = this.#backoff.calculateDelay();
+          if (process.env.NODE_ENV !== "production") {
+            this.#logger?.debug({
+              delay,
+              attempt: this.#backoff.getAttempt()
+            }, "Waiting before reconnect");
+          }
           await new Promise((resolve) => {
-            setTimeout(resolve, nextConnectTime - Date.now());
+            setTimeout(resolve, delay);
           });
         }
         this.#lastWsConnect = Date.now();
@@ -1503,7 +1650,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
           }
           function error(evt) {
             cleanup();
-            reject(evt);
+            reject(new Error(String(evt)));
           }
           ws.addEventListener("open", open);
           ws.addEventListener("error", error);
@@ -1513,10 +1660,12 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     }
   }
   #onOpen = () => {
+    this.#isFirstConnection = false;
+    this.#backoff.reset();
     this.#sendSubscribeMessage();
   };
   #onMessage = async (message) => {
-    const data = JSON.parse(message.data.toString());
+    const data = JSON.parse(String(message.data));
     if (process.env.NODE_ENV !== "production") {
       this.#logger?.debug({
         payload: data
@@ -1537,7 +1686,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
         return;
       }
       default:
-        process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "Unexpected message type") : invariant8__default.default(false) ;
+        process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "Unexpected message type") : invariant5__default.default(false) ;
     }
   };
   #handleMessage_objectSetChanged = async (payload) => {
@@ -1602,7 +1751,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   }
   #handleMessage_refreshObjectSet = (payload) => {
     const sub = this.#subscriptions.get(payload.id);
-    !sub ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Expected subscription id ${payload.id}`) : invariant8__default.default(false) : void 0;
+    !sub ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Expected subscription id ${payload.id}`) : invariant5__default.default(false) : void 0;
     try {
       sub.listener.onOutOfDate();
     } catch (error) {
@@ -1616,7 +1765,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
       responses
     } = payload;
     const subs = this.#pendingSubscriptions.get(id);
-    !subs ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `should have a pending subscription for ${id}`) : invariant8__default.default(false) : void 0;
+    !subs ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `should have a pending subscription for ${id}`) : invariant5__default.default(false) : void 0;
     this.#pendingSubscriptions.delete(id);
     for (let i = 0; i < responses.length; i++) {
       const sub = subs[i];
@@ -1658,7 +1807,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
   #handleMessage_subscriptionClosed(payload) {
     const sub = this.#subscriptions.get(payload.id);
     if (sub == null && this.#endedSubscriptions.has(payload.id)) return;
-    !sub ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, `Expected subscription id ${payload.id}`) : invariant8__default.default(false) : void 0;
+    !sub ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `Expected subscription id ${payload.id}`) : invariant5__default.default(false) : void 0;
     this.#tryCatchOnError(sub, true, payload.cause);
     this.#unsubscribe(sub, "error");
   }
@@ -1683,7 +1832,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
     if (this.#subscriptions.size > 0) {
       if (process.env.NODE_ENV !== "production") {
         for (const s of this.#subscriptions.values()) {
-          !(s.status !== "done" && s.status !== "error") ? process.env.NODE_ENV !== "production" ? invariant8__default.default(false, "should not have done/error subscriptions still") : invariant8__default.default(false) : void 0;
+          !(s.status !== "done" && s.status !== "error") ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, "should not have done/error subscriptions still") : invariant5__default.default(false) : void 0;
         }
       }
       for (const s of this.#subscriptions.values()) {
@@ -1896,11 +2045,12 @@ exports.extractNamespace = extractNamespace;
 exports.fetchPage = fetchPage;
 exports.fetchSingle = fetchSingle;
 exports.fetchSingleWithErrors = fetchSingleWithErrors;
+exports.fetchStaticRidPage = fetchStaticRidPage;
 exports.getWireObjectSet = getWireObjectSet;
 exports.hydrateAttachmentFromRid = hydrateAttachmentFromRid;
 exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
 exports.symbolClientContext = symbolClientContext;
-//# sourceMappingURL=chunk-633AI7EA.cjs.map
-//# sourceMappingURL=chunk-633AI7EA.cjs.map
+//# sourceMappingURL=chunk-GVGP7T5P.cjs.map
+//# sourceMappingURL=chunk-GVGP7T5P.cjs.map