sptc 0.0.11 → 0.0.13

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')

package/engine/index.js

@@ -28,14 +28,21 @@ function executeSptcFile(filename, payload, option={}) {
 
 function executeSptcFileEx(...x) {
 	const e=new Promise((resolve, reject)=>{
-  	const {end, onError, readAsBinary}=(x[2]=x[2] || {})
+  	const {end, onError}=(x[2]=x[2] || {})
   	const buf=[]
   	x[2].write=(...x)=>{
   		buf.push(...x)
   	}
   	x[2].end=_=>{
   		end && end()
-  		resolve(readAsBinary? Buffer.concat(buf): buf.join(''))
+  		const xbuf=[]
+  		const is_str=typeof buf[0]==='string'
+  		for(let x of buf) {
+  			if(is_str && typeof x!=='string') x=x.toString('utf8')
+  		  if(!is_str && typeof x==='string') x=Buffer.concat(x)
+  		  xbuf.push(x)
+  		}
+  		resolve(xbuf)
   	}
   	x[2].onError=e=>{
   		onError && onError(e)

package/engine/interpreter.js

@@ -2,7 +2,7 @@ const _module=require('module')
 const vm=require('vm')
 const path=require('path')
 const Compiler=require('./compiler')
-const {generate_uuid}=require('../utils')
+const {generate_uuid, PromiseWithResolvers}=require('../utils')
 
 /*
   const tt={x: 2, b: [2, 5], c: _=>2, d: /xx/ig}
@@ -132,7 +132,6 @@ function buildContext(ctx0, option) {
     end=NOOP,
     onError=NOOP,
     masterPriv=null,
-    readAsBinary=false,
     isEntry=false,
   }=option
 
@@ -174,7 +173,7 @@ function buildContext(ctx0, option) {
   ctx.flush=_=>{
     if(priv.isEnd) return;
     const {echos}=priv
-    echos.splice(0).map(x=>write(toWritable(x, readAsBinary)))
+    echos.splice(0).map(x=>write(toWritable(x)))
   }
 
   ctx.var_dump=(...x)=>{
@@ -191,6 +190,11 @@ function buildContext(ctx0, option) {
       }
       priv.syncs.push(...x)
     },
+    Lock: _=>{
+      const lock=PromiseWithResolvers()
+      priv.syncs.push(lock.promise)
+      return _=>lock.resolve()
+    },
   }
 
   ctx.defer=fn=>{
@@ -235,7 +239,6 @@ function buildContext(ctx0, option) {
       write: option.write,
       onError: option.onError,
       masterPriv: priv,
-      readAsBinary,
       isEntry: false,
     })
     const ret=executeVm(_vm, _ctx, priv)
@@ -281,21 +284,18 @@ function buildContext(ctx0, option) {
   return [pctx, priv]
 }
 
-function toWritable(x, asBinary=false) {
+function toWritable(x) {
   if(x && [Uint8Array, Buffer].includes(x.constructor)) {
-    return asBinary? x: Buffer.from(x).toString('utf8')
+    return x
   }
-  const str=(_=>{
-    if(typeof x==='string') return x
-    if(typeof x==='undefined') return 'undefined'
-    if(typeof x==='number') {
-      if(isNaN(x))return 'NaN'
-      if(x===Infinity) return 'Infinity'
-      if(x===-Infinity) return '-Infinity'
-    }
-    return JSON.stringify(x)+''
-  })()
-  return asBinary? Buffer.from(str): str
+  if(typeof x==='string') return x
+  if(typeof x==='undefined') return 'undefined'
+  if(typeof x==='number') {
+    if(isNaN(x))return 'NaN'
+    if(x===Infinity) return 'Infinity'
+    if(x===-Infinity) return '-Infinity'
+  }
+  return JSON.stringify(x)+''
 }
 
 function executeVm(vm, ctx, priv) {
@@ -318,6 +318,7 @@ function executeVm(vm, ctx, priv) {
       onError(e)
     }
 
+    if(!isMaster) return;
     for(let fn of priv._defers.splice(0)) {
       try{
         fn()

package/package.json

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

package/tests/www/stream.s

@@ -0,0 +1,4 @@
+<?js
+
+echo(Buffer.from([1, 65]))
+echo('bbbbb')

package/utils/base.js

@@ -53,6 +53,15 @@ function getLocalIpv4Addresses() {
   return Object.keys(rr)
 }
 
+function PromiseWithResolvers() {
+  let _resolve, _reject
+  const promise=new Promise((resolve, reject)=>{
+    _resolve=resolve
+    _reject=reject
+  })
+  return {promise, resolve: _resolve, reject: _reject}
+}
+
 module.exports={
   readTextFile,
   mtime,
@@ -62,4 +71,5 @@ module.exports={
   generate_uuid,
   getExtension,
   getLocalIpv4Addresses,
+  PromiseWithResolvers,
 }