@codeyam/codeyam-cli 0.1.0-staging.415103 → 0.1.0-staging.44b55c1

package/codeyam-cli/src/utils/webappDetection.js

@@ -22,6 +22,10 @@ function detectFrameworkFromPackageJson(packageJsonPath) {
             return ProjectFramework.Remix;
         if (deps['react-scripts'])
             return ProjectFramework.CRA;
+        if (deps.expo)
+            return ProjectFramework.Expo;
+        if (deps.vite)
+            return ProjectFramework.Vite;
         return ProjectFramework.Unknown;
     }
     catch (error) {
@@ -98,6 +102,7 @@ function isWebAppDirectory(dirPath) {
             'react-scripts',
             'webpack-dev-server',
             'parcel',
+            'expo',
         ];
         const possibleStartAndBuildScripts = Object.keys(scripts).filter((script) => ['dev', 'start', 'serve', 'build'].some((keyword) => script.includes(keyword)));
         const scriptsWithWebappPattern = possibleStartAndBuildScripts.filter((scriptName) => webappPatterns.some((pattern) => scripts[scriptName].includes(pattern)));
@@ -239,6 +244,22 @@ export function getDefaultStartScript(webappPath, projectRoot) {
         return null;
     }
 }
+/**
+ * Merge detected webapps with existing config webapps.
+ * Detected webapps take precedence, but manually-configured webapps
+ * (those with a startCommand that aren't in the detected set) are preserved.
+ */
+export function mergeWebApps(detected, existing) {
+    const detectedPaths = new Set(detected.map((w) => w.path));
+    const merged = [...detected];
+    for (const existingWebapp of existing) {
+        if (!detectedPaths.has(existingWebapp.path)) {
+            // Preserve manually-configured webapps not found by detection
+            merged.push(existingWebapp);
+        }
+    }
+    return merged;
+}
 /**
  * Find which webapp a component belongs to based on its file path
  * Returns the webapp that contains the component, or the first webapp as fallback

package/codeyam-cli/src/utils/webappDetection.js.map

@@ -1 +1 @@
-{"version":3,"file":"webappDetection.js","sourceRoot":"","sources":["../../../../src/utils/webappDetection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webappDetection.js","sourceRoot":"","sources":["../../../../src/utils/webappDetection.ts"],"names":[],"mappings":"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"}

package/codeyam-cli/src/webserver/__tests__/editorProxy.test.js

@@ -0,0 +1,410 @@
+import http from 'http';
+import zlib from 'zlib';
+import { injectHealthScript, PREVIEW_HEALTH_SCRIPT, getPreviewHealthReport, resetPreviewHealth, } from "../editorProxy.js";
+describe('editorProxy', () => {
+    describe('normalizeTargetUrl', () => {
+        it('should leave localhost as-is (no longer normalizes to 127.0.0.1)', () => {
+            const { normalizeTargetUrl } = require('../editorProxy');
+            expect(normalizeTargetUrl('http://localhost:3112')).toBe('http://localhost:3112');
+        });
+        it('should leave 127.0.0.1 unchanged', () => {
+            const { normalizeTargetUrl } = require('../editorProxy');
+            expect(normalizeTargetUrl('http://127.0.0.1:3112')).toBe('http://127.0.0.1:3112');
+        });
+        it('should leave other hostnames unchanged', () => {
+            const { normalizeTargetUrl } = require('../editorProxy');
+            expect(normalizeTargetUrl('http://myhost:3112')).toBe('http://myhost:3112');
+        });
+        it('should strip trailing slash', () => {
+            const { normalizeTargetUrl } = require('../editorProxy');
+            expect(normalizeTargetUrl('http://localhost:3112/')).toBe('http://localhost:3112');
+        });
+    });
+    describe('resolveLoopbackAddress', () => {
+        let server;
+        afterEach((done) => {
+            if (server?.listening) {
+                server.close(done);
+            }
+            else {
+                done();
+            }
+        });
+        it('should resolve to 127.0.0.1 when server binds to IPv4', async () => {
+            const { resolveLoopbackAddress } = require('../editorProxy');
+            server = http.createServer((_req, res) => res.end('ok'));
+            await new Promise((resolve) => server.listen(0, '127.0.0.1', () => resolve()));
+            const port = server.address().port;
+            const host = await resolveLoopbackAddress(port);
+            expect(host).toBe('127.0.0.1');
+        });
+        it('should resolve to ::1 when server binds to IPv6 only', async () => {
+            const { resolveLoopbackAddress } = require('../editorProxy');
+            server = http.createServer((_req, res) => res.end('ok'));
+            await new Promise((resolve) => server.listen(0, '::1', () => resolve()));
+            const port = server.address().port;
+            const host = await resolveLoopbackAddress(port);
+            expect(host).toBe('::1');
+        });
+        it('should return null when no server is listening', async () => {
+            const { resolveLoopbackAddress } = require('../editorProxy');
+            const host = await resolveLoopbackAddress(19876);
+            expect(host).toBeNull();
+        });
+    });
+    describe('proxy forwarding uses 127.0.0.1', () => {
+        let targetServer;
+        let targetPort;
+        afterEach((done) => {
+            if (targetServer?.listening) {
+                targetServer.close(done);
+            }
+            else {
+                done();
+            }
+        });
+        it('should forward requests to target and return correct response', async () => {
+            const { startEditorProxy, stopEditorProxy } = require('../editorProxy');
+            // Start a target server that returns 200
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'text/plain' });
+                res.end('OK from target');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            // Start proxy pointing to the target using localhost URL
+            const result = await startEditorProxy({
+                port: 0, // let OS pick
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            expect(result).not.toBeNull();
+            // Make a request through the proxy
+            const response = await fetch(`http://127.0.0.1:${result.port}/`);
+            expect(response.status).toBe(200);
+            const body = await response.text();
+            expect(body).toBe('OK from target');
+            await stopEditorProxy();
+        });
+        it('should log when target returns non-2xx status', async () => {
+            const { startEditorProxy, stopEditorProxy } = require('../editorProxy');
+            // Start a target that returns 404
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(404, { 'Content-Type': 'text/plain' });
+                res.end('Not Found');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            const warnSpy = jest.spyOn(console, 'warn').mockImplementation();
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            const response = await fetch(`http://127.0.0.1:${result.port}/test-path`);
+            expect(response.status).toBe(404);
+            // Verify a warning was logged about the non-2xx response
+            expect(warnSpy.mock.calls.some((call) => String(call[0]).includes('[editorProxy]') &&
+                String(call[0]).includes('404') &&
+                String(call[0]).includes('/test-path'))).toBe(true);
+            warnSpy.mockRestore();
+            await stopEditorProxy();
+        });
+        it('should verify forwarding works after start via self-test', async () => {
+            const { startEditorProxy, stopEditorProxy, verifyProxyForwarding, } = require('../editorProxy');
+            // Start a target that returns 200
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'text/plain' });
+                res.end('healthy');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            const verified = await verifyProxyForwarding();
+            expect(verified).toBe(true);
+            await stopEditorProxy();
+        });
+        it('should report verification failure when target is down', async () => {
+            const { startEditorProxy, stopEditorProxy, verifyProxyForwarding, } = require('../editorProxy');
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: 'http://127.0.0.1:19876',
+            });
+            const verified = await verifyProxyForwarding();
+            expect(verified).toBe(false);
+            await stopEditorProxy();
+        });
+        it('should return false for verification when proxy is not running', async () => {
+            const { verifyProxyForwarding, stopEditorProxy, } = require('../editorProxy');
+            await stopEditorProxy();
+            const verified = await verifyProxyForwarding();
+            expect(verified).toBe(false);
+        });
+        it('should return 502 when target is unreachable', async () => {
+            const { startEditorProxy, stopEditorProxy } = require('../editorProxy');
+            // Start proxy pointing to a port with nothing listening
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: 'http://localhost:19876',
+            });
+            expect(result).not.toBeNull();
+            const response = await fetch(`http://127.0.0.1:${result.port}/`);
+            expect(response.status).toBe(502);
+            await stopEditorProxy();
+        });
+        it('should forward requests to an IPv6-only target server', async () => {
+            const { startEditorProxy, stopEditorProxy } = require('../editorProxy');
+            // Start a target server bound to IPv6 only (::1) — this is what Vite 6 does on macOS
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'text/plain' });
+                res.end('OK from IPv6 target');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '::1', () => resolve()));
+            targetPort = targetServer.address().port;
+            // Start proxy with a localhost URL (simulating Vite's "Local: http://localhost:PORT")
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            expect(result).not.toBeNull();
+            // The proxy should successfully forward to the IPv6-only target
+            const response = await fetch(`http://127.0.0.1:${result.port}/`);
+            expect(response.status).toBe(200);
+            const body = await response.text();
+            expect(body).toBe('OK from IPv6 target');
+            await stopEditorProxy();
+        });
+    });
+    describe('injectHealthScript', () => {
+        it('should inject before </head> when present', () => {
+            const html = '<html><head><title>Test</title></head><body>Hello</body></html>';
+            const result = injectHealthScript(html);
+            expect(result).toContain(PREVIEW_HEALTH_SCRIPT + '</head>');
+            expect(result).toContain('<title>Test</title>');
+        });
+        it('should inject before </body> when no </head>', () => {
+            const html = '<html><body>Hello</body></html>';
+            const result = injectHealthScript(html);
+            expect(result).toContain(PREVIEW_HEALTH_SCRIPT + '</body>');
+        });
+        it('should append when no </head> or </body>', () => {
+            const html = '<div>Hello</div>';
+            const result = injectHealthScript(html);
+            expect(result).toBe('<div>Hello</div>' + PREVIEW_HEALTH_SCRIPT);
+        });
+        it('should include the data-codeyam-health attribute', () => {
+            const html = '<html><head></head><body></body></html>';
+            const result = injectHealthScript(html);
+            expect(result).toContain('data-codeyam-health');
+        });
+    });
+    describe('preview health endpoint', () => {
+        let targetServer;
+        let targetPort;
+        afterEach(async () => {
+            const { stopEditorProxy } = require('../editorProxy');
+            await stopEditorProxy();
+            if (targetServer?.listening) {
+                await new Promise((resolve) => targetServer.close(() => resolve()));
+            }
+            resetPreviewHealth();
+        });
+        it('should intercept POST /__codeyam__/preview-health and store errors', async () => {
+            const { startEditorProxy } = require('../editorProxy');
+            // Start a target that returns 200
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'text/plain' });
+                res.end('ok');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            expect(result).not.toBeNull();
+            // Post error data to the health endpoint
+            const response = await fetch(`http://127.0.0.1:${result.port}/__codeyam__/preview-health`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    errors: [
+                        {
+                            type: 'error',
+                            message: 'Cannot read properties of undefined',
+                            timestamp: 1710000000,
+                        },
+                    ],
+                    url: 'http://localhost:3112/',
+                }),
+            });
+            expect(response.status).toBe(204);
+            // Check the stored health data
+            const health = getPreviewHealthReport();
+            expect(health).not.toBeNull();
+            expect(health.errors).toHaveLength(1);
+            expect(health.errors[0].message).toBe('Cannot read properties of undefined');
+            expect(health.url).toBe('http://localhost:3112/');
+        });
+        it('should store loaded/hasContent from load report', async () => {
+            const { startEditorProxy } = require('../editorProxy');
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'text/plain' });
+                res.end('ok');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            // Post load report
+            await fetch(`http://127.0.0.1:${result.port}/__codeyam__/preview-health`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    loaded: true,
+                    hasContent: true,
+                    url: 'http://localhost:3112/',
+                    errorCount: 0,
+                }),
+            });
+            const health = getPreviewHealthReport();
+            expect(health).not.toBeNull();
+            expect(health.loaded).toBe(true);
+            expect(health.hasContent).toBe(true);
+        });
+        it('should inject health script into HTML responses', async () => {
+            const { startEditorProxy } = require('../editorProxy');
+            // Target that returns HTML
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'text/html' });
+                res.end('<html><head><title>App</title></head><body><div>Hello</div></body></html>');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            const response = await fetch(`http://127.0.0.1:${result.port}/`);
+            const body = await response.text();
+            expect(body).toContain('data-codeyam-health');
+            expect(body).toContain('/__codeyam__/preview-health');
+            expect(body).toContain('<title>App</title>');
+            expect(body).toContain('<div>Hello</div>');
+        });
+        it('should NOT inject health script into non-HTML responses', async () => {
+            const { startEditorProxy } = require('../editorProxy');
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.end('{"data": "test"}');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            const response = await fetch(`http://127.0.0.1:${result.port}/api/data`);
+            const body = await response.text();
+            expect(body).toBe('{"data": "test"}');
+            expect(body).not.toContain('data-codeyam-health');
+        });
+        it('should accumulate errors across multiple health reports', async () => {
+            const { startEditorProxy } = require('../editorProxy');
+            targetServer = http.createServer((_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'text/plain' });
+                res.end('ok');
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            // First error report
+            await fetch(`http://127.0.0.1:${result.port}/__codeyam__/preview-health`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    errors: [{ type: 'error', message: 'Error 1', timestamp: 1 }],
+                    url: 'http://localhost:3112/',
+                }),
+            });
+            // Second error report
+            await fetch(`http://127.0.0.1:${result.port}/__codeyam__/preview-health`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    errors: [
+                        { type: 'console.error', message: 'Error 2', timestamp: 2 },
+                    ],
+                    url: 'http://localhost:3112/',
+                }),
+            });
+            const health = getPreviewHealthReport();
+            expect(health).not.toBeNull();
+            expect(health.errors).toHaveLength(2);
+            expect(health.errors[0].message).toBe('Error 1');
+            expect(health.errors[1].message).toBe('Error 2');
+        });
+    });
+    describe('compressed response handling', () => {
+        let targetServer;
+        let targetPort;
+        afterEach(async () => {
+            const { stopEditorProxy } = require('../editorProxy');
+            await stopEditorProxy();
+            if (targetServer?.listening) {
+                await new Promise((resolve) => targetServer.close(() => resolve()));
+            }
+            resetPreviewHealth();
+        });
+        it('should strip accept-encoding so target returns uncompressed HTML for injection', async () => {
+            const { startEditorProxy } = require('../editorProxy');
+            const originalHtml = '<html><head><title>Compressed</title></head><body><div>Gzipped</div></body></html>';
+            // Target server that compresses only when client sends Accept-Encoding
+            // (simulates real dev servers like Next.js/Vite)
+            targetServer = http.createServer((req, res) => {
+                const acceptEncoding = req.headers['accept-encoding'] || '';
+                if (acceptEncoding.includes('gzip')) {
+                    const compressed = zlib.gzipSync(Buffer.from(originalHtml));
+                    res.writeHead(200, {
+                        'Content-Type': 'text/html',
+                        'Content-Encoding': 'gzip',
+                        'Content-Length': compressed.length,
+                    });
+                    res.end(compressed);
+                }
+                else {
+                    res.writeHead(200, { 'Content-Type': 'text/html' });
+                    res.end(originalHtml);
+                }
+            });
+            await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', () => resolve()));
+            targetPort = targetServer.address().port;
+            const result = await startEditorProxy({
+                port: 0,
+                targetUrl: `http://localhost:${targetPort}`,
+            });
+            expect(result).not.toBeNull();
+            // Request through proxy WITH Accept-Encoding (simulating a real browser)
+            const response = await fetch(`http://127.0.0.1:${result.port}/`, {
+                headers: { 'Accept-Encoding': 'gzip, deflate, br' },
+            });
+            // The proxy should return a valid, readable response
+            expect(response.status).toBe(200);
+            const body = await response.text();
+            // Should contain the original HTML content (not corrupted binary)
+            expect(body).toContain('<title>Compressed</title>');
+            expect(body).toContain('<div>Gzipped</div>');
+            // Should have injected the health script
+            expect(body).toContain('data-codeyam-health');
+            // Should NOT have Content-Encoding since the proxy serves uncompressed
+            expect(response.headers.get('content-encoding')).toBeNull();
+        });
+    });
+});
+//# sourceMappingURL=editorProxy.test.js.map

package/codeyam-cli/src/webserver/__tests__/editorProxy.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editorProxy.test.js","sourceRoot":"","sources":["../../../../../src/webserver/__tests__/editorProxy.test.ts"],"names":[],"mappings":"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"}

package/codeyam-cli/src/webserver/app/lib/database.js

@@ -19,15 +19,24 @@ export async function getAllEntities() {
     if (!allEntities || allEntities.length === 0) {
         return [];
     }
-    // Filter out superseded entities - only return current versions
-    const entities = allEntities.filter((e) => !e.metadata?.isSuperseded);
-    // Load analyses for all entities
-    // Include SHAs from previousVersionWithAnalyses to inherit analyses
-    const entityShas = entities.map((e) => e.sha);
-    const previousVersionShas = entities
-        .map((e) => e.metadata?.previousVersionWithAnalyses)
-        .filter((sha) => !!sha);
-    const allShas = [...new Set([...entityShas, ...previousVersionShas])];
+    // Deduplicate by (name, filePath) keeping only the latest version.
+    // excludeMetadata skips the metadata column for performance, so we can't
+    // rely on metadata.isSuperseded — deduplicate by created_at instead.
+    const latestByKey = new Map();
+    for (const entity of allEntities) {
+        const key = `${entity.name}::${entity.filePath}`;
+        const existing = latestByKey.get(key);
+        if (!existing ||
+            (entity.createdAt &&
+                existing.createdAt &&
+                entity.createdAt > existing.createdAt)) {
+            latestByKey.set(key, entity);
+        }
+    }
+    const entities = [...latestByKey.values()];
+    // Load analyses for all entity SHAs (including superseded ones so the
+    // latest version can inherit analyses from a previous version)
+    const allShas = allEntities.map((e) => e.sha);
     const analyses = await loadAnalyses({
         entityShas: allShas,
         excludeMetadata: true,
@@ -42,29 +51,34 @@ export async function getAllEntities() {
             analysisMap.get(analysis.entitySha).push(analysis);
         }
     }
-    // Attach analyses to entities
-    // If entity has no analyses but has previousVersionWithAnalyses, inherit from that version
+    // Build a map from (name, filePath) to all SHAs for that entity
+    // so we can find analyses from previous versions
+    const shasByKey = new Map();
+    for (const entity of allEntities) {
+        const key = `${entity.name}::${entity.filePath}`;
+        const list = shasByKey.get(key) || [];
+        list.push(entity.sha);
+        shasByKey.set(key, list);
+    }
+    // Attach analyses to entities — check the entity's own SHA first,
+    // then fall back to any previous version's analyses
     const result = entities.map((entity) => {
         const directAnalyses = analysisMap.get(entity.sha) || [];
         if (directAnalyses.length > 0) {
-            return {
-                ...entity,
-                analyses: directAnalyses,
-            };
+            return { ...entity, analyses: directAnalyses };
         }
-        // No direct analyses, check for inherited analyses
-        const previousSha = entity.metadata?.previousVersionWithAnalyses;
-        if (previousSha) {
-            const inheritedAnalyses = analysisMap.get(previousSha) || [];
-            return {
-                ...entity,
-                analyses: inheritedAnalyses,
-            };
+        // No direct analyses — check previous versions of this entity
+        const key = `${entity.name}::${entity.filePath}`;
+        const allVersionShas = shasByKey.get(key) || [];
+        for (const sha of allVersionShas) {
+            if (sha === entity.sha)
+                continue;
+            const inherited = analysisMap.get(sha);
+            if (inherited && inherited.length > 0) {
+                return { ...entity, analyses: inherited };
+            }
         }
-        return {
-            ...entity,
-            analyses: [],
-        };
+        return { ...entity, analyses: [] };
     });
     return result;
 }