sptc 0.0.6 → 0.0.8

package/bin/sptcd.js

@@ -11,7 +11,7 @@ const program=new Command()
   .option('-l, --locally', 'Only accepts local connections.')
   .option('-w, --workdir <string>', 'Specify the working directory.', '.')
   .option('-r, --router <string>', 'Specify a file as the router entry. If specified, all requests will pass to this file.')
-  .option('-e, --exts <string>', 'Specify the valid extensions of executable sptc files.', '.sjs,.shtml')
+  .option('-e, --exts <string>', 'Specify the valid extensions of executable sptc files.', '.s,.sjs,.sptc')
   .option('-n, --workers <number>', 'Workers count.', 1)
   .option('-s, --slient', 'Slient mode.')
   .action(({
@@ -28,12 +28,31 @@ const program=new Command()
       routerEntry: router,
       exts: exts.split(',').map(x=>x.trim()).filter(x=>x),
       debug: true,
-      slientMode: slient,
     }]
     if(workers>1) {
       FastCGI_FPM(workers, ...argv)
     }else{
       FastCGI(...argv)
     }
+
+    if(slient || require('cluster').isWorker) return;
+  	const {getLocalIpv4Addresses}=require('../utils')
+    console.log('`sptc-http-server` has been launched with the following option:')
+    const o={
+      workdir,
+      routerEntry: router,
+    }
+    if(locally) {
+      o.serve='127.0.0.1:'+port
+    }else{
+      o.serves=getLocalIpv4Addresses().map(x=>x+':'+port)
+    }
+    o.runtime=workers>1? 'FastCGI_FPM': 'FastCGI'
+    if(workers>1) {
+      o.workers=workers
+    }
+    console.log(o)
+
+
   })
   .parse()

package/dist/httpServer.js

@@ -3,7 +3,6 @@ const {
 	safe_path,
 	fileExists,
 	getExtension,
-	getLocalIpv4Addresses,
 }=require('../utils')
 const {executeSptcFile}=require('../engine')
 
@@ -15,6 +14,7 @@ function FastCGI_FPM(n, port, locally, option={}) {
 	option.env={
 		RUNTIME: 'FastCGI_FPM',
 	}
+	option.workers=n
 	fpm(n, _=>FastCGI(port, locally, option))
 }
 
