@aopslabs/aops 0.3.2 → 0.3.4

package/README.md

@@ -196,7 +196,9 @@ Opening the TUI does not by itself start or stop either service. Use the TUI's
 explicit actions or the CLI command families. The convenience
 `aops cockpit` command may start safely stopped services before opening the
 browser; the explicit server and Cockpit lifecycle commands never stop or
-start the other service.
+start the other service. For setup path 2, an ordinary `aops server stop`
+leaves the managed PostgreSQL container running; only the explicit destructive
+installation reset removes its verified container and volume.
 
 The npm package includes `launchers/aops-server.sh` and
 `launchers/aops-server.ps1` for running the installed server in the current

package/dist/lib/community-native-lifecycle.js

@@ -8,7 +8,7 @@ import { parseEnv } from 'node:util';
 import { COMMUNITY_NATIVE_CHILD_PROTOCOL, COMMUNITY_NATIVE_CONTROL_PROTOCOL, } from './community-native-child.js';
 import { resolveCommunityInstallPaths } from './community-lifecycle.js';
 import { buildCommunityInstanceContract, } from './community-instance-contract.js';
-import { COMMUNITY_NATIVE_POSTGRES_CONTRACT_PATH, assertCommunityNativePostgresInstanceState, assertCommunityNativePostgresState, buildCommunityNativePostgresUrl, setupCommunityNativePostgres, startCommunityNativePostgres, stopCommunityNativePostgres, } from './community-native-postgres.js';
+import { COMMUNITY_NATIVE_POSTGRES_CONTRACT_PATH, assertCommunityNativePostgresInstanceState, assertCommunityNativePostgresState, buildCommunityNativePostgresUrl, setupCommunityNativePostgres, startCommunityNativePostgres, } from './community-native-postgres.js';
 import { COMMUNITY_NATIVE_MIGRATION_POLICY_PATH, assertCommunityNativeMigrationReceiptV1, planCommunityNativeMigration, runCommunityNativeMigration, } from './community-native-migration.js';
 import { createCommunityExternalSnapshotAttestationV1, writeCommunityExternalSnapshotAttestationV1, } from './community-migration-snapshot.js';
 import { createCommunityNativeApplicationReferenceV1, readCommunityNativeApplicationUpdate, sameCommunityNativeApplicationContent, writeCommunityNativeApplicationRollbackOutcome, writeCommunityNativeApplicationRollbackPrepared, writeCommunityNativeApplicationUpdateOutcome, writeCommunityNativeApplicationUpdatePrepared, } from './community-native-application-recovery.js';
@@ -1636,15 +1636,6 @@ export async function stopCommunityNativeInstall(params = {}) {
         now,
     });
     if (observed.runtimeState === 'stopped' || observed.runtimeState === 'crashed') {
-        if (inspection.state.postgres.mode === 'container') {
-            await stopCommunityNativePostgres({
-                state: inspection.state.postgres,
-                instanceName: inspection.state.instanceName,
-                instanceRoot: inspection.paths.instanceRoot,
-                runtime: params.postgresRuntime,
-                signal: params.signal,
-            });
-        }
         return { status: 'already-stopped', state: inspection.state, process: observed.process };
     }
     if (!observed.process || !observed.identity || !observed.supervisorAlive ||
@@ -1670,15 +1661,6 @@ export async function stopCommunityNativeInstall(params = {}) {
             };
             delete stopped.failure;
             writeProcess(inspection.paths, stopped);
-            if (inspection.state.postgres.mode === 'container') {
-                await stopCommunityNativePostgres({
-                    state: inspection.state.postgres,
-                    instanceName: inspection.state.instanceName,
-                    instanceRoot: inspection.paths.instanceRoot,
-                    runtime: params.postgresRuntime,
-                    signal: params.signal,
-                });
-            }
             return { status: 'stopped', state: inspection.state, process: stopped };
         }
         await runtime.sleep(READY_POLL_MS, params.signal);

