@atcute/client 1.0.0 → 2.0.1

package/dist/utils/http.js

@@ -0,0 +1,20 @@
+/**
+ * @module
+ * Assortment of HTTP utilities
+ * This module is exported for convenience and is no way part of public API,
+ * it can be removed at any time.
+ */
+export const mergeHeaders = (init, defaults) => {
+    let headers;
+    for (const name in defaults) {
+        const value = defaults[name];
+        if (value !== null) {
+            headers ??= new Headers(init);
+            if (!headers.has(name)) {
+                headers.set(name, value);
+            }
+        }
+    }
+    return headers ?? init;
+};
+//# sourceMappingURL=http.js.map

package/dist/utils/http.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../lib/utils/http.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,CAC3B,IAA6B,EAC7B,QAAuC,EACb,EAAE;IAC5B,IAAI,OAA4B,CAAC;IAEjC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACpB,OAAO,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;YAE9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1B,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,OAAO,IAAI,IAAI,CAAC;AACxB,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@atcute/client",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "description": "lightweight and cute API client for AT Protocol",
   "license": "MIT",
   "repository": {
@@ -13,16 +13,19 @@
   "exports": {
     ".": "./dist/index.js",
     "./lexicons": "./dist/lexicons.js",
-    "./middlewares/auth": "./dist/middlewares/auth.js",
-    "./middlewares/mod": "./dist/middlewares/mod.js",
     "./utils/did": "./dist/utils/did.js",
+    "./utils/http": "./dist/utils/http.js",
     "./utils/jwt": "./dist/utils/jwt.js"
   },
   "devDependencies": {
+    "@vitest/coverage-v8": "^2.0.5",
+    "vitest": "^2.0.5",
+    "@atcute/internal-dev-env": "^1.0.0",
     "@atcute/lex-cli": "^1.0.0"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --project tsconfig.build.json",
+    "test": "vitest run",
     "generate": "./scripts/generate-lexicons.sh",
     "prepublish": "rm -rf dist; pnpm run build"
   }

package/dist/middlewares/auth.js

@@ -1,150 +0,0 @@
-/**
- * @module
- * Contains a middleware that handles authentication to a personal data server.
- */
-import { fetchHandler, isErrorResponse, XRPCError } from '../index.js';
-import { getPdsEndpoint } from '../utils/did.js';
-import { decodeJwt } from '../utils/jwt.js';
-/** Authentication/session management middleware */
-export class AtpAuth {
-    #rpc;
-    #refreshSessionPromise;
-    #onExpired;
-    #onRefresh;
-    #onSessionUpdate;
-    /** Current session state */
-    session;
-    constructor(rpc, { onExpired, onRefresh, onSessionUpdate } = {}) {
-        this.#rpc = rpc;
-        this.#onRefresh = onRefresh;
-        this.#onExpired = onExpired;
-        this.#onSessionUpdate = onSessionUpdate;
-        rpc.hook((next) => async (request) => {
-            await this.#refreshSessionPromise;
-            let res = await next(this.#decorateRequest(request));
-            if (isErrorResponse(res.body, ['ExpiredToken']) && this.session?.refreshJwt) {
-                await this.#refreshSession();
-                if (this.session) {
-                    // retry fetch
-                    res = await next(this.#decorateRequest(request));
-                }
-            }
-            return res;
-        });
-    }
-    #decorateRequest(req) {
-        const session = this.session;
-        if (session && !req.headers['Authorization']) {
-            return {
-                ...req,
-                service: session.pdsUri || req.service,
-                headers: {
-                    ...req.headers,
-                    Authorization: `Bearer ${session.accessJwt}`,
-                },
-            };
-        }
-        return req;
-    }
-    #refreshSession() {
-        return (this.#refreshSessionPromise ||= this.#refreshSessionInner().finally(() => {
-            this.#refreshSessionPromise = undefined;
-        }));
-    }
-    async #refreshSessionInner() {
-        const session = this.session;
-        if (!session || !session.refreshJwt) {
-            return;
-        }
-        const res = await fetchHandler({
-            service: session.pdsUri || this.#rpc.service,
-            type: 'post',
-            nsid: 'com.atproto.server.refreshSession',
-            headers: {
-                Authorization: `Bearer ${session.refreshJwt}`,
-            },
-            params: {},
-        });
-        if (isErrorResponse(res.body, ['ExpiredToken', 'InvalidToken'])) {
-            // failed due to a bad refresh token
-            this.session = undefined;
-            this.#onExpired?.(session);
-        }
-        else if (res.status === 200) {
-            // succeeded, update the session
-            this.#updateSession({ ...session, ...res.body });
-            this.#onRefresh?.(this.session);
-        }
-    }
-    #updateSession(raw) {
-        const didDoc = raw.didDoc;
-        let pdsUri;
-        if (didDoc) {
-            pdsUri = getPdsEndpoint(didDoc);
-        }
-        const newSession = {
-            accessJwt: raw.accessJwt,
-            refreshJwt: raw.refreshJwt,
-            handle: raw.handle,
-            did: raw.did,
-            pdsUri: pdsUri,
-            email: raw.email,
-            emailConfirmed: raw.emailConfirmed,
-            emailAuthFactor: raw.emailConfirmed,
-            active: raw.active ?? true,
-            inactiveStatus: raw.status,
-        };
-        this.session = newSession;
-        this.#onSessionUpdate?.(newSession);
-        return newSession;
-    }
-    /**
-     * Resume a saved session
-     * @param session Session information, taken from `AtpAuth#session` after login
-     */
-    async resume(session) {
-        const now = Date.now() / 1000 + 60 * 5;
-        const refreshToken = decodeJwt(session.refreshJwt);
-        if (now >= refreshToken.exp) {
-            throw new XRPCError(401, { kind: 'InvalidToken' });
-        }
-        const accessToken = decodeJwt(session.accessJwt);
-        this.session = session;
-        if (now >= accessToken.exp) {
-            await this.#refreshSession();
-        }
-        else {
-            const promise = this.#rpc.get('com.atproto.server.getSession', {});
-            promise.then((response) => {
-                const existing = this.session;
-                const next = response.data;
-                if (!existing) {
-                    return;
-                }
-                this.#updateSession({ ...existing, ...next });
-            });
-        }
-        if (!this.session) {
-            throw new XRPCError(401, { kind: 'InvalidToken' });
-        }
-        return this.session;
-    }
-    /**
-     * Perform a login operation
-     * @param options Login options
-     * @returns Session data that can be saved for later
-     */
-    async login(options) {
-        // Reset the session
-        this.session = undefined;
-        const res = await this.#rpc.call('com.atproto.server.createSession', {
-            data: {
-                identifier: options.identifier,
-                password: options.password,
-                authFactorToken: options.code,
-            },
-        });
-        return this.#updateSession(res.data);
-    }
-}
-//# sourceMappingURL=auth.js.map

