diff --git a/app/srv/package.json b/app/srv/package.json index 08a273a5..cff19dcd 100644 --- a/app/srv/package.json +++ b/app/srv/package.json @@ -7,6 +7,7 @@ "@node-rs/argon2": "^1.5.2", "@paralleldrive/cuid2": "^2.2.2", "@parcel/watcher": "^2.4.1", + "@types/bun": "^1.1.14", "@types/lodash.isequal": "^4.5.8", "@types/mime-types": "^2.1.4", "del": "^7.1.0", diff --git a/app/srv/ws/sync/code/templates/typings/global_d_ts b/app/srv/ws/sync/code/templates/typings/global_d_ts index 1a0c4e6a..e440fb84 100644 --- a/app/srv/ws/sync/code/templates/typings/global_d_ts +++ b/app/srv/ws/sync/code/templates/typings/global_d_ts @@ -62,7 +62,7 @@ declare global { opt?: { rewrite?: (arg: { body: Bun.BodyInit; - headers: Response["headers"]; + headers: Headers | any; }) => Bun.BodyInit; } ) => Promise; diff --git a/app/srv/ws/sync/editor/code/server-main.ts b/app/srv/ws/sync/editor/code/server-main.ts index dfbd5d06..ff5ad291 100644 --- a/app/srv/ws/sync/editor/code/server-main.ts +++ b/app/srv/ws/sync/editor/code/server-main.ts @@ -175,7 +175,7 @@ export interface PrasiServer extends Record { opt?: { rewrite?: (arg: { body: Bun.BodyInit; - headers: Response["headers"]; + headers: Headers | any; }) => Bun.BodyInit; } ) => Promise; @@ -190,5 +190,6 @@ export interface PrasiServer extends Record { const glb = global as unknown as { _server: ReturnType; }; + glb._server = serverMain(); export const server = glb._server; diff --git a/app/srv/ws/sync/editor/code/util-code.ts b/app/srv/ws/sync/editor/code/util-code.ts index 4f125b51..9fa5a920 100644 --- a/app/srv/ws/sync/editor/code/util-code.ts +++ b/app/srv/ws/sync/editor/code/util-code.ts @@ -83,7 +83,7 @@ declare global { handle: (req: Request, opt?: { rewrite?: (arg: { body: Bun.BodyInit; - headers: Response["headers"]; + headers: Headers | any; }) => Bun.BodyInit; }) => Promise; serveStatic?: any; diff --git a/bun.lockb b/bun.lockb index d71d4037..60719fcf 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/pkgs/core/server/create.ts b/pkgs/core/server/create.ts index 4a0544c0..18e91dc5 100644 --- a/pkgs/core/server/create.ts +++ b/pkgs/core/server/create.ts @@ -34,7 +34,7 @@ export const createServer = async () => { opt?: { rewrite?: (arg: { body: Bun.BodyInit; - headers: Response["headers"]; + headers: Headers | any; }) => Bun.BodyInit; } ) => { diff --git a/pkgs/core/server/serve-static.ts b/pkgs/core/server/serve-static.ts index a9a4ef52..fad55870 100644 --- a/pkgs/core/server/serve-static.ts +++ b/pkgs/core/server/serve-static.ts @@ -84,7 +84,7 @@ export const serveStatic = { opt?: { rewrite?: (arg: { body: Bun.BodyInit; - headers: Response["headers"]; + headers: Headers | any; }) => Bun.BodyInit; } ) => { @@ -109,7 +109,7 @@ export const serveStatic = { opt?: { rewrite?: (arg: { body: Bun.BodyInit; - headers: Response["headers"]; + headers: Headers | any; }) => Bun.BodyInit; } ) { @@ -193,7 +193,7 @@ const rewriteResponse = ( opt?: { rewrite?: (arg: { body: Bun.BodyInit; - headers: Response["headers"]; + headers: Headers | any; }) => Bun.BodyInit; }; } @@ -202,11 +202,11 @@ const rewriteResponse = ( arg.headers instanceof Headers ? arg.headers : new Headers(arg.headers); if (arg.opt?.rewrite) { - return new Response(arg.opt.rewrite({ body: body, headers }), { + return new Response(arg.opt.rewrite({ body: body, headers }) as any, { headers, status: arg.status, }); } - return new Response(body, { headers, status: arg.status }); + return new Response(body as any, { headers, status: arg.status }); }; diff --git a/pkgs/core/utils/global.ts b/pkgs/core/utils/global.ts index 27a42646..477038e9 100644 --- a/pkgs/core/utils/global.ts +++ b/pkgs/core/utils/global.ts @@ -34,7 +34,7 @@ export const g = global as unknown as { opt?: { rewrite?: (arg: { body: Bun.BodyInit; - headers: Response["headers"]; + headers: Headers | any; }) => Bun.BodyInit; } ) => Promise;