@arcblock/did-connect-js 1.29.22 → 4.0.0-beta.1

package/{lib/adapters/detect.d.cts → dist/adapters/detect.d.ts}

@@ -1,11 +1,9 @@
-//#region src/adapters/detect.d.ts
 /**
  * Detect whether an app object is Express or Hono.
  *
  * Express: has set(), engine(), and lazyrouter() or _router
  * Hono: has fetch() method + basePath property, no Express set/engine
  */
-declare function isExpressApp(app: any): boolean;
-declare function isHonoApp(app: any): boolean;
-//#endregion
-export { isExpressApp, isHonoApp };
+export declare function isExpressApp(app: any): boolean;
+export declare function isHonoApp(app: any): boolean;
+//# sourceMappingURL=detect.d.ts.map

package/dist/adapters/detect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect.d.ts","sourceRoot":"","sources":["../../src/adapters/detect.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAE9C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAE3C"}

package/dist/adapters/detect.js

@@ -0,0 +1,13 @@
+/**
+ * Detect whether an app object is Express or Hono.
+ *
+ * Express: has set(), engine(), and lazyrouter() or _router
+ * Hono: has fetch() method + basePath property, no Express set/engine
+ */
+export function isExpressApp(app) {
+    return typeof app?.set === 'function' && typeof app?.engine === 'function';
+}
+export function isHonoApp(app) {
+    return typeof app?.fetch === 'function' && !isExpressApp(app);
+}
+//# sourceMappingURL=detect.js.map

package/dist/adapters/detect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../src/adapters/detect.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,UAAU,YAAY,CAAC,GAAQ;IACnC,OAAO,OAAO,GAAG,EAAE,GAAG,KAAK,UAAU,IAAI,OAAO,GAAG,EAAE,MAAM,KAAK,UAAU,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAQ;IAChC,OAAO,OAAO,GAAG,EAAE,KAAK,KAAK,UAAU,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;AAChE,CAAC"}

package/dist/adapters/express.d.ts

@@ -0,0 +1,40 @@
+import type { ConnectRequest, ConnectResponse, NextFunction } from '../types.js';
+export interface ExpressLikeApp {
+    use(path: string, ...handlers: any[]): void;
+    get(path: string, ...handlers: any[]): void;
+    post(path: string, ...handlers: any[]): void;
+}
+export interface HandlerFunctions {
+    generateSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    checkSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    expireSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    onAuthRequest: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    onAuthResponse: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    ensureContext: (req: ConnectRequest, res: ConnectResponse, next: NextFunction) => Promise<void>;
+    ensureSignedJson: (req: ConnectRequest, res: ConnectResponse, next: NextFunction) => void;
+}
+export interface AttachExpressOptions {
+    app: ExpressLikeApp;
+    prefix: string;
+    action: string;
+    handlers: HandlerFunctions;
+}
+/**
+ * Register DID Connect routes on an Express-compatible app.
+ *
+ * Routes registered:
+ * - GET/POST `{prefix}/{action}/token` — generate session
+ * - GET `{prefix}/{action}/status` — check session status
+ * - GET `{prefix}/{action}/timeout` — expire session
+ * - GET `{prefix}/{action}/auth` — wallet fetches auth request
+ * - POST `{prefix}/{action}/auth` — wallet submits auth response
+ * - GET `{prefix}/{action}/auth/submit` — web wallet submit
+ */
+export declare function attachExpress({ app, prefix, action, handlers }: AttachExpressOptions): {
+    generateSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    expireSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    checkSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    onAuthRequest: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    onAuthResponse: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+};
+//# sourceMappingURL=express.d.ts.map

package/dist/adapters/express.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/adapters/express.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEjF,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5C,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,YAAY,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,aAAa,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,aAAa,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,cAAc,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7E,aAAa,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChG,gBAAgB,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CAC3F;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,oBAAoB;2BA3B5D,cAAc,OAAO,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC;yBAExD,cAAc,OAAO,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC;wBADvD,cAAc,OAAO,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC;yBAErD,cAAc,OAAO,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC;0BACrD,cAAc,OAAO,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC;EAuD7E"}

package/dist/adapters/express.js

