@rdfc/js-runner 3.0.2 → 3.0.4-remote
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/.claude/settings.local.json +12 -0
- package/README.md +41 -1
- package/__tests__/echoProcessor.test.ts +11 -12
- package/bin/runner.js +7 -1
- package/bin/server.js +13 -0
- package/bun.lock +820 -0
- package/examples/echo/.idea/echo.iml +9 -0
- package/examples/echo/.idea/misc.xml +6 -0
- package/{.idea → examples/echo/.idea}/modules.xml +1 -1
- package/examples/echo/.idea/vcs.xml +7 -0
- package/examples/echo/.swls/config.json +1 -0
- package/examples/echo/package-lock.json +27 -29
- package/examples/echo/pipeline.ttl +0 -1
- package/examples/echo/processors.ttl +1 -1
- package/examples/echo/remote_pipeline.ttl +18 -0
- package/examples/echo/server.ttl +5 -0
- package/examples/echo/untitled:/types/MyType.ttl +0 -0
- package/file:/home/silvius/Projects/mumo-pipeline/ldes/http_3A_2F_2Fdata.mumo.be_2Fstreams_2Fnodes_2Fdefault/root/index.trig +3 -0
- package/ldes/http_3A_2F_2Fdata.mumo.be_2Fstreams_2Fnodes_2Fdefault/root/index.trig +3 -0
- package/lib/client.d.ts +2 -1
- package/lib/client.js +70 -22
- package/lib/index.d.ts +2 -0
- package/lib/index.js +3 -1
- package/lib/jsonld.d.ts +17 -0
- package/lib/jsonld.js +135 -0
- package/lib/logger.d.ts +1 -0
- package/lib/logger.js +19 -9
- package/lib/reader.d.ts +4 -1
- package/lib/reader.js +11 -3
- package/lib/runner.d.ts +6 -1
- package/lib/runner.js +43 -15
- package/lib/server.d.ts +9 -0
- package/lib/server.js +459 -0
- package/lib/state.d.ts +32 -0
- package/lib/state.js +71 -0
- package/lib/testUtils/duplex.js +1 -1
- package/lib/testUtils/index.d.ts +9 -9
- package/lib/testUtils/index.js +9 -9
- package/lib/testUtils.d.ts +24 -0
- package/lib/testUtils.js +150 -0
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/writer.d.ts +5 -1
- package/lib/writer.js +26 -10
- package/minimal.ttl +99 -0
- package/package.json +21 -19
- package/src/client.ts +99 -24
- package/src/index.ts +2 -0
- package/src/logger.ts +15 -7
- package/src/reader.ts +19 -9
- package/src/runner.ts +61 -12
- package/src/server.ts +545 -0
- package/src/state.ts +105 -0
- package/src/testUtils/duplex.ts +1 -4
- package/src/testUtils/index.ts +25 -21
- package/src/writer.ts +36 -12
- package/.idea/LNKD.tech Editor.xml +0 -194
- package/.idea/codeStyles/Project.xml +0 -52
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/copilot.data.migration.agent.xml +0 -6
- package/.idea/copilot.data.migration.ask.xml +0 -6
- package/.idea/copilot.data.migration.ask2agent.xml +0 -6
- package/.idea/copilot.data.migration.edit.xml +0 -6
- package/.idea/inspectionProfiles/Project_Default.xml +0 -6
- package/.idea/js-runner.iml +0 -12
- package/.idea/vcs.xml +0 -6
- package/dist/args.d.ts +0 -4
- package/dist/args.js +0 -58
- package/dist/connectors/file.d.ts +0 -15
- package/dist/connectors/file.js +0 -89
- package/dist/connectors/http.d.ts +0 -14
- package/dist/connectors/http.js +0 -82
- package/dist/connectors/kafka.d.ts +0 -48
- package/dist/connectors/kafka.js +0 -68
- package/dist/connectors/ws.d.ts +0 -10
- package/dist/connectors/ws.js +0 -72
- package/dist/connectors.d.ts +0 -73
- package/dist/connectors.js +0 -168
- package/dist/index.cjs +0 -732
- package/dist/index.d.ts +0 -42
- package/dist/index.js +0 -83
- package/dist/tsconfig.tsbuildinfo +0 -1
- package/dist/util.d.ts +0 -71
- package/dist/util.js +0 -92
- package/jest.config.js +0 -2
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<module type="JAVA_MODULE" version="4">
|
|
3
|
+
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
4
|
+
<exclude-output />
|
|
5
|
+
<content url="file://$MODULE_DIR$" />
|
|
6
|
+
<orderEntry type="inheritedJdk" />
|
|
7
|
+
<orderEntry type="sourceFolder" forTests="false" />
|
|
8
|
+
</component>
|
|
9
|
+
</module>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<project version="4">
|
|
3
3
|
<component name="ProjectModuleManager">
|
|
4
4
|
<modules>
|
|
5
|
-
<module fileurl="file://$PROJECT_DIR$/.idea/
|
|
5
|
+
<module fileurl="file://$PROJECT_DIR$/.idea/echo.iml" filepath="$PROJECT_DIR$/.idea/echo.iml" />
|
|
6
6
|
</modules>
|
|
7
7
|
</component>
|
|
8
8
|
</project>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{ "disabled": ["shapes"] }
|
|
@@ -17,45 +17,43 @@
|
|
|
17
17
|
},
|
|
18
18
|
"../..": {
|
|
19
19
|
"name": "@rdfc/js-runner",
|
|
20
|
-
"version": "
|
|
21
|
-
"license": "
|
|
20
|
+
"version": "3.0.3",
|
|
21
|
+
"license": "MIT",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@grpc/grpc-js": "^1.
|
|
24
|
-
"@rdfc/proto": "^0.1.
|
|
23
|
+
"@grpc/grpc-js": "^1.14.3",
|
|
24
|
+
"@rdfc/proto": "^0.1.2",
|
|
25
25
|
"@treecg/types": "^0.4.6",
|
|
26
|
-
"jsonld": "^
|
|
27
|
-
"jsonld-streaming-parser": "^5.0.
|
|
28
|
-
"n3": "^
|
|
29
|
-
"rdf-lens": "^1.3.
|
|
30
|
-
"winston": "^3.
|
|
26
|
+
"jsonld": "^9.0.0",
|
|
27
|
+
"jsonld-streaming-parser": "^5.0.1",
|
|
28
|
+
"n3": "^2.0.3",
|
|
29
|
+
"rdf-lens": "^1.3.6",
|
|
30
|
+
"winston": "^3.19.0",
|
|
31
31
|
"winston-transport": "^4.9.0"
|
|
32
32
|
},
|
|
33
33
|
"bin": {
|
|
34
|
-
"js-runner": "bin/runner.js"
|
|
34
|
+
"js-runner": "bin/runner.js",
|
|
35
|
+
"js-runner-server": "bin/server.js"
|
|
35
36
|
},
|
|
36
37
|
"devDependencies": {
|
|
37
|
-
"@eslint/js": "^
|
|
38
|
+
"@eslint/js": "^10.0.1",
|
|
38
39
|
"@rdfjs/types": "^2.0.1",
|
|
39
|
-
"@types/jest": "^29.5.14",
|
|
40
40
|
"@types/jsonld": "^1.5.15",
|
|
41
|
-
"@types/n3": "^1.
|
|
42
|
-
"@types/node": "^
|
|
43
|
-
"@typescript-eslint/eslint-plugin": "^8.
|
|
44
|
-
"@typescript-eslint/parser": "^8.
|
|
45
|
-
"@vitest/coverage-v8": "^
|
|
46
|
-
"eslint": "^
|
|
47
|
-
"eslint-config-prettier": "^10.
|
|
48
|
-
"eslint-plugin-prettier": "^5.
|
|
49
|
-
"globals": "^
|
|
41
|
+
"@types/n3": "^1.26.1",
|
|
42
|
+
"@types/node": "^25.5.0",
|
|
43
|
+
"@typescript-eslint/eslint-plugin": "^8.57.1",
|
|
44
|
+
"@typescript-eslint/parser": "^8.57.1",
|
|
45
|
+
"@vitest/coverage-v8": "^4.1.0",
|
|
46
|
+
"eslint": "^10.0.2",
|
|
47
|
+
"eslint-config-prettier": "^10.1.8",
|
|
48
|
+
"eslint-plugin-prettier": "^5.5.5",
|
|
49
|
+
"globals": "^17.4.0",
|
|
50
50
|
"husky": "^9.1.7",
|
|
51
|
-
"
|
|
52
|
-
"
|
|
53
|
-
"
|
|
54
|
-
"
|
|
55
|
-
"
|
|
56
|
-
"
|
|
57
|
-
"typescript-eslint": "^8.25.0",
|
|
58
|
-
"vitest": "^3.0.7"
|
|
51
|
+
"lint-staged": "^16.4.0",
|
|
52
|
+
"prettier": "^3.8.1",
|
|
53
|
+
"tsc-alias": "^1.8.16",
|
|
54
|
+
"typescript": "^5.9.3",
|
|
55
|
+
"typescript-eslint": "^8.57.1",
|
|
56
|
+
"vitest": "^4.1.0"
|
|
59
57
|
}
|
|
60
58
|
},
|
|
61
59
|
"node_modules/@rdfc/js-runner": {
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
@prefix sh: <http://www.w3.org/ns/shacl#>.
|
|
8
8
|
@prefix rdfc: <https://w3id.org/rdf-connect#>.
|
|
9
9
|
|
|
10
|
-
<> owl:imports <../../index.ttl>.
|
|
10
|
+
# <> owl:imports <../../index.ttl>.
|
|
11
11
|
rdfc:Test rdfc:jsImplementationOf rdfc:Processor;
|
|
12
12
|
rdfc:entrypoint <./>;
|
|
13
13
|
rdfc:file <./lib/processors.js>;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
@prefix owl: <http://www.w3.org/2002/07/owl#>.
|
|
2
|
+
@prefix rdfc: <https://w3id.org/rdf-connect#>.
|
|
3
|
+
@prefix runner: <http://localhost:3000/>.
|
|
4
|
+
|
|
5
|
+
<> owl:imports runner:, runner:processors.ttl.
|
|
6
|
+
<> a rdfc:Pipeline;
|
|
7
|
+
rdfc:consistsOf [
|
|
8
|
+
rdfc:processor <logProc>, <sendProc>;
|
|
9
|
+
rdfc:instantiates runner:runner;
|
|
10
|
+
].
|
|
11
|
+
|
|
12
|
+
<sendProc> a rdfc:SendProcessor;
|
|
13
|
+
rdfc:msg " Hello", " World";
|
|
14
|
+
rdfc:writer <data>.
|
|
15
|
+
|
|
16
|
+
<logProc> a rdfc:LogProcessor;
|
|
17
|
+
rdfc:reader <data>.
|
|
18
|
+
|
|
File without changes
|
package/lib/client.d.ts
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import { State } from './state.js';
|
|
2
|
+
export declare function start(addr: string, uri: string, configPath?: string, signal?: AbortSignal, state?: State, runnerId?: string): Promise<void>;
|
package/lib/client.js
CHANGED
|
@@ -4,37 +4,85 @@ import { RunnerClient } from '@rdfc/proto';
|
|
|
4
4
|
import { createLogger } from 'winston';
|
|
5
5
|
import { RpcTransport } from './logger.js';
|
|
6
6
|
import { Runner } from './runner.js';
|
|
7
|
-
|
|
7
|
+
const GRPC_STATE_NAMES = [
|
|
8
|
+
'IDLE',
|
|
9
|
+
'CONNECTING',
|
|
10
|
+
'READY',
|
|
11
|
+
'TRANSIENT_FAILURE',
|
|
12
|
+
'SHUTDOWN',
|
|
13
|
+
];
|
|
14
|
+
function watchGrpcState(client, state, runnerId, signal) {
|
|
15
|
+
const ch = client.getChannel();
|
|
16
|
+
const update = () => {
|
|
17
|
+
if (signal.aborted)
|
|
18
|
+
return;
|
|
19
|
+
const s = ch.getConnectivityState(false);
|
|
20
|
+
state.setGrpcState(runnerId, GRPC_STATE_NAMES[s] ?? String(s));
|
|
21
|
+
if (s === grpc.connectivityState.SHUTDOWN)
|
|
22
|
+
return;
|
|
23
|
+
ch.watchConnectivityState(s, new Date(Date.now() + 3_600_000), update);
|
|
24
|
+
};
|
|
25
|
+
update();
|
|
26
|
+
}
|
|
27
|
+
export async function start(addr, uri, configPath, signal, state, runnerId) {
|
|
8
28
|
const client = new RunnerClient(addr, grpc.credentials.createInsecure());
|
|
29
|
+
const logStream = client.logStream(() => { });
|
|
9
30
|
const logger = createLogger({
|
|
10
31
|
transports: [
|
|
11
32
|
new RpcTransport({
|
|
12
33
|
entities: [uri, 'cli'],
|
|
13
|
-
stream:
|
|
34
|
+
stream: logStream,
|
|
14
35
|
}),
|
|
15
36
|
],
|
|
16
37
|
});
|
|
17
38
|
const stream = client.connect();
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
39
|
+
const closeConnection = () => {
|
|
40
|
+
stream.end();
|
|
41
|
+
logStream.end();
|
|
42
|
+
client.close();
|
|
43
|
+
};
|
|
44
|
+
const abortCtrl = signal ?? new AbortController().signal;
|
|
45
|
+
abortCtrl.addEventListener('abort', closeConnection, { once: true });
|
|
46
|
+
if (state && runnerId) {
|
|
47
|
+
watchGrpcState(client, state, runnerId, abortCtrl);
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
logger.info('Connected with server ' + addr);
|
|
51
|
+
const writable = promisify(stream.write.bind(stream));
|
|
52
|
+
const runner = new Runner(client, writable, uri, logger, configPath, state, runnerId);
|
|
53
|
+
await writable({ identify: { uri } });
|
|
54
|
+
let runnerDone = false;
|
|
55
|
+
await new Promise(async (res, rej) => {
|
|
56
|
+
try {
|
|
57
|
+
for await (const chunk of stream) {
|
|
58
|
+
const msg = chunk;
|
|
59
|
+
if (msg.proc) {
|
|
60
|
+
await runner.addProcessor(msg.proc);
|
|
61
|
+
}
|
|
62
|
+
if (msg.start) {
|
|
63
|
+
if (state && runnerId)
|
|
64
|
+
state.setStatus(runnerId, 'running');
|
|
65
|
+
runner.start().then(() => {
|
|
66
|
+
runnerDone = true;
|
|
67
|
+
res(undefined);
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
await runner.handleOrchMessage(msg);
|
|
71
|
+
}
|
|
72
|
+
logger.error('Stream ended');
|
|
27
73
|
}
|
|
28
|
-
|
|
29
|
-
|
|
74
|
+
catch (err) {
|
|
75
|
+
if (runnerDone) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
rej(err);
|
|
30
79
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
setTimeout(() => process.exit(0), 500);
|
|
80
|
+
});
|
|
81
|
+
logger.info('All processors are finished');
|
|
82
|
+
}
|
|
83
|
+
finally {
|
|
84
|
+
abortCtrl.removeEventListener('abort', closeConnection);
|
|
85
|
+
closeConnection();
|
|
86
|
+
}
|
|
39
87
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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","sourcesContent":["import * as grpc from '@grpc/grpc-js'\nimport { promisify } from 'util'\nimport { RunnerClient, ToRunner } from '@rdfc/proto'\nimport { createLogger } from 'winston'\nimport { RpcTransport } from './logger'\nimport { Runner } from './runner'\nimport { State } from './state'\n\nconst GRPC_STATE_NAMES = [\n  'IDLE',\n  'CONNECTING',\n  'READY',\n  'TRANSIENT_FAILURE',\n  'SHUTDOWN',\n] as const\n\nfunction watchGrpcState(\n  client: RunnerClient,\n  state: State,\n  runnerId: string,\n  signal: AbortSignal,\n): void {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const ch = (client as any).getChannel() as grpc.Channel\n\n  const update = () => {\n    if (signal.aborted) return\n    const s = ch.getConnectivityState(false)\n    state.setGrpcState(runnerId, GRPC_STATE_NAMES[s] ?? String(s))\n    if (s === grpc.connectivityState.SHUTDOWN) return\n    // Watch for the next state change (1-hour deadline)\n    ch.watchConnectivityState(s, new Date(Date.now() + 3_600_000), update)\n  }\n\n  update()\n}\n\nexport async function start(\n  addr: string,\n  uri: string,\n  configPath?: string,\n  signal?: AbortSignal,\n  state?: State,\n  runnerId?: string,\n) {\n  const client = new RunnerClient(addr, grpc.credentials.createInsecure())\n\n  const logStream = client.logStream(() => {})\n\n  const logger = createLogger({\n    transports: [\n      new RpcTransport({\n        entities: [uri, 'cli'],\n        stream: logStream,\n      }),\n    ],\n  })\n\n  const stream = client.connect()\n\n  const closeConnection = () => {\n    stream.end()\n    logStream.end()\n    client.close()\n  }\n\n  const abortCtrl = signal ?? new AbortController().signal\n  abortCtrl.addEventListener('abort', closeConnection, { once: true })\n\n  if (state && runnerId) {\n    watchGrpcState(client, state, runnerId, abortCtrl)\n  }\n\n  try {\n    logger.info('Connected with server ' + addr)\n    const writable = promisify(stream.write.bind(stream))\n    const runner = new Runner(\n      client,\n      writable,\n      uri,\n      logger,\n      configPath,\n      state,\n      runnerId,\n    )\n\n    await writable({ identify: { uri } })\n\n    let runnerDone = false\n    /* eslint-disable no-async-promise-executor */\n    await new Promise(async (res, rej) => {\n      try {\n        for await (const chunk of stream) {\n          const msg: ToRunner = chunk\n          if (msg.proc) {\n            await runner.addProcessor(msg.proc)\n          }\n          if (msg.start) {\n            if (state && runnerId) state.setStatus(runnerId, 'running')\n            runner.start().then(() => {\n              runnerDone = true\n              res(undefined)\n            })\n          }\n\n          await runner.handleOrchMessage(msg)\n        }\n\n        logger.error('Stream ended')\n      } catch (err) {\n        if (runnerDone) {\n          // Stream error after runner finished (e.g. connection dropped during cleanup) — safe to ignore\n          return\n        }\n        rej(err)\n      }\n    })\n\n    logger.info('All processors are finished')\n  } finally {\n    abortCtrl.removeEventListener('abort', closeConnection)\n    closeConnection()\n  }\n}\n"]}
|
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -4,5 +4,7 @@ export * from './reader.js';
|
|
|
4
4
|
export * from './processor.js';
|
|
5
5
|
export * from './runner.js';
|
|
6
6
|
export * from './logger.js';
|
|
7
|
+
export * from './state.js';
|
|
7
8
|
export * as reexports from './reexports.js';
|
|
8
|
-
|
|
9
|
+
export * from './server.js';
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxhQUFhLENBQUE7QUFDM0IsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxTQUFTLENBQUE7QUFFdkIsT0FBTyxLQUFLLFNBQVMsTUFBTSxhQUFhLENBQUE7QUFDeEMsY0FBYyxVQUFVLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL2NsaWVudCdcbmV4cG9ydCAqIGZyb20gJy4vd3JpdGVyJ1xuZXhwb3J0ICogZnJvbSAnLi9yZWFkZXInXG5leHBvcnQgKiBmcm9tICcuL3Byb2Nlc3NvcidcbmV4cG9ydCAqIGZyb20gJy4vcnVubmVyJ1xuZXhwb3J0ICogZnJvbSAnLi9sb2dnZXInXG5leHBvcnQgKiBmcm9tICcuL3N0YXRlJ1xuXG5leHBvcnQgKiBhcyByZWV4cG9ydHMgZnJvbSAnLi9yZWV4cG9ydHMnXG5leHBvcnQgKiBmcm9tICcuL3NlcnZlcidcbiJdfQ==
|
package/lib/jsonld.d.ts
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { OrchestratorMessage, RunnerClient } from '@rdfc/proto';
|
|
2
|
+
import { ReaderInstance } from './reader.js';
|
|
3
|
+
import { WriterInstance } from './writer.js';
|
|
4
|
+
import { Logger } from 'winston';
|
|
5
|
+
export type RunnerItems = {
|
|
6
|
+
readers: {
|
|
7
|
+
[uri: string]: ReaderInstance[];
|
|
8
|
+
};
|
|
9
|
+
writers: {
|
|
10
|
+
[uri: string]: WriterInstance[];
|
|
11
|
+
};
|
|
12
|
+
client: RunnerClient;
|
|
13
|
+
write: Writable;
|
|
14
|
+
};
|
|
15
|
+
type Writable = (msg: OrchestratorMessage) => Promise<unknown>;
|
|
16
|
+
export declare function parse_jsonld(args: string, logger: Logger, items: RunnerItems): Promise<unknown>;
|
|
17
|
+
export {};
|
package/lib/jsonld.js
ADDED
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import { createNamespace, createUriAndTermNamespace } from '@treecg/types';
|
|
2
|
+
import { ReaderInstance } from './reader.js';
|
|
3
|
+
import { WriterInstance } from './writer.js';
|
|
4
|
+
import { JsonLdParser } from 'jsonld-streaming-parser';
|
|
5
|
+
import { pred, ShaclPath } from 'rdf-lens';
|
|
6
|
+
import { NamedNode } from 'n3';
|
|
7
|
+
const RDFL = createUriAndTermNamespace('https://w3id.org/rdf-lens/ontology#', 'CBD', 'Path', 'PathLens', 'Context', 'TypedExtract', 'EnvVariable', 'envKey', 'envDefault', 'datatype');
|
|
8
|
+
const RDFC = createNamespace('https://w3id.org/rdf-connect#', (x) => x, 'Reader', 'Writer');
|
|
9
|
+
function as_string_array(obj) {
|
|
10
|
+
const out = Array.isArray(obj) ? obj : [obj];
|
|
11
|
+
return out.filter((x) => typeof x === 'string');
|
|
12
|
+
}
|
|
13
|
+
function cbdToQuads(value) {
|
|
14
|
+
const quads = [];
|
|
15
|
+
const parser = new JsonLdParser();
|
|
16
|
+
const promise = new Promise((res, rej) => parser
|
|
17
|
+
.on('end', () => res({ value: quads }))
|
|
18
|
+
.on('error', (e) => rej(e))
|
|
19
|
+
.on('data', (q) => {
|
|
20
|
+
quads.push(q);
|
|
21
|
+
}));
|
|
22
|
+
if (value instanceof Object && '@type' in value) {
|
|
23
|
+
delete value['@type'];
|
|
24
|
+
}
|
|
25
|
+
parser.write(JSON.stringify(value));
|
|
26
|
+
parser.end();
|
|
27
|
+
return promise;
|
|
28
|
+
}
|
|
29
|
+
async function cbdToPath(value) {
|
|
30
|
+
const qs = (await cbdToQuads({
|
|
31
|
+
'@id': 'http://example.com/ns#me1234',
|
|
32
|
+
'http://example.com/ns#innerPred': value,
|
|
33
|
+
})).value;
|
|
34
|
+
const path = pred(new NamedNode('http://example.com/ns#innerPred'))
|
|
35
|
+
.one()
|
|
36
|
+
.then(ShaclPath)
|
|
37
|
+
.execute({
|
|
38
|
+
quads: qs,
|
|
39
|
+
id: new NamedNode('http://example.com/ns#me1234'),
|
|
40
|
+
});
|
|
41
|
+
return { value: path };
|
|
42
|
+
}
|
|
43
|
+
async function jsonldToQuads(value) {
|
|
44
|
+
const qs = (await cbdToQuads({
|
|
45
|
+
'@id': 'http://example.com/ns#me1234',
|
|
46
|
+
'http://example.com/ns#innerPred': value,
|
|
47
|
+
})).value;
|
|
48
|
+
const idx = qs.findIndex((x) => x.predicate.equals(new NamedNode('http://example.com/ns#innerPred')) &&
|
|
49
|
+
x.subject.equals(new NamedNode('http://example.com/ns#me1234')));
|
|
50
|
+
if (idx < 0)
|
|
51
|
+
throw 'This cannot happen';
|
|
52
|
+
const id = qs[idx].object;
|
|
53
|
+
qs.splice(idx, 1);
|
|
54
|
+
return {
|
|
55
|
+
quads: qs,
|
|
56
|
+
id,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
function revive(_key, value, logger, promises, runnerItems) {
|
|
60
|
+
if (typeof value === 'object') {
|
|
61
|
+
const types = as_string_array(value['@type'] || []);
|
|
62
|
+
const ids = as_string_array(value['@id'] || [])[0] || '';
|
|
63
|
+
if (types.includes(RDFC.Reader)) {
|
|
64
|
+
if (runnerItems.readers[ids] === undefined) {
|
|
65
|
+
runnerItems.readers[ids] = [];
|
|
66
|
+
}
|
|
67
|
+
const reader = new ReaderInstance(ids, runnerItems.client, logger);
|
|
68
|
+
runnerItems.readers[ids].push(reader);
|
|
69
|
+
return reader;
|
|
70
|
+
}
|
|
71
|
+
if (types.includes(RDFC.Writer)) {
|
|
72
|
+
if (runnerItems.writers[ids] === undefined) {
|
|
73
|
+
runnerItems.writers[ids] = [];
|
|
74
|
+
}
|
|
75
|
+
const writer = new WriterInstance(ids, runnerItems.client, runnerItems.write, logger);
|
|
76
|
+
runnerItems.writers[ids].push(writer);
|
|
77
|
+
return writer;
|
|
78
|
+
}
|
|
79
|
+
if (types.includes(RDFL.CBD)) {
|
|
80
|
+
return cbdToQuads(value);
|
|
81
|
+
}
|
|
82
|
+
if (types.includes(RDFL.Path)) {
|
|
83
|
+
return cbdToPath(value);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
Object.entries(value).forEach(([k, v]) => {
|
|
87
|
+
if (v instanceof Promise) {
|
|
88
|
+
logger.info('Found promise');
|
|
89
|
+
promises.push(v.then((x) => {
|
|
90
|
+
logger.info('Setting field ' + k);
|
|
91
|
+
value[k] = x.value;
|
|
92
|
+
}));
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
return value;
|
|
96
|
+
}
|
|
97
|
+
function expandArgs(args, cont, logger) {
|
|
98
|
+
const context = args['@context'];
|
|
99
|
+
if (!context)
|
|
100
|
+
return;
|
|
101
|
+
for (const key of Object.keys(args)) {
|
|
102
|
+
if (key == '@context')
|
|
103
|
+
continue;
|
|
104
|
+
const ctxObj = context[key];
|
|
105
|
+
if (!ctxObj) {
|
|
106
|
+
logger.debug("Didn't find ctx things for " + key);
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
logger.debug('Did find ctx things for ' +
|
|
110
|
+
key +
|
|
111
|
+
' ' +
|
|
112
|
+
JSON.stringify(ctxObj) +
|
|
113
|
+
': ' +
|
|
114
|
+
JSON.stringify(Object.entries(args[key]).map(([k, v]) => {
|
|
115
|
+
let x = 'object';
|
|
116
|
+
try {
|
|
117
|
+
x = JSON.stringify(v);
|
|
118
|
+
}
|
|
119
|
+
catch (_e) {
|
|
120
|
+
}
|
|
121
|
+
return k + ': ' + x;
|
|
122
|
+
})));
|
|
123
|
+
expandArgs(args[key], cont, logger);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
export async function parse_jsonld(args, logger, items) {
|
|
127
|
+
const promises = [];
|
|
128
|
+
logger.info(args);
|
|
129
|
+
const cont = await jsonldToQuads(JSON.parse(args));
|
|
130
|
+
const out = JSON.parse(args, (k, v) => revive(k, v, logger, promises, items));
|
|
131
|
+
await Promise.all(promises);
|
|
132
|
+
expandArgs(out, cont, logger);
|
|
133
|
+
return out;
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"jsonld.js","sourceRoot":"","sources":["../src/jsonld.ts"],"names":[],"mappings":"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","sourcesContent":["import { OrchestratorMessage, RunnerClient } from '@rdfc/proto'\nimport { createNamespace, createUriAndTermNamespace } from '@treecg/types'\nimport { ReaderInstance } from './reader'\nimport { WriterInstance } from './writer'\nimport { Logger } from 'winston'\nimport { JsonLdParser } from 'jsonld-streaming-parser'\nimport { pred, ShaclPath } from 'rdf-lens'\nimport { Quad, Term } from '@rdfjs/types'\nimport { NamedNode } from 'n3'\n\nexport type RunnerItems = {\n  readers: { [uri: string]: ReaderInstance[] }\n  writers: { [uri: string]: WriterInstance[] }\n  client: RunnerClient\n  write: Writable\n}\n\nconst RDFL = createUriAndTermNamespace(\n  'https://w3id.org/rdf-lens/ontology#',\n  'CBD',\n  'Path',\n  'PathLens',\n  'Context',\n  'TypedExtract',\n  'EnvVariable',\n  'envKey',\n  'envDefault',\n  'datatype',\n)\n\ntype Writable = (msg: OrchestratorMessage) => Promise<unknown>\nconst RDFC = createNamespace(\n  'https://w3id.org/rdf-connect#',\n  (x) => x,\n  'Reader',\n  'Writer',\n)\n\nfunction as_string_array(obj: unknown): string[] {\n  const out = Array.isArray(obj) ? obj : [obj]\n  return out.filter((x) => typeof x === 'string')\n}\n\nfunction cbdToQuads(value: unknown) {\n  const quads: Quad[] = []\n  const parser = new JsonLdParser()\n  const promise = new Promise<{ value: Quad[] }>((res, rej) =>\n    parser\n      .on('end', () => res({ value: quads }))\n      .on('error', (e) => rej(e))\n      .on('data', (q) => {\n        quads.push(q)\n      }),\n  )\n\n  if (value instanceof Object && '@type' in value) {\n    delete value['@type']\n  }\n  parser.write(JSON.stringify(value))\n  parser.end()\n  return promise\n}\n\nasync function cbdToPath(value: unknown): Promise<{ value: unknown }> {\n  const qs = (\n    await cbdToQuads({\n      '@id': 'http://example.com/ns#me1234',\n      'http://example.com/ns#innerPred': value,\n    })\n  ).value\n\n  const path = pred(new NamedNode('http://example.com/ns#innerPred'))\n    .one()\n    .then(ShaclPath)\n    .execute({\n      quads: qs,\n      id: new NamedNode('http://example.com/ns#me1234'),\n    })\n  return { value: path }\n}\n\ntype Cont = { quads: Quad[]; id: Term }\nasync function jsonldToQuads(value: unknown): Promise<Cont> {\n  const qs = (\n    await cbdToQuads({\n      '@id': 'http://example.com/ns#me1234',\n      'http://example.com/ns#innerPred': value,\n    })\n  ).value\n\n  const idx = qs.findIndex(\n    (x) =>\n      x.predicate.equals(new NamedNode('http://example.com/ns#innerPred')) &&\n      x.subject.equals(new NamedNode('http://example.com/ns#me1234')),\n  )\n  if (idx < 0) throw 'This cannot happen'\n  const id = qs[idx].object\n\n  qs.splice(idx, 1)\n\n  return {\n    quads: qs,\n    id,\n  }\n}\n\n/* eslint-disable  @typescript-eslint/no-explicit-any */\nfunction revive(\n  _key: string,\n  value: any,\n  logger: Logger,\n  promises: Promise<unknown>[],\n  runnerItems: RunnerItems,\n): any {\n  if (typeof value === 'object') {\n    const types = as_string_array(value['@type'] || [])\n    const ids = as_string_array(value['@id'] || [])[0] || ''\n\n    if (types.includes(RDFC.Reader)) {\n      if (runnerItems.readers[ids] === undefined) {\n        runnerItems.readers[ids] = []\n      }\n      const reader = new ReaderInstance(ids, runnerItems.client, logger)\n      runnerItems.readers[ids].push(reader)\n      return reader\n    }\n\n    if (types.includes(RDFC.Writer)) {\n      if (runnerItems.writers[ids] === undefined) {\n        runnerItems.writers[ids] = []\n      }\n      const writer = new WriterInstance(\n        ids,\n        runnerItems.client,\n        runnerItems.write,\n        logger,\n      )\n      runnerItems.writers[ids].push(writer)\n      return writer\n    }\n\n    if (types.includes(RDFL.CBD)) {\n      return cbdToQuads(value)\n    }\n\n    if (types.includes(RDFL.Path)) {\n      return cbdToPath(value)\n    }\n  }\n\n  Object.entries(value).forEach(([k, v]) => {\n    if (v instanceof Promise) {\n      logger.info('Found promise')\n      promises.push(\n        v.then((x) => {\n          logger.info('Setting field ' + k)\n          value[k] = x.value\n        }),\n      )\n    }\n  })\n\n  return value\n}\n\ntype Arg = {\n  [id: string]: any\n}\nfunction expandArgs(args: Arg, cont: Cont, logger: Logger) {\n  const context = args['@context']\n  if (!context) return\n\n  for (const key of Object.keys(args)) {\n    if (key == '@context') continue\n    const ctxObj = context[key]\n    if (!ctxObj) {\n      logger.debug(\"Didn't find ctx things for \" + key)\n      continue\n    }\n\n    logger.debug(\n      'Did find ctx things for ' +\n        key +\n        ' ' +\n        JSON.stringify(ctxObj) +\n        ': ' +\n        JSON.stringify(\n          Object.entries(args[key]).map(([k, v]) => {\n            let x = 'object'\n            try {\n              x = JSON.stringify(v)\n              // eslint-disable-next-line @typescript-eslint/no-unused-vars\n            } catch (_e: unknown) {\n              // default is set\n            }\n\n            return k + ': ' + x\n          }),\n        ),\n    )\n\n    expandArgs(args[key], cont, logger)\n  }\n}\n\nexport async function parse_jsonld(\n  args: string,\n  logger: Logger,\n  items: RunnerItems,\n): Promise<unknown> {\n  const promises: Promise<unknown>[] = []\n  logger.info(args)\n  const cont = await jsonldToQuads(JSON.parse(args))\n  const out = JSON.parse(args, (k, v) => revive(k, v, logger, promises, items))\n\n  await Promise.all(promises)\n\n  expandArgs(out, cont, logger)\n  return out\n}\n"]}
|
package/lib/logger.d.ts
CHANGED
package/lib/logger.js
CHANGED
|
@@ -4,25 +4,35 @@ export class RpcTransport extends Transport {
|
|
|
4
4
|
stream;
|
|
5
5
|
entities;
|
|
6
6
|
aliases;
|
|
7
|
+
draining;
|
|
7
8
|
constructor(opts) {
|
|
8
9
|
super({ level: 'debug' });
|
|
9
10
|
this.stream = opts.stream;
|
|
10
11
|
this.entities = opts.entities;
|
|
11
12
|
this.aliases = opts.aliases || [];
|
|
13
|
+
this.draining = true;
|
|
14
|
+
this.stream.on('drain', () => {
|
|
15
|
+
this.draining = true;
|
|
16
|
+
});
|
|
12
17
|
}
|
|
13
18
|
log(info, callback) {
|
|
14
|
-
if (!this.stream.closed) {
|
|
15
|
-
this.
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
if (!this.stream.closed && !this.stream.destroyed && this.stream.writable) {
|
|
20
|
+
if (this.draining) {
|
|
21
|
+
const ok = this.stream.write({
|
|
22
|
+
msg: info.message,
|
|
23
|
+
level: info.level,
|
|
24
|
+
entities: this.entities,
|
|
25
|
+
aliases: this.aliases,
|
|
26
|
+
});
|
|
27
|
+
if (!ok) {
|
|
28
|
+
this.draining = false;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
21
31
|
}
|
|
22
32
|
else {
|
|
23
33
|
console.log('Output stream closed');
|
|
24
|
-
callback();
|
|
25
34
|
}
|
|
35
|
+
callback();
|
|
26
36
|
}
|
|
27
37
|
withEntity(entity) {
|
|
28
38
|
return new RpcTransport({
|
|
@@ -46,4 +56,4 @@ export function extendLogger(baseLogger, newEntity) {
|
|
|
46
56
|
transports: newTransports,
|
|
47
57
|
});
|
|
48
58
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFvQixNQUFNLFNBQVMsQ0FBQTtBQUN4RCxPQUFPLFNBQVMsTUFBTSxtQkFBbUIsQ0FBQTtBQUt6QyxNQUFNLE9BQU8sWUFBYSxTQUFRLFNBQVM7SUFDeEIsTUFBTSxDQUF1QztJQUM3QyxRQUFRLENBQVU7SUFDbEIsT0FBTyxDQUFVO0lBQzFCLFFBQVEsQ0FBUztJQUV6QixZQUFZLElBSVg7UUFDQyxLQUFLLENBQUMsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQTtRQUV6QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUE7UUFDekIsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFBO1FBQzdCLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUE7UUFDakMsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUE7UUFFcEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTtZQUMzQixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQTtRQUN0QixDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRCxHQUFHLENBQUMsSUFBYyxFQUFFLFFBQW9CO1FBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDMUUsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQ2xCLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO29CQUMzQixHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU87b0JBQ2pCLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztvQkFDakIsUUFBUSxFQUFFLElBQUksQ0FBQyxRQUFRO29CQUN2QixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87aUJBQ3RCLENBQUMsQ0FBQTtnQkFDRixJQUFJLENBQUMsRUFBRSxFQUFFLENBQUM7b0JBQ1IsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUE7Z0JBQ3ZCLENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQzthQUFNLENBQUM7WUFDTixPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFzQixDQUFDLENBQUE7UUFDckMsQ0FBQztRQUNELFFBQVEsRUFBRSxDQUFBO0lBQ1osQ0FBQztJQUVELFVBQVUsQ0FBQyxNQUFjO1FBQ3ZCLE9BQU8sSUFBSSxZQUFZLENBQUM7WUFDdEIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLFFBQVEsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUM7WUFDcEMsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO1NBQ3RCLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDRjtBQUVELE1BQU0sVUFBVSxZQUFZLENBQUMsVUFBa0IsRUFBRSxTQUFpQjtJQUNoRSxNQUFNLGFBQWEsR0FBRyxVQUFVLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ3BELElBQUksQ0FBQyxZQUFZLFlBQVksRUFBRSxDQUFDO1lBQzlCLE9BQU8sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUNoQyxDQUFDO1FBQ0QsT0FBTyxDQUFDLENBQUE7SUFDVixDQUFDLENBQUMsQ0FBQTtJQUVGLE9BQU8sWUFBWSxDQUFDO1FBQ2xCLEtBQUssRUFBRSxVQUFVLENBQUMsS0FBSztRQUN2QixNQUFNLEVBQUUsVUFBVSxDQUFDLE1BQU07UUFDekIsV0FBVyxFQUFFLFVBQVUsQ0FBQyxXQUFXO1FBQ25DLFVBQVUsRUFBRSxhQUFhO0tBQzFCLENBQUMsQ0FBQTtBQUNKLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjcmVhdGVMb2dnZXIsIExvZ0VudHJ5LCBMb2dnZXIgfSBmcm9tICd3aW5zdG9uJ1xuaW1wb3J0IFRyYW5zcG9ydCBmcm9tICd3aW5zdG9uLXRyYW5zcG9ydCdcblxuaW1wb3J0ICogYXMgZ3JwYyBmcm9tICdAZ3JwYy9ncnBjLWpzJ1xuaW1wb3J0IHsgTG9nTWVzc2FnZSB9IGZyb20gJ0ByZGZjL3Byb3RvJ1xuXG5leHBvcnQgY2xhc3MgUnBjVHJhbnNwb3J0IGV4dGVuZHMgVHJhbnNwb3J0IHtcbiAgcHJpdmF0ZSByZWFkb25seSBzdHJlYW06IGdycGMuQ2xpZW50V3JpdGFibGVTdHJlYW08TG9nTWVzc2FnZT5cbiAgcHJpdmF0ZSByZWFkb25seSBlbnRpdGllczogc3RyaW5nW11cbiAgcHJpdmF0ZSByZWFkb25seSBhbGlhc2VzOiBzdHJpbmdbXVxuICBwcml2YXRlIGRyYWluaW5nOiBib29sZWFuXG5cbiAgY29uc3RydWN0b3Iob3B0czoge1xuICAgIHN0cmVhbTogZ3JwYy5DbGllbnRXcml0YWJsZVN0cmVhbTxMb2dNZXNzYWdlPlxuICAgIGVudGl0aWVzOiBzdHJpbmdbXVxuICAgIGFsaWFzZXM/OiBzdHJpbmdbXVxuICB9KSB7XG4gICAgc3VwZXIoeyBsZXZlbDogJ2RlYnVnJyB9KVxuXG4gICAgdGhpcy5zdHJlYW0gPSBvcHRzLnN0cmVhbVxuICAgIHRoaXMuZW50aXRpZXMgPSBvcHRzLmVudGl0aWVzXG4gICAgdGhpcy5hbGlhc2VzID0gb3B0cy5hbGlhc2VzIHx8IFtdXG4gICAgdGhpcy5kcmFpbmluZyA9IHRydWVcblxuICAgIHRoaXMuc3RyZWFtLm9uKCdkcmFpbicsICgpID0+IHtcbiAgICAgIHRoaXMuZHJhaW5pbmcgPSB0cnVlXG4gICAgfSlcbiAgfVxuXG4gIGxvZyhpbmZvOiBMb2dFbnRyeSwgY2FsbGJhY2s6ICgpID0+IHZvaWQpIHtcbiAgICBpZiAoIXRoaXMuc3RyZWFtLmNsb3NlZCAmJiAhdGhpcy5zdHJlYW0uZGVzdHJveWVkICYmIHRoaXMuc3RyZWFtLndyaXRhYmxlKSB7XG4gICAgICBpZiAodGhpcy5kcmFpbmluZykge1xuICAgICAgICBjb25zdCBvayA9IHRoaXMuc3RyZWFtLndyaXRlKHtcbiAgICAgICAgICBtc2c6IGluZm8ubWVzc2FnZSxcbiAgICAgICAgICBsZXZlbDogaW5mby5sZXZlbCxcbiAgICAgICAgICBlbnRpdGllczogdGhpcy5lbnRpdGllcyxcbiAgICAgICAgICBhbGlhc2VzOiB0aGlzLmFsaWFzZXMsXG4gICAgICAgIH0pXG4gICAgICAgIGlmICghb2spIHtcbiAgICAgICAgICB0aGlzLmRyYWluaW5nID0gZmFsc2VcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH0gZWxzZSB7XG4gICAgICBjb25zb2xlLmxvZygnT3V0cHV0IHN0cmVhbSBjbG9zZWQnKVxuICAgIH1cbiAgICBjYWxsYmFjaygpXG4gIH1cblxuICB3aXRoRW50aXR5KGVudGl0eTogc3RyaW5nKTogUnBjVHJhbnNwb3J0IHtcbiAgICByZXR1cm4gbmV3IFJwY1RyYW5zcG9ydCh7XG4gICAgICBzdHJlYW06IHRoaXMuc3RyZWFtLFxuICAgICAgZW50aXRpZXM6IFsuLi50aGlzLmVudGl0aWVzLCBlbnRpdHldLFxuICAgICAgYWxpYXNlczogdGhpcy5hbGlhc2VzLFxuICAgIH0pXG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGV4dGVuZExvZ2dlcihiYXNlTG9nZ2VyOiBMb2dnZXIsIG5ld0VudGl0eTogc3RyaW5nKTogTG9nZ2VyIHtcbiAgY29uc3QgbmV3VHJhbnNwb3J0cyA9IGJhc2VMb2dnZXIudHJhbnNwb3J0cy5tYXAoKHQpID0+IHtcbiAgICBpZiAodCBpbnN0YW5jZW9mIFJwY1RyYW5zcG9ydCkge1xuICAgICAgcmV0dXJuIHQud2l0aEVudGl0eShuZXdFbnRpdHkpXG4gICAgfVxuICAgIHJldHVybiB0XG4gIH0pXG5cbiAgcmV0dXJuIGNyZWF0ZUxvZ2dlcih7XG4gICAgbGV2ZWw6IGJhc2VMb2dnZXIubGV2ZWwsXG4gICAgZm9ybWF0OiBiYXNlTG9nZ2VyLmZvcm1hdCxcbiAgICBkZWZhdWx0TWV0YTogYmFzZUxvZ2dlci5kZWZhdWx0TWV0YSxcbiAgICB0cmFuc3BvcnRzOiBuZXdUcmFuc3BvcnRzLFxuICB9KVxufVxuIl19
|
package/lib/reader.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ReceivingMessage, ReceivingStreamMessage, RunnerClient } from '@rdfc/proto';
|
|
2
2
|
import { Logger } from 'winston';
|
|
3
3
|
import { Writable } from './runner.js';
|
|
4
|
+
import { ChannelTracker } from './state.js';
|
|
4
5
|
export type Any = {
|
|
5
6
|
string: string;
|
|
6
7
|
} | {
|
|
@@ -20,13 +21,15 @@ export declare class ReaderInstance implements Reader {
|
|
|
20
21
|
readonly uri: string;
|
|
21
22
|
private logger;
|
|
22
23
|
private readonly notifyOrchestrator;
|
|
24
|
+
private readonly tracker;
|
|
23
25
|
private consumers;
|
|
24
|
-
constructor(uri: string, client: RunnerClient, notifyOrchestrator: Writable, logger: Logger);
|
|
26
|
+
constructor(uri: string, client: RunnerClient, notifyOrchestrator: Writable, logger: Logger, tracker?: ChannelTracker);
|
|
25
27
|
anys(): AsyncIterable<Any>;
|
|
26
28
|
strings(): AsyncIterable<string>;
|
|
27
29
|
buffers(): AsyncIterable<Uint8Array>;
|
|
28
30
|
streams(): AsyncIterable<AsyncGenerator<Uint8Array>>;
|
|
29
31
|
handleMsg(msg: ReceivingMessage): void;
|
|
32
|
+
private hasClosed;
|
|
30
33
|
close(): void;
|
|
31
34
|
handleStreamingMessage({ channel, globalSequenceNumber, }: ReceivingStreamMessage): Promise<void>;
|
|
32
35
|
}
|