Fixes sub array insertion

Author: ospfranco

cpp/utils.cpp

@@ -97,18 +97,48 @@ inline JSVariant to_variant(jsi::Runtime &rt, const jsi::Value &value) {
     return JSVariant(strVal);
   } else if (value.isObject()) {
     auto obj = value.asObject(rt);
+    size_t byteOffset = 0;
+    size_t byteLength = 0;
+    uint8_t *sourceData = nullptr;
+
+    if (obj.isArrayBuffer(rt)) {
+      auto buffer = obj.getArrayBuffer(rt);
+      sourceData = buffer.data(rt);
+      byteLength = buffer.size(rt);
+    } else {
+      jsi::Function arrayBufferCtor =
+          rt.global().getPropertyAsFunction(rt, "ArrayBuffer");
+      jsi::Function isViewFn =
+          arrayBufferCtor.getPropertyAsFunction(rt, "isView");
+      bool isArrayBufferView = isViewFn.call(rt, obj).getBool();
+
+      if (!isArrayBufferView) {
+        throw std::runtime_error(
+            "Object is not an ArrayBuffer or ArrayBuffer view, cannot bind "
+            "to SQLite");
+      }
+
+      jsi::Object bufferObject = obj.getPropertyAsObject(rt, "buffer");
+      auto buffer = bufferObject.getArrayBuffer(rt);
+
+      byteOffset =
+          static_cast<size_t>(obj.getProperty(rt, "byteOffset").asNumber());
+      byteLength =
+          static_cast<size_t>(obj.getProperty(rt, "byteLength").asNumber());
+
+      const size_t bufferSize = buffer.size(rt);
+      if (byteOffset > bufferSize || byteLength > bufferSize - byteOffset) {
+        throw std::runtime_error("Invalid ArrayBuffer view range");
+      }
 
-    if (!obj.isArrayBuffer(rt)) {
-      throw std::runtime_error(
-          "Object is not an ArrayBuffer, cannot bind to SQLite");
+      sourceData = buffer.data(rt) + byteOffset;
     }
 
-    auto buffer = obj.getArrayBuffer(rt);
-    uint8_t *data = new uint8_t[buffer.size(rt)];
-    memcpy(data, buffer.data(rt), buffer.size(rt));
+    uint8_t *data = new uint8_t[byteLength];
+    memcpy(data, sourceData, byteLength);
 
     return JSVariant(ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                 .size = buffer.size(rt)});
+                                 .size = byteLength});
   }
 
   throw std::runtime_error("Cannot convert JSI value to C++ Variant value");

example/ios/Podfile.lock

@@ -2002,7 +2002,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   FBLazyVector: 2e5b5553df729e080483373db6f045201ff4e6db
   hermes-engine: 273e30e7fb618279934b0b95ffab60ecedb7acf5
-  op-sqlite: aec4b9ac1b22d981c2ddaf27a0acc199c1187a3c
+  op-sqlite: 4df330bec6c23e6d9c9a5e256831869c58a618ea
   RCTDeprecation: c6b36da89aa26090c8684d29c2868dcca2cd4554
   RCTRequired: 1413a0844770d00fa1f1bb2da4680adfa8698065
   RCTTypeSafety: 354b4bb344998550c45d054ef66913837948f958

example/src/tests/blob.ts

@@ -60,6 +60,23 @@ describe("Blobs", () => {
 		expect(finalUint8[0]).toBe(42);
 	});
 
+	it("Uint8Array subarray", async () => {
+		const uint8 = new Uint8Array([97, 98, 99, 100]);
+		const subarray = uint8.subarray(1, 3);
+
+		await db.execute(`INSERT OR REPLACE INTO BlobTable VALUES (?, ?);`, [
+			1,
+			subarray,
+		]);
+
+		const result = await db.execute("SELECT content FROM BlobTable");
+		const content = result.rows[0]?.content;
+		expect(content).toBeTruthy();
+
+		const finalUint8 = new Uint8Array(content as ArrayBuffer);
+		expect(Array.from(finalUint8)).toEqual([98, 99]);
+	});
+
 	it("Uint16Array", async () => {
 		const uint8 = new Uint16Array(2);
 		uint8[0] = 42;