@fnlb-project/fnbr 4.1.102 → 4.2.1

package/dist/src/managers/ChatManager.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const crypto_1 = require("crypto");
+const util_1 = require("util");
 const Endpoints_1 = tslib_1.__importDefault(require("../../resources/Endpoints"));
 const enums_1 = require("../../resources/enums");
 const Base_1 = tslib_1.__importDefault(require("../Base"));
-const UserNotFoundError_1 = tslib_1.__importDefault(require("../exceptions/UserNotFoundError"));
 function customUUID() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
         const r = Math.random() * 16 | 0;
@@ -18,98 +19,170 @@ const generateCustomCorrelationId = () => `EOS-${Date.now()}-${customUUID()}`;
  * Represent's the client's chat manager (dm, party chat) via eos.
  */
 class ChatManager extends Base_1.default {
+    constructor() {
+        super(...arguments);
+        /**
+         * DM conversations cache map (account id -> conversation id)
+         */
+        this.dmConversations = new Map();
+    }
+    /**
+     * Whether the keypair for message signing exists
+     */
+    get keypairExists() {
+        return !!this.privateKey && !!this.publicKey;
+    }
+    /**
+     * Whether the keypair has been registered on epic's servers
+     */
+    get keypairRegistered() {
+        return !!this.publicKeyData;
+    }
     /**
      * Returns the chat namespace, this is the eos deployment id
      */
     get namespace() {
         return this.client.config.eosDeploymentId;
     }
-    async getConversationId(userId) {
-        const data = await this.client.http.epicgamesRequest({
-            method: 'POST',
-            url: `${Endpoints_1.default.EOS_CHAT}/v1/public/_/conversations?createIfExists=false`,
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            data: {
-                title: '',
-                type: 'dm',
-                members: [this.client.user.self.id, userId],
-            },
-        }, enums_1.AuthSessionStoreKey.FortniteEOS);
-        return data.conversationId;
-    }
     /**
      * Sends a private message to the specified user
      * @param user the account id or displayname
      * @param message the message object
      * @returns the message id
+     * @throws {UserNotFoundError} When the specified user was not found
+     * @throws {EpicgamesAPIError} When the api request failed
      */
     async whisperUser(user, message) {
         const accountId = await this.client.user.resolveId(user);
-        if (!accountId)
-            throw new UserNotFoundError_1.default(user);
-        const conversationId = await this.getConversationId(accountId);
-        const { body, signatureString } = this.client.createSignedMessage(conversationId, message.body);
-        const eosSession = this.client.auth.sessions.get(enums_1.AuthSessionStoreKey.FortniteEOS);
+        const conversationId = await this.getDMConversationId(accountId);
+        return this.sendMessageInConversation(conversationId, message, [accountId, this.client.user.self.id], enums_1.ConversationType.DirectMessage);
+    }
+    /**
+     * Sends a message in the specified conversation (e.g. party chat)
+     * @param conversationId the conversation id, usually `p-[PARTYID]`
+     * @param message the message object
+     * @param allowedRecipients the account ids, that should receive the message
+     * @returns the message id
+     * @throws {EpicgamesAPIError}
+     */
+    async sendMessageInConversation(conversationId, message, allowedRecipients, conversationType) {
+        const correlationId = generateCustomCorrelationId();
+        const { body, signature } = await this.createSignedMessage(conversationId, message.body, conversationType === enums_1.ConversationType.DirectMessage ? enums_1.SignedMessageType.Persistent : enums_1.SignedMessageType.Party);
         await this.client.http.epicgamesRequest({
             method: 'POST',
-            url: `${Endpoints_1.default.EOS_CHAT}/v1/public/_/conversations/${conversationId}/messages?fromAccountId=${this.client.user.self.id}`,
+            url: `${Endpoints_1.default.EOS_CHAT}/v1/public/${conversationType === enums_1.ConversationType.DirectMessage ? '_' : this.namespace}`
+                + `/conversations/${conversationId}/messages?fromAccountId=${this.client.user.self.id}`,
             headers: {
                 'Content-Type': 'application/json',
-                Authorization: `bearer ${eosSession.easAccessToken}`,
+                'X-Epic-Correlation-ID': correlationId,
             },
             data: {
-                allowedRecipients: [accountId, this.client.user.self.id],
+                allowedRecipients,
                 message: {
                     body,
                 },
                 isReportable: false,
                 metadata: {
                     TmV: '2',
-                    Pub: this.client.keyData.jwt,
-                    Sig: signatureString,
+                    Pub: this.publicKeyData.jwt,
+                    Sig: signature,
+                    NPM: conversationType === enums_1.ConversationType.Party ? '1' : undefined,
                     PlfNm: this.client.config.platform,
                     PlfId: this.client.user.self.id,
                 },
             },
-        });
-        return conversationId;
+        }, enums_1.AuthSessionStoreKey.FortniteEOS);
+        return correlationId;
+    }
+    async createDMConversation(recepientId, createIfExists = false) {
+        return this.client.http.epicgamesRequest({
+            method: 'POST',
+            url: `${Endpoints_1.default.EOS_CHAT}/v1/public/_/conversations?createIfExists=${createIfExists}`,
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            data: {
+                title: '',
+                type: 'dm',
+                members: [this.client.user.self.id, recepientId],
+            },
+        }, enums_1.AuthSessionStoreKey.FortniteEOS);
     }
     /**
-     * Sends a message in the specified conversation (party chat)
-     * @param conversationId the conversation id, usually `p-[PARTYID]`
-     * @param message the message object
-     * @param allowedRecipients the account ids, that should receive the message
-     * @returns the message id
+     * Ensures that message signing is possible
      */
