tidy

.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

.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": {

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'
 

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'

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

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'

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'

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(

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(

packages/internal/fetch-node/src/unicast.ts

@@ -1,16 +1,17 @@
 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,
   FetchRequestError,
   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'
 

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 {

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<ResolvedHandle>
   pds: URL

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<K extends Key, V extends Value> = {

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'))
 

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'

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<V extends { dpopKey: Key }> = Omit<V, 'dpopKey'> & {
   dpopJwk: Jwk

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,

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

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 }

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 {

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 }

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,

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,

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'

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'

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'

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