@yeying-community/web3-bs 1.0.6 → 1.0.7

package/dist/web3-bs.umd.js

@@ -1137,6 +1137,16 @@
     function resolveSessionTokenKey(options) {
         return options?.sessionTokenStorageKey || DEFAULT_SESSION_TOKEN_KEY;
     }
+    function resolveAccessToken(options) {
+        if (typeof options?.accessToken === 'string') {
+            const token = options.accessToken.trim();
+            return token || null;
+        }
+        if (options?.accessToken === null) {
+            return null;
+        }
+        return getAccessToken(options);
+    }
     function shouldStoreSessionToken(options) {
         return options?.storeSessionToken !== false;
     }
@@ -1184,6 +1194,9 @@
         }
         return undefined;
     }
+    function parseIssuerDidField(obj) {
+        return parseStringField(obj, ['issuerDid', 'issuer', 'did']);
+    }
     function readStoredSessionToken(options) {
         if (!shouldStoreSessionToken(options))
             return null;
@@ -1240,11 +1253,16 @@
         const fetcher = resolveFetcher(options);
         const credentials = resolveCredentials(options);
         const url = joinUrl$1(resolveBaseUrl(options), options.issuerPath || DEFAULT_ISSUER_PATH);
+        const token = resolveAccessToken(options);
+        const headers = new Headers({
+            accept: 'application/json',
+        });
+        if (token) {
+            headers.set('Authorization', `Bearer ${token}`);
+        }
         const response = await fetcher(url, {
             method: 'GET',
-            headers: {
-                accept: 'application/json',
-            },
+            headers,
             credentials,
         });
         const payload = await parseJsonBody(response);
@@ -1254,7 +1272,7 @@
         const data = parseEnvelopeData(payload);
         return {
             enabled: typeof data.enabled === 'boolean' ? data.enabled : undefined,
-            issuerDid: parseStringField(data, ['issuerDid']),
+            issuerDid: parseIssuerDidField(data),
             defaultAudience: parseStringField(data, ['defaultAudience']),
             defaultCapabilities: parseCapabilitiesField(data, ['defaultCapabilities']),
             response: payload,
@@ -1267,13 +1285,18 @@
         }
         const fetcher = resolveFetcher(options);
         const credentials = resolveCredentials(options);
+        const accessToken = resolveAccessToken(options);
         const url = joinUrl$1(resolveBaseUrl(options), options.sessionPath || DEFAULT_SESSION_PATH);
+        const headers = new Headers({
+            'Content-Type': 'application/json',
+            accept: 'application/json',
+        });
+        if (accessToken) {
+            headers.set('Authorization', `Bearer ${accessToken}`);
+        }
         const response = await fetcher(url, {
             method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                accept: 'application/json',
-            },
+            headers,
             credentials,
             body: JSON.stringify({
                 subject,
@@ -1294,7 +1317,7 @@
             subject: parseStringField(data, ['subject']) || subject,
             sessionToken,
             expiresAt: parseNumberField(data, ['expiresAt']),
-            issuerDid: parseStringField(data, ['issuerDid']),
+            issuerDid: parseIssuerDidField(data),
             response: payload,
         };
     }
@@ -1335,13 +1358,13 @@
         }
         return {
             ucan,
-            issuerDid: parseStringField(data, ['issuerDid']),
+            issuerDid: parseIssuerDidField(data),
             subject: parseStringField(data, ['subject']),
             audience: parseStringField(data, ['audience']),
             capabilities: parseCapabilitiesField(data, ['capabilities']),
-            exp: parseNumberField(data, ['exp']),
-            nbf: parseNumberField(data, ['nbf']),
-            iat: parseNumberField(data, ['iat']),
+            exp: parseNumberField(data, ['exp', 'expiresAt']),
+            nbf: parseNumberField(data, ['nbf', 'notBefore']),
+            iat: parseNumberField(data, ['iat', 'issuedAt']),
             response: payload,
         };
     }
@@ -1614,6 +1637,13 @@
     const tokenCache = new Map();
     const TOKEN_SKEW_MS = 5000;
     const DEFAULT_APP_ACTION = 'write';
