@highstate/backend 0.4.6 → 0.5.1

package/dist/index.d.ts

@@ -63,6 +63,7 @@ declare class LocalPulumiHost {
     private passwords;
     hasPassword(projectId: string): boolean;
     setPassword(projectId: string, password: string): void;
+    removePassword(projectId: string): void;
     private getPassword;
     tryUnlockStack(stack: Stack, error: unknown): Promise<boolean>;
     static create(logger: Logger): LocalPulumiHost;
@@ -209,6 +210,12 @@ interface ProjectBackend {
      * @param projectId The ID of the project.
      */
     getProject(projectId: string): Promise<ProjectModel>;
+    /**
+     * Create an empty project.
+     *
+     * @param projectId The ID of the project.
+     */
+    createProject(projectId: string): Promise<void>;
     /**
      * Create the instance of the project.
      *

package/dist/index.mjs

@@ -10,7 +10,7 @@ import Watcher from 'watcher';
 import { resolve } from 'import-meta-resolve';
 import { readdir, readFile, writeFile, mkdir } from 'node:fs/promises';
 import { getInstanceId, isUnitModel, parseInstanceId } from '@highstate/contract';
-import { h as hubModelSchema, i as instanceModelSchema, c as createInputResolver, a as createInputHashResolver, b as createInstanceState, d as instanceTerminalSchema, e as instancePageSchema, f as instanceFileSchema, g as instanceStatusFieldSchema, j as instanceTriggerSchema, k as compositeInstanceSchema, p as projectOperationSchema, l as instanceStateSchema, m as isFinalOperationStatus, t as terminalSessionSchema, n as applyPartialInstanceState, o as createInstanceStateFrontendPatch } from './terminal-C1HuyJ6e.mjs';
+import { h as hubModelSchema, i as instanceModelSchema, c as createInputResolver, a as createInputHashResolver, b as createInstanceState, d as instanceTerminalSchema, e as instancePageSchema, f as instanceFileSchema, g as instanceStatusFieldSchema, j as instanceTriggerSchema, k as compositeInstanceSchema, p as projectOperationSchema, l as instanceStateSchema, m as isFinalOperationStatus, t as terminalSessionSchema, n as applyPartialInstanceState, o as createInstanceStateFrontendPatch } from './terminal-CkVAFPZo.mjs';
 import { sha256 } from 'crypto-hash';
 import 'ajv';
 import { Readable, PassThrough } from 'node:stream';
@@ -162,6 +162,9 @@ class LocalPulumiHost {
   setPassword(projectId, password) {
     this.passwords.set(projectId, password);
   }
+  removePassword(projectId) {
+    this.passwords.delete(projectId);
+  }
   getPassword(projectId) {
     return this.sharedPassword || this.passwords.get(projectId) || "";
   }
@@ -253,7 +256,7 @@ class LocalSecretBackend {
         projectId,
         () => this.projectPath,
         async (stack) => {
-          this.logger.debug("checking password", { projectId });
+          this.logger.debug({ projectId }, "checking password");
           await stack.info(true);
         }
       );
@@ -261,6 +264,8 @@ class LocalSecretBackend {
     } catch (error) {
       if (error instanceof Error) {
         if (error.message.includes("incorrect passphrase")) {
+          this.logger.debug({ projectId, error }, "incorrect passphrase");
+          this.pulumiProjectHost.removePassword(projectId);
           return false;
         }
       }
@@ -274,7 +279,7 @@ class LocalSecretBackend {
       projectId,
       () => this.projectPath,
       async (stack) => {
-        this.logger.debug("getting secrets", { projectId, instanceId });
+        this.logger.debug({ projectId, instanceId }, "getting secrets");
         const config = await stack.getAllConfig();
         const prefix = this.getPrefix(projectId, instanceId);
         const secrets = pickBy(config, (_, key) => key.startsWith(prefix));
@@ -290,7 +295,7 @@ class LocalSecretBackend {
       projectId,
       () => this.projectPath,
       async (stack) => {
-        this.logger.debug("setting secrets", { projectId, instanceId });
+        this.logger.debug({ projectId, instanceId }, "setting secrets");
         const componentSecrets = mapValues(
           mapKeys(values, (key) => `${this.getPrefix(projectId, instanceId)}${key}`),
           (value) => ({
@@ -305,7 +310,7 @@ class LocalSecretBackend {
     );
   }
   getPrefix(projectId, instanceId) {
-    instanceId = instanceId.replace(/:/g, ".");
+    instanceId = instanceId.replace(/:/g, "_");
     return `${this.projectName}:${projectId}/${instanceId}/`;
   }
   static async create(config, pulumiProjectHost, logger) {
@@ -484,6 +489,15 @@ class LocalProjectBackend {
       throw new Error("Failed to get project instances", { cause: error });
     }
   }
+  async createProject(projectId) {
+    try {
+      await this.withProject(projectId, () => {
+        return { instances: {}, hubs: {} };
+      });
+    } catch (error) {
+      throw new Error("Failed to create project", { cause: error });
+    }
+  }
   async createInstance(projectId, instance) {
     try {
       return await this.withProject(projectId, (project) => {
@@ -1209,7 +1223,7 @@ class LocalRunnerBackend {
     return this.pulumiProjectHost.runEmpty(
       options.projectId,
       options.instanceType,
-      options.instanceName,
+      LocalRunnerBackend.getStackName(options),
       async (stack) => {
         const info = await stack.info();
         const instanceId = getInstanceId(options.instanceType, options.instanceName);
@@ -1238,7 +1252,7 @@ class LocalRunnerBackend {
     return this.pulumiProjectHost.runEmpty(
       options.projectId,
       options.instanceType,
-      options.instanceName,
+      LocalRunnerBackend.getStackName(options),
       async (stack) => {
         const outputs = await stack.outputs();
         if (!outputs["$terminals"]) {
@@ -1257,7 +1271,7 @@ class LocalRunnerBackend {
     return this.pulumiProjectHost.runEmpty(
       options.projectId,
       options.instanceType,
-      options.instanceName,
+      LocalRunnerBackend.getStackName(options),
       async (stack) => {
         const outputs = await stack.outputs();
         if (!outputs["$pages"]) {
@@ -1276,7 +1290,7 @@ class LocalRunnerBackend {
     return this.pulumiProjectHost.runEmpty(
       options.projectId,
       options.instanceType,
-      options.instanceName,
+      LocalRunnerBackend.getStackName(options),
       async (stack) => {
         const outputs = await stack.outputs();
         if (!outputs["$files"]) {
@@ -1313,7 +1327,7 @@ class LocalRunnerBackend {
       await this.pulumiProjectHost.runLocal(
         options.projectId,
         options.instanceType,
-        options.instanceName,
+        LocalRunnerBackend.getStackName(options),
         () => this.resolveProjectPath(options.source),
         async (stack) => {
           await stack.setAllConfig(configMap);
@@ -1400,7 +1414,7 @@ class LocalRunnerBackend {
       await this.pulumiProjectHost.runEmpty(
         options.projectId,
         options.instanceType,
-        options.instanceName,
+        LocalRunnerBackend.getStackName(options),
         async (stack) => {
           const summary = await stack.workspace.stack();
           let currentResourceCount = summary?.resourceCount ?? 0;
@@ -1470,7 +1484,7 @@ class LocalRunnerBackend {
       await this.pulumiProjectHost.runEmpty(
         options.projectId,
         options.instanceType,
-        options.instanceName,
+        LocalRunnerBackend.getStackName(options),
         async (stack) => {
           const summary = await stack.workspace.stack();
           let currentResourceCount = 0;
@@ -1622,6 +1636,9 @@ class LocalRunnerBackend {
     await ensureDependencyInstalled(packageName);
     return true;
   }
+  static getStackName(options) {
+    return `${options.projectId}_${options.instanceName}`;
+  }
   static async create(config, pulumiProjectHost) {
     let sourceBasePath = config.HIGHSTATE_BACKEND_RUNNER_LOCAL_SOURCE_BASE_PATH;
     if (!sourceBasePath) {
@@ -2071,6 +2088,9 @@ class RuntimeOperation {
   childrenStateMap = /* @__PURE__ */ new Map();
   dependentStateMap = /* @__PURE__ */ new Map();
   library;
+  inputHashLock = new BetterLock();
+  inputHashPromiseCache = /* @__PURE__ */ new Map();
+  inputHashNodes = /* @__PURE__ */ new Map();
   resolveInputHash;
   async operateSafe() {
     try {
@@ -2156,9 +2176,8 @@ class RuntimeOperation {
       this.tryAddStateToParent(state);
       this.addDependentState(state);
     }
-    const inputHashNodes = /* @__PURE__ */ new Map();
     for (const instance of allInstances) {
-      inputHashNodes.set(instance.id, {
+      this.inputHashNodes.set(instance.id, {
         instance,
         resolvedInputs: this.resolvedInstanceInputs.get(instance.id),
         state: this.stateMap.get(instance.id),
@@ -2167,8 +2186,9 @@ class RuntimeOperation {
       });
     }
     this.resolveInputHash = createInputHashResolver(
-      inputHashNodes,
-      this.logger.child({ resolver: "input-hash-resolver" })
+      this.inputHashNodes,
+      this.logger.child({ resolver: "input-hash-resolver" }),
+      { promiseCache: this.inputHashPromiseCache }
     );
     if (this.operation.type === "update") {
       await this.extendWithNotCreatedDependencies();
@@ -2325,7 +2345,17 @@ class RuntimeOperation {
         finalStatuses: ["created", "error"]
       });
       await this.watchStateStream(stream);
-      const inputHash = await this.resolveInputHash(instance.id);
+      const inputHash = await this.inputHashLock.acquire(async () => {
+        this.inputHashNodes.set(instance.id, {
+          instance,
+          resolvedInputs: this.resolvedInstanceInputs.get(instance.id),
+          state: this.stateMap.get(instance.id),
+          sourceHash: void 0
+          // TODO: implement source hash
+        });
+        this.inputHashPromiseCache.clear();
+        return await this.resolveInputHash(instance.id);
+      });
       this.updateInstanceState({ id: instance.id, inputHash });
       logger.debug("input hash after update", { inputHash });
       logger.info("unit updated");

package/dist/shared/index.d.ts

@@ -11,8 +11,8 @@ type GraphResolverOptions<TNode, TOutput> = {
 };
 interface GraphResolverBackend<TOutput> {
     promiseCache: Map<string, Promise<TOutput>>;
-    setOutput(id: string, value: TOutput): void;
-    setDependencies(id: string, dependencies: string[]): void;
+    setOutput?(id: string, value: TOutput): void;
+    setDependencies?(id: string, dependencies: string[]): void;
 }
 type GraphResolverFactory<TNode, TOutput> = (nodes: ReadonlyMap<string, TNode>, logger: Logger, backend?: GraphResolverBackend<TOutput>) => GraphResolver<TOutput>;
 type GraphResolver<TOutput> = (id: string) => Promise<TOutput>;

package/dist/shared/index.mjs

@@ -1,5 +1,5 @@
-import { q as defineGraphResolver } from '../terminal-C1HuyJ6e.mjs';
-export { J as CircularDependencyError, n as applyPartialInstanceState, k as compositeInstanceSchema, K as createDefaultGraphResolverBackend, a as createInputHashResolver, c as createInputResolver, b as createInstanceState, o as createInstanceStateFrontendPatch, O as getMatchedInjectionInstanceInputs, L as getResolvedHubInputs, N as getResolvedInjectionInstanceInputs, M as getResolvedInstanceInputs, u as hubInstanceInputSchema, w as hubModelPatchSchema, h as hubModelSchema, y as instanceFileMetaSchema, f as instanceFileSchema, s as instanceInputSchema, v as instanceModelPatchSchema, i as instanceModelSchema, z as instancePageBlockSchema, A as instancePageMetaSchema, e as instancePageSchema, F as instanceStatePatchSchema, l as instanceStateSchema, g as instanceStatusFieldSchema, x as instanceStatusSchema, C as instanceTerminalFileSchema, B as instanceTerminalMetaSchema, d as instanceTerminalSchema, E as instanceTriggerInvocationSchema, j as instanceTriggerSchema, D as instanceTriggerSpecSchema, m as isFinalOperationStatus, H as operationStatusSchema, G as operationTypeSchema, r as positionSchema, I as projectOperationRequestSchema, p as projectOperationSchema, t as terminalSessionSchema } from '../terminal-C1HuyJ6e.mjs';
+import { q as defineGraphResolver } from '../terminal-CkVAFPZo.mjs';
+export { J as CircularDependencyError, n as applyPartialInstanceState, k as compositeInstanceSchema, K as createDefaultGraphResolverBackend, a as createInputHashResolver, c as createInputResolver, b as createInstanceState, o as createInstanceStateFrontendPatch, O as getMatchedInjectionInstanceInputs, L as getResolvedHubInputs, N as getResolvedInjectionInstanceInputs, M as getResolvedInstanceInputs, u as hubInstanceInputSchema, w as hubModelPatchSchema, h as hubModelSchema, y as instanceFileMetaSchema, f as instanceFileSchema, s as instanceInputSchema, v as instanceModelPatchSchema, i as instanceModelSchema, z as instancePageBlockSchema, A as instancePageMetaSchema, e as instancePageSchema, F as instanceStatePatchSchema, l as instanceStateSchema, g as instanceStatusFieldSchema, x as instanceStatusSchema, C as instanceTerminalFileSchema, B as instanceTerminalMetaSchema, d as instanceTerminalSchema, E as instanceTriggerInvocationSchema, j as instanceTriggerSchema, D as instanceTriggerSpecSchema, m as isFinalOperationStatus, H as operationStatusSchema, G as operationTypeSchema, r as positionSchema, I as projectOperationRequestSchema, p as projectOperationSchema, t as terminalSessionSchema } from '../terminal-CkVAFPZo.mjs';
 import { Ajv } from 'ajv';
 import 'zod';
 import 'remeda';

package/dist/{terminal-C1HuyJ6e.mjs → terminal-CkVAFPZo.mjs}

@@ -259,11 +259,7 @@ class CircularDependencyError extends Error {
 function createDefaultGraphResolverBackend() {
   const promiseCache = /* @__PURE__ */ new Map();
   return {
-    promiseCache,
-    setOutput() {
-    },
-    setDependencies() {
-    }
+    promiseCache
   };
 }
 function defineGraphResolver(options) {
@@ -284,7 +280,7 @@ function defineGraphResolver(options) {
       }
       const resolve = async () => {
         const dependencies = unique(options.getNodeDependencies(item));
-        backend.setDependencies(itemId, dependencies);
+        backend.setDependencies?.(itemId, dependencies);
         logger.trace({ itemId, dependencies }, "resolving item dependencies");
         const resolvedDependencies = /* @__PURE__ */ new Map();
         const newChain = [...dependencyChain, itemId];
@@ -298,7 +294,7 @@ function defineGraphResolver(options) {
       };
       const promise = resolve().then((result) => {
         if (backend.promiseCache.get(itemId) === promise) {
-          backend.setOutput(itemId, result);
+          backend.setOutput?.(itemId, result);
         }
         return result;
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/backend",
-  "version": "0.4.6",
+  "version": "0.5.1",
   "type": "module",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "build": "pkgroll --tsconfig=tsconfig.build.json"
   },
   "dependencies": {
-    "@highstate/contract": "^0.4.6",
+    "@highstate/contract": "^0.5.1",
     "@types/node": "^22.10.1",
     "ajv": "^8.17.1",
     "better-lock": "^3.2.0",
@@ -65,5 +65,5 @@
     "rollup": "^4.28.1",
     "typescript": "^5.7.2"
   },
-  "gitHead": "dbb1d8125884cfe3a9d95df2e0710333c01c7edf"
+  "gitHead": "4ee64a0eebcb655746fa591ebf8e82199cf9e5d5"
 }