sptc 0.0.8 → 0.0.10

package/bin/sptcd.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const {FastCGI, FastCGI_FPM}=require('../dist/httpServer')
 const {Command}=require('commander')
@@ -14,6 +14,7 @@ const program=new Command()
   .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.')
+  .option('-t, --traverse', 'If pathname is a directory, execute the index file under the pathname directory if any index file exists. If no index file is found, traverse the directory. If a router file is specified, this option will be ignored.')
   .action(({
     port,
     locally,
@@ -22,26 +23,39 @@ const program=new Command()
     exts,
     workers,
     slient,
+    traverse,
   })=>{
+    const disableLog=slient || require('cluster').isWorker
+
+    if(router && traverse) {
+      traverse=false
+      if(!disableLog) {
+        console.log('`--traverse` option has been ignored due to the router file has been specified.')
+      }
+    }
+
     const argv=[port, locally, {
       serverDir: workdir,
       routerEntry: router,
       exts: exts.split(',').map(x=>x.trim()).filter(x=>x),
       debug: true,
+      traverse,
     }]
+
     if(workers>1) {
       FastCGI_FPM(workers, ...argv)
     }else{
       FastCGI(...argv)
     }
 
-    if(slient || require('cluster').isWorker) return;
+    if(disableLog) return;
   	const {getLocalIpv4Addresses}=require('../utils')
     console.log('`sptc-http-server` has been launched with the following option:')
     const o={
       workdir,
-      routerEntry: router,
+      routerEntry: router || null,
     }
+    o.traverse=traverse? true: false
     if(locally) {
       o.serve='127.0.0.1:'+port
     }else{

package/dist/httpServer.js

@@ -3,6 +3,7 @@ const {
 	safe_path,
 	fileExists,
 	getExtension,
+	listdir,
 }=require('../utils')
 const {executeSptcFile}=require('../engine')
 
@@ -42,26 +43,51 @@ function CGI(req, res, option) {
 		exts=['.s', '.sptc', '.sjs'],
 		debug=false,
 		router=null,
+		traverse=false,
 		env,
 	}=option
-	const [reqCtx, handler]=buildRequestContext(req, res, {srvDir, debug, env})
+	const [reqCtx, handler]=buildRequestContext(req, res, {
+		srvDir,
+		debug,
+		env,
+		isRouterMode: router,
+	})
 	const file=reqCtx.$_REQUEST_FILE || {}
 	const fn=router || file.fullname
-	if(!fileExists(fn)) {
-		res.writeHead(404, {'content-type': 'text/plain'})
-		res.end(`file does not exist: \`${router || file.pathname}\``)
+
+  function _executeFile(fn) {
+	  const ext=getExtension(fn)
+  	if(!exts.includes(ext)) {
+	  	res.writeHead(403, {'content-type': 'text/plain'})
+  		res.end(`extensions does not match: \`${ext}\``)
+		  return
+	  }
+  	executeSptcFile(fn, reqCtx, handler)
+  }
+
+	if(fileExists(fn)) {
+		_executeFile(fn)
 		return
 	}
-	const ext=getExtension(fn)
-	if(!exts.includes(ext)) {
-		res.writeHead(403, {'content-type': 'text/plain'})
-		res.end(`extensions does not match: \`${ext}\``)
-		return
+
+  if(!traverse) {
+  	res.writeHead(404, {'content-type': 'text/html'})
+	  res.end(`<h3>File does not exist: \`${router || file.pathname}\`</h3>`)
+	  return
+  }
+
+	for(let e of exts) {
+	  if(!fileExists(fn+'/index'+e)) continue
+    _executeFile(fn+'/index'+e)
+	  return
 	}
-	executeSptcFile(fn, reqCtx, handler)
+
+  res.writeHead(404, {'content-type': 'text/html'})
+	res.end(traverseDirectory(srvDir, file.pathname, exts))
+
 }
 
-function buildRequestContext(req, res, {srvDir, debug, env}) {
+function buildRequestContext(req, res, {srvDir, debug, env, isRouterMode}) {
 	const {fullname, pathname}=getRequestFile(req, srvDir)
 	const reqCtx={
 		$_RAW_REQUEST: req,
@@ -105,7 +131,7 @@ function buildRequestContext(req, res, {srvDir, debug, env}) {
 	}
 	reqCtx.isDebug=_=>state.is_debug
 
-	return [reqCtx, {
+	const handler={
 		write: x=>{
 			flushHeader()
 			res.write(x)
@@ -119,7 +145,10 @@ function buildRequestContext(req, res, {srvDir, debug, env}) {
 			flushHeader()
 			res.end(state.is_debug? e.stack: '')
 		},
-	}]
+		isEntry: true,
+	}
+
+	return [reqCtx, handler]
 }
 function getRequestFile(req, srvDir) {
 	const _url=require('url')
@@ -130,6 +159,31 @@ function getRequestFile(req, srvDir) {
 	}
 }
 
+function traverseDirectory(ref, dir, exts) {
+  let ret=`
+<!doctype html>
+<meta charset=utf8 />
+<style>*{line-height: 1.8;}b{font-size: 16px;}a{font-size: 18px; color: #2222ff; cursor: pointer;}a.dir{color: #555555;}</style>`
+  const {dirs, files, error}=listdir(ref, dir)
+  ret+=`<a style="font-size: 22px;" href="${dir!=='/'? '../': ''}">back</a>`
+  ret+=`<h3>${dir}</h3>`
+  if(error) {
+  	ret+=`<h3>${error.message}</h3>`
+  }else{
+    for(let i=0; i<dirs.length; i++) {
+		  ret+=`<a class="dir" href="${encodeURIComponent(dirs[i].fn)}/">${dirs[i].fn}</a> <br/>`
+  	}
+  	for(let i=0; i<files.length; i++) {
+  		if(exts.includes(getExtension(files[i].fn))) {
+  			ret+=`<a href="${encodeURIComponent(files[i].fn)}">${files[i].fn}</a> <br/>`
+  		}else{
+  	  	ret+=`<b>${files[i].fn}</b> ${files[i].size} <br/>`
+  		}
+	  }
+  }
+  return ret
+}
+
 module.exports={
 	FastCGI,
 	FastCGI_FPM,

package/engine/index.js

@@ -17,6 +17,10 @@ function executeSptcFile(filename, payload, option={}) {
 		  undefined,
   }
 
+  if(option.isEntry) {
+  	_option.isEntry=option.isEntry
+  }
+
 	const [ctx0, vm]=Compiler.compileSptcFile(filename, _option)
   const [ctx, priv]=Interpreter.buildContext({...payload, ...ctx0}, option)
   Interpreter.executeVm(vm, ctx, priv)

package/engine/interpreter.js

@@ -133,6 +133,7 @@ function buildContext(ctx0, option) {
     onError=NOOP,
     masterPriv=null,
     readAsBinary=false,
+    isEntry=false,
   }=option
 
   const ctx=buildGlobal()
@@ -144,6 +145,9 @@ function buildContext(ctx0, option) {
     _defers: [],
     __autoload_func: null,
     __autoload_vars: {},
+    _defined: {},
+    cacheVersion: '',
+    statExpires: -1,
   }
 
   Object.assign(ctx, {
@@ -152,6 +156,16 @@ function buildContext(ctx0, option) {
     isMaster: !masterPriv,
   })
 
+  // Dynamically set the cache configuration.
+  ctx.configSptcFileCache=(cacheVersion, cacheSeconds)=>{
+    if(!isEntry) {
+      console.log('Warning: this function only works in the entry file.')
+      return
+    }
+    priv.cacheVersion=cacheVersion
+    priv.statExpires=cacheSeconds
+  }
+
   ctx.echo=(...x)=>{
     if(priv.isEnd) return;
     priv.echos.push(...x)
@@ -184,6 +198,13 @@ function buildContext(ctx0, option) {
     priv._defers.push(fn)
   }
 
+  ctx.define=(k, v)=>{
+    if(k in priv._defined) {
+      throw new Error(`duplicate key: ${k}`)
+    }
+    priv._defined[k]=v
+  }
+
   try{
     ctx.require=_module.createRequire(ctx0.__filefullname)
   }catch(e) {
@@ -202,13 +223,20 @@ function buildContext(ctx0, option) {
 
   ctx.include=(inc_filename, inc_payload={})=>{
     const inc=path.resolve(ctx0.__dirname, inc_filename)
-    const [_ctx0, _vm]=Compiler.compileSptcFile(inc)
-    const [_ctx, _]=buildContext({...ctx0, ...inc_payload, ..._ctx0}, {
+    const [_ctx0, _vm]=Compiler.compileSptcFile(inc, {
+      statExpires: priv.statExpires,
+      cacheVersion: priv.cacheVersion,
+    })
+    const [_ctx, _]=buildContext({
+      ...ctx0,
+      ...inc_payload,
+      ..._ctx0,
+    }, {
       write: option.write,
-      // end: ctx.end,
       onError: option.onError,
       masterPriv: priv,
       readAsBinary,
+      isEntry: false,
     })
     const ret=executeVm(_vm, _ctx, priv)
     return Object.assign({}, _ctx._exports, {__getter__: (...x)=>ret.constructor('return '+(x.length>1? '['+x.join(',')+']': x))()})
@@ -222,6 +250,9 @@ function buildContext(ctx0, option) {
   pctx=new Proxy(pctx, {
     get: (target, prop, receiver)=>{
       if(false===prop in target) {
+        if(prop in priv._defined) {
+          return priv._defined[prop]
+        }
         if(prop in priv.__autoload_vars) {
           return priv.__autoload_vars[prop]
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sptc",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Simple Pretreat Toolkit CLI",
   "main": "index.js",
   "engines": {

package/tests/www/cc.s

@@ -0,0 +1,5 @@
+<?js
+//configSptcFileCache('ll', 1919)
+echo(`aaaD=>`+DDD)
+define('RRR', 44)
+echo($_GLOBAL['x'], '::>JJJv,v2222:')

package/tests/www/{index.sjs → index.s}

@@ -1,5 +1,18 @@
 <?js
+
+
+$_GLOBAL['x']='999x'
+configSptcFileCache('eob0', 100)
+
 echo($_REQUEST_FILE)
+
+define('DDD', 2)
+include(__dirname+'/cc.s')
+
+echo('oaawecR=>'+RRR, Math.random())
+
+/*
+
 echo('aaaa<pre>')
 var_dump($_GLOBAL, this)
 
@@ -15,3 +28,4 @@ Sync.Push((async _=>{
 	}
 	echo('--done--')
 })())
+*/

package/utils/compileFile.js

@@ -3,23 +3,25 @@ const {mtime, readTextFile}=require('./base')
 const _caches={}
 function compileFile(filename, option) {
   const {
-    cacheKeyWrapper=x=>x,
     contentWrapper=x=>x,
     mockFileContent=null,
     compileFunc=x=>x,
-    statExpires=-1,
+    statExpires=-1, cacheVersion='',
     customCache,
   }=option
 
+  const cacheKeyWrapper=statExpires>0?
+    fn=>(option.cacheVersion || '')+'-'+fn:
+    fn=>fn
+
   if(mockFileContent) {
     return compileFunc(contentWrapper(mockFileContent))
   }
 
   const caches=customCache || _caches
-
   const cacheKey=cacheKeyWrapper(filename)
   let _e=caches[filename]
-  const file_mt=(!_e || statExpires<=0 || _e.modify_t-Date.now()>statExpires)?
+  const file_mt=(!_e || statExpires<=0 || Date.now()-_e.modify_t>statExpires*1e3)?
     mtime(filename):
     _e.file_mt
 

package/utils/dir.js

@@ -0,0 +1,46 @@
+const fs=require('fs')
+const {safe_path}=require('./base')
+
+function fsize(b) {
+  const u=['b', 'kb', 'mb', 'gb']
+  let i=0;
+  for(; i<u.length-1; i++) {
+    if(b<1024) break
+    b/=1024
+  }
+  return b.toFixed(1)+u[i]
+}
+
+function listdir(ref, dir) {
+  const ret={
+    dirs: [],
+    files: [],
+  }
+  try{
+    const ls=fs.readdirSync(safe_path(ref, dir))
+    for(let a of ls) try{
+      const fn=safe_path(ref, dir+'/'+a)
+      const stat=fs.statSync(fn)
+      const dfn=safe_path(dir.substr(1), a)
+      if(stat.isFile()) {
+        ret.files.push({
+          dfn,
+          fn: a,
+          size: fsize(stat.size),
+        })
+      }else{
+        ret.dirs.push({
+          dfn,
+          fn: a,
+        })
+      }
+    }catch(e) {}
+  }catch(e) {
+    ret.error=new Error('`'+dir+'` permission denied')
+  }
+  return ret
+}
+
+module.exports={
+  listdir,
+}

package/utils/index.js

@@ -3,4 +3,5 @@ module.exports={
   ...require('./compileFile'),
   ...require('./base'),
   ...require('./fpm'),
+  ...require('./dir'),
 }