-    async sendMessageInConversation(conversationId, message, allowedRecipients) {
-        const { body, signatureString } = this.client.createSignedMessage(conversationId, message.body, 'Party');
-        const eosSession = this.client.auth.sessions.get(enums_1.AuthSessionStoreKey.FortniteEOS);
-        await this.client.http.epicgamesRequest({
+    async ensureMessageSigning() {
+        if (!this.keypairExists) {
+            await this.generateKeypair();
+        }
+        if (!this.keypairRegistered) {
+            await this.registerKeypair();
+        }
+    }
+    /**
+     * Resolves the conversation id for a dm with the specified user
+     * @param recepientId The account id of the recepient
+     * @returns The conversation id
+     */
+    async getDMConversationId(recepientId) {
+        if (this.dmConversations.has(recepientId)) {
+            return this.dmConversations.get(recepientId);
+        }
+        const conversationData = await this.createDMConversation(recepientId);
+        this.dmConversations.set(recepientId, conversationData.conversationId);
+        return conversationData.conversationId;
+    }
+    /**
+     * Signs a message for the specified conversation
+     * @param conversationId The conversation id
+     * @param content The message content
+     * @param type The signed message type
+     */
+    async createSignedMessage(conversationId, content, type) {
+        await this.ensureMessageSigning();
+        const timestamp = Date.now();
+        const messageInfo = {
+            mid: customUUID(),
+            sid: this.client.user.self.id,
+            rid: conversationId,
+            msg: content,
+            tst: timestamp,
+            seq: 1,
+            rec: false,
+            mts: [],
+            cty: type,
+        };
+        const body = Buffer.from(JSON.stringify(messageInfo), 'utf-8').toString('base64');
+        const messageToSign = Buffer.concat([Buffer.from(body, 'utf-8'), Buffer.from([0])]);
+        const signature = (0, crypto_1.sign)(null, messageToSign, this.privateKey).toString('base64');
+        return { body, signature };
+    }
+    /**
+     * Generates a ed25519 keypair for message signing
+     */
+    async generateKeypair() {
+        const { privateKey, publicKey } = await (0, util_1.promisify)(crypto_1.generateKeyPair)('ed25519');
+        const spkiDer = publicKey.export({ type: 'spki', format: 'der' });
+        const rawPublicKey = spkiDer.subarray(spkiDer.length - 32);
+        this.privateKey = privateKey;
+        this.publicKey = rawPublicKey.toString('base64');
+    }
+    /**
+     * Registers the public key on epic's servers
+     */
+    async registerKeypair() {
+        const publicKeyData = await this.client.http.epicgamesRequest({
             method: 'POST',
-            url: `${Endpoints_1.default.EOS_CHAT}/v1/public/${this.namespace}/conversations/${conversationId}/messages?fromAccountId=${this.client.user.self.id}`,
+            url: `${Endpoints_1.default.PUBLICKEY}/v2/publickey`,
             headers: {
                 'Content-Type': 'application/json',
-                Authorization: `bearer ${eosSession.easAccessToken}`,
             },
             data: {
-                allowedRecipients: allowedRecipients.filter((id) => id !== this.client.user.self.id),
-                message: {
-                    body,
-                },
-                isReportable: false,
-                metadata: {
-                    TmV: '2',
-                    Pub: this.client.keyData.jwt,
-                    Sig: signatureString,
-                    NPM: '1',
-                    PlfNm: this.client.config.platform,
-                    PlfId: this.client.user.self.id,
-                },
+                key: this.publicKey,
+                algorithm: 'ed25519',
             },
-        });
-        return conversationId;
+        }, enums_1.AuthSessionStoreKey.Fortnite);
+        this.publicKeyData = publicKeyData;
     }
 }
 exports.default = ChatManager;

package/dist/src/managers/ChatManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChatManager.js","sourceRoot":"","sources":["../../../src/managers/ChatManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChatManager.js","sourceRoot":"","sources":["../../../src/managers/ChatManager.ts"],"names":[],"mappings":"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"}

