everything-dev 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "everything-dev",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "main": "src/index.ts",
   "exports": {

package/src/lib/nova.ts

@@ -20,7 +20,7 @@ export interface UploadResult {
 
 export const getNovaConfig = Effect.gen(function* () {
   const accountId = process.env.NOVA_ACCOUNT_ID;
-  const sessionToken = process.env.NOVA_SESSION_TOKEN;
+  const sessionToken = process.env.NOVA_API_KEY;
 
   if (!accountId || !sessionToken) {
     return yield* Effect.fail(
@@ -46,7 +46,7 @@ export function getSecretsGroupId(nearAccount: string): string {
 export const registerSecretsGroup = (
   nova: NovaSdk,
   nearAccount: string,
-  gatewayAccount: string
+  novaAccount: string
 ) =>
   Effect.gen(function* () {
     const groupId = getSecretsGroupId(nearAccount);
@@ -57,8 +57,8 @@ export const registerSecretsGroup = (
     });
 
     yield* Effect.tryPromise({
-      try: () => nova.addGroupMember(groupId, gatewayAccount),
-      catch: (e) => new Error(`Failed to add gateway to NOVA group: ${e}`),
+      try: () => nova.addGroupMember(groupId, novaAccount),
+      catch: (e) => new Error(`Failed to add gateway Nova account to group: ${e}`),
     });
 
     return groupId;
@@ -150,7 +150,7 @@ export function filterSecretsToRequired(
 }
 
 export function hasNovaCredentials(): boolean {
-  return !!(process.env.NOVA_ACCOUNT_ID && process.env.NOVA_SESSION_TOKEN);
+  return !!(process.env.NOVA_ACCOUNT_ID && process.env.NOVA_API_KEY);
 }
 
 function getBosEnvPath(): string {
@@ -182,8 +182,8 @@ export const saveNovaCredentials = (accountId: string, sessionToken: string) =>
       if (trimmed.startsWith("NOVA_ACCOUNT_ID=")) {
         newLines.push(`NOVA_ACCOUNT_ID=${accountId}`);
         foundAccountId = true;
-      } else if (trimmed.startsWith("NOVA_SESSION_TOKEN=")) {
-        newLines.push(`NOVA_SESSION_TOKEN=${sessionToken}`);
+      } else if (trimmed.startsWith("NOVA_API_KEY=")) {
+        newLines.push(`NOVA_API_KEY=${sessionToken}`);
         foundSessionToken = true;
       } else {
         newLines.push(line);
@@ -198,7 +198,7 @@ export const saveNovaCredentials = (accountId: string, sessionToken: string) =>
     }
 
     if (!foundSessionToken) {
-      newLines.push(`NOVA_SESSION_TOKEN=${sessionToken}`);
+      newLines.push(`NOVA_API_KEY=${sessionToken}`);
     }
 
     yield* Effect.tryPromise({
@@ -207,7 +207,7 @@ export const saveNovaCredentials = (accountId: string, sessionToken: string) =>
     });
 
     process.env.NOVA_ACCOUNT_ID = accountId;
-    process.env.NOVA_SESSION_TOKEN = sessionToken;
+    process.env.NOVA_API_KEY = sessionToken;
   });
 
 export const removeNovaCredentials = Effect.gen(function* () {
@@ -226,7 +226,7 @@ export const removeNovaCredentials = Effect.gen(function* () {
   const lines = content.split("\n");
   const newLines = lines.filter((line) => {
     const trimmed = line.trim();
-    return !trimmed.startsWith("NOVA_ACCOUNT_ID=") && !trimmed.startsWith("NOVA_SESSION_TOKEN=");
+    return !trimmed.startsWith("NOVA_ACCOUNT_ID=") && !trimmed.startsWith("NOVA_API_KEY=");
   });
 
   yield* Effect.tryPromise({
@@ -235,7 +235,7 @@ export const removeNovaCredentials = Effect.gen(function* () {
   });
 
   delete process.env.NOVA_ACCOUNT_ID;
-  delete process.env.NOVA_SESSION_TOKEN;
+  delete process.env.NOVA_API_KEY;
 });
 
 export const verifyNovaCredentials = (accountId: string, sessionToken: string) =>

package/src/lib/process.ts

@@ -117,6 +117,46 @@ const detectStatus = (
   return null;
 };
 
+const killProcessTree = (pid: number) =>
+  Effect.gen(function* () {
+    const killSignal = (signal: NodeJS.Signals) =>
+      Effect.try({
+        try: () => {
+          process.kill(-pid, signal);
+        },
+        catch: () => null,
+      }).pipe(Effect.ignore);
+
+    const killDirect = (signal: NodeJS.Signals) =>
+      Effect.try({
+        try: () => {
+          process.kill(pid, signal);
+        },
+        catch: () => null,
+      }).pipe(Effect.ignore);
+
+    const isRunning = () =>
+      Effect.try({
+        try: () => {
+          process.kill(pid, 0);
+          return true;
+        },
+        catch: () => false,
+      });
+
+    yield* killSignal("SIGTERM");
+    yield* killDirect("SIGTERM");
+
+    yield* Effect.sleep("200 millis");
+
+    const stillRunning = yield* isRunning();
+    if (stillRunning) {
+      yield* killSignal("SIGKILL");
+      yield* killDirect("SIGKILL");
+      yield* Effect.sleep("100 millis");
+    }
+  });
+
 export const spawnDevProcess = (
   config: DevProcess,
   callbacks: ProcessCallbacks
@@ -181,11 +221,16 @@ export const spawnDevProcess = (
       name: config.name,
       pid: proc.pid,
       kill: async () => {
-        proc.kill("SIGTERM");
-        await new Promise((r) => setTimeout(r, 100));
-        try {
-          proc.kill("SIGKILL");
-        } catch { }
+        const pid = proc.pid;
+        if (pid) {
+          await Effect.runPromise(killProcessTree(pid));
+        } else {
+          proc.kill("SIGTERM");
+          await new Promise((r) => setTimeout(r, 100));
+          try {
+            proc.kill("SIGKILL");
+          } catch { }
+        }
       },
       waitForReady: Deferred.await(readyDeferred),
       waitForExit: Effect.gen(function* () {

package/src/plugin.ts

@@ -47,7 +47,10 @@ interface BosDeps {
   nearPrivateKey?: string;
 }
 
-function getGatewayDomain(config: BosConfigType): string {
+const DEFAULT_GATEWAY = "everything.dev";
+
+function getGatewayDomain(config: BosConfigType | null): string {
+  if (!config) return DEFAULT_GATEWAY;
   const gateway = config.gateway as string | { production: string } | undefined;
   if (typeof gateway === "string") {
     return gateway.replace(/^https?:\/\//, "");
@@ -55,7 +58,7 @@ function getGatewayDomain(config: BosConfigType): string {
   if (gateway && typeof gateway === "object" && "production" in gateway) {
     return gateway.production.replace(/^https?:\/\//, "");
   }
-  throw new Error("bos.config.json must have a 'gateway' field with production URL");
+  return DEFAULT_GATEWAY;
 }
 
 function getAccountForNetwork(config: BosConfigType, network: "mainnet" | "testnet"): string {
@@ -753,7 +756,12 @@ export default createPlugin({
           const novaConfig = yield* getNovaConfig;
           const nova = createNovaClient(novaConfig);
 
-          yield* registerSecretsGroup(nova, fullAccount, parentAccount);
+          const gatewayNovaAccount = bosConfig.gateway?.nova?.account;
+          if (!gatewayNovaAccount) {
+            return yield* Effect.fail(new Error("gateway.nova.account is required for secrets registration"));
+          }
+
+          yield* registerSecretsGroup(nova, fullAccount, gatewayNovaAccount);
 
           return {
             status: "registered" as const,
@@ -1098,7 +1106,7 @@ export default createPlugin({
 
       try {
         const gatewayDomain = getGatewayDomain(bosConfig);
-        const gatewayAccount = bosConfig.account;
+        const gatewayAccount = bosConfig.gateway?.account || bosConfig.account;
 
         const wranglerContent = await Bun.file(wranglerPath).text();
 
@@ -1284,11 +1292,10 @@ export default createPlugin({
     sync: builder.sync.handler(async ({ input }) => {
       const { configDir, bosConfig } = deps;
 
-      const DEFAULT_SYNC_ACCOUNT = "every.near";
-      const DEFAULT_SYNC_GATEWAY = "everything.dev";
+      const DEFAULT_ACCOUNT = "every.near";
 
-      const account = input.account || bosConfig?.account || DEFAULT_SYNC_ACCOUNT;
-      const gateway = input.gateway || (bosConfig ? getGatewayDomain(bosConfig) : null) || DEFAULT_SYNC_GATEWAY;
+      const account = input.account || bosConfig?.account || DEFAULT_ACCOUNT;
+      const gateway = input.gateway || getGatewayDomain(bosConfig);
       const socialUrl = `https://near.social/mob.near/widget/State.Inspector?key=${account}/bos/gateways/${gateway}`;
 
       if (!bosConfig) {

package/src/types.ts

@@ -30,9 +30,16 @@ export const RemoteConfigSchema = z.object({
 });
 export type RemoteConfig = z.infer<typeof RemoteConfigSchema>;
 
+export const NovaConfigSchema = z.object({
+  account: z.string(),
+});
+export type NovaConfig = z.infer<typeof NovaConfigSchema>;
+
 export const GatewayConfigSchema = z.object({
   development: z.string(),
   production: z.string(),
+  account: z.string().optional(),
+  nova: NovaConfigSchema.optional(),
 });
 export type GatewayConfig = z.infer<typeof GatewayConfigSchema>;
 
@@ -54,6 +61,7 @@ export type SyncConfig = z.infer<typeof SyncConfigSchema>;
 export const BosConfigSchema = z.object({
   account: z.string(),
   testnet: z.string().optional(),
+  nova: NovaConfigSchema.optional(),
   gateway: GatewayConfigSchema,
   template: z.string().optional(),
   cli: z.object({