mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-21 16:13:12 +09:00
tsconfig update; fix function signature; test: add .default
This commit is contained in:
1 parent
a26dcf5075
commit
f2736bae40
8 files changed
+61
-24
No files matched your search
@@ -64,7 +64,7 @@ export default class ControlConnection extends BaseConnection {
|
|||||||
this._version = registerData.version;
|
this._version = registerData.version;
|
||||||
|
|
||||||
this.connector.on("connect", () => {
|
this.connector.on("connect", () => {
|
||||||
this.connector._socket.clusterio_ignore_dump = Boolean(this.ws_dumper);
|
this.connector._socket!.clusterio_ignore_dump = Boolean(this.ws_dumper);
|
||||||
});
|
});
|
||||||
this.connector.on("close", () => {
|
this.connector.on("close", () => {
|
||||||
if (this.logTransport) {
|
if (this.logTransport) {
|
||||||
@@ -264,11 +264,21 @@ export default class ControlConnection extends BaseConnection {
|
|||||||
async handleInstanceDetailsGetRequest(request: lib.InstanceDetailsGetRequest) {
|
async handleInstanceDetailsGetRequest(request: lib.InstanceDetailsGetRequest) {
|
||||||
let instance = this._controller.getRequestInstance(request.instanceId);
|
let instance = this._controller.getRequestInstance(request.instanceId);
|
||||||
|
|
||||||
|
let assigned_host: number|null|undefined = instance.config.get("instance.assigned_host");
|
||||||
|
if (assigned_host === null) {
|
||||||
|
assigned_host = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
let game_port: number|null|undefined = instance.game_port
|
||||||
|
if (game_port === null) {
|
||||||
|
game_port = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
return new lib.InstanceDetails(
|
return new lib.InstanceDetails(
|
||||||
instance.config.get("instance.name"),
|
instance.config.get("instance.name"),
|
||||||
instance.id,
|
instance.id,
|
||||||
instance.config.get("instance.assigned_host"),
|
assigned_host,
|
||||||
instance.game_port,
|
game_port,
|
||||||
instance.status,
|
instance.status,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -276,11 +286,21 @@ export default class ControlConnection extends BaseConnection {
|
|||||||
async handleInstanceDetailsListRequest() {
|
async handleInstanceDetailsListRequest() {
|
||||||
let list = [];
|
let list = [];
|
||||||
for (let instance of this._controller.instances!.values()) {
|
for (let instance of this._controller.instances!.values()) {
|
||||||
|
let assigned_host: number|null|undefined = instance.config.get("instance.assigned_host");
|
||||||
|
if (assigned_host === null) {
|
||||||
|
assigned_host = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
let game_port: number|null|undefined = instance.game_port
|
||||||
|
if (game_port === null) {
|
||||||
|
game_port = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
list.push(new lib.InstanceDetails(
|
list.push(new lib.InstanceDetails(
|
||||||
instance.config.get("instance.name"),
|
instance.config.get("instance.name"),
|
||||||
instance.id,
|
instance.id,
|
||||||
instance.config.get("instance.assigned_host"),
|
assigned_host,
|
||||||
instance.game_port,
|
game_port,
|
||||||
instance.status,
|
instance.status,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
@@ -296,12 +316,23 @@ export default class ControlConnection extends BaseConnection {
|
|||||||
this.instanceSubscriptions.all
|
this.instanceSubscriptions.all
|
||||||
|| this.instanceSubscriptions.instanceIds.includes(instance.id)
|
|| this.instanceSubscriptions.instanceIds.includes(instance.id)
|
||||||
) {
|
) {
|
||||||
|
let assigned_host: number|null|undefined = instance.config.get("instance.assigned_host");
|
||||||
|
if (assigned_host === null) {
|
||||||
|
assigned_host = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
let game_port: number|null|undefined = instance.game_port
|
||||||
|
if (game_port === null) {
|
||||||
|
game_port = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
this.send(new lib.InstanceDetailsUpdateEvent(
|
this.send(new lib.InstanceDetailsUpdateEvent(
|
||||||
new lib.InstanceDetails(
|
new lib.InstanceDetails(
|
||||||
instance.config.get("instance.name"),
|
instance.config.get("instance.name"),
|
||||||
instance.id,
|
instance.id,
|
||||||
instance.config.get("instance.assigned_host"),
|
assigned_host,
|
||||||
instance.game_port,
|
game_port,
|
||||||
instance.status,
|
instance.status,
|
||||||
)
|
)
|
||||||
));
|
));
|
||||||
@@ -954,7 +985,7 @@ export default class ControlConnection extends BaseConnection {
|
|||||||
this.send(new lib.DebugWsMessageEvent(data.direction, data.content));
|
this.send(new lib.DebugWsMessageEvent(data.direction, data.content));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
this.connector._socket.clusterio_ignore_dump = true;
|
this.connector._socket!.clusterio_ignore_dump = true;
|
||||||
this._controller.debugEvents.on("message", this.ws_dumper);
|
this._controller.debugEvents.on("message", this.ws_dumper);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { IncomingMessage } from "http";
|
import type { IncomingMessage } from "http";
|
||||||
import type { Duplex } from "stream";
|
import type { Duplex } from "stream";
|
||||||
import type Controller from "./Controller";
|
import type Controller from "./Controller";
|
||||||
|
import type { WebSocketClusterio } from "./WsServerConnector";
|
||||||
|
|
||||||
import jwt from "jsonwebtoken";
|
import jwt from "jsonwebtoken";
|
||||||
import WebSocket, { WebSocketServer } from "ws";
|
import WebSocket, { WebSocketServer } from "ws";
|
||||||
@@ -12,11 +13,6 @@ import ControlConnection from "./ControlConnection";
|
|||||||
import HostConnection, { HostInfo } from "./HostConnection";
|
import HostConnection, { HostInfo } from "./HostConnection";
|
||||||
import WsServerConnector from "./WsServerConnector";
|
import WsServerConnector from "./WsServerConnector";
|
||||||
|
|
||||||
export interface WebSocketClusterio extends WebSocket {
|
|
||||||
clusterio_ignore_dump: boolean | undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const packageVersion = require("../package.json").version;
|
const packageVersion = require("../package.json").version;
|
||||||
|
|
||||||
const wsMessageCounter = new lib.Counter(
|
const wsMessageCounter = new lib.Counter(
|
||||||
|
|||||||
@@ -5,6 +5,11 @@ import events from "events";
|
|||||||
import * as lib from "@clusterio/lib";
|
import * as lib from "@clusterio/lib";
|
||||||
const { logger } = lib;
|
const { logger } = lib;
|
||||||
|
|
||||||
|
export interface WebSocketClusterio extends WebSocket {
|
||||||
|
clusterio_ignore_dump?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Connector for controller connections
|
* Connector for controller connections
|
||||||
*
|
*
|
||||||
@@ -13,6 +18,7 @@ const { logger } = lib;
|
|||||||
*/
|
*/
|
||||||
export default class WsServerConnector extends lib.WebSocketBaseConnector {
|
export default class WsServerConnector extends lib.WebSocketBaseConnector {
|
||||||
_timeoutId: NodeJS.Timeout | null = null;
|
_timeoutId: NodeJS.Timeout | null = null;
|
||||||
|
declare _socket: WebSocketClusterio | null;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
dst: lib.Address,
|
dst: lib.Address,
|
||||||
@@ -47,7 +53,7 @@ export default class WsServerConnector extends lib.WebSocketBaseConnector {
|
|||||||
* @param account - account data to provide to control connection
|
* @param account - account data to provide to control connection
|
||||||
*/
|
*/
|
||||||
ready(
|
ready(
|
||||||
socket: WebSocket,
|
socket: WebSocket.WebSocket,
|
||||||
src: lib.Address,
|
src: lib.Address,
|
||||||
sessionToken: string,
|
sessionToken: string,
|
||||||
account: lib.AccountDetails | undefined
|
account: lib.AccountDetails | undefined
|
||||||
@@ -84,7 +90,7 @@ export default class WsServerConnector extends lib.WebSocketBaseConnector {
|
|||||||
|
|
||||||
// It's possible the previous connection hasn't closed yet due to a
|
// It's possible the previous connection hasn't closed yet due to a
|
||||||
// stale connection. Terminate it if so.
|
// stale connection. Terminate it if so.
|
||||||
if (this._state === "connected") {
|
if (this._state === "connected" && this._socket !== null) {
|
||||||
this._socket.terminate();
|
this._socket.terminate();
|
||||||
this._socket.once("close", () => this.continue(socket, lastSeq));
|
this._socket.once("close", () => this.continue(socket, lastSeq));
|
||||||
return;
|
return;
|
||||||
@@ -117,6 +123,10 @@ export default class WsServerConnector extends lib.WebSocketBaseConnector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_attachSocketHandlers() {
|
_attachSocketHandlers() {
|
||||||
|
if (this._socket === null) {
|
||||||
|
throw new Error("this._socket is null");
|
||||||
|
}
|
||||||
|
|
||||||
this.startHeartbeat();
|
this.startHeartbeat();
|
||||||
|
|
||||||
this._socket.on("close", (code: number, reason: string) => {
|
this._socket.on("close", (code: number, reason: string) => {
|
||||||
@@ -188,7 +198,9 @@ export default class WsServerConnector extends lib.WebSocketBaseConnector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this._closing = true;
|
this._closing = true;
|
||||||
this._socket.close(code, reason);
|
if (this._socket !== null) {
|
||||||
|
this._socket.close(code, reason);
|
||||||
|
}
|
||||||
await events.once(this, "close");
|
await events.once(this, "close");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +1,15 @@
|
|||||||
{
|
{
|
||||||
"include": ["controller.ts", "package.json", "src/**/*.ts"],
|
"include": ["controller.ts", "package.json", "src/**/*.ts"],
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"lib": ["esnext"],
|
"lib": ["es2023"],
|
||||||
"module": "commonjs",
|
"module": "commonjs",
|
||||||
"target": "es2022",
|
"target": "es2022",
|
||||||
"rootDir": ".",
|
"rootDir": ".",
|
||||||
"outDir": "dist/controller",
|
"outDir": "dist/controller",
|
||||||
"composite": true,
|
"composite": true,
|
||||||
|
"sourceMap": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"alwaysStrict": true,
|
"alwaysStrict": true,
|
||||||
"allowJs": true,
|
|
||||||
"checkJs": false,
|
|
||||||
"noEmitOnError": false,
|
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"resolveJsonModule": true
|
"resolveJsonModule": true
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ function splitOn(separator: string, string: string) {
|
|||||||
return [string.slice(0, index), string.slice(index + separator.length)];
|
return [string.slice(0, index), string.slice(index + separator.length)];
|
||||||
}
|
}
|
||||||
|
|
||||||
type SerializedConfig = ReturnType<Config["serialize"]>;
|
export type SerializedConfig = ReturnType<Config["serialize"]>;
|
||||||
type SerializedGroup = ReturnType<ConfigGroup["serialize"]>;
|
type SerializedGroup = ReturnType<ConfigGroup["serialize"]>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const util = require("util");
|
|||||||
|
|
||||||
const phin = require("phin");
|
const phin = require("phin");
|
||||||
|
|
||||||
const HttpCloser = require("@clusterio/controller/dist/controller/src/HttpCloser");
|
const HttpCloser = require("@clusterio/controller/dist/controller/src/HttpCloser").default;
|
||||||
|
|
||||||
// Time to wait during async operations to ensure they happened in order.
|
// Time to wait during async operations to ensure they happened in order.
|
||||||
const tick = 20;
|
const tick = 20;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const http = require("http");
|
|||||||
const phin = require("phin");
|
const phin = require("phin");
|
||||||
|
|
||||||
const { wait } = require("@clusterio/lib");
|
const { wait } = require("@clusterio/lib");
|
||||||
const routes = require("@clusterio/controller/dist/controller/src/routes");
|
const routes = require("@clusterio/controller/dist/controller/src/routes").default;
|
||||||
const mock = require("../mock");
|
const mock = require("../mock");
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ const express = require("express");
|
|||||||
|
|
||||||
const lib = require("@clusterio/lib");
|
const lib = require("@clusterio/lib");
|
||||||
|
|
||||||
const UserManager = require("@clusterio/controller/dist/controller/src/UserManager");
|
const UserManager = require("@clusterio/controller/dist/controller/src/UserManager").default;
|
||||||
|
|
||||||
const addr = lib.Address.fromShorthand;
|
const addr = lib.Address.fromShorthand;
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user