comty.js 0.65.0 → 0.65.3

package/dist/models/spectrum/index.js

@@ -1,5 +1,7 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _axios = require('axios'); var _axios2 = _interopRequireDefault(_axios);
-var _src = require('linebridge-client/src');
+"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);
+
+var _linebridgeclient = require('linebridge-client');
 
 var _session = require('../session'); var _session2 = _interopRequireDefault(_session);
 var _user = require('../user'); var _user2 = _interopRequireDefault(_user);
@@ -36,34 +38,12 @@ async function injectUserDataOnList(list) {
 }
 
  class Streaming {
-	static __initStatic() {this.apiHostname = "https://live.ragestudio.net"}
-
-	static get base() {
-		const baseInstance = _axios2.default.create({
-			baseURL: Streaming.apiHostname,
-			headers: {
-				Accept: "application/json",
-				"ngrok-skip-browser-warning": "any",
-			},
-		})
-
-		if (_session2.default.token) {
-			baseInstance.defaults.headers.common["Authorization"] =
-				`Bearer ${_session2.default.token}`
+	static get baseUrl() {
+		if (process.env.NODE_ENV === "production") {
+			return "https://live.ragestudio.net"
 		}
 
-		return baseInstance
-	}
-
-	static async serverInfo() {
-		const { data } = await Streaming.base({
-			method: "get",
-		})
-
-		return {
-			...data,
-			hostname: Streaming.apiHostname,
-		}
+		return __comty_shared_state.baseRequest.defaults.baseURL + "/spectrum"
 	}
 
 	static async getStream(stream_id) {
@@ -71,7 +51,8 @@ async function injectUserDataOnList(list) {
 			return null
 		}
 
-		const { data } = await Streaming.base({
+		const { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "get",
 			url: `/stream/${stream_id}/data`,
 		})
@@ -80,7 +61,8 @@ async function injectUserDataOnList(list) {
 	}
 
 	static async getOwnProfiles() {
-		const { data } = await Streaming.base({
+		const { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "GET",
 			url: "/streaming/profiles/self",
 		})
@@ -93,7 +75,8 @@ async function injectUserDataOnList(list) {
 			return null
 		}
 
-		const { data } = await Streaming.base({
+		const { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "GET",
 			url: `/streaming/profiles/${profile_id}`,
 		})
@@ -102,7 +85,8 @@ async function injectUserDataOnList(list) {
 	}
 
 	static async createProfile(payload) {
-		const { data } = await Streaming.base({
+		const { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "POST",
 			url: "/streaming/profiles/new",
 			data: payload,
@@ -116,7 +100,8 @@ async function injectUserDataOnList(list) {
 			return null
 		}
 
-		const { data } = await Streaming.base({
+		const { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "PUT",
 			url: `/streaming/profiles/${profile_id}`,
 			data: update,
@@ -130,7 +115,8 @@ async function injectUserDataOnList(list) {
 			return null
 		}
 
-		const { data } = await Streaming.base({
+		const { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "delete",
 			url: `/streaming/profiles/${profile_id}`,
 		})
@@ -144,7 +130,8 @@ async function injectUserDataOnList(list) {
 			return null
 		}
 
-		const { data } = await Streaming.base({
+		const { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "put",
 			url: `/streaming/profiles/${profileId}/restreams`,
 			data: restreamData,
@@ -159,7 +146,8 @@ async function injectUserDataOnList(list) {
 			return null
 		}
 
-		const { data } = await Streaming.base({
+		const { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "delete",
 			url: `/streaming/profiles/${profileId}/restreams`,
 			data: restreamIndexData,
@@ -169,7 +157,8 @@ async function injectUserDataOnList(list) {
 	}
 
 	static async list({ limit, offset } = {}) {
-		let { data } = await Streaming.base({
+		let { data } = await _request2.default.call(void 0, {
+			baseURL: Streaming.baseUrl,
 			method: "get",
 			url: "/streaming/list",
 			params: {
@@ -183,6 +172,16 @@ async function injectUserDataOnList(list) {
 		return data
 	}
 
+	static createWebsocket(params = {}) {
+		const client = new (0, _linebridgeclient.RTEngineClient)({
+			...params,
+			url: Streaming.baseUrl,
+			token: _session2.default.token,
+		})
+
+		return client
+	}
+
 	static async createStreamWebsocket(stream_id, params = {}) {
 		if (!stream_id) {
 			console.error("stream_id is required")
@@ -211,14 +210,4 @@ async function injectUserDataOnList(list) {
 
 		return client
 	}
-
-	static createWebsocket(params = {}) {
-		const client = new (0, _src.RTEngineClient)({
-			...params,
-			url: Streaming.apiHostname,
-			token: _session2.default.token,
-		})
-
-		return client
-	}
-} Streaming.__initStatic(); exports.default = Streaming;
+} exports.default = Streaming;

package/dist/remotes.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }const envOrigins = {
-	development: `https://fr01.ragestudio.net:9000`, //`${location.origin}/api`,
+	development: location ? `${location.origin}/api` : "http://localhost:9000",
 	indev: "https://indev.comty.app/api",
 	production: "https://api.comty.app",
 }

package/dist/ws.js

@@ -2,8 +2,7 @@
 var _withStorage = require('./helpers/withStorage'); var _withStorage2 = _interopRequireDefault(_withStorage);
 
 var _socketioclient = require('socket.io-client');
-var _src = require('linebridge-client/src');
-//import { RTEngineClient } from "../../linebridge/client/src"
+var _linebridgeclient = require('linebridge-client');
 
 class WebsocketManager {
 	constructor({ origin }) {;WebsocketManager.prototype.__init.call(this);
@@ -59,7 +58,7 @@ class WebsocketManager {
 			remote,
 		)
 
-		const client = new (0, _src.RTEngineClient)({
+		const client = new (0, _linebridgeclient.RTEngineClient)({
 			refName: remote.namespace,
 			url: `${this.origin}/${remote.namespace}`,
 			token: _withStorage2.default.engine.get("token"),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "comty.js",
-	"version": "0.65.0",
+	"version": "0.65.3",
 	"main": "./dist/index.js",
 	"description": "Official Comty API for JavaScript",
 	"homepage": "https://github.com/ragestudio/comty.js",