@rdfc/js-runner 2.0.0 → 3.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/client.js CHANGED
@@ -1,12 +1,12 @@
1
1
  import * as grpc from '@grpc/grpc-js';
2
2
  import { promisify } from 'util';
3
3
  import { RunnerClient } from '@rdfc/proto';
4
- import winston from 'winston';
4
+ import { createLogger } from 'winston';
5
5
  import { RpcTransport } from './logger.js';
6
6
  import { Runner } from './runner.js';
7
7
  export async function start(addr, uri) {
8
8
  const client = new RunnerClient(addr, grpc.credentials.createInsecure());
9
- const logger = winston.createLogger({
9
+ const logger = createLogger({
10
10
  transports: [
11
11
  new RpcTransport({
12
12
  entities: [uri, 'cli'],
@@ -19,25 +19,22 @@ export async function start(addr, uri) {
19
19
  const writable = promisify(stream.write.bind(stream));
20
20
  const runner = new Runner(client, writable, uri, logger);
21
21
  await writable({ identify: { uri } });
22
- let processorsEnd;
23
- const processorsEnded = new Promise((res) => (processorsEnd = res));
24
- (async () => {
22
+ await new Promise(async (res) => {
25
23
  for await (const chunk of stream) {
26
24
  const msg = chunk;
27
25
  if (msg.proc) {
28
26
  await runner.addProcessor(msg.proc);
29
27
  }
30
28
  if (msg.start) {
31
- runner.start().then(processorsEnd);
29
+ runner.start().then(res);
32
30
  }
33
31
  await runner.handleOrchMessage(msg);
34
32
  }
35
33
  logger.error('Stream ended');
36
- })();
37
- await processorsEnded;
34
+ });
38
35
  logger.info('All processors are finished');
39
36
  stream.end();
40
37
  client.close();
41
38
  setTimeout(() => process.exit(0), 500);
42
39
  }
43
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssSUFBSSxNQUFNLGVBQWUsQ0FBQTtBQUNyQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQ2hDLE9BQU8sRUFBRSxZQUFZLEVBQWlCLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sT0FBTyxNQUFNLFNBQVMsQ0FBQTtBQUM3QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFFakMsTUFBTSxDQUFDLEtBQUssVUFBVSxLQUFLLENBQUMsSUFBWSxFQUFFLEdBQVc7SUFDbkQsTUFBTSxNQUFNLEdBQUcsSUFBSSxZQUFZLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQTtJQUV4RSxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDO1FBQ2xDLFVBQVUsRUFBRTtZQUNWLElBQUksWUFBWSxDQUFDO2dCQUNmLFFBQVEsRUFBRSxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUM7Z0JBQ3RCLE1BQU0sRUFBRSxNQUFNLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxHQUFFLENBQUMsQ0FBQzthQUNuQyxDQUFDO1NBQ0g7S0FDRixDQUFDLENBQUE7SUFFRixNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUE7SUFFL0IsTUFBTSxDQUFDLElBQUksQ0FBQyx3QkFBd0IsR0FBRyxJQUFJLENBQUMsQ0FBQTtJQUM1QyxNQUFNLFFBQVEsR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtJQUNyRCxNQUFNLE1BQU0sR0FBRyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUV4RCxNQUFNLFFBQVEsQ0FBQyxFQUFFLFFBQVEsRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUVyQyxJQUFJLGFBQXVDLENBQUE7SUFDM0MsTUFBTSxlQUFlLEdBQUcsSUFBSSxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUMsYUFBYSxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQ2xFO0lBQUEsQ0FBQyxLQUFLLElBQUksRUFBRTtRQUNYLElBQUksS0FBSyxFQUFFLE1BQU0sS0FBSyxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ2pDLE1BQU0sR0FBRyxHQUFrQixLQUFLLENBQUE7WUFDaEMsSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ2IsTUFBTSxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtZQUNyQyxDQUFDO1lBQ0QsSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2QsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtZQUNwQyxDQUFDO1lBRUQsTUFBTSxNQUFNLENBQUMsaUJBQWlCLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDckMsQ0FBQztRQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDOUIsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtJQUVKLE1BQU0sZUFBZSxDQUFBO0lBRXJCLE1BQU0sQ0FBQyxJQUFJLENBQUMsNkJBQTZCLENBQUMsQ0FBQTtJQUMxQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUE7SUFDWixNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDZCxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQTtBQUN4QyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgZ3JwYyBmcm9tICdAZ3JwYy9ncnBjLWpzJ1xuaW1wb3J0IHsgcHJvbWlzaWZ5IH0gZnJvbSAndXRpbCdcbmltcG9ydCB7IFJ1bm5lckNsaWVudCwgUnVubmVyTWVzc2FnZSB9IGZyb20gJ0ByZGZjL3Byb3RvJ1xuaW1wb3J0IHdpbnN0b24gZnJvbSAnd2luc3RvbidcbmltcG9ydCB7IFJwY1RyYW5zcG9ydCB9IGZyb20gJy4vbG9nZ2VyJ1xuaW1wb3J0IHsgUnVubmVyIH0gZnJvbSAnLi9ydW5uZXInXG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBzdGFydChhZGRyOiBzdHJpbmcsIHVyaTogc3RyaW5nKSB7XG4gIGNvbnN0IGNsaWVudCA9IG5ldyBSdW5uZXJDbGllbnQoYWRkciwgZ3JwYy5jcmVkZW50aWFscy5jcmVhdGVJbnNlY3VyZSgpKVxuXG4gIGNvbnN0IGxvZ2dlciA9IHdpbnN0b24uY3JlYXRlTG9nZ2VyKHtcbiAgICB0cmFuc3BvcnRzOiBbXG4gICAgICBuZXcgUnBjVHJhbnNwb3J0KHtcbiAgICAgICAgZW50aXRpZXM6IFt1cmksICdjbGknXSxcbiAgICAgICAgc3RyZWFtOiBjbGllbnQubG9nU3RyZWFtKCgpID0+IHt9KSxcbiAgICAgIH0pLFxuICAgIF0sXG4gIH0pXG5cbiAgY29uc3Qgc3RyZWFtID0gY2xpZW50LmNvbm5lY3QoKVxuXG4gIGxvZ2dlci5pbmZvKCdDb25uZWN0ZWQgd2l0aCBzZXJ2ZXIgJyArIGFkZHIpXG4gIGNvbnN0IHdyaXRhYmxlID0gcHJvbWlzaWZ5KHN0cmVhbS53cml0ZS5iaW5kKHN0cmVhbSkpXG4gIGNvbnN0IHJ1bm5lciA9IG5ldyBSdW5uZXIoY2xpZW50LCB3cml0YWJsZSwgdXJpLCBsb2dnZXIpXG5cbiAgYXdhaXQgd3JpdGFibGUoeyBpZGVudGlmeTogeyB1cmkgfSB9KVxuXG4gIGxldCBwcm9jZXNzb3JzRW5kITogKHY6IHVua25vd24pID0+IHVua25vd25cbiAgY29uc3QgcHJvY2Vzc29yc0VuZGVkID0gbmV3IFByb21pc2UoKHJlcykgPT4gKHByb2Nlc3NvcnNFbmQgPSByZXMpKVxuICA7KGFzeW5jICgpID0+IHtcbiAgICBmb3IgYXdhaXQgKGNvbnN0IGNodW5rIG9mIHN0cmVhbSkge1xuICAgICAgY29uc3QgbXNnOiBSdW5uZXJNZXNzYWdlID0gY2h1bmtcbiAgICAgIGlmIChtc2cucHJvYykge1xuICAgICAgICBhd2FpdCBydW5uZXIuYWRkUHJvY2Vzc29yKG1zZy5wcm9jKVxuICAgICAgfVxuICAgICAgaWYgKG1zZy5zdGFydCkge1xuICAgICAgICBydW5uZXIuc3RhcnQoKS50aGVuKHByb2Nlc3NvcnNFbmQpXG4gICAgICB9XG5cbiAgICAgIGF3YWl0IHJ1bm5lci5oYW5kbGVPcmNoTWVzc2FnZShtc2cpXG4gICAgfVxuXG4gICAgbG9nZ2VyLmVycm9yKCdTdHJlYW0gZW5kZWQnKVxuICB9KSgpXG5cbiAgYXdhaXQgcHJvY2Vzc29yc0VuZGVkXG5cbiAgbG9nZ2VyLmluZm8oJ0FsbCBwcm9jZXNzb3JzIGFyZSBmaW5pc2hlZCcpXG4gIHN0cmVhbS5lbmQoKVxuICBjbGllbnQuY2xvc2UoKVxuICBzZXRUaW1lb3V0KCgpID0+IHByb2Nlc3MuZXhpdCgwKSwgNTAwKVxufVxuIl19
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssSUFBSSxNQUFNLGVBQWUsQ0FBQTtBQUNyQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQ2hDLE9BQU8sRUFBRSxZQUFZLEVBQVksTUFBTSxhQUFhLENBQUE7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFNBQVMsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFFakMsTUFBTSxDQUFDLEtBQUssVUFBVSxLQUFLLENBQUMsSUFBWSxFQUFFLEdBQVc7SUFDbkQsTUFBTSxNQUFNLEdBQUcsSUFBSSxZQUFZLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQTtJQUV4RSxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUM7UUFDMUIsVUFBVSxFQUFFO1lBQ1YsSUFBSSxZQUFZLENBQUM7Z0JBQ2YsUUFBUSxFQUFFLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQztnQkFDdEIsTUFBTSxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLEdBQUUsQ0FBQyxDQUFDO2FBQ25DLENBQUM7U0FDSDtLQUNGLENBQUMsQ0FBQTtJQUVGLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUUvQixNQUFNLENBQUMsSUFBSSxDQUFDLHdCQUF3QixHQUFHLElBQUksQ0FBQyxDQUFBO0lBQzVDLE1BQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFBO0lBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUksTUFBTSxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLE1BQU0sQ0FBQyxDQUFBO0lBRXhELE1BQU0sUUFBUSxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFBO0lBR3JDLE1BQU0sSUFBSSxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQzlCLElBQUksS0FBSyxFQUFFLE1BQU0sS0FBSyxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ2pDLE1BQU0sR0FBRyxHQUFhLEtBQUssQ0FBQTtZQUMzQixJQUFJLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDYixNQUFNLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFBO1lBQ3JDLENBQUM7WUFDRCxJQUFJLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDZCxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQzFCLENBQUM7WUFFRCxNQUFNLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNyQyxDQUFDO1FBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUM5QixDQUFDLENBQUMsQ0FBQTtJQUVGLE1BQU0sQ0FBQyxJQUFJLENBQUMsNkJBQTZCLENBQUMsQ0FBQTtJQUMxQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUE7SUFDWixNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDZCxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQTtBQUN4QyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgZ3JwYyBmcm9tICdAZ3JwYy9ncnBjLWpzJ1xuaW1wb3J0IHsgcHJvbWlzaWZ5IH0gZnJvbSAndXRpbCdcbmltcG9ydCB7IFJ1bm5lckNsaWVudCwgVG9SdW5uZXIgfSBmcm9tICdAcmRmYy9wcm90bydcbmltcG9ydCB7IGNyZWF0ZUxvZ2dlciB9IGZyb20gJ3dpbnN0b24nXG5pbXBvcnQgeyBScGNUcmFuc3BvcnQgfSBmcm9tICcuL2xvZ2dlcidcbmltcG9ydCB7IFJ1bm5lciB9IGZyb20gJy4vcnVubmVyJ1xuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gc3RhcnQoYWRkcjogc3RyaW5nLCB1cmk6IHN0cmluZykge1xuICBjb25zdCBjbGllbnQgPSBuZXcgUnVubmVyQ2xpZW50KGFkZHIsIGdycGMuY3JlZGVudGlhbHMuY3JlYXRlSW5zZWN1cmUoKSlcblxuICBjb25zdCBsb2dnZXIgPSBjcmVhdGVMb2dnZXIoe1xuICAgIHRyYW5zcG9ydHM6IFtcbiAgICAgIG5ldyBScGNUcmFuc3BvcnQoe1xuICAgICAgICBlbnRpdGllczogW3VyaSwgJ2NsaSddLFxuICAgICAgICBzdHJlYW06IGNsaWVudC5sb2dTdHJlYW0oKCkgPT4ge30pLFxuICAgICAgfSksXG4gICAgXSxcbiAgfSlcblxuICBjb25zdCBzdHJlYW0gPSBjbGllbnQuY29ubmVjdCgpXG5cbiAgbG9nZ2VyLmluZm8oJ0Nvbm5lY3RlZCB3aXRoIHNlcnZlciAnICsgYWRkcilcbiAgY29uc3Qgd3JpdGFibGUgPSBwcm9taXNpZnkoc3RyZWFtLndyaXRlLmJpbmQoc3RyZWFtKSlcbiAgY29uc3QgcnVubmVyID0gbmV3IFJ1bm5lcihjbGllbnQsIHdyaXRhYmxlLCB1cmksIGxvZ2dlcilcblxuICBhd2FpdCB3cml0YWJsZSh7IGlkZW50aWZ5OiB7IHVyaSB9IH0pXG5cbiAgLyogZXNsaW50LWRpc2FibGUgbm8tYXN5bmMtcHJvbWlzZS1leGVjdXRvciAqL1xuICBhd2FpdCBuZXcgUHJvbWlzZShhc3luYyAocmVzKSA9PiB7XG4gICAgZm9yIGF3YWl0IChjb25zdCBjaHVuayBvZiBzdHJlYW0pIHtcbiAgICAgIGNvbnN0IG1zZzogVG9SdW5uZXIgPSBjaHVua1xuICAgICAgaWYgKG1zZy5wcm9jKSB7XG4gICAgICAgIGF3YWl0IHJ1bm5lci5hZGRQcm9jZXNzb3IobXNnLnByb2MpXG4gICAgICB9XG4gICAgICBpZiAobXNnLnN0YXJ0KSB7XG4gICAgICAgIHJ1bm5lci5zdGFydCgpLnRoZW4ocmVzKVxuICAgICAgfVxuXG4gICAgICBhd2FpdCBydW5uZXIuaGFuZGxlT3JjaE1lc3NhZ2UobXNnKVxuICAgIH1cblxuICAgIGxvZ2dlci5lcnJvcignU3RyZWFtIGVuZGVkJylcbiAgfSlcblxuICBsb2dnZXIuaW5mbygnQWxsIHByb2Nlc3NvcnMgYXJlIGZpbmlzaGVkJylcbiAgc3RyZWFtLmVuZCgpXG4gIGNsaWVudC5jbG9zZSgpXG4gIHNldFRpbWVvdXQoKCkgPT4gcHJvY2Vzcy5leGl0KDApLCA1MDApXG59XG4iXX0=
package/lib/logger.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import winston, { Logger } from 'winston';
1
+ import { LogEntry, Logger } from 'winston';
2
2
  import Transport from 'winston-transport';
3
3
  import * as grpc from '@grpc/grpc-js';
4
4
  import { LogMessage } from '@rdfc/proto';
@@ -11,7 +11,7 @@ export declare class RpcTransport extends Transport {
11
11
  entities: string[];
12
12
  aliases?: string[];
13
13
  });
14
- log(info: winston.LogEntry, callback: () => void): void;
14
+ log(info: LogEntry, callback: () => void): void;
15
15
  withEntity(entity: string): RpcTransport;
16
16
  }
17
17
  export declare function extendLogger(baseLogger: Logger, newEntity: string): Logger;
package/lib/logger.js CHANGED
@@ -1,4 +1,4 @@
1
- import winston from 'winston';
1
+ import { createLogger } from 'winston';
2
2
  import Transport from 'winston-transport';
3
3
  export class RpcTransport extends Transport {
4
4
  stream;
@@ -39,11 +39,11 @@ export function extendLogger(baseLogger, newEntity) {
39
39
  }
40
40
  return t;
41
41
  });
42
- return winston.createLogger({
42
+ return createLogger({
43
43
  level: baseLogger.level,
44
44
  format: baseLogger.format,
45
45
  defaultMeta: baseLogger.defaultMeta,
46
46
  transports: newTransports,
47
47
  });
48
48
  }
49
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE9BQW1CLE1BQU0sU0FBUyxDQUFBO0FBQ3pDLE9BQU8sU0FBUyxNQUFNLG1CQUFtQixDQUFBO0FBS3pDLE1BQU0sT0FBTyxZQUFhLFNBQVEsU0FBUztJQUN4QixNQUFNLENBQXVDO0lBQzdDLFFBQVEsQ0FBVTtJQUNsQixPQUFPLENBQVU7SUFFbEMsWUFBWSxJQUlYO1FBQ0MsS0FBSyxDQUFDLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFFekIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFBO1FBQ3pCLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQTtRQUM3QixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFBO0lBQ25DLENBQUM7SUFFRCxHQUFHLENBQUMsSUFBc0IsRUFBRSxRQUFvQjtRQUM5QyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUN4QixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FDZjtnQkFDRSxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU87Z0JBQ2pCLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztnQkFDakIsUUFBUSxFQUFFLElBQUksQ0FBQyxRQUFRO2dCQUN2QixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87YUFDdEIsRUFDRCxRQUFRLENBQ1QsQ0FBQTtRQUNILENBQUM7YUFBTSxDQUFDO1lBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFBO1lBQ25DLFFBQVEsRUFBRSxDQUFBO1FBQ1osQ0FBQztJQUNILENBQUM7SUFFRCxVQUFVLENBQUMsTUFBYztRQUN2QixPQUFPLElBQUksWUFBWSxDQUFDO1lBQ3RCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixRQUFRLEVBQUUsQ0FBQyxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO1lBQ3BDLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN0QixDQUFDLENBQUE7SUFDSixDQUFDO0NBQ0Y7QUFFRCxNQUFNLFVBQVUsWUFBWSxDQUFDLFVBQWtCLEVBQUUsU0FBaUI7SUFDaEUsTUFBTSxhQUFhLEdBQUcsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNwRCxJQUFJLENBQUMsWUFBWSxZQUFZLEVBQUUsQ0FBQztZQUM5QixPQUFPLENBQUMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUE7UUFDaEMsQ0FBQztRQUNELE9BQU8sQ0FBQyxDQUFBO0lBQ1YsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPLE9BQU8sQ0FBQyxZQUFZLENBQUM7UUFDMUIsS0FBSyxFQUFFLFVBQVUsQ0FBQyxLQUFLO1FBQ3ZCLE1BQU0sRUFBRSxVQUFVLENBQUMsTUFBTTtRQUN6QixXQUFXLEVBQUUsVUFBVSxDQUFDLFdBQVc7UUFDbkMsVUFBVSxFQUFFLGFBQWE7S0FDMUIsQ0FBQyxDQUFBO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB3aW5zdG9uLCB7IExvZ2dlciB9IGZyb20gJ3dpbnN0b24nXG5pbXBvcnQgVHJhbnNwb3J0IGZyb20gJ3dpbnN0b24tdHJhbnNwb3J0J1xuXG5pbXBvcnQgKiBhcyBncnBjIGZyb20gJ0BncnBjL2dycGMtanMnXG5pbXBvcnQgeyBMb2dNZXNzYWdlIH0gZnJvbSAnQHJkZmMvcHJvdG8nXG5cbmV4cG9ydCBjbGFzcyBScGNUcmFuc3BvcnQgZXh0ZW5kcyBUcmFuc3BvcnQge1xuICBwcml2YXRlIHJlYWRvbmx5IHN0cmVhbTogZ3JwYy5DbGllbnRXcml0YWJsZVN0cmVhbTxMb2dNZXNzYWdlPlxuICBwcml2YXRlIHJlYWRvbmx5IGVudGl0aWVzOiBzdHJpbmdbXVxuICBwcml2YXRlIHJlYWRvbmx5IGFsaWFzZXM6IHN0cmluZ1tdXG5cbiAgY29uc3RydWN0b3Iob3B0czoge1xuICAgIHN0cmVhbTogZ3JwYy5DbGllbnRXcml0YWJsZVN0cmVhbTxMb2dNZXNzYWdlPlxuICAgIGVudGl0aWVzOiBzdHJpbmdbXVxuICAgIGFsaWFzZXM/OiBzdHJpbmdbXVxuICB9KSB7XG4gICAgc3VwZXIoeyBsZXZlbDogJ2RlYnVnJyB9KVxuXG4gICAgdGhpcy5zdHJlYW0gPSBvcHRzLnN0cmVhbVxuICAgIHRoaXMuZW50aXRpZXMgPSBvcHRzLmVudGl0aWVzXG4gICAgdGhpcy5hbGlhc2VzID0gb3B0cy5hbGlhc2VzIHx8IFtdXG4gIH1cblxuICBsb2coaW5mbzogd2luc3Rvbi5Mb2dFbnRyeSwgY2FsbGJhY2s6ICgpID0+IHZvaWQpIHtcbiAgICBpZiAoIXRoaXMuc3RyZWFtLmNsb3NlZCkge1xuICAgICAgdGhpcy5zdHJlYW0ud3JpdGUoXG4gICAgICAgIHtcbiAgICAgICAgICBtc2c6IGluZm8ubWVzc2FnZSxcbiAgICAgICAgICBsZXZlbDogaW5mby5sZXZlbCxcbiAgICAgICAgICBlbnRpdGllczogdGhpcy5lbnRpdGllcyxcbiAgICAgICAgICBhbGlhc2VzOiB0aGlzLmFsaWFzZXMsXG4gICAgICAgIH0sXG4gICAgICAgIGNhbGxiYWNrLFxuICAgICAgKVxuICAgIH0gZWxzZSB7XG4gICAgICBjb25zb2xlLmxvZygnT3V0cHV0IHN0cmVhbSBjbG9zZWQnKVxuICAgICAgY2FsbGJhY2soKVxuICAgIH1cbiAgfVxuXG4gIHdpdGhFbnRpdHkoZW50aXR5OiBzdHJpbmcpOiBScGNUcmFuc3BvcnQge1xuICAgIHJldHVybiBuZXcgUnBjVHJhbnNwb3J0KHtcbiAgICAgIHN0cmVhbTogdGhpcy5zdHJlYW0sXG4gICAgICBlbnRpdGllczogWy4uLnRoaXMuZW50aXRpZXMsIGVudGl0eV0sXG4gICAgICBhbGlhc2VzOiB0aGlzLmFsaWFzZXMsXG4gICAgfSlcbiAgfVxufVxuXG5leHBvcnQgZnVuY3Rpb24gZXh0ZW5kTG9nZ2VyKGJhc2VMb2dnZXI6IExvZ2dlciwgbmV3RW50aXR5OiBzdHJpbmcpOiBMb2dnZXIge1xuICBjb25zdCBuZXdUcmFuc3BvcnRzID0gYmFzZUxvZ2dlci50cmFuc3BvcnRzLm1hcCgodCkgPT4ge1xuICAgIGlmICh0IGluc3RhbmNlb2YgUnBjVHJhbnNwb3J0KSB7XG4gICAgICByZXR1cm4gdC53aXRoRW50aXR5KG5ld0VudGl0eSlcbiAgICB9XG4gICAgcmV0dXJuIHRcbiAgfSlcblxuICByZXR1cm4gd2luc3Rvbi5jcmVhdGVMb2dnZXIoe1xuICAgIGxldmVsOiBiYXNlTG9nZ2VyLmxldmVsLFxuICAgIGZvcm1hdDogYmFzZUxvZ2dlci5mb3JtYXQsXG4gICAgZGVmYXVsdE1ldGE6IGJhc2VMb2dnZXIuZGVmYXVsdE1ldGEsXG4gICAgdHJhbnNwb3J0czogbmV3VHJhbnNwb3J0cyxcbiAgfSlcbn1cbiJdfQ==
49
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFvQixNQUFNLFNBQVMsQ0FBQTtBQUN4RCxPQUFPLFNBQVMsTUFBTSxtQkFBbUIsQ0FBQTtBQUt6QyxNQUFNLE9BQU8sWUFBYSxTQUFRLFNBQVM7SUFDeEIsTUFBTSxDQUF1QztJQUM3QyxRQUFRLENBQVU7SUFDbEIsT0FBTyxDQUFVO0lBRWxDLFlBQVksSUFJWDtRQUNDLEtBQUssQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBRXpCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQTtRQUN6QixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUE7UUFDN0IsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQTtJQUNuQyxDQUFDO0lBRUQsR0FBRyxDQUFDLElBQWMsRUFBRSxRQUFvQjtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUN4QixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FDZjtnQkFDRSxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU87Z0JBQ2pCLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztnQkFDakIsUUFBUSxFQUFFLElBQUksQ0FBQyxRQUFRO2dCQUN2QixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87YUFDdEIsRUFDRCxRQUFRLENBQ1QsQ0FBQTtRQUNILENBQUM7YUFBTSxDQUFDO1lBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFBO1lBQ25DLFFBQVEsRUFBRSxDQUFBO1FBQ1osQ0FBQztJQUNILENBQUM7SUFFRCxVQUFVLENBQUMsTUFBYztRQUN2QixPQUFPLElBQUksWUFBWSxDQUFDO1lBQ3RCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixRQUFRLEVBQUUsQ0FBQyxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO1lBQ3BDLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN0QixDQUFDLENBQUE7SUFDSixDQUFDO0NBQ0Y7QUFFRCxNQUFNLFVBQVUsWUFBWSxDQUFDLFVBQWtCLEVBQUUsU0FBaUI7SUFDaEUsTUFBTSxhQUFhLEdBQUcsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNwRCxJQUFJLENBQUMsWUFBWSxZQUFZLEVBQUUsQ0FBQztZQUM5QixPQUFPLENBQUMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUE7UUFDaEMsQ0FBQztRQUNELE9BQU8sQ0FBQyxDQUFBO0lBQ1YsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPLFlBQVksQ0FBQztRQUNsQixLQUFLLEVBQUUsVUFBVSxDQUFDLEtBQUs7UUFDdkIsTUFBTSxFQUFFLFVBQVUsQ0FBQyxNQUFNO1FBQ3pCLFdBQVcsRUFBRSxVQUFVLENBQUMsV0FBVztRQUNuQyxVQUFVLEVBQUUsYUFBYTtLQUMxQixDQUFDLENBQUE7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3JlYXRlTG9nZ2VyLCBMb2dFbnRyeSwgTG9nZ2VyIH0gZnJvbSAnd2luc3RvbidcbmltcG9ydCBUcmFuc3BvcnQgZnJvbSAnd2luc3Rvbi10cmFuc3BvcnQnXG5cbmltcG9ydCAqIGFzIGdycGMgZnJvbSAnQGdycGMvZ3JwYy1qcydcbmltcG9ydCB7IExvZ01lc3NhZ2UgfSBmcm9tICdAcmRmYy9wcm90bydcblxuZXhwb3J0IGNsYXNzIFJwY1RyYW5zcG9ydCBleHRlbmRzIFRyYW5zcG9ydCB7XG4gIHByaXZhdGUgcmVhZG9ubHkgc3RyZWFtOiBncnBjLkNsaWVudFdyaXRhYmxlU3RyZWFtPExvZ01lc3NhZ2U+XG4gIHByaXZhdGUgcmVhZG9ubHkgZW50aXRpZXM6IHN0cmluZ1tdXG4gIHByaXZhdGUgcmVhZG9ubHkgYWxpYXNlczogc3RyaW5nW11cblxuICBjb25zdHJ1Y3RvcihvcHRzOiB7XG4gICAgc3RyZWFtOiBncnBjLkNsaWVudFdyaXRhYmxlU3RyZWFtPExvZ01lc3NhZ2U+XG4gICAgZW50aXRpZXM6IHN0cmluZ1tdXG4gICAgYWxpYXNlcz86IHN0cmluZ1tdXG4gIH0pIHtcbiAgICBzdXBlcih7IGxldmVsOiAnZGVidWcnIH0pXG5cbiAgICB0aGlzLnN0cmVhbSA9IG9wdHMuc3RyZWFtXG4gICAgdGhpcy5lbnRpdGllcyA9IG9wdHMuZW50aXRpZXNcbiAgICB0aGlzLmFsaWFzZXMgPSBvcHRzLmFsaWFzZXMgfHwgW11cbiAgfVxuXG4gIGxvZyhpbmZvOiBMb2dFbnRyeSwgY2FsbGJhY2s6ICgpID0+IHZvaWQpIHtcbiAgICBpZiAoIXRoaXMuc3RyZWFtLmNsb3NlZCkge1xuICAgICAgdGhpcy5zdHJlYW0ud3JpdGUoXG4gICAgICAgIHtcbiAgICAgICAgICBtc2c6IGluZm8ubWVzc2FnZSxcbiAgICAgICAgICBsZXZlbDogaW5mby5sZXZlbCxcbiAgICAgICAgICBlbnRpdGllczogdGhpcy5lbnRpdGllcyxcbiAgICAgICAgICBhbGlhc2VzOiB0aGlzLmFsaWFzZXMsXG4gICAgICAgIH0sXG4gICAgICAgIGNhbGxiYWNrLFxuICAgICAgKVxuICAgIH0gZWxzZSB7XG4gICAgICBjb25zb2xlLmxvZygnT3V0cHV0IHN0cmVhbSBjbG9zZWQnKVxuICAgICAgY2FsbGJhY2soKVxuICAgIH1cbiAgfVxuXG4gIHdpdGhFbnRpdHkoZW50aXR5OiBzdHJpbmcpOiBScGNUcmFuc3BvcnQge1xuICAgIHJldHVybiBuZXcgUnBjVHJhbnNwb3J0KHtcbiAgICAgIHN0cmVhbTogdGhpcy5zdHJlYW0sXG4gICAgICBlbnRpdGllczogWy4uLnRoaXMuZW50aXRpZXMsIGVudGl0eV0sXG4gICAgICBhbGlhc2VzOiB0aGlzLmFsaWFzZXMsXG4gICAgfSlcbiAgfVxufVxuXG5leHBvcnQgZnVuY3Rpb24gZXh0ZW5kTG9nZ2VyKGJhc2VMb2dnZXI6IExvZ2dlciwgbmV3RW50aXR5OiBzdHJpbmcpOiBMb2dnZXIge1xuICBjb25zdCBuZXdUcmFuc3BvcnRzID0gYmFzZUxvZ2dlci50cmFuc3BvcnRzLm1hcCgodCkgPT4ge1xuICAgIGlmICh0IGluc3RhbmNlb2YgUnBjVHJhbnNwb3J0KSB7XG4gICAgICByZXR1cm4gdC53aXRoRW50aXR5KG5ld0VudGl0eSlcbiAgICB9XG4gICAgcmV0dXJuIHRcbiAgfSlcblxuICByZXR1cm4gY3JlYXRlTG9nZ2VyKHtcbiAgICBsZXZlbDogYmFzZUxvZ2dlci5sZXZlbCxcbiAgICBmb3JtYXQ6IGJhc2VMb2dnZXIuZm9ybWF0LFxuICAgIGRlZmF1bHRNZXRhOiBiYXNlTG9nZ2VyLmRlZmF1bHRNZXRhLFxuICAgIHRyYW5zcG9ydHM6IG5ld1RyYW5zcG9ydHMsXG4gIH0pXG59XG4iXX0=
package/lib/reader.d.ts CHANGED
@@ -1,5 +1,6 @@
1
- import { Message, RunnerClient, StreamMessage } from '@rdfc/proto';
2
- import winston from 'winston';
1
+ import { ReceivingMessage, ReceivingStreamMessage, RunnerClient } from '@rdfc/proto';
2
+ import { Logger } from 'winston';
3
+ import { Writable } from './runner.js';
3
4
  export type Any = {
4
5
  string: string;
5
6
  } | {
@@ -18,13 +19,14 @@ export declare class ReaderInstance implements Reader {
18
19
  private client;
19
20
  readonly uri: string;
20
21
  private logger;
21
- private iterators;
22
- constructor(uri: string, client: RunnerClient, logger: winston.Logger);
22
+ private readonly notifyOrchestrator;
23
+ private consumers;
24
+ constructor(uri: string, client: RunnerClient, notifyOrchestrator: Writable, logger: Logger);
23
25
  anys(): AsyncIterable<Any>;
24
26
  strings(): AsyncIterable<string>;
25
27
  buffers(): AsyncIterable<Uint8Array>;
26
28
  streams(): AsyncIterable<AsyncGenerator<Uint8Array>>;
27
- handleMsg(msg: Message): void;
29
+ handleMsg(msg: ReceivingMessage): void;
28
30
  close(): void;
29
- handleStreamingMessage(msg: StreamMessage): void;
31
+ handleStreamingMessage({ channel, globalSequenceNumber, }: ReceivingStreamMessage): Promise<void>;
30
32
  }
package/lib/reader.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { AnyConvertor, NoConvertor, StreamConvertor, StringConvertor, } from './convertor.js';
2
+ import { promisify } from 'util';
2
3
  class MyIter {
3
4
  convertor;
4
5
  queue = [];
@@ -6,30 +7,29 @@ class MyIter {
6
7
  constructor(convertor) {
7
8
  this.convertor = convertor;
8
9
  }
9
- push(buffer) {
10
+ push(buffer, onComplete) {
10
11
  const item = this.convertor.from(buffer);
11
- this.queue.push(item);
12
+ this.queue.push({ item, onComplete });
12
13
  if (this.resolveNext) {
13
14
  this.resolveNext(undefined);
14
15
  this.resolveNext = null;
15
16
  }
16
17
  }
17
- close() {
18
- this.queue.push(undefined);
18
+ close(onComplete) {
19
+ this.queue.push({ item: undefined, onComplete });
19
20
  if (this.resolveNext) {
20
21
  this.resolveNext(undefined);
21
22
  this.resolveNext = null;
22
23
  }
23
24
  }
24
- async pushStream(chunks) {
25
+ async pushStream(chunks, onComplete) {
25
26
  const stream = (async function* (stream) {
26
- for await (const c of stream) {
27
- const chunk = c;
27
+ for await (const chunk of stream) {
28
28
  yield chunk.data;
29
29
  }
30
30
  })(chunks);
31
31
  const item = await this.convertor.fromStream(stream);
32
- this.queue.push(item);
32
+ this.queue.push({ item, onComplete });
33
33
  if (this.resolveNext) {
34
34
  this.resolveNext(undefined);
35
35
  this.resolveNext = null;
@@ -38,10 +38,13 @@ class MyIter {
38
38
  async *[Symbol.asyncIterator]() {
39
39
  while (true) {
40
40
  if (this.queue.length > 0) {
41
- const item = this.queue.shift();
42
- if (item === undefined)
41
+ const { item, onComplete } = this.queue.shift();
42
+ if (item === undefined) {
43
+ onComplete();
43
44
  break;
45
+ }
44
46
  yield item;
47
+ onComplete();
45
48
  }
46
49
  else {
47
50
  await new Promise((resolve) => (this.resolveNext = resolve));
@@ -53,49 +56,156 @@ export class ReaderInstance {
53
56
  client;
54
57
  uri;
55
58
  logger;
56
- iterators = [];
57
- constructor(uri, client, logger) {
59
+ notifyOrchestrator;
60
+ consumers = [];
61
+ constructor(uri, client, notifyOrchestrator, logger) {
58
62
  this.uri = uri;
59
63
  this.client = client;
60
64
  this.logger = logger;
65
+ this.notifyOrchestrator = notifyOrchestrator;
61
66
  }
62
67
  anys() {
63
68
  const iter = new MyIter(AnyConvertor);
64
- this.iterators.push(iter);
69
+ this.consumers.push(iter);
65
70
  return iter;
66
71
  }
67
72
  strings() {
68
73
  const iter = new MyIter(StringConvertor);
69
- this.iterators.push(iter);
74
+ this.consumers.push(iter);
70
75
  return iter;
71
76
  }
72
77
  buffers() {
73
78
  const iter = new MyIter(NoConvertor);
74
- this.iterators.push(iter);
79
+ this.consumers.push(iter);
75
80
  return iter;
76
81
  }
77
82
  streams() {
78
83
  const iter = new MyIter(StreamConvertor);
79
- this.iterators.push(iter);
84
+ this.consumers.push(iter);
80
85
  return iter;
81
86
  }
82
87
  handleMsg(msg) {
83
88
  this.logger.debug(`${this.uri} handling message`);
84
- for (const iter of this.iterators) {
85
- iter.push(msg.data);
89
+ const promises = [];
90
+ for (const iter of this.consumers) {
91
+ promises.push(new Promise((res) => iter.push(msg.data, () => res(null))));
86
92
  }
93
+ Promise.all(promises).then(() => this.notifyOrchestrator({
94
+ processed: {
95
+ globalSequenceNumber: msg.globalSequenceNumber,
96
+ channel: this.uri,
97
+ },
98
+ }));
87
99
  }
88
100
  close() {
89
- for (const iter of this.iterators) {
90
- iter.close();
101
+ for (const iter of this.consumers) {
102
+ iter.close(() => { });
91
103
  }
92
104
  }
93
- handleStreamingMessage(msg) {
105
+ async handleStreamingMessage({ channel, globalSequenceNumber, }) {
94
106
  this.logger.debug(`${this.uri} handling streaming message`);
95
- const chunks = this.client.receiveStreamMessage(msg.id);
96
- for (const iter of this.iterators) {
97
- iter.pushStream(chunks);
107
+ const chunks = this.client.receiveStreamMessage();
108
+ const writeControlMessage = promisify(chunks.write.bind(chunks));
109
+ const consumersConsumed = [];
110
+ let idx = 0;
111
+ const messageIterators = fanoutStream(chunks, this.consumers.length, async () => {
112
+ await writeControlMessage({ streamSequenceNumber: idx++ });
113
+ });
114
+ for (const consumer of this.consumers) {
115
+ consumersConsumed.push(new Promise((res) => consumer.pushStream(messageIterators.pop(), () => res(null))));
116
+ }
117
+ await writeControlMessage({ globalSequenceNumber });
118
+ Promise.all(consumersConsumed).then(() => {
119
+ console.log('Writing processed for streaming message');
120
+ this.notifyOrchestrator({ processed: { globalSequenceNumber, channel } });
121
+ });
122
+ }
123
+ }
124
+ function fanoutStream(stream, numConsumers, onAllHandled) {
125
+ let ended = false;
126
+ const buffer = [];
127
+ const pending = [];
128
+ let activeConsumers = numConsumers;
129
+ let awaitingAck = 0;
130
+ function pushChunk(chunk) {
131
+ buffer.push(chunk);
132
+ flush();
133
+ }
134
+ function flush() {
135
+ while (buffer.length > 0 && pending.length > 0) {
136
+ const chunk = buffer[0];
137
+ const waiter = pending.shift();
138
+ waiter({ value: chunk, done: false });
139
+ awaitingAck++;
140
+ }
141
+ }
142
+ function end() {
143
+ ended = true;
144
+ while (pending.length > 0) {
145
+ const waiter = pending.shift();
146
+ waiter({ value: undefined, done: true });
147
+ }
148
+ }
149
+ stream.on('data', (chunk) => {
150
+ pushChunk(chunk);
151
+ });
152
+ stream.on('end', () => {
153
+ end();
154
+ });
155
+ stream.on('error', (err) => {
156
+ while (pending.length > 0) {
157
+ const waiter = pending.shift();
158
+ waiter({ value: undefined, done: true });
98
159
  }
160
+ throw err;
161
+ });
162
+ function makeIterable() {
163
+ return {
164
+ [Symbol.asyncIterator]() {
165
+ return {
166
+ next() {
167
+ if (buffer.length > 0) {
168
+ const chunk = buffer[0];
169
+ awaitingAck++;
170
+ return Promise.resolve({ value: chunk, done: false });
171
+ }
172
+ if (ended) {
173
+ return Promise.resolve({ value: undefined, done: true });
174
+ }
175
+ return new Promise((resolve) => {
176
+ pending.push(resolve);
177
+ });
178
+ },
179
+ async return() {
180
+ activeConsumers--;
181
+ if (activeConsumers === 0) {
182
+ end();
183
+ }
184
+ return { value: undefined, done: true };
185
+ },
186
+ };
187
+ },
188
+ };
189
+ }
190
+ async function ack() {
191
+ awaitingAck--;
192
+ if (awaitingAck === 0) {
193
+ buffer.shift();
194
+ await onAllHandled();
195
+ flush();
196
+ }
197
+ }
198
+ function wrap(iterable) {
199
+ return {
200
+ async *[Symbol.asyncIterator]() {
201
+ for await (const item of iterable) {
202
+ yield item;
203
+ await ack();
204
+ }
205
+ },
206
+ };
99
207
  }
208
+ const rawIterables = Array.from({ length: numConsumers }, makeIterable);
209
+ return rawIterables.map(wrap);
100
210
  }
101
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"reader.js","sourceRoot":"","sources":["../src/reader.ts"],"names":[],"mappings":"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","sourcesContent":["import { ClientReadableStream } from '@grpc/grpc-js'\nimport { DataChunk, Message, RunnerClient, StreamMessage } from '@rdfc/proto'\nimport winston from 'winston'\nimport {\n  AnyConvertor,\n  Convertor,\n  NoConvertor,\n  StreamConvertor,\n  StringConvertor,\n} from './convertor'\n\nexport type Any =\n  | {\n      string: string\n    }\n  | {\n      stream: AsyncGenerator<Uint8Array>\n    }\n  | {\n      buffer: Uint8Array\n    }\n\nexport interface Reader {\n  readonly uri: string\n  strings(): AsyncIterable<string>\n  streams(): AsyncIterable<AsyncGenerator<Uint8Array>>\n  buffers(): AsyncIterable<Uint8Array>\n  anys(): AsyncIterable<Any>\n}\n\nclass MyIter<T> implements AsyncIterable<T> {\n  private convertor: Convertor<T>\n  private queue: (T | undefined)[] = []\n  private resolveNext: ((value: undefined) => void) | null = null\n\n  constructor(convertor: Convertor<T>) {\n    this.convertor = convertor\n  }\n\n  push(buffer: Uint8Array) {\n    const item = this.convertor.from(buffer)\n    this.queue.push(item)\n    if (this.resolveNext) {\n      this.resolveNext(undefined)\n      this.resolveNext = null\n    }\n  }\n\n  close() {\n    this.queue.push(undefined)\n    if (this.resolveNext) {\n      this.resolveNext(undefined)\n      this.resolveNext = null\n    }\n  }\n\n  async pushStream(chunks: ClientReadableStream<DataChunk>) {\n    const stream = (async function* (stream) {\n      for await (const c of stream) {\n        const chunk: DataChunk = c\n        yield chunk.data\n      }\n    })(chunks)\n    const item = await this.convertor.fromStream(stream)\n    this.queue.push(item)\n    if (this.resolveNext) {\n      this.resolveNext(undefined)\n      this.resolveNext = null\n    }\n  }\n\n  async *[Symbol.asyncIterator]() {\n    while (true) {\n      if (this.queue.length > 0) {\n        const item = this.queue.shift()!\n        if (item === undefined) break\n        yield item\n      } else {\n        await new Promise<undefined>((resolve) => (this.resolveNext = resolve))\n      }\n    }\n  }\n}\n\nexport class ReaderInstance implements Reader {\n  private client: RunnerClient\n  readonly uri: string\n  private logger: winston.Logger\n\n  private iterators: MyIter<unknown>[] = []\n\n  constructor(uri: string, client: RunnerClient, logger: winston.Logger) {\n    this.uri = uri\n    this.client = client\n    this.logger = logger\n  }\n\n  anys(): AsyncIterable<Any> {\n    const iter = new MyIter(AnyConvertor)\n    this.iterators.push(iter)\n    return iter\n  }\n\n  strings(): AsyncIterable<string> {\n    const iter = new MyIter(StringConvertor)\n    this.iterators.push(iter)\n    return iter\n  }\n\n  buffers(): AsyncIterable<Uint8Array> {\n    const iter = new MyIter(NoConvertor)\n    this.iterators.push(iter)\n    return iter\n  }\n\n  streams(): AsyncIterable<AsyncGenerator<Uint8Array>> {\n    const iter = new MyIter(StreamConvertor)\n    this.iterators.push(iter)\n    return iter\n  }\n\n  handleMsg(msg: Message) {\n    this.logger.debug(`${this.uri} handling message`)\n    for (const iter of this.iterators) {\n      iter.push(msg.data)\n    }\n  }\n\n  close() {\n    for (const iter of this.iterators) {\n      iter.close()\n    }\n  }\n\n  handleStreamingMessage(msg: StreamMessage) {\n    this.logger.debug(`${this.uri} handling streaming message`)\n    const chunks = this.client.receiveStreamMessage(msg.id!)\n    for (const iter of this.iterators) {\n      iter.pushStream(chunks)\n    }\n  }\n}\n"]}
211
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"reader.js","sourceRoot":"","sources":["../src/reader.ts"],"names":[],"mappings":"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","sourcesContent":["import { ClientReadableStream } from '@grpc/grpc-js'\nimport {\n  DataChunk,\n  ReceivingMessage,\n  ReceivingStreamMessage,\n  RunnerClient,\n} from '@rdfc/proto'\nimport { Logger } from 'winston'\nimport {\n  AnyConvertor,\n  Convertor,\n  NoConvertor,\n  StreamConvertor,\n  StringConvertor,\n} from './convertor'\nimport { Writable } from './runner'\nimport { promisify } from 'util'\n\nexport type Any =\n  | {\n    string: string\n  }\n  | {\n    stream: AsyncGenerator<Uint8Array>\n  }\n  | {\n    buffer: Uint8Array\n  }\n\nexport interface Reader {\n  readonly uri: string\n  strings(): AsyncIterable<string>\n  streams(): AsyncIterable<AsyncGenerator<Uint8Array>>\n  buffers(): AsyncIterable<Uint8Array>\n  anys(): AsyncIterable<Any>\n}\n\ntype Todo<T> = {\n  item: T\n  onComplete: () => void\n}\n\nclass MyIter<T> implements AsyncIterable<T> {\n  private convertor: Convertor<T>\n  private queue: Todo<T | undefined>[] = []\n  private resolveNext: ((value: undefined) => void) | null = null\n\n  constructor(convertor: Convertor<T>) {\n    this.convertor = convertor\n  }\n\n  push(buffer: Uint8Array, onComplete: () => void) {\n    const item = this.convertor.from(buffer)\n    this.queue.push({ item, onComplete })\n    if (this.resolveNext) {\n      this.resolveNext(undefined)\n      this.resolveNext = null\n    }\n  }\n\n  close(onComplete: () => void) {\n    this.queue.push({ item: undefined, onComplete })\n    if (this.resolveNext) {\n      this.resolveNext(undefined)\n      this.resolveNext = null\n    }\n  }\n\n  async pushStream(chunks: AsyncIterable<DataChunk>, onComplete: () => void) {\n    // This is an async generator that transforms DataChunks to Buffers\n    const stream = (async function*(stream) {\n      for await (const chunk of stream) {\n        yield chunk.data\n      }\n    })(chunks)\n\n    const item = await this.convertor.fromStream(stream)\n    this.queue.push({ item, onComplete })\n    if (this.resolveNext) {\n      this.resolveNext(undefined)\n      this.resolveNext = null\n    }\n  }\n\n  async *[Symbol.asyncIterator]() {\n    while (true) {\n      if (this.queue.length > 0) {\n        const { item, onComplete } = this.queue.shift()!\n        if (item === undefined) {\n          onComplete()\n          break\n        }\n        yield item\n        // Note: execution pauses at `yield` until the consumer calls `.next()` again.\n        // We call onComplete *after* resuming, so the producer knows the item was actually consumed.\n        onComplete()\n      } else {\n        await new Promise<undefined>((resolve) => (this.resolveNext = resolve))\n      }\n    }\n  }\n}\n\nexport class ReaderInstance implements Reader {\n  private client: RunnerClient\n  readonly uri: string\n  private logger: Logger\n  private readonly notifyOrchestrator: Writable\n\n  private consumers: MyIter<unknown>[] = []\n\n  constructor(\n    uri: string,\n    client: RunnerClient,\n    notifyOrchestrator: Writable,\n    logger: Logger,\n  ) {\n    this.uri = uri\n    this.client = client\n    this.logger = logger\n    this.notifyOrchestrator = notifyOrchestrator\n  }\n\n  anys(): AsyncIterable<Any> {\n    const iter = new MyIter(AnyConvertor)\n    this.consumers.push(iter)\n    return iter\n  }\n\n  strings(): AsyncIterable<string> {\n    const iter = new MyIter(StringConvertor)\n    this.consumers.push(iter)\n    return iter\n  }\n\n  buffers(): AsyncIterable<Uint8Array> {\n    const iter = new MyIter(NoConvertor)\n    this.consumers.push(iter)\n    return iter\n  }\n\n  streams(): AsyncIterable<AsyncGenerator<Uint8Array>> {\n    const iter = new MyIter(StreamConvertor)\n    this.consumers.push(iter)\n    return iter\n  }\n\n  handleMsg(msg: ReceivingMessage) {\n    this.logger.debug(`${this.uri} handling message`)\n\n    const promises = []\n    for (const iter of this.consumers) {\n      promises.push(new Promise((res) => iter.push(msg.data, () => res(null))))\n    }\n\n    Promise.all(promises).then(() =>\n      this.notifyOrchestrator({\n        processed: {\n          globalSequenceNumber: msg.globalSequenceNumber,\n          channel: this.uri,\n        },\n      }),\n    )\n  }\n\n  close() {\n    for (const iter of this.consumers) {\n      iter.close(() => { })\n    }\n  }\n\n  // There is a stream message available for this reader\n  async handleStreamingMessage({\n    channel,\n    globalSequenceNumber,\n  }: ReceivingStreamMessage) {\n    this.logger.debug(`${this.uri} handling streaming message`)\n\n    const chunks = this.client.receiveStreamMessage()\n    const writeControlMessage = promisify(chunks.write.bind(chunks))\n    const consumersConsumed = []\n\n    // After each chunk is handled by all consumer, emit a processed message\n    let idx = 0\n    const messageIterators = fanoutStream(\n      chunks,\n      this.consumers.length,\n      async () => {\n        await writeControlMessage({ streamSequenceNumber: idx++ })\n      },\n    )\n\n    for (const consumer of this.consumers) {\n      consumersConsumed.push(\n        new Promise((res) =>\n          consumer.pushStream(messageIterators.pop()!, () => res(null)),\n        ),\n      )\n    }\n\n    await writeControlMessage({ globalSequenceNumber })\n\n    Promise.all(consumersConsumed).then(() => {\n      console.log('Writing processed for streaming message')\n      this.notifyOrchestrator({ processed: { globalSequenceNumber, channel } })\n    })\n  }\n}\n\n/**\n * Helper function to tee a stream `numConsumers` times\n * When each tee'd stream has handled a chunk, call {@link onAllHandled}\n */\nfunction fanoutStream<T>(\n  stream: ClientReadableStream<T>,\n  numConsumers: number,\n  onAllHandled: () => void | Promise<void>,\n): AsyncIterable<T>[] {\n  type Waiter = (value: IteratorResult<T>) => void\n\n  let ended = false\n  const buffer: T[] = []\n  const pending: Waiter[] = []\n  let activeConsumers = numConsumers\n\n  // consumer bookkeeping\n  let awaitingAck = 0\n\n  function pushChunk(chunk: T) {\n    buffer.push(chunk)\n    flush()\n  }\n\n  function flush() {\n    while (buffer.length > 0 && pending.length > 0) {\n      const chunk = buffer[0] // keep until all consumers ack\n      const waiter = pending.shift()!\n      waiter({ value: chunk, done: false })\n      awaitingAck++\n    }\n  }\n\n  function end() {\n    ended = true\n    while (pending.length > 0) {\n      const waiter = pending.shift()!\n      waiter({ value: undefined, done: true })\n    }\n  }\n\n  stream.on('data', (chunk: T) => {\n    pushChunk(chunk)\n  })\n\n  stream.on('end', () => {\n    end()\n  })\n\n  stream.on('error', (err) => {\n    while (pending.length > 0) {\n      const waiter = pending.shift()!\n      waiter({ value: undefined, done: true })\n    }\n    throw err\n  })\n\n  function makeIterable(): AsyncIterable<T> {\n    return {\n      [Symbol.asyncIterator]() {\n        return {\n          next(): Promise<IteratorResult<T>> {\n            if (buffer.length > 0) {\n              const chunk = buffer[0]\n              awaitingAck++\n              return Promise.resolve({ value: chunk, done: false })\n            }\n            if (ended) {\n              return Promise.resolve({ value: undefined, done: true })\n            }\n            return new Promise((resolve) => {\n              pending.push(resolve)\n            })\n          },\n          async return() {\n            activeConsumers--\n            if (activeConsumers === 0) {\n              end()\n            }\n            return { value: undefined, done: true }\n          },\n        }\n      },\n    }\n  }\n\n  async function ack() {\n    awaitingAck--\n    if (awaitingAck === 0) {\n      // all consumers done with the current chunk\n      buffer.shift() // drop it\n      await onAllHandled()\n      flush() // continue with next chunk\n    }\n  }\n\n  // wrap consumer so they *must* call ack() after processing\n  function wrap(iterable: AsyncIterable<T>): AsyncIterable<T> {\n    return {\n      async *[Symbol.asyncIterator]() {\n        for await (const item of iterable) {\n          yield item\n          await ack()\n        }\n      },\n    }\n  }\n\n  const rawIterables = Array.from({ length: numConsumers }, makeIterable)\n  return rawIterables.map(wrap)\n}\n"]}
package/lib/runner.d.ts CHANGED
@@ -1,26 +1,31 @@
1
- import { OrchestratorMessage, Processor, RunnerClient, RunnerMessage } from '@rdfc/proto';
1
+ import { FromRunner, Processor, RunnerClient, ToRunner } from '@rdfc/proto';
2
2
  import { Reader } from './reader.js';
3
3
  import { Writer } from './writer.js';
4
4
  import { Processor as Proc } from './processor.js';
5
5
  import { Logger } from 'winston';
6
6
  import { Term } from '@rdfjs/types';
7
- export type Writable = (msg: OrchestratorMessage) => Promise<unknown>;
8
- export type FullProc<C extends Proc<unknown>> = C extends Proc<infer T> ? T & C : unknown;
7
+ export type Writable = (msg: FromRunner) => Promise<unknown>;
8
+ export type FullProc<C> = C extends Proc<infer T> ? T & C : never;
9
9
  export declare class Runner {
10
10
  private readonly readers;
11
11
  private readonly writers;
12
12
  private readonly client;
13
- private readonly write;
13
+ private readonly notifyOrchestrator;
14
14
  private readonly logger;
15
15
  private shapes;
16
16
  private quads;
17
17
  private readonly uri;
18
18
  private readonly processors;
19
19
  private readonly processorTransforms;
20
- constructor(client: RunnerClient, write: Writable, uri: string, logger: Logger);
20
+ constructor(client: RunnerClient, notifyOrchestrator: Writable, uri: string, logger: Logger);
21
21
  addProcessor<P extends Proc<unknown>>(proc: Processor): Promise<FullProc<P>>;
22
22
  start(): Promise<void>;
23
23
  createWriter(uri: Term): Writer;
24
24
  createReader(uri: Term): Reader;
25
- handleOrchMessage(msg: RunnerMessage): Promise<void>;
25
+ handleOrchMessage(msg: ToRunner): Promise<void>;
26
+ private handleClose;
27
+ private handlePipeline;
28
+ private handleMsg;
29
+ private handleStreamMsg;
30
+ private handleProcessed;
26
31
  }