commit 0e5523bbbc84291f55f5b2a8998684ff19121f79 · dunkirk.sh/dots

+1 -1

machines/atalanta/home/default.nix

···

       38
       38
        
               swift = true;

     

       39
       39
        
             };

     

       40
       40
        
           };

     

       41
       41
       -
           frpc = {

     

       41
       41
       +
           bore = {

     

       42
       42
        
             enable = true;

     

       43
       43
        
             authTokenFile = osConfig.age.secrets.frp-auth-token.path;

     

       44
       44
        
           };

+7 -7

modules/home/apps/frpc.nix

···

       5
       5
        
         ...

     

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
       -
         cfg = config.atelier.frpc;

     

       8
       8
       +
         cfg = config.atelier.bore;

     

       9
       9
        
       

     

       10
       10
       -
         frpc-tunnel = pkgs.writeShellScriptBin "frpc-tunnel" ''

     

       10
       10
       +
         bore = pkgs.writeShellScriptBin "bore" ''

     

       11
       11
        
           # Get subdomain

     

       12
       12
        
           if [ -n "$1" ]; then

     

       13
       13
        
             subdomain="$1"

     
···

       82
       82
        
         '';

     

       83
       83
        
       in

     

       84
       84
        
       {

     

       85
       85
       -
         options.atelier.frpc = {

     

       86
       86
       -
           enable = lib.mkEnableOption "frp client for tunneling services";

     

       85
       85
       +
         options.atelier.bore = {

     

       86
       86
       +
           enable = lib.mkEnableOption "bore tunneling service";

     

       87
       87
        
       

     

       88
       88
        
           serverAddr = lib.mkOption {

     

       89
       89
        
             type = lib.types.str;

     

       90
       90
        
             default = "bore.dunkirk.sh";

     

       91
       91
       -
             description = "frp server address";

     

       91
       91
       +
             description = "bore server address";

     

       92
       92
        
           };

     

       93
       93
        
       

     

       94
       94
        
           serverPort = lib.mkOption {

     

       95
       95
        
             type = lib.types.port;

     

       96
       96
        
             default = 7000;

     

       97
       97
       -
             description = "frp server port";

     

       97
       97
       +
             description = "bore server port";

     

       98
       98
        
           };

     

       99
       99
        
       

     

       100
       100
        
           domain = lib.mkOption {

     
···

       113
       113
        
         config = lib.mkIf cfg.enable {

     

       114
       114
        
           home.packages = [

     

       115
       115
        
             pkgs.frp

     

       116
       116
       -
             frpc-tunnel

     

       116
       116
       +
             bore

     

       117
       117
        
           ];

     

       118
       118
        
         };

     

       119
       119
        
       }

+78 -13

modules/nixos/services/bore-dashboard.html modules/nixos/services/bore/dashboard.html

···

       4
       4
        
       <head>

     

       5
       5
        
         <meta charset="UTF-8">

     

       6
       6
        
         <meta name="viewport" content="width=device-width, initial-scale=1.0">

     

       7
       7
       -
         <title>🚇 bore</title>

     

       7
       7
       +
         <title>bore</title>

     

       8
       8
       +
         <link rel="icon"

     

       9
       9
       +
           href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🚇</text></svg>">

     

       8
       10
        
         <style>

     

       9
       11
        
           * {

     

       10
       12
        
             margin: 0;

     
···

       18
       20
        
             color: #e6edf3;

     

       19
       21
        
             padding: 2rem;

     

       20
       22
        
             line-height: 1.5;

     

       23
       23
       +
             min-height: 100vh;

     

       24
       24
       +
             display: flex;

     

       25
       25
       +
             flex-direction: column;

     

       21
       26
        
           }

     

       22
       27
        
       

     

       23
       28
        
           .container {

     

       24
       29
        
             max-width: 1200px;

     

       25
       30
        
             margin: 0 auto;

     

       31
       31
       +
             flex: 1;

     

       32
       32
       +
             width: 100%;

     

       26
       33
        
           }

     

       27
       34
        
       

     

       28
       35
        
           header {

     
···

       185
       192
        
             color: #8b949e;

     

       186
       193
        
             font-size: 0.8rem;

     

       187
       194
        
             margin-top: 2rem;

     

       195
       195
       +
             padding: 2rem 0;

     

       196
       196
       +
           }

     

       197
       197
       +
       

     

       198
       198
       +
           .last-updated a {

     

       199
       199
       +
             color: #14b8a6;

     

       200
       200
       +
             text-decoration: none;

     

       201
       201
       +
           }

     

       202
       202
       +
       

     

       203
       203
       +
           .last-updated a:hover {

     

       204
       204
       +
             text-decoration: underline;

     

       188
       205
        
           }

     

       189
       206
        
         </style>

     

       190
       207
        
       </head>

     

       191
       208
        
       

     

       192
       209
        
       <body>

     

       193
       193
       -
         <div class="container">

     

       210
       210
       +
         <main class="container">

     

       194
       211
        
           <header>

     

       195
       212
        
             <h1>🚇 bore</h1>

     

       196
       196
       -
             <p class="subtitle">tunnel dashboard • bore.dunkirk.sh</p>

     

       213
       213
       +
             <p class="subtitle">fancy tunnels @ terebithia</p>

     

       197
       214
        
           </header>

     

       198
       215
        
       

     

       199
       216
        
           <div class="stats">

     
···

       211
       228
        
             </div>

     

       212
       229
        
           </div>

     

       213
       230
        
       

     

       214
       214
       -
           <div class="section">

     

       215
       215
       -
             <h2>~ active tunnels</h2>

     

       231
       231
       +
           <section class="section">

     

       232
       232
       +
             <h2>~boreholes</h2>

     

       216
       233
        
             <div class="tunnel-list" id="tunnelList">

     

       217
       234
        
               <div class="empty-state">

     

       218
       235
        
                 <div class="empty-icon">🚇</div>

     

       219
       236
        
                 <p>no active tunnels</p>

     

       220
       237
        
               </div>

     

       221
       238
        
             </div>

     

       222
       222
       -
           </div>

     

       239
       239
       +
           </section>

     

       240
       240
       +
         </main>

     

       223
       241
        
       

     

       224
       224
       -
           <div class="last-updated">

     

       225
       225
       -
             last updated: <span id="lastUpdated">never</span>

     

       226
       226
       -
           </div>

     

       227
       227
       -
         </div>

     

       242
       242
       +
         <footer class="last-updated">

     

       243
       243
       +
           last updated: <span id="lastUpdated">never</span><br>

     

       244
       244
       +
           made with ♥︎ by <a href="https://dunkirk.sh" target="_blank">kieran klukas</a>

     

       245
       245
       +
         </footer>

     

       228
       246
        
       

     

       229
       247
        
         <script>

     

       230
       248
        
           let fetchFailCount = 0;

     
···

       265
       283
        
                   const subdomain = proxy.conf.subdomain;

     

       266
       284
        
                   const url = `https://${subdomain}.bore.dunkirk.sh`;

     

       267
       285
        
                   const statusClass = proxy.status === 'online' ? 'status-online' : '';

     

       268
       268
       -
                   

     

       286
       286
       +
       

     

       269
       287
        
                   return `

     

       270
       288
        
                     <div class="tunnel">

     

       271
       289
        
                       <div class="tunnel-icon">→</div>

     
···

       275
       293
        
                           <a href="${url}" target="_blank">${url}</a>

     

       276
       294
        
                         </div>

     

       277
       295
        
                         <div style="color: #8b949e; font-size: 0.75rem; margin-top: 0.25rem;">

     

       278
       278
       -
                           started: ${proxy.lastStartTime} • traffic in: ${formatBytes(proxy.todayTrafficIn)} • out: ${formatBytes(proxy.todayTrafficOut)}

     

       296
       296
       +
                           started: <span data-start-time="${proxy.lastStartTime}"></span> • traffic in: ${formatBytes(proxy.todayTrafficIn)} • out: ${formatBytes(proxy.todayTrafficOut)}

     

       279
       297
        
                         </div>

     

       280
       298
        
                       </div>

     

       281
       299
        
                       <div class="tunnel-status ${statusClass}">${proxy.status}</div>

     

       282
       300
        
                     </div>

     

       283
       301
        
                   `;

     

       284
       302
        
                 }).join('');

     

       303
       303
       +
       

     

       304
       304
       +
                 // Update all relative times

     

       305
       305
       +
                 updateRelativeTimes();

     

       285
       306
        
               }

     

       286
       307
        
       

     

       287
       308
        
               document.getElementById('lastUpdated').textContent = new Date().toLocaleTimeString();

     
···

       289
       310
        
               fetchFailCount++;

     

       290
       311
        
               document.getElementById('serverStatus').textContent = 'offline';

     

       291
       312
        
               console.error('Failed to fetch stats:', error);

     

       292
       292
       -
               

     

       313
       313
       +
       

     

       293
       314
        
               // Reload page if failed multiple times (server might have updated)

     

       294
       315
        
               if (fetchFailCount >= MAX_FAIL_COUNT) {

     

       295
       316
        
                 console.log('Multiple fetch failures detected, reloading page...');

     
···

       306
       327
        
             return Math.round(bytes / Math.pow(k, i) * 100) / 100 + ' ' + sizes[i];

     

       307
       328
        
           }

     

       308
       329
        
       

     

       330
       330
       +
           function formatTime(timeStr) {

     

       331
       331
       +
             // Input format: "12-08 20:15:20" (MM-DD HH:MM:SS)

     

       332
       332
       +
             const [datePart, timePart] = timeStr.split(' ');

     

       333
       333
       +
             const [month, day] = datePart.split('-');

     

       334
       334
       +
             const [hour, minute, second] = timePart.split(':');

     

       335
       335
       +
       

     

       336
       336
       +
             const now = new Date();

     

       337
       337
       +
             const inputDate = new Date(now.getFullYear(), parseInt(month) - 1, parseInt(day), parseInt(hour), parseInt(minute), parseInt(second));

     

       338
       338
       +
       

     

       339
       339
       +
             const diffInSeconds = (now.getTime() - inputDate.getTime()) / 1000;

     

       340
       340
       +
             const diffInMinutes = Math.round(diffInSeconds / 60);

     

       341
       341
       +
             const diffInHours = Math.round(diffInMinutes / 60);

     

       342
       342
       +
       

     

       343
       343
       +
             if (diffInSeconds < 60) {

     

       344
       344
       +
               return 'just now';

     

       345
       345
       +
             } else if (diffInHours < 1) {

     

       346
       346
       +
               return diffInMinutes === 1 ? '1 minute ago' : `${diffInMinutes} minutes ago`;

     

       347
       347
       +
             } else if (now.toDateString() === inputDate.toDateString()) {

     

       348
       348
       +
               return 'today';

     

       349
       349
       +
             } else if (

     

       350
       350
       +
               new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1).toDateString() ===

     

       351
       351
       +
               inputDate.toDateString()

     

       352
       352
       +
             ) {

     

       353
       353
       +
               return 'yesterday';

     

       354
       354
       +
             } else {

     

       355
       355
       +
               return inputDate.toLocaleTimeString([], {

     

       356
       356
       +
                 month: 'numeric',

     

       357
       357
       +
                 day: 'numeric',

     

       358
       358
       +
                 hour: 'numeric',

     

       359
       359
       +
                 minute: 'numeric',

     

       360
       360
       +
               });

     

       361
       361
       +
             }

     

       362
       362
       +
           }

     

       363
       363
       +
       

     

       364
       364
       +
           function updateRelativeTimes() {

     

       365
       365
       +
             document.querySelectorAll('[data-start-time]').forEach(element => {

     

       366
       366
       +
               const timeStr = element.getAttribute('data-start-time');

     

       367
       367
       +
               element.textContent = formatTime(timeStr);

     

       368
       368
       +
             });

     

       369
       369
       +
           }

     

       370
       370
       +
       

     

       309
       371
        
           // Fetch immediately and then every 5 seconds

     

       310
       372
        
           fetchStats();

     

       311
       373
        
           setInterval(fetchStats, 5000);

     

       374
       374
       +
       

     

       375
       375
       +
           // Update relative times every 10 seconds

     

       376
       376
       +
           setInterval(updateRelativeTimes, 10000);

     

       312
       377
        
         </script>

     

       313
       378
        
       </body>

     

       314
       379

+1 -1

modules/nixos/services/frps.nix modules/nixos/services/bore/frps.nix

···

       136
       136
        
                 # Serve dashboard HTML

     

       137
       137
        
                 handle {

     

       138
       138
        
                   root * ${./.}

     

       139
       139
       -
                   try_files bore-dashboard.html

     

       139
       139
       +
                   try_files dashboard.html

     

       140
       140
        
                   file_server

     

       141
       141
        
                 }

     

       142
       142
        
               '';