Merge remote-tracking branch 'origin/master' into chat-threads-smaller

Author: haraldschilly

src/packages/database/settings/auth-sso-types.ts

@@ -80,7 +80,9 @@ export type PassportLoginInfo = { [key in LoginInfoKeys]?: string };
  * The remaining fields, except for type, clientID, clientSecret, and callbackURL, userinfoURL, login_info are passed to that constructor.
  * Additionally, there are default values for some of the fields, e.g. for the SAML2.0 strategy.
  * Please check the hub/auth.ts file for more details.
+ *
  * Regarding the userinfoURL, this is used by OAuth2 to get the profile.
+ *
  * The "login_info" field is a mapping from "cocalc" profile fields, that end up in the DB,
  * to the entries in the generated profile object. The DB entry can only be a string and
  * processing is done by using the "dot-object" npm library.
@@ -91,6 +93,7 @@ export type PassportLoginInfo = { [key in LoginInfoKeys]?: string };
  *   last_name: "name.familyName",
  *   emails: "emails[0].value",
  * }
+ * You can to customize the separator of dot-object, e.g. to process keys with dots, add a "_sep: string" entry.
  */
 export interface PassportStrategyDBConfig {
   type: PassportTypes;

src/packages/frontend/jupyter/cell-input.tsx

@@ -153,7 +153,9 @@ export const CellInput: React.FC<CellInputProps> = React.memo(
       return (
         <CodeMirror
           actions={
-            props.input_is_readonly ? undefined : props.actions
+            props.is_readonly || props.input_is_readonly
+              ? undefined
+              : props.actions
             /* Do NOT pass in actions when read only, since having any actions *defines*
             not read only for the codemirror editor; also, it will get created with
             potentially the same id as a normal cell, hence get linked to it, and

src/packages/frontend/project_actions.ts

@@ -3581,7 +3581,10 @@ export class ProjectActions extends Actions<ProjectStoreState> {
     return this.computeServerManager?.get(canonicalPath(path));
   };
 
-  // in case of confirmation, returns true on success or false if user says "no"
+  // In case of confirmation, returns true on success or false if user says "no"
+  // Also, no matter what, we NEVER explicitly request confirmation if the
+  // file doesn't involve backend state that could be reset, e.g., we basically
+  // only confirm for terminals and jupyter notebooks.
   setComputeServerIdForFile = async ({
     path,
     compute_server_id,
@@ -3591,6 +3594,13 @@ export class ProjectActions extends Actions<ProjectStoreState> {
     compute_server_id?: number;
     confirm?: boolean;
   }): Promise<boolean> => {
+    if (confirm) {
+      if (!path.endsWith(".term") && !path.endsWith(".ipynb")) {
+        // ONLY confirm when there is some danger is loss of state.  Otherwise,
+        // this is very annoying.
+        confirm = false;
+      }
+    }
     const selectedComputeServerId = this.getComputeServerId(compute_server_id);
     const computeServerAssociations =
       webapp_client.project_client.computeServers(this.project_id);

src/packages/hub/package.json

@@ -40,6 +40,7 @@
     "express": "^4.21.2",
     "formidable": "^3.5.4",
     "http-proxy": "^1.18.1",
+    "http-proxy-3": "^1.19.3",
     "immutable": "^4.3.0",
     "jquery": "^3.6.0",
     "json-stable-stringify": "^1.0.1",

src/packages/hub/proxy/handle-upgrade.ts

@@ -109,6 +109,7 @@ export default function init(
     proxy.on("error", (err) => {
       logger.debug(`websocket proxy error, so clearing cache -- ${err}`);
       cache.delete(target);
+      proxy.close();
     });
     proxy.on("close", () => {
       dbg("websocket proxy closed, so removing from cache");

src/packages/hub/proxy/target.ts

@@ -28,7 +28,14 @@ const logger = getLogger("proxy:target");
 // Also, if the project stops and starts, the host=ip address could
 // change, so we need to timeout so we see that thange.
 
-const cache = new LRU({ max: 20000, ttl: 1000 * 30 });
+const cache = new LRU<
+  string,
+  {
+    host: string;
+    port: number;
+    internal_url: string | undefined;
+  }
+>({ max: 20000, ttl: 1000 * 30 });
 
 // This gets explicitly called from outside when certain errors occur.
 export function invalidateTargetCache(remember_me: string, url: string): void {

src/packages/hub/servers/nats.ts

@@ -38,6 +38,10 @@ export async function proxyNatsWebsocket(req, socket, head) {
     timeout: 5000,
   });
   proxy.ws(req, socket, head);
+  proxy.on("error", (err) => {
+    logger.debug(`nats websocket proxy error, so closing -- ${err}`);
+    proxy.close();
+  });
 
   while (socket.readyState !== socket.CLOSED) {
     if (versionCheckFails(req)) {

src/packages/jupyter/kernel/kernel.ts

@@ -218,14 +218,6 @@ nodeCleanup(() => {
   }
 });
 
-// TODO: are these the only base64 encoded types that jupyter kernels return?
-export const BASE64_TYPES = [
-  "image/png",
-  "image/jpeg",
-  "application/pdf",
-  "base64",
-] as const;
-
 // NOTE: keep JupyterKernel implementation private -- use the kernel function
 // above, and the interface defined in types.
 class JupyterKernel extends EventEmitter implements JupyterKernelInterface {
@@ -760,15 +752,14 @@ class JupyterKernel extends EventEmitter implements JupyterKernelInterface {
     return await new CodeExecutionEmitter(this, opts).go();
   };
 
-  private saveBlob = (data: string, type?: string) => {
+  private saveBlob = (data: string, type: string) => {
     const blobs = this._actions?.blobs;
     if (blobs == null) {
       throw Error("blob store not available");
     }
-    const buf: Buffer =
-      type && BASE64_TYPES.includes(type as any)
-        ? Buffer.from(data, "base64")
-        : Buffer.from(data);
+    const buf: Buffer = !type.startsWith("text/")
+      ? Buffer.from(data, "base64")
+      : Buffer.from(data);
 
     const sha1: string = misc_node_sha1(buf);
     blobs.set(sha1, buf);

src/packages/nats/time.ts

@@ -61,7 +61,7 @@ const INTERVAL_BAD = 5 * 1000;
 // If clock fails to sync this many times in a row, we reconnect to nats.
 const MAX_FAILS = 3;
 
-const RECONNECT_LOGIC = true;
+const RECONNECT_LOGIC = false;
 
 export function init() {
   syncLoop();