Compare commits

..

2 Commits

Author SHA1 Message Date
Derrick Hammer b23289b8eb
*Update dist 2023-04-09 16:20:01 -04:00
Derrick Hammer 73c94f03b4
*refactor async iteration 2023-04-09 16:19:41 -04:00
4 changed files with 42 additions and 21 deletions

2
dist/index.d.ts vendored
View File

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

2
dist/index.d.ts.map vendored
View File

@ -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,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"}
{"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"}

27
dist/index.js vendored
View File

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

View File

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