sptc 0.0.30 → 0.0.32

package/dist/httpServer.js

@@ -93,7 +93,7 @@ function CGI(req, res, option) {
 }
 
 function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
-	const {fullname, pathname}=getRequestFile(req, srvDir)
+	const {fullname, pathname, query}=getRequestFile(req, srvDir)
 	const reqCtx={
 		$_RAW_REQUEST: req,
 		$_RAW_RESPONSE: res,
@@ -103,6 +103,8 @@ function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
 			pathname,
 		},
 		$_WORKDIR: srvDir,
+		$_QUERY: query,
+		$_PATHNAME: pathname,
 	}
 	reqCtx.$_GLOBAL=reqCtx
 
@@ -112,6 +114,7 @@ function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
 		responseHeaders: {'content-type': 'text/html; charset=utf8'},
 		error: null,
 		headerFlushed: false,
+		isSendFile: false,
 
 		is_debug: debug,
 	}
@@ -125,6 +128,13 @@ function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
 		state.statusCode=code
 		if(text!==undefined) state.statusText=text
 	}
+  reqCtx.sendFile=(fn, headers)=>{
+  	state.headerFlushed=true
+  	state.isSendFile=true
+  	const ws=fsResponse(fn, res, headers)
+  	ws.on('error', e=>handler.onError(e))
+  	ws.on('end', _=>res.end())
+  }
 	reqCtx.setResponseHeaders=headers=>{
 		Object.assign(state.responseHeaders, headers)
 	}
@@ -150,6 +160,7 @@ function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
 			res.write(x)
 		},
 		end: _=>{
+			if(state.isSendFile) return;
 			flushHeader()
 			res.end()
 		},
@@ -164,11 +175,14 @@ function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
 	return [reqCtx, handler]
 }
 function getRequestFile(req, srvDir) {
-	const _url=require('url')
-	const {pathname}=_url.parse(req.url)
+	const _url=req.url
+	const url=require('url')
+  const qs=require('querystring')
+  const {pathname, query}=url.parse(_url)
 	return {
 		fullname: safe_path(srvDir, pathname),
 		pathname,
+    query: qs.parse(query) || {},
 	}
 }
 const cacheStore={}
@@ -186,7 +200,7 @@ function createWithCacheStore() {
 	return withCache
 }
 
-function fsResponse(fn, res) {
+function fsResponse(fn, res, headers={}) {
 	const fs=require('fs')
 	const ext=getExtension(fn)
 	res.writeHead(200, {
@@ -197,8 +211,11 @@ function fsResponse(fn, res) {
 			'.jpg': 'image/jpeg',
 			'.html': 'text/html',
 		})[ext] || 'application/octet-stream',
+		...headers,
 	})
-	fs.createReadStream(fn).pipe(res)
+	const ws=fs.createReadStream(fn)
+	ws.pipe(res)
+	return ws
 }
 
 function traverseDirectory(ref, dir, exts, debug) {

package/engine/interpreter-macro.js

@@ -24,6 +24,7 @@ function buildMacroContext({filename, ...inherits}) {
   }
   if(Array.isArray(ctx.defs)) {
     ctx.defs=new Set(ctx.defs)
+    for(const x of ctx.defs) ctx.defines[x]=true
   }
   return ctx
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sptc",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "Simple Pretreat Toolkit CLI",
   "main": "engine/index.js",
   "engines": {

package/utils/base.js

@@ -75,6 +75,19 @@ function assert(x) {
   if(!x) throw new Error('Uncaught AssertionError [ERR_ASSERTION]: '+x+' == true')
 }
 
+async function rs2Buffer(rs) {
+  const def=PromiseWithResolvers()
+  const buf=[]
+  rs.on('data', b=>buf.push(b))
+  rs.on('end', _=>{
+    def.resolve(Buffer.concat(buf))
+  })
+  rs.on('error', e=>{
+    def.reject(e)
+  })
+  return def.promise
+}
+
 module.exports={
   readTextFile,
   sleep,
@@ -87,4 +100,5 @@ module.exports={
   getLocalIpv4Addresses,
   PromiseWithResolvers,
   assert,
+  rs2Buffer,
 }