yencode 1.2.3 → 1.2.4

package/binding.gyp

@@ -2,14 +2,15 @@
   "variables": {
     "enable_native_tuning%": 1,
     "disable_avx256%": 0,
-    "disable_crcutil%": 0
+    "disable_crcutil%": 0,
+    "built_with_electron%": 0
   },
   "target_defaults": {
     "conditions": [
       ['target_arch=="ia32"', {
         "msvs_settings": {"VCCLCompilerTool": {"EnableEnhancedInstructionSet": "2"}}
       }],
-      ['OS!="win" and enable_native_tuning!=0', {
+      ['OS!="win" and enable_native_tuning!=0 and target_arch==host_arch and (built_with_electron==0 or host_arch!="x64")', {
         "variables": {
           "supports_native%": "<!(<!(echo ${CXX_target:-${CXX:-c++}}) -MM -E src/common.h -march=native 2>/dev/null || true)"
         },
@@ -20,7 +21,8 @@
             "xcode_settings": {
               "OTHER_CFLAGS": ["-march=native"],
               "OTHER_CXXFLAGS": ["-march=native"],
-            }
+            },
+            "defines": ["YENC_BUILD_NATIVE=1"]
           }]
         ]
       }],
@@ -45,9 +47,6 @@
       ['disable_crcutil!=0', {
         "defines": ["YENC_DISABLE_CRCUTIL=1"]
       }],
