comty.js 0.56.0 → 0.57.5

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/music/index.js

@@ -7,32 +7,50 @@ var _sync = require('../sync'); var _sync2 = _interopRequireDefault(_sync);
         return globalThis.__comty_shared_state.instances["music"]
     }
 
+    // TODO: Move external services fetching to API
     static __initStatic() {this.getFavorites = async ({
-        useTidal = false
+        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 {
+                        total_length: 0,
+                        tracks: [],
+                    }
+                }
 
-        if (useTidal) {
-            requesters.push(
-                async () => {
-                    const tidalResult = await _sync2.default.tidalCore.getMyFavoriteTracks()
+                const tidalResult = await _sync2.default.tidalCore.getMyFavoriteTracks({
+                    limit: limitPerRequesters,
+                    offset,
+                })
 
-                    return tidalResult
-                }
-            )
-        }
+                return tidalResult
+            },
+        ]
 
         result = await _pmap2.default.call(void 0, 
             requesters,
@@ -46,17 +64,24 @@ var _sync = require('../sync'); var _sync2 = _interopRequireDefault(_sync);
             }
         )
 
-        result = result.reduce((acc, cur) => {
-            return [...acc, ...cur]
+        let total_length = 0
+
+        result.forEach((result) => {
+            total_length += result.total_length
+        })
+
+        let tracks = result.reduce((acc, cur) => {
+            return [...acc, ...cur.tracks]
         }, [])
 
-        result = result.sort((a, b) => {
+        tracks = tracks.sort((a, b) => {
             return b.liked_at - a.liked_at
         })
 
-        console.log(result)
-
-        return result
+        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/services/tidal.js

@@ -81,11 +81,18 @@
         return data
     }
 
-    static async getMyFavoriteTracks() {
+    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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "comty.js",
-    "version": "0.56.0",
+    "version": "0.57.5",
     "main": "./dist/index.js",
     "author": "RageStudio <support@ragestudio.net>",
     "scripts": {