@asterai/cli 0.3.0 → 0.3.2

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @asterai/cli
 $ asterai COMMAND
 running command...
 $ asterai (--version)
-@asterai/cli/0.3.0 linux-x64 node-v20.12.2
+@asterai/cli/0.3.2 linux-x64 node-v20.12.2
 $ asterai --help [COMMAND]
 USAGE
   $ asterai COMMAND
@@ -53,7 +53,7 @@ EXAMPLES
   $ asterai auth
 ```
 
-_See code: [src/commands/auth.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.0/src/commands/auth.ts)_
+_See code: [src/commands/auth.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/auth.ts)_
 
 ## `asterai build [INPUT]`
 
@@ -73,7 +73,7 @@ EXAMPLES
   $ asterai build
 ```
 
-_See code: [src/commands/build.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.0/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/build.ts)_
 
 ## `asterai codegen`
 
@@ -81,11 +81,14 @@ Generate code from the plugin manifest
 
 ```
 USAGE
-  $ asterai codegen [-m <value>] [-o <value>]
+  $ asterai codegen [-m <value>] [-o <value>] [-a <value>] [-l <value>] [-s]
 
 FLAGS
+  -a, --appId=<value>      app id
+  -l, --language=<value>   [default: js] language of generated typings
   -m, --manifest=<value>   [default: plugin.asterai.proto] manifest path
   -o, --outputDir=<value>  [default: generated] output directory
+  -s, --staging            use staging endpoint
 
 DESCRIPTION
   Generate code from the plugin manifest
@@ -94,7 +97,7 @@ EXAMPLES
   $ asterai codegen
 ```
 
-_See code: [src/commands/codegen.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.0/src/commands/codegen.ts)_
+_See code: [src/commands/codegen.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/codegen.ts)_
 
 ## `asterai deploy [INPUT]`
 
@@ -117,7 +120,7 @@ EXAMPLES
   $ asterai deploy --app 66a46b12-b1a7-4b72-a64a-0e4fe21902b6
 ```
 
-_See code: [src/commands/deploy.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.0/src/commands/deploy.ts)_
+_See code: [src/commands/deploy.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/deploy.ts)_
 
 ## `asterai help [COMMAND]`
 
@@ -154,5 +157,5 @@ EXAMPLES
   $ asterai init project-name
 ```
 
-_See code: [src/commands/init.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.0/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/init.ts)_
 <!-- commandsstop -->

package/dist/commands/codegen.d.ts

