@valkey/valkey-glide 2.4.0-rc1 → 2.4.0-rc3

package/build-ts/BaseClient.js

@@ -163,22 +163,6 @@ function convertRecordToGlideRecord(data) {
         return { key, value };
     });
 }
-/**
- * Our purpose in creating PointerResponse type is to mark when response is of number/long pointer response type.
- * Consequently, when the response is returned, we can check whether it is instanceof the PointerResponse type and pass it to the Rust core function with the proper parameters.
- */
-class PointerResponse {
-    pointer;
-    // As Javascript does not support 64-bit integers,
-    // we split the Rust u64 pointer into two u32 integers (high and low) and build it again when we call value_from_split_pointer, the Rust function.
-    high;
-    low;
-    constructor(pointer, high, low) {
-        this.pointer = pointer;
-        this.high = high;
-        this.low = low;
-    }
-}
 /** Represents the types of services that can be used for IAM authentication. */
 var ServiceType;
 (function (ServiceType) {
@@ -401,18 +385,11 @@ class BaseClient {
             reject(new errorType(message.requestError.message ?? undefined));
         }
         else if (message.respPointer != null) {
-            let pointer;
-            if (typeof message.respPointer === "number") {
-                // Response from type number
-                const long = long_1.default.fromNumber(message.respPointer);
-                pointer = new PointerResponse(message.respPointer, long.high, long.low);
-            }
-            else {
-                // Response from type long
-                pointer = new PointerResponse(message.respPointer, message.respPointer.high, message.respPointer.low);
-            }
+            const ptrNum = typeof message.respPointer === "number"
+                ? message.respPointer
+                : message.respPointer.toNumber();
             try {
-                resolve((0, _1.valueFromSplitPointer)(pointer.high, pointer.low, decoder === Decoder.String));
+                resolve((0, _1.valueFromPointer)(ptrNum, decoder === Decoder.String));
             }
             catch (err) {
                 _1.Logger.log("error", "Decoder", `Decoding error: '${err}'`);
@@ -739,12 +716,10 @@ class BaseClient {
         let nextPushNotificationValue = {};
         const isStringDecoder = (decoder ?? this.defaultDecoder) === Decoder.String;
         if (responsePointer) {
-            if (typeof responsePointer !== "number") {
-                nextPushNotificationValue = (0, _1.valueFromSplitPointer)(responsePointer.high, responsePointer.low, isStringDecoder);
-            }
-            else {
-                nextPushNotificationValue = (0, _1.valueFromSplitPointer)(0, responsePointer, isStringDecoder);
-            }
+            const ptrNum = typeof responsePointer === "number"
+                ? responsePointer
+                : responsePointer.toNumber();
+            nextPushNotificationValue = (0, _1.valueFromPointer)(ptrNum, isStringDecoder);
             const messageKind = nextPushNotificationValue["kind"];
             if (messageKind === "Disconnect") {
                 _1.Logger.log("warn", "disconnect notification", "Transport disconnected, messages might be lost");

package/build-ts/native.d.ts

@@ -70,7 +70,17 @@ export declare function StartSocketConnection(): Promise<string>
 export declare function InitOpenTelemetry(openTelemetryConfig: OpenTelemetryConfig): void
 export declare function log(logLevel: Level, logIdentifier: string, message: string): void
 export declare function InitInternalLogger(level?: Level | undefined | null, fileName?: string | undefined | null): Level
-export declare function valueFromSplitPointer(highBits: number, lowBits: number, stringDecoder: boolean): null | string | Uint8Array | number | {} | Boolean | BigInt | Set<any> | any[] | Buffer
+/**
+ * Dereference a response pointer passed as a single JS number.
+ *
+ * napi-rs marshals `i64` via `napi_get_value_int64`, which preserves all
+ * bits for values within the safe integer range. User-space heap addresses
+ * on current 64-bit platforms (48-bit on arm64 macOS, 47-bit on x86-64
+ * Linux) are well within this range. Using a single integer avoids the
+ * high/low u32 split and eliminates the class of bugs where the caller
+ * passes the wrong high bits.
+ */
+export declare function valueFromPointer(pointerNumber: number, stringDecoder: boolean): null | string | Uint8Array | number | {} | Boolean | BigInt | Set<any> | any[] | Buffer
 /**
  * @internal @test
  * This function is for tests that require a value allocated on the heap.

package/build-ts/native.js

@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { Level, MAX_REQUEST_ARGS_LEN, DEFAULT_REQUEST_TIMEOUT_IN_MILLISECONDS, DEFAULT_CONNECTION_TIMEOUT_IN_MILLISECONDS, DEFAULT_INFLIGHT_REQUESTS_LIMIT, AsyncClient, StartSocketConnection, InitOpenTelemetry, log, InitInternalLogger, valueFromSplitPointer, createLeakedStringVec, createLeakedOtelSpan, createOtelSpanWithTraceContext, dropOtelSpan, Script, ClusterScanCursor, getStatistics } = nativeBinding
+const { Level, MAX_REQUEST_ARGS_LEN, DEFAULT_REQUEST_TIMEOUT_IN_MILLISECONDS, DEFAULT_CONNECTION_TIMEOUT_IN_MILLISECONDS, DEFAULT_INFLIGHT_REQUESTS_LIMIT, AsyncClient, StartSocketConnection, InitOpenTelemetry, log, InitInternalLogger, valueFromPointer, createLeakedStringVec, createLeakedOtelSpan, createOtelSpanWithTraceContext, dropOtelSpan, Script, ClusterScanCursor, getStatistics } = nativeBinding
 
 module.exports.Level = Level
 module.exports.MAX_REQUEST_ARGS_LEN = MAX_REQUEST_ARGS_LEN
@@ -322,7 +322,7 @@ module.exports.StartSocketConnection = StartSocketConnection
 module.exports.InitOpenTelemetry = InitOpenTelemetry
 module.exports.log = log
 module.exports.InitInternalLogger = InitInternalLogger
-module.exports.valueFromSplitPointer = valueFromSplitPointer
+module.exports.valueFromPointer = valueFromPointer
 module.exports.createLeakedStringVec = createLeakedStringVec
 module.exports.createLeakedOtelSpan = createLeakedOtelSpan
 module.exports.createOtelSpanWithTraceContext = createOtelSpanWithTraceContext

package/package.json

@@ -4,7 +4,7 @@
   "main": "build-ts/index.js",
   "module": "build-ts/index.js",
   "types": "build-ts/index.d.ts",
-  "version": "2.4.0-rc1",
+  "version": "2.4.0-rc3",
   "exports": {
     ".": {
       "import": {
@@ -135,11 +135,11 @@
     }
   },
   "optionalDependencies": {
-    "@valkey/valkey-glide-darwin-x64": "2.4.0-rc1",
-    "@valkey/valkey-glide-darwin-arm64": "2.4.0-rc1",
-    "@valkey/valkey-glide-linux-x64-gnu": "2.4.0-rc1",
-    "@valkey/valkey-glide-linux-arm64-gnu": "2.4.0-rc1",
-    "@valkey/valkey-glide-linux-x64-musl": "2.4.0-rc1",
-    "@valkey/valkey-glide-linux-arm64-musl": "2.4.0-rc1"
+    "@valkey/valkey-glide-darwin-x64": "2.4.0-rc3",
+    "@valkey/valkey-glide-darwin-arm64": "2.4.0-rc3",
+    "@valkey/valkey-glide-linux-x64-gnu": "2.4.0-rc3",
+    "@valkey/valkey-glide-linux-arm64-gnu": "2.4.0-rc3",
+    "@valkey/valkey-glide-linux-x64-musl": "2.4.0-rc3",
+    "@valkey/valkey-glide-linux-arm64-musl": "2.4.0-rc3"
   }
 }