node-liblzma 1.0.4-8 → 1.1.4

package/src/bindings/node-liblzma.hpp

@@ -1,115 +1,87 @@
 /**
- * node-liblzma - Node.js bindings for liblzma
- * Copyright (C) 2014-2015 Olivier Orabona <olivier.orabona@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- **/
+	* node-liblzma - Node.js bindings for liblzma
+	* Copyright (C) 2014-2015 Olivier Orabona <olivier.orabona@gmail.com>
+	*
+	* This program is free software: you can redistribute it and/or modify
+	* it under the terms of the GNU Lesser General Public License as published by
+	* the Free Software Foundation, either version 3 of the License, or
+	* (at your option) any later version.
+	*
+	* This program is distributed in the hope that it will be useful,
+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	* GNU General Public License for more details.
+	*
+	* You should have received a copy of the GNU Lesser General Public License
+	* along with this program. If not, see <https://www.gnu.org/licenses/>.
+	**/
 
 #ifndef BUILDING_NODE_EXTENSION
 #define BUILDING_NODE_EXTENSION
 #endif
 
 #ifndef NODE_LIBLZMA_H
-# define NODE_LIBLZMA_H
-
-#include <node.h>
-#include <node_object_wrap.h>
-#include <v8.h>
-#include <nan.h>
-
-using v8::Array;
-using v8::Context;
-using v8::Function;
-using v8::FunctionTemplate;
-using v8::Handle;
-using v8::Local;
-using v8::Object;
-using v8::Persistent;
-using v8::String;
-using v8::Value;
+#define NODE_LIBLZMA_H
 
-#include <sstream>
-
-#ifdef LIBLZMA_ENABLE_MT
-# warning "Building with (unstable) multithread support"
-# define LZMA_UNSTABLE
-#endif
 #include <lzma.h>
+#include <napi.h>
 
