wspromisify 2.5.0 → 2.6.1

package/dist/bundle.cjs

@@ -1 +1 @@
-"use strict";const e=Symbol("Placeholder"),t=t=>{let n=0;for(const s of t)s!==e&&n++;return n},n=(t,n)=>{const s=t.length,o=t.slice(),r=n.length;let i=r,c=0;for(;i&&c<s;c++)o[c]===e&&(o[c]=n[r-i],i--);for(c=s;i;c++,i--)o[c]=n[r-i];return o},s=(e,o,r)=>{const i=e.length-o.length-t(r);if(i<1)return e(...n(o,r));{const t=(...t)=>s(e,n(o,r),t);return t.$args_left=i,t}},o=e=>(...n)=>e.length>t(n)?s(e,[],n):e(...n);function r(t){return function(n,s){const o=n===e,r=arguments.length;if(1===r&&o)throw new Error("Senseless placeholder usage.");return r>1?o?(t=>function(n){return n===e?t:t(n)})((e=>t(e,s))):t(n,s):e=>t(n,e)}}function i(e){return o(e)}const c=void 0,l=1/0,u=e=>typeof e,a=e=>null===e,h={u:"U",b:"B",n:"N",s:"S",f:"F"},f=Symbol(),d=e=>{const t=u(e);return"object"===t?a(e)?"Null":e.constructor.name:h[t[0]]+t.slice(1)},p=e=>e.length,g=r(((e,t)=>e===t)),m=r(((e,t)=>{const n=d(e);if(g(n,d(t))&&(g(n,"Object")||g(n,"Array"))){if(a(e)||a(t))return g(e,t);if(g(e,t))return!0;for(const n of[e,t])for(const s in n)if(!(g(n,t)&&s in e||g(n,e)&&s in t&&m(e[s],t[s])))return!1;return!0}return g(e,t)})),y=r(((e,t)=>(t.push(e),t))),w=i(((e,t,n)=>n.reduce(e,t))),b=o(((e,t,n,s)=>e(s)?t(s):n(s))),_=(...t)=>(...n)=>{let s,o=!0;for(let r=p(t)-1;r>-1;r--)o?(o=!1,s=t[r](...n)):s=s===e?t[r]():t[r](s);return s},k=r(((e,t)=>t[e])),S=i(((e,t,n)=>n.slice(e,(e=>"number"==u(e))(t)?t:l))),v=k(0);S(1,l);const E=r(((e,t)=>t.find(e))),P=e=>()=>e,W=r(((e,t)=>t.split(e))),j=P(!0),N=P(!1),q=r(((e,t)=>w(((t,n)=>E((t=>e(n,t)),t)?t:y(n,t)),[],t)))(m),z=i(((e,t,n)=>p(t)?(e=>a(e)||(e=>e===c)(e))(n)?e:_((s=>s in n?z(e,S(1,l,t),n[s]):e),v)(t):n));z(c),_(b(m(f),N,j),z(f));const Q=r(((e,t)=>t.map(e))),{floor:A}=Math,C="0123456789abcdefghijklmnopqrstuvwxyz",O=_((e=>Object.fromEntries(e)),Q(((e,t)=>[e,t])),W(""));class ${abc;abclen;c2pos;standard;setABC(e){if(!_(m(p(t=e)),p,q,W(""))(t))throw new Error("Not all chars are unique!");var t;this.abc=e,this.abclen=e.length,this.standard=C.startsWith(e),this.c2pos=O(e)}zip(e){const{abc:t,abclen:n}=this;let s="";for(;e>0;)s=t[e%n]+s,e=A(e/n);return s||"0"}unzip(e){const{standard:t,abclen:n,c2pos:s}=this;if(t)return parseInt(e,n);const o=e.length;let r=0;for(let t=0;t<o;t++)r+=s[e[t]]*n**(o-t-1);return r}constructor(e){this.setABC(e||C+"ABCDEFGHIJKLMNOPQRSTUVWXYZ")}}const B=new $;B.setABC.bind(B),B.zip.bind(B),B.unzip.bind(B);const R=(()=>{try{return WebSocket||null}catch{return null}})(),I=(e,t,n)=>e.addEventListener(t,n),T=(e,t)=>setTimeout(t,e),D={data_type:"json",log:()=>null,timer:!1,url:"localhost",timeout:1400,reconnect:2,lazy:!1,socket:null,adapter:(e,t)=>new WebSocket(e,t),encode:(e,t,{server:n})=>JSON.stringify({[n.id_key]:e,[n.data_key]:t}),decode:e=>JSON.parse(e),protocols:[],pipes:[],server:{id_key:"id",data_key:"data"},ping:{interval:55,content:{}}},U=Symbol("Placeholder"),x=e=>{let t=0;for(const n of e)n!==U&&t++;return t},F=(e,t)=>{const n=e.length,s=e.slice(),o=t.length;let r=o,i=0;for(;r&&i<n;i++)s[i]===U&&(s[i]=t[o-r],r--);for(i=n;r;i++,r--)s[i]=t[o-r];return s},J=(e,t,n)=>{const s=e.length-t.length-x(n);if(s<1)return e(...F(t,n));{const o=(...s)=>J(e,F(t,n),s);return o.$args_left=s,o}},L=e=>(...t)=>e.length>x(t)?J(e,[],t):e(...t);function M(e){return function(t,n){const s=t===U,o=arguments.length;if(1===o&&s)throw new Error("Senseless placeholder usage.");return o>1?s?(e=>function(t){return t===U?e:e(t)})((t=>e(t,n))):e(t,n):n=>e(t,n)}}function G(e){return L(e)}const H=void 0,K=1/0,V=e=>typeof e,X=e=>null===e,Y=e=>"number"==V(e),Z={u:"U",b:"B",n:"N",s:"S",f:"F"},ee=Symbol(),te=e=>{const t=V(e);return"object"===t?X(e)?"Null":e.constructor.name:Z[t[0]]+t.slice(1)},ne=e=>e.length,se=e=>X(e)||(e=>e===H)(e),oe=M(((e,t)=>e===t)),re=M(((e,t)=>{const n=te(e);if(oe(n,te(t))&&(oe(n,"Object")||oe(n,"Array"))){if(X(e)||X(t))return oe(e,t);if(oe(e,t))return!0;for(const n of[e,t])for(const s in n)if(!(oe(n,t)&&s in e||oe(n,e)&&s in t&&re(e[s],t[s])))return!1;return!0}return oe(e,t)})),ie=M(((e,t)=>(t.push(e),t))),ce=G(((e,t,n)=>n.reduce(e,t))),le=L(((e,t,n,s)=>e(s)?t(s):n(s))),ue=(...e)=>(...t)=>{let n,s=!0;for(let o=ne(e)-1;o>-1;o--)s?(s=!1,n=e[o](...t)):n=n===U?e[o]():e[o](n);return n},ae=M(((e,t)=>t[e])),he=G(((e,t,n)=>n.slice(e,Y(t)?t:K))),fe=ae(0);he(1,K);const de=M(((e,t)=>t.find(e))),pe=e=>()=>e,ge=pe(!0),me=pe(!1),ye=M(((e,t)=>ce(((t,n)=>de((t=>e(n,t)),t)?t:ie(n,t)),[],t)));ye(re);const we=e=>{let t,n=!1;return(...s)=>n?t:(n=!0,t=e(...s))},be=G(((e,t,n)=>ne(t)?se(n)?e:ue((s=>s in n?be(e,he(1,K,t),n[s]):e),fe)(t):n));be(H),ue(le(re(ee),me,ge),be(ee));const _e=new $;module.exports=class{open=!1;ws=null;forcibly_closed=!1;reconnect_timeout=null;queue={};messages=[];onReadyQueue=[];onCloseQueue=[];handlers={open:[],close:[],message:[],error:[]};config={};init_flush(){this.queue={},this.messages=[]}log(e,t=null,n=null){const s=this.config;null!==n?s.log(e,n,t):s.timer?s.log(e,null,t):s.log(e,t)}initSocket(e){const t=this.config;this.open=!0,this.onReadyQueue.forEach((e=>e())),this.onReadyQueue.splice(0);const{id_key:n,data_key:s}=t.server;if(this.handlers.open.forEach((t=>t(e))),this.messages.forEach((e=>e.send())),null!==this.reconnect_timeout&&(clearInterval(this.reconnect_timeout),this.reconnect_timeout=null),t.ping){const e=setInterval((()=>{this.open&&this.send(t.ping.content),this.forcibly_closed&&clearInterval(e)}),1e3*t.ping.interval)}I(e,"close",(async(...e)=>{this.log("close"),this.open=!1,this.onCloseQueue.forEach((e=>e())),this.onCloseQueue.splice(0),this.handlers.close.forEach((t=>t(...e)));const n=t.reconnect;if("number"!=typeof n||isNaN(n)||this.forcibly_closed)this.ws=null,this.open=!1;else{const e=async()=>{this.log("reconnect"),null!==this.ws&&(this.ws.close(),this.ws=null);null!==await this.connect()&&(this.reconnect_timeout=setTimeout(e,1e3*n))};e()}this.forcibly_closed=!1})),I(e,"message",(e=>{try{const o=t.decode(e.data);if(this.handlers.message.forEach((t=>t({...e,data:o}))),o[n]){const e=this.queue[o[n]];if(e){const t=e.sent_time?Date.now()-e.sent_time:null;this.log("message",o[s],t),e.ff(o[s]),clearTimeout(e.timeout),delete this.queue[o[n]]}}}catch(t){console.error(t,`WSP: Decode error. Got: ${e.data}`)}}))}async connect(){return new Promise((e=>{if(!0===this.open)return e(null);const t=this.config,n=t.socket||t.adapter(t.url,t.protocols);if(this.ws=n,!n||n.readyState>1)return this.ws=null,this.log("error","ready() on closing or closed state! status 2."),e(2);I(n,"error",we((t=>(this.log("error","status 3."),this.handlers.error.forEach((e=>e(t))),this.ws=null,e(3))))),n.readyState?(this.initSocket(n),e(null)):I(n,"open",we((()=>(this.log("open"),this.initSocket(n),e(null)))))}))}get socket(){return this.ws}async ready(){return new Promise((e=>{this.open?e():this.onReadyQueue.push(e)}))}on(e,t,n=ge,s=!1){const o=e=>n(e)&&t(e);return s?I(this.ws,e,o):this.handlers[e].push(o)}async close(){return new Promise(((e,t)=>{null===this.ws?t("WSP: closing a non-inited socket!"):(this.open=!1,this.onCloseQueue.push((()=>{this.init_flush(),this.ws=null,this.forcibly_closed=!0,e(null)})),this.ws.close())}))}async send(e,t={}){this.log("send",e);const n=this.config,s={},o=n.server.data_key,r=n.lazy&&!this.open,i=_e.zip(2147483637*Math.random()|0);if("object"==typeof t.top){if(t.top[o])throw new Error("Attempting to set data key/token via send() options!");Object.assign(s,t.top)}if(n.pipes.forEach((t=>e=t(e))),!0===this.open)this.ws.send(n.encode(i,e,n));else if(!1===this.open||r)this.messages.push({send:()=>this.ws.send(n.encode(i,e,n))}),r&&this.connect();else if(null===this.open)throw new Error("Attempting to send via closed WebSocket connection!");return new Promise(((t,s)=>{this.queue[i]={ff:t,data_type:n.data_type,sent_time:n.timer?Date.now():null,timeout:T(n.timeout,(()=>{this.queue[i]&&(s({"Websocket timeout expired: ":n.timeout,"for the message ":e}),delete this.queue[i])}))}}))}constructor(e={}){this.config=(e=>{if(null===R&&!("adapter"in e))throw new Error("\n    This platform has no native WebSocket implementation.\n    Please use 'ws' package as an adapter.\n    See https://github.com/houd1ni/WebsocketPromisify/issues/23\n  ");const t=Object.assign({},D,e),n=t.url;if("/"==n[0])try{const e=location.protocol.includes("s:")?"wss":"ws";t.url=`${e}://${location.hostname}:${location.port}${n}`}catch(e){throw new Error("WSP: URL starting with / in non-browser environment!")}return t})(e),this.init_flush(),this.open=!1,this.reconnect_timeout=null,this.forcibly_closed=!1,this.config.lazy||this.connect()}};
+"use strict";const t=Symbol("Placeholder"),e=e=>{let n=0;for(const o of e)o!==t&&n++;return n},n=(e,n)=>{const o=e.length,s=e.slice(),r=n.length;let i=r,l=0;for(;i&&l<o;l++)s[l]===t&&(s[l]=n[r-i],i--);for(l=o;i;l++,i--)s[l]=n[r-i];return s},o=(t,s,r)=>{const i=t.length-s.length-e(r);if(i<1)return t(...n(s,r));{const e=(...e)=>o(t,n(s,r),e);return e.$args_left=i,e}},s=t=>(...n)=>t.length>e(n)?o(t,[],n):t(...n);function r(e){return function(n,o){const s=n===t,r=arguments.length;if(1===r&&s)throw new Error("Senseless placeholder usage.");return r>1?s?(e=>function(n){return n===t?e:e(n)})((t=>e(t,o))):e(n,o):t=>e(n,t)}}function i(t){return s(t)}const l=void 0,c=1/0,u=t=>typeof t,a=t=>null===t,h={u:"U",b:"B",n:"N",s:"S",f:"F"},f=Symbol(),d=t=>{const e=u(t);return"object"===e?a(t)?"Null":t.constructor.name:h[e[0]]+e.slice(1)},p=t=>t.length,g=r(((t,e)=>t===e)),m=r(((t,e)=>{const n=d(t);if(g(n,d(e))&&(g(n,"Object")||g(n,"Array"))){if(a(t)||a(e))return g(t,e);if(g(t,e))return!0;for(const n of[t,e])for(const o in n)if(!(g(n,e)&&o in t||g(n,t)&&o in e&&m(t[o],e[o])))return!1;return!0}return g(t,e)})),y=r(((t,e)=>(e.push(t),e))),w=i(((t,e,n)=>n.reduce(t,e))),b=s(((t,e,n,o)=>t(o)?e(o):n(o))),_=(...e)=>(...n)=>{let o,s=!0;for(let r=p(e)-1;r>-1;r--)s?(s=!1,o=e[r](...n)):o=o===t?e[r]():e[r](o);return o},S=r(((t,e)=>e[t])),k=i(((t,e,n)=>n.slice(t,(t=>"number"==u(t))(e)?e:c))),v=S(0);k(1,c);const E=r(((t,e)=>e.find(t))),P=t=>()=>t,W=r(((t,e)=>e.split(t))),j=P(!0),A=P(!1),N=r(((t,e)=>w(((e,n)=>E((e=>t(n,e)),e)?e:y(n,e)),[],e)))(m),q=i(((t,e,n)=>p(e)?(t=>a(t)||(t=>t===l)(t))(n)?t:_((o=>o in n?q(t,k(1,c,e),n[o]):t),v)(e):n));q(l),_(b(m(f),A,j),q(f));const Q=r(((t,e)=>e.map(t))),{floor:z}=Math,C="0123456789abcdefghijklmnopqrstuvwxyz",O=_((t=>Object.fromEntries(t)),Q(((t,e)=>[t,e])),W(""));class ${abc;abclen;c2pos;standard;setABC(t){if(!_(m(p(e=t)),p,N,W(""))(e))throw new Error("Not all chars are unique!");var e;this.abc=t,this.abclen=t.length,this.standard=C.startsWith(t),this.c2pos=O(t)}zip(t){const{abc:e,abclen:n}=this;let o="";for(;t>0;)o=e[t%n]+o,t=z(t/n);return o||"0"}unzip(t){const{standard:e,abclen:n,c2pos:o}=this;if(e)return parseInt(t,n);const s=t.length;let r=0;for(let e=0;e<s;e++)r+=o[t[e]]*n**(s-e-1);return r}constructor(t){this.setABC(t||C+"ABCDEFGHIJKLMNOPQRSTUVWXYZ")}}const B=new $;B.setABC.bind(B),B.zip.bind(B),B.unzip.bind(B);const R=(()=>{try{return WebSocket||null}catch{return null}})(),I=(t,e,n)=>t.addEventListener(e,n),T=(t,e)=>setTimeout(e,t),D={data_type:"json",log:()=>null,timer:!1,url:"localhost",timeout:1400,reconnect:2,lazy:!1,socket:null,adapter:(t,e)=>new WebSocket(t,e),encode:(t,e,{server:n})=>JSON.stringify({[n.id_key]:t,[n.data_key]:e}),decode:t=>JSON.parse(t),protocols:[],pipes:[],server:{id_key:"id",data_key:"data"},ping:{interval:55,content:{}}},U=Symbol("Placeholder"),x=t=>{let e=0;for(const n of t)n!==U&&e++;return e},F=(t,e)=>{const n=t.length,o=t.slice(),s=e.length;let r=s,i=0;for(;r&&i<n;i++)o[i]===U&&(o[i]=e[s-r],r--);for(i=n;r;i++,r--)o[i]=e[s-r];return o},J=(t,e,n)=>{const o=t.length-e.length-x(n);if(o<1)return t(...F(e,n));{const s=(...o)=>J(t,F(e,n),o);return s.$args_left=o,s}},L=t=>(...e)=>t.length>x(e)?J(t,[],e):t(...e);function M(t){return function(e,n){const o=e===U,s=arguments.length;if(1===s&&o)throw new Error("Senseless placeholder usage.");return s>1?o?(t=>function(e){return e===U?t:t(e)})((e=>t(e,n))):t(e,n):n=>t(e,n)}}function G(t){return L(t)}const H=void 0,K=1/0,V=t=>typeof t,X=t=>null===t,Y=t=>"number"==V(t),Z={u:"U",b:"B",n:"N",s:"S",f:"F"},tt=Symbol(),et=t=>{const e=V(t);return"object"===e?X(t)?"Null":t.constructor.name:Z[e[0]]+e.slice(1)},nt=t=>t.length,ot=t=>X(t)||(t=>t===H)(t),st=M(((t,e)=>t===e)),rt=M(((t,e)=>{const n=et(t);if(st(n,et(e))&&(st(n,"Object")||st(n,"Array"))){if(X(t)||X(e))return st(t,e);if(st(t,e))return!0;for(const n of[t,e])for(const o in n)if(!(st(n,e)&&o in t||st(n,t)&&o in e&&rt(t[o],e[o])))return!1;return!0}return st(t,e)})),it=M(((t,e)=>(e.push(t),e))),lt=G(((t,e,n)=>n.reduce(t,e))),ct=M(((t,e)=>{const n=(t=>Array.isArray(t))(e);let o,s;n&&(o=0,s=[]);for(let o in e)t(e[o],o)||(n?s.push(+o):delete e[o]);if(n)for(const t of s)e.splice(t-o++,1);return e})),ut=L(((t,e,n,o)=>t(o)?e(o):n(o))),at=(...t)=>(...e)=>{let n,o=!0;for(let s=nt(t)-1;s>-1;s--)o?(o=!1,n=t[s](...e)):n=n===U?t[s]():t[s](n);return n},ht=M(((t,e)=>e[t])),ft=G(((t,e,n)=>n.slice(t,Y(e)?e:K))),dt=ht(0);ft(1,K);const pt=M(((t,e)=>e.find(t))),gt=t=>()=>t,mt=gt(!0),yt=gt(!1),wt=M(((t,e)=>lt(((e,n)=>pt((e=>t(n,e)),e)?e:it(n,e)),[],e)));wt(rt);const bt=t=>{let e,n=!1;return(...o)=>n?e:(n=!0,e=t(...o))},_t=G(((t,e,n)=>nt(e)?ot(n)?t:at((o=>o in n?_t(t,ft(1,K,e),n[o]):t),dt)(e):n));_t(H),at(ut(rt(tt),yt,mt),_t(tt));const St=new $;module.exports=class{open=!1;ws=null;forcibly_closed=!1;reconnect_timeout=null;queue={};onReadyQueue=[];onCloseQueue=[];handlers={open:[],close:[],message:[],error:[],timeout:[]};config={};init_flush(){ct(yt,this.queue)}call(t,...e){for(const n of this.handlers[t])n(...e)}log(t,e=null,n=null){const o=this.config;null!==n?o.log(t,n,e):o.timer?o.log(t,null,e):o.log(t,e)}initSocket(t){const{queue:e,config:n}=this;this.open=!0,this.onReadyQueue.forEach((t=>t())),this.onReadyQueue.splice(0);const{id_key:o,data_key:s}=n.server;this.call("open",t);for(const n in e)t.send(e[n].msg);if(null!==this.reconnect_timeout&&(clearInterval(this.reconnect_timeout),this.reconnect_timeout=null),n.ping){const t=setInterval((()=>{this.open&&this.send(n.ping.content),this.forcibly_closed&&clearInterval(t)}),1e3*n.ping.interval)}I(t,"close",(async(...t)=>{this.log("close"),this.open=!1,this.ws=null,this.onCloseQueue.forEach((t=>t())),this.onCloseQueue.splice(0),this.call("close",...t);const e=n.reconnect;if("number"==typeof e&&!isNaN(e)&&!this.forcibly_closed){const t=async()=>{this.log("reconnect"),null!==this.ws&&(this.ws.close(),this.ws=null);null!==await this.connect()&&(this.reconnect_timeout=setTimeout(t,1e3*e))};t()}this.forcibly_closed=!1})),I(t,"message",(t=>{try{const e=n.decode(t.data);if(this.call("message",{...t,data:e}),e[o]){const t=this.queue[e[o]];if(t){const n=t.sent_time?Date.now()-t.sent_time:null;this.log("message",e[s],n),t.ff(e[s])}}}catch(e){console.error(e,`WSP: Decode error. Got: ${t.data}`)}}))}connect(){return new Promise((t=>{if(!0===this.open)return t(null);const e=this.config,n=e.socket||e.adapter(e.url,e.protocols);if(this.ws=n,!n||n.readyState>1)return this.ws=null,this.log("error","ready() on closing or closed state! status 2."),t(2);const o=bt(t);I(n,"error",bt((t=>{this.log("error","status 3. Err: "+t.message),this.call("error",t),this.ws=null,o(3)}))),n.readyState?(this.initSocket(n),o(null)):I(n,"open",bt((()=>{this.log("open"),this.initSocket(n),o(null)})))}))}get socket(){return this.ws}async ready(){return new Promise((t=>{this.open?t():this.onReadyQueue.push(t)}))}on(t,e,n=mt,o=!1){const s=t=>n(t)&&e(t);return o?I(this.ws,t,s):this.handlers[t].push(s)}async close(){return new Promise(((t,e)=>{null===this.ws?e("WSP: closing a non-inited socket!"):(this.open=!1,this.onCloseQueue.push((()=>{this.init_flush(),this.ws=null,this.forcibly_closed=!0,t(null)})),this.ws.close())}))}async send(t,e={}){this.log("send",t);const{config:n,ws:o,forcibly_closed:s,queue:r}=this,i={},l=n.server.data_key,c=St.zip(2147483637*Math.random()|0);if("object"==typeof e.top){if(e.top[l])throw new Error("Attempting to set data key/token via send() options!");Object.assign(i,e.top)}if(n.pipes.forEach((e=>t=e(t))),s)throw new Error("Attempting to send via closed WebSocket connection!");this.open||this.connect();const u=await n.encode(c,t,n);return 1===o?.readyState&&o.send(u),new Promise(((e,o)=>{this.queue[c]={msg:u,ff(t){e(t),clearTimeout(this.timeout),delete r[c]},data_type:n.data_type,sent_time:n.timer?Date.now():null,timeout:T(n.timeout,(()=>{this.queue[c]&&(this.call("timeout",t),o({"Websocket timeout expired: ":n.timeout,"for the message ":t}),delete r[c])}))}}))}constructor(t={}){this.config=(t=>{if(null===R&&!("adapter"in t))throw new Error("\n    This platform has no native WebSocket implementation.\n    Please use 'ws' package as an adapter.\n    See https://github.com/houd1ni/WebsocketPromisify/issues/23\n  ");const e=Object.assign({},D,t),n=e.url;if("/"==n[0])try{const t=location.protocol.includes("s:")?"wss":"ws";e.url=`${t}://${location.hostname}:${location.port}${n}`}catch(t){throw new Error("WSP: URL starting with / in non-browser environment!")}return e})(t),this.init_flush(),this.config.lazy||this.connect()}};

