comty.js 0.46.0 → 0.47.0

package/dist/handlers/request.js

@@ -1,6 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }var _handleBeforeRequest = require('../helpers/handleBeforeRequest'); var _handleBeforeRequest2 = _interopRequireDefault(_handleBeforeRequest);
 var _handleAfterRequest = require('../helpers/handleAfterRequest'); var _handleAfterRequest2 = _interopRequireDefault(_handleAfterRequest);
-var _session = require('../models/session'); var _session2 = _interopRequireDefault(_session);
 
 exports. default = async (
     request = {
@@ -30,14 +29,6 @@ exports. default = async (
     let result = null
 
     const makeRequest = async () => {
-        const sessionToken = await _session2.default.token
-
-        if (sessionToken) {
-            request.headers["Authorization"] = `${globalThis.isServerMode ? "Server" : "Bearer"} ${sessionToken}`
-        } else {
-            console.warn("Making a request with no session token")
-        }
-
         const _result = await instance(request, ...args)
             .catch((error) => {
                 return error

package/dist/helpers/handleRegenerationEvent.js

@@ -1,7 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var _session = require('../models/session'); var _session2 = _interopRequireDefault(_session);
 var _request = require('../handlers/request'); var _request2 = _interopRequireDefault(_request);
+var _ = require('../');
 
-exports. default = async (refreshToken) =>{
+exports. default = async (refreshToken) => {
     __comty_shared_state.eventBus.emit("session.expiredExceptionEvent", refreshToken)
 
     __comty_shared_state.onExpiredExceptionEvent = true
@@ -25,7 +26,7 @@ exports. default = async (refreshToken) =>{
         return __comty_shared_state.eventBus.emit("session.invalid", "Failed to regenerate token")
     }
 
-    if (!_optionalChain([response, 'access', _ => _.data, 'optionalAccess', _2 => _2.token])) {
+    if (!_optionalChain([response, 'access', _3 => _3.data, 'optionalAccess', _4 => _4.token])) {
         return __comty_shared_state.eventBus.emit("session.invalid", "Failed to regenerate token, invalid server response.")
     }
 
@@ -36,4 +37,7 @@ exports. default = async (refreshToken) =>{
 
     // emit event
     __comty_shared_state.eventBus.emit("session.regenerated")
+
+    // reconnect websockets
+    _.reconnectWebsockets.call(void 0, )
 }

package/dist/index.js

@@ -5,7 +5,7 @@ var _socketioclient = require('socket.io-client');
 
 var _remotes = require('./remotes'); var _remotes2 = _interopRequireDefault(_remotes);
 
-
+//import request from "./handlers/request"
 var _withStorage = require('./helpers/withStorage'); var _withStorage2 = _interopRequireDefault(_withStorage);
 
 var _session = require('./models/session'); var _session2 = _interopRequireDefault(_session);
@@ -24,11 +24,118 @@ if (globalThis.isServerMode) {
     }
 }
 
+ async function createWebsockets() {
+    const instances = globalThis.__comty_shared_state.wsInstances
+
+    for (let [key, instance] of Object.entries(instances)) {
+        if (instance.connected) {
+            // disconnect first
+            instance.disconnect()
+        }
+
+        // remove current listeners
+        instance.removeAllListeners()
+
+        delete globalThis.__comty_shared_state.wsInstances[key]
+    }
+
+    for (let [key, remote] of Object.entries(_remotes2.default)) {
+        if (!remote.hasWebsocket) {
+            continue
+        }
+
+        let opts = {
+            transports: ["websocket"],
+            autoConnect: _nullishCoalesce(remote.autoConnect, () => ( true)),
+            ..._nullishCoalesce(remote.wsParams, () => ( {})),
+        }
+
+        if (remote.noAuth !== true) {
+            opts.auth = {
+                token: _session2.default.token,
+            }
+        }
+
+        globalThis.__comty_shared_state.wsInstances[key] = _socketioclient.io.call(void 0, _nullishCoalesce(remote.wsOrigin, () => ( remote.origin)), opts)
+    }
+
+    // regsister events
+    for (let [key, instance] of Object.entries(instances)) {
+        instance.on("connect", () => {
+            console.debug(`[WS-API][${key}] Connected`)
+
+            if (_remotes2.default[key].useClassicAuth && _remotes2.default[key].noAuth !== true) {
+                // try to auth
+                instance.emit("authenticate", {
+                    token: _session2.default.token,
+                })
+            }
+
+            globalThis.__comty_shared_state.eventBus.emit(`${key}:connected`)
+        })
+
+        instance.on("disconnect", () => {
+            console.debug(`[WS-API][${key}] Disconnected`)
+
+            globalThis.__comty_shared_state.eventBus.emit(`${key}:disconnected`)
+        })
+
+        instance.on("error", (error) => {
+            console.error(`[WS-API][${key}] Error`, error)
+
+            globalThis.__comty_shared_state.eventBus.emit(`${key}:error`, error)
+        })
+
+        instance.onAny((event, ...args) => {
+            console.debug(`[WS-API][${key}] Event (${event})`, ...args)
+
+            globalThis.__comty_shared_state.eventBus.emit(`${key}:${event}`, ...args)
+        })
+    }
+} exports.createWebsockets = createWebsockets;
+
+ async function reconnectWebsockets({ force = false } = {}) {
+    const instances = globalThis.__comty_shared_state.wsInstances
+
+    for (let [key, instance] of Object.entries(instances)) {
+        if (instance.connected) {
+            if (!instance.auth) {
+                instance.disconnect()
+
+                instance.auth = {
+                    token: _session2.default.token,
+                }
+
+                instance.connect()
+                continue
+            }
+
+            if (!force) {
+                instance.emit("reauthenticate", {
+                    token: _session2.default.token,
+                })
+
+                continue
+            }
+
+            // disconnect first
+            instance.disconnect()
+        }
+
+        if (_remotes2.default[key].noAuth !== true) {
+            instance.auth = {
+                token: _session2.default.token,
+            }
+        }
+
+        instance.connect()
+    }
+} exports.reconnectWebsockets = reconnectWebsockets;
+
  function createClient({
-    wsEvents = Object(),
-    useWs = false,
     accessKey = null,
     privateKey = null,
+    enableWs = false,
 } = {}) {
     const sharedState = globalThis.__comty_shared_state = {
         onExpiredExceptionEvent: false,
@@ -52,52 +159,31 @@ if (globalThis.isServerMode) {
     for (const [key, remote] of Object.entries(_remotes2.default)) {
         sharedState.instances[key] = _axios2.default.create({
             baseURL: remote.origin,
-        })
-
-        if (useWs && remote.hasWebsocket) {
-            sharedState.wsInstances[key] = _socketioclient.io.call(void 0, _nullishCoalesce(remote.wsOrigin, () => ( remote.origin)), {
-                transports: ["websocket"],
-                autoConnect: true,
-                ..._nullishCoalesce(remote.wsParams, () => ( {})),
-            })
-        }
-    }
-
-    // register ws events
-    Object.keys(sharedState.wsInstances).forEach((key) => {
-        const ws = sharedState.wsInstances[key]
-
-        ws.on("connect", () => {
-            console.log(`[WS-API][${key}] Connected`)
-
-            if (_remotes2.default[key].needsAuth) {
-                // try to auth
-                ws.emit("authenticate", {
-                    token: _session2.default.token,
-                })
+            headers: {
+                "Content-Type": "application/json",
             }
         })
 
-        ws.on("disconnect", () => {
-            console.log(`[WS-API][${key}] Disconnected`)
-        })
-
-        ws.on("error", (error) => {
-            console.error(`[WS-API][${key}] Error`, error)
-        })
+        // create a interceptor to attach the token every request
+        sharedState.instances[key].interceptors.request.use((config) => {
+            // check if current request has no Authorization header, if so, attach the token
+            if (!config.headers["Authorization"]) {
+                const sessionToken = _session2.default.token
+
+                if (sessionToken) {
+                    config.headers["Authorization"] = `${globalThis.isServerMode ? "Server" : "Bearer"} ${sessionToken}`
+                } else {
+                    console.warn("Making a request with no session token")
+                }
+            }
 
-        ws.onAny((event, ...args) => {
-            console.log(`[WS-API][${key}] Event recived`, event, ...args)
+            return config
         })
+    }
 
-        const customEvents = wsEvents[key]
-
-        if (customEvents) {
-            for (const [eventName, eventHandler] of Object.entries(customEvents)) {
-                ws.on(eventName, eventHandler)
-            }
-        }
-    })
+    if (enableWs) {
+        createWebsockets()
+    }
 
     return sharedState
 } exports.default = createClient;

package/dist/models/feed/index.js

@@ -66,17 +66,4 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
 
         return data
     }}
-
-    static __initStatic6() {this.search = async (keywords, params = {}) => {
-        const { data } = await _request2.default.call(void 0, {
-            method: "GET",
-            url: `/search`,
-            params: {
-                keywords: keywords,
-                params: params
-            }
-        })
-
-        return data
-    }}
-} FeedModel.__initStatic(); FeedModel.__initStatic2(); FeedModel.__initStatic3(); FeedModel.__initStatic4(); FeedModel.__initStatic5(); FeedModel.__initStatic6(); exports.default = FeedModel;
+} FeedModel.__initStatic(); FeedModel.__initStatic2(); FeedModel.__initStatic3(); FeedModel.__initStatic4(); FeedModel.__initStatic5(); exports.default = FeedModel;

package/dist/models/playlists/index.js

@@ -1,48 +1,95 @@
 "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 PlaylistsModel {
+    static get api_instance() {
+        return globalThis.__comty_shared_state.instances["music"]
+    }
+
     static __initStatic() {this.putPlaylist = async (payload) => {
         if (!payload) {
             throw new Error("Payload is required")
         }
 
         const { data } = await _request2.default.call(void 0, {
+            instance: PlaylistsModel.api_instance,
             method: "PUT",
-            url: `/playlist`,
+            url: `/playlists/playlist`,
             data: payload,
         })
 
         return data
     }}
 
-    static __initStatic2() {this.getPlaylist = async (id) => {
+    static __initStatic2() {this.deletePlaylist = async (id) => {
+        if (!id) {
+            throw new Error("ID is required")
+        }
+
+        const { data } = await _request2.default.call(void 0, {
+            instance: PlaylistsModel.api_instance,
+            method: "DELETE",
+            url: `/playlist/${id}`,
+        })
+
+        return data
+    }}
+
+    static __initStatic3() {this.getTrack = async (id) => {
         const { data } = await _request2.default.call(void 0, {
+            instance: PlaylistsModel.api_instance,
             method: "GET",
-            url: `/playlist/data/${id}`,
+            url: `/tracks/${id}/data`,
         })
 
         return data
     }}
 
-    static __initStatic3() {this.getMyReleases = async () => {
+    static __initStatic4() {this.getTracks = async (ids) => {
         const { data } = await _request2.default.call(void 0, {
+            instance: PlaylistsModel.api_instance,
             method: "GET",
-            url: `/playlist/self`,
+            url: `/tracks/many`,
+            params: {
+                ids,
+            }
         })
 
         return data
     }}
 
-    static __initStatic4() {this.deletePlaylist = async (id) => {
-        if (!id) {
-            throw new Error("ID is required")
-        }
+    static __initStatic5() {this.getPlaylist = async (id) => {
+        const { data } = await _request2.default.call(void 0, {
+            instance: PlaylistsModel.api_instance,
+            method: "GET",
+            url: `/playlists/${id}/data`,
+        })
+
+        return data
+    }}
 
+    static __initStatic6() {this.search = async (keywords) => {
         const { data } = await _request2.default.call(void 0, {
-            method: "DELETE",
-            url: `/playlist/${id}`,
+            instance: PlaylistsModel.api_instance,
+            method: "GET",
+            url: `/playlists/search`,
+            params: {
+                keywords,
+            }
+        })
+
+        return data
+    }}
+
+    static __initStatic7() {this.getMyReleases = async (keywords) => {
+        const { data } = await _request2.default.call(void 0, {
+            instance: PlaylistsModel.api_instance,
+            method: "GET",
+            url: `/playlists/self`,
+            params: {
+                keywords,
+            }
         })
 
         return data
     }}
-} PlaylistsModel.__initStatic(); PlaylistsModel.__initStatic2(); PlaylistsModel.__initStatic3(); PlaylistsModel.__initStatic4(); exports.default = PlaylistsModel;
+} PlaylistsModel.__initStatic(); PlaylistsModel.__initStatic2(); PlaylistsModel.__initStatic3(); PlaylistsModel.__initStatic4(); PlaylistsModel.__initStatic5(); PlaylistsModel.__initStatic6(); PlaylistsModel.__initStatic7(); exports.default = PlaylistsModel;

package/dist/models/post/index.js

@@ -50,7 +50,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
             throw new Error("Post ID and/or comment are required")
         }
 
-        const request = await request({
+        const { data } = await _request2.default.call(void 0, {
             method: "POST",
             url: `/comments/post/${post_id}`,
             data: {
@@ -58,7 +58,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
             },
         })
 
-        return request
+        return data
     }}
 
     static __initStatic5() {this.deleteComment = async ({ post_id, comment_id }) => {
@@ -66,12 +66,12 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
             throw new Error("Post ID and/or comment ID are required")
         }
 
-        const request = await request({
+        const { data } = await _request2.default.call(void 0, {
             method: "DELETE",
             url: `/comments/post/${post_id}/${comment_id}`,
         })
 
-        return request
+        return data
     }}
 
     static __initStatic6() {this.getExplorePosts = async ({ trim, limit }) => {

package/dist/models/search/index.js

@@ -0,0 +1,26 @@
+"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 Search {
+    static __initStatic() {this.search = async (keywords, params = {}) => {
+        const { data } = await _request2.default.call(void 0, {
+            method: "GET",
+            url: `/search`,
+            params: {
+                keywords: keywords,
+                params: params
+            }
+        })
+
+        return data
+    }}
+
+    static async quickSearch(params) {
+        const response = await _request2.default.call(void 0, {
+            method: "GET",
+            url: "/search/quick",
+            params: params
+        })
+
+        return response.data
+    }
+} Search.__initStatic(); exports.default = Search;

package/dist/models/session/index.js

@@ -106,9 +106,14 @@ var _withStorage = require('../../helpers/withStorage'); var _withStorage2 = _in
         return response.data
     }}
 
+    // alias for validateToken method
     static __initStatic8() {this.validSession = async (token) => {
+        return await Session.validateToken(token)
+    }}
+
+    static __initStatic9() {this.validateToken = async (token) => {
         const response = await _request2.default.call(void 0, {
-            method: "POST",
+            method: "post",
             url: "/session/validate",
             data: {
                 token: token
@@ -118,9 +123,9 @@ var _withStorage = require('../../helpers/withStorage'); var _withStorage2 = _in
         return response.data
     }}
 
-    static __initStatic9() {this.isCurrentTokenValid = async () => {
+    static __initStatic10() {this.isCurrentTokenValid = async () => {
         const health = await Session.getTokenValidation()
 
         return health.valid
     }}
-} Session.__initStatic(); Session.__initStatic2(); Session.__initStatic3(); Session.__initStatic4(); Session.__initStatic5(); Session.__initStatic6(); Session.__initStatic7(); Session.__initStatic8(); Session.__initStatic9(); exports.default = Session;
+} Session.__initStatic(); Session.__initStatic2(); Session.__initStatic3(); Session.__initStatic4(); Session.__initStatic5(); Session.__initStatic6(); Session.__initStatic7(); Session.__initStatic8(); Session.__initStatic9(); Session.__initStatic10(); exports.default = Session;

package/dist/remotes.js

@@ -13,15 +13,17 @@ function getCurrentHostname() {
 const envOrigins = {
     "development": {
         default: `http://${getCurrentHostname()}:3010`,
-        messaging: `http://${getCurrentHostname()}:3020`,
+        chat: `http://${getCurrentHostname()}:3020`,
         livestreaming: `http://${getCurrentHostname()}:3030`,
         marketplace: `http://${getCurrentHostname()}:3040`,
+        music: `http://${getCurrentHostname()}:3050`,
     },
     "production": {
         default: "https://api.comty.app",
-        messaging: `https://messaging_api.comty.app`,
+        chat: `https://chat_api.comty.app`,
         livestreaming: `https://livestreaming_api.comty.app`,
         marketplace: `https://marketplace_api.comty.app`,
+        music: `https://music_api.comty.app`,
     }
 }
 
@@ -29,12 +31,16 @@ exports. default = {
     default: {
         origin: composeRemote("default"),
         hasWebsocket: true,
-        needsAuth: true,
+        useClassicAuth: true,
+        autoconnect: true,
     },
-    messaging: {
-        origin: composeRemote("messaging"),
+    chat: {
+        origin: composeRemote("chat"),
+        hasWebsocket: true,
+    },
+    music: {
+        origin: composeRemote("music"),
         hasWebsocket: true,
-        needsAuth: true,
     },
     livestreaming: {
         origin: composeRemote("livestreaming"),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "comty.js",
-    "version": "0.46.0",
+    "version": "0.47.0",
     "main": "./dist/index.js",
     "author": "RageStudio <support@ragestudio.net>",
     "scripts": {
@@ -16,7 +16,7 @@
         "js-cookie": "^3.0.5",
         "jsonwebtoken": "^9.0.0",
         "jwt-decode": "^3.1.2",
-        "linebridge": "^0.15.12"
+        "socket.io-client": "^4.6.1"
     },
     "devDependencies": {
         "corenode": "^0.28.26"