Merge remote-tracking branch 'origin/master' into npm-ts-5.7.3

src/packages/database/postgres-blobs.coffee

@@ -17,7 +17,11 @@ LICENSE   : MS-RSL
 # If this env variable begins with a / it is assumed to be a path in the file system,
 # e.g., a remote mount (in practice, we are using gcsfuse to mount gcloud buckets).
 # If it is gs:// then it is a google cloud storage bucket.
-COCALC_BLOB_STORE = process.env.COCALC_BLOB_STORE
+# 2025-01-10: noticed rarely this variable is not set, at least not initially after startup.
+# Hardcoding the path, which has never changed anyways.
+# Maybe https://github.com/nodejs/help/issues/3618
+COCALC_BLOB_STORE_FALLBACK = "/blobs"
+COCALC_BLOB_STORE = String(process.env.COCALC_BLOB_STORE ? COCALC_BLOB_STORE_FALLBACK)
 
 async   = require('async')
 zlib    = require('zlib')
@@ -211,8 +215,8 @@ exports.extend_PostgreSQL = (ext) -> class PostgreSQL extends ext
                     cb()
                 else if x.gcloud
                     if not COCALC_BLOB_STORE?
-                        cb("no blob store configured -- set the COCALC_BLOB_STORE env variable")
-                        return
+                        # see comment https://github.com/sagemathinc/cocalc/pull/8110
+                        COCALC_BLOB_STORE = COCALC_BLOB_STORE_FALLBACK
                     # blob not available locally, but should be in a Google cloud storage bucket -- try to get it
                     # NOTE: we now ignore the actual content of x.gcloud -- we don't support spreading blobs
                     # across multiple buckets... as it isn't needed because buckets are infinite, and it
@@ -291,9 +295,7 @@ exports.extend_PostgreSQL = (ext) -> class PostgreSQL extends ext
             opts.cb?("uuid is invalid")
             return
         if not opts.bucket
