@rdfc/js-runner 3.0.2 → 3.1.0-alpha.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/README.md +4 -0
- package/__tests__/channels.test.ts +66 -1
- package/__tests__/echoProcessor.test.ts +11 -12
- package/bun.lock +820 -0
- package/lib/logger.d.ts +1 -0
- package/lib/logger.js +19 -9
- package/lib/reader.d.ts +4 -0
- package/lib/reader.js +46 -1
- package/lib/runner.js +1 -1
- package/lib/testUtils/duplex.js +1 -1
- package/lib/testUtils/index.d.ts +9 -9
- package/lib/testUtils/index.js +9 -9
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/writer.d.ts +14 -0
- package/lib/writer.js +120 -30
- package/package.json +20 -19
- package/src/logger.ts +15 -7
- package/src/reader.ts +62 -8
- package/src/runner.ts +3 -1
- package/src/testUtils/duplex.ts +1 -4
- package/src/testUtils/index.ts +25 -21
- package/src/writer.ts +172 -32
- package/jest.config.js +0 -2
package/lib/writer.js
CHANGED
|
@@ -9,6 +9,10 @@ export class WriterInstance {
|
|
|
9
9
|
awaitingProcessed = [];
|
|
10
10
|
openStreams = 0;
|
|
11
11
|
shouldClose = [];
|
|
12
|
+
closed = false;
|
|
13
|
+
_canceled = false;
|
|
14
|
+
cancelSignal = new AbortController();
|
|
15
|
+
cancelHandlers = new Set();
|
|
12
16
|
runnerId;
|
|
13
17
|
constructor(uri, client, notifyOrchestrator, runnerId, logger) {
|
|
14
18
|
this.client = client;
|
|
@@ -17,8 +21,62 @@ export class WriterInstance {
|
|
|
17
21
|
this.logger = logger;
|
|
18
22
|
this.runnerId = runnerId;
|
|
19
23
|
}
|
|
24
|
+
get canceled() {
|
|
25
|
+
return this._canceled;
|
|
26
|
+
}
|
|
27
|
+
on(event, listener) {
|
|
28
|
+
if (event === 'cancel') {
|
|
29
|
+
this.cancelHandlers.add(listener);
|
|
30
|
+
}
|
|
31
|
+
return this;
|
|
32
|
+
}
|
|
33
|
+
cancellationError() {
|
|
34
|
+
return new Error(`Writer for channel ${this.uri} was canceled by the connected reader`);
|
|
35
|
+
}
|
|
36
|
+
emitCancel() {
|
|
37
|
+
for (const handler of this.cancelHandlers) {
|
|
38
|
+
try {
|
|
39
|
+
Promise.resolve(handler()).catch((error) => {
|
|
40
|
+
this.logger.error(`Cancel listener for channel ${this.uri} failed: ${String(error)}`);
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
this.logger.error(`Cancel listener for channel ${this.uri} failed: ${String(error)}`);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
assertCanWrite() {
|
|
49
|
+
if (this._canceled) {
|
|
50
|
+
throw this.cancellationError();
|
|
51
|
+
}
|
|
52
|
+
if (this.closed) {
|
|
53
|
+
throw new Error(`Writer for channel ${this.uri} is closed`);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
async raceWithCancellation(promise) {
|
|
57
|
+
this.assertCanWrite();
|
|
58
|
+
return await new Promise((resolve, reject) => {
|
|
59
|
+
const onAbort = () => reject(this.cancellationError());
|
|
60
|
+
this.cancelSignal.signal.addEventListener('abort', onAbort, {
|
|
61
|
+
once: true,
|
|
62
|
+
});
|
|
63
|
+
promise.then((value) => {
|
|
64
|
+
this.cancelSignal.signal.removeEventListener('abort', onAbort);
|
|
65
|
+
resolve(value);
|
|
66
|
+
}, (error) => {
|
|
67
|
+
this.cancelSignal.signal.removeEventListener('abort', onAbort);
|
|
68
|
+
reject(error);
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
rejectPendingProcessed(error) {
|
|
73
|
+
while (this.awaitingProcessed.length > 0) {
|
|
74
|
+
this.awaitingProcessed.shift().reject(error);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
20
77
|
awaitProcessed() {
|
|
21
|
-
|
|
78
|
+
this.assertCanWrite();
|
|
79
|
+
return new Promise((resolve, reject) => this.awaitingProcessed.push({ resolve, reject }));
|
|
22
80
|
}
|
|
23
81
|
async any(any) {
|
|
24
82
|
if ('stream' in any) {
|
|
@@ -32,6 +90,7 @@ export class WriterInstance {
|
|
|
32
90
|
}
|
|
33
91
|
}
|
|
34
92
|
async buffer(buffer) {
|
|
93
|
+
this.assertCanWrite();
|
|
35
94
|
this.logger.debug(`${this.uri} sends buffer ${buffer.length} bytes`);
|
|
36
95
|
const localSequenceNumber = this.localSequenceNumber++;
|
|
37
96
|
const handledPromise = this.awaitProcessed();
|
|
@@ -41,33 +100,43 @@ export class WriterInstance {
|
|
|
41
100
|
await handledPromise;
|
|
42
101
|
}
|
|
43
102
|
async stream(buffer, transform) {
|
|
103
|
+
this.assertCanWrite();
|
|
44
104
|
this.openStreams += 1;
|
|
45
105
|
const t = transform || ((x) => x);
|
|
46
106
|
const stream = this.client.sendStreamMessage();
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
107
|
+
try {
|
|
108
|
+
const handledPromise = this.awaitProcessed();
|
|
109
|
+
const writeStreamMessageChunk = promisify(stream.write.bind(stream));
|
|
110
|
+
const localSequenceNumber = this.localSequenceNumber++;
|
|
111
|
+
await writeStreamMessageChunk({
|
|
112
|
+
id: {
|
|
113
|
+
channel: this.uri,
|
|
114
|
+
localSequenceNumber,
|
|
115
|
+
runner: this.runnerId,
|
|
116
|
+
},
|
|
117
|
+
});
|
|
118
|
+
const id = await this.raceWithCancellation(new Promise((res) => stream.once('data', res)));
|
|
119
|
+
this.logger.debug(`${this.uri} streams message with id ${JSON.stringify(id)}`);
|
|
120
|
+
for await (const msg of buffer) {
|
|
121
|
+
const processedPromise = new Promise((res) => stream.once('data', res));
|
|
122
|
+
await writeStreamMessageChunk({ data: { data: t(msg) } });
|
|
123
|
+
await processedPromise;
|
|
124
|
+
}
|
|
125
|
+
stream.end();
|
|
126
|
+
await handledPromise;
|
|
127
|
+
}
|
|
128
|
+
finally {
|
|
129
|
+
this.openStreams -= 1;
|
|
130
|
+
if (!stream.writableEnded) {
|
|
131
|
+
stream.end();
|
|
132
|
+
}
|
|
133
|
+
if (this.shouldClose.length > 0) {
|
|
134
|
+
await this.close();
|
|
135
|
+
}
|
|
136
|
+
}
|
|
69
137
|
}
|
|
70
138
|
async string(msg) {
|
|
139
|
+
this.assertCanWrite();
|
|
71
140
|
this.logger.debug(`${this.uri} sends string ${msg.length} characters`);
|
|
72
141
|
const localSequenceNumber = this.localSequenceNumber++;
|
|
73
142
|
const handledPromise = this.awaitProcessed();
|
|
@@ -81,16 +150,34 @@ export class WriterInstance {
|
|
|
81
150
|
await handledPromise;
|
|
82
151
|
}
|
|
83
152
|
async close(issued = false) {
|
|
153
|
+
if (issued) {
|
|
154
|
+
if (!this.closed) {
|
|
155
|
+
this._canceled = true;
|
|
156
|
+
this.emitCancel();
|
|
157
|
+
}
|
|
158
|
+
this.closed = true;
|
|
159
|
+
const cancelError = this.cancellationError();
|
|
160
|
+
this.rejectPendingProcessed(cancelError);
|
|
161
|
+
this.cancelSignal.abort(cancelError);
|
|
162
|
+
let waiting = this.shouldClose.pop();
|
|
163
|
+
while (waiting) {
|
|
164
|
+
waiting();
|
|
165
|
+
waiting = this.shouldClose.pop();
|
|
166
|
+
}
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
if (this.closed) {
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
84
172
|
if (this.openStreams !== 0) {
|
|
85
173
|
await new Promise((resolve) => this.shouldClose.push(resolve));
|
|
86
174
|
return;
|
|
87
175
|
}
|
|
88
176
|
this.logger.debug(`${this.uri} closes stream`);
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
}
|
|
177
|
+
this.closed = true;
|
|
178
|
+
await this.notifyOrchestrator({
|
|
179
|
+
close: { channel: this.uri },
|
|
180
|
+
});
|
|
94
181
|
let resolve = this.shouldClose.pop();
|
|
95
182
|
while (resolve) {
|
|
96
183
|
resolve();
|
|
@@ -99,7 +186,10 @@ export class WriterInstance {
|
|
|
99
186
|
}
|
|
100
187
|
handled() {
|
|
101
188
|
if (this.awaitingProcessed.length > 0) {
|
|
102
|
-
this.awaitingProcessed.shift()();
|
|
189
|
+
this.awaitingProcessed.shift().resolve();
|
|
190
|
+
}
|
|
191
|
+
else if (this.closed || this._canceled) {
|
|
192
|
+
return;
|
|
103
193
|
}
|
|
104
194
|
else {
|
|
105
195
|
this.logger.error('Expected to be waiting for a message to be processed, but this is not the case ' +
|
|
@@ -107,4 +197,4 @@ export class WriterInstance {
|
|
|
107
197
|
}
|
|
108
198
|
}
|
|
109
199
|
}
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"writer.js","sourceRoot":"","sources":["../src/writer.ts"],"names":[],"mappings":"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","sourcesContent":["import { FromRunner, RunnerClient } from '@rdfc/proto'\nimport { promisify } from 'util'\nimport { Logger } from 'winston'\nimport { Any } from './reader'\n\ntype Writable = (msg: FromRunner) => Promise<unknown>\nexport interface Writer {\n  readonly uri: string\n  buffer(buffer: Uint8Array): Promise<void>\n\n  stream(buffer: AsyncIterable<Uint8Array>): Promise<void>\n  stream<T>(\n    buffer: AsyncIterable<T>,\n    transform: (x: T) => Uint8Array,\n  ): Promise<void>\n\n  string(buffer: string): Promise<void>\n  any(any: Any): Promise<void>\n  close(): Promise<void>\n}\nconst encoder = new TextEncoder()\nexport class WriterInstance implements Writer {\n  readonly uri: string\n  localSequenceNumber: number = 1\n  private readonly client: RunnerClient\n  private readonly notifyOrchestrator: Writable\n  private readonly logger: Logger\n\n  private awaitingProcessed: Array<() => void> = []\n\n  private openStreams: number = 0\n  private shouldClose: Array<() => void> = []\n\n  private readonly runnerId: string\n\n  constructor(\n    uri: string,\n    client: RunnerClient,\n    notifyOrchestrator: Writable,\n    runnerId: string,\n    logger: Logger,\n  ) {\n    this.client = client\n    this.notifyOrchestrator = notifyOrchestrator\n    this.uri = uri\n    this.logger = logger\n    this.runnerId = runnerId\n  }\n\n  private awaitProcessed(): Promise<void> {\n    return new Promise((res) => this.awaitingProcessed.push(res))\n  }\n\n  async any(any: Any): Promise<void> {\n    if ('stream' in any) {\n      await this.stream(any.stream)\n    }\n    if ('buffer' in any) {\n      await this.buffer(any.buffer)\n    }\n    if ('string' in any) {\n      await this.string(any.string)\n    }\n  }\n\n  async buffer(buffer: Uint8Array): Promise<void> {\n    this.logger.debug(`${this.uri} sends buffer ${buffer.length} bytes`)\n    const localSequenceNumber = this.localSequenceNumber++\n    const handledPromise = this.awaitProcessed()\n\n    await this.notifyOrchestrator({\n      msg: { data: buffer, channel: this.uri, localSequenceNumber },\n    })\n    await handledPromise\n  }\n\n  async stream<T = Uint8Array>(\n    buffer: AsyncIterable<T>,\n    transform?: (x: T) => Uint8Array,\n  ) {\n    this.openStreams += 1\n    const t = transform || ((x: unknown) => <Uint8Array>x)\n    const stream = this.client.sendStreamMessage()\n\n    const handledPromise = this.awaitProcessed()\n    const writeStreamMessageChunk = promisify(stream.write.bind(stream))\n    const localSequenceNumber = this.localSequenceNumber++\n    await writeStreamMessageChunk({\n      id: {\n        channel: this.uri,\n        localSequenceNumber,\n        runner: this.runnerId,\n      },\n    })\n\n    const id = await new Promise((res) => stream.once('data', res))\n\n    this.logger.debug(\n      `${this.uri} streams message with id ${JSON.stringify(id)}`,\n    )\n\n    for await (const msg of buffer) {\n      const processedPromise = new Promise((res) => stream.once('data', res))\n      await writeStreamMessageChunk({ data: { data: t(msg) } })\n      // Await a message on the stream, indicating that the chunk has been processed\n      await processedPromise\n    }\n\n    stream.end()\n\n    await handledPromise\n\n    this.openStreams -= 1\n\n    if (this.shouldClose.length > 0) await this.close()\n  }\n\n  async string(msg: string): Promise<void> {\n    this.logger.debug(`${this.uri} sends string ${msg.length} characters`)\n    const localSequenceNumber = this.localSequenceNumber++\n    const handledPromise = this.awaitProcessed()\n\n    await this.notifyOrchestrator({\n      msg: {\n        data: encoder.encode(msg),\n        channel: this.uri,\n        localSequenceNumber,\n      },\n    })\n\n    await handledPromise\n  }\n\n  /**\n   * Gracefully closes this channel.\n   *\n   * Behavior:\n   * - If there are still active streams, closing is deferred until they complete.\n   * - If multiple callers invoke `close()` while waiting, their Promises are queued and\n   *   resolved once the channel actually closes.\n   * - If this side initiated the close (`issued = false`), a close message is sent to the remote.\n   *\n   * @param issued - If true, indicates the close request originated remotely\n   */\n  async close(issued = false): Promise<void> {\n    // Case 1: Active streams still running → wait until they finish\n    if (this.openStreams !== 0) {\n      await new Promise<void>((resolve) => this.shouldClose.push(resolve))\n      return\n    }\n\n    // Case 2: No active streams → perform actual close\n    this.logger.debug(`${this.uri} closes stream`)\n    if (!issued) {\n      await this.notifyOrchestrator({\n        close: { channel: this.uri },\n      })\n    }\n\n    let resolve = this.shouldClose.pop()\n    while (resolve) {\n      resolve()\n      resolve = this.shouldClose.pop()\n    }\n  }\n\n  /**\n   * A message is handled, let's notify the fifo {@link awaitProcessed}\n   */\n  handled(): void {\n    if (this.awaitingProcessed.length > 0) {\n      this.awaitingProcessed.shift()!()\n    } else {\n      this.logger.error(\n        'Expected to be waiting for a message to be processed, but this is not the case ' +\n          this.uri,\n      )\n    }\n  }\n}\n"]}
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"writer.js","sourceRoot":"","sources":["../src/writer.ts"],"names":[],"mappings":"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","sourcesContent":["import { FromRunner, RunnerClient } from '@rdfc/proto'\nimport { promisify } from 'util'\nimport { Logger } from 'winston'\nimport { Any } from './reader'\n\ntype Writable = (msg: FromRunner) => Promise<unknown>\nexport type Handler<T = void> = [T] extends [void]\n  ? () => void | Promise<void>\n  : (value: T) => void | Promise<void>\n\nexport interface Writer {\n  readonly uri: string\n  readonly canceled: boolean\n  on(event: 'cancel', listener: Handler): this\n  buffer(buffer: Uint8Array): Promise<void>\n\n  stream(buffer: AsyncIterable<Uint8Array>): Promise<void>\n  stream<T>(\n    buffer: AsyncIterable<T>,\n    transform: (x: T) => Uint8Array,\n  ): Promise<void>\n\n  string(buffer: string): Promise<void>\n  any(any: Any): Promise<void>\n  close(): Promise<void>\n}\nconst encoder = new TextEncoder()\nexport class WriterInstance implements Writer {\n  readonly uri: string\n  localSequenceNumber: number = 1\n  private readonly client: RunnerClient\n  private readonly notifyOrchestrator: Writable\n  private readonly logger: Logger\n\n  // FIFO of message-level acknowledgements coming back from the orchestrator.\n  private awaitingProcessed: Array<{\n    resolve: () => void\n    reject: (reason: Error) => void\n  }> = []\n\n  private openStreams: number = 0\n  // Close callers wait here while active streams are still flushing.\n  private shouldClose: Array<() => void> = []\n  private closed = false\n  private _canceled = false\n\n  // Shared cancellation signal to abort in-flight waits when the remote closes.\n  private readonly cancelSignal = new AbortController()\n  // Processors can subscribe here to stop upstream work when downstream cancels.\n  private readonly cancelHandlers = new Set<Handler>()\n\n  private readonly runnerId: string\n\n  constructor(\n    uri: string,\n    client: RunnerClient,\n    notifyOrchestrator: Writable,\n    runnerId: string,\n    logger: Logger,\n  ) {\n    this.client = client\n    this.notifyOrchestrator = notifyOrchestrator\n    this.uri = uri\n    this.logger = logger\n    this.runnerId = runnerId\n  }\n\n  get canceled(): boolean {\n    return this._canceled\n  }\n\n  on(event: 'cancel', listener: Handler): this {\n    if (event === 'cancel') {\n      this.cancelHandlers.add(listener)\n    }\n\n    return this\n  }\n\n  private cancellationError(): Error {\n    return new Error(\n      `Writer for channel ${this.uri} was canceled by the connected reader`,\n    )\n  }\n\n  private emitCancel() {\n    for (const handler of this.cancelHandlers) {\n      try {\n        Promise.resolve(handler()).catch((error: unknown) => {\n          this.logger.error(\n            `Cancel listener for channel ${this.uri} failed: ${String(error)}`,\n          )\n        })\n      } catch (error: unknown) {\n        this.logger.error(\n          `Cancel listener for channel ${this.uri} failed: ${String(error)}`,\n        )\n      }\n    }\n  }\n\n  private assertCanWrite() {\n    if (this._canceled) {\n      throw this.cancellationError()\n    }\n\n    if (this.closed) {\n      throw new Error(`Writer for channel ${this.uri} is closed`)\n    }\n  }\n\n  private async raceWithCancellation<T>(promise: Promise<T>): Promise<T> {\n    this.assertCanWrite()\n\n    return await new Promise<T>((resolve, reject) => {\n      const onAbort = () => reject(this.cancellationError())\n      this.cancelSignal.signal.addEventListener('abort', onAbort, {\n        once: true,\n      })\n\n      promise.then(\n        (value) => {\n          // Clean up the abort listener if the original operation finished first.\n          this.cancelSignal.signal.removeEventListener('abort', onAbort)\n          resolve(value)\n        },\n        (error) => {\n          this.cancelSignal.signal.removeEventListener('abort', onAbort)\n          reject(error)\n        },\n      )\n    })\n  }\n\n  private rejectPendingProcessed(error: Error) {\n    // Reject all queued message waits so callers do not hang during cancellation.\n    while (this.awaitingProcessed.length > 0) {\n      this.awaitingProcessed.shift()!.reject(error)\n    }\n  }\n\n  private awaitProcessed(): Promise<void> {\n    this.assertCanWrite()\n    return new Promise((resolve, reject) =>\n      this.awaitingProcessed.push({ resolve, reject }),\n    )\n  }\n\n  async any(any: Any): Promise<void> {\n    if ('stream' in any) {\n      await this.stream(any.stream)\n    }\n    if ('buffer' in any) {\n      await this.buffer(any.buffer)\n    }\n    if ('string' in any) {\n      await this.string(any.string)\n    }\n  }\n\n  async buffer(buffer: Uint8Array): Promise<void> {\n    this.assertCanWrite()\n    this.logger.debug(`${this.uri} sends buffer ${buffer.length} bytes`)\n    const localSequenceNumber = this.localSequenceNumber++\n    const handledPromise = this.awaitProcessed()\n\n    await this.notifyOrchestrator({\n      msg: { data: buffer, channel: this.uri, localSequenceNumber },\n    })\n    await handledPromise\n  }\n\n  async stream<T = Uint8Array>(\n    buffer: AsyncIterable<T>,\n    transform?: (x: T) => Uint8Array,\n  ) {\n    this.assertCanWrite()\n    this.openStreams += 1\n    const t = transform || ((x: unknown) => <Uint8Array>x)\n    const stream = this.client.sendStreamMessage()\n\n    try {\n      // Message-level ack that signals the whole stream message is fully handled.\n      const handledPromise = this.awaitProcessed()\n      const writeStreamMessageChunk = promisify(stream.write.bind(stream))\n      const localSequenceNumber = this.localSequenceNumber++\n      await writeStreamMessageChunk({\n        id: {\n          channel: this.uri,\n          localSequenceNumber,\n          runner: this.runnerId,\n        },\n      })\n\n      // First response confirms stream id registration on the remote side.\n      const id = await this.raceWithCancellation(\n        new Promise((res) => stream.once('data', res)),\n      )\n\n      this.logger.debug(\n        `${this.uri} streams message with id ${JSON.stringify(id)}`,\n      )\n\n      for await (const msg of buffer) {\n        const processedPromise = new Promise((res) => stream.once('data', res))\n        await writeStreamMessageChunk({ data: { data: t(msg) } })\n        // Await a message on the stream, indicating that the chunk has been processed\n        await processedPromise\n      }\n\n      stream.end()\n\n      await handledPromise\n    } finally {\n      this.openStreams -= 1\n\n      if (!stream.writableEnded) {\n        stream.end()\n      }\n\n      // If a close call was deferred while streaming, complete it now.\n      if (this.shouldClose.length > 0) {\n        await this.close()\n      }\n    }\n  }\n\n  async string(msg: string): Promise<void> {\n    this.assertCanWrite()\n    this.logger.debug(`${this.uri} sends string ${msg.length} characters`)\n    const localSequenceNumber = this.localSequenceNumber++\n    const handledPromise = this.awaitProcessed()\n\n    await this.notifyOrchestrator({\n      msg: {\n        data: encoder.encode(msg),\n        channel: this.uri,\n        localSequenceNumber,\n      },\n    })\n\n    await handledPromise\n  }\n\n  /**\n   * Gracefully closes this channel.\n   *\n   * Behavior:\n   * - If there are still active streams, closing is deferred until they complete.\n   * - If multiple callers invoke `close()` while waiting, their Promises are queued and\n   *   resolved once the channel actually closes.\n   * - If this side initiated the close (`issued = false`), a close message is sent to the remote.\n   *\n   * @param issued - If true, indicates the close request originated remotely\n   */\n  async close(issued = false): Promise<void> {\n    if (issued) {\n      if (!this.closed) {\n        // Remote initiated close: mark writer canceled to fail future writes.\n        this._canceled = true\n\n        // Notify processors so they can stop producing upstream work as well.\n        this.emitCancel()\n      }\n      this.closed = true\n\n      const cancelError = this.cancellationError()\n      this.rejectPendingProcessed(cancelError)\n      this.cancelSignal.abort(cancelError)\n\n      // Unblock any local close() callers waiting for streams to settle.\n      let waiting = this.shouldClose.pop()\n      while (waiting) {\n        waiting()\n        waiting = this.shouldClose.pop()\n      }\n      return\n    }\n\n    if (this.closed) {\n      return\n    }\n\n    // Case 1: Active streams still running → wait until they finish\n    if (this.openStreams !== 0) {\n      await new Promise<void>((resolve) => this.shouldClose.push(resolve))\n      return\n    }\n\n    // Case 2: No active streams → perform actual close\n    this.logger.debug(`${this.uri} closes stream`)\n    this.closed = true\n    await this.notifyOrchestrator({\n      close: { channel: this.uri },\n    })\n\n    let resolve = this.shouldClose.pop()\n    while (resolve) {\n      resolve()\n      resolve = this.shouldClose.pop()\n    }\n  }\n\n  /**\n   * A message is handled, let's notify the fifo {@link awaitProcessed}\n   */\n  handled(): void {\n    if (this.awaitingProcessed.length > 0) {\n      this.awaitingProcessed.shift()!.resolve()\n    } else if (this.closed || this._canceled) {\n      // A late ack can arrive after a close/cancel race; nothing to resolve anymore.\n      return\n    } else {\n      this.logger.error(\n        'Expected to be waiting for a message to be processed, but this is not the case ' +\n          this.uri,\n      )\n    }\n  }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rdfc/js-runner",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.1.0-alpha.1",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -25,32 +25,33 @@
|
|
|
25
25
|
]
|
|
26
26
|
},
|
|
27
27
|
"keywords": [],
|
|
28
|
-
"author": "",
|
|
29
|
-
"
|
|
30
|
-
|
|
28
|
+
"author": "Arthur Vercruysse",
|
|
29
|
+
"contributors": [
|
|
30
|
+
"Ieben Smessaert",
|
|
31
|
+
"Julián Rojas"
|
|
32
|
+
],
|
|
33
|
+
"license": "MIT",
|
|
34
|
+
"description": "JavaScript runner implementation for RDF-Connect",
|
|
31
35
|
"devDependencies": {
|
|
32
|
-
"@eslint/js": "^
|
|
36
|
+
"@eslint/js": "^10.0.1",
|
|
33
37
|
"@rdfjs/types": "^2.0.1",
|
|
34
|
-
"@types/jest": "^30.0.0",
|
|
35
38
|
"@types/jsonld": "^1.5.15",
|
|
36
39
|
"@types/n3": "^1.26.1",
|
|
37
|
-
"@types/node": "^
|
|
38
|
-
"@typescript-eslint/eslint-plugin": "^8.
|
|
39
|
-
"@typescript-eslint/parser": "^8.
|
|
40
|
-
"@vitest/coverage-v8": "^4.
|
|
41
|
-
"eslint": "^
|
|
40
|
+
"@types/node": "^25.5.0",
|
|
41
|
+
"@typescript-eslint/eslint-plugin": "^8.57.2",
|
|
42
|
+
"@typescript-eslint/parser": "^8.57.2",
|
|
43
|
+
"@vitest/coverage-v8": "^4.1.1",
|
|
44
|
+
"eslint": "^10.0.2",
|
|
42
45
|
"eslint-config-prettier": "^10.1.8",
|
|
43
46
|
"eslint-plugin-prettier": "^5.5.5",
|
|
44
|
-
"globals": "^17.
|
|
47
|
+
"globals": "^17.4.0",
|
|
45
48
|
"husky": "^9.1.7",
|
|
46
|
-
"
|
|
47
|
-
"lint-staged": "^16.2.7",
|
|
49
|
+
"lint-staged": "^16.4.0",
|
|
48
50
|
"prettier": "^3.8.1",
|
|
49
|
-
"ts-jest": "^29.4.6",
|
|
50
51
|
"tsc-alias": "^1.8.16",
|
|
51
52
|
"typescript": "^5.9.3",
|
|
52
|
-
"typescript-eslint": "^8.
|
|
53
|
-
"vitest": "^4.
|
|
53
|
+
"typescript-eslint": "^8.57.2",
|
|
54
|
+
"vitest": "^4.1.1"
|
|
54
55
|
},
|
|
55
56
|
"dependencies": {
|
|
56
57
|
"@grpc/grpc-js": "^1.14.3",
|
|
@@ -58,8 +59,8 @@
|
|
|
58
59
|
"@treecg/types": "^0.4.6",
|
|
59
60
|
"jsonld": "^9.0.0",
|
|
60
61
|
"jsonld-streaming-parser": "^5.0.1",
|
|
61
|
-
"n3": "^2.0.
|
|
62
|
-
"rdf-lens": "^1.3.
|
|
62
|
+
"n3": "^2.0.3",
|
|
63
|
+
"rdf-lens": "^1.3.7",
|
|
63
64
|
"winston": "^3.19.0",
|
|
64
65
|
"winston-transport": "^4.9.0"
|
|
65
66
|
}
|
package/src/logger.ts
CHANGED
|
@@ -8,6 +8,7 @@ export class RpcTransport extends Transport {
|
|
|
8
8
|
private readonly stream: grpc.ClientWritableStream<LogMessage>
|
|
9
9
|
private readonly entities: string[]
|
|
10
10
|
private readonly aliases: string[]
|
|
11
|
+
private draining: boolean
|
|
11
12
|
|
|
12
13
|
constructor(opts: {
|
|
13
14
|
stream: grpc.ClientWritableStream<LogMessage>
|
|
@@ -19,23 +20,30 @@ export class RpcTransport extends Transport {
|
|
|
19
20
|
this.stream = opts.stream
|
|
20
21
|
this.entities = opts.entities
|
|
21
22
|
this.aliases = opts.aliases || []
|
|
23
|
+
this.draining = true
|
|
24
|
+
|
|
25
|
+
this.stream.on('drain', () => {
|
|
26
|
+
this.draining = true
|
|
27
|
+
})
|
|
22
28
|
}
|
|
23
29
|
|
|
24
30
|
log(info: LogEntry, callback: () => void) {
|
|
25
|
-
if (!this.stream.closed) {
|
|
26
|
-
this.
|
|
27
|
-
{
|
|
31
|
+
if (!this.stream.closed && !this.stream.destroyed && this.stream.writable) {
|
|
32
|
+
if (this.draining) {
|
|
33
|
+
const ok = this.stream.write({
|
|
28
34
|
msg: info.message,
|
|
29
35
|
level: info.level,
|
|
30
36
|
entities: this.entities,
|
|
31
37
|
aliases: this.aliases,
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
|
|
38
|
+
})
|
|
39
|
+
if (!ok) {
|
|
40
|
+
this.draining = false
|
|
41
|
+
}
|
|
42
|
+
}
|
|
35
43
|
} else {
|
|
36
44
|
console.log('Output stream closed')
|
|
37
|
-
callback()
|
|
38
45
|
}
|
|
46
|
+
callback()
|
|
39
47
|
}
|
|
40
48
|
|
|
41
49
|
withEntity(entity: string): RpcTransport {
|
package/src/reader.ts
CHANGED
|
@@ -18,14 +18,14 @@ import { promisify } from 'util'
|
|
|
18
18
|
|
|
19
19
|
export type Any =
|
|
20
20
|
| {
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
string: string
|
|
22
|
+
}
|
|
23
23
|
| {
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
stream: AsyncGenerator<Uint8Array>
|
|
25
|
+
}
|
|
26
26
|
| {
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
buffer: Uint8Array
|
|
28
|
+
}
|
|
29
29
|
|
|
30
30
|
export interface Reader {
|
|
31
31
|
readonly uri: string
|
|
@@ -33,6 +33,7 @@ export interface Reader {
|
|
|
33
33
|
streams(): AsyncIterable<AsyncGenerator<Uint8Array>>
|
|
34
34
|
buffers(): AsyncIterable<Uint8Array>
|
|
35
35
|
anys(): AsyncIterable<Any>
|
|
36
|
+
cancel(): Promise<void>
|
|
36
37
|
}
|
|
37
38
|
|
|
38
39
|
type Todo<T> = {
|
|
@@ -44,12 +45,18 @@ class MyIter<T> implements AsyncIterable<T> {
|
|
|
44
45
|
private convertor: Convertor<T>
|
|
45
46
|
private queue: Todo<T | undefined>[] = []
|
|
46
47
|
private resolveNext: ((value: undefined) => void) | null = null
|
|
48
|
+
private closed = false
|
|
47
49
|
|
|
48
50
|
constructor(convertor: Convertor<T>) {
|
|
49
51
|
this.convertor = convertor
|
|
50
52
|
}
|
|
51
53
|
|
|
52
54
|
push(buffer: Uint8Array, onComplete: () => void) {
|
|
55
|
+
if (this.closed) {
|
|
56
|
+
onComplete()
|
|
57
|
+
return
|
|
58
|
+
}
|
|
59
|
+
|
|
53
60
|
const item = this.convertor.from(buffer)
|
|
54
61
|
this.queue.push({ item, onComplete })
|
|
55
62
|
if (this.resolveNext) {
|
|
@@ -59,6 +66,12 @@ class MyIter<T> implements AsyncIterable<T> {
|
|
|
59
66
|
}
|
|
60
67
|
|
|
61
68
|
close(onComplete: () => void) {
|
|
69
|
+
if (this.closed) {
|
|
70
|
+
onComplete()
|
|
71
|
+
return
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
this.closed = true
|
|
62
75
|
this.queue.push({ item: undefined, onComplete })
|
|
63
76
|
if (this.resolveNext) {
|
|
64
77
|
this.resolveNext(undefined)
|
|
@@ -67,8 +80,13 @@ class MyIter<T> implements AsyncIterable<T> {
|
|
|
67
80
|
}
|
|
68
81
|
|
|
69
82
|
async pushStream(chunks: AsyncIterable<DataChunk>, onComplete: () => void) {
|
|
83
|
+
if (this.closed) {
|
|
84
|
+
onComplete()
|
|
85
|
+
return
|
|
86
|
+
}
|
|
87
|
+
|
|
70
88
|
// This is an async generator that transforms DataChunks to Buffers
|
|
71
|
-
const stream = (async function*(stream) {
|
|
89
|
+
const stream = (async function* (stream) {
|
|
72
90
|
for await (const chunk of stream) {
|
|
73
91
|
yield chunk.data
|
|
74
92
|
}
|
|
@@ -108,6 +126,8 @@ export class ReaderInstance implements Reader {
|
|
|
108
126
|
private readonly notifyOrchestrator: Writable
|
|
109
127
|
|
|
110
128
|
private consumers: MyIter<unknown>[] = []
|
|
129
|
+
private closed = false
|
|
130
|
+
private canceled = false
|
|
111
131
|
|
|
112
132
|
constructor(
|
|
113
133
|
uri: string,
|
|
@@ -148,6 +168,16 @@ export class ReaderInstance implements Reader {
|
|
|
148
168
|
handleMsg(msg: ReceivingMessage) {
|
|
149
169
|
this.logger.debug(`${this.uri} handling message`)
|
|
150
170
|
|
|
171
|
+
if (this.closed) {
|
|
172
|
+
this.notifyOrchestrator({
|
|
173
|
+
processed: {
|
|
174
|
+
globalSequenceNumber: msg.globalSequenceNumber,
|
|
175
|
+
channel: this.uri,
|
|
176
|
+
},
|
|
177
|
+
})
|
|
178
|
+
return
|
|
179
|
+
}
|
|
180
|
+
|
|
151
181
|
const promises = []
|
|
152
182
|
for (const iter of this.consumers) {
|
|
153
183
|
promises.push(new Promise((res) => iter.push(msg.data, () => res(null))))
|
|
@@ -164,11 +194,28 @@ export class ReaderInstance implements Reader {
|
|
|
164
194
|
}
|
|
165
195
|
|
|
166
196
|
close() {
|
|
197
|
+
if (this.closed) {
|
|
198
|
+
return
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
this.closed = true
|
|
167
202
|
for (const iter of this.consumers) {
|
|
168
|
-
iter.close(() => {
|
|
203
|
+
iter.close(() => {})
|
|
169
204
|
}
|
|
170
205
|
}
|
|
171
206
|
|
|
207
|
+
async cancel(): Promise<void> {
|
|
208
|
+
if (this.canceled) {
|
|
209
|
+
return
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
this.canceled = true
|
|
213
|
+
this.close()
|
|
214
|
+
await this.notifyOrchestrator({
|
|
215
|
+
close: { channel: this.uri },
|
|
216
|
+
})
|
|
217
|
+
}
|
|
218
|
+
|
|
172
219
|
// There is a stream message available for this reader
|
|
173
220
|
async handleStreamingMessage({
|
|
174
221
|
channel,
|
|
@@ -176,6 +223,13 @@ export class ReaderInstance implements Reader {
|
|
|
176
223
|
}: ReceivingStreamMessage) {
|
|
177
224
|
this.logger.debug(`${this.uri} handling streaming message`)
|
|
178
225
|
|
|
226
|
+
if (this.closed) {
|
|
227
|
+
await this.notifyOrchestrator({
|
|
228
|
+
processed: { globalSequenceNumber, channel },
|
|
229
|
+
})
|
|
230
|
+
return
|
|
231
|
+
}
|
|
232
|
+
|
|
179
233
|
const chunks = this.client.receiveStreamMessage()
|
|
180
234
|
const writeControlMessage = promisify(chunks.write.bind(chunks))
|
|
181
235
|
const consumersConsumed = []
|
package/src/runner.ts
CHANGED
|
@@ -93,7 +93,9 @@ export class Runner {
|
|
|
93
93
|
)
|
|
94
94
|
.map((x) => x.object.value)
|
|
95
95
|
|
|
96
|
-
this.logger.info(
|
|
96
|
+
this.logger.info(
|
|
97
|
+
`Parsing processor '${proc.uri}' of type(s) [${ty.join(', ')}]`,
|
|
98
|
+
)
|
|
97
99
|
const args = this.shapes.lenses[RDFL.TypedExtract].execute({
|
|
98
100
|
id: new NamedNode(proc.uri),
|
|
99
101
|
quads: this.quads,
|
package/src/testUtils/duplex.ts
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { Duplex } from 'stream'
|
|
2
|
-
import type {
|
|
3
|
-
ClientDuplexStream,
|
|
4
|
-
InterceptingCall,
|
|
5
|
-
} from '@grpc/grpc-js'
|
|
2
|
+
import type { ClientDuplexStream, InterceptingCall } from '@grpc/grpc-js'
|
|
6
3
|
import { AuthContext } from '@grpc/grpc-js/build/src/auth-context'
|
|
7
4
|
|
|
8
5
|
type Matcher<Req, T> = (req: Req) => T | undefined
|
package/src/testUtils/index.ts
CHANGED
|
@@ -1,22 +1,28 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
DataChunk,
|
|
3
|
+
FromRunner,
|
|
4
|
+
LogMessage,
|
|
5
|
+
Processor as ProcConfig,
|
|
6
|
+
ToRunner,
|
|
7
|
+
} from '@rdfc/proto'
|
|
8
|
+
import { extractShapes } from 'rdf-lens'
|
|
9
|
+
import { NamedNode, Parser, Writer as N3Writer } from 'n3'
|
|
10
|
+
import { readFile } from 'fs/promises'
|
|
11
|
+
import winston, { createLogger } from 'winston'
|
|
12
|
+
import { Processor } from '../processor'
|
|
13
|
+
import { FullProc, Runner, Writable } from '../runner'
|
|
14
|
+
import { Quad } from '@rdfjs/types'
|
|
15
|
+
import { createTermNamespace } from '@treecg/types'
|
|
10
16
|
import {
|
|
11
17
|
ReceivingStreamControl,
|
|
12
18
|
SendingStreamControl,
|
|
13
19
|
StreamChunk,
|
|
14
20
|
StreamIdentify,
|
|
15
|
-
} from
|
|
16
|
-
import { MockClientDuplexStream } from
|
|
17
|
-
import { promisify } from
|
|
18
|
-
import { Reader } from
|
|
19
|
-
import { Writer } from
|
|
21
|
+
} from '@rdfc/proto/lib/generated/common'
|
|
22
|
+
import { MockClientDuplexStream } from './duplex'
|
|
23
|
+
import { promisify } from 'util'
|
|
24
|
+
import { Reader } from '../reader'
|
|
25
|
+
import { Writer } from '../writer'
|
|
20
26
|
|
|
21
27
|
export function channel(runner: Runner, name: string): [Writer, Reader] {
|
|
22
28
|
const n = new NamedNode(name)
|
|
@@ -352,13 +358,11 @@ export class ProcHelper<T extends Processor<unknown>> {
|
|
|
352
358
|
pipeline: new N3Writer().quadsToString(this.quads),
|
|
353
359
|
})
|
|
354
360
|
|
|
355
|
-
return await this.runner.createProcessor<T>(
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
},
|
|
361
|
-
)
|
|
361
|
+
return await this.runner.createProcessor<T>({
|
|
362
|
+
config: JSON.stringify(this.config),
|
|
363
|
+
arguments: '',
|
|
364
|
+
uri,
|
|
365
|
+
})
|
|
362
366
|
}
|
|
363
367
|
}
|
|
364
368
|
|