@mochabug/adaptkit 0.11.0 → 0.11.1

package/assets/tsconf.json

@@ -29,7 +29,8 @@
         "noPropertyAccessFromIndexSignature": true
     },
     "exclude": [
-        "dist",
+        "dist/**",
+        "assets/**",
         "rollup.config.js"
     ]
 }

package/bin/index.js

@@ -19,7 +19,9 @@ import pkceChallenge from 'pkce-challenge';
 import { ChannelCredentials } from '@grpc/grpc-js';
 import { GrpcTransport } from '@protobuf-ts/grpc-transport';
 import fg from 'fast-glob';
+import { PassThrough } from 'stream';
 import sharp from 'sharp';
+import archiver from 'archiver';
 import updateNotifier from 'update-notifier';
 
 // @generated by protobuf-ts 2.9.4 with parameter client_generic,force_server_none
@@ -1540,11 +1542,61 @@ function isPathSafe(filePath) {
     const absoluteFilePath = path.resolve(filePath);
     return absoluteFilePath.startsWith(currentWorkingDir);
 }
+function folderExists(folderPath) {
+    try {
+        const absolutePath = path.resolve(folderPath);
+        if (fs.existsSync(absolutePath)) {
+            const stats = fs.statSync(absolutePath);
+            return stats.isDirectory();
+        }
+        else {
+            return false;
+        }
+    }
+    catch (err) {
+        console.error('Error checking if folder exists:', err);
+        return false;
+    }
+}
+function createArchive(folder) {
+    return new Promise((resolve, reject) => {
+        if (!folderExists(folder)) {
+            reject(`The folder ${folder} does not exist`);
+        }
+        const archive = archiver('tar', {
+            gzip: true, // Use gzip compression
+            zlib: { level: 9 } // Sets the compression level.
+        });
+        archive.on('error', (err) => {
+            reject(err);
+        });
+        const buffers = [];
+        const bufferStream = new PassThrough();
+        bufferStream.on('data', (data) => buffers.push(data));
+        bufferStream.on('end', () => {
+            const res = Buffer.concat(buffers);
+            console.log('Assets have been compressed successfully into a buffer.');
+            resolve(res); // Resolve the promise with the final buffer
+        });
+        archive.pipe(bufferStream);
+        fg(path.join(folder, '**', '*'))
+            .then((paths) => {
+            for (let filepath of paths) {
+                if (fs.statSync(filepath).isFile()) {
+                    const relativePath = path.relative(folder, filepath);
+                    archive.file(filepath, { name: relativePath });
+                }
+            }
+            archive.finalize();
+        })
+            .catch((err) => reject(err));
+    });
+}
 async function sendPlugin(manifest, client, metadata) {
     console.log('Sending the plugin to the server');
     const stream = client.uploadPlugin({ meta: metadata });
     const lookup = {};
-    async function send(filePath, imgOpts) {
+    async function send(filePath, imgOpts, fileContent) {
         if (!filePath || lookup[filePath]) {
             return;
         }
@@ -1552,7 +1604,7 @@ async function sendPlugin(manifest, client, metadata) {
             throw new Error(`The file path is not safe: ${filePath}. It must be contained inside the manifest folder. Invalid manifest`);
         }
         if (!fs.existsSync(filePath)) {
-            throw new Error(`The file does not exists: ${filePath}. Invalid manifest`);
+            throw new Error(`The path does not exists: ${filePath}. Invalid manifest`);
         }
         // If image file, we need to compress it
         let buffer;
@@ -1560,6 +1612,9 @@ async function sendPlugin(manifest, client, metadata) {
             buffer = await resize(filePath, imgOpts[0], imgOpts[1]);
             console.log(`Compressed: ${filePath} to ${imgOpts[0]}x${imgOpts[1]} size`);
         }
+        else if (fileContent) {
+            buffer = fileContent;
+        }
         else {
             buffer = fs.readFileSync(filePath);
         }
@@ -1593,21 +1648,13 @@ async function sendPlugin(manifest, client, metadata) {
     await send(manifest.logo, [80, 80]);
     // Send everything inside the asset directory as assets
     if (manifest.assets && fs.existsSync(manifest.assets)) {
-        const paths = await fg(path.join(manifest.assets, '**', '*'));
-        for (let filepath of paths) {
-            if (fs.statSync(filepath).isFile()) {
-                await send(filepath);
-            }
-        }
+        const assets = await createArchive(manifest.assets);
+        await send(manifest.assets, undefined, assets);
     }
     // Send everything inside the cdn directory as cdn files
     if (manifest.cdn && fs.existsSync(manifest.cdn)) {
-        const paths = await fg(path.join(manifest.cdn, '**', '*'));
-        for (let filepath of paths) {
-            if (fs.statSync(filepath).isFile()) {
-                await send(filepath);
-            }
-        }
+        const cdn = await createArchive(manifest.cdn);
+        await send(manifest.cdn, undefined, cdn);
     }
     // Send everything related to the vertices. Logos, schemas and configs
     for (let vertex of manifest.vertices) {
@@ -1815,7 +1862,7 @@ async function handleEmulate(host, cmd) {
 }
 async function main() {
     const notifier = updateNotifier({
-        pkg: JSON.parse('{"name":"@mochabug/adaptkit","version":"0.11.0"}')
+        pkg: JSON.parse('{"name":"@mochabug/adaptkit","version":"0.11.1"}')
     });
     notifier.notify({ isGlobal: true, defer: false });
     program

package/bin/publish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,QAAQ,EAET,MAAM,kDAAkD,CAAC;AA0I1D,wBAAsB,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,iBAkB7D;AAED,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,OAAO,iBA0BlB"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"AAwBA,OAAO,EACL,QAAQ,EAET,MAAM,kDAAkD,CAAC;AAiM1D,wBAAsB,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,iBAkB7D;AAED,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,OAAO,iBA0BlB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mochabug/adaptkit",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "A cmd to create, emulate and publish Mochabug Adapt plugins",
   "main": "bin/index.js",
   "type": "module",
@@ -47,6 +47,7 @@
     "@rollup/plugin-replace": "^5.0.7",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
+    "@types/archiver": "^6.0.2",
     "@types/express": "^4.17.21",
     "@types/figlet": "^1.5.8",
     "@types/jest": "^29.5.12",
@@ -66,6 +67,7 @@
     "@protobuf-ts/grpc-transport": "^2.9.4",
     "@protobuf-ts/runtime": "^2.9.4",
     "@protobuf-ts/runtime-rpc": "^2.9.4",
+    "archiver": "^7.0.1",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "express": "^4.19.2",
@@ -79,4 +81,4 @@
     "sharp": "^0.33.5",
     "update-notifier": "^7.3.0"
   }
-}
+}