@@ -2,6 +2,9 @@ import { Command } from "@oclif/core";
 export type CodegenFlags = {
     manifest: string;
     outputDir: string;
+    appId?: string;
+    language?: string;
+    staging?: boolean;
 };
 export default class Codegen extends Command {
     static args: {};
@@ -10,7 +13,10 @@ export default class Codegen extends Command {
     static flags: {
         manifest: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         outputDir: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        appId: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        language: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        staging: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }
-export declare const codegen: (flags: CodegenFlags) => void;
+export declare const codegen: (flags: CodegenFlags) => Promise<void>;

package/dist/commands/codegen.js

@@ -2,8 +2,13 @@ import { Command, Flags } from "@oclif/core";
 import path from "path";
 import fs from "fs";
 import { execSync } from "node:child_process";
+import axios from "axios";
+import { getConfigValue } from "../config.js";
+import os from "os";
 // Relative path from the plugin root directory.
 const AS_PROTO_GEN_PATH = "./node_modules/.bin/as-proto-gen";
+const PRODUCTION_ENDPOINT_BASE_URL = "https://api.asterai.io";
+const STAGING_ENDPOINT_BASE_URL = "https://staging.api.asterai.io";
 export default class Codegen extends Command {
     static args = {};
     static description = "Generate code from the plugin manifest";
@@ -19,6 +24,23 @@ export default class Codegen extends Command {
             description: "output directory",
             default: "generated",
         }),
+        appId: Flags.string({
+            char: "a",
+            description: "app id",
+            required: false,
+        }),
+        language: Flags.string({
+            char: "l",
+            description: "language of generated typings",
+            required: false,
+            default: "js",
+        }),
+        staging: Flags.boolean({
+            char: "s",
+            description: "use staging endpoint",
+            required: false,
+            default: false,
+        }),
     };
     async run() {
         const { flags } = await this.parse(Codegen);
@@ -35,6 +57,12 @@ export const codegen = (flags) => {
     else {
         deleteOldGeneratedFiles(outDir);
     }
+    if (flags.appId && flags.language) {
+        return generateClientTypings(outDir, flags.language, flags.appId, flags.staging ?? false);
+    }
+    return generateAssemblyScriptPluginTypings(flags, baseDir);
+};
+const generateAssemblyScriptPluginTypings = async (flags, baseDir) => {
     const absoluteAsProtoGenPath = path.join(baseDir, AS_PROTO_GEN_PATH);
     try {
         execSync("protoc --version");
@@ -66,3 +94,56 @@ const deleteOldGeneratedFiles = (outDir) => {
         fs.unlinkSync(deletePath);
     }
 };
+const generateClientTypings = async (outDir, language, appId, shouldUseStaging) => {
+    const manifestsResponse = await downloadEnabledPluginsManifests(appId, shouldUseStaging);
+    const asteraiProto = await fetchAsteraiProto();
+    const aggregatedManifest = aggregateManifests(manifestsResponse.manifests, asteraiProto);
+    const appPrefix = `app.${appId}`;
+    fs.writeFileSync(path.join(outDir, `${appPrefix}.proto`), aggregatedManifest.content);
+    if (language === "ts") {
+        console.log("generating TypeScript typings for plugin manifest...");
+        const jsOutput = `${appPrefix}.js`;
+        const dTsOutput = `${appPrefix}.d.ts`;
+        execSync(`
+      npx -p protobufjs-cli pbjs -t static --no-service ${aggregatedManifest.filePath} -o ${path.join(outDir, jsOutput)}
+    `);
+        execSync(`
+      npx -p protobufjs-cli pbts -o ${path.join(outDir, dTsOutput)} ${path.join(outDir, jsOutput)}
+    `);
+        fs.unlinkSync(aggregatedManifest.filePath);
+        console.log("Typings generated successfully.");
+    }
+    console.log("done.");
+};
+const fetchAsteraiProto = () => {
+    // TODO: fetch this from the local file system instead.
+    return axios
+        .get("https://unpkg.com/@asterai/sdk@latest/protobuf/asterai.proto")
+        .then(r => r.data);
+};
+const aggregateManifests = (manifests, asteraiProto) => {
+    let aggregatedManifest = `${asteraiProto}\n`;
+    const osTmpDir = os.tmpdir();
+    const aggregatedManifestPath = path.join(osTmpDir, "plugins.asterai.proto");
+    for (const manifest of manifests) {
+        aggregatedManifest += `${manifest.proto}\n`;
+    }
+    fs.writeFileSync(aggregatedManifestPath, aggregatedManifest);
+    return {
+        content: aggregatedManifest,
+        filePath: aggregatedManifestPath,
+    };
+};
+const downloadEnabledPluginsManifests = async (appId, shouldUseStaging) => {
+    const baseUrl = shouldUseStaging
+        ? STAGING_ENDPOINT_BASE_URL
+        : PRODUCTION_ENDPOINT_BASE_URL;
+    const response = await axios({
+        url: `${baseUrl}/app/${appId}/plugin/manifests`,
+        method: "GET",
+        headers: {
+            Authorization: getConfigValue("key"),
+        },
+    });
+    return response.data;
+};

package/oclif.manifest.json

@@ -91,6 +91,33 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "appId": {
+          "char": "a",
+          "description": "app id",
+          "name": "appId",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "language": {
+          "char": "l",
+          "description": "language of generated typings",
+          "name": "language",
+          "required": false,
+          "default": "js",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "staging": {
+          "char": "s",
+          "description": "use staging endpoint",
+          "name": "staging",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -198,5 +225,5 @@
       ]
     }
   },
-  "version": "0.3.0"
+  "version": "0.3.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asterai/cli",
   "description": "CLI for building and deploying asterai plugins",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "author": "asterai <support@asterai.io>",
   "repository": "asterai-io/asterai-sdk",
   "homepage": "https://github.com/asterai-io/asterai-sdk",