Merge branch 'master' into conat-supercluster

Author: williamstein

src/packages/database/postgres/changefeed-query.ts

@@ -12,7 +12,7 @@ both all changefeeds and a small interval of time.
 const THROTTLE: boolean = true;
 
 // 10ms when running unit tests, still throttle, but make it quick.
-// Otherwise, we default to 250ms, which is enough to be massively
+// Otherwise, we default to 500ms, which is enough to be massively
 // useful, but also not noticed by user.
 let THROTTLE_MS: number = process.env.SMC_TEST ? 10 : 500;
 

src/packages/frontend/conat/client.ts

@@ -303,7 +303,6 @@ export class ConatClient extends EventEmitter {
     args: any[];
     timeout?: number;
   }) => {
-    console.log("callHub", { name, args, timeout });
     const cn = this.conat();
     const subject = `hub.account.${this.client.account_id}.${service}`;
     try {

src/packages/next/next.config.js

@@ -5,7 +5,6 @@ const BASE_PATH = process.env.BASE_PATH ?? "/";
 const basePath = BASE_PATH == "/" ? "" : BASE_PATH;
 
 const { join, resolve } = require("path");
-const withRspack = require("next-rspack");
 
 // Important!  We include resolve('.') and basePath to avoid
 // any possibility of multiple cocalc installs or different base
@@ -16,73 +15,41 @@ const cacheDirectory = join(
   resolve("."),
 );
 
-const removeImports = require("next-remove-imports")();
+const config = {
+  basePath,
+  env: { BASE_PATH },
+  eslint: { ignoreDuringBuilds: true },
+  webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
+    // Webpack breaks without this pg-native alias, even though it's dead code,
+    // due to how the pg module does package detection internally.
+    config.resolve.alias["pg-native"] = ".";
+    // These aliases are so we don't end up with two distinct copies
+    // of React in our application, since this doesn't work at all!
+    config.resolve.alias["react"] = resolve(__dirname, "node_modules", "react");
+    config.resolve.alias["react-dom"] = resolve(
+      __dirname,
+      "node_modules",
+      "react-dom",
+    );
+    // Important: return the modified config
+    return config;
+  },
+  // For i18n, see https://nextjs.org/docs/advanced-features/i18n-routing
+  // We are doing this at all since it improves our Lighthouse accessibility score.
+  i18n: {
+    locales: ["en-US"],
+    defaultLocale: "en-US",
+  },
+  poweredByHeader: false,
+};
 
-module.exports = withRspack(
-  removeImports({
-    basePath,
-    swcMinify: true, //  enable faster RUST-based minifier
-    env: { BASE_PATH },
-    reactStrictMode: false, // See https://github.com/ant-design/ant-design/issues/26136
-    eslint: { ignoreDuringBuilds: true },
-    // typescript: { ignoreBuildErrors: true },
-    webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
-      config.cache = {
-        type: "filesystem",
-        buildDependencies: {
-          config: [__filename],
-        },
-        cacheDirectory,
-      };
-      // Webpack breaks without this pg-native alias, even though it's dead code,
-      // due to how the pg module does package detection internally.
-      config.resolve.alias["pg-native"] = ".";
-      // These aliases are so we don't end up with two distinct copies
-      // of React in our application, since this doesn't work at all!
-      config.resolve.alias["react"] = resolve(
-        __dirname,
-        "node_modules",
-        "react",
-      );
-      config.resolve.alias["react-dom"] = resolve(
-        __dirname,
-        "node_modules",
-        "react-dom",
-      );
-      config.ignoreWarnings = [
-        // This yargs warning is caused by node-zendesk in the @cocalc/server package
-        // being a generally bad citizen.  Things seem to work fine (we barely use the
-        // zendesk api anyways).
-        { module: /^\.\.\/server\/node_modules\/yargs.*/ },
-      ];
+const withRspack = require("next-rspack");
+// use NO_RSPACK to build without RSPACK.  This is useful on a machine with a lot
+// of RAM (and patience) since it supports hot module reloading (so you don't have
+// to refresh after making changes).
 
-      // Important: return the modified config
-      return config;
-    },
-    experimental: {
-      // This is because the debug module color support would otherwise log this warning constantly:
-      // Module not found: ESM packages (supports-color) need to be imported. Use 'import' to
-      // reference the package instead. https://nextjs.org/docs/messages/import-esm-externals
-      // esmExternals: "loose", // not supported by turbopack
-      // We raise largePageDataBytes since this was recently added, and breaks a lot of SSR rendering
-      // for cocalc share server.  By default this is 128 * 1000 = "128KB", and we are changing it to
-      // 128 * 1000 * 15 = "1MB" for now.  TODO: Obviously, it would be nice to fix the root causes of this
-      // being too big, but that's for another day, since our production website is broken right now.
-      largePageDataBytes: 128 * 1000 * 10,
-      // If you click the back button in the browser, it should go back to the previous page and restore the scroll position.
-      // With Next.js in the loop, this doesn't happen by default.
-      // besides the ticket about this, here is a blogpost about this
-      // https://www.joshwcomeau.com/react/nextjs-scroll-restoration/
-      scrollRestoration: true,
-      // https://nextjs.org/docs/app/building-your-application/optimizing/memory-usage#webpack-build-worker
-      webpackBuildWorker: true,
-    },
-    // For i18n, see https://nextjs.org/docs/advanced-features/i18n-routing
-    // We are doing this at all since it improves our Lighthouse accessibility score.
-    i18n: {
-      locales: ["en-US"],
-      defaultLocale: "en-US",
-    },
-    poweredByHeader: false, // https://github.com/sagemathinc/cocalc/issues/6101
-  }),
-);
+if (process.env.NO_RSPACK) {
+  module.exports = config;
+} else {
+  module.exports = withRspack(config);
+}

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

