refactor: upate typings

Author: Wenjie Xia

cli.ts

@@ -1,10 +1,11 @@
-import { listenAndServe, path, ServerRequest, walk } from './deps.ts'
+import { listenAndServe, path, walk } from './deps.ts'
 import { Request } from './server/api.ts'
 import { getContentType } from './server/mime.ts'
 import { createHtml } from './server/util.ts'
 import { existsDirSync, existsFileSync } from './shared/fs.ts'
 import log from './shared/log.ts'
 import util from './shared/util.ts'
+import { ServerRequest } from './types.ts'
 import { VERSION } from './version.ts'
 
 const commands = {

deps.ts

@@ -8,8 +8,7 @@ export { exists, existsSync } from 'https://deno.land/[email protected]/fs/exists.ts'
 export { walk } from 'https://deno.land/[email protected]/fs/walk.ts'
 export { Sha1 } from 'https://deno.land/[email protected]/hash/sha1.ts'
 export { Sha256 } from 'https://deno.land/[email protected]/hash/sha256.ts'
-export { listenAndServe, serve, ServerRequest } from 'https://deno.land/[email protected]/http/server.ts'
-export type { Response } from 'https://deno.land/[email protected]/http/server.ts'
+export { listenAndServe, serve } from 'https://deno.land/[email protected]/http/server.ts'
 export * as bufio from 'https://deno.land/[email protected]/io/bufio.ts'
 export * as path from 'https://deno.land/[email protected]/path/mod.ts'
 export * as ws from 'https://deno.land/[email protected]/ws/mod.ts'

server/api.ts

@@ -1,6 +1,6 @@
-import { brotli, bufio, gzipEncode, Response, ServerRequest } from '../deps.ts'
+import { brotli, bufio, gzipEncode } from '../deps.ts'
 import log from '../shared/log.ts'
-import type { APIRequest, FormDataBody } from '../types.ts'
+import type { APIRequest, FormDataBody, ServerRequest, ServerResponse } from '../types.ts'
 import { multiParser } from './multiparser.ts'
 
 export class Request implements APIRequest {
@@ -41,18 +41,6 @@ export class Request implements APIRequest {
         return this.#req.method
     }
 
-    get proto(): string {
-        return this.#req.proto
-    }
-
-    get protoMinor(): number {
-        return this.#req.protoMinor
-    }
-
-    get protoMajor(): number {
-        return this.#req.protoMajor
-    }
-
     get headers(): Headers {
         return this.#req.headers
     }
@@ -69,26 +57,14 @@ export class Request implements APIRequest {
         return this.#req.w
     }
 
-    get done(): Promise<Error | undefined> {
-        return this.#req.done
-    }
-
-    get contentLength(): number | null {
-        return this.#req.contentLength
-    }
-
     get body(): Deno.Reader {
         return this.#req.body
     }
 
-    async respond(r: Response): Promise<void> {
+    async respond(r: ServerResponse): Promise<void> {
         return this.#req.respond(r)
     }
 
-    async finalize(): Promise<void> {
-        return this.#req.finalize()
-    }
-
     get pathname(): string {
         return this.#pathname
     }

server/project.ts

@@ -1,13 +1,13 @@
 import { buildChecksum, initWasm, SWCOptions, TransformOptions, transpileSync } from '../compiler/mod.ts'
-import type { AcceptedPlugin, ECMA, ServerRequest } from '../deps.ts'
+import type { AcceptedPlugin, ECMA } from '../deps.ts'
 import { CleanCSS, colors, ensureDir, minify, path, postcss, Sha1, Sha256, walk } from '../deps.ts'
 import { EventEmitter } from '../framework/core/events.ts'
 import { getPagePath, RouteModule, Routing } from '../framework/core/routing.ts'
 import { hashShort, reFullVersion, reHashJs, reHashResolve, reHttp, reLocaleID, reModuleExt, reStyleModuleExt } from '../shared/constants.ts'
 import { ensureTextFile, existsDirSync, existsFileSync } from '../shared/fs.ts'
 import log from '../shared/log.ts'
 import util from '../shared/util.ts'
-import type { APIHandler, Config, RouterURL } from '../types.ts'
+import type { APIHandler, Config, RouterURL, ServerRequest } from '../types.ts'
 import { VERSION } from '../version.ts'
 import { Request } from './api.ts'
 import type { DependencyDescriptor, ImportMap, Module, RenderResult } from './types.ts'

server/server.ts

@@ -8,6 +8,14 @@ import { getContentType } from './mime.ts'
 import { Project } from './project.ts'
 import { createHtml } from './util.ts'
 
+export class Server {
+
+}
+
+export function createServer(): Server {
+    return new Server()
+}
+
 export async function start(appDir: string, hostname: string, port: number, isDev = false, reload = false) {
     const project = new Project(appDir, isDev ? 'development' : 'production', reload)
     await project.ready

types.ts

@@ -1,4 +1,4 @@
-import type { AcceptedPlugin, bufio, Response } from './deps.ts'
+import type { AcceptedPlugin, bufio } from './deps.ts'
 
 export type LoaderPlugin = {
     /* `type` defines the plugin type */
@@ -68,23 +68,26 @@ export type APIHandler = {
 }
 
 /**
- * The raw request object of http request.
+ * An interface that aligns to the parts of std http srever's `ServerRequest`.
  */
 export interface ServerRequest {
     readonly url: string
     readonly method: string
-    readonly proto: string
-    readonly protoMinor: number
-    readonly protoMajor: number
     readonly headers: Headers
     readonly conn: Deno.Conn
     readonly r: bufio.BufReader
     readonly w: bufio.BufWriter
-    readonly done: Promise<Error | undefined>
-    readonly contentLength: number | null
     readonly body: Deno.Reader
-    respond(r: Response): Promise<void>
-    finalize(): Promise<void>
+    respond(r: ServerResponse): Promise<void>
+}
+
+/**
+ * An interface is compatible with std http srever's `request.respond()`.
+ */
+export interface ServerResponse {
+    status?: number
+    headers?: Headers
+    body?: Uint8Array | Deno.Reader | string
 }
 
 /**