@rivetkit/engine-runner 2.0.26 → 2.0.28

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @rivetkit/engine-runner@2.0.26 build /home/runner/work/rivet/rivet/engine/sdks/typescript/runner
+> @rivetkit/engine-runner@2.0.28 build /home/runner/work/rivet/rivet/engine/sdks/typescript/runner
 > tsup src/mod.ts
 
 CLI Building entry: src/mod.ts
@@ -10,13 +10,13 @@
 CLI Cleaning output folder
 CJS Build start
 ESM Build start
-ESM dist/mod.js     93.79 KB
-ESM dist/mod.js.map 185.09 KB
-ESM ⚡️ Build success in 622ms
+ESM dist/mod.js     93.71 KB
+ESM dist/mod.js.map 184.98 KB
+ESM ⚡️ Build success in 605ms
+CJS dist/mod.cjs     94.95 KB
+CJS dist/mod.cjs.map 157.62 KB
+CJS ⚡️ Build success in 610ms
 DTS Build start
-CJS dist/mod.cjs     95.02 KB
-CJS dist/mod.cjs.map 157.67 KB
-CJS ⚡️ Build success in 747ms
-DTS ⚡️ Build success in 3223ms
+DTS ⚡️ Build success in 3637ms
 DTS dist/mod.d.cts 14.77 KB
 DTS dist/mod.d.ts  14.77 KB

package/dist/mod.cjs

