@fireproof/core 0.20.0-dev-preview-57 → 0.20.0-dev-preview-58

package/deno.json

@@ -1,12 +1,12 @@
 {
   "imports": {
     "@fireproof/core": "./index.js",
-    "@adviser/cement": "npm:@adviser/cement@~0.4.3",
+    "@adviser/cement": "npm:@adviser/cement@~0.4.4",
     "@fireproof/vendor": "npm:@fireproof/vendor@~2.0.2",
     "@ipld/car": "npm:@ipld/car@^5.4.0",
     "@ipld/dag-cbor": "npm:@ipld/dag-cbor@^9.2.2",
     "@ipld/dag-json": "npm:@ipld/dag-json@^10.2.3",
-    "cborg": "npm:cborg@^4.2.8",
+    "cborg": "npm:cborg@^4.2.9",
     "jose": "npm:jose@^6.0.10",
     "multiformats": "npm:multiformats@^13.3.2",
     "charwise": "npm:charwise@^3.0.1",

package/index.cjs

@@ -68,6 +68,7 @@ __export(index_exports, {
   ps: () => protocols_exports,
   rt: () => runtime_exports,
   runtime: () => runtime_exports,
+  setPresetEnv: () => setPresetEnv,
   storeType2DataMetaWal: () => storeType2DataMetaWal,
   throwFalsy: () => throwFalsy,
   toSortedArray: () => toSortedArray,
@@ -186,15 +187,21 @@ var SuperThisImpl = class _SuperThisImpl {
     });
   }
 };
-function presetEnv() {
+function presetEnv(ipreset) {
+  let preset = {};
+  if (ipreset instanceof Map) {
+    preset = Object.fromEntries(ipreset.entries());
+  } else if (typeof ipreset === "object" && ipreset !== null) {
+    preset = ipreset;
+  }
   const penv = new Map([
     // ["FP_DEBUG", "xxx"],
     // ["FP_ENV", "development"],
     ...Array.from(
-      Object.entries(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        globalThis[Symbol.for("FP_PRESET_ENV")] || {}
-      )
+      Object.entries({
+        ...setPresetEnv({}),
+        ...preset
+      })
     )
     // .map(([k, v]) => [k, v as string])
   ]);
@@ -231,7 +238,7 @@ function onSuperThis(fn) {
 function ensureSuperThis(osthis) {
   const env = (0, import_cement.envFactory)({
     symbol: osthis?.env?.symbol || "FP_ENV",
-    presetEnv: osthis?.env?.presetEnv || presetEnv()
+    presetEnv: presetEnv(osthis?.env?.presetEnv)
   });
   const ret = new SuperThisImpl({
     logger: osthis?.logger || globalLogger(),
@@ -497,6 +504,14 @@ function ensureURIDefaults(sthis, name, curi, uri, store, ctx) {
   }
   return ret.URI();
 }
+function setPresetEnv(o, symbol = "FP_PRESET_ENV") {
+  const key = Symbol.for(symbol);
+  const env = globalThis[key] ?? {};
+  for (const [k, v] of Object.entries(o)) {
+    env[k] = v;
+  }
+  return env;
+}
 
 // src/write-queue.ts
 var import_cement2 = require("@adviser/cement");
@@ -5335,7 +5350,7 @@ var SessionTokenService = class _SessionTokenService {
       }
     };
   }
-  static async createFromEnv(sp = {}, sthis = ensureSuperThis()) {
+  static async createFromEnv(sthis, sp = {}) {
     let envToken = sthis.env.get(sp.privateEnvKey ?? envKeyDefaults.SECRET);
     if (!envToken) {
       envToken = sthis.env.get(sp.publicEnvKey ?? envKeyDefaults.PUBLIC);
@@ -5745,6 +5760,14 @@ function toHttpProtocol(uri) {
   }
   return toFix.URI();
 }
+function ensurePath(uri, fp) {
+  const path = uri.pathname.replace(/\/$/, "").replace(/^\//, "");
+  const buri = uri.build();
+  if (path === "") {
+    buri.appendRelative(fp);
+  }
+  return buri.toString();
+}
 var HttpConnection = class extends MsgRawConnectionBase {
   constructor(sthis, uris, msgP, exGestalt) {
     super(sthis, exGestalt);
@@ -5833,7 +5856,7 @@ var HttpConnection = class extends MsgRawConnectionBase {
     const rRes = await (0, import_cement23.exception2Result)(
       () => timeout(
         this.msgP.timeout,
-        fetch(url.cleaned.toString(), {
+        fetch(ensurePath(url.cleaned, "fp"), {
           method: "PUT",
           headers: headers.AsHeaderInit(),
           body: rReqBody.Ok()
@@ -6189,11 +6212,12 @@ var Msger = class _Msger {
   static async openWS(sthis, url, msgP, exGestalt) {
     let ws;
     url = url.build().setParam("random", sthis.nextId().str).URI();
+    const wsUrl = ensurePath(url, "ws");
     if ((0, import_cement25.runtimeFn)().isNodeIsh) {
       const { WebSocket: WebSocket2 } = await import("ws");
-      ws = new WebSocket2(url.toString());
+      ws = new WebSocket2(wsUrl);
     } else {
-      ws = new WebSocket(url.toString());
+      ws = new WebSocket(wsUrl);
     }
     return import_cement25.Result.Ok(new WSConnection(sthis, ws, msgP, exGestalt));
   }
@@ -7169,6 +7193,7 @@ __export(cloud_exports, {
   coerceFPStoreTypes: () => coerceFPStoreTypes,
   defaultGestalt: () => defaultGestalt,
   defaultMsgParams: () => defaultMsgParams,
+  ensurePath: () => ensurePath,
   isAuthTypeFPCloud: () => isAuthTypeFPCloud,
   isAuthTypeFPCloudJWK: () => isAuthTypeFPCloudJWK,
   isProtocolCapabilities: () => isProtocolCapabilities,
@@ -7239,6 +7264,6 @@ function buildResDelWAL(msgCtx, req, ctx) {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.0-dev-preview-57": "xxxx"
+  "0.20.0-dev-preview-58": "xxxx"
 })[0];
 //# sourceMappingURL=index.cjs.map