@rdfc/js-runner 1.0.0-alpha.7 → 1.0.0

package/bin/js-runner.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 import { jsRunner } from "../dist/index.js";
 
-jsRunner().catch((e) => { console.error("Error:", e); console.error(e.stack); });
+jsRunner().catch((e) => { console.error("Error:", e); console.error(e.stack) });

package/dist/connectors.d.ts

@@ -10,11 +10,11 @@ export interface Config<T> {
     config: T;
 }
 export type ReaderConstructor<C> = (config: C) => {
-    reader: SimpleStream<string | Buffer>;
+    reader: Stream<string | Buffer>;
     init: () => Promise<void>;
 };
 export type WriterConstructor<C> = (config: C) => {
-    writer: SimpleStream<string | Buffer>;
+    writer: Writer<string | Buffer>;
     init: () => Promise<void>;
 };
 export declare const JsOntology: import("@treecg/types").Namespace<("JsProcess" | "JsChannel" | "JsReaderChannel" | "JsWriterChannel")[], NamedNode<string>, string>;
@@ -45,10 +45,7 @@ export declare class SimpleStream<T> implements Stream<T> {
     readonly disconnect: () => Promise<void>;
     lastElement?: T | undefined;
     private ended;
-    private name?;
-    readonly id?: Term;
-    constructor(onDisconnect?: () => Promise<void>, id?: Term);
-    setName(name: string): void;
+    constructor(onDisconnect?: () => Promise<void>);
     data(listener: Handler<T>): this;
     push(data: T): Promise<void>;
     end(): Promise<void>;

package/dist/connectors.js

@@ -7,7 +7,6 @@ import { startKafkaStreamReader, startKafkaStreamWriter, } from "./connectors/ka
 export * from "./connectors/kafka.js";
 import { startHttpStreamReader, startHttpStreamWriter, } from "./connectors/http.js";
 import { LOG } from "./util.js";
-import { profiler } from "./profiling.js";
 export * from "./connectors/http.js";
 export const Conn = createTermNamespace("https://w3id.org/conn#", "FileReaderChannel", "FileWriterChannel", "HttpReaderChannel", "HttpWriterChannel", "KafkaReaderChannel", "KafkaWriterChannel", "WsReaderChannel", "WsWriterChannel", "WriterChannel", "ReaderChannel");
 export const JsOntology = createTermNamespace("https://w3id.org/conn/js#", "JsProcess", "JsChannel", "JsReaderChannel", "JsWriterChannel");
@@ -19,25 +18,21 @@ export class ChannelFactory {
         LOG.channel("Creating reader %s: a %s", config.id.value, config.ty.value);
         if (config.ty.equals(Conn.FileReaderChannel)) {
             const { reader, init } = startFileStreamReader(config.config);
-            reader.setName(config.id.value);
             this.inits.push(init);
             return reader;
         }
         if (config.ty.equals(Conn.WsReaderChannel)) {
             const { reader, init } = startWsStreamReader(config.config);
-            reader.setName(config.id.value);
             this.inits.push(init);
             return reader;
         }
         if (config.ty.equals(Conn.KafkaReaderChannel)) {
             const { reader, init } = startKafkaStreamReader(config.config);
-            reader.setName(config.id.value);
             this.inits.push(init);
             return reader;
         }
         if (config.ty.equals(Conn.HttpReaderChannel)) {
             const { reader, init } = startHttpStreamReader(config.config);
-            reader.setName(config.id.value);
             this.inits.push(init);
             return reader;
         }
@@ -48,24 +43,16 @@ export class ChannelFactory {
                 if (c.channel.id.termType === "NamedNode") {
                     if (!this.jsChannelsNamedNodes[id]) {
                         this.jsChannelsNamedNodes[id] =
-                            new SimpleStream(undefined, c.id);
+                            new SimpleStream();
                     }
-                    const out = this.jsChannelsNamedNodes[id];
-                    if (out.id) {
-                        out.setName(out.id.value);
-                    }
-                    return out;
+                    return this.jsChannelsNamedNodes[id];
                 }
                 if (c.channel.id.termType === "BlankNode") {
                     if (!this.jsChannelsBlankNodes[id]) {
                         this.jsChannelsBlankNodes[id] =
-                            new SimpleStream(undefined, c.id);
+                            new SimpleStream();
                     }
-                    const out = this.jsChannelsBlankNodes[id];
-                    if (out.id) {
-                        out.setName(out.id.value);
-                    }
-                    return out;
+                    return this.jsChannelsBlankNodes[id];
                 }
                 throw "Should have found a thing";
             }
@@ -101,14 +88,14 @@ export class ChannelFactory {
                 if (c.channel.id.termType === "NamedNode") {
                     if (!this.jsChannelsNamedNodes[id]) {
                         this.jsChannelsNamedNodes[id] =
-                            new SimpleStream(undefined, c.id);
+                            new SimpleStream();
                     }
                     return this.jsChannelsNamedNodes[id];
                 }
                 if (c.channel.id.termType === "BlankNode") {
                     if (!this.jsChannelsBlankNodes[id]) {
                         this.jsChannelsBlankNodes[id] =
-                            new SimpleStream(undefined, c.id);
+                            new SimpleStream();
                     }
                     return this.jsChannelsBlankNodes[id];
                 }
@@ -127,15 +114,8 @@ export class SimpleStream {
     disconnect;
     lastElement;
     ended = false;
-    name;
-    id;
-    constructor(onDisconnect, id) {
+    constructor(onDisconnect) {
         this.disconnect = onDisconnect || (async () => { });
-        this.id = id;
-    }
-    setName(name) {
-        console.log("setting name", name);
-        this.name = name;
     }
     data(listener) {
         this.dataHandlers.push(listener);
@@ -146,16 +126,7 @@ export class SimpleStream {
             throw new Error("Trying to push to a stream that has ended!");
         }
         this.lastElement = data;
-        for (const handler of this.dataHandlers) {
-            let idx = 0;
-            if (this.name) {
-                idx = profiler.start(this.name);
-            }
-            await handler(data);
-            if (this.name) {
-                profiler.stop(idx);
-            }
-        }
+        await Promise.all(this.dataHandlers.map((handler) => handler(data)));
     }
     async end() {
         await this.disconnect();