sptc 0.0.12 → 0.0.14

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

@@ -42,7 +42,7 @@ function executeSptcFileEx(...x) {
   		  if(!is_str && typeof x==='string') x=Buffer.concat(x)
   		  xbuf.push(x)
   		}
-  		resolve(xbuf)
+  		resolve(is_str? xbuf.join(''): Buffer.concat(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}
@@ -190,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=>{
@@ -313,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.12",
+  "version": "0.0.14",
   "description": "Simple Pretreat Toolkit CLI",
   "main": "index.js",
   "engines": {

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,
 }