-      ['OS!="win" and enable_native_tuning!=0', {
-        "defines": ["YENC_BUILD_NATIVE=1"]
-      }],
       ['OS!="win"', {
         "variables": {
           "missing_memalign%": "<!(<!(echo ${CXX_target:-${CXX:-c++}}) -c src/test_alignalloc.cc -o /dev/null -Werror 2>/dev/null || echo failed)",

package/index.js

@@ -3,6 +3,7 @@
 var y = require('./build/Release/yencode.node');
 
 var toBuffer = Buffer.alloc ? Buffer.from : Buffer;
+var allocBuffer = (Buffer.allocUnsafe || Buffer);
 var bufferSlice = Buffer.prototype.readBigInt64BE ? Buffer.prototype.subarray : Buffer.prototype.slice;
 
 var nl = toBuffer([13, 10]);
@@ -125,9 +126,17 @@ var propIsNotValidNumber = function(prop) {
 module.exports = {
 	encoding: 'utf8',
 	
-	encode: y.encode,
+	encode: y.encode || function(data, line_size, column_offset) {
+		var buffer = allocBuffer(module.exports.maxSize(data.length, line_size));
+		var length = y.encodeTo(data, buffer, line_size, column_offset);
+		return bufferSlice.call(buffer, 0, length);
+	},
 	encodeTo: y.encodeTo,
-	decode: y.decode,
+	decode: y.decode || function(data, stripDots) {
+		var buffer = allocBuffer(data.length);
+		var length = y.decodeTo(data, buffer, stripDots);
+		return bufferSlice.call(buffer, 0, length);
+	},
 	decodeTo: y.decodeTo,
 	
 	decodeChunk: function(data, output, prev) {
@@ -157,7 +166,13 @@ module.exports = {
 			}
 			if(state < 0) state = decodePrev.indexOf('');
 		}
-		var ret = y.decodeIncr(data, state, output);
+		var ret;
+		if(!output && !y.decode) {
+			output = allocBuffer(data.length);
+			ret = y.decodeIncr(data, state, output);
+			ret.output = bufferSlice.call(output, 0, ret.written);
+		} else
+			ret = y.decodeIncr(data, state, output);
 		
 		return {
 			read: ret.read,
@@ -199,13 +214,17 @@ module.exports = {
 		if(!Buffer.isBuffer(data)) data = toBuffer(data);
 		
 		filename = toBuffer(filename.replace(RE_BADCHAR, '').substring(0, 256), exports.encoding);
-		var e = encodeCrc(data, line_size);
-		return Buffer.concat([
-			toBuffer('=ybegin line='+line_size+' size='+data.length+' name='),
-			filename, nl,
-			e.output,
-			toBuffer('\r\n=yend size='+data.length+' crc32=' + e.crc32.toString('hex'))
-		]);
+		
+		var yBegin = '=ybegin line='+line_size+' size='+data.length+' name=';
+		var yEnd = '\r\n=yend size='+data.length+' crc32=';
+		var ret = allocBuffer(yBegin.length + filename.length + 2 + module.exports.maxSize(data.length, line_size) + yEnd.length + 8);
+		
+		var writePos = ret.write(yBegin);
+		writePos += filename.copy(ret, writePos);
+		writePos += nl.copy(ret, writePos);
+		writePos += y.encodeTo(data, bufferSlice.call(ret, writePos), line_size);
+		writePos += ret.write(yEnd + y.crc32(data).toString('hex'), writePos);
+		return bufferSlice.call(ret, 0, writePos);
 	},
 	multi_post: function(filename, size, parts, line_size) {
 		return new YEncoder(filename, size, parts, line_size);
@@ -325,7 +344,7 @@ module.exports = {
 			warnings.push(DecoderWarning('size_mismatch', 'Size specified for part exceeds size specified for whole file'));
 		
 		if(ret.dataStart) {
-			ret.data = y.decode(bufferSlice.call(data, ret.dataStart, ret.dataEnd), !!isRaw);
+			ret.data = module.exports.decode(bufferSlice.call(data, ret.dataStart, ret.dataEnd), !!isRaw);
 			ret.crc32 = y.crc32(ret.data);
 			var hexCrc = ret.crc32.toString('hex');
 			
@@ -403,16 +422,19 @@ YEncoder.prototype = {
 			this.yInfo = null;
 		}
 		
-		var ret = Buffer.concat([
-			toBuffer('=ybegin part='+this.part),
-			yInfo,
-			toBuffer('=ypart begin='+( this.pos+1 )+' end='+end+'\r\n'),
-			y.encode(data, this.line_size),
-			toBuffer('\r\n=yend size='+data.length+' part='+this.part+' pcrc32='+crc.toString('hex')+fullCrc)
-		]);
+		var yBegin = '=ybegin part='+this.part;
+		var yPart = '=ypart begin='+( this.pos+1 )+' end='+end+'\r\n';
+		var yEnd = '\r\n=yend size='+data.length+' part='+this.part+' pcrc32='+crc.toString('hex')+fullCrc;
+		var ret = allocBuffer(yBegin.length + yInfo.length + yPart.length + module.exports.maxSize(data.length, this.line_size) + yEnd.length);
+		
+		var writePos = ret.write(yBegin);
+		writePos += yInfo.copy(ret, writePos);
+		writePos += ret.write(yPart, writePos);
+		writePos += y.encodeTo(data, bufferSlice.call(ret, writePos), this.line_size);
+		writePos += ret.write(yEnd, writePos);
 		
 		this.pos = end;
-		return ret;
+		return bufferSlice.call(ret, 0, writePos);
 	},
 	
 	_encodeSingle: function(data) {
@@ -428,10 +450,12 @@ YEncoder.prototype = {
 		
 		var yInfo = this.yInfo;
 		this.yInfo = null;
-		return Buffer.concat([
-			yInfo,
-			y.encode(data, this.line_size),
-			toBuffer('\r\n=yend size='+data.length+' crc32=' + this.crc.toString('hex'))
-		]);
+		
+		var tail = '\r\n=yend size='+data.length+' crc32=' + this.crc.toString('hex');
+		var ret = allocBuffer(yInfo.length + module.exports.maxSize(data.length, this.line_size) + tail.length);
+		var writePos = yInfo.copy(ret);
+		writePos += y.encodeTo(data, bufferSlice.call(ret, writePos), this.line_size);
+		writePos += ret.write(tail, writePos);
+		return bufferSlice.call(ret, 0, writePos);
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yencode",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "SIMD accelerated yEnc encoder/decoder and CRC32 calculator",
   "keywords": [
     "yenc",

package/src/common.h

@@ -40,6 +40,11 @@
 	// MSVC doesn't support C11 aligned_alloc: https://stackoverflow.com/a/62963007
 	#define ALIGN_ALLOC(buf, len, align) *(void**)&(buf) = _aligned_malloc((len), align)
 	#define ALIGN_FREE _aligned_free
+#elif defined(__ANDROID__)
+	// Android NDK may have broken std::aligned_alloc [https://github.com/android/ndk/issues/1339]
+	#include <malloc.h>
+	#define ALIGN_ALLOC(buf, len, align) *(void**)&(buf) = memalign(align, (len))
+	#define ALIGN_FREE free
 #elif defined(_ISOC11_SOURCE)
 	// C11 method
 	// len needs to be a multiple of alignment, although it sometimes works if it isn't...

package/src/crc.cc

@@ -198,9 +198,7 @@ namespace RapidYenc {
 # include <Windows.h>
 #endif
 #ifdef PLATFORM_ARM
-# ifdef __ANDROID__
-#  include <cpu-features.h>
-# elif defined(__APPLE__)
+# if defined(__APPLE__)
 #  include <sys/types.h>
 #  include <sys/sysctl.h>
 # elif defined(__has_include)
@@ -217,6 +215,9 @@ static unsigned long getauxval(unsigned long cap) {
 #    include <asm/hwcap.h>
 #   endif
 #  endif
+#  if defined(__ANDROID__) && __has_include(<cpu-features.h>)
+#   include <cpu-features.h>
+#  endif
 # endif
 #endif
 #if defined(__riscv) && defined(__has_include)

package/src/platform.cc

@@ -1,8 +1,6 @@
 #include "common.h"
 #ifdef PLATFORM_ARM
-# ifdef __ANDROID__
-#  include <cpu-features.h>
-# elif defined(_WIN32)
+# if defined(_WIN32)
 #  define WIN32_LEAN_AND_MEAN
 #  define NOMINMAX
 #  include <Windows.h>
@@ -16,6 +14,9 @@
 #    include <asm/hwcap.h>
 #   endif
 #  endif
+#  if defined(__ANDROID__) && __has_include(<cpu-features.h>)
+#   include <cpu-features.h>
+#  endif
 # endif
 bool RapidYenc::cpu_supports_neon() {
 # if defined(AT_HWCAP)

package/src/yencode.cc

@@ -13,6 +13,11 @@
 using namespace v8;
 using namespace RapidYenc;
 
+#ifdef V8_ENABLE_SANDBOX
+// V8 Memory Cage is enabled - no external buffers allowed
+# define YENC_NO_EXTERNAL_BUFFER 1
+#endif
+
 static void free_buffer(char* data, void* _size) {
 #if !NODE_VERSION_AT_LEAST(0, 11, 0)
 	int size = (int)(size_t)_size;
@@ -101,6 +106,7 @@ static inline size_t YENC_MAX_SIZE(size_t len, size_t line_size) {
 #endif
 
 
+#ifndef YENC_NO_EXTERNAL_BUFFER
 // encode(str, line_size, col)
 FUNC(Encode) {
 	FUNC_START;
@@ -135,6 +141,7 @@ FUNC(Encode) {
 	MARK_EXT_MEM(len);
 	RETURN_VAL( NEW_BUFFER((char*)result, len, free_buffer, (void*)len) );
 }
+#endif
 
 FUNC(EncodeTo) {
 	FUNC_START;
@@ -205,6 +212,9 @@ FUNC(EncodeIncr) {
 			}
 		}
 	}
+#ifdef YENC_NO_EXTERNAL_BUFFER
+	if(allocResult) RETURN_ERROR("Destination buffer must be supplied as buffer allocation isn't enabled in this build");
+#endif
 	
 	Local<Object> ret = NEW_OBJECT;
 	
@@ -215,24 +225,29 @@ FUNC(EncodeIncr) {
 		RETURN_VAL( ret );
 	}
 	
+#ifndef YENC_NO_EXTERNAL_BUFFER
 	if(allocResult) {
 		// allocate enough memory to handle worst case requirements
 		size_t dest_len = YENC_MAX_SIZE(arg_len, line_size);
 		result = (unsigned char*) malloc(dest_len);
 	}
+#endif
 	
 	size_t len = encode(line_size, &col, (const unsigned char*)node::Buffer::Data(args[0]), result, arg_len, false);
 	
 	SET_OBJ(ret, "written", Integer::New(ISOLATE len));
+#ifndef YENC_NO_EXTERNAL_BUFFER
 	if(allocResult) {
 		result = (unsigned char*)realloc(result, len);
 		SET_OBJ(ret, "output", NEW_BUFFER((char*)result, len, free_buffer, (void*)len));
 		MARK_EXT_MEM(len);
 	}
+#endif
 	SET_OBJ(ret, "col", Integer::New(ISOLATE col));
 	RETURN_VAL( ret );
 }
 
+#ifndef YENC_NO_EXTERNAL_BUFFER
 FUNC(Decode) {
 	FUNC_START;
 	
@@ -253,6 +268,7 @@ FUNC(Decode) {
 	MARK_EXT_MEM(len);
 	RETURN_VAL( NEW_BUFFER((char*)result, len, free_buffer, (void*)len) );
 }
+#endif
 
 FUNC(DecodeTo) {
 	FUNC_START;
@@ -301,6 +317,10 @@ FUNC(DecodeIncr) {
 		}
 	}
 	
+#ifdef YENC_NO_EXTERNAL_BUFFER
+	if(allocResult) RETURN_ERROR("Destination buffer must be supplied as buffer allocation isn't enabled in this build");
+#endif
+	
 	const unsigned char* src = (const unsigned char*)node::Buffer::Data(args[0]);
 	const unsigned char* sp = src;
 #ifdef DBG_ALIGN_SOURCE
@@ -309,11 +329,15 @@ FUNC(DecodeIncr) {
 	sp = (const unsigned char*)newSrc;
 #endif
 	
+#ifndef YENC_NO_EXTERNAL_BUFFER
 	if(allocResult) result = (unsigned char*) malloc(arg_len);
+#endif
 	unsigned char* dp = result;
 	YencDecoderEnd ended = RapidYenc::decode_end((const void**)&sp, (void**)&dp, arg_len, &state);
 	size_t len = dp - result;
+#ifndef YENC_NO_EXTERNAL_BUFFER
 	if(allocResult) result = (unsigned char*)realloc(result, len);
+#endif
 	
 #ifdef DBG_ALIGN_SOURCE
 	free(newSrc);
@@ -322,10 +346,12 @@ FUNC(DecodeIncr) {
 	Local<Object> ret = NEW_OBJECT;
 	SET_OBJ(ret, "read", Integer::New(ISOLATE sp - src));
 	SET_OBJ(ret, "written", Integer::New(ISOLATE len));
+#ifndef YENC_NO_EXTERNAL_BUFFER
 	if(allocResult) {
 		SET_OBJ(ret, "output", NEW_BUFFER((char*)result, len, free_buffer, (void*)len));
 		MARK_EXT_MEM(len);
 	}
+#endif
 	SET_OBJ(ret, "ended", Integer::New(ISOLATE (int)ended));
 	SET_OBJ(ret, "state", Integer::New(ISOLATE state));
 	RETURN_VAL( ret );
@@ -468,10 +494,12 @@ void yencode_init(
 )
 #endif
 {
+#ifndef YENC_NO_EXTERNAL_BUFFER
 	NODE_SET_METHOD(exports, "encode", Encode);
+	NODE_SET_METHOD(exports, "decode", Decode);
+#endif
 	NODE_SET_METHOD(exports, "encodeTo", EncodeTo);
 	NODE_SET_METHOD(exports, "encodeIncr", EncodeIncr);
-	NODE_SET_METHOD(exports, "decode", Decode);
 	NODE_SET_METHOD(exports, "decodeTo", DecodeTo);
 	NODE_SET_METHOD(exports, "decodeIncr", DecodeIncr);
 	NODE_SET_METHOD(exports, "crc32", CRC32);