commit 6e9cfb22929bd35eda98cb0f43c47237ceaeae4d · gracekind.net/tangled-pages

+2 -1

.example.env

···

       2
       2
        
       # note these aren't secrets, just config

     

       3
       3
        
       KNOT_DOMAIN = "knot.gracekind.net"

     

       4
       4
        
       OWNER_DID = "did:plc:p572wxnsuoogcrhlfrlizlrb"

     

       5
       5
       -
       REPO_NAME = "tangled-pages-example"
     

       5
       5
       +
       REPO_NAME = "tangled-pages-example"

     

       6
       6
       +
       BRANCH = "main"

-185

src/knot-client.js

···

       1
       1
       -
       // https://tangled.sh/@tangled.sh/core/blob/master/knotclient/unsigned.go

     

       2
       2
       -
       // Converted to JavaScript by Claude Code

     

       3
       3
       -
       // Changes:

     

       4
       4
       -
       // - Added blob method

     

       5
       5
       -
       // - Added verbose option

     

       6
       6
       -
       

     

       7
       7
       -
       class UnsignedClient {

     

       8
       8
       -
         constructor(domain, dev = false, verbose = false) {

     

       9
       9
       -
           this.baseUrl = new URL(`${dev ? "http" : "https"}://${domain}`);

     

       10
       10
       -
           this.verbose = verbose;

     

       11
       11
       -
         }

     

       12
       12
       -
       

     

       13
       13
       -
         async newRequest(method, endpoint, query = null, body = null) {

     

       14
       14
       -
           const url = new URL(endpoint, this.baseUrl);

     

       15
       15
       -
       

     

       16
       16
       -
           if (query) {

     

       17
       17
       -
             for (const [key, value] of Object.entries(query)) {

     

       18
       18
       -
               url.searchParams.append(key, value);

     

       19
       19
       -
             }

     

       20
       20
       -
           }

     

       21
       21
       -
       

     

       22
       22
       -
           const options = {

     

       23
       23
       -
             method,

     

       24
       24
       -
             headers: {

     

       25
       25
       -
               "Content-Type": "application/json",

     

       26
       26
       -
             },

     

       27
       27
       -
             signal: AbortSignal.timeout(5000), // 5 second timeout

     

       28
       28
       -
           };

     

       29
       29
       -
       

     

       30
       30
       -
           if (body) {

     

       31
       31
       -
             options.body = typeof body === "string" ? body : JSON.stringify(body);

     

       32
       32
       -
           }

     

       33
       33
       -
       

     

       34
       34
       -
           return { url: url.toString(), options };

     

       35
       35
       -
         }

     

       36
       36
       -
       

     

       37
       37
       -
         async doRequest(url, options) {

     

       38
       38
       -
           try {

     

       39
       39
       -
             if (this.verbose) {

     

       40
       40
       -
               console.log("Request:", url);

     

       41
       41
       -
             }

     

       42
       42
       -
       

     

       43
       43
       -
             const response = await fetch(url, options);

     

       44
       44
       -
       

     

       45
       45
       -
             if (!response.ok && response.status !== 404 && response.status !== 400) {

     

       46
       46
       -
               throw new Error(`HTTP error! status: ${response.status}`);

     

       47
       47
       -
             }

     

       48
       48
       -
       

     

       49
       49
       -
             const text = await response.text();

     

       50
       50
       -
             return {

     

       51
       51
       -
               status: response.status,

     

       52
       52
       -
               data: text ? JSON.parse(text) : null,

     

       53
       53
       -
             };

     

       54
       54
       -
           } catch (error) {

     

       55
       55
       -
             console.error("Request error:", error);

     

       56
       56
       -
             throw error;

     

       57
       57
       -
           }

     

       58
       58
       -
         }

     

       59
       59
       -
       

     

       60
       60
       -
         async index(ownerDid, repoName, ref = "") {

     

       61
       61
       -
           const endpoint = ref

     

       62
       62
       -
             ? `/${ownerDid}/${repoName}/tree/${ref}`

     

       63
       63
       -
             : `/${ownerDid}/${repoName}`;

     

       64
       64
       -
       

     

       65
       65
       -
           const { url, options } = await this.newRequest("GET", endpoint);

     

       66
       66
       -
           const response = await this.doRequest(url, options);

     

       67
       67
       -
           return response.data;

     

       68
       68
       -
         }

     

       69
       69
       -
       

     

       70
       70
       -
         async log(ownerDid, repoName, ref, page = 0) {

     

       71
       71
       -
           const endpoint = `/${ownerDid}/${repoName}/log/${encodeURIComponent(ref)}`;

     

       72
       72
       -
           const query = {

     

       73
       73
       -
             page: page.toString(),

     

       74
       74
       -
             per_page: "60",

     

       75
       75
       -
           };

     

       76
       76
       -
       

     

       77
       77
       -
           const { url, options } = await this.newRequest("GET", endpoint, query);

     

       78
       78
       -
           const response = await this.doRequest(url, options);

     

       79
       79
       -
           return response.data;

     

       80
       80
       -
         }

     

       81
       81
       -
       

     

       82
       82
       -
         async branches(ownerDid, repoName) {

     

       83
       83
       -
           const endpoint = `/${ownerDid}/${repoName}/branches`;

     

       84
       84
       -
       

     

       85
       85
       -
           const { url, options } = await this.newRequest("GET", endpoint);

     

       86
       86
       -
           const response = await this.doRequest(url, options);

     

       87
       87
       -
           return response.data;

     

       88
       88
       -
         }

     

       89
       89
       -
       

     

       90
       90
       -
         async tags(ownerDid, repoName) {

     

       91
       91
       -
           const endpoint = `/${ownerDid}/${repoName}/tags`;

     

       92
       92
       -
       

     

       93
       93
       -
           const { url, options } = await this.newRequest("GET", endpoint);

     

       94
       94
       -
           const response = await this.doRequest(url, options);

     

       95
       95
       -
           return response.data;

     

       96
       96
       -
         }

     

       97
       97
       -
       

     

       98
       98
       -
         async branch(ownerDid, repoName, branch) {

     

       99
       99
       -
           const endpoint = `/${ownerDid}/${repoName}/branches/${encodeURIComponent(

     

       100
       100
       -
             branch

     

       101
       101
       -
           )}`;

     

       102
       102
       -
       

     

       103
       103
       -
           const { url, options } = await this.newRequest("GET", endpoint);

     

       104
       104
       -
           const response = await this.doRequest(url, options);

     

       105
       105
       -
           return response.data;

     

       106
       106
       -
         }

     

       107
       107
       -
       

     

       108
       108
       -
         async defaultBranch(ownerDid, repoName) {

     

       109
       109
       -
           const endpoint = `/${ownerDid}/${repoName}/branches/default`;

     

       110
       110
       -
       

     

       111
       111
       -
           const { url, options } = await this.newRequest("GET", endpoint);

     

       112
       112
       -
           const response = await this.doRequest(url, options);

     

       113
       113
       -
           return response.data;

     

       114
       114
       -
         }

     

       115
       115
       -
       

     

       116
       116
       -
         async capabilities() {

     

       117
       117
       -
           const endpoint = "/capabilities";

     

       118
       118
       -
       

     

       119
       119
       -
           const { url, options } = await this.newRequest("GET", endpoint);

     

       120
       120
       -
           const response = await this.doRequest(url, options);

     

       121
       121
       -
           return response.data;

     

       122
       122
       -
         }

     

       123
       123
       -
       

     

       124
       124
       -
         async compare(ownerDid, repoName, rev1, rev2) {

     

       125
       125
       -
           const endpoint = `/${ownerDid}/${repoName}/compare/${encodeURIComponent(

     

       126
       126
       -
             rev1

     

       127
       127
       -
           )}/${encodeURIComponent(rev2)}`;

     

       128
       128
       -
       

     

       129
       129
       -
           const { url, options } = await this.newRequest("GET", endpoint);

     

       130
       130
       -
       

     

       131
       131
       -
           try {

     

       132
       132
       -
             const response = await fetch(url, options);

     

       133
       133
       -
       

     

       134
       134
       -
             if (response.status === 404 || response.status === 400) {

     

       135
       135
       -
               throw new Error("Branch comparisons not supported on this knot.");

     

       136
       136
       -
             }

     

       137
       137
       -
       

     

       138
       138
       -
             if (!response.ok) {

     

       139
       139
       -
               throw new Error("Failed to create request.");

     

       140
       140
       -
             }

     

       141
       141
       -
       

     

       142
       142
       -
             const text = await response.text();

     

       143
       143
       -
             return JSON.parse(text);

     

       144
       144
       -
           } catch (error) {

     

       145
       145
       -
             console.error("Failed to compare across branches");

     

       146
       146
       -
             throw new Error("Failed to compare branches.");

     

       147
       147
       -
           }

     

       148
       148
       -
         }

     

       149
       149
       -
       

     

       150
       150
       -
         async repoLanguages(ownerDid, repoName, ref) {

     

       151
       151
       -
           const endpoint = `/${ownerDid}/${repoName}/languages/${encodeURIComponent(

     

       152
       152
       -
             ref

     

       153
       153
       -
           )}`;

     

       154
       154
       -
       

     

       155
       155
       -
           try {

     

       156
       156
       -
             const { url, options } = await this.newRequest("GET", endpoint);

     

       157
       157
       -
             const response = await fetch(url, options);

     

       158
       158
       -
       

     

       159
       159
       -
             if (response.status !== 200) {

     

       160
       160
       -
               console.warn("Failed to calculate languages", response.status);

     

       161
       161
       -
               return {};

     

       162
       162
       -
             }

     

       163
       163
       -
       

     

       164
       164
       -
             const text = await response.text();

     

       165
       165
       -
             return JSON.parse(text);

     

       166
       166
       -
           } catch (error) {

     

       167
       167
       -
             console.error("Error fetching repo languages:", error);

     

       168
       168
       -
             throw error;

     

       169
       169
       -
           }

     

       170
       170
       -
         }

     

       171
       171
       -
       

     

       172
       172
       -
         async blob(ownerDid, repoName, ref, filePath) {

     

       173
       173
       -
           const endpoint = `/${ownerDid}/${repoName}/blob/${encodeURIComponent(

     

       174
       174
       -
             ref

     

       175
       175
       -
           )}/${filePath}`;

     

       176
       176
       -
       

     

       177
       177
       -
           const { url, options } = await this.newRequest("GET", endpoint);

     

       178
       178
       -
           const response = await this.doRequest(url, options);

     

       179
       179
       -
           return response.data;

     

       180
       180
       -
         }

     

       181
       181
       -
       }

     

       182
       182
       -
       

     

       183
       183
       -
       export function createUnsignedClient(domain, dev = false, verbose = false) {

     

       184
       184
       -
         return new UnsignedClient(domain, dev, verbose);

     

       185
       185
       -
       }

