@astrojs/db 0.8.2 → 0.8.4

package/dist/_internal/runtime/utils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
+ */
+export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;

package/dist/core/cli/commands/link/index.js

@@ -5,9 +5,10 @@ import { slug } from "github-slugger";
 import { bgRed, cyan } from "kleur/colors";
 import ora from "ora";
 import prompts from "prompts";
+import { safeFetch } from "../../../../runtime/utils.js";
 import { MISSING_SESSION_ID_ERROR } from "../../../errors.js";
 import { PROJECT_ID_FILE, getSessionIdFromFile } from "../../../tokens.js";
-import { getAstroStudioUrl, safeFetch } from "../../../utils.js";
+import { getAstroStudioUrl } from "../../../utils.js";
 async function cmd() {
   const sessionToken = await getSessionIdFromFile();
   if (!sessionToken) {
@@ -225,7 +226,11 @@ async function promptNewProjectRegion() {
     message: `Where should your new database live?`,
     choices: [
       { title: "North America (East)", value: "NorthAmericaEast" },
-      { title: "North America (West)", value: "NorthAmericaWest" }
+      { title: "North America (West)", value: "NorthAmericaWest" },
+      { title: "Europe (Amsterdam)", value: "EuropeCentral" },
+      { title: "South America (Brazil)", value: "SouthAmericaEast" },
+      { title: "Asia (India)", value: "AsiaSouth" },
+      { title: "Asia (Japan)", value: "AsiaNorthEast" }
     ],
     initial: 0
   });

package/dist/core/cli/commands/push/index.js

@@ -1,7 +1,8 @@
+import { safeFetch } from "../../../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../../../consts.js";
 import { getManagedAppTokenOrExit } from "../../../tokens.js";
 import {} from "../../../types.js";
-import { getRemoteDatabaseUrl, safeFetch } from "../../../utils.js";
+import { getRemoteDatabaseUrl } from "../../../utils.js";
 import {
   createCurrentSnapshot,
   createEmptySnapshot,

package/dist/core/cli/migration-queries.js

@@ -14,12 +14,13 @@ import {
   schemaTypeToSqlType
 } from "../../runtime/queries.js";
 import { isSerializedSQL } from "../../runtime/types.js";
+import { safeFetch } from "../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../consts.js";
 import { RENAME_COLUMN_ERROR, RENAME_TABLE_ERROR } from "../errors.js";
 import { columnSchema } from "../schemas.js";
 import {
 } from "../types.js";
-import { getRemoteDatabaseUrl, safeFetch } from "../utils.js";
+import { getRemoteDatabaseUrl } from "../utils.js";
 const sqlite = new SQLiteAsyncDialect();
 const genTempTableName = customAlphabet("abcdefghijklmnopqrstuvwxyz", 10);
 async function getMigrationQueries({

package/dist/core/cli/print-help.js

@@ -27,7 +27,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"0.8.2"}`
+        `v${"0.8.4"}`
       )} ${headline}`
     );
   }

package/dist/core/tokens.js

@@ -2,8 +2,11 @@ import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
+import { green } from "kleur/colors";
+import ora from "ora";
+import { safeFetch } from "../runtime/utils.js";
 import { MISSING_PROJECT_ID_ERROR, MISSING_SESSION_ID_ERROR } from "./errors.js";
-import { getAstroStudioEnv, getAstroStudioUrl, getRemoteDatabaseUrl, safeFetch } from "./utils.js";
+import { getAstroStudioEnv, getAstroStudioUrl } from "./utils.js";
 const SESSION_LOGIN_FILE = pathToFileURL(join(homedir(), ".astro", "session-token"));
 const PROJECT_ID_FILE = pathToFileURL(join(process.cwd(), ".astro", "link"));
 class ManagedLocalAppToken {
@@ -19,17 +22,11 @@ class ManagedLocalAppToken {
 class ManagedRemoteAppToken {
   token;
   session;
-  region;
   projectId;
   ttl;
   renewTimer;
-  static async getRegionCode() {
-    const pingResponse = await safeFetch(new URL(`${getRemoteDatabaseUrl()}/ping`));
-    const pingResult = await pingResponse.json();
-    return pingResult.data.region;
-  }
   static async create(sessionToken, projectId) {
-    const region = await ManagedRemoteAppToken.getRegionCode();
+    const spinner = ora("Connecting to remote database...").start();
     const response = await safeFetch(
       new URL(`${getAstroStudioUrl()}/auth/cli/token-create`),
       {
@@ -37,17 +34,18 @@ class ManagedRemoteAppToken {
         headers: new Headers({
           Authorization: `Bearer ${sessionToken}`
         }),
-        body: JSON.stringify({ projectId, region })
+        body: JSON.stringify({ projectId })
       },
       (res) => {
         throw new Error(`Failed to create token: ${res.status} ${res.statusText}`);
       }
     );
+    await new Promise((resolve) => setTimeout(resolve, 2e3));
+    spinner.succeed(green("Connected to remote database."));
     const { token: shortLivedAppToken, ttl } = await response.json();
     return new ManagedRemoteAppToken({
       token: shortLivedAppToken,
       session: sessionToken,
-      region,
       projectId,
       ttl
     });
@@ -55,7 +53,6 @@ class ManagedRemoteAppToken {
   constructor(options) {
     this.token = options.token;
     this.session = options.session;
-    this.region = options.region;
     this.projectId = options.projectId;
     this.ttl = options.ttl;
     this.renewTimer = setTimeout(() => this.renew(), 1e3 * 60 * 5 / 2);
@@ -69,7 +66,7 @@ class ManagedRemoteAppToken {
           Authorization: `Bearer ${this.session}`,
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({ ...body, region: this.region })
+        body: JSON.stringify(body)
       },
       () => {
         throw new Error(`Failed to fetch ${url}.`);

package/dist/core/utils.d.ts

@@ -6,10 +6,6 @@ export declare function getRemoteDatabaseUrl(): string;
 export declare function getAstroStudioUrl(): string;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
 export declare function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration;
-/**
- * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
- */
-export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;
 export type Result<T> = {
     success: true;
     data: T;

package/dist/core/utils.js

@@ -17,20 +17,10 @@ function getDbDirectoryUrl(root) {
 function defineDbIntegration(integration) {
   return integration;
 }
-async function safeFetch(url, options = {}, onNotOK = () => {
-  throw new Error(`Request to ${url} returned a non-OK status code.`);
-}) {
-  const response = await fetch(url, options);
-  if (!response.ok) {
-    await onNotOK(response);
-  }
-  return response;
-}
 export {
   defineDbIntegration,
   getAstroStudioEnv,
   getAstroStudioUrl,
   getDbDirectoryUrl,
-  getRemoteDatabaseUrl,
-  safeFetch
+  getRemoteDatabaseUrl
 };

package/dist/runtime/db-client.js

@@ -2,7 +2,7 @@ import { createClient } from "@libsql/client";
 import { drizzle as drizzleLibsql } from "drizzle-orm/libsql";
 import { drizzle as drizzleProxy } from "drizzle-orm/sqlite-proxy";
 import { z } from "zod";
-import { safeFetch } from "../core/utils.js";
+import { safeFetch } from "./utils.js";
 const isWebContainer = !!process.versions?.webcontainer;
 function createLocalDatabaseClient({ dbUrl }) {
   const url = isWebContainer ? "file:content.db" : dbUrl;

package/dist/runtime/utils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
+ */
+export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;

package/dist/runtime/utils.js

@@ -0,0 +1,12 @@
+async function safeFetch(url, options = {}, onNotOK = () => {
+  throw new Error(`Request to ${url} returned a non-OK status code.`);
+}) {
+  const response = await fetch(url, options);
+  if (!response.ok) {
+    await onNotOK(response);
+  }
+  return response;
+}
+export {
+  safeFetch
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -80,7 +80,7 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro": "4.5.3",
+    "astro": "4.5.4",
     "astro-scripts": "0.0.14"
   },
   "scripts": {

package/dist/_internal/core/utils.d.ts

@@ -1,19 +0,0 @@
-import type { AstroConfig, AstroIntegration } from 'astro';
-import type { AstroDbIntegration } from './types.js';
-export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
-export declare function getAstroStudioEnv(envMode?: string): Record<`ASTRO_STUDIO_${string}`, string>;
-export declare function getRemoteDatabaseUrl(): string;
-export declare function getAstroStudioUrl(): string;
-export declare function getDbDirectoryUrl(root: URL | string): URL;
-export declare function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration;
-/**
- * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
- */
-export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;
-export type Result<T> = {
-    success: true;
-    data: T;
-} | {
-    success: false;
-    data: unknown;
-};