rubjs 2.8.7 → 2.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubjs",
-  "version": "2.8.7",
+  "version": "2.9.0",
   "main": "rubjs/index.js",
   "types": "rubjs/index.d.ts",
   "keywords": [

package/rubjs/client.d.ts

@@ -1,7 +1,7 @@
 import Methods from "./methods";
 import Network from "./network";
 import SessionManager from "./session";
-import { VoiceChatClient } from "./utils";
+import { VoiceChatClient } from "./clients";
 interface Platform {
     app_name: string;
     app_version: string;
@@ -11,6 +11,10 @@ interface Platform {
 }
 type TypeUpdate = "show_activities" | "chat_updates" | "message_updates" | "show_notifications";
 type PlatformType = "Web" | "Android";
+interface SessionType {
+    iv: string;
+    encryptedData: string;
+}
 declare class Client extends Methods {
     defaultPlatform: Platform;
     apiVersion: string;
@@ -21,7 +25,7 @@ declare class Client extends Methods {
     timeout: number;
     network: Network;
     privateKey: string | null;
-    sessionFile: string;
+    sessionFile: string | SessionType;
     platform: PlatformType;
     userGuid: string | null;
     sessionDb: SessionManager;
@@ -32,6 +36,6 @@ declare class Client extends Methods {
         updateType: TypeUpdate;
     }[];
     voiceChatClient: VoiceChatClient;
-    constructor(sessionFile: string, timeout?: number, platform?: PlatformType);
+    constructor(sessionFile: string | SessionType, timeout?: number, platform?: PlatformType);
 }
 export default Client;

package/rubjs/client.js

@@ -28,8 +28,8 @@ class Client extends methods_1.default {
         this.timeout = timeout !== null && timeout !== void 0 ? timeout : 0;
         this.eventHandlers = [];
         this.platform = platform;
-        this.sessionDb = new session_1.default(sessionFile);
         this.network = new network_1.default(this);
+        this.sessionDb = new session_1.default(sessionFile);
         this.auth = null;
         this.privateKey = null;
         this.eventHandlers = [];

package/rubjs/clients/index.d.ts

@@ -0,0 +1,4 @@
+import VoiceChatClient from "./VoiceChatClient";
+import SendLiveClient from "./sendLiveClient";
+import LoginClient from "./loginClient";
+export { VoiceChatClient, SendLiveClient, LoginClient };

package/rubjs/clients/index.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoginClient = exports.SendLiveClient = exports.VoiceChatClient = void 0;
+const VoiceChatClient_1 = __importDefault(require("./VoiceChatClient"));
+exports.VoiceChatClient = VoiceChatClient_1.default;
+const sendLiveClient_1 = __importDefault(require("./sendLiveClient"));
+exports.SendLiveClient = sendLiveClient_1.default;
+const loginClient_1 = __importDefault(require("./loginClient"));
+exports.LoginClient = loginClient_1.default;

package/rubjs/{utils → clients}/loginClient.d.ts

@@ -18,9 +18,20 @@ interface AuthFace {
 declare class LoginClient {
     static systemVersions: Record<string, string>;
     static sendCode(phone_number: string, pass_key?: string): Promise<AuthResult>;
-    static signIn(phone_code: string, sessionPath: string, datas: AuthResult): Promise<{
+    static signIn(phone_code: string, datas: AuthResult, sessionPath?: string): Promise<{
         isOk: boolean;
         status: string;
+        sessionData?: undefined;
+    } | {
+        isOk: boolean;
+        status: string;
+        sessionData: {
+            phone: any;
+            auth: string;
+            guid: any;
+            agent: string;
+            private_key: any;
+        };
     }>;
     static registerDevice(network: Network, datas: AuthFace): Promise<void>;
     static getBrowser(userAgent: string, langCode: string, appVersion: string): Promise<{

package/rubjs/{utils → clients}/loginClient.js

@@ -40,7 +40,7 @@ class LoginClient {
             };
         });
     }
-    static signIn(phone_code, sessionPath, datas) {
+    static signIn(phone_code, datas, sessionPath) {
         return __awaiter(this, void 0, void 0, function* () {
             const network = new loginNetwork_1.default();
             const [publicKey, privateKey] = crypto_1.default.createKeys();
@@ -63,22 +63,24 @@ class LoginClient {
             auth.key = Buffer.from(crypto_1.default.passphrase(sampleAuth), "utf8");
             auth.auth = sampleAuth;
             auth.decode_auth = crypto_1.default.decode_auth(sampleAuth);
-            const session = new session_1.default(sessionPath);
-            session.saveSession({
+            yield this.registerDevice(network, auth);
+            const sessionData = {
                 phone: response.user.phone,
                 auth: auth.auth,
                 guid: response.user.user_guid,
                 agent: network.userAgent,
                 private_key: privateKey,
-            });
-            yield this.registerDevice(network, auth);
-            return { isOk: true, status: "Sucessfull" };
+            };
+            if (sessionPath) {
+                const session = new session_1.default(sessionPath);
+                session.saveSession(sessionData);
+            }
+            return { isOk: true, status: "Sucessfull", sessionData };
         });
     }
     static registerDevice(network, datas) {
         return __awaiter(this, void 0, void 0, function* () {
             const browserData = yield this.getBrowser(network.userAgent, network.defaultPlatform.lang_code, network.defaultPlatform.app_version);
-            const sendData = {};
             yield network.bulder("registerDevice", browserData, datas);
         });
     }

package/rubjs/index.d.ts

@@ -1,6 +1,7 @@
 import Client from "./client";
 import Crypto from "./crypto";
 import * as Types from "./types";
-import { Filters, Utils, VoiceChatClient, SendLiveClient, LoginClient } from "./utils";
+import { Filters, Utils } from "./utils";
+import { VoiceChatClient, SendLiveClient, LoginClient } from "./clients";
 export default Client;
-export { Client, Crypto, Utils, VoiceChatClient, Filters, Types, SendLiveClient, LoginClient, };
+export { Utils, Types, Crypto, Client, Filters, LoginClient, SendLiveClient, VoiceChatClient };

package/rubjs/index.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoginClient = exports.SendLiveClient = exports.Types = exports.Filters = exports.VoiceChatClient = exports.Utils = exports.Crypto = exports.Client = void 0;
+exports.VoiceChatClient = exports.SendLiveClient = exports.LoginClient = exports.Filters = exports.Client = exports.Crypto = exports.Types = exports.Utils = void 0;
 const client_1 = __importDefault(require("./client"));
 exports.Client = client_1.default;
 const crypto_1 = __importDefault(require("./crypto"));
@@ -46,7 +46,8 @@ exports.Types = Types;
 const utils_1 = require("./utils");
 Object.defineProperty(exports, "Filters", { enumerable: true, get: function () { return utils_1.Filters; } });
 Object.defineProperty(exports, "Utils", { enumerable: true, get: function () { return utils_1.Utils; } });
-Object.defineProperty(exports, "VoiceChatClient", { enumerable: true, get: function () { return utils_1.VoiceChatClient; } });
-Object.defineProperty(exports, "SendLiveClient", { enumerable: true, get: function () { return utils_1.SendLiveClient; } });
-Object.defineProperty(exports, "LoginClient", { enumerable: true, get: function () { return utils_1.LoginClient; } });
+const clients_1 = require("./clients");
+Object.defineProperty(exports, "VoiceChatClient", { enumerable: true, get: function () { return clients_1.VoiceChatClient; } });
+Object.defineProperty(exports, "SendLiveClient", { enumerable: true, get: function () { return clients_1.SendLiveClient; } });
+Object.defineProperty(exports, "LoginClient", { enumerable: true, get: function () { return clients_1.LoginClient; } });
 exports.default = client_1.default;

package/rubjs/session/index.d.ts

@@ -5,11 +5,16 @@ interface SessionData {
     agent: string;
     private_key: string;
 }
+interface SessionType {
+    iv: string;
+    encryptedData: string;
+}
 declare class SessionManager {
     private secretKey;
     private filename;
     private iv;
-    constructor(filename: string);
+    private sessionData;
+    constructor(filename: string | SessionType);
     private encrypt;
     private decrypt;
     saveSession(sessionData: SessionData): void;

package/rubjs/session/index.js

@@ -9,7 +9,9 @@ class SessionManager {
     constructor(filename) {
         this.secretKey = "12345678901234567890123456789012";
         this.iv = crypto_1.default.randomBytes(16);
-        this.filename = filename + ".json";
+        this.filename =
+            typeof filename === "string" ? `${filename}.json` : `${Date.now()}.json`;
+        this.sessionData = typeof filename !== "string" && filename;
     }
     encrypt(sessionData) {
         const cipher = crypto_1.default.createCipheriv("aes-256-cbc", Buffer.from(this.secretKey), this.iv);
@@ -33,7 +35,7 @@ class SessionManager {
     }
     getSession() {
         try {
-            if (!fs_1.default.existsSync(this.filename)) {
+            if (!this.sessionData && !fs_1.default.existsSync(this.filename)) {
                 const defaultSessionData = {
                     phone: "",
                     auth: "",
@@ -44,8 +46,14 @@ class SessionManager {
                 this.saveSession(defaultSessionData);
                 return defaultSessionData;
             }
-            const rawData = fs_1.default.readFileSync(this.filename, "utf8");
-            const parsedData = JSON.parse(rawData);
+            let parsedData;
+            if (this.sessionData) {
+                parsedData = this.sessionData;
+            }
+            else {
+                const rawData = fs_1.default.readFileSync(this.filename, "utf8");
+                parsedData = JSON.parse(rawData);
+            }
             return this.decrypt(parsedData.encryptedData, Buffer.from(parsedData.iv, "hex"));
         }
         catch (error) {

package/rubjs/utils/index.d.ts

@@ -1,6 +1,3 @@
 import Filters from "./filters";
 import Utils from "./utils";
-import VoiceChatClient from "./VoiceChatClient";
-import SendLiveClient from "./sendLiveClient";
-import LoginClient from "./loginClient";
-export { Filters, Utils, VoiceChatClient, SendLiveClient, LoginClient };
+export { Filters, Utils };

package/rubjs/utils/index.js

@@ -3,14 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoginClient = exports.SendLiveClient = exports.VoiceChatClient = exports.Utils = exports.Filters = void 0;
+exports.Utils = exports.Filters = void 0;
 const filters_1 = __importDefault(require("./filters"));
 exports.Filters = filters_1.default;
 const utils_1 = __importDefault(require("./utils"));
 exports.Utils = utils_1.default;
-const VoiceChatClient_1 = __importDefault(require("./VoiceChatClient"));
-exports.VoiceChatClient = VoiceChatClient_1.default;
-const sendLiveClient_1 = __importDefault(require("./sendLiveClient"));
-exports.SendLiveClient = sendLiveClient_1.default;
-const loginClient_1 = __importDefault(require("./loginClient"));
-exports.LoginClient = loginClient_1.default;