@amerged/ohmyhost-cli 0.1.37 → 0.1.39

package/dist/index.js

@@ -99,7 +99,7 @@ import {
   selectWorkspace,
   verifiedUserId,
   workspaceOf
-} from "./chunk-IHXNADOQ.js";
+} from "./chunk-R2BC42EW.js";
 import {
   CredentialStoreIntegrityError,
   CredentialStoreUnavailableError,

package/dist/licenses/pgcf-bridge-LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/licenses/pgcf-bridge-NOTICE

@@ -0,0 +1 @@
+PostgreSQL WebSocket bridge and authentication prelude handling adapted from cloudflare-postgres packages/cli, commit e05d9102c840e283602272ed0e16a95be3e3b8ea. Upstream license: Apache-2.0.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amerged/ohmyhost-cli",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "type": "module",
   "engines": {
     "node": ">=22"

package/src/apps/product-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohmyhost/product-cli",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "private": true,
   "ohmyhost": {
     "deployment": "production",
@@ -32,7 +32,7 @@
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
-    "typecheck": "tsc --project tsconfig.json --noEmit",
+    "typecheck": "tsc --project tsconfig.json --noEmit --incremental --tsBuildInfoFile typecheck.tsbuildinfo",
     "test": "vitest run --root ../.. apps/product-cli/test"
   },
   "dependencies": {
@@ -41,7 +41,8 @@
     "@ohmyhost/sdk-ts": "workspace:*",
     "@ohmyhost/workos-auth-contracts": "workspace:*",
     "ignore": "7.0.12",
-    "isomorphic-git": "1.43.0"
+    "isomorphic-git": "1.43.0",
+    "@ohmyhost/postgres-bridge": "workspace:*"
   },
   "license": "Apache-2.0"
 }

package/src/apps/product-cli/src/cli.ts

@@ -281,6 +281,7 @@ export interface ProductCliDependencies {
   readonly operationEventSink?: { write(value: string): void };
   readonly readSecretValue: (signal: AbortSignal) => Promise<string>;
   readonly spawnPsql?: (input: {
+    readonly websocketUrl?: string;
     readonly host: string;
     readonly user: string;
     readonly password: string;
@@ -321,7 +322,7 @@ type CustomerCommandLabel = Exclude<CommandLabel, "unknown" | "help" | "version"
 
 const CLI_VERSION = cliPackage.version;
 const HELP_USAGE = Object.freeze({
-  init: "ohmyhost init [--directory PATH] [--root PATH] [--project SLUG] [--region us|eu] [--dry-run] --json (pass the project's hosting region so storage.jurisdiction matches it; us when omitted)",
+  init: "ohmyhost init [--directory PATH] [--root PATH] [--project SLUG] [--region us|eu] [--dry-run] --json (preserve existing storage jurisdiction; for new storage pass the project's region, us when omitted)",
   login:
     "ohmyhost login [--organization ULID] [--user USER_ID] [--profile-name NAME] --json (adds one saved login; nothing is saved unless the browser signed in as that user and organization)",
   logout:
@@ -372,7 +373,7 @@ const HELP_USAGE = Object.freeze({
   "feedback submit":
     "ohmyhost feedback submit --organization ULID --kind bug|issue|feature_request --title TITLE --description REDACTED_REPORT [--project ULID] [--environment ULID] [--operation ULID] [--error-code CODE] [--client-version VERSION] --idempotency-key KEY --json",
   "project create":
-    "ohmyhost project create --organization ULID --name NAME [--data-mode shared|isolated] [--dev-access-mode protected|public] [--region us|eu] --idempotency-key KEY --json (data mode is optional and defaults to shared; later assignments use project data plan/change without copying data; the region is chosen once: us is the default, eu places the database, files and builds in the EU; it cannot be changed later)",
+    "ohmyhost project create --organization ULID --name NAME [--data-mode shared|isolated] [--dev-access-mode protected|public] [--region us|eu] --idempotency-key KEY --json (data mode is optional and defaults to shared; later assignments use project data plan/change without copying data; the region is chosen once: us is the default, eu selects EU database, new files and builds; existing R2 locations survive authorized region moves; the customer API cannot change region later)",
   "project data plan":
     "ohmyhost project data plan --project ULID --change isolate_prod_keeps_data|isolate_dev_keeps_data|share_prod_keeps_data|reset_dev --json (shared is the optional creation default; review which data is kept or deleted; no data is copied)",
   "project data change":
@@ -398,8 +399,8 @@ const HELP_USAGE = Object.freeze({
   "project handle set":
     "ohmyhost project handle set --project ULID --handle HANDLE --if-match ETAG --idempotency-key KEY --json (moves the project to a free address; the old one stops working and anyone may claim it)",
   "database compute set":
-    "ohmyhost database compute set --project ULID --environment dev|prod --profile standard|performance --idempotency-key KEY --yes [--wait] --json\n" +
-    "  standard: Free 0.25 CU/1 GB, Paid 0.5 CU/2 GB. performance: Paid 1 CU/4 GB, 2.5x database compute credits per equal active minute. All profiles use the provider-default idle suspension.",
+    "ohmyhost database compute set --project ULID --environment dev|prod --memory-mib 256|512|1024|2048|4096 --idempotency-key KEY --yes [--wait] --json\n" +
+    "  10/20/40/80/160 credits per active hour, prorated; includes 500 MiB/1/2/4/8 GiB total disk and seven-day backups. Free supports 256 MiB; larger sizes require Paid. Sleep after 300 idle seconds. No separate database CPU, network or connection charge. Smaller disk requires a separate data migration. Transitional --profile standard|performance is accepted only for legacy provider use; never combine it with --memory-mib.",
   "database compute get":
     "ohmyhost database compute get --project ULID [--environment dev|prod] --json",
   "database write":
@@ -1872,7 +1873,8 @@ export class ProductCli {
       exitCode = await spawnPsql({
         host: credential.host,
         user: credential.role_name,
-        password: new URL(credential.connection_uri).password,
+        password: decodeURIComponent(new URL(credential.connection_uri).password),
+        ...(credential.provider === "pgcf" ? { websocketUrl: credential.websocket_url } : {}),
         database: credential.database,
         mode: credential.mode,
         signal,

package/src/apps/product-cli/src/command.ts

@@ -1,4 +1,8 @@
 import { isUserSecretName } from "@ohmyhost/contracts/secret-names";
+import {
+  databaseSizeForMemory,
+  type DatabaseComputeSelection,
+} from "@ohmyhost/contracts/database-sizes";
 import {
   isProjectDataChangeKind,
   type ProjectDataChangeKind,
@@ -92,15 +96,14 @@ export type ProductCliCommand =
       readonly organizationId: string;
       readonly credentialStore: "native";
     }
-  | {
+  | ({
       readonly kind: "database-compute-set";
       readonly projectId: string;
       readonly environment: "dev" | "prod";
-      readonly profile: "standard" | "performance";
       readonly idempotencyKey: string;
       readonly wait: boolean;
       readonly credentialStore: "native";
-    }
+    } & DatabaseComputeSelection)
   | {
       readonly kind: "database-compute-get";
       readonly projectId: string;
@@ -1761,20 +1764,30 @@ export const parseProductCliCommand = (argv: readonly string[]): ProductCliComma
       "--project",
       "--environment",
       "--profile",
+      "--memory-mib",
       "--idempotency-key",
     ]);
     if (
       !options["--project"] ||
       !options["--idempotency-key"] ||
-      (options["--profile"] !== "standard" && options["--profile"] !== "performance") ||
+      (options["--profile"] === undefined) === (options["--memory-mib"] === undefined) ||
+      (options["--profile"] !== undefined &&
+        options["--profile"] !== "standard" &&
+        options["--profile"] !== "performance") ||
       (options["--environment"] !== "dev" && options["--environment"] !== "prod")
     )
       throw new InvalidCommandError();
+    let selection: DatabaseComputeSelection;
+    if (options["--memory-mib"] !== undefined) {
+      if (!/^(256|512|1024|2048|4096)$/u.test(options["--memory-mib"]))
+        throw new InvalidCommandError();
+      selection = { memoryMiB: databaseSizeForMemory(Number(options["--memory-mib"])).memoryMiB };
+    } else selection = { profile: options["--profile"] as "standard" | "performance" };
     return {
       kind: "database-compute-set",
       projectId: options["--project"],
       environment: options["--environment"],
-      profile: options["--profile"],
+      ...selection,
       idempotencyKey: options["--idempotency-key"],
       wait,
       credentialStore,

package/src/apps/product-cli/src/product-api.ts

@@ -20,6 +20,7 @@ import {
   type ProjectDatabaseWriteReceipt,
 } from "@ohmyhost/contracts/database-access";
 import { assertDatabaseCompute, type DatabaseCompute } from "@ohmyhost/contracts/database-compute";
+import type { DatabaseComputeSelection } from "@ohmyhost/contracts/database-sizes";
 import {
   assertProjectContext,
   assertProjectNotesReceipt,
@@ -173,12 +174,13 @@ export interface ProductApi {
     confirmationToken: string;
     idempotencyKey: string;
   }): Promise<Operation>;
-  changeDatabaseCompute(input: {
-    projectId: string;
-    environment: "dev" | "prod";
-    profile: "standard" | "performance";
-    idempotencyKey: string;
-  }): Promise<import("@ohmyhost/sdk-ts").Operation>;
+  changeDatabaseCompute(
+    input: {
+      projectId: string;
+      environment: "dev" | "prod";
+      idempotencyKey: string;
+    } & DatabaseComputeSelection,
+  ): Promise<import("@ohmyhost/sdk-ts").Operation>;
   getDatabaseCompute(input: {
     projectId: string;
     environment: "dev" | "prod";
@@ -456,18 +458,23 @@ export class GeneratedSdkProductApi implements ProductApi {
     this.managedSource = new GeneratedSdkManagedSourceApi(() => this.#client);
   }
 
-  public async changeDatabaseCompute(input: {
-    projectId: string;
-    environment: "dev" | "prod";
-    profile: "standard" | "performance";
-    idempotencyKey: string;
-  }) {
+  public async changeDatabaseCompute(
+    input: {
+      projectId: string;
+      environment: "dev" | "prod";
+      idempotencyKey: string;
+    } & DatabaseComputeSelection,
+  ) {
     return changeDatabaseCompute(
       {
         project_id: input.projectId,
-        environment: input.environment,
-        profile: input.profile,
-        confirm: true,
+        body: {
+          environment: input.environment,
+          ...(input.memoryMiB === undefined
+            ? { profile: input.profile }
+            : { memory_mib: input.memoryMiB }),
+          confirm: true,
+        },
         "Idempotency-Key": input.idempotencyKey,
       },
       { client: this.#client },

package/src/apps/product-cli/src/psql-session.ts

@@ -1,29 +1,64 @@
 import { spawn } from "node:child_process";
+import { startBridge } from "@ohmyhost/postgres-bridge";
 
 import { PsqlUnavailableError } from "./cli.js";
 
-/**
- * Starts the customer's own psql against a temporary database credential.
- * The password reaches psql only through its private environment, never through
- * argv, the terminal title or any file; no authentication credential is involved.
- */
-export const runLocalPsql = (input: {
+/** One private loopback bridge lasts exactly as long as the customer's native psql session. */
+export const runLocalPsql = async (input: {
   readonly host: string;
   readonly user: string;
   readonly password: string;
   readonly database: string;
+  readonly websocketUrl?: string;
   readonly signal: AbortSignal;
-}): Promise<number> =>
-  new Promise<number>((resolve, reject) => {
-    const child = spawn("psql", ["-h", input.host, "-U", input.user, "-d", input.database], {
-      stdio: "inherit",
-      signal: input.signal,
-      env: { ...process.env, PGPASSWORD: input.password, PGSSLMODE: "require" },
+}): Promise<number> => {
+  input.signal.throwIfAborted();
+  if (input.websocketUrl !== undefined && input.websocketUrl !== `wss://${input.host}/`)
+    throw new Error("Invalid PGCF transport");
+  const bridge =
+    input.websocketUrl === undefined
+      ? null
+      : await startBridge({
+          endpoint: input.websocketUrl,
+          database: input.database,
+          user: input.user,
+          port: 0,
+        });
+  try {
+    input.signal.throwIfAborted();
+    // A caller's libpq service/hostaddr settings must not redirect this temporary credential.
+    const environment = Object.fromEntries(
+      Object.entries(process.env).filter(([key]) => !/^PG[A-Z_]+$/iu.test(key)),
+    );
+    return await new Promise<number>((resolve, reject) => {
+      const child = spawn(
+        "psql",
+        ["-h", bridge?.host ?? input.host, "-U", input.user, "-d", input.database],
+        {
+          stdio: "inherit",
+          signal: input.signal,
+          env: {
+            ...environment,
+            PGPASSWORD: input.password,
+            PGSSLMODE: bridge ? "disable" : "require",
+            ...(bridge
+              ? {
+                  PGPORT: String(bridge.port),
+                  PGCHANNELBINDING: "disable",
+                  PGGSSENCMODE: "disable",
+                }
+              : {}),
+          },
+        },
+      );
+      child.once("error", (error: NodeJS.ErrnoException) => {
+        reject(error.code === "ENOENT" ? new PsqlUnavailableError() : error);
+      });
+      child.once("close", (code, signalName) => {
+        resolve(code ?? (signalName === null ? 1 : 130));
+      });
     });
-    child.once("error", (error: NodeJS.ErrnoException) => {
-      reject(error.code === "ENOENT" ? new PsqlUnavailableError() : error);
-    });
-    child.once("close", (code, signalName) => {
-      resolve(code ?? (signalName === null ? 1 : 130));
-    });
-  });
+  } finally {
+    await bridge?.close();
+  }
+};