+8 -15

apps/main-app/src/routes/wisp.ts

··· 183 183 continue; 184 184 } 185 185 186 186 - console.log(`Processing file ${i + 1}/${fileArray.length}:`, file.name, file.size, 'bytes'); 186 186 + // Use webkitRelativePath when available (directory uploads), fallback to name for regular file uploads 187 187 + const filePath = (file as any).webkitRelativePath || file.name; 188 188 + 187 189 updateJobProgress(jobId, { 188 190 filesProcessed: i + 1, 189 189 - currentFile: file.name 191 191 + currentFile: filePath 190 192 }); 191 193 192 194 // Skip files that match ignore patterns 193 193 - const normalizedPath = file.name.replace(/^[^\/]*\//, ''); 195 195 + const normalizedPath = filePath.replace(/^[^\/]*\//, ''); 194 196 195 197 if (shouldIgnore(ignoreMatcher, normalizedPath)) { 196 196 - console.log(`Skipping ignored file: ${file.name}`); 197 198 skippedFiles.push({ 198 198 - name: file.name, 199 199 + name: filePath, 199 200 reason: 'matched ignore pattern' 200 201 }); 201 202 continue; ··· 205 206 const maxSize = MAX_FILE_SIZE; 206 207 if (file.size > maxSize) { 207 208 skippedFiles.push({ 208 208 - name: file.name, 209 209 + name: filePath, 209 210 reason: `file too large (${(file.size / 1024 / 1024).toFixed(2)}MB, max 100MB)` 210 211 }); 211 212 continue; ··· 238 239 // Text files: compress AND base64 encode 239 240 finalContent = Buffer.from(compressedContent.toString('base64'), 'binary'); 240 241 base64Encoded = true; 241 241 - const compressionRatio = (compressedContent.length / originalContent.length * 100).toFixed(1); 242 242 - console.log(`Compressing+base64 ${file.name}: ${originalContent.length} -> ${compressedContent.length} bytes (${compressionRatio}%), base64: ${finalContent.length} bytes`); 243 243 - logger.info(`Compressing+base64 ${file.name}: ${originalContent.length} -> ${compressedContent.length} bytes (${compressionRatio}%), base64: ${finalContent.length} bytes`); 244 242 } else { 245 243 // Audio files: just compress, no base64 246 244 finalContent = compressedContent; 247 247 - const compressionRatio = (compressedContent.length / originalContent.length * 100).toFixed(1); 248 248 - console.log(`Compressing ${file.name}: ${originalContent.length} -> ${compressedContent.length} bytes (${compressionRatio}%)`); 249 249 - logger.info(`Compressing ${file.name}: ${originalContent.length} -> ${compressedContent.length} bytes (${compressionRatio}%)`); 250 245 } 251 246 } else { 252 247 // Binary files: upload directly 253 248 finalContent = originalContent; 254 254 - console.log(`Uploading ${file.name} directly: ${originalContent.length} bytes (no compression)`); 255 255 - logger.info(`Uploading ${file.name} directly: ${originalContent.length} bytes (binary)`); 256 249 } 257 250 258 251 uploadedFiles.push({ 259 259 - name: file.name, 252 252 + name: filePath, 260 253 content: finalContent, 261 254 mimeType: originalMimeType, 262 255 size: finalContent.length,

+9 -2

bun.lock

