@fireproof/core 0.20.5-dev-preview-7 → 0.20.5-dev-preview-8

package/react/use-attach.js

@@ -1,75 +1,175 @@
-import { falsyToUndef } from "@fireproof/core";
+import { ensureSuperThis, hashString, rt } from "@fireproof/core";
 import { useEffect, useState } from "react";
+import { exception2Result, KeyedResolvOnce, ResolveOnce } from "@adviser/cement";
+import { decodeJwt } from "jose/jwt/decode";
 export const WebCtx = "webCtx";
 class WebCtxImpl {
     constructor(opts) {
-        this.dashboardURI = opts.dashboardURI || "https://dev.connect.fireproof.direct/fp/cloud/api/token";
-        this.uiURI = opts.uiURI || "https://dev.connect.fireproof.direct/api";
-        this.tokenKey = opts.tokenKey || "fpToken";
+        this.onActions = new Set();
+        this.myTokenChange = new ResolveOnce();
+        this._tokenAndClaims = new ResolveOnce();
+        this.dashboardURI = opts.dashboardURI ?? "https://dev.connect.fireproof.direct/fp/cloud/api/token";
+        this.tokenApiURI = opts.tokenApiURI ?? "https://dev.connect.fireproof.direct/api";
+        this.tokenParam = opts.tokenParam ?? "fpToken";
+        this.sthis = opts.sthis ?? ensureSuperThis();
+        this.keyBag = opts.keyBag;
         this.opts = opts;
     }
+    async ready(db) {
+        this.dbId = await db.ledger.refId();
+        this.keyBag = this.keyBag ?? (await db.ledger.opts.keyBag.getBagProvider());
+    }
+    async onAction(token) {
+        for (const action of this.onActions.values()) {
+            action(token);
+        }
+    }
     onTokenChange(on) {
         if (this.opts.onTokenChange) {
             return this.opts.onTokenChange(on);
         }
-        this.onAction = on;
+        this.onActions.add(on);
+        return () => {
+            this.onActions.delete(on);
+        };
     }
-    token() {
+    async token() {
         if (this.opts.token) {
             return this.opts.token();
         }
-        return falsyToUndef(localStorage.getItem(this.tokenKey));
+        return this._tokenAndClaims.once(async () => {
+            const ret = await this.keyBag?.get(`${this.dbId}/urlToken`);
+            if (!ret) {
+                return;
+            }
+            let token;
+            if (rt.isV1StorageKeyItem(ret)) {
+                token = ret.key;
+            }
+            else if (rt.isKeysItem(ret)) {
+                token = ret.keys[this.tokenParam].key;
+            }
+            else {
+                return undefined;
+            }
+            const claims = decodeJwt(token);
+            return {
+                token,
+                claims,
+            };
+        });
     }
-    resetToken() {
+    async resetToken() {
         if (this.opts.resetToken) {
-            this.opts.resetToken();
-        }
-        else {
-            localStorage.removeItem(this.tokenKey);
+            return this.opts.resetToken();
         }
-        this.onAction?.();
+        await this.keyBag?.del(`${this.dbId}/urlToken`);
+        this.onAction();
     }
-    setToken(token) {
-        const oldToken = this.token();
+    async setToken(token) {
         if (this.opts.setToken) {
-            this.opts.setToken(token);
+            return this.opts.setToken(token);
         }
-        else {
-            localStorage.setItem(this.tokenKey, token);
-        }
-        if (oldToken !== token) {
-            this.onAction?.(token);
+        const oldToken = await this.token();
+        if (oldToken?.token !== token.token) {
+            this._tokenAndClaims.reset();
+            this._tokenAndClaims.once(() => token);
+            await this.keyBag?.set({
+                name: `${this.dbId}/urlToken`,
+                keys: {
+                    [this.tokenParam]: {
+                        key: token.token,
+                        fingerPrint: await hashString(token.token),
+                        default: false,
+                    },
+                },
+            });
+            this.onAction(token);
         }
     }
 }
 export function defaultWebToCloudOpts(opts) {
     return new WebCtxImpl(opts);
 }
-export function useAttach(database, config) {
-    const [attachState, setAttachState] = useState({ state: "initial" });
+const nonAttachedCtx = {
+    token: undefined,
+    reset: () => {
+    },
+};
+let pCnt = 0;
+let caCnt = 0;
+const prepareWebctxs = new KeyedResolvOnce();
+export function createAttach(database, config) {
+    caCnt++;
+    if (caCnt > 1)
+        console.log("enter-createAttach", caCnt);
+    const [attachState, setAttachState] = useState({ state: "initial", ctx: nonAttachedCtx });
     useEffect(() => {
-        if (config.attach && attachState.state === "initial") {
-            setAttachState({ state: "attaching" });
-            database
-                .attach(config.attach)
-                .then((a) => {
-                a
-                    .ctx()
-                    .get(WebCtx)
-                    ?.onTokenChange((token) => {
-                    if (!token) {
-                        setAttachState({ state: "initial" });
-                        return;
+        database.ledger.refId().then((dbId) => {
+            prepareWebctxs.get(dbId).once(() => {
+                if (config.attach && attachState.state === "initial") {
+                    const id = database.sthis.nextId().str;
+                    setAttachState({ state: "attaching", ctx: nonAttachedCtx });
+                    async function prepareWebctx(attachable) {
+                        console.log("1-prepareWebctx", id);
+                        const webCtx = attachable.opts.context.get(WebCtx);
+                        if (!webCtx) {
+                            throw database.logger.Error().Msg("WebCtx not found").AsError();
+                        }
+                        await webCtx.ready(database);
+                        console.log("2-prepareWebctx", id);
+                        webCtx.onTokenChange((token) => {
+                            console.log("2.a-webctx-onTokenChange", id, token);
+                            if (!token) {
+                                setAttachState({ state: "initial", ctx: nonAttachedCtx });
+                                return;
+                            }
+                            setAttachState((prev) => {
+                                return {
+                                    ...prev,
+                                    ctx: {
+                                        tokenAndClaims: token,
+                                        reset: () => {
+                                            console.log("2.b-webctx-onTokenChange-reset", id);
+                                        },
+                                    },
+                                };
+                            });
+                        });
+                        const rAttached = await exception2Result(async () => {
+                            console.log("2.a-prepareWebctx", id);
+                            const ret = await database.attach(attachable);
+                            console.log("2.b-prepareWebctx", id);
+                            return ret;
+                        });
+                        console.log("3-prepareWebctx", id);
+                        if (rAttached.isErr()) {
+                            database.logger.Error().Err(rAttached).Msg("attach error");
+                            setAttachState({ state: "error", error: rAttached.Err(), ctx: nonAttachedCtx });
+                        }
+                        const attached = rAttached.Ok();
+                        setAttachState({
+                            state: "attached",
+                            attached,
+                            ctx: nonAttachedCtx,
+                        });
                     }
-                });
-                setAttachState({ state: "attached", attached: a });
-            })
-                .catch((err) => {
-                database.logger.Error().Err(err).Msg("attach error");
-                setAttachState({ state: "error", error: err });
+                    prepareWebctx(config.attach)
+                        .catch((e) => {
+                        console.error("attach error", e, id);
+                    })
+                        .then(() => {
+                        console.log("prepareWebctx-done", id);
+                    })
+                        .finally(() => {
+                        console.log("leave-prepareWebctx", --pCnt, id);
+                    });
+                }
             });
-        }
-    }, [database, config.attach, attachState]);
+        });
+    }, [database, config.attach, attachState.state]);
+    if (--caCnt)
+        console.log("leave-createAttach", caCnt);
     return attachState;
 }
 //# sourceMappingURL=use-attach.js.map

package/react/use-attach.js.map

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

package/react/use-fireproof.js

@@ -1,7 +1,7 @@
 import { toSortedArray } from "@adviser/cement/utils";
 import { fireproof } from "@fireproof/core";
 import { useMemo } from "react";
-import { useAttach } from "./use-attach.js";
+import { createAttach } from "./use-attach.js";
 import { createUseAllDocs } from "./use-all-docs.js";
 import { createUseChanges } from "./use-changes.js";
 import { createUseDocument } from "./use-document.js";
@@ -10,7 +10,7 @@ export const FireproofCtx = {};
 export function useFireproof(name = "useFireproof", config = {}) {
     const strConfig = JSON.stringify(toSortedArray(config));
     const database = useMemo(() => (typeof name === "string" ? fireproof(name, config) : name), [name, strConfig]);
-    const attach = useAttach(database, config);
+    const attach = createAttach(database, config);
     const useDocument = useMemo(() => createUseDocument(database), [database.name, strConfig]);
     const useLiveQuery = useMemo(() => createUseLiveQuery(database), [database.name, strConfig]);
     const useAllDocs = useMemo(() => createUseAllDocs(database), [database.name, strConfig]);

package/react/use-fireproof.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-fireproof.js","sourceRoot":"","sources":["../../../../src/react/use-fireproof.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAY,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAKzD,MAAM,CAAC,MAAM,YAAY,GAAG,EAAkB,CAAC;AAgB/C,MAAM,UAAU,YAAY,CAAC,OAA0B,cAAc,EAAE,SAAsB,EAAE;IAC7F,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC/G,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3F,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACzF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAEzF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AACjF,CAAC"}
+{"version":3,"file":"use-fireproof.js","sourceRoot":"","sources":["../../../../src/react/use-fireproof.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAY,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAKzD,MAAM,CAAC,MAAM,YAAY,GAAG,EAAkB,CAAC;AAgB/C,MAAM,UAAU,YAAY,CAAC,OAA0B,cAAc,EAAE,SAAsB,EAAE;IAC7F,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC/G,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE9C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3F,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACzF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAEzF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AACjF,CAAC"}

package/runtime/gateways/cloud/to-cloud.d.ts

@@ -1,9 +1,10 @@
 import { CoerceURI, Logger, URI, AppContext } from "@adviser/cement";
-import { Attachable } from "@fireproof/core";
+import { FPCloudClaim } from "../../../protocols/cloud/msg-types.js";
+import { Attachable, SuperThis } from "../../../types.js";
 export interface TokenStrategie {
-    open(logger: Logger, deviceId: string, opts: ToCloudOpts): void;
-    gatherToken(logger: Logger, opts: ToCloudOpts): Promise<string | undefined>;
-    waitForToken(logger: Logger, deviceId: string, opts: ToCloudOpts): Promise<string | undefined>;
+    open(sthis: SuperThis, logger: Logger, deviceId: string, opts: ToCloudOpts): void;
+    tryToken(sthis: SuperThis, logger: Logger, opts: ToCloudOpts): Promise<TokenAndClaims | undefined>;
+    waitForToken(sthis: SuperThis, logger: Logger, deviceId: string, opts: ToCloudOpts): Promise<TokenAndClaims | undefined>;
 }
 export declare const ToCloudName = "toCloud";
 export interface FPCloudRef {
@@ -12,11 +13,15 @@ export interface FPCloudRef {
     readonly file: CoerceURI;
     readonly meta: CoerceURI;
 }
+export interface TokenAndClaimsEvents {
+    changed(token?: TokenAndClaims): Promise<void>;
+}
 interface ToCloudBase {
     readonly name: string;
     readonly interval: number;
     readonly refreshTokenPreset: number;
     readonly context: AppContext;
+    readonly events: TokenAndClaimsEvents;
     readonly tenant?: string;
     readonly ledger?: string;
 }
@@ -25,7 +30,7 @@ export interface ToCloudRequiredOpts {
     readonly strategy: TokenStrategie;
 }
 export type ToCloudOpts = ToCloudRequiredOpts & ToCloudBase;
-export type ToCloudOptionalOpts = ToCloudRequiredOpts & Partial<ToCloudBase>;
+export type ToCloudOptionalOpts = Partial<ToCloudBase> & ToCloudRequiredOpts;
 export interface FPCloudUri {
     readonly car: URI;
     readonly file: URI;
@@ -33,14 +38,19 @@ export interface FPCloudUri {
 }
 export interface ToCloudAttachable extends Attachable {
     token?: string;
+    readonly opts: ToCloudOpts;
+}
+export interface TokenAndClaims {
+    readonly token: string;
+    readonly claims: FPCloudClaim;
 }
-export declare function toCloud(iopts: ToCloudOptionalOpts): ToCloudAttachable;
+export declare function toCloud(iopts: Partial<ToCloudBase> & ToCloudRequiredOpts): ToCloudAttachable;
 export declare class SimpleTokenStrategy implements TokenStrategie {
-    private jwk;
+    private tc;
     constructor(jwk: string);
     open(): void;
-    gatherToken(): Promise<string | undefined>;
-    waitForToken(): Promise<string | undefined>;
+    tryToken(): Promise<TokenAndClaims | undefined>;
+    waitForToken(): Promise<TokenAndClaims | undefined>;
 }
 export {};
 //# sourceMappingURL=to-cloud.d.ts.map

package/runtime/gateways/cloud/to-cloud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"to-cloud.d.ts","sourceRoot":"","sources":["../../../../../../src/runtime/gateways/cloud/to-cloud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,EAAe,GAAG,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAwC,MAAM,iBAAiB,CAAC;AAGnF,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IAChE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5E,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAChG;AAED,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;CACnC;AAED,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,WAAW,CAAC;AAE5D,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAE7E,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;CACpB;AA+BD,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA4KD,wBAAgB,OAAO,CAAC,KAAK,EAAE,mBAAmB,GAAG,iBAAiB,CAGrE;AAED,qBAAa,mBAAoB,YAAW,cAAc;IACxD,OAAO,CAAC,GAAG,CAAS;gBACR,GAAG,EAAE,MAAM;IAGvB,IAAI,IAAI,IAAI;IAIN,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI1C,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAIlD"}
+{"version":3,"file":"to-cloud.d.ts","sourceRoot":"","sources":["../../../../../../src/runtime/gateways/cloud/to-cloud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,EAAe,GAAG,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAU,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAIlE,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IAClF,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IACnG,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;CAC1H;AAED,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,KAAK,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;CAInC;AAED,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,WAAW,CAAC;AAE5D,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC;AAE7E,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;CACpB;AAoCD,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;CAC5B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;CAK/B;AAmKD,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,mBAAmB,GAAG,iBAAiB,CAa5F;AAED,qBAAa,mBAAoB,YAAW,cAAc;IACxD,OAAO,CAAC,EAAE,CAAiB;gBACf,GAAG,EAAE,MAAM;IAMvB,IAAI,IAAI,IAAI;IAIN,QAAQ,IAAI,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAI/C,YAAY,IAAI,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;CAI1D"}

package/runtime/gateways/cloud/to-cloud.js

@@ -1,6 +1,7 @@
 import { BuildURI, ResolveOnce, AppContext } from "@adviser/cement";
-import { bs, ensureLogger, hashObject } from "@fireproof/core";
 import { decodeJwt } from "jose/jwt/decode";
+import { ensureLogger, hashObject } from "../../../utils.js";
+import { URIInterceptor } from "../../../blockstore/uri-interceptor.js";
 export const ToCloudName = "toCloud";
 function addTenantAndLedger(opts, uri) {
     const buri = BuildURI.from(uri);
@@ -24,20 +25,20 @@ function defaultOpts(opts) {
         interval: 1000,
         refreshTokenPreset: 2 * 60 * 1000,
         ...opts,
+        events: opts.events ?? {
+            changed: async () => {
+            },
+        },
         context: opts.context ?? new AppContext(),
         urls: param,
     };
     return defOpts;
 }
-function toTokenAndClaims(token) {
-    const claims = decodeJwt(token);
-    return {
-        token,
-        claims: {
-            ...claims,
-            exp: claims.exp || 0,
-        },
-    };
+function definedExp(exp) {
+    if (typeof exp === "number") {
+        return exp;
+    }
+    return new Date().getTime();
 }
 class TokenObserver {
     constructor(opts) {
@@ -50,43 +51,41 @@ class TokenObserver {
     async stop() {
         return;
     }
-    async getToken(logger, ledger) {
-        const tc = await this._token.once(async () => {
-            const token = await this.opts.strategy.gatherToken(logger, this.opts);
+    async refreshToken(logger, ledger) {
+        let token = await this.opts.strategy.tryToken(ledger.sthis, logger, this.opts);
+        if (!token) {
+            logger.Debug().Msg("waiting for token");
+            this.opts.strategy.open(ledger.sthis, logger, ledger.name, this.opts);
+            token = await this.opts.strategy.waitForToken(ledger.sthis, logger, ledger.name, this.opts);
             if (!token) {
-                logger.Debug().Msg("waiting for token");
-                this.opts.strategy.open(logger, ledger.name, this.opts);
-                const token = await this.opts.strategy.waitForToken(logger, ledger.name, this.opts);
-                if (!token) {
-                    throw new Error("Token not found");
-                }
-                return toTokenAndClaims(token);
+                throw new Error("Token not found");
             }
-            const tc = toTokenAndClaims(token);
-            if (!this.currentToken) {
-                logger
-                    .Debug()
-                    .Any({ tc, diff: new Date().getTime() - tc.claims.exp })
-                    .Msg("set current token");
-                this.currentToken = tc;
-            }
-            const now = new Date().getTime();
-            if (this.currentToken?.claims.exp - this.opts.refreshTokenPreset < now) {
-                logger.Debug().Any(tc.claims).Msg("token expired");
-                this.opts.strategy.open(logger, ledger.name, this.opts);
-                const token = await this.opts.strategy.waitForToken(logger, ledger.name, this.opts);
-                if (!token) {
-                    throw new Error("Token not found");
-                }
-                return toTokenAndClaims(token);
-            }
-            return tc;
-        });
-        return tc;
+        }
+        return token;
+    }
+    async getToken(logger, ledger) {
+        const now = new Date().getTime();
+        let activeTokenAndClaim = this.currentTokenAndClaim;
+        if (!this.currentTokenAndClaim || definedExp(this.currentTokenAndClaim.claims.exp) - this.opts.refreshTokenPreset < now) {
+            await this.opts.events?.changed(undefined);
+            logger
+                .Debug()
+                .Any({ claims: this.currentTokenAndClaim?.claims, now, exp: definedExp(this.currentTokenAndClaim?.claims.exp) })
+                .Msg("refresh token");
+            activeTokenAndClaim = await this.refreshToken(logger, ledger);
+        }
+        if (activeTokenAndClaim && activeTokenAndClaim.token !== this.currentTokenAndClaim?.token) {
+            this.currentTokenAndClaim = activeTokenAndClaim;
+            await this.opts.events?.changed(activeTokenAndClaim);
+        }
+        if (this.currentTokenAndClaim) {
+            return this.currentTokenAndClaim;
+        }
+        throw logger.Error().Msg("Token not found").AsError();
     }
-    reset() {
-        this._token.reset();
-        this.currentToken = undefined;
+    async reset() {
+        this.currentTokenAndClaim = undefined;
+        await this.opts.events?.changed(undefined);
         return;
     }
 }
@@ -111,22 +110,22 @@ class ToCloud {
         const logger = ensureLogger(ledger.sthis, "ToCloud").SetDebug("ToCloud");
         this._tokenObserver = new TokenObserver(this.opts);
         await this._tokenObserver.start();
-        const gatewayInterceptor = bs.URIInterceptor.withMapper(async (uri) => {
+        const gatewayInterceptor = URIInterceptor.withMapper(async (uri) => {
             const token = await this._tokenObserver.getToken(logger, ledger);
             const buri = BuildURI.from(uri).setParam("authJWK", token.token);
-            if (this.opts.tenant) {
-                buri.setParam("tenant", this.opts.tenant);
+            if (token.claims.selected.tenant) {
+                buri.setParam("tenant", token.claims.selected.tenant);
             }
-            if (this.opts.ledger) {
-                buri.setParam("ledger", this.opts.ledger);
+            else if (this.opts.tenant) {
+                buri.setParam("tenant", this.opts.tenant);
             }
-            if (token.claims.tenant && !buri.hasParam("tenant")) {
-                buri.setParam("tenant", token.claims.tenant);
+            if (token.claims.selected.ledger) {
+                buri.setParam("ledger", token.claims.selected.ledger);
             }
-            if (token.claims.ledger && !buri.hasParam("ledger")) {
-                buri.setParam("ledger", token.claims.ledger);
+            else if (this.opts.ledger) {
+                buri.setParam("ledger", this.opts.ledger);
             }
-            return uri.build().setParam("authJWK", token.token).URI();
+            return buri.URI();
         });
         return {
             car: { url: this.opts.urls.car, gatewayInterceptor },
@@ -140,20 +139,32 @@ class ToCloud {
     }
 }
 export function toCloud(iopts) {
-    return new ToCloud(iopts);
+    return new ToCloud({
+        ...iopts,
+        urls: iopts.urls ?? {},
+        events: iopts.events ?? {
+            changed: async () => {
+            },
+        },
+        context: iopts.context ?? new AppContext(),
+        strategy: iopts.strategy,
+    });
 }
 export class SimpleTokenStrategy {
     constructor(jwk) {
-        this.jwk = jwk;
+        this.tc = {
+            token: jwk,
+            claims: decodeJwt(jwk),
+        };
     }
     open() {
         return;
     }
-    async gatherToken() {
-        return this.jwk;
+    async tryToken() {
+        return this.tc;
     }
     async waitForToken() {
-        return this.jwk;
+        return this.tc;
     }
 }
 //# sourceMappingURL=to-cloud.js.map

package/runtime/gateways/cloud/to-cloud.js.map

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

package/runtime/gateways/file/key-bag-file.d.ts

@@ -12,6 +12,7 @@ export declare class KeyBagProviderFile implements KeyBagProvider {
     readonly logger: Logger;
     readonly sthis: SuperThis;
     constructor(url: URI, sthis: SuperThis);
+    del(id: string): Promise<void>;
     get(id: string): Promise<V1StorageKeyItem | KeysItem | undefined>;
     set(item: KeysItem): Promise<void>;
 }

package/runtime/gateways/file/key-bag-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"key-bag-file.d.ts","sourceRoot":"","sources":["../../../../../../src/runtime/gateways/file/key-bag-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAI9E,UAAU,SAAS;IACjB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,kBAAmB,YAAW,cAAc;IACjD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAY9C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;gBACd,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS;IAMhC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,QAAQ,GAAG,SAAS,CAAC;IAcjE,GAAG,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAKzC"}
+{"version":3,"file":"key-bag-file.d.ts","sourceRoot":"","sources":["../../../../../../src/runtime/gateways/file/key-bag-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAI9E,UAAU,SAAS;IACjB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,kBAAmB,YAAW,cAAc;IACjD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAY9C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;gBACd,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS;IAMhC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,QAAQ,GAAG,SAAS,CAAC;IAcjE,GAAG,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAKzC"}

package/runtime/gateways/file/key-bag-file.js

@@ -17,6 +17,18 @@ export class KeyBagProviderFile {
         this.sthis = sthis;
         this.logger = sthis.logger;
     }
+    async del(id) {
+        const ctx = await this._prepare(id);
+        try {
+            await ctx.sysFS.unlink(ctx.fName);
+        }
+        catch (e) {
+            if (isNotFoundError(e)) {
+                return;
+            }
+            throw this.logger.Error().Err(e).Any("file", ctx).Msg("delete bag failed").AsError();
+        }
+    }
     async get(id) {
         const ctx = await this._prepare(id);
         try {

package/runtime/gateways/file/key-bag-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"key-bag-file.js","sourceRoot":"","sources":["../../../../../../src/runtime/gateways/file/key-bag-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAQpE,MAAM,OAAO,kBAAkB;IAC7B,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClC,MAAM,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,OAAO;YACL,OAAO;YACP,KAAK;YACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC;SACpF,CAAC;IACJ,CAAC;IAKD,YAAY,GAAQ,EAAE,KAAgB;QACpC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAU;QAClB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC9C,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvB,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,CAAC;QACrF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAc;QACtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/D,MAAM,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC;CACF"}
+{"version":3,"file":"key-bag-file.js","sourceRoot":"","sources":["../../../../../../src/runtime/gateways/file/key-bag-file.ts"],"names":[],"mappings":"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"}