@@ -0,0 +1,30 @@
+/**
+ * Register DID Connect routes on an Express-compatible app.
+ *
+ * Routes registered:
+ * - GET/POST `{prefix}/{action}/token` — generate session
+ * - GET `{prefix}/{action}/status` — check session status
+ * - GET `{prefix}/{action}/timeout` — expire session
+ * - GET `{prefix}/{action}/auth` — wallet fetches auth request
+ * - POST `{prefix}/{action}/auth` — wallet submits auth response
+ * - GET `{prefix}/{action}/auth/submit` — web wallet submit
+ */
+export function attachExpress({ app, prefix, action, handlers }) {
+    const pathname = `${prefix}/${action}/auth`;
+    const { generateSession, checkSession, expireSession, onAuthRequest, onAuthResponse, ensureContext, ensureSignedJson, } = handlers;
+    // 1. WEB|Wallet: generate new token
+    app.get(`${prefix}/${action}/token`, generateSession);
+    app.post(`${prefix}/${action}/token`, generateSession);
+    // 2. WEB: check for token status
+    app.get(`${prefix}/${action}/status`, ensureContext, checkSession);
+    // 3. WEB: expire old token
+    app.get(`${prefix}/${action}/timeout`, ensureContext, expireSession);
+    // 4. Wallet: fetch auth request
+    app.get(pathname, ensureContext, ensureSignedJson, onAuthRequest);
+    // 5. Wallet: submit auth response
+    app.post(pathname, ensureContext, ensureSignedJson, onAuthResponse);
+    // 6. Web wallet: submit auth response via GET
+    app.get(`${pathname}/submit`, ensureContext, ensureSignedJson, onAuthResponse);
+    return { generateSession, expireSession, checkSession, onAuthRequest, onAuthResponse };
+}
+//# sourceMappingURL=express.js.map

package/dist/adapters/express.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/adapters/express.ts"],"names":[],"mappings":"AAyBA;;;;;;;;;;GAUG;AACH,MAAM,UAAU,aAAa,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAwB;IACnF,MAAM,QAAQ,GAAG,GAAG,MAAM,IAAI,MAAM,OAAO,CAAC;IAC5C,MAAM,EACJ,eAAe,EACf,YAAY,EACZ,aAAa,EACb,aAAa,EACb,cAAc,EACd,aAAa,EACb,gBAAgB,GACjB,GAAG,QAAQ,CAAC;IAEb,oCAAoC;IACpC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,MAAM,QAAQ,EAAE,eAAe,CAAC,CAAC;IACtD,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,MAAM,QAAQ,EAAE,eAAe,CAAC,CAAC;IAEvD,iCAAiC;IACjC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,MAAM,SAAS,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;IAEnE,2BAA2B;IAC3B,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,MAAM,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;IAErE,gCAAgC;IAChC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;IAElE,kCAAkC;IAClC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAEpE,8CAA8C;IAC9C,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAE/E,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC;AACzF,CAAC"}

package/dist/adapters/hono.d.ts

@@ -0,0 +1,49 @@
+import type { ConnectRequest, ConnectResponse } from '../types.js';
+import type { HandlerFunctions } from './express.js';
+export interface HonoLikeApp {
+    get(path: string, handler: (c: any) => any): void;
+    post(path: string, handler: (c: any) => any): void;
+    use(path: string, handler: any): void;
+}
+export interface AttachHonoOptions {
+    app: HonoLikeApp;
+    prefix: string;
+    action: string;
+    handlers: HandlerFunctions;
+}
+/**
+ * Create a ConnectRequest from a Hono-like Context.
+ *
+ * @param c - Hono Context object
+ * @param bodyCache - Pre-parsed request body (since c.req.json() is async)
+ */
+export declare function createHonoRequest(c: any, bodyCache?: any): ConnectRequest;
+/**
+ * Create a ConnectResponse that buffers the handler's response.
+ * The Hono route wrapper reads the buffer via _getResult() to return c.json().
+ */
+export declare function createHonoResponse(): ConnectResponse & {
+    _getResult(): {
+        statusCode: number;
+        body: any;
+    } | null;
+};
+/**
+ * Register DID Connect routes on a Hono-compatible app.
+ *
+ * Routes registered are the same as attachExpress:
+ * - GET/POST `{prefix}/{action}/token`
+ * - GET `{prefix}/{action}/status`
+ * - GET `{prefix}/{action}/timeout`
+ * - GET `{prefix}/{action}/auth`
+ * - POST `{prefix}/{action}/auth`
+ * - GET `{prefix}/{action}/auth/submit`
+ */
+export declare function attachHono({ app, prefix, action, handlers }: AttachHonoOptions): {
+    generateSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    expireSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    checkSession: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    onAuthRequest: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+    onAuthResponse: (req: ConnectRequest, res: ConnectResponse) => Promise<void>;
+};
+//# sourceMappingURL=hono.d.ts.map

