refactor: refork tail module

This commit is contained in:
2026-10-22 12:04:40 +03:00
parent a421d56ec1
commit 84d905dbb3
12 changed files with 1047 additions and 2036 deletions
+2 -2
View File
@@ -5,7 +5,7 @@ import through from "through2";
import { Env } from "../common/env";
import exec from "../common/exec";
import { System } from "../common/system";
import { StringWritable } from "../common/tail";
import { HandlerWriter } from "../common/tail";
import { Downloader } from "../core/download";
import { Sdk } from "../core/sdk";
import { Command } from "../run/command";
@@ -223,7 +223,7 @@ export class Android extends Sdk {
const command = new Command(cmd).exec();
this.push(command);
command.contents.pipe(
new StringWritable((line) => {
new HandlerWriter((line: string) => {
if (line.includes("SDL") && (line.includes("onDestroy()") || line.includes("onStop()"))) {
callback();
throw "Exit"; // ToDo:
+2 -14
View File
@@ -2,10 +2,9 @@ import fs from "fs";
import fse from "fs-extra";
import os from "os";
import path from "path";
import through from "through2";
import { Env } from "../common/env";
import { System } from "../common/system";
import { TailVinyl } from "../common/tail";
import { watch } from "../common/watch";
import { Sdk } from "../core/sdk";
import run from "../run";
@@ -120,17 +119,6 @@ export class FlashPlayer extends Sdk {
this.log.i("_run_ *%s*", filename);
FlashPlayer.trust(filename);
FlashPlayer.enableLog();
return run(`${this.flashPlayerBin} ${filename}`, params)
.exec()
.pipe(
through.obj(function (file: any, enc: string, callback: any) {
const log = new TailVinyl({
path: FlashPlayer.log,
});
this.on("end", () => log.dispose());
this.push(log);
callback();
}),
);
return run(`${this.flashPlayerBin} ${filename}`, params).exec().pipe(watch(FlashPlayer.log));
}
}
+6 -3
View File
@@ -77,7 +77,10 @@ export class Haxe extends Sdk {
prepare() {
return Promise.all([this.neko.prepare(), super.prepare()]).then(() => {
fs.copyFileSync(path.resolve(import.meta.dirname, "..", "template/haxe/activate"), path.resolve(this.path, "activate"));
fs.copyFileSync(
path.resolve(import.meta.dirname, "..", "template/haxe/activate"),
path.resolve(this.path, "activate"),
);
});
}
@@ -128,7 +131,7 @@ export class Haxe extends Sdk {
flash: "*.swf",
}[platform] || "**/*";
return this.haxelib(args).then(() => {
let r = vfs.src(`${target}/${result}`);
let r = vfs.src(`${target}/${result}`, { encoding: false });
if (platform === "android") {
r = r.pipe(rename(`${config.meta.filename}_${config.meta.version}.apk`));
}
@@ -175,7 +178,7 @@ export class Haxe extends Sdk {
cpp: `${config.meta.filename}/${config.main.split(".").pop()}${debug ? "-debug" : ""}`,
}[platform] || "**/*";
return this.haxe(args).then(() => {
let r = vfs.src(`${target}/${result}`);
let r = vfs.src(`${target}/${result}`, { encoding: false });
if (platform === "cpp") {
r = r.pipe(rename(config.meta.filename));
}
+5 -14
View File
@@ -1,9 +1,8 @@
import os from "os";
import path from "path";
import through from "through2";
import { Env } from "../common/env";
import { System } from "../common/system";
import { TailVinyl } from "../common/tail";
import { watch } from "../common/watch";
import run from "../run";
import { FlashPlayer } from "./flashplayer";
@@ -55,18 +54,10 @@ export class RufflePlayer extends FlashPlayer {
return run(`${this.flashPlayerBin} ${filename}`, params)
.exec()
.pipe(
through.obj(function (file: any, enc: string, callback: any) {
const log = new TailVinyl({
path: RufflePlayer.log,
handler: (line: string) => {
if (line.includes("avm_trace")) {
return line.split("avm_trace: ").pop();
}
},
});
this.on("end", () => log.dispose());
this.push(log);
callback();
watch(RufflePlayer.log, (line: string) => {
if (line.includes("avm_trace")) {
return line.split("avm_trace: ").pop();
}
}),
);
}