smule.js 1.3.2 → 1.4.1

package/dist/index.js

@@ -1301,18 +1301,17 @@ var SmuleUrls;
 import "@xmpp/xml";
 import EventEmitter from "events";
 import "@xmpp/jid";
+import { randomUUID as randomUUID2 } from "crypto";
 var SmuleLiveChat = class {
   events = new EventEmitter();
   state = "closed";
   client;
   jid;
-  ongoingIq = false;
-  iqHasMore = false;
-  lastIqId = "0";
+  iqs = {};
   roomJID = null;
   roomUsers = [];
   chat = { messages: [] };
-  constructor(userId, session, host = SmuleUrls.userChat, roomJID) {
+  constructor(userId, session, host = SmuleUrls.cfireChat, roomJID) {
     this.client = client({
       service: "xmpp://" + host,
       domain: host,
@@ -1360,6 +1359,9 @@ var SmuleLiveChat = class {
         )
       )
     );
+    this.sendIqQuery("http://jabber.org/protocol/disco#info", (el) => {
+      console.log("reply from disco", el);
+    });
   }
   /**
    * Disconnects the client from the XMPP server.
@@ -1371,83 +1373,41 @@ var SmuleLiveChat = class {
    */
   async disconnect() {
     try {
+      await this.client.send(xml("presence", { type: "unavailable" }));
       await this.client.stop();
     } catch {
     }
   }
-  /**
-   * Send a chat state to the server. This is used to
-   * signal whether you are currently active or not.
-   *
-   * active -> You're active
-   * 
-   * composing -> Typing
-   * 
-   * paused -> Just stopped typing
-   * 
-   * inactive -> You're inactive
-   * 
-   * gone -> You're hidden / disconnected / You've left the chat
-   * 
-   * @param state One of `active`, `composing`, `paused`, `inactive`, or `gone`.
-   *              Default is `active`
-   */
-  async sendChatState(to, state = "active") {
-    if (typeof to != "string" && "accountId" in to) to = this.getJIDFromUserId(to.accountId);
-    await this.client.send(
+  sendIq(data, callback, iqType = "get") {
+    const id = randomUUID2();
+    this.iqs[id] = callback;
+    this.client.send(
       xml(
-        "message",
-        { to: to.toString(), type: "chat" },
-        xml(
-          "chatstate",
-          { xmlns: "http://jabber.org/protocol/chatstates" },
-          state
-        )
+        "iq",
+        { from: this.jid.toString(), to: this.roomJID, type: iqType, id },
+        data
       )
     );
   }
-  /**
-   * Loads the entire message history
-   * @param limit The maximum number of messages to fetch. Default is 50.
-   * @remarks This currently recurses until it loads ALL archived messages.
-   *          This means that it will take a long time to load all messages.
-   * @remarks Filtering by a specific JID may not work yet
-   */
-  async loadMessageHistory(limit = 50, before = null, after = null, jid) {
-    this._log("Loading live chat history...");
-    this.ongoingIq = true;
-    await this.client.send(
-      xml(
-        "iq",
-        { from: this.jid.toString(), to: this.roomJID, type: "get", id: "meow" },
-        xml(
-          "query",
-          { xmlns: "http://jabber.org/protocol/muc#history" }
-        )
-      )
+  sendIqQuery(xmlns, callback, iqType = "get") {
+    this.sendIq(
+      xml("query", { xmlns }),
+      callback,
+      iqType
     );
-    while (this.ongoingIq) await new Promise((resolve) => setTimeout(resolve, 100));
   }
   /**
-   * Send a text message
-   * @param jid The JID to send the message to
+   * Send a text message to the livestream
    * @param message The message body
    */
-  async sendTextMessage(jid, message) {
-    if (typeof jid != "string" && "accountId" in jid) jid = this.getJIDFromUserId(jid.accountId);
+  async sendTextMessage(message) {
     await this.client.send(
       xml(
         "message",
-        { to: jid.toString(), type: "groupchat" },
+        { to: this.roomJID, type: "groupchat" },
         xml("body", {}, message)
       )
     );
-    const data = {
-      sender: parseInt(this.jid.getLocal()),
-      content: message
-    };
-    this.chat[this.getUserIdFromJID(jid.toString())].messages.push(data);
-    this.events.emit("message", data);
   }
   /**
    * Read-only jid to prevent any bugs
@@ -1560,6 +1520,23 @@ var SmuleLiveChat = class {
       this._log("Got host left!", data2);
       this.events.emit("host-left", data2);
     }
+    child = el.getChild("song-listen");
+    if (child) {
+      const data2 = {
+        arrKey: child.getChild("arrangement-key").getText(),
+        hostSessionId: child.getChild("host-session-id").getText()
+      };
+      this._log("Got song listen!", data2);
+      this.events.emit("song-listen", data2);
+    }
+    child = el.getChild("campfire-ended");
+    if (child) {
+      const data2 = {
+        reason: child.getChild("reason").getText()
+      };
+      this._log("Got stop livestream!", data2);
+      this.events.emit("stop-livestream", data2);
+    }
     child = el.getChild("result");
     if (!child) return;
     child = child.getChild("forwarded");
@@ -1583,15 +1560,17 @@ var SmuleLiveChat = class {
     if (child) {
       child = child.getChild("item");
       if (child) {
-        if (!el.getAttr("jid")) return;
-        const data = {
-          user: this.getUserIdFromJID(el.getAttr("jid")),
-          role: child.getAttr("role"),
-          affiliation: child.getAttr("affiliation")
-        };
-        this._log("Got presence!", data);
-        this.roomUsers.push(data);
-        this.events.emit("presence", data);
+        if (!el.getAttr("jid")) {
+        } else {
+          const data = {
+            user: this.getUserIdFromJID(el.getAttr("jid")),
+            role: child.getAttr("role"),
+            affiliation: child.getAttr("affiliation")
+          };
+          this._log("Got presence!", data);
+          this.roomUsers.push(data);
+          this.events.emit("presence", data);
+        }
       }
     }
   }
@@ -1688,22 +1667,11 @@ var SmuleLiveChat = class {
       this.parsePresence(el);
     } else {
       if (el.is("iq")) {
-        let child = el.getChild("fin");
-        if (child) {
-          if (child.getAttr("complete") == "false") {
-            this.iqHasMore = true;
-            child = child.getChild("set");
-            if (child) {
-              child = child.getChild("last");
-              if (child) {
-                this.lastIqId = child.getText();
-              }
-            }
-          } else {
-            this.iqHasMore = false;
-          }
+        const id = el.getAttr("id");
+        if (id) {
+          this.iqs[id](el);
+          delete this.iqs[id];
         }
-        this.ongoingIq = false;
       }
       this._log("Stanza!", el.toString());
     }
@@ -2140,17 +2108,14 @@ import { client as client2, xml as xml2 } from "@xmpp/client";
 import "@xmpp/xml";
 import EventEmitter2 from "events";
 import "@xmpp/jid";
+import { randomUUID as randomUUID3 } from "crypto";
 var SmuleChat = class {
   events = new EventEmitter2();
   state = "closed";
   client;
   jid;
-  ongoingIq = false;
-  iqHasMore = false;
-  lastIqId = "0";
-  isLive = false;
+  iqs = {};
   roomJID = null;
-  roomUsers = [];
   chats = {};
   constructor(userId, session, host = SmuleUrls.userChat, roomJID) {
     this.client = client2({
@@ -2161,7 +2126,6 @@ var SmuleChat = class {
       username: userId + "",
       password: session
     });
-    this.isLive = host != SmuleUrls.userChat || !!roomJID;
     this.roomJID = roomJID;
     this.client.on("close", (el) => this.onClose(el));
     this.client.on("closing", () => this.onClosing());
@@ -2184,27 +2148,7 @@ var SmuleChat = class {
   async connect() {
     this.jid = await this.client.start();
     this._log("Connected as:", this.jid.getLocal() + "@" + this.jid.getDomain());
-    if (!this.isLive && !this.roomJID) {
-      this.client.send(xml2("presence", {}));
-    } else {
-      this.client.send(
-        xml2(
-          "presence",
-          { to: this.roomJID + "/" + this.jid.getLocal() },
-          xml2(
-            "x",
-            { xmlns: "http://jabber.org/protocol/muc" },
-            xml2(
-              "password"
-            ),
-            xml2(
-              "history",
-              { maxstanzas: "1" }
-            )
-          )
-        )
-      );
-    }
+    this.client.send(xml2("presence", {}));
   }
   /**
    * Disconnects the client from the XMPP server.
@@ -2216,10 +2160,29 @@ var SmuleChat = class {
    */
   async disconnect() {
     try {
+      await this.client.send(xml2("presence", { type: "unavailable" }));
       await this.client.stop();
     } catch {
     }
   }
+  sendIq(data, callback, iqType = "get") {
+    const id = randomUUID3();
+    this.iqs[id] = callback;
+    this.client.send(
+      xml2(
+        "iq",
+        { from: this.jid.toString(), to: this.roomJID, type: iqType, id },
+        data
+      )
+    );
+  }
+  sendIqQuery(xmlns, callback, iqType = "get") {
+    this.sendIq(
+      xml2("query", { xmlns }),
+      callback,
+      iqType
+    );
+  }
   /**
    * Send a chat state to the server. This is used to
    * signal whether you are currently active or not.
@@ -2259,50 +2222,29 @@ var SmuleChat = class {
    * @remarks Filtering by a specific JID may not work yet
    */
   async loadMessageHistory(limit = 50, before = null, after = null, jid) {
-    if (!this.isLive) {
-      if (this.ongoingIq) this._log("Waiting for previous iq to finish...");
-      while (this.ongoingIq) await new Promise((resolve) => setTimeout(resolve, 100));
-      if (jid)
-        this._log(`Loading ${limit} messages with ${jid}...`);
-      else
-        this._log(`Loading ${limit} messages from history...`);
-      if (!before && !after && !jid) this.chats = {};
-      this.ongoingIq = true;
-      await this.client.send(
-        xml2(
-          "iq",
-          { type: "set", id: "mam-query" },
-          xml2(
-            "query",
-            { xmlns: "urn:xmpp:mam:2" },
-            xml2(
-              "set",
-              { xmlns: "http://jabber.org/protocol/rsm" },
-              xml2("max", {}, limit.toString()),
-              before ? xml2("before", {}, before.toString()) : null,
-              after ? xml2("after", {}, after.toString()) : null
-            ),
-            jid ? xml2("with", {}, jid.toString()) : null
-          )
-        )
-      );
-      while (this.ongoingIq) await new Promise((resolve) => setTimeout(resolve, 100));
-      if (this.iqHasMore) await this.loadMessageHistory(limit, null, this.lastIqId, jid);
-    } else {
-      this._log("Loading live chat history...");
-      this.ongoingIq = true;
-      await this.client.send(
+    if (jid)
+      this._log(`Loading ${limit} messages with ${jid}...`);
+    else
+      this._log(`Loading ${limit} messages from history...`);
+    if (!before && !after && !jid) this.chats = {};
+    this.sendIq(
+      xml2(
+        "query",
+        { xmlns: "urn:xmpp:mam:2" },
         xml2(
-          "iq",
-          { from: this.jid.toString(), to: this.roomJID, type: "get", id: "meow" },
-          xml2(
-            "query",
-            { xmlns: "http://jabber.org/protocol/muc#history" }
-          )
-        )
-      );
-      while (this.ongoingIq) await new Promise((resolve) => setTimeout(resolve, 100));
-    }
+          "set",
+          { xmlns: "http://jabber.org/protocol/rsm" },
+          xml2("max", {}, limit.toString()),
+          before ? xml2("before", {}, before.toString()) : null,
+          after ? xml2("after", {}, after.toString()) : null
+        ),
+        jid ? xml2("with", {}, jid.toString()) : null
+      ),
+      (el) => {
+        this._log("Finished loading history!", el.toString());
+      },
+      "set"
+    );
   }
   /**
    * Send a text message
@@ -2314,16 +2256,10 @@ var SmuleChat = class {
     await this.client.send(
       xml2(
         "message",
-        { to: jid.toString(), type: this.isLive ? "groupchat" : "chat" },
+        { to: jid.toString(), type: "chat" },
         xml2("body", {}, message)
       )
     );
-    let data = {
-      sender: parseInt(this.jid.getLocal()),
-      content: message
-    };
-    this.chats[this.getUserIdFromJID(jid.toString())].messages.push(data);
-    this.events.emit("message", data);
   }
   /**
    * Send a performance / recording 
@@ -2363,25 +2299,6 @@ var SmuleChat = class {
       )
     );
   }
-  //TODO - Most definitely not required
-  async archiveMessage(jid, message) {
-    if (typeof jid != "string" && "accountId" in jid) jid = this.getJIDFromUserId(jid.accountId);
-    await this.client.send(
-      xml2(
-        "iq",
-        { type: "set" },
-        xml2(
-          "archive",
-          { xmlns: "urn:xmpp:mam:2" },
-          xml2(
-            "item",
-            { with: jid, id: Math.random().toString(16).substring(2, 8) },
-            xml2("body", {}, message)
-          )
-        )
-      )
-    );
-  }
   /**
    * Read-only jid to prevent any bugs
    * @returns user's JID
@@ -2405,7 +2322,6 @@ var SmuleChat = class {
    */
   getJIDFromUserId(userId) {
     if (typeof userId != "string" && typeof userId != "number" && "accountId" in userId) userId = userId.accountId;
-    if (this.isLive) return this.roomJID + "/" + userId;
     return userId + "@" + this.jid.getDomain();
   }
   //* Processes all message-like elements
@@ -2430,7 +2346,6 @@ var SmuleChat = class {
     }
     child = el.getChild("body");
     const perfChild = el.getChild("performance");
-    const perfStartChild = el.getChild("performance-start");
     if (child && (child.getText().trim().length > 0 || perfChild)) {
       this._log("Got message!", child.getText());
       let performanceKey2 = void 0;
@@ -2461,7 +2376,8 @@ var SmuleChat = class {
       content: child.getText(),
       sender: this.getUserIdFromJID(child.parent.getAttr("from")),
       id: child.parent.getAttr("id"),
-      performanceKey
+      performanceKey,
+      systemMessage: !!child.parent.getChild("smule-system-msg")
     };
     let chat = this.jid.getLocal().includes(data.sender + "") ? this.getUserIdFromJID(child.parent.getAttr("to")) : data.sender;
     this.events.emit("history", data);
@@ -2470,25 +2386,6 @@ var SmuleChat = class {
   }
   parsePresence(el) {
     if (el.children.length < 1) return;
-    if (this.isLive) {
-      let child = el.getChildByAttr("xmlns", "http://jabber.org/protocol/muc#user");
-      if (child) {
-        child = child.getChild("item");
-        if (child) {
-          if (!el.getAttr("jid")) return;
-          let user = this.getUserIdFromJID(el.getAttr("jid"));
-          let role = child.getAttr("role");
-          let affiliation = child.getAttr("affiliation");
-          let data = {
-            user,
-            role,
-            affiliation
-          };
-          this.roomUsers.push(data);
-          this.events.emit("presence", data);
-        }
-      }
-    }
   }
   /**
    * Fetches the chats currently loaded
@@ -2506,9 +2403,6 @@ var SmuleChat = class {
     if (!(user in this.chats)) this.chats[user] = { messages: [] };
     return this.chats[user];
   }
-  fetchUsers() {
-    return this.roomUsers;
-  }
   //#region Internal events
   onClose(el) {
     this._log("Closed!:", el);
@@ -2592,22 +2486,11 @@ var SmuleChat = class {
       this.parsePresence(el);
     } else {
       if (el.is("iq")) {
-        let child = el.getChild("fin");
-        if (child) {
-          if (child.getAttr("complete") == "false") {
-            this.iqHasMore = true;
-            child = child.getChild("set");
-            if (child) {
-              child = child.getChild("last");
-              if (child) {
-                this.lastIqId = child.getText();
-              }
-            }
-          } else {
-            this.iqHasMore = false;
-          }
+        const id = el.getAttr("id");
+        if (id) {
+          this.iqs[id](el);
+          delete this.iqs[id];
         }
-        this.ongoingIq = false;
       }
       this._log("Stanza!", el.toString());
     }
@@ -2615,13 +2498,13 @@ var SmuleChat = class {
   //#endregion Internal events
   //#region Logging
   _log(...args) {
-    console.log(this.isLive ? "[SmuleLiveChat]" : "[SmuleChat]", ...args);
+    console.log("[SmuleChat]", ...args);
   }
   _warn(...args) {
-    console.warn(this.isLive ? "[SmuleLiveChat]" : "[SmuleChat]", ...args);
+    console.warn("[SmuleChat]", ...args);
   }
   _error(...args) {
-    console.error(this.isLive ? "[SmuleLiveChat]" : "[SmuleChat]", ...args);
+    console.error("[SmuleChat]", ...args);
   }
   //#endregion Logging
 };
@@ -2630,7 +2513,7 @@ var SmuleChat = class {
 import { readFileSync } from "fs";
 import * as crypto from "crypto";
 import "@xmpp/jid";
-var APP_VERSION = "12.0.9";
+var APP_VERSION = "12.6.9";
 var SmuleDigest;
 ((SmuleDigest2) => {
   const SALT = `c2250918de500e32c37842f2d25d4d8210992a0ae96a7f36c4c9703cc675d02b92968bc4fa7feada`;
@@ -3174,13 +3057,37 @@ var Smule = class {
        * Creates a new spark chat
        * @param address The JID address of the chat partner
        * @param type Whether the JID address is an individual or a group
-       * @returns idk
        */
       create: async (address, type = "ACCT") => {
         const req = await this.internal._createRequest(SmuleUrls.SparkChatUpdate, { add: [{ name: address, type }], remove: [] });
+        this.internal._handleNon200(req);
+      },
+      /**
+       * Deletes an existing spark chat
+       * @param address The JID address of the chat partner
+       * @param type Whether the JID address is an individual or a group
+       */
+      delete: async (address, type = "ACCT") => {
+        const req = await this.internal._createRequest(SmuleUrls.SparkChatUpdate, { remove: [{ name: address, type }], add: [] });
+        this.internal._handleNon200(req);
+      },
+      /**
+       * Fetches your existing chats
+       * @param type Whether an individual or a group
+       * @returns Your inbox and your message requests
+       */
+      fetchInboxes: async (type = "ACCT") => {
+        const req = await this.internal._createRequest(SmuleUrls.SparkChatList, { type, limit: 200 });
         if (!this.internal._handleNon200(req)) return;
         return this.internal._getResponseData(req);
       },
+      /**
+       * Marks you as offline to your chats
+       */
+      markOffline: async () => {
+        const req = await this.internal._createRequest(SmuleUrls.SparkChatOffline, {});
+        this.internal._handleNon200(req);
+      },
       /**
        * Creates a connection to the XMPP chat server
        */
@@ -4351,9 +4258,9 @@ var Smule = class {
        * @param to The user to send the message to
        * @param message The message body
        */
-      sendTextMessage: async (to, message) => {
+      sendTextMessage: async (message) => {
         if (!this.liveChatSession) return;
-        await this.liveChatSession.sendTextMessage(to, message);
+        await this.liveChatSession.sendTextMessage(message);
       },
       /**
        * Fetch all loaded chats
@@ -4366,27 +4273,47 @@ var Smule = class {
       fetchUsers: () => {
         if (!this.liveChatSession) return;
         return this.liveChatSession.fetchUsers();
-      },
-      /**
-       * Loads the entire message history
-       * @param limit How many messages
-       * @param before Messages before this
-       * @param after Messages after this
-       * @param user The chat partner
-       * 
-       * @remarks This currently recurses until it loads ALL archived messages.
-       *          This means that it will take a long time to load all messages.
-       * @remarks Filtering by a specific user may not work yet
-       */
-      loadMessageHistory: async (limit = 50, before = null, after = null, user) => {
-        if (!this.liveChatSession) return;
-        await this.liveChatSession.loadMessageHistory(limit, before, after, user);
       }
     },
+    /**
+     * Fetches ("syncs") a livestream (campfire) so you can connect to it
+     * 
+     * @param campfireId The campfire's id
+     * @returns Data regarding the campfire and the streaming details
+     */
     fetch: async (campfireId) => {
       const req = await this.internal._createRequest(SmuleUrls.CfireSync, { campfireId });
       if (!this.internal._handleNon200(req)) return;
       return this.internal._getResponseData(req);
+    },
+    /**
+     * Fetches gifts that have been sent to a live
+     * 
+     * @param campfireId The campfire's id
+     * @param cursor The starting point
+     * @param limit How many results
+     * @returns A list of gifts data
+     */
+    fetchRecentGifts: async (campfireId, cursor = "start", limit = 10) => {
+      const req = await this.internal._createRequest(SmuleUrls.GiftRecentTransactions, { campfireId, cursor, limit, animationVersion: "V2", extraGiftTypes: ["SYSTEM"], previewVersion: "PNG", type: "CFIRE" });
+      if (!this.internal._handleNon200(req)) return;
+      return this.internal._getResponseData(req);
+    },
+    /**
+     * Sign up as available to sing
+     * @param campfireId The livestream's id
+     */
+    joinToSing: async (campfireId) => {
+      const req = await this.internal._createRequest(SmuleUrls.CfireSignupAdd, { campfireId, message: "I'm available to sing" });
+      this.internal._handleNon200(req);
+    },
+    /**
+     * Revoke your availability to sing
+     * @param campfireId The livestream's id
+     */
+    revokeJoinToSing: async (campfireId) => {
+      const req = await this.internal._createRequest(SmuleUrls.CfireSignupRemove, { campfireId });
+      this.internal._handleNon200(req);
     }
   };
   groups = {