From 7d405e51457012643a0c1bdf17ecf1b2363205c7 Mon Sep 17 00:00:00 2001 From: Rizky Date: Tue, 31 Oct 2023 16:43:56 +0700 Subject: [PATCH] fix --- app/srv/ws/sync/actions-def.ts | 74 +++++++++--------- app/srv/ws/sync/actions.ts | 6 +- .../actions/{code_load.ts => code_close.ts} | 4 +- app/srv/ws/sync/actions/code_create.ts | 11 --- .../actions/{code_list.ts => code_open.ts} | 4 +- app/srv/ws/sync/actions/index.ts | 5 +- bun.lockb | Bin 306144 -> 306176 bytes package.json | 3 +- pkgs/core/index.ts | 15 +++- pkgs/core/server/prep-api-ts.ts | 18 ++--- pkgs/core/utils/parcel.ts | 1 + 11 files changed, 63 insertions(+), 78 deletions(-) rename app/srv/ws/sync/actions/{code_load.ts => code_close.ts} (61%) delete mode 100644 app/srv/ws/sync/actions/code_create.ts rename app/srv/ws/sync/actions/{code_list.ts => code_open.ts} (62%) diff --git a/app/srv/ws/sync/actions-def.ts b/app/srv/ws/sync/actions-def.ts index 04051d41..96d405cb 100644 --- a/app/srv/ws/sync/actions-def.ts +++ b/app/srv/ws/sync/actions-def.ts @@ -1,54 +1,52 @@ export const SyncActionDefinition = { "code": { - "create": "0", - "list": "1", - "load": "2" + "open": "0", + "close": "1" }, "site": { - "list": "3", - "group": "4", - "load": "5", - "update": "6" + "list": "2", + "group": "3", + "load": "4", + "update": "5" }, "comp": { - "new": "7", - "list": "8", - "group": "9", - "load": "10" + "new": "6", + "list": "7", + "group": "8", + "load": "9" }, "page": { - "list": "11", - "load": "12" + "list": "10", + "load": "11" }, "yjs": { - "um": "13", - "sv_local": "14", - "diff_local": "15", - "sv_remote": "16" + "um": "12", + "sv_local": "13", + "diff_local": "14", + "sv_remote": "15" }, - "activity": "17", + "activity": "16", "client": { - "info": "18" + "info": "17" } }; export const SyncActionPaths = { - "0": "code.create", - "1": "code.list", - "2": "code.load", - "3": "site.list", - "4": "site.group", - "5": "site.load", - "6": "site.update", - "7": "comp.new", - "8": "comp.list", - "9": "comp.group", - "10": "comp.load", - "11": "page.list", - "12": "page.load", - "13": "yjs.um", - "14": "yjs.sv_local", - "15": "yjs.diff_local", - "16": "yjs.sv_remote", - "17": "activity", - "18": "client.info" + "0": "code.open", + "1": "code.close", + "2": "site.list", + "3": "site.group", + "4": "site.load", + "5": "site.update", + "6": "comp.new", + "7": "comp.list", + "8": "comp.group", + "9": "comp.load", + "10": "page.list", + "11": "page.load", + "12": "yjs.um", + "13": "yjs.sv_local", + "14": "yjs.diff_local", + "15": "yjs.sv_remote", + "16": "activity", + "17": "client.info" }; diff --git a/app/srv/ws/sync/actions.ts b/app/srv/ws/sync/actions.ts index 230431ce..c3168588 100644 --- a/app/srv/ws/sync/actions.ts +++ b/app/srv/ws/sync/actions.ts @@ -14,14 +14,12 @@ import { Activity, ActivityKind } from "./type"; WILL *BREAK* OFFLINE STORAGE -- ONLY ADDITION IS ALLOWED */ - export type SAction = typeof SyncActions; export const SyncActions = { code: { - create: async (id_site: string, name: string) => ({}) as { id: string }, - list: async (id_site: string) => ({}) as { ids: string[] }, - load: async (id: string) => ({}) as { bin: Uint8Array } | void, + open: async (id_site: string) => ({}) as { id: string }, + close: async (id_site: string) => ({}) as { id: string }, }, site: { list: async () => diff --git a/app/srv/ws/sync/actions/code_load.ts b/app/srv/ws/sync/actions/code_close.ts similarity index 61% rename from app/srv/ws/sync/actions/code_load.ts rename to app/srv/ws/sync/actions/code_close.ts index aa7df99c..26b7ff02 100644 --- a/app/srv/ws/sync/actions/code_load.ts +++ b/app/srv/ws/sync/actions/code_close.ts @@ -1,11 +1,11 @@ import { SAction } from "../actions"; import { SyncConnection } from "../type"; -export const code_load: SAction["code"]["load"] = async function ( +export const code_close: SAction["code"]["close"] = async function ( this: SyncConnection, ) { let result = null as unknown as Awaited< - ReturnType + ReturnType >; return result; } \ No newline at end of file diff --git a/app/srv/ws/sync/actions/code_create.ts b/app/srv/ws/sync/actions/code_create.ts deleted file mode 100644 index 6e163a12..00000000 --- a/app/srv/ws/sync/actions/code_create.ts +++ /dev/null @@ -1,11 +0,0 @@ - -import { SAction } from "../actions"; -import { SyncConnection } from "../type"; -export const code_create: SAction["code"]["create"] = async function ( - this: SyncConnection, -) { - let result = null as unknown as Awaited< - ReturnType - >; - return result; -} \ No newline at end of file diff --git a/app/srv/ws/sync/actions/code_list.ts b/app/srv/ws/sync/actions/code_open.ts similarity index 62% rename from app/srv/ws/sync/actions/code_list.ts rename to app/srv/ws/sync/actions/code_open.ts index 49eb1422..83b39101 100644 --- a/app/srv/ws/sync/actions/code_list.ts +++ b/app/srv/ws/sync/actions/code_open.ts @@ -1,11 +1,11 @@ import { SAction } from "../actions"; import { SyncConnection } from "../type"; -export const code_list: SAction["code"]["list"] = async function ( +export const code_open: SAction["code"]["open"] = async function ( this: SyncConnection, ) { let result = null as unknown as Awaited< - ReturnType + ReturnType >; return result; } \ No newline at end of file diff --git a/app/srv/ws/sync/actions/index.ts b/app/srv/ws/sync/actions/index.ts index 9d0130b6..b63cf3b0 100644 --- a/app/srv/ws/sync/actions/index.ts +++ b/app/srv/ws/sync/actions/index.ts @@ -1,6 +1,5 @@ -export * from "./code_create"; -export * from "./code_list"; -export * from "./code_load"; +export * from "./code_open"; +export * from "./code_close"; export * from "./site_list"; export * from "./site_group"; export * from "./site_load"; diff --git a/bun.lockb b/bun.lockb index 91ef701cff4fbd0d689cb917ddb66786fd57173e..7904c3421b797c2fdffb0209f00e946d1cc49c3e 100755 GIT binary patch delta 14812 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 delta 14800 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 diff --git a/package.json b/package.json index c51020f3..cfe719ad 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ }, "dependencies": { "brotli-wasm": "^2.0.1", - "fdir": "^6.1.0" + "fdir": "^6.1.0", + "typescript": "^5.2.2" } } diff --git a/pkgs/core/index.ts b/pkgs/core/index.ts index cbf9e932..4490a64d 100644 --- a/pkgs/core/index.ts +++ b/pkgs/core/index.ts @@ -26,10 +26,12 @@ if (g.mode === "dev") { await startDevWatcher(); } + /** init lmdb */ user.conf.init(); snapshot.init(); + await preparePrisma(); await ensureNotRunning(); @@ -39,12 +41,17 @@ if (g.db) { }); } + await initSrv(); await syncActionDefinition(); + await generateAPIFrm(); await prepareApiRoutes(); -await prepareAPITypes(); -await parcelBuild(); -await createServer(); -g.status = "ready"; +await prepareAPITypes(); + +await parcelBuild(); + +// await createServer(); + +// g.status = "ready"; diff --git a/pkgs/core/server/prep-api-ts.ts b/pkgs/core/server/prep-api-ts.ts index f1ded836..27b05fa1 100644 --- a/pkgs/core/server/prep-api-ts.ts +++ b/pkgs/core/server/prep-api-ts.ts @@ -35,6 +35,7 @@ export const ${name} = { const targetFile = dir.path("app/srv/exports.d.ts"); const args = [ + process.execPath, dir.path("node_modules/.bin/tsc"), dir.path("app/srv/exports.ts"), "--declaration", @@ -43,19 +44,10 @@ export const ${name} = { targetFile, ]; if (g.mode === "dev") { - const tsc = spawn( - [ - dir.path("node_modules/.bin/tsc"), - dir.path("app/srv/exports.ts"), - "--declaration", - "--emitDeclarationOnly", - "--outFile", - targetFile, - ], - { - cwd: dir.path(`node_modules/.bin`), - } - ); + const tsc = spawn(args, { + cwd: dir.path(`node_modules/.bin`), + }); + await tsc.exited; } diff --git a/pkgs/core/utils/parcel.ts b/pkgs/core/utils/parcel.ts index 1ccf719e..9bad92a1 100644 --- a/pkgs/core/utils/parcel.ts +++ b/pkgs/core/utils/parcel.ts @@ -6,6 +6,7 @@ import { g } from "./global"; const decoder = new TextDecoder(); export const parcelBuild = async () => { await dirAsync("app/static"); + const args = [ "node", dir.path("node_modules/.bin/parcel"),