@osdk/client 2.5.0-beta.9 → 2.6.0-beta.1

package/build/cjs/{chunk-MKL3HEQ5.cjs → chunk-DCEFUXFS.cjs}

@@ -563,9 +563,13 @@ async function extractObjectOrInterfaceType(clientCtx, objectSet) {
       };
     case "filter":
     case "asBaseObjectTypes":
-    case "asType":
     case "nearestNeighbors":
       return extractObjectOrInterfaceType(clientCtx, objectSet.objectSet);
+    case "asType":
+      return {
+        type: clientCtx.asTypeInterfaceOrObjectMapping[objectSet.entityType],
+        apiName: objectSet.entityType
+      };
     case "intersect": {
       const objectSets2 = objectSet.objectSets;
       const objectSetTypes2 = await Promise.all(objectSets2.map((os) => extractObjectOrInterfaceType(clientCtx, os)));
@@ -831,7 +835,8 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
     );
     return result2;
   }
-  const resolvedInterfaceObjectSet = resolveInterfaceObjectSet(objectSet, interfaceType.apiName, args);
+  const extractedInterfaceTypeApiName = (await extractObjectOrInterfaceType(client, objectSet))?.apiName ?? interfaceType.apiName;
+  const resolvedInterfaceObjectSet = resolveInterfaceObjectSet(objectSet, extractedInterfaceTypeApiName, args);
   const requestBody = await buildAndRemapRequestBody(args, {
     objectSet: resolvedInterfaceObjectSet,
     select: args?.$select ? [...args.$select] : [],
@@ -843,7 +848,7 @@ async function fetchInterfacePage(client, interfaceType, args, objectSet, useSna
     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),
+    data: await client.objectFactory2(client, result.data, extractedInterfaceTypeApiName, {}, !args.$includeRid, args.$select, false, result.interfaceToObjectTypeMappings),
     nextPageToken: result.nextPageToken,
     totalCount: result.totalCount
   });
@@ -928,7 +933,8 @@ async function applyFetchArgs(args, body, _client, objectType) {
   return body;
 }
 async function fetchObjectPage(client, objectType, args, objectSet, useSnapshot = false) {
-  void client.ontologyProvider.getObjectDefinition(objectType.apiName);
+  void client.ontologyProvider.getObjectDefinition(objectType.apiName).catch(() => {
+  });
   const requestBody = await buildAndRemapRequestBody(args, {
     objectSet,
     select: args?.$select ? [...args.$select] : [],
@@ -1392,7 +1398,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({
@@ -1428,6 +1477,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
@@ -1446,6 +1497,12 @@ 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> "
     });
@@ -1546,16 +1603,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) {
@@ -1566,10 +1619,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();
@@ -1597,7 +1656,7 @@ var ObjectSetListenerWebsocket = class _ObjectSetListenerWebsocket {
           }
           function error(evt) {
             cleanup();
-            reject(evt);
+            reject(new Error(String(evt)));
           }
           ws.addEventListener("open", open);
           ws.addEventListener("error", error);
@@ -1607,10 +1666,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
@@ -1931,6 +1992,16 @@ function createObjectSet(objectType, clientCtx, objectSet = resolveBaseObjectSet
         objectSet
       });
     },
+    asType: (objectTypeDef) => {
+      const existingMapping = clientCtx.asTypeInterfaceOrObjectMapping[objectTypeDef.apiName];
+      !(!existingMapping || existingMapping === objectTypeDef.type) ? process.env.NODE_ENV !== "production" ? invariant5__default.default(false, `${objectTypeDef.apiName} was previously used as an ${existingMapping}, but now used as a ${objectTypeDef.type}.`) : invariant5__default.default(false) : void 0;
+      clientCtx.asTypeInterfaceOrObjectMapping[objectTypeDef.apiName] = objectTypeDef.type;
+      return clientCtx.objectSetFactory(objectTypeDef, clientCtx, {
+        type: "asType",
+        objectSet,
+        entityType: objectTypeDef.apiName
+      });
+    },
     $objectSetInternals: {
       def: objectType
     }
@@ -1997,5 +2068,5 @@ exports.hydrateAttachmentFromRidInternal = hydrateAttachmentFromRidInternal;
 exports.isObjectSet = isObjectSet;
 exports.isWireObjectSet = isWireObjectSet;
 exports.symbolClientContext = symbolClientContext;
-//# sourceMappingURL=chunk-MKL3HEQ5.cjs.map
-//# sourceMappingURL=chunk-MKL3HEQ5.cjs.map
+//# sourceMappingURL=chunk-DCEFUXFS.cjs.map
+//# sourceMappingURL=chunk-DCEFUXFS.cjs.map