rocksdb-native 2.6.2 → 2.6.4

package/CMakeLists.txt

@@ -1,11 +1,13 @@
 cmake_minimum_required(VERSION 3.25)
 
-project(rocksdb_native C CXX)
+find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
+find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
+find_package(cmake-napi REQUIRED PATHS node_modules/cmake-napi)
+find_package(cmake-npm REQUIRED PATHS node_modules/cmake-npm)
 
-include(bare)
-include(napi)
+project(rocksdb_native C CXX)
 
-add_subdirectory(vendor/librocksdb EXCLUDE_FROM_ALL)
+fetch_package("github:holepunchto/librocksdb#0934354")
 
 add_bare_module(rocksdb_native_bare)
 
@@ -17,28 +19,38 @@ target_sources(
 
 target_link_libraries(
   ${rocksdb_native_bare}
+  PRIVATE
+    $<TARGET_OBJECTS:rocksdb>
+    $<TARGET_OBJECTS:path>
   PUBLIC
-    rocksdb_static
+    rocksdb
+    rocksdb_facebook
+    path
 )
 
-add_napi_module(rocksdb_native_node)
-
-bare_include_directories(compat NAPI)
-
-target_include_directories(
-  ${rocksdb_native_node}
-  PRIVATE
-    ${compat}
-)
+add_napi_module(rocksdb_native_napi)
 
 target_sources(
-  ${rocksdb_native_node}
+  ${rocksdb_native_napi}
   PRIVATE
     binding.c
 )
 
 target_link_libraries(
-  ${rocksdb_native_node}
+  ${rocksdb_native_napi}
+  PRIVATE
+    $<TARGET_OBJECTS:rocksdb>
+    $<TARGET_OBJECTS:path>
   PUBLIC
-    rocksdb_static
+    rocksdb
+    rocksdb_facebook
+    path
+)
+
+resolve_node_module(bare-compat-napi compat)
+
+target_include_directories(
+  ${rocksdb_native_napi}
+  PRIVATE
+    "${compat}/include"
 )

package/binding.js

@@ -1 +1 @@
-module.exports = require('load-addon')(__dirname)
+module.exports = require('require-addon')('.', __filename)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "2.6.2",
+  "version": "2.6.4",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -12,8 +12,7 @@
     "binding.js",
     "CMakeLists.txt",
     "lib",
-    "prebuilds",
-    "vendor/librocksdb"
+    "prebuilds"
   ],
   "addon": true,
   "scripts": {
@@ -35,12 +34,16 @@
   "dependencies": {
     "b4a": "^1.6.6",
     "compact-encoding": "^2.15.0",
-    "load-addon": "^1.0.0",
     "ready-resource": "^1.0.0",
+    "require-addon": "^1.0.2",
     "streamx": "^2.16.1"
   },
   "devDependencies": {
+    "bare-compat-napi": "^1.0.0",
     "brittle": "^3.5.0",
+    "cmake-bare": "^1.1.14",
+    "cmake-fetch": "^1.0.1",
+    "cmake-napi": "^1.0.6",
     "standard": "^17.1.0",
     "test-tmp": "^1.2.0"
   }

package/vendor/librocksdb/CMakeLists.txt

@@ -1,94 +0,0 @@
-cmake_minimum_required(VERSION 3.25)
-
-project(rocksdb C CXX)
-
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-set(PORTABLE ON CACHE BOOL "Make a portable RocksDB build" FORCE)
-
-set(WITH_TESTS OFF CACHE BOOL "Build the RocksDB test suite" FORCE)
-
-set(WITH_GFLAGS OFF CACHE BOOL "Build RocksDB with gflags support" FORCE)
-
-set(ROCKSDB_SKIP_THIRDPARTY ON CACHE BOOL "Skip third-party RocksDB integrations" FORCE)
-
-set(ARTIFACT_SUFFIX _facebook) # Ensure that upstream RocksDB targets don't clash
-
-add_subdirectory(vendor/rocksdb EXCLUDE_FROM_ALL)
-
-if(NOT TARGET uv)
-  add_subdirectory(vendor/libuv EXCLUDE_FROM_ALL)
-endif()
-
-add_library(rocksdb OBJECT)
-
-set_target_properties(
-  rocksdb
-  PROPERTIES
-  C_STANDARD 99
-  CXX_STANDARD 20
-  POSITION_INDEPENDENT_CODE ON
-)
-
-target_sources(
-  rocksdb
-  INTERFACE
-    include/rocksdb.h
-  PRIVATE
-    src/rocksdb.cc
-)
-
-target_include_directories(
-  rocksdb
-  PUBLIC
-    include
-    $<TARGET_PROPERTY:uv,INTERFACE_INCLUDE_DIRECTORIES>
-  PRIVATE
-    $<TARGET_PROPERTY:rocksdb_facebook,INTERFACE_INCLUDE_DIRECTORIES>
-)
-
-add_library(rocksdb_shared SHARED)
-
-set_target_properties(
-  rocksdb_shared
-  PROPERTIES
-  OUTPUT_NAME rocksdb
-  WINDOWS_EXPORT_ALL_SYMBOLS ON
-)
-
-target_link_libraries(
-  rocksdb_shared
-  PUBLIC
-    uv
-    rocksdb
-  PRIVATE
-    rocksdb_facebook
-)
-
-add_library(rocksdb_static STATIC)
-
-set_target_properties(
-  rocksdb_static
-  PROPERTIES
-  OUTPUT_NAME rocksdb
-  PREFIX lib
-)
-
-target_link_libraries(
-  rocksdb_static
-  PUBLIC
-    uv_a
-    rocksdb
-  PRIVATE
-    rocksdb_facebook
-)
-
-install(TARGETS rocksdb_shared rocksdb_static)
-
-install(FILES include/rocksdb.h DESTINATION include)
-
-if(PROJECT_IS_TOP_LEVEL)
-  enable_testing()
-
-  add_subdirectory(test)
-endif()

package/vendor/librocksdb/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

package/vendor/librocksdb/NOTICE

@@ -1,13 +0,0 @@
-Copyright 2023 Holepunch Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

package/vendor/librocksdb/README.md

@@ -1,11 +0,0 @@
-# librocksdb
-
-Asynchronous C bindings to RocksDB with support for batch operations.
-
-## API
-
-See [`include/rocksdb.h`](include/rocksdb.h) for the public API.
-
-## License
-
-Apache-2.0