@liquidmetal-ai/raindrop 0.2.11 → 0.2.12

package/dist/commands/build/find.js

@@ -4,7 +4,7 @@ import { Flags } from '@oclif/core';
 import { BaseCommand } from '../../base-command.js';
 import { EPOCH_TS } from '../../index.js';
 import { toJsonString } from '@bufbuild/protobuf';
-import { QueryResourcesResponseSchema } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/catalog_pb';
+import { QueryModulesResponseSchema, QueryResourcesResponseSchema, } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/catalog_pb';
 export default class Find extends BaseCommand {
     static args = {};
     static description = 'find resources in Raindrop';
@@ -31,6 +31,10 @@ export default class Find extends BaseCommand {
             description: 'application version',
             required: false,
         }),
+        moduleType: Flags.string({
+            description: 'filter by module type (e.g. smartbucket)',
+            required: false,
+        }),
         output: Flags.string({
             char: 'o',
             description: 'output format',
@@ -51,6 +55,50 @@ export default class Find extends BaseCommand {
             hidden: true,
         }),
     };
+    async queryModules(flags) {
+        if (!flags.version) {
+            const config = await this.loadConfig();
+            flags.version = config.versionId;
+        }
+        if (!flags.application) {
+            const apps = await this.loadManifest();
+            const app = apps[0];
+            if (app === undefined) {
+                this.error('No application provided or found in manifest', { exit: 1 });
+            }
+            flags.application = valueOf(app.name);
+        }
+        const { client: catalogService, userId, organizationId: defaultOrganizationId } = await this.catalogService();
+        const organizationId = this.flags.impersonate ?? defaultOrganizationId;
+        const resp = await catalogService.queryModules({
+            userId,
+            applicationName: flags.application,
+            applicationVersionId: flags.version,
+            organizationId,
+            moduleType: flags.moduleType,
+        });
+        if (flags.output === 'table') {
+            console.table(resp.modules.reduce((acc, v) => {
+                acc[v.name] = {
+                    ...v,
+                    attributes: JSON.stringify(v.attributes),
+                    createdAt: timestampDate(v.createdAt || EPOCH_TS).toISOString(),
+                    updatedAt: timestampDate(v.updatedAt || EPOCH_TS).toISOString(),
+                };
+                return acc;
+            }, 
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            {}), ['moduleId', 'name', 'type', 'attributes', 'createdAt', 'updatedAt']);
+        }
+        else if (flags.output === 'json') {
+            console.log(toJsonString(QueryModulesResponseSchema, resp, { prettySpaces: 2 }));
+        }
+        else {
+            for (const m of resp.modules) {
+                console.log(`${m.moduleId} ${m.name} ${m.type} ${timestampDate(m.createdAt || EPOCH_TS).toISOString()} ${timestampDate(m.updatedAt || EPOCH_TS).toISOString()} ${JSON.stringify(m.attributes)}`);
+            }
+        }
+    }
     async queryResources(flags) {
         if (!flags.version) {
             const config = await this.loadConfig();
@@ -76,12 +124,11 @@ export default class Find extends BaseCommand {
             console.table(resp.resources.reduce((acc, v) => {
                 acc[v.name] = {
                     ...v,
-                    attributes: JSON.stringify(v.attributes, null, 2),
                 };
                 return acc;
             }, 
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            {}), ['name', 'resourceId', 'applicationName', 'applicationVersionId', 'type', 'attributes']);
+            {}), ['name', 'resourceId', 'applicationName', 'applicationVersionId', 'type']);
         }
         else if (flags.output === 'json') {
             console.log(toJsonString(QueryResourcesResponseSchema, resp, { prettySpaces: 2 }));
@@ -97,7 +144,7 @@ export default class Find extends BaseCommand {
             await this.queryResources(this.flags);
         }
         else {
-            this.error('Not implemented, try --sudo mode', { exit: 1 });
+            await this.queryModules(this.flags);
         }
     }
 }

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

