instant-cli 1.0.56 → 1.0.57

package/src/lib/http.ts

@@ -1,11 +1,12 @@
 import { HttpClient, HttpClientRequest } from '@effect/platform';
 import { version } from '@instantdb/version';
-import { Config, Context, Data, Effect, Layer, Option, Schema } from 'effect';
+import { Context, Data, Effect, Layer, Schema } from 'effect';
 import { AuthToken } from '../context/authToken.ts';
 import { TimeoutException } from 'effect/Cause';
 import { RequestError } from '@effect/platform/HttpClientError';
-import { readInstantConfigFile } from '../util/instantConfig.ts';
-import { BadArgsError } from '../errors.ts';
+import { getBaseUrl } from './config.ts';
+
+export { getBaseUrl, getDashUrl } from './config.ts';
 
 export class InstantHttp extends Context.Tag(
   'instant-cli/new/lib/http/InstantHttp',
@@ -49,15 +50,6 @@ class InstantTypicalHttpErrorResponse extends Schema.Struct({
   ),
 }) {}
 
-const HttpUrl = Schema.URL.pipe(
-  Schema.filter(
-    (url) =>
-      url.protocol === 'http:' ||
-      url.protocol === 'https:' ||
-      'Expected an HTTP(S) URL',
-  ),
-);
-
 export const InstantHttpLive = Layer.effect(
   InstantHttp,
   Effect.gen(function* () {
@@ -134,59 +126,3 @@ export const InstantHttpAuthedLive = Layer.effect(
     );
   }),
 );
-
-export const getBaseUrl = Effect.gen(function* () {
-  const setEnv = yield* Config.string('INSTANT_CLI_API_URI').pipe(
-    Config.option,
-  );
-  const dev = yield* Config.boolean('INSTANT_CLI_DEV').pipe(
-    Config.withDefault(false),
-  );
-
-  if (Option.isSome(setEnv)) {
-    return setEnv.value;
-  }
-
-  const instantConfig = yield* Effect.tryPromise(readInstantConfigFile);
-  if (instantConfig?.apiURI !== undefined) {
-    yield* Schema.decodeUnknown(HttpUrl)(instantConfig.apiURI).pipe(
-      Effect.mapError(() =>
-        BadArgsError.make({
-          message:
-            'Invalid apiURI in instant.config.ts. Expected a valid HTTP(S) URL.',
-        }),
-      ),
-    );
-    return instantConfig.apiURI;
-  }
-
-  return dev ? 'http://localhost:8888' : 'https://api.instantdb.com';
-});
-
-export const getDashUrl = Effect.gen(function* () {
-  const setEnv = yield* Config.string('INSTANT_CLI_DASH_URI').pipe(
-    Config.option,
-  );
-  const dev = yield* Config.boolean('INSTANT_CLI_DEV').pipe(
-    Config.withDefault(false),
-  );
-
-  if (Option.isSome(setEnv)) {
-    return setEnv.value;
-  }
-
-  const instantConfig = yield* Effect.tryPromise(readInstantConfigFile);
-  if (instantConfig?.dashURI !== undefined) {
-    yield* Schema.decodeUnknown(HttpUrl)(instantConfig.dashURI).pipe(
-      Effect.mapError(() =>
-        BadArgsError.make({
-          message:
-            'Invalid dashURI in instant.config.ts. Expected a valid HTTP(S) URL.',
-        }),
-      ),
-    );
-    return instantConfig.dashURI;
-  }
-
-  return dev ? 'http://localhost:3000' : 'https://instantdb.com';
-});

package/src/lib/login.ts

@@ -1,11 +1,8 @@
 import { Effect, Schedule, Schema } from 'effect';
 import { InstantHttp, withCommand } from './http.ts';
