update to new epoxy build

Author: r58Playz

src/puter-js/src/modules/networking/epoxy.js

@@ -1,22 +1,15 @@
-let EPOXY_BASE = 'https://epoxy.puter.com/0265590';
+let EPOXY_BASE = 'https://puter-net.b-cdn.net/epoxy/7fbb05b';
 let epoxyRuntimePromise;
 
 const textEncoder = new TextEncoder();
 
-function getEpoxyBase () {
-    const overriddenBase =
-        globalThis.PUTER_EPOXY_BASE || globalThis.PUTER_EPOXY_BASE_ENV;
-    const base = overriddenBase || EPOXY_BASE;
-    return base.endsWith('/') ? base.slice(0, -1) : base;
-}
-
 async function getEpoxyRuntime () {
     if ( epoxyRuntimePromise ) {
-        return epoxyRuntimePromise;
+        return await epoxyRuntimePromise;
     }
 
     epoxyRuntimePromise = (async () => {
-        const base = getEpoxyBase();
+        const base = EPOXY_BASE;
         const runtime = await import(/* webpackIgnore: true */ `${base}/full.js`);
         const wasmResponse = await fetch(`${base}/full.wasm`);
         if ( ! wasmResponse.ok ) {
@@ -82,10 +75,6 @@ function createPuterPasswordBuilder (runtime, wispToken) {
 }
 
 export let initEpoxy = async ({ wispToken, wispServer }) => {
-    if ( !wispServer || !wispToken ) {
-        throw new Error('Both wispServer and wispToken are required to initialize networking.');
-    }
-
     const runtime = await getEpoxyRuntime();
 
     const provider = new runtime.WispSocketProvider(

src/puter-js/src/modules/networking/index.js

@@ -2,8 +2,7 @@ import { initEpoxy } from './epoxy.js';
 import { PSocket, PTLSSocket } from './PSocket.js';
 import { pFetch } from './requests.js';
 
-let cachedEpoxyClientPromise;
-let cachedEpoxyClientKey;
+let cachedEpoxy = undefined;
 
 function getPuterInstance () {
     const puter = globalThis.puter;
@@ -59,28 +58,33 @@ export async function generateWispV1URL () {
 }
 
 export async function getEpoxyClient ({ refresh = false } = {}) {
+    if ( cachedEpoxy && cachedEpoxy.initting ) return await cachedEpoxy.promise;
+
     const nextKey = getClientCacheKey();
-    if ( refresh || !cachedEpoxyClientPromise || cachedEpoxyClientKey !== nextKey ) {
-        cachedEpoxyClientKey = nextKey;
-        cachedEpoxyClientPromise = (async () => {
-            const { wispToken, wispServer } = await getWispCredentials();
-            return await initEpoxy({ wispToken, wispServer });
+    if ( refresh || !(cachedEpoxy && cachedEpoxy.key === nextKey) ) {
+        let epoxy = { key: nextKey, initting: true };
+        let promise = (async () => {
+            try {
+                const { wispToken, wispServer } = await getWispCredentials();
+                let ret = await initEpoxy({ wispToken, wispServer });
+                epoxy.initting = false;
+                return ret;
+            } catch {
+                if ( cachedEpoxy === epoxy ) {
+                    cachedEpoxy = undefined;
+                }
+            }
         })();
+        epoxy.promise = promise;
 
-        cachedEpoxyClientPromise.catch(() => {
-            if ( cachedEpoxyClientKey === nextKey ) {
-                cachedEpoxyClientPromise = undefined;
-                cachedEpoxyClientKey = undefined;
-            }
-        });
+        cachedEpoxy = epoxy;
     }
 
-    return await cachedEpoxyClientPromise;
+    return await cachedEpoxy.promise;
 }
 
 export function clearEpoxyClientCache () {
-    cachedEpoxyClientPromise = undefined;
-    cachedEpoxyClientKey = undefined;
+    cachedEpoxy = undefined;
 }
 
 export let netAPI = {