+11 -8

src/pages-service.js

···

       1
       1
       -
       import { createUnsignedClient } from "./knot-client.js";

     

       2
       1
        
       import { getContentTypeForExtension, trimLeadingSlash } from "./helpers.js";

     

       3
       2
        
       import path from "node:path";

     

       4
       3
        
       import yaml from "yaml";

     
···

       70
       69
        
           domain,

     

       71
       70
        
           ownerDid,

     

       72
       71
        
           repoName,

     

       72
       72
       +
           branch,

     

       73
       73
        
           configFilepath = "pages_config.yaml",

     

       74
       74
        
           verbose = false,

     

       75
       75
        
           fileCacheExpirationSeconds = 10,

     

       76
       76
        
         }) {

     

       77
       77
       +
           this.domain = domain;

     

       77
       78
        
           this.ownerDid = ownerDid;

     

       78
       79
        
           this.repoName = repoName;

     

       80
       80
       +
           this.branch = branch;

     

       79
       81
        
           this.configFilepath = configFilepath;

     

       80
       82
        
           this.verbose = verbose;

     

       81
       81
       -
           this.client = createUnsignedClient(domain, false, verbose);

     

       82
       83
        
           this.fileCache = new FileCache({

     

       83
       84
        
             expirationSeconds: fileCacheExpirationSeconds,

     

       84
       85
        
           });

     
···

       115
       116
        
             return cachedContent;

     

       116
       117
        
           }

     

       117
       118
        
           // todo error handling?

     

       118
       118
       -
           const blob = await this.client.blob(

     

       119
       119
       -
             this.ownerDid,

     

       120
       120
       -
             this.repoName,

     

       121
       121
       -
             "main",

     

       122
       122
       -
             trimLeadingSlash(filename)

     

       123
       123
       -
           );

     

       119
       119
       +
           const url = `https://${this.domain}/${this.ownerDid}/${

     

       120
       120
       +
             this.repoName

     

       121
       121
       +
           }/blob/${this.branch}/${trimLeadingSlash(filename)}`;

     

       122
       122
       +
           if (this.verbose) {

     

       123
       123
       +
             console.log(`Fetching ${url}`);

     

       124
       124
       +
           }

     

       125
       125
       +
           const res = await fetch(url);

     

       126
       126
       +
           const blob = await res.json();

     

       124
       127
        
           const content = blob.contents;

     

       125
       128
        
           this.fileCache.set(filename, content);

     

       126
       129
        
           return content;

