@intuned/runtime-dev 1.3.17-cdp.1 → 1.3.17-ws.0

package/dist/commands/intuned-cli/controller/save.js

@@ -96,18 +96,24 @@ async function runSaveProject(projectName, auth) {
 ${_constants2.WORKSPACE_ID_ENV_VAR_KEY}=${workspaceId}
 ${_constants2.API_KEY_ENV_VAR_KEY}=${apiKey}`);
     (0, _terminal.terminal)(`^g^+Created .env file with project credentials.^:\n`);
+    return;
   }
   const envContent = await fs.readFile(dotEnvPath, "utf-8");
   const dotenvContent = dotenv.parse(envContent);
   let contentToAppend = "";
-  if (!dotenvContent[_constants2.PROJECT_ID_ENV_VAR_KEY] || dotenvContent[_constants2.PROJECT_ID_ENV_VAR_KEY] !== projectId) {
-    contentToAppend += `\n${_constants2.PROJECT_ID_ENV_VAR_KEY}=${projectId}`;
-  }
-  if (!dotenvContent[_constants2.WORKSPACE_ID_ENV_VAR_KEY]) {
-    contentToAppend += `\n${_constants2.WORKSPACE_ID_ENV_VAR_KEY}=${workspaceId}`;
-  }
-  if (!dotenvContent[_constants2.API_KEY_ENV_VAR_KEY]) {
-    contentToAppend += `\n${_constants2.API_KEY_ENV_VAR_KEY}=${apiKey}`;
+  const projectCredentialsEnvVars = {
+    [_constants2.PROJECT_ID_ENV_VAR_KEY]: projectId,
+    [_constants2.WORKSPACE_ID_ENV_VAR_KEY]: workspaceId,
+    [_constants2.API_KEY_ENV_VAR_KEY]: apiKey
+  };
+  for (const key in projectCredentialsEnvVars) {
+    if (dotenvContent[key] === projectCredentialsEnvVars[key]) {
+      continue;
+    }
+    if (dotenvContent[key]) {
+      (0, _terminal.terminal)(`^yWarning: Existing ${key} in .env has invalid value. Appending correct value.^:\n`);
+    }
+    contentToAppend += `${key}=${projectCredentialsEnvVars[key]}\n`;
   }
   if (contentToAppend) {
     await fs.appendFile(dotEnvPath, contentToAppend + "\n");

package/dist/commands/intuned-cli/helpers/backend.js

@@ -9,7 +9,7 @@ var _constants = require("../../../common/constants");
 var _errors = require("./errors");
 var _intunedJson = require("./intunedJson");
 async function getAuthCredentials(options) {
-  const workspaceId = options.workspaceId || (await (0, _intunedJson.loadIntunedJson)()).workspaceId;
+  const workspaceId = options.workspaceId || (await (0, _intunedJson.loadIntunedJson)()).workspaceId || process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY];
   const apiKey = options.apiKey || process.env[_constants.API_KEY_ENV_VAR_KEY];
   if (!workspaceId) {
     throw new _errors.CLIError(`Workspace ID is required. Please provide it via command line options or ${await (0, _intunedJson.getIntunedSettingsFileName)()}`);

package/dist/commands/intuned-cli/main.js

@@ -3,9 +3,10 @@
 var _dotenv = _interopRequireDefault(require("dotenv"));
 var _constants = require("../../common/constants");
 var _backend = require("./helpers/backend");
-var _commands = require("./commands");
-var _helpers = require("./helpers");
+var _intunedJson = require("../../common/intunedJson");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 require("../../common/binStartupScript");
 _dotenv.default.config({
   path: `.env`
@@ -15,9 +16,21 @@ process.env.RUN_ENVIRONMENT = "AUTHORING";
 if (!process.env.FUNCTIONS_DOMAIN) {
   process.env.FUNCTIONS_DOMAIN = (0, _backend.getBaseUrl)().replace(/\/$/, "");
 }
-_commands.program.configureHelp({
-  sortSubcommands: true
-});
-void (0, _helpers.withCLIContext)(async () => {
-  _commands.program.parse(process.argv);
-});
+void (async () => {
+  const intunedJson = await (0, _intunedJson.loadIntunedJson)();
+  if (intunedJson.isOk() && intunedJson.value.workspaceId) {
+    process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY] = intunedJson.value.workspaceId;
+  }
+  const {
+    program
+  } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands")));
+  const {
+    withCLIContext
+  } = await Promise.resolve().then(() => _interopRequireWildcard(require("./helpers/context")));
+  await withCLIContext(async () => {
+    program.configureHelp({
+      sortSubcommands: true
+    });
+    program.parse(process.argv);
+  });
+})();

package/dist/common/launchBrowser.d.ts

@@ -1,5 +1,4 @@
 import * as playwright from "playwright";
-import { Result } from "neverthrow";
 export interface Proxy {
     server: string;
     username: string;
@@ -25,7 +24,6 @@ export declare function launchChromium(options: LaunchChromiumCdpOptions): Promi
 export declare function getBrowserExecutablePath(): Promise<string | undefined>;
 export declare function launchBrowser(options: Omit<LaunchChromiumStandaloneOptions, "executablePath"> | LaunchChromiumCdpOptions): Promise<LaunchBrowserResult>;
 export declare function getLocalCdpAddress(port: number): string;
-export declare function getCdpWebSocketUrl(cdpAddress: string): Promise<Result<string, string>>;
 export declare function getHeadlessUserAgent({ executablePath, args, ignoreDefaultArgs, }: {
     executablePath?: string;
     args?: string[];

package/dist/common/launchBrowser.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getBrowserExecutablePath = getBrowserExecutablePath;
-exports.getCdpWebSocketUrl = getCdpWebSocketUrl;
 exports.getHeadlessUserAgent = getHeadlessUserAgent;
 exports.getLocalCdpAddress = getLocalCdpAddress;
 exports.launchBrowser = launchBrowser;
@@ -18,8 +17,6 @@ var _child_process = require("child_process");
 var _extensionsHelpers = require("./extension/extensionsHelpers");
 var _intunedExtensionServer = require("./extension/intunedExtensionServer");
 var _util = require("util");
-var _neverthrow = require("neverthrow");
-var _zod = require("zod");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -176,21 +173,6 @@ async function getBraveExecutablePath() {
 function getLocalCdpAddress(port) {
   return `http://localhost:${port}`;
 }
