@openzim/libzim 3.1.0 → 3.2.1

package/.env

@@ -1 +1 @@
-LIBZIM_VERSION=8.2.1
+LIBZIM_VERSION=9.2.1

package/Changelog

@@ -1,3 +1,15 @@
+3.2.1
+* NEW: Use libzim 9.2.1
+* FIX: Module properly in ESM format
+* FIX: Codecov in the CI
+
+3.2.0:
+* NEW: Use libzim v9.0.0
+* NEW: Added mediaCount to Archive
+* FIX: Simplify a lot the CI
+* FIX: Nlob allocation and warning
+* DEL: Deprecated getSize from SearchIterator
+
 3.1.0:
 * NEW: Use libzim v8.2.1
 * FIX: Handling of binary data in the creator

package/binding.gyp

@@ -24,7 +24,7 @@
                 "libraries": [
                   "-Wl,-rpath,'$$ORIGIN'",
                   "-L<(libzim_dir)/lib/x86_64-linux-gnu",
-                  "<(libzim_dir)/lib/x86_64-linux-gnu/libzim.so.8",
+                  "<(libzim_dir)/lib/x86_64-linux-gnu/libzim.so.9",
                 ],
               }],
               ["libzim_local!='true' and OS=='mac'", {

package/bundle-libzim.js

@@ -1,7 +1,8 @@
-require("dotenv").config();
-const mkdirp = require("mkdirp");
-const exec = require("exec-then");
-const os = require("os");
+import dotenv from "dotenv";
+dotenv.config();
+import mkdirp from "mkdirp";
+import exec from "exec-then";
+import os from "os";
 
 mkdirp.sync("./build/Release");
 
@@ -15,18 +16,18 @@ if (!isMacOS && !isLinux) {
 }
 
 if (isLinux) {
-  console.info("Copying libzim.so.8 to build folder");
+  console.info("Copying libzim.so.9 to build folder");
   exec(
-    "cp download/lib/x86_64-linux-gnu/libzim.so.8 build/Release/libzim.so.8"
+    "cp download/lib/x86_64-linux-gnu/libzim.so.9 build/Release/libzim.so.9"
   );
-  exec("ln -sf build/Release/libzim.so.8 build/Release/libzim.so"); // convienience only, not required
+  exec("ln -sf build/Release/libzim.so.9 build/Release/libzim.so"); // convienience only, not required
 }
 if (isMacOS) {
-  console.info("Copying libzim.8.dylib to build folder");
-  exec("cp download/lib/libzim.8.dylib build/Release/libzim.8.dylib");
-  exec("ln -sf build/Release/libzim.8.dylib build/Release/libzim.dylib"); // convienience only, not required
+  console.info("Copying libzim.9.dylib to build folder");
+  exec("cp download/lib/libzim.9.dylib build/Release/libzim.9.dylib");
+  exec("ln -sf build/Release/libzim.9.dylib build/Release/libzim.dylib"); // convienience only, not required
   console.info("Fixing rpath");
   exec(
-    "install_name_tool -change libzim.8.dylib @loader_path/libzim.8.dylib build/Release/zim_binding.node"
+    "install_name_tool -change libzim.9.dylib @loader_path/libzim.9.dylib build/Release/zim_binding.node"
   );
 }

package/dist/index.d.ts

@@ -153,6 +153,7 @@ export class Archive {
   get allEntryCount(): number;
   get entryCount(): number;
   get articleCount(): number;
+  get mediaCount(): number;
   get uuid(): string;
   getMetadata(name: string): string;
   getMetadataItem(name: string): Item;
@@ -208,7 +209,6 @@ export class SearchIterator {
   get score(): number;
   get snippet(): string;
   get wordCount(): number;
-  get size(): number;
   get fileIndex(): number;
   get zimId(): string;
   get entry(): Entry;

package/dist/index.js

@@ -1,4 +1,4 @@
-import bindings from "bindings";
+const bindings = require("bindings");
 
 const {
   Archive,

package/download-libzim.js

@@ -1,16 +1,20 @@
-require("dotenv").config();
-const axios = require("axios");
-const mkdirp = require("mkdirp");
-const exec = require("exec-then");
-const os = require("os");
-const fs = require("fs");
-const urlParser = require("url");
+import dotenv from "dotenv";
+dotenv.config();
+import axios from "axios";
+import mkdirp from "mkdirp";
+import exec from "exec-then";
+import os from "os";
+import fs from "fs";
+import urlParser from "url";
 
 mkdirp.sync("./download");
 
+console.info("os.type() is:", os.type());
+console.info("os.arch() is:", os.arch());
 const isMacOS = os.type() === "Darwin";
 const isLinux = os.type() === "Linux";
 const rawArch = os.arch();
+
 const isAvailableArch =
   rawArch === "x64" || rawArch === "arm" || rawArch === "arm64";
 
@@ -48,7 +52,7 @@ for (let url of urls) {
   try {
     fs.statSync(dlFile);
     console.warn(`File [${dlFile}] already exists, not downloading`);
-    return;
+    break;
   } catch (err) {
     //
   }

package/package.json

@@ -2,8 +2,9 @@
   "name": "@openzim/libzim",
   "main": "dist/index.js",
   "types": "dist/index.d.js",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "Libzim bindings for NodeJS",
+  "type": "module",
   "scripts": {
     "clean": "rm -rf dist build/native/build",
     "tsc": "tsc",

package/src/archive.h

@@ -69,6 +69,14 @@ class Archive : public Napi::ObjectWrap<Archive> {
     }
   }
 
+  Napi::Value getMediaCount(const Napi::CallbackInfo &info) {
+    try {
+      return Napi::Value::From(info.Env(), archive_->getMediaCount());
+    } catch (const std::exception &err) {
+      throw Napi::Error::New(info.Env(), err.what());
+    }
+  }
+
   Napi::Value getUuid(const Napi::CallbackInfo &info) {
     try {
       // TODO(kelvinhammond): convert this to
@@ -446,6 +454,7 @@ class Archive : public Napi::ObjectWrap<Archive> {
             InstanceAccessor<&Archive::getAllEntryCount>("allEntryCount"),
             InstanceAccessor<&Archive::getEntryCount>("entryCount"),
             InstanceAccessor<&Archive::getArticleCount>("articleCount"),
+            InstanceAccessor<&Archive::getMediaCount>("mediaCount"),
             InstanceAccessor<&Archive::getUuid>("uuid"),
             InstanceMethod<&Archive::getMetadata>("getMetadata"),
             InstanceMethod<&Archive::getMetadataItem>("getMetadataItem"),

package/src/blob.h

@@ -29,17 +29,20 @@ class Blob : public Napi::ObjectWrap<Blob> {
       if (info[0].IsArrayBuffer()) {  // handle ArrayBuffer
         auto buf = info[0].As<Napi::ArrayBuffer>();
         size = buf.ByteLength();
-        data = std::shared_ptr<char>(new char[size]);
+        data = std::shared_ptr<char>(new char[size],
+                                     std::default_delete<char[]>());
         memcpy(data.get(), buf.Data(), size);
       } else if (info[0].IsBuffer()) {  // handle Buffer
         auto buf = info[0].As<Napi::Buffer<char>>();
         size = buf.Length();
-        data = std::shared_ptr<char>(new char[size]);
+        data = std::shared_ptr<char>(new char[size],
+                                     std::default_delete<char[]>());
         memcpy(data.get(), buf.Data(), size);
       } else {                                      // all others toString()
         auto str = info[0].ToString().Utf8Value();  // coerce to string
         size = str.size();
-        data = std::shared_ptr<char>(new char[size]);
+        data = std::shared_ptr<char>(new char[size],
+                                     std::default_delete<char[]>());
         memcpy(data.get(), str.c_str(), size);
       }
 

package/src/index.d.ts

@@ -153,6 +153,7 @@ export class Archive {
   get allEntryCount(): number;
   get entryCount(): number;
   get articleCount(): number;
+  get mediaCount(): number;
   get uuid(): string;
   getMetadata(name: string): string;
   getMetadataItem(name: string): Item;
@@ -208,7 +209,6 @@ export class SearchIterator {
   get score(): number;
   get snippet(): string;
   get wordCount(): number;
-  get size(): number;
   get fileIndex(): number;
   get zimId(): string;
   get entry(): Entry;

package/src/index.js

@@ -1,4 +1,4 @@
-import bindings from "bindings";
+const bindings = require("bindings");
 
 const {
   Archive,

package/src/search.h

@@ -200,14 +200,6 @@ class SearchIterator : public Napi::ObjectWrap<SearchIterator> {
     }
   }
 
-  Napi::Value getSize(const Napi::CallbackInfo &info) {
-    try {
-      return Napi::Value::From(info.Env(), searchIterator_.getSize());
-    } catch (const std::exception &err) {
-      throw Napi::Error::New(info.Env(), err.what());
-    }
-  }
-
   Napi::Value getFileIndex(const Napi::CallbackInfo &info) {
     try {
       return Napi::Value::From(info.Env(), searchIterator_.getFileIndex());
@@ -250,7 +242,6 @@ class SearchIterator : public Napi::ObjectWrap<SearchIterator> {
             InstanceAccessor<&SearchIterator::getScore>("score"),
             InstanceAccessor<&SearchIterator::getSnippet>("snippet"),
             InstanceAccessor<&SearchIterator::getWordCount>("wordCount"),
-            InstanceAccessor<&SearchIterator::getSize>("size"),
             InstanceAccessor<&SearchIterator::getFileIndex>("fileIndex"),
             InstanceAccessor<&SearchIterator::getZimId>("zimId"),
             InstanceAccessor<&SearchIterator::getEntry>("entry"),