package/dist/bundle.d.ts

@@ -4,7 +4,7 @@ declare namespace wsc {
 	interface DataObject {
 		[key: string]: any;
 	}
-	type WSEvent = "open" | "message" | "close" | "error";
+	type WSEvent = "open" | "message" | "close" | "error" | "timeout";
 	/** Minimal socket-like interface. */
 	interface Socket {
 		readyState: number;
@@ -47,6 +47,13 @@ declare namespace wsc {
 		top: any;
 		data_type: DataType;
 	}
+	interface Message {
+		msg: any;
+		ff(x: any): any;
+		data_type: DataType;
+		sent_time: number | null;
+		timeout: NodeJS.Timeout;
+	}
 }
 declare class WebSocketClient {
 	private open;
@@ -54,12 +61,12 @@ declare class WebSocketClient {
 	private forcibly_closed;
 	private reconnect_timeout;
 	private queue;
-	private messages;
 	private onReadyQueue;
 	private onCloseQueue;
 	private handlers;
 	private config;
 	private init_flush;
+	private call;
 	private log;
 	private initSocket;
 	private connect;

package/dist/bundle.mjs

@@ -1 +1 @@
-const e=Symbol("Placeholder"),t=t=>{let n=0;for(const s of t)s!==e&&n++;return n},n=(t,n)=>{const s=t.length,o=t.slice(),r=n.length;let i=r,l=0;for(;i&&l<s;l++)o[l]===e&&(o[l]=n[r-i],i--);for(l=s;i;l++,i--)o[l]=n[r-i];return o},s=(e,o,r)=>{const i=e.length-o.length-t(r);if(i<1)return e(...n(o,r));{const t=(...t)=>s(e,n(o,r),t);return t.$args_left=i,t}},o=e=>(...n)=>e.length>t(n)?s(e,[],n):e(...n);function r(t){return function(n,s){const o=n===e,r=arguments.length;if(1===r&&o)throw new Error("Senseless placeholder usage.");return r>1?o?(t=>function(n){return n===e?t:t(n)})((e=>t(e,s))):t(n,s):e=>t(n,e)}}function i(e){return o(e)}const l=void 0,c=1/0,u=e=>typeof e,a=e=>null===e,h={u:"U",b:"B",n:"N",s:"S",f:"F"},f=Symbol(),d=e=>{const t=u(e);return"object"===t?a(e)?"Null":e.constructor.name:h[t[0]]+t.slice(1)},p=e=>e.length,g=r(((e,t)=>e===t)),m=r(((e,t)=>{const n=d(e);if(g(n,d(t))&&(g(n,"Object")||g(n,"Array"))){if(a(e)||a(t))return g(e,t);if(g(e,t))return!0;for(const n of[e,t])for(const s in n)if(!(g(n,t)&&s in e||g(n,e)&&s in t&&m(e[s],t[s])))return!1;return!0}return g(e,t)})),y=r(((e,t)=>(t.push(e),t))),w=i(((e,t,n)=>n.reduce(e,t))),b=o(((e,t,n,s)=>e(s)?t(s):n(s))),_=(...t)=>(...n)=>{let s,o=!0;for(let r=p(t)-1;r>-1;r--)o?(o=!1,s=t[r](...n)):s=s===e?t[r]():t[r](s);return s},k=r(((e,t)=>t[e])),S=i(((e,t,n)=>n.slice(e,(e=>"number"==u(e))(t)?t:c))),v=k(0);S(1,c);const E=r(((e,t)=>t.find(e))),P=e=>()=>e,W=r(((e,t)=>t.split(e))),j=P(!0),N=P(!1),q=r(((e,t)=>w(((t,n)=>E((t=>e(n,t)),t)?t:y(n,t)),[],t)))(m),z=i(((e,t,n)=>p(t)?(e=>a(e)||(e=>e===l)(e))(n)?e:_((s=>s in n?z(e,S(1,c,t),n[s]):e),v)(t):n));z(l),_(b(m(f),N,j),z(f));const Q=r(((e,t)=>t.map(e))),{floor:A}=Math,C="0123456789abcdefghijklmnopqrstuvwxyz",O=_((e=>Object.fromEntries(e)),Q(((e,t)=>[e,t])),W(""));class ${abc;abclen;c2pos;standard;setABC(e){if(!_(m(p(t=e)),p,q,W(""))(t))throw new Error("Not all chars are unique!");var t;this.abc=e,this.abclen=e.length,this.standard=C.startsWith(e),this.c2pos=O(e)}zip(e){const{abc:t,abclen:n}=this;let s="";for(;e>0;)s=t[e%n]+s,e=A(e/n);return s||"0"}unzip(e){const{standard:t,abclen:n,c2pos:s}=this;if(t)return parseInt(e,n);const o=e.length;let r=0;for(let t=0;t<o;t++)r+=s[e[t]]*n**(o-t-1);return r}constructor(e){this.setABC(e||C+"ABCDEFGHIJKLMNOPQRSTUVWXYZ")}}const B=new $;B.setABC.bind(B),B.zip.bind(B),B.unzip.bind(B);const R=(()=>{try{return WebSocket||null}catch{return null}})(),I=(e,t,n)=>e.addEventListener(t,n),T=(e,t)=>setTimeout(t,e),D={data_type:"json",log:()=>null,timer:!1,url:"localhost",timeout:1400,reconnect:2,lazy:!1,socket:null,adapter:(e,t)=>new WebSocket(e,t),encode:(e,t,{server:n})=>JSON.stringify({[n.id_key]:e,[n.data_key]:t}),decode:e=>JSON.parse(e),protocols:[],pipes:[],server:{id_key:"id",data_key:"data"},ping:{interval:55,content:{}}},U=Symbol("Placeholder"),x=e=>{let t=0;for(const n of e)n!==U&&t++;return t},F=(e,t)=>{const n=e.length,s=e.slice(),o=t.length;let r=o,i=0;for(;r&&i<n;i++)s[i]===U&&(s[i]=t[o-r],r--);for(i=n;r;i++,r--)s[i]=t[o-r];return s},J=(e,t,n)=>{const s=e.length-t.length-x(n);if(s<1)return e(...F(t,n));{const o=(...s)=>J(e,F(t,n),s);return o.$args_left=s,o}},L=e=>(...t)=>e.length>x(t)?J(e,[],t):e(...t);function M(e){return function(t,n){const s=t===U,o=arguments.length;if(1===o&&s)throw new Error("Senseless placeholder usage.");return o>1?s?(e=>function(t){return t===U?e:e(t)})((t=>e(t,n))):e(t,n):n=>e(t,n)}}function G(e){return L(e)}const H=void 0,K=1/0,V=e=>typeof e,X=e=>null===e,Y=e=>"number"==V(e),Z={u:"U",b:"B",n:"N",s:"S",f:"F"},ee=Symbol(),te=e=>{const t=V(e);return"object"===t?X(e)?"Null":e.constructor.name:Z[t[0]]+t.slice(1)},ne=e=>e.length,se=e=>X(e)||(e=>e===H)(e),oe=M(((e,t)=>e===t)),re=M(((e,t)=>{const n=te(e);if(oe(n,te(t))&&(oe(n,"Object")||oe(n,"Array"))){if(X(e)||X(t))return oe(e,t);if(oe(e,t))return!0;for(const n of[e,t])for(const s in n)if(!(oe(n,t)&&s in e||oe(n,e)&&s in t&&re(e[s],t[s])))return!1;return!0}return oe(e,t)})),ie=M(((e,t)=>(t.push(e),t))),le=G(((e,t,n)=>n.reduce(e,t))),ce=L(((e,t,n,s)=>e(s)?t(s):n(s))),ue=(...e)=>(...t)=>{let n,s=!0;for(let o=ne(e)-1;o>-1;o--)s?(s=!1,n=e[o](...t)):n=n===U?e[o]():e[o](n);return n},ae=M(((e,t)=>t[e])),he=G(((e,t,n)=>n.slice(e,Y(t)?t:K))),fe=ae(0);he(1,K);const de=M(((e,t)=>t.find(e))),pe=e=>()=>e,ge=pe(!0),me=pe(!1),ye=M(((e,t)=>le(((t,n)=>de((t=>e(n,t)),t)?t:ie(n,t)),[],t)));ye(re);const we=e=>{let t,n=!1;return(...s)=>n?t:(n=!0,t=e(...s))},be=G(((e,t,n)=>ne(t)?se(n)?e:ue((s=>s in n?be(e,he(1,K,t),n[s]):e),fe)(t):n));be(H),ue(ce(re(ee),me,ge),be(ee));const _e=new $;class ke{open=!1;ws=null;forcibly_closed=!1;reconnect_timeout=null;queue={};messages=[];onReadyQueue=[];onCloseQueue=[];handlers={open:[],close:[],message:[],error:[]};config={};init_flush(){this.queue={},this.messages=[]}log(e,t=null,n=null){const s=this.config;null!==n?s.log(e,n,t):s.timer?s.log(e,null,t):s.log(e,t)}initSocket(e){const t=this.config;this.open=!0,this.onReadyQueue.forEach((e=>e())),this.onReadyQueue.splice(0);const{id_key:n,data_key:s}=t.server;if(this.handlers.open.forEach((t=>t(e))),this.messages.forEach((e=>e.send())),null!==this.reconnect_timeout&&(clearInterval(this.reconnect_timeout),this.reconnect_timeout=null),t.ping){const e=setInterval((()=>{this.open&&this.send(t.ping.content),this.forcibly_closed&&clearInterval(e)}),1e3*t.ping.interval)}I(e,"close",(async(...e)=>{this.log("close"),this.open=!1,this.onCloseQueue.forEach((e=>e())),this.onCloseQueue.splice(0),this.handlers.close.forEach((t=>t(...e)));const n=t.reconnect;if("number"!=typeof n||isNaN(n)||this.forcibly_closed)this.ws=null,this.open=!1;else{const e=async()=>{this.log("reconnect"),null!==this.ws&&(this.ws.close(),this.ws=null);null!==await this.connect()&&(this.reconnect_timeout=setTimeout(e,1e3*n))};e()}this.forcibly_closed=!1})),I(e,"message",(e=>{try{const o=t.decode(e.data);if(this.handlers.message.forEach((t=>t({...e,data:o}))),o[n]){const e=this.queue[o[n]];if(e){const t=e.sent_time?Date.now()-e.sent_time:null;this.log("message",o[s],t),e.ff(o[s]),clearTimeout(e.timeout),delete this.queue[o[n]]}}}catch(t){console.error(t,`WSP: Decode error. Got: ${e.data}`)}}))}async connect(){return new Promise((e=>{if(!0===this.open)return e(null);const t=this.config,n=t.socket||t.adapter(t.url,t.protocols);if(this.ws=n,!n||n.readyState>1)return this.ws=null,this.log("error","ready() on closing or closed state! status 2."),e(2);I(n,"error",we((t=>(this.log("error","status 3."),this.handlers.error.forEach((e=>e(t))),this.ws=null,e(3))))),n.readyState?(this.initSocket(n),e(null)):I(n,"open",we((()=>(this.log("open"),this.initSocket(n),e(null)))))}))}get socket(){return this.ws}async ready(){return new Promise((e=>{this.open?e():this.onReadyQueue.push(e)}))}on(e,t,n=ge,s=!1){const o=e=>n(e)&&t(e);return s?I(this.ws,e,o):this.handlers[e].push(o)}async close(){return new Promise(((e,t)=>{null===this.ws?t("WSP: closing a non-inited socket!"):(this.open=!1,this.onCloseQueue.push((()=>{this.init_flush(),this.ws=null,this.forcibly_closed=!0,e(null)})),this.ws.close())}))}async send(e,t={}){this.log("send",e);const n=this.config,s={},o=n.server.data_key,r=n.lazy&&!this.open,i=_e.zip(2147483637*Math.random()|0);if("object"==typeof t.top){if(t.top[o])throw new Error("Attempting to set data key/token via send() options!");Object.assign(s,t.top)}if(n.pipes.forEach((t=>e=t(e))),!0===this.open)this.ws.send(n.encode(i,e,n));else if(!1===this.open||r)this.messages.push({send:()=>this.ws.send(n.encode(i,e,n))}),r&&this.connect();else if(null===this.open)throw new Error("Attempting to send via closed WebSocket connection!");return new Promise(((t,s)=>{this.queue[i]={ff:t,data_type:n.data_type,sent_time:n.timer?Date.now():null,timeout:T(n.timeout,(()=>{this.queue[i]&&(s({"Websocket timeout expired: ":n.timeout,"for the message ":e}),delete this.queue[i])}))}}))}constructor(e={}){this.config=(e=>{if(null===R&&!("adapter"in e))throw new Error("\n    This platform has no native WebSocket implementation.\n    Please use 'ws' package as an adapter.\n    See https://github.com/houd1ni/WebsocketPromisify/issues/23\n  ");const t=Object.assign({},D,e),n=t.url;if("/"==n[0])try{const e=location.protocol.includes("s:")?"wss":"ws";t.url=`${e}://${location.hostname}:${location.port}${n}`}catch(e){throw new Error("WSP: URL starting with / in non-browser environment!")}return t})(e),this.init_flush(),this.open=!1,this.reconnect_timeout=null,this.forcibly_closed=!1,this.config.lazy||this.connect()}}export{ke as default};
+const t=Symbol("Placeholder"),e=e=>{let n=0;for(const o of e)o!==t&&n++;return n},n=(e,n)=>{const o=e.length,s=e.slice(),r=n.length;let i=r,l=0;for(;i&&l<o;l++)s[l]===t&&(s[l]=n[r-i],i--);for(l=o;i;l++,i--)s[l]=n[r-i];return s},o=(t,s,r)=>{const i=t.length-s.length-e(r);if(i<1)return t(...n(s,r));{const e=(...e)=>o(t,n(s,r),e);return e.$args_left=i,e}},s=t=>(...n)=>t.length>e(n)?o(t,[],n):t(...n);function r(e){return function(n,o){const s=n===t,r=arguments.length;if(1===r&&s)throw new Error("Senseless placeholder usage.");return r>1?s?(e=>function(n){return n===t?e:e(n)})((t=>e(t,o))):e(n,o):t=>e(n,t)}}function i(t){return s(t)}const l=void 0,c=1/0,u=t=>typeof t,a=t=>null===t,h={u:"U",b:"B",n:"N",s:"S",f:"F"},f=Symbol(),d=t=>{const e=u(t);return"object"===e?a(t)?"Null":t.constructor.name:h[e[0]]+e.slice(1)},p=t=>t.length,g=r(((t,e)=>t===e)),m=r(((t,e)=>{const n=d(t);if(g(n,d(e))&&(g(n,"Object")||g(n,"Array"))){if(a(t)||a(e))return g(t,e);if(g(t,e))return!0;for(const n of[t,e])for(const o in n)if(!(g(n,e)&&o in t||g(n,t)&&o in e&&m(t[o],e[o])))return!1;return!0}return g(t,e)})),y=r(((t,e)=>(e.push(t),e))),w=i(((t,e,n)=>n.reduce(t,e))),b=s(((t,e,n,o)=>t(o)?e(o):n(o))),_=(...e)=>(...n)=>{let o,s=!0;for(let r=p(e)-1;r>-1;r--)s?(s=!1,o=e[r](...n)):o=o===t?e[r]():e[r](o);return o},S=r(((t,e)=>e[t])),k=i(((t,e,n)=>n.slice(t,(t=>"number"==u(t))(e)?e:c))),v=S(0);k(1,c);const E=r(((t,e)=>e.find(t))),P=t=>()=>t,W=r(((t,e)=>e.split(t))),j=P(!0),A=P(!1),N=r(((t,e)=>w(((e,n)=>E((e=>t(n,e)),e)?e:y(n,e)),[],e)))(m),q=i(((t,e,n)=>p(e)?(t=>a(t)||(t=>t===l)(t))(n)?t:_((o=>o in n?q(t,k(1,c,e),n[o]):t),v)(e):n));q(l),_(b(m(f),A,j),q(f));const Q=r(((t,e)=>e.map(t))),{floor:z}=Math,C="0123456789abcdefghijklmnopqrstuvwxyz",O=_((t=>Object.fromEntries(t)),Q(((t,e)=>[t,e])),W(""));class ${abc;abclen;c2pos;standard;setABC(t){if(!_(m(p(e=t)),p,N,W(""))(e))throw new Error("Not all chars are unique!");var e;this.abc=t,this.abclen=t.length,this.standard=C.startsWith(t),this.c2pos=O(t)}zip(t){const{abc:e,abclen:n}=this;let o="";for(;t>0;)o=e[t%n]+o,t=z(t/n);return o||"0"}unzip(t){const{standard:e,abclen:n,c2pos:o}=this;if(e)return parseInt(t,n);const s=t.length;let r=0;for(let e=0;e<s;e++)r+=o[t[e]]*n**(s-e-1);return r}constructor(t){this.setABC(t||C+"ABCDEFGHIJKLMNOPQRSTUVWXYZ")}}const B=new $;B.setABC.bind(B),B.zip.bind(B),B.unzip.bind(B);const R=(()=>{try{return WebSocket||null}catch{return null}})(),I=(t,e,n)=>t.addEventListener(e,n),T=(t,e)=>setTimeout(e,t),D={data_type:"json",log:()=>null,timer:!1,url:"localhost",timeout:1400,reconnect:2,lazy:!1,socket:null,adapter:(t,e)=>new WebSocket(t,e),encode:(t,e,{server:n})=>JSON.stringify({[n.id_key]:t,[n.data_key]:e}),decode:t=>JSON.parse(t),protocols:[],pipes:[],server:{id_key:"id",data_key:"data"},ping:{interval:55,content:{}}},U=Symbol("Placeholder"),x=t=>{let e=0;for(const n of t)n!==U&&e++;return e},F=(t,e)=>{const n=t.length,o=t.slice(),s=e.length;let r=s,i=0;for(;r&&i<n;i++)o[i]===U&&(o[i]=e[s-r],r--);for(i=n;r;i++,r--)o[i]=e[s-r];return o},J=(t,e,n)=>{const o=t.length-e.length-x(n);if(o<1)return t(...F(e,n));{const s=(...o)=>J(t,F(e,n),o);return s.$args_left=o,s}},L=t=>(...e)=>t.length>x(e)?J(t,[],e):t(...e);function M(t){return function(e,n){const o=e===U,s=arguments.length;if(1===s&&o)throw new Error("Senseless placeholder usage.");return s>1?o?(t=>function(e){return e===U?t:t(e)})((e=>t(e,n))):t(e,n):n=>t(e,n)}}function G(t){return L(t)}const H=void 0,K=1/0,V=t=>typeof t,X=t=>null===t,Y=t=>"number"==V(t),Z={u:"U",b:"B",n:"N",s:"S",f:"F"},tt=Symbol(),et=t=>{const e=V(t);return"object"===e?X(t)?"Null":t.constructor.name:Z[e[0]]+e.slice(1)},nt=t=>t.length,ot=t=>X(t)||(t=>t===H)(t),st=M(((t,e)=>t===e)),rt=M(((t,e)=>{const n=et(t);if(st(n,et(e))&&(st(n,"Object")||st(n,"Array"))){if(X(t)||X(e))return st(t,e);if(st(t,e))return!0;for(const n of[t,e])for(const o in n)if(!(st(n,e)&&o in t||st(n,t)&&o in e&&rt(t[o],e[o])))return!1;return!0}return st(t,e)})),it=M(((t,e)=>(e.push(t),e))),lt=G(((t,e,n)=>n.reduce(t,e))),ct=M(((t,e)=>{const n=(t=>Array.isArray(t))(e);let o,s;n&&(o=0,s=[]);for(let o in e)t(e[o],o)||(n?s.push(+o):delete e[o]);if(n)for(const t of s)e.splice(t-o++,1);return e})),ut=L(((t,e,n,o)=>t(o)?e(o):n(o))),at=(...t)=>(...e)=>{let n,o=!0;for(let s=nt(t)-1;s>-1;s--)o?(o=!1,n=t[s](...e)):n=n===U?t[s]():t[s](n);return n},ht=M(((t,e)=>e[t])),ft=G(((t,e,n)=>n.slice(t,Y(e)?e:K))),dt=ht(0);ft(1,K);const pt=M(((t,e)=>e.find(t))),gt=t=>()=>t,mt=gt(!0),yt=gt(!1),wt=M(((t,e)=>lt(((e,n)=>pt((e=>t(n,e)),e)?e:it(n,e)),[],e)));wt(rt);const bt=t=>{let e,n=!1;return(...o)=>n?e:(n=!0,e=t(...o))},_t=G(((t,e,n)=>nt(e)?ot(n)?t:at((o=>o in n?_t(t,ft(1,K,e),n[o]):t),dt)(e):n));_t(H),at(ut(rt(tt),yt,mt),_t(tt));const St=new $;class kt{open=!1;ws=null;forcibly_closed=!1;reconnect_timeout=null;queue={};onReadyQueue=[];onCloseQueue=[];handlers={open:[],close:[],message:[],error:[],timeout:[]};config={};init_flush(){ct(yt,this.queue)}call(t,...e){for(const n of this.handlers[t])n(...e)}log(t,e=null,n=null){const o=this.config;null!==n?o.log(t,n,e):o.timer?o.log(t,null,e):o.log(t,e)}initSocket(t){const{queue:e,config:n}=this;this.open=!0,this.onReadyQueue.forEach((t=>t())),this.onReadyQueue.splice(0);const{id_key:o,data_key:s}=n.server;this.call("open",t);for(const n in e)t.send(e[n].msg);if(null!==this.reconnect_timeout&&(clearInterval(this.reconnect_timeout),this.reconnect_timeout=null),n.ping){const t=setInterval((()=>{this.open&&this.send(n.ping.content),this.forcibly_closed&&clearInterval(t)}),1e3*n.ping.interval)}I(t,"close",(async(...t)=>{this.log("close"),this.open=!1,this.ws=null,this.onCloseQueue.forEach((t=>t())),this.onCloseQueue.splice(0),this.call("close",...t);const e=n.reconnect;if("number"==typeof e&&!isNaN(e)&&!this.forcibly_closed){const t=async()=>{this.log("reconnect"),null!==this.ws&&(this.ws.close(),this.ws=null);null!==await this.connect()&&(this.reconnect_timeout=setTimeout(t,1e3*e))};t()}this.forcibly_closed=!1})),I(t,"message",(t=>{try{const e=n.decode(t.data);if(this.call("message",{...t,data:e}),e[o]){const t=this.queue[e[o]];if(t){const n=t.sent_time?Date.now()-t.sent_time:null;this.log("message",e[s],n),t.ff(e[s])}}}catch(e){console.error(e,`WSP: Decode error. Got: ${t.data}`)}}))}connect(){return new Promise((t=>{if(!0===this.open)return t(null);const e=this.config,n=e.socket||e.adapter(e.url,e.protocols);if(this.ws=n,!n||n.readyState>1)return this.ws=null,this.log("error","ready() on closing or closed state! status 2."),t(2);const o=bt(t);I(n,"error",bt((t=>{this.log("error","status 3. Err: "+t.message),this.call("error",t),this.ws=null,o(3)}))),n.readyState?(this.initSocket(n),o(null)):I(n,"open",bt((()=>{this.log("open"),this.initSocket(n),o(null)})))}))}get socket(){return this.ws}async ready(){return new Promise((t=>{this.open?t():this.onReadyQueue.push(t)}))}on(t,e,n=mt,o=!1){const s=t=>n(t)&&e(t);return o?I(this.ws,t,s):this.handlers[t].push(s)}async close(){return new Promise(((t,e)=>{null===this.ws?e("WSP: closing a non-inited socket!"):(this.open=!1,this.onCloseQueue.push((()=>{this.init_flush(),this.ws=null,this.forcibly_closed=!0,t(null)})),this.ws.close())}))}async send(t,e={}){this.log("send",t);const{config:n,ws:o,forcibly_closed:s,queue:r}=this,i={},l=n.server.data_key,c=St.zip(2147483637*Math.random()|0);if("object"==typeof e.top){if(e.top[l])throw new Error("Attempting to set data key/token via send() options!");Object.assign(i,e.top)}if(n.pipes.forEach((e=>t=e(t))),s)throw new Error("Attempting to send via closed WebSocket connection!");this.open||this.connect();const u=await n.encode(c,t,n);return 1===o?.readyState&&o.send(u),new Promise(((e,o)=>{this.queue[c]={msg:u,ff(t){e(t),clearTimeout(this.timeout),delete r[c]},data_type:n.data_type,sent_time:n.timer?Date.now():null,timeout:T(n.timeout,(()=>{this.queue[c]&&(this.call("timeout",t),o({"Websocket timeout expired: ":n.timeout,"for the message ":t}),delete r[c])}))}}))}constructor(t={}){this.config=(t=>{if(null===R&&!("adapter"in t))throw new Error("\n    This platform has no native WebSocket implementation.\n    Please use 'ws' package as an adapter.\n    See https://github.com/houd1ni/WebsocketPromisify/issues/23\n  ");const e=Object.assign({},D,t),n=e.url;if("/"==n[0])try{const t=location.protocol.includes("s:")?"wss":"ws";e.url=`${t}://${location.hostname}:${location.port}${n}`}catch(t){throw new Error("WSP: URL starting with / in non-browser environment!")}return e})(t),this.init_flush(),this.config.lazy||this.connect()}}export{kt as default};

package/package.json

@@ -41,48 +41,36 @@
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs",
     "all": "npm run dev && npm run prod"
   },
-  "version": "2.5.0",
+  "version": "2.6.1",
   "type": "module",
   "exports": {
     ".": {
+      "types": "./dist/bundle.d.ts",
       "import": "./dist/bundle.mjs",
       "require": "./dist/bundle.cjs"
-    }
-  },
-  "ava": {
-    "extensions": {
-      "js": true,
-      "ts": "module"
     },
-    "files": [
-      "./test/specs/*.ts"
-    ],
-    "failFast": true,
-    "timeout": "2m",
-    "nodeArguments": [
-      "--import=tsimp"
-    ]
+    "./src": "./src/*"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.2",
-    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
-    "@types/express": "^5.0.0",
-    "@types/node": "^22.13.1",
-    "@types/ws": "^8.5.14",
+    "@types/express": "^5.0.1",
+    "@types/node": "^22.15.2",
+    "@types/ws": "^8.18.1",
     "codecov": "^3.8.3",
     "cross-env": "^7.0.3",
     "dts-bundle-generator": "^9.5.1",
     "nyc": "^17.1.0",
-    "pepka": "^1.6.2",
-    "rollup": "^4.34.2",
+    "pepka": "^1.6.3",
+    "rollup": "^4.40.0",
     "rollup-plugin-typescript2": "^0.36.0",
     "ts-node": "^10.9.2",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.3",
+    "tsx": "^4.19.3",
+    "typescript": "^5.8.3",
     "uvu": "^0.5.6",
-    "ws": "^8.18.0"
+    "ws": "^8.18.1"
   },
   "types": "./dist/bundle.d.ts",
   "dependencies": {

package/src/WSC.ts

@@ -2,28 +2,38 @@ import './types'
 import { Zipnum } from 'zipnum'
 import { add_event, sett } from './utils'
 import { processConfig } from './config'
-import { AnyFunc, once, T } from 'pepka'
+import { AnyFunc, F, once, qfilter, T } from 'pepka'
 
 const MAX_32 = 2**31 - 1
 const zipnum = new Zipnum()
 
+type EventHandler<T extends keyof WebSocketEventMap> = AnyFunc<any, [WebSocketEventMap[T]]>
+type EventHandlers = {
+  open: EventHandler<'open'>[]
+  close: EventHandler<'close'>[]
+  error: EventHandler<'error'>[]
+  message: AnyFunc<any, [WebSocketEventMap['message'] & {data: any}]>[]
+  timeout: AnyFunc<any, [data: any]>[]
+}
+
 class WebSocketClient {
   private open = false
   private ws: wsc.Socket|null = null
   private forcibly_closed = false
   private reconnect_timeout: NodeJS.Timeout|null = null
-  private queue = {}
-  private messages: any[] = []
+  private queue: Record<string, wsc.Message> = {}
   private onReadyQueue: AnyFunc[] = []
   private onCloseQueue: AnyFunc[] = []
-  private handlers = <{[event in wsc.WSEvent]: ((e: any) => void)[]}>{
-    open: [], close: [], message: [], error: []
-  }
+  private handlers: EventHandlers = { open: [], close: [], message: [], error: [], timeout: [] }
   private config = <wsc.Config>{}
 
   private init_flush(): void {
-    this.queue    = {}  // data queuse
-    this.messages = []  // send() queue
+    // TODO: reject them or save somehow ?..
+    qfilter(F, this.queue)
+  }
+  private call(event_name: wsc.WSEvent, ...args: any[]) {
+    // this.handlers.open[0]()
+    for(const h of this.handlers[event_name]) h(...args)
   }
 
   private log(event: string, message: any = null, time: number|null = null): void {
@@ -40,16 +50,14 @@ class WebSocketClient {
   }
 
   private initSocket(ws: wsc.Socket) {
-    const config = this.config
+    const {queue, config} = this
     this.open = true
     this.onReadyQueue.forEach((fn: Function) => fn())
     this.onReadyQueue.splice(0)
     const {id_key, data_key} = config.server
     // Works also on previously opened sockets that do not fire 'open' event.
-    this.handlers.open.forEach((h) => h(ws))
-    // Send all pending messages.
-    this.messages.forEach((message: any) => message.send())
-    // It's reconnecting.
+    this.call('open', ws)
+    for(const msg_id in queue) ws.send(queue[msg_id].msg)
     if(this.reconnect_timeout !== null) {
       clearInterval(this.reconnect_timeout)
       this.reconnect_timeout = null
@@ -63,9 +71,10 @@ class WebSocketClient {
     add_event(ws, 'close', async (...e) => {
       this.log('close')
       this.open = false
+      this.ws = null
       this.onCloseQueue.forEach((fn: Function) => fn())
       this.onCloseQueue.splice(0)
-      this.handlers.close.forEach((h: any) => h(...e))
+      this.call('close', ...e)
       // Auto reconnect.
       const reconnect = config.reconnect
       if(
@@ -81,15 +90,11 @@ class WebSocketClient {
           }
           // If some error occured, try again.
           const status = await this.connect()
-          if(status !== null) {
+          if(status !== null)
             this.reconnect_timeout = setTimeout(reconnectFunc, reconnect * 1000)
-          }
         }
-        // No need for await.
+        // TODO: test normal close by server. Would it be infinite ?
         reconnectFunc()
-      } else {
-        this.ws = null
-        this.open = false
       }
       // reset the flag to reuse.
       this.forcibly_closed = false
@@ -97,7 +102,7 @@ class WebSocketClient {
     add_event(ws, 'message', (e) => {
       try {
         const data = config.decode(e.data)
-        this.handlers.message.forEach((h: any) => h({...e, data}))
+        this.call('message', {...e, data})
         if(data[id_key]) {
           const q = this.queue[data[id_key]]
           if(q) {
@@ -106,8 +111,6 @@ class WebSocketClient {
             this.log('message', data[data_key], time)
             // Play.
             q.ff(data[data_key])
-            clearTimeout(q.timeout)
-            delete this.queue[data[id_key]]
           }
         }
       } catch (err) {
@@ -116,7 +119,7 @@ class WebSocketClient {
     })
   }
 
-  private async connect() { // returns status if won't open or null if ok.
+  private connect() { // returns status if won't open or null if ok.
     return new Promise((ff) => {
       if(this.open === true) {
         return ff(null)
@@ -124,48 +127,39 @@ class WebSocketClient {
       const config = this.config
       const ws = config.socket || config.adapter(config.url, config.protocols)
       this.ws = ws
-      
       if(!ws || ws.readyState > 1) {
         this.ws = null
         this.log('error', 'ready() on closing or closed state! status 2.')
         return ff(2)
       }
-    
+      const ffo = once(ff)
       add_event(ws, 'error', once((e) => {
-        this.log('error', 'status 3.')
-        this.handlers.error.forEach((h) => h(e))
+        this.log('error', 'status 3. Err: '+e.message)
+        this.call('error', e)
         this.ws = null
         // Some network error: Connection refused or so.
-        return ff(3)
+        ffo(3)
       }))
       // Because 'open' won't be envoked on opened socket.
       if(ws.readyState) {
         this.initSocket(ws)
-        ff(null)
+        ffo(null)
       } else {
         add_event(ws, 'open', once(() => {
           this.log('open')
           this.initSocket(ws)
-          return ff(null)
+          ffo(null)
         }))
       }
     })
   }
-
-  public get socket() {
-    return this.ws
-  }
-
+  public get socket() { return this.ws }
   public async ready() {
     return new Promise<void>((ff) => {
-      if(this.open) {
-        ff()
-      } else {
-        this.onReadyQueue.push(ff)
-      }
+      if(this.open) ff()
+      else this.onReadyQueue.push(ff)
     })
   }
-
   public on(
     event_name: wsc.WSEvent,
     handler: (data: any) => any,
@@ -205,10 +199,9 @@ class WebSocketClient {
     opts = <wsc.SendOptions>{}
   ): Promise<ResponseDataType> {
     this.log('send', message_data)
-    const config   = this.config
+    const {config, ws, forcibly_closed, queue} = this
     const message  = {}
     const data_key = config.server.data_key
-    const first_time_lazy = config.lazy && !this.open
 
     const message_id = zipnum.zip((Math.random()*(MAX_32-10))|0)
     if(typeof opts.top === 'object') {
@@ -217,53 +210,44 @@ class WebSocketClient {
       }
       Object.assign(message, opts.top)
     }
+    config.pipes.forEach((pipe) => message_data = pipe(message_data))
 
-    config.pipes.forEach(
-      (pipe) => message_data = pipe(message_data)
-    )
-
-    if(this.open === true) {
-      (this.ws as wsc.Socket).send(config.encode(message_id, message_data, config))
-    } else if(this.open === false || first_time_lazy) {
-      this.messages.push({
-        send: () => (this.ws as wsc.Socket).send(config.encode(message_id, message_data, config))
-      })
-      if(first_time_lazy) {
-        this.connect()
-      }
-    } else if(this.open === null) {
+    if(forcibly_closed)
       throw new Error('Attempting to send via closed WebSocket connection!')
-    }
+    if(!this.open) this.connect()
+    const msg = await config.encode(message_id, message_data, config)
+    if(ws?.readyState===1) // The only opened state.
+      ws.send(msg)
 
     return new Promise((ff, rj) => {
       this.queue[message_id] = {
-        ff,
+        msg, ff(x: any) {
+          ff(x)
+          // cleanup.
+          clearTimeout(this.timeout) // from this object!
+          delete queue[message_id]
+        },
         data_type: config.data_type,
         sent_time: config.timer ? Date.now() : null,
         timeout: sett(config.timeout, () => {
           if(this.queue[message_id]) {
+            this.call('timeout', message_data)
             rj({
               'Websocket timeout expired: ': config.timeout,
               'for the message ': message_data
             })
-            delete this.queue[message_id]
+            delete queue[message_id]
           }
         })
       }
     })
   }
 
+  // TODO: Add .on handlers to config!
   constructor(user_config: wsc.UserConfig = {}) {
     this.config = processConfig(user_config)
-    // Init.
     this.init_flush()
-    // Flags.
-    this.open = false
-    this.reconnect_timeout = null
-    this.forcibly_closed = false
-    if(!this.config.lazy) {
-      this.connect()
-    }
+    if(!this.config.lazy) this.connect()
   }
 }
 

package/src/types.ts

@@ -4,7 +4,7 @@ declare namespace wsc {
     [key: string]: any
   }
 
-  export type WSEvent = 'open' | 'message' | 'close' | 'error'
+  export type WSEvent = 'open' | 'message' | 'close' | 'error' | 'timeout'
 
   /** Minimal socket-like interface. */
   interface Socket {
@@ -55,4 +55,11 @@ declare namespace wsc {
     top: any
     data_type: DataType
   }
+
+  export interface Message {
+    msg: any, ff(x: any): any,
+    data_type: DataType,
+    sent_time: number | null,
+    timeout: NodeJS.Timeout
+  }
 }

package/src/utils.ts

@@ -9,4 +9,10 @@ export const add_event = (o: wsc.Socket, e: string, handler: wsc.EventHandler) =
 export const sett = (
   a: number,
   b: { (): void; (...args: any[]): void; }
-) => setTimeout(b, a)
+) => setTimeout(b, a)
+
+export const try_splice = <T = any>(arr: T[], el: T) => {
+  const i = arr.indexOf(el)
+  if(~i) return arr.splice(arr.indexOf(el), 1)
+  else return []
+}

package/test/index.ts

@@ -11,10 +11,10 @@ import './specs/no-native-throws'
 import mockServer from './mock/server'
 import {test} from './suite'
 
-const {shutDown} = await mockServer()
+const {shutDown, isRunning} = await mockServer()
 test.after(() => {
   setTimeout(async () => {
-    await shutDown()
+    if(isRunning()) await shutDown()
     process.exit()
   }, 100)
 })

package/test/mock/WS.ts

@@ -9,6 +9,7 @@ const createServer = (port = 40510) => new Promise<WebSocketServer>((ff, rj) =>
   server = new WebSocketServer({ port }, () => {
     server!.on('connection', (socket: WebSocket&{isAlive: boolean}) => {
       socket.on('message', (rawMessage: string) => {
+        // console.log({rawMessage: rawMessage.toString()})
         const {id, data} = JSON.parse(rawMessage)
         let response = ''
         if(data.shut) {

package/test/mock/server.ts

@@ -1,6 +1,6 @@
 
 import { WebSocketServer } from 'ws'
-import { createServer, killServer } from './WS.js'
+import { createServer, killServer } from './WS'
 
 let port: number,
     server: WebSocketServer|null
@@ -12,6 +12,7 @@ export default async (new_port?: number) => {
   }
   return {
     server, port,
+    isRunning() {return Boolean(server)},
     shutDown: async () => { await killServer(); server=null }
   }
 }

package/test/specs/drops.ts

@@ -1,6 +1,7 @@
 import { createNew } from '../utils'
 import mockServer from '../mock/server'
 import { test } from '../suite'
+import { wait } from 'pepka'
 
 /** Rejects messages by timout */
 test('drops', () => new Promise(async (ff, rj) => {
@@ -8,23 +9,21 @@ test('drops', () => new Promise(async (ff, rj) => {
   const ws = createNew({timeout: 500}, port)
 
   await shutDown()
-  const lauchServ = async () => await mockServer(port)
+  await wait(200)
 
-  setTimeout(async () => {
-    const msg = {echo: true, msg: 'hello!'}
-    let to: NodeJS.Timeout
-    try {
-      to = setTimeout(() => {
-        return rj()
-      }, 600)
-      await ws.send(msg)
-      if(to) clearTimeout(to)
-      await lauchServ()
+  const msg = {echo: true, msg: 'hello!'}
+  let to: NodeJS.Timeout
+  try {
+    to = setTimeout(() => {
       return rj()
-    } catch(e) {
-      if(to!) clearTimeout(to)
-      await lauchServ()
-      return ff()
-    }
-  }, 200)
+    }, 600)
+    await ws.send(msg)
+    if(to) clearTimeout(to)
+    await mockServer(port)
+    return rj()
+  } catch(e) {
+    if(to!) clearTimeout(to)
+    await mockServer(port)
+    return ff()
+  }
 }))

package/test/specs/existing_socket.ts

@@ -9,47 +9,45 @@ import { equals } from 'pepka'
 const addr = (port: number) => 'ws://localhost:' + port
 
 /** If an existing socket connection is provided via config. */
-test('existing_socket', () => {
-  return new Promise(async (ff, rj) => {
-    const {port} = await mockServer()
-    const to = setTimeout(() => rj(), 4e4)
-    const existing_addr = addr(port)
+test('existing_socket', () => new Promise(async (ff, rj) => {
+  const {port} = await mockServer()
+  const to = setTimeout(() => rj(), 4e4)
+  const existing_addr = addr(port)
 
-    // This one CANNOT connect as fast as we send to it,
-    // So readyState is 0.
-    const ws1 = createNew({socket: new WS(existing_addr)}, port)
+  // This one CANNOT connect as fast as we send to it,
+  // So readyState is 0.
+  const ws1 = createNew({socket: new WS(existing_addr)}, port)
 
-    if(ws1.socket?.readyState !== 0) return rj('not ready.')
+  if(ws1.socket?.readyState !== 0) return rj('not ready.')
 
-    const msg1 = {echo: true, msg: 'existing_socket!'}
-    const response1 = await ws1.send(msg1)
+  const msg1 = {echo: true, msg: 'existing_socket!'}
+  const response1 = await ws1.send(msg1)
 
-    if(
-      ws1.socket?.readyState as number !== 1
-      || !equals(response1, msg1)
-    ) return rj('not ready.')
-    await ws1.close()
+  if(
+    ws1.socket?.readyState as number !== 1
+    || !equals(response1, msg1)
+  ) return rj('not ready.')
+  await ws1.close()
 
-    // This one DO CAN connect as fast as we send to it,
-    // So readyState should be 1.
-    const ws2_0 = new WS(existing_addr)
+  // This one DO CAN connect as fast as we send to it,
+  // So readyState should be 1.
+  const ws2_0 = new WS(existing_addr)
 
-    ws2_0.addEventListener('open', async () => {
-      const ws2 = await createNew({socket: ws2_0}, port)
+  ws2_0.addEventListener('open', async () => {
+    const ws2 = createNew({socket: ws2_0}, port)
 
-      if(ws2.socket?.readyState !== 1) return rj('not ready.')
-    
-      const msg2 = {echo: true, msg: 'existing_socket!'}
-      const response2 = await ws2.send(msg2)
+    if(ws2.socket?.readyState !== 1) return rj('not ready.')
+  
+    const msg2 = {echo: true, msg: 'existing_socket!'}
+    const response2 = await ws2.send(msg2)
 
-      if(
-        ws2.socket?.readyState as number !== 1
-        || !equals(response2, msg2)
-      ) return rj('not ready.')
-      await ws2.close()
+    if(
+      ws2.socket?.readyState as number !== 1
+      || !equals(response2, msg2)
+    ) return rj('not ready.')
+    await ws2.close()
 
-      clearTimeout(to)
-      ff()
-    })
+    clearTimeout(to)
+    ff()
   })
-})
+}))

package/test/specs/lazy.ts

@@ -1,22 +1,17 @@
 import { createNew, timeout } from '../utils'
 import mockServer from '../mock/server'
-import { equals } from 'pepka'
+import { equals, wait } from 'pepka'
 import { test } from '../suite'
 
 /** Lazy connect */
-test('lazy', timeout(2e3, () => {
-  return new Promise<void>(async (ff, rj) => {
-    const {port} = await mockServer()
-    const ws = createNew({ lazy: true }, port)
+test('lazy', timeout(2e3, async () => {
+  const {port} = await mockServer()
+  const ws = createNew({ lazy: true }, port)
 
-    setTimeout(async () => {
-      if(ws.socket !== null) {
-        rj()
-      } else {
-        const msg = {echo: true, msg: 'hello!'}
-        const response = await ws.send(msg)
-        if(equals(response, msg)) ff(); else rj()
-      }
-    }, 500)
-  })
+  await wait(500)
+  if(ws.socket !== null) throw new Error('Socket is not open.')
+  else {
+    const msg = {echo: true, msg: 'hello!'}
+    if(!equals(await ws.send(msg), msg)) throw new Error('msg\s not equal.')
+  }
 }))

package/test/specs/no-native-throws.ts

@@ -1,6 +1,6 @@
 import mockServer from '../mock/server'
 import { test } from '../suite'
-import {WebSocketClient} from '../../src/WSC'
+import WebSocketClient from '../../src/WSC'
 
 /** Ready method. */
 test('No native throws without an adapter', async () => {

package/test/specs/reconnect.ts

@@ -1,23 +1,41 @@
 import { createNew, timeout } from '../utils'
 import mockServer from '../mock/server'
-import { equals } from 'pepka'
+import { equals, wait } from 'pepka'
 import { test } from '../suite'
 
 /** Reconnects if connection is broken. */
-test('reconnect', timeout(1e4, () => new Promise<void>(async (ff, rj) => {
-    const {port, shutDown} = await mockServer()
-    const ws = createNew({ reconnect: 1 }, port)
-
-    setTimeout(async () => {
-      await shutDown()
-      setTimeout(async () => {
-        await mockServer(port)
-        setTimeout(async () => {
-          const msg = {echo: true, msg: 'hello!'}
-          const response = await ws.send(msg)
-          if(equals(response, msg)) ff(); else rj('not equals.')
-        }, 1500)
-      }, 1100)
-    }, 500)
-  })
-))
+test('reconnect', timeout(1e4, () => async () => {
+  const {port, shutDown} = await mockServer()
+  const ws = createNew({ reconnect: 1 }, port)
+  await wait(200)
+  await shutDown()
+  await wait(500)
+  await mockServer(port)
+  await wait(600)
+  const msg = {echo: true, msg: 'hello!'}
+  const response = await ws.send(msg)
+  if(!equals(response, msg)) throw new Error('not equals.')
+}))
+/** Should send messages that were queued while being disconnected right after the reconnect. */
+test('reconnect-queue', timeout(1e4, async () => {
+  const {port, shutDown} = await mockServer()
+  const ws = createNew({ reconnect: 1, timeout: 5e3 }, port)
+  await ws.ready()
+  await shutDown()
+  const msg1 = {echo: true, msg: 'hello!'}
+  const msg2 = {echo: true, msg: 'hello 2!'}
+  const msg3 = {echo: true, msg: 'hello 3!'}
+  let ok = false
+  const p = new Promise<void>((ff) => ws.send(msg1).then((res) => {
+    if(!equals(res, msg1)) throw new Error('msg1 not equals.')
+    else ws.send(msg2).then((res) => {
+      if(!equals(res, msg2)) throw new Error('msg2 not equals.')
+      else {ok=true}
+      ff()
+    })
+  }))
+  await mockServer(port)
+  await p
+  if(!ok) throw new Error('Not sent.')
+  if(!equals(await ws.send(msg3), msg3)) throw new Error('not sent or msg3 not equals.')
+}))

package/test/utils.ts

@@ -6,7 +6,7 @@ import WS from 'ws'
 
 export const createNew = (config = {}, port: number) => new WebSocketClient(Object.assign({
     url: 'ws://127.0.0.1:' + port,
-    // log: (...a) => console.log(...a),
+    // log: (...a: any[]) => console.log(...a),
     adapter: (host: string, protocols?: string|string[]) => new (native_ws || WS)(host, protocols)
   }, config)
 )
@@ -15,12 +15,14 @@ export const createNew = (config = {}, port: number) => new WebSocketClient(Obje
 export const timeout = (time: number, handler: AnyFunc) => async (context: AnyObject) => {
   let timer: NodeJS.Timeout
   try {
-    return await Promise.race([
+    await Promise.race([
       handler(context),
       new Promise((_resolve, reject) =>
         timer = setTimeout(() => reject(new Error('timeout')), time)
       )
     ])
+  } catch(e) {
+    throw e
   } finally {
     if(timer!) clearTimeout(timer)
   }

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "lib": [ "esnext", "DOM" ],
     "strictNullChecks": true,
     "target": "esnext",

package/.circleci/config.yml

@@ -1,20 +0,0 @@
-
-version: 2
-
-jobs:
-  build:
-    working_directory: ~/test
-    docker:
-      - image: circleci/node
-    steps:
-      - checkout
-      - run:
-          name: install
-          command: npm i
-      - run:
-          name: npm test
-          command: |
-              nodejs -v
-              npm -v
-              npm run lint
-              npm run test:report

package/_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-cayman