@truenas/api-client 9.0.2 → 9.0.4

package/dist/{chunk-MJFFBJJE.cjs → chunk-WAVCPALL.cjs}

@@ -3205,13 +3205,14 @@ function socketScheme(protocol) {
 var tenSeconds = 10 * 1e3;
 var twentySeconds = 20 * 1e3;
 var TrueNasConnection = class {
-  constructor(initialEnabled, hostnames, systemUuid, websocketPath, systemName, retryDelay = tenSeconds, maxRetry = 3, logger = noopLogger, protocol = "https:") {
+  constructor(initialEnabled, hostnames, systemUuid, websocketPath, systemName, retryDelay = tenSeconds, maxRetry = 3, logger = noopLogger, protocol = "https:", interceptor) {
     this.systemUuid = systemUuid;
     this.websocketPath = websocketPath;
     this.systemName = systemName;
     this.retryDelay = retryDelay;
     this.maxRetry = maxRetry;
     this.logger = logger;
+    this.interceptor = interceptor;
     // compatibility properties
     this.opened = new rxjs.BehaviorSubject(false);
     this.closed = new rxjs.Subject();
@@ -3269,6 +3270,7 @@ var TrueNasConnection = class {
         const initMessage = createJsonRpcMessage("core.set_options", [
           { legacy_jobs: false }
         ]);
+        this.interceptor?.outgoing?.(initMessage);
         connection.ws.next(initMessage);
         return connection.ws.messages().pipe(
           rxjs.filter((msg) => msg.id === initMessage.id),
@@ -3367,22 +3369,27 @@ var TrueNasConnection = class {
       rxjs.map((conn) => conn.state === "error"),
       rxjs.takeUntil(this.closeConnection)
     );
-    /**
-     * observable which always emits messages from the current socket.
-     */
-    this.messages$ = this.ws$.pipe(
+    /** What the appliance sends, on whichever socket is current. */
+    this.socketMessages$ = this.ws$.pipe(
       rxjs.filter((ws) => ws !== null),
       rxjs.switchMap((ws) => ws.messages().pipe(
         rxjs.catchError(() => rxjs.EMPTY)
       ))
     );
+    this.messages$ = interceptor?.injected$ ? rxjs.merge(this.socketMessages$, interceptor.injected$.pipe(rxjs.observeOn(rxjs.asapScheduler), rxjs.share())) : this.socketMessages$;
     this.endpoint$.next(resolveEndpoint(hostnames, protocol));
     this.ws$.pipe(
       rxjs.switchMap((ws) => ws ? rxjs.interval(twentySeconds).pipe(rxjs.map(() => ws)) : rxjs.EMPTY),
       rxjs.takeUntil(this.closeConnection)
     ).subscribe((ws) => {
-      ws.next(createJsonRpcMessage("core.ping"));
+      const ping = createJsonRpcMessage("core.ping");
+      this.interceptor?.outgoing?.(ping);
+      ws.next(ping);
     });
+    if (interceptor?.incoming) {
+      const incoming = interceptor.incoming.bind(interceptor);
+      this.messages$.pipe(rxjs.takeUntil(this.closeConnection)).subscribe((message) => incoming(message));
+    }
     this.opened$.subscribe((val) => this.opened.next(val));
     this.closed$.subscribe(() => this.closed.next());
     this.hostname$.pipe(rxjs.filter(Boolean)).subscribe((name) => this.hostname.next(name));
@@ -3451,6 +3458,9 @@ var TrueNasConnection = class {
    * the next `closed$` emission.
    */
   send(message) {
+    if (this.interceptor?.outgoing?.(message) === false) {
+      return rxjs.Subscription.EMPTY;
+    }
     return this.ws$.pipe(
       rxjs.filter((ws) => ws !== null),
       rxjs.take(1)
@@ -3648,7 +3658,8 @@ var TrueNasApiClient = class {
       this.reconnect.retryDelay,
       this.reconnect.maxRetry,
       this.logger,
-      this.protocol
+      this.protocol,
+      this.reconnect.interceptor
     );
   }
   /**
@@ -4308,6 +4319,11 @@ async function createTrueNasClient(opts) {
       `Cannot create client for system ${uuid}: hostnames array is empty`
     );
   }
+  if (opts.websocketPath !== void 0 && !opts.websocketPath.startsWith("/")) {
+    throw new Error(
+      `Cannot create client for system ${uuid}: websocketPath must be an absolute path, got '${opts.websocketPath}'.`
+    );
+  }
   logger.info("Creating versioned API client", {
     uuid: uuid.slice(0, 8),
     hostnames: hostnames.join(", "),
@@ -4337,7 +4353,7 @@ async function createTrueNasClient(opts) {
     logger.info("API version supplied by the caller, skipping discovery", {
       uuid: uuid.slice(0, 8),
       version: known.version,
-      websocketPath: known.websocketPath
+      websocketPath: opts.websocketPath ?? known.websocketPath
     });
     return instantiateClientForVersion(known, opts, logger);
   }
@@ -4356,7 +4372,7 @@ async function createTrueNasClient(opts) {
       // of them anyway.
       hostname: winner.hostname,
       version: version.version,
-      websocketPath: version.websocketPath
+      websocketPath: opts.websocketPath ?? version.websocketPath
     });
   } catch (error) {
     const errorMessage = errorMessageOrDefault(error, "Unknown error");
@@ -4482,6 +4498,7 @@ function clientClassFor(version) {
 function instantiateClientForVersion(version, opts, logger) {
   const { uuid, hostnames, enabled, systemName } = opts;
   const versionKey = clientVersionKey(version);
+  const endpoint = opts.websocketPath === void 0 ? version : { ...version, websocketPath: opts.websocketPath };
   const Client = CLIENT_BY_VERSION_KEY[versionKey];
   if (!Client) {
     logger.error("No client implementation for version", {
@@ -4496,17 +4513,18 @@ function instantiateClientForVersion(version, opts, logger) {
   logger.info(`Instantiating ${Client.name}`, {
     uuid: uuid.slice(0, 8),
     version: version.version,
-    versionKey
+    versionKey,
+    websocketPath: endpoint.websocketPath
   });
   return new Client(
     uuid,
     hostnames,
-    version,
+    endpoint,
     enabled,
     systemName,
     logger,
     opts.protocol,
-    { retryDelay: opts.retryDelay, maxRetry: opts.maxRetry }
+    { retryDelay: opts.retryDelay, maxRetry: opts.maxRetry, interceptor: opts.interceptor }
   );
 }
 function errorMessageOrDefault(error, fallback) {
@@ -4568,5 +4586,5 @@ exports.v25_10_4_exports = v25_10_4_exports;
 exports.v25_10_5_exports = v25_10_5_exports;
 exports.v27_0_0_exports = v27_0_0_exports;
 exports.v28_0_0_exports = v28_0_0_exports;
-//# sourceMappingURL=chunk-MJFFBJJE.cjs.map
-//# sourceMappingURL=chunk-MJFFBJJE.cjs.map
+//# sourceMappingURL=chunk-WAVCPALL.cjs.map
+//# sourceMappingURL=chunk-WAVCPALL.cjs.map