statelyai 0.8.2 → 0.8.4

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { S as run } from "./cli-Dc8HDZ6q.mjs";
+import { S as run } from "./cli-Dx1dw7Cy.mjs";
 
 //#region src/bin.ts
 run();

package/dist/{cli-Dc8HDZ6q.mjs → cli-Dx1dw7Cy.mjs}

@@ -10,6 +10,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { promisify } from "node:util";
 import { Args, Command, Flags, flush, handle, run } from "@oclif/core";
 import * as http from "node:http";
+import { WebSocket, WebSocketServer } from "ws";
 import os from "node:os";
 import { StudioApiError, buildAuthorizeUrl, createPkcePair, createStatelyClient, discoverAuthorizationServer, discoverProtectedResource, exchangeCodeForToken, findStatelyPragmaAttachments, getStatelyPragma, refreshToken, registerOAuthClient } from "@statelyai/sdk";
 import { planSync, pullSync, pushLocalMachineLinks } from "@statelyai/sdk/sync";
@@ -19,68 +20,36 @@ const DEFAULT_SYNC_MAX_FILES = 150;
 const DEFAULT_SYNC_MAX_BYTES = 2e6;
 const supportedDocumentPattern = /\.(?:c|m)?(?:jsx?|tsx?)$|\.jsonc?$|\.ya?ml$|\.mmd$|\.mermaid$/i;
 var WebSocketClient = class {
-	buffer = Buffer.alloc(0);
 	listeners = /* @__PURE__ */ new Set();
 	constructor(socket) {
 		this.socket = socket;
-		socket.on("data", (chunk) => {
-			const nextChunk = typeof chunk === "string" ? Buffer.from(chunk) : chunk;
-			this.buffer = Buffer.concat([this.buffer, nextChunk]);
-			this.readFrames();
+		socket.on("message", (data, isBinary) => {
+			if (isBinary) return;
+			let message;
+			try {
+				message = JSON.parse(rawDataToBuffer(data).toString("utf8"));
+			} catch {
+				socket.close(1007, "Invalid JSON payload");
+				return;
+			}
+			for (const listener of this.listeners) listener(message);
 		});
 	}
 	onMessage(listener) {
 		this.listeners.add(listener);
 	}
 	send(message) {
-		this.socket.write(encodeWebSocketFrame(JSON.stringify(message)));
+		if (this.socket.readyState === WebSocket.OPEN) this.socket.send(JSON.stringify(message));
 	}
 	close() {
-		this.socket.end();
-	}
-	readFrames() {
-		while (this.buffer.length >= 2) {
-			const first = this.buffer[0];
-			const second = this.buffer[1];
-			const opcode = first & 15;
-			const masked = (second & 128) !== 0;
-			let length = second & 127;
-			let offset = 2;
-			if (length === 126) {
-				if (this.buffer.length < offset + 2) return;
-				length = this.buffer.readUInt16BE(offset);
-				offset += 2;
-			} else if (length === 127) {
-				if (this.buffer.length < offset + 8) return;
-				const bigLength = this.buffer.readBigUInt64BE(offset);
-				if (bigLength > BigInt(Number.MAX_SAFE_INTEGER)) {
-					this.socket.destroy(/* @__PURE__ */ new Error("WebSocket frame is too large."));
-					return;
-				}
-				length = Number(bigLength);
-				offset += 8;
-			}
-			const maskLength = masked ? 4 : 0;
-			if (this.buffer.length < offset + maskLength + length) return;
-			const mask = masked ? this.buffer.subarray(offset, offset + 4) : void 0;
-			offset += maskLength;
-			const payload = Buffer.from(this.buffer.subarray(offset, offset + length));
-			this.buffer = this.buffer.subarray(offset + length);
-			if (mask) for (let index = 0; index < payload.length; index++) payload[index] = payload[index] ^ mask[index % 4];
-			if (opcode === 8) {
-				this.close();
-				return;
-			}
-			if (opcode === 9) {
-				this.socket.write(encodeWebSocketFrame(payload, 10));
-				continue;
-			}
-			if (opcode !== 1) continue;
-			const message = JSON.parse(payload.toString("utf8"));
-			for (const listener of this.listeners) listener(message);
-		}
+		if (this.socket.readyState === WebSocket.OPEN || this.socket.readyState === WebSocket.CONNECTING) this.socket.close();
 	}
 };
+function rawDataToBuffer(data) {
+	if (Array.isArray(data)) return Buffer.concat(data);
+	if (data instanceof ArrayBuffer) return Buffer.from(data);
+	return Buffer.from(data);
+}
 var RemoteEditorSession = class {
 	currentGraph;
 	lastPersistedGraph;
@@ -382,35 +351,25 @@ async function openEditor(options) {
 		response.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
 		response.end(getCliWebviewContent({ editorUrl: options.editorUrl }));
 	});
-	server.on("upgrade", (request, socket) => {
+	const webSocketServer = new WebSocketServer({ noServer: true });
+	server.on("upgrade", (request, socket, head) => {
 		if (request.url !== "/ws") {
 			socket.end("HTTP/1.1 404 Not Found\r\n\r\n");
 			return;
 		}
-		const key = request.headers["sec-websocket-key"];
-		if (typeof key !== "string") {
-			socket.end("HTTP/1.1 400 Bad Request\r\n\r\n");
-			return;
-		}
-		const accept = crypto.createHash("sha1").update(`${key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11`).digest("base64");
-		socket.write([
-			"HTTP/1.1 101 Switching Protocols",
-			"Upgrade: websocket",
-			"Connection: Upgrade",
-			`Sec-WebSocket-Accept: ${accept}`,
-			"\r\n"
-		].join("\r\n"));
-		activeClient?.close();
-		session?.dispose();
-		activeClient = new WebSocketClient(socket);
-		session = new RemoteEditorSession({
-			...options,
-			fileName,
-			rootUri,
-			rootDir
-		}, (message) => activeClient?.send(message));
-		activeClient.onMessage((message) => {
-			session?.receiveMessage(message);
+		webSocketServer.handleUpgrade(request, socket, head, (webSocket) => {
+			activeClient?.close();
+			session?.dispose();
+			activeClient = new WebSocketClient(webSocket);
+			session = new RemoteEditorSession({
+				...options,
+				fileName,
+				rootUri,
+				rootDir
+			}, (message) => activeClient?.send(message));
+			activeClient.onMessage((message) => {
+				session?.receiveMessage(message);
+			});
 		});
 	});
 	await listen(server, options.port, options.host);
@@ -423,6 +382,7 @@ async function openEditor(options) {
 	const shutdown = () => {
 		session?.dispose();
 		activeClient?.close();
+		webSocketServer.close();
 		server.close();
 	};
 	process.once("SIGINT", () => {
@@ -589,25 +549,6 @@ function getCliWebviewContent(options) {
 </body>
 </html>`;
 }
-function encodeWebSocketFrame(payload, opcode = 1) {
-	const data = typeof payload === "string" ? Buffer.from(payload) : payload;
-	const headerLength = data.length < 126 ? 2 : data.length <= 65535 ? 4 : 10;
-	const frame = Buffer.alloc(headerLength + data.length);
-	frame[0] = 128 | opcode;
-	if (data.length < 126) {
-		frame[1] = data.length;
-		data.copy(frame, 2);
-	} else if (data.length <= 65535) {
-		frame[1] = 126;
-		frame.writeUInt16BE(data.length, 2);
-		data.copy(frame, 4);
-	} else {
-		frame[1] = 127;
-		frame.writeBigUInt64BE(BigInt(data.length), 2);
-		data.copy(frame, 10);
-	}
-	return frame;
-}
 function listen(server, port, host) {
 	return new Promise((resolve) => {
 		server.listen(port, host, resolve);

package/dist/index.d.mts

@@ -397,6 +397,6 @@ declare const COMMANDS: {
   logout: typeof LogoutCommand;
   whoami: typeof WhoamiCommand;
 };
-declare function run(argv?: any, entryUrl?: string): Promise<void>;
+declare function run(argv?: string[], entryUrl?: string): Promise<void>;
 //#endregion
 export { ApiKeyResolution, COMMANDS, CredentialStatus, DiscoveredMachine, InitProjectOptions, InitProjectResult, LinkedPullTarget, OAuthLoginDiscovery, ProjectMachineStatus, ProjectStatusMachine, ProjectStatusResult, PushCandidateClassification, RemoteProjectMachineTarget, ResolveApiKeyOptions, ResolvedConfiguredPullTargets, ScanProjectSourcesOptions, buildOAuthLoginStart, classifyPushCandidates, createStatelyProjectConfig, discoverLinkedPullTargets, discoverMachinesInSource, discoverOAuthLogin, discoverRemoteProjectMachineTargets, formatDiscoveredMachines, formatMissingNewMachineDirMessage, formatPlanSummary, formatProjectStatus, formatStoredCredentialSource, getEnvApiKey, getEnvCredential, inferInitProjectName, initProject, isFileGitDirty, resolveApiKey, resolveConfiguredPullTargets, resolveCredentialStatus, resolveProjectStatus, run, scanProjectMachines, scanProjectSources };

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { C as scanProjectMachines, S as run, T as createStatelyProjectConfig, _ as isFileGitDirty, a as discoverMachinesInSource, b as resolveCredentialStatus, c as formatDiscoveredMachines, d as formatProjectStatus, f as formatStoredCredentialSource, g as initProject, h as inferInitProjectName, i as discoverLinkedPullTargets, l as formatMissingNewMachineDirMessage, m as getEnvCredential, n as buildOAuthLoginStart, o as discoverOAuthLogin, p as getEnvApiKey, r as classifyPushCandidates, s as discoverRemoteProjectMachineTargets, t as COMMANDS, u as formatPlanSummary, v as resolveApiKey, w as scanProjectSources, x as resolveProjectStatus, y as resolveConfiguredPullTargets } from "./cli-Dc8HDZ6q.mjs";
+import { C as scanProjectMachines, S as run, T as createStatelyProjectConfig, _ as isFileGitDirty, a as discoverMachinesInSource, b as resolveCredentialStatus, c as formatDiscoveredMachines, d as formatProjectStatus, f as formatStoredCredentialSource, g as initProject, h as inferInitProjectName, i as discoverLinkedPullTargets, l as formatMissingNewMachineDirMessage, m as getEnvCredential, n as buildOAuthLoginStart, o as discoverOAuthLogin, p as getEnvApiKey, r as classifyPushCandidates, s as discoverRemoteProjectMachineTargets, t as COMMANDS, u as formatPlanSummary, v as resolveApiKey, w as scanProjectSources, x as resolveProjectStatus, y as resolveConfiguredPullTargets } from "./cli-Dx1dw7Cy.mjs";
 
 export { COMMANDS, buildOAuthLoginStart, classifyPushCandidates, createStatelyProjectConfig, discoverLinkedPullTargets, discoverMachinesInSource, discoverOAuthLogin, discoverRemoteProjectMachineTargets, formatDiscoveredMachines, formatMissingNewMachineDirMessage, formatPlanSummary, formatProjectStatus, formatStoredCredentialSource, getEnvApiKey, getEnvCredential, inferInitProjectName, initProject, isFileGitDirty, resolveApiKey, resolveConfiguredPullTargets, resolveCredentialStatus, resolveProjectStatus, run, scanProjectMachines, scanProjectSources };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "statelyai",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "Command-line tools for Stately",
   "license": "MIT",
   "type": "module",
@@ -21,9 +21,11 @@
   },
   "dependencies": {
     "@oclif/core": "^4.10.3",
-    "@statelyai/sdk": "0.16.1"
+    "ws": "^8.21.0",
+    "@statelyai/sdk": "0.16.2"
   },
   "devDependencies": {
+    "@types/ws": "^8.18.1",
     "tsdown": "0.21.0-beta.2",
     "vitest": "^3.2.4"
   },