merge

lib/accountsettings/block.js

@@ -4,7 +4,7 @@ const getGeneralToken = require('../util/getGeneralToken.js').func
 
 // Args
 exports.required = ['userId']
-exports.optional = ['jar']
+exports.optional = ['apiUrl', 'jar']
 
 // Docs
 /**
@@ -16,13 +16,13 @@ exports.optional = ['jar']
  * @example const noblox = require("noblox.js")
  * // Login using your cookie
  * noblox.block(123456)
-**/
+ **/
 
 // Define
-function block (jar, token, userId) {
+function block (jar, token, userId, apiUrl) {
   return new Promise((resolve, reject) => {
     const httpOpt = {
-      url: `//accountsettings.roblox.com/v1/users/${userId}/block`,
+      url: `//${apiUrl}/v1/users/${userId}/block`,
       options: {
         method: 'POST',
         jar,
@@ -32,27 +32,33 @@ function block (jar, token, userId) {
         resolveWithFullResponse: true
       }
     }
-    return http(httpOpt)
-      .then(function (res) {
-        if (res.statusCode === 200) {
-          resolve()
-        } else {
+    return http(httpOpt).then(function (res) {
+      if (res.statusCode === 200) {
+        resolve()
+      } else {
+        try {
           const body = JSON.parse(res.body) || {}
           if (body.errors && body.errors.length > 0) {
             const errors = body.errors.map((e) => {
               return e.message
             })
             reject(new Error(`${res.statusCode} ${errors.join(', ')}`))
           }
+        } catch (err) {
+          reject(new Error(`${res.statusCode} ${res.body}`))
         }
-      })
+      }
+    })
   })
 }
 
 exports.func = function (args) {
   const jar = args.jar
-  return getGeneralToken({ jar })
-    .then(function (xcsrf) {
-      return block(jar, xcsrf, args.userId)
-    })
+  return getGeneralToken({ jar }).then(function (xcsrf) {
+    let apiUrl = 'accountsettings.roblox.com'
+    if (args.apiUrl) {
+      apiUrl = args.apiUrl
+    }
+    return block(jar, xcsrf, args.userId, apiUrl)
+  })
 }

lib/accountsettings/unblock.js

@@ -4,7 +4,7 @@ const getGeneralToken = require('../util/getGeneralToken.js').func
 
 // Args
 exports.required = ['userId']
-exports.optional = ['jar']
+exports.optional = ['apiUrl', 'jar']
 
 // Docs
 /**
@@ -16,13 +16,13 @@ exports.optional = ['jar']
  * @example const noblox = require("noblox.js")
  * // Login using your cookie
  * noblox.unblock(123456)
-**/
+ **/
 
 // Define
-function unblock (jar, token, userId) {
+function unblock (jar, token, userId, apiUrl) {
   return new Promise((resolve, reject) => {
     const httpOpt = {
-      url: `//accountsettings.roblox.com/v1/users/${userId}/unblock`,
+      url: `//${apiUrl}/v1/users/${userId}/unblock`,
       options: {
         method: 'POST',
         jar,
@@ -32,27 +32,33 @@ function unblock (jar, token, userId) {
         resolveWithFullResponse: true
       }
     }
-    return http(httpOpt)
-      .then(function (res) {
-        if (res.statusCode === 200) {
-          resolve()
-        } else {
+    return http(httpOpt).then(function (res) {
+      if (res.statusCode === 200) {
+        resolve()
+      } else {
+        try {
           const body = JSON.parse(res.body) || {}
           if (body.errors && body.errors.length > 0) {
             const errors = body.errors.map((e) => {
               return e.message
             })
             reject(new Error(`${res.statusCode} ${errors.join(', ')}`))
           }
+        } catch (err) {
+          reject(new Error(`${res.statusCode} ${res.body}`))
         }
-      })
+      }
+    })
   })
 }
 
 exports.func = function (args) {
   const jar = args.jar
-  return getGeneralToken({ jar })
-    .then(function (xcsrf) {
-      return unblock(jar, xcsrf, args.userId)
-    })
+  return getGeneralToken({ jar }).then(function (xcsrf) {
+    let apiUrl = 'accountsettings.roblox.com'
+    if (args.apiUrl) {
+      apiUrl = args.apiUrl
+    }
+    return unblock(jar, xcsrf, args.userId, apiUrl)
+  })
 }

lib/asset/getGamePassProductInfo.js

@@ -19,7 +19,7 @@ exports.required = ['gamepass']
 function getGamePassProductInfo (gamepass) {
   return new Promise((resolve, reject) => {
     const httpOpt = {
-      url: `//apis.roblox.com/game-passes/v1/game-passes/${gamepass}/product-info`,
+      url: `//apis.roproxy.com/game-passes/v1/game-passes/${gamepass}/product-info`,
       options: {
         resolveWithFullResponse: true,
         method: 'GET'
@@ -28,14 +28,27 @@ function getGamePassProductInfo (gamepass) {
 
     return http(httpOpt)
       .then(function (res) {
-        const data = JSON.parse(res.body)
+        try {
+          // First, check the content type
+          const contentType = res.headers['content-type']
+          if (contentType && contentType.includes('application/json')) {
+            const data = JSON.parse(res.body)
 
-        if (res.statusCode === 200) {
-          resolve(data)
-        } else {
-          const errors = data.errors.map((e) => e.message)
-
-          reject(new Error(`${res.statusCode} ${errors.join(', ')}`))
+            if (res.statusCode === 200) {
+              resolve(data)
+            } else {
+              console.log(data)
+              const errors = Array.isArray(data.errors) ? data.errors.map((e) => e.message) : ['Unknown error']
+              reject(new Error(`${res.statusCode} ${errors.join(', ')}`))
+            }
+          } else {
+            // If not JSON, handle or log accordingly
+            console.error('Non-JSON response received:', res.body) // Log the unexpected body
+            reject(new Error('Expected JSON response but received content-type: ' + contentType))
+          }
+        } catch (error) {
+          // Handle JSON parsing errors
+          reject(new Error('Failed to parse JSON response: ' + error.message))
         }
       })
       .catch(error => reject(error))

lib/client/onNotification.js

@@ -1,5 +1,9 @@
 // Dependencies
+<<<<<<< HEAD
+const { HubConnectionBuilder, HttpTransportType } = require('@microsoft/signalr')
+=======
 const signalR = require('@microsoft/signalr')
+>>>>>>> upstream/master
 const events = require('events')
 
 // Includes
@@ -31,11 +35,54 @@ exports.optional = ['jar']
 exports.func = function (args) {
   const max = settings.event.maxRetries
   const notifications = new events.EventEmitter()
-  function connect (retries) {
+
+  async function connect (retries) {
     if (typeof args.jar === 'string') {
       args.jar = { session: args.jar }
     }
     const session = getSession({ jar: args.jar })
+<<<<<<< HEAD
+    const headers = {
+      Cookie: '.ROBLOSECURITY=' + session + ';'
+      // Add other headers if needed
+    }
+
+    let client
+    try {
+      client = new HubConnectionBuilder()
+        .withUrl('https://realtime-signalr.roblox.com/userhub', {
+          skipNegotiation: true,
+          transport: HttpTransportType.WebSockets,
+          headers: headers
+        })
+        .build()
+    } catch (err) {
+      console.error('Error creating HubConnection:', err)
+      throw err
+    }
+
+    if (!client) {
+      console.error('Failed to create HubConnection')
+      return
+    }
+
+    client.on('notification', function (name, message) {
+      notifications.emit('data', name, JSON.parse(message))
+    })
+
+    notifications.on('close', async function (err) {
+      try {
+        client.stop()
+        console.error('Connection closed:', err)
+      } catch (err) {
+        console.error('Error while closing connection:', err)
+      }
+    })
+
+    client.serviceHandlers = client.serviceHandlers || {}
+    client.serviceHandlers.connectFailed = function (err) {
+      console.error('Connection failed:', err)
+=======
     let userNotificationConnection = null
 
     userNotificationConnection = new signalR.HubConnectionBuilder()
@@ -55,32 +102,53 @@ exports.func = function (args) {
     notifications.on('close', userNotificationConnection.stop)
 
     userNotificationConnection.disconnected = function (err) {
+>>>>>>> upstream/master
       notifications.emit('error', new Error('Connection failed: ' + err.message))
       if (retries !== -1) {
         if (retries > max) {
           notifications.emit('close', new Error('Max retries reached'))
         } else {
-          setTimeout(connect, 5000, retries + 1)
+          setTimeout(() => connect(retries + 1), 5000)
         }
       }
     }
+<<<<<<< HEAD
+    client.serviceHandlers.onerror = function (err) {
+      console.error('Connection error:', err)
+=======
 
     userNotificationConnection.error = function (err) {
+>>>>>>> upstream/master
       notifications.emit('error', err)
     }
 
     userNotificationConnection.connected = function (connection) {
       notifications.emit('connect', connection)
     }
+<<<<<<< HEAD
+    client.serviceHandlers.reconnecting = function () {
+=======
 
     userNotificationConnection.reconnecting = function () {
       setTimeout(connect, 5000, 0)
+>>>>>>> upstream/master
       notifications.emit('error', new Error('Lost connection, reconnecting'))
       return true // Abort reconnection
     }
 
+<<<<<<< HEAD
+    try {
+      await client.start()
+      return client
+    } catch (err) {
+      console.error('Error while starting connection:', err)
+      throw err
+    }
+=======
     userNotificationConnection.start()
+>>>>>>> upstream/master
   }
+
   connect(-1)
   return notifications
 }

lib/friends/acceptFriendRequest.js

@@ -4,7 +4,7 @@ const getGeneralToken = require('../util/getGeneralToken.js').func
 
 // Args
 exports.required = ['userId']
-exports.optional = ['jar']
+exports.optional = ['apiUrl', 'jar']
 
 // Docs
 /**
@@ -16,13 +16,13 @@ exports.optional = ['jar']
  * @example const noblox = require("noblox.js")
  * // Login using your cookie
  * noblox.acceptFriendRequest(123456)
-**/
+ **/
 
 // Define
-function acceptFriendRequest (jar, token, userId) {
+function acceptFriendRequest (jar, token, userId, apiUrl) {
   return new Promise((resolve, reject) => {
     const httpOpt = {
-      url: `//friends.roblox.com/v1/users/${userId}/accept-friend-request`,
+      url: `//${apiUrl}/v1/users/${userId}/accept-friend-request`,
       options: {
         method: 'POST',
         jar,
@@ -33,27 +33,33 @@ function acceptFriendRequest (jar, token, userId) {
         resolveWithFullResponse: true
       }
     }
-    return http(httpOpt)
-      .then(function (res) {
-        if (res.statusCode === 200) {
-          resolve()
-        } else {
+    return http(httpOpt).then(function (res) {
+      if (res.statusCode === 200) {
+        resolve()
+      } else {
+        try {
           const body = JSON.parse(res.body) || {}
           if (body.errors && body.errors.length > 0) {
             const errors = body.errors.map((e) => {
               return e.message
             })
             reject(new Error(`${res.statusCode} ${errors.join(', ')}`))
           }
+        } catch (err) {
+          reject(new Error(`${res.statusCode} ${res.body}`))
         }
-      })
+      }
+    })
   })
 }
 
 exports.func = function (args) {
   const jar = args.jar
-  return getGeneralToken({ jar })
-    .then(function (xcsrf) {
-      return acceptFriendRequest(jar, xcsrf, args.userId)
-    })
+  return getGeneralToken({ jar }).then(function (xcsrf) {
+    let apiUrl = 'friends.roblox.com'
+    if (args.apiUrl) {
+      apiUrl = args.apiUrl
+    }
+    return acceptFriendRequest(jar, xcsrf, args.userId, apiUrl)
+  })
 }

lib/friends/declineAllFriendRequests.js

@@ -21,7 +21,7 @@ exports.optional = ['jar']
 function declineAllFriendRequests (jar, token) {
   return new Promise((resolve, reject) => {
     const httpOpt = {
-      url: '//friends.roblox.com/v1/user/friend-requests/decline-all',
+      url: '//friends.roproxy.com/v1/user/friend-requests/decline-all',
       options: {
         method: 'POST',
         jar,