@@ -1460,8 +1460,8 @@ export class SyncDoc extends EventEmitter {
     this.assert_not_closed("initAll -- before ensuring syncstring exists");
     await this.ensure_syncstring_exists_in_db();
 
-    await this.init_syncstring_table(),
-      this.assert_not_closed("initAll -- successful init_syncstring_table");
+    await this.init_syncstring_table();
+    this.assert_not_closed("initAll -- successful init_syncstring_table");
 
     log("patch_list, cursors, evaluator, ipywidgets");
     this.assert_not_closed(
@@ -1504,7 +1504,7 @@ export class SyncDoc extends EventEmitter {
       // this will finish.
       //       if (!this.client.is_browser() && !this.client.is_project()) {
       //         // FAKE DELAY!!!  Just to simulate flakiness / slow network!!!!
-      //         await delay(10000);
+      // await delay(3000);
       //       }
       await retry_until_success({
         f: this.init_load_from_disk,
@@ -1563,22 +1563,28 @@ export class SyncDoc extends EventEmitter {
       }
     }
 
+    let init;
     const is_init = (t: SyncTable) => {
       this.assert_not_closed("is_init");
       const tbl = t.get_one();
       if (tbl == null) {
         dbg("null");
         return false;
       }
-      return tbl.get("init") != null;
+      init = tbl.get("init")?.toJS();
+      return init != null;
     };
     dbg("waiting for init...");
-    const init = await this.syncstring_table.wait(is_init, 0);
+    await this.syncstring_table.wait(is_init, 0);
     dbg("init done");
     if (init.error) {
       throw Error(init.error);
     }
     assertDefined(this.patch_list);
+    if (init.size == null) {
+      // don't crash but warn at least.  
+      console.warn("SYNC BUG -- init.size must be defined", { init });
+    }
     if (
       !this.client.is_project() &&
       this.patch_list.count() === 0 &&
@@ -2937,8 +2943,8 @@ export class SyncDoc extends EventEmitter {
       size = data.length;
       dbg(`got it -- length=${size}`);
       this.from_str(data);
-      // we also know that this is the version on disk, so we update the hash
       this.commit();
+      // we also know that this is the version on disk, so we update the hash
       await this.set_save({
         state: "done",
         error: "",

src/packages/util/smc-version.js

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