From 7c8793b9983b2f95d13aecd98548032e20ab0a6e Mon Sep 17 00:00:00 2001 From: Matthieu Sieben Date: Sun, 26 Jan 2025 16:28:17 -0800 Subject: [PATCH] tidy --- .changeset/olive-teachers-yawn.md | 2 +- .eslintrc | 2 +- packages/bsky/src/api/blob-dispatcher.ts | 3 ++- packages/bsky/src/api/blob-resolver.ts | 12 ++++----- .../did-resolver/src/did-cache-memory.ts | 3 +-- .../internal/did-resolver/src/did-cache.ts | 3 +-- .../did-resolver/src/did-resolver-base.ts | 2 +- .../internal/did-resolver/src/methods/plc.ts | 3 +-- .../internal/did-resolver/src/methods/web.ts | 3 +-- packages/internal/fetch-node/src/unicast.ts | 7 +++--- packages/internal/fetch/src/fetch-response.ts | 3 ++- .../src/identity-resolver.ts | 3 +-- .../internal/simple-store-memory/src/index.ts | 3 ++- .../rollup.config.js | 7 +++--- .../src/browser-oauth-database.ts | 5 ++-- .../oauth-client-node/src/node-dpop-store.ts | 3 +-- .../src/node-oauth-client.ts | 9 +++---- packages/oauth/oauth-client/src/fetch-dpop.ts | 4 +-- ...-authorization-server-metadata-resolver.ts | 11 ++++---- .../oauth/oauth-client/src/oauth-client.ts | 19 +++++++------- ...th-protected-resource-metadata-resolver.ts | 9 +++---- .../oauth/oauth-client/src/oauth-resolver.ts | 9 +++---- .../oauth-client/src/oauth-server-agent.ts | 5 ++-- .../oauth-client/src/oauth-server-factory.ts | 3 +-- .../oauth/oauth-client/src/oauth-session.ts | 3 +-- .../oauth/oauth-client/src/session-getter.ts | 5 ++-- .../oauth/oauth-client/src/state-store.ts | 3 +-- .../oauth/oauth-provider/rollup.config.js | 7 +++--- .../src/client/client-manager.ts | 25 +++++++++---------- .../errors/invalid-client-metadata-error.ts | 3 ++- .../oauth-provider/src/oauth-provider.ts | 6 ++--- packages/pds/src/context.ts | 14 +++++------ packages/pds/src/pipethrough.ts | 2 +- 33 files changed, 95 insertions(+), 106 deletions(-) diff --git a/.changeset/olive-teachers-yawn.md b/.changeset/olive-teachers-yawn.md index 4d8001679cc..2211f115909 100644 --- a/.changeset/olive-teachers-yawn.md +++ b/.changeset/olive-teachers-yawn.md @@ -2,4 +2,4 @@ "@atproto/oauth-types": patch --- -Support environemnts not providing URL.canParse +Support environments not providing URL.canParse diff --git a/.eslintrc b/.eslintrc index b3ad24f9e20..c6bb7d10239 100644 --- a/.eslintrc +++ b/.eslintrc @@ -70,7 +70,7 @@ ], "settings": { "node": { "version": ">=18.7.0" }, - "import/internal-regex": "^@atproto/", + "import/internal-regex": "^@atproto(?:-labs)?/", "import/parsers": { "@typescript-eslint/parser": [".ts", ".tsx"] }, "import/resolver": { "typescript": { diff --git a/packages/bsky/src/api/blob-dispatcher.ts b/packages/bsky/src/api/blob-dispatcher.ts index 24dd9694571..3d51ac64f2f 100644 --- a/packages/bsky/src/api/blob-dispatcher.ts +++ b/packages/bsky/src/api/blob-dispatcher.ts @@ -1,6 +1,7 @@ -import { isUnicastIp, unicastLookup } from '@atproto-labs/fetch-node' import { Agent, Dispatcher, Pool, RetryAgent } from 'undici' +import { isUnicastIp, unicastLookup } from '@atproto-labs/fetch-node' + import { ServerConfig } from '../config' import { RETRYABLE_HTTP_STATUS_CODES } from '../util/retry' diff --git a/packages/bsky/src/api/blob-resolver.ts b/packages/bsky/src/api/blob-resolver.ts index a4dc4faca30..c6cef98c46e 100644 --- a/packages/bsky/src/api/blob-resolver.ts +++ b/packages/bsky/src/api/blob-resolver.ts @@ -1,12 +1,6 @@ import { Duplex, Transform, Writable } from 'node:stream' import { pipeline } from 'node:stream/promises' -import { - ACCEPT_ENCODING_COMPRESSED, - ACCEPT_ENCODING_UNCOMPRESSED, - buildProxiedContentEncoding, - formatAcceptHeader, -} from '@atproto-labs/xrpc-utils' import createError, { isHttpError } from 'http-errors' import { CID } from 'multiformats/cid' import { Dispatcher } from 'undici' @@ -17,6 +11,12 @@ import { createDecoders, } from '@atproto/common' import { AtprotoDid, isAtprotoDid } from '@atproto/did' +import { + ACCEPT_ENCODING_COMPRESSED, + ACCEPT_ENCODING_UNCOMPRESSED, + buildProxiedContentEncoding, + formatAcceptHeader, +} from '@atproto-labs/xrpc-utils' import { ServerConfig } from '../config' import { AppContext } from '../context' diff --git a/packages/internal/did-resolver/src/did-cache-memory.ts b/packages/internal/did-resolver/src/did-cache-memory.ts index 5532d4b4771..1c05bb9739d 100644 --- a/packages/internal/did-resolver/src/did-cache-memory.ts +++ b/packages/internal/did-resolver/src/did-cache-memory.ts @@ -1,10 +1,9 @@ +import { Did, DidDocument } from '@atproto/did' import { SimpleStoreMemory, SimpleStoreMemoryOptions, } from '@atproto-labs/simple-store-memory' -import { Did, DidDocument } from '@atproto/did' - import { DidCache } from './did-cache.js' const DEFAULT_TTL = 3600 * 1000 // 1 hour diff --git a/packages/internal/did-resolver/src/did-cache.ts b/packages/internal/did-resolver/src/did-cache.ts index 9819b90ce48..499f0dc059d 100644 --- a/packages/internal/did-resolver/src/did-cache.ts +++ b/packages/internal/did-resolver/src/did-cache.ts @@ -1,6 +1,5 @@ -import { CachedGetter, SimpleStore } from '@atproto-labs/simple-store' - import { Did, DidDocument } from '@atproto/did' +import { CachedGetter, SimpleStore } from '@atproto-labs/simple-store' import { DidCacheMemory } from './did-cache-memory.js' import { DidMethod, ResolveDidOptions } from './did-method.js' diff --git a/packages/internal/did-resolver/src/did-resolver-base.ts b/packages/internal/did-resolver/src/did-resolver-base.ts index 7814e859001..57401ed8c30 100644 --- a/packages/internal/did-resolver/src/did-resolver-base.ts +++ b/packages/internal/did-resolver/src/did-resolver-base.ts @@ -1,7 +1,7 @@ -import { FetchError, FetchResponseError } from '@atproto-labs/fetch' import { ZodError } from 'zod' import { Did, DidError, extractDidMethod } from '@atproto/did' +import { FetchError, FetchResponseError } from '@atproto-labs/fetch' import { DidMethod, DidMethods, ResolveDidOptions } from './did-method.js' import { DidResolver, ResolvedDocument } from './did-resolver.js' diff --git a/packages/internal/did-resolver/src/methods/plc.ts b/packages/internal/did-resolver/src/methods/plc.ts index 34332e4aa00..263eb034acc 100644 --- a/packages/internal/did-resolver/src/methods/plc.ts +++ b/packages/internal/did-resolver/src/methods/plc.ts @@ -1,3 +1,4 @@ +import { Did, assertDidPlc, didDocumentValidator } from '@atproto/did' import { Fetch, bindFetch, @@ -7,8 +8,6 @@ import { } from '@atproto-labs/fetch' import { pipe } from '@atproto-labs/pipe' -import { Did, assertDidPlc, didDocumentValidator } from '@atproto/did' - import { DidMethod, ResolveDidOptions } from '../did-method.js' const fetchSuccessHandler = pipe( diff --git a/packages/internal/did-resolver/src/methods/web.ts b/packages/internal/did-resolver/src/methods/web.ts index 5fbb20020e5..a0a46dfbb01 100644 --- a/packages/internal/did-resolver/src/methods/web.ts +++ b/packages/internal/did-resolver/src/methods/web.ts @@ -1,3 +1,4 @@ +import { Did, DidError, didDocumentValidator, didWebToUrl } from '@atproto/did' import { Fetch, bindFetch, @@ -7,8 +8,6 @@ import { } from '@atproto-labs/fetch' import { pipe } from '@atproto-labs/pipe' -import { Did, DidError, didDocumentValidator, didWebToUrl } from '@atproto/did' - import { DidMethod, ResolveDidOptions } from '../did-method.js' const fetchSuccessHandler = pipe( diff --git a/packages/internal/fetch-node/src/unicast.ts b/packages/internal/fetch-node/src/unicast.ts index 3f82c7b2658..581255e1656 100644 --- a/packages/internal/fetch-node/src/unicast.ts +++ b/packages/internal/fetch-node/src/unicast.ts @@ -1,6 +1,10 @@ import dns, { LookupAddress } from 'node:dns' import { LookupFunction } from 'node:net' +import ipaddr from 'ipaddr.js' +import { parse as pslParse } from 'psl' +import { Agent, Client } from 'undici' + import { Fetch, FetchContext, @@ -8,9 +12,6 @@ import { asRequest, extractUrl, } from '@atproto-labs/fetch' -import ipaddr from 'ipaddr.js' -import { parse as pslParse } from 'psl' -import { Agent, Client } from 'undici' import { isUnicastIp } from './util.js' diff --git a/packages/internal/fetch/src/fetch-response.ts b/packages/internal/fetch/src/fetch-response.ts index a1b9b037d3e..64669a2c1af 100644 --- a/packages/internal/fetch/src/fetch-response.ts +++ b/packages/internal/fetch/src/fetch-response.ts @@ -1,6 +1,7 @@ -import { Transformer, pipe } from '@atproto-labs/pipe' import type { ParseParams, TypeOf, ZodTypeAny } from 'zod' +import { Transformer, pipe } from '@atproto-labs/pipe' + import { FetchError } from './fetch-error.js' import { TransformedResponse } from './transformed-response.js' import { diff --git a/packages/internal/identity-resolver/src/identity-resolver.ts b/packages/internal/identity-resolver/src/identity-resolver.ts index a1fb799c99f..efbdc4f36a1 100644 --- a/packages/internal/identity-resolver/src/identity-resolver.ts +++ b/packages/internal/identity-resolver/src/identity-resolver.ts @@ -1,3 +1,4 @@ +import { normalizeAndEnsureValidHandle } from '@atproto/syntax' import { Did, DidDocument, @@ -13,8 +14,6 @@ import { isResolvedHandle, } from '@atproto-labs/handle-resolver' -import { normalizeAndEnsureValidHandle } from '@atproto/syntax' - export type ResolvedIdentity = { did: NonNullable pds: URL diff --git a/packages/internal/simple-store-memory/src/index.ts b/packages/internal/simple-store-memory/src/index.ts index d293dfa00f7..8fa2a7a96f9 100644 --- a/packages/internal/simple-store-memory/src/index.ts +++ b/packages/internal/simple-store-memory/src/index.ts @@ -1,6 +1,7 @@ -import { Key, SimpleStore, Value } from '@atproto-labs/simple-store' import { LRUCache } from 'lru-cache' +import { Key, SimpleStore, Value } from '@atproto-labs/simple-store' + import { roughSizeOfObject } from './util.js' export type SimpleStoreMemoryOptions = { diff --git a/packages/oauth/oauth-client-browser-example/rollup.config.js b/packages/oauth/oauth-client-browser-example/rollup.config.js index 5a39393d521..087ab0e2130 100644 --- a/packages/oauth/oauth-client-browser-example/rollup.config.js +++ b/packages/oauth/oauth-client-browser-example/rollup.config.js @@ -1,8 +1,5 @@ /* eslint-env node */ -const { - default: manifest, -} = require('@atproto-labs/rollup-plugin-bundle-manifest') const { default: commonjs } = require('@rollup/plugin-commonjs') const { default: html, makeHtmlAttributes } = require('@rollup/plugin-html') const { default: json } = require('@rollup/plugin-json') @@ -11,6 +8,10 @@ const { default: replace } = require('@rollup/plugin-replace') const { default: terser } = require('@rollup/plugin-terser') const { default: typescript } = require('@rollup/plugin-typescript') const { defineConfig } = require('rollup') + +const { + default: manifest, +} = require('@atproto-labs/rollup-plugin-bundle-manifest') const postcss = ((m) => m.default || m)(require('rollup-plugin-postcss')) const serve = ((m) => m.default || m)(require('rollup-plugin-serve')) diff --git a/packages/oauth/oauth-client-browser/src/browser-oauth-database.ts b/packages/oauth/oauth-client-browser/src/browser-oauth-database.ts index 6cff4e3c765..fe533f75552 100644 --- a/packages/oauth/oauth-client-browser/src/browser-oauth-database.ts +++ b/packages/oauth/oauth-client-browser/src/browser-oauth-database.ts @@ -1,6 +1,3 @@ -import { ResolvedHandle } from '@atproto-labs/handle-resolver' -import { SimpleStore, Value } from '@atproto-labs/simple-store' - import { DidDocument } from '@atproto/did' import { Key } from '@atproto/jwk' import { WebcryptoKey } from '@atproto/jwk-webcrypto' @@ -9,6 +6,8 @@ import { OAuthAuthorizationServerMetadata, OAuthProtectedResourceMetadata, } from '@atproto/oauth-types' +import { ResolvedHandle } from '@atproto-labs/handle-resolver' +import { SimpleStore, Value } from '@atproto-labs/simple-store' import { DB, DBObjectStore } from './indexed-db/index.js' import { TupleUnion } from './util.js' diff --git a/packages/oauth/oauth-client-node/src/node-dpop-store.ts b/packages/oauth/oauth-client-node/src/node-dpop-store.ts index a5ac57ada5c..e68ebed97f9 100644 --- a/packages/oauth/oauth-client-node/src/node-dpop-store.ts +++ b/packages/oauth/oauth-client-node/src/node-dpop-store.ts @@ -1,8 +1,7 @@ -import { SimpleStore } from '@atproto-labs/simple-store' - import { Jwk, Key } from '@atproto/jwk' import { JoseKey } from '@atproto/jwk-jose' import { InternalStateData, Session } from '@atproto/oauth-client' +import { SimpleStore } from '@atproto-labs/simple-store' type ToDpopJwkValue = Omit & { dpopJwk: Jwk diff --git a/packages/oauth/oauth-client-node/src/node-oauth-client.ts b/packages/oauth/oauth-client-node/src/node-oauth-client.ts index 0480379999a..40c5f0e4b91 100644 --- a/packages/oauth/oauth-client-node/src/node-oauth-client.ts +++ b/packages/oauth/oauth-client-node/src/node-oauth-client.ts @@ -1,10 +1,5 @@ import { createHash, randomBytes } from 'node:crypto' -import { - AtprotoHandleResolverNode, - AtprotoHandleResolverNodeOptions, -} from '@atproto-labs/handle-resolver-node' - import { JoseKey } from '@atproto/jwk-jose' import { OAuthClient, @@ -13,6 +8,10 @@ import { RuntimeLock, } from '@atproto/oauth-client' import { OAuthResponseMode } from '@atproto/oauth-types' +import { + AtprotoHandleResolverNode, + AtprotoHandleResolverNodeOptions, +} from '@atproto-labs/handle-resolver-node' import { NodeSavedSessionStore, diff --git a/packages/oauth/oauth-client/src/fetch-dpop.ts b/packages/oauth/oauth-client/src/fetch-dpop.ts index a5cfd576e14..66b07b81de2 100644 --- a/packages/oauth/oauth-client/src/fetch-dpop.ts +++ b/packages/oauth/oauth-client/src/fetch-dpop.ts @@ -1,8 +1,8 @@ -import { Fetch, FetchContext, cancelBody, peekJson } from '@atproto-labs/fetch' -import { SimpleStore } from '@atproto-labs/simple-store' import { base64url } from 'multiformats/bases/base64' import { Key } from '@atproto/jwk' +import { Fetch, FetchContext, cancelBody, peekJson } from '@atproto-labs/fetch' +import { SimpleStore } from '@atproto-labs/simple-store' // "undefined" in non https environments or environments without crypto const subtle = globalThis.crypto?.subtle as SubtleCrypto | undefined diff --git a/packages/oauth/oauth-client/src/oauth-authorization-server-metadata-resolver.ts b/packages/oauth/oauth-client/src/oauth-authorization-server-metadata-resolver.ts index ebfd68c91e8..49498c4d8fe 100644 --- a/packages/oauth/oauth-client/src/oauth-authorization-server-metadata-resolver.ts +++ b/packages/oauth/oauth-client/src/oauth-authorization-server-metadata-resolver.ts @@ -1,3 +1,8 @@ +import { + OAuthAuthorizationServerMetadata, + oauthAuthorizationServerMetadataValidator, + oauthIssuerIdentifierSchema, +} from '@atproto/oauth-types' import { Fetch, FetchResponseError, @@ -10,12 +15,6 @@ import { SimpleStore, } from '@atproto-labs/simple-store' -import { - OAuthAuthorizationServerMetadata, - oauthAuthorizationServerMetadataValidator, - oauthIssuerIdentifierSchema, -} from '@atproto/oauth-types' - import { contentMime } from './util.js' export type { GetCachedOptions, OAuthAuthorizationServerMetadata } diff --git a/packages/oauth/oauth-client/src/oauth-client.ts b/packages/oauth/oauth-client/src/oauth-client.ts index 10bd81c96ba..e9ecfff0d47 100644 --- a/packages/oauth/oauth-client/src/oauth-client.ts +++ b/packages/oauth/oauth-client/src/oauth-client.ts @@ -1,3 +1,12 @@ +import { Key, Keyset } from '@atproto/jwk' +import { + OAuthAuthorizationRequestParameters, + OAuthClientIdDiscoverable, + OAuthClientMetadata, + OAuthClientMetadataInput, + OAuthResponseMode, + oauthClientMetadataSchema, +} from '@atproto/oauth-types' import { AtprotoDid, DidCache, @@ -17,16 +26,6 @@ import { import { IdentityResolver } from '@atproto-labs/identity-resolver' import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory' -import { Key, Keyset } from '@atproto/jwk' -import { - OAuthAuthorizationRequestParameters, - OAuthClientIdDiscoverable, - OAuthClientMetadata, - OAuthClientMetadataInput, - OAuthResponseMode, - oauthClientMetadataSchema, -} from '@atproto/oauth-types' - import { FALLBACK_ALG } from './constants.js' import { TokenRevokedError } from './errors/token-revoked-error.js' import { diff --git a/packages/oauth/oauth-client/src/oauth-protected-resource-metadata-resolver.ts b/packages/oauth/oauth-client/src/oauth-protected-resource-metadata-resolver.ts index 807c33063fa..faa74a1c8b3 100644 --- a/packages/oauth/oauth-client/src/oauth-protected-resource-metadata-resolver.ts +++ b/packages/oauth/oauth-client/src/oauth-protected-resource-metadata-resolver.ts @@ -1,3 +1,7 @@ +import { + OAuthProtectedResourceMetadata, + oauthProtectedResourceMetadataSchema, +} from '@atproto/oauth-types' import { Fetch, FetchResponseError, @@ -10,11 +14,6 @@ import { SimpleStore, } from '@atproto-labs/simple-store' -import { - OAuthProtectedResourceMetadata, - oauthProtectedResourceMetadataSchema, -} from '@atproto/oauth-types' - import { contentMime } from './util.js' export type { GetCachedOptions, OAuthProtectedResourceMetadata } diff --git a/packages/oauth/oauth-client/src/oauth-resolver.ts b/packages/oauth/oauth-client/src/oauth-resolver.ts index ebace316595..19b20cb9f48 100644 --- a/packages/oauth/oauth-client/src/oauth-resolver.ts +++ b/packages/oauth/oauth-client/src/oauth-resolver.ts @@ -1,14 +1,13 @@ +import { + OAuthAuthorizationServerMetadata, + oauthIssuerIdentifierSchema, +} from '@atproto/oauth-types' import { IdentityResolver, ResolveIdentityOptions, ResolvedIdentity, } from '@atproto-labs/identity-resolver' -import { - OAuthAuthorizationServerMetadata, - oauthIssuerIdentifierSchema, -} from '@atproto/oauth-types' - import { GetCachedOptions, OAuthAuthorizationServerMetadataResolver, diff --git a/packages/oauth/oauth-client/src/oauth-server-agent.ts b/packages/oauth/oauth-client/src/oauth-server-agent.ts index ec7cc39c9a8..4a5b3d45bb4 100644 --- a/packages/oauth/oauth-client/src/oauth-server-agent.ts +++ b/packages/oauth/oauth-client/src/oauth-server-agent.ts @@ -1,6 +1,3 @@ -import { Fetch, Json, bindFetch, fetchJsonProcessor } from '@atproto-labs/fetch' -import { SimpleStore } from '@atproto-labs/simple-store' - import { AtprotoDid } from '@atproto/did' import { Key, Keyset } from '@atproto/jwk' import { @@ -13,6 +10,8 @@ import { OAuthTokenRequest, oauthParResponseSchema, } from '@atproto/oauth-types' +import { Fetch, Json, bindFetch, fetchJsonProcessor } from '@atproto-labs/fetch' +import { SimpleStore } from '@atproto-labs/simple-store' import { AtprotoScope, diff --git a/packages/oauth/oauth-client/src/oauth-server-factory.ts b/packages/oauth/oauth-client/src/oauth-server-factory.ts index cffd76fa177..b72313f6a48 100644 --- a/packages/oauth/oauth-client/src/oauth-server-factory.ts +++ b/packages/oauth/oauth-client/src/oauth-server-factory.ts @@ -1,7 +1,6 @@ -import { Fetch } from '@atproto-labs/fetch' - import { Key, Keyset } from '@atproto/jwk' import { OAuthAuthorizationServerMetadata } from '@atproto/oauth-types' +import { Fetch } from '@atproto-labs/fetch' import { GetCachedOptions } from './oauth-authorization-server-metadata-resolver.js' import { OAuthResolver } from './oauth-resolver.js' diff --git a/packages/oauth/oauth-client/src/oauth-session.ts b/packages/oauth/oauth-client/src/oauth-session.ts index 8d03415924e..aebeedc0426 100644 --- a/packages/oauth/oauth-client/src/oauth-session.ts +++ b/packages/oauth/oauth-client/src/oauth-session.ts @@ -1,7 +1,6 @@ -import { Fetch, bindFetch } from '@atproto-labs/fetch' - import { AtprotoDid } from '@atproto/did' import { OAuthAuthorizationServerMetadata } from '@atproto/oauth-types' +import { Fetch, bindFetch } from '@atproto-labs/fetch' import { AtprotoScope } from './atproto-token-response.js' import { TokenInvalidError } from './errors/token-invalid-error.js' diff --git a/packages/oauth/oauth-client/src/session-getter.ts b/packages/oauth/oauth-client/src/session-getter.ts index cc7665f8963..94993a1291d 100644 --- a/packages/oauth/oauth-client/src/session-getter.ts +++ b/packages/oauth/oauth-client/src/session-getter.ts @@ -1,12 +1,11 @@ +import { AtprotoDid } from '@atproto/did' +import { Key } from '@atproto/jwk' import { CachedGetter, GetCachedOptions, SimpleStore, } from '@atproto-labs/simple-store' -import { AtprotoDid } from '@atproto/did' -import { Key } from '@atproto/jwk' - import { TokenInvalidError } from './errors/token-invalid-error.js' import { TokenRefreshError } from './errors/token-refresh-error.js' import { TokenRevokedError } from './errors/token-revoked-error.js' diff --git a/packages/oauth/oauth-client/src/state-store.ts b/packages/oauth/oauth-client/src/state-store.ts index cd0e7fdabfb..0cafecfdc58 100644 --- a/packages/oauth/oauth-client/src/state-store.ts +++ b/packages/oauth/oauth-client/src/state-store.ts @@ -1,6 +1,5 @@ -import { SimpleStore } from '@atproto-labs/simple-store' - import { Key } from '@atproto/jwk' +import { SimpleStore } from '@atproto-labs/simple-store' export type InternalStateData = { iss: string diff --git a/packages/oauth/oauth-provider/rollup.config.js b/packages/oauth/oauth-provider/rollup.config.js index f2fcb9b279b..416f23169bc 100644 --- a/packages/oauth/oauth-provider/rollup.config.js +++ b/packages/oauth/oauth-provider/rollup.config.js @@ -1,14 +1,15 @@ /* eslint-env node */ -const { - default: manifest, -} = require('@atproto-labs/rollup-plugin-bundle-manifest') const { default: commonjs } = require('@rollup/plugin-commonjs') const { default: nodeResolve } = require('@rollup/plugin-node-resolve') const { default: replace } = require('@rollup/plugin-replace') const { default: terser } = require('@rollup/plugin-terser') const { default: typescript } = require('@rollup/plugin-typescript') const { defineConfig } = require('rollup') + +const { + default: manifest, +} = require('@atproto-labs/rollup-plugin-bundle-manifest') const postcss = ((m) => m.default || m)(require('rollup-plugin-postcss')) module.exports = defineConfig((commandLineArguments) => { diff --git a/packages/oauth/oauth-provider/src/client/client-manager.ts b/packages/oauth/oauth-provider/src/client/client-manager.ts index 61ad69c6532..32bd2d3365c 100644 --- a/packages/oauth/oauth-provider/src/client/client-manager.ts +++ b/packages/oauth/oauth-provider/src/client/client-manager.ts @@ -1,3 +1,15 @@ +import { Jwks, Keyset, jwksSchema } from '@atproto/jwk' +import { + OAuthAuthorizationServerMetadata, + OAuthClientIdDiscoverable, + OAuthClientIdLoopback, + OAuthClientMetadata, + OAuthClientMetadataInput, + isLoopbackHost, + isOAuthClientIdDiscoverable, + isOAuthClientIdLoopback, + oauthClientMetadataSchema, +} from '@atproto/oauth-types' import { Fetch, bindFetch, @@ -12,19 +24,6 @@ import { SimpleStore, } from '@atproto-labs/simple-store' -import { Jwks, Keyset, jwksSchema } from '@atproto/jwk' -import { - OAuthAuthorizationServerMetadata, - OAuthClientIdDiscoverable, - OAuthClientIdLoopback, - OAuthClientMetadata, - OAuthClientMetadataInput, - isLoopbackHost, - isOAuthClientIdDiscoverable, - isOAuthClientIdLoopback, - oauthClientMetadataSchema, -} from '@atproto/oauth-types' - import { InvalidClientMetadataError } from '../errors/invalid-client-metadata-error.js' import { InvalidRedirectUriError } from '../errors/invalid-redirect-uri-error.js' import { callAsync } from '../lib/util/function.js' diff --git a/packages/oauth/oauth-provider/src/errors/invalid-client-metadata-error.ts b/packages/oauth/oauth-provider/src/errors/invalid-client-metadata-error.ts index 6bbe108ad20..ebcdcae31a6 100644 --- a/packages/oauth/oauth-provider/src/errors/invalid-client-metadata-error.ts +++ b/packages/oauth/oauth-provider/src/errors/invalid-client-metadata-error.ts @@ -1,6 +1,7 @@ -import { FetchError } from '@atproto-labs/fetch' import { ZodError } from 'zod' +import { FetchError } from '@atproto-labs/fetch' + import { OAuthError } from './oauth-error.js' /** diff --git a/packages/oauth/oauth-provider/src/oauth-provider.ts b/packages/oauth/oauth-provider/src/oauth-provider.ts index 52d09d65ff9..6a434bf906b 100644 --- a/packages/oauth/oauth-provider/src/oauth-provider.ts +++ b/packages/oauth/oauth-provider/src/oauth-provider.ts @@ -1,6 +1,3 @@ -import { safeFetchWrap } from '@atproto-labs/fetch-node' -import { SimpleStore } from '@atproto-labs/simple-store' -import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory' import { mediaType } from '@hapi/accept' import createHttpError from 'http-errors' import type { Redis, RedisOptions } from 'ioredis' @@ -34,6 +31,9 @@ import { oauthTokenIdentificationSchema, oauthTokenRequestSchema, } from '@atproto/oauth-types' +import { safeFetchWrap } from '@atproto-labs/fetch-node' +import { SimpleStore } from '@atproto-labs/simple-store' +import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory' import { AccessTokenType } from './access-token/access-token-type.js' import { AccountManager } from './account/account-manager.js' diff --git a/packages/pds/src/context.ts b/packages/pds/src/context.ts index bccf6b0ee84..e8f2d2286ad 100644 --- a/packages/pds/src/context.ts +++ b/packages/pds/src/context.ts @@ -1,12 +1,5 @@ import assert from 'node:assert' -import { - Fetch, - isUnicastIp, - loggedFetch, - safeFetchWrap, - unicastLookup, -} from '@atproto-labs/fetch-node' import * as plc from '@did-plc/lib' import { Redis } from 'ioredis' import * as nodemailer from 'nodemailer' @@ -25,6 +18,13 @@ import { createServiceAuthHeaders, createServiceJwt, } from '@atproto/xrpc-server' +import { + Fetch, + isUnicastIp, + loggedFetch, + safeFetchWrap, + unicastLookup, +} from '@atproto-labs/fetch-node' import { AccountManager } from './account-manager' import { ActorStore } from './actor-store' diff --git a/packages/pds/src/pipethrough.ts b/packages/pds/src/pipethrough.ts index 066c8cd95a2..6364d97af38 100644 --- a/packages/pds/src/pipethrough.ts +++ b/packages/pds/src/pipethrough.ts @@ -1,7 +1,6 @@ import { IncomingHttpHeaders, ServerResponse } from 'node:http' import { PassThrough, Readable } from 'node:stream' -import { buildProxiedContentEncoding } from '@atproto-labs/xrpc-utils' import express from 'express' import { Dispatcher } from 'undici' @@ -21,6 +20,7 @@ import { XRPCError as XRPCServerError, parseReqNsid, } from '@atproto/xrpc-server' +import { buildProxiedContentEncoding } from '@atproto-labs/xrpc-utils' import { AppContext } from './context' import { ids } from './lexicon/lexicons'