goscript 0.1.2 → 0.1.3

package/gs/net/http/index.ts

@@ -1,4 +1,5 @@
 import * as $ from '@goscript/builtin/index.js'
+import * as bytes from '@goscript/bytes/index.js'
 import * as context from '@goscript/context/index.js'
 import * as errors from '@goscript/errors/index.js'
 import * as fs from '@goscript/io/fs/fs.js'
@@ -10,9 +11,14 @@ export const StatusCreated = 201
 export const StatusPartialContent = 206
 export const StatusMovedPermanently = 301
 export const StatusBadRequest = 400
+export const StatusUnauthorized = 401
+export const StatusForbidden = 403
+export const StatusMethodNotAllowed = 405
 export const StatusRequestTimeout = 408
 export const StatusConflict = 409
 export const StatusNotFound = 404
+export const StatusUnsupportedMediaType = 415
+export const StatusTeapot = 418
 export const StatusTooManyRequests = 429
 export const StatusRequestedRangeNotSatisfiable = 416
 export const StatusInternalServerError = 500
@@ -31,6 +37,12 @@ export function StatusText(code: number): string {
       return 'OK'
     case StatusMovedPermanently:
       return 'Moved Permanently'
+    case StatusUnauthorized:
+      return 'Unauthorized'
+    case StatusForbidden:
+      return 'Forbidden'
+    case StatusMethodNotAllowed:
+      return 'Method Not Allowed'
     case StatusBadRequest:
       return 'Bad Request'
     case StatusRequestTimeout:
@@ -39,12 +51,16 @@ export function StatusText(code: number): string {
       return 'Conflict'
     case StatusNotFound:
       return 'Not Found'
+    case StatusUnsupportedMediaType:
+      return 'Unsupported Media Type'
     case StatusTooManyRequests:
       return 'Too Many Requests'
     case StatusPartialContent:
       return 'Partial Content'
     case StatusRequestedRangeNotSatisfiable:
       return 'Requested Range Not Satisfiable'
+    case StatusTeapot:
+      return "I'm a teapot"
     case StatusInternalServerError:
       return 'Internal Server Error'
     case StatusServiceUnavailable:
@@ -61,22 +77,39 @@ export const Header = Map as {
 }
 
 export function Header_Add(h: Header, key: string, value: string): void {
+  key = canonicalMIMEHeaderKey(key)
   const values = Array.from(h.get(key) ?? [])
   values.push(value)
   h.set(key, $.arrayToSlice(values))
 }
 
 export function Header_Del(h: Header, key: string): void {
-  h.delete(key)
+  h.delete(canonicalMIMEHeaderKey(key))
 }
 
 export function Header_Get(h: Header, key: string): string {
-  const values = h.get(key)
+  const values = h.get(canonicalMIMEHeaderKey(key))
   return values == null || values.length === 0 ? '' : String(values[0])
 }
 
 export function Header_Set(h: Header, key: string, value: string): void {
-  h.set(key, $.arrayToSlice([value]))
+  h.set(canonicalMIMEHeaderKey(key), $.arrayToSlice([value]))
+}
+
+function canonicalMIMEHeaderKey(key: string): string {
+  let upper = true
+  let out = ''
+  for (let i = 0; i < key.length; i++) {
+    const ch = key[i]
+    if (ch === '-') {
+      upper = true
+      out += ch
+      continue
+    }
+    out += upper ? ch.toUpperCase() : ch.toLowerCase()
+    upper = false
+  }
+  return out
 }
 
 class QueryValues extends Map<string, $.Slice<string>> {
@@ -90,13 +123,27 @@ class QueryValues extends Map<string, $.Slice<string>> {
     const values = this.get(key)
     return values == null || values.length === 0 ? '' : String(values[0])
   }
+
+  public Encode(): string {
+    const params = new URLSearchParams()
+    for (const [key, values] of this.entries()) {
+      for (const value of Array.from(values ?? [])) {
+        params.append(key, String(value))
+      }
+    }
+    return params.toString()
+  }
 }
 
 class RequestURL {
+  public Scheme: string
+  public Host: string
   public Path: string
   public RawQuery: string
 
-  constructor(path: string, rawQuery: string) {
+  constructor(path: string, rawQuery: string, scheme = '', host = '') {
+    this.Scheme = scheme
+    this.Host = host
     this.Path = path
     this.RawQuery = rawQuery
   }
@@ -109,19 +156,100 @@ class RequestURL {
   }
 
   public clone(): RequestURL {
-    return new RequestURL(this.Path, this.RawQuery)
+    return new RequestURL(this.Path, this.RawQuery, this.Scheme, this.Host)
+  }
+
+  public String(): string {
+    const query = this.RawQuery === '' ? '' : `?${this.RawQuery}`
+    const path = this.Path === '' ? '/' : this.Path
+    if (this.Scheme === '' || this.Host === '') {
+      return `${path}${query}`
+    }
+    return `${this.Scheme}://${this.Host}${path}${query}`
   }
 }
 
 function parseRequestURL(rawURL: string): RequestURL {
   try {
     const parsed = new URL(rawURL, 'http://goscript.invalid')
-    return new RequestURL(parsed.pathname, parsed.search.startsWith('?') ? parsed.search.slice(1) : parsed.search)
+    const hasHost = /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(rawURL)
+    return new RequestURL(
+      parsed.pathname,
+      parsed.search.startsWith('?') ? parsed.search.slice(1) : parsed.search,
+      hasHost ? parsed.protocol.replace(/:$/, '') : '',
+      hasHost ? parsed.host : '',
+    )
   } catch {
     return new RequestURL('', '')
   }
 }
 
+class responseBody implements io.ReadCloser {
+  private reader: bytes.Reader
+
+  constructor(data: $.Bytes) {
+    this.reader = bytes.NewReader(Uint8Array.from(data ?? []))
+  }
+
+  public Read(p: $.Bytes): [number, $.GoError] {
+    return this.reader.Read(p)
+  }
+
+  public Close(): $.GoError {
+    return null
+  }
+}
+
+class memoryResponseWriter implements ResponseWriter {
+  public Code = StatusOK
+  public Body = new bytes.Buffer()
+  private headerMap = new Header()
+  private wroteHeader = false
+
+  public Header(): Header {
+    return this.headerMap
+  }
+
+  public Write(p: $.Slice<number>): [number, $.GoError] {
+    if (!this.wroteHeader) {
+      this.WriteHeader(StatusOK)
+    }
+    return this.Body.Write(p)
+  }
+
+  public WriteHeader(statusCode: number): void {
+    if (this.wroteHeader) {
+      return
+    }
+    this.wroteHeader = true
+    this.Code = statusCode
+  }
+
+  public Result(): Response {
+    return new Response({
+      Body: new responseBody(this.Body.Bytes()),
+      Header: this.headerMap,
+      StatusCode: this.Code,
+    })
+  }
+}
+
+const inProcessServers = new Map<string, Handler>()
+let nextInProcessServerID = 1
+
+export function RegisterInProcessServer(handler: Handler | null): string {
+  const host = `goscript-httptest-${nextInProcessServerID++}.invalid`
+  inProcessServers.set(host, handler ?? { ServeHTTP: NotFound })
+  return `http://${host}`
+}
+
+export function UnregisterInProcessServer(rawURL: string): void {
+  const parsed = parseRequestURL(rawURL)
+  if (parsed.Host !== '') {
+    inProcessServers.delete(parsed.Host)
+  }
+}
+
 export interface ResponseWriter {
   Header(): Header
   Write(p: $.Slice<number>): [number, $.GoError]
@@ -181,20 +309,27 @@ export class Request {
 }
 
 export class Response {
+  public Status: string
   public StatusCode: number
   public Body: io.ReadCloser | null
   public Header: Header
 
   constructor(init?: Partial<Response>) {
+    this.Status = init?.Status ?? ''
     this.StatusCode = init?.StatusCode ?? 0
     this.Body = init?.Body ?? null
     this.Header = init?.Header ?? new Header()
+    if (this.Status === '' && this.StatusCode !== 0) {
+      const text = StatusText(this.StatusCode)
+      this.Status = text === '' ? String(this.StatusCode) : `${this.StatusCode} ${text}`
+    }
   }
 
   public clone(): Response {
     return new Response({
       Body: this.Body,
       Header: this.Header,
+      Status: this.Status,
       StatusCode: this.StatusCode,
     })
   }
@@ -220,13 +355,27 @@ export interface RoundTripper {
   RoundTrip(req: Request | $.VarRef<Request> | null): [Response | null, $.GoError] | Promise<[Response | null, $.GoError]>
 }
 
-class unsupportedTransport implements RoundTripper {
-  public async RoundTrip(_req: Request | $.VarRef<Request> | null): Promise<[Response | null, $.GoError]> {
-    return [null, errors.New('net/http: Client.Do is not implemented in GoScript')]
+class defaultTransport implements RoundTripper {
+  public async RoundTrip(req: Request | $.VarRef<Request> | null): Promise<[Response | null, $.GoError]> {
+    const request = $.pointerValue<Request | null>(req)
+    if (request == null) {
+      return [null, errors.New('net/http: nil Request')]
+    }
+    const host = request.URL?.Host ?? ''
+    const handler = host === '' ? null : inProcessServers.get(host)
+    if (handler == null) {
+      return [null, errors.New('net/http: Client.Do is not implemented in GoScript')]
+    }
+    const recorder = new memoryResponseWriter()
+    const served = handler.ServeHTTP(recorder, request)
+    if (served instanceof Promise) {
+      await served
+    }
+    return [recorder.Result(), null]
   }
 }
 
-export const DefaultTransport: RoundTripper = new unsupportedTransport()
+export const DefaultTransport: RoundTripper = new defaultTransport()
 
 export interface FileSystem {
   Open(name: string): [File | null, $.GoError]

package/gs/os/zero_copy_posix.gs.ts

@@ -30,6 +30,5 @@ export function tryLimitedReader(r: io.Reader): [io.LimitedReader | null, io.Rea
 	}
 
 	remain = lr!.N
-	return [lr, lr!.R, remain]
+	return [lr, lr!.R ?? r, remain]
 }
-

package/gs/sync/meta.json

@@ -3,6 +3,7 @@
     "unsafe"
   ],
   "asyncMethods": {
+    "Locker.Lock": true,
     "Mutex.Lock": true,
     "RWMutex.Lock": true,
     "RWMutex.RLock": true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "goscript",
   "description": "Go to TypeScript transpiler",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": {
     "name": "Aperture Robotics LLC.",
     "email": "support@aperture.us",