@@ -324,30 +324,29 @@ function stringifyToClientTunnelMessageKind(kind) {
 function stringifyCommand(command) {
   switch (command.tag) {
     case "CommandStartActor": {
-      const { generation, config, hibernatingRequests } = command.val;
+      const { config, hibernatingRequests } = command.val;
       const keyStr = config.key === null ? "null" : `"${config.key}"`;
       const inputStr = config.input === null ? "null" : stringifyArrayBuffer(config.input);
       const hibernatingRequestsStr = hibernatingRequests.length > 0 ? `[${hibernatingRequests.map((hr) => `{gatewayId: ${idToStr(hr.gatewayId)}, requestId: ${idToStr(hr.requestId)}}`).join(", ")}]` : "[]";
-      return `CommandStartActor{generation: ${generation}, config: {name: "${config.name}", key: ${keyStr}, createTs: ${stringifyBigInt(config.createTs)}, input: ${inputStr}}, hibernatingRequests: ${hibernatingRequestsStr}}`;
+      return `CommandStartActor{config: {name: "${config.name}", key: ${keyStr}, createTs: ${stringifyBigInt(config.createTs)}, input: ${inputStr}}, hibernatingRequests: ${hibernatingRequestsStr}}`;
     }
     case "CommandStopActor": {
-      const { generation } = command.val;
-      return `CommandStopActor{generation: ${generation}}`;
+      return `CommandStopActor`;
     }
   }
 }
 function stringifyCommandWrapper(wrapper) {
-  return `CommandWrapper{actorId: "${wrapper.checkpoint.actorId}", index: ${stringifyBigInt(wrapper.checkpoint.index)}, inner: ${stringifyCommand(wrapper.inner)}}`;
+  return `CommandWrapper{actorId: "${wrapper.checkpoint.actorId}", generation: "${wrapper.checkpoint.generation}", index: ${stringifyBigInt(wrapper.checkpoint.index)}, inner: ${stringifyCommand(wrapper.inner)}}`;
 }
 function stringifyEvent(event) {
   switch (event.tag) {
     case "EventActorIntent": {
-      const { actorId, generation, intent } = event.val;
+      const { intent } = event.val;
       const intentStr = intent.tag === "ActorIntentSleep" ? "Sleep" : intent.tag === "ActorIntentStop" ? "Stop" : "Unknown";
-      return `EventActorIntent{actorId: "${actorId}", generation: ${generation}, intent: ${intentStr}}`;
+      return `EventActorIntent{intent: ${intentStr}}`;
     }
     case "EventActorStateUpdate": {
-      const { actorId, generation, state } = event.val;
+      const { state } = event.val;
       let stateStr;
       if (state.tag === "ActorStateRunning") {
         stateStr = "Running";
@@ -358,17 +357,17 @@ function stringifyEvent(event) {
       } else {
         stateStr = "Unknown";
       }
-      return `EventActorStateUpdate{actorId: "${actorId}", generation: ${generation}, state: ${stateStr}}`;
+      return `EventActorStateUpdate{state: ${stateStr}}`;
     }
     case "EventActorSetAlarm": {
-      const { actorId, generation, alarmTs } = event.val;
+      const { alarmTs } = event.val;
       const alarmTsStr = alarmTs === null ? "null" : stringifyBigInt(alarmTs);
-      return `EventActorSetAlarm{actorId: "${actorId}", generation: ${generation}, alarmTs: ${alarmTsStr}}`;
+      return `EventActorSetAlarm{alarmTs: ${alarmTsStr}}`;
     }
   }
 }
 function stringifyEventWrapper(wrapper) {
-  return `EventWrapper{actorId: ${wrapper.checkpoint.actorId}, index: ${stringifyBigInt(wrapper.checkpoint.index)}, inner: ${stringifyEvent(wrapper.inner)}}`;
+  return `EventWrapper{actorId: ${wrapper.checkpoint.actorId}, generation: "${wrapper.checkpoint.generation}", index: ${stringifyBigInt(wrapper.checkpoint.index)}, inner: ${stringifyEvent(wrapper.inner)}}`;
 }
 function stringifyToServer(message) {
   switch (message.tag) {
@@ -1756,7 +1755,7 @@ async function importWebSocket() {
 
 // src/mod.ts
 var KV_EXPIRE = 3e4;
-var PROTOCOL_VERSION = 4;
+var PROTOCOL_VERSION = 5;
 var EVENT_BACKLOG_WARN_THRESHOLD = 1e4;
 var SIGNAL_HANDLERS = [];
 var RunnerShutdownError = class extends Error {
@@ -1835,7 +1834,11 @@ var Runner = class {
     this.#sendActorIntent(actorId, actor.generation, "stop");
   }
   async forceStopActor(actorId, generation) {
-    var _a;
+    var _a, _b;
+    (_a = this.log) == null ? void 0 : _a.debug({
+      msg: "force stopping actor",
+      actorId
+    });
     const actor = this.getActor(actorId, generation);
     if (!actor) return;
     try {
@@ -1843,9 +1846,9 @@ var Runner = class {
     } catch (err) {
       console.error(`Error in onActorStop for actor ${actorId}:`, err);
     }
-    (_a = this.#tunnel) == null ? void 0 : _a.closeActiveRequests(actor);
-    this.#removeActor(actorId, generation);
+    (_b = this.#tunnel) == null ? void 0 : _b.closeActiveRequests(actor);
     this.#sendActorStateUpdate(actorId, actor.generation, "stopped");
+    this.#removeActor(actorId, generation);
   }
   #handleLost() {
     var _a;
@@ -2383,6 +2386,11 @@ var Runner = class {
             error: stringifyError(err)
           });
         });
+        const actor = this.getActor(
+          commandWrapper.checkpoint.actorId,
+          commandWrapper.checkpoint.generation
+        );
+        if (actor) actor.lastCommandIdx = commandWrapper.checkpoint.index;
       } else if (commandWrapper.inner.tag === "CommandStopActor") {
         this.#handleCommandStopActor(commandWrapper).catch((err) => {
           var _a2;
@@ -2395,11 +2403,6 @@ var Runner = class {
       } else {
         unreachable(commandWrapper.inner);
       }
-      const actor = this.getActor(
-        commandWrapper.checkpoint.actorId,
-        commandWrapper.inner.val.generation
-      );
-      if (actor) actor.lastCommandIdx = commandWrapper.checkpoint.index;
     }
   }
   #handleAckEvents(ack) {
@@ -2453,7 +2456,7 @@ var Runner = class {
     if (!this.#tunnel) throw new Error("missing tunnel on actor start");
     const startCommand = commandWrapper.inner.val;
     const actorId = commandWrapper.checkpoint.actorId;
-    const generation = startCommand.generation;
+    const generation = commandWrapper.checkpoint.generation;
     const config = startCommand.config;
     const actorConfig = {
       name: config.name,
@@ -2512,7 +2515,7 @@ var Runner = class {
   async #handleCommandStopActor(commandWrapper) {
     const stopCommand = commandWrapper.inner.val;
     const actorId = commandWrapper.checkpoint.actorId;
-    const generation = stopCommand.generation;
+    const generation = commandWrapper.checkpoint.generation;
     await this.forceStopActor(actorId, generation);
   }
   #sendActorIntent(actorId, generation, intentType) {
@@ -2530,13 +2533,12 @@ var Runner = class {
       unreachable(intentType);
     }
     const intentEvent = {
-      actorId,
-      generation,
       intent: actorIntent
     };
     const eventWrapper = {
       checkpoint: {
         actorId,
+        generation,
         index: actor.nextEventIdx++
       },
       inner: {
@@ -2568,13 +2570,12 @@ var Runner = class {
       unreachable(stateType);
     }
     const stateUpdateEvent = {
-      actorId,
-      generation,
       state: actorState
     };
     const eventWrapper = {
       checkpoint: {
         actorId,
+        generation,
         index: actor.nextEventIdx++
       },
       inner: {
@@ -2596,6 +2597,7 @@ var Runner = class {
       }
       lastCommandCheckpoints.push({
         actorId: actor.actorId,
+        generation: actor.generation,
         index: actor.lastCommandIdx
       });
     }
@@ -2832,13 +2834,12 @@ var Runner = class {
     const actor = this.getActor(actorId, generation);
     if (!actor) return;
     const alarmEvent = {
-      actorId,
-      generation: actor.generation,
       alarmTs: alarmTs !== null ? BigInt(alarmTs) : null
     };
     const eventWrapper = {
       checkpoint: {
         actorId,
+        generation: actor.generation,
         index: actor.nextEventIdx++
       },
       inner: {