package/dist/src/stomp/STOMP.d.ts

@@ -28,7 +28,6 @@ declare class STOMP extends Base {
      * Whether the internal websocket is connected
      */
     get isConnected(): boolean | undefined;
-    private decodeBody;
     /**
      * Connect to the STOMP server
      * @throws {AuthenticationMissingError} When there is no EOS auth to use for STOMP auth

package/dist/src/stomp/STOMP.js

@@ -11,6 +11,7 @@ const PartyMessage_1 = tslib_1.__importDefault(require("../structures/party/Part
 const STOMPConnectionTimeoutError_1 = tslib_1.__importDefault(require("../exceptions/STOMPConnectionTimeoutError"));
 const STOMPMessage_1 = tslib_1.__importDefault(require("./STOMPMessage"));
 const STOMPConnectionError_1 = tslib_1.__importDefault(require("../exceptions/STOMPConnectionError"));
+const Util_1 = require("../util/Util");
 /**
  * Represents the client's EOS Connect STOMP manager (i.e. chat messages)
  */
@@ -31,25 +32,6 @@ class STOMP extends Base_1.default {
     get isConnected() {
         return this.connection && this.connection.readyState === ws_1.default.OPEN;
     }
-    decodeBody(body) {
-        var _a;
-        if (!body)
-            return '';
-        try {
-            const decoded = Buffer.from(body, 'base64')
-                .toString('utf-8')
-                .replace(/\0+$/, '');
-            try {
-                return (_a = JSON.parse(decoded).msg) !== null && _a !== void 0 ? _a : decoded;
-            }
-            catch {
-                return decoded;
-            }
-        }
-        catch {
-            return '';
-        }
-    }
     /**
      * Connect to the STOMP server
      * @throws {AuthenticationMissingError} When there is no EOS auth to use for STOMP auth
@@ -150,7 +132,7 @@ class STOMP extends Base_1.default {
                                 if (!friend || senderId === this.client.user.self.id)
                                     return;
                                 const friendMessage = new ReceivedFriendMessage_1.default(this.client, {
-                                    content: this.decodeBody(body),
+                                    content: (0, Util_1.decodeSTOMPMessageBody)(body),
                                     author: friend,
                                     id: data.id,
                                     sentAt: new Date(time),
@@ -171,7 +153,7 @@ class STOMP extends Base_1.default {
                                 if (!authorMember)
                                     return;
                                 const partyMessage = new PartyMessage_1.default(this.client, {
-                                    content: this.decodeBody(body),
+                                    content: (0, Util_1.decodeSTOMPMessageBody)(body),
                                     author: authorMember,
                                     sentAt: new Date(time),
                                     id: data.id,

package/dist/src/stomp/STOMP.js.map

@@ -1 +1 @@
-{"version":3,"file":"STOMP.js","sourceRoot":"","sources":["../../../src/stomp/STOMP.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"STOMP.js","sourceRoot":"","sources":["../../../src/stomp/STOMP.ts"],"names":[],"mappings":"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"}

package/dist/src/structures/party/ClientPartyMember.d.ts

@@ -47,11 +47,9 @@ declare class ClientPartyMember extends PartyMember {
      * Updates the client party member's battle pass info
      * @param isPurchased Whether the battle pass is purchased
      * @param level The battle pass level
-     * @param selfBoost The battle pass self boost percentage
-     * @param friendBoost The battle pass friend boost percentage
      * @throws {EpicgamesAPIError}
      */
-    setBattlePass(isPurchased: boolean, level: number, selfBoost: number, friendBoost: number): Promise<void>;
+    setBattlePass(isPurchased: boolean, level: number): Promise<void>;
     /**
      * Updates the client party member's banner
      * @param bannerId The new banner's id
@@ -60,14 +58,13 @@ declare class ClientPartyMember extends PartyMember {
      */
     setBanner(bannerId: string, color: string): Promise<void>;
     /**
-   * Updates multiple cosmetics for the client party member.
-   * If a cosmetic is set to `null`, it will be cleared.
-   * If a cosmetic is set to `undefined` or not provided, it will remain unchanged.
-   *
-   * @param cosmetics An object specifying the cosmetics to update.
-   * @throws {EpicgamesAPIError}
-   */
-    setCosmetics({ outfit, backpack, pickaxe, shoes, sidekick, }?: Cosmetics): Promise<void>;
+     * Updates multiple cosmetics for the client party member.
+     * If a cosmetic is set to `null`, it will be cleared.
+     * If a cosmetic is set to `undefined` or is not provided, it will remain unchanged.
+     * @param cosmetics An object specifying the cosmetics to update, including outfit, backpack, pickaxe and shoes.
+     * @throws {EpicgamesAPIError}
+     */
+    setCosmetics(cosmetics?: Cosmetics): Promise<void>;
     /**
      * Updates the client party member's outfit
      * @param id The outfit's ID