comty.js 0.59.2 → 0.60.3

package/dist/models/user/index.js

@@ -1,8 +1,16 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _session = require('../session'); var _session2 = _interopRequireDefault(_session);
-var _request = require('../../handlers/request'); var _request2 = _interopRequireDefault(_request);
+"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 _session = require('../session'); var _session2 = _interopRequireDefault(_session);
+var _request = require('../../request'); var _request2 = _interopRequireDefault(_request);
 
  class User {
-    static __initStatic() {this.data = async (payload = {}) => {
+    /**
+     * Retrieves the data of a user.
+     *
+     * @param {Object} payload - An object containing the username and user_id.
+     * @param {string} payload.username - The username of the user.
+     * @param {string} payload.user_id - The ID of the user.
+     * @return {Promise<Object>} - A promise that resolves with the data of the user.
+     */
+    static async data(payload = {}) {
         let {
             username,
             user_id,
@@ -16,7 +24,7 @@ var _request = require('../../handlers/request'); var _request2 = _interopRequir
             // resolve user_id from username
             const resolveResponse = await _request2.default.call(void 0, {
                 method: "GET",
-                url: `/user/user_id/${username}`,
+                url: `/users/${username}/resolve-user_id`,
             })
 
             user_id = resolveResponse.data.user_id
@@ -24,136 +32,106 @@ var _request = require('../../handlers/request'); var _request2 = _interopRequir
 
         const response = await _request2.default.call(void 0, {
             method: "GET",
-            url: `/user/${user_id}/data`,
+            url: `/users/${user_id}/data`,
         })
 
         return response.data
-    }}
-
-    static __initStatic2() {this.updateData = async (payload) => {
+    }
+
+    /**
+     * Updates the user data with the given payload.
+     *
+     * @param {Object} payload - The data to update the user with.
+     * @return {Promise<Object>} - A promise that resolves with the updated user data.
+     */
+    static async updateData(payload) {
         const response = await _request2.default.call(void 0, {
             method: "POST",
-            url: "/user/self/update_data",
+            url: "/users/self/update",
             data: {
                 update: payload,
             },
         })
 
         return response.data
-    }}
-
-    static __initStatic3() {this.unsetFullName = async () => {
-        const response = await _request2.default.call(void 0, {
-            method: "DELETE",
-            url: "/user/self/public_name",
+    }
+
+    /**
+     * Update the public name to null in the user data.
+     *
+     * @return {Promise} A Promise that resolves with the response data after updating the public name
+     */
+    static async unsetPublicName() {
+        return await User.updateData({
+            public_name: null,
         })
-
-        return response.data
-    }}
-
-    static __initStatic4() {this.selfRoles = async () => {
+    }
+
+    /**
+     * Retrieves the roles of a user.
+     *
+     * @param {string} user_id - The ID of the user. If not provided, the current user ID will be used.
+     * @return {Promise<Array>} An array of roles for the user.
+     */
+    static async getRoles(user_id) {
         const response = await _request2.default.call(void 0, {
             method: "GET",
-            url: "/roles/self",
+            url: `/users/${_nullishCoalesce(user_id, () => ( "self"))}/roles`,
         })
 
         return response.data
-    }}
-
-    static __initStatic5() {this.haveRole = async (role) => {
-        const roles = await User.selfRoles()
-
-        if (!roles) {
-            return false
-        }
-
-        return Array.isArray(roles) && roles.includes(role)
-    }}
-
-    static __initStatic6() {this.haveAdmin = async () => {
-        return User.haveRole("admin")
-    }}
-
-    static __initStatic7() {this.getUserBadges = async (user_id) => {
+    }
+
+    /**
+     * Retrieves the badges for a given user.
+     *
+     * @param {string} user_id - The ID of the user. If not provided, the current session user ID will be used.
+     * @return {Promise<Array>} An array of badges for the user.
+     */
+    static async getBadges(user_id) {
         if (!user_id) {
             user_id = _session2.default.user_id
         }
 
         const { data } = await _request2.default.call(void 0, {
             method: "GET",
-            url: `/badge/user/${user_id}`,
-        })
-
-        return data
-    }}
-
-    static __initStatic8() {this.changePassword = async (payload) => {
-        const { currentPassword, newPassword } = payload
-
-        const { data } = await _request2.default.call(void 0, {
-            method: "POST",
-            url: "/user/self/update_password",
-            data: {
-                currentPassword,
-                newPassword,
-            }
-        })
-
-        return data
-    }}
-
-    static __initStatic9() {this.getUserFollowers = async ({
-        user_id,
-        limit = 20,
-        offset = 0,
-    }) => {
-        // if user_id or username is not provided, set with current user
-        if (!user_id && !username) {
-            user_id = _session2.default.user_id
-        }
-
-        const { data } = await _request2.default.call(void 0, {
-            method: "GET",
-            url: `/user/${user_id}/followers`,
-            params: {
-                limit,
-                offset,
-            }
+            url: `/users/${user_id}/badges`,
         })
 
         return data
-    }}
-
-    static __initStatic10() {this.getConnectedUsersFollowing = async () => {
+    }
+
+    /**
+     * Retrive user config from server
+     *
+     * @param {type} key - A key of config
+     * @return {object} - Config object
+     */
+    static async getConfig(key) {
         const { data } = await _request2.default.call(void 0, {
             method: "GET",
-            url: "/status/connected/following",
-        })
-
-        return data
-    }}
-
-    static __initStatic11() {this.checkUsernameAvailability = async (username) => {
-        const { data } = await _request2.default.call(void 0, {
-            method: "GET",
-            url: `/user/username_available`,
+            url: "/users/self/config",
             params: {
-                username,
+                key
             }
         })
 
         return data
-    }}
-
-    static __initStatic12() {this.checkEmailAvailability = async (email) => {
+    }
+
+    /**
+     * Update the configuration with the given update.
+     *
+     * @param {Object} update - The object containing the updated configuration data
+     * @return {Promise} A Promise that resolves with the response data after the configuration is updated
+     */
+    static async updateConfig(update) {
         const { data } = await _request2.default.call(void 0, {
-            method: "GET",
-            url: `/user/email_available`,
-            params: {
-                email,
-            }
+            method: "PUT",
+            url: "/users/self/config",
+            data: update
         })
 
         return data
-    }}
-} User.__initStatic(); User.__initStatic2(); User.__initStatic3(); User.__initStatic4(); User.__initStatic5(); User.__initStatic6(); User.__initStatic7(); User.__initStatic8(); User.__initStatic9(); User.__initStatic10(); User.__initStatic11(); User.__initStatic12(); exports.default = User;
+    }
+} exports.default = User;

package/dist/remote.js

@@ -0,0 +1,43 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } 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; }function getCurrentHostname() {
+    if (typeof window === "undefined") {
+        return "localhost"
+    }
+
+    return _nullishCoalesce(_optionalChain([window, 'optionalAccess', _ => _.location, 'optionalAccess', _2 => _2.hostname]), () => ( "localhost"))
+}
+
+function getCurrentProtocol() {
+    if (typeof window === "undefined") {
+        return "http"
+    }
+
+    return _nullishCoalesce(_optionalChain([window, 'optionalAccess', _3 => _3.location, 'optionalAccess', _4 => _4.protocol]), () => ( "http:"))
+}
+
+const envOrigins = {
+    "development": `${getCurrentProtocol()}//${getCurrentHostname()}:9000`,
+    "indev": "https://indev_api.comty.app",
+    "production": "https://api.comty.app",
+}
+
+exports. default = {
+    origin: envOrigins[_nullishCoalesce(process.env.NODE_ENV, () => ( "production"))],
+    websockets: [
+        {
+            namespace: "posts",
+            path: "/posts",
+        },
+        {
+            namespace: "main",
+            path: "/main",
+        },
+        {
+            namespace: "notifications",
+            path: "/notifications",
+        },
+        {
+            namespace: "chats",
+            path: "/chats",
+        }
+    ]
+}

