go-bds/Maneger
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Releases 71 Wiki Activity

Reewrite project #430

Merged
Sirherobrine23 merged 13 commits from reewriteProject into main 2022-08-31 10:03:14 +00:00
Conversation 14 Commits 13 Files Changed 56 +11 -6
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 53c03c62c5 - Show all commits

13
src/bedrock.ts
View File

@@ -12,9 +12,12 @@ export { bedrockServerWorld, bedrockWorld, linkBedrock } from "./linkWorlds/bedr
// RegExp // RegExp
export const saveFf = /^(worlds|server\.properties|config|((permissions|allowlist|valid_known_packs)\.json)|(development_.*_packs))$/; export const saveFf = /^(worlds|server\.properties|config|((permissions|allowlist|valid_known_packs)\.json)|(development_.*_packs))$/;
export const portListen = /(IPv[46])\s+supported,\s+port:\s+(.*)/; export const portListen = /\[.*\]\s+(IPv[46])\s+supported,\s+port:\s+([0-9]+)/;
export const started = /\[.*\]\s+Server\s+started\./; export const started = /\[.*\]\s+Server\s+started\./;
export const player = /r\s+(.*)\:\s+(.*)\,\s+xuid\:\s+(.*)/; // [2022-08-30 20:50:53:821 INFO] Player connected: Sirherobrine, xuid: 111111111111111
// [2022-08-30 20:56:55:231 INFO] Player disconnected: Sirherobrine, xuid: 111111111111111
export const player = /\[.*\]\s+Player\s+((dis|)connected):\s+(.*),\s+xuid:\s+([0-9]+)/;
// [2022-08-30 20:56:55:601 INFO] Running AutoCompaction...
export async function installServer(version: string|boolean) { export async function installServer(version: string|boolean) {
let arch = process.arch; let arch = process.arch;
@@ -52,7 +55,7 @@ const serverConfig: actionConfig[] = [
callback(data, done) { callback(data, done) {
const match = data.match(player); const match = data.match(player);
if (!match) return; if (!match) return;
const [, action, playerName, xuid] = match; const [, action,, playerName, xuid] = match;
if (action === "connect") done({connectTime: new Date(), playerName: playerName, xuid}); if (action === "connect") done({connectTime: new Date(), playerName: playerName, xuid});
} }
}, },
@@ -61,7 +64,7 @@ const serverConfig: actionConfig[] = [
callback(data, done) { callback(data, done) {
const match = data.match(player); const match = data.match(player);
if (!match) return; if (!match) return;
const [, action, playerName, xuid] = match; const [, action,, playerName, xuid] = match;
if (action === "disconnect") done({connectTime: new Date(), playerName: playerName, xuid}); if (action === "disconnect") done({connectTime: new Date(), playerName: playerName, xuid});
} }
}, },
@@ -70,7 +73,7 @@ const serverConfig: actionConfig[] = [
callback(data, done) { callback(data, done) {
const match = data.match(player); const match = data.match(player);
if (!match) return; if (!match) return;
const [, action, playerName, xuid] = match; const [, action,, playerName, xuid] = match;
if (!(action === "disconnect" || action === "connect")) done({connectTime: new Date(), playerName: playerName, xuid}); if (!(action === "disconnect" || action === "connect")) done({connectTime: new Date(), playerName: playerName, xuid});
} }
}, },

4
tests/bedrock.ts
View File

@@ -5,7 +5,9 @@ describe("Bedrock", () => {
this.timeout(1000*60*60*15); this.timeout(1000*60*60*15);
await installServer("latest"); await installServer("latest");
const serverManeger = await startServer(); const serverManeger = await startServer();
serverManeger.on("log_stdout", data => process.stdout.write(data)); serverManeger.on("log_stdout", console.log);
serverManeger.on("log_stderr", console.log);
serverManeger.on("portListening", console.log);
serverManeger.once("serverStarted", () => serverManeger.stopServer()); serverManeger.once("serverStarted", () => serverManeger.stopServer());
return new Promise((done, reject) => serverManeger.on("exit", ({code}) => code === 0?done():reject(new Error("Exit another code "+code)))); return new Promise((done, reject) => serverManeger.on("exit", ({code}) => code === 0?done():reject(new Error("Exit another code "+code))));
}); });