Merge branch 'master' into fs2

Author: williamstein

src/packages/frontend/jupyter/browser-actions.ts

@@ -153,11 +153,7 @@ export class JupyterActions extends JupyterActions0 {
       }
     });
 
-    // Put an entry in the project log once the jupyter notebook gets opened.
-    // NOTE: Obviously, the project does NOT need to put entries in the log.
-    this.syncdb.once("change", () =>
-      this.redux?.getProjectActions(this.project_id).log_opened_time(this.path),
-    );
+    this.initOpenLog();
 
     // project doesn't care about cursors, but browser clients do:
     this.syncdb.on("cursor_activity", this.syncdb_cursor_activity);
@@ -176,6 +172,23 @@ export class JupyterActions extends JupyterActions0 {
     }
   }
 
+  initOpenLog = () => {
+    // Put an entry in the project log once the jupyter notebook gets opened and
+    // shows cells.
+    const reportOpened = () => {
+      if (this._state == "closed") {
+        return;
+      }
+      if (this.syncdb.get_one({ type: "cell" }) != null) {
+        this.redux
+          ?.getProjectActions(this.project_id)
+          .log_opened_time(this.path);
+        this.syncdb.removeListener("change", reportOpened);
+      }
+    };
+    this.syncdb.on("change", reportOpened);
+  };
+
   initUsageInfo = async () => {
     while (this._state != "closed") {
       try {

src/packages/server/conat/socketio/dns-scan-k8s-api.ts

@@ -1,87 +1,91 @@
-import * as fs from "fs";
+import { readFile } from "fs/promises";
 import * as https from "https";
 
 // Define the options interface for type safety
 interface ListPodsOptions {
   labelSelector?: string; // e.g. "app=foo,env=prod"
 }
 
-const NAMESPACE: string = fs
-  .readFileSync(
-    "/var/run/secrets/kubernetes.io/serviceaccount/namespace",
-    "utf8",
-  )
-  .trim();
-const CA: Buffer = fs.readFileSync(
-  "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
-);
+let NAMESPACE: string | null = null;
+let CA: Buffer | null = null;
 
 async function listPods(options: ListPodsOptions = {}): Promise<any> {
+  let token: string;
   try {
-    // Read service account details, token could be rotated
-    const token = fs
-      .readFileSync(
+    NAMESPACE =
+      NAMESPACE ??
+      (
+        await readFile(
+          "/var/run/secrets/kubernetes.io/serviceaccount/namespace",
+          "utf8",
+        )
+      ).trim();
+    CA =
+      CA ??
+      (await readFile("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"));
+
+    // Read service account details, token could be rotated, so read every time
+    token = (
+      await readFile(
         "/var/run/secrets/kubernetes.io/serviceaccount/token",
         "utf8",
       )
-      .trim();
+    ).trim();
+  } catch (err) {
+    throw new Error(`Failed to read service account files: ${err}`);
+  }
 
-    // Base API path
-    let path = `/api/v1/namespaces/${NAMESPACE}/pods`;
+  // Base API path
+  let path = `/api/v1/namespaces/${NAMESPACE}/pods`;
 
-    const queryParams: string[] = [];
-    if (options.labelSelector) {
-      queryParams.push(
-        `labelSelector=${encodeURIComponent(options.labelSelector)}`,
-      );
-    }
+  const queryParams: string[] = [];
+  if (options.labelSelector) {
+    queryParams.push(
+      `labelSelector=${encodeURIComponent(options.labelSelector)}`,
+    );
+  }
 
-    if (queryParams.length > 0) {
-      path += `?${queryParams.join("&")}`;
-    }
+  if (queryParams.length > 0) {
+    path += `?${queryParams.join("&")}`;
+  }
 
-    const query: https.RequestOptions = {
-      hostname: "kubernetes.default.svc",
-      path,
-      method: "GET",
-      headers: {
-        Authorization: `Bearer ${token}`,
-        Accept: "application/json",
-      },
-      ca: [CA],
-    };
+  const query: https.RequestOptions = {
+    hostname: "kubernetes.default.svc",
+    path,
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      Accept: "application/json",
+    },
+    ca: [CA],
+  };
 
-    return new Promise((resolve, reject) => {
-      const req = https.request(query, (res) => {
-        let data = "";
-        res.on("data", (chunk) => {
-          data += chunk;
-        });
-        res.on("end", () => {
-          if (res.statusCode !== 200) {
-            reject(
-              new Error(
-                `K8S API request failed. status=${res.statusCode}: ${data}`,
-              ),
-            );
-          } else {
-            try {
-              resolve(JSON.parse(data));
-            } catch (parseError) {
-              reject(parseError);
-            }
+  return new Promise((resolve, reject) => {
+    const req = https.request(query, (res) => {
+      let data = "";
+      res.on("data", (chunk) => {
+        data += chunk;
+      });
+      res.on("end", () => {
+        if (res.statusCode !== 200) {
+          reject(
+            new Error(
+              `K8S API request failed. status=${res.statusCode}: ${data}`,
+            ),
+          );
+        } else {
+          try {
+            resolve(JSON.parse(data));
+          } catch (parseError) {
+            reject(parseError);
           }
-        });
+        }
       });
-
-      req.on("error", (error) => reject(error));
-      req.end();
     });
-  } catch (error) {
-    throw new Error(
-      `Failed to read service account files: ${(error as Error).message}`,
-    );
-  }
+
+    req.on("error", (error) => reject(error));
+    req.end();
+  });
 }
 
 export async function getAddressesFromK8sApi(): Promise<

src/packages/server/projects/control/single-user.ts

@@ -14,21 +14,20 @@ This is useful for:
   - development of cocalc from inside of a CoCalc project
   - non-collaborative use of cocalc on your own
     laptop, e.g., when you're on an airplane.
-    
-    
+
+
 DEVELOPMENT:
 
 
 ~/cocalc/src/packages/server/projects/control$ COCALC_MODE='single-user' node
 Welcome to Node.js v20.19.1.
 Type ".help" for more information.
-> a = require('@cocalc/server/projects/control'); 
+> a = require('@cocalc/server/projects/control');
 > p = a.getProject('8a840733-93b6-415c-83d4-7e5712a6266b')
 > await p.start()
 */
 
-import { kill } from "process";
-
+import { kill } from "node:process";
 import getLogger from "@cocalc/backend/logger";
 import {
   BaseProject,
@@ -153,16 +152,26 @@ class Project extends BaseProject {
     try {
       this.stateChanging = { state: "stopping" };
       await this.saveStateToDatabase(this.stateChanging);
-      try {
-        const pid = await getProjectPID(this.HOME);
-        logger.debug(`stop: sending kill -${pid}`);
-        kill(-pid);
-      } catch (err) {
-        // expected exception if no pid
-        logger.debug(`stop: kill err ${err}`);
-      }
+      const pid = await getProjectPID(this.HOME);
+      const killProject = () => {
+        try {
+          logger.debug(`stop: sending kill -${pid}`);
+          kill(-pid, "SIGKILL");
+        } catch (err) {
+          // expected exception if no pid
+          logger.debug(`stop: kill err ${err}`);
+        }
+      };
+      killProject();
       await this.wait({
-        until: async () => !(await isProjectRunning(this.HOME)),
+        until: async () => {
+          if (await isProjectRunning(this.HOME)) {
+            killProject();
+            return false;
+          } else {
+            return true;
+          }
+        },
         maxTime: MAX_STOP_TIME_MS,
       });
       await deleteProjectSecretToken(this.project_id);

src/packages/sync/editor/generic/sync-doc.ts

@@ -1027,14 +1027,11 @@ export class SyncDoc extends EventEmitter {
     this.assert_table_is_ready("syncstring");
     this.dbg("set_initialized")({ error, read_only, size });
     const init = { time: this.client.server_time(), size, error };
-    for (let i = 0; i < 3; i++) {
-      await this.set_syncstring_table({
-        init,
-        read_only,
-        last_active: this.client.server_time(),
-      });
-      await delay(1000);
-    }
+    await this.set_syncstring_table({
+      init,
+      read_only,
+      last_active: this.client.server_time(),
+    });
   };
 
   /* List of logical timestamps of the versions of this string in the sync
@@ -1463,7 +1460,7 @@ export class SyncDoc extends EventEmitter {
     log("update interest");
     this.initInterestLoop();
 
-    log("ensure syncstring exists in database (if not using NATS)");
+    log("ensure syncstring exists");
     this.assert_not_closed("initAll -- before ensuring syncstring exists");
     await this.ensure_syncstring_exists_in_db();
 

src/packages/util/smc-version.js

@@ -1,2 +1,2 @@
 /* autogenerated by the update_version script */
-exports.version=1752418521;
+exports.version=1752527312;