comty.js 0.61.0 → 0.62.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +12 -4
- package/dist/utils/measurePing.js +63 -0
- package/dist/ws.js +8 -2
- package/package.json +5 -6
package/dist/index.js
CHANGED
|
@@ -30,7 +30,10 @@ if (globalThis.isServerMode) {
|
|
|
30
30
|
function createClient({
|
|
31
31
|
accessKey = null,
|
|
32
32
|
privateKey = null,
|
|
33
|
-
|
|
33
|
+
ws = {
|
|
34
|
+
enable: false,
|
|
35
|
+
autoConnect: false,
|
|
36
|
+
},
|
|
34
37
|
origin = _remotes2.default.origin,
|
|
35
38
|
eventBus = new (0, _events2.default)(),
|
|
36
39
|
} = {}) {
|
|
@@ -72,9 +75,14 @@ if (globalThis.isServerMode) {
|
|
|
72
75
|
return config
|
|
73
76
|
})
|
|
74
77
|
|
|
75
|
-
if (
|
|
76
|
-
|
|
77
|
-
|
|
78
|
+
if (typeof ws === "object") {
|
|
79
|
+
if (ws.enable === true) {
|
|
80
|
+
__comty_shared_state.ws = new (0, _ws2.default)()
|
|
81
|
+
|
|
82
|
+
if (ws.autoConnect === true) {
|
|
83
|
+
sharedState.ws.connectAll()
|
|
84
|
+
}
|
|
85
|
+
}
|
|
78
86
|
}
|
|
79
87
|
|
|
80
88
|
return sharedState
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"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);
|
|
2
|
+
|
|
3
|
+
const fetchers = {
|
|
4
|
+
http: () =>
|
|
5
|
+
new Promise(async (resolve) => {
|
|
6
|
+
const start = Date.now()
|
|
7
|
+
|
|
8
|
+
const failTimeout = setTimeout(() => {
|
|
9
|
+
resolve("timeout")
|
|
10
|
+
}, 5000)
|
|
11
|
+
|
|
12
|
+
_request2.default.call(void 0, {
|
|
13
|
+
method: "GET",
|
|
14
|
+
url: "/ping",
|
|
15
|
+
})
|
|
16
|
+
.then(() => {
|
|
17
|
+
clearTimeout(failTimeout)
|
|
18
|
+
resolve(Date.now() - start)
|
|
19
|
+
})
|
|
20
|
+
.catch((err) => {
|
|
21
|
+
console.log(err)
|
|
22
|
+
clearTimeout(failTimeout)
|
|
23
|
+
resolve("failed")
|
|
24
|
+
})
|
|
25
|
+
}),
|
|
26
|
+
ws: () =>
|
|
27
|
+
new Promise((resolve) => {
|
|
28
|
+
const start = Date.now()
|
|
29
|
+
|
|
30
|
+
const failTimeout = setTimeout(() => {
|
|
31
|
+
resolve("failed")
|
|
32
|
+
}, 5000)
|
|
33
|
+
|
|
34
|
+
globalThis.__comty_shared_state.ws.sockets
|
|
35
|
+
.get("main")
|
|
36
|
+
.once("pong", () => {
|
|
37
|
+
failTimeout && clearTimeout(failTimeout)
|
|
38
|
+
|
|
39
|
+
resolve(Date.now() - start)
|
|
40
|
+
})
|
|
41
|
+
|
|
42
|
+
globalThis.__comty_shared_state.ws.sockets.get("main").emit("ping")
|
|
43
|
+
}),
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
exports. default = async ({ select } = {}) => {
|
|
47
|
+
let selectedPromises = []
|
|
48
|
+
|
|
49
|
+
if (Array.isArray(select)) {
|
|
50
|
+
select.forEach((item) => {
|
|
51
|
+
if (!fetchers[item]) {
|
|
52
|
+
return
|
|
53
|
+
}
|
|
54
|
+
selectedPromises.push(fetchers[item]())
|
|
55
|
+
})
|
|
56
|
+
} else {
|
|
57
|
+
selectedPromises = [fetchers["http"](), fetchers["ws"]()]
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
const result = await Promise.all(selectedPromises)
|
|
61
|
+
|
|
62
|
+
return result
|
|
63
|
+
}
|
package/dist/ws.js
CHANGED
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
var _withStorage = require('./helpers/withStorage'); var _withStorage2 = _interopRequireDefault(_withStorage);
|
|
3
3
|
|
|
4
4
|
var _socketioclient = require('socket.io-client');
|
|
5
|
-
var
|
|
5
|
+
var _src = require('linebridge-client/src');
|
|
6
|
+
//import { RTEngineClient } from "../../linebridge/client/src"
|
|
6
7
|
|
|
7
8
|
class WebsocketManager {constructor() { WebsocketManager.prototype.__init.call(this); }
|
|
8
9
|
__init() {this.sockets = new Map()}
|
|
@@ -54,7 +55,8 @@ class WebsocketManager {constructor() { WebsocketManager.prototype.__init.call(t
|
|
|
54
55
|
remote,
|
|
55
56
|
)
|
|
56
57
|
|
|
57
|
-
const client = new (0,
|
|
58
|
+
const client = new (0, _src.RTEngineClient)({
|
|
59
|
+
refName: remote.namespace,
|
|
58
60
|
url: `${_remotes2.default.origin}/${remote.namespace}`,
|
|
59
61
|
token: _withStorage2.default.engine.get("token"),
|
|
60
62
|
})
|
|
@@ -119,6 +121,10 @@ class WebsocketManager {constructor() { WebsocketManager.prototype.__init.call(t
|
|
|
119
121
|
await this.connect(remote)
|
|
120
122
|
}
|
|
121
123
|
} catch (error) {
|
|
124
|
+
console.error(
|
|
125
|
+
`Failed to connect to [${remote.namespace}]:`,
|
|
126
|
+
error,
|
|
127
|
+
)
|
|
122
128
|
globalThis.__comty_shared_state.eventBus.emit(
|
|
123
129
|
`wsmanager:${remote.namespace}:error`,
|
|
124
130
|
error,
|
package/package.json
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "comty.js",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.62.0",
|
|
4
4
|
"main": "./dist/index.js",
|
|
5
5
|
"author": "RageStudio <support@ragestudio.net>",
|
|
6
6
|
"scripts": {
|
|
7
|
-
"test": "ava",
|
|
8
7
|
"build": "hermes build"
|
|
9
8
|
},
|
|
10
9
|
"files": [
|
|
@@ -13,15 +12,15 @@
|
|
|
13
12
|
"license": "MIT",
|
|
14
13
|
"dependencies": {
|
|
15
14
|
"@foxify/events": "^2.1.0",
|
|
16
|
-
"axios": "^1.4
|
|
15
|
+
"axios": "^1.8.4",
|
|
17
16
|
"js-cookie": "^3.0.5",
|
|
18
17
|
"jsonwebtoken": "^9.0.0",
|
|
19
18
|
"jwt-decode": "^4.0.0",
|
|
20
|
-
"
|
|
21
|
-
"
|
|
19
|
+
"linebridge-client": "^1.0.0",
|
|
20
|
+
"luxon": "^3.6.0",
|
|
21
|
+
"socket.io-client": "^4.8.1"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"ava": "^6.1.2",
|
|
25
24
|
"@ragestudio/hermes": "^1.0.0"
|
|
26
25
|
}
|
|
27
26
|
}
|