dist/index.d.ts

@@ -2,7 +2,7 @@ import { Client } from "@lumeweb/libkernel-universal";
 import { CatOptions, LsOptions, StatOptions } from "@helia/unixfs";
 interface AbortableGenerator {
     abort: () => void;
-    iterable: () => AsyncIterable<Uint8Array>;
+    iterable: AsyncGenerator<object>;
 }
 export declare class IPFSClient extends Client {
     ready(): Promise<any>;

dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAW,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEnE,UAAU,kBAAkB;IAC1B,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,QAAQ,EAAE,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;CAC3C;AAED,qBAAa,UAAW,SAAQ,MAAM;IACvB,KAAK;IAIL,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC;IAItD,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,kBAAkB;IAIjE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,kBAAkB;IAI7D,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIlC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C,OAAO,CAAC,sBAAsB;CA4C/B;AAED,eAAO,MAAM,YAAY,8BAGxB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAW,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEnE,UAAU,kBAAkB;IAC1B,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;CAClC;AAED,qBAAa,UAAW,SAAQ,MAAM;IACvB,KAAK;IAIL,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC;IAItD,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,kBAAkB;IAIjE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,kBAAkB;IAI7D,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIlC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C,OAAO,CAAC,sBAAsB;CAgC/B;AAED,eAAO,MAAM,YAAY,8BAGxB,CAAC"}

dist/index.js

@@ -20,7 +20,7 @@ export class IPFSClient extends Client {
         return this.callModuleReturn("getActivePeers");
     }
     connectModuleGenerator(method, data) {
-        let pipe = defer();
+        const pipe = defer();
         let done = false;
         const [update, result] = this.connectModule(method, data, (item) => {
             pipe.resolve(item);
@@ -32,24 +32,15 @@ export class IPFSClient extends Client {
         })();
         return {
             abort() {
-                update("abort");
+                update();
             },
-            iterable() {
+            // @ts-ignore
-                return {
+            iterable: async function* () {
-                    [Symbol.asyncIterator]() {
+                // @ts-ignore
-                        return {
+                const iterator = (await pipe.promise)[Symbol.asyncIterator]();
-                            async next() {
+                for await (const value of iterator) {
-                                const chunk = await pipe.promise;
+                    yield value;
-                                update("next");
+                }
-                                pipe = defer();
-                                return {
-                                    value: chunk,
-                                    done: true,
-                                };
-                            },
-                        };
-                    },
-                };
             },
         };
     }

src/index.ts

@@ -4,7 +4,7 @@ import { CatOptions, LsOptions, StatOptions } from "@helia/unixfs";
 
 interface AbortableGenerator {
   abort: () => void;
-  iterable: () => AsyncIterable<Uint8Array>;
+  iterable: AsyncGenerator<object>;
 }
 
 export class IPFSClient extends Client {
@@ -36,7 +36,7 @@ export class IPFSClient extends Client {
     method: string,
     data: any
   ): AbortableGenerator {
-    let pipe = defer<Uint8Array>();
+    const pipe = defer();
 
     let done = false;
 
@@ -52,27 +52,15 @@ export class IPFSClient extends Client {
 
     return {
       abort() {
-        update("abort");
+        update();
       },
-
+      // @ts-ignore
-      iterable(): AsyncIterable<Uint8Array> {
+      iterable: async function* (): AsyncGenerator<object> {
-        return {
+        // @ts-ignore
-          [Symbol.asyncIterator]() {
+        const iterator = (await pipe.promise)[Symbol.asyncIterator]();
-            return {
+        for await (const value of iterator) {
-              async next(): Promise<IteratorResult<Uint8Array>> {
+          yield value as object;
-                const chunk = await pipe.promise;
+        }
-                update("next");
-
-                pipe = defer();
-
-                return {
-                  value: chunk,
-                  done: true as const,
-                };
-              },
-            };
-          },
-        };
       },
     };
   }