Add timeout

Author: mustard-mh

components/public-api/typescript-common/src/public-api-converter.spec.ts

@@ -177,6 +177,64 @@ describe("PublicAPIConverter", () => {
         });
     });
 
+    describe("toDuration", () => {
+        it("should convert with 0", () => {
+            expect(converter.toDuration("").seconds).to.equal(BigInt(0));
+            expect(converter.toDuration("  ").seconds).to.equal(BigInt(0));
+            expect(converter.toDuration("0").seconds).to.equal(BigInt(0));
+            expect(converter.toDuration("0ms").seconds).to.equal(BigInt(0));
+            expect(converter.toDuration("0s").seconds).to.equal(BigInt(0));
+            expect(converter.toDuration("0m").seconds).to.equal(BigInt(0));
+            expect(converter.toDuration("0h").seconds).to.equal(BigInt(0));
+        });
+        it("should convert with hours", () => {
+            expect(converter.toDuration("1h").seconds).to.equal(BigInt(3600));
+            expect(converter.toDuration("24h").seconds).to.equal(BigInt(3600 * 24));
+            expect(converter.toDuration("25h").seconds).to.equal(BigInt(3600 * 25));
+        });
+        it("should convert with minutes", () => {
+            expect(converter.toDuration("1m").seconds).to.equal(BigInt(60));
+            expect(converter.toDuration("120m").seconds).to.equal(BigInt(120 * 60));
+        });
+        it("should convert with seconds", () => {
+            expect(converter.toDuration("1s").seconds).to.equal(BigInt(1));
+            expect(converter.toDuration("120s").seconds).to.equal(BigInt(120));
+        });
+        it("should convert with mixed", () => {
+            expect(converter.toDuration("1h20m").seconds).to.equal(BigInt(3600 + 20 * 60));
+            expect(converter.toDuration("1h0m0s").seconds).to.equal(BigInt(3600));
+            expect(converter.toDuration("20m1h").seconds).to.equal(BigInt(3600 + 20 * 60));
+            expect(converter.toDuration("20m25h1s").seconds).to.equal(BigInt(25 * 3600 + 20 * 60 + 1));
+        });
+    });
+
+    describe("toDurationString", () => {
+        it("should convert with 0", () => {
+            expect(converter.toDurationString(new Duration())).to.equal("0");
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(0) }))).to.equal("0");
+            expect(converter.toDurationString(new Duration({ nanos: 0 }))).to.equal("0");
+        });
+        it("should convert with hours", () => {
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(3600) }))).to.equal("1h");
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(3600 * 24) }))).to.equal("24h");
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(3600 * 25) }))).to.equal("25h");
+        });
+        it("should convert with minutes", () => {
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(60) }))).to.equal("1m");
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(2 * 60 * 60) }))).to.equal("2h");
+        });
+        it("should convert with seconds", () => {
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(1) }))).to.equal("1s");
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(120) }))).to.equal("2m");
+        });
+        it("should convert with mixed", () => {
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(3600 + 20 * 60) }))).to.equal("1h20m");
+            expect(converter.toDurationString(new Duration({ seconds: BigInt(25 * 3600 + 20 * 60 + 1) }))).to.equal(
+                "25h20m1s",
+            );
+        });
+    });
+
     describe("errors", () => {
         it("USER_BLOCKED", () => {
             const connectError = converter.toError(new ApplicationError(ErrorCodes.USER_BLOCKED, "user blocked"));

components/public-api/typescript-common/src/public-api-converter.ts

@@ -4,7 +4,8 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { Timestamp, toPlainMessage } from "@bufbuild/protobuf";
+import { Timestamp, toPlainMessage, PartialMessage } from "@bufbuild/protobuf";
+import { Duration } from "@bufbuild/protobuf";
 import { Code, ConnectError } from "@connectrpc/connect";
 import {
     FailedPreconditionDetails,
@@ -43,6 +44,7 @@ import {
     GitInitializer_GitConfig,
     PrebuildInitializer,
     SnapshotInitializer,
+    UpdateWorkspaceRequest_UpdateTimeout,
     Workspace,
     WorkspaceGitStatus,
     WorkspaceInitializer,
@@ -210,7 +212,11 @@ export class PublicAPIConverter {
         spec.editor = this.toEditor(arg.configuration.ideConfig);
         spec.ports = this.toPorts(arg.status.exposedPorts);
         if (arg.status.timeout) {
-            // TODO: timeout
+            spec.timeout = new UpdateWorkspaceRequest_UpdateTimeout({
+                disconnected: this.toDuration(arg.status.timeout),
+                // TODO: inactivity
+                // TODO: maximum_lifetime
+            });
         }
         if (arg.workspaceClass) {
             spec.class = arg.workspaceClass;
@@ -1026,4 +1032,55 @@ export class PublicAPIConverter {
         result.lastUsedTime = Timestamp.fromDate(new Date(sshKey.lastUsedTime || sshKey.creationTime));
         return result;
     }
+
+    /**
+     * Converts a duration to a string like "1h2m3s4ms"
+     *
+     * `Duration.nanos` is ignored
+     * @returns a string like "1h2m3s", valid time units are `s`, `m`, `h`
+     */
+    toDurationString(duration: PartialMessage<Duration>): string {
+        const seconds = duration.seconds || 0;
+        if (seconds === 0) {
+            return "0";
+        }
+        const totalMilliseconds = Number(seconds) * 1000;
+
+        const hours = Math.floor(totalMilliseconds / 3600000);
+        const remainingMillisecondsAfterHours = totalMilliseconds % 3600000;
+        const minutes = Math.floor(remainingMillisecondsAfterHours / 60000);
+        const remainingMillisecondsAfterMinutes = remainingMillisecondsAfterHours % 60000;
+        const secondsResult = Math.floor(remainingMillisecondsAfterMinutes / 1000);
+
+        return `${hours > 0 ? hours + "h" : ""}${minutes > 0 ? minutes + "m" : ""}${
+            secondsResult > 0 ? secondsResult + "s" : ""
+        }`;
+    }
+
+    /**
+     * Converts a duration string like "1h2m3s" to a Duration
+     *
+     * @param durationString "1h2m3s" valid time units are `s`, `m`, `h`
+     */
+    toDuration(durationString: string): Duration {
+        const units = new Map([
+            ["h", 3600],
+            ["m", 60],
+            ["s", 1],
+        ]);
+        const regex = /(\d+(?:\.\d+)?)([hmsµµs]+)/g;
+        let totalSeconds = 0;
+        let match: RegExpExecArray | null;
+
+        while ((match = regex.exec(durationString)) !== null) {
+            const value = parseFloat(match[1]);
+            const unit = match[2];
+            totalSeconds += value * (units.get(unit) || 0);
+        }
+
+        return new Duration({
+            seconds: BigInt(Math.floor(totalSeconds)),
+            nanos: (totalSeconds - Math.floor(totalSeconds)) * 1e9,
+        });
+    }
 }