justrun-ws 0.2.0 → 0.2.1

package/lib/WsClient.js

@@ -1,54 +1,55 @@
 import { b } from './common/AdjustableTimer';
 import { CommonError } from './handler/common';
-import { j, n } from './handler/SimpleHandler';
-import { l } from './net/BrowserWsNet';
-import { o, p } from './net/hubPkgSerializer';
+import { n, o } from './handler/SimpleHandler';
+import { r } from './net/BrowserWsNet';
+import { p, s } from './net/hubPkgSerializer';
 import { JsonRequest } from './net/JsonPackageWrapper';
 import { g } from './net/LazyConn';
-import { t } from './net/TypedPkgHub';
-class r extends JsonRequest {
+import { NetErrorString } from './net/NetErrorString';
+import { v } from './net/TypedPkgHub';
+class l extends JsonRequest {
 }
 export const createNumPkgTypeClient = (getConnStr, timeoutMonitor) => {
     return new WsClient(getConnStr, {
         responsePkgType: 0,
-        makePkgBuff: o,
-        parsePkgBuff: p,
+        makePkgBuff: p,
+        parsePkgBuff: s,
         timeoutMonitor,
     });
 };
 export class WsClient {
     constructor(getConnStr, w) {
-        const C = new l();
-        const _ = this.f = new t(C, w);
+        const F = new r();
+        const _ = this.d = new v(F, w);
         this.h = '';
-        this.k = [];
+        this.j = [];
         this.q = 0;
         this.a = new g(() => this.c());
-        this.I = getConnStr;
+        this.H = getConnStr;
         this.O = this.c;
-        _.F = this.F.bind(this);
-        _.G = this.G.bind(this);
+        _.K = this.K.bind(this);
+        _.B = this.B.bind(this);
     }
     registerError(pkgType, wrapperCtor) {
-        return this.f.registerError(pkgType, wrapperCtor);
+        return this.d.registerError(pkgType, wrapperCtor);
     }
     registerMessage(pkgType, wrapperCtor) {
-        return this.f.registerMessage(pkgType, wrapperCtor);
+        return this.d.registerMessage(pkgType, wrapperCtor);
     }
     registerRequest(pkgType, wrapperCtor) {
-        return this.f.registerRequest(pkgType, wrapperCtor);
+        return this.d.registerRequest(pkgType, wrapperCtor);
     }
     handleMessageWith(wrapperCtor, handler) {
-        const i = (a, e) => {
-            return handler(e.data);
+        const i = (a, f) => {
+            return handler(f.data);
         };
-        this.f.handleMessageWith(new j(wrapperCtor, i, false));
+        this.d.handleMessageWith(new n(wrapperCtor, i, false));
     }
     handleRequestWith(wrapperCtor, handler) {
-        const i = async (a, e) => {
-            e.resp = await handler(e.data);
+        const i = async (a, f) => {
+            f.resp = await handler(f.data);
         };
-        this.f.handleRequestWith(new n(wrapperCtor, i, false));
+        this.d.handleRequestWith(new o(wrapperCtor, i, false));
     }
     sendMessage(message) {
         return this.a.sendMessage(message);
@@ -63,21 +64,28 @@ export class WsClient {
     resetAuthState() {
     }
     enableAuthenticate(proxyAuthPkgType, authStatusCallback, allowAnonymous) {
-        const { O, I, f, a } = this;
+        const { O, H, d, a } = this;
         if (this.c === O) {
-            f.registerRequest(proxyAuthPkgType, r);
+            d.registerRequest(proxyAuthPkgType, l);
             let token = '';
             let shard = undefined;
             this.c = async () => {
                 this.q = -1;
                 if (this.m) {
-                    await this.m.a0();
+                    await this.m.Y();
                 }
                 for (;;) {
-                    const d = I(shard);
-                    const conn = await f.c(d);
+                    const e = H(shard);
+                    let conn;
+                    try {
+                        conn = await d.c(e);
+                    }
+                    catch {
+                        this.B(d, this.a, true, new Error(NetErrorString.k));
+                        return;
+                    }
                     if (this.h || allowAnonymous) {
-                        const request = new r({
+                        const request = new l({
                             cid: this.h,
                             token,
                         });
@@ -140,7 +148,7 @@ export class WsClient {
             return;
         }
         if (this.m) {
-            this.m.a6(delay ?? 0);
+            this.m.a3(delay ?? 0);
         }
         else if (delay) {
             this.m = new b(delay, () => this.m = undefined);
@@ -150,49 +158,54 @@ export class WsClient {
         }
     }
     onConnectionStatus(listener) {
-        let { k } = this;
-        if (!k) {
-            this.k = k = [];
+        let { j } = this;
+        if (!j) {
+            this.j = j = [];
         }
-        k.push(listener);
+        j.push(listener);
     }
     async c() {
-        const { I, f, m } = this;
+        const { H, d, m } = this;
         this.q = -1;
         if (m) {
-            await m.a0();
+            await m.Y();
+        }
+        const e = H();
+        try {
+            return d.c(e);
+        }
+        catch {
+            this.B(d, this.a, true, new Error(NetErrorString.k));
         }
-        const d = I();
-        return f.c(d);
     }
-    F(f, conn, R) {
+    K(d, conn, W) {
         this.q = 1;
         conn.context = '';
-        if (this.k) {
-            for (const listener of this.k) {
-                listener(true, R);
+        if (this.j) {
+            for (const listener of this.j) {
+                listener(true, W);
             }
         }
     }
-    G(f, a, E, err) {
+    B(d, a, G, err) {
         this.q = 0;
-        this.a.aa();
-        if (!E) {
+        this.a.a5();
+        if (!G) {
             this.resetAuthState();
         }
-        if (this.k) {
-            for (const listener of this.k) {
-                listener(false, E, err);
+        if (this.j) {
+            for (const listener of this.j) {
+                listener(false, G, err);
             }
         }
     }
-    f;
+    d;
     a;
     h;
     q;
-    I;
+    H;
     O;
     m;
-    k;
+    j;
 }
 //# sourceMappingURL=WsClient.js.map

package/lib/bundle.min.js

@@ -1 +1 @@
-var t={d:(e,s)=>{for(var r in s)t.o(s,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:s[r]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{EK:()=>p,sr:()=>i,si:()=>o,N3:()=>d,sk:()=>u,wL:()=>l,bM:()=>n,h8:()=>h,Yu:()=>E,I9:()=>I,iU:()=>$,mx:()=>y});class s{constructor(t,e){e?(this.r=t,this.s=void 0):(this.r=void 0,this.s=t)}get data(){return this.s||(this.s=this.decode(this.r)),this.s}set data(t){this.s=t,this.r=void 0}get buff(){return this.r||(this.r=this.encode(this.s)),this.r}r;s}class r extends s{static context;static registerPkgType(t){let e;try{e=this.pkgType}catch{return void Object.defineProperty(this,"pkgType",{value:t,writable:!1,enumerable:!1})}if(e!==t)throw new Error(`Wrapper ${this.name} is already registered with type ${e}`)}static get pkgType(){throw new Error(`Wrapper ${this.name} need to be registered`)}}class i extends r{isError(){return!0}}class n extends r{isMessage(){return!0}}class o extends r{isEvent(){return!0}}class h extends r{constructor(t,e){super(t,e)}isRequest(){return!0}get resp(){return this.z||(this.z=this.decodeResponse(this.$)),this.z}set resp(t){this.z=t,this.$=void 0}get respBuff(){return this.$||(this.$=this.encodeResponse(this.z)),this.$}set respBuff(t){this.z=void 0,this.$=t}z;$}const a=new TextEncoder,c=new TextDecoder;class d extends i{encode(t){const e=JSON.stringify(t);return a.encode(e)}decode(t){const e=c.decode(t);return JSON.parse(e)}}class u extends n{encode(t){const e=JSON.stringify(t);return a.encode(e)}decode(t){const e=c.decode(t);return JSON.parse(e)}}class l extends h{encode(t){const e=JSON.stringify(t);return a.encode(e)}decode(t){const e=c.decode(t);return JSON.parse(e)}encodeResponse(t){const e=JSON.stringify(t);return a.encode(e)}decodeResponse(t){const e=c.decode(t);return JSON.parse(e)}}class p extends d{}const g=new Error("Connection is not authenticated");let f=(t,e)=>new p(e.message);const y=t=>{f=t};class w{constructor(){this.d=this,this.i=this}getPrev(){return this.d}getNext(){return this.i}insertBefore(t){this.i=t,this.d=t.d,t.d=this,this.d.i=this}insertAfter(t){this.d=t,this.i=t.i,t.i=this,this.i.d=this}remove(){this.d.i=this.i,this.i.d=this.d}d;i}class m{constructor(){this._=new w}get e(){return this._.getNext()}get a(){return this._.getPrev()}P(t){return t===this._}Q(t){t.insertAfter(this._)}ab(t){t.insertBefore(this._)}_}const k=()=>{},v=t=>{let e=0,s=0;for(;e<t.length;)s+=t[e++].length;const r=new Uint8Array(s);for(s=0;e>0;){const i=t[--e];r.set(i,s),s+=i.length}return r};class b extends w{}class E{constructor(t,e,s){if(this.R=t,this.J=e,this.D=s,this.o=0,this.E=0,this.t=[],0===t)return this.insert=k,this.update=k,void(this.remove=k);for(let t=0;t<s;t++)this.t.push(new m)}insert(t){this.E||(this.S=setInterval(this.a2,this.R)),this.E++,this.t[this.o].Q(t)}update(t){t.remove(),this.t[this.o].Q(t)}remove(t){t.remove(),this.E--,this.E||clearInterval(this.S)}a2=()=>{const{J:t,D:e,t:s}=this;if(this.o++,this.o===e&&(this.o=0),t){let r=this.o+t;r>=e&&(r-=e);const i=s[r];for(let t=i.e;!i.P(t);t=t.getNext())t.keepAlive()}const r=s[this.o];for(let t=r.e;!r.P(t);t=t.getNext())t.timeout()};R;J;D;o;E;S;t}class P{constructor(t,e){this.Z=new Promise((t=>{this.H=t})),this.N=e,t>0?this.w=setTimeout((()=>{this.w=void 0,this.N?.(),this.H()}),t):this.H()}a6(t){this.w&&clearTimeout(this.w),t>0?this.w=setTimeout((()=>{this.w=void 0,this.N?.(),this.H()}),t):(this.w=void 0,this.H())}async a0(){await this.Z}H;Z;w;N}class x{constructor(t,e,s=!0){this.l=t,this.x=e,this.y=s}get pkgType(){return this.l.pkgType}get m(){return this.l.name}async $(t,e){const{buff:s,bodyOffset:r}=e,i=s.subarray(r),n=new this.l(i,!0);if(void 0===t.context&&this.y)f(t,g);else try{await this.x(t,n)}catch(e){e.isError||f(t,e)}void 0===t.context&&await t.close()}async r(t,e){if(void 0===t.context&&this.y)f(t,g);else try{return await this.x(t,e)}catch(e){e.isError||f(t,e)}}l;x;y}class T{constructor(t,e,s=!0){this.l=t,this.x=e,this.y=s}get pkgType(){return this.l.pkgType}get m(){return this.l.name}async $(t,e){const{buff:s,requestId:r,bodyOffset:i}=e,n=s.subarray(i),o=new this.l(n,!0);let h;if(void 0===t.context&&this.y)h=f(t,g);else try{await this.x(t,o)}catch(e){h=e.isError?e:f(t,e)}try{h?await t.sendErrorResponse(h,r):await t.sendResponse(o,r),void 0===t.context&&await t.close()}catch(e){await t.close(e)}}async r(t,e){if(void 0!==t.context||!this.y)try{return await this.x(t,e)}catch(e){throw e.isError?e:f(t,e)}throw f(t,g)}l;x;y}class R{o(){return null}N(t){this.C=t}async O(t){return!1}async P(){return!1}async c(t){const e=new WebSocket(t);return new Promise(((t,s)=>{e.onerror=t=>{s(new Error("WebSocket error"))},e.onopen=()=>{t(this.a9(e,!0))}}))}a9=(t,e)=>{const s=new A(t),{conn:r,D:i,n}=this.C(s,e);return t.onmessage=t=>{t.data.arrayBuffer().then((t=>{i(new Uint8Array(t))}))},t.onerror=t=>{n(new Error("WebSocket error"))},t.onclose=t=>{1e3===t.code?n():n(new Error(t.reason))},r};C(t,e){throw new Error('Need to call "setConnWrapperMaker" before using')}}class A{constructor(t){this.g=t}get localAddress(){}get localPort(){}get remoteAddress(){}get remoteFamily(){}get remotePort(){}async I(t){if(this.g)return this.g.send(t);throw new Error("Invalid socket")}async p(t){if(this.g){const e=v(t);return this.g.send(e)}throw new Error("Invalid socket")}async close(t){const{g:e}=this;e&&(this.g=void 0,t?e.close(3e3,t.message):e.readyState===WebSocket.OPEN&&e.close(1e3))}J(){return!this.g}g}const q=(t,e,s)=>{const r=[e,t],i=(t=>{let e,s=0,r=0;for(;s<t.length;)for(r++,e=t[s++];e>>>=7;)r++;return r})(r),n=new Uint8Array(i);((t,e,s=0)=>{let r,i,n=s;for(r=0;r<t.length;r++){i=t[r];let s=127&i;for(;i>>>=7;)e[n++]=128|s,s=127&i;e[n++]=s}if(n<=e.length)return n-s;throw new Error("Buffer overflow")})(r,n),s.push(n)},M=t=>{const{h:[e,s],k:r}=((t,e,s=0)=>{let r,i,n=s,o=0,h=0;const a=[];for(r=0;r<t;r++){do{i=e[n++],o|=(127&i)<<h,h+=7}while(128&i);if(!(void 0!==i&&h<=35))throw new Error("Parsing failed");a.push(o),o=0,h=0}return{h:a,k:n-s}})(2,t);return{buff:t,pkgType:s,requestId:e,bodyOffset:r}};class W{constructor(t){this.a1=t}get id(){return this.a?.id??-1}get context(){return this.a?.context}set context(t){this.a&&(this.a.context=t)}localAddress;localPort;remoteAddress;remoteFamily;remotePort;async sendErrorResponse(t,e){return(this.a??await this.c()).sendErrorResponse(t,e)}async sendResponse(t,e){return(this.a??await this.c()).sendResponse(t,e)}async sendMessage(t){return(this.a??await this.c()).sendMessage(t)}async sendRequest(t){return(this.a??await this.c()).sendRequest(t)}async close(t){const{a:e}=this;if(e)return this.a=void 0,void await e.close(t);this.p&&await this.p.then((e=>{this.a=void 0,e.close(t)}),(()=>this.a=void 0))}async reconnect(){this.a||await this.c()}aa(){this.a=void 0}async c(){let{p:t}=this;return t||(t=this.p=new Promise(((t,e)=>{this.a1().then((s=>{s?(t(s),this.a=s,this.p=void 0):e(new Error("Connect failed"))}))}))),await t}a1;a;p}class B{constructor(t,e){const{responsePkgType:s,timeoutMonitor:r,makePkgBuff:i,parsePkgBuff:n}=e;this.responsePkgType=s,this.context=void 0,this.F=void 0,this.G=void 0,this.u=0,this.v=new Map,this.e=new Map,this.L=new Map,this.T=i,this.U=n,this.A=t,this.K=r,this.$=this.a3;const o=[];this.T(s,2097152,o),this.V={makePkgBuff:i,responsePkgType:s,s:v(o)},this.e.set(s,this),this.A.N(((t,e)=>{do{this.u++}while(this.v.has(2097151&this.u));const s=new N(this.V,t,2097151&this.u);this.v.set(s.id,s),this.K?.insert(s);const r={conn:s,D:t=>this.a4(s,t),n:t=>this.a5(s,t)};return this.F?.(this,s,!!e),r}))}responsePkgType;context;F;G;o(){return this.A.o()}Z(t){return this.v.get(t)}c(t){return this.A.c(t)}async a0(){do{this.u++}while(this.v.has(2097151&this.u));const t=new O(2097151&this.u,this);return this.v.set(t.id,t),t}async a1(t){return this.A.O(t)}async a2(){return this.A.P()}a7(t,e){const s=e.constructor.pkgType,r=this.e.get(s);if(r)return r?.r(t,e);throw new Error("Invalid package")}a8(t,e){const s=e.constructor.pkgType,r=this.e.get(s);if(r)return r?.r(t,e);throw new Error("Invalid package")}registerError(t,e){e.registerPkgType(t),this.L.set(t,e);const s=this.e.get(this.responsePkgType);this.e.set(t,s)}registerMessage(t,e){e.registerPkgType(t)}registerRequest(t,e){e.registerPkgType(t)}handleMessageWith(t){const e=t.pkgType;if(typeof e!=typeof this.responsePkgType)throw new Error(`Wrapper ${t.m} has an incompatible pkgType ${typeof e}`);if(this.e.has(e))throw new Error(`Wrapper ${t.m} is already handled by another handler`);return this.e.set(e,t),t}handleRequestWith(t){const e=t.pkgType;if(typeof e!=typeof this.responsePkgType)throw new Error(`Wrapper ${t.m} has an incompatible pkgType ${typeof e}`);if(this.e.has(e))throw new Error(`Wrapper ${t.m} is already handled by another handler`);return this.e.set(e,t),t}ak(t){const e=t.pkgType;return this.e.get(e)===t&&(this.e.delete(e),!0)}a4(t,e){this.K?.update(t);const s=this.U(e),r=this.e.get(s.pkgType);r?r.$(t,s):t.close(new Error("Invalid package"))}a5(t,e){const s=t.id;this.v.delete(s),this.K?.remove(t),t.n(e),this.G?.(this,t,t.b.J(),e)}a3(t,e){const{buff:s,pkgType:r,requestId:i,bodyOffset:n}=e;if(r===this.responsePkgType){const e=s.subarray(n);t.W(i,e)}else{const e=this.L.get(r);if(e){const r=new e(s.subarray(n),!0);t.ac(i,r)}}}V;u;T;U;A;v;e;L;K}class N extends b{constructor(t,e,s){super(),this.context=void 0,this.id=s,this.b=e,this.B=t,this.j=void 0,this.X=0}context;id;b;get localAddress(){return this.b.localAddress}get localPort(){return this.b.localPort}get remoteAddress(){return this.b.remoteAddress}get remoteFamily(){return this.b.remoteFamily}get remotePort(){return this.b.remotePort}sendMessage(t){const e=t.constructor.pkgType,s=[t.buff];return this.B.makePkgBuff(e,0,s),this.b.p(s)}sendRequest(t){return this.j=new Map,this.sendRequest=this.Y,this.W=this.ad,this.n=this.ae,this.Y(t)}sendErrorResponse(t,e){const s=t.constructor.pkgType,r=[t.buff];return this.B.makePkgBuff(s,e,r),this.b.p(r)}sendResponse(t,e){const s=[t.respBuff],{makePkgBuff:r,responsePkgType:i}=this.B;return r(i,e,s),this.b.p(s)}async close(t){await this.b.close(t)}W(t,e){2097152===t&&void 0===this.context&&this.close(new Error("Authenticating timeout"))}ac(t,e){const s=this.j.get(t);if(s)return this.j.delete(t),s.i(e)}keepAlive(){this.b.I(this.B.s).catch(k)}timeout(){this.close(new Error("Connection timeout"))}n(t){}async Y(t){const e=2097151&this.X++,s=t.constructor.pkgType,r=[t.buff];this.B.makePkgBuff(s,e,r);const i=new Promise(((t,s)=>{const i={f:t,i:s};this.j.set(e,i),this.b.p(r).catch((t=>{this.j.delete(e),s(t)}))}));t.respBuff=await i}ad(t,e){const s=this.j.get(t);if(s)return this.j.delete(t),void s.f(e);2097152===t&&void 0===this.context&&this.close(new Error("Authenticating timeout"))}ae(t){const e=this.j;if(e.size>0){t||(t=new Error("Connection is closed"));for(const[s,r]of e)e.delete(s),r.i(t)}this.j=void 0}B;j;X}class O{constructor(t,e){this.context=void 0,this.id=t,this.M=e}context;id;localAddress;localPort;remoteAddress;remotePort;get remoteFamily(){return"Local"}async sendMessage(t){return this.M.a7(this,t)}async sendRequest(t){return this.M.a8(this,t)}sendErrorResponse(t,e){throw null}sendResponse(t,e){throw null}async close(t){}M}class S extends l{}const $=(t,e)=>new I(t,{responsePkgType:0,makePkgBuff:q,parsePkgBuff:M,timeoutMonitor:e});class I{constructor(t,e){const s=new R,r=this.f=new B(s,e);this.h="",this.k=[],this.q=0,this.a=new W((()=>this.c())),this.I=t,this.O=this.c,r.F=this.F.bind(this),r.G=this.G.bind(this)}registerError(t,e){return this.f.registerError(t,e)}registerMessage(t,e){return this.f.registerMessage(t,e)}registerRequest(t,e){return this.f.registerRequest(t,e)}handleMessageWith(t,e){this.f.handleMessageWith(new x(t,((t,s)=>e(s.data)),!1))}handleRequestWith(t,e){this.f.handleRequestWith(new T(t,(async(t,s)=>{s.resp=await e(s.data)}),!1))}sendMessage(t){return this.a.sendMessage(t)}async sendRequest(t){return await this.a.sendRequest(t),t.resp}async sendCustomAuthRequest(t){throw new Error('Need to call "enableAuthenticate" before using sendCustomAuthRequest')}resetAuthState(){}enableAuthenticate(t,e,s){const{O:r,I:i,f:n,a:o}=this;if(this.c===r){n.registerRequest(t,S);let r,h="";this.c=async()=>{for(this.q=-1,this.m&&await this.m.a0();;){const t=i(r),o=await n.c(t);if(this.h||s){const t=new S({cid:this.h,token:h});try{await o.sendRequest(t);const{resp:s}=t;if(this.h=s.cid,h=s.token,r=s.shard,r&&r<0){r=-r-1,o.close();continue}e(this.h)}catch(t){return t instanceof p&&"HitSessionLimit"===t.data&&(this.h="",h="",r=void 0,e(this.h)),void o.close(t)}}return o}},this.sendCustomAuthRequest=async t=>{await o.sendRequest(t);const{resp:s}=t;return this.h=s.cid,h=s.token,r=s.shard,r&&r<0&&(r=-r-1,o.close()),e(this.h),s},this.resetAuthState=()=>{this.h&&(this.h="",h="",r=void 0,o.close(),e(this.h))}}}reconnect(t){const{a:e,q:s}=this;s>0||(this.m?this.m.a6(t??0):t&&(this.m=new P(t,(()=>this.m=void 0))),s||e.reconnect())}onConnectionStatus(t){let{k:e}=this;e||(this.k=e=[]),e.push(t)}async c(){const{I:t,f:e,m:s}=this;this.q=-1,s&&await s.a0();const r=t();return e.c(r)}F(t,e,s){if(this.q=1,e.context="",this.k)for(const t of this.k)t(!0,s)}G(t,e,s,r){if(this.q=0,this.a.aa(),s||this.resetAuthState(),this.k)for(const t of this.k)t(!1,s,r)}f;a;h;q;I;O;m;k}var J=e.EK,C=e.sr,j=e.si,F=e.N3,U=e.sk,z=e.wL,L=e.bM,H=e.h8,K=e.Yu,_=e.I9,D=e.iU,G=e.mx;export{J as CommonError,C as ErrorWrapper,j as EventWrapper,F as JsonError,U as JsonMessage,z as JsonRequest,L as MessageWrapper,H as RequestWrapper,K as TimeoutMonitor,_ as WsClient,D as createNumPkgTypeClient,G as handleUncaughtErrorWith};
+var t={d:(e,s)=>{for(var r in s)t.o(s,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:s[r]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{EK:()=>p,sr:()=>i,si:()=>o,N3:()=>u,sk:()=>d,wL:()=>l,bM:()=>n,Lm:()=>y,h8:()=>h,Yu:()=>b,I9:()=>I,iU:()=>$,mx:()=>f});class s{constructor(t,e){e?this.x=t:this.y=t}get data(){return this.y||(this.y=this.decode(this.x)),this.y}set data(t){this.y=t,this.x=void 0}get buff(){return this.x||(this.x=this.encode(this.y)),this.x}x;y}class r extends s{static context;static registerPkgType(t){let e;try{e=this.pkgType}catch{return void Object.defineProperty(this,"pkgType",{value:t,writable:!1,enumerable:!1})}if(e!==t)throw new Error(`Wrapper ${this.name} is already registered with type ${e}`)}static get pkgType(){throw new Error(`Wrapper ${this.name} need to be registered`)}}class i extends r{isError(){return!0}}class n extends r{isMessage(){return!0}}class o extends r{isEvent(){return!0}}class h extends r{constructor(t,e){super(t,e)}isRequest(){return!0}get resp(){return this.z||(this.z=this.decodeResponse(this.$)),this.z}set resp(t){this.z=t,this.$=void 0}get respBuff(){return this.$||(this.$=this.encodeResponse(this.z)),this.$}set respBuff(t){this.z=void 0,this.$=t}z;$}const a=new TextEncoder,c=new TextDecoder;class u extends i{encode(t){const e=JSON.stringify(t);return a.encode(e)}decode(t){const e=c.decode(t);return JSON.parse(e)}}class d extends n{encode(t){const e=JSON.stringify(t);return a.encode(e)}decode(t){const e=c.decode(t);return JSON.parse(e)}}class l extends h{encode(t){const e=JSON.stringify(t);return a.encode(e)}decode(t){const e=c.decode(t);return JSON.parse(e)}encodeResponse(t){const e=JSON.stringify(t);return a.encode(e)}decodeResponse(t){const e=c.decode(t);return JSON.parse(e)}}class p extends u{}let g=(t,e)=>new p(e.message);const f=t=>{g=t};var y;!function(t){t.I="AuthTimeout",t.a="BadRequest",t.k="ConnectFailed",t.a1="ConnectionClosed",t.b="InvalidConnString",t.l="InvalidConnection",t.D="InvalidPackage",t.g="NotAuthenticated",t.a2="Timeout",t.m="UnknownError"}(y||(y={}));class w{constructor(){this.e=this,this.i=this}getPrev(){return this.e}getNext(){return this.i}insertBefore(t){this.i=t,this.e=t.e,t.e=this,this.e.i=this}insertAfter(t){this.e=t,this.i=t.i,t.i=this,this.i.e=this}remove(){this.e.i=this.i,this.i.e=this.e}e;i}class m{constructor(){this._=new w}get f(){return this._.getNext()}get a(){return this._.getPrev()}P(t){return t===this._}Q(t){t.insertAfter(this._)}a6(t){t.insertBefore(this._)}_}const k=()=>{},v=t=>{let e=0,s=0;for(;e<t.length;)s+=t[e++].length;const r=new Uint8Array(s);for(s=0;e>0;){const i=t[--e];r.set(i,s),s+=i.length}return r};class E extends w{}class b{constructor(t,e,s){if(this.R=t,this.I=e,this.E=s,this.o=0,this.F=0,this.r=[],0===t)return this.insert=k,this.update=k,void(this.remove=k);for(let t=0;t<s;t++)this.r.push(new m)}insert(t){this.F||(this.S=setInterval(this.a2,this.R)),this.F++,this.r[this.o].Q(t)}update(t){t.remove(),this.r[this.o].Q(t)}remove(t){t.remove(),this.F--,this.F||clearInterval(this.S)}a2=()=>{const{I:t,E:e,r:s}=this;if(this.o++,this.o===e&&(this.o=0),t){let r=this.o+t;r>=e&&(r-=e);const i=s[r];for(let t=i.f;!i.P(t);t=t.getNext())t.keepAlive()}const r=s[this.o];for(let t=r.f;!r.P(t);t=t.getNext())t.timeout()};R;I;E;o;F;S;r}class P{constructor(t,e){this.W=new Promise((t=>{this.G=t})),this.N=e,t>0?this.u=setTimeout((()=>{this.u=void 0,this.N?.(),this.G()}),t):this.G()}a3(t){this.u&&clearTimeout(this.u),t>0?this.u=setTimeout((()=>{this.u=void 0,this.N?.(),this.G()}),t):(this.u=void 0,this.G())}async Y(){await this.W}G;W;u;N}const T=new Error(y.g);class x{constructor(t,e,s=!0){this.l=t,this.v=e,this.w=s}get pkgType(){return this.l.pkgType}get m(){return this.l.name}async $(t,e){const{buff:s,bodyOffset:r}=e,i=s.subarray(r),n=new this.l(i,!0);if(void 0===t.context&&this.w)g(t,T);else try{await this.v(t,n)}catch(e){e.isError||g(t,e)}void 0===t.context&&await t.close()}async r(t,e){if(void 0===t.context&&this.w)g(t,T);else try{return await this.v(t,e)}catch(e){e.isError||g(t,e)}}l;v;w}class R{constructor(t,e,s=!0){this.l=t,this.v=e,this.w=s}get pkgType(){return this.l.pkgType}get m(){return this.l.name}async $(t,e){const{buff:s,requestId:r,bodyOffset:i}=e,n=s.subarray(i),o=new this.l(n,!0);let h;if(void 0===t.context&&this.w)h=g(t,T);else try{await this.v(t,o)}catch(e){h=e.isError?e:g(t,e)}try{h?await t.sendErrorResponse(h,r):await t.sendResponse(o,r),void 0===t.context&&await t.close()}catch(e){await t.close(e)}}async r(t,e){if(void 0!==t.context||!this.w)try{return await this.v(t,e)}catch(e){throw e.isError?e:g(t,e)}throw g(t,T)}l;v;w}class A{o(){return null}P(t){this.D=t}async Q(t){return!1}async R(){return!1}async c(t){const e=new WebSocket(t);return new Promise(((t,s)=>{e.onerror=t=>{s(new Error(y.m))},e.onopen=()=>{t(this.a4(e,!0))}}))}a4=(t,e)=>{const s=new q(t),{conn:r,E:i,n}=this.D(s,e);return t.onmessage=t=>{t.data.arrayBuffer().then((t=>{i(new Uint8Array(t))}))},t.onerror=t=>{n(new Error(y.m))},t.onclose=t=>{1e3===t.code?n():n(new Error(t.reason))},r};D(t,e){throw new Error('Need to call "setConnWrapperMaker" before using')}}class q{constructor(t){this.g=t}get localAddress(){}get localPort(){}get remoteAddress(){}get remoteFamily(){}get remotePort(){}async N(t){if(this.g)return this.g.send(t);throw new Error(y.l)}async p(t){if(this.g){const e=v(t);return this.g.send(e)}throw new Error(y.l)}async close(t){const{g:e}=this;e&&(this.g=void 0,t?e.close(3e3,t.message):e.readyState===WebSocket.OPEN&&e.close(1e3))}O(){return!this.g}g}const M=(t,e,s)=>{const r=[e,t],i=(t=>{let e,s=0,r=0;for(;s<t.length;)for(r++,e=t[s++];e>>>=7;)r++;return r})(r),n=new Uint8Array(i);((t,e,s=0)=>{let r,i,n=s;for(r=0;r<t.length;r++){i=t[r];let s=127&i;for(;i>>>=7;)e[n++]=128|s,s=127&i;e[n++]=s}if(n<=e.length)return n-s;throw new Error("Buffer overflow")})(r,n),s.push(n)},N=t=>{const{h:[e,s],k:r}=((t,e,s=0)=>{let r,i,n=s,o=0,h=0;const a=[];for(r=0;r<t;r++){do{i=e[n++],o|=(127&i)<<h,h+=7}while(128&i);if(!(void 0!==i&&h<=35))throw new Error("Parsing failed");a.push(o),o=0,h=0}return{h:a,k:n-s}})(2,t);return{buff:t,pkgType:s,requestId:e,bodyOffset:r}};class B{constructor(t){this.a1=t}get id(){return this.a?.id??-1}get context(){return this.a?.context}set context(t){this.a&&(this.a.context=t)}localAddress;localPort;remoteAddress;remoteFamily;remotePort;async sendErrorResponse(t,e){return(this.a??await this.c()).sendErrorResponse(t,e)}async sendResponse(t,e){return(this.a??await this.c()).sendResponse(t,e)}async sendMessage(t){return(this.a??await this.c()).sendMessage(t)}async sendRequest(t){return(this.a??await this.c()).sendRequest(t)}async close(t){const{a:e}=this;if(e)return this.a=void 0,void await e.close(t);this.p&&await this.p.then((e=>{this.a=void 0,e.close(t)}),(()=>this.a=void 0))}async reconnect(){this.a||await this.c()}a5(){this.a=void 0}async c(){let{p:t}=this;return t||(t=this.p=new Promise(((t,e)=>{this.a1().then((s=>{s?(t(s),this.a=s,this.p=void 0):e(new Error("Connect failed"))}))}))),await t}a1;a;p}class W{constructor(t,e){const{responsePkgType:s,timeoutMonitor:r,makePkgBuff:i,parsePkgBuff:n}=e;this.responsePkgType=s,this.s=0,this.t=new Map,this.f=new Map,this.L=new Map,this.T=i,this.U=n,this.A=t,this.J=r,this.$=this.a7;const o=[];this.T(s,2097152,o),this.V={makePkgBuff:i,responsePkgType:s,u:v(o)},this.f.set(s,this),this.A.P(((t,e)=>{do{this.s++}while(this.t.has(2097151&this.s));const s=new O(this.V,t,2097151&this.s);this.t.set(s.id,s),this.J?.insert(s);const r={conn:s,E:t=>this.a8(s,t),n:t=>this.a9(s,t)};return this.K?.(this,s,!!e),r}))}responsePkgType;context;K;B;o(){return this.A.o()}a3(t){return this.t.get(t)}c(t){return this.A.c(t)}async a4(){do{this.s++}while(this.t.has(2097151&this.s));const t=new C(2097151&this.s,this);return this.t.set(t.id,t),t}async a5(t){return this.A.Q(t)}async a6(){return this.A.R()}ab(t,e){const s=e.constructor.pkgType,r=this.f.get(s);if(r)return r?.r(t,e);throw new Error(y.D)}ac(t,e){const s=e.constructor.pkgType,r=this.f.get(s);if(r)return r?.r(t,e);throw new Error(y.D)}registerError(t,e){e.registerPkgType(t),this.L.set(t,e);const s=this.f.get(this.responsePkgType);this.f.set(t,s)}registerMessage(t,e){e.registerPkgType(t)}registerRequest(t,e){e.registerPkgType(t)}handleMessageWith(t){const e=t.pkgType;if(typeof e!=typeof this.responsePkgType)throw new Error(`Wrapper ${t.m} has an incompatible pkgType ${typeof e}`);if(this.f.has(e))throw new Error(`Wrapper ${t.m} is already handled by another handler`);return this.f.set(e,t),t}handleRequestWith(t){const e=t.pkgType;if(typeof e!=typeof this.responsePkgType)throw new Error(`Wrapper ${t.m} has an incompatible pkgType ${typeof e}`);if(this.f.has(e))throw new Error(`Wrapper ${t.m} is already handled by another handler`);return this.f.set(e,t),t}ao(t){const e=t.pkgType;return this.f.get(e)===t&&(this.f.delete(e),!0)}a8(t,e){this.J?.update(t);const s=this.U(e),r=this.f.get(s.pkgType);r?r.$(t,s):t.close(new Error(y.D))}a9(t,e){const s=t.id;this.t.delete(s),this.J?.remove(t),t.n(e),this.B?.(this,t,t.b.O(),e)}a7(t,e){const{buff:s,pkgType:r,requestId:i,bodyOffset:n}=e;if(r===this.responsePkgType){const e=s.subarray(n);t.X(i,e)}else{const e=this.L.get(r);if(e){const r=new e(s.subarray(n),!0);t.ag(i,r)}}}V;s;T;U;A;t;f;L;J}class O extends E{constructor(t,e,s){super(),this.id=s,this.b=e,this.C=t,this.Z=0}context;id;b;get localAddress(){return this.b.localAddress}get localPort(){return this.b.localPort}get remoteAddress(){return this.b.remoteAddress}get remoteFamily(){return this.b.remoteFamily}get remotePort(){return this.b.remotePort}sendMessage(t){const e=t.constructor.pkgType,s=[t.buff];return this.C.makePkgBuff(e,0,s),this.b.p(s)}sendRequest(t){return this.k=new Map,this.sendRequest=this.a0,this.X=this.ah,this.n=this.ai,this.a0(t)}sendErrorResponse(t,e){const s=t.constructor.pkgType,r=[t.buff];return this.C.makePkgBuff(s,e,r),this.b.p(r)}sendResponse(t,e){const s=[t.respBuff],{makePkgBuff:r,responsePkgType:i}=this.C;return r(i,e,s),this.b.p(s)}async close(t){await this.b.close(t)}X(t,e){2097152===t&&void 0===this.context&&this.close(new Error(y.I))}ag(t,e){const s=this.k.get(t);if(s)return this.k.delete(t),s.i(e)}keepAlive(){this.b.N(this.C.u).catch(k)}timeout(){this.close(new Error(y.a2))}n(t){}async a0(t){const e=2097151&this.Z++,s=t.constructor.pkgType,r=[t.buff];this.C.makePkgBuff(s,e,r);const i=new Promise(((t,s)=>{const i={d:t,i:s};this.k.set(e,i),this.b.p(r).catch((t=>{this.k.delete(e),s(t)}))}));t.respBuff=await i}ah(t,e){const s=this.k.get(t);if(s)return this.k.delete(t),void s.d(e);2097152===t&&void 0===this.context&&this.close(new Error(y.I))}ai(t){const e=this.k;if(e.size>0){t||(t=new Error(y.a1));for(const[s,r]of e)e.delete(s),r.i(t)}this.k=void 0}C;k;Z}class C{constructor(t,e){this.id=t,this.M=e}context;id;localAddress;localPort;remoteAddress;remotePort;get remoteFamily(){return"Local"}async sendMessage(t){return this.M.ab(this,t)}async sendRequest(t){return this.M.ac(this,t)}sendErrorResponse(t,e){throw null}sendResponse(t,e){throw null}async close(t){}M}class S extends l{}const $=(t,e)=>new I(t,{responsePkgType:0,makePkgBuff:M,parsePkgBuff:N,timeoutMonitor:e});class I{constructor(t,e){const s=new A,r=this.d=new W(s,e);this.h="",this.j=[],this.q=0,this.a=new B((()=>this.c())),this.H=t,this.O=this.c,r.K=this.K.bind(this),r.B=this.B.bind(this)}registerError(t,e){return this.d.registerError(t,e)}registerMessage(t,e){return this.d.registerMessage(t,e)}registerRequest(t,e){return this.d.registerRequest(t,e)}handleMessageWith(t,e){this.d.handleMessageWith(new x(t,((t,s)=>e(s.data)),!1))}handleRequestWith(t,e){this.d.handleRequestWith(new R(t,(async(t,s)=>{s.resp=await e(s.data)}),!1))}sendMessage(t){return this.a.sendMessage(t)}async sendRequest(t){return await this.a.sendRequest(t),t.resp}async sendCustomAuthRequest(t){throw new Error('Need to call "enableAuthenticate" before using sendCustomAuthRequest')}resetAuthState(){}enableAuthenticate(t,e,s){const{O:r,H:i,d:n,a:o}=this;if(this.c===r){n.registerRequest(t,S);let r,h="";this.c=async()=>{for(this.q=-1,this.m&&await this.m.Y();;){const t=i(r);let o;try{o=await n.c(t)}catch{return void this.B(n,this.a,!0,new Error(y.k))}if(this.h||s){const t=new S({cid:this.h,token:h});try{await o.sendRequest(t);const{resp:s}=t;if(this.h=s.cid,h=s.token,r=s.shard,r&&r<0){r=-r-1,o.close();continue}e(this.h)}catch(t){return t instanceof p&&"HitSessionLimit"===t.data&&(this.h="",h="",r=void 0,e(this.h)),void o.close(t)}}return o}},this.sendCustomAuthRequest=async t=>{await o.sendRequest(t);const{resp:s}=t;return this.h=s.cid,h=s.token,r=s.shard,r&&r<0&&(r=-r-1,o.close()),e(this.h),s},this.resetAuthState=()=>{this.h&&(this.h="",h="",r=void 0,o.close(),e(this.h))}}}reconnect(t){const{a:e,q:s}=this;s>0||(this.m?this.m.a3(t??0):t&&(this.m=new P(t,(()=>this.m=void 0))),s||e.reconnect())}onConnectionStatus(t){let{j:e}=this;e||(this.j=e=[]),e.push(t)}async c(){const{H:t,d:e,m:s}=this;this.q=-1,s&&await s.Y();const r=t();try{return e.c(r)}catch{this.B(e,this.a,!0,new Error(y.k))}}K(t,e,s){if(this.q=1,e.context="",this.j)for(const t of this.j)t(!0,s)}B(t,e,s,r){if(this.q=0,this.a.a5(),s||this.resetAuthState(),this.j)for(const t of this.j)t(!1,s,r)}d;a;h;q;H;O;m;j}var J=e.EK,F=e.sr,j=e.si,L=e.N3,U=e.sk,z=e.wL,D=e.bM,K=e.Lm,_=e.h8,G=e.Yu,H=e.I9,Q=e.iU,Y=e.mx;export{J as CommonError,F as ErrorWrapper,j as EventWrapper,L as JsonError,U as JsonMessage,z as JsonRequest,D as MessageWrapper,K as NetErrorString,_ as RequestWrapper,G as TimeoutMonitor,H as WsClient,Q as createNumPkgTypeClient,Y as handleUncaughtErrorWith};

package/lib/common/AdjustableTimer.js

@@ -1,42 +1,42 @@
 export class b {
     constructor(a, c) {
-        this.Z = new Promise((f) => {
-            this.H = f;
+        this.W = new Promise((d) => {
+            this.G = d;
         });
         this.N = c;
         if (a > 0) {
-            this.w = setTimeout(() => {
-                this.w = undefined;
+            this.u = setTimeout(() => {
+                this.u = undefined;
                 this.N?.();
-                this.H();
+                this.G();
             }, a);
         }
         else {
-            this.H();
+            this.G();
         }
     }
-    a6(a) {
-        if (this.w) {
-            clearTimeout(this.w);
+    a3(a) {
+        if (this.u) {
+            clearTimeout(this.u);
         }
         if (a > 0) {
-            this.w = setTimeout(() => {
-                this.w = undefined;
+            this.u = setTimeout(() => {
+                this.u = undefined;
                 this.N?.();
-                this.H();
+                this.G();
             }, a);
         }
         else {
-            this.w = undefined;
-            this.H();
+            this.u = undefined;
+            this.G();
         }
     }
-    async a0() {
-        await this.Z;
+    async Y() {
+        await this.W;
     }
-    H;
-    Z;
-    w;
+    G;
+    W;
+    u;
     N;
 }
 //# sourceMappingURL=AdjustableTimer.js.map

package/lib/common/DataWrapper.js

@@ -1,31 +1,29 @@
 export class DataWrapper {
     constructor(a, needParse) {
         if (needParse) {
-            this.r = a;
-            this.s = undefined;
+            this.x = a;
         }
         else {
-            this.r = undefined;
-            this.s = a;
+            this.y = a;
         }
     }
     get data() {
-        if (!this.s) {
-            this.s = this.decode(this.r);
+        if (!this.y) {
+            this.y = this.decode(this.x);
         }
-        return this.s;
+        return this.y;
     }
     set data(b) {
-        this.s = b;
-        this.r = undefined;
+        this.y = b;
+        this.x = undefined;
     }
     get buff() {
-        if (!this.r) {
-            this.r = this.encode(this.s);
+        if (!this.x) {
+            this.x = this.encode(this.y);
         }
-        return this.r;
+        return this.x;
     }
-    r;
-    s;
+    x;
+    y;
 }
 //# sourceMappingURL=DataWrapper.js.map

package/lib/common/List.js

@@ -1,38 +1,38 @@
 export class ListNode {
     constructor() {
-        this.d = this;
+        this.e = this;
         this.i = this;
     }
     getPrev() {
-        return this.d;
+        return this.e;
     }
     getNext() {
         return this.i;
     }
     insertBefore(node) {
         this.i = node;
-        this.d = node.d;
-        node.d = this;
-        this.d.i = this;
+        this.e = node.e;
+        node.e = this;
+        this.e.i = this;
     }
     insertAfter(node) {
-        this.d = node;
+        this.e = node;
         this.i = node.i;
         node.i = this;
-        this.i.d = this;
+        this.i.e = this;
     }
     remove() {
-        this.d.i = this.i;
-        this.i.d = this.d;
+        this.e.i = this.i;
+        this.i.e = this.e;
     }
-    d;
+    e;
     i;
 }
 export class c {
     constructor() {
         this._ = new ListNode();
     }
-    get e() {
+    get f() {
         return this._.getNext();
     }
     get a() {
@@ -44,7 +44,7 @@ export class c {
     Q(node) {
         node.insertAfter(this._);
     }
-    ab(node) {
+    a6(node) {
         node.insertBefore(this._);
     }
     _;

package/lib/common/utils.js

@@ -1,14 +1,14 @@
-export const j = (e) => {
-    return new Promise((f) => setTimeout(f, e));
+export const j = (f) => {
+    return new Promise((d) => setTimeout(d, f));
 };
 export const l = () => { };
 export const k = (i = 0x100000000) => {
     return (Math.random() * i) >>> 0;
 };
-export const m = (d) => {
+export const m = (e) => {
     let c = 5381, a = 0;
-    while (a < d.length) {
-        c = ((c << 5) + c) + d.charCodeAt(a++);
+    while (a < e.length) {
+        c = ((c << 5) + c) + e.charCodeAt(a++);
     }
     return c >>> 0;
 };

package/lib/handler/SimpleHandler.js

@@ -1,9 +1,11 @@
-import { c, b } from './common';
-export class j {
-    constructor(wrapperCtor, d, f = true) {
+import { NetErrorString } from '../net/NetErrorString';
+import { b } from './common';
+const c = new Error(NetErrorString.g);
+export class n {
+    constructor(wrapperCtor, d, e = true) {
         this.l = wrapperCtor;
-        this.x = d;
-        this.y = f;
+        this.v = d;
+        this.w = e;
     }
     get pkgType() {
         return this.l.pkgType;
@@ -15,9 +17,9 @@ export class j {
         const { buff, bodyOffset } = a;
         const h = buff.subarray(bodyOffset);
         const message = new this.l(h, true);
-        if (conn.context !== undefined || !this.y) {
+        if (conn.context !== undefined || !this.w) {
             try {
-                await this.x(conn, message);
+                await this.v(conn, message);
             }
             catch (err) {
                 if (!err.isError) {
@@ -33,9 +35,9 @@ export class j {
         }
     }
     async r(conn, message) {
-        if (conn.context !== undefined || !this.y) {
+        if (conn.context !== undefined || !this.w) {
             try {
-                return await this.x(conn, message);
+                return await this.v(conn, message);
             }
             catch (err) {
                 if (!err.isError) {
@@ -48,14 +50,14 @@ export class j {
         }
     }
     l;
-    x;
-    y;
+    v;
+    w;
 }
-export class n {
-    constructor(wrapperCtor, d, f = true) {
+export class o {
+    constructor(wrapperCtor, d, e = true) {
         this.l = wrapperCtor;
-        this.x = d;
-        this.y = f;
+        this.v = d;
+        this.w = e;
     }
     get pkgType() {
         return this.l.pkgType;
@@ -68,9 +70,9 @@ export class n {
         const h = buff.subarray(bodyOffset);
         const request = new this.l(h, true);
         let error;
-        if (conn.context !== undefined || !this.y) {
+        if (conn.context !== undefined || !this.w) {
             try {
-                await this.x(conn, request);
+                await this.v(conn, request);
             }
             catch (err) {
                 if (err.isError) {
@@ -100,9 +102,9 @@ export class n {
         }
     }
     async r(conn, request) {
-        if (conn.context !== undefined || !this.y) {
+        if (conn.context !== undefined || !this.w) {
             try {
-                return await this.x(conn, request);
+                return await this.v(conn, request);
             }
             catch (err) {
                 if (err.isError) {
@@ -116,7 +118,7 @@ export class n {
         throw b(conn, c);
     }
     l;
-    x;
-    y;
+    v;
+    w;
 }
 //# sourceMappingURL=SimpleHandler.js.map

package/lib/handler/common.js

@@ -1,7 +1,6 @@
 import { JsonError } from '../net/JsonPackageWrapper';
 export class CommonError extends JsonError {
 }
-export const c = new Error('Connection is not authenticated');
 export let b = (a, err) => {
     return new CommonError(err.message);
 };

package/lib/index.d.ts

@@ -122,6 +122,18 @@ export interface IAuthResp {
 	shard?: number;
 }
 export declare const handleUncaughtErrorWith: (handler: (conn: IConn<unknown>, err: Error) => ErrorWrapper<unknown>) => void;
+export declare enum NetErrorString {
+	AuthTimeout = "AuthTimeout",
+	BadRequest = "BadRequest",
+	ConnectFailed = "ConnectFailed",
+	ConnectionClosed = "ConnectionClosed",
+	InvalidConnString = "InvalidConnString",
+	InvalidConnection = "InvalidConnection",
+	InvalidPackage = "InvalidPackage",
+	NotAuthenticated = "NotAuthenticated",
+	Timeout = "Timeout",
+	UnknownError = "UnknownError"
+}
 export declare const createNumPkgTypeClient: (getConnStr: (shard?: number) => string, timeoutMonitor?: TimeoutMonitor) => WsClient<number>;
 export declare class WsClient<PkgTypeT extends number | string> {
 	constructor(getConnStr: (shard?: number) => string, opts: TypedPkgHubOpts<PkgTypeT>);

package/lib/index.js

@@ -1,5 +1,6 @@
 export { CommonError, handleUncaughtErrorWith } from './handler/common';
 export { JsonError, JsonMessage, JsonRequest } from './net/JsonPackageWrapper';
+export { NetErrorString } from './net/NetErrorString';
 export { ErrorWrapper, EventWrapper, MessageWrapper, RequestWrapper } from './net/PackageWrapper';
 export { TimeoutMonitor } from './net/TimeoutMonitor';
 export { createNumPkgTypeClient, WsClient } from './WsClient';

package/lib/net/BrowserWsNet.js

@@ -1,40 +1,41 @@
 import { y } from '../common/utils';
-export class l {
+import { NetErrorString } from './NetErrorString';
+export class r {
     o() {
         return null;
     }
-    N(C) {
-        this.C = C;
+    P(D) {
+        this.D = D;
     }
-    async O(r) {
+    async Q(t) {
         return false;
     }
-    async P() {
+    async R() {
         return false;
     }
-    async c(d) {
-        const e = new WebSocket(d);
-        return new Promise((f, i) => {
-            e.onerror = (k) => {
-                i(new Error('WebSocket error'));
+    async c(e) {
+        const f = new WebSocket(e);
+        return new Promise((d, i) => {
+            f.onerror = (k) => {
+                i(new Error(NetErrorString.m));
             };
-            e.onopen = () => {
-                f(this.a9(e, true));
+            f.onopen = () => {
+                d(this.a4(f, true));
             };
         });
     }
-    a9 = (e, q) => {
-        const b = new m(e);
-        const { conn, D, n } = this.C(b, q);
-        e.onmessage = (j) => {
+    a4 = (f, q) => {
+        const b = new s(f);
+        const { conn, E, n } = this.D(b, q);
+        f.onmessage = (j) => {
             j.data.arrayBuffer().then((buff) => {
-                D(new Uint8Array(buff));
+                E(new Uint8Array(buff));
             });
         };
-        e.onerror = (k) => {
-            n(new Error('WebSocket error'));
+        f.onerror = (k) => {
+            n(new Error(NetErrorString.m));
         };
-        e.onclose = (j) => {
+        f.onclose = (j) => {
             if (j.code === 1000) {
                 n();
             }
@@ -44,13 +45,13 @@ export class l {
         };
         return conn;
     };
-    C(a, s) {
+    D(a, u) {
         throw new Error('Need to call "setConnWrapperMaker" before using');
     }
 }
-class m {
-    constructor(e) {
-        this.g = e;
+class s {
+    constructor(f) {
+        this.g = f;
     }
     get localAddress() {
         return;
@@ -67,18 +68,18 @@ class m {
     get remotePort() {
         return;
     }
-    async I(buff) {
+    async N(buff) {
         if (this.g) {
             return this.g.send(buff);
         }
-        throw new Error('Invalid socket');
+        throw new Error(NetErrorString.l);
     }
     async p(h) {
         if (this.g) {
             const buff = y(h);
             return this.g.send(buff);
         }
-        throw new Error('Invalid socket');
+        throw new Error(NetErrorString.l);
     }
     async close(err) {
         const { g } = this;
@@ -94,7 +95,7 @@ class m {
             }
         }
     }
-    J() {
+    O() {
         return !this.g;
     }
     g;

package/lib/net/LazyConn.js

@@ -1,6 +1,6 @@
 export class g {
-    constructor(d) {
-        this.a1 = d;
+    constructor(e) {
+        this.a1 = e;
     }
     get id() {
         return this.a?.id ?? -1;
@@ -49,16 +49,16 @@ export class g {
             await this.c();
         }
     }
-    aa() {
+    a5() {
         this.a = undefined;
     }
     async c() {
         let { p } = this;
         if (!p) {
-            p = this.p = new Promise((f, i) => {
+            p = this.p = new Promise((d, i) => {
                 this.a1().then((conn) => {
                     if (conn) {
-                        f(conn);
+                        d(conn);
                         this.a = conn;
                         this.p = undefined;
                     }

package/lib/net/NetErrorString.js

@@ -0,0 +1,14 @@
+export var NetErrorString;
+(function (NetErrorString) {
+    NetErrorString["I"] = "AuthTimeout";
+    NetErrorString["a"] = "BadRequest";
+    NetErrorString["k"] = "ConnectFailed";
+    NetErrorString["a1"] = "ConnectionClosed";
+    NetErrorString["b"] = "InvalidConnString";
+    NetErrorString["l"] = "InvalidConnection";
+    NetErrorString["D"] = "InvalidPackage";
+    NetErrorString["g"] = "NotAuthenticated";
+    NetErrorString["a2"] = "Timeout";
+    NetErrorString["m"] = "UnknownError";
+})(NetErrorString || (NetErrorString = {}));
+//# sourceMappingURL=NetErrorString.js.map

package/lib/net/TimeoutMonitor.js

@@ -3,68 +3,68 @@ import { l } from '../common/utils';
 export class MonitorConn extends ListNode {
 }
 export class TimeoutMonitor {
-    constructor(f, h, g) {
-        this.R = f;
-        this.J = h;
-        this.D = g;
+    constructor(e, h, g) {
+        this.R = e;
+        this.I = h;
+        this.E = g;
         this.o = 0;
-        this.E = 0;
-        this.t = [];
-        if (f === 0) {
+        this.F = 0;
+        this.r = [];
+        if (e === 0) {
             this.insert = l;
             this.update = l;
             this.remove = l;
             return;
         }
         for (let a = 0; a < g; a++) {
-            this.t.push(new c());
+            this.r.push(new c());
         }
     }
     insert(conn) {
-        if (!this.E) {
+        if (!this.F) {
             this.S = setInterval(this.a2, this.R);
         }
-        this.E++;
-        this.t[this.o].Q(conn);
+        this.F++;
+        this.r[this.o].Q(conn);
     }
     update(conn) {
         conn.remove();
-        this.t[this.o].Q(conn);
+        this.r[this.o].Q(conn);
     }
     remove(conn) {
         conn.remove();
-        this.E--;
-        if (!this.E) {
+        this.F--;
+        if (!this.F) {
             clearInterval(this.S);
         }
     }
     a2 = () => {
-        const { J, D, t } = this;
+        const { I, E, r } = this;
         this.o++;
-        if (this.o === D) {
+        if (this.o === E) {
             this.o = 0;
         }
-        if (J) {
-            let d = this.o + J;
-            if (d >= D) {
-                d -= D;
+        if (I) {
+            let d = this.o + I;
+            if (d >= E) {
+                d -= E;
             }
-            const b = t[d];
-            for (let node = b.e; !b.P(node); node = node.getNext()) {
+            const b = r[d];
+            for (let node = b.f; !b.P(node); node = node.getNext()) {
                 node.keepAlive();
             }
         }
-        const b = t[this.o];
-        for (let node = b.e; !b.P(node); node = node.getNext()) {
+        const b = r[this.o];
+        for (let node = b.f; !b.P(node); node = node.getNext()) {
             node.timeout();
         }
     };
     R;
-    J;
-    D;
-    o;
+    I;
     E;
+    o;
+    F;
     S;
-    t;
+    r;
 }
 //# sourceMappingURL=TimeoutMonitor.js.map

package/lib/net/TypedPkgHub.js

@@ -1,94 +1,92 @@
 import { y, l } from '../common/utils';
+import { NetErrorString } from './NetErrorString';
 import { MonitorConn } from './TimeoutMonitor';
-export class t {
-    constructor(C, w) {
+export class v {
+    constructor(F, w) {
         const { responsePkgType, timeoutMonitor, makePkgBuff, parsePkgBuff } = w;
         this.responsePkgType = responsePkgType;
-        this.context = undefined;
-        this.F = undefined;
-        this.G = undefined;
-        this.u = 0;
-        this.v = new Map();
-        this.e = new Map();
+        this.s = 0;
+        this.t = new Map();
+        this.f = new Map();
         this.L = new Map();
         this.T = makePkgBuff;
         this.U = parsePkgBuff;
-        this.A = C;
-        this.K = timeoutMonitor;
-        const Q = this;
-        Q.$ = this.a3;
-        const s = [];
-        this.T(responsePkgType, 0x200000, s);
+        this.A = F;
+        this.J = timeoutMonitor;
+        const S = this;
+        S.$ = this.a7;
+        const u = [];
+        this.T(responsePkgType, 0x200000, u);
         this.V = {
             makePkgBuff: makePkgBuff,
             responsePkgType: responsePkgType,
-            s: y(s),
+            u: y(u),
         };
-        this.e.set(responsePkgType, Q);
-        this.A.N((b, q) => {
+        this.f.set(responsePkgType, S);
+        this.A.P((b, q) => {
             do {
-                this.u++;
-            } while (this.v.has(this.u & 0x1fffff));
-            const conn = new x(this.V, b, this.u & 0x1fffff);
-            this.v.set(conn.id, conn);
-            this.K?.insert(conn);
+                this.s++;
+            } while (this.t.has(this.s & 0x1fffff));
+            const conn = new x(this.V, b, this.s & 0x1fffff);
+            this.t.set(conn.id, conn);
+            this.J?.insert(conn);
             const g = {
                 conn,
-                D: (buff) => this.a4(conn, buff),
-                n: (err) => this.a5(conn, err),
+                E: (buff) => this.a8(conn, buff),
+                n: (err) => this.a9(conn, err),
             };
-            this.F?.(this, conn, !!q);
+            this.K?.(this, conn, !!q);
             return g;
         });
     }
     responsePkgType;
     context;
-    F;
-    G;
+    K;
+    B;
     o() {
         return this.A.o();
     }
-    Z(z) {
-        return this.v.get(z);
+    a3(z) {
+        return this.t.get(z);
     }
-    c(d) {
-        return this.A.c(d);
+    c(e) {
+        return this.A.c(e);
     }
-    async a0() {
+    async a4() {
         do {
-            this.u++;
-        } while (this.v.has(this.u & 0x1fffff));
-        const conn = new a6(this.u & 0x1fffff, this);
-        this.v.set(conn.id, conn);
+            this.s++;
+        } while (this.t.has(this.s & 0x1fffff));
+        const conn = new aa(this.s & 0x1fffff, this);
+        this.t.set(conn.id, conn);
         return conn;
     }
-    async a1(d) {
-        return this.A.O(d);
+    async a5(e) {
+        return this.A.Q(e);
     }
-    async a2() {
-        return this.A.P();
+    async a6() {
+        return this.A.R();
     }
-    a7(conn, message) {
+    ab(conn, message) {
         const pkgType = message.constructor.pkgType;
-        const handler = this.e.get(pkgType);
+        const handler = this.f.get(pkgType);
         if (handler) {
             return handler?.r(conn, message);
         }
-        throw new Error('Invalid package');
+        throw new Error(NetErrorString.D);
     }
-    a8(conn, request) {
+    ac(conn, request) {
         const pkgType = request.constructor.pkgType;
-        const handler = this.e.get(pkgType);
+        const handler = this.f.get(pkgType);
         if (handler) {
             return handler?.r(conn, request);
         }
-        throw new Error('Invalid package');
+        throw new Error(NetErrorString.D);
     }
     registerError(pkgType, wrapperCtor) {
         wrapperCtor.registerPkgType(pkgType);
         this.L.set(pkgType, wrapperCtor);
-        const a9 = this.e.get(this.responsePkgType);
-        this.e.set(pkgType, a9);
+        const ad = this.f.get(this.responsePkgType);
+        this.f.set(pkgType, ad);
     }
     registerMessage(pkgType, wrapperCtor) {
         wrapperCtor.registerPkgType(pkgType);
@@ -101,10 +99,10 @@ export class t {
         if (typeof pkgType !== typeof this.responsePkgType) {
             throw new Error(`Wrapper ${handler.m} has an incompatible pkgType ${typeof pkgType}`);
         }
-        if (this.e.has(pkgType)) {
+        if (this.f.has(pkgType)) {
             throw new Error(`Wrapper ${handler.m} is already handled by another handler`);
         }
-        this.e.set(pkgType, handler);
+        this.f.set(pkgType, handler);
         return handler;
     }
     handleRequestWith(handler) {
@@ -112,72 +110,70 @@ export class t {
         if (typeof pkgType !== typeof this.responsePkgType) {
             throw new Error(`Wrapper ${handler.m} has an incompatible pkgType ${typeof pkgType}`);
         }
-        if (this.e.has(pkgType)) {
+        if (this.f.has(pkgType)) {
             throw new Error(`Wrapper ${handler.m} is already handled by another handler`);
         }
-        this.e.set(pkgType, handler);
+        this.f.set(pkgType, handler);
         return handler;
     }
-    ak(handler) {
+    ao(handler) {
         const pkgType = handler.pkgType;
-        const aa = this.e.get(pkgType);
-        if (aa === handler) {
-            this.e.delete(pkgType);
+        const ae = this.f.get(pkgType);
+        if (ae === handler) {
+            this.f.delete(pkgType);
             return true;
         }
         return false;
     }
-    a4(conn, buff) {
-        this.K?.update(conn);
+    a8(conn, buff) {
+        this.J?.update(conn);
         const a = this.U(buff);
-        const handler = this.e.get(a.pkgType);
+        const handler = this.f.get(a.pkgType);
         if (handler) {
             handler.$(conn, a);
             return;
         }
-        conn.close(new Error('Invalid package'));
+        conn.close(new Error(NetErrorString.D));
     }
-    a5(conn, err) {
+    a9(conn, err) {
         const z = conn.id;
-        this.v.delete(z);
-        this.K?.remove(conn);
+        this.t.delete(z);
+        this.J?.remove(conn);
         conn.n(err);
-        this.G?.(this, conn, conn.b.J(), err);
+        this.B?.(this, conn, conn.b.O(), err);
     }
-    a3(conn, a) {
+    a7(conn, a) {
         const { buff, pkgType, requestId, bodyOffset } = a;
         if (pkgType === this.responsePkgType) {
             const h = buff.subarray(bodyOffset);
-            conn.W(requestId, h);
+            conn.X(requestId, h);
         }
         else {
-            const S = this.L.get(pkgType);
-            if (S) {
+            const Y = this.L.get(pkgType);
+            if (Y) {
                 const h = buff.subarray(bodyOffset);
-                const ab = new S(h, true);
-                conn.ac(requestId, ab);
+                const af = new Y(h, true);
+                conn.ag(requestId, af);
             }
         }
     }
     V;
-    u;
+    s;
     T;
     U;
     A;
-    v;
-    e;
+    t;
+    f;
     L;
-    K;
+    J;
 }
 class x extends MonitorConn {
     constructor(w, b, id) {
         super();
-        this.context = undefined;
         this.id = id;
         this.b = b;
-        this.B = w;
-        this.j = undefined;
-        this.X = 0;
+        this.C = w;
+        this.Z = 0;
     }
     context;
     id;
@@ -200,99 +196,98 @@ class x extends MonitorConn {
     sendMessage(message) {
         const pkgType = message.constructor.pkgType;
         const encoded = [message.buff];
-        this.B.makePkgBuff(pkgType, 0, encoded);
+        this.C.makePkgBuff(pkgType, 0, encoded);
         return this.b.p(encoded);
     }
     sendRequest(request) {
-        this.j = new Map();
-        this.sendRequest = this.Y;
-        this.W = this.ad;
-        this.n = this.ae;
-        return this.Y(request);
+        this.k = new Map();
+        this.sendRequest = this.a0;
+        this.X = this.ah;
+        this.n = this.ai;
+        return this.a0(request);
     }
     sendErrorResponse(error, requestId) {
         const pkgType = error.constructor.pkgType;
         const encoded = [error.buff];
-        this.B.makePkgBuff(pkgType, requestId, encoded);
+        this.C.makePkgBuff(pkgType, requestId, encoded);
         return this.b.p(encoded);
     }
     sendResponse(request, requestId) {
         const encoded = [request.respBuff];
-        const { makePkgBuff, responsePkgType } = this.B;
+        const { makePkgBuff, responsePkgType } = this.C;
         makePkgBuff(responsePkgType, requestId, encoded);
         return this.b.p(encoded);
     }
     async close(err) {
         await this.b.close(err);
     }
-    W(requestId, al) {
+    X(requestId, ap) {
         if (requestId === 0x200000 && this.context === undefined) {
-            this.close(new Error('Authenticating timeout'));
+            this.close(new Error(NetErrorString.I));
         }
     }
-    ac(requestId, error) {
-        const k = this.j.get(requestId);
-        if (k) {
-            this.j.delete(requestId);
-            return k.i(error);
+    ag(requestId, error) {
+        const j = this.k.get(requestId);
+        if (j) {
+            this.k.delete(requestId);
+            return j.i(error);
         }
     }
     keepAlive() {
-        this.b.I(this.B.s).catch(l);
+        this.b.N(this.C.u).catch(l);
     }
     timeout() {
-        this.close(new Error('Connection timeout'));
+        this.close(new Error(NetErrorString.a2));
     }
-    n(af) {
+    n(aj) {
     }
-    async Y(request) {
-        const requestId = (this.X++) & 0x1fffff;
+    async a0(request) {
+        const requestId = (this.Z++) & 0x1fffff;
         const pkgType = request.constructor.pkgType;
         const encoded = [request.buff];
-        this.B.makePkgBuff(pkgType, requestId, encoded);
-        const ag = new Promise((f, i) => {
-            const ah = { f, i };
-            this.j.set(requestId, ah);
+        this.C.makePkgBuff(pkgType, requestId, encoded);
+        const ak = new Promise((d, i) => {
+            const al = { d, i };
+            this.k.set(requestId, al);
             this.b.p(encoded).catch((err) => {
-                this.j.delete(requestId);
+                this.k.delete(requestId);
                 i(err);
             });
         });
-        request.respBuff = await ag;
+        request.respBuff = await ak;
     }
-    ad(requestId, h) {
-        const k = this.j.get(requestId);
-        if (k) {
-            this.j.delete(requestId);
-            k.f(h);
+    ah(requestId, h) {
+        const j = this.k.get(requestId);
+        if (j) {
+            this.k.delete(requestId);
+            j.d(h);
             return;
         }
         if (requestId === 0x200000 && this.context === undefined) {
-            this.close(new Error('Authenticating timeout'));
+            this.close(new Error(NetErrorString.I));
         }
     }
-    ae(err) {
-        const H = this.j;
+    ai(err) {
+        const H = this.k;
         if (H.size > 0) {
             if (!err) {
-                err = new Error('Connection is closed');
+                err = new Error(NetErrorString.a1);
             }
-            for (const [requestId, k] of H) {
+            for (const [requestId, j] of H) {
                 H.delete(requestId);
-                k.i(err);
+                j.i(err);
             }
         }
-        this.j = undefined;
+        this.k = undefined;
     }
-    B;
-    j;
-    X;
+    C;
+    k;
+    Z;
 }
-class a6 {
-    constructor(id, ai) {
-        this.context = undefined;
+class aa {
+    constructor(id, am) {
         this.id = id;
-        this.M = ai;
+        this.M = am;
     }
     context;
     id;
@@ -304,18 +299,18 @@ class a6 {
         return 'Local';
     }
     async sendMessage(message) {
-        return this.M.a7(this, message);
+        return this.M.ab(this, message);
     }
     async sendRequest(request) {
-        return this.M.a8(this, request);
+        return this.M.ac(this, request);
     }
-    sendErrorResponse(am, aj) {
+    sendErrorResponse(aq, an) {
         throw null;
     }
-    sendResponse(_request, aj) {
+    sendResponse(_request, an) {
         throw null;
     }
-    async close(af) {
+    async close(aj) {
     }
     M;
 }

package/lib/net/hubPkgSerializer.js

@@ -1,12 +1,12 @@
 import { j, l, m } from '../common/varUintOps';
-export const o = (pkgType, requestId, encoded) => {
+export const p = (pkgType, requestId, encoded) => {
     const i = [requestId, pkgType];
     const b = j(i);
     const a = new Uint8Array(b);
     m(i, a);
     encoded.push(a);
 };
-export const p = (buff) => {
+export const s = (buff) => {
     const { h: [requestId, pkgType], k: bodyOffset } = l(2, buff);
     const result = { buff, pkgType, requestId, bodyOffset };
     return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "justrun-ws",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "scripts": {
     "start": "webpack serve"
   },