comparing d5b45a1f725bb866fe31e4d1d39c910273360728 and main on cduck.me/statusphere-example-app-fork

+8 -6

.env.template

···

       1
       1
        
       # Environment Configuration

     

       2
       2
       -
       NODE_ENV="development" # Options: 'development', 'production'

     

       3
       3
       -
       PORT="8080"            # The port your server will listen on

     

       4
       4
       -
       PUBLIC_URL=""          # Set when deployed publicly, e.g. "https://mysite.com". Informs OAuth client id.

     

       5
       5
       -
       DB_PATH="db.sqlite"    # The SQLite database path. Set as ":memory:" to use a temporary in-memory database.

     

       2
       2
       +
       NODE_ENV="development"     # Options: 'development', 'production'

     

       3
       3
       +
       PORT="8080"                # The port your server will listen on

     

       4
       4
       +
       DB_PATH=":memory:"         # The SQLite database path. Set as ":memory:" to use a temporary in-memory database.

     

       5
       5
       +
       # PUBLIC_URL=""            # Set when deployed publicly, e.g. "https://mysite.com". Informs OAuth client id.

     

       6
       6
       +
       # LOG_LEVEL="info"         # Options: 'fatal', 'error', 'warn', 'info', 'debug'

     

       7
       7
       +
       # PDS_URL="https://my.pds" # The default PDS for login and sign-ups

     

       6
       8
        
       

     

       7
       7
       -
       # Secrets: *MUST* set this in production

     

       9
       9
       +
       # Secrets below *MUST* be set in production

     

       8
       10
        
       

     

       9
       11
        
       # May be generated with `openssl rand -base64 33`

     

       10
       12
        
       # COOKIE_SECRET=""

     

       11
       13
        
       

     

       12
       14
        
       # May be generated with `./bin/gen-jwk` (requires `npm install` once first)

     

       13
       13
       -
       # PRIVATE_JWKS='[{"kty":"EC","kid":"123",...}]'

     

       15
       15
       +
       # PRIVATE_KEYS='[{"kty":"EC","kid":"123",...}]'

+2 -2

.gitignore

···

       14
       14
        
       dist-ssr

     

       15
       15
        
       *.local

     

       16
       16
        
       .env

     

       17
       17
       +
       *.sqlite

     

       17
       18
        
       

     

       18
       19
        
       # Editor directories and files

     

       19
       20
        
       !.vscode/extensions.json

     
···

       23
       24
        
       *.ntvs*

     

       24
       25
        
       *.njsproj

     

       25
       26
        
       *.sln

     

       26
       26
       -
       *.sw?

     

       27
       27
       -
       *.sqlite

     

       27
       27
       +
       *.sw?

+2 -8

.vscode/settings.json

···

       1
       1
        
       {

     

       2
       2
        
         "editor.formatOnSave": true,

     

       3
       3
       -
         "editor.defaultFormatter": "biomejs.biome",

     

       3
       3
       +
         "editor.defaultFormatter": "esbenp.prettier-vscode",

     

       4
       4
        
         "editor.codeActionsOnSave": {

     

       5
       5
        
           "quickfix.biome": "explicit",

     

       6
       6
        
           "source.organizeImports.biome": "explicit",

     
···

       11
       11
        
             "url": "https://cdn.jsdelivr.net/npm/tsup/schema.json",

     

       12
       12
        
             "fileMatch": ["package.json", "tsup.config.json"]

     

       13
       13
        
           }

     

       14
       14
       -
         ],

     

       15
       15
       -
         "[typescript]": {

     

       16
       16
       -
           "editor.defaultFormatter": "esbenp.prettier-vscode"

     

       17
       17
       -
         },

     

       18
       18
       -
         "[javascript]": {

     

       19
       19
       -
           "editor.defaultFormatter": "esbenp.prettier-vscode"

     

       20
       20
       -
         }

     

       14
       14
       +
         ]

     

       21
       15
        
       }

+42

README.md

···

       19
       19
        
       npm run dev

     

       20
       20
        
       # Navigate to http://localhost:8080

     

       21
       21
        
       ```

     

       22
       22
       +
       

     

       23
       23
       +
       ## Deploying

     

       24
       24
       +
       

     

       25
       25
       +
       In production, you will need a private key to sign OAuth tokens request. Use the

     

       26
       26
       +
       following command to generate a new private key:

     

       27
       27
       +
       

     

       28
       28
       +
       ```sh

     

       29
       29
       +
       ./bin/gen-jwk

     

       30
       30
       +
       ```

     

       31
       31
       +
       

     

       32
       32
       +
       The generated key must be added to the environment variables (`.env` file) in `PRIVATE_KEYS`.

     

       33
       33
       +
       

     

       34
       34
       +
       ```env

     

       35
       35
       +
       PRIVATE_KEYS='[{"kty":"EC","kid":"12",...}]'

     

       36
       36
       +
       ```

     

       37
       37
       +
       

     

       38
       38
       +
       > [!NOTE]

     

       39
       39
       +
       >

     

       40
       40
       +
       > The `PRIVATE_KEYS` can contain multiple keys. The first key in the array is

     

       41
       41
       +
       > the most recent one, and it will be used to sign new tokens. When a key is

     

       42
       42
       +
       > removed, all associated sessions will be invalidated.

     

       43
       43
       +
       

     

       44
       44
       +
       Make sure to also set the `COOKIE_SECRET`, which is used to sign session

     

       45
       45
       +
       cookies, in your environment variables (`.env` file). You should use a random

     

       46
       46
       +
       string for this:

     

       47
       47
       +
       

     

       48
       48
       +
       ```sh

     

       49
       49
       +
       openssl rand -base64 33

     

       50
       50
       +
       ```

     

       51
       51
       +
       

     

       52
       52
       +
       Finally, set the `PUBLIC_URL` to the URL where your app will be accessible. This

     

       53
       53
       +
       will allow the authorization servers to download the app's public keys.

     

       54
       54
       +
       

     

       55
       55
       +
       ```env

     

       56
       56
       +
       PUBLIC_URL="https://your-app-url.com"

     

       57
       57
       +
       ```

     

       58
       58
       +
       

     

       59
       59
       +
       > [!NOTE]

     

       60
       60
       +
       >

     

       61
       61
       +
       > You can use services like [ngrok](https://ngrok.com/) to expose your local

     

       62
       62
       +
       > server to the internet for testing purposes. Just set the `PUBLIC_URL` to the

     

       63
       63
       +
       > ngrok URL.

+1 -1

bin/gen-jwk

···

       2
       2
        
       

     

       3
       3
        
       'use strict'

     

       4
       4
        
       

     

       5
       5
       -
       const { JoseKey } = require('@atproto/jwk-jose')

     

       5
       5
       +
       const { JoseKey } = require('@atproto/oauth-client-node')

     

       6
       6
        
       

     

       7
       7
        
       async function main() {

     

       8
       8
        
         const kid = Date.now().toString()

+50 -52

package-lock.json

···

       12
       12
        
               "@atproto/api": "^0.15.6",

     

       13
       13
        
               "@atproto/common": "^0.4.11",

     

       14
       14
        
               "@atproto/identity": "^0.4.8",

     

       15
       15
       -
               "@atproto/jwk-jose": "^0.1.8",

     

       16
       15
        
               "@atproto/lexicon": "^0.4.11",

     

       17
       17
       -
               "@atproto/oauth-client-node": "^0.2.24",

     

       16
       16
       +
               "@atproto/oauth-client-node": "^0.3.1",

     

       18
       17
        
               "@atproto/sync": "^0.1.26",

     

       19
       18
        
               "@atproto/syntax": "^0.4.0",

     

       20
       19
        
               "@atproto/xrpc-server": "^0.8.0",

     
···

       43
       42
        
             }

     

       44
       43
        
           },

     

       45
       44
        
           "node_modules/@atproto-labs/did-resolver": {

     

       46
       46
       -
             "version": "0.1.13",

     

       47
       47
       -
             "resolved": "https://registry.npmjs.org/@atproto-labs/did-resolver/-/did-resolver-0.1.13.tgz",

     

       48
       48
       -
             "integrity": "sha512-DG3YNaCKc6PAIv1Gsz3E1Kufw2t14OBxe4LdKK7KKLCNoex51hm+A5yMevShe3BSll+QosqWYIEgkPSc5xBoGQ==",

     

       45
       45
       +
             "version": "0.2.0",

     

       46
       46
       +
             "resolved": "https://registry.npmjs.org/@atproto-labs/did-resolver/-/did-resolver-0.2.0.tgz",

     

       47
       47
       +
             "integrity": "sha512-y9GOx2gUETynDKmANnBrU5DTf+u0AwKBJpGns1vDDOYMdLdRCFIeYy3UH+TI8YOkcEazjgF5Q3m+LjwriE1KqQ==",

     

       49
       48
        
             "license": "MIT",

     

       50
       49
        
             "dependencies": {

     

       51
       50
        
               "@atproto-labs/fetch": "0.2.3",

     
···

       90
       89
        
             }

     

       91
       90
        
           },

     

       92
       91
        
           "node_modules/@atproto-labs/handle-resolver": {

     

       93
       93
       -
             "version": "0.1.8",

     

       94
       94
       -
             "resolved": "https://registry.npmjs.org/@atproto-labs/handle-resolver/-/handle-resolver-0.1.8.tgz",

     

       95
       95
       -
             "integrity": "sha512-Y0ckccoCGDo/3g4thPkgp9QcORmc+qqEaCBCYCZYtfLIQp4775u22wd+4fyEyJP4DqoReKacninkICgRGfs3dQ==",

     

       92
       92
       +
             "version": "0.3.0",

     

       93
       93
       +
             "resolved": "https://registry.npmjs.org/@atproto-labs/handle-resolver/-/handle-resolver-0.3.0.tgz",

     

       94
       94
       +
             "integrity": "sha512-TREelvXB6P2eHxx6QjINRkBzUZu/aXWrdY9iN57shQe3C8rzsHNEHHuTVvRa33Hc7vFdQbZN0TnCgKveoyiL/A==",

     

       96
       95
        
             "license": "MIT",

     

       97
       96
        
             "dependencies": {

     

       98
       97
        
               "@atproto-labs/simple-store": "0.2.0",

     
···

       102
       101
        
             }

     

       103
       102
        
           },

     

       104
       103
        
           "node_modules/@atproto-labs/handle-resolver-node": {

     

       105
       105
       -
             "version": "0.1.16",

     

       106
       106
       -
             "resolved": "https://registry.npmjs.org/@atproto-labs/handle-resolver-node/-/handle-resolver-node-0.1.16.tgz",

     

       107
       107
       -
             "integrity": "sha512-i2F989zjyC7b/odrV3/tOpIT1IDIxR3F0khPG4REfOWcmJ89QcP8BiejJ6KFJk3hbTJHq6X9/pTG1vesCvyIKA==",

     

       104
       104
       +
             "version": "0.1.18",

     

       105
       105
       +
             "resolved": "https://registry.npmjs.org/@atproto-labs/handle-resolver-node/-/handle-resolver-node-0.1.18.tgz",

     

       106
       106
       +
             "integrity": "sha512-/qo14c3I+kagT1UWSp3lTIzwDetfkxvF3Y3VlX2NyQ2jHwgtIAJ81KFNqe7t82NpQDjWiM5h4bdjvdbFIh5djQ==",

     

       108
       107
        
             "license": "MIT",

     

       109
       108
        
             "dependencies": {

     

       110
       109
        
               "@atproto-labs/fetch-node": "0.1.9",

     

       111
       111
       -
               "@atproto-labs/handle-resolver": "0.1.8",

     

       110
       110
       +
               "@atproto-labs/handle-resolver": "0.3.0",

     

       112
       111
        
               "@atproto/did": "0.1.5"

     

       113
       112
        
             },

     

       114
       113
        
             "engines": {

     
···

       116
       115
        
             }

     

       117
       116
        
           },

     

       118
       117
        
           "node_modules/@atproto-labs/identity-resolver": {

     

       119
       119
       -
             "version": "0.1.18",

     

       120
       120
       -
             "resolved": "https://registry.npmjs.org/@atproto-labs/identity-resolver/-/identity-resolver-0.1.18.tgz",

     

       121
       121
       -
             "integrity": "sha512-DArYXP1hzZJIBcojun0CWEF+TjAhlGKcVq/RwLiGfY1mKq2yPjCiXyHj+5L0+z9jBSZiAB7L65JgcjI2+MFiRg==",

     

       118
       118
       +
             "version": "0.2.0",

     

       119
       119
       +
             "resolved": "https://registry.npmjs.org/@atproto-labs/identity-resolver/-/identity-resolver-0.2.0.tgz",

     

       120
       120
       +
             "integrity": "sha512-X4UpU9qSgbuBVRXw0kpYqdVRtjNGezmaetyQIwWHNdUl1+ILu4GhinSk1MBXamzgg/07/BVCU0r4LRIPg2Wiow==",

     

       122
       121
        
             "license": "MIT",

     

       123
       122
        
             "dependencies": {

     

       124
       124
       -
               "@atproto-labs/did-resolver": "0.1.13",

     

       125
       125
       -
               "@atproto-labs/handle-resolver": "0.1.8",

     

       126
       126
       -
               "@atproto/syntax": "0.4.0"

     

       123
       123
       +
               "@atproto-labs/did-resolver": "0.2.0",

     

       124
       124
       +
               "@atproto-labs/handle-resolver": "0.3.0"

     

       127
       125
        
             }

     

       128
       126
        
           },

     

       129
       127
        
           "node_modules/@atproto-labs/pipe": {

     
···

       277
       275
        
             }

     

       278
       276
        
           },

     

       279
       277
        
           "node_modules/@atproto/jwk": {

     

       280
       280
       -
             "version": "0.3.0",

     

       281
       281
       -
             "resolved": "https://registry.npmjs.org/@atproto/jwk/-/jwk-0.3.0.tgz",

     

       282
       282
       -
             "integrity": "sha512-MIAXyNMGu1tCNHjqW/8jqfE/wgWCIoK2cJ0mR6UxwhNPvkbe35TcpRYJdtQu/E6MUd7TziyDBa/GO4dKAiePhQ==",

     

       278
       278
       +
             "version": "0.4.0",

     

       279
       279
       +
             "resolved": "https://registry.npmjs.org/@atproto/jwk/-/jwk-0.4.0.tgz",

     

       280
       280
       +
             "integrity": "sha512-tvp4iZrzqEzKCeTOKz50/o6WdsZzOuWmWjF6On5QAp04fLwLpsFu2Hixgx/lA1KBO0O4sns7YSGcAqSSX6Rdog==",

     

       283
       281
        
             "license": "MIT",

     

       284
       282
        
             "dependencies": {

     

       285
       283
        
               "multiformats": "^9.9.0",

     
···

       287
       285
        
             }

     

       288
       286
        
           },

     

       289
       287
        
           "node_modules/@atproto/jwk-jose": {

     

       290
       290
       -
             "version": "0.1.8",

     

       291
       291
       -
             "resolved": "https://registry.npmjs.org/@atproto/jwk-jose/-/jwk-jose-0.1.8.tgz",

     

       292
       292
       -
             "integrity": "sha512-aoU2Q0GpIl388KhCcv9YvAxNscALUv3xzLq5gjVPdJ+zmqw94nGZNcjiNvpnbfS+VQM9e2DrrTuwmDXnxfrrSA==",

     

       288
       288
       +
             "version": "0.1.9",

     

       289
       289
       +
             "resolved": "https://registry.npmjs.org/@atproto/jwk-jose/-/jwk-jose-0.1.9.tgz",

     

       290
       290
       +
             "integrity": "sha512-HT9GcUe6htDxI5OSYXWdeS6QZ9lpuDDvJk508ppi8a48E/1f8eumoM0QhgbFRF9IKAnnFrtnZDOAvljQzFKwwQ==",

     

       293
       291
        
             "license": "MIT",

     

       294
       292
        
             "dependencies": {

     

       295
       295
       -
               "@atproto/jwk": "0.3.0",

     

       293
       293
       +
               "@atproto/jwk": "0.4.0",

     

       296
       294
        
               "jose": "^5.2.0"

     

       297
       295
        
             }

     

       298
       296
        
           },

     

       299
       297
        
           "node_modules/@atproto/jwk-webcrypto": {

     

       300
       300
       -
             "version": "0.1.8",

     

       301
       301
       -
             "resolved": "https://registry.npmjs.org/@atproto/jwk-webcrypto/-/jwk-webcrypto-0.1.8.tgz",

     

       302
       302
       -
             "integrity": "sha512-oOW/G40f6M0NbTOo8uZgiSsFtcvlfNFldyxm+V+fVo5yKe6cvgvPNqckpqMsoBe6JYfImdc/zdVak9fCSSh41A==",

     

       298
       298
       +
             "version": "0.1.9",

     

       299
       299
       +
             "resolved": "https://registry.npmjs.org/@atproto/jwk-webcrypto/-/jwk-webcrypto-0.1.9.tgz",

     

       300
       300
       +
             "integrity": "sha512-ecciePHT0JEDZNAbMKSkdqoBYsjvhwuVno0jsS600SZmuvi2fAMhGraDZ5ZOO5M0hHHBiDbN7Ar/qcnIwyoxsA==",

     

       303
       301
        
             "license": "MIT",

     

       304
       302
        
             "dependencies": {

     

       305
       305
       -
               "@atproto/jwk": "0.3.0",

     

       306
       306
       -
               "@atproto/jwk-jose": "0.1.8",

     

       303
       303
       +
               "@atproto/jwk": "0.4.0",

     

       304
       304
       +
               "@atproto/jwk-jose": "0.1.9",

     

       307
       305
        
               "zod": "^3.23.8"

     

       308
       306
        
             }

     

       309
       307
        
           },

     
···

       347
       345
        
             }

     

       348
       346
        
           },

     

       349
       347
        
           "node_modules/@atproto/oauth-client": {

     

       350
       350
       -
             "version": "0.4.0",

     

       351
       351
       -
             "resolved": "https://registry.npmjs.org/@atproto/oauth-client/-/oauth-client-0.4.0.tgz",

     

       352
       352
       -
             "integrity": "sha512-uWVnlhennWkgvzqP0l53sFaw6DM6B4zmq0fv1xs05vt56Sjly8YirAj0GVDXlb37/BQRJQ1WOBzJVYDI3bH9uw==",

     

       348
       348
       +
             "version": "0.4.2",

     

       349
       349
       +
             "resolved": "https://registry.npmjs.org/@atproto/oauth-client/-/oauth-client-0.4.2.tgz",

     

       350
       350
       +
             "integrity": "sha512-wHRYcrh+iKQvMramYqE6PHs5Y/L2LYFzrEnyUMf83CjD3GYFwbSN5pwot6EFXONxRwuRjxpXsCSlFzZwx9YFvw==",

     

       353
       351
        
             "license": "MIT",

     

       354
       352
        
             "dependencies": {

     

       355
       355
       -
               "@atproto-labs/did-resolver": "0.1.13",

     

       353
       353
       +
               "@atproto-labs/did-resolver": "0.2.0",

     

       356
       354
        
               "@atproto-labs/fetch": "0.2.3",

     

       357
       357
       -
               "@atproto-labs/handle-resolver": "0.1.8",

     

       358
       358
       -
               "@atproto-labs/identity-resolver": "0.1.18",

     

       355
       355
       +
               "@atproto-labs/handle-resolver": "0.3.0",

     

       356
       356
       +
               "@atproto-labs/identity-resolver": "0.2.0",

     

       359
       357
        
               "@atproto-labs/simple-store": "0.2.0",

     

       360
       358
        
               "@atproto-labs/simple-store-memory": "0.1.3",

     

       361
       359
        
               "@atproto/did": "0.1.5",

     

       362
       362
       -
               "@atproto/jwk": "0.3.0",

     

       363
       363
       -
               "@atproto/oauth-types": "0.3.0",

     

       360
       360
       +
               "@atproto/jwk": "0.4.0",

     

       361
       361
       +
               "@atproto/oauth-types": "0.3.1",

     

       364
       362
        
               "@atproto/xrpc": "0.7.0",

     

       365
       363
        
               "multiformats": "^9.9.0",

     

       366
       364
        
               "zod": "^3.23.8"

     

       367
       365
        
             }

     

       368
       366
        
           },

     

       369
       367
        
           "node_modules/@atproto/oauth-client-node": {

     

       370
       370
       -
             "version": "0.2.24",

     

       371
       371
       -
             "resolved": "https://registry.npmjs.org/@atproto/oauth-client-node/-/oauth-client-node-0.2.24.tgz",

     

       372
       372
       -
             "integrity": "sha512-WsUiFkHjlm80J2d4czP7msYZoxvKB4hDpZGw34RgMD4VLA2jt03GMH4wTQPIZxfV3/9yrgMoOW/BDC9Iv4MavA==",

     

       368
       368
       +
             "version": "0.3.1",

     

       369
       369
       +
             "resolved": "https://registry.npmjs.org/@atproto/oauth-client-node/-/oauth-client-node-0.3.1.tgz",

     

       370
       370
       +
             "integrity": "sha512-k37YC7Ke4+btX05oAqHqkkM8r2Ya/tssWANx7/GMwN3PXPP5PK1C/pkxJrGsN/hpjn3I4W9lVTOlC7nigEX7sw==",

     

       373
       371
        
             "license": "MIT",

     

       374
       372
        
             "dependencies": {

     

       375
       375
       -
               "@atproto-labs/did-resolver": "0.1.13",

     

       376
       376
       -
               "@atproto-labs/handle-resolver-node": "0.1.16",

     

       373
       373
       +
               "@atproto-labs/did-resolver": "0.2.0",

     

       374
       374
       +
               "@atproto-labs/handle-resolver-node": "0.1.18",

     

       377
       375
        
               "@atproto-labs/simple-store": "0.2.0",

     

       378
       376
        
               "@atproto/did": "0.1.5",

     

       379
       379
       -
               "@atproto/jwk": "0.3.0",

     

       380
       380
       -
               "@atproto/jwk-jose": "0.1.8",

     

       381
       381
       -
               "@atproto/jwk-webcrypto": "0.1.8",

     

       382
       382
       -
               "@atproto/oauth-client": "0.4.0",

     

       383
       383
       -
               "@atproto/oauth-types": "0.3.0"

     

       377
       377
       +
               "@atproto/jwk": "0.4.0",

     

       378
       378
       +
               "@atproto/jwk-jose": "0.1.9",

     

       379
       379
       +
               "@atproto/jwk-webcrypto": "0.1.9",

     

       380
       380
       +
               "@atproto/oauth-client": "0.4.2",

     

       381
       381
       +
               "@atproto/oauth-types": "0.3.1"

     

       384
       382
        
             },

     

       385
       383
        
             "engines": {

     

       386
       384
        
               "node": ">=18.7.0"

     

       387
       385
        
             }

     

       388
       386
        
           },

     

       389
       387
        
           "node_modules/@atproto/oauth-types": {

     

       390
       390
       -
             "version": "0.3.0",

     

       391
       391
       -
             "resolved": "https://registry.npmjs.org/@atproto/oauth-types/-/oauth-types-0.3.0.tgz",

     

       392
       392
       -
             "integrity": "sha512-ptfsJARKODXfuOoDQag4a6PpEkDEj4Urz3jOmnQZy2YspPc/TNm1o0HglU0YehELv1vfhh9gEz40BJztPPhiLA==",

     

       388
       388
       +
             "version": "0.3.1",

     

       389
       389
       +
             "resolved": "https://registry.npmjs.org/@atproto/oauth-types/-/oauth-types-0.3.1.tgz",

     

       390
       390
       +
             "integrity": "sha512-l8ahtm74lmBOs5boi5q7mqzF2D37+cIYqVmbCrpexNeJfg2BXu0sBxREt0ADxP25Td9pX+u6FnefCOQtI/YAZw==",

     

       393
       391
        
             "license": "MIT",

     

       394
       392
        
             "dependencies": {

     

       395
       395
       -
               "@atproto/jwk": "0.3.0",

     

       393
       393
       +
               "@atproto/jwk": "0.4.0",

     

       396
       394
        
               "zod": "^3.23.8"

     

       397
       395
        
             }

     

       398
       396
        
           },

+1 -3

package.json

···

       17
       17
        
           "@atproto/api": "^0.15.6",

     

       18
       18
        
           "@atproto/common": "^0.4.11",

     

       19
       19
        
           "@atproto/identity": "^0.4.8",

     

       20
       20
       -
           "@atproto/jwk-jose": "^0.1.8",

     

       21
       20
        
           "@atproto/lexicon": "^0.4.11",

     

       22
       22
       -
           "@atproto/oauth-client-node": "^0.2.24",

     

       21
       21
       +
           "@atproto/oauth-client-node": "^0.3.1",

     

       23
       22
        
           "@atproto/sync": "^0.1.26",

     

       24
       24
       -
           "@atproto/syntax": "^0.4.0",

     

       25
       23
        
           "@atproto/xrpc-server": "^0.8.0",

     

       26
       24
        
           "better-sqlite3": "^11.1.2",

     

       27
       25
        
           "dotenv": "^16.4.5",

+14 -14

src/auth/client.ts

···

       1
       1
       -
       import assert from 'node:assert'

     

       2
       2
       -
       import { Keyset } from '@atproto/jwk'

     

       3
       3
       -
       import { JoseKey } from '@atproto/jwk-jose'

     

       4
       1
        
       import {

     

       5
       5
       -
         AppViewHandleResolver,

     

       2
       2
       +
         Keyset,

     

       3
       3
       +
         JoseKey,

     

       6
       4
        
         atprotoLoopbackClientMetadata,

     

       7
       7
       -
         DidResolverCommon,

     

       8
       5
        
         NodeOAuthClient,

     

       9
       6
        
         OAuthClientMetadataInput,

     

       10
       7
        
       } from '@atproto/oauth-client-node'

     

       8
       8
       +
       import assert from 'node:assert'

     

       11
       9
        
       

     

       12
       10
        
       import type { Database } from '#/db'

     

       13
       11
        
       import { env } from '#/env'

     

       14
       12
        
       import { SessionStore, StateStore } from './storage'

     

       15
       13
        
       

     

       16
       14
        
       export async function createOAuthClient(db: Database) {

     

       17
       17
       -
         assert(

     

       18
       18
       -
           !env.PUBLIC_URL || env.PRIVATE_JWKS,

     

       19
       19
       -
           'ATProto requires backend clients to be confidential',

     

       20
       20
       -
         )

     

       21
       21
       -
       

     

       22
       15
        
         // Confidential client require a keyset accessible on the internet. Non

     

       23
       16
        
         // internet clients (e.g. development) cannot expose a keyset on the internet

     

       24
       17
        
         // so they can't be private..

     

       25
       18
        
         const keyset =

     

       26
       26
       -
           env.PUBLIC_URL && env.PRIVATE_JWKS

     

       19
       19
       +
           env.PUBLIC_URL && env.PRIVATE_KEYS

     

       27
       20
        
             ? new Keyset(

     

       28
       21
        
                 await Promise.all(

     

       29
       29
       -
                   env.PRIVATE_JWKS.map((jwk) => JoseKey.fromJWK(jwk)),

     

       22
       22
       +
                   env.PRIVATE_KEYS.map((jwk) => JoseKey.fromJWK(jwk)),

     

       30
       23
        
                 ),

     

       31
       24
        
               )

     

       32
       25
        
             : undefined

     

       33
       26
        
       

     

       27
       27
       +
         assert(

     

       28
       28
       +
           !env.PUBLIC_URL || keyset?.size,

     

       29
       29
       +
           'ATProto requires backend clients to be confidential. Make sure to set the PRIVATE_KEYS environment variable.',

     

       30
       30
       +
         )

     

       31
       31
       +
       

     

       34
       32
        
         // If a keyset is defined (meaning the client is confidential). Let's make

     

       35
       33
        
         // sure it has a private key for signing. Note: findPrivateKey will throw if

     

       36
       36
       -
         // the keyset does no contain a suitable private key.

     

       34
       34
       +
         // the keyset does not contain a suitable private key.

     

       37
       35
        
         const pk = keyset?.findPrivateKey({ use: 'sig' })

     

       38
       36
        
       

     

       39
       37
        
         const clientMetadata: OAuthClientMetadataInput = env.PUBLIC_URL

     
···

       47
       45
        
               response_types: ['code'],

     

       48
       46
        
               application_type: 'web',

     

       49
       47
        
               token_endpoint_auth_method: pk ? 'private_key_jwt' : 'none',

     

       50
       50
       -
               token_endpoint_auth_signing_alg: pk ? pk[1] : undefined,

     

       48
       48
       +
               token_endpoint_auth_signing_alg: pk ? pk.alg : undefined,

     

       51
       49
        
               dpop_bound_access_tokens: true,

     

       52
       50
        
             }

     

       53
       51
        
           : atprotoLoopbackClientMetadata(

     
···

       62
       60
        
           clientMetadata,

     

       63
       61
        
           stateStore: new StateStore(db),

     

       64
       62
        
           sessionStore: new SessionStore(db),

     

       63
       63
       +
           plcDirectoryUrl: env.PLC_URL,

     

       64
       64
       +
           handleResolver: env.PDS_URL,

     

       65
       65
        
         })

     

       66
       66
        
       }

+3 -11

src/auth/storage.ts

···

       4
       4
        
         NodeSavedState,

     

       5
       5
        
         NodeSavedStateStore,

     

       6
       6
        
       } from '@atproto/oauth-client-node'

     

       7
       7
       -
       import { Database } from '#/db'

     

       7
       7
       +
       import type { Database } from '#/db'

     

       8
       8
        
       

     

       9
       9
        
       export class StateStore implements NodeSavedStateStore {

     

       10
       10
        
         constructor(private db: Database) {}

     

       11
       11
        
         async get(key: string): Promise<NodeSavedState | undefined> {

     

       12
       12
       -
           const result = await this.db

     

       13
       13
       -
             .selectFrom('auth_state')

     

       14
       14
       -
             .selectAll()

     

       15
       15
       -
             .where('key', '=', key)

     

       16
       16
       -
             .executeTakeFirst()

     

       12
       12
       +
           const result = await this.db.selectFrom('auth_state').selectAll().where('key', '=', key).executeTakeFirst()

     

       17
       13
        
           if (!result) return

     

       18
       14
        
           return JSON.parse(result.state) as NodeSavedState

     

       19
       15
        
         }

     
···

       33
       29
        
       export class SessionStore implements NodeSavedSessionStore {

     

       34
       30
        
         constructor(private db: Database) {}

     

       35
       31
        
         async get(key: string): Promise<NodeSavedSession | undefined> {

     

       36
       36
       -
           const result = await this.db

     

       37
       37
       -
             .selectFrom('auth_session')

     

       38
       38
       -
             .selectAll()

     

       39
       39
       -
             .where('key', '=', key)

     

       40
       40
       -
             .executeTakeFirst()

     

       32
       32
       +
           const result = await this.db.selectFrom('auth_session').selectAll().where('key', '=', key).executeTakeFirst()

     

       41
       33
        
           if (!result) return

     

       42
       34
        
           return JSON.parse(result.session) as NodeSavedSession

     

       43
       35
        
         }

+18 -5

src/context.ts

···

       3
       3
        
       import { pino } from 'pino'

     

       4
       4
        
       

     

       5
       5
        
       import { createOAuthClient } from '#/auth/client'

     

       6
       6
       -
       import { createDb, Database } from '#/db'

     

       6
       6
       +
       import { createDb, Database, migrateToLatest } from '#/db'

     

       7
       7
        
       import { createIngester } from '#/ingester'

     

       8
       8
       +
       import { env } from '#/env'

     

       9
       9
       +
       import {

     

       10
       10
       +
         BidirectionalResolver,

     

       11
       11
       +
         createBidirectionalResolver,

     

       12
       12
       +
       } from '#/id-resolver'

     

       8
       13
        
       

     

       9
       14
        
       /**

     

       10
       15
        
        * Application state passed to the router and elsewhere

     
···

       14
       19
        
         ingester: Firehose

     

       15
       20
        
         logger: pino.Logger

     

       16
       21
        
         oauthClient: NodeOAuthClient

     

       17
       17
       -
         identityResolver: NodeOAuthClient['identityResolver']

     

       22
       22
       +
         resolver: BidirectionalResolver

     

       23
       23
       +
         destroy: () => Promise<void>

     

       18
       24
        
       }

     

       19
       25
        
       

     

       20
       26
        
       export async function createAppContext(): Promise<AppContext> {

     

       21
       21
       -
         const db = await createDb()

     

       27
       27
       +
         const db = createDb(env.DB_PATH)

     

       28
       28
       +
         await migrateToLatest(db)

     

       22
       29
        
         const oauthClient = await createOAuthClient(db)

     

       23
       30
        
         const ingester = createIngester(db)

     

       24
       24
       -
         const logger = pino({ name: 'server' })

     

       31
       31
       +
         const logger = pino({ name: 'server', level: env.LOG_LEVEL })

     

       32
       32
       +
         const resolver = createBidirectionalResolver(oauthClient)

     

       25
       33
        
       

     

       26
       34
        
         return {

     

       27
       35
        
           db,

     

       28
       36
        
           ingester,

     

       29
       37
        
           logger,

     

       30
       38
        
           oauthClient,

     

       31
       31
       -
           identityResolver: oauthClient.identityResolver,

     

       39
       39
       +
           resolver,

     

       40
       40
       +
       

     

       41
       41
       +
           async destroy() {

     

       42
       42
       +
             await ingester.destroy()

     

       43
       43
       +
             await db.destroy()

     

       44
       44
       +
           },

     

       32
       45
        
         }

     

       33
       46
        
       }

+10 -17

src/db.ts

···

       1
       1
        
       import SqliteDb from 'better-sqlite3'

     

       2
       2
        
       import {

     

       3
       3
        
         Kysely,

     

       4
       4
       -
         Migration,

     

       5
       5
       -
         MigrationProvider,

     

       6
       4
        
         Migrator,

     

       7
       5
        
         SqliteDialect,

     

       6
       6
       +
         Migration,

     

       7
       7
       +
         MigrationProvider,

     

       8
       8
        
       } from 'kysely'

     

       9
       9
       -
       

     

       10
       10
       -
       import { env } from '#/env'

     

       11
       9
        
       

     

       12
       10
        
       // Types

     

       13
       11
        
       

     
···

       79
       77
        
       

     

       80
       78
        
       // APIs

     

       81
       79
        
       

     

       82
       82
       -
       export async function createDb(options?: {

     

       83
       83
       -
         /** @default true */

     

       84
       84
       -
         migrate?: boolean

     

       85
       85
       -
       }): Promise<Database> {

     

       86
       86
       -
         const db = new Kysely<DatabaseSchema>({

     

       80
       80
       +
       export const createDb = (location: string): Database => {

     

       81
       81
       +
         return new Kysely<DatabaseSchema>({

     

       87
       82
        
           dialect: new SqliteDialect({

     

       88
       88
       -
             database: new SqliteDb(env.DB_PATH),

     

       83
       83
       +
             database: new SqliteDb(location),

     

       89
       84
        
           }),

     

       90
       85
        
         })

     

       86
       86
       +
       }

     

       91
       87
        
       

     

       92
       92
       -
         if (options?.migrate !== false) {

     

       93
       93
       -
           const migrator = new Migrator({ db, provider: migrationProvider })

     

       94
       94
       -
           const { error } = await migrator.migrateToLatest()

     

       95
       95
       -
           if (error) throw error

     

       96
       96
       -
         }

     

       97
       97
       -
       

     

       98
       98
       -
         return db

     

       88
       88
       +
       export const migrateToLatest = async (db: Database) => {

     

       89
       89
       +
         const migrator = new Migrator({ db, provider: migrationProvider })

     

       90
       90
       +
         const { error } = await migrator.migrateToLatest()

     

       91
       91
       +
         if (error) throw error

     

       99
       92
        
       }

     

       100
       93
        
       

     

       101
       94
        
       export type Database = Kysely<DatabaseSchema>

+12 -4

src/env.ts

···

       1
       1
        
       import dotenv from 'dotenv'

     

       2
       2
       -
       import { cleanEnv, port, str, testOnly } from 'envalid'

     

       3
       3
       -
       import { privateKeys } from '#/lib/envalid-private-keys'

     

       2
       2
       +
       import { cleanEnv, port, str, testOnly, url } from 'envalid'

     

       3
       3
       +
       import { envalidJsonWebKeys as keys } from '#/lib/jwk'

     

       4
       4
        
       

     

       5
       5
        
       dotenv.config()

     

       6
       6
        
       

     
···

       10
       10
        
           choices: ['development', 'production', 'test'],

     

       11
       11
        
         }),

     

       12
       12
        
         PORT: port({ devDefault: testOnly(3000) }),

     

       13
       13
       -
         PUBLIC_URL: str({}),

     

       13
       13
       +
         PUBLIC_URL: url({ default: undefined }),

     

       14
       14
        
         DB_PATH: str({ devDefault: ':memory:' }),

     

       15
       15
        
         COOKIE_SECRET: str({ devDefault: '00000000000000000000000000000000' }),

     

       16
       16
       -
         PRIVATE_JWKS: privateKeys({ default: undefined }),

     

       16
       16
       +
         PRIVATE_KEYS: keys({ default: undefined }),

     

       17
       17
       +
         LOG_LEVEL: str({

     

       18
       18
       +
           devDefault: 'debug',

     

       19
       19
       +
           default: 'info',

     

       20
       20
       +
           choices: ['fatal', 'error', 'warn', 'info', 'debug', 'trace', 'silent'],

     

       21
       21
       +
         }),

     

       22
       22
       +
         PDS_URL: url({ default: undefined }),

     

       23
       23
       +
         PLC_URL: url({ default: undefined }),

     

       24
       24
       +
         FIREHOSE_URL: url({ default: undefined }),

     

       17
       25
        
       })

+37

src/id-resolver.ts

···

       1
       1
       +
       import { OAuthClient } from '@atproto/oauth-client-node'

     

       2
       2
       +
       

     

       3
       3
       +
       export interface BidirectionalResolver {

     

       4
       4
       +
         resolveDidToHandle(did: string): Promise<string | undefined>

     

       5
       5
       +
         resolveDidsToHandles(

     

       6
       6
       +
           dids: string[],

     

       7
       7
       +
         ): Promise<Record<string, string | undefined>>

     

       8
       8
       +
       }

     

       9
       9
       +
       

     

       10
       10
       +
       export function createBidirectionalResolver({

     

       11
       11
       +
         identityResolver,

     

       12
       12
       +
       }: OAuthClient): BidirectionalResolver {

     

       13
       13
       +
         return {

     

       14
       14
       +
           async resolveDidToHandle(did: string): Promise<string | undefined> {

     

       15
       15
       +
             try {

     

       16
       16
       +
               const { handle } = await identityResolver.resolve(did)

     

       17
       17
       +
               if (handle) return handle

     

       18
       18
       +
             } catch {

     

       19
       19
       +
               // Ignore

     

       20
       20
       +
             }

     

       21
       21
       +
           },

     

       22
       22
       +
       

     

       23
       23
       +
           async resolveDidsToHandles(

     

       24
       24
       +
             dids: string[],

     

       25
       25
       +
           ): Promise<Record<string, string | undefined>> {

     

       26
       26
       +
             const uniqueDids = [...new Set(dids)]

     

       27
       27
       +
       

     

       28
       28
       +
             return Object.fromEntries(

     

       29
       29
       +
               await Promise.all(

     

       30
       30
       +
                 uniqueDids.map((did) =>

     

       31
       31
       +
                   this.resolveDidToHandle(did).then((handle) => [did, handle]),

     

       32
       32
       +
                 ),

     

       33
       33
       +
               ),

     

       34
       34
       +
             )

     

       35
       35
       +
           },

     

       36
       36
       +
         }

     

       37
       37
       +
       }

+3 -4

src/index.ts

···

       1
       1
       -
       import { createHttpTerminator } from 'http-terminator'

     

       2
       1
        
       import { once } from 'node:events'

     

       3
       2
        
       

     

       4
       3
        
       import { createAppContext } from '#/context'

     

       5
       4
        
       import { env } from '#/env'

     

       5
       5
       +
       import { startServer } from '#/lib/http'

     

       6
       6
        
       import { run } from '#/lib/process'

     

       7
       7
        
       import { createRouter } from '#/routes'

     

       8
       8
       -
       import { startServer } from '#/lib/http'

     

       9
       8
        
       

     

       10
       9
        
       run(async (killSignal) => {

     

       11
       10
        
         // Create the application context

     
···

       30
       29
        
         // Gracefully shutdown the http server

     

       31
       30
        
         await terminate()

     

       32
       31
        
       

     

       33
       33
       -
         // Close the firehose connection

     

       34
       34
       -
         await ctx.ingester.destroy()

     

       32
       32
       +
         // Gracefully shutdown the application context

     

       33
       33
       +
         await ctx.destroy()

     

       35
       34
        
       })

+18 -5

src/ingester.ts

···

       3
       3
        
       import { IdResolver, MemoryCache } from '@atproto/identity'

     

       4
       4
        
       import { Event, Firehose } from '@atproto/sync'

     

       5
       5
        
       import pino from 'pino'

     

       6
       6
       +
       import { env } from './env'

     

       6
       7
        
       

     

       7
       8
        
       const HOUR = 60e3 * 60

     

       8
       9
        
       const DAY = HOUR * 24

     

       9
       10
        
       

     

       10
       11
        
       export function createIngester(db: Database) {

     

       11
       11
       -
         const logger = pino({ name: 'firehose ingestion' })

     

       12
       12
       +
         const logger = pino({ name: 'firehose', level: env.LOG_LEVEL })

     

       12
       13
        
         return new Firehose({

     

       13
       13
       -
           idResolver: new IdResolver({

     

       14
       14
       -
             didCache: new MemoryCache(HOUR, DAY),

     

       15
       15
       -
           }),

     

       14
       14
       +
           filterCollections: ['xyz.statusphere.status'],

     

       16
       15
        
           handleEvent: async (evt: Event) => {

     

       17
       16
        
             // Watch for write events

     

       18
       17
        
             if (evt.event === 'create' || evt.event === 'update') {

     
···

       25
       24
        
                 Status.isRecord(record) &&

     

       26
       25
        
                 Status.validateRecord(record).success

     

       27
       26
        
               ) {

     

       27
       27
       +
                 logger.debug(

     

       28
       28
       +
                   { uri: evt.uri.toString(), status: record.status },

     

       29
       29
       +
                   'ingesting status',

     

       30
       30
       +
                 )

     

       31
       31
       +
       

     

       28
       32
        
                 // Store the status in our SQLite

     

       29
       33
        
                 await db

     

       30
       34
        
                   .insertInto('status')

     
···

       47
       51
        
               evt.event === 'delete' &&

     

       48
       52
        
               evt.collection === 'xyz.statusphere.status'

     

       49
       53
        
             ) {

     

       54
       54
       +
               logger.debug(

     

       55
       55
       +
                 { uri: evt.uri.toString(), did: evt.did },

     

       56
       56
       +
                 'deleting status',

     

       57
       57
       +
               )

     

       58
       58
       +
       

     

       50
       59
        
               // Remove the status from our SQLite

     

       51
       60
        
               await db

     

       52
       61
        
                 .deleteFrom('status')

     
···

       57
       66
        
           onError: (err: unknown) => {

     

       58
       67
        
             logger.error({ err }, 'error on firehose ingestion')

     

       59
       68
        
           },

     

       60
       60
       -
           filterCollections: ['xyz.statusphere.status'],

     

       61
       69
        
           excludeIdentity: true,

     

       62
       70
        
           excludeAccount: true,

     

       71
       71
       +
           service: env.FIREHOSE_URL,

     

       72
       72
       +
           idResolver: new IdResolver({

     

       73
       73
       +
             plcUrl: env.PLC_URL,

     

       74
       74
       +
             didCache: new MemoryCache(HOUR, DAY),

     

       75
       75
       +
           }),

     

       63
       76
        
         })

     

       64
       77
        
       }

-17

src/lib/envalid-private-keys.ts

···

       1
       1
       -
       import { Jwk, jwkValidator } from '@atproto/jwk'

     

       2
       2
       -
       import { makeValidator } from 'envalid'

     

       3
       3
       -
       import { z } from 'zod'

     

       4
       4
       -
       

     

       5
       5
       -
       export type PrivateKey = Jwk & { kid: string }

     

       6
       6
       -
       

     

       7
       7
       -
       const privateKeySchema = z.intersection(

     

       8
       8
       -
         jwkValidator,

     

       9
       9
       -
         z.object({ kid: z.string().nonempty() })

     

       10
       10
       -
       ) satisfies z.ZodType<PrivateKey>

     

       11
       11
       -
       

     

       12
       12
       -
       const privateKeysSchema = z.array(privateKeySchema).nonempty()

     

       13
       13
       -
       

     

       14
       14
       -
       export const privateKeys = makeValidator((input) => {

     

       15
       15
       -
         const value = JSON.parse(input)

     

       16
       16
       -
         return privateKeysSchema.parse(value)

     

       17
       17
       -
       })

+21 -57

src/lib/http.ts

···

       1
       1
       +
       import { Request, Response } from 'express'

     

       1
       2
        
       import { createHttpTerminator } from 'http-terminator'

     

       2
       3
        
       import { once } from 'node:events'

     

       3
       4
        
       import type {

     
···

       9
       10
        
       

     

       10
       11
        
       export type NextFunction = (err?: unknown) => void

     

       11
       12
        
       

     

       12
       12
       -
       export type Handler<

     

       13
       13
       +
       export type Middleware<

     

       13
       14
        
         Req extends IncomingMessage = IncomingMessage,

     

       14
       14
       -
         Res extends ServerResponse<Req> = ServerResponse<Req>,

     

       15
       15
       +
         Res extends ServerResponse = ServerResponse,

     

       15
       16
        
       > = (req: Req, res: Res, next: NextFunction) => void

     

       16
       17
        
       

     

       17
       17
       -
       export type AsyncHandler<

     

       18
       18
       +
       export type Handler<

     

       18
       19
        
         Req extends IncomingMessage = IncomingMessage,

     

       19
       19
       -
         Res extends ServerResponse<Req> = ServerResponse<Req>,

     

       20
       20
       -
       > = (req: Req, res: Res, next: NextFunction) => Promise<void>

     

       21
       21
       -
       

     

       22
       22
       -
       // Helper function for defining routes

     

       20
       20
       +
         Res extends ServerResponse = ServerResponse,

     

       21
       21
       +
       > = (req: Req, res: Res) => unknown | Promise<unknown>

     

       22
       22
       +
       /**

     

       23
       23
       +
        * Wraps a request handler middleware to ensure that `next` is called if it

     

       24
       24
       +
        * throws or returns a promise that rejects.

     

       25
       25
       +
        */

     

       23
       26
        
       export function handler<

     

       24
       24
       -
         Req extends IncomingMessage = IncomingMessage,

     

       25
       25
       -
         Res extends ServerResponse<Req> = ServerResponse<Req>,

     

       26
       26
       -
       >(fn: Handler<Req, Res> | AsyncHandler<Req, Res>): Handler<Req, Res> {

     

       27
       27
       -
         return (req, res, next) => {

     

       28
       28
       -
           // NodeJS prefers objects over functions for garbage collection,

     

       29
       29
       -
           const nextSafe = nextOnce.bind({ next })

     

       27
       27
       +
         Req extends IncomingMessage = Request,

     

       28
       28
       +
         Res extends ServerResponse = Response,

     

       29
       29
       +
       >(fn: Handler<Req, Res>): Middleware<Req, Res> {

     

       30
       30
       +
         return async (req, res, next) => {

     

       30
       31
        
           try {

     

       31
       31
       -
             const result = fn(req, res, nextSafe)

     

       32
       32
       -
             if (result instanceof Promise) result.catch(nextSafe)

     

       32
       32
       +
             await fn(req, res)

     

       33
       33
        
           } catch (err) {

     

       34
       34
       -
             nextSafe(err)

     

       34
       34
       +
             next(err)

     

       35
       35
        
           }

     

       36
       36
        
         }

     

       37
       37
       -
       

     

       38
       38
       -
         function nextOnce(this: { next: NextFunction | null }, err?: unknown) {

     

       39
       39
       -
           const { next } = this

     

       40
       40
       -
           this.next = null

     

       41
       41
       -
           next?.(err)

     

       42
       42
       -
         }

     

       43
       37
        
       }

     

       44
       38
        
       

     

       45
       45
       -
       export function formHandler<

     

       46
       46
       -
         Req extends IncomingMessage = IncomingMessage,

     

       47
       47
       -
         Res extends ServerResponse<Req & { body: unknown }> = ServerResponse<

     

       48
       48
       -
           Req & { body: unknown }

     

       49
       49
       -
         >,

     

       50
       50
       -
       >(fn: AsyncHandler<Req & { body: unknown }, Res>): Handler<Req, Res> {

     

       51
       51
       -
         return handler(async (req, res, next) => {

     

       52
       52
       -
           if (req.method !== 'POST') {

     

       53
       53
       -
             return void res.writeHead(405).end()

     

       54
       54
       -
           }

     

       55
       55
       -
           if (req.headers['content-type'] !== 'application/x-www-form-urlencoded') {

     

       56
       56
       -
             return void res.writeHead(415).end('Unsupported Media Type')

     

       57
       57
       -
           }

     

       58
       58
       -
       

     

       59
       59
       -
           // Read the request payload

     

       60
       60
       -
           const chunks: Uint8Array[] = []

     

       61
       61
       -
           for await (const chunk of req) chunks.push(chunk)

     

       62
       62
       -
           const payload = Buffer.concat(chunks).toString('utf-8')

     

       63
       63
       -
       

     

       64
       64
       -
           // Parse the Form URL-encoded payload

     

       65
       65
       -
           const body = payload ? Object.fromEntries(new URLSearchParams(payload)) : {}

     

       66
       66
       -
       

     

       67
       67
       -
           // Define the body property on the request object

     

       68
       68
       -
           Object.defineProperty(req, 'body', {

     

       69
       69
       -
             value: body,

     

       70
       70
       -
             writable: false,

     

       71
       71
       -
             enumerable: true,

     

       72
       72
       -
             configurable: true,

     

       73
       73
       -
           })

     

       74
       74
       -
       

     

       75
       75
       -
           // Call the provided async handler with the modified request

     

       76
       76
       -
           return fn(req as Req & { body: unknown }, res, next)

     

       77
       77
       -
         })

     

       78
       78
       -
       }

     

       79
       79
       -
       

     

       39
       39
       +
       /**

     

       40
       40
       +
        * Create an HTTP server with the provided request listener, ensuring that it

     

       41
       41
       +
        * can bind the listening port, and returns a termination function that allows

     

       42
       42
       +
        * graceful termination of HTTP connections.

     

       43
       43
       +
        */

     

       80
       44
        
       export async function startServer(

     

       81
       45
        
         requestListener: RequestListener,

     

       82
       46
        
         {

+17

src/lib/jwk.ts

···

       1
       1
       +
       import { Jwk, jwkValidator } from '@atproto/oauth-client-node'

     

       2
       2
       +
       import { makeValidator } from 'envalid'

     

       3
       3
       +
       import { z } from 'zod'

     

       4
       4
       +
       

     

       5
       5
       +
       export type JsonWebKey = Jwk & { kid: string }

     

       6
       6
       +
       

     

       7
       7
       +
       const jsonWebKeySchema = z.intersection(

     

       8
       8
       +
         jwkValidator,

     

       9
       9
       +
         z.object({ kid: z.string().nonempty() }),

     

       10
       10
       +
       ) satisfies z.ZodType<JsonWebKey>

     

       11
       11
       +
       

     

       12
       12
       +
       const jsonWebKeysSchema = z.array(jsonWebKeySchema).nonempty()

     

       13
       13
       +
       

     

       14
       14
       +
       export const envalidJsonWebKeys = makeValidator((input) => {

     

       15
       15
       +
         const value = JSON.parse(input)

     

       16
       16
       +
         return jsonWebKeysSchema.parse(value)

     

       17
       17
       +
       })

+8 -4

src/lib/process.ts

···

       1
       1
        
       const SIGNALS = ['SIGINT', 'SIGTERM'] as const

     

       2
       2
        
       

     

       3
       3
       -
       export async function run<F extends (signal: AbortSignal) => unknown>(

     

       4
       4
       -
         fn: F

     

       5
       5
       -
       ): Promise<Awaited<ReturnType<F>>> {

     

       3
       3
       +
       /**

     

       4
       4
       +
        * Runs a function with an abort signal that will be triggered when the process

     

       5
       5
       +
        * receives a termination signal.

     

       6
       6
       +
        */

     

       7
       7
       +
       export async function run<F extends (signal: AbortSignal) => Promise<void>>(

     

       8
       8
       +
         fn: F,

     

       9
       9
       +
       ): Promise<void> {

     

       6
       10
        
         const killController = new AbortController()

     

       7
       11
        
       

     

       8
       12
        
         const abort = (signal?: string) => {

     
···

       13
       17
        
         for (const sig of SIGNALS) process.on(sig, abort)

     

       14
       18
        
       

     

       15
       19
        
         try {

     

       16
       16
       -
           return (await fn(killController.signal)) as Awaited<ReturnType<F>>

     

       20
       20
       +
           await fn(killController.signal)

     

       17
       21
        
         } finally {

     

       18
       22
        
           abort()

     

       19
       23
        
         }

src/lib/util.ts

···

       1
       1
       +
       export function ifString<T>(value: T): (T & string) | undefined {

     

       2
       2
       +
         if (typeof value === 'string') return value

     

       3
       3
       +
         return undefined

     

       4
       4
       +
       }

+1 -1

src/pages/home.ts

···

       4
       4
        
       

     

       5
       5
        
       const TODAY = new Date().toDateString()

     

       6
       6
        
       

     

       7
       7
       -
       const STATUS_OPTIONS = [

     

       7
       7
       +
       export const STATUS_OPTIONS = [

     

       8
       8
        
         '👍',

     

       9
       9
        
         '👎',

     

       10
       10
        
         '💙',

+14 -6

src/pages/login.ts

···

       1
       1
       +
       import { env } from '#/env'

     

       1
       2
        
       import { html } from '../lib/view'

     

       2
       3
        
       import { shell } from './shell'

     

       3
       4
        
       

     
···

       11
       12
        
       }

     

       12
       13
        
       

     

       13
       14
        
       function content({ error }: Props) {

     

       15
       15
       +
         const signupService =

     

       16
       16
       +
           !env.PDS_URL || env.PDS_URL === 'https://bsky.social'

     

       17
       17
       +
             ? 'Bluesky'

     

       18
       18
       +
             : new URL(env.PDS_URL).hostname

     

       19
       19
       +
       

     

       14
       20
        
         return html`<div id="root">

     

       15
       21
        
           <div id="header">

     

       16
       22
        
             <h1>Statusphere</h1>

     
···

       20
       26
        
             <form action="/login" method="post" class="login-form">

     

       21
       27
        
               <input

     

       22
       28
        
                 type="text"

     

       23
       23
       -
                 name="handle"

     

       29
       29
       +
                 name="input"

     

       24
       30
        
                 placeholder="Enter your handle (eg alice.bsky.social)"

     

       25
       31
        
                 required

     

       26
       32
        
               />

     

       33
       33
       +
       

     

       27
       34
        
               <button type="submit">Log in</button>

     

       28
       28
       -
               ${error ? html`<p>Error: <i>${error}</i></p>` : undefined}

     

       29
       35
        
             </form>

     

       30
       30
       -
             <div class="signup-cta">

     

       31
       31
       -
               Don't have an account on the Atmosphere?

     

       32
       32
       -
               <a href="https://bsky.app">Sign up for Bluesky</a> to create one now!

     

       33
       33
       -
             </div>

     

       36
       36
       +
       

     

       37
       37
       +
             <a href="/signup" class="button signup-cta">

     

       38
       38
       +
               Login or Sign up with a ${signupService} account

     

       39
       39
       +
             </a>

     

       40
       40
       +
       

     

       41
       41
       +
             ${error ? html`<p>Error: <i>${error}</i></p>` : undefined}

     

       34
       42
        
           </div>

     

       35
       43
        
         </div>`

     

       36
       44
        
       }

+28 -9

src/pages/public/styles.css

···

       18
       18
        
         Josh's Custom CSS Reset

     

       19
       19
        
         https://www.joshwcomeau.com/css/custom-css-reset/

     

       20
       20
        
       */

     

       21
       21
       -
       *, *::before, *::after {

     

       21
       21
       +
       *,

     

       22
       22
       +
       *::before,

     

       23
       23
       +
       *::after {

     

       22
       24
        
         box-sizing: border-box;

     

       23
       25
        
       }

     

       24
       26
        
       * {

     
···

       28
       30
        
         line-height: 1.5;

     

       29
       31
        
         -webkit-font-smoothing: antialiased;

     

       30
       32
        
       }

     

       31
       31
       -
       img, picture, video, canvas, svg {

     

       33
       33
       +
       img,

     

       34
       34
       +
       picture,

     

       35
       35
       +
       video,

     

       36
       36
       +
       canvas,

     

       37
       37
       +
       svg {

     

       32
       38
        
         display: block;

     

       33
       39
        
         max-width: 100%;

     

       34
       40
        
       }

     

       35
       35
       -
       input, button, textarea, select {

     

       41
       41
       +
       input,

     

       42
       42
       +
       button,

     

       43
       43
       +
       textarea,

     

       44
       44
       +
       select {

     

       36
       45
        
         font: inherit;

     

       37
       46
        
       }

     

       38
       38
       -
       p, h1, h2, h3, h4, h5, h6 {

     

       47
       47
       +
       p,

     

       48
       48
       +
       h1,

     

       49
       49
       +
       h2,

     

       50
       50
       +
       h3,

     

       51
       51
       +
       h4,

     

       52
       52
       +
       h5,

     

       53
       53
       +
       h6 {

     

       39
       54
        
         overflow-wrap: break-word;

     

       40
       55
        
       }

     

       41
       41
       -
       #root, #__next {

     

       56
       56
       +
       #root,

     

       57
       57
       +
       #__next {

     

       42
       58
        
         isolation: isolate;

     

       43
       59
        
       }

     

       44
       60
        
       

     

       45
       61
        
       /*

     

       46
       62
        
         Common components

     

       47
       63
        
       */

     

       48
       48
       -
       button, .button {

     

       64
       64
       +
       button,

     

       65
       65
       +
       .button {

     

       49
       66
        
         display: inline-block;

     

       50
       67
        
         border: 0;

     

       51
       68
        
         background-color: var(--primary-500);

     
···

       55
       72
        
         cursor: pointer;

     

       56
       73
        
         text-decoration: none;

     

       57
       74
        
       }

     

       58
       58
       -
       button:hover, .button:hover {

     

       75
       75
       +
       button:hover,

     

       76
       76
       +
       .button:hover {

     

       59
       77
        
         background: var(--primary-400);

     

       60
       78
        
       }

     

       61
       79
        
       

     
···

       207
       225
        
       

     

       208
       226
        
       .signup-cta {

     

       209
       227
        
         text-align: center;

     

       210
       210
       -
         text-wrap: balance;

     

       228
       228
       +
         width: 100%;

     

       229
       229
       +
         display: block;

     

       211
       230
        
         margin-top: 1rem;

     

       212
       212
       -
       }
     

       231
       231
       +
       }

+136 -75

src/routes.ts

···

       1
       1
        
       import { Agent } from '@atproto/api'

     

       2
       2
        
       import { TID } from '@atproto/common'

     

       3
       3
        
       import { OAuthResolverError } from '@atproto/oauth-client-node'

     

       4
       4
       -
       import { isValidHandle } from '@atproto/syntax'

     

       5
       4
        
       import express, { Request, Response } from 'express'

     

       6
       5
        
       import { getIronSession } from 'iron-session'

     

       7
       7
       -
       import assert from 'node:assert'

     

       8
       8
       -
       import type { IncomingMessage, ServerResponse } from 'node:http'

     

       6
       6
       +
       import type {

     

       7
       7
       +
         IncomingMessage,

     

       8
       8
       +
         RequestListener,

     

       9
       9
       +
         ServerResponse,

     

       10
       10
       +
       } from 'node:http'

     

       9
       11
        
       import path from 'node:path'

     

       10
       12
        
       

     

       11
       13
        
       import type { AppContext } from '#/context'

     

       14
       14
       +
       import { env } from '#/env'

     

       12
       15
        
       import * as Profile from '#/lexicon/types/app/bsky/actor/profile'

     

       13
       16
        
       import * as Status from '#/lexicon/types/xyz/statusphere/status'

     

       14
       14
       -
       import { env } from '#/env'

     

       15
       15
       -
       import { formHandler, handler } from '#/lib/http'

     

       17
       17
       +
       import { handler } from '#/lib/http'

     

       18
       18
       +
       import { ifString } from '#/lib/util'

     

       16
       19
        
       import { page } from '#/lib/view'

     

       17
       20
        
       import { home } from '#/pages/home'

     

       18
       21
        
       import { login } from '#/pages/login'

     

       19
       22
        
       

     

       20
       20
       -
       type Session = { did: string }

     

       23
       23
       +
       // Max age, in seconds, for static routes and assets

     

       24
       24
       +
       const MAX_AGE = env.NODE_ENV === 'production' ? 60 : 0

     

       25
       25
       +
       

     

       26
       26
       +
       type Session = { did?: string }

     

       21
       27
        
       

     

       22
       28
        
       // Helper function to get the Atproto Agent for the active session

     

       23
       29
        
       async function getSessionAgent(

     
···

       25
       31
        
         res: ServerResponse,

     

       26
       32
        
         ctx: AppContext,

     

       27
       33
        
       ) {

     

       34
       34
       +
         res.setHeader('Vary', 'Cookie')

     

       35
       35
       +
       

     

       28
       36
        
         const session = await getIronSession<Session>(req, res, {

     

       29
       37
        
           cookieName: 'sid',

     

       30
       38
        
           password: env.COOKIE_SECRET,

     

       31
       39
        
         })

     

       32
       40
        
         if (!session.did) return null

     

       41
       41
       +
       

     

       42
       42
       +
         // This page is dynamic and should not be cached publicly

     

       43
       43
       +
         res.setHeader('cache-control', `max-age=${MAX_AGE}, private`)

     

       44
       44
       +
       

     

       33
       45
        
         try {

     

       34
       46
        
           const oauthSession = await ctx.oauthClient.restore(session.did)

     

       35
       47
        
           return oauthSession ? new Agent(oauthSession) : null

     
···

       40
       52
        
         }

     

       41
       53
        
       }

     

       42
       54
        
       

     

       43
       43
       -
       export const createRouter = (ctx: AppContext) => {

     

       44
       44
       -
         const app = express()

     

       55
       55
       +
       export const createRouter = (ctx: AppContext): RequestListener => {

     

       56
       56
       +
         const router = express()

     

       45
       57
        
       

     

       46
       58
        
         // Static assets

     

       47
       47
       -
         app.use('/public', express.static(path.join(__dirname, 'pages', 'public')))

     

       59
       59
       +
         router.use(

     

       60
       60
       +
           '/public',

     

       61
       61
       +
           express.static(path.join(__dirname, 'pages', 'public'), {

     

       62
       62
       +
             maxAge: MAX_AGE * 1000,

     

       63
       63
       +
           }),

     

       64
       64
       +
         )

     

       48
       65
        
       

     

       49
       66
        
         // OAuth metadata

     

       50
       50
       -
         app.get(

     

       67
       67
       +
         router.get(

     

       51
       68
        
           '/oauth-client-metadata.json',

     

       52
       52
       -
           handler(async (req: Request, res: Response) => {

     

       69
       69
       +
           handler((req, res) => {

     

       70
       70
       +
             res.setHeader('cache-control', `max-age=${MAX_AGE}, public`)

     

       53
       71
        
             res.json(ctx.oauthClient.clientMetadata)

     

       54
       72
        
           }),

     

       55
       73
        
         )

     

       56
       74
        
       

     

       57
       75
        
         // Public keys

     

       58
       58
       -
         app.get(

     

       76
       76
       +
         router.get(

     

       59
       77
        
           '/.well-known/jwks.json',

     

       60
       60
       -
           handler(async (req: Request, res: Response) => {

     

       78
       78
       +
           handler((req, res) => {

     

       79
       79
       +
             res.setHeader('cache-control', `max-age=${MAX_AGE}, public`)

     

       61
       80
        
             res.json(ctx.oauthClient.jwks)

     

       62
       81
        
           }),

     

       63
       82
        
         )

     

       64
       83
        
       

     

       65
       84
        
         // OAuth callback to complete session creation

     

       66
       66
       -
         app.get(

     

       85
       85
       +
         router.get(

     

       67
       86
        
           '/oauth/callback',

     

       68
       68
       -
           handler(async (req: Request, res: Response) => {

     

       87
       87
       +
           handler(async (req, res) => {

     

       88
       88
       +
             res.setHeader('cache-control', 'no-store')

     

       89
       89
       +
       

     

       69
       90
        
             const params = new URLSearchParams(req.originalUrl.split('?')[1])

     

       70
       91
        
             try {

     

       71
       71
       -
               const { session } = await ctx.oauthClient.callback(params)

     

       72
       72
       -
               const clientSession = await getIronSession<Session>(req, res, {

     

       92
       92
       +
               // Load the session cookie

     

       93
       93
       +
               const session = await getIronSession<Session>(req, res, {

     

       73
       94
        
                 cookieName: 'sid',

     

       74
       95
        
                 password: env.COOKIE_SECRET,

     

       75
       96
        
               })

     

       76
       76
       -
               assert(!clientSession.did, 'session already exists')

     

       77
       77
       -
               clientSession.did = session.did

     

       78
       78
       -
               await clientSession.save()

     

       79
       79
       -
               return res.redirect('/')

     

       97
       97
       +
       

     

       98
       98
       +
               // If the user is already signed in, destroy the old credentials

     

       99
       99
       +
               if (session.did) {

     

       100
       100
       +
                 try {

     

       101
       101
       +
                   const oauthSession = await ctx.oauthClient.restore(session.did)

     

       102
       102
       +
                   if (oauthSession) oauthSession.signOut()

     

       103
       103
       +
                 } catch (err) {

     

       104
       104
       +
                   ctx.logger.warn({ err }, 'oauth restore failed')

     

       105
       105
       +
                 }

     

       106
       106
       +
               }

     

       107
       107
       +
       

     

       108
       108
       +
               // Complete the OAuth flow

     

       109
       109
       +
               const oauth = await ctx.oauthClient.callback(params)

     

       110
       110
       +
       

     

       111
       111
       +
               // Update the session cookie

     

       112
       112
       +
               session.did = oauth.session.did

     

       113
       113
       +
       

     

       114
       114
       +
               await session.save()

     

       80
       115
        
             } catch (err) {

     

       81
       116
        
               ctx.logger.error({ err }, 'oauth callback failed')

     

       82
       82
       -
               return res.redirect('/?error')

     

       83
       117
        
             }

     

       118
       118
       +
       

     

       119
       119
       +
             return res.redirect('/')

     

       84
       120
        
           }),

     

       85
       121
        
         )

     

       86
       122
        
       

     

       87
       123
        
         // Login page

     

       88
       88
       -
         app.get(

     

       124
       124
       +
         router.get(

     

       89
       125
        
           '/login',

     

       90
       90
       -
           handler(async (req: Request, res: Response) => {

     

       126
       126
       +
           handler(async (req, res) => {

     

       127
       127
       +
             res.setHeader('cache-control', `max-age=${MAX_AGE}, public`)

     

       91
       128
        
             res.type('html').send(page(login({})))

     

       92
       129
        
           }),

     

       93
       130
        
         )

     

       94
       131
        
       

     

       95
       132
        
         // Login handler

     

       96
       96
       -
         app.post(

     

       133
       133
       +
         router.post(

     

       97
       134
        
           '/login',

     

       98
       98
       -
           formHandler(async (req: Request, res: Response) => {

     

       99
       99
       -
             // Validate

     

       100
       100
       -
             const handle = req.body?.handle

     

       101
       101
       -
             if (typeof handle !== 'string' || !isValidHandle(handle)) {

     

       102
       102
       -
               return void res

     

       103
       103
       -
                 .type('html')

     

       104
       104
       -
                 .send(page(login({ error: 'invalid handle' })))

     

       135
       135
       +
           express.urlencoded(),

     

       136
       136
       +
           handler(async (req, res) => {

     

       137
       137
       +
             // Never store this route

     

       138
       138
       +
             res.setHeader('cache-control', 'no-store')

     

       139
       139
       +
       

     

       140
       140
       +
             // Initiate the OAuth flow

     

       141
       141
       +
             try {

     

       142
       142
       +
               // Validate input: can be a handle, a DID or a service URL (PDS).

     

       143
       143
       +
               const input = ifString(req.body.input)

     

       144
       144
       +
               if (!input) {

     

       145
       145
       +
                 throw new Error('Invalid input')

     

       146
       146
       +
               }

     

       147
       147
       +
       

     

       148
       148
       +
               // Initiate the OAuth flow

     

       149
       149
       +
               const url = await ctx.oauthClient.authorize(input, {

     

       150
       150
       +
                 scope: 'atproto transition:generic',

     

       151
       151
       +
               })

     

       152
       152
       +
       

     

       153
       153
       +
               res.redirect(url.toString())

     

       154
       154
       +
             } catch (err) {

     

       155
       155
       +
               ctx.logger.error({ err }, 'oauth authorize failed')

     

       156
       156
       +
       

     

       157
       157
       +
               const error = err instanceof Error ? err.message : 'unexpected error'

     

       158
       158
       +
       

     

       159
       159
       +
               return res.type('html').send(page(login({ error })))

     

       105
       160
        
             }

     

       161
       161
       +
           }),

     

       162
       162
       +
         )

     

       106
       163
        
       

     

       107
       107
       -
             // Initiate the OAuth flow

     

       164
       164
       +
         // Signup

     

       165
       165
       +
         router.get(

     

       166
       166
       +
           '/signup',

     

       167
       167
       +
           handler(async (req, res) => {

     

       168
       168
       +
             res.setHeader('cache-control', `max-age=${MAX_AGE}, public`)

     

       169
       169
       +
       

     

       108
       170
        
             try {

     

       109
       109
       -
               const url = await ctx.oauthClient.authorize(handle, {

     

       171
       171
       +
               const service = env.PDS_URL ?? 'https://bsky.social'

     

       172
       172
       +
               const url = await ctx.oauthClient.authorize(service, {

     

       110
       173
        
                 scope: 'atproto transition:generic',

     

       111
       174
        
               })

     

       112
       175
        
               res.redirect(url.toString())

     
···

       127
       190
        
         )

     

       128
       191
        
       

     

       129
       192
        
         // Logout handler

     

       130
       130
       -
         app.post(

     

       193
       193
       +
         router.post(

     

       131
       194
        
           '/logout',

     

       132
       132
       -
           formHandler(async (req: Request, res: Response) => {

     

       195
       195
       +
           handler(async (req, res) => {

     

       196
       196
       +
             // Never store this route

     

       197
       197
       +
             res.setHeader('cache-control', 'no-store')

     

       198
       198
       +
       

     

       133
       199
        
             const session = await getIronSession<Session>(req, res, {

     

       134
       200
        
               cookieName: 'sid',

     

       135
       201
        
               password: env.COOKIE_SECRET,

     

       136
       202
        
             })

     

       137
       137
       -
             await session.destroy()

     

       203
       203
       +
       

     

       204
       204
       +
             // Revoke credentials on the server

     

       205
       205
       +
             if (session.did) {

     

       206
       206
       +
               try {

     

       207
       207
       +
                 const oauthSession = await ctx.oauthClient.restore(session.did)

     

       208
       208
       +
                 if (oauthSession) await oauthSession.signOut()

     

       209
       209
       +
               } catch (err) {

     

       210
       210
       +
                 ctx.logger.warn({ err }, 'Failed to revoke credentials')

     

       211
       211
       +
               }

     

       212
       212
       +
             }

     

       213
       213
       +
       

     

       214
       214
       +
             session.destroy()

     

       215
       215
       +
       

     

       138
       216
        
             return res.redirect('/')

     

       139
       217
        
           }),

     

       140
       218
        
         )

     

       141
       219
        
       

     

       142
       220
        
         // Homepage

     

       143
       143
       -
         app.get(

     

       221
       221
       +
         router.get(

     

       144
       222
        
           '/',

     

       145
       145
       -
           handler(async (req: Request, res: Response) => {

     

       223
       223
       +
           handler(async (req, res) => {

     

       146
       224
        
             // If the user is signed in, get an agent which communicates with their server

     

       147
       225
        
             const agent = await getSessionAgent(req, res, ctx)

     

       148
       226
        
       

     
···

       162
       240
        
                   .executeTakeFirst()

     

       163
       241
        
               : undefined

     

       164
       242
        
       

     

       165
       165
       -
             // Map (unique) user DIDs to their domain-name handles

     

       166
       166
       -
             const uniqueDids = [...new Set(statuses.map((s) => s.authorDid))]

     

       167
       167
       -
       

     

       168
       168
       -
             const didHandleMap: Record<string, string | undefined> =

     

       169
       169
       -
               Object.fromEntries(

     

       170
       170
       -
                 await Promise.all(

     

       171
       171
       -
                   uniqueDids.map((did) =>

     

       172
       172
       -
                     ctx.identityResolver.resolve(did).then(

     

       173
       173
       -
                       (r) => [did, r.handle],

     

       174
       174
       -
                       () => [did, undefined],

     

       175
       175
       -
                     ),

     

       176
       176
       -
                   ),

     

       177
       177
       -
                 ),

     

       178
       178
       -
               )

     

       243
       243
       +
             // Map user DIDs to their domain-name handles

     

       244
       244
       +
             const didHandleMap = await ctx.resolver.resolveDidsToHandles(

     

       245
       245
       +
               statuses.map((s) => s.authorDid),

     

       246
       246
       +
             )

     

       179
       247
        
       

     

       180
       248
        
             if (!agent) {

     

       181
       249
        
               // Serve the logged-out view

     

       182
       182
       -
               return void res

     

       183
       183
       -
                 .type('html')

     

       184
       184
       -
                 .send(page(home({ statuses, didHandleMap })))

     

       250
       250
       +
               return res.type('html').send(page(home({ statuses, didHandleMap })))

     

       185
       251
        
             }

     

       186
       252
        
       

     

       187
       253
        
             // Fetch additional information about the logged-in user

     
···

       203
       269
        
                 : {}

     

       204
       270
        
       

     

       205
       271
        
             // Serve the logged-in view

     

       206
       206
       -
             res.type('html').send(

     

       207
       207
       -
               page(

     

       208
       208
       -
                 home({

     

       209
       209
       -
                   statuses,

     

       210
       210
       -
                   didHandleMap,

     

       211
       211
       -
                   profile,

     

       212
       212
       -
                   myStatus,

     

       213
       213
       -
                 }),

     

       214
       214
       -
               ),

     

       215
       215
       -
             )

     

       272
       272
       +
             res

     

       273
       273
       +
               .type('html')

     

       274
       274
       +
               .send(page(home({ statuses, didHandleMap, profile, myStatus })))

     

       216
       275
        
           }),

     

       217
       276
        
         )

     

       218
       277
        
       

     

       219
       278
        
         // "Set status" handler

     

       220
       220
       -
         app.post(

     

       279
       279
       +
         router.post(

     

       221
       280
        
           '/status',

     

       222
       222
       -
           formHandler(async (req: Request, res: Response) => {

     

       281
       281
       +
           express.urlencoded(),

     

       282
       282
       +
           handler(async (req, res) => {

     

       223
       283
        
             // If the user is signed in, get an agent which communicates with their server

     

       224
       284
        
             const agent = await getSessionAgent(req, res, ctx)

     

       225
       285
        
             if (!agent) {

     

       226
       226
       -
               return void res

     

       286
       286
       +
               return res

     

       227
       287
        
                 .status(401)

     

       228
       288
        
                 .type('html')

     

       229
       289
        
                 .send('<h1>Error: Session required</h1>')

     

       230
       290
        
             }

     

       231
       291
        
       

     

       232
       232
       -
             // Construct & validate their status record

     

       233
       233
       -
             const rkey = TID.nextStr()

     

       292
       292
       +
             // Construct their status record

     

       234
       293
        
             const record = {

     

       235
       294
        
               $type: 'xyz.statusphere.status',

     

       236
       295
        
               status: req.body?.status,

     

       237
       296
        
               createdAt: new Date().toISOString(),

     

       238
       297
        
             }

     

       298
       298
       +
       

     

       299
       299
       +
             // Make sure the record generated from the input is valid

     

       239
       300
        
             if (!Status.validateRecord(record).success) {

     

       240
       240
       -
               return void res

     

       301
       301
       +
               return res

     

       241
       302
        
                 .status(400)

     

       242
       303
        
                 .type('html')

     

       243
       304
        
                 .send('<h1>Error: Invalid status</h1>')

     
···

       249
       310
        
               const res = await agent.com.atproto.repo.putRecord({

     

       250
       311
        
                 repo: agent.assertDid,

     

       251
       312
        
                 collection: 'xyz.statusphere.status',

     

       252
       252
       -
                 rkey,

     

       313
       313
       +
                 rkey: TID.nextStr(),

     

       253
       314
        
                 record,

     

       254
       315
        
                 validate: false,

     

       255
       316
        
               })

     

       256
       317
        
               uri = res.data.uri

     

       257
       318
        
             } catch (err) {

     

       258
       319
        
               ctx.logger.warn({ err }, 'failed to write record')

     

       259
       259
       -
               return void res

     

       320
       320
       +
               return res

     

       260
       321
        
                 .status(500)

     

       261
       322
        
                 .type('html')

     

       262
       323
        
                 .send('<h1>Error: Failed to write record</h1>')

     
···

       288
       349
        
           }),

     

       289
       350
        
         )

     

       290
       351
        
       

     

       291
       291
       -
         return app

     

       352
       352
       +
         return router

     

       292
       353
        
       }

Compare changes