··· 11 11 "elysia": "^1.4.18", 12 12 "tailwindcss": "^4.1.17", 13 13 }, 14 14 + "devDependencies": { 15 15 + "@types/bun": "^1.3.5", 16 16 + }, 14 17 }, 15 18 "apps/hosting-service": { 16 19 "name": "wisp-hosting-service", ··· 583 586 584 587 "@ts-morph/common": ["@ts-morph/common@0.25.0", "", { "dependencies": { "minimatch": "^9.0.4", "path-browserify": "^1.0.1", "tinyglobby": "^0.2.9" } }, "sha512-kMnZz+vGGHi4GoHnLmMhGNjm44kGtKUXGnOvrKmMwAuvNjM/PgKVGfUnL7IDvK7Jb2QQ82jq3Zmp04Gy+r3Dkg=="], 585 588 586 586 - "@types/bun": ["@types/bun@1.3.3", "", { "dependencies": { "bun-types": "1.3.3" } }, "sha512-ogrKbJ2X5N0kWLLFKeytG0eHDleBYtngtlbu9cyBKFtNL3cnpDZkNdQj8flVf6WTZUX5ulI9AY1oa7ljhSrp+g=="], 589 589 + "@types/bun": ["@types/bun@1.3.5", "", { "dependencies": { "bun-types": "1.3.5" } }, "sha512-RnygCqNrd3srIPEWBd5LFeUYG7plCoH2Yw9WaZGyNmdTEei+gWaHqydbaIRkIkcbXwhBT94q78QljxN0Sk838w=="], 587 590 588 591 "@types/mime-types": ["@types/mime-types@2.1.4", "", {}, "sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w=="], 589 592 ··· 1267 1270 1268 1271 "@tokenizer/inflate/debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="], 1269 1272 1270 1270 - "@types/bun/bun-types": ["bun-types@1.3.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-z3Xwlg7j2l9JY27x5Qn3Wlyos8YAp0kKRlrePAOjgjMGS5IG6E7Jnlx736vH9UVI4wUICwwhC9anYL++XeOgTQ=="], 1273 1273 + "@types/bun/bun-types": ["bun-types@1.3.5", "", { "dependencies": { "@types/node": "*" } }, "sha512-inmAYe2PFLs0SUbFOWSVD24sg1jFlMPxOjOSSCYqUgn4Hsc3rDc7dFvfVYjFPNHtov6kgUeulV4SxbuIV/stPw=="], 1271 1274 1272 1275 "@wisp/main-app/@atproto/api": ["@atproto/api@0.17.7", "", { "dependencies": { "@atproto/common-web": "^0.4.3", "@atproto/lexicon": "^0.5.1", "@atproto/syntax": "^0.4.1", "@atproto/xrpc": "^0.7.5", "await-lock": "^2.2.2", "multiformats": "^9.9.0", "tlds": "^1.234.0", "zod": "^3.23.8" } }, "sha512-V+OJBZq9chcrD21xk1bUa6oc5DSKfQj5DmUPf5rmZncqL1w9ZEbS38H5cMyqqdhfgo2LWeDRdZHD0rvNyJsIaw=="], 1273 1276 ··· 1298 1301 "uint8arrays/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="], 1299 1302 1300 1303 "wisp-hosting-service/@atproto/api": ["@atproto/api@0.17.7", "", { "dependencies": { "@atproto/common-web": "^0.4.3", "@atproto/lexicon": "^0.5.1", "@atproto/syntax": "^0.4.1", "@atproto/xrpc": "^0.7.5", "await-lock": "^2.2.2", "multiformats": "^9.9.0", "tlds": "^1.234.0", "zod": "^3.23.8" } }, "sha512-V+OJBZq9chcrD21xk1bUa6oc5DSKfQj5DmUPf5rmZncqL1w9ZEbS38H5cMyqqdhfgo2LWeDRdZHD0rvNyJsIaw=="], 1304 1304 + 1305 1305 + "wisp-hosting-service/@types/bun": ["@types/bun@1.3.3", "", { "dependencies": { "bun-types": "1.3.3" } }, "sha512-ogrKbJ2X5N0kWLLFKeytG0eHDleBYtngtlbu9cyBKFtNL3cnpDZkNdQj8flVf6WTZUX5ulI9AY1oa7ljhSrp+g=="], 1301 1306 1302 1307 "@atproto/sync/@atproto/xrpc-server/@atproto/ws-client": ["@atproto/ws-client@0.0.3", "", { "dependencies": { "@atproto/common": "^0.5.0", "ws": "^8.12.0" } }, "sha512-eKqkTWBk6zuMY+6gs02eT7mS8Btewm8/qaL/Dp00NDCqpNC+U59MWvQsOWT3xkNGfd9Eip+V6VI4oyPvAfsfTA=="], 1303 1308 ··· 1400 1405 "tsx/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.27.1", "", { "os": "win32", "cpu": "x64" }, "sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw=="], 1401 1406 1402 1407 "wisp-hosting-service/@atproto/api/multiformats": ["multiformats@9.9.0", "", {}, "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg=="], 1408 1408 + 1409 1409 + "wisp-hosting-service/@types/bun/bun-types": ["bun-types@1.3.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-z3Xwlg7j2l9JY27x5Qn3Wlyos8YAp0kKRlrePAOjgjMGS5IG6E7Jnlx736vH9UVI4wUICwwhC9anYL++XeOgTQ=="], 1403 1410 } 1404 1411 }

