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

fix init loading

This commit is contained in:
Rizky 2023-10-24 15:57:34 +07:00
parent 0a39588932
commit 4bc08ebc29
11 changed files with 152 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/srv/package.json
View File

@ -12,6 +12,7 @@
"mime-types": "^2.1.35",
"msgpackr": "^1.9.9",
"radix3": "^1.1.0",
"uuid": "^9.0.1",
"y-pojo": "^0.0.8",
"yjs": "^13.6.8",
"yjs-types": "^0.0.1"

7
app/srv/ws/sync/actions/comp_new.ts
View File

@ -2,5 +2,8 @@ import { SAction } from "../actions";
import { SyncConnection } from "../type";
export const comp_new: SAction["comp"]["new"] = async function (
this: SyncConnection
) {};
this: SyncConnection,
arg
) {
console.log(arg);
};

1
app/srv/ws/sync/actions/index.ts
View File

@ -2,6 +2,7 @@ export * from "./site_load";
export * from "./site_group";
export * from "./page_load";
export * from "./comp_load";
export * from "./comp_new";
export * from "./comp_group";
export * from "./yjs_um";
export * from "./yjs_sv_local";

0
app/srv/ws/sync/editor/load.ts → app/srv/ws/sync/editor/load-default.ts
View File

37
app/srv/ws/sync/editor/load-sitepage.ts Normal file
View File

@ -0,0 +1,37 @@
import { validate } from "uuid";
import { user } from "../entity/user";
export const loadSitePage = async (
user_id: string,
site_id: string,
page_id?: string
) => {
if (validate(site_id)) {
const site = await db.site.findFirst({
where: { id: site_id },
select: { id: true },
});
if (site) {
await user.conf.set(user_id, "site_id", site_id);
}
let page = null;
if (validate(page_id || "")) {
page = await db.page.findFirst({
where: { id: page_id, id_site: site_id, is_deleted: false },
select: { id: true },
});
}
if (!page) {
page = await db.page.findFirst({
where: { id_site: site_id, is_deleted: false },
select: { id: true },
});
}
if (page) {
await user.conf.set(user_id, "page_id", page.id);
}
}
return user.conf.get(user_id);
};

17
app/srv/ws/sync/sync-handler.ts
View File

@ -5,10 +5,11 @@ import { WSData } from "../../../../pkgs/core/server/create";
import { ClientEvent } from "../../../web/src/utils/sync/ws-client";
import { SyncActionPaths } from "./actions-def";
import * as actions from "./actions/index";
import { loadDefaultSite } from "./editor/load";
import { loadDefaultSite } from "./editor/load-default";
import { loadSitePage } from "./editor/load-sitepage";
import { conns, wconns } from "./entity/conn";
import { UserConf, user } from "./entity/user";
import { SyncType } from "./type";
import { conns, wconns } from "./entity/conn";
const packr = new Packr({ structuredClone: true });
export const sendWS = (ws: ServerWebSocket<WSData>, msg: any) => {
@ -40,13 +41,19 @@ export const syncHandler: WebSocketHandler<WSData> = {
if (conn) {
const msg = packr.unpack(Buffer.from(raw));
if (msg.type === SyncType.UserID) {
const { user_id } = msg;
const { user_id, page_id, site_id } = msg;
conn.user_id = user_id;
const conf = await user.conf.getOrCreate(user_id);
if (!conf.site_id) {
let conf = await user.conf.getOrCreate(user_id);
if (site_id) {
const newconf = await loadSitePage(user_id, site_id, page_id);
if (newconf) conf = newconf;
} else if (!conf.site_id) {
await loadDefaultSite(user_id);
}
console.log(conf);
conn.conf = new Proxy(conf, {
get(_, p) {
const conf = user.conf.get(user_id);

29
app/web/src/render/ed/logic/ed-sync.tsx
View File

@ -4,6 +4,7 @@ import { Loading } from "../../../utils/ui/loading";
import { PG } from "./ed-global";
import { Y } from "../../../../../srv/ws/sync/entity/docs";
import { treeRebuild } from "./tree/build";
import { w } from "../../../utils/types/general";
export const edInitSync = (p: PG) => {
const session = JSON.parse(
@ -13,26 +14,34 @@ export const edInitSync = (p: PG) => {
navigate("/login");
return <Loading note="logging in" />;
}
const paramsOK =
!!params.site_id &&
!!params.page_id &&
params.site_id !== "_" &&
params.page_id !== "_";
if (!p.sync) {
clientStartSync({
user_id: session.data.user.id,
site_id: params.site_id,
page_id: params.page_id,
events: {
connected() {
if (w.offline) console.log("connected");
w.offline = false;
p.render();
},
disconnected() {
console.log("offline, reconnecting...");
w.offline = true;
p.render();
return {
reconnect: true,
};
},
editor_start(e) {
if (!paramsOK) {
if (e.site_id && e.page_id) {
if (params.site_id !== e.site_id || params.page_id !== e.page_id) {
p.site.id = e.site_id;
p.page.cur.id = e.page_id;
navigate(`/ed/${e.site_id}/${e.page_id}`);
}
} else {
p.site.id = params.site_id;
p.page.cur.id = params.page_id;
p.site.id = e.site_id;
p.page.cur.id = e.page_id;
p.render();
}
},

5
app/web/src/render/ed/panel/popup/comp-group.tsx
View File

@ -9,13 +9,14 @@ export const EdPopCompGroup = () => {
useEffect(() => {
(async () => {
if (p.ui.popup.comp_group) {
if (!p.comp.group[p.site.id]) {
p.comp.group[p.site.id] = await p.sync.comp.group(p.site.id);
}
console.log(p.comp.group[p.site.id]);
p.render();
}
})();
}, []);
}, [p.ui.popup.comp_group]);
if (!p.ui.popup.comp_group) return null;
const pop = p.ui.popup.comp_group;

2
app/web/src/render/ed/panel/tree/node/item/indent-hook.ts
View File

@ -13,11 +13,13 @@ export const indentHook = (
let shouldOpen = open[p.page.cur.id] || [];
const cur = p.page.meta[active.item_id];
if (cur && cur.parent_item) {
let meta = p.page.meta[cur.parent_item.id];
while (meta) {
if (meta.item.id) shouldOpen.push(meta.item.id);
meta = p.page.meta[meta.parent_item.id];
}
}
if (shouldOpen.length > 0 && local.tree) {
local.tree.open(shouldOpen);

37
app/web/src/utils/sync/ws-client.ts
View File

@ -48,6 +48,8 @@ const sendWs = (ws: WebSocket, msg: any) => {
export const clientStartSync = async (arg: {
user_id: string;
site_id?: string;
page_id?: string;
events: {
editor_start: (arg: UserConf) => void;
site_loaded: (arg: { site: ESite }) => void;
@ -56,11 +58,13 @@ export const clientStartSync = async (arg: {
id: string;
sv_local: Uint8Array;
}) => void;
disconnected: () => { reconnect: boolean };
connected: () => void;
};
}) => {
const { user_id, events } = arg;
const { user_id, site_id, page_id, events } = arg;
conf.idb = initIDB(user_id);
await connect(user_id, events);
await connect({ user_id, site_id, page_id }, events);
return new DeepProxy(
SyncActionDefinition,
({ target, trapName, value, key, DEFAULT, PROXY }) => {
@ -91,7 +95,11 @@ export const clientStartSync = async (arg: {
) as unknown as typeof SyncActions;
};
const connect = (user_id: string, event: ClientEventObject) => {
const connect = (
opt: { user_id: string; page_id?: string; site_id?: string },
event: ClientEventObject
) => {
const { user_id, page_id, site_id } = opt;
conf.event = event;
if (w.offline) {
return new Promise<void>(async (resolve) => {
@ -104,8 +112,10 @@ const connect = (user_id: string, event: ClientEventObject) => {
}
});
} else {
return new Promise<void>((resolve) => {
return new Promise<void>((resolve, reject) => {
if (!conf.ws) {
let reconnect = 0;
const retry = () => {
const url = new URL(location.href);
url.pathname = "/sync";
url.protocol = url.protocol === "http:" ? "ws:" : "wss:";
@ -113,15 +123,20 @@ const connect = (user_id: string, event: ClientEventObject) => {
const ws = new WebSocket(url.toString());
ws.onopen = () => {
sendWs(ws, { type: SyncType.UserID, user_id });
console.clear();
sendWs(ws, { type: SyncType.UserID, user_id, site_id, page_id });
conf.ws = ws;
event.connected();
};
ws.onclose = async () => {
console.log("disconnected..");
w.offline = true;
if (!conf.ws) {
await connect(user_id, event);
resolve();
const res = event.disconnected();
if (res.reconnect) {
setTimeout(async () => {
reconnect++;
retry();
}, reconnect * 5000);
} else {
reject();
}
};
ws.onmessage = async (e) => {
@ -153,6 +168,8 @@ const connect = (user_id: string, event: ClientEventObject) => {
}
}
};
};
retry();
}
});
}

BIN
bun.lockb
View File

Binary file not shown.