@@ -24,7 +24,6 @@ function FastCGI(port, locally, option) {
 	const {
 		serverDir='.',
 		routerEntry=null,
-		slientMode=false,
 		..._option
 	}=option
 	_option.env=_option.env || {
@@ -34,21 +33,7 @@ function FastCGI(port, locally, option) {
 	_option.router=routerEntry? safe_path(_option.srvDir, routerEntry): null
 	http.createServer((req, res)=>{
 		CGI(req, res, _option)
-	}).listen(port, locally? '127.0.0.1': '0.0.0.0', _=>{
-		console.log()
-		console.log('`sptc-http-server` has been launched with the following option:')
-		const o={
-			workdir: _option.srvDir,
-			routerEntry: _option.router,
-		}
-		if(locally) {
-			o.serve='127.0.0.1:'+port
-		}else{
-			o.serves=getLocalIpv4Addresses().map(x=>x+':'+port)
-		}
-		console.log(o)
-		console.log()
-	})
+	}).listen(port, locally? '127.0.0.1': '0.0.0.0')
 }
 
 function CGI(req, res, option) {
@@ -64,13 +49,13 @@ function CGI(req, res, option) {
 	const fn=router || file.fullname
 	if(!fileExists(fn)) {
 		res.writeHead(404, {'content-type': 'text/plain'})
-		res.end(`\`${router || file.pathname}\` does not exist`)
+		res.end(`file does not exist: \`${router || file.pathname}\``)
 		return
 	}
 	const ext=getExtension(fn)
 	if(!exts.includes(ext)) {
 		res.writeHead(403, {'content-type': 'text/plain'})
-		res.end(`\`${ext}\` does not match`)
+		res.end(`extensions does not match: \`${ext}\``)
 		return
 	}
 	executeSptcFile(fn, reqCtx, handler)
@@ -86,7 +71,6 @@ function buildRequestContext(req, res, {srvDir, debug, env}) {
 			fullname,
 			pathname,
 		},
-		$_DEBUG: debug,
 		$_WORKDIR: srvDir,
 	}
 	reqCtx.$_GLOBAL=reqCtx
@@ -94,9 +78,11 @@ function buildRequestContext(req, res, {srvDir, debug, env}) {
 	const state={
 		statusCode: 200,
 		statusText: 'OK',
-		responseHeaders: {'content-type': 'text/html'},
+		responseHeaders: {'content-type': 'text/html; charset=utf8'},
 		error: null,
 		headerFlushed: false,
+
+		is_debug: debug,
 	}
 	function flushHeader() {
 		if(state.headerFlushed) return;
@@ -115,8 +101,9 @@ function buildRequestContext(req, res, {srvDir, debug, env}) {
 		flushHeader()
 	}
 	reqCtx.setDebug=x=>{
-		reqCtx.$_DEBUG=x
+		state.is_debug=x
 	}
+	reqCtx.isDebug=_=>state.is_debug
 
 	return [reqCtx, {
 		write: x=>{
@@ -128,7 +115,9 @@ function buildRequestContext(req, res, {srvDir, debug, env}) {
 			res.end()
 		},
 		onError: e=>{
-			if(reqCtx.$_DEBUG) console.log(e)
+			if(state.is_debug) console.log(e)
+			flushHeader()
+			res.end(state.is_debug? e.stack: '')
 		},
 	}]
 }

package/engine/interpreter.js

@@ -172,6 +172,9 @@ function buildContext(ctx0, option) {
   ctx.Sync={
     Push: (...x)=>{
       if(priv.isEnd) return;
+      for(let i=x.length; i--; ) {
+        if(typeof x[i]==='function') x[i]=x[i]()
+      }
       priv.syncs.push(...x)
     },
   }
@@ -189,15 +192,18 @@ function buildContext(ctx0, option) {
 
   ctx._exports={}
   ctx.exports=o=>{
+    if('__getter__' in o) {
+      throw new Error('`__getter__` cannot be overrided')
+    }
     Object.assign(ctx._exports, o)
   }
 
   ctx.eval=code=>(new vm.Script(code)).runInNewContext(ctx)
 
-  ctx.include=(inc_filename, payload={})=>{
+  ctx.include=(inc_filename, inc_payload={})=>{
     const inc=path.resolve(ctx0.__dirname, inc_filename)
     const [_ctx0, _vm]=Compiler.compileSptcFile(inc)
-    const [_ctx, _]=buildContext({...payload, ..._ctx0}, {
+    const [_ctx, _]=buildContext({...ctx0, ...inc_payload, ..._ctx0}, {
       write: option.write,
       // end: ctx.end,
       onError: option.onError,
@@ -205,7 +211,7 @@ function buildContext(ctx0, option) {
       readAsBinary,
     })
     const ret=executeVm(_vm, _ctx, priv)
-    return [_ctx._exports, x=>ret.constructor('return '+x)()]
+    return Object.assign({}, _ctx._exports, {__getter__: (...x)=>ret.constructor('return '+(x.length>1? '['+x.join(',')+']': x))()})
   }
 
   ctx.__autoload=fn=>{
@@ -222,8 +228,8 @@ function buildContext(ctx0, option) {
         if(priv.__autoload_func) {
           let inc_fn=priv.__autoload_func(prop)
           if(inc_fn) {
-            const [{default: d}, q]=ctx.include(inc_fn)
-            return priv.__autoload_vars[prop]=d || q(prop)
+            const e=ctx.include(inc_fn)
+            return priv.__autoload_vars[prop]=e.default || e.__getter__(prop)
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sptc",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Simple Pretreat Toolkit CLI",
   "main": "index.js",
   "engines": {
@@ -11,6 +11,6 @@
     "sptcd": "./bin/sptcd.js"
   },
   "dependencies": {
-    "commander": "^10.0.1"
+    "commander": "10.0.1"
   }
 }

package/tests/engine/a.sjs

@@ -37,7 +37,7 @@ __autoload(varname=>{
 	if(varname==='TestModel') return './TestModel.sjs'
 })
 
-const [v, _]=include('./ee.sjs', {P: 55})
+const v=include('./ee.sjs', {P: 55})
 echo('['+v.ee+']')
 
 Sync.Push((async _=>{

package/tests/engine/ee.sjs

@@ -14,4 +14,4 @@ Sync.Push(new Promise(r=>{
   	echo('xxxxxxxxx')
   	r()
 	}, 2e3)
-}))
+}))