comty.js 0.46.0 → 0.46.1

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);
@@ -25,10 +25,11 @@ if (globalThis.isServerMode) {
 }
 
  function createClient({
-    wsEvents = Object(),
-    useWs = false,
     accessKey = null,
     privateKey = null,
+    enableWs = false,
+    wsEvents = Object(),
+    wsParams = Object(),
 } = {}) {
     const sharedState = globalThis.__comty_shared_state = {
         onExpiredExceptionEvent: false,
@@ -54,12 +55,25 @@ if (globalThis.isServerMode) {
             baseURL: remote.origin,
         })
 
-        if (useWs && remote.hasWebsocket) {
-            sharedState.wsInstances[key] = _socketioclient.io.call(void 0, _nullishCoalesce(remote.wsOrigin, () => ( remote.origin)), {
+        if (enableWs && remote.hasWebsocket) {
+            let opts = {
                 transports: ["websocket"],
-                autoConnect: true,
+                autoConnect: _nullishCoalesce(remote.autoConnect, () => ( true)),
                 ..._nullishCoalesce(remote.wsParams, () => ( {})),
-            })
+            }
+
+            if (wsParams[key]) {
+                if (typeof wsParams[key] === "function") {
+                    opts = wsParams[key](opts)
+                } else {
+                    opts = {
+                        ...opts,
+                        ...wsParams[key],
+                    }
+                }
+            }
+
+            sharedState.wsInstances[key] = _socketioclient.io.call(void 0, _nullishCoalesce(remote.wsOrigin, () => ( remote.origin)), opts)
         }
     }
 
@@ -68,9 +82,9 @@ if (globalThis.isServerMode) {
         const ws = sharedState.wsInstances[key]
 
         ws.on("connect", () => {
-            console.log(`[WS-API][${key}] Connected`)
+            console.debug(`[WS-API][${key}] Connected`)
 
-            if (_remotes2.default[key].needsAuth) {
+            if (_remotes2.default[key].useClassicAuth) {
                 // try to auth
                 ws.emit("authenticate", {
                     token: _session2.default.token,
@@ -87,7 +101,7 @@ if (globalThis.isServerMode) {
         })
 
         ws.onAny((event, ...args) => {
-            console.log(`[WS-API][${key}] Event recived`, event, ...args)
+            console.debug(`[WS-API][${key}] Event recived`, event, ...args)
         })
 
         const customEvents = wsEvents[key]

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/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,13 +13,13 @@ 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`,
     },
     "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`,
     }
@@ -29,12 +29,12 @@ exports. default = {
     default: {
         origin: composeRemote("default"),
         hasWebsocket: true,
-        needsAuth: true,
+        useClassicAuth: true,
+        autoconnect: true,
     },
-    messaging: {
-        origin: composeRemote("messaging"),
+    chat: {
+        origin: composeRemote("chat"),
         hasWebsocket: true,
-        needsAuth: true,
     },
     livestreaming: {
         origin: composeRemote("livestreaming"),

package/package.json

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