refactor: remove html & http-util as standalone lib

bluesky-social · Apr 24, 2024 · f3dca7a · f3dca7a
1 parent ab109f6
commit f3dca7a
Show file tree

Hide file tree

Showing 72 changed files with 111 additions and 422 deletions.
diff --git a/packages/html/TODO.md b/packages/html/TODO.md
diff --git a/packages/html/package.json b/packages/html/package.json
diff --git a/packages/html/tsconfig.json b/packages/html/tsconfig.json
diff --git a/packages/http-util/TODO.md b/packages/http-util/TODO.md
diff --git a/packages/http-util/package.json b/packages/http-util/package.json
diff --git a/packages/http-util/src/server.ts b/packages/http-util/src/server.ts
diff --git a/packages/http-util/tsconfig.json b/packages/http-util/tsconfig.json
diff --git a/packages/oauth-provider/package.json b/packages/oauth-provider/package.json
@@ -30,13 +30,14 @@
   "dependencies": {
     "@atproto/fetch": "workspace:*",
     "@atproto/fetch-node": "workspace:*",
-    "@atproto/html": "workspace:*",
-    "@atproto/http-util": "workspace:*",
     "@atproto/jwk": "workspace:*",
     "@atproto/jwk-node": "workspace:*",
     "@atproto/oauth-client-metadata": "workspace:*",
     "@atproto/oauth-server-metadata": "workspace:*",
+    "@hapi/accept": "^6.0.3",
+    "@hapi/bourne": "^3.0.0",
     "cookie": "^0.6.0",
+    "http-errors": "^2.0.0",
     "jose": "^5.2.0",
     "keygrip": "^1.1.0",
     "oidc-token-hash": "^5.0.3",

diff --git a/packages/oauth-provider/src/account/account-hooks.ts b/packages/oauth-provider/src/account/account-hooks.ts
@@ -1,7 +1,7 @@
 import { Client } from '../client/client.js'
 import { DeviceId } from '../device/device-id.js'
+import { Awaitable } from '../lib/util/type.js'
 import { ClientAuth } from '../token/token-store.js'
-import { Awaitable } from '../util/awaitable.js'
 import { Account } from './account-store.js'
 // https://github.com/typescript-eslint/typescript-eslint/issues/8902
 // eslint-disable-next-line

diff --git a/packages/oauth-provider/src/account/account-manager.ts b/packages/oauth-provider/src/account/account-manager.ts
@@ -3,7 +3,7 @@ import { DeviceId } from '../device/device-id.js'
 import { InvalidRequestError } from '../oauth-errors.js'
 import { Sub } from '../oidc/sub.js'
 import { ClientAuth } from '../token/token-store.js'
-import { constantTime } from '../util/time.js'
+import { constantTime } from '../lib/util/time.js'
 import { AccountHooks } from './account-hooks.js'
 import {
   Account,

diff --git a/packages/oauth-provider/src/account/account-store.ts b/packages/oauth-provider/src/account/account-store.ts
@@ -1,8 +1,8 @@
 import { OAuthClientId } from '@atproto/oauth-client-metadata'
 
 import { DeviceId } from '../device/device-id.js'
+import { Awaitable } from '../lib/util/type.js'
 import { Sub } from '../oidc/sub.js'
-import { Awaitable } from '../util/awaitable.js'
 import { Account } from './account.js'
 
 export type LoginCredentials = {

diff --git a/packages/oauth-provider/src/account/account.ts b/packages/oauth-provider/src/account/account.ts
@@ -1,6 +1,6 @@
 import { OIDCStandardPayload } from '../oidc/claims.js'
 import { Sub } from '../oidc/sub.js'
-import { Simplify } from '../util/type.js'
+import { Simplify } from '../lib/util/type.js'
 
 export type Account = Simplify<
   {

diff --git a/packages/oauth-provider/src/assets/assets-middleware.ts b/packages/oauth-provider/src/assets/assets-middleware.ts
@@ -1,4 +1,4 @@
-import { writeStream } from '@atproto/http-util'
+import { writeStream } from '../lib/http/index.js'
 
 import { ASSETS_URL_PREFIX, getAsset } from './index.js'
 

diff --git a/packages/oauth-provider/src/client/client-hooks.ts b/packages/oauth-provider/src/client/client-hooks.ts
@@ -3,7 +3,7 @@ import {
   OAuthClientId,
   OAuthClientMetadata,
 } from '@atproto/oauth-client-metadata'
-import { Awaitable } from '../util/awaitable.js'
+import { Awaitable } from '../lib/util/type.js'
 
 /**
  * Use this to alter, override or validate the client metadata & jwks returned

diff --git a/packages/oauth-provider/src/client/client-store.ts b/packages/oauth-provider/src/client/client-store.ts
@@ -2,7 +2,7 @@ import {
   OAuthClientId,
   OAuthClientMetadata,
 } from '@atproto/oauth-client-metadata'
-import { Awaitable } from '../util/awaitable.js'
+import { Awaitable } from '../lib/util/type.js'
 import { ClientData } from './client-data.js'
 
 // Export all types needed to implement the ClientStore interface

diff --git a/packages/oauth-provider/src/device/device-data.ts b/packages/oauth-provider/src/device/device-data.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
 
 import { SESSION_ID_BYTES_LENGTH, SESSION_ID_PREFIX } from '../constants.js'
-import { randomHexId } from '../util/crypto.js'
+import { randomHexId } from '../lib/util/crypto.js'
 import { deviceDetailsSchema } from './device-details.js'
 
 export const sessionIdSchema = z

diff --git a/packages/oauth-provider/src/device/device-id.ts b/packages/oauth-provider/src/device/device-id.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
 
 import { DEVICE_ID_BYTES_LENGTH, DEVICE_ID_PREFIX } from '../constants.js'
-import { randomHexId } from '../util/crypto.js'
+import { randomHexId } from '../lib/util/crypto.js'
 
 export const deviceIdSchema = z
   .string()