screenright-client 0.9.8 → 0.9.10

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Page } from '@playwright/test';
-export declare const initializeScreenwright: () => Promise<void>;
+export declare const initializeScreenwright: (diagramId?: string) => Promise<void>;
 export declare const finalize: () => Promise<void>;
 /**
  * Get screen capture.

package/dist/index.js

@@ -11,7 +11,7 @@ import fetch from 'node-fetch';
 import process from 'node:process';
 import FormData from 'form-data';
 import { setTimeout } from 'timers/promises';
-const result = { screenshotItemAttributes: [] };
+const result = { diagramId: "", screenshotItemAttributes: [] };
 let deploymentId = null;
 const deploymentToken = process.env.SCREENRIGHT_DEPLOYMENT_TOKEN || '';
 const baseUrl = () => {
@@ -21,14 +21,15 @@ const errorOccurred = (message) => {
     console.error('[ScreenRight] Error occurred', message);
     deploymentId = null;
 };
-export const initializeScreenwright = () => __awaiter(void 0, void 0, void 0, function* () {
-    const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID;
-    if (!diagramId || !deploymentToken) {
+export const initializeScreenwright = (diagramId) => __awaiter(void 0, void 0, void 0, function* () {
+    const _diagramId = process.env.SCREENRIGHT_DIAGRAM_ID;
+    if (!_diagramId || !deploymentToken) {
         errorOccurred('Not set require environments.');
         return;
     }
+    result.diagramId = _diagramId;
     try {
-        const response = yield fetch(`${baseUrl()}/diagrams/${diagramId}/deployments`, {
+        const response = yield fetch(`${baseUrl()}/diagrams/${result.diagramId}/deployments`, {
             method: 'POST',
             body: JSON.stringify({ deployment_token: deploymentToken }),
             headers: { 'Content-Type': 'application/json' }
@@ -48,8 +49,7 @@ export const finalize = () => __awaiter(void 0, void 0, void 0, function* () {
     if (!deploymentId) {
         return;
     }
-    const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID;
-    yield fetch(`${baseUrl()}/diagrams/${diagramId}/deployments/${deploymentId}/done_upload`, {
+    yield fetch(`${baseUrl()}/diagrams/${result.diagramId}/deployments/${deploymentId}/done_upload`, {
         method: 'PUT',
         body: JSON.stringify({ deployment_token: deploymentToken, blueprint: JSON.stringify({ screenshotItemAttributes: result.screenshotItemAttributes }) }),
         headers: { 'Content-Type': 'application/json' }
@@ -84,8 +84,7 @@ export const capture = (page, key, title, parentKey, options = { waitMillisecond
         const buffer = yield page.screenshot({ fullPage: true, type: 'jpeg' });
         const formData = new FormData();
         formData.append('file', buffer, fileName);
-        const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID;
-        const response = yield fetch(`${baseUrl()}/diagrams/${diagramId}/deployments/${deploymentId}/screenshot`, {
+        const response = yield fetch(`${baseUrl()}/diagrams/${result.diagramId}/deployments/${deploymentId}/screenshot`, {
             method: 'POST',
             headers: {
                 'X-File-Key': key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screenright-client",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "description": "screenright's nodejs client library",
   "type": "module",
   "main": "dist/index.js",

package/src/index.ts

@@ -13,10 +13,11 @@ type ScreenshotItemAttribute = {
 }
 
 type Result = {
+  diagramId: string
   screenshotItemAttributes: ScreenshotItemAttribute[]
 }
 
-const result: Result = { screenshotItemAttributes: [] }
+const result: Result = { diagramId: "", screenshotItemAttributes: [] }
 
 let deploymentId: string | null = null
 const deploymentToken: string = process.env.SCREENRIGHT_DEPLOYMENT_TOKEN || ''
@@ -30,16 +31,18 @@ const errorOccurred = (message: string) => {
   deploymentId = null
 }
 
-export const initializeScreenwright = async () => {
+export const initializeScreenwright = async (diagramId?: string) => {
 
-  const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID
-  if (!diagramId || !deploymentToken) {
+  const _diagramId = process.env.SCREENRIGHT_DIAGRAM_ID
+  if (!_diagramId || !deploymentToken) {
     errorOccurred('Not set require environments.')
     return
   }
 
+  result.diagramId = _diagramId
+
   try {
-    const response = await fetch(`${baseUrl()}/diagrams/${diagramId}/deployments`, {
+    const response = await fetch(`${baseUrl()}/diagrams/${result.diagramId}/deployments`, {
       method: 'POST',
       body: JSON.stringify({ deployment_token: deploymentToken }),
       headers: { 'Content-Type': 'application/json' }
@@ -62,8 +65,7 @@ export const finalize = async () => {
     return
   }
 
-  const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID
-  await fetch(`${baseUrl()}/diagrams/${diagramId}/deployments/${deploymentId}/done_upload`, {
+  await fetch(`${baseUrl()}/diagrams/${result.diagramId}/deployments/${deploymentId}/done_upload`, {
     method: 'PUT',
     body: JSON.stringify({ deployment_token: deploymentToken, blueprint: JSON.stringify({ screenshotItemAttributes: result.screenshotItemAttributes}) }),
     headers: { 'Content-Type': 'application/json' }
@@ -112,8 +114,7 @@ export const capture = async (
 
     formData.append('file', buffer, fileName)
 
-    const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID
-    const response = await fetch(`${baseUrl()}/diagrams/${diagramId}/deployments/${deploymentId}/screenshot`, {
+    const response = await fetch(`${baseUrl()}/diagrams/${result.diagramId}/deployments/${deploymentId}/screenshot`, {
       method: 'POST',
       headers: {
         'X-File-Key': key,

package/dist/index.mjs

@@ -1,69 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import * as fs from 'fs';
-import fetch from 'node-fetch';
-const tmpDir = 'screenright/tmp';
-const result = { screenshotItemAttributes: [] };
-let deploymentId = null;
-export const initializeScreenwright = () => __awaiter(void 0, void 0, void 0, function* () {
-    const baseUrl = `${process.env.SCREENRIGHT_ENDPOINT}/client_api`;
-    const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID;
-    const deploymentToken = process.env.SCREENRIGHT_DEVELOPMENT_TOKEN;
-    const response = yield fetch(`${baseUrl}/diagrams/${diagramId}/deployments`, {
-        method: 'POST',
-        body: JSON.stringify({ deployment_token: deploymentToken }),
-        headers: { 'Content-Type': 'application/json' }
-    });
-    const body = yield response.text();
-    const json = JSON.parse(body);
-    deploymentId = json.id;
-    process.on('exit', (exitCode) => __awaiter(void 0, void 0, void 0, function* () {
-        if (exitCode === 0) {
-            fs.writeFileSync(`${tmpDir}/result.json`, JSON.stringify({
-                screenshotItemAttributes: result.screenshotItemAttributes,
-            }));
-            yield fetch(`${baseUrl}/diagrams/${diagramId}/deployments/${deploymentId}/done_upload`, {
-                method: 'PUT',
-                body: JSON.stringify({ deployment_token: deploymentToken }),
-                headers: { 'Content-Type': 'application/json' }
-            });
-        }
-    }));
-});
-initializeScreenwright();
-export const capture = (page, key, title, parentKey) => __awaiter(void 0, void 0, void 0, function* () {
-    if (deploymentId === null) {
-        return;
-    }
-    fs.mkdirSync(tmpDir, { recursive: true });
-    const path = `${tmpDir}/${key}.png`;
-    yield page.screenshot({ path, fullPage: true });
-    const attribute = {
-        key,
-        title,
-        src: path,
-        childrens: [],
-    };
-    if (parentKey) {
-        const searchParent = (attributes) => {
-            for (let i = 0; i < attributes.length; i++) {
-                if (attributes[i].key === parentKey) {
-                    attributes[i].childrens.push(attribute);
-                    break;
-                }
-                searchParent(attributes[i].childrens);
-            }
-        };
-        searchParent(result.screenshotItemAttributes);
-    }
-    else {
-        result.screenshotItemAttributes.push(attribute);
-    }
-});