@kohost/api-client 3.1.24 → 3.2.1

package/dist/esm/SocketIoClient.js

@@ -3313,10 +3313,12 @@ var require_socket2 = __commonJS({
           debug("event with ack id %d has timed out after %d ms", id, timeout);
           ack.call(this, new Error("operation has timed out"));
         }, timeout);
-        this.acks[id] = (...args) => {
+        const fn = /* @__PURE__ */ __name((...args) => {
           this.io.clearTimeoutFn(timer);
-          ack.apply(this, [null, ...args]);
-        };
+          ack.apply(this, args);
+        }, "fn");
+        fn.withError = true;
+        this.acks[id] = fn;
       }
       /**
        * Emits an event and waits for an acknowledgement
@@ -3335,15 +3337,12 @@ var require_socket2 = __commonJS({
        * @return a Promise that will be fulfilled when the server acknowledges the event
        */
       emitWithAck(ev, ...args) {
-        const withErr = this.flags.timeout !== void 0 || this._opts.ackTimeout !== void 0;
         return new Promise((resolve, reject) => {
-          args.push((arg1, arg2) => {
-            if (withErr) {
-              return arg1 ? reject(arg1) : resolve(arg2);
-            } else {
-              return resolve(arg1);
-            }
-          });
+          const fn = /* @__PURE__ */ __name((arg1, arg2) => {
+            return arg1 ? reject(arg1) : resolve(arg2);
+          }, "fn");
+          fn.withError = true;
+          args.push(fn);
           this.emit(ev, ...args);
         });
       }
@@ -3472,6 +3471,25 @@ var require_socket2 = __commonJS({
         this.connected = false;
         delete this.id;
         this.emitReserved("disconnect", reason, description);
+        this._clearAcks();
+      }
+      /**
+       * Clears the acknowledgement handlers upon disconnection, since the client will never receive an acknowledgement from
+       * the server.
+       *
+       * @private
+       */
+      _clearAcks() {
+        Object.keys(this.acks).forEach((id) => {
+          const isBuffered = this.sendBuffer.some((packet) => String(packet.id) === id);
+          if (!isBuffered) {
+            const ack = this.acks[id];
+            delete this.acks[id];
+            if (ack.withError) {
+              ack.call(this, new Error("socket has been disconnected"));
+            }
+          }
+        });
       }
       /**
        * Called with socket packet.
@@ -3562,20 +3580,23 @@ var require_socket2 = __commonJS({
         };
       }
       /**
-       * Called upon a server acknowlegement.
+       * Called upon a server acknowledgement.
        *
        * @param packet
        * @private
        */
       onack(packet) {
         const ack = this.acks[packet.id];
-        if ("function" === typeof ack) {
-          debug("calling ack %s with %j", packet.id, packet.data);
-          ack.apply(this, packet.data);
-          delete this.acks[packet.id];
-        } else {
+        if (typeof ack !== "function") {
           debug("bad ack %s", packet.id);
+          return;
         }
+        delete this.acks[packet.id];
+        debug("calling ack %s with %j", packet.id, packet.data);
+        if (ack.withError) {
+          packet.data.unshift(null);
+        }
+        ack.apply(this, packet.data);
       }
       /**
        * Called upon server connect.
@@ -4850,6 +4871,9 @@ var require_SocketIoClient = __commonJS({
       unsubscribe(event, callback) {
         this.socket.off(event, callback);
       }
+      getSubscriptions(event) {
+        return this.socket.listeners(event);
+      }
       send(event, { data = {}, query = {}, ...rest }) {
         this.socket.emit(event, { data, query, ...rest });
       }