ts-ip2region2 1.4.0 → 1.6.0

package/data/checksums.json

@@ -1,4 +1,4 @@
 {
-  "v4": "77134c43150220c609b0e6367b715c641223b7c4",
+  "v4": "d4299a1d1b17d4502cbc203bc9c5f0deca0a9b5c",
   "v6": "d28a10b0c1fcc86c8826668837cb0e2c35a7a4fc"
 }

package/ip2region/xdb_api.h

@@ -9,6 +9,10 @@
 #ifndef C_IP2REGION_XDB_H
 #define C_IP2REGION_XDB_H
 
+// @Note: 
+// this define must be put before any header include
+// force the LFS for ftell
+#define _FILE_OFFSET_BITS 64
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,9 +21,6 @@
 #   define XDB_PUBLIC(type)    extern __declspec(dllexport) type
 #   define XDB_PRIVATE(type)   static type
 #   define XDB_WINDOWS
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>
@@ -204,6 +205,11 @@ XDB_PUBLIC(int) xdb_v6_ip_to_string(const bytes_ip_t *, char *, size_t);
 // returns: -1 if ip1 < ip2, 1 if ip1 > ip2 or 0
 XDB_PUBLIC(int) xdb_ip_sub_compare(const bytes_ip_t *, int, const char *, int);
 
+// large file seek and tell
+XDB_PUBLIC(int) xdb_fseek(FILE *, long long, int);
+
+XDB_PUBLIC(long long) xdb_ftell(FILE *);
+
 // --- END xdb utils
 
 
@@ -276,4 +282,4 @@ XDB_PUBLIC(int) xdb_get_io_count(xdb_searcher_t *);
 
 // --- END xdb searcher api
 
-#endif // C_IP2REGION_XDB_H
+#endif // C_IP2REGION_XDB_H

package/ip2region/xdb_searcher.c

@@ -196,6 +196,13 @@ XDB_PUBLIC(int) xdb_search(xdb_searcher_t *xdb, const bytes_ip_t *ip_bytes, int
     }
 
     // printf("s_ptr=%u, e_ptr=%u\n", s_ptr, e_ptr);
+    // @Note: ptr validate, zero ptr means source data missing
+    // so we could just stop here and return an empty string.
+    if (s_ptr == 0 || e_ptr == 0) {
+        xdb_region_buffer_empty(region);
+        return err;
+    }
+
     // binary search to get the final region info
     // segment_buffer = xdb_malloc(seg_index_size);
     seg_index_size = xdb->version->segment_index_size;
@@ -270,4 +277,4 @@ XDB_PUBLIC(xdb_version_t *) xdb_get_version(xdb_searcher_t *xdb) {
 
 XDB_PUBLIC(int) xdb_get_io_count(xdb_searcher_t *xdb) {
     return xdb->io_count;
-}
+}

package/ip2region/xdb_util.c

@@ -228,7 +228,7 @@ XDB_PUBLIC(void) xdb_free_content(void *ptr) {
 }
 
 XDB_PUBLIC(int) xdb_verify_from_header(FILE *handle, xdb_header_t *header) {
-    int runtime_ptr_bytes = 0;  // runtime ptr bytes
+    unsigned int runtime_ptr_bytes = 0;  // runtime ptr bytes
     if (header->version == xdb_structure_20) {
         runtime_ptr_bytes = 4;
     } else if (header->version == xdb_structure_30) {
@@ -244,15 +244,10 @@ XDB_PUBLIC(int) xdb_verify_from_header(FILE *handle, xdb_header_t *header) {
         return 3;
     }
 
-    long int fileBytes = ftell(handle);
-    if (fileBytes < 0) {
-        return 3;
-    }
-    
-    // Use unsigned long long for maxFilePtr to avoid overflow
-    unsigned long long maxFilePtr = (1ULL << (runtime_ptr_bytes * 8)) - 1;
-    // printf("fileBytes: %ld, maxFilePtr: %llu\n", fileBytes, maxFilePtr);
-    if ((unsigned long long)fileBytes > maxFilePtr) {
+    long long fileBytes = xdb_ftell(handle);
+    long long maxFilePtr = (1LL << (runtime_ptr_bytes * 8)) - 1;
+    // printf("fileBytes: %lld, maxFilePtr: %lld\n", fileBytes, maxFilePtr);
+    if (fileBytes > maxFilePtr) {
         return 4;
     }
 
@@ -500,4 +495,31 @@ XDB_PUBLIC(int) xdb_ip_sub_compare(const bytes_ip_t *ip1, int bytes, const char
         }
     }
     return 0;
+}
+
+XDB_PUBLIC(int) xdb_fseek(FILE *handle, long long offset, int whence) {
+    // we may have to use the large file solution later
+    // #if defined(XDB_LINUX)
+    //     return fseeko(handle, (off_t) offset, whence);
+    // #elif defined(XDB_WINDOWS)
+    //     return _fseeki64(handle, (__int64) offset, whence)
+    // #else
+    //     return fseek(handle, (long) offset, whence);
+    // #endif
+
+    return fseek(handle, (long) offset, whence);
+}
+
+XDB_PUBLIC(long long) xdb_ftell(FILE *handle) {
+    // we may have to use the large file solution later
+    // #if defined(XDB_LINUX)
+    //     return (long long) ftello(handle);
+    // #elif defined(XDB_WINDOWS)
+    //     return (long long) _ftelli64(handle);
+    // #else
+    //     // report error ?
+    //     return (long long) ftell(handle);
+    // #endif
+
+    return (long long) ftell(handle);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ip2region2",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "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",