@liquidmetal-ai/raindrop 0.0.7 → 0.1.0

package/dist/commands/build/upload.js

@@ -18,7 +18,13 @@ export default class Upload extends BaseCommand {
             required: false,
             default: 'raindrop.manifest',
         }),
-        config: Flags.string({ char: 'c', description: 'config file', required: false, default: '.raindrop/config.json' }),
+        config: Flags.string({
+            char: 'c',
+            description: 'config file',
+            required: false,
+            hidden: true,
+            default: '.raindrop/config.json',
+        }),
         output: Flags.string({ char: 'o', description: 'output directory', required: false, default: 'dist' }),
         versionId: Flags.string({ char: 'v', description: 'version ID', required: true }),
         impersonate: Flags.string({
@@ -32,6 +38,11 @@ export default class Upload extends BaseCommand {
             hidden: true,
             env: 'LIQUIDMETAL_RAINBOW_AUTH_SERVICE',
         }),
+        raindropCatalogService: Flags.string({
+            env: 'RAINDROP_CATALOG_SERVICE',
+            description: 'URL of the catalog service',
+            hidden: true,
+        }),
     };
     async run() {
         const apps = await this.loadManifest();

package/dist/commands/build/validate.d.ts

@@ -6,6 +6,7 @@ export default class Build extends BaseCommand<typeof Build> {
     static flags: {
         root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         manifest: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/dist/commands/build/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/build/validate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,IAAI,KAAM;IAE1B,OAAgB,WAAW,SAAiD;IAE5E,OAAgB,QAAQ,WAA2C;IAEnE,OAAgB,KAAK;;;;MASnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAQlC"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/build/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAiBpD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,IAAI,KAAM;IAE1B,OAAgB,WAAW,SAAiD;IAE5E,OAAgB,QAAQ,WAA2C;IAEnE,OAAgB,KAAK;;;;;MAgBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsBlC"}

package/dist/commands/build/validate.js

@@ -1,7 +1,20 @@
 import { Flags } from '@oclif/core';
+import { spawn } from 'node:child_process';
 import path from 'node:path';
 import { BaseCommand } from '../../base-command.js';
 import { buildHandlers } from '../../build.js';
+async function runTypeCheck(root) {
+    return new Promise((resolve) => {
+        const tsc = spawn('npx', ['tsc', '--noEmit'], {
+            cwd: root,
+            stdio: 'inherit', // Inherit stdio to show compiler output in real-time
+            shell: true,
+        });
+        tsc.on('exit', (code) => {
+            resolve(code === 0);
+        });
+    });
+}
 export default class Build extends BaseCommand {
     static args = {};
     static description = 'build and validate a LiquidMetal.AI project';
@@ -14,10 +27,29 @@ export default class Build extends BaseCommand {
             required: false,
             default: 'raindrop.manifest',
         }),
+        config: Flags.string({
+            char: 'c',
+            description: 'config file',
+            required: false,
+            hidden: true,
+            default: '.raindrop/config.json',
+        }),
         output: Flags.string({ char: 'o', description: 'output directory', required: false, default: 'dist' }),
     };
     async run() {
         const apps = await this.loadManifest();
+        const version = await this.raindropFrameworkVersion();
+        if (version === null) {
+            this.error('Failed to determine @liquidmetal-ai/raindrop-framework version; is it installed?', { exit: 1 });
+        }
+        this.log(`Using @liquidmetal-ai/raindrop-framework version ${version}`);
+        // Run TypeScript type checking
+        this.log('Running type check...');
+        const typeCheckPassed = await runTypeCheck(this.flags.root);
+        if (!typeCheckPassed) {
+            this.error('Type check failed. Please fix the TypeScript errors before building.');
+        }
+        this.log('Type check passed');
         const buildDir = path.isAbsolute(this.flags.output)
             ? this.flags.output
             : path.join(this.flags.root, this.flags.output);

package/dist/commands/tail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tail.d.ts","sourceRoot":"","sources":["../../src/commands/tail.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,WAAW,SAAwC;IAE1D,MAAM,CAAC,KAAK;;;;MAiBV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuB3B"}
+{"version":3,"file":"tail.d.ts","sourceRoot":"","sources":["../../src/commands/tail.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,WAAW,SAAwC;IAE1D,MAAM,CAAC,KAAK;;;;MAiBV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkC3B"}

package/dist/commands/tail.js

@@ -29,12 +29,24 @@ export default class Tail extends BaseCommand {
             organizationId,
             userId,
         });
-        const socket = new Socket(websocketUrl, undefined, {
-            heartbeatInterval: 30000,
-        });
+        let socket;
+        try {
+            socket = new Socket(websocketUrl, undefined, {
+                heartbeatInterval: 30000,
+            });
+        }
+        catch (e) {
+            const err = e;
+            if (typeof WebSocket !== 'undefined') {
+                this.error('WebSocket is unavailable in this version of node. Please upgrade before continuing.', {
+                    exit: 1,
+                });
+            }
+            this.error(`Failed to connect to websocket ${err.message}`, { exit: 1 });
+        }
         socket.addEventListener('message', (e) => {
             const msg = TailWebsocketMessage.fromJsonString(e.data);
-            console.log(msg);
+            console.log(msg.toJsonString());
         });
         return new Promise((resolve) => {
             socket.on('close', () => {

package/dist/index.d.ts

@@ -1,18 +1,42 @@
-import { ServiceType } from '@bufbuild/protobuf';
-import { PromiseClient } from '@connectrpc/connect';
+import { Interceptor, PromiseClient } from '@connectrpc/connect';
 import { Application } from '@liquidmetal-ai/drizzle/appify/build';
+import { CatalogService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/catalog_connect';
 import { RainbowAuthService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/rainbow_auth_connect';
+import { RainbowPublicService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/rainbow_public_connect';
 import { RaindropState } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/raindrop_pb';
 export { run } from '@oclif/core';
 export declare function configFromAppFile(appFile: string): Promise<Application[]>;
 export declare function joinPath(...parts: string[]): string;
-export declare function useClient<T extends ServiceType>(service: T, baseUrl: string): PromiseClient<T>;
-export declare function createAuthenticatingClient<T extends ServiceType>(service: T, configDir: string, rainbowAuth: PromiseClient<typeof RainbowAuthService>): Promise<{
-    client: PromiseClient<T>;
-    userId: string;
+export declare function selectedOrganization(configDir: string): Promise<{
+    catalogServiceBaseUrl: string;
     organizationId: string;
+    userId: string;
 }>;
+export declare function createAuthenticateInterceptor(configDir: string, rainbowAuth: PromiseClient<typeof RainbowAuthService>): {
+    authenticate: Interceptor;
+};
 export declare function readState(configDir: string): Promise<RaindropState>;
 export declare function replaceState(configDir: string, state: RaindropState): Promise<void>;
 export declare function ensureDirectory(dir: string): Promise<void>;
+export declare function catalogService({ rainbowAuth, configDir, baseUrl, }: {
+    rainbowAuth: PromiseClient<typeof RainbowAuthService>;
+    configDir: string;
+    baseUrl?: string;
+}): Promise<{
+    client: PromiseClient<typeof CatalogService>;
+    userId: string;
+    organizationId: string;
+}>;
+export declare function rainbowAuthService(baseUrl: string): Promise<{
+    client: PromiseClient<typeof RainbowAuthService>;
+}>;
+export declare function rainbowPublicService({ baseUrl, configDir, rainbowAuth, }: {
+    baseUrl: string;
+    configDir: string;
+    rainbowAuth: PromiseClient<typeof RainbowAuthService>;
+}): Promise<{
+    client: PromiseClient<typeof RainbowPublicService>;
+    organizationId: string;
+    userId: string;
+}>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAoC,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEtF,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mEAAmE,CAAC;AAEvG,OAAO,EAAE,aAAa,EAAE,MAAM,0DAA0D,CAAC;AAKzF,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAG/E;AAGD,wBAAgB,QAAQ,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAEnD;AAGD,wBAAgB,SAAS,CAAC,CAAC,SAAS,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,CAM9F;AA8FD,wBAAsB,0BAA0B,CAAC,CAAC,SAAS,WAAW,EACpE,OAAO,EAAE,CAAC,EACV,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,aAAa,CAAC,OAAO,kBAAkB,CAAC,GACpD,OAAO,CAAC;IAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,CAkB/E;AAID,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAUzE;AAED,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CASzF;AAGD,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEtF,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mEAAmE,CAAC;AAEvG,OAAO,EAAE,oBAAoB,EAAE,MAAM,qEAAqE,CAAC;AAC3G,OAAO,EAAE,aAAa,EAAE,MAAM,0DAA0D,CAAC;AAKzF,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAG/E;AAGD,wBAAgB,QAAQ,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAEnD;AAgDD,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IACrE,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAgBD;AAKD,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,aAAa,CAAC,OAAO,kBAAkB,CAAC,GACpD;IAAE,YAAY,EAAE,WAAW,CAAA;CAAE,CAY/B;AAID,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAUzE;AAED,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CASzF;AAGD,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhE;AAED,wBAAsB,cAAc,CAAC,EACnC,WAAW,EACX,SAAS,EACT,OAAO,GACR,EAAE;IACD,WAAW,EAAE,aAAa,CAAC,OAAO,kBAAkB,CAAC,CAAC;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,aAAa,CAAC,OAAO,cAAc,CAAC,CAAC;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC,CAgBD;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACjE,MAAM,EAAE,aAAa,CAAC,OAAO,kBAAkB,CAAC,CAAC;CAClD,CAAC,CASD;AAED,wBAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,SAAS,EACT,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,aAAa,CAAC,OAAO,kBAAkB,CAAC,CAAC;CACvD,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,aAAa,CAAC,OAAO,oBAAoB,CAAC,CAAC;IACnD,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAeD"}

package/dist/index.js

@@ -1,6 +1,9 @@
 import { createPromiseClient } from '@connectrpc/connect';
 import { createConnectTransport } from '@connectrpc/connect-web';
 import { mustManifestFromString } from '@liquidmetal-ai/drizzle/appify/index';
+import { CatalogService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/catalog_connect';
+import { RainbowAuthService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/rainbow_auth_connect';
+import { RainbowPublicService } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/rainbow_public_connect';
 import { RaindropState } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/raindrop_pb';
 import { Mutex } from 'async-mutex';
 import * as fs from 'node:fs/promises';
@@ -14,13 +17,6 @@ export async function configFromAppFile(appFile) {
 export function joinPath(...parts) {
     return parts.join('/').replace(/\/+/g, '/');
 }
-// useClient returns a promise client for the given service at baseUrl.
-export function useClient(service, baseUrl) {
-    const transport = createConnectTransport({
-        baseUrl,
-    });
-    return createPromiseClient(service, transport);
-}
 const accessTokenAndRefreshMutex = new Mutex();
 // bearerTokenAndRefresh returns an access token for the currently selected
 // organization based on the raindrop state found in the config directory. If
@@ -57,50 +53,32 @@ async function bearerTokenAndRefresh(configDir, rainbowAuth) {
         return token;
     });
 }
+export async function selectedOrganization(configDir) {
+    const state = await readState(configDir);
+    if (!state.currentOrganizationId) {
+        throw new Error('not logged in');
+    }
+    const token = state.organizationIdToBearerToken[state.currentOrganizationId];
+    if (!token) {
+        throw new Error('no credentials set for current organization');
+    }
+    return {
+        catalogServiceBaseUrl: token.catalogServiceBaseUrl,
+        organizationId: token.organizationId,
+        userId: token.userId,
+    };
+}
 // createAuthenticateInterceptor returns a connect rpc interceptor which ensures
 // that the user is logged in with an active access token and automatically
 // refreshes the access tokens when making requests.
-async function createAuthenticateInterceptor(service, configDir, rainbowAuth) {
-    const { userId, organizationId, catalogServiceBaseUrl } = await bearerTokenAndRefresh(configDir, rainbowAuth);
-    const interceptor = (next) => async (req) => {
+export function createAuthenticateInterceptor(configDir, rainbowAuth) {
+    const authenticate = (next) => async (req) => {
         const { accessToken } = await bearerTokenAndRefresh(configDir, rainbowAuth);
         req.header.set('Authorization', `Bearer ${accessToken}`);
         return await next(req);
     };
-    let baseUrl = '';
-    switch (service.typeName) {
-        case 'liquidmetal.v1alpha1.CatalogService':
-            baseUrl = catalogServiceBaseUrl;
-            if (process.env.RAINDROP_CATALOG_API_BASE_URL) {
-                baseUrl = process.env.RAINDROP_CATALOG_API_BASE_URL;
-                // Prepend missing protocol if missing
-                if (!baseUrl.match(/^http(s):\/\//)) {
-                    baseUrl = `https://${baseUrl}`;
-                }
-            }
-            break;
-        default:
-            throw new Error(`unable to determine baseUrl for service=${service.typeName}`);
-    }
-    return {
-        interceptor,
-        userId,
-        organizationId,
-        baseUrl,
-    };
-}
-// createAuthenticatingClient should be used for instantiating any connect rpc
-// client that needs to authenticate the requests.
-export async function createAuthenticatingClient(service, configDir, rainbowAuth) {
-    const { interceptor: authenticate, baseUrl, userId, organizationId, } = await createAuthenticateInterceptor(service, configDir, rainbowAuth);
-    const transport = createConnectTransport({
-        baseUrl,
-        interceptors: [authenticate],
-    });
     return {
-        client: createPromiseClient(service, transport),
-        userId,
-        organizationId,
+        authenticate,
     };
 }
 const configBasename = 'raindrop.json';
@@ -138,3 +116,35 @@ export async function ensureDirectory(dir) {
         }
     }
 }
+export async function catalogService({ rainbowAuth, configDir, baseUrl, }) {
+    const { catalogServiceBaseUrl, organizationId, userId } = await selectedOrganization(configDir);
+    const { authenticate } = createAuthenticateInterceptor(configDir, rainbowAuth);
+    const serviceBaseUrl = baseUrl || catalogServiceBaseUrl;
+    return {
+        client: createPromiseClient(CatalogService, createConnectTransport({
+            baseUrl: serviceBaseUrl,
+            interceptors: [authenticate],
+        })),
+        userId,
+        organizationId,
+    };
+}
+export async function rainbowAuthService(baseUrl) {
+    return {
+        client: createPromiseClient(RainbowAuthService, createConnectTransport({
+            baseUrl,
+        })),
+    };
+}
+export async function rainbowPublicService({ baseUrl, configDir, rainbowAuth, }) {
+    const { organizationId, userId } = await selectedOrganization(configDir);
+    const { authenticate } = createAuthenticateInterceptor(configDir, rainbowAuth);
+    return {
+        client: createPromiseClient(RainbowPublicService, createConnectTransport({
+            baseUrl,
+            interceptors: [authenticate],
+        })),
+        organizationId,
+        userId,
+    };
+}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/base-command.ts","../src/build.test.ts","../src/build.ts","../src/codegen.test.ts","../src/codegen.ts","../src/config.test.ts","../src/config.ts","../src/index.test.ts","../src/index.ts","../src/commands/tail.ts","../src/commands/auth/list.ts","../src/commands/auth/login.ts","../src/commands/auth/logout.ts","../src/commands/auth/select.ts","../src/commands/build/branch.ts","../src/commands/build/delete.ts","../src/commands/build/deploy.ts","../src/commands/build/find.ts","../src/commands/build/generate.ts","../src/commands/build/init.ts","../src/commands/build/list.ts","../src/commands/build/sandbox.ts","../src/commands/build/start.ts","../src/commands/build/stop.ts","../src/commands/build/token.ts","../src/commands/build/unsandbox.ts","../src/commands/build/upload.ts","../src/commands/build/validate.ts","../src/commands/build/env/get.ts","../src/commands/build/env/set.ts","../src/commands/build/tools/check.ts","../src/commands/build/tools/fmt.ts"],"version":"5.6.2"}
+{"root":["../src/base-command.ts","../src/build.test.ts","../src/build.ts","../src/codegen.test.ts","../src/codegen.ts","../src/config.test.ts","../src/config.ts","../src/index.test.ts","../src/index.ts","../src/commands/tail.ts","../src/commands/auth/list.ts","../src/commands/auth/login.ts","../src/commands/auth/logout.ts","../src/commands/auth/select.ts","../src/commands/build/branch.ts","../src/commands/build/delete.ts","../src/commands/build/deploy.ts","../src/commands/build/find.ts","../src/commands/build/generate.ts","../src/commands/build/init.ts","../src/commands/build/list.ts","../src/commands/build/sandbox.ts","../src/commands/build/start.ts","../src/commands/build/status.ts","../src/commands/build/stop.ts","../src/commands/build/token.ts","../src/commands/build/unsandbox.ts","../src/commands/build/upload.ts","../src/commands/build/validate.ts","../src/commands/build/env/get.ts","../src/commands/build/env/set.ts","../src/commands/build/tools/check.ts","../src/commands/build/tools/fmt.ts"],"version":"5.6.2"}