-#define STREAM_ENCODE 0
-#define STREAM_DECODE 1
-#define STREAM_ENCODE_MT 2
-
-#define CONST_UINT32(target, value) \
-  target->Set(String::NewSymbol(#value), Uint32::New(value), \
-      static_cast<PropertyAttribute>(ReadOnly|DontDelete));
+#include <sstream>
 
-#ifndef ARRAY_SIZE
-# define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
+constexpr unsigned int STREAM_ENCODE = 0;
+constexpr unsigned int STREAM_DECODE = 1;
+constexpr unsigned int STREAM_ENCODE_MT = 2;
 
-/**
- * Create a new v8 String
- */
-template<typename T>
-inline Local<String> NewString(T value) {
-  return Nan::New<String>(value).ToLocalChecked();
-}
-
-class LZMA : public Nan::ObjectWrap {
+class LZMAWorker;
+class LZMA : public Napi::ObjectWrap<LZMA> {
 public:
-  static void Init(Local<Object> exports);
+	static void Init(Napi::Env env, Napi::Object exports);
 
-private:
-  explicit LZMA() : ObjectWrap(), _stream(LZMA_STREAM_INIT),
-    _wip(false), _pending_close(false)
-  {
-  }
-  ~LZMA() {
-    Nan::AdjustExternalMemory(-int64_t(sizeof(LZMA)));
-    Close();
-  }
+	explicit LZMA(const Napi::CallbackInfo& info);
+	~LZMA() = default;
 
-  void Close();
+  Napi::Value Close(const Napi::CallbackInfo &info);
+  Napi::Value Close(const Napi::Env &env);
 
-  static NAN_METHOD(New);
-  static NAN_METHOD(Close);
+	template<bool async>
+  Napi::Value Code(const Napi::CallbackInfo &info);
 
-  template<bool async>
-  static NAN_METHOD(Code);
+	static void Process(LZMA* obj);
+	static void After(Napi::Env env, LZMA* obj /*, int status */);
+	static Napi::Value AfterSync(const Napi::CallbackInfo &info, LZMA* obj);
 
 private:
-  static void Process(uv_work_t* work_req);
-  static void After(uv_work_t* work_req, int status);
-  static Local<Value> AfterSync(LZMA* obj);
-
-  static Nan::Persistent<Function> constructor;
+	lzma_stream _stream;
+	bool _wip;
+	bool _pending_close;
 
-  static void _failMissingSelf(const Nan::FunctionCallbackInfo<Value>& info) {
-  	Nan::ThrowTypeError("LZMA methods need to be called on an LZMA object");
-  	info.GetReturnValue().SetUndefined();
-  }
+  LZMAWorker* _worker;
 
-  uv_work_t _req;
-
-  lzma_stream _stream;
-  bool _wip;
-  bool _pending_close;
+	lzma_action _action;
+	Napi::FunctionReference _callback;
+	lzma_ret _ret;
+  lzma_filter *filters;
+};
 
-  lzma_action _action;
-  Nan::Callback _callback;
-  lzma_ret _ret;
+class LZMAWorker : public Napi::AsyncWorker {
+	public:
+		LZMAWorker(Napi::Env env, LZMA* instance) : AsyncWorker(env), lzma(instance) { }
+		~LZMAWorker() = default;
+
+		void Execute() {
+			LZMA::Process(this->lzma);
+		}
+		void OnOK() {
+			Napi::HandleScope scope(Env());
+			LZMA::After(Env(), this->lzma);
+		}
+		void OnError(const Napi::Error& e) {
+			Napi::HandleScope scope(Env());
+			LZMA::After(Env(), this->lzma);
+		}
+
+	private:
+		LZMA *lzma;
 };
 
 #endif // NODE_LIBLZMA_H

package/src/lzma.coffee

@@ -1,6 +1,6 @@
 ###
  * node-liblzma - Node.js bindings for liblzma
- * Copyright (C) 2014-2015 Olivier Orabona <olivier.orabona@gmail.com>
+ * Copyright (C) Olivier Orabona <olivier.orabona@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ###
 
-liblzma = require '../build/Release/node-liblzma.node'
+path = require 'path'
+binding_path = path.resolve path.join __dirname, '..'
 
+liblzma = require('node-gyp-build')(binding_path)
 util = require 'util'
 assert = require 'assert'
 os = require 'os'
@@ -64,7 +66,7 @@ class XzStream extends Transform
     @_closed = false
     @_hadError = false
     @_offset = 0
-    @_buffer = new Buffer @_chunkSize
+    @_buffer = Buffer.alloc @_chunkSize
 
     @on 'onerror', (errno) =>
       @_hadError = true
@@ -77,7 +79,7 @@ class XzStream extends Transform
     @once 'end', @close
 
   flush: (kind, callback) ->
-    ws = @_writableState;
+    ws = @_writableState
 
     if (typeof kind == 'function' or (typeof kind == 'undefined' && !callback))
       [callback, kind] = [kind, liblzma.LZMA_SYNC_FLUSH]
@@ -94,7 +96,7 @@ class XzStream extends Transform
         return
     else
       @_flushFlag = kind
-      @write new Buffer(0), '', callback
+      @write Buffer.alloc(0), '', callback
 
     return
 
@@ -119,8 +121,8 @@ class XzStream extends Transform
     ws = @_writableState
     ending = ws.ending or ws.ended
     last = ending and (not chunk or ws.length is chunk.length)
-    return callback(new Error("invalid input"))  if chunk != null and !(chunk instanceof Buffer)
-    return callback(new Error("lzma binding closed"))  if @_closed
+    return callback(new Error("invalid input")) if chunk != null and !(chunk instanceof Buffer)
+    return callback(new Error("lzma binding closed")) if @_closed
 
     # If it's the last chunk, or a final flush, we use the LZMA_FINISH flush flag.
     # If it's explicitly flushing at some other time, then we use
@@ -132,13 +134,13 @@ class XzStream extends Transform
 
       # once we've flushed the last of the queue, stop flushing and
       # go back to the normal behavior.
-      @_flushFlag = @_opts.flushFlag or liblzma.LZMA_RUN  if chunk.length >= ws.length
+      @_flushFlag = @_opts.flushFlag or liblzma.LZMA_RUN if chunk.length >= ws.length
 
     @_processChunk chunk, flushFlag, callback
     return
 
   _flush: (callback) ->
-    @_transform new Buffer(0), '', callback
+    @_transform Buffer.alloc(0), '', callback
     return
 
   _processChunk: (chunk, flushFlag, cb) ->
@@ -173,7 +175,7 @@ class XzStream extends Transform
       assert used >= 0, "More bytes after than before! Delta = #{used}"
 
       if used > 0
-        out = @_buffer[@_offset...@_offset+used]
+        out = @_buffer[ @_offset ... @_offset + used ]
         @_offset += used
         if async
           @push out
@@ -185,7 +187,7 @@ class XzStream extends Transform
       if availOutAfter is 0 or @_offset >= @_chunkSize
         availOutBefore = @_chunkSize
         @_offset = 0
-        @_buffer = new Buffer @_chunkSize
+        @_buffer = Buffer.alloc @_chunkSize
 
       if availOutAfter is 0 or availInAfter > 0
         inOff += (availInBefore - availInAfter)
@@ -251,23 +253,26 @@ exports.messages = [
   "Programming error"
 ]
 
-exports.check =
+exports.check = {
   "NONE": liblzma.LZMA_CHECK_NONE
   "CRC32": liblzma.LZMA_CHECK_CRC32
   "CRC64": liblzma.LZMA_CHECK_CRC64
   "SHA256": liblzma.LZMA_CHECK_SHA256
+}
 
-exports.preset =
+exports.preset = {
   "DEFAULT": liblzma.LZMA_PRESET_DEFAULT
   "EXTREME": liblzma.LZMA_PRESET_EXTREME
+}
 
-exports.flag =
+exports.flag = {
   "TELL_NO_CHECK": liblzma.LZMA_TELL_NO_CHECK
   "TELL_UNSUPPORTED_CHECK": liblzma.LZMA_TELL_UNSUPPORTED_CHECK
   "TELL_ANY_CHECK": liblzma.LZMA_TELL_ANY_CHECK
   "CONCATENATED": liblzma.LZMA_CONCATENATED
+}
 
-exports.filter =
+exports.filter = {
   "LZMA2": liblzma.LZMA_FILTER_LZMA2
   "X86": liblzma.LZMA_FILTER_X86
   "POWERPC": liblzma.LZMA_FILTER_POWERPC
@@ -275,10 +280,12 @@ exports.filter =
   "ARM": liblzma.LZMA_FILTER_ARM
   "ARMTHUMB": liblzma.LZMA_FILTER_ARMTHUMB
   "SPARC": liblzma.LZMA_FILTER_SPARC
+}
 
-exports.mode =
+exports.mode = {
   "FAST": liblzma.LZMA_MODE_FAST
   "NORMAL": liblzma.LZMA_MODE_NORMAL
+}
 
 exports.createXz = (lzma_options, options) ->
   new Xz(lzma_options, options)
@@ -331,8 +338,8 @@ xzBuffer = (engine, buffer, callback) ->
   return
 
 xzBufferSync = (engine, buffer) ->
-  buffer = new Buffer(buffer)  if typeof buffer == 'string'
-  throw new TypeError("Not a string or buffer")  unless buffer instanceof Buffer
+  buffer = Buffer.from(buffer) if typeof buffer == 'string'
+  throw new TypeError("Not a string or buffer") unless buffer instanceof Buffer
 
   engine._processChunk buffer, liblzma.LZMA_FINISH
 

package/build.yml

@@ -1,78 +0,0 @@
-init:
-  plugins:
-    - mocha
-    - clean
-    - packagejson
-    - grab
-settings:
-  exec:
-    env:
-      CPPFLAGS: "-fPIC"
-      CFLAGS: "-O3"
-  xzWebUrl: 'http://tukaani.org/xz/xz'
-  xzVersion: '5.2.2'
-  xzExt: 'gz'
-  clean:
-    path: ['lib', '*.log']
-    distclean: ['build', 'xz*.tar.*']
-  srcPath: 'src'
-  libPath: 'lib'
-  coffee: './node_modules/.bin/coffee'
-  npg: './node_modules/.bin/node-pre-gyp'
-  cpu: 4
-  mocha:
-    useCoffee: true
-clean:
-  - '%npg% clean'
-  - rm -rf %clean.path%
-fetch_lzma:
-  - log: Fetching source ...
-  - grab: "%xzWebUrl%-%xzVersion%.tar.%xzExt%"
-  - mkdir -p deps/xz
-  - '[ "%xzExt%" = "gz" ] && tar zxvf xz-%xzVersion%.tar.%xzExt% -C deps/xz --strip-components=1'
-  - '[ "%xzExt%" = "bz2" ] && tar jxvf xz-%xzVersion%.tar.%xzExt% -C deps/xz --strip-components=1'
-  - '[ "%xzExt%" = "xz" ] && tar Jxvf xz-%xzVersion%.tar.%xzExt% -C deps/xz --strip-components=1'
-build_lzma:
-  - log: Building LibLZMA from sources, using %cpu% threads ! (change by passing cpu=xxx)
-  - log: Cleaning deps ...
-  - rm -rf deps
-  - task: fetch_lzma
-  - cd deps/xz
-  - ./autogen.sh
-  - ./configure --prefix=`pwd` --enable-threads --enable-static --disable-shared --disable-scripts --disable-lzmainfo
-    --disable-lzma-links --disable-lzmadec --disable-xzdec --disable-xz --disable-rpath
-  - make -j%cpu%
-  - make install
-  - env: CPATH=`pwd`/include
-  - env: LIBRARY_PATH=`pwd`/lib
-  - env: LD_LIBRARY_PATH=$LIBRARY_PATH:$LD_LIBRARY_PATH
-  - log: Done compiling liblzma. headers are at $CPATH
-  - cd ../..
-build_module:
-  - log: Building %name% version %version% Add-On ...
-  - '%npg% configure build'
-install_module:
-  - log: Installing %name% version %version Add-On ...
-  - '%npg% install --fallback-to-build'
-build:
-  # If we are compiling, we surely won't want to try to download a precompiled binary
-  - |
-    if [ "$COMPILE" = "1" ]
-    then
-      %ubs% build_lzma build_module xzVersion=%xzVersion% xzExt=%xzExt%
-    else
-      %ubs% install_module
-    fi
-  # If we do not have any js file, we build it
-  - '[ -r %libPath%/lzma.js ] || %ubs% build_coffee'
-build_coffee:
-  - log: Building Javascript API...
-  - '%coffee% -b -c -o %libPath% %srcPath%'
-  - log: Done building Javascript.
-test:
-  # Make sure we have our devDependencies with us.
-  - npm i
-  - task: mocha-test
-install:
-  - task: build
-  - log: Build done.