justrun-ws 0.3.0 → 0.3.1

package/lib/common/AdjustableTimer.js

@@ -1,42 +1,52 @@
-export class g {
-    constructor(a, b) {
-        this.a8 = new Promise((f) => {
-            this.L = f;
+export class m {
+    constructor(a, onTimeout) {
+        this.a5 = new Promise((d) => {
+            this.u = d;
         });
-        this.V = b;
+        this.M = onTimeout;
         if (a > 0) {
-            this.u = setTimeout(() => {
-                this.u = undefined;
-                this.V?.();
-                this.L();
+            this.k = setTimeout(() => {
+                this.k = undefined;
+                this.u(true);
+                onTimeout?.();
             }, a);
         }
         else {
-            this.L();
+            this.u(true);
+            onTimeout?.();
         }
     }
-    ak(a) {
-        if (this.u) {
-            clearTimeout(this.u);
+    ao(a) {
+        const { k, u, M } = this;
+        if (k) {
+            clearTimeout(k);
         }
         if (a > 0) {
-            this.u = setTimeout(() => {
-                this.u = undefined;
-                this.V?.();
-                this.L();
+            this.k = setTimeout(() => {
+                this.k = undefined;
+                M?.();
+                u(true);
             }, a);
         }
         else {
-            this.u = undefined;
-            this.L();
+            this.k = undefined;
+            u(true);
+            M?.();
         }
     }
-    async al() {
-        await this.a8;
+    ah() {
+        if (this.k) {
+            clearTimeout(this.k);
+            this.k = undefined;
+            this.u(false);
+        }
+    }
+    ap() {
+        return this.a5;
     }
-    L;
-    a8;
     u;
-    V;
+    a5;
+    k;
+    M;
 }
 //# sourceMappingURL=AdjustableTimer.js.map

package/lib/common/DataWrapper.js

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

package/lib/common/List.js

@@ -30,23 +30,23 @@ export class ListNode {
 }
 export class c {
     constructor() {
-        this.D = new ListNode();
+        this._ = new ListNode();
     }
     get e() {
-        return this.D.getNext();
+        return this._.getNext();
     }
     get a() {
-        return this.D.getPrev();
+        return this._.getPrev();
     }
-    Y(node) {
-        return node === this.D;
+    V(node) {
+        return node === this._;
     }
-    Z(node) {
-        node.insertAfter(this.D);
+    W(node) {
+        node.insertAfter(this._);
     }
-    ar(node) {
-        node.insertBefore(this.D);
+    am(node) {
+        node.insertBefore(this._);
     }
-    D;
+    _;
 }
 //# sourceMappingURL=List.js.map

package/lib/common/utils.js

@@ -1,9 +1,9 @@
-export const i = (d) => {
-    return new Promise((f) => setTimeout(f, d));
+export const i = (e) => {
+    return new Promise((d) => setTimeout(d, e));
 };
 export const l = () => { };
-export const j = (e = 0x100000000) => {
-    return (Math.random() * e) >>> 0;
+export const j = (g = 0x100000000) => {
+    return (Math.random() * g) >>> 0;
 };
 export const k = (c) => {
     let hash = 5381, a = 0;
@@ -12,19 +12,19 @@ export const k = (c) => {
     }
     return hash >>> 0;
 };
-export const z = (h) => {
+export const y = (h) => {
     let a = 0;
     let b = 0;
     while (a < h.length) {
         b += h[a++].length;
     }
-    const g = new Uint8Array(b);
+    const f = new Uint8Array(b);
     b = 0;
     while (a > 0) {
         const buff = h[--a];
-        g.set(buff, b);
+        f.set(buff, b);
         b += buff.length;
     }
-    return g;
+    return f;
 };
 //# sourceMappingURL=utils.js.map

package/lib/common/varUintOps.js

@@ -1,34 +1,34 @@
 export const o = (b) => {
-    let g = 1;
+    let f = 1;
     while (b >>>= 7) {
-        g++;
+        f++;
     }
-    return g;
+    return f;
 };
 export const j = (i) => {
     let b;
     let a = 0;
-    let g = 0;
+    let f = 0;
     while (a < i.length) {
-        g++;
+        f++;
         b = i[a++];
         while (b >>>= 7) {
-            g++;
+            f++;
         }
     }
-    return g;
+    return f;
 };
 export const p = (buffer, e = 0) => {
     let c;
     let d = e;
     let b = 0;
-    let f = 0;
+    let g = 0;
     do {
         c = buffer[d++];
-        b |= (c & 127) << f;
-        f += 7;
+        b |= (c & 127) << g;
+        g += 7;
     } while (c & 128);
-    if (c !== undefined && f <= 35) {
+    if (c !== undefined && g <= 35) {
         return {
             b: b,
             k: d - e,
@@ -43,18 +43,18 @@ export const l = (n, buffer, e = 0) => {
     let c;
     let d = e;
     let b = 0;
-    let f = 0;
+    let g = 0;
     const h = [];
     for (a = 0; a < n; a++) {
         do {
             c = buffer[d++];
-            b |= (c & 127) << f;
-            f += 7;
+            b |= (c & 127) << g;
+            g += 7;
         } while (c & 128);
-        if (c !== undefined && f <= 35) {
+        if (c !== undefined && g <= 35) {
             h.push(b);
             b = 0;
-            f = 0;
+            g = 0;
         }
         else {
             throw new Error('Parsing failed');

package/lib/handler/SimpleHandler.js

@@ -1,11 +1,11 @@
 import { NetErrorString } from '../net/NetErrorString';
 import { b } from './common';
-const d = new Error(NetErrorString.g);
-export class i {
-    constructor(wrapperCtor, e, f = true) {
+const c = new Error(NetErrorString.NotAuthenticated);
+export class h {
+    constructor(wrapperCtor, e, f) {
         this.n = wrapperCtor;
         this.v = e;
-        this.w = f;
+        this.w = !f;
     }
     get pkgType() {
         return this.n.pkgType;
@@ -13,7 +13,7 @@ export class i {
     get k() {
         return this.n.name;
     }
-    async y(conn, a) {
+    async x(conn, a) {
         const { buff, bodyOffset } = a;
         const body = buff.subarray(bodyOffset);
         const message = new this.n(body, true);
@@ -28,7 +28,7 @@ export class i {
             }
         }
         else {
-            b(conn, d);
+            b(conn, c);
         }
         if (conn.context === undefined) {
             await conn.close();
@@ -46,18 +46,18 @@ export class i {
             }
         }
         else {
-            b(conn, d);
+            b(conn, c);
         }
     }
     n;
     v;
     w;
 }
-export class j {
-    constructor(wrapperCtor, e, f = true) {
+export class i {
+    constructor(wrapperCtor, e, f) {
         this.n = wrapperCtor;
         this.v = e;
-        this.w = f;
+        this.w = !f;
     }
     get pkgType() {
         return this.n.pkgType;
@@ -65,7 +65,7 @@ export class j {
     get k() {
         return this.n.name;
     }
-    async y(conn, a) {
+    async x(conn, a) {
         const { buff, requestId, bodyOffset } = a;
         const body = buff.subarray(bodyOffset);
         const request = new this.n(body, true);
@@ -84,7 +84,7 @@ export class j {
             }
         }
         else {
-            error = b(conn, d);
+            error = b(conn, c);
         }
         try {
             if (!error) {
@@ -97,8 +97,8 @@ export class j {
                 await conn.close();
             }
         }
-        catch (err) {
-            await conn.close(err);
+        catch {
+            return;
         }
     }
     async q(conn, request) {
@@ -115,7 +115,7 @@ export class j {
                 }
             }
         }
-        throw b(conn, d);
+        throw b(conn, c);
     }
     n;
     v;

package/lib/index.d.ts

@@ -76,18 +76,18 @@ declare class ListNode {
 	private _prev;
 	private _next;
 }
-declare abstract class MonitorConn extends ListNode {
-	abstract keepAlive(): void;
-	abstract timeout(): void;
+declare abstract class MonitorItem extends ListNode {
+	abstract warnTimeout(): void;
+	abstract onTimeout(): void;
 }
 export declare class TimeoutMonitor {
-	constructor(tickMilSec: number, aliveTick: number, timeoutTick: number);
-	insert(conn: MonitorConn): void;
-	update(conn: MonitorConn): void;
-	remove(conn: MonitorConn): void;
+	constructor(tickMilSec: number, warningTick: number, timeoutTick: number);
+	insert(item: MonitorItem): void;
+	update(item: MonitorItem): void;
+	remove(item: MonitorItem): void;
 	private check;
 	private _tickMilSec;
-	private _aliveTick;
+	private _warningTick;
 	private _timeoutTick;
 	private _currentTick;
 	private _monitorCount;
@@ -129,6 +129,7 @@ export declare enum NetErrorString {
 	InvalidConnection = "InvalidConnection",
 	InvalidPackage = "InvalidPackage",
 	NotAuthenticated = "NotAuthenticated",
+	NotFound = "NotFound",
 	Timeout = "Timeout",
 	UnknownError = "UnknownError"
 }
@@ -137,8 +138,14 @@ export interface IAuthProvider {
 	preConnect(): Promise<string>;
 }
 export declare const createNumPkgTypeClient: (connUrl: string, timeoutMonitor?: TimeoutMonitor) => WsClient<number>;
+declare enum ClientConnState {
+	NotConnected = 0,
+	Connecting = 1,
+	Connected = 2
+}
 export declare class WsClient<PkgTypeT extends number | string> {
 	constructor(connUrl: string, opts: TypedPkgHubOpts<PkgTypeT>);
+	getConnState(): ClientConnState;
 	enableAuthenticate(proxyPrivatePkgType: PkgTypeT, authProvider: IAuthProvider): void;
 	registerError<ErrorT>(pkgType: PkgTypeT, wrapperCtor: ErrorWrapperCtor<ErrorT>): void;
 	registerMessage<MessageT>(pkgType: PkgTypeT, wrapperCtor: MessageWrapperCtor<MessageT>): void;
@@ -147,7 +154,6 @@ export declare class WsClient<PkgTypeT extends number | string> {
 	handleRequestWith<RequestT, ResponseT, WrapperT extends RequestWrapper<RequestT, ResponseT>>(wrapperCtor: RequestWrapperCtor<RequestT, ResponseT, WrapperT>, handler: (request: RequestT) => ResponseT | Promise<ResponseT>): void;
 	sendMessage<MessageT>(message: MessageWrapper<MessageT>): Promise<void>;
 	sendRequest<RequestT, ResponseT>(request: RequestWrapper<RequestT, ResponseT>): Promise<ResponseT>;
-	startConnect(delay?: number): Promise<void>;
 	onConnectionStatus(listener: (isOpen: boolean, conn: IConn<string>, active: boolean, err?: Error) => void): void;
 	private connect;
 	private onConnOpen;
@@ -157,17 +163,16 @@ export declare class WsClient<PkgTypeT extends number | string> {
 	private _conn;
 	private _connState;
 	private _authProvider?;
-	private _connectDelay?;
 	private _listenerArr?;
 }
 export declare class JustrunAuthProvider implements IAuthProvider {
-	constructor(allowAnonymous: boolean, authUrl: string, getConnUrl: (address: string, sid: string, kick?: boolean) => string, authStateCb: (cid: string, sid: string) => void);
+	constructor(authUrl: string, getConnUrl: (address: string, sid: string, kick?: boolean) => string, authStateCb: (cid: string, sid: string, connErr?: string) => void);
 	init<PkgTypeT extends number | string>(proxyPrivatePkgType: PkgTypeT, client: WsClient<PkgTypeT>): Promise<void>;
 	preConnect(): Promise<string>;
 	authWithCredential(type: "signin" | "signup", id: string, hash: string, extra: string): Promise<void>;
 	authWithOAuth2(returnTo: string, oauthUrl: string, clientId: string, scope: string): void;
 	resetAuthState(): Promise<void>;
-	resetKickedState(forceKick: boolean): void;
+	resetConnState(forceKick: boolean): void;
 	private onConnStatus;
 	private extendToken;
 	private onSysMessage;
@@ -175,11 +180,10 @@ export declare class JustrunAuthProvider implements IAuthProvider {
 	private sendAuthRequest;
 	private _cid;
 	private _sid;
-	private _allowAnonymous;
 	private _authUrl;
-	private _kickedState;
 	private _currConnAddr;
 	private _conn?;
+	private _connErr?;
 	private _extendTokenTimer?;
 	private _getConnUrl;
 	private _authStateCb;

package/lib/net/BrowserWsNet.js

@@ -1,41 +1,41 @@
-import { z } from '../common/utils';
+import { y } from '../common/utils';
 import { NetErrorString } from './NetErrorString';
-export class q {
+export class m {
     b() {
         return null;
     }
-    I(H) {
-        this.H = H;
+    init(E) {
+        this.E = E;
     }
-    async J(t) {
+    async I(r) {
         return false;
     }
-    async L() {
+    async J() {
         return false;
     }
-    async d(e) {
-        const g = new WebSocket(e);
-        return new Promise((f, j) => {
-            g.onerror = (r) => {
-                j(new Error(NetErrorString.l));
+    async g(c) {
+        const f = new WebSocket(c);
+        return new Promise((d, j) => {
+            f.onerror = (l) => {
+                j(new Error(NetErrorString.UnknownError));
             };
-            g.onopen = () => {
-                f(this.am(g, true));
+            f.onopen = () => {
+                d(this.ai(f, true));
             };
         });
     }
-    am = (g, p) => {
-        const c = new s(g);
-        const { conn, A, o } = this.H(c, p);
-        g.onmessage = (k) => {
+    ai = (f, p) => {
+        const e = new q(f);
+        const { conn, _, o } = this.E(e, p);
+        f.onmessage = (k) => {
             k.data.arrayBuffer().then((buff) => {
-                A(new Uint8Array(buff));
+                _(new Uint8Array(buff));
             });
         };
-        g.onerror = (r) => {
-            o(new Error(NetErrorString.l));
+        f.onerror = (l) => {
+            o(new Error(NetErrorString.UnknownError));
         };
-        g.onclose = (k) => {
+        f.onclose = (k) => {
             if (k.code === 1000) {
                 o();
             }
@@ -45,53 +45,47 @@ export class q {
         };
         return conn;
     };
-    H(a, u) {
+    E(a, s) {
         throw new Error('Need to call "setConnWrapperMaker" before using');
     }
 }
-class s {
-    constructor(g) {
-        this.i = g;
-    }
-    get localAddress() {
-        return;
-    }
-    get localPort() {
-        return;
-    }
-    get remoteAddress() {
-        return;
-    }
-    get remoteFamily() {
-        return;
-    }
-    get remotePort() {
-        return;
+class q {
+    constructor(f) {
+        this.i = f;
+    }
+    get socket() {
+        return {
+            localAddress: '',
+            localPort: 0,
+            remoteAddress: '',
+            remoteFamily: '',
+            remotePort: 0,
+        };
     }
-    async D(buff) {
+    async F(buff) {
         if (this.i) {
             return this.i.send(buff);
         }
-        throw new Error(NetErrorString.m);
+        throw new Error(NetErrorString.InvalidConnection);
     }
     async n(h) {
         if (this.i) {
-            const buff = z(h);
+            const buff = y(h);
             return this.i.send(buff);
         }
-        throw new Error(NetErrorString.m);
+        throw new Error(NetErrorString.InvalidConnection);
     }
     async close(err) {
         const { i } = this;
         if (i) {
             this.i = undefined;
             if (!err) {
-                if (i.readyState === WebSocket.OPEN) {
+                if (i.readyState <= WebSocket.OPEN) {
                     i.close(1000);
                 }
             }
             else {
-                i.close(3000, err.message);
+                i.close(1006, err.message);
             }
         }
     }

package/lib/net/LazyConn.js

@@ -1,6 +1,6 @@
-export class h {
+export class e {
     constructor(c) {
-        this.a9 = c;
+        this.a6 = c;
     }
     get id() {
         return this.a?.id ?? -1;
@@ -19,16 +19,16 @@ export class h {
     remoteFamily;
     remotePort;
     async sendErrorResponse(error, requestId) {
-        return (this.a ?? await this.d()).sendErrorResponse(error, requestId);
+        return (this.a ?? await this.g()).sendErrorResponse(error, requestId);
     }
     async sendResponse(request, requestId) {
-        return (this.a ?? await this.d()).sendResponse(request, requestId);
+        return (this.a ?? await this.g()).sendResponse(request, requestId);
     }
     async sendMessage(message) {
-        return (this.a ?? await this.d()).sendMessage(message);
+        return (this.a ?? await this.g()).sendMessage(message);
     }
     async sendRequest(request) {
-        return (this.a ?? await this.d()).sendRequest(request);
+        return (this.a ?? await this.g()).sendRequest(request);
     }
     async close(err) {
         const { a } = this;
@@ -44,21 +44,21 @@ export class h {
             }, () => this.a = undefined);
         }
     }
-    async an() {
+    async aq() {
         if (!this.a) {
-            await this.d();
+            await this.g();
         }
     }
-    ao() {
+    aj() {
         this.a = undefined;
     }
-    async d() {
+    async g() {
         let { q } = this;
         if (!q) {
-            q = this.q = new Promise((f, j) => {
-                this.a9().then((conn) => {
+            q = this.q = new Promise((d, j) => {
+                this.a6().then((conn) => {
                     if (conn) {
-                        f(conn);
+                        d(conn);
                         this.a = conn;
                         this.q = undefined;
                     }
@@ -70,7 +70,7 @@ export class h {
         }
         return await q;
     }
-    a9;
+    a6;
     a;
     q;
 }

package/lib/net/NetErrorString.js

@@ -1,14 +1,15 @@
 export var NetErrorString;
 (function (NetErrorString) {
-    NetErrorString["H"] = "AuthTimeout";
-    NetErrorString["a"] = "BadRequest";
-    NetErrorString["p"] = "ConnectFailed";
-    NetErrorString["Y"] = "ConnectionClosed";
-    NetErrorString["b"] = "InvalidConnString";
-    NetErrorString["m"] = "InvalidConnection";
-    NetErrorString["$"] = "InvalidPackage";
-    NetErrorString["g"] = "NotAuthenticated";
-    NetErrorString["Z"] = "Timeout";
-    NetErrorString["l"] = "UnknownError";
+    NetErrorString["AuthTimeout"] = "AuthTimeout";
+    NetErrorString["BadRequest"] = "BadRequest";
+    NetErrorString["ConnectFailed"] = "ConnectFailed";
+    NetErrorString["ConnectionClosed"] = "ConnectionClosed";
+    NetErrorString["InvalidConnString"] = "InvalidConnString";
+    NetErrorString["InvalidConnection"] = "InvalidConnection";
+    NetErrorString["InvalidPackage"] = "InvalidPackage";
+    NetErrorString["NotAuthenticated"] = "NotAuthenticated";
+    NetErrorString["NotFound"] = "NotFound";
+    NetErrorString["Timeout"] = "Timeout";
+    NetErrorString["UnknownError"] = "UnknownError";
 })(NetErrorString || (NetErrorString = {}));
 //# sourceMappingURL=NetErrorString.js.map