applesauce-loaders 0.10.0 → 0.12.0

package/package.json

@@ -1,50 +1,70 @@
 {
   "name": "applesauce-loaders",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "A collection of observable based loaders built on rx-nostr",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
-    "nostr"
+    "nostr",
+    "applesauce"
   ],
   "author": "hzrd149",
   "license": "MIT",
   "files": [
-    "dist"
+    "dist",
+    "applesauce"
   ],
   "exports": {
     ".": {
       "import": "./dist/index.js",
+      "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
     "./loaders": {
       "import": "./dist/loaders/index.js",
+      "require": "./dist/loaders/index.js",
       "types": "./dist/loaders/index.d.ts"
     },
     "./loaders/*": {
       "import": "./dist/loaders/*.js",
+      "require": "./dist/loaders/*.js",
       "types": "./dist/loaders/*.d.ts"
     },
     "./operators": {
       "import": "./dist/operators/index.js",
+      "require": "./dist/operators/index.js",
       "types": "./dist/operators/index.d.ts"
     },
     "./operators/*": {
       "import": "./dist/operators/*.js",
+      "require": "./dist/operators/*.js",
       "types": "./dist/operators/*.d.ts"
+    },
+    "./helpers": {
+      "import": "./dist/helpers/index.js",
+      "require": "./dist/helpers/index.js",
+      "types": "./dist/helpers/index.d.ts"
+    },
+    "./helpers/*": {
+      "import": "./dist/helpers/*.js",
+      "require": "./dist/helpers/*.js",
+      "types": "./dist/helpers/*.d.ts"
     }
   },
   "dependencies": {
-    "applesauce-core": "^0.10.0",
+    "applesauce-core": "^0.12.0",
     "nanoid": "^5.0.9",
-    "nostr-tools": "^2.10.3",
-    "rx-nostr": "^3.4.1",
+    "nostr-tools": "^2.10.4",
+    "rx-nostr": "^3.5.0",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "typescript": "^5.6.3",
-    "vitest": "^2.1.8"
+    "rx-nostr-crypto": "^3.1.3",
+    "typescript": "^5.7.3",
+    "vitest": "^3.0.5",
+    "vitest-nostr": "^0.4.1",
+    "vitest-websocket-mock": "^0.4.0"
   },
   "funding": {
     "type": "lightning",

package/dist/loaders/single-relay-replaceable-loader.d.ts

@@ -1,14 +0,0 @@
-import { EventPacket, RxNostr } from "rx-nostr";
-import { Loader } from "./loader.js";
-import { LoadableAddressPointer } from "./replaceable-loader.js";
-export type SingleRelayReplaceableOptions = Partial<{
-    /**
-     * Wait X ms before making a request
-     * @default 1000
-     */
-    bufferTime: number;
-}>;
-/** A wrapper class around {@link singleRelayBatcher'}, {@link replaceableRequest}, and share */
-export declare class SingleRelayReplaceableLoader extends Loader<LoadableAddressPointer, EventPacket> {
-    constructor(rxNostr: RxNostr, relay: string, opts?: SingleRelayReplaceableOptions);
-}

package/dist/loaders/single-relay-replaceable-loader.js

@@ -1,51 +0,0 @@
-import { bufferTime, filter, from, map, mergeMap, share } from "rxjs";
-import { getReplaceableUID } from "applesauce-core/helpers";
-import { nanoid } from "nanoid";
-import { Loader } from "./loader.js";
-import { isLoadableAddressPointer } from "../helpers/address-pointer.js";
-import { replaceableRequest } from "../operators/address-pointers-request.js";
-const defaultRelayReplaceableLoaderOptions = {
-    bufferTime: 1000,
-};
-/** Ensures an address pointer is only loaded once from a relay */
-function singleRelayBatcher(opts) {
-    return (source) => {
-        const loaded = new Set();
-        const options = opts ? { ...defaultRelayReplaceableLoaderOptions, ...opts } : defaultRelayReplaceableLoaderOptions;
-        return source.pipe(
-        // buffer the requests, so we only send requests every second
-        bufferTime(options.bufferTime), 
-        // ignore empty batches
-        filter((batch) => batch.length > 0), 
-        // filter out duplicates
-        map((batch) => {
-            const filtered = [];
-            for (const pointer of batch) {
-                const uid = getReplaceableUID(pointer.kind, pointer.pubkey, pointer.identifier);
-                if (!loaded.has(uid)) {
-                    filtered.push(pointer);
-                    loaded.add(uid);
-                }
-                else if (pointer.force)
-                    filtered.push(pointer);
-            }
-            return filtered;
-        }), 
-        // ignore empty batches
-        filter((batch) => batch.length > 0));
-    };
-}
-/** A wrapper class around {@link singleRelayBatcher'}, {@link replaceableRequest}, and share */
-export class SingleRelayReplaceableLoader extends Loader {
-    constructor(rxNostr, relay, opts) {
-        super((source) => source.pipe(
-        // ignore invalid address pointers
-        filter(isLoadableAddressPointer), 
-        // batch and filter
-        singleRelayBatcher(opts), 
-        // breakout the batches so they can complete
-        mergeMap((pointers) => from([pointers]).pipe(replaceableRequest(rxNostr, nanoid(8), [relay]))), 
-        // share the response with all subscribers
-        share()));
-    }
-}

package/dist/operators/address-pointers-request.d.ts

@@ -1,5 +0,0 @@
-import { EventPacket, RxNostr } from "rx-nostr";
-import { OperatorFunction } from "rxjs";
-import { AddressPointerWithoutD } from "applesauce-core/helpers";
-/** Makes a request to relays for every set of address pointers */
-export declare function replaceableRequest<T extends AddressPointerWithoutD>(rxNostr: RxNostr, id: string, relays?: string[]): OperatorFunction<T[], EventPacket>;

package/dist/operators/address-pointers-request.js

@@ -1,25 +0,0 @@
-import { map, tap } from "rxjs";
-import { logger } from "applesauce-core";
-import { relaysRequest } from "./relay-request.js";
-import { createFiltersFromAddressPointers } from "../helpers/address-pointer.js";
-/** Makes a request to relays for every set of address pointers */
-export function replaceableRequest(rxNostr, id, relays) {
-    return (source) => {
-        const log = logger.extend(`replaceableRequest:${id}`);
-        return source.pipe(
-        // convert pointers to filters
-        map(createFiltersFromAddressPointers), 
-        // make requests
-        tap((filters) => {
-            log(`Requesting`, relays, filters);
-        }), 
-        // make requests
-        relaysRequest(rxNostr, id, relays), 
-        // log when complete
-        tap({
-            complete: () => {
-                log(`Complete`);
-            },
-        }));
-    };
-}

package/dist/operators/max-filters.d.ts

@@ -1,4 +0,0 @@
-import { LazyFilter } from "rx-nostr";
-import { OperatorFunction } from "rxjs";
-/** Splits a batch of filters into multiple requests if necessary */
-export declare function splitMaxFiltersPerRequest(maxFiltersPerRequest: number): OperatorFunction<LazyFilter[], LazyFilter[]>;

package/dist/operators/max-filters.js

@@ -1,8 +0,0 @@
-import { mergeMap } from "rxjs";
-import { reduceToBatches } from "../helpers/array.js";
-/** Splits a batch of filters into multiple requests if necessary */
-export function splitMaxFiltersPerRequest(maxFiltersPerRequest) {
-    return (source) => source.pipe(
-    // batch the filters into sets no larger than maxFiltersPerRequest
-    mergeMap((filters) => reduceToBatches(filters, maxFiltersPerRequest)));
-}

package/dist/operators/relay-request.d.ts

@@ -1,4 +0,0 @@
-import { EventPacket, LazyFilter, RxNostr } from "rx-nostr";
-import { OperatorFunction } from "rxjs";
-/** Makes a request to relays for every set of filters */
-export declare function relaysRequest(rxNostr: RxNostr, id: string, relays?: string[]): OperatorFunction<LazyFilter | LazyFilter[], EventPacket>;

package/dist/operators/relay-request.js

@@ -1,9 +0,0 @@
-import { createRxOneshotReq } from "rx-nostr";
-import { map, mergeAll } from "rxjs";
-/** Makes a request to relays for every set of filters */
-export function relaysRequest(rxNostr, id, relays) {
-    return (source) => source.pipe(map((filters) => {
-        const req = createRxOneshotReq({ filters, rxReqId: id });
-        return rxNostr.use(req, { on: { relays } });
-    }), mergeAll());
-}