+    const LOOPBACK_HOST_ALIASES = new Set([
+        'localhost',
+        '127.0.0.1',
+        '::1',
+        '0:0:0:0:0:0:0:1',
+        '0.0.0.0',
+    ]);
     function normalizeAppDir(path) {
         const trimmed = path.trim();
         if (!trimmed)
@@ -1625,6 +1655,69 @@
     function sanitizeAppId(appId) {
         return appId.trim().replace(/[^a-zA-Z0-9._-]/g, '-');
     }
+    function parseHostPort(rawHost) {
+        const host = rawHost.trim();
+        if (!host)
+            return { hostname: '', port: '' };
+        const bracketMatch = host.match(/^\[([^\]]+)\](?::([0-9]+))?$/);
+        if (bracketMatch) {
+            return {
+                hostname: bracketMatch[1] || '',
+                port: bracketMatch[2] || '',
+            };
+        }
+        const firstColon = host.indexOf(':');
+        const lastColon = host.lastIndexOf(':');
+        if (firstColon > -1 && firstColon === lastColon) {
+            const hostname = host.slice(0, firstColon).trim();
+            const port = host.slice(firstColon + 1).trim();
+            if (/^[0-9]+$/.test(port)) {
+                return { hostname, port };
+            }
+        }
+        return { hostname: host, port: '' };
+    }
+    function normalizeAppHostnameForAppId(hostname) {
+        const normalized = (hostname || '').trim().toLowerCase();
+        if (!normalized)
+            return '';
+        const bare = normalized.replace(/^\[(.*)\]$/, '$1');
+        if (LOOPBACK_HOST_ALIASES.has(normalized) || LOOPBACK_HOST_ALIASES.has(bare)) {
+            return 'localhost';
+        }
+        return bare;
+    }
+    function buildSanitizedAppId(hostname, port) {
+        const normalizedHostname = normalizeAppHostnameForAppId(hostname);
+        if (!normalizedHostname)
+            return '';
+        const normalizedPort = port === undefined || port === null ? '' : String(port).trim();
+        const host = normalizedPort
+            ? `${normalizedHostname}:${normalizedPort}`
+            : normalizedHostname;
+        return sanitizeAppId(host);
+    }
+    function deriveAppIdFromHost(host) {
+        const parsed = parseHostPort(host || '');
+        return buildSanitizedAppId(parsed.hostname, parsed.port);
+    }
+    function deriveAppIdFromLocation(locationLike) {
+        const source = locationLike ||
+            (typeof window !== 'undefined' ? window.location : undefined);
+        if (!source)
+            return '';
+        const hostname = typeof source.hostname === 'string' ? source.hostname : '';
+        const port = source.port;
+        if (hostname) {
+            const appId = buildSanitizedAppId(hostname, port);
+            if (appId)
+                return appId;
+        }
+        if (typeof source.host === 'string') {
+            return deriveAppIdFromHost(source.host);
+        }
+        return '';
+    }
     function normalizeAction(action) {
         const trimmed = (action || '').trim();
         return trimmed ? trimmed : null;
@@ -1862,6 +1955,8 @@
     exports.createRootUcan = createRootUcan;
     exports.createUcanSession = createUcanSession;
     exports.createWebDavClient = createWebDavClient;
+    exports.deriveAppIdFromHost = deriveAppIdFromHost;
+    exports.deriveAppIdFromLocation = deriveAppIdFromLocation;
     exports.getAccessToken = getAccessToken;
     exports.getAccounts = getAccounts;
     exports.getBalance = getBalance;
@@ -1881,6 +1976,7 @@
     exports.issueCentralUcan = issueCentralUcan;
     exports.loginWithChallenge = loginWithChallenge;
     exports.logout = logout;
+    exports.normalizeAppHostnameForAppId = normalizeAppHostnameForAppId;
     exports.normalizeUcanCapabilities = normalizeUcanCapabilities;
     exports.normalizeUcanCapability = normalizeUcanCapability;
     exports.onAccountsChanged = onAccountsChanged;