+4 -1

package.json

··· 30 30 "@parcel/watcher", 31 31 "bun", 32 32 "esbuild" 33 33 - ] 33 33 + ], 34 34 + "devDependencies": { 35 35 + "@types/bun": "^1.3.5" 36 36 + } 34 37 }

+244

packages/@wisp/fs-utils/src/tree.test.ts

··· 1 1 + import { describe, test, expect } from 'bun:test' 2 2 + import { processUploadedFiles, type UploadedFile } from './tree' 3 3 + 4 4 + describe('processUploadedFiles', () => { 5 5 + test('should preserve nested directory structure', () => { 6 6 + const files: UploadedFile[] = [ 7 7 + { 8 8 + name: 'mysite/index.html', 9 9 + content: Buffer.from('<html>'), 10 10 + mimeType: 'text/html', 11 11 + size: 6 12 12 + }, 13 13 + { 14 14 + name: 'mysite/_astro/main.js', 15 15 + content: Buffer.from('console.log()'), 16 16 + mimeType: 'application/javascript', 17 17 + size: 13 18 18 + }, 19 19 + { 20 20 + name: 'mysite/_astro/styles.css', 21 21 + content: Buffer.from('body {}'), 22 22 + mimeType: 'text/css', 23 23 + size: 7 24 24 + }, 25 25 + { 26 26 + name: 'mysite/images/logo.png', 27 27 + content: Buffer.from([0x89, 0x50, 0x4e, 0x47]), 28 28 + mimeType: 'image/png', 29 29 + size: 4 30 30 + } 31 31 + ] 32 32 + 33 33 + const result = processUploadedFiles(files) 34 34 + 35 35 + expect(result.fileCount).toBe(4) 36 36 + expect(result.directory.entries).toHaveLength(3) // index.html, _astro/, images/ 37 37 + 38 38 + // Check _astro directory exists 39 39 + const astroEntry = result.directory.entries.find(e => e.name === '_astro') 40 40 + expect(astroEntry).toBeTruthy() 41 41 + expect('type' in astroEntry!.node && astroEntry!.node.type).toBe('directory') 42 42 + 43 43 + if ('entries' in astroEntry!.node) { 44 44 + const astroDir = astroEntry!.node 45 45 + expect(astroDir.entries).toHaveLength(2) // main.js, styles.css 46 46 + expect(astroDir.entries.find(e => e.name === 'main.js')).toBeTruthy() 47 47 + expect(astroDir.entries.find(e => e.name === 'styles.css')).toBeTruthy() 48 48 + } 49 49 + 50 50 + // Check images directory exists 51 51 + const imagesEntry = result.directory.entries.find(e => e.name === 'images') 52 52 + expect(imagesEntry).toBeTruthy() 53 53 + expect('type' in imagesEntry!.node && imagesEntry!.node.type).toBe('directory') 54 54 + 55 55 + if ('entries' in imagesEntry!.node) { 56 56 + const imagesDir = imagesEntry!.node 57 57 + expect(imagesDir.entries).toHaveLength(1) // logo.png 58 58 + expect(imagesDir.entries.find(e => e.name === 'logo.png')).toBeTruthy() 59 59 + } 60 60 + }) 61 61 + 62 62 + test('should handle deeply nested directories', () => { 63 63 + const files: UploadedFile[] = [ 64 64 + { 65 65 + name: 'site/a/b/c/d/deep.txt', 66 66 + content: Buffer.from('deep'), 67 67 + mimeType: 'text/plain', 68 68 + size: 4 69 69 + } 70 70 + ] 71 71 + 72 72 + const result = processUploadedFiles(files) 73 73 + 74 74 + expect(result.fileCount).toBe(1) 75 75 + 76 76 + // Navigate through nested structure 77 77 + const aEntry = result.directory.entries.find(e => e.name === 'a') 78 78 + expect(aEntry).toBeTruthy() 79 79 + expect('type' in aEntry!.node && aEntry!.node.type).toBe('directory') 80 80 + 81 81 + if ('entries' in aEntry!.node) { 82 82 + const bEntry = aEntry!.node.entries.find(e => e.name === 'b') 83 83 + expect(bEntry).toBeTruthy() 84 84 + expect('type' in bEntry!.node && bEntry!.node.type).toBe('directory') 85 85 + 86 86 + if ('entries' in bEntry!.node) { 87 87 + const cEntry = bEntry!.node.entries.find(e => e.name === 'c') 88 88 + expect(cEntry).toBeTruthy() 89 89 + expect('type' in cEntry!.node && cEntry!.node.type).toBe('directory') 90 90 + 91 91 + if ('entries' in cEntry!.node) { 92 92 + const dEntry = cEntry!.node.entries.find(e => e.name === 'd') 93 93 + expect(dEntry).toBeTruthy() 94 94 + expect('type' in dEntry!.node && dEntry!.node.type).toBe('directory') 95 95 + 96 96 + if ('entries' in dEntry!.node) { 97 97 + const fileEntry = dEntry!.node.entries.find(e => e.name === 'deep.txt') 98 98 + expect(fileEntry).toBeTruthy() 99 99 + expect('type' in fileEntry!.node && fileEntry!.node.type).toBe('file') 100 100 + } 101 101 + } 102 102 + } 103 103 + } 104 104 + }) 105 105 + 106 106 + test('should handle files at root level', () => { 107 107 + const files: UploadedFile[] = [ 108 108 + { 109 109 + name: 'mysite/index.html', 110 110 + content: Buffer.from('<html>'), 111 111 + mimeType: 'text/html', 112 112 + size: 6 113 113 + }, 114 114 + { 115 115 + name: 'mysite/robots.txt', 116 116 + content: Buffer.from('User-agent: *'), 117 117 + mimeType: 'text/plain', 118 118 + size: 13 119 119 + } 120 120 + ] 121 121 + 122 122 + const result = processUploadedFiles(files) 123 123 + 124 124 + expect(result.fileCount).toBe(2) 125 125 + expect(result.directory.entries).toHaveLength(2) 126 126 + expect(result.directory.entries.find(e => e.name === 'index.html')).toBeTruthy() 127 127 + expect(result.directory.entries.find(e => e.name === 'robots.txt')).toBeTruthy() 128 128 + }) 129 129 + 130 130 + test('should skip .git directories', () => { 131 131 + const files: UploadedFile[] = [ 132 132 + { 133 133 + name: 'mysite/index.html', 134 134 + content: Buffer.from('<html>'), 135 135 + mimeType: 'text/html', 136 136 + size: 6 137 137 + }, 138 138 + { 139 139 + name: 'mysite/.git/config', 140 140 + content: Buffer.from('[core]'), 141 141 + mimeType: 'text/plain', 142 142 + size: 6 143 143 + }, 144 144 + { 145 145 + name: 'mysite/.gitignore', 146 146 + content: Buffer.from('node_modules'), 147 147 + mimeType: 'text/plain', 148 148 + size: 12 149 149 + } 150 150 + ] 151 151 + 152 152 + const result = processUploadedFiles(files) 153 153 + 154 154 + expect(result.fileCount).toBe(2) // Only index.html and .gitignore 155 155 + expect(result.directory.entries).toHaveLength(2) 156 156 + expect(result.directory.entries.find(e => e.name === 'index.html')).toBeTruthy() 157 157 + expect(result.directory.entries.find(e => e.name === '.gitignore')).toBeTruthy() 158 158 + expect(result.directory.entries.find(e => e.name === '.git')).toBeFalsy() 159 159 + }) 160 160 + 161 161 + test('should handle mixed root and nested files', () => { 162 162 + const files: UploadedFile[] = [ 163 163 + { 164 164 + name: 'mysite/index.html', 165 165 + content: Buffer.from('<html>'), 166 166 + mimeType: 'text/html', 167 167 + size: 6 168 168 + }, 169 169 + { 170 170 + name: 'mysite/about/index.html', 171 171 + content: Buffer.from('<html>'), 172 172 + mimeType: 'text/html', 173 173 + size: 6 174 174 + }, 175 175 + { 176 176 + name: 'mysite/about/team.html', 177 177 + content: Buffer.from('<html>'), 178 178 + mimeType: 'text/html', 179 179 + size: 6 180 180 + }, 181 181 + { 182 182 + name: 'mysite/robots.txt', 183 183 + content: Buffer.from('User-agent: *'), 184 184 + mimeType: 'text/plain', 185 185 + size: 13 186 186 + } 187 187 + ] 188 188 + 189 189 + const result = processUploadedFiles(files) 190 190 + 191 191 + expect(result.fileCount).toBe(4) 192 192 + expect(result.directory.entries).toHaveLength(3) // index.html, about/, robots.txt 193 193 + 194 194 + const aboutEntry = result.directory.entries.find(e => e.name === 'about') 195 195 + expect(aboutEntry).toBeTruthy() 196 196 + expect('type' in aboutEntry!.node && aboutEntry!.node.type).toBe('directory') 197 197 + 198 198 + if ('entries' in aboutEntry!.node) { 199 199 + const aboutDir = aboutEntry!.node 200 200 + expect(aboutDir.entries).toHaveLength(2) // index.html, team.html 201 201 + expect(aboutDir.entries.find(e => e.name === 'index.html')).toBeTruthy() 202 202 + expect(aboutDir.entries.find(e => e.name === 'team.html')).toBeTruthy() 203 203 + } 204 204 + }) 205 205 + 206 206 + test('should handle empty file array', () => { 207 207 + const files: UploadedFile[] = [] 208 208 + 209 209 + const result = processUploadedFiles(files) 210 210 + 211 211 + expect(result.fileCount).toBe(0) 212 212 + expect(result.directory.entries).toHaveLength(0) 213 213 + }) 214 214 + 215 215 + test('should strip base folder name from paths', () => { 216 216 + // This tests the behavior where file.name includes the base folder 217 217 + // e.g., "mysite/index.html" should become "index.html" at root 218 218 + const files: UploadedFile[] = [ 219 219 + { 220 220 + name: 'build-output/index.html', 221 221 + content: Buffer.from('<html>'), 222 222 + mimeType: 'text/html', 223 223 + size: 6 224 224 + }, 225 225 + { 226 226 + name: 'build-output/assets/main.js', 227 227 + content: Buffer.from('console.log()'), 228 228 + mimeType: 'application/javascript', 229 229 + size: 13 230 230 + } 231 231 + ] 232 232 + 233 233 + const result = processUploadedFiles(files) 234 234 + 235 235 + expect(result.fileCount).toBe(2) 236 236 + 237 237 + // Should have index.html at root and assets/ directory 238 238 + expect(result.directory.entries.find(e => e.name === 'index.html')).toBeTruthy() 239 239 + expect(result.directory.entries.find(e => e.name === 'assets')).toBeTruthy() 240 240 + 241 241 + // Should NOT have 'build-output' directory 242 242 + expect(result.directory.entries.find(e => e.name === 'build-output')).toBeFalsy() 243 243 + }) 244 244 + })

+1 -1

tsconfig.json

··· 33 33 // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ 34 34 // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ 35 35 "types": [ 36 36 - "bun-types" 36 36 + "bun" 37 37 ] /* Specify type package names to be included without being referenced in a source file. */, 38 38 // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ 39 39 // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */