comty.js 0.55.0 → 0.57.2

package/dist/models/auth/index.js

@@ -4,7 +4,7 @@ var _session = require('../session'); var _session2 = _interopRequireDefault(_se
 const emailRegex = new RegExp(/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/)
 
  class AuthModel {
-    static __initStatic() {this.login = async (payload) => {
+    static __initStatic() {this.login = async (payload, callback) => {
         const response = await _request2.default.call(void 0, {
             method: "post",
             url: "/auth/login",
@@ -16,6 +16,10 @@ const emailRegex = new RegExp(/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/)
 
         _session2.default.token = response.data.token
 
+        if (typeof callback === "function") {
+            await callback()
+        }
+
         __comty_shared_state.eventBus.emit("auth:login_success")
 
         return response.data

package/dist/models/feed/index.js

@@ -28,7 +28,7 @@ var _withSettings = require('../../helpers/withSettings'); var _withSettings2 =
         return data
     }}
 
-    static __initStatic3() {this.getTimelineFeed = async ({ trim, limit } = {}) => {
+    static __initStatic3() {this.getTimelineFeed = async ({ trim, limit = 10 } = {}) => {
         const { data } = await _request2.default.call(void 0, {
             method: "GET",
             url: `/feed/timeline`,

package/dist/models/music/index.js

@@ -1,18 +1,84 @@
 "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);
+var _pmap = require('p-map'); var _pmap2 = _interopRequireDefault(_pmap);
+var _sync = require('../sync'); var _sync2 = _interopRequireDefault(_sync);
 
  class MusicModel {
     static get api_instance() {
         return globalThis.__comty_shared_state.instances["music"]
     }
 
-    static __initStatic() {this.getFavorites = async () => {
-        const { data } = await _request2.default.call(void 0, {
-            instance: MusicModel.api_instance,
-            method: "GET",
-            url: `/tracks/liked`,
+    // TODO: Move external services fetching to API
+    static __initStatic() {this.getFavorites = async ({
+        useTidal = false,
+        limit,
+        offset,
+    }) => {
+        let result = []
+
+        let limitPerRequesters = limit
+
+        if (useTidal) {
+            limitPerRequesters = limitPerRequesters / 2
+        }
+
+        const requesters = [
+            async () => {
+                let { data } = await _request2.default.call(void 0, {
+                    instance: MusicModel.api_instance,
+                    method: "GET",
+                    url: `/tracks/liked`,
+                    params: {
+                        limit: limitPerRequesters,
+                        offset,
+                    },
+                })
+
+                return data
+            },
+            async () => {
+                if (!useTidal) {
+                    return []
+                }
+
+                const tidalResult = await _sync2.default.tidalCore.getMyFavoriteTracks({
+                    limit: limitPerRequesters,
+                    offset,
+                })
+
+                return tidalResult
+            },
+        ]
+
+        result = await _pmap2.default.call(void 0, 
+            requesters,
+            async (requester) => {
+                const data = await requester()
+
+                return data
+            },
+            {
+                concurrency: 3
+            }
+        )
+
+        let total_length = 0
+
+        result.forEach((result) => {
+            total_length += result.total_length
         })
 
-        return data
+        let tracks = result.reduce((acc, cur) => {
+            return [...acc, ...cur.tracks]
+        }, [])
+
+        tracks = tracks.sort((a, b) => {
+            return b.liked_at - a.liked_at
+        })
+
+        return {
+            total_length,
+            tracks,
+        }
     }}
 
     static __initStatic2() {this.search = async (keywords, {

package/dist/models/session/index.js

@@ -13,12 +13,16 @@ var _withStorage = require('../../helpers/withStorage'); var _withStorage2 = _in
         return _withStorage2.default.engine.set(this.storageTokenKey, token)
     }
 
+    static get roles() {
+        return _optionalChain([this, 'access', _ => _.getDecodedToken, 'call', _2 => _2(), 'optionalAccess', _3 => _3.roles])
+    }
+
     static get user_id() {
-        return _optionalChain([this, 'access', _ => _.getDecodedToken, 'call', _2 => _2(), 'optionalAccess', _3 => _3.user_id])
+        return _optionalChain([this, 'access', _4 => _4.getDecodedToken, 'call', _5 => _5(), 'optionalAccess', _6 => _6.user_id])
     }
 
     static get session_uuid() {
-        return _optionalChain([this, 'access', _4 => _4.getDecodedToken, 'call', _5 => _5(), 'optionalAccess', _6 => _6.session_uuid])
+        return _optionalChain([this, 'access', _7 => _7.getDecodedToken, 'call', _8 => _8(), 'optionalAccess', _9 => _9.session_uuid])
     }
 
     static __initStatic2() {this.getDecodedToken = () => {

package/dist/models/sync/index.js

@@ -1,6 +1,8 @@
 "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 _request = require('../../handlers/request'); var _request2 = _interopRequireDefault(_request);
+
 const namespacesServices = {
     spotify: _spotify2.default,
     tidal: _tidal2.default
@@ -44,4 +46,14 @@ const namespacesServices = {
 
         return await service.isActive()
     }
+
+    static async getLinkedServices() {
+        const response = await _request2.default.call(void 0, {
+            instance:  globalThis.__comty_shared_state.instances["sync"],
+            method: "GET",
+            url: "/active_services",
+        })
+
+        return response.data
+    }
 } exports.default = SyncModel;

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

@@ -80,4 +80,21 @@
 
         return data
     }
+
+    static async getMyFavoriteTracks({
+        limit = 50,
+        offset = 0,
+    } = {}) {
+        const { data } = await _request2.default.call(void 0, {
+            instance: TidalService.api_instance,
+            method: "GET",
+            url: `/services/tidal/favorites/tracks`,
+            params: {
+                limit,
+                offset,
+            },
+        })
+
+        return data
+    }
 } exports.default = TidalService;

package/package.json

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