@intuned/runtime-dev 1.0.6-cli.8.0.5 → 1.0.6-cli.8.0.6

package/dist/commands/deploy/deploy.js

@@ -4,23 +4,32 @@
 var _commander = require("commander");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _dotenv = _interopRequireDefault(require("dotenv"));
-var _utils = require("../init/utils");
-var _utils2 = require("./utils");
+var _utils = require("./utils");
+var _utils2 = require("../../common/cli/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 _dotenv.default.config({
   path: `.env`
 });
 _commander.program.description("Deploy an Intuned project to be public").argument("[project-name]", "Name of the project to deploy").option("-w, --workspace-id <id>", "Your Intuned workspace ID").option("-k, --api-key <key>", "Your Intuned API key").action(async (projectName, options) => {
+  const _projectName = projectName || (await (0, _utils2.getSettingIntunedJSON)("projectName"));
   try {
-    if (!projectName) {
+    if (!_projectName) {
       throw new Error("Project name is required");
     }
-    const projectNameValidation = (0, _utils2.validateProjectName)(projectName);
+    const projectNameValidation = (0, _utils.validateProjectName)(projectName);
     if (!projectNameValidation.isValid) {
       throw new Error(projectNameValidation.errorMessage);
     }
-    const auth = (0, _utils.getAuthCredentials)(options);
-    const deployStarted = await (0, _utils2.deployProject)(projectName, auth);
+    const {
+      isValid,
+      errorMessage
+    } = await (0, _utils.validateIntunedProject)();
+    if (!isValid) {
+      const userErrorMesage = `Project to be deployed is not a valid Intuned project: ${errorMessage}, modify and check again`;
+      throw new Error(userErrorMesage);
+    }
+    const auth = await (0, _utils2.getAuthCredentials)(options);
+    const deployStarted = await (0, _utils.deployProject)(projectName, auth);
     if (!deployStarted) {
       throw new Error("Project not deployed");
     }

package/dist/commands/deploy/utils.d.ts

@@ -1,7 +1,11 @@
-import { AuthCredentials, FileSystemTree } from "../init/types";
+import { AuthCredentials, FileSystemTree } from "../../common/cli/types";
 export declare function convertProjectToCodeTree(projectPath: string): Promise<FileSystemTree>;
 export declare function deployProject(projectName: string, auth: AuthCredentials): Promise<boolean>;
 export declare const validateProjectName: (projectName: string) => {
     isValid: boolean;
     errorMessage?: string;
 };
+export declare const validateIntunedProject: () => Promise<{
+    isValid: boolean;
+    errorMessage?: string;
+}>;

package/dist/commands/deploy/utils.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.convertProjectToCodeTree = convertProjectToCodeTree;
 exports.deployProject = deployProject;
-exports.validateProjectName = void 0;
-var fs = _interopRequireWildcard(require("fs"));
+exports.validateProjectName = exports.validateIntunedProject = void 0;
+var fs = _interopRequireWildcard(require("fs-extra"));
 var path = _interopRequireWildcard(require("path"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _minimatch = require("minimatch");
 var _zod = require("zod");
 var _projectExclusions = _interopRequireDefault(require("../common/projectExclusions"));
+var _constants = require("../../common/cli/constants");
 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; }
@@ -70,14 +71,12 @@ function listFilesNotIgnored(projectPath, ignorePatterns) {
 async function convertProjectToCodeTree(projectPath) {
   let ignorePatterns = [..._projectExclusions.default];
   let currentDir = path.normalize(projectPath);
-  let gitignoreFound = false;
   while (currentDir !== path.parse(currentDir).root) {
     const gitignorePath = path.join(currentDir, ".gitignore");
     if (fs.existsSync(gitignorePath)) {
       const gitignoreContent = fs.readFileSync(gitignorePath, "utf-8").split("\n");
       ignorePatterns = [...ignorePatterns, ...gitignoreContent];
       console.log(`Found .gitignore file: ${_chalk.default.cyan.bold(gitignorePath)}`);
-      gitignoreFound = true;
       break;
     } else {
       currentDir = path.dirname(currentDir);
@@ -157,7 +156,7 @@ async function deployProject(projectName, auth) {
   const codeTree = await convertProjectToCodeTree(projectPath);
   const deployProjectPayload = {
     name: projectName,
-    codeTree: codeTree,
+    codeTree,
     isCli: true,
     language: "typescript"
   };
@@ -170,12 +169,22 @@ async function deployProject(projectName, auth) {
     throw new Error(`Error deploying project`);
   }
   const data = await response.json();
-  if (response.status === 202) {
-    return true;
-  }
   if (!data) {
     throw new Error("Project not deployed");
   }
+  const startTime = Date.now();
+  const checkInterval = setInterval(async () => {
+    const status = await checkIntunedProjectDeployStatus(workspaceId, projectName, apiKey);
+    if (status === "completed" || status === "failed" || status === "not_found") {
+      clearInterval(checkInterval);
+      return status === "completed";
+    }
+    const elapsedTime = Date.now() - startTime;
+    if (elapsedTime > _constants.PROJECT_DEPLOY_TIMEOUT) {
+      clearInterval(checkInterval);
+      throw new Error(`Deployment timed out after ${Math.floor(_constants.PROJECT_DEPLOY_TIMEOUT / 1000 / 60)} minutes`);
+    }
+  }, 5000);
   return false;
 }
 const validateProjectName = projectName => {
@@ -193,4 +202,104 @@ const validateProjectName = projectName => {
     isValid: true
   };
 };
-exports.validateProjectName = validateProjectName;
+exports.validateProjectName = validateProjectName;
+const validateIntunedProject = async () => {
+  const currentDirectoryToDeploy = process.cwd();
+  const validationSteps = [{
+    name: "package.json",
+    check: async () => {
+      const packageJsonPath = path.join(currentDirectoryToDeploy, "package.json");
+      try {
+        var _packageJson$dependen;
+        await fs.exists(packageJsonPath);
+        const packageJson = JSON.parse(await fs.readFile(packageJsonPath, {
+          encoding: "utf-8"
+        }));
+        const userCodePlaywrightVersion = (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen.playwright;
+        if (userCodePlaywrightVersion !== _constants.CURRENT_PLAYWRIGHT_VERSION) {
+          return {
+            isValid: false,
+            errorMessage: `Playwright version mismatch: expected ${_constants.CURRENT_PLAYWRIGHT_VERSION}, found ${userCodePlaywrightVersion || "none"}`
+          };
+        }
+        return {
+          isValid: true
+        };
+      } catch (error) {
+        return {
+          isValid: false,
+          errorMessage: "Package.json file not found or cannot be read"
+        };
+      }
+    }
+  }, {
+    name: "intuned.json",
+    check: async () => {
+      const intunedJsonPath = path.join(currentDirectoryToDeploy, "intuned.json");
+      try {
+        await fs.exists(intunedJsonPath);
+        return {
+          isValid: true
+        };
+      } catch (error) {
+        return {
+          isValid: false,
+          errorMessage: "Intuned.json file not found"
+        };
+      }
+    }
+  }, {
+    name: "api folder",
+    check: async () => {
+      const apiFolderPath = path.join(currentDirectoryToDeploy, "api");
+      try {
+        await fs.access(apiFolderPath);
+        return {
+          isValid: true
+        };
+      } catch (error) {
+        return {
+          isValid: false,
+          errorMessage: "API folder not found"
+        };
+      }
+    }
+  }];
+  for (const step of validationSteps) {
+    const result = await step.check();
+    if (!result.isValid) {
+      return result;
+    }
+  }
+  return {
+    isValid: true
+  };
+};
+exports.validateIntunedProject = validateIntunedProject;
+const checkIntunedProjectDeployStatus = async (workspaceId, projectName, apiKey) => {
+  try {
+    const baseUrl = "https://rauf-2.intuned-team-local.com";
+    const url = `${baseUrl}/api/v1/workspace/${workspaceId}/projects/create/${projectName}/result`;
+    const headers = {
+      "x-api-key": apiKey,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(url, {
+      headers,
+      method: "GET"
+    });
+    if (response.status === 404) {
+      return "not_found";
+    }
+    if (!response.ok) {
+      throw new Error("Error fetching deployment status");
+    }
+    const data = await response.json();
+    if (data.status) {
+      return data.status.name;
+    }
+    return "failed";
+  } catch (e) {
+    throw new Error(`Error during deployment`);
+  }
+};

package/dist/commands/init/utils.d.ts

@@ -1,4 +1,4 @@
-import { FileSystemTree } from "./types";
+import { FileSystemTree } from "../../common/cli/types";
 export declare function mountFiles(cwd: string, tree: FileSystemTree): Promise<void>;
 export declare function checkEmptyDirectory(): Promise<boolean>;
 export declare function getAuthCredentials(options: any): {

package/dist/commands/init/utils.js

@@ -9,7 +9,7 @@ exports.mountFiles = mountFiles;
 exports.scaffoldProject = scaffoldProject;
 exports.selectTemplate = selectTemplate;
 var fs = _interopRequireWildcard(require("fs-extra"));
-var _types = require("./types");
+var _types = require("../../common/cli/types");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _inquirer = _interopRequireDefault(require("inquirer"));
 var _path = _interopRequireDefault(require("path"));

package/dist/common/cli/constants.d.ts

@@ -0,0 +1,3 @@
+export declare const CURRENT_PLAYWRIGHT_VERSION = "1.44.1";
+export declare const ProjectDeploymentStatus: string[];
+export declare const PROJECT_DEPLOY_TIMEOUT = 600000;

package/dist/common/cli/constants.js

@@ -1 +1,9 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ProjectDeploymentStatus = exports.PROJECT_DEPLOY_TIMEOUT = exports.CURRENT_PLAYWRIGHT_VERSION = void 0;
+const CURRENT_PLAYWRIGHT_VERSION = exports.CURRENT_PLAYWRIGHT_VERSION = "1.44.1";
+const ProjectDeploymentStatus = exports.ProjectDeploymentStatus = ["completed", "failed", "pending", "not_found"];
+const PROJECT_DEPLOY_TIMEOUT = exports.PROJECT_DEPLOY_TIMEOUT = 600000;

package/dist/common/cli/utils.d.ts

@@ -1,5 +1,5 @@
-export declare function getAuthCredentials(options: any): {
+export declare function getAuthCredentials(options: any): Promise<{
     workspaceId: any;
     apiKey: any;
-};
-export declare function getSettingIntunedJSON(key: string): null;
+}>;
+export declare function getSettingIntunedJSON(key: string): Promise<any>;

package/dist/common/cli/utils.js

@@ -5,28 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getAuthCredentials = getAuthCredentials;
 exports.getSettingIntunedJSON = getSettingIntunedJSON;
-function getAuthCredentials(options) {
-  const workspaceId = options.workspaceId || process.env.INTUNED_WORKSPACE_ID;
+var _path = _interopRequireDefault(require("path"));
+var fs = _interopRequireWildcard(require("fs-extra"));
+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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+async function getAuthCredentials(options) {
+  const workspaceId = options.workspaceId || (await getSettingIntunedJSON("workspaceId"));
   const apiKey = options.apiKey || process.env.INTUNED_API_KEY;
-  const missingAuth = [];
-  if (!workspaceId) {
-    missingAuth.push({
-      type: "input",
-      name: "workspaceId",
-      message: "Enter your Intuned workspace ID:",
-      validate: input => input.trim() !== "" ? true : "Workspace ID is required"
-    });
-  }
-  if (!apiKey) {
-    missingAuth.push({
-      type: "password",
-      name: "apiKey",
-      message: "Enter your Intuned API key:",
-      mask: "*",
-      validate: input => input.trim() !== "" ? true : "API key is required"
-    });
-  }
-  if (missingAuth.length) {
+  if (!workspaceId || !workspaceId) {
     throw new Error("Authentication details are required. Please provide them via command line options or environment variables.");
   }
   return {
@@ -34,6 +21,11 @@ function getAuthCredentials(options) {
     apiKey
   };
 }
-function getSettingIntunedJSON(key) {
+async function getSettingIntunedJSON(key) {
+  const intunedJsonPath = _path.default.join(process.cwd(), "intuned.json");
+  const intunedJson = await fs.readJSON(intunedJsonPath);
+  if (intunedJson && intunedJson[key]) {
+    return intunedJson[key];
+  }
   return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.0.6-cli.8.0.5",
+  "version": "1.0.6-cli.8.0.6",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",

package/dist/commands/init/types.d.ts

@@ -1,52 +0,0 @@
-export declare const templateIds: string[];
-export type TemplateId = (typeof templateIds)[number];
-/**
- * A simple, tree-like structure to describe the contents of a folder to be mounted.
- *
- * @example
- * ```
- * const tree = {
- *   myproject: {
- *     directory: {
- *       'foo.js': {
- *         file: {
- *           contents: 'const x = 1;',
- *         },
- *       },
- *       .envrc: {
- *         file: {
- *           contents: 'ENVIRONMENT=staging'
- *         }
- *       },
- *     },
- *   },
- *   emptyFolder: {
- *     directory: {}
- *   },
- * };
- * ```
- */
-export interface FileSystemTree {
-    [name: string]: DirectoryNode | FileNode;
-}
-/**
- * Represents a directory, see {@link FileSystemTree}.
- */
-export interface DirectoryNode {
-    directory: FileSystemTree;
-}
-/**
- * Represents a file, see {@link FileSystemTree}.
- */
-export interface FileNode {
-    file: {
-        /**
-         * The contents of the file, either as a UTF-8 string or as raw binary.
-         */
-        contents: string | Uint8Array;
-    };
-}
-export interface AuthCredentials {
-    workspaceId: string;
-    apiKey: string;
-}

package/dist/commands/init/types.js

@@ -1,7 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.templateIds = void 0;
-const templateIds = exports.templateIds = ["default", "empty", "linkedin-recorder", "api-auth-sessions", "nested-scheduling", "ai-extractors", "npm-auth-sessions", "python-empty"];

package/r/Intuned.json

@@ -1,15 +0,0 @@
-{
-  "apiAccess": {
-    "enabled": true
-  },
-  "authSessions": {
-    "enabled": false
-  },
-  "scale": {
-    "machineCount": 1,
-    "softLimit": 8,
-    "hardLimit": 10,
-    "memory": 2048,
-    "cpus": 6
-  }
-}

package/r/api/book-details.ts

@@ -1,45 +0,0 @@
-import { BrowserContext, Page } from "playwright-core";
-import { extendPlaywrightPage } from "@intuned/sdk/playwright";
-
-interface Params {
-  bookFullUrl: string;
-}
-
-export default async function handler(
-  params: Params,
-  _playwrightPage: Page,
-  context: BrowserContext
-) {
-  const page = extendPlaywrightPage(_playwrightPage);
-
-  // go to the url that is passed in the params
-  await page.goto(params.bookFullUrl);
-
-  // optimized extractor!
-  // for more info checkout
-  // https://docs.intunedhq.com/docs/data-extraction/web-data-extraction
-  const result = await page.extractObjectOptimized({
-    label: "book-deatils",
-    entityName: "book_info",
-    entitySchema: {
-      type: "object",
-      properties: {
-        name: {
-          type: "string",
-          description: "book name",
-        },
-        upc: {
-          type: "string",
-          description: "upc of the book",
-        },
-        numberOfReviews: {
-          type: "string",
-          description: "Number of reviews on the book",
-        },
-      },
-      required: ["name", "upc"],
-    },
-  });
-
-  return result;
-}

package/r/api/books-all.ts

@@ -1,35 +0,0 @@
-import { BrowserContext, Page } from "playwright-core";
-import { extendPlaywrightPage } from "@intuned/sdk/playwright";
-import { extendPayload } from "@intuned/sdk/runtime";
-import { extractBooks } from "../utils/books";
-
-interface Params {
-  // Add your params here
-}
-
-export default async function handler(
-  params: Params,
-  _playwrightPage: Page,
-  context: BrowserContext
-) {
-  // extends playwright page with Intuned helpers.
-  const page = extendPlaywrightPage(_playwrightPage);
-
-  await page.goto("https://books.toscrape.com/");
-
-  // optimized extractor!
-  // for more info checkout
-  // https://docs.intunedhq.com/docs/data-extraction/web-data-extraction
-
-  const result = await extractBooks(page);
-  // for each book on the main page, schedule api to get details
-  result.forEach((book) => {
-    // Extend job payload so it runs API `book-details` with provided params
-    extendPayload({
-      api: "book-details",
-      parameters: {
-        bookFullUrl: `${page.url()}${book.bookUrl}`,
-      },
-    });
-  });
-}

package/r/package.json

@@ -1,33 +0,0 @@
-{
-  "name": "Nested-Scheduling",
-  "version": "1.0.0",
-  "description": "project uses nested scheduling feature",
-  "tags": [
-    "Scrapper"
-  ],
-  "main": "index.js",
-  "scripts": {
-    "dev:local": "intuned-api-run sample playwright -j '{}'",
-    "dev": "intuned-api-run",
-    "debug": "node --inspect-brk ./node_modules/.bin/intuned-api-run",
-    "build": "intuned-build",
-    "types-check": "intuned-ts-check",
-    "pre-publish": "intuned-ts-check && intuned-build",
-    "start": "node ./output/bundle_v2.js",
-    "browser-save-state": "intuned-browser-save-state",
-    "auth-session-check": "intuned-auth-session-check",
-    "auth-session-create": "intuned-auth-session-create",
-    "auth-session-refresh": "intuned-auth-session-refresh",
-    "auth-session-load": "intuned-auth-session-load"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@intuned/runtime": "1.0.5",
-    "@intuned/sdk": "2.0.2",
-    "@types/intuned__sdk": "npm:@intuned/sdk-types@2.0.2",
-    "@types/node": "^20.10.3",
-    "playwright": "1.44.1",
-    "playwright-core": "1.44.1"
-  }
-}

package/r/tsconfig.json

@@ -1,47 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": false,
-    "experimentalDecorators": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "lib": ["dom", "dom.iterable", "esnext", "es2021"],
-    "module": "commonjs",
-    "target": "es2021",
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": false,
-    "incremental": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "noImplicitAny": false,
-    "composite": false,
-    "inlineSources": false,
-    "moduleResolution": "node",
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "preserveWatchOutput": true,
-    "rootDir": "./",
-    "outDir": "./dist",
-    "paths": {
-      "primitives/*": ["components/primitives/*"]
-    }
-  },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    "node_modules/monaco-editor/**/*.d.ts",
-    "node_modules/@monaco-editor/**/*.d.ts",
-    "node_modules/@kusto/monaco-kusto/**/*.d.ts"
-  ],
-  "exclude": [
-    "public",
-    "dist",
-    "packagerWorkerAssets/packagerTemplates",
-    "httpRequests"
-  ]
-}

package/r/utils/books.ts

@@ -1,32 +0,0 @@
-import { Page } from "playwright-core";
-
-interface BookItem {
-  name: string;
-  bookUrl: string;
-}
-
-export async function extractBooks(page: Page): Promise<BookItem[]> {
-  await page.waitForSelector("article.product_pod");
-
-  const books: BookItem[] = [];
-
-  const bookElements = await page.getByRole("article").all();
-
-  for (const bookElement of bookElements) {
-    const linkElement = bookElement.getByRole("link").first();
-
-    const name =
-      (await linkElement.getAttribute("title")) ||
-      (await linkElement.textContent()) ||
-      "Unknown Title";
-
-    const bookUrl = (await linkElement.getAttribute("href")) || "";
-
-    books.push({
-      name: name.trim(),
-      bookUrl: bookUrl.trim(),
-    });
-  }
-
-  return books;
-}