package/dist/remotes.js

@@ -1,14 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } 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; }function composeRemote(path) {
-    if (typeof window !== "undefined") {
-        if (window.localStorage.getItem("comty:use_indev") || window.location.hostname === "indev.comty.app") {
-            return envOrigins["indev"][path]
-        }
-    }
-
-    return envOrigins[_nullishCoalesce(globalThis._force_comtyjs_env, () => ( "production"))][path]
-}
-
-function getCurrentHostname() {
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } 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; }function getCurrentHostname() {
     if (typeof window === "undefined") {
         return "localhost"
     }
@@ -17,62 +7,14 @@ function getCurrentHostname() {
 }
 
 const envOrigins = {
-    "development": {
-        default: `http://${getCurrentHostname()}:3010`,
-        chat: `http://${getCurrentHostname()}:3020`,
-        livestreaming: `http://${getCurrentHostname()}:3030`,
-        marketplace: `http://${getCurrentHostname()}:3040`,
-        music: `http://${getCurrentHostname()}:3050`,
-        files: `http://${getCurrentHostname()}:3060`,
-        sync: `http://${getCurrentHostname()}:3070`,
-    },
-    "indev": {
-        default: `https://indev_api.comty.app/main`,
-        chat: `https://indev_api.comty.app/chat`,
-        livestreaming: `https://indev_api.comty.app/livestreaming`,
-        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",
-        chat: `https://chat_api.comty.app`,
-        livestreaming: `https://livestreaming_api.comty.app`,
-        marketplace: `https://marketplace_api.comty.app`,
-        music: `https://music_api.comty.app`,
-        files: `https://files_api.comty.app`,
-        sync: `https://sync_api.comty.app`,
-    }
+    "development": `http://${getCurrentHostname()}:9000`,
+    "indev": "https://indev_api.comty.app",
+    "production": "https://api.comty.app",
 }
 
 exports. default = {
     default: {
-        origin: composeRemote("default"),
-        hasWebsocket: true,
-    },
-    chat: {
-        origin: composeRemote("chat"),
-        hasWebsocket: true,
-    },
-    music: {
-        origin: composeRemote("music"),
-        hasWebsocket: true,
-    },
-    livestreaming: {
-        origin: composeRemote("livestreaming"),
-        hasWebsocket: false,
-    },
-    marketplace: {
-        origin: composeRemote("marketplace"),
-        hasWebsocket: false,
-    },
-    files: {
-        origin: composeRemote("files"),
-        hasWebsocket: false,
-    },
-    sync: {
-        origin: composeRemote("sync"),
+        origin: envOrigins[_nullishCoalesce(process.env.NODE_ENV, () => ( "production"))],
         hasWebsocket: false,
     }
 }

package/dist/request.js

@@ -0,0 +1,51 @@
+"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);
+
+exports. default = async (
+    request = {
+        method: "GET",
+    },
+    ...args
+) => {
+    const instance = _nullishCoalesce(request.instance, () => ( __comty_shared_state.baseRequest))
+
+    if (!instance) {
+        throw new Error("No instance provided")
+    }
+
+    // handle before request
+    await _handleBeforeRequest2.default.call(void 0, request)
+
+    if (typeof request === "string") {
+        request = {
+            url: request,
+        }
+    }
+
+    if (typeof request.headers !== "object") {
+        request.headers = {}
+    }
+
+    let result = null
+
+    const makeRequest = async () => {
+        const _result = await instance(request, ...args)
+            .catch((error) => {
+                return error
+            })
+
+        result = _result
+    }
+
+    await makeRequest()
+
+    // handle after request
+    await _handleAfterRequest2.default.call(void 0, result, makeRequest)
+
+    // if error, throw it
+    if (result instanceof Error) {
+        throw result
+    }
+
+    return result
+}

package/dist/utils/generateRequest.js

@@ -0,0 +1,52 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _request = require('../request'); var _request2 = _interopRequireDefault(_request);
+
+// create a regex to detect params  with %% symbol, from the url
+const paramMatchRegex = /(%[0-9a-f]{2}%)/g
+
+exports. default = (method = "GET", url = "/", params, data) => {
+    return async function generatedRequest(arg0, arg1) {
+        const requestObj = {
+            method: method,
+            url: url,
+            params: params,
+            data: data,
+        }
+
+        // search url for params
+        // example: /namespace/search/[0]/data => /namespace/search/${arguments[0]}/data
+        // if no url matches, merge params with arg0 and override data in requestObj
+        if (url.match(paramMatchRegex)) {
+            requestObj.url = url.replace(paramMatchRegex, (match) => {
+                console.log(match)
+                
+                // replace with arguments
+                const fnArgumentIndex = ""
+
+                return match
+            })
+        } else {
+            requestObj.params = {
+                ...requestObj.params,
+                ...arg0
+            }
+            requestObj.data = {
+                ...requestObj.data,
+                ...arg1
+            }
+        }
+
+        if (typeof requestObj.params === "object" && requestObj.params) {
+            Object.keys(requestObj.params).forEach((key) => {
+                if (requestObj.params && typeof requestObj.params[key] === "string") {
+
+                }
+            })
+        }
+        
+
+        const response = await _request2.default.call(void 0, requestObj)
+
+        // @ts-ignore
+        return response.data
+    }
+}

package/dist/utils/importFrom.js

@@ -0,0 +1,22 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});async function importFilesFrom(from) {
+    let paths = {
+        // @ts-ignore
+        ...import.meta.glob(`${from}/**.ts`),
+        // @ts-ignore
+        ...import.meta.glob(`${from}/**.js`),
+    }
+
+    let fns = {}
+
+    for (const path in paths) {
+        // @ts-ignore
+        const name = path.split("/").pop().replace(".ts", "").replace(".js", "")
+        const fn = await paths[path]()
+
+        fns[name] = fn.default
+    }
+
+    return fns
+}
+
+exports. default = importFilesFrom

package/package.json

@@ -1,9 +1,10 @@
 {
     "name": "comty.js",
-    "version": "0.59.2",
+    "version": "0.60.3",
     "main": "./dist/index.js",
     "author": "RageStudio <support@ragestudio.net>",
     "scripts": {
+        "test": "ava",
         "build": "hermes build"
     },
     "files": [
@@ -12,6 +13,7 @@
     "license": "MIT",
     "dependencies": {
         "@foxify/events": "^2.1.0",
+        "ava": "^6.1.2",
         "axios": "^1.4.0",
         "js-cookie": "^3.0.5",
         "jsonwebtoken": "^9.0.0",
@@ -20,7 +22,6 @@
         "socket.io-client": "^4.6.1"
     },
     "devDependencies": {
-        "@ragestudio/hermes": "^0.1.0",
-        "corenode": "^0.28.26"
+        "@ragestudio/hermes": "^0.1.0"
     }
-}
+}