wapi-client 0.8.4 → 0.8.13

package/dist/api/base-client.browser.cjs

@@ -192,7 +192,9 @@ var BaseClient = class {
       return;
     }
     stream.push(message);
-    stream.push(null);
+    if (!stream.destroyed) {
+      stream.push(null);
+    }
     this._requests.delete(message.id);
     if (this.connectionType === import__.WapiClientType.ws) {
       this._send({

package/dist/api/base-client.browser.js

@@ -184,7 +184,9 @@ var BaseClient = class {
       return;
     }
     stream.push(message);
-    stream.push(null);
+    if (!stream.destroyed) {
+      stream.push(null);
+    }
     this._requests.delete(message.id);
     if (this.connectionType === WapiClientType.ws) {
       this._send({

package/dist/api/base-client.cjs

@@ -192,7 +192,9 @@ var BaseClient = class {
       return;
     }
     stream.push(message);
-    stream.push(null);
+    if (!stream.destroyed) {
+      stream.push(null);
+    }
     this._requests.delete(message.id);
     if (this.connectionType === import__.WapiClientType.ws) {
       this._send({

package/dist/api/base-client.d.ts

@@ -67,7 +67,8 @@ export declare class BaseClient {
     _connection: WebSocket | HttpConnectionClient;
     $connect: Promise<ISocketId> | Promise<undefined> | undefined;
     connectionType: WapiClientType;
-    jwt: string;
+    host: string;
+    protected jwt: string;
     isConnected: boolean;
     socId: undefined | string;
     hooks: ClientHooks;

package/dist/api/base-client.js

@@ -184,7 +184,9 @@ var BaseClient = class {
       return;
     }
     stream.push(message);
-    stream.push(null);
+    if (!stream.destroyed) {
+      stream.push(null);
+    }
     this._requests.delete(message.id);
     if (this.connectionType === WapiClientType.ws) {
       this._send({

package/dist/api/http-client.browser.cjs

@@ -72,19 +72,21 @@ function createHttpClient(opts) {
 }
 function createConnection(opts) {
   const url = opts.host.replace(/^wss:/, "https:");
+  const REQ_HEADER_ID = "x-wapi-req-id";
   function onmessage(body) {
     return __async(this, null, function* () {
-      (0, import_debug.debugLog)(`http_createConnection>message(body:${body})`);
+      (0, import_debug.debugLog)(`http_createConnection>message(body:$0)`, body);
     });
   }
   function send(body, jwt) {
     return __async(this, null, function* () {
       const jsonBody = JSON.parse(body);
-      const res = yield (0, import_fetch.fetch)(`${opts.host}/api`, {
+      const res = yield (0, import_fetch.fetch)(`${url}/api`, {
         keepalive: true,
         method: "POST",
         headers: {
-          Authorization: `Bearer ${jwt}`
+          Authorization: `Bearer ${jwt}`,
+          [REQ_HEADER_ID]: jsonBody == null ? void 0 : jsonBody.id
         },
         body
       });
@@ -92,16 +94,18 @@ function createConnection(opts) {
       this.onmessage(__spreadProps(__spreadValues({}, responseBody), { id: jsonBody.id }));
     });
   }
+  const connectId = (0, import_utils.getRandomHex)();
   const $connect = (0, import_fetch.fetch)(`${url}/api`, {
     method: "POST",
     headers: {
-      Authorization: `Bearer ${opts.jwt}`
+      Authorization: `Bearer ${opts.jwt}`,
+      [REQ_HEADER_ID]: connectId
     },
     body: JSON.stringify({
       jsonrpc: import_jsonrpc.JSONRPC.version,
       method: "authenticationCheck",
       params: {},
-      id: (0, import_utils.getRandomHex)()
+      id: connectId
     })
   }).then((res) => res.json()).then((res) => {
     if (res.error) {
@@ -118,6 +122,7 @@ function createConnection(opts) {
 var HttpClient = class extends import_base_client.BaseClient {
   constructor(connection, opts) {
     super(connection, import__.WapiClientType.https, connection.$connect);
+    this.host = opts.host;
     this.jwt = opts.jwt;
     this.$connect.then(() => {
       this._ready();
@@ -132,7 +137,7 @@ var HttpClient = class extends import_base_client.BaseClient {
   _ready() {
     this._setConnected(true);
     this._connection.onmessage = (body) => __async(this, null, function* () {
-      (0, import_debug.debugLog)(`http_message(data:${body})`);
+      (0, import_debug.debugLog)(`http_message($0)>`, body);
       this._handleMessage(body);
     });
   }

package/dist/api/http-client.browser.js

@@ -53,19 +53,21 @@ function createHttpClient(opts) {
 }
 function createConnection(opts) {
   const url = opts.host.replace(/^wss:/, "https:");
+  const REQ_HEADER_ID = "x-wapi-req-id";
   function onmessage(body) {
     return __async(this, null, function* () {
-      debugLog(`http_createConnection>message(body:${body})`);
+      debugLog(`http_createConnection>message(body:$0)`, body);
     });
   }
   function send(body, jwt) {
     return __async(this, null, function* () {
       const jsonBody = JSON.parse(body);
-      const res = yield fetch(`${opts.host}/api`, {
+      const res = yield fetch(`${url}/api`, {
         keepalive: true,
         method: "POST",
         headers: {
-          Authorization: `Bearer ${jwt}`
+          Authorization: `Bearer ${jwt}`,
+          [REQ_HEADER_ID]: jsonBody == null ? void 0 : jsonBody.id
         },
         body
       });
@@ -73,16 +75,18 @@ function createConnection(opts) {
       this.onmessage(__spreadProps(__spreadValues({}, responseBody), { id: jsonBody.id }));
     });
   }
+  const connectId = getRandomHex();
   const $connect = fetch(`${url}/api`, {
     method: "POST",
     headers: {
-      Authorization: `Bearer ${opts.jwt}`
+      Authorization: `Bearer ${opts.jwt}`,
+      [REQ_HEADER_ID]: connectId
     },
     body: JSON.stringify({
       jsonrpc: JSONRPC.version,
       method: "authenticationCheck",
       params: {},
-      id: getRandomHex()
+      id: connectId
     })
   }).then((res) => res.json()).then((res) => {
     if (res.error) {
@@ -99,6 +103,7 @@ function createConnection(opts) {
 var HttpClient = class extends BaseClient {
   constructor(connection, opts) {
     super(connection, WapiClientType.https, connection.$connect);
+    this.host = opts.host;
     this.jwt = opts.jwt;
     this.$connect.then(() => {
       this._ready();
@@ -113,7 +118,7 @@ var HttpClient = class extends BaseClient {
   _ready() {
     this._setConnected(true);
     this._connection.onmessage = (body) => __async(this, null, function* () {
-      debugLog(`http_message(data:${body})`);
+      debugLog(`http_message($0)>`, body);
       this._handleMessage(body);
     });
   }

package/dist/api/http-client.cjs

@@ -72,19 +72,21 @@ function createHttpClient(opts) {
 }
 function createConnection(opts) {
   const url = opts.host.replace(/^wss:/, "https:");
+  const REQ_HEADER_ID = "x-wapi-req-id";
   function onmessage(body) {
     return __async(this, null, function* () {
-      (0, import_debug.debugLog)(`http_createConnection>message(body:${body})`);
+      (0, import_debug.debugLog)(`http_createConnection>message(body:$0)`, body);
     });
   }
   function send(body, jwt) {
     return __async(this, null, function* () {
       const jsonBody = JSON.parse(body);
-      const res = yield (0, import_fetch.fetch)(`${opts.host}/api`, {
+      const res = yield (0, import_fetch.fetch)(`${url}/api`, {
         keepalive: true,
         method: "POST",
         headers: {
-          Authorization: `Bearer ${jwt}`
+          Authorization: `Bearer ${jwt}`,
+          [REQ_HEADER_ID]: jsonBody == null ? void 0 : jsonBody.id
         },
         body
       });
@@ -92,16 +94,18 @@ function createConnection(opts) {
       this.onmessage(__spreadProps(__spreadValues({}, responseBody), { id: jsonBody.id }));
     });
   }
+  const connectId = (0, import_utils.getRandomHex)();
   const $connect = (0, import_fetch.fetch)(`${url}/api`, {
     method: "POST",
     headers: {
-      Authorization: `Bearer ${opts.jwt}`
+      Authorization: `Bearer ${opts.jwt}`,
+      [REQ_HEADER_ID]: connectId
     },
     body: JSON.stringify({
       jsonrpc: import_jsonrpc.JSONRPC.version,
       method: "authenticationCheck",
       params: {},
-      id: (0, import_utils.getRandomHex)()
+      id: connectId
     })
   }).then((res) => res.json()).then((res) => {
     if (res.error) {
@@ -118,6 +122,7 @@ function createConnection(opts) {
 var HttpClient = class extends import_base_client.BaseClient {
   constructor(connection, opts) {
     super(connection, import__.WapiClientType.https, connection.$connect);
+    this.host = opts.host;
     this.jwt = opts.jwt;
     this.$connect.then(() => {
       this._ready();
@@ -132,7 +137,7 @@ var HttpClient = class extends import_base_client.BaseClient {
   _ready() {
     this._setConnected(true);
     this._connection.onmessage = (body) => __async(this, null, function* () {
-      (0, import_debug.debugLog)(`http_message(data:${body})`);
+      (0, import_debug.debugLog)(`http_message($0)>`, body);
       this._handleMessage(body);
     });
   }

package/dist/api/http-client.js

@@ -53,19 +53,21 @@ function createHttpClient(opts) {
 }
 function createConnection(opts) {
   const url = opts.host.replace(/^wss:/, "https:");
+  const REQ_HEADER_ID = "x-wapi-req-id";
   function onmessage(body) {
     return __async(this, null, function* () {
-      debugLog(`http_createConnection>message(body:${body})`);
+      debugLog(`http_createConnection>message(body:$0)`, body);
     });
   }
   function send(body, jwt) {
     return __async(this, null, function* () {
       const jsonBody = JSON.parse(body);
-      const res = yield fetch(`${opts.host}/api`, {
+      const res = yield fetch(`${url}/api`, {
         keepalive: true,
         method: "POST",
         headers: {
-          Authorization: `Bearer ${jwt}`
+          Authorization: `Bearer ${jwt}`,
+          [REQ_HEADER_ID]: jsonBody == null ? void 0 : jsonBody.id
         },
         body
       });
@@ -73,16 +75,18 @@ function createConnection(opts) {
       this.onmessage(__spreadProps(__spreadValues({}, responseBody), { id: jsonBody.id }));
     });
   }
+  const connectId = getRandomHex();
   const $connect = fetch(`${url}/api`, {
     method: "POST",
     headers: {
-      Authorization: `Bearer ${opts.jwt}`
+      Authorization: `Bearer ${opts.jwt}`,
+      [REQ_HEADER_ID]: connectId
     },
     body: JSON.stringify({
       jsonrpc: JSONRPC.version,
       method: "authenticationCheck",
       params: {},
-      id: getRandomHex()
+      id: connectId
     })
   }).then((res) => res.json()).then((res) => {
     if (res.error) {
@@ -99,6 +103,7 @@ function createConnection(opts) {
 var HttpClient = class extends BaseClient {
   constructor(connection, opts) {
     super(connection, WapiClientType.https, connection.$connect);
+    this.host = opts.host;
     this.jwt = opts.jwt;
     this.$connect.then(() => {
       this._ready();
@@ -113,7 +118,7 @@ var HttpClient = class extends BaseClient {
   _ready() {
     this._setConnected(true);
     this._connection.onmessage = (body) => __async(this, null, function* () {
-      debugLog(`http_message(data:${body})`);
+      debugLog(`http_message($0)>`, body);
       this._handleMessage(body);
     });
   }

package/dist/api/ws-client.browser.cjs

@@ -143,6 +143,7 @@ var WsClient = class extends import_base_client.BaseClient {
     super(initial.ws, import__.WapiClientType.ws, initial.$connect);
     this._tryToReconnect = true;
     this._config = config;
+    this.host = config.host;
     this.$connect.then((_id) => {
       this.socId = _id;
       return this._ready();
@@ -166,7 +167,7 @@ var WsClient = class extends import_base_client.BaseClient {
     this._setConnected(true);
     this._connection.onmessage = (event) => {
       const { data, type } = event;
-      (0, import_debug.debugLog)(`message(type:${type},data:${data})`);
+      (0, import_debug.debugLog)(`message(type:${type},data:$0)`, data);
       if (type === "message") {
         const obj = JSON.parse(data.toString());
         this._handleMessage(obj);
@@ -175,11 +176,11 @@ var WsClient = class extends import_base_client.BaseClient {
     };
     this._connection.onerror = (event) => {
       const { message, error, type } = event;
-      (0, import_debug.debugLog)(`error(message:${message},error:${error},type:${type})`);
+      (0, import_debug.debugLog)(`error(message:$0,error:$1,type:${type})`, message, error);
     };
     this._connection.onclose = (event) => {
       const { reason, code, wasClean } = event;
-      (0, import_debug.debugLog)(`close(reason:${reason},code:${code},wasClean:${wasClean})`);
+      (0, import_debug.debugLog)(`close(reason:$0,code:${code},wasClean:${wasClean})`, reason);
       this._setConnected(false);
       clearTimeout(this._pingTimeout);
       this._connectionLost();

package/dist/api/ws-client.browser.js

@@ -125,6 +125,7 @@ var WsClient = class extends BaseClient {
     super(initial.ws, WapiClientType.ws, initial.$connect);
     this._tryToReconnect = true;
     this._config = config;
+    this.host = config.host;
     this.$connect.then((_id) => {
       this.socId = _id;
       return this._ready();
@@ -148,7 +149,7 @@ var WsClient = class extends BaseClient {
     this._setConnected(true);
     this._connection.onmessage = (event) => {
       const { data, type } = event;
-      debugLog(`message(type:${type},data:${data})`);
+      debugLog(`message(type:${type},data:$0)`, data);
       if (type === "message") {
         const obj = JSON.parse(data.toString());
         this._handleMessage(obj);
@@ -157,11 +158,11 @@ var WsClient = class extends BaseClient {
     };
     this._connection.onerror = (event) => {
       const { message, error, type } = event;
-      debugLog(`error(message:${message},error:${error},type:${type})`);
+      debugLog(`error(message:$0,error:$1,type:${type})`, message, error);
     };
     this._connection.onclose = (event) => {
       const { reason, code, wasClean } = event;
-      debugLog(`close(reason:${reason},code:${code},wasClean:${wasClean})`);
+      debugLog(`close(reason:$0,code:${code},wasClean:${wasClean})`, reason);
       this._setConnected(false);
       clearTimeout(this._pingTimeout);
       this._connectionLost();

package/dist/api/ws-client.cjs

@@ -61,7 +61,7 @@ var import_base_client = require('./base-client.cjs');
 var import_connection = require('./connection/connection.enums.cjs');
 var import__ = require('../index.cjs');
 var _a;
-var CLIENT_VERSION = (_a = '0.8.4') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.8.13') != null ? _a : "";
 function createWsClient(opts) {
   const initialConnection = createConnection(opts);
   return new WsClient(initialConnection, opts);
@@ -149,6 +149,7 @@ var WsClient = class extends import_base_client.BaseClient {
     super(initial.ws, import__.WapiClientType.ws, initial.$connect);
     this._tryToReconnect = true;
     this._config = config;
+    this.host = config.host;
     this.$connect.then((_id) => {
       this.socId = _id;
       return this._ready();
@@ -172,7 +173,7 @@ var WsClient = class extends import_base_client.BaseClient {
     this._setConnected(true);
     this._connection.onmessage = (event) => {
       const { data, type } = event;
-      (0, import_debug.debugLog)(`message(type:${type},data:${data})`);
+      (0, import_debug.debugLog)(`message(type:${type},data:$0)`, data);
       if (type === "message") {
         const obj = JSON.parse(data.toString());
         this._handleMessage(obj);
@@ -181,11 +182,11 @@ var WsClient = class extends import_base_client.BaseClient {
     };
     this._connection.onerror = (event) => {
       const { message, error, type } = event;
-      (0, import_debug.debugLog)(`error(message:${message},error:${error},type:${type})`);
+      (0, import_debug.debugLog)(`error(message:$0,error:$1,type:${type})`, message, error);
     };
     this._connection.onclose = (event) => {
       const { reason, code, wasClean } = event;
-      (0, import_debug.debugLog)(`close(reason:${reason},code:${code},wasClean:${wasClean})`);
+      (0, import_debug.debugLog)(`close(reason:$0,code:${code},wasClean:${wasClean})`, reason);
       this._setConnected(false);
       clearTimeout(this._pingTimeout);
       this._connectionLost();

package/dist/api/ws-client.js

@@ -35,7 +35,7 @@ import {
 } from "./connection/connection.enums";
 import { WapiClientType } from "../index";
 var _a;
-var CLIENT_VERSION = (_a = '0.8.4') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.8.13') != null ? _a : "";
 function createWsClient(opts) {
   const initialConnection = createConnection(opts);
   return new WsClient(initialConnection, opts);
@@ -123,6 +123,7 @@ var WsClient = class extends BaseClient {
     super(initial.ws, WapiClientType.ws, initial.$connect);
     this._tryToReconnect = true;
     this._config = config;
+    this.host = config.host;
     this.$connect.then((_id) => {
       this.socId = _id;
       return this._ready();
@@ -146,7 +147,7 @@ var WsClient = class extends BaseClient {
     this._setConnected(true);
     this._connection.onmessage = (event) => {
       const { data, type } = event;
-      debugLog(`message(type:${type},data:${data})`);
+      debugLog(`message(type:${type},data:$0)`, data);
       if (type === "message") {
         const obj = JSON.parse(data.toString());
         this._handleMessage(obj);
@@ -155,11 +156,11 @@ var WsClient = class extends BaseClient {
     };
     this._connection.onerror = (event) => {
       const { message, error, type } = event;
-      debugLog(`error(message:${message},error:${error},type:${type})`);
+      debugLog(`error(message:$0,error:$1,type:${type})`, message, error);
     };
     this._connection.onclose = (event) => {
       const { reason, code, wasClean } = event;
-      debugLog(`close(reason:${reason},code:${code},wasClean:${wasClean})`);
+      debugLog(`close(reason:$0,code:${code},wasClean:${wasClean})`, reason);
       this._setConnected(false);
       clearTimeout(this._pingTimeout);
       this._connectionLost();

package/dist/client.cjs

@@ -66,7 +66,7 @@ var import_errors = require('./lib/errors.cjs');
 var import_fns = require('./fns/index.cjs');
 var import_import_data = require('./fns/import-data/import-data.guards.cjs');
 var _a;
-var CLIENT_VERSION = (_a = '0.8.4') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.8.13') != null ? _a : "";
 var Client = class {
   /**
    * @internal

package/dist/client.js

@@ -50,7 +50,7 @@ import {
   isImportDataFnInput
 } from "./fns/import-data/import-data.guards";
 var _a;
-var CLIENT_VERSION = (_a = '0.8.4') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.8.13') != null ? _a : "";
 var Client = class {
   /**
    * @internal

package/dist/lib/debug.browser.cjs

@@ -24,6 +24,10 @@ __export(debug_exports, {
 module.exports = __toCommonJS(debug_exports);
 function debugLog(...args) {
   if (window.WAPI_DEBUG) {
-    console.log(...args);
+    console.log(
+      ...args.map(
+        (arg) => arg && typeof arg === "object" ? JSON.stringify(arg) : arg
+      )
+    );
   }
 }

package/dist/lib/debug.browser.js

@@ -1,7 +1,11 @@
 // src/lib/debug.ts
 function debugLog(...args) {
   if (window.WAPI_DEBUG) {
-    console.log(...args);
+    console.log(
+      ...args.map(
+        (arg) => arg && typeof arg === "object" ? JSON.stringify(arg) : arg
+      )
+    );
   }
 }
 export {

package/dist/lib/debug.cjs

@@ -24,7 +24,11 @@ __export(debug_exports, {
 module.exports = __toCommonJS(debug_exports);
 function debugLog(...args) {
   if (process.env.WAPI_DEBUG) {
-    console.log(...args);
+    console.log(
+      ...args.map(
+        (arg) => arg && typeof arg === "object" ? JSON.stringify(arg) : arg
+      )
+    );
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/lib/debug.js

@@ -1,7 +1,11 @@
 // src/lib/debug.ts
 function debugLog(...args) {
   if (process.env.WAPI_DEBUG) {
-    console.log(...args);
+    console.log(
+      ...args.map(
+        (arg) => arg && typeof arg === "object" ? JSON.stringify(arg) : arg
+      )
+    );
   }
 }
 export {

package/dist/lib/isomorphic/web/streams.browser.cjs

@@ -95,6 +95,9 @@ var ReadStream = class {
     this.end();
     return this;
   }
+  get destroyed() {
+    return this._finished;
+  }
 };
 var ReadWriteStream = class {
   constructor() {

package/dist/lib/isomorphic/web/streams.browser.js

@@ -71,6 +71,9 @@ var ReadStream = class {
     this.end();
     return this;
   }
+  get destroyed() {
+    return this._finished;
+  }
 };
 var ReadWriteStream = class {
   constructor() {

package/dist/lib/stream-promise.browser.cjs

@@ -42,6 +42,7 @@ module.exports = __toCommonJS(stream_promise_exports);
 var import_errors = require('./errors.cjs');
 var import_jsonrpc = require('../api/jsonrpc/jsonrpc.enums.cjs');
 var import_streams = require('./isomorphic/web/streams.cjs');
+var import_debug = require('./debug.cjs');
 var StreamPromise = class {
   constructor(makeRequest) {
     this.streamObject = new import_streams.ReadStream({
@@ -54,6 +55,7 @@ var StreamPromise = class {
     this.makeRequest = makeRequest;
   }
   start(asMode) {
+    (0, import_debug.debugLog)("start request as", asMode);
     if (this.mode && this.mode !== asMode) {
       throw new Error("Already in use as " + this.mode);
     }
@@ -77,6 +79,7 @@ var StreamPromise = class {
       this.streamObject.on(
         "data",
         (chunk) => {
+          (0, import_debug.debugLog)("stream data", chunk);
           if (!chunk) {
             this.outStreamObject.push(chunk);
           }
@@ -102,6 +105,7 @@ var StreamPromise = class {
           this.outStreamObject.push(chunk);
         }
       ).on("end", () => {
+        (0, import_debug.debugLog)("stream ended");
         const lastMessage = internalArr.pop();
         if (!lastMessage) {
           return;
@@ -123,6 +127,7 @@ var StreamPromise = class {
         this.outStreamObject.push(lastMessage);
         this.outStreamObject.push(null);
       }).on("error", (err) => {
+        (0, import_debug.debugLog)("stream error", err);
         this.outStreamObject.destroy(err);
       });
       return;
@@ -133,6 +138,7 @@ var StreamPromise = class {
         "data",
         (chunk) => {
           var _a;
+          (0, import_debug.debugLog)("streamPromise data", chunk);
           if (chunk === void 0) {
             return;
           }
@@ -153,6 +159,7 @@ var StreamPromise = class {
           internalMap.set(chunk.prop, arr);
         }
       ).on("end", () => {
+        (0, import_debug.debugLog)("streamPromise end");
         const lastMessage = internalArr.pop();
         if (!lastMessage) {
           return;
@@ -186,7 +193,10 @@ var StreamPromise = class {
             result
           );
         }
-      }).on("error", this.reject);
+      }).on("error", (reason) => {
+        (0, import_debug.debugLog)("streamPromise error", reason);
+        return this.reject(reason);
+      });
     }
   }
   then(onfulfilled, onrejected) {