-async function getCdpWebSocketUrl(cdpAddress) {
-  const response = await fetch(`${cdpAddress}/json/version`);
-  if (!response.ok) {
-    return (0, _neverthrow.err)(`Failed to get CDP WebSocket URL from ${cdpAddress}: ${response.status} ${response.statusText}`);
-  }
-  const data = await response.json();
-  const cdpJsonVersionResponseSchema = _zod.z.object({
-    webSocketDebuggerUrl: _zod.z.string().url()
-  });
-  const parseResult = cdpJsonVersionResponseSchema.safeParse(data);
-  if (!parseResult.success) {
-    return (0, _neverthrow.err)(`Invalid CDP version response from ${cdpAddress}: ${JSON.stringify(parseResult.error.format())}`);
-  }
-  return (0, _neverthrow.ok)(parseResult.data.webSocketDebuggerUrl);
-}
 async function waitOnCdpAddress(cdpAddress) {
   const cdpAddressWithoutProtocol = cdpAddress.replace("http://", "").replace("https://", "").replace("localhost", "127.0.0.1");
   await (0, _waitOn.default)({

package/dist/common/playwrightContext.js

@@ -71,6 +71,7 @@ async function withPlaywrightContext({
       const port = await (0, _portfinder.getPort)({
         port: 9222
       });
+      hookCdpUrl = (0, _launchBrowser.getLocalCdpAddress)(port);
       ({
         context,
         page
@@ -80,14 +81,9 @@ async function withPlaywrightContext({
         downloadsPath,
         cdpPort: port
       }));
-      hookCdpUrl = (0, _launchBrowser.getLocalCdpAddress)(port);
     }
     let hookResult;
     try {
-      const wsUrlResult = await (0, _launchBrowser.getCdpWebSocketUrl)(hookCdpUrl);
-      if (wsUrlResult.isOk()) {
-        hookCdpUrl = wsUrlResult.value;
-      }
       hookResult = await setupContextHook({
         apiName: apiName,
         apiParameters: apiParameters,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.3.17-cdp.1",
+  "version": "1.3.17-ws.0",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",