@mochabug/adaptkit 0.8.7 → 0.8.9

package/bin/index.js

@@ -5,7 +5,7 @@ import figlet from 'figlet';
 import isValidHostname from 'is-valid-hostname';
 import fs from 'fs';
 import inquirer from 'inquirer';
-import { ServiceType, stackIntercept } from '@protobuf-ts/runtime-rpc';
+import { ServiceType, stackIntercept, RpcError } from '@protobuf-ts/runtime-rpc';
 import { MessageType, reflectionMergePartial, UnknownFieldHandler, WireType } from '@protobuf-ts/runtime';
 import { mkdirp } from 'mkdirp';
 import path from 'path';
@@ -1475,17 +1475,6 @@ class PluginServiceClient {
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-function printStatus(status) {
-    if (status.code !== 'OK') {
-        console.error('Error: The server returned a non-successful status code.');
-        console.error(`Status Code: ${status.code}`);
-        console.error(`Details: ${status.detail}`);
-        console.log(chalk.bgRed('FAILURE'));
-    }
-    else {
-        console.log(chalk.green('Stream message was sent successfully'));
-    }
-}
 async function resize(filepath, height, width) {
     const extname = path.extname(filepath);
     switch (extname) {
@@ -1508,14 +1497,21 @@ async function resize(filepath, height, width) {
     }
     throw new Error('Invalid logotype');
 }
+function isPathSafe(filePath) {
+    const currentWorkingDir = path.resolve('.');
+    const absoluteFilePath = path.resolve(filePath);
+    return absoluteFilePath.startsWith(currentWorkingDir);
+}
 async function sendPlugin(manifest, client, metadata) {
     console.log('Sending the plugin to the server');
     const stream = client.uploadPlugin({ meta: metadata });
     const lookup = {};
-    // Returns success / false
     async function send(filePath, imgOpts) {
         if (!filePath || lookup[filePath]) {
-            return true;
+            return;
+        }
+        if (!isPathSafe(filePath)) {
+            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`);
@@ -1539,11 +1535,9 @@ async function sendPlugin(manifest, client, metadata) {
                 }
             }
         };
-        await stream.requests.send(message);
+        // The idea here is that we will have an RPC error if the server has returned an error
+        await Promise.race([stream.requests.send(message), stream.status]);
         lookup[filePath] = true;
-        const status = await stream.status;
-        printStatus(status);
-        return status.code === 'OK';
     }
     // The first message must be the manifest
     // All the other messages must be files and must be described in the manifest
@@ -1554,68 +1548,39 @@ async function sendPlugin(manifest, client, metadata) {
         }
     };
     await stream.requests.send(request);
-    printStatus(await stream.status);
-    let success = await send('README.md');
-    if (!success) {
-        return;
-    }
-    success = await send('LICENSE.md');
-    if (!success) {
-        return;
-    }
-    success = await send(manifest.executorEsm);
-    if (!success) {
-        return;
-    }
-    success = await send(manifest.configuratorEsm);
-    if (!success) {
-        return;
-    }
-    success = await send(manifest.logo, [80, 80]);
-    if (!success) {
-        return;
-    }
+    await send('README.md');
+    await send('LICENSE.md');
+    await send(manifest.executorEsm);
+    await send(manifest.configuratorEsm);
+    await send(manifest.logo, [80, 80]);
     // Send everything inside the asset directory as assets
     if (manifest.assetsDir && fs.existsSync(manifest.assetsDir)) {
         const paths = await fg(path.join(manifest.assetsDir, '**', '*'));
         for (let filepath of paths) {
             if (fs.statSync(filepath).isFile()) {
-                success = await send(filepath);
-                if (!success) {
-                    return;
-                }
+                await send(filepath);
             }
         }
     }
     // Send everything related to the vertices. Logos, schemas and configs
     for (let vertex of manifest.vertices) {
-        success = await send(vertex.logo, [40, 40]);
-        if (!success) {
-            return;
-        }
-        success = await send(vertex.defaultConfig);
-        if (!success) {
-            return;
-        }
+        await send(vertex.logo, [40, 40]);
+        await send(vertex.defaultConfig);
         for (let mtls of vertex.mtls) {
-            success = await send(mtls.trustedCa);
-            if (!success) {
-                return;
-            }
+            await send(mtls.trustedCa);
         }
     }
     // Send the ca bundles
     for (let mtls of manifest.mtls) {
-        success = await send(mtls.trustedCa);
-        if (!success) {
-            return;
-        }
+        await send(mtls.trustedCa);
     }
     await stream.requests.complete();
+    const status = await stream.status;
+    console.error(chalk.green(`Status Code: ${status.code}`));
+    console.error(chalk.green(`Details: ${status.detail}`));
     const result = await stream.response;
-    console.log(chalk.bgGreen('SUCCESS'));
-    console.log(chalk.green('Publishing done'));
     console.log(result);
+    console.log(chalk.bgGreen('SUCCESS'));
 }
 async function emulate(manifest, host) {
     const transport = new GrpcTransport({
@@ -1627,8 +1592,13 @@ async function emulate(manifest, host) {
         await sendPlugin(manifest, client);
     }
     catch (e) {
-        console.error(e);
-        console.log(`For more information, use: ${chalk.blue('adaptkit help emulate')}`);
+        if (e instanceof RpcError) {
+            printRpcError(e);
+        }
+        else {
+            console.error(e);
+        }
+        console.log(`For more information, use: ${chalk.blue('adaptkit help publish')}`);
     }
 }
 async function publish(manifest, host, accessToken, insecure) {
@@ -1646,13 +1616,47 @@ async function publish(manifest, host, accessToken, insecure) {
         await sendPlugin(manifest, client, metadata);
     }
     catch (e) {
-        console.error(e);
+        if (e instanceof RpcError) {
+            printRpcError(e);
+        }
+        else {
+            console.error(e);
+        }
         console.log(`For more information, use: ${chalk.blue('adaptkit help publish')}`);
     }
 }
+function printRpcError(error) {
+    const line = chalk.red('--------------------------------------------------');
+    const title = chalk.bold.red('RPC Error Details');
+    const name = chalk.bold.white('Name: ') + chalk.redBright(error.name);
+    const message = chalk.bold.white('Message: ') + chalk.redBright(error.message);
+    const code = chalk.bold.white('Code: ') + chalk.redBright(error.code);
+    const methodName = error.methodName
+        ? chalk.bold.white('Method Name: ') + chalk.yellowBright(error.methodName)
+        : '';
+    const serviceName = error.serviceName
+        ? chalk.bold.white('Service Name: ') + chalk.yellowBright(error.serviceName)
+        : '';
+    const meta = chalk.bold.white('Metadata: ') +
+        (error.meta
+            ? chalk.blue(JSON.stringify(error.meta, null, 2))
+            : chalk.gray('No Metadata'));
+    console.error(line);
+    console.error(title);
+    console.error(line);
+    console.error(name);
+    console.error(message);
+    console.error(code);
+    if (methodName)
+        console.error(methodName);
+    if (serviceName)
+        console.error(serviceName);
+    console.error(meta);
+    console.error(line);
+}
 
 var name = "@mochabug/adaptkit";
-var version = "0.8.7";
+var version = "0.8.9";
 var description = "A cmd to create, emulate and publish Mochabug Adapt plugins";
 var main$1 = "bin/index.js";
 var type = "module";

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;AAyK1D,wBAAsB,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,iBAc7D;AAED,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,OAAO,iBAoBlB"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,QAAQ,EAET,MAAM,kDAAkD,CAAC;AAwI1D,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,iBAwBlB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mochabug/adaptkit",
-  "version": "0.8.7",
+  "version": "0.8.9",
   "description": "A cmd to create, emulate and publish Mochabug Adapt plugins",
   "main": "bin/index.js",
   "type": "module",