package/dist/middlewares/auth.js.map

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

package/dist/middlewares/mod.d.ts

@@ -1,24 +0,0 @@
-/**
- * @module
- * Contains a middleware that adds `atproto-accept-labelers` header to requests.
- */
-import type { XRPC } from '../index.js';
-import type { At } from '../lexicons.js';
-/** Options for constructing a moderation middleware */
-export interface AtpModOptions {
-    /** Array of moderation services to use */
-    labelers?: ModerationService[];
-}
-/** Moderation middleware, unstable. */
-export declare class AtpMod {
-    /** Array of moderation services that gets forwarded as a header */
-    labelers: ModerationService[];
-    constructor(rpc: XRPC, { labelers }?: AtpModOptions);
-}
-/** Interface detailing what moderator service to use and how it should be used. */
-export interface ModerationService {
-    /** Moderator service to use */
-    did: At.DID;
-    /** Whether it should apply takedowns made by this service. */
-    redact?: boolean;
-}

package/dist/middlewares/mod.js

@@ -1,24 +0,0 @@
-/**
- * @module
- * Contains a middleware that adds `atproto-accept-labelers` header to requests.
- */
-/** Moderation middleware, unstable. */
-export class AtpMod {
-    /** Array of moderation services that gets forwarded as a header */
-    labelers;
-    constructor(rpc, { labelers = [] } = {}) {
-        this.labelers = labelers;
-        rpc.hook((next) => (request) => {
-            return next({
-                ...request,
-                headers: {
-                    ...request.headers,
-                    'atproto-accept-labelers': this.labelers
-                        .map((labeler) => labeler.did + (labeler.redact ? `;redact` : ``))
-                        .join(', '),
-                },
-            });
-        });
-    }
-}
-//# sourceMappingURL=mod.js.map

package/dist/middlewares/mod.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../lib/middlewares/mod.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,uCAAuC;AACvC,MAAM,OAAO,MAAM;IAClB,mEAAmE;IACnE,QAAQ,CAAsB;IAE9B,YAAY,GAAS,EAAE,EAAE,QAAQ,GAAG,EAAE,KAAoB,EAAE;QAC3D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,OAAO,IAAI,CAAC;gBACX,GAAG,OAAO;gBACV,OAAO,EAAE;oBACR,GAAG,OAAO,CAAC,OAAO;oBAClB,yBAAyB,EAAE,IAAI,CAAC,QAAQ;yBACtC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;yBACjE,IAAI,CAAC,IAAI,CAAC;iBACZ;aACD,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;CACD"}