package/dist/adapters/hono.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hono.d.ts","sourceRoot":"","sources":["../../src/adapters/hono.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAgB,MAAM,aAAa,CAAC;AACjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,IAAI,CAAC;IAClD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,IAAI,CAAC;IACnD,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,WAAW,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAmCD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,GAAE,GAAQ,GAAG,cAAc,CAyB7E;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,eAAe,GAAG;IAAE,UAAU,IAAI;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,CAuBjH;AAmDD;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,iBAAiB;;;;;;EA4C9E"}

package/dist/adapters/hono.js

@@ -0,0 +1,176 @@
+/**
+ * Parse a raw Cookie header string into a key-value map.
+ */
+function parseCookieHeader(header) {
+    const cookies = {};
+    if (!header)
+        return cookies;
+    for (const pair of header.split(';')) {
+        const idx = pair.indexOf('=');
+        if (idx > 0) {
+            const key = pair.slice(0, idx).trim();
+            const val = pair.slice(idx + 1).trim();
+            cookies[key] = decodeURIComponent(val);
+        }
+    }
+    return cookies;
+}
+/**
+ * Simple Accept-Language negotiation matching Express's req.acceptsLanguages().
+ * Only needs to handle the two languages used by DID Connect: 'en-US' and 'zh-CN'.
+ */
+function negotiateLanguage(acceptHeader, ...langs) {
+    if (!acceptHeader || langs.length === 0)
+        return langs[0] || false;
+    const lower = acceptHeader.toLowerCase();
+    for (const lang of langs) {
+        const prefix = lang.toLowerCase().split('-')[0];
+        if (lower.includes(lang.toLowerCase()) || lower.includes(prefix)) {
+            return lang;
+        }
+    }
+    return langs[0] || false;
+}
+/**
+ * Create a ConnectRequest from a Hono-like Context.
+ *
+ * @param c - Hono Context object
+ * @param bodyCache - Pre-parsed request body (since c.req.json() is async)
+ */
+export function createHonoRequest(c, bodyCache = {}) {
+    const url = new URL(c.req.url);
+    const rawHeaders = {};
+    if (c.req.raw?.headers) {
+        c.req.raw.headers.forEach((value, key) => {
+            rawHeaders[key.toLowerCase()] = value;
+        });
+    }
+    return {
+        body: bodyCache,
+        query: Object.fromEntries(url.searchParams.entries()),
+        params: typeof c.req.param === 'function' ? c.req.param() : {},
+        headers: rawHeaders,
+        cookies: parseCookieHeader(rawHeaders.cookie || ''),
+        protocol: url.protocol.replace(':', ''),
+        originalUrl: url.pathname + url.search,
+        get(name) {
+            return rawHeaders[name.toLowerCase()];
+        },
+        acceptsLanguages(...langs) {
+            return negotiateLanguage(rawHeaders['accept-language'] || '', ...langs);
+        },
+        raw: c,
+    };
+}
+/**
+ * Create a ConnectResponse that buffers the handler's response.
+ * The Hono route wrapper reads the buffer via _getResult() to return c.json().
+ */
+export function createHonoResponse() {
+    let result = null;
+    const response = {
+        jsonp(data) {
+            result = { statusCode: 200, body: data };
+        },
+        json(data) {
+            result = { statusCode: 200, body: data };
+        },
+        status(code) {
+            return {
+                json(data) {
+                    result = { statusCode: code, body: data };
+                },
+            };
+        },
+        _getResult() {
+            return result;
+        },
+    };
+    return response;
+}
+/**
+ * Wrap a middleware chain + handler into a single Hono route handler.
+ * Runs middlewares sequentially with manual next() control,
+ * then runs the handler, then returns the buffered response.
+ */
+function wrapHandler(middlewares, handler) {
+    return async (c) => {
+        let body = {};
+        try {
+            const text = await c.req.text();
+            if (text) {
+                const contentType = c.req.header('content-type') || '';
+                if (contentType.includes('json')) {
+                    body = JSON.parse(text);
+                }
+                else if (contentType.includes('urlencoded')) {
+                    body = Object.fromEntries(new URLSearchParams(text).entries());
+                }
+            }
+        }
+        catch {
+            // Body parsing failed, use empty object
+        }
+        const req = createHonoRequest(c, body);
+        const res = createHonoResponse();
+        // Run middlewares
+        for (const mw of middlewares) {
+            let nextCalled = false;
+            await mw(req, res, () => {
+                nextCalled = true;
+            });
+            if (!nextCalled) {
+                // Middleware short-circuited (e.g., error response)
+                const r = res._getResult();
+                if (r)
+                    return c.json(r.body, r.statusCode);
+                return c.json({ error: 'Unknown error' }, 500);
+            }
+        }
+        // Run handler
+        await handler(req, res);
+        const r = res._getResult();
+        return c.json(r?.body ?? {}, r?.statusCode ?? 200);
+    };
+}
+/**
+ * Register DID Connect routes on a Hono-compatible app.
+ *
+ * Routes registered are the same as attachExpress:
+ * - GET/POST `{prefix}/{action}/token`
+ * - GET `{prefix}/{action}/status`
+ * - GET `{prefix}/{action}/timeout`
+ * - GET `{prefix}/{action}/auth`
+ * - POST `{prefix}/{action}/auth`
+ * - GET `{prefix}/{action}/auth/submit`
+ */
+export function attachHono({ app, prefix, action, handlers }) {
+    const pathname = `${prefix}/${action}/auth`;
+    const { generateSession, checkSession, expireSession, onAuthRequest, onAuthResponse, ensureContext, ensureSignedJson, } = handlers;
+    // CORS — use Hono's built-in cors or manual headers
+    // For simplicity, add CORS headers via a middleware
+    app.use(`${prefix}/${action}/*`, async (c, next) => {
+        c.header('Access-Control-Allow-Origin', '*');
+        c.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+        c.header('Access-Control-Allow-Headers', 'Content-Type, Authorization');
+        if (c.req.method === 'OPTIONS') {
+            return c.text('', 204);
+        }
+        await next();
+    });
+    // 1. WEB|Wallet: generate new token
+    app.get(`${prefix}/${action}/token`, wrapHandler([], generateSession));
+    app.post(`${prefix}/${action}/token`, wrapHandler([], generateSession));
+    // 2. WEB: check for token status
+    app.get(`${prefix}/${action}/status`, wrapHandler([ensureContext], checkSession));
+    // 3. WEB: expire old token
+    app.get(`${prefix}/${action}/timeout`, wrapHandler([ensureContext], expireSession));
+    // 4. Wallet: fetch auth request
+    app.get(pathname, wrapHandler([ensureContext, ensureSignedJson], onAuthRequest));
+    // 5. Wallet: submit auth response
+    app.post(pathname, wrapHandler([ensureContext, ensureSignedJson], onAuthResponse));
+    // 6. Web wallet: submit via GET
+    app.get(`${pathname}/submit`, wrapHandler([ensureContext, ensureSignedJson], onAuthResponse));
+    return { generateSession, expireSession, checkSession, onAuthRequest, onAuthResponse };
+}
+//# sourceMappingURL=hono.js.map

