@blakearoberts/visage 0.0.5-rc.2 → 0.0.5-rc.4

package/dist/certs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"certs.d.ts","sourceRoot":"","sources":["../src/certs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAI7C,wBAAsB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCrE"}
+{"version":3,"file":"certs.d.ts","sourceRoot":"","sources":["../src/certs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,wBAAsB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCrE"}

package/dist/compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,IAAI,CAmD7D"}
+{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,IAAI,CAsD7D"}

package/dist/index.js

@@ -1,9 +1,8 @@
 import { randomBytes } from 'node:crypto';
 import { basename, resolve, join } from 'node:path';
-import { readFileSync, mkdirSync, chmodSync, openSync, rmSync, appendFileSync, writeFileSync } from 'node:fs';
+import { readFileSync, openSync, mkdirSync, chmodSync, rmSync, appendFileSync, writeFileSync } from 'node:fs';
 import { parse, stringify } from 'yaml';
-import { spawnSync } from 'node:child_process';
-import { homedir } from 'node:os';
+import { spawnSync, spawn } from 'node:child_process';
 import { hashSync } from 'bcryptjs';
 import { Eta } from 'eta';
 
@@ -465,20 +464,15 @@ function isVisageEdgeRequest(request, edgeKey) {
     return typeof header === 'string' && header === edgeKey;
 }
 
-const CACHE_HOME = process.env.XDG_CACHE_HOME || join(homedir(), '.cache');
 async function ensureCerts(config) {
-    const CAROOT = join(CACHE_HOME, 'visage/ca');
-    mkdirSync(CAROOT, { recursive: true, mode: 0o700 });
-    chmodSync(CAROOT, 0o700);
     const mkcert = resolveMkcert();
     const out = openSync(join(config.cache, 'logs', 'mkcert.log'), 'w');
-    const env = { CAROOT, TRUST_STORES: 'system', ...process.env };
     const tty = process.stdin.isTTY;
     const stdio = [tty ? 'inherit' : 'ignore', out, out];
-    if (process.env.CI !== 'true') {
+    {
         // mkcert -install is idempotent;
         // CA files alone don't prove trust-store state.
-        const result = spawnSync(mkcert, ['-install'], { env, stdio });
+        const result = spawnSync(mkcert, ['-install'], { stdio });
         if (result.error)
             throw result.error;
         if (result.status !== 0) {
@@ -494,7 +488,7 @@ async function ensureCerts(config) {
     rmSync(key, { force: true });
     const names = [...new Set([config.host, 'localhost', '127.0.0.1', '::1'])];
     const args = ['-cert-file', cert, '-key-file', key, ...names];
-    const result = spawnSync(mkcert, args, { env, stdio });
+    const result = spawnSync(mkcert, args, { stdio });
     if (result.error)
         throw result.error;
     if (result.status !== 0) {
@@ -570,8 +564,6 @@ function mkcertInstallInstructions() {
 }
 
 function startCompose(config) {
-    const logs = join(config.cache, 'logs');
-    const output = openSync(join(logs, 'compose.log'), 'w');
     const compose = [
         'compose',
         '--ansi=never',
@@ -579,6 +571,7 @@ function startCompose(config) {
         `--project-name=${config.compose.name}`,
         `--profile=${process.platform}`,
     ];
+    const dir = join(config.cache, 'logs');
     const env = {
         COMPOSE_MENU: 'false',
         ...(config.oauth2.public
@@ -588,12 +581,9 @@ function startCompose(config) {
         [config.secrets.edgeKey]: config.edgeKey,
         [config.secrets.cookieSecret]: randomBytes(32).toString('base64url'),
     };
-    const opts = {
-        cwd: config.cache,
-        stdio: ['ignore', output, output],
-        env,
-    };
+    const opts = { cwd: config.cache, env };
     function up() {
+        const out = openSync(join(dir, 'compose.log'), 'w');
         const args = [
             ...compose,
             'up',
@@ -601,11 +591,17 @@ function startCompose(config) {
             '--force-recreate',
             '--remove-orphans',
         ];
-        return spawnSync('docker', args, opts);
+        return spawnSync('docker', args, { ...opts, stdio: ['ignore', out, out] });
     }
     function down() {
+        const out = openSync(join(dir, 'compose.log'), 'a');
         const args = [...compose, 'down', '--remove-orphans'];
-        return spawnSync('docker', args, opts);
+        return spawnSync('docker', args, { ...opts, stdio: ['ignore', out, out] });
+    }
+    function follow() {
+        const out = openSync(join(dir, 'container.log'), 'w');
+        const args = [...compose, 'logs', '--follow'];
+        return spawn('docker', args, { ...opts, stdio: ['ignore', out, out] });
     }
     down();
     const result = up();
@@ -615,7 +611,11 @@ function startCompose(config) {
         down();
         throw new Error('Failed to start Docker Compose');
     }
-    return down;
+    const logs = follow();
+    return () => {
+        down();
+        logs.kill('SIGINT');
+    };
 }
 
 const HOSTS_FILE = '/etc/hosts';
@@ -670,12 +670,6 @@ function writeComposeConfig(config) {
 }
 function renderComposeConfig(config) {
     const { dex, nginx, oauth2_proxy, ...services } = config.services;
-    const bridge = spawnSync('docker', [
-        'network',
-        'inspect',
-        'bridge',
-        '--format={{ (index .IPAM.Config 0).Gateway }}',
-    ], { encoding: 'utf8' }).stdout.trim();
     return stringify({
         secrets: {
             [config.secrets.cookieSecret]: {
@@ -711,7 +705,9 @@ function renderComposeConfig(config) {
                 ? {
                     vite_loopback: {
                         image: DockerImages.socat.image,
-                        command: `tcp-listen:${config.upstreams.vite.port},fork,bind=${bridge} tcp-connect:127.0.0.1:${config.upstreams.vite.port}`,
+                        command: `tcp-listen:${config.upstreams.vite.port},fork,bind=host.docker.internal ` +
+                            `tcp-connect:127.0.0.1:${config.upstreams.vite.port}`,
+                        extra_hosts: ['host.docker.internal:host-gateway'],
                         network_mode: 'host',
                         profiles: ['linux'],
                         restart: 'always',

package/dist/render/compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/render/compose.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAI7D"}
+{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/render/compose.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAI7D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blakearoberts/visage",
-  "version": "0.0.5-rc.2",
+  "version": "0.0.5-rc.4",
   "description": "Vite plugin for local development with HMR and OIDC session cookie lifecycle semantics.",
   "type": "module",
   "author": "Blake Roberts",