src/server.js

···

       8
       8
        
         domain: process.env.KNOT_DOMAIN,

     

       9
       9
        
         ownerDid: process.env.OWNER_DID,

     

       10
       10
        
         repoName: process.env.REPO_NAME,

     

       11
       11
       +
         branch: process.env.BRANCH,

     

       11
       12
        
         verbose: process.env.NODE_ENV === "development",

     

       12
       13
        
       });

     

       13
       14

src/worker.js

···

       11
       11
        
             domain: env.KNOT_DOMAIN,

     

       12
       12
        
             ownerDid: env.OWNER_DID,

     

       13
       13
        
             repoName: env.REPO_NAME,

     

       14
       14
       +
             branch: env.BRANCH,

     

       14
       15
        
             verbose: env.NODE_ENV === "development",

     

       15
       16
        
           });

     

       16
       17
        
         }

-16

test/knot-client-test.js

···

       1
       1
       -
       import { createUnsignedClient } from "../src/knot-client.js";

     

       2
       2
       -
       

     

       3
       3
       -
       const OWNER_DID = "did:plc:p572wxnsuoogcrhlfrlizlrb";

     

       4
       4
       -
       const REPO_NAME = "tangled-pages-example";

     

       5
       5
       -
       const KNOT_DOMAIN = "knot.gracekind.net";

     

       6
       6
       -
       

     

       7
       7
       -
       const client = createUnsignedClient(KNOT_DOMAIN);

     

       8
       8
       -
       

     

       9
       9
       -
       const blob = await client.blob(

     

       10
       10
       -
         OWNER_DID,

     

       11
       11
       -
         REPO_NAME,

     

       12
       12
       -
         "main",

     

       13
       13
       -
         "public/index.html"

     

       14
       14
       -
       );

     

       15
       15
       -
       

     

       16
       16
       -
       console.log(blob);