package/dist/adapters/hono.js.map

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

package/dist/authenticator/base.d.ts

@@ -0,0 +1,21 @@
+import * as Jwt from '@arcblock/jwt';
+export declare const DEFAULT_CHAIN_INFO: {
+    id: string;
+    host: string;
+    type: string;
+};
+declare class BaseAuthenticator {
+    _validateWallet(wallet: any, canSign?: boolean): any;
+    /**
+     * Verify a DID auth response sent from DID Wallet
+     *
+     * @method
+     * @param {object} data
+     * @param {string} [locale=en]
+     * @param {boolean} [enforceTimestamp=true]
+     * @returns Promise<boolean>
+     */
+    _verify(data: any, fieldPk: string, fieldInfo: string, locale?: string, enforceTimestamp?: boolean): Promise<Jwt.JwtBody>;
+}
+export default BaseAuthenticator;
+//# sourceMappingURL=base.d.ts.map

package/dist/authenticator/base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/authenticator/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,eAAe,CAAC;AAMrC,eAAO,MAAM,kBAAkB;;;;CAAiD,CAAC;AAEjF,cAAM,iBAAiB;IACrB,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,UAAO;IAiD3C;;;;;;;;OAQG;IACG,OAAO,CACX,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,MAAM,SAAO,EACb,gBAAgB,UAAO,GACtB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;CAmDxB;AAED,eAAe,iBAAiB,CAAC"}

package/dist/authenticator/base.js

@@ -0,0 +1,109 @@
+import * as Jwt from '@arcblock/jwt';
+import { fromJSON, isValid } from '@ocap/wallet';
+import Debug from 'debug';
+const debug = Debug('@arcblock/did-connect-js:authenticator:base');
+export const DEFAULT_CHAIN_INFO = { id: 'none', host: 'none', type: 'arcblock' };
+class BaseAuthenticator {
+    _validateWallet(wallet, canSign = true) {
+        if (!wallet) {
+            throw new Error('WalletAuthenticator cannot work without wallet');
+        }
+        if (typeof wallet === 'function') {
+            return wallet;
+        }
+        if (isValid(wallet, canSign)) {
+            // Full wallet object with methods - add pk/sk aliases for backward compatibility
+            if (!wallet.pk && wallet.publicKey) {
+                wallet.pk = wallet.publicKey;
+            }
+            if (!wallet.sk && wallet.secretKey) {
+                wallet.sk = wallet.secretKey;
+            }
+            return wallet;
+        }
+        // Validate required fields for JSON wallet object
+        if (canSign && !wallet.sk) {
+            throw new Error('WalletAuthenticator cannot work without wallet.sk');
+        }
+        if (!wallet.pk) {
+            throw new Error('WalletAuthenticator cannot work without wallet.pk');
+        }
+        if (!wallet.address) {
+            throw new Error('WalletAuthenticator cannot work without wallet.address');
+        }
+        // If it's a plain JSON object with required fields, convert it to a full wallet object
+        // This ensures backward compatibility with code that uses toJSON()
+        try {
+            const fullWallet = fromJSON(wallet);
+            // Add pk/sk aliases for backward compatibility
+            if (!fullWallet.pk && fullWallet.publicKey) {
+                fullWallet.pk = fullWallet.publicKey;
+            }
+            if (!fullWallet.sk && fullWallet.secretKey) {
+                fullWallet.sk = fullWallet.secretKey;
+            }
+            return fullWallet;
+        }
+        catch (_err) {
+            // If fromJSON fails, return the original object for backward compatibility
+            return wallet;
+        }
+    }
+    /**
+     * Verify a DID auth response sent from DID Wallet
+     *
+     * @method
+     * @param {object} data
+     * @param {string} [locale=en]
+     * @param {boolean} [enforceTimestamp=true]
+     * @returns Promise<boolean>
+     */
+    async _verify(data, fieldPk, fieldInfo, locale = 'en', enforceTimestamp = true) {
+        debug('verify', data, locale);
+        const errors = {
+            pkMissing: {
+                en: `${fieldPk} is required to complete auth`,
+                zh: `${fieldPk} 参数缺失`,
+            },
+            tokenMissing: {
+                en: `${fieldInfo} is required to complete auth`,
+                zh: 'JWT Token 参数缺失',
+            },
+            pkFormat: {
+                en: `${fieldPk} should be either base58 or base16 format`,
+                zh: `${fieldPk} 无法解析`,
+            },
+            tokenInvalid: {
+                en: 'Invalid JWT token',
+                zh: '签名无效',
+            },
+            timeInvalid: {
+                en: 'JWT token expired, make sure your device time in sync with network',
+                zh: '签名中的时间戳无效，请确保设备和网络时间同步',
+            },
+        };
+        const pk = data[fieldPk];
+        const info = data[fieldInfo];
+        if (!pk) {
+            throw new Error(errors.pkMissing[locale]);
+        }
+        if (!info) {
+            throw new Error(errors.tokenMissing[locale]);
+        }
+        if (!pk) {
+            throw new Error(errors.pkFormat[locale]);
+        }
+        // NOTE: since the token can be invalid because of wallet-app clock not in sync
+        // We should tell the user that if it's caused by clock
+        if (!(await Jwt.verify(info, pk))) {
+            const isValidSig = await Jwt.verify(info, pk, { tolerance: 0, enforceTimestamp: false });
+            if (enforceTimestamp) {
+                const error = isValidSig ? errors.timeInvalid[locale] : errors.tokenInvalid[locale];
+                throw new Error(error);
+            }
+        }
+        return Jwt.decode(info);
+    }
+}
+export default BaseAuthenticator;
+//# sourceMappingURL=base.js.map

package/dist/authenticator/base.js.map

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