midsuit
/
prasi-bun
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
Rizky 2024-08-16 11:18:55 +07:00
parent cac2e1ea1e
commit 44f934b4b9
6 changed files with 100 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/srv/package.json
View File

@ -6,6 +6,7 @@
"@hyrious/esbuild-plugin-style": "^0.3.5",
"@node-rs/argon2": "^1.5.2",
"@paralleldrive/cuid2": "^2.2.2",
"@parcel/watcher": "^2.4.1",
"@types/lodash.isequal": "^4.5.8",
"@types/mime-types": "^2.1.4",
"esbuild": "^0.21.5",

77
app/srv/ws/sync/code/parts/init/frontend.ts
View File

@ -4,7 +4,6 @@ import { $ } from "bun";
import { dir } from "dir";
import { context, formatMessages } from "esbuild";
import { cleanPlugin } from "esbuild-clean-plugin";
import { watch } from "fs";
import { existsAsync } from "fs-jetpack";
import { appendFile } from "node:fs/promises";
import { conns } from "../../../entity/conn";
@ -12,6 +11,7 @@ import { user } from "../../../entity/user";
import { sendWS } from "../../../sync-handler";
import { SyncType } from "../../../type";
import { code } from "../../code";
import { Watcher } from "../watcher";
const pending = {} as any;
export const initFrontEnd = async (
@ -50,83 +50,16 @@ export const initFrontEnd = async (
try {
await isInstalling(id_site);
const broadcastLoading = async () => {
const client_ids = user.active
.findAll({ site_id: id_site })
.map((e) => e.client_id);
const now = Date.now();
client_ids.forEach((client_id) => {
const ws = conns.get(client_id)?.ws;
if (ws)
sendWS(ws, {
type: SyncType.Event,
event: "code_changes",
data: { ts: now, mode: "frontend", status: "building" },
});
});
};
if (code.internal.frontend[id_site]?.watch) {
await code.internal.frontend[id_site].watch.close();
}
code.internal.frontend[id_site] = {
...(code.internal.frontend[id_site] || {}),
ctx: await initBuildCtx({ id_site, root }),
timeout: null,
rebuilding: false,
watch: new Watcher(dir.data(root), id_site),
};
if (code.internal.frontend[id_site].watch) {
code.internal.frontend[id_site].watch.close();
}
console.log("watching", dir.data(root));
code.internal.frontend[id_site].watch = watch(
dir.data(root),
{
recursive: true,
persistent: true
},
async (event, filename) => {
const fe = code.internal.frontend[id_site];
const srv = code.internal.server[id_site];
if (
filename?.startsWith("node_modules") ||
filename?.startsWith("typings") ||
filename?.endsWith(".log")
)
return;
console.log(
event,
filename,
typeof fe !== "undefined" && !fe.rebuilding
? "start-rebuild"
: "rebuilding..."
);
if (
filename?.endsWith(".tsx") ||
filename?.endsWith(".ts") ||
filename?.endsWith(".css") ||
filename?.endsWith(".html")
) {
if (typeof fe !== "undefined" && !fe.rebuilding) {
fe.rebuilding = true;
clearTimeout(fe.timeout);
fe.timeout = setTimeout(async () => {
try {
broadcastLoading();
await fe.ctx.rebuild();
fe.rebuilding = false;
} catch (e: any) {
console.error(`Frontend failed rebuild (site: ${id_site})`);
console.error(e.message);
fe.rebuilding = false;
}
}, 500);
}
}
}
);
const fe = code.internal.frontend[id_site];
fe.rebuilding = true;
try {

3
app/srv/ws/sync/code/parts/internal.ts
View File

@ -2,6 +2,7 @@ import Parcel from "@parcel/core";
import { Subprocess } from "bun";
import type { BuildContext } from "esbuild";
import { FSWatcher } from "fs";
import { Watcher } from "./watcher";
const g = global as unknown as {
prasi_code: any;
};
@ -24,7 +25,7 @@ export const codeInternal = {
{
ctx: BuildContext;
timeout: any;
watch?: FSWatcher;
watch?: Watcher;
rebuilding: boolean;
npm?: Promise<void>;
}

92
app/srv/ws/sync/code/parts/watcher.ts Normal file
View File

@ -0,0 +1,92 @@
import watcher, { AsyncSubscription } from "@parcel/watcher";
import { readdir } from "node:fs/promises";
import { statSync } from "node:fs";
import { join } from "path";
import { code } from "../code";
import { user } from "../../entity/user";
import { conns } from "../../entity/conn";
import { sendWS } from "../../sync-handler";
import { SyncType } from "../../type";
export class Watcher {
subcription = null as null | AsyncSubscription;
constructor(path: string, id_site: string) {
this.init(path, id_site);
// watcher.subscribe(path, (err, events) => {
// console.log(events);
// });
// watch(
// path,
// {
// recursive: true,
// persistent: true,
// },
// async (event, filename) => {
// }
// );
}
async init(path: string, id_site: string) {
const broadcastLoading = async () => {
const client_ids = user.active
.findAll({ site_id: id_site })
.map((e) => e.client_id);
const now = Date.now();
client_ids.forEach((client_id) => {
const ws = conns.get(client_id)?.ws;
if (ws)
sendWS(ws, {
type: SyncType.Event,
event: "code_changes",
data: { ts: now, mode: "frontend", status: "building" },
});
});
};
this.subcription = await watcher.subscribe(path, (err, events) => {
for (const e of events) {
const filename = e.path.substring(path.length + 1);
if (e.type === "create" || e.type === "update") {
const fe = code.internal.frontend[id_site];
if (
filename?.startsWith("node_modules") ||
filename?.startsWith("typings") ||
filename?.endsWith(".log")
)
return;
if (
filename?.endsWith(".tsx") ||
filename?.endsWith(".ts") ||
filename?.endsWith(".css") ||
filename?.endsWith(".html")
) {
if (typeof fe !== "undefined" && !fe.rebuilding) {
fe.rebuilding = true;
clearTimeout(fe.timeout);
fe.timeout = setTimeout(async () => {
try {
broadcastLoading();
await fe.ctx.rebuild();
fe.rebuilding = false;
} catch (e: any) {
console.error(`Frontend failed rebuild (site: ${id_site})`);
console.error(e.message);
fe.rebuilding = false;
}
}, 500);
}
}
}
}
});
}
async close() {
if (this.subcription) {
await this.subcription.unsubscribe();
}
}
}

BIN
bun.lockb
View File

Binary file not shown.

BIN
dockerzip
View File

Binary file not shown.