package/dist/lib/community-native-postgres.js

@@ -302,8 +302,11 @@ async function verifyContainer(runtime, state, instanceName, signal, verifyPersi
         (hostPort !== null && (!Number.isSafeInteger(hostPort) || hostPort < 1 || hostPort > 65_535)) ||
         (verifyPersistedPort && hostPort !== null && hostPort !== state.port))
         throw new Error('community_native_postgres_container_port_binding_drift');
-    if (verifyPersistedPort && await mappedPort(runtime, state, signal) !== state.port) {
-        throw new Error('community_native_postgres_container_port_binding_drift');
+    if (verifyPersistedPort) {
+        const observed = await containerState(runtime, state.containerName, signal);
+        if (observed.status === 'running' && await mappedPort(runtime, state, signal) !== state.port) {
+            throw new Error('community_native_postgres_container_port_binding_drift');
+        }
     }
     const restartPolicy = await inspectContainerJson(runtime, state.containerName, '{{json .HostConfig.RestartPolicy}}', 'container_restart_policy_inspect', signal);
     if (!restartPolicy || typeof restartPolicy !== 'object' || Array.isArray(restartPolicy) ||
@@ -476,19 +479,6 @@ export async function startCommunityNativePostgres(params) {
     if (port !== state.port)
         throw new Error('community_native_postgres_port_mapping_drift:run_server_setup_--apply');
 }
-export async function stopCommunityNativePostgres(params) {
-    throwIfCommunityCommandAborted(params.signal);
-    const state = assertCommunityNativePostgresInstanceState(params);
-    const runtime = params.runtime ?? communityNativePostgresRuntime;
-    if (!await verifyContainer(runtime, state, params.instanceName, params.signal)) {
-        throw new Error('community_native_postgres_container_missing');
-    }
-    const observed = await containerState(runtime, state.containerName, params.signal);
-    if (observed.status === 'exited' || observed.status === 'created')
-        return 'already-stopped';
-    await runDocker(runtime, ['container', 'stop', '--time', '15', state.containerName], 'container_stop', params.signal);
-    return 'stopped';
-}
 export async function removeCommunityNativePostgresContainer(params) {
     throwIfCommunityCommandAborted(params.signal);
     const state = assertCommunityNativePostgresInstanceState(params);

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@aopslabs/aops",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "type": "module",
   "description": "AOPS CLI and terminal setup application.",
-  "aopsDockerServerVersion": "0.2.4",
+  "aopsDockerServerVersion": "0.2.6",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {
     "type": "git",
@@ -46,7 +46,7 @@
     "test:target-transport": "node --test test/target-transport.test.mjs",
     "test:r6-cutover-baseline": "node scripts/verify-r6-cutover-baseline.mjs",
     "test:r6-auth-cutover": "node --test test/r6-auth-cutover.test.mjs",
-    "test:container-runtime": "node --test test/container-runtime.test.mjs",
+    "test:container-runtime": "node --test test/container-runtime.test.mjs test/community-native-postgres.test.mjs",
     "test:kernel-alignment": "node --test test/kernel-alignment.test.mjs",
     "test:home": "node --test test/home-menu.test.mjs",
     "test:launchers": "node --test test/terminal-launchers.test.mjs",
@@ -55,11 +55,11 @@
     "start": "node dist/main.js"
   },
   "dependencies": {
-    "@aopslabs/aops-server": "0.2.4",
+    "@aopslabs/aops-server": "0.2.6",
     "@aopslabs/artifact-trust-contracts": "0.3.0",
     "@aopslabs/cli-kit": "0.1.0",
     "@aopslabs/aops-host-registration": "0.2.0",
-    "@aopslabs/aops-pg-bootstrap": "0.2.0",
+    "@aopslabs/aops-pg-bootstrap": "0.2.1",
     "@aopslabs/aops-runtime-config": "0.2.0",
     "@sigstore/bundle": "4.0.0",
     "@sigstore/protobuf-specs": "0.5.1",