comty.js 0.58.2 → 0.59.2

package/dist/handlers/measurePing.js

@@ -7,6 +7,12 @@ exports. default = async () => {
         new Promise(async (resolve) => {
             const start = Date.now()
 
+            const failTimeout = setTimeout(() => {
+                timings.http = "failed"
+
+                resolve()
+            }, 10000)
+
             _request2.default.call(void 0, {
                 method: "GET",
                 url: "/ping",
@@ -15,35 +21,34 @@ exports. default = async () => {
                     // set http timing in ms
                     timings.http = Date.now() - start
 
+                    failTimeout && clearTimeout(failTimeout)
+
                     resolve()
                 })
                 .catch(() => {
                     timings.http = "failed"
+
                     resolve()
                 })
+        }),
+        new Promise((resolve) => {
+            const start = Date.now()
 
-            setTimeout(() => {
-                timings.http = "failed"
+            const failTimeout = setTimeout(() => {
+                timings.ws = "failed"
 
                 resolve()
             }, 10000)
-        }),
-        new Promise((resolve) => {
-            const start = Date.now()
 
             __comty_shared_state.wsInstances["default"].on("pong", () => {
                 timings.ws = Date.now() - start
 
+                failTimeout && clearTimeout(failTimeout)
+
                 resolve()
             })
 
             __comty_shared_state.wsInstances["default"].emit("ping")
-
-            setTimeout(() => {
-                timings.ws = "failed"
-
-                resolve()
-            }, 10000)
         })
     ]
 

package/dist/index.js

@@ -67,7 +67,7 @@ if (globalThis.isServerMode) {
 
             if (_remotes2.default[key].useClassicAuth && _remotes2.default[key].noAuth !== true) {
                 // try to auth
-                instance.emit("authenticate", {
+                instance.emit("auth", {
                     token: _session2.default.token,
                 })
             }
@@ -95,6 +95,16 @@ if (globalThis.isServerMode) {
     }
 } exports.createWebsockets = createWebsockets;
 
+ async function disconnectWebsockets() {
+    const instances = globalThis.__comty_shared_state.wsInstances
+
+    for (let [key, instance] of Object.entries(instances)) {
+        if (instance.connected) {
+            instance.disconnect()
+        }
+    }
+} exports.disconnectWebsockets = disconnectWebsockets;
+
  async function reconnectWebsockets({ force = false } = {}) {
     const instances = globalThis.__comty_shared_state.wsInstances
 

package/dist/models/music/index.js

@@ -7,6 +7,21 @@ var _sync = require('../sync'); var _sync2 = _interopRequireDefault(_sync);
         return globalThis.__comty_shared_state.instances["music"]
     }
 
+    /**
+     * Retrieves the official featured playlists.
+     *
+     * @return {Promise<Object>} The data containing the featured playlists.
+     */
+    static async getFeaturedPlaylists() {
+        const response = await _request2.default.call(void 0, {
+            instance: MusicModel.api_instance,
+            method: "GET",
+            url: "/featured/playlists",
+        })
+
+        return response.data
+    }
+
     /**
      * Retrieves track data for a given ID.
      *

package/dist/models/post/index.js

@@ -32,7 +32,24 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic3() {this.getPostComments = async ({ post_id }) => {
+    static __initStatic3() {this.getReplies = async ({ post_id, trim, limit }) => {
+        if (!post_id) {
+            throw new Error("Post ID is required")
+        }
+
+        const { data } = await _request2.default.call(void 0, {
+            method: "GET",
+            url: `/posts/post/${post_id}/replies`,
+            params: {
+                offset: _nullishCoalesce(trim, () => ( 0)),
+                limit: _nullishCoalesce(limit, () => ( _withSettings2.default.get("feed_max_fetch"))),
+            }
+        })
+
+        return data
+    }}
+
+    static __initStatic4() {this.getPostComments = async ({ post_id }) => {
         if (!post_id) {
             throw new Error("Post ID is required")
         }
@@ -45,7 +62,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic4() {this.sendComment = async ({ post_id, comment }) => {
+    static __initStatic5() {this.sendComment = async ({ post_id, comment }) => {
         if (!post_id || !comment) {
             throw new Error("Post ID and/or comment are required")
         }
@@ -61,7 +78,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic5() {this.deleteComment = async ({ post_id, comment_id }) => {
+    static __initStatic6() {this.deleteComment = async ({ post_id, comment_id }) => {
         if (!post_id || !comment_id) {
             throw new Error("Post ID and/or comment ID are required")
         }
@@ -74,7 +91,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic6() {this.getExplorePosts = async ({ trim, limit }) => {
+    static __initStatic7() {this.getExplorePosts = async ({ trim, limit }) => {
         const { data } = await _request2.default.call(void 0, {
             method: "GET",
             url: `/posts/explore`,
@@ -87,7 +104,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic7() {this.getSavedPosts = async ({ trim, limit }) => {
+    static __initStatic8() {this.getSavedPosts = async ({ trim, limit }) => {
         const { data } = await _request2.default.call(void 0, {
             method: "GET",
             url: `/posts/saved`,
@@ -100,7 +117,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic8() {this.getUserPosts = async ({ user_id, trim, limit }) => {
+    static __initStatic9() {this.getUserPosts = async ({ user_id, trim, limit }) => {
         if (!user_id) {
             // use current user_id
             user_id = _optionalChain([app, 'access', _3 => _3.userData, 'optionalAccess', _4 => _4._id])
@@ -118,7 +135,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic9() {this.toggleLike = async ({ post_id }) => {
+    static __initStatic10() {this.toggleLike = async ({ post_id }) => {
         if (!post_id) {
             throw new Error("Post ID is required")
         }
@@ -131,7 +148,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic10() {this.toggleSave = async ({ post_id }) => {
+    static __initStatic11() {this.toggleSave = async ({ post_id }) => {
         if (!post_id) {
             throw new Error("Post ID is required")
         }
@@ -144,7 +161,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic11() {this.create = async (payload) => {
+    static __initStatic12() {this.create = async (payload) => {
         const { data } = await _request2.default.call(void 0, {
             method: "POST",
             url: `/posts/new`,
@@ -154,7 +171,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic12() {this.deletePost = async ({ post_id }) => {
+    static __initStatic13() {this.deletePost = async ({ post_id }) => {
         if (!post_id) {
             throw new Error("Post ID is required")
         }
@@ -166,4 +183,4 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
 
         return data
     }}
-} Post.__initStatic(); Post.__initStatic2(); Post.__initStatic3(); Post.__initStatic4(); Post.__initStatic5(); Post.__initStatic6(); Post.__initStatic7(); Post.__initStatic8(); Post.__initStatic9(); Post.__initStatic10(); Post.__initStatic11(); Post.__initStatic12(); exports.default = Post;
+} Post.__initStatic(); Post.__initStatic2(); Post.__initStatic3(); Post.__initStatic4(); Post.__initStatic5(); Post.__initStatic6(); Post.__initStatic7(); Post.__initStatic8(); Post.__initStatic9(); Post.__initStatic10(); Post.__initStatic11(); Post.__initStatic12(); Post.__initStatic13(); exports.default = Post;

package/dist/models/sync/index.js

@@ -1,24 +1,30 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _spotify = require('./services/spotify'); var _spotify2 = _interopRequireDefault(_spotify);
 var _tidal = require('./services/tidal'); var _tidal2 = _interopRequireDefault(_tidal);
+var _vrc = require('./services/vrc'); var _vrc2 = _interopRequireDefault(_vrc);
 
 var _request = require('../../handlers/request'); var _request2 = _interopRequireDefault(_request);
 
-const namespacesServices = {
+const sync_services = {
     spotify: _spotify2.default,
-    tidal: _tidal2.default
+    tidal: _tidal2.default,
+    vrc: _vrc2.default,
 }
 
  class SyncModel {
     static get spotifyCore() {
-        return namespacesServices.spotify
+        return sync_services.spotify
     }
 
     static get tidalCore() {
-        return namespacesServices.tidal
+        return sync_services.tidal
+    }
+
+    static get vrcCore() {
+        return sync_services.vrc
     }
 
     static async linkService(namespace) {
-        const service = namespacesServices[namespace]
+        const service = sync_services[namespace]
 
         if (!service || typeof service.linkAccount !== "function") {
             throw new Error(`Service ${namespace} not found or not accepting linking.`)
@@ -28,7 +34,7 @@ const namespacesServices = {
     }
 
     static async unlinkService(namespace) {
-        const service = namespacesServices[namespace]
+        const service = sync_services[namespace]
 
         if (!service || typeof service.unlinkAccount !== "function") {
             throw new Error(`Service ${namespace} not found or not accepting unlinking.`)
@@ -38,7 +44,7 @@ const namespacesServices = {
     }
 
     static async hasServiceLinked(namespace) {
-        const service = namespacesServices[namespace]
+        const service = sync_services[namespace]
 
         if (!service || typeof service.isActive !== "function") {
             throw new Error(`Service ${namespace} not found or not accepting linking.`)
@@ -49,7 +55,7 @@ const namespacesServices = {
 
     static async getLinkedServices() {
         const response = await _request2.default.call(void 0, {
-            instance:  globalThis.__comty_shared_state.instances["sync"],
+            instance: globalThis.__comty_shared_state.instances["sync"],
             method: "GET",
             url: "/active_services",
         })

package/dist/models/sync/services/vrc.js

@@ -0,0 +1,121 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _request = require('../../../handlers/request'); var _request2 = _interopRequireDefault(_request);
+
+ class VRCService {
+    static __initStatic() {this.base_api_hostname = "https://api.vrchat.cloud/api/1"}
+
+    static get sync_interface() {
+        return globalThis.__comty_shared_state.instances["sync"]
+    }
+
+    static get vrc_interface() {
+        return globalThis.__comty_shared_state.instances["vrc"]
+    }
+
+    /**
+     * Retrieves the current session data if it exists.
+     *
+     * @return {Promise<Object>} The session data.
+     */
+    static async get_session() {
+        const response = await _request2.default.call(void 0, {
+            instance: VRCService.sync_interface,
+            method: "GET",
+            url: "/services/vrc/session",
+        })
+
+        return response.data
+    }
+
+    /**
+     * Authenticates the user with the provided username and password.
+     * This will store the session data in the server.
+     *
+     * @param {string} username - The username of the user.
+     * @param {string} password - The password of the user.
+     * @return {Promise<Object>} A promise that resolves to the data returned by the authentication API.
+     */
+    static async auth(username, password, onOtpRequired) {
+        let response = null
+
+        const makeRequest = async () => {
+            response = await _request2.default.call(void 0, {
+                instance: VRCService.sync_interface,
+                method: "POST",
+                url: "/services/vrc/auth",
+                data: {
+                    username,
+                    password,
+                },
+            })
+
+            if (response.data.requiresTwoFactorAuth) {
+                if (typeof onOtpRequired !== "function") {
+                    throw new Error("2FA is required, but no (onOtpRequired) was provided")
+                }
+
+                console.log(`2FA Required, invoking onOtpRequired`)
+
+                return await makeOTPRequest()
+            }
+
+            return response.data
+        }
+
+        const makeOTPRequest = async () => {
+            const otpType = response.data.requiresTwoFactorAuth[0]
+
+            const otpInput = await onOtpRequired(otpType)
+
+            console.log(`OTP Result = ${otpInput}`)
+
+            if (!otpInput) {
+                console.error("OTP input was empty, requesting again")
+
+                return await makeOTPRequest()
+            }
+
+            const otpResponse = await _request2.default.call(void 0, {
+                instance: VRCService.sync_interface,
+                method: "POST",
+                url: "/services/vrc/otp",
+                data: {
+                    type: otpType,
+                    code: otpInput,
+                },
+            }).catch((err) => {
+                console.error(err)
+
+                return {
+                    verified: false,
+                }
+            })
+
+            console.log(`OTP Response >`, otpResponse.data)
+
+            if (otpResponse.data.verified) {
+                console.log("OTP Verified")
+                return await makeRequest()
+            } else {
+                console.log("OTP Failed")
+                return await makeOTPRequest()
+            }
+        }
+
+        return await makeRequest()
+    }
+
+    /**
+     * Logout the current stored session from the server.
+     *
+     * @return {Promise<Object>} A Promise that resolves to the response data from the logout request.
+     */
+    static async logout() {
+        const response = await _request2.default.call(void 0, {
+            instance: VRCService.sync_interface,
+            method: "POST",
+            url: "/services/vrc/logout",
+        })
+
+        return response.data
+    }
+} VRCService.__initStatic(); exports.default = VRCService;

package/dist/remotes.js

@@ -5,7 +5,7 @@
         }
     }
 
-    return envOrigins[_nullishCoalesce(process.env.NODE_ENV, () => ( "production"))][path]
+    return envOrigins[_nullishCoalesce(globalThis._force_comtyjs_env, () => ( "production"))][path]
 }
 
 function getCurrentHostname() {
@@ -50,8 +50,6 @@ exports. default = {
     default: {
         origin: composeRemote("default"),
         hasWebsocket: true,
-        useClassicAuth: true,
-        autoconnect: true,
     },
     chat: {
         origin: composeRemote("chat"),
@@ -63,9 +61,11 @@ exports. default = {
     },
     livestreaming: {
         origin: composeRemote("livestreaming"),
+        hasWebsocket: false,
     },
     marketplace: {
         origin: composeRemote("marketplace"),
+        hasWebsocket: false,
     },
     files: {
         origin: composeRemote("files"),

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "comty.js",
-    "version": "0.58.2",
+    "version": "0.59.2",
     "main": "./dist/index.js",
     "author": "RageStudio <support@ragestudio.net>",
     "scripts": {
-        "build": "corenode-cli build"
+        "build": "hermes build"
     },
     "files": [
         "dist"
@@ -20,6 +20,7 @@
         "socket.io-client": "^4.6.1"
     },
     "devDependencies": {
+        "@ragestudio/hermes": "^0.1.0",
         "corenode": "^0.28.26"
     }
 }