screenright-client 0.9.0 → 0.9.2

package/dist/index.js

@@ -7,46 +7,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import * as fs from 'fs';
 import fetch from 'node-fetch';
 import process from 'node:process';
-const tmpDir = 'screenright/tmp';
+import FormData from 'form-data';
 const result = { screenshotItemAttributes: [] };
 let deploymentId = null;
+const deploymentToken = process.env.SCREENRIGHT_DEPLOYMENT_TOKEN || '';
 const baseUrl = () => {
     return `${process.env.SCREENRIGHT_ENDPOINT}/client_api`;
 };
+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;
-    const deploymentToken = process.env.SCREENRIGHT_DEPLOYMENT_TOKEN;
-    console.log("#", deploymentToken);
+    if (!diagramId || !deploymentToken) {
+        errorOccurred('Not set require environments.');
+        return;
+    }
     try {
         const response = yield fetch(`${baseUrl()}/diagrams/${diagramId}/deployments`, {
             method: 'POST',
             body: JSON.stringify({ deployment_token: deploymentToken }),
             headers: { 'Content-Type': 'application/json' }
         });
+        if (!response.ok) {
+            errorOccurred('Failed create deployment.');
+        }
         const body = yield response.text();
         const json = JSON.parse(body);
         deploymentId = json.id;
     }
     catch (e) {
-        console.error('[ScreenRight] Error catch', e.message);
+        errorOccurred(e.message);
     }
 });
 export const finalize = () => __awaiter(void 0, void 0, void 0, function* () {
-    console.log("################## -1");
     if (!deploymentId) {
         return;
     }
-    fs.writeFileSync(`${tmpDir}/result.json`, JSON.stringify({
-        screenshotItemAttributes: result.screenshotItemAttributes,
-    }));
     const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID;
-    const deploymentToken = process.env.SCREENRIGHT_DEPLOYMENT_TOKEN;
     yield fetch(`${baseUrl()}/diagrams/${diagramId}/deployments/${deploymentId}/done_upload`, {
         method: 'PUT',
-        body: JSON.stringify({ deployment_token: deploymentToken, screenshotItemAttributes: result.screenshotItemAttributes }),
+        body: JSON.stringify({ deployment_token: deploymentToken, blueprint: JSON.stringify({ screenshotItemAttributes: result.screenshotItemAttributes }) }),
         headers: { 'Content-Type': 'application/json' }
     });
     deploymentId = null;
@@ -55,13 +59,32 @@ export const capture = (page, key, title, parentKey) => __awaiter(void 0, void 0
     if (deploymentId === null) {
         return;
     }
-    fs.mkdirSync(tmpDir, { recursive: true });
-    const path = `${tmpDir}/${key}.png`;
-    yield page.screenshot({ path, fullPage: true });
+    const fileName = `${key}.jpg`;
+    try {
+        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`, {
+            method: 'POST',
+            headers: {
+                'X-File-Key': key,
+                'X-Deployment-Token': deploymentToken,
+            },
+            body: formData
+        });
+        if (!response.ok) {
+            errorOccurred('Faild screenshot upload');
+            return;
+        }
+    }
+    catch (e) {
+        errorOccurred(`capture: ${key}, ${e.message}`);
+        return;
+    }
     const attribute = {
         key,
         title,
-        src: path,
         childrens: [],
     };
     if (parentKey) {

package/package.json

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

package/src/index.ts

@@ -2,11 +2,11 @@ import * as fs from 'fs'
 import { Page } from '@playwright/test'
 import fetch from 'node-fetch'
 import process from 'node:process'
+import FormData from 'form-data'
 
 type ScreenshotItemAttribute = {
   key: string
   title: string
-  src: string
   childrens: ScreenshotItemAttribute[]
 }
 
@@ -14,20 +14,28 @@ type Result = {
   screenshotItemAttributes: ScreenshotItemAttribute[]
 }
 
-const tmpDir = 'screenright/tmp'
-
 const result: Result = { screenshotItemAttributes: [] }
 
 let deploymentId: string | null = null
+const deploymentToken: string = process.env.SCREENRIGHT_DEPLOYMENT_TOKEN || ''
 
 const baseUrl = () => {
   return `${process.env.SCREENRIGHT_ENDPOINT}/client_api`
 }
 
+const errorOccurred = (message: string) => {
+  console.error('[ScreenRight] Error occurred', message)
+  deploymentId = null
+}
+
 export const initializeScreenwright = async () => {
 
   const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID
-  const deploymentToken = process.env.SCREENRIGHT_DEPLOYMENT_TOKEN
+  if (!diagramId || !deploymentToken) {
+    errorOccurred('Not set require environments.')
+    return
+  }
+
   try {
     const response = await fetch(`${baseUrl()}/diagrams/${diagramId}/deployments`, {
       method: 'POST',
@@ -35,11 +43,15 @@ export const initializeScreenwright = async () => {
       headers: { 'Content-Type': 'application/json' }
     })
 
+    if (!response.ok) {
+      errorOccurred('Failed create deployment.')
+    }
+
     const body = await response.text()
     const json = JSON.parse(body)
     deploymentId = json.id
   } catch(e: any) {
-    console.error('[ScreenRight] Error catch', e.message)
+    errorOccurred(e.message)
   }
 }
 
@@ -48,18 +60,10 @@ export const finalize = async () => {
     return
   }
 
-  fs.writeFileSync(
-    `${tmpDir}/result.json`,
-    JSON.stringify({
-      screenshotItemAttributes: result.screenshotItemAttributes,
-    })
-  )
-
   const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID
-  const deploymentToken = process.env.SCREENRIGHT_DEPLOYMENT_TOKEN
   await fetch(`${baseUrl()}/diagrams/${diagramId}/deployments/${deploymentId}/done_upload`, {
     method: 'PUT',
-    body: JSON.stringify({ deployment_token: deploymentToken, screenshotItemAttributes: result.screenshotItemAttributes }),
+    body: JSON.stringify({ deployment_token: deploymentToken, blueprint: JSON.stringify({ screenshotItemAttributes: result.screenshotItemAttributes}) }),
     headers: { 'Content-Type': 'application/json' }
   })
 
@@ -76,14 +80,35 @@ export const capture = async (
     return
   }
 
-  fs.mkdirSync(tmpDir, { recursive: true })
-  const path = `${tmpDir}/${key}.png`
-  await page.screenshot({ path, fullPage: true })
+  const fileName = `${key}.jpg`
+  try {
+    const buffer = await page.screenshot({ fullPage: true, type: 'jpeg' })
+    const formData = new FormData()
+
+    formData.append('file', buffer, fileName)
+
+    const diagramId = process.env.SCREENRIGHT_DIAGRAM_ID
+    const response = await fetch(`${baseUrl()}/diagrams/${diagramId}/deployments/${deploymentId}/screenshot`, {
+      method: 'POST',
+      headers: {
+        'X-File-Key': key,
+        'X-Deployment-Token': deploymentToken,
+      },
+      body: formData
+    })
+
+    if (!response.ok) {
+      errorOccurred('Faild screenshot upload')
+      return
+    }
+  } catch(e: any) {
+    errorOccurred(`capture: ${key}, ${e.message}`)
+    return
+  }
 
   const attribute: ScreenshotItemAttribute = {
     key,
     title,
-    src: path,
     childrens: [],
   }