-            dbg("invalid bucket")
-            opts.cb?("no blob store configured -- set the COCALC_BLOB_STORE env variable")
-            return
+            opts.bucket = COCALC_BLOB_STORE_FALLBACK
         locals =
             x: undefined
         async.series([

src/packages/frontend/app/actions.ts

@@ -185,7 +185,7 @@ export class PageActions extends Actions<PageState> {
         if (change_history) {
           set_url("/notifications");
         }
-        set_window_title("Messages, Mentions and News");
+        set_window_title(intl.formatMessage(labels.messages_title));
         return;
       case undefined:
         return;

src/packages/frontend/compute/api.ts

@@ -133,6 +133,13 @@ export async function setServerCloud(opts: { id: number; cloud: string }) {
   return await api("compute/set-server-cloud", opts);
 }
 
+export async function setServerOwner(opts: {
+  id: number;
+  new_account_id: string;
+}) {
+  return await api("compute/set-server-owner", opts);
+}
+
 // Cache for 12 hours
 let googleCloudPriceData: GoogleCloudData | null = null;
 let googleCloudPriceDataExpire: number = 0;

src/packages/frontend/compute/automatic-shutdown.tsx

@@ -24,6 +24,7 @@ import Inline from "./inline";
 import { IdleTimeout } from "./idle-timeout";
 import { SpendLimit } from "./spend-limit";
 import { HealthCheck } from "./health-check";
+import { ShutdownTime } from "./shutdown-time";
 import ShowError from "@cocalc/frontend/components/error";
 import { Icon } from "@cocalc/frontend/components";
 
@@ -116,21 +117,11 @@ function CardTitle({
         {saveButton}
       </Space>
       <div style={{ flex: 1 }} />
-      {savedEnabled ? (
-        <Alert
-          style={{ marginLeft: "15px" }}
-          type="success"
-          showIcon
-          message={"Enabled"}
-        />
-      ) : (
-        <Alert
-          style={{ marginLeft: "15px" }}
-          type="info"
-          showIcon
-          message={"Disabled"}
-        />
-      )}
+      <div style={{ marginLeft: "15px", width: "105px" }}>
+        {savedEnabled ? (
+          <Alert type="success" showIcon message={"Enabled"} />
+        ) : undefined}
+      </div>
     </Flex>
   );
 }
@@ -139,7 +130,7 @@ export function AutomaticShutdownModal({ id, project_id, close }) {
   const [help, setHelp] = useState<boolean>(false);
   return (
     <Modal
-      width={800}
+      width={900}
       open
       onCancel={close}
       onOk={close}
@@ -157,7 +148,7 @@ export function AutomaticShutdownModal({ id, project_id, close }) {
           />
           <Flex style={{ marginRight: "20px", alignItems: "center" }}>
             <div style={{ fontSize: "18px", margin: "15px 0" }}>
-              Configure Automatic Shutdown Strategies
+              Configure Automatic Shutdown and Health Check Strategies
             </div>
             <div style={{ flex: 1 }} />
             <Switch
@@ -169,6 +160,14 @@ export function AutomaticShutdownModal({ id, project_id, close }) {
           </Flex>
           {help && (
             <div style={{ fontSize: "14px", fontWeight: "normal" }}>
+              <Button
+                href="https://youtu.be/Kx_47fs_xcI"
+                target="_blank"
+                style={{ float: "right" }}
+              >
+                <Icon name="youtube" style={{ color: "red" }} />
+                YouTube Video
+              </Button>
               Each strategy automatically turns this compute server off when a
               condition is met. This can save you money keeping spending under
               control. When the server is shutdown, a message is also sent and a
@@ -180,6 +179,8 @@ export function AutomaticShutdownModal({ id, project_id, close }) {
     >
       <IdleTimeout id={id} project_id={project_id} help={help} />
       <div style={{ height: "15px" }} />
+      <ShutdownTime id={id} project_id={project_id} help={help} />
+      <div style={{ height: "15px" }} />
       <SpendLimit id={id} project_id={project_id} help={help} />
       <div style={{ height: "15px" }} />
       <HealthCheck id={id} project_id={project_id} help={help} />

src/packages/frontend/compute/compute-server.tsx

@@ -25,6 +25,7 @@ import SerialPortOutput from "./serial-port-output";
 import State from "./state";
 import Title from "./title";
 import { IdleTimeoutMessage } from "./idle-timeout";
+import { ShutdownTimeMessage } from "./shutdown-time";
 import { RunningProgress } from "@cocalc/frontend/compute/doc-status";
 import { SpendLimitStatus } from "./spend-limit";
 
@@ -392,20 +393,40 @@ export default function ComputeServer({
                   />
                 )}
             </div>
-            {cloud != "onprem" &&
-              server.configuration?.idleTimeoutMinutes &&
-              state == "running" &&
-              id && (
-                <div
-                  style={{
-                    display: "flex",
-                    marginLeft: "-10px",
-                    color: "#666",
-                  }}
-                >
-                  <IdleTimeoutMessage id={id} project_id={project_id} minimal />
-                </div>
-              )}
+            {cloud != "onprem" && state == "running" && id && (
+              <>
+                {!!server.configuration?.idleTimeoutMinutes && (
+                  <div
+                    style={{
+                      display: "flex",
+                      marginLeft: "-10px",
+                      color: "#666",
+                    }}
+                  >
+                    <IdleTimeoutMessage
+                      id={id}
+                      project_id={project_id}
+                      minimal
+                    />
+                  </div>
+                )}
+                {!!server.configuration?.shutdownTime?.enabled && (
+                  <div
+                    style={{
+                      display: "flex",
+                      marginLeft: "-15px",
+                      color: "#666",
+                    }}
+                  >
+                    <ShutdownTimeMessage
+                      id={id}
+                      project_id={project_id}
+                      minimal
+                    />
+                  </div>
+                )}
+              </>
+            )}
             {id != null && (
               <div style={{ marginLeft: "-15px" }}>
                 <CurrentCost state={state} cost_per_hour={cost_per_hour} />
@@ -420,7 +441,7 @@ export default function ComputeServer({
                 project_id={project_id}
               />
             )}
-            <SpendLimitStatus server={server} />
+            {server?.id != null && <SpendLimitStatus server={server} />}
           </div>
         }
         title={

src/packages/frontend/compute/health-check.tsx

@@ -1,5 +1,5 @@
-import { Button, Flex, Input, InputNumber, Radio, Space } from "antd";
-import { useEffect, useState } from "react";
+import { Button, Input, InputNumber, Radio, Space } from "antd";
+import { useState } from "react";
 import ShowError from "@cocalc/frontend/components/error";
 import { useServer } from "./compute-server";
 import { webapp_client } from "@cocalc/frontend/webapp-client";
@@ -27,14 +27,6 @@ export function HealthCheck({ id, project_id, help }) {
     )!,
   );
 
-  useEffect(() => {
-    setHealthCheck(
-      validatedHealthCheck(
-        server?.configuration?.healthCheck ?? HEALTH_CHECK_DEFAULTS,
-      )!,
-    );
-  }, [server?.configuration?.healthCheck]);
-
   const doTest = async () => {
     try {
       setSaving(true);
@@ -59,6 +51,9 @@ export function HealthCheck({ id, project_id, help }) {
     healthCheck.periodSeconds ?? HEALTH_CHECK_DEFAULTS.periodSeconds;
   const failureThreshold =
     healthCheck.failureThreshold ?? HEALTH_CHECK_DEFAULTS.failureThreshold;
+  const initialDelaySeconds =
+    healthCheck.initialDelaySeconds ??
+    HEALTH_CHECK_DEFAULTS.initialDelaySeconds;
 
   return (
     <AutomaticShutdownCard
@@ -82,7 +77,8 @@ export function HealthCheck({ id, project_id, help }) {
         ) &&
         healthCheck.failureThreshold != null &&
         healthCheck.periodSeconds != null &&
-        healthCheck.timeoutSeconds != null
+        healthCheck.timeoutSeconds != null &&
+        healthCheck.initialDelaySeconds != null
       }
       savedEnabled={!!server.configuration?.healthCheck?.enabled}
       enabled={healthCheck.enabled}
@@ -116,9 +112,9 @@ export function HealthCheck({ id, project_id, help }) {
         </div>
       )}
       <Space direction="vertical" size="large">
-        <Flex>
+        <Space style={{ width: "100%" }} wrap>
           <Input
-            style={{ flex: 1, marginRight: "15px" }}
+            style={{ width: "508px" }}
             allowClear
             disabled={saving}
             value={healthCheck.command}
@@ -128,7 +124,7 @@ export function HealthCheck({ id, project_id, help }) {
             placeholder={`Shell Command (bash) -- ${healthCheck.action} when this fails ${failureThreshold} times...`}
           />
           <InputNumber
-            style={{ flex: 0.5, marginRight: "15px" }}
+            style={{ width: "250px" }}
             disabled={saving}
             min={1}
             step={1}
@@ -142,10 +138,10 @@ export function HealthCheck({ id, project_id, help }) {
             addonAfter="seconds timeout"
             placeholder="Command timeout..."
           />
-        </Flex>
-        <Flex>
+        </Space>
+        <Space style={{ width: "100%" }} wrap>
           <InputNumber
-            style={{ flex: 1, marginRight: "15px" }}
+            style={{ width: "250px" }}
             disabled={saving}
             min={1}
             step={1}
@@ -160,7 +156,7 @@ export function HealthCheck({ id, project_id, help }) {
             placeholder="Failure threshold..."
           />
           <InputNumber
-            style={{ flex: 1 }}
+            style={{ width: "250px" }}
             disabled={saving}
             min={60}
             step={30}
@@ -174,7 +170,22 @@ export function HealthCheck({ id, project_id, help }) {
             addonAfter="seconds between checks"
             placeholder="Interval..."
           />
-        </Flex>
+          <InputNumber
+            style={{ width: "250px" }}
+            disabled={saving}
+            min={60}
+            step={30}
+            value={initialDelaySeconds}
+            onChange={(initialDelaySeconds) =>
+              setHealthCheck({
+                ...healthCheck,
+                initialDelaySeconds: initialDelaySeconds ?? undefined,
+              })
+            }
+            addonAfter="seconds initial delay"
+            placeholder="Initial delay..."
+          />
+        </Space>
         <Space style={{ width: "100%" }}>
           <div style={{ marginRight: "15px" }}>
             Action when health check fails:

src/packages/frontend/compute/idle-timeout.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useServer } from "./compute-server";
 import { TimeAgo } from "@cocalc/frontend/components/time-ago";
 import dayjs from "dayjs";
@@ -28,10 +28,6 @@ export function IdleTimeout({
   const [idleTimeoutMinutes, setIdleTimeoutMinutes] = useState<number | null>(
     server.configuration?.idleTimeoutMinutes ?? null,
   );
-  useEffect(() => {
-    setIdleTimeoutMinutes(server.configuration?.idleTimeoutMinutes ?? null);
-    setEnabled(!!server.configuration?.idleTimeoutMinutes);
-  }, [server.configuration?.idleTimeoutMinutes]);
 
   return (
     <AutomaticShutdownCard

src/packages/frontend/compute/log-entry.tsx

@@ -85,6 +85,14 @@ export default function LogEntry({
           {event.idle_timeout} {plural(event.idle_timeout, "minute")}) {tag}
         </>
       );
+
+    case "shutdown-time":
+      return (
+        <>
+          {cs} - Schedule Shutdown -- shutting down due to a prescheduled daily
+          shutdown time {tag}
+        </>
+      );
     case "spend-limit":
       return (
         <>

src/packages/frontend/compute/menu.tsx

@@ -97,7 +97,7 @@ function getItems({
     key: "automatic-shutdown",
     icon: <Icon name="stopwatch" />,
     disabled: server.cloud == "onprem",
-    label: "Automatic Shutdown",
+    label: "Automatic Shutdown & Health Check",
   };
   const jupyterlab = {
     key: "top-jupyterlab",
@@ -448,7 +448,6 @@ export default function Menu({
     return {
       items: getItems({ id, project_id, account_id, isAdmin }),
       onClick: async (obj) => {
-        console.log("obj = ", obj);
         setOpen(false);
         let cmd = obj.key.startsWith("top-") ? obj.key.slice(4) : obj.key;
         switch (cmd) {