wip

Author: mabels

cloud/backend/base/ws-sockets.test.ts

@@ -1,13 +1,13 @@
-import { sleep } from "@fireproof/core-runtime";
 import * as ps from "@fireproof/core-types-protocols-cloud";
 import { Msger } from "@fireproof/core-protocols-cloud";
 import { testSuperThis } from "@fireproof/cloud-base";
-import { Future, URI } from "@adviser/cement";
+import { Future, URI, sleep } from "@adviser/cement";
 import { describe, beforeAll, afterAll, it, expect, assert } from "vitest";
 import { mockJWK, MockJWK } from "./test-helper.js";
 
 const { MsgIsResChat, buildReqChat } = ps;
 
+
 describe("test multiple connections", () => {
   const sthis = testSuperThis();
   const fpUrl = URI.from(sthis.env.get("FP_ENDPOINT"));

cloud/connector/base/fpcc-protocol.ts

@@ -20,18 +20,37 @@ import {
   isFPCCReqWaitConnectorReady,
   validateFPCCMessage,
 } from "./protocol-fp-cloud-conn.js";
-import { Logger, OnFunc } from "@adviser/cement";
+import { Logger, OnFunc, Result } from "@adviser/cement";
 import { ensureLogger } from "@fireproof/core-runtime";
 import { SuperThis } from "@fireproof/core-types-base";
 
+export interface JustReady {
+  readonly type: "ready";
+}
+
+export interface PeerReady {
+  readonly type: "peer";
+  readonly peer: string;
+}
+
+export function isJustReady(obj: unknown): obj is JustReady {
+  return typeof obj === "object" && obj !== null && (obj as JustReady).type === "ready";
+}
+
+export function isPeerReady(obj: unknown): obj is PeerReady {
+  return typeof obj === "object" && obj !== null && (obj as PeerReady).type === "peer" && typeof (obj as PeerReady).peer === "string";
+}
+
+export type Ready = JustReady | PeerReady;
+
 export interface FPCCProtocol {
   // handle must be this bound method
   hash: () => string;
 
   sendMessage<T extends FPCCMsgBase>(event: FPCCSendMessage<T>, srcEvent: MessageEvent<unknown>): void;
   handleError: (error: unknown) => void;
   injectSend(send: (evt: FPCCMessage, srcEvent: MessageEvent<unknown> | string) => FPCCMessage): void;
-  ready(): Promise<FPCCProtocol>;
+  ready(): Promise<Result<Ready>>;
   stop(): void;
 }
 
@@ -143,9 +162,10 @@ export class FPCCProtocolBase implements FPCCProtocol {
     throw new Error("Method not implemented.");
   };
 
-  ready(): Promise<FPCCProtocol> {
-
-    return Promise.resolve(this);
+  ready(): Promise<Result<Ready>> {
+    return Promise.resolve(Result.Ok({
+      type: "ready" as const,
+    }))
   }
 
   injectSend(sendFn: (msg: FPCCMessage, srcEvent: MessageEvent<unknown> | string) => FPCCMessage): void {

cloud/connector/base/package.json

@@ -30,7 +30,7 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.58",
+    "@adviser/cement": "^0.4.62",
     "@fireproof/core-runtime": "workspace:*",
     "@fireproof/core-types-base": "workspace:*",
     "@fireproof/core-types-protocols-cloud": "workspace:*",

cloud/connector/iframe/package.json

@@ -31,7 +31,7 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.58",
+    "@adviser/cement": "^0.4.62",
     "@clerk/clerk-js": "^5.102.0",
     "@fireproof/cloud-connector-base": "workspace:*",
     "@fireproof/core-protocols-dashboard": "workspace:*",

cloud/connector/page/package.json

@@ -31,7 +31,7 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.58",
+    "@adviser/cement": "^0.4.62",
     "@fireproof/cloud-connector-base": "workspace:*",
     "@fireproof/core-runtime": "workspace:*",
     "@fireproof/core-types-base": "workspace:*",