ts-ip2region2 1.0.0 → 1.0.2

package/LICENSE

@@ -0,0 +1,201 @@
+                                 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/README.md

@@ -1,4 +1,4 @@
-# ip2region Node.js Addon (TypeScript)
+# ip2region Node.js (TypeScript)
 
 [English](README.md) | [中文](README_CN.md)
 
@@ -9,7 +9,7 @@ High-performance Node.js native addon for ip2region xdb query with IPv4/IPv6 sup
 ## Features
 
 - 🚀 **High Performance** - Native C++ implementation with microsecond-level response
-- 🌐 **IPv4 & IPv6** - Full support for both IPv4 and IPv6 address queries  
+- 🌐 **IPv4 & IPv6** - Full support for both IPv4 and IPv6 address queries
 - 💾 **Multiple Cache Strategies** - file/vectorIndex/content caching options
 - 🔒 **Memory Safe** - Automatic resource management prevents memory leaks
 - 📝 **TypeScript** - Complete TypeScript type definitions included
@@ -18,8 +18,11 @@ High-performance Node.js native addon for ip2region xdb query with IPv4/IPv6 sup
 ## Installation
 
 ```bash
-npm install
-npm run build:all
+npm install ts-ip2region2
+# or
+pnpm add ts-ip2region2
+# or
+yarn add ts-ip2region2
 ```
 
 > **Database Required**: Download the xdb database files from [ip2region data](https://github.com/lionsoul2014/ip2region/tree/master/data) before using.
@@ -27,18 +30,18 @@ npm run build:all
 ## Quick Start
 
 ```typescript
-import Ip2Region from 'ip2region-nodejs';
+import { Ip2Region } from 'ts-ip2region2';
 
 // Create searcher instance
 const searcher = new Ip2Region('./data/ip2region_v4.xdb', {
-    cachePolicy: 'vectorIndex',  // file/vectorIndex/content
-    ipVersion: 'v4'              // v4/v6
+  cachePolicy: 'vectorIndex', // file/vectorIndex/content
+  ipVersion: 'v4', // v4/v6
 });
 
 // Query IP address
-const result = searcher.search('8.8.8.8');
+const result = searcher.search('120.229.45.2');
 console.log(result);
-// Output: { region: 'United States|0|0|Level3', ioCount: 3, took: 1000 }
+// Output: { region: '中国|广东省|深圳市|移动', ioCount: 3, took: 1000 }
 
 // Clean up
 searcher.close();
@@ -47,68 +50,81 @@ searcher.close();
 ## API Reference
 
 ### Constructor
+
 ```typescript
 new Ip2Region(dbPath: string, options?: Ip2RegionOptions)
 ```
 
 ### Methods
+
 - `search(ip: string): SearchResult` - Query IP address location
 - `close(): void` - Release resources
 
 ### Static Methods
+
 - `Ip2Region.verify(dbPath: string): boolean` - Verify xdb file
 - `Ip2Region.verifyDetailed(dbPath: string): VerifyResult` - Verify with detailed info
 
 ### Types
+
 ```typescript
 interface SearchResult {
-    region: string;    // Geographic location
-    ioCount: number;   // IO operation count
-    took: number;      // Query time in microseconds
+  region: string; // Geographic location
+  ioCount: number; // IO operation count
+  took: number; // Query time in microseconds
 }
 
 interface Ip2RegionOptions {
-    cachePolicy?: 'file' | 'vectorIndex' | 'content';
-    ipVersion?: 'v4' | 'v6';
+  cachePolicy?: 'file' | 'vectorIndex' | 'content';
+  ipVersion?: 'v4' | 'v6';
 }
 ```
 
 ## Cache Strategies
 
-| Strategy | Memory | Performance | Use Case |
-|----------|--------|-------------|----------|
-| `file` | Minimal | Good | Memory-constrained |
-| `vectorIndex` | Medium | Better | General use (recommended) |
-| `content` | High | Best | High-concurrency |
+| Strategy      | Memory  | Performance | Use Case                  |
+| ------------- | ------- | ----------- | ------------------------- |
+| `file`        | Minimal | Good        | Memory-constrained        |
+| `vectorIndex` | Medium  | Better      | General use (recommended) |
+| `content`     | High    | Best        | High-concurrency          |
 
 ## Examples
 
 ```bash
-# Run TypeScript example
+# Build and run example
 npm run example
 
-# Run TypeScript tests  
+# Build and run tests
 npm test
+
+# Build native addon
+npm run build
+
+# Compile TypeScript
+npm run compile
 ```
 
 ## Project Structure
 
 ```
-ip2region-nodejs/
+ts-ip2region2/
 ├── src/                       # TypeScript source code
-│   ├── index.ts              # Main TypeScript API
-│   ├── example.ts            # TypeScript example
-│   └── test.ts               # TypeScript tests
+│   └── index.ts              # Main TypeScript API
 ├── dist/                      # Compiled JavaScript output
 │   ├── index.js
 │   ├── index.d.ts
 │   └── ...
+├── data/                      # Sample xdb database files
+│   ├── ip2region_v4.xdb
+│   └── ip2region_v6.xdb
 ├── ip2region/                 # Original ip2region C source code
 │   ├── xdb_api.h
 │   ├── xdb_util.c
 │   └── xdb_searcher.c
 ├── addon.cpp                  # Node.js addon implementation
 ├── binding.gyp                # Build configuration
+├── example.js                 # JavaScript example
+├── test.js                    # JavaScript tests
 ├── tsconfig.json              # TypeScript configuration
 ├── package.json
 └── README.md
@@ -117,4 +133,3 @@ ip2region-nodejs/
 ## License
 
 Apache-2.0
-

package/README_CN.md

@@ -1,10 +1,10 @@
-# ip2region Node.js Addon (TypeScript)
+# ip2region Node.js (TypeScript)
 
 [English](README.md) | [中文](README_CN.md)
 
 高性能的 ip2region xdb 查询 Node.js 原生扩展，支持 IPv4/IPv6。使用 TypeScript 编写，包含完整的类型定义。
 
-> **说明**: 本项目基于官方 [ip2region C语言客户端](https://github.com/lionsoul2014/ip2region/tree/master/binding/c) 改造，并增强了 TypeScript 支持。
+> **说明**: 本项目基于官方 [ip2region C 语言客户端](https://github.com/lionsoul2014/ip2region/tree/master/binding/c) 改造，并增强了 TypeScript 支持。
 
 ## 特性
 
@@ -18,8 +18,11 @@
 ## 安装
 
 ```bash
-npm install
-npm run build:all
+npm install ts-ip2region2
+# or
+pnpm add ts-ip2region2
+# or
+yarn add ts-ip2region2
 ```
 
 > **需要数据库**: 使用前请从 [ip2region data](https://github.com/lionsoul2014/ip2region/tree/master/data) 下载 xdb 数据库文件。
@@ -27,18 +30,18 @@ npm run build:all
 ## 快速开始
 
 ```typescript
-import Ip2Region from 'ip2region-nodejs';
+import { Ip2Region } from 'ts-ip2region2';
 
 // 创建查询器实例
 const searcher = new Ip2Region('./data/ip2region_v4.xdb', {
-    cachePolicy: 'vectorIndex',  // file/vectorIndex/content
-    ipVersion: 'v4'              // v4/v6
+  cachePolicy: 'vectorIndex', // file/vectorIndex/content
+  ipVersion: 'v4', // v4/v6
 });
 
 // 查询IP地址
-const result = searcher.search('8.8.8.8');
+const result = searcher.search('120.229.45.2');
 console.log(result);
-// 输出: { region: 'United States|0|0|Level3', ioCount: 3, took: 1000 }
+// 输出: { region: '中国|广东省|深圳市|移动', ioCount: 3, took: 1000 }
 
 // 清理资源
 searcher.close();
@@ -47,68 +50,81 @@ searcher.close();
 ## API 参考
 
 ### 构造函数
+
 ```typescript
 new Ip2Region(dbPath: string, options?: Ip2RegionOptions)
 ```
 
 ### 方法
-- `search(ip: string): SearchResult` - 查询IP地址位置
+
+- `search(ip: string): SearchResult` - 查询 IP 地址位置
 - `close(): void` - 释放资源
 
 ### 静态方法
-- `Ip2Region.verify(dbPath: string): boolean` - 验证xdb文件
+
+- `Ip2Region.verify(dbPath: string): boolean` - 验证 xdb 文件
 - `Ip2Region.verifyDetailed(dbPath: string): VerifyResult` - 验证并返回详细信息
 
 ### 类型定义
+
 ```typescript
 interface SearchResult {
-    region: string;    // 地理位置
-    ioCount: number;   // IO操作次数
-    took: number;      // 查询耗时(微秒)
+  region: string; // 地理位置
+  ioCount: number; // IO操作次数
+  took: number; // 查询耗时(微秒)
 }
 
 interface Ip2RegionOptions {
-    cachePolicy?: 'file' | 'vectorIndex' | 'content';
-    ipVersion?: 'v4' | 'v6';
+  cachePolicy?: 'file' | 'vectorIndex' | 'content';
+  ipVersion?: 'v4' | 'v6';
 }
 ```
 
 ## 缓存策略
 
-| 策略 | 内存占用 | 性能 | 使用场景 |
-|------|----------|------|----------|
-| `file` | 最小 | 良好 | 内存受限环境 |
-| `vectorIndex` | 中等 | 更好 | 一般使用(推荐) |
-| `content` | 较高 | 最佳 | 高并发场景 |
+| 策略          | 内存占用 | 性能 | 使用场景       |
+| ------------- | -------- | ---- | -------------- |
+| `file`        | 最小     | 良好 | 内存受限环境   |
+| `vectorIndex` | 中等     | 更好 | 一般使用(推荐) |
+| `content`     | 较高     | 最佳 | 高并发场景     |
 
 ## 示例
 
 ```bash
-# 运行 TypeScript 示例
+# 构建并运行示例
 npm run example
 
-# 运行 TypeScript 测试
+# 构建并运行测试
 npm test
+
+# 构建原生扩展
+npm run build
+
+# 编译 TypeScript
+npm run compile
 ```
 
 ## 项目结构
 
 ```
-ip2region-nodejs/
+ts-ip2region2/
 ├── src/                       # TypeScript 源代码
-│   ├── index.ts              # 主要 TypeScript API
-│   ├── example.ts            # TypeScript 示例
-│   └── test.ts               # TypeScript 测试
+│   └── index.ts              # 主要 TypeScript API
 ├── dist/                      # 编译后的 JavaScript 输出
 │   ├── index.js
 │   ├── index.d.ts
 │   └── ...
+├── data/                      # 示例 xdb 数据库文件
+│   ├── ip2region_v4.xdb
+│   └── ip2region_v6.xdb
 ├── ip2region/                 # 原始 ip2region C 源代码
 │   ├── xdb_api.h
 │   ├── xdb_util.c
 │   └── xdb_searcher.c
 ├── addon.cpp                  # Node.js 扩展实现
 ├── binding.gyp                # 构建配置
+├── example.js                 # JavaScript 示例
+├── test.js                    # JavaScript 测试
 ├── tsconfig.json              # TypeScript 配置
 ├── package.json
 └── README.md
@@ -116,4 +132,4 @@ ip2region-nodejs/
 
 ## 许可证
 
-Apache-2.0
+Apache-2.0

package/addon.cpp

@@ -3,13 +3,13 @@
 #endif
 
 #include <napi.h>
+#include <string>
+#include <cstdio>
 
 extern "C" {
 #include "ip2region/xdb_api.h"
 }
 
-#include <memory>
-
 class Ip2RegionSearcher : public Napi::ObjectWrap<Ip2RegionSearcher> {
 public:
     static Napi::Object Init(Napi::Env env, Napi::Object exports);
@@ -51,13 +51,8 @@ Ip2RegionSearcher::Ip2RegionSearcher(const Napi::CallbackInfo& info)
     Napi::Env env = info.Env();
     Napi::HandleScope scope(env);
 
-    if (info.Length() < 1) {
-        Napi::TypeError::New(env, "Expected at least 1 argument").ThrowAsJavaScriptException();
-        return;
-    }
-
-    if (!info[0].IsString()) {
-        Napi::TypeError::New(env, "Expected string for db_path").ThrowAsJavaScriptException();
+    if (info.Length() < 1 || !info[0].IsString()) {
+        Napi::TypeError::New(env, "Expected database path as string").ThrowAsJavaScriptException();
         return;
     }
 
@@ -77,56 +72,53 @@ Ip2RegionSearcher::Ip2RegionSearcher(const Napi::CallbackInfo& info)
         }
     }
 
-    // 初始化winsock (Windows)
+    // Initialize winsock (Windows only)
     int err = xdb_init_winsock();
     if (err != 0) {
-        Napi::Error::New(env, "Failed to init winsock").ThrowAsJavaScriptException();
+        Napi::Error::New(env, "Failed to initialize network layer").ThrowAsJavaScriptException();
         return;
     }
 
-    // 验证xdb文件 (跳过严格验证，因为某些xdb文件可能有兼容性问题)
-    // err = xdb_verify_from_file(db_path.c_str());
-    // if (err != 0) {
-    //     std::string error_msg = "Failed to verify xdb file, error code: " + std::to_string(err);
-    //     Napi::Error::New(env, error_msg).ThrowAsJavaScriptException();
-    //     return;
-    // }
-
-    // 确定IP版本
-    xdb_version_t* version;
-    if (ip_version == "v4" || ip_version == "ipv4") {
-        version = XDB_IPv4;
-    } else if (ip_version == "v6" || ip_version == "ipv6") {
-        version = XDB_IPv6;
-    } else {
-        Napi::Error::New(env, "Invalid IP version").ThrowAsJavaScriptException();
+    // Determine IP version
+    xdb_version_t* version = (ip_version == "v4" || ip_version == "ipv4") ? XDB_IPv4 : 
+                            (ip_version == "v6" || ip_version == "ipv6") ? XDB_IPv6 : nullptr;
+    
+    if (!version) {
+        xdb_clean_winsock();
+        Napi::Error::New(env, "Invalid IP version. Use 'v4' or 'v6'").ThrowAsJavaScriptException();
         return;
     }
 
-    // 根据缓存策略初始化searcher
+    // Initialize searcher based on cache strategy
     if (cache_policy == "file") {
         err = xdb_new_with_file_only(version, &searcher, db_path.c_str());
     } else if (cache_policy == "vectorIndex") {
         v_index = xdb_load_vector_index_from_file(db_path.c_str());
-        if (v_index == nullptr) {
-            Napi::Error::New(env, "Failed to load vector index").ThrowAsJavaScriptException();
+        if (!v_index) {
+            xdb_clean_winsock();
+            Napi::Error::New(env, "Failed to load vector index from database file").ThrowAsJavaScriptException();
             return;
         }
         err = xdb_new_with_vector_index(version, &searcher, db_path.c_str(), v_index);
     } else if (cache_policy == "content") {
         c_buffer = xdb_load_content_from_file(db_path.c_str());
-        if (c_buffer == nullptr) {
-            Napi::Error::New(env, "Failed to load content").ThrowAsJavaScriptException();
+        if (!c_buffer) {
+            xdb_clean_winsock();
+            Napi::Error::New(env, "Failed to load database content into memory").ThrowAsJavaScriptException();
             return;
         }
         err = xdb_new_with_buffer(version, &searcher, c_buffer);
     } else {
-        Napi::Error::New(env, "Invalid cache policy").ThrowAsJavaScriptException();
+        xdb_clean_winsock();
+        Napi::Error::New(env, "Invalid cache policy. Use 'file', 'vectorIndex', or 'content'").ThrowAsJavaScriptException();
         return;
     }
 
     if (err != 0) {
-        Napi::Error::New(env, "Failed to create searcher").ThrowAsJavaScriptException();
+        if (v_index) xdb_free_vector_index(v_index);
+        if (c_buffer) xdb_free_content(c_buffer);
+        xdb_clean_winsock();
+        Napi::Error::New(env, "Failed to initialize IP geolocation searcher").ThrowAsJavaScriptException();
         return;
     }
 
@@ -136,16 +128,16 @@ Ip2RegionSearcher::Ip2RegionSearcher(const Napi::CallbackInfo& info)
 Ip2RegionSearcher::~Ip2RegionSearcher() {
     if (is_initialized) {
         xdb_close(&searcher);
-        
-        if (v_index != nullptr) {
+        if (v_index) {
             xdb_free_vector_index(v_index);
+            v_index = nullptr;
         }
-        
-        if (c_buffer != nullptr) {
+        if (c_buffer) {
             xdb_free_content(c_buffer);
+            c_buffer = nullptr;
         }
-        
         xdb_clean_winsock();
+        is_initialized = false;
     }
 }
 
@@ -159,7 +151,7 @@ Napi::Value Ip2RegionSearcher::Search(const Napi::CallbackInfo& info) {
     }
 
     if (info.Length() < 1 || !info[0].IsString()) {
-        Napi::TypeError::New(env, "Expected string for IP address").ThrowAsJavaScriptException();
+        Napi::TypeError::New(env, "Expected IP address as string").ThrowAsJavaScriptException();
         return env.Null();
     }
 
@@ -168,24 +160,24 @@ Napi::Value Ip2RegionSearcher::Search(const Napi::CallbackInfo& info) {
     xdb_region_buffer_t region;
     int err = xdb_region_buffer_init(&region, nullptr, 0);
     if (err != 0) {
-        Napi::Error::New(env, "Failed to init region buffer").ThrowAsJavaScriptException();
+        Napi::Error::New(env, "Failed to initialize region buffer").ThrowAsJavaScriptException();
         return env.Null();
     }
 
-    long start_time = xdb_now();
+    const long start_time = xdb_now();
     err = xdb_search_by_string(&searcher, ip_string.c_str(), &region);
-    long cost_time = xdb_now() - start_time;
+    const long elapsed_time = xdb_now() - start_time;
 
     if (err != 0) {
         xdb_region_buffer_free(&region);
-        Napi::Error::New(env, "Search failed").ThrowAsJavaScriptException();
+        Napi::Error::New(env, "IP address lookup failed").ThrowAsJavaScriptException();
         return env.Null();
     }
 
     Napi::Object result = Napi::Object::New(env);
     result.Set("region", Napi::String::New(env, region.value ? region.value : ""));
     result.Set("ioCount", Napi::Number::New(env, xdb_get_io_count(&searcher)));
-    result.Set("took", Napi::Number::New(env, cost_time));
+    result.Set("took", Napi::Number::New(env, elapsed_time));
 
     xdb_region_buffer_free(&region);
     return result;
@@ -196,17 +188,14 @@ Napi::Value Ip2RegionSearcher::Close(const Napi::CallbackInfo& info) {
     
     if (is_initialized) {
         xdb_close(&searcher);
-        
-        if (v_index != nullptr) {
+        if (v_index) {
             xdb_free_vector_index(v_index);
             v_index = nullptr;
         }
-        
-        if (c_buffer != nullptr) {
+        if (c_buffer) {
             xdb_free_content(c_buffer);
             c_buffer = nullptr;
         }
-        
         xdb_clean_winsock();
         is_initialized = false;
     }
@@ -214,37 +203,34 @@ Napi::Value Ip2RegionSearcher::Close(const Napi::CallbackInfo& info) {
     return env.Undefined();
 }
 
-// 静态函数用于验证xdb文件
 Napi::Value VerifyXdb(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
     if (info.Length() < 1 || !info[0].IsString()) {
-        Napi::TypeError::New(env, "Expected string for db_path").ThrowAsJavaScriptException();
+        Napi::TypeError::New(env, "Expected database path as string").ThrowAsJavaScriptException();
         return env.Null();
     }
     
-    std::string db_path = info[0].As<Napi::String>().Utf8Value();
+    const std::string db_path = info[0].As<Napi::String>().Utf8Value();
+    
+    int error_code = 0;
+    FILE* file_handle = std::fopen(db_path.c_str(), "rb");
     
-    int err = 0;
-    FILE *handle = fopen(db_path.c_str(), "rb");
-    if (handle == NULL) {
-        err = -1;
+    if (!file_handle) {
+        error_code = -1; // File not found or cannot be opened
     } else {
-        // 加载header
-        xdb_header_t *header = xdb_load_header(handle);
-        if (header == NULL) {
-            err = 1;
+        xdb_header_t* header = xdb_load_header(file_handle);
+        if (!header) {
+            error_code = 1; // Invalid file format
         } else {
-            // =只检查header是否正常加载
-            err = 0; // header加载成功即认为文件有效
             xdb_free_header(header);
         }
-        fclose(handle);
+        std::fclose(file_handle);
     }
     
     Napi::Object result = Napi::Object::New(env);
-    result.Set("valid", Napi::Boolean::New(env, err == 0));
-    result.Set("errorCode", Napi::Number::New(env, err));
+    result.Set("valid", Napi::Boolean::New(env, error_code == 0));
+    result.Set("errorCode", Napi::Number::New(env, error_code));
     
     return result;
 }

package/dist/index.d.ts

@@ -1,53 +1,65 @@
 export interface SearchResult {
-    /** 地理位置信息字符串 */
+    /** Geographic location information string */
     region: string;
-    /** IO操作次数 */
+    /** Number of IO operations */
     ioCount: number;
-    /** 查询耗时(微秒) */
+    /** Query time in microseconds */
     took: number;
 }
 export interface Ip2RegionOptions {
-    /** 缓存策略: 'file' | 'vectorIndex' | 'content' */
+    /** Cache strategy: 'file' | 'vectorIndex' | 'content' */
     cachePolicy?: 'file' | 'vectorIndex' | 'content';
-    /** IP版本: 'v4' | 'v6' */
+    /** IP version: 'v4' | 'v6' */
     ipVersion?: 'v4' | 'v6';
 }
 export interface VerifyResult {
-    /** 验证结果 */
+    /** Verification result */
     valid: boolean;
-    /** 错误代码 */
+    /** Error code */
     errorCode: number;
 }
 export default class Ip2Region {
     private searcher;
+    private readonly dbPath;
+    private readonly options;
     /**
-     * 创建ip2region查询器实例
-     * @param dbPath xdb数据库文件路径
-     * @param options 配置选项
+     * Create ip2region searcher instance
+     * @param dbPath Path to xdb database file
+     * @param options Configuration options
      */
     constructor(dbPath: string, options?: Ip2RegionOptions);
     /**
-     * 查询IP地址对应的地理位置信息
-     * @param ip IP地址字符串(支持IPv4和IPv6)
-     * @returns 查询结果
+     * Query geographic location information for IP address
+     * @param ip IP address string (supports IPv4 and IPv6)
+     * @returns Query result
      */
     search(ip: string): SearchResult;
     /**
-     * 关闭查询器并释放资源
+     * Close searcher and release resources
      */
     close(): void;
     /**
-     * 验证xdb文件的有效性
-     * @param dbPath xdb文件路径
-     * @returns 验证结果
+     * Verify the validity of xdb file
+     * @param dbPath Path to xdb file
+     * @returns Verification result
      */
     static verify(dbPath: string): boolean;
     /**
-     * 验证xdb文件并返回详细信息
-     * @param dbPath xdb文件路径
-     * @returns 包含 valid 和 errorCode 的对象
+     * Verify xdb file and return detailed information
+     * @param dbPath Path to xdb file
+     * @returns Object containing valid and errorCode
      */
     static verifyDetailed(dbPath: string): VerifyResult;
+    /**
+     * Get current configuration
+     * @returns Current options
+     */
+    getOptions(): Required<Ip2RegionOptions>;
+    /**
+     * Get database file path
+     * @returns Database path
+     */
+    getDbPath(): string;
 }
 export { Ip2Region };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,YAAY;IACzB,gBAAgB;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe;IACf,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC7B,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IACjD,wBAAwB;IACxB,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IACzB,WAAW;IACX,KAAK,EAAE,OAAO,CAAC;IACf,WAAW;IACX,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,OAAO,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAM;IAEtB;;;;OAIG;gBACS,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB;IAI1D;;;;OAIG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY;IAIhC;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAKtC;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;CAGtD;AAED,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,YAAY;IACzB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC7B,yDAAyD;IACzD,WAAW,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IACjD,8BAA8B;IAC9B,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IACzB,0BAA0B;IAC1B,KAAK,EAAE,OAAO,CAAC;IACf,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,OAAO,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IAErD;;;;OAIG;gBACS,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB;IAc1D;;;;OAIG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY;IAOhC;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAQtC;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAOnD;;;OAGG;IACH,UAAU,IAAI,QAAQ,CAAC,gBAAgB,CAAC;IAIxC;;;OAGG;IACH,SAAS,IAAI,MAAM;CAGtB;AAED,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/dist/index.js

@@ -2,46 +2,83 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ip2Region = void 0;
 const addon = require('../build/Release/ip2region.node');
+// Error codes for verification
+const ERROR_CODES = {
+    SUCCESS: 0,
+    FILE_NOT_FOUND: -1,
+    INVALID_FORMAT: 1,
+};
 class Ip2Region {
     /**
-     * 创建ip2region查询器实例
-     * @param dbPath xdb数据库文件路径
-     * @param options 配置选项
+     * Create ip2region searcher instance
+     * @param dbPath Path to xdb database file
+     * @param options Configuration options
      */
     constructor(dbPath, options = {}) {
-        this.searcher = new addon.Ip2RegionSearcher(dbPath, options);
+        if (!dbPath || typeof dbPath !== 'string') {
+            throw new TypeError('Database path must be a non-empty string');
+        }
+        this.dbPath = dbPath;
+        this.options = {
+            cachePolicy: options.cachePolicy || 'vectorIndex',
+            ipVersion: options.ipVersion || 'v4',
+        };
+        this.searcher = new addon.Ip2RegionSearcher(dbPath, this.options);
     }
     /**
-     * 查询IP地址对应的地理位置信息
-     * @param ip IP地址字符串(支持IPv4和IPv6)
-     * @returns 查询结果
+     * Query geographic location information for IP address
+     * @param ip IP address string (supports IPv4 and IPv6)
+     * @returns Query result
      */
     search(ip) {
+        if (!ip || typeof ip !== 'string') {
+            throw new TypeError('IP address must be a non-empty string');
+        }
         return this.searcher.search(ip);
     }
     /**
-     * 关闭查询器并释放资源
+     * Close searcher and release resources
      */
     close() {
         this.searcher.close();
     }
     /**
-     * 验证xdb文件的有效性
-     * @param dbPath xdb文件路径
-     * @returns 验证结果
+     * Verify the validity of xdb file
+     * @param dbPath Path to xdb file
+     * @returns Verification result
      */
     static verify(dbPath) {
+        if (!dbPath || typeof dbPath !== 'string') {
+            throw new TypeError('Database path must be a non-empty string');
+        }
         const result = addon.verifyXdb(dbPath);
         return result.valid;
     }
     /**
-     * 验证xdb文件并返回详细信息
-     * @param dbPath xdb文件路径
-     * @returns 包含 valid 和 errorCode 的对象
+     * Verify xdb file and return detailed information
+     * @param dbPath Path to xdb file
+     * @returns Object containing valid and errorCode
      */
     static verifyDetailed(dbPath) {
+        if (!dbPath || typeof dbPath !== 'string') {
+            throw new TypeError('Database path must be a non-empty string');
+        }
         return addon.verifyXdb(dbPath);
     }
+    /**
+     * Get current configuration
+     * @returns Current options
+     */
+    getOptions() {
+        return { ...this.options };
+    }
+    /**
+     * Get database file path
+     * @returns Database path
+     */
+    getDbPath() {
+        return this.dbPath;
+    }
 }
 exports.default = Ip2Region;
 exports.Ip2Region = Ip2Region;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAyBzD,MAAqB,SAAS;IAG1B;;;;OAIG;IACH,YAAY,MAAc,EAAE,UAA4B,EAAE;QACtD,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,EAAU;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,KAAK;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,MAAc;QACxB,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC,KAAK,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,MAAc;QAChC,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CACJ;AA9CD,4BA8CC;AAEQ,8BAAS"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAEzD,+BAA+B;AAC/B,MAAM,WAAW,GAAG;IAChB,OAAO,EAAE,CAAC;IACV,cAAc,EAAE,CAAC,CAAC;IAClB,cAAc,EAAE,CAAC;CACX,CAAC;AAyBX,MAAqB,SAAS;IAK1B;;;;OAIG;IACH,YAAY,MAAc,EAAE,UAA4B,EAAE;QACtD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxC,MAAM,IAAI,SAAS,CAAC,0CAA0C,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG;YACX,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,aAAa;YACjD,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;SACvC,CAAC;QAEF,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACtE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,EAAU;QACb,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,SAAS,CAAC,uCAAuC,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,KAAK;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,MAAc;QACxB,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxC,MAAM,IAAI,SAAS,CAAC,0CAA0C,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC,KAAK,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,MAAc;QAChC,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxC,MAAM,IAAI,SAAS,CAAC,0CAA0C,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,UAAU;QACN,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACH,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;CACJ;AAnFD,4BAmFC;AAEQ,8BAAS"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ip2region2",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "TypeScript-first ip2region implementation with native Node.js addon. Ultra-fast IPv4/IPv6 geolocation queries.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,19 +37,19 @@
   },
   "homepage": "https://github.com/Steven-Qiang/ts-ip2region2#readme",
   "dependencies": {
-    "node-addon-api": "^7.0.0"
+    "node-addon-api": "^8.5.0"
   },
   "devDependencies": {
-    "@types/node": "^20.19.19",
-    "node-gyp": "^10.0.0",
-    "typescript": "^5.9.3",
-    "semantic-release": "^22.0.0",
-    "@semantic-release/changelog": "^6.0.0",
-    "@semantic-release/commit-analyzer": "^11.0.0",
-    "@semantic-release/git": "^10.0.0",
-    "@semantic-release/github": "^9.0.0",
-    "@semantic-release/npm": "^11.0.0",
-    "@semantic-release/release-notes-generator": "^12.0.0"
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/commit-analyzer": "^13.0.1",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/github": "^11.0.6",
+    "@semantic-release/npm": "^12.0.2",
+    "@semantic-release/release-notes-generator": "^14.1.0",
+    "@types/node": "^24.7.0",
+    "node-gyp": "^11.4.2",
+    "semantic-release": "^24.2.9",
+    "typescript": "^5.9.3"
   },
   "engines": {
     "node": ">=16.0.0"
@@ -73,6 +73,7 @@
   ],
   "gypfile": true,
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   }
-}
+}