sptc 0.0.35 → 0.0.37

package/bin/sptc.js

@@ -1,15 +1,15 @@
-#!/usr/bin/env node
-
-const {NodeCGI}=require('../dist/httpServer')
-const {Command}=require('commander')
-const version=require('../package.json').version
-const program=new Command()
-  .name(`sptc`)
-  .description(`sptc`)
-  .version(version)
-  .arguments('<filename>', 'Sptc filename.')
-  .option('-d, --defines <string>', 'Macro definition switches. Separate multiple switches with a comma.', '')
-  .action((filename, {defines})=>{
-    NodeCGI(filename, defines)
-  })
-  .parse()
+#!/usr/bin/env node
+
+const {NodeCGI}=require('../dist/httpServer')
+const {Command}=require('commander')
+const version=require('../package.json').version
+const program=new Command()
+  .name(`sptc`)
+  .description(`sptc`)
+  .version(version)
+  .arguments('<filename>', 'Sptc filename.')
+  .option('-d, --defines <string>', 'Macro definition switches. Separate multiple switches with a comma.', '')
+  .action((filename, {defines})=>{
+    NodeCGI(filename, defines)
+  })
+  .parse()

package/bin/sptcd.js

@@ -1,78 +1,78 @@
-#!/usr/bin/env node
-
-const {FastCGI, FastCGI_FPM}=require('../dist/httpServer')
-const {Command}=require('commander')
-const version=require('../package.json').version
-const program=new Command()
-  .name(`sptc http server`)
-  .description(`A simple HTTP server`)
-  .version(version)
-  .requiredOption('-p, --port <number>', 'The port to serve on.', 9090)
-  .option('-l, --locally', 'Only accepts local connections.')
-  .option('-w, --workdir <string>', 'Specifies the working directory.', '.')
-  .option('-r, --router <string>', 'Specifies a file to use as a router entry. If specified, all requests will be routed to this file.')
-  .option('-e, --exts <string>', 'Specifies the valid extensions for executable SPTC files.', '.s, .sjs, .sptc')
-  .option('-n, --workers <number>', 'The number of worker processes.', 1)
-  .option('-s, --silent', 'Enables silent mode.')
-  .option('-t, --traverse', 'If the pathname is a directory, executes the index file under the pathname directory if one exists. If no index file is found, traverses the directory. This option is ignored if a router file is specified.')
-  .option('-d, --debug', 'Enables debug mode.')
-  .action(({
-    port,
-    locally,
-    workdir,
-    router,
-    exts,
-    workers,
-    slient,
-    traverse,
-    debug,
-  })=>{
-    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=>{
-        const r=x.trim()
-        return r.indexOf('.')===0? r: '.'+r
-      }).filter(x=>x),
-      debug,
-      traverse,
-    }]
-
-    if(workers>1) {
-      FastCGI_FPM(workers, ...argv)
-    }else{
-      FastCGI(...argv)
-    }
-
-    if(disableLog) return;
-  	const {getLocalIpv4Addresses}=require('../utils')
-    console.log('`sptc-http-server` has been launched with the following option:')
-    const o={
-      debug,
-      workdir,
-      routerEntry: router || null,
-    }
-    o.traverse=traverse? true: false
-    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()
+#!/usr/bin/env node
+
+const {FastCGI, FastCGI_FPM}=require('../dist/httpServer')
+const {Command}=require('commander')
+const version=require('../package.json').version
+const program=new Command()
+  .name(`sptc http server`)
+  .description(`A simple HTTP server`)
+  .version(version)
+  .requiredOption('-p, --port <number>', 'The port to serve on.', 9090)
+  .option('-l, --locally', 'Only accepts local connections.')
+  .option('-w, --workdir <string>', 'Specifies the working directory.', '.')
+  .option('-r, --router <string>', 'Specifies a file to use as a router entry. If specified, all requests will be routed to this file.')
+  .option('-e, --exts <string>', 'Specifies the valid extensions for executable SPTC files.', '.s, .sjs, .sptc')
+  .option('-n, --workers <number>', 'The number of worker processes.', 1)
+  .option('-s, --silent', 'Enables silent mode.')
+  .option('-t, --traverse', 'If the pathname is a directory, executes the index file under the pathname directory if one exists. If no index file is found, traverses the directory. This option is ignored if a router file is specified.')
+  .option('-d, --debug', 'Enables debug mode.')
+  .action(({
+    port,
+    locally,
+    workdir,
+    router,
+    exts,
+    workers,
+    slient,
+    traverse,
+    debug,
+  })=>{
+    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=>{
+        const r=x.trim()
+        return r.indexOf('.')===0? r: '.'+r
+      }).filter(x=>x),
+      debug,
+      traverse,
+    }]
+
+    if(workers>1) {
+      FastCGI_FPM(workers, ...argv)
+    }else{
+      FastCGI(...argv)
+    }
+
+    if(disableLog) return;
+  	const {getLocalIpv4Addresses}=require('../utils')
+    console.log('`sptc-http-server` has been launched with the following option:')
+    const o={
+      debug,
+      workdir,
+      routerEntry: router || null,
+    }
+    o.traverse=traverse? true: false
+    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/engine/interpreter.js

@@ -80,16 +80,6 @@ function buildGlobal() {
   return ctx
 }
 
-let _patched=false
-function securityPatch() {
-  if(_patched) return;
-  _patched=true
-  const sfunc=(new vm.Script(`(_=>null).constructor`)).runInNewContext({})
-  parseInt.constructor.prototype.constructor=sfunc
-  global.Function=sfunc
-  global.global=buildGlobal()
-}
-
 const NOOP=_=>null
 const Application={}
 function buildContext(ctx0, option) {
@@ -246,9 +236,20 @@ function buildContext(ctx0, option) {
     const jsvm=Utils.compileFile(inc, {
       compileFunc: code=>new vm.Script(code+'; Symbol()[0]=_=>0', inc)
     })
+
+    /*
     const jsctx={
       ...inc_payload,
-    }
+    }*/
+
+    const [jsctx]=buildContext({
+      ...ctx0,
+      ...inc_payload,
+    }, {
+      isEntry: false,
+      masterPriv: priv,
+    })
+
     jsvm.runInNewContext(jsctx)
     return jsctx
   }
@@ -273,12 +274,13 @@ function buildContext(ctx0, option) {
             return priv.__autoload_vars[prop]=ctx.include(inc_fn)[prop]
           }
         }
+        if(global[prop]) return global[prop]
       }
       return Reflect.get(target, prop, receiver)
     },
   })
 
-  return [{...pctx}, priv]
+  return [pctx, priv]
 }
 
 function toWritable(x) {
@@ -332,5 +334,4 @@ function executeVm(vm, ctx, priv) {
 module.exports={
   buildContext,
   executeVm,
-  securityPatch,
 }

package/package.json

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