@mtkruto/node 0.67.1 → 0.68.0

package/script/session/1_session.js

@@ -15,25 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Session_instances, _Session_dc, _Session_cdn, _Session_lastConnect, _Session_disconnected, _Session_L, _Session_onConnectionStateChange, _Session_lastState, _Session_stateChangeHandler, _Session_connectMutex;
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Session = void 0;
 /**
@@ -65,108 +63,97 @@ let id = 0;
 // @ts-ignore: lib
 const defaultTransportProvider = typeof dntShim.Deno === "undefined" ? _3_transport_js_1.transportProviderWebSocket : _3_transport_js_1.transportProviderTcp;
 class Session {
+    #dc;
+    #cdn;
+    state = new _0_session_state_js_1.SessionState();
+    transport;
+    #lastConnect;
+    #disconnected = true;
+    #L;
+    #onConnectionStateChange;
     constructor(dc, params) {
-        _Session_instances.add(this);
-        _Session_dc.set(this, void 0);
-        _Session_cdn.set(this, void 0);
-        Object.defineProperty(this, "state", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new _0_session_state_js_1.SessionState()
-        });
-        Object.defineProperty(this, "transport", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        _Session_lastConnect.set(this, void 0);
-        _Session_disconnected.set(this, true);
-        _Session_L.set(this, void 0);
-        _Session_onConnectionStateChange.set(this, void 0);
-        _Session_lastState.set(this, void 0);
-        _Session_connectMutex.set(this, new _1_utilities_js_1.Mutex());
-        __classPrivateFieldSet(this, _Session_dc, dc, "f");
-        __classPrivateFieldSet(this, _Session_cdn, params?.cdn ?? false, "f");
+        this.#dc = dc;
+        this.#cdn = params?.cdn ?? false;
         const transportProvider = params?.transportProvider ?? defaultTransportProvider();
-        this.transport = transportProvider({ dc: __classPrivateFieldGet(this, _Session_dc, "f"), cdn: __classPrivateFieldGet(this, _Session_cdn, "f") });
+        this.transport = transportProvider({ dc: this.#dc, cdn: this.#cdn });
         this.transport.connection.stateChangeHandler = (connected) => {
             setTimeout(() => {
-                (0, _1_utilities_js_1.drop)(__classPrivateFieldGet(this, _Session_instances, "m", _Session_stateChangeHandler).call(this, connected));
+                (0, _1_utilities_js_1.drop)(this.#stateChangeHandler(connected));
             });
         };
-        __classPrivateFieldSet(this, _Session_L, (0, _1_utilities_js_1.getLogger)("Session").client(id++), "f");
+        this.#L = (0, _1_utilities_js_1.getLogger)("Session").client(id++);
     }
     set onConnectionStateChange(onConnectionStateChange) {
-        __classPrivateFieldSet(this, _Session_onConnectionStateChange, onConnectionStateChange, "f");
+        this.#onConnectionStateChange = onConnectionStateChange;
     }
     set connectionCallback(connectionCallback) {
         this.transport.connection.callback = connectionCallback;
     }
     get dc() {
-        return __classPrivateFieldGet(this, _Session_dc, "f");
+        return this.#dc;
     }
     get cdn() {
-        return __classPrivateFieldGet(this, _Session_cdn, "f");
+        return this.#cdn;
     }
     set serverSalt(serverSalt) {
         this.state.serverSalt = serverSalt;
     }
+    #lastState;
+    async #stateChangeHandler(connected) {
+        if (this.#lastState !== connected) {
+            setTimeout(() => {
+                this.#onConnectionStateChange?.(connected);
+            });
+        }
+        if (this.#lastState === connected) {
+            return;
+        }
+        this.#lastState = connected;
+        if (connected || this.#disconnected) {
+            if (this.#disconnected) {
+                this.#L.debug("not reconnecting because explicitly disconnected");
+            }
+            return;
+        }
+        if (this.#lastConnect && Date.now() - this.#lastConnect.getTime() <= 10 * _0_deps_js_1.SECOND) {
+            this.#L.debug("reconnecting after a delay");
+            await (0, _0_deps_js_1.delay)(3 * _0_deps_js_1.SECOND);
+        }
+        else {
+            this.#L.debug("reconnecting");
+        }
+        await this.connect();
+    }
     get connected() {
         return this.transport.connection.connected;
     }
+    #connectMutex = new _1_utilities_js_1.Mutex();
     async connect() {
-        const unlock = await __classPrivateFieldGet(this, _Session_connectMutex, "f").lock();
+        const unlock = await this.#connectMutex.lock();
         try {
             if (this.connected) {
                 return;
             }
             await this.transport.connection.open();
             await this.transport.transport.initialize();
-            __classPrivateFieldSet(this, _Session_lastConnect, new Date(), "f");
-            __classPrivateFieldSet(this, _Session_disconnected, false, "f");
+            this.#lastConnect = new Date();
+            this.#disconnected = false;
         }
         finally {
             unlock();
         }
     }
     async waitUntilConnected() {
-        (await __classPrivateFieldGet(this, _Session_connectMutex, "f").lock())();
+        (await this.#connectMutex.lock())();
     }
     get disconnected() {
-        return __classPrivateFieldGet(this, _Session_disconnected, "f");
+        return this.#disconnected;
     }
     disconnect() {
-        __classPrivateFieldSet(this, _Session_disconnected, true, "f");
+        this.#disconnected = true;
         if (this.transport.connection.connected) {
             this.transport.connection.close();
         }
     }
 }
 exports.Session = Session;
-_Session_dc = new WeakMap(), _Session_cdn = new WeakMap(), _Session_lastConnect = new WeakMap(), _Session_disconnected = new WeakMap(), _Session_L = new WeakMap(), _Session_onConnectionStateChange = new WeakMap(), _Session_lastState = new WeakMap(), _Session_connectMutex = new WeakMap(), _Session_instances = new WeakSet(), _Session_stateChangeHandler = async function _Session_stateChangeHandler(connected) {
-    if (__classPrivateFieldGet(this, _Session_lastState, "f") !== connected) {
-        setTimeout(() => {
-            __classPrivateFieldGet(this, _Session_onConnectionStateChange, "f")?.call(this, connected);
-        });
-    }
-    if (__classPrivateFieldGet(this, _Session_lastState, "f") === connected) {
-        return;
-    }
-    __classPrivateFieldSet(this, _Session_lastState, connected, "f");
-    if (connected || __classPrivateFieldGet(this, _Session_disconnected, "f")) {
-        if (__classPrivateFieldGet(this, _Session_disconnected, "f")) {
-            __classPrivateFieldGet(this, _Session_L, "f").debug("not reconnecting because explicitly disconnected");
-        }
-        return;
-    }
-    if (__classPrivateFieldGet(this, _Session_lastConnect, "f") && Date.now() - __classPrivateFieldGet(this, _Session_lastConnect, "f").getTime() <= 10 * _0_deps_js_1.SECOND) {
-        __classPrivateFieldGet(this, _Session_L, "f").debug("reconnecting after a delay");
-        await (0, _0_deps_js_1.delay)(3 * _0_deps_js_1.SECOND);
-    }
-    else {
-        __classPrivateFieldGet(this, _Session_L, "f").debug("reconnecting");
-    }
-    await this.connect();
-};