comty.js 0.54.0 → 0.56.0

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,17 +1,81 @@
 "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 () => {
+    static __initStatic() {this.getFavorites = async ({
+        useTidal = false
+    }) => {
+        let result = []
+
+        const requesters = [
+            async () => {
+                let { data } = await _request2.default.call(void 0, {
+                    instance: MusicModel.api_instance,
+                    method: "GET",
+                    url: `/tracks/liked`,
+                })
+
+                return data
+            },
+        ]
+
+        if (useTidal) {
+            requesters.push(
+                async () => {
+                    const tidalResult = await _sync2.default.tidalCore.getMyFavoriteTracks()
+
+                    return tidalResult
+                }
+            )
+        }
+
+        result = await _pmap2.default.call(void 0, 
+            requesters,
+            async (requester) => {
+                const data = await requester()
+
+                return data
+            },
+            {
+                concurrency: 3
+            }
+        )
+
+        result = result.reduce((acc, cur) => {
+            return [...acc, ...cur]
+        }, [])
+
+        result = result.sort((a, b) => {
+            return b.liked_at - a.liked_at
+        })
+
+        console.log(result)
+
+        return result
+    }}
+
+    static __initStatic2() {this.search = async (keywords, {
+        limit = 5,
+        offset = 0,
+        useTidal = false,
+    }) => {
         const { data } = await _request2.default.call(void 0, {
             instance: MusicModel.api_instance,
             method: "GET",
-            url: `/tracks/liked`,
+            url: `/search`,
+            params: {
+                keywords,
+                limit,
+                offset,
+                useTidal,
+            }
         })
 
         return data
     }}
-} MusicModel.__initStatic(); exports.default = MusicModel;
+} MusicModel.__initStatic(); MusicModel.__initStatic2(); exports.default = MusicModel;

package/dist/models/sync/index.js