@@ -1,13 +1,12 @@
 import { BaseCommand } from '../../base-command.js';
 export default class Sandbox extends BaseCommand<typeof Sandbox> {
-    static args: {
-        versionId: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
-    };
+    static args: {};
     static description: string;
     static examples: string[];
     static flags: {
         impersonate: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         manifest: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        version: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         rainbowAuthService: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         raindropCatalogService: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

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

@@ -1 +1 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../src/commands/build/sandbox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,WAAW,CAAC,OAAO,OAAO,CAAC;IAC9D,MAAM,CAAC,IAAI;;MAET;IACF,MAAM,CAAC,WAAW,SAAyD;IAE3E,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;MASV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA6B3B"}
+{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../src/commands/build/sandbox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,WAAW,CAAC,OAAO,OAAO,CAAC;IAC9D,MAAM,CAAC,IAAI,KAAM;IACjB,MAAM,CAAC,WAAW,SAAyD;IAE3E,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;MAcV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA6B3B"}

package/dist/commands/build/sandbox.js

@@ -1,10 +1,8 @@
 import { valueOf } from '@liquidmetal-ai/drizzle/appify/build';
-import { Args, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import { BaseCommand } from '../../base-command.js';
 export default class Sandbox extends BaseCommand {
-    static args = {
-        versionId: Args.string({ char: 'v', description: 'version to sandbox', required: false }),
-    };
+    static args = {};
     static description = 'mark a version as sandboxed in the Raindrop catalog';
     static examples = [
         `<%= config.bin %> <%= command.id %>
@@ -19,6 +17,11 @@ export default class Sandbox extends BaseCommand {
             hidden: true,
         }),
         manifest: Flags.string({ default: 'raindrop.manifest', description: 'project manifest' }),
+        version: Flags.string({
+            char: 'v',
+            description: 'application version to sandbox',
+            required: false,
+        }),
     };
     async run() {
         const config = await this.loadConfig();
@@ -29,7 +32,7 @@ export default class Sandbox extends BaseCommand {
         const organizationId = this.flags.impersonate ?? defaultOrganizationId;
         const apps = await this.loadManifest();
         const app = apps[0];
-        const versionId = this.args.versionId ?? config.versionId;
+        const versionId = this.flags.version ?? config.versionId;
         if (!app) {
             this.error('No application found');
         }

package/dist/commands/build/start.js

@@ -51,7 +51,7 @@ Start a Raindrop application.
             }
             applicationName = valueOf(app.name);
         }
-        const currentVersionId = this.args.versionId ?? config.versionId;
+        const currentVersionId = this.flags.version ?? config.versionId;
         await catalogService.setActive({
             userId,
             organizationId,

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

@@ -1,13 +1,12 @@
 import { BaseCommand } from '../../base-command.js';
 export default class Unsandbox extends BaseCommand<typeof Unsandbox> {
-    static args: {
-        versionId: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
-    };
+    static args: {};
     static description: string;
     static examples: string[];
     static flags: {
         impersonate: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         manifest: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        version: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         rainbowAuthService: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         raindropCatalogService: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

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

@@ -1 +1 @@
-{"version":3,"file":"unsandbox.d.ts","sourceRoot":"","sources":["../../../src/commands/build/unsandbox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW,CAAC,OAAO,SAAS,CAAC;IAClE,MAAM,CAAC,IAAI;;MAET;IAEF,MAAM,CAAC,WAAW,SAA2D;IAE7E,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;MASV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA6B3B"}
+{"version":3,"file":"unsandbox.d.ts","sourceRoot":"","sources":["../../../src/commands/build/unsandbox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW,CAAC,OAAO,SAAS,CAAC;IAClE,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,WAAW,SAA2D;IAE7E,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;MAcV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA6B3B"}

package/dist/commands/build/unsandbox.js

@@ -1,10 +1,8 @@
 import { valueOf } from '@liquidmetal-ai/drizzle/appify/build';
-import { Args, Flags } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import { BaseCommand } from '../../base-command.js';
 export default class Unsandbox extends BaseCommand {
-    static args = {
-        versionId: Args.string({ char: 'v', description: 'version to sandbox', required: false }),
-    };
+    static args = {};
     static description = 'mark a version as unsandboxed in the Raindrop catalog';
     static examples = [
         `<%= config.bin %> <%= command.id %>
@@ -19,6 +17,11 @@ export default class Unsandbox extends BaseCommand {
             hidden: true,
         }),
         manifest: Flags.string({ default: 'raindrop.manifest', description: 'project manifest' }),
+        version: Flags.string({
+            char: 'v',
+            description: 'application version to unsandbox',
+            required: false,
+        }),
     };
     async run() {
         const config = await this.loadConfig();
@@ -29,7 +32,7 @@ export default class Unsandbox extends BaseCommand {
         const organizationId = this.flags.impersonate ?? defaultOrganizationId;
         const apps = await this.loadManifest();
         const app = apps[0];
-        const versionId = this.args.versionId ?? config.versionId;
+        const versionId = this.flags.version ?? config.versionId;
         if (!app) {
             this.error('No application found');
         }

package/dist/commands/object/delete.js

@@ -48,7 +48,7 @@ Delete file with key 'my-key' from my-bucket
         const response = await objectService.deleteObject({
             userId,
             organizationId,
-            bucket: flags.bucket,
+            bucketId: flags.bucket,
             key: args.key,
         });
         if (flags.output === 'json') {

package/dist/commands/object/get.js

@@ -55,7 +55,7 @@ Download file with key 'my-key' from my-bucket to output.txt
         const response = await objectService.getObject({
             userId,
             organizationId,
-            bucket: flags.bucket,
+            bucketId: flags.bucket,
             key: args.key,
         });
         if (!response.content) {

package/dist/commands/object/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/object/list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW,CAAC,OAAO,UAAU,CAAC;IACpE,MAAM,CAAC,WAAW,SAA8B;IAEhD,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;MA0BV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2C3B"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/object/list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW,CAAC,OAAO,UAAU,CAAC;IACpE,MAAM,CAAC,WAAW,SAA8B;IAEhD,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;MA0BV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiD3B"}

package/dist/commands/object/list.js

@@ -39,11 +39,18 @@ List all objects in my-bucket
     async run() {
         const { flags } = await this.parse(ObjectList);
         const { client: objectService, userId, organizationId } = await this.objectService();
-        const response = await objectService.listObjects({
-            userId,
-            organizationId,
-            bucket: flags.bucket,
-        });
+        let response;
+        try {
+            response = await objectService.listObjects({
+                userId,
+                organizationId,
+                bucketId: flags.bucket,
+            });
+        }
+        catch (error) {
+            const err = error;
+            this.error(`Failed to list objects in bucket ${flags.bucket}: ${err.message}`);
+        }
         if (!response.objects?.length) {
             console.log('No objects found in bucket');
             return;

package/dist/commands/object/put.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"put.d.ts","sourceRoot":"","sources":["../../../src/commands/object/put.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAMpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW,CAAC,OAAO,SAAS,CAAC;IAClE,MAAM,CAAC,IAAI;;;;;MAUT;IAEF,MAAM,CAAC,WAAW,SAAyC;IAE3D,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;MA+BV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1B,OAAO,CAAC,cAAc;CAavB"}
+{"version":3,"file":"put.d.ts","sourceRoot":"","sources":["../../../src/commands/object/put.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAMpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW,CAAC,OAAO,SAAS,CAAC;IAClE,MAAM,CAAC,IAAI;;;;;MAUT;IAEF,MAAM,CAAC,WAAW,SAAyC;IAE3D,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;MA+BV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B1B,OAAO,CAAC,cAAc;CAavB"}

package/dist/commands/object/put.js

@@ -64,7 +64,7 @@ Upload myfile.txt to my-bucket with key 'my-key'
         const response = await objectService.putObject({
             userId,
             organizationId,
-            bucket: flags.bucket,
+            bucketId: flags.bucket,
             key: args.key,
             content: fileContent,
             contentType,
@@ -74,9 +74,8 @@ Upload myfile.txt to my-bucket with key 'my-key'
         }
         else {
             console.log('Successfully uploaded file:');
-            console.log(`Bucket: ${response.bucket}`);
+            console.log(`Bucket: ${response.bucketId}`);
             console.log(`Key: ${response.key}`);
-            console.log(`Success: ${response.success}`);
         }
     }
     getContentType(filePath) {

package/dist/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,OAAO,WAAW;IAEzD,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAGxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IAGf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,MAAM,CAAC,CAAC,SAAS,OAAO,WAAW,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAkHrG"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,OAAO,WAAW;IAEzD,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAGxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IAGf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,MAAM,CAAC,CAAC,SAAS,OAAO,WAAW,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAkHrG"}

package/dist/deploy.js

@@ -7,6 +7,7 @@ import { BundleArchiveType, ReleaseRequest_LockSchema, } from '@liquidmetal-ai/d
 import { FileSystemBundle } from '@liquidmetal-ai/drizzle/unsafe/codestore';
 import fs from 'node:fs/promises';
 import * as path from 'node:path';
+import { tmpdir } from 'zx';
 import { buildHandlers } from './build.js';
 export async function deploy(options) {
     const { command, root, manifest, output } = options;
@@ -160,15 +161,41 @@ async function uploadDbBundle(command, root, catalogService, userId, organizatio
         // Nothing to do
     }
     if (dbExists) {
-        const dbBundle = new FileSystemBundle(dbDir);
-        await catalogService.uploadBundle({
-            userId,
-            organizationId,
-            applicationName: valueOf(app.name),
-            applicationVersionId: currentVersionId,
-            archiveType: BundleArchiveType.ZIP,
-            bundleName: 'db',
-            archive: Buffer.from(await archive(dbBundle)),
+        // Check if there are any SQL files in the directory
+        command.log(`Checking for SQL files in ${dbDir}`);
+        //check for subfolders under dbDir
+        const files = await fs.readdir(dbDir, {
+            withFileTypes: true,
         });
+        const folders = files.filter((file) => file.isDirectory());
+        try {
+            // Generate a temporary directory path using zx's tmpfile
+            const tempDir = tmpdir();
+            // Copy only SQL files to the temporary directory
+            for (const folder of folders) {
+                //read all the files in the folder and filter for sql files
+                const sqlFiles = (await fs.readdir(path.join(dbDir, folder.name))).filter((file) => file.endsWith('.sql'));
+                const tmpDbFolder = await fs.mkdir(path.join(tempDir, folder.name), { recursive: true });
+                for (const sqlFile of sqlFiles) {
+                    await fs.copyFile(path.join(dbDir, folder.name, sqlFile), path.join(tmpDbFolder, sqlFile));
+                }
+            }
+            // Create bundle from the filtered directory
+            const dbBundle = new FileSystemBundle(tempDir);
+            await catalogService.uploadBundle({
+                userId,
+                organizationId,
+                applicationName: valueOf(app.name),
+                applicationVersionId: currentVersionId,
+                archiveType: BundleArchiveType.ZIP,
+                bundleName: 'db',
+                archive: Buffer.from(await archive(dbBundle)),
+            });
+            command.log(`Uploaded db bundle with SQL files`);
+            await fs.rm(tempDir, { recursive: true, force: true });
+        }
+        catch (error) {
+            command.log(`Failed to upload db bundle: ${error}`);
+        }
     }
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -12,7 +12,7 @@ import { Mutex } from 'async-mutex';
 import { subSeconds, isAfter } from 'date-fns';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { generateTraceUrl, traceStore } from './trace.js';
+import { traceStore } from './trace.js';
 export { run } from '@oclif/core';
 export const EPOCH_TS = timestampFromDate(new Date(0));
 export async function configFromAppFile(appFile) {
@@ -52,12 +52,19 @@ async function bearerTokenAndRefresh(configDir, rainbowAuth) {
         // expired is true if the current time is after the earlier expiration date
         const expired = isAfter(now, earlierExpirationDate);
         if (expired) {
-            const next = await rainbowAuth.refreshAccessToken(create(RefreshAccessTokenRequestSchema, {
-                refreshToken: token.refreshToken,
-                organizationId: token.organizationId,
-            }));
+            let next;
+            try {
+                next = await rainbowAuth.refreshAccessToken(create(RefreshAccessTokenRequestSchema, {
+                    refreshToken: token.refreshToken,
+                    organizationId: token.organizationId,
+                }));
+            }
+            catch (e) {
+                const err = e;
+                throw new Error(`unable to refresh access token: ${err.message}`);
+            }
             if (!next.bearerToken) {
-                throw new Error('unable to refresh login');
+                throw new Error('unable to refresh access token: no bearer token returned');
             }
             state.organizationIdToBearerToken[state.currentOrganizationId] = next.bearerToken;
             await replaceState(configDir, state);
@@ -100,11 +107,12 @@ export function createTraceInterceptor() {
     return (next) => async (req) => {
         const traceparent = traceStore.getOrCreateTraceparent(req.header.get('traceparent') ?? undefined);
         req.header.set('traceparent', traceparent);
-        const rpcName = `${req.service.name}/${req.method.name}`;
-        const traceUrl = generateTraceUrl(traceparent);
-        if (traceUrl) {
-            console.debug(`${rpcName} ${traceUrl}`);
-        }
+        // TODO [bosgood] re-enable once we can get a logger instance in here - messes up -o json | jq
+        // const rpcName = `${req.service.name}/${req.method.name}`;
+        // const traceUrl = generateTraceUrl(traceparent);
+        // if (traceUrl) {
+        //   console.debug(`[DEBUG] ${rpcName} ${traceUrl}`);
+        // }
         return traceStore.run(traceparent, async () => {
             return await next(req);
         });

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/deploy.ts","../src/index.test.ts","../src/index.ts","../src/trace.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/checkout.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/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","../src/commands/object/delete.ts","../src/commands/object/get.ts","../src/commands/object/list.ts","../src/commands/object/put.ts","../src/commands/query/chunk-search.ts","../src/commands/query/register-retriever.ts","../src/commands/query/search.ts"],"version":"5.8.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/deploy.ts","../src/index.test.ts","../src/index.ts","../src/trace.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/checkout.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/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","../src/commands/object/delete.ts","../src/commands/object/get.ts","../src/commands/object/list.ts","../src/commands/object/put.ts","../src/commands/query/chunk-search.ts","../src/commands/query/search.ts"],"version":"5.8.2"}