@fireproof/core 0.21.0-dev-preview-4 → 0.21.0-dev-preview-6

package/protocols/cloud/msger.js

@@ -1,9 +1,7 @@
 import { BuildURI, Result, runtimeFn, URI } from "@adviser/cement";
-import { buildReqGestalt, defaultGestalt, MsgIsResGestalt, MsgIsError, buildReqOpen, MsgIsResOpen, MsgIsConnected, MsgIsWithConn, } from "./msg-types.js";
+import { buildReqGestalt, defaultGestalt, MsgIsResGestalt, buildReqOpen, MsgIsConnected, MsgIsError, MsgIsResOpen, MsgIsTid, buildReqClose, MsgIsResClose, } from "./msg-types.js";
 import { ensurePath, HttpConnection } from "./http-connection.js";
 import { WSConnection } from "./ws-connection.js";
-import { ensureLogger, sleep } from "../../utils.js";
-import pLimit from "p-limit";
 export function selectRandom(arr) {
     return arr[Math.floor(Math.random() * arr.length)];
 }
@@ -58,246 +56,143 @@ export async function authTypeFromUri(logger, curi) {
         },
     });
 }
-function initialFPUri(curl) {
-    let gestaltUrl = URI.from(curl);
-    if (["", "/"].includes(gestaltUrl.pathname)) {
-        gestaltUrl = gestaltUrl.build().appendRelative("/fp").URI();
-    }
-    return gestaltUrl;
-}
-export class Msger {
-    static connect(sthis, curl, imsgP = {}, conn, mowh) {
-        const vc = new VirtualConnected(sthis, { curl, imsgP, conn, openWSorHttp: mowh });
-        return Promise.resolve(Result.Ok(vc));
-    }
-    constructor() {
-    }
-}
-export class MsgOpenWSAndHttp {
-    async openHttp(vc, urls, msgP, exGestalt) {
-        return Result.Ok(new HttpConnection(vc, urls, msgP, exGestalt));
-    }
-    async openWS(vc, url, msgP, exGestalt) {
-        url = url.build().setParam("random", vc.nextId().str).URI();
-        const wsUrl = ensurePath(url, "ws");
-        let wsFactory;
-        if (runtimeFn().isNodeIsh) {
-            const { WebSocket } = await import("ws");
-            wsFactory = () => new WebSocket(wsUrl);
+export class MsgConnected {
+    static async connect(auth, mrc, conn = {}) {
+        if (Result.Is(mrc)) {
+            if (mrc.isErr()) {
+                return Result.Err(mrc.Err());
+            }
+            mrc = mrc.Ok();
         }
-        else {
-            wsFactory = () => new WebSocket(wsUrl);
+        const res = await mrc.request(buildReqOpen(mrc.sthis, auth, conn), { waitFor: MsgIsResOpen });
+        if (MsgIsError(res) || !MsgIsResOpen(res)) {
+            return mrc.sthis.logger.Error().Err(res).Msg("unexpected response").ResultError();
         }
-        return Result.Ok(new WSConnection(vc, wsFactory(), msgP, exGestalt));
+        return Result.Ok(new MsgConnected(mrc, res.conn));
     }
-}
-export class VirtualConnected {
-    constructor(sthis, opts) {
-        this.retries = [];
-        this.activeBinds = new Map();
-        this.mutex = pLimit(1);
-        this.sthis = sthis;
-        this.id = sthis.nextId().str;
-        this.logger = ensureLogger(sthis, "VirtualConnected");
-        this.opts = {
-            ...opts,
-            openWSorHttp: opts.openWSorHttp || new MsgOpenWSAndHttp(),
-            retryCount: opts.retryCount || 3,
-            retryDelay: opts.retryDelay || 500,
-            conn: { reqId: sthis.nextId().str, ...opts.conn },
-        };
-        this.mowh = this.opts.openWSorHttp;
+    constructor(raw, conn) {
+        this.sthis = raw.sthis;
+        this.raw = raw;
+        this.exchangedGestalt = raw.exchangedGestalt;
+        this.conn = conn;
+        this.activeBinds = raw.activeBinds;
+        this.id = this.sthis.nextId().str;
     }
-    get conn() {
-        if (!this.virtualConn) {
-            throw new Error("conn is not set");
-        }
-        return this.virtualConn;
+    attachAuth(auth) {
+        return new MsgConnectedAuth(this, auth);
     }
-    async handleBindRealConn(realConn, req, as) {
-        const stream = realConn.bind({ ...as.bind.msg, auth: req.auth, conn: { ...this.conn, ...req.conn } }, as.bind.opts);
-        for await (const msg of stream) {
-            try {
-                if (MsgIsConnected(msg, this.conn)) {
-                    as.controller?.enqueue(msg);
-                }
-            }
-            catch (err) {
-                this.sthis.logger.Error().Err(err).Any({ msg }).Msg("Error in handleBindRealConn callback[ignored]");
-            }
-        }
+}
+export class MsgConnectedAuth {
+    constructor(conn, authFactory) {
+        this.id = conn.id;
+        this.raw = conn.raw;
+        this.conn = conn.conn;
+        this.sthis = conn.sthis;
+        this.authFactory = authFactory;
+        this.exchangedGestalt = conn.exchangedGestalt;
+        this.activeBinds = conn.activeBinds;
     }
     bind(req, opts) {
-        const id = this.sthis.nextId().str;
-        return new ReadableStream({
-            cancel: (err) => {
-                this.sthis.logger.Debug().Msg("vc-bind-cancel", id, err);
-                this.activeBinds.delete(id);
-            },
-            start: (ctl) => {
-                this.getRealConn(req, opts, async (realConn) => {
-                    const as = {
-                        id,
-                        bind: {
-                            msg: req,
-                            opts,
-                        },
-                        controller: ctl,
-                    };
-                    this.activeBinds.set(id, as);
-                    this.handleBindRealConn(realConn, req, as);
-                    return Result.Ok(undefined);
-                }).catch((err) => {
-                    ctl.error({
-                        type: "error",
-                        src: "VirtualConnection:bind",
-                        message: err.message,
-                        tid: req.tid,
-                        version: req.version,
-                        auth: req.auth,
-                        stack: [],
-                    });
-                });
+        const stream = this.raw.bind({ ...req, conn: req.conn || this.conn }, opts);
+        const ts = new TransformStream({
+            transform: (chunk, controller) => {
+                if (!MsgIsTid(chunk, req.tid)) {
+                    return;
+                }
+                if (MsgIsConnected(chunk, this.conn)) {
+                    if (opts.waitFor?.(chunk) || MsgIsError(chunk)) {
+                        controller.enqueue(chunk);
+                    }
+                }
             },
         });
+        stream.pipeThrough(ts);
+        return ts.readable;
+    }
+    authType() {
+        return this.authFactory();
+    }
+    msgConnAuth() {
+        return this.authType().then((r) => {
+            if (r.isErr()) {
+                return Result.Err(r);
+            }
+            return Result.Ok({ conn: this.conn, auth: r.Ok() });
+        });
     }
     request(req, opts) {
-        return this.getRealConn(req, opts, (realConn) => realConn.request({
-            ...req,
-            conn: { ...this.virtualConn, ...req.conn },
-        }, opts));
+        return this.raw.request({ ...req, conn: req.conn || this.conn }, opts);
     }
     send(msg) {
-        return this.getRealConn(msg, {
-            waitFor: () => true,
-        }, async (realConn) => {
-            const ret = await realConn.send({
-                ...msg,
-                conn: { ...this.conn, ...msg.conn },
-            });
-            return ret;
-        });
+        return this.raw.send({ ...msg, conn: msg.conn || this.conn });
     }
-    close(t) {
-        return this.getRealConn(t, {
-            waitFor: () => true,
-            noRetry: true,
-        }, (realConn) => realConn.close(t));
+    start() {
+        return this.raw.start();
+    }
+    async close(t) {
+        await this.request(buildReqClose(this.sthis, t.auth, this.conn), { waitFor: MsgIsResClose });
+        return await this.raw.close(t);
     }
     onMsg(msgFn) {
-        throw new Error("Method not implemented.");
+        return this.raw.onMsg((msg) => {
+            if (MsgIsConnected(msg, this.conn)) {
+                msgFn(msg);
+            }
+        });
+    }
+}
+function initialFPUri(curl) {
+    let gestaltUrl = URI.from(curl);
+    if (["", "/"].includes(gestaltUrl.pathname)) {
+        gestaltUrl = gestaltUrl.build().appendRelative("/fp").URI();
+    }
+    return gestaltUrl;
+}
+export class Msger {
+    static async openHttp(sthis, urls, msgP, exGestalt) {
+        return Result.Ok(new HttpConnection(sthis, urls, msgP, exGestalt));
+    }
+    static async openWS(sthis, url, msgP, exGestalt) {
+        let ws;
+        url = url.build().setParam("random", sthis.nextId().str).URI();
+        const wsUrl = ensurePath(url, "ws");
+        if (runtimeFn().isNodeIsh) {
+            const { WebSocket } = await import("ws");
+            ws = new WebSocket(wsUrl);
+        }
+        else {
+            ws = new WebSocket(wsUrl);
+        }
+        return Result.Ok(new WSConnection(sthis, ws, msgP, exGestalt));
     }
-    async connect(auth, curl, imsgP = {}) {
-        const jsMsgP = defaultMsgParams(this.sthis, { ...imsgP, mime: "application/json", ende: jsonEnDe(this.sthis) });
+    static async open(sthis, auth, curl, imsgP = {}) {
+        const jsMsgP = defaultMsgParams(sthis, { ...imsgP, mime: "application/json", ende: jsonEnDe(sthis) });
         const gestaltUrl = initialFPUri(curl);
-        const gs = defaultGestalt(defaultMsgParams(this.sthis, imsgP), { id: "FP-Universal-Client" });
-        const rHC = await this.mowh.openHttp(this.sthis, [gestaltUrl], jsMsgP, { my: gs, remote: gs });
+        const gs = defaultGestalt(defaultMsgParams(sthis, imsgP), { id: "FP-Universal-Client" });
+        const rHC = await Msger.openHttp(sthis, [gestaltUrl], jsMsgP, { my: gs, remote: gs });
         if (rHC.isErr()) {
             return rHC;
         }
         const hc = rHC.Ok();
-        const resGestalt = await hc.request(buildReqGestalt(this.sthis, auth, gs), {
+        const resGestalt = await hc.request(buildReqGestalt(sthis, auth, gs), {
             waitFor: MsgIsResGestalt,
-            noConn: true,
         });
         if (!MsgIsResGestalt(resGestalt)) {
-            return this.logger.Error().Any({ resGestalt }).Msg("should be ResGestalt").ResultError();
+            return sthis.logger.Error().Any({ resGestalt }).Msg("should be ResGestalt").ResultError();
         }
         await hc.close(resGestalt);
         const exGt = { my: gs, remote: resGestalt.gestalt };
-        const msgP = defaultMsgParams(this.sthis, imsgP);
-        this.exchangedGestalt = exGt;
-        let rRealConn;
+        const msgP = defaultMsgParams(sthis, imsgP);
         if (exGt.remote.protocolCapabilities.includes("reqRes") && !exGt.remote.protocolCapabilities.includes("stream")) {
-            rRealConn = await this.mowh.openHttp(this.sthis, exGt.remote.httpEndpoints.map((i) => BuildURI.from(curl).resolve(i).URI()), msgP, exGt);
-        }
-        else {
-            const wsUrl = BuildURI.from(gestaltUrl).resolve(selectRandom(exGt.remote.wsEndpoints)).URI();
-            rRealConn = await this.mowh.openWS(this.sthis, wsUrl, msgP, exGt);
-        }
-        if (rRealConn.isErr()) {
-            return rRealConn;
-        }
-        const realConn = rRealConn.Ok();
-        const rStart = await realConn.start();
-        if (rStart.isErr()) {
-            return Result.Err(rStart);
+            return applyStart(Msger.openHttp(sthis, exGt.remote.httpEndpoints.map((i) => BuildURI.from(curl).resolve(i).URI()), msgP, exGt));
         }
-        return rRealConn;
+        const wsUrl = BuildURI.from(gestaltUrl).resolve(selectRandom(exGt.remote.wsEndpoints)).URI();
+        return applyStart(Msger.openWS(sthis, wsUrl, msgP, exGt));
     }
-    async getQSIdWithSideEffect(msg, conn) {
-        const mOpen = await this.request(buildReqOpen(this.sthis, msg.auth, conn), {
-            waitFor: MsgIsResOpen,
-            noConn: true,
-        });
-        if (MsgIsError(mOpen)) {
-            return mOpen;
-        }
-        this.virtualConn = mOpen.conn;
-        return mOpen;
+    static connect(sthis, auth, curl, imsgP = {}, conn = {}) {
+        return Msger.open(sthis, auth, curl, imsgP).then((srv) => MsgConnected.connect(auth, srv, conn));
     }
-    async getRealConn(msg, opts, action) {
-        if (!this.realConn) {
-            await this.mutex(async () => {
-                if (this.retries.length >= this.opts.retryCount) {
-                    return Promise.resolve({
-                        type: "error",
-                        src: "VirtualConnection:getRealConn",
-                        message: "retry count exceeded",
-                        tid: msg.tid,
-                        version: msg.version,
-                        auth: msg.auth,
-                        stack: [],
-                    });
-                }
-                const rConn = await this.connect(msg.auth, this.opts.curl, this.opts.imsgP);
-                if (rConn.isErr()) {
-                    this.retries.push({ retryCount: this.retries.length + 1 });
-                    await sleep(this.opts.retryDelay * this.retries.length);
-                    return this.getRealConn(msg, opts, action);
-                }
-                this.realConn = rConn.Ok();
-                const mQSid = await this.getQSIdWithSideEffect(msg, {
-                    reqId: this.sthis.nextId().str,
-                    ...this.virtualConn,
-                    ...this.opts.conn,
-                });
-                if (MsgIsError(mQSid)) {
-                    return {
-                        ...mQSid,
-                        tid: msg.tid,
-                    };
-                }
-                for (const as of this.activeBinds.values()) {
-                    void this.handleBindRealConn(this.realConn, msg, as);
-                }
-            });
-            const ret = await this.getRealConn(msg, opts, action);
-            return ret;
-        }
-        else {
-            if (!this.realConn.isReady) {
-                await this.realConn.close(msg);
-                this.realConn = undefined;
-                this.retries = [];
-                return this.getRealConn(msg, opts, action);
-            }
-            if (!opts.noConn && !this.virtualConn) {
-                const conn = MsgIsWithConn(msg) ? { conn: msg.conn } : {};
-                return {
-                    type: "error",
-                    src: msg,
-                    message: "virtualConn is not set",
-                    tid: msg.tid,
-                    ...conn,
-                    version: msg.version,
-                    auth: msg.auth,
-                    stack: [],
-                };
-            }
-            const ret = await action(this.realConn);
-            return ret;
-        }
+    constructor() {
     }
 }
 //# sourceMappingURL=msger.js.map

package/protocols/cloud/msger.js.map

@@ -1 +1 @@
-{"version":3,"file":"msger.js","sourceRoot":"","sources":["../../../../../src/protocols/cloud/msger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"msger.js","sourceRoot":"","sources":["../../../../../src/protocols/cloud/msger.ts"],"names":[],"mappings":"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"}

package/protocols/cloud/ws-connection.d.ts

@@ -7,24 +7,14 @@ export interface WSReqOpen {
     readonly reqOpen: ReqOpen;
     readonly ws: WebSocket;
 }
-interface WaitForTidItem {
-    readonly opts: WaitForTid;
-    readonly timeout?: ReturnType<typeof setTimeout>;
-}
-declare class WaitForTids {
-    readonly waitForTids: Map<string, WaitForTidItem>;
-    start(sthis: SuperThis, logger: Logger, waitFor: WaitForTid): void;
-    stop(tid: string): void;
-    resolve(msg: MsgBase): WaitForTidItem | undefined;
-}
 export declare class WSConnection extends MsgRawConnectionBase implements MsgRawConnection {
     #private;
     readonly logger: Logger;
     readonly msgP: MsgerParamsWithEnDe;
     readonly ws: WebSocket;
-    readonly waitForTid: WaitForTids;
+    readonly waitForTid: Map<string, WaitForTid>;
+    opened: boolean;
     readonly id: string;
-    isReady: boolean;
     constructor(sthis: SuperThis, ws: WebSocket, msgP: MsgerParamsWithEnDe, exGestalt: ExchangedGestalt);
     start(): Promise<Result<void>>;
     close(): Promise<Result<void>>;
@@ -32,9 +22,8 @@ export declare class WSConnection extends MsgRawConnectionBase implements MsgRaw
     send<Q extends MsgBase, S extends MsgBase>(msg: Q): Promise<S>;
     onMsg<S extends MsgBase>(fn: OnMsgFn<S>): UnReg;
     onClose(fn: UnReg): UnReg;
-    readonly activeBinds: Map<string, ActiveStream>;
+    readonly activeBinds: Map<string, ActiveStream<MsgBase, MsgBase>>;
     bind<Q extends MsgBase, S extends MsgBase>(req: Q, opts: RequestOpts): ReadableStream<MsgWithError<S>>;
     request<Q extends MsgBase, S extends MsgBase>(req: Q, opts: RequestOpts): Promise<MsgWithError<S>>;
 }
-export {};
 //# sourceMappingURL=ws-connection.d.ts.map

package/protocols/cloud/ws-connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-connection.d.ts","sourceRoot":"","sources":["../../../../../src/protocols/cloud/ws-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,MAAM,EAAE,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,OAAO,EAA6B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACpH,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnH,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;CACxB;AAED,UAAU,cAAc;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;CAClD;AAED,cAAM,WAAW;IACf,QAAQ,CAAC,WAAW,8BAAqC;IAEzD,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAuB3D,IAAI,CAAC,GAAG,EAAE,MAAM;IAWhB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS;CAalD;AAID,qBAAa,YAAa,SAAQ,oBAAqB,YAAW,gBAAgB;;IAChF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;IAMvB,QAAQ,CAAC,UAAU,cAAqB;IAExC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB,OAAO,UAAS;gBAEJ,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,gBAAgB;IAS7F,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAmE9B,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAQpC,KAAK,CAAC,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAK/D,IAAI,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAM9D,KAAK,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK;IAM/C,OAAO,CAAC,EAAE,EAAE,KAAK,GAAG,KAAK;IAMzB,QAAQ,CAAC,WAAW,4BAAmC;IACvD,IAAI,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IA+ChG,OAAO,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAgBzG"}
+{"version":3,"file":"ws-connection.d.ts","sourceRoot":"","sources":["../../../../../src/protocols/cloud/ws-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,MAAM,EAAE,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,OAAO,EAA6B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAY,MAAM,gBAAgB,CAAC;AAC9H,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnH,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;CACxB;AAED,qBAAa,YAAa,SAAQ,oBAAqB,YAAW,gBAAgB;;IAChF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;IAMvB,QAAQ,CAAC,UAAU,0BAAiC;IAEpD,MAAM,UAAS;IAEf,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBAER,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,gBAAgB;IAS7F,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IA+E9B,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAQpC,KAAK,CAAC,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAK/D,IAAI,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAM9D,KAAK,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK;IAM/C,OAAO,CAAC,EAAE,EAAE,KAAK,GAAG,KAAK;IAMzB,QAAQ,CAAC,WAAW,8CAAqD;IACzE,IAAI,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IA2ChG,OAAO,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAczG"}

package/protocols/cloud/ws-connection.js

@@ -5,60 +5,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _WSConnection_onMsg, _WSConnection_onClose, _WSConnection_wsOnMessage;
 import { exception2Result, Future, Result, top_uint8 } from "@adviser/cement";
-import { MsgIsError, buildErrorMsg } from "./msg-types.js";
+import { MsgIsError, buildErrorMsg, MsgIsTid } from "./msg-types.js";
 import { MsgRawConnectionBase } from "./msg-raw-connection-base.js";
 import { ensureLogger } from "../../utils.js";
-class WaitForTids {
-    constructor() {
-        this.waitForTids = new Map();
-    }
-    start(sthis, logger, waitFor) {
-        let timeout = undefined;
-        if (typeof waitFor.timeout === "number" && waitFor.timeout > 0) {
-            timeout = setTimeout(() => {
-                this.waitForTids.delete(waitFor.tid);
-                waitFor.future.resolve(buildErrorMsg({ logger, sthis }, {
-                    tid: waitFor.tid,
-                }, logger.Error().Any({ tid: waitFor }).Msg("Timeout").AsError()));
-            }, waitFor.timeout);
-        }
-        this.waitForTids.set(waitFor.tid, {
-            opts: waitFor,
-            timeout,
-        });
-    }
-    stop(tid) {
-        const item = this.waitForTids.get(tid);
-        if (!item) {
-            return;
-        }
-        if (item.timeout) {
-            clearTimeout(item.timeout);
-        }
-        this.waitForTids.delete(tid);
-    }
-    resolve(msg) {
-        const item = this.waitForTids.get(msg.tid);
-        if (!item) {
-            return undefined;
-        }
-        if (item.opts.waitFor(msg)) {
-            if (item.timeout) {
-                clearTimeout(item.timeout);
-            }
-            item.opts.future.resolve(msg);
-        }
-        return item;
-    }
-}
-const DefaultRoundTripTime = 1000;
 export class WSConnection extends MsgRawConnectionBase {
     constructor(sthis, ws, msgP, exGestalt) {
         super(sthis, exGestalt);
         _WSConnection_onMsg.set(this, new Map());
         _WSConnection_onClose.set(this, new Map());
-        this.waitForTid = new WaitForTids();
-        this.isReady = false;
+        this.waitForTid = new Map();
+        this.opened = false;
         _WSConnection_wsOnMessage.set(this, async (event) => {
             const rMsg = await exception2Result(async () => {
                 const msg = this.msgP.ende.decode(await top_uint8(event.data));
@@ -69,10 +25,24 @@ export class WSConnection extends MsgRawConnectionBase {
                 return;
             }
             const msg = rMsg.Ok();
-            this.waitForTid.resolve(msg);
+            const waitFor = this.waitForTid.get(msg.tid);
             Array.from(__classPrivateFieldGet(this, _WSConnection_onMsg, "f").values()).forEach((cb) => {
                 cb(msg);
             });
+            if (waitFor) {
+                if (MsgIsError(msg)) {
+                    this.waitForTid.delete(msg.tid);
+                    waitFor.future.resolve(msg);
+                }
+                else if (waitFor.waitFor(msg)) {
+                    this.waitForTid.delete(msg.tid);
+                    waitFor.future.resolve(msg);
+                }
+                else {
+                    this.waitForTid.delete(msg.tid);
+                    waitFor.future.resolve(msg);
+                }
+            }
         });
         this.activeBinds = new Map();
         this.id = sthis.nextId().str;
@@ -89,7 +59,7 @@ export class WSConnection extends MsgRawConnectionBase {
         }, this.msgP.timeout);
         this.ws.onopen = () => {
             onOpenFuture.resolve(Result.Ok(undefined));
-            this.isReady = true;
+            this.opened = true;
         };
         this.ws.onerror = (ierr) => {
             const err = this.logger.Error().Err(ierr).Msg("WS Error").AsError();
@@ -98,13 +68,13 @@ export class WSConnection extends MsgRawConnectionBase {
             this.toMsg(res);
         };
         this.ws.onmessage = (evt) => {
-            if (!this.isReady) {
+            if (!this.opened) {
                 this.toMsg(buildErrorMsg(this, {}, this.logger.Error().Msg("Received message before onOpen").AsError()));
             }
             __classPrivateFieldGet(this, _WSConnection_wsOnMessage, "f").call(this, evt);
         };
         this.ws.onclose = () => {
-            this.isReady = false;
+            this.opened = false;
             this.close().catch((ierr) => {
                 const err = this.logger.Error().Err(ierr).Msg("close error").AsError();
                 onOpenFuture.resolve(Result.Err(err));
@@ -151,7 +121,6 @@ export class WSConnection extends MsgRawConnectionBase {
                 msg: req,
                 opts,
             },
-            controller: undefined,
         };
         this.activeBinds.set(state.id, state);
         return new ReadableStream({
@@ -159,27 +128,21 @@ export class WSConnection extends MsgRawConnectionBase {
                 this.activeBinds.delete(state.id);
             },
             start: (controller) => {
-                state.controller = controller;
                 this.onMsg((msg) => {
-                    try {
-                        if (MsgIsError(msg)) {
-                            controller.enqueue(msg);
-                            return;
-                        }
-                        if (!opts.waitFor) {
-                            controller.enqueue(msg);
-                        }
-                        else if (opts.waitFor(msg)) {
-                            controller.enqueue(msg);
-                        }
+                    if (MsgIsError(msg)) {
+                        controller.enqueue(msg);
+                        return;
                     }
-                    catch (err) {
-                        this.logger.Error().Err(err).Any({ msg }).Msg("Error in onMsg callback[ignored]");
+                    if (!MsgIsTid(msg, req.tid)) {
+                        return;
+                    }
+                    if (opts.waitFor && opts.waitFor(msg)) {
+                        controller.enqueue(msg);
                     }
                 });
                 this.send(req);
                 const future = new Future();
-                this.waitForTid.start(this.sthis, this.logger, { tid: req.tid, future, waitFor: opts.waitFor });
+                this.waitForTid.set(req.tid, { tid: req.tid, future, waitFor: opts.waitFor, timeout: opts.timeout });
                 future.asPromise().then((msg) => {
                     if (MsgIsError(msg)) {
                         controller.enqueue(msg);
@@ -190,13 +153,11 @@ export class WSConnection extends MsgRawConnectionBase {
         });
     }
     async request(req, opts) {
+        if (!this.opened) {
+            return buildErrorMsg(this, req, this.logger.Error().Msg("Connection not open").AsError());
+        }
         const future = new Future();
-        this.waitForTid.start(this.sthis, this.logger, {
-            tid: req.tid,
-            future,
-            waitFor: opts.waitFor,
-            timeout: opts.timeout ?? DefaultRoundTripTime,
-        });
+        this.waitForTid.set(req.tid, { tid: req.tid, future, waitFor: opts.waitFor, timeout: opts.timeout });
         await this.send(req);
         return future.asPromise();
     }