@candypoets/nipworker 0.96.3 → 0.96.5

package/dist/scheduleMicrotask.js

@@ -1,12 +1,12 @@
-import { ByteBuffer as P } from "flatbuffers";
+import { ByteBuffer as p } from "flatbuffers";
 import { W as v } from "./worker-message.js";
-class D {
+const _b = class _b {
   /**
    * Initialize a buffer for writing - sets the write position header to 4
    * @param buffer The ArrayBuffer to initialize
    */
-  static initializeBuffer(e) {
-    new DataView(e).setUint32(0, 4, true);
+  static initializeBuffer(t) {
+    new DataView(t).setUint32(0, 4, true);
   }
   /**
    * Write a message to the ArrayBuffer
@@ -14,13 +14,13 @@ class D {
    * @param data The data to write (already encoded as Uint8Array)
    * @returns True if written successfully, false if buffer is full
    */
-  static writeMessage(e, t) {
-    const i = new DataView(e), r = new Uint8Array(e), n = i.getUint32(0, true), s = 4 + t.length;
-    if (n + s > e.byteLength)
+  static writeMessage(t, e) {
+    const n = new DataView(t), s = new Uint8Array(t), i = n.getUint32(0, true), r = 4 + e.length;
+    if (i + r > t.byteLength)
       return console.warn("Buffer full, cannot write message"), false;
-    i.setUint32(n, t.length, true), r.set(t, n + 4);
-    const a = n + s;
-    return i.setUint32(0, a, true), true;
+    n.setUint32(i, e.length, true), s.set(e, i + 4);
+    const a = i + r;
+    return n.setUint32(0, a, true), true;
   }
   /**
    * Write raw batched data (already length-prefixed) to the ArrayBuffer.
@@ -29,21 +29,21 @@ class D {
    * @param data The batched data (already with length prefixes)
    * @returns True if written successfully, false if buffer is full
    */
-  static writeBatchedData(e, t, i) {
-    const r = new DataView(e), n = new Uint8Array(e), s = r.getUint32(0, true);
-    if (s + t.length > e.byteLength)
+  static writeBatchedData(t, e, n) {
+    const s = new DataView(t), i = new Uint8Array(t), r = s.getUint32(0, true);
+    if (r + e.length > t.byteLength)
       return console.warn(
-        `[ArrayBufferReader] Dropping ${i ? `event for subscription '${i}'` : "event"}: buffer full (${s}/${e.byteLength} bytes used, need ${t.length} more bytes). Consider increasing 'bytesPerEvent' or reducing subscription limits.`
+        `[ArrayBufferReader] Dropping ${n ? `event for subscription '${n}'` : "event"}: buffer full (${r}/${t.byteLength} bytes used, need ${e.length} more bytes). Consider increasing 'bytesPerEvent' or reducing subscription limits.`
       ), false;
-    n.set(t, s);
-    const a = s + t.length;
-    return r.setUint32(0, a, true), true;
+    i.set(e, r);
+    const a = r + e.length;
+    return s.setUint32(0, a, true), true;
   }
-  static writePayload(e, t, i) {
-    const r = new DataView(e), n = new Uint8Array(e), s = r.getUint32(0, true), a = 4 + t.length;
-    return s + a > e.byteLength ? (console.warn(
-      `[ArrayBufferReader] Dropping ${i ? `event for subscription '${i}'` : "event"}: buffer full (${s}/${e.byteLength} bytes used, need ${a} more bytes). Consider increasing 'bytesPerEvent' or reducing subscription limits.`
-    ), false) : (r.setUint32(s, t.length, true), n.set(t, s + 4), r.setUint32(0, s + a, true), true);
+  static writePayload(t, e, n) {
+    const s = new DataView(t), i = new Uint8Array(t), r = s.getUint32(0, true), a = 4 + e.length;
+    return r + a > t.byteLength ? (console.warn(
+      `[ArrayBufferReader] Dropping ${n ? `event for subscription '${n}'` : "event"}: buffer full (${r}/${t.byteLength} bytes used, need ${a} more bytes). Consider increasing 'bytesPerEvent' or reducing subscription limits.`
+    ), false) : (s.setUint32(r, e.length, true), i.set(e, r + 4), s.setUint32(0, r + a, true), true);
   }
   /**
    * Read new messages from ArrayBuffer since last read position
@@ -51,19 +51,25 @@ class D {
    * @param lastReadPosition Last position read (default: 0, meaning read from beginning)
    * @returns Object containing new messages and updated read position
    */
-  static readMessages(e, t = 0, i) {
-    const r = new DataView(e), n = new Uint8Array(e), s = r.getUint32(0, true), a = 4;
-    let o = t < a ? a : t;
-    if (s <= o)
+  static readMessages(t, e = 0, n) {
+    const s = new DataView(t), i = new Uint8Array(t), r = s.getUint32(0, true), a = 4;
+    let o = e < a ? a : e;
+    if (r <= o)
       return { messages: [], newReadPosition: o, hasNewData: false };
-    const f = 128, c = new Array(f);
+    const h = 128, c = new Array(h);
     let u = 0;
     try {
-      for (; o < s && !(u >= f || o + 4 > s); ) {
-        const g = o, d = r.getUint32(g, true), h = g + 4, l = h + d;
-        if (l > s) break;
-        const y = new P(n.subarray(h, l)), m = v.getRootAsWorkerMessage(y);
-        c[u++] = m, o = l;
+      for (; o < r && !(u >= h || o + 4 > r); ) {
+        const g = o, m = s.getUint32(g, true), w = g + 4, f = w + m, U = r - w;
+        if (f > r) {
+          const d = n || "__no_sub_id__";
+          this.malformedFrameLogOnceBySubId.has(d) || (this.malformedFrameLogOnceBySubId.add(d), console.error(
+            `[ArrayBufferReader] malformed frame, skipping remaining bytes: subId=${n ?? "unknown"}, subIdLen=${n ? n.length : -1}, payloadLen=${m}, currentWritePosition=${r}, lastReadPos=${e}`
+          )), o = r;
+          break;
+        }
+        const y = new p(i.subarray(w, f)), P = v.getRootAsWorkerMessage(y);
+        c[u++] = P, o = f;
       }
       return c.length = u, {
         messages: c,
@@ -73,7 +79,7 @@ class D {
     } catch (g) {
       return console.error("Failed to decode FlatBuffer data from ArrayBuffer:", g), c.length = u, {
         messages: c,
-        newReadPosition: t < a ? a : t,
+        newReadPosition: e < a ? a : e,
         hasNewData: false
       };
     }
@@ -83,11 +89,11 @@ class D {
    * @param buffer The ArrayBuffer to read from
    * @returns Object containing all messages in the buffer
    */
-  static readAllMessages(e) {
-    const t = this.readMessages(e, 0);
+  static readAllMessages(t) {
+    const e = this.readMessages(t, 0);
     return {
-      messages: t.messages,
-      totalMessages: t.messages.length
+      messages: e.messages,
+      totalMessages: e.messages.length
     };
   }
   /**
@@ -95,8 +101,8 @@ class D {
    * @param buffer The ArrayBuffer to read from
    * @returns Current write position
    */
-  static getCurrentWritePosition(e) {
-    return new DataView(e).getUint32(0, true);
+  static getCurrentWritePosition(t) {
+    return new DataView(t).getUint32(0, true);
   }
   /**
    * Check if buffer has new data since last read
@@ -104,9 +110,9 @@ class D {
    * @param lastReadPosition Last position read
    * @returns True if there's new data to read
    */
-  static hasNewData(e, t) {
-    const i = this.getCurrentWritePosition(e), n = Math.max(t, 4);
-    return i > n;
+  static hasNewData(t, e) {
+    const n = this.getCurrentWritePosition(t), i = Math.max(e, 4);
+    return n > i;
   }
   /**
    * Calculate recommended buffer size based on request limits
@@ -114,15 +120,17 @@ class D {
    * @param bytesPerEvent Estimated bytes per event (default: 3072)
    * @returns Recommended buffer size in bytes
    */
-  static calculateBufferSize(e = 100, t = 3072) {
-    const r = e * t, n = Math.floor(r * 0.25);
-    return 4 + r + n;
+  static calculateBufferSize(t = 100, e = 3072) {
+    const s = t * e, i = Math.floor(s * 0.25);
+    return 4 + s + i;
   }
-}
-function M(w) {
-  typeof queueMicrotask < "u" ? queueMicrotask(w) : typeof Promise < "u" ? Promise.resolve().then(w) : setTimeout(w, 0);
+};
+_b.malformedFrameLogOnceBySubId = /* @__PURE__ */ new Set();
+let b = _b;
+function S(l) {
+  typeof queueMicrotask < "u" ? queueMicrotask(l) : typeof Promise < "u" ? Promise.resolve().then(l) : setTimeout(l, 0);
 }
 export {
-  D as A,
-  M as s
+  b as A,
+  S as s
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@candypoets/nipworker",
-  "version": "0.96.3",
+  "version": "0.96.5",
   "description": "Nostr client library with worker-based architecture using Rust WASM",
   "type": "module",
   "module": "./dist/index.js",
@@ -36,11 +36,6 @@
       "import": "./dist/proxy/vite.js",
       "default": "./dist/proxy/vite.js"
     },
-    "./native": {
-      "types": "./dist/native.d.ts",
-      "import": "./dist/native.js",
-      "default": "./dist/native.js"
-    },
     "./react-native": {
       "types": "./dist/react-native.d.ts",
       "import": "./dist/react-native.js",
@@ -71,6 +66,8 @@
     "crates/native-ffi/react-native/android/consumer-rules.pro",
     "crates/native-ffi/react-native/android/src",
     "crates/native-ffi/react-native/ios",
+    "swift/Package.swift",
+    "swift/Sources/NipworkerSwift",
     "README.md"
   ],
   "codegenConfig": {
@@ -89,18 +86,25 @@
     }
   },
   "scripts": {
-    "build": "npm-run-all --parallel build:connections build:cache build:parser build:crypto build:engine && vite build",
+    "build": "npm-run-all --parallel build:connections build:cache build:parser build:crypto build:engine build:native:android build:native:ios && vite build",
+    "build:package": "npm run build:crates && vite build",
     "build:crates": "npm-run-all --parallel build:connections build:cache build:parser build:crypto build:engine",
+    "build:native:android": "cd crates/native-ffi/android && ./build-android-aar.sh",
+    "build:native:ios": "cd crates/native-ffi/ios && ./build-ios.sh",
+    "build:native": "npm-run-all --parallel build:native:android build:native:ios",
     "build:engine": "wasm-pack build ./src/engine --release --target web",
     "build:connections": "wasm-pack build ./crates/connections --release --target web",
     "build:cache": "wasm-pack build ./crates/cache --release --target web",
     "build:parser": "wasm-pack build ./crates/parser --release --target web",
     "build:crypto": "wasm-pack build ./crates/crypto --release --target web",
-    "flatc": "npm run flatc:rust && npm run flatc:ts",
+    "flatc": "npm run flatc:rust && npm run flatc:ts && npm run flatc:java",
     "flatc:rust": "flatc --rust --gen-object-api --gen-all --filename-suffix '' -o ./crates/core/src/generated ./schemas/message.fbs",
     "flatc:ts": "flatc --ts --gen-object-api --gen-all --filename-suffix '' -o ./src/generated ./schemas/message.fbs",
+    "flatc:swift": "npm run flatc:swift:raw && node ./scripts/postprocess-flatc-swift.mjs ./swift/Sources/NipworkerSwift/Generated/message_generated.swift && swift build --package-path swift",
+    "flatc:swift:raw": "flatc --swift --gen-all --filename-suffix '_generated' -o ./swift/Sources/NipworkerSwift/Generated ./schemas/message.fbs",
+    "flatc:java": "flatc --java --gen-all --filename-suffix '' -o ./crates/native-ffi/react-native/android/src/main/java ./schemas/message.fbs && perl -pi -e 's/FLATBUFFERS_25_12_19/FLATBUFFERS_25_2_10/g' ./crates/native-ffi/react-native/android/src/main/java/nostr/fb/*.java",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "npm run build:package",
     "test": "vitest run",
     "test:watch": "vitest",
     "test:ui": "vitest --ui",
@@ -142,8 +146,6 @@
     }
   },
   "devDependencies": {
-    "@lynx-js/react": "^0.119.0",
-    "@lynx-js/types": "^3.7.0",
     "@playwright/test": "^1.59.1",
     "@types/node": "^20.19.17",
     "@types/ws": "^8.5.12",

package/swift/Package.swift

@@ -0,0 +1,36 @@
+// swift-tools-version:5.9
+import PackageDescription
+
+let package = Package(
+    name: "NipworkerSwift",
+    platforms: [.iOS(.v14), .macOS(.v13)],
+    products: [
+        .library(
+            name: "NipworkerSwift",
+            targets: ["NipworkerSwift"]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/google/flatbuffers.git", from: "25.2.10")
+    ],
+    targets: [
+        .binaryTarget(
+            name: "NipworkerNativeFFI",
+            path: "../crates/native-ffi/ios/NipworkerNativeFFI.xcframework"
+        ),
+        .target(
+            name: "NipworkerSwift",
+            dependencies: [
+                "NipworkerNativeFFI",
+                .product(name: "FlatBuffers", package: "flatbuffers")
+            ],
+            path: "Sources/NipworkerSwift",
+            exclude: []
+        ),
+        .testTarget(
+            name: "NipworkerSwiftTests",
+            dependencies: ["NipworkerSwift"],
+            path: "Tests/NipworkerSwiftTests"
+        ),
+    ]
+)