-import {
-  HttpClientRequest,
-  HttpClientResponse,
-  FileSystem,
-} from '@effect/platform';
-import { getAuthPaths } from '../util/getAuthPaths.ts';
+import { HttpClientRequest, HttpClientResponse } from '@effect/platform';
+import { writeAuthToken } from '../auth/index.ts';
+import { getBaseUrl } from './config.ts';
 
 const LoginInfo = Schema.Struct({
   secret: Schema.String,
@@ -46,9 +43,6 @@ export const waitForAuthToken = Effect.fn(function* (secret: string) {
 });
 
 export const saveConfigAuthToken = Effect.fn(function* (token: string) {
-  const authPaths = getAuthPaths();
-
-  const fs = yield* FileSystem.FileSystem;
-  yield* fs.makeDirectory(authPaths.appConfigDirPath, { recursive: true });
-  yield* fs.writeFileString(authPaths.authConfigFilePath, token);
+  const apiURI = yield* getBaseUrl;
+  yield* Effect.tryPromise(() => writeAuthToken(apiURI, token));
 });

package/src/old.js

@@ -1,8 +1,8 @@
 import boxen from 'boxen';
 import chalk from 'chalk';
 import { program } from '@commander-js/extra-typings';
-import { readFile } from 'node:fs/promises';
 import path from 'node:path';
+import { readAuthToken } from './auth/index.ts';
 import { UI } from './ui/index.ts';
 import { deferred, renderUnwrap } from './ui/lib.ts';
 import {
@@ -10,7 +10,6 @@ import {
   getPermsReadCandidates,
   getSchemaReadCandidates,
 } from './util/findConfigCandidates.ts';
-import { getAuthPaths } from './util/getAuthPaths.ts';
 import { loadConfig } from './util/loadConfig.ts';
 import { ResolveRenamePrompt } from './util/renamePrompt.ts';
 import version from './version.js';
@@ -331,7 +330,7 @@ async function fetchJson({
   let authToken = null;
   if (withAuth) {
     authToken =
-      providedAuthToken ?? (await readConfigAuthTokenWithErrorLogging());
+      providedAuthToken ?? (await readConfigAuthTokenWithErrorLogging(apiURI));
     if (!authToken) {
       return { ok: false, data: undefined };
     }
@@ -436,7 +435,7 @@ export async function readLocalEmailFile(emailPath) {
   return { path: relativePath, email: res.config };
 }
 
-async function readConfigAuthToken(allowAdminToken = true) {
+async function readConfigAuthToken(apiURI, allowAdminToken = true) {
   const options = program.opts();
   // @ts-expect-error command opts type is unknown
   if (typeof options.token === 'string') {
@@ -458,10 +457,7 @@ async function readConfigAuthToken(allowAdminToken = true) {
     }
   }
 
-  const authToken = await readFile(
-    getAuthPaths().authConfigFilePath,
-    'utf-8',
-  ).catch(() => null);
+  const authToken = await readAuthToken(apiURI).catch(() => null);
 
   if (authToken) {
     return authToken;
@@ -470,8 +466,8 @@ async function readConfigAuthToken(allowAdminToken = true) {
   return null;
 }
 
-export async function readConfigAuthTokenWithErrorLogging() {
-  const token = await readConfigAuthToken();
+export async function readConfigAuthTokenWithErrorLogging(apiURI) {
+  const token = await readConfigAuthToken(apiURI);
   if (!token) {
     error(
       `Looks like you are not logged in. Please log in with ${chalk.green('`instant-cli login`')}`,

package/dist/util/getAuthPaths.d.ts

@@ -1,5 +0,0 @@
-export declare function getAuthPaths(): {
-    authConfigFilePath: string;
-    appConfigDirPath: string;
-};
-//# sourceMappingURL=getAuthPaths.d.ts.map

package/dist/util/getAuthPaths.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getAuthPaths.d.ts","sourceRoot":"","sources":["../../src/util/getAuthPaths.ts"],"names":[],"mappings":"AAKA,wBAAgB,YAAY;;;EAM3B"}

package/dist/util/getAuthPaths.js

@@ -1,10 +0,0 @@
-import envPaths from 'env-paths';
-import { join } from 'node:path';
-const dev = Boolean(process.env.INSTANT_CLI_DEV);
-export function getAuthPaths() {
-    const key = `instantdb-${dev ? 'dev' : 'prod'}`;
-    const { config: appConfigDirPath } = envPaths(key);
-    const authConfigFilePath = join(appConfigDirPath, 'a');
-    return { authConfigFilePath, appConfigDirPath };
-}
-//# sourceMappingURL=getAuthPaths.js.map

package/dist/util/getAuthPaths.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getAuthPaths.js","sourceRoot":"","sources":["../../src/util/getAuthPaths.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAEjD,MAAM,UAAU,YAAY;IAC1B,MAAM,GAAG,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChD,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAEvD,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,CAAC;AAClD,CAAC","sourcesContent":["import envPaths from 'env-paths';\nimport { join } from 'node:path';\n\nconst dev = Boolean(process.env.INSTANT_CLI_DEV);\n\nexport function getAuthPaths() {\n  const key = `instantdb-${dev ? 'dev' : 'prod'}`;\n  const { config: appConfigDirPath } = envPaths(key);\n  const authConfigFilePath = join(appConfigDirPath, 'a');\n\n  return { authConfigFilePath, appConfigDirPath };\n}\n"]}

package/src/util/getAuthPaths.ts

@@ -1,12 +0,0 @@
-import envPaths from 'env-paths';
-import { join } from 'node:path';
-
-const dev = Boolean(process.env.INSTANT_CLI_DEV);
-
-export function getAuthPaths() {
-  const key = `instantdb-${dev ? 'dev' : 'prod'}`;
-  const { config: appConfigDirPath } = envPaths(key);
-  const authConfigFilePath = join(appConfigDirPath, 'a');
-
-  return { authConfigFilePath, appConfigDirPath };
-}