@@ -1,11 +1,59 @@
-"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 _spotifyCore = require('./cores/spotifyCore'); var _spotifyCore2 = _interopRequireDefault(_spotifyCore);
+"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
+}
 
  class SyncModel {
-    static get bridge() {
-        return _optionalChain([window, 'access', _ => _.app, 'optionalAccess', _2 => _2.cores, 'access', _3 => _3.api, 'access', _4 => _4.withEndpoints, 'call', _5 => _5()])
+    static get spotifyCore() {
+        return namespacesServices.spotify
     }
 
-    static get spotifyCore() {
-        return _spotifyCore2.default
+    static get tidalCore() {
+        return namespacesServices.tidal
+    }
+
+    static async linkService(namespace) {
+        const service = namespacesServices[namespace]
+
+        if (!service || typeof service.linkAccount !== "function") {
+            throw new Error(`Service ${namespace} not found or not accepting linking.`)
+        }
+
+        return await service.linkAccount()
+    }
+
+    static async unlinkService(namespace) {
+        const service = namespacesServices[namespace]
+
+        if (!service || typeof service.unlinkAccount !== "function") {
+            throw new Error(`Service ${namespace} not found or not accepting unlinking.`)
+        }
+
+        return await service.unlinkAccount()
+    }
+
+    static async hasServiceLinked(namespace) {
+        const service = namespacesServices[namespace]
+
+        if (!service || typeof service.isActive !== "function") {
+            throw new Error(`Service ${namespace} not found or not accepting linking.`)
+        }
+
+        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/spotify.js

@@ -0,0 +1,87 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); class SpotifySyncModel {
+    static get spotify_redirect_uri() {
+        return window.location.origin + "/callbacks/sync/spotify"
+    }
+
+    static get spotify_authorize_endpoint() {
+        return "https://accounts.spotify.com/authorize?response_type=code&client_id={{client_id}}&scope={{scope}}&redirect_uri={{redirect_uri}}&response_type=code"
+    }
+
+    static async authorizeAccount() {
+        const scopes = [
+            "user-read-private",
+            "user-modify-playback-state",
+            "user-read-currently-playing",
+            "user-read-playback-state",
+            "streaming",
+        ]
+
+        const { client_id } = await SpotifySyncModel.get_client_id()
+
+        const parsedUrl = SpotifySyncModel.spotify_authorize_endpoint
+            .replace("{{client_id}}", client_id)
+            .replace("{{scope}}", scopes.join(" "))
+            .replace("{{redirect_uri}}", SpotifySyncModel.spotify_redirect_uri)
+
+        // open on a new tab
+        window.open(parsedUrl, "_blank")
+    }
+
+    static async get_client_id() {
+        const { data } = await app.cores.api.customRequest({
+            method: "GET",
+            url: `/sync/spotify/client_id`,
+        })
+
+        return data
+    }
+
+    static async syncAuthCode(code) {
+        const { data } = await app.cores.api.customRequest({
+            method: "POST",
+            url: `/sync/spotify/auth`,
+            data: {
+                redirect_uri: SpotifySyncModel.spotify_redirect_uri,
+                code,
+            },
+        })
+
+        return data
+    }
+
+    static async unlinkAccount() {
+        const { data } = await app.cores.api.customRequest({
+            method: "POST",
+            url: `/sync/spotify/unlink`,
+        })
+
+        return data
+    }
+
+    static async isAuthorized() {
+        const { data } = await app.cores.api.customRequest({
+            method: "GET",
+            url: `/sync/spotify/is_authorized`,
+        })
+
+        return data
+    }
+
+    static async getData() {
+        const { data } = await app.cores.api.customRequest({
+            method: "GET",
+            url: `/sync/spotify/data`,
+        })
+
+        return data
+    }
+
+    static async getCurrentPlaying() {
+        const { data } = await app.cores.api.customRequest({
+            method: "GET",
+            url: `/sync/spotify/currently_playing`,
+        })
+
+        return data
+    }
+} exports.default = SpotifySyncModel;

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

@@ -0,0 +1,93 @@
+"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 TidalService {
+    static get api_instance() {
+        return globalThis.__comty_shared_state.instances["sync"]
+    }
+
+    static async linkAccount() {
+        if (!window) {
+            throw new Error("This method is only available in the browser.")
+        }
+
+        const { data } = await _request2.default.call(void 0, {
+            instance: TidalService.api_instance,
+            method: "GET",
+            url: `/services/tidal/create_link`,
+        })
+
+        if (data.auth_url) {
+            window.open(data.auth_url, "_blank")
+        }
+
+        return data
+    }
+
+    static async unlinkAccount() {
+        if (!window) {
+            throw new Error("This method is only available in the browser.")
+        }
+
+        const { data } = await _request2.default.call(void 0, {
+            instance: TidalService.api_instance,
+            method: "POST",
+            url: `/services/tidal/delete_link`,
+        })
+
+        return data
+    }
+
+    static async isActive() {
+        if (!window) {
+            throw new Error("This method is only available in the browser.")
+        }
+
+        const { data } = await _request2.default.call(void 0, {
+            instance: TidalService.api_instance,
+            method: "GET",
+            url: `/services/tidal/is_active`,
+        })
+
+        return data
+    }
+
+    static async getCurrentUser() {
+        const { data } = await _request2.default.call(void 0, {
+            instance: TidalService.api_instance,
+            method: "GET",
+            url: `/services/tidal/current`,
+        })
+
+        return data
+    }
+
+    static async getPlaybackUrl(track_id) {
+        const { data } = await _request2.default.call(void 0, {
+            instance: TidalService.api_instance,
+            method: "GET",
+            url: `/services/tidal/playback/${track_id}`,
+        })
+
+        return data
+    }
+
+    static async getTrackManifest(track_id) {
+        const { data } = await _request2.default.call(void 0, {
+            instance: TidalService.api_instance,
+            method: "GET",
+            url: `/services/tidal/manifest/${track_id}`,
+        })
+
+        return data
+    }
+
+    static async getMyFavoriteTracks() {
+        const { data } = await _request2.default.call(void 0, {
+            instance: TidalService.api_instance,
+            method: "GET",
+            url: `/services/tidal/favorites/tracks`,
+        })
+
+        return data
+    }
+} exports.default = TidalService;

package/dist/remotes.js

@@ -24,6 +24,7 @@ const envOrigins = {
         marketplace: `http://${getCurrentHostname()}:3040`,
         music: `http://${getCurrentHostname()}:3050`,
         files: `http://${getCurrentHostname()}:3060`,
+        sync: `http://${getCurrentHostname()}:3070`,
     },
     "indev": {
         default: `https://indev_api.comty.app/main`,
@@ -32,6 +33,7 @@ const envOrigins = {
         marketplace: `https://indev_api.comty.app/marketplace`,
         music: `https://indev_api.comty.app/music`,
         files: `https://indev_api.comty.app/files`,
+        sync: `https://indev_api.comty.app/sync`,
     },
     "production": {
         default: "https://api.comty.app",
@@ -40,6 +42,7 @@ const envOrigins = {
         marketplace: `https://marketplace_api.comty.app`,
         music: `https://music_api.comty.app`,
         files: `https://files_api.comty.app`,
+        sync: `https://sync_api.comty.app`,
     }
 }
 
@@ -67,5 +70,9 @@ exports. default = {
     files: {
         origin: composeRemote("files"),
         hasWebsocket: false,
+    },
+    sync: {
+        origin: composeRemote("sync"),
+        hasWebsocket: false,
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "comty.js",
-    "version": "0.54.0",
+    "version": "0.56.0",
     "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": {