@liquidmetal-ai/raindrop 0.0.6 → 0.0.8

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,38 @@ export async function ensureDirectory(dir) {
         }
     }
 }
+export async function catalogService({ rainbowAuth, configDir, }) {
+    const { catalogServiceBaseUrl, organizationId, userId } = await selectedOrganization(configDir);
+    const { authenticate } = createAuthenticateInterceptor(configDir, rainbowAuth);
+    let baseUrl = catalogServiceBaseUrl;
+    if (process.env.RAINDROP_CATALOG_API_BASE_URL) {
+        baseUrl = process.env.RAINDROP_CATALOG_API_BASE_URL;
+    }
+    return {
+        client: createPromiseClient(CatalogService, createConnectTransport({
+            baseUrl,
+            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/oclif.manifest.json

@@ -174,6 +174,37 @@
         "<%= config.bin %> <%= command.id %> .\nCreated new branch 1234\n"
       ],
       "flags": {
+        "root": {
+          "char": "r",
+          "description": "root directory",
+          "name": "root",
+          "required": false,
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "manifest": {
+          "char": "m",
+          "description": "project manifest",
+          "name": "manifest",
+          "required": false,
+          "default": "raindrop.manifest",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "previousVersionId": {
           "aliases": [
             "prev"
@@ -220,22 +251,6 @@
           "multiple": false,
           "type": "option"
         },
-        "config": {
-          "hidden": true,
-          "name": "config",
-          "default": ".raindrop/config.json",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "manifest": {
-          "description": "project manifest",
-          "name": "manifest",
-          "default": "raindrop.manifest",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "show": {
           "description": "show the current branch",
           "name": "show",
@@ -274,6 +289,37 @@
         "<%= config.bin %> <%= command.id %> .\nDeleted (application) at version (version)\n"
       ],
       "flags": {
+        "root": {
+          "char": "r",
+          "description": "root directory",
+          "name": "root",
+          "required": false,
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "manifest": {
+          "char": "m",
+          "description": "project manifest",
+          "name": "manifest",
+          "required": false,
+          "default": "raindrop.manifest",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "output": {
           "char": "o",
           "description": "output format",
@@ -329,22 +375,6 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "manifest": {
-          "description": "project manifest",
-          "name": "manifest",
-          "default": "raindrop.manifest",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "config": {
-          "hidden": true,
-          "name": "config",
-          "default": ".raindrop/config.json",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -376,7 +406,7 @@
           "description": "root directory",
           "name": "root",
           "required": false,
-          "default": "/Users/ian/liquidmetal/packages/raindrop",
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -391,6 +421,17 @@
           "multiple": false,
           "type": "option"
         },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "output": {
           "char": "o",
           "description": "output directory",
@@ -440,14 +481,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "config": {
-          "hidden": true,
-          "name": "config",
-          "default": ".raindrop/config.json",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "amend": {
           "char": "a",
           "description": "amend an existing application",
@@ -481,6 +514,37 @@
         "<%= config.bin %> <%= command.id %> .\n"
       ],
       "flags": {
+        "root": {
+          "char": "r",
+          "description": "root directory",
+          "name": "root",
+          "required": false,
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "manifest": {
+          "char": "m",
+          "description": "project manifest",
+          "name": "manifest",
+          "required": false,
+          "default": "raindrop.manifest",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "application": {
           "char": "a",
           "description": "application",
@@ -540,22 +604,6 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "manifest": {
-          "description": "project manifest",
-          "name": "manifest",
-          "default": "raindrop.manifest",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "config": {
-          "hidden": true,
-          "name": "config",
-          "default": ".raindrop/config.json",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -586,20 +634,33 @@
           "char": "r",
           "description": "root directory",
           "name": "root",
-          "default": "/Users/ian/liquidmetal/packages/raindrop",
+          "required": false,
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "manifest": {
           "char": "m",
-          "description": "manifest file",
+          "description": "project manifest",
           "name": "manifest",
+          "required": false,
           "default": "raindrop.manifest",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "output": {
           "char": "o",
           "description": "output directory",
@@ -812,12 +873,12 @@
         "<%= config.bin %> <%= command.id %> .\nStart a Raindrop application.\n"
       ],
       "flags": {
-        "config": {
-          "char": "c",
-          "description": "config file",
-          "name": "config",
+        "root": {
+          "char": "r",
+          "description": "root directory",
+          "name": "root",
           "required": false,
-          "default": ".raindrop/config.json",
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -832,6 +893,17 @@
           "multiple": false,
           "type": "option"
         },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "application": {
           "char": "a",
           "description": "application to start",
@@ -894,6 +966,37 @@
         "<%= config.bin %> <%= command.id %> .\nStop a Raindrop application.\n"
       ],
       "flags": {
+        "root": {
+          "char": "r",
+          "description": "root directory",
+          "name": "root",
+          "required": false,
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "manifest": {
+          "char": "m",
+          "description": "project manifest",
+          "name": "manifest",
+          "required": false,
+          "default": "raindrop.manifest",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "application": {
           "char": "a",
           "description": "application to stop",
@@ -930,14 +1033,6 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "config": {
-          "hidden": true,
-          "name": "config",
-          "default": ".raindrop/config.json",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1057,7 +1152,7 @@
           "description": "root directory",
           "name": "root",
           "required": false,
-          "default": "/Users/ian/liquidmetal/packages/raindrop",
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -1075,6 +1170,7 @@
         "config": {
           "char": "c",
           "description": "config file",
+          "hidden": true,
           "name": "config",
           "required": false,
           "default": ".raindrop/config.json",
@@ -1150,7 +1246,7 @@
           "description": "root directory",
           "name": "root",
           "required": false,
-          "default": "/Users/ian/liquidmetal/packages/raindrop",
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -1165,6 +1261,17 @@
           "multiple": false,
           "type": "option"
         },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "output": {
           "char": "o",
           "description": "output directory",
@@ -1268,6 +1375,7 @@
         "config": {
           "char": "c",
           "description": "config file",
+          "hidden": true,
           "name": "config",
           "required": false,
           "default": ".raindrop/config.json",
@@ -1312,11 +1420,12 @@
         "<%= config.bin %> <%= command.id %> .\nsets an env var/secret.\n"
       ],
       "flags": {
-        "output": {
-          "char": "o",
-          "description": "output format",
-          "name": "output",
-          "default": "table",
+        "root": {
+          "char": "r",
+          "description": "root directory",
+          "name": "root",
+          "required": false,
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -1331,6 +1440,26 @@
           "multiple": false,
           "type": "option"
         },
+        "config": {
+          "char": "c",
+          "description": "config file",
+          "hidden": true,
+          "name": "config",
+          "required": false,
+          "default": ".raindrop/config.json",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "output": {
+          "char": "o",
+          "description": "output format",
+          "name": "output",
+          "default": "table",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "versionId": {
           "aliases": [
             "version"
@@ -1370,16 +1499,6 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "config": {
-          "char": "c",
-          "description": "config file",
-          "name": "config",
-          "required": false,
-          "default": ".raindrop/config.json",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1412,7 +1531,7 @@
           "description": "root directory",
           "name": "root",
           "required": false,
-          "default": "/Users/ian/liquidmetal/packages/raindrop",
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -1458,7 +1577,7 @@
           "description": "root directory",
           "name": "root",
           "required": false,
-          "default": "/Users/ian/liquidmetal/packages/raindrop",
+          "default": "/Users/bosgood/dev/src/github.com/LiquidMetal-AI/liquidmetal/packages/raindrop",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -1492,5 +1611,5 @@
       ]
     }
   },
-  "version": "0.0.6"
+  "version": "0.0.8"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liquidmetal-ai/raindrop",
   "description": "CLI for the Raindrop platform",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "author": "bosgood",
   "bin": {
     "raindrop": "./bin/run.js"
@@ -106,4 +106,4 @@
       "types": "./dist/*.d.ts"
     }
   }
-}
+}

package/templates/handlers/actor/index.test.ts

@@ -1,3 +1,4 @@
+import '@liquidmetal-ai/raindrop-framework/testing';
 import { expect, test } from 'vitest';
 
 test('dummy test', async () => {

package/templates/handlers/http-service/index.test.ts

@@ -1,3 +1,4 @@
+import '@liquidmetal-ai/raindrop-framework/testing';
 import { expect, test } from 'vitest';
 
 test('dummy test', async () => {

package/templates/handlers/queue-consumer/index.test.ts

@@ -1,3 +1,4 @@
+import '@liquidmetal-ai/raindrop-framework/testing';
 import { expect, test } from 'vitest';
 
 test('dummy test', async () => {

package/templates/handlers/r2-event-notification/index.test.ts

@@ -1,3 +1,4 @@
+import '@liquidmetal-ai/raindrop-framework/testing';
 import { expect, test } from 'vitest';
 
 test('dummy test', async () => {