@ohos-ports/nx 23.3.0-beta.2 → 24.0.2-beta.0

package/dist/src/daemon/server/server.js

@@ -155,7 +155,9 @@ async function handleMessage(socket, data) {
         await handleResult(socket, 'HASH_TASKS_UPFRONT', () => (0, handle_hash_tasks_1.handleHashTasksUpfront)(payload), mode);
     }
     else if (payload.type === 'PROCESS_IN_BACKGROUND') {
-        await handleResult(socket, 'PROCESS_IN_BACKGROUND', () => (0, handle_process_in_background_1.handleProcessInBackground)(payload), mode);
+        // The client names the module to run, so its failure says nothing about
+        // the daemon's health. Respond, but stay alive for other clients.
+        await handleResult(socket, 'PROCESS_IN_BACKGROUND', () => (0, handle_process_in_background_1.handleProcessInBackground)(payload), mode, shutdown_utils_1.respondWithError);
     }
     else if (payload.type === 'RECORD_OUTPUTS_HASH_BATCH') {
         await handleResult(socket, 'RECORD_OUTPUTS_HASH_BATCH', () => (0, handle_outputs_tracking_1.handleRecordOutputsHashBatch)(payload), mode);
@@ -168,6 +170,17 @@ async function handleMessage(socket, data) {
     }
     else if (payload.type === 'REGISTER_FILE_WATCHER') {
         file_watcher_sockets_1.registeredFileWatcherSockets.push({ socket, config: payload.config });
+        // A client must not announce readiness until this socket is subscribed.
+        // Older clients do not request an acknowledgement and expect only changes.
+        if (payload.registrationId) {
+            await handleResult(socket, 'REGISTER_FILE_WATCHER', async () => ({
+                description: 'File watcher registered',
+                response: {
+                    type: 'FILE_WATCHER_REGISTERED',
+                    registrationId: payload.registrationId,
+                },
+            }), mode);
+        }
     }
     else if ((0, register_project_graph_listener_1.isRegisterProjectGraphListenerMessage)(payload)) {
         project_graph_listener_sockets_1.registeredProjectGraphListenerSockets.push(socket);
@@ -218,7 +231,7 @@ async function handleMessage(socket, data) {
         await handleResult(socket, get_plugin_capabilities_1.GET_PLUGIN_CAPABILITIES, () => (0, handle_get_plugin_capabilities_1.handleGetPluginCapabilities)(), mode);
     }
     else if ((0, select_affected_tasks_1.isHandleSelectAffectedTasksMessage)(payload)) {
-        await handleResult(socket, select_affected_tasks_1.SELECT_AFFECTED_TASKS, () => (0, handle_select_affected_tasks_1.handleSelectAffectedTasks)(payload.request), mode);
+        await handleResult(socket, select_affected_tasks_1.SELECT_AFFECTED_TASKS, () => (0, handle_select_affected_tasks_1.handleSelectAffectedTasks)(payload.request, socket), mode);
     }
     else if ((0, update_workspace_context_1.isHandleUpdateWorkspaceContextMessage)(payload)) {
         await handleResult(socket, update_workspace_context_1.UPDATE_WORKSPACE_CONTEXT, () => (0, handle_update_workspace_context_1.handleUpdateWorkspaceContext)(payload.createdFiles, payload.updatedFiles, payload.deletedFiles), mode);
@@ -245,7 +258,7 @@ async function handleMessage(socket, data) {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${(0, consume_messages_from_socket_1.describeMessage)(unparsedPayload, { maxBytes: 200 })}`));
     }
 }
-async function handleResult(socket, type, hrFn, mode) {
+async function handleResult(socket, type, hrFn, mode, respondToError = shutdown_utils_1.respondWithErrorAndExit) {
     let hr;
     const startMark = new Date();
     try {
@@ -256,7 +269,7 @@ async function handleResult(socket, type, hrFn, mode) {
     }
     const doneHandlingMark = new Date();
     if (hr.error) {
-        await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, hr.description, hr.error);
+        await respondToError(socket, hr.description, hr.error);
     }
     else {
         logger_1.serverLogger.log(`Serializing response for ${type} message in ${mode} mode`);

package/dist/src/daemon/server/shutdown-utils.js

@@ -11,7 +11,6 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const logger_1 = require("../logger");
 const socket_utils_1 = require("../socket-utils");
 const cache_1 = require("../cache");
-const workspace_context_1 = require("../../utils/workspace-context");
 const error_types_1 = require("../../project-graph/error-types");
 const get_plugins_1 = require("../../project-graph/plugins/get-plugins");
 const consume_messages_from_socket_1 = require("../../utils/consume-messages-from-socket");
@@ -78,8 +77,6 @@ async function performShutdown(server, reason, sockets) {
                 socket.destroy();
             }
         });
-        (0, workspace_context_1.stopWatchingWorkspaceContext)();
-        logger_1.serverLogger.watcherLog(`Stopping the watch for ${workspace_root_1.workspaceRoot}`);
         (0, cache_1.deleteDaemonJsonProcessCache)();
         (0, get_plugins_1.cleanupPlugins)();
         // Clean up shared latest Nx installation

package/dist/src/daemon/server/start.d.ts

@@ -1 +1,2 @@
 import '../../utils/enable-compile-cache';
+import './native-js-loader';

package/dist/src/daemon/server/start.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 // Must be the first import — see enable-compile-cache.ts.
 require("../../utils/enable-compile-cache");
+// Captures Node's .js loader before user code can hook it, see native-js-loader.ts.
+require("./native-js-loader");
 const output_1 = require("../../utils/output");
 const server_1 = require("./server");
 const process = tslib_1.__importStar(require("process"));

package/dist/src/daemon/socket-utils.d.ts

@@ -1,15 +1,20 @@
 import type { Socket } from 'net';
 export declare const isWindows: boolean;
 /**
- * For IPC with the daemon server we use unix sockets or windows named pipes, depending on the user's operating system.
+ * For IPC with the daemon server we use unix sockets or windows named pipes,
+ * depending on the user's operating system.
  *
- * See https://nodejs.org/dist/latest-v14.x/docs/api/net.html#net_identifying_paths_for_ipc_connections for a full breakdown
- * of OS differences between Unix domain sockets and named pipes.
+ * The paths themselves — the directory, the file name, the named-pipe form, and
+ * the length budget — are all decided in `native/utils/socket_path.rs`, so that
+ * Nx and Nx Console cannot disagree about where a socket lives.
+ *
+ * See https://nodejs.org/dist/latest-v14.x/docs/api/net.html#net_identifying_paths_for_ipc_connections
+ * for a full breakdown of OS differences between Unix domain sockets and named
+ * pipes.
  */
 export declare const getFullOsSocketPath: () => string;
 export declare const getForkedProcessOsSocketPath: (id: string) => string;
 export declare const getPluginOsSocketPath: (id: string) => string;
-export declare function getPluginSocketFileName(id: string): string;
 export declare function killSocketOrPath(): void;
 export declare function serializeResult(error: Error | null, serializedProjectGraph: string | null, serializedSourceMaps: string | null): string | null;
 /**
@@ -26,12 +31,9 @@ export declare function serializeWithFallback(data: any, preferred: 'v8' | 'json
  * Serialize data for IPC using the format the user configured.
  *
  * @param data Data to serialize
- * @param force Use this format without falling back. For callers whose data is
- *              known to be unrepresentable in the other format, where a fallback
- *              would only swap one failure for a less obvious one.
  * @returns Serialized data as bytes ready to be framed onto a socket
  */
-export declare function serialize(data: any, force?: 'v8' | 'json'): Buffer;
+export declare function serialize(data: any): Buffer;
 /**
  * Serialize `data` and write it as one framed message.
  *
@@ -40,4 +42,4 @@ export declare function serialize(data: any, force?: 'v8' | 'json'): Buffer;
  * already hold bytes, and having it reach back into the daemon's serializer
  * would invert the dependency.
  */
-export declare function sendMessage(socket: Socket, data: any, force?: 'v8' | 'json', callback?: (err?: Error) => void): void;
+export declare function sendMessage(socket: Socket, data: any, callback?: (err?: Error) => void): void;

package/dist/src/daemon/socket-utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPluginOsSocketPath = exports.getForkedProcessOsSocketPath = exports.getFullOsSocketPath = exports.isWindows = void 0;
-exports.getPluginSocketFileName = getPluginSocketFileName;
 exports.killSocketOrPath = killSocketOrPath;
 exports.serializeResult = serializeResult;
 exports.serializeWithFallback = serializeWithFallback;
@@ -9,7 +8,6 @@ exports.serialize = serialize;
 exports.sendMessage = sendMessage;
 const fs_1 = require("fs");
 const os_1 = require("os");
-const path_1 = require("path");
 const tmp_dir_1 = require("./tmp-dir");
 const serializable_error_1 = require("../utils/serializable-error");
 const is_v8_serializer_enabled_1 = require("./is-v8-serializer-enabled");
@@ -17,58 +15,23 @@ const v8_1 = require("v8");
 const consume_messages_from_socket_1 = require("../utils/consume-messages-from-socket");
 exports.isWindows = (0, os_1.platform)() === 'win32';
 /**
- * For IPC with the daemon server we use unix sockets or windows named pipes, depending on the user's operating system.
+ * For IPC with the daemon server we use unix sockets or windows named pipes,
+ * depending on the user's operating system.
  *
- * See https://nodejs.org/dist/latest-v14.x/docs/api/net.html#net_identifying_paths_for_ipc_connections for a full breakdown
- * of OS differences between Unix domain sockets and named pipes.
+ * The paths themselves — the directory, the file name, the named-pipe form, and
+ * the length budget — are all decided in `native/utils/socket_path.rs`, so that
+ * Nx and Nx Console cannot disagree about where a socket lives.
+ *
+ * See https://nodejs.org/dist/latest-v14.x/docs/api/net.html#net_identifying_paths_for_ipc_connections
+ * for a full breakdown of OS differences between Unix domain sockets and named
+ * pipes.
  */
-const getFullOsSocketPath = () => {
-    const path = (0, path_1.resolve)((0, tmp_dir_1.getDaemonSocketDir)());
-    assertValidSocketPath(path);
-    return exports.isWindows ? '\\\\.\\pipe\\nx\\' + path : path;
-};
+const getFullOsSocketPath = () => (0, tmp_dir_1.getDaemonSocketPath)();
 exports.getFullOsSocketPath = getFullOsSocketPath;
-const getForkedProcessOsSocketPath = (id) => {
-    let path = (0, path_1.resolve)((0, path_1.join)((0, tmp_dir_1.getSocketDir)(), 'fp' + id + '.sock'));
-    assertValidSocketPath(path);
-    return exports.isWindows ? '\\\\.\\pipe\\nx\\' + path : path;
-};
+const getForkedProcessOsSocketPath = (id) => (0, tmp_dir_1.getForkedProcessSocketPath)(id);
 exports.getForkedProcessOsSocketPath = getForkedProcessOsSocketPath;
-const getPluginOsSocketPath = (id) => {
-    let path = (0, path_1.resolve)((0, path_1.join)((0, tmp_dir_1.getPluginSocketDir)(), getPluginSocketFileName(id)));
-    assertValidSocketPath(path);
-    return exports.isWindows ? '\\\\.\\pipe\\nx\\' + path : path;
-};
+const getPluginOsSocketPath = (id) => (0, tmp_dir_1.getPluginSocketPath)(id);
 exports.getPluginOsSocketPath = getPluginOsSocketPath;
-function getPluginSocketFileName(id) {
-    return `p${id}.sock`;
-}
-function assertValidSocketPath(path) {
-    if (path.length > 95) {
-        const fallbackCause = (0, tmp_dir_1.getSocketDirFallbackCause)();
-        const refusedConfiguredSocketDir = (0, tmp_dir_1.getRefusedConfiguredSocketDir)();
-        throw new Error([
-            'Attempted to open socket that exceeds the maximum socket length.',
-            ...(fallbackCause === undefined
-                ? []
-                : [
-                    `Nx fell back to ${(0, path_1.dirname)(path)} because the default socket directory could not be used.`,
-                    'Run the command with --verbose to see why the default directory was rejected.',
-                ]),
-            '',
-            ...(refusedConfiguredSocketDir === undefined
-                ? [
-                    `Set NX_SOCKET_DIR to a shorter path (e.g. ${exports.isWindows ? '%TMP%/nx-tmp' : '/tmp/nx-tmp'}) to avoid this issue.`,
-                ]
-                : [
-                    // Saying "set a shorter path" here would be advice they already
-                    // followed: they set one, and it was refused for another reason.
-                    `The directory set in NX_SOCKET_DIR (${refusedConfiguredSocketDir}) could not be used — see the warning above — so Nx fell back to a longer path.`,
-                    'Point NX_SOCKET_DIR at a short directory your user owns.',
-                ]),
-        ].join('\n'), fallbackCause === undefined ? undefined : { cause: fallbackCause });
-    }
-}
 function killSocketOrPath() {
     try {
         (0, fs_1.unlinkSync)((0, exports.getFullOsSocketPath)());
@@ -80,6 +43,9 @@ function serializeResult(error, serializedProjectGraph, serializedSourceMaps) {
     // We do not want to repeat work `JSON.stringify`ing an object containing the potentially large project graph so merge as strings
     return `{ "error": ${JSON.stringify(error ? (0, serializable_error_1.createSerializableError)(error) : error)}, "projectGraph": ${serializedProjectGraph}, "sourceMaps": ${serializedSourceMaps} }`;
 }
+function stackOf(e) {
+    return e instanceof Error ? (e.stack ?? String(e)) : String(e);
+}
 function serializeAs(data, format) {
     return format === 'v8'
         ? (0, v8_1.serialize)(data)
@@ -98,25 +64,29 @@ function serializeWithFallback(data, preferred) {
     try {
         return serializeAs(data, preferred);
     }
-    catch (e) {
+    catch (preferredError) {
         const fallback = preferred === 'v8' ? 'json' : 'v8';
-        console.warn(`Data could not be serialized using ${preferred} serialization: ${e}. Falling back to ${fallback} serialization.`);
-        return serializeAs(data, fallback);
+        console.warn(`Data could not be serialized using ${preferred} serialization: ${preferredError}. Falling back to ${fallback} serialization.`);
+        try {
+            return serializeAs(data, fallback);
+        }
+        catch (fallbackError) {
+            throw new Error([
+                `Data could not be serialized using either ${preferred} or ${fallback} serialization.`,
+                `${preferred} failed with: ${stackOf(preferredError)}`,
+                `${fallback} failed with: ${stackOf(fallbackError)}`,
+            ].join('\n\n'), { cause: fallbackError });
+        }
     }
 }
 /**
  * Serialize data for IPC using the format the user configured.
  *
  * @param data Data to serialize
- * @param force Use this format without falling back. For callers whose data is
- *              known to be unrepresentable in the other format, where a fallback
- *              would only swap one failure for a less obvious one.
  * @returns Serialized data as bytes ready to be framed onto a socket
  */
-function serialize(data, force) {
-    return force
-        ? serializeAs(data, force)
-        : serializeWithFallback(data, (0, is_v8_serializer_enabled_1.isV8SerializerEnabled)() ? 'v8' : 'json');
+function serialize(data) {
+    return serializeWithFallback(data, (0, is_v8_serializer_enabled_1.isV8SerializerEnabled)() ? 'v8' : 'json');
 }
 /**
  * Serialize `data` and write it as one framed message.
@@ -126,6 +96,6 @@ function serialize(data, force) {
  * already hold bytes, and having it reach back into the daemon's serializer
  * would invert the dependency.
  */
-function sendMessage(socket, data, force, callback) {
-    (0, consume_messages_from_socket_1.writeMessage)(socket, serialize(data, force), callback);
+function sendMessage(socket, data, callback) {
+    (0, consume_messages_from_socket_1.writeMessage)(socket, serialize(data), callback);
 }

package/dist/src/daemon/tmp-dir.d.ts

@@ -24,7 +24,6 @@ export declare class InvalidSocketDirConfigured extends Error {
 }
 export declare const DAEMON_DIR_FOR_CURRENT_WORKSPACE: string;
 export declare const DAEMON_OUTPUT_LOG_FILE: string;
-export declare const getDaemonSocketDir: () => string;
 export declare function writeDaemonLogs(error?: string): string;
 export declare function markDaemonAsDisabled(reason: string): void;
 /**
@@ -38,25 +37,31 @@ export declare function markDaemonAsDisabled(reason: string): void;
  */
 export declare function disableDaemonForThisProcess(reason: string): void;
 export declare function isDaemonDisabled(): boolean;
-export declare function getSocketDir(): string;
-/**
- * Plugin worker sockets get their own workspace-scoped directory rather than
- * sitting in the shared system temp dir, which cannot be locked down.
- */
-export declare function getPluginSocketDir(): string;
 /**
  * Exported for tests: both fallback warnings fire once per process, so a suite
  * that stages either fallback more than once has to clear the latches between
  * cases.
  */
 export declare function resetSocketDirWarningsForTesting(): void;
-export declare function getSocketDirFallbackCause(): unknown;
+/** The daemon's own socket. */
+export declare function getDaemonSocketPath(): string;
+/** A forked task process's socket, in the daemon's per-run directory. */
+export declare function getForkedProcessSocketPath(id: string): string;
+/**
+ * Plugin worker sockets get their own workspace-scoped directory rather than
+ * sitting in the shared system temp dir, which cannot be locked down.
+ */
+export declare function getPluginSocketPath(id: string): string;
 /**
- * The NX_SOCKET_DIR that was refused, if that is why we are in the fallback.
- * Reflects the most recent resolution only — both accessors are cleared at the
- * top of every `createOwnerOnlySocketDir` call, and the daemon and plugin socket
- * paths each drive one. Read it immediately after the call that produced the
- * path, which is what `assertValidSocketPath` does.
+ * Where the Nx Console socket lives, for whoever binds or connects to it.
+ *
+ * Nx Console is the server here and Nx the client, so the extension listens
+ * where this says and Nx dials it.
+ *
+ * @param workspaceRootOverride the workspace to resolve for, when the caller is
+ * not itself running inside it (Nx Console runs in the editor's extension host)
+ * @param env the environment to read `NX_SOCKET_DIR` from, for callers that
+ * load a workspace `.env` into a copy rather than into `process.env`
  */
-export declare function getRefusedConfiguredSocketDir(): string | undefined;
+export declare function getNxConsoleSocketPath(workspaceRootOverride?: string, env?: Record<string, string>): string;
 export declare function removeSocketDir(): void;