wip[skip ci]

Author: mabels

cloud/3rd-party/src/App.tsx

@@ -5,7 +5,6 @@ import "./App.css";
 // import { URI } from "@adviser/cement";
 
 function App() {
-
   const { database, attach } = useFireproof("fireproof-5-party", {
     attach: toCloud({
       strategy: FPCloudConnectStrategy({

cloud/3rd-party/src/main.tsx

@@ -3,7 +3,7 @@ import { createRoot } from "react-dom/client";
 import "./index.css";
 import App from "./App.jsx";
 
-console.log("i'm in main.tsx")
+console.log("i'm in main.tsx");
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 createRoot(document.getElementById("root")!).render(
   <StrictMode>

cloud/3rd-party/src/overlayHtml.tsx

@@ -1,9 +1,6 @@
 import { jsx } from "use-fireproof";
 
-const {
-  renderToString,
-  React 
-} = jsx
+const { renderToString, React } = jsx;
 
 // function jsxDEV(...args: unknown[]) {
 //   // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -7,7 +7,6 @@ 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

@@ -38,7 +38,9 @@ export function isJustReady(obj: unknown): obj is JustReady {
 }
 
 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";
+  return (
+    typeof obj === "object" && obj !== null && (obj as PeerReady).type === "peer" && typeof (obj as PeerReady).peer === "string"
+  );
 }
 
 export type Ready = JustReady | PeerReady;
@@ -63,26 +65,27 @@ export class FPCCProtocolBase implements FPCCProtocol {
   readonly onMessage = OnFunc<(event: MessageEvent<unknown>) => void>();
   readonly onFPCCMessage = OnFunc<(msg: FPCCMessage, srcEvent: MessageEvent<unknown>) => void>();
 
-  readonly onFPCCEvtNeedsLogin = OnFunc<(msg: FPCCEvtNeedsLogin, srcEvent: MessageEvent<unknown>) => void>()
+  readonly onFPCCEvtNeedsLogin = OnFunc<(msg: FPCCEvtNeedsLogin, srcEvent: MessageEvent<unknown>) => void>();
   readonly onFPCCError = OnFunc<(msg: FPCCError, srcEvent: MessageEvent<unknown>) => void>();
-  readonly onFPCCReqRegisterLocalDbName = OnFunc<(msg: FPCCReqRegisterLocalDbName, srcEvent: MessageEvent<unknown>) => void>()
-  readonly onFPCCEvtApp = OnFunc<(msg: FPCCEvtApp, srcEvent: MessageEvent<unknown>) => void>()  
+  readonly onFPCCReqRegisterLocalDbName = OnFunc<(msg: FPCCReqRegisterLocalDbName, srcEvent: MessageEvent<unknown>) => void>();
+  readonly onFPCCEvtApp = OnFunc<(msg: FPCCEvtApp, srcEvent: MessageEvent<unknown>) => void>();
   readonly onFPCCPing = OnFunc<(msg: FPCCPing, srcEvent: MessageEvent<unknown>) => void>();
-  readonly onFPCCPong = OnFunc<(msg: FPCCPong, srcEvent: MessageEvent<unknown>) => void>()
+  readonly onFPCCPong = OnFunc<(msg: FPCCPong, srcEvent: MessageEvent<unknown>) => void>();
   readonly onFPCCEvtConnectorReady = OnFunc<(msg: FPCCEvtConnectorReady, srcEvent: MessageEvent<unknown>) => void>();
-  readonly onFPCCReqWaitConnectorReady = OnFunc<(msg: FPCCReqWaitConnectorReady, srcEvent: MessageEvent<unknown>) => void>(); 
+  readonly onFPCCReqWaitConnectorReady = OnFunc<(msg: FPCCReqWaitConnectorReady, srcEvent: MessageEvent<unknown>) => void>();
 
   constructor(sthis: SuperThis, logger?: Logger) {
     this.sthis = sthis;
     this.logger = logger || ensureLogger(sthis, "FPCCProtocolBase");
-    this.onMessage(event => {
+    this.onMessage((event) => {
       this.handleMessage(event);
     });
     this.onFPCCMessage((msg, srcEvent) => {
       this.#handleFPCCMessage(msg, srcEvent);
-    })
+    });
     this.onFPCCPing((msg, srcEvent) => {
-      this.sendMessage<FPCCPong>({
+      this.sendMessage<FPCCPong>(
+        {
           src: msg.dst,
           dst: msg.src,
           pingTid: msg.tid,
@@ -114,7 +117,6 @@ export class FPCCProtocolBase implements FPCCProtocol {
   #handleFPCCMessage(event: FPCCMessage, srcEvent: MessageEvent<unknown>) {
     this.logger.Debug().Any("event", event).Msg("Handling FPCC message");
     switch (true) {
-
       case isFPCCEvtNeedsLogin(event): {
         this.onFPCCEvtNeedsLogin.invoke(event, srcEvent);
         break;
@@ -154,7 +156,6 @@ export class FPCCProtocolBase implements FPCCProtocol {
         this.onFPCCReqWaitConnectorReady.invoke(event, srcEvent);
         break;
       }
-
     }
   }
 
@@ -163,9 +164,11 @@ export class FPCCProtocolBase implements FPCCProtocol {
   };
 
   ready(): Promise<Result<Ready>> {
-    return Promise.resolve(Result.Ok({
-      type: "ready" as const,
-    }))
+    return Promise.resolve(
+      Result.Ok({
+        type: "ready" as const,
+      }),
+    );
   }
 
   injectSend(sendFn: (msg: FPCCMessage, srcEvent: MessageEvent<unknown> | string) => FPCCMessage): void {

cloud/connector/base/index.ts

@@ -1,21 +1,27 @@
+import { hashObjectSync } from "@fireproof/core-runtime";
+import { FPCCReqRegisterLocalDbName } from "./protocol-fp-cloud-conn.js";
+
 export * from "./convert-to-token-and-claims.js";
 export * from "./fpcc-protocol.js";
 export * from "./post-messager.js";
 export * from "./protocol-fp-cloud-conn.js";
 
-export interface DbKey {
-  readonly appId: string;
-  readonly dbName: string;
-}
+// export interface DbKey {
+//   readonly appId: string;
+//   readonly dbName: string;
+// }
 
-export function dbAppKey(o: DbKey): string {
-  return o.appId + ":" + o.dbName;
+export function dbAppKey(o: FPCCReqRegisterLocalDbName): string {
+  return hashObjectSync(o);
+  //o.appId + ":" + o.dbName;
 }
 
-export function isInIframe(win: {
-  readonly self: Window | null;
-  readonly top: Window | null;
-} = window): boolean {
+export function isInIframe(
+  win: {
+    readonly self: Window | null;
+    readonly top: Window | null;
+  } = window,
+): boolean {
   try {
     return win.self !== win.top;
   } catch (e) {

cloud/connector/base/package.json

@@ -30,7 +30,7 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.62",
+    "@adviser/cement": "^0.4.63",
     "@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.62",
+    "@adviser/cement": "^0.4.63",
     "@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.62",
+    "@adviser/cement": "^0.4.63",
     "@fireproof/cloud-connector-base": "workspace:*",
     "@fireproof/core-runtime": "workspace:*",
     "@fireproof/core-types-base": "workspace:*",

cloud/connector/page/page-handler.ts

@@ -48,7 +48,7 @@ export function initializeIframe(pageProtocol: FPCCProtocolBase, iframeSrc: stri
   // Add load event listener
   // console.log("Initializing FPCC iframe with src:", iframeHref.toString());
   iframe.addEventListener("load", () => {
-        pageProtocol.injectSend((event: Writable<FPCCMessage>) => {
+    pageProtocol.injectSend((event: Writable<FPCCMessage>) => {
       // console.log("Sending PageFPCCProtocol", event, iframe.src);
       event.dst = iframe.src;
       event.src = window.location.href;