@foxtware/mineral 0.1.8 → 0.1.10

package/api/youtube/youtubeChannelVideosGet.js

@@ -1,9 +1,8 @@
 // https://developers.google.com/youtube/v3/guides/implementation/videos
 
-const { FetchClient, credsFromPayload, ArgsWarden } = require('../utils');
+const { ArgsWarden } = require('../utils');
 const { credsValidator } = require('../validators');
-
-const YOUTUBE_API_BASE = 'https://www.googleapis.com/youtube/v3';
+const { youtubeClient } = require('../youtube/youtube.utils');
 
 const parseChannelHandle = (channelHandle) => {
   const trimmed = channelHandle.trim();
@@ -15,54 +14,6 @@ const parseChannelHandle = (channelHandle) => {
   return trimmed;
 };
 
-const youtubeClient = new FetchClient({
-  requestPreparer: async (requestPayload, context) => {
-    const { creds } = context;
-    const { API_KEY } = creds;
-
-    return {
-      ...requestPayload,
-      params: {
-        key: API_KEY,
-        ...requestPayload.params,
-      },
-    };
-  },
-  responseInterpreter: async (response) => {
-    if (!response.ok) {
-      const youtubeError = response.error?.details?.error;
-
-      if (youtubeError) {
-        return {
-          ok: false,
-          error: {
-            code: youtubeError.code,
-            message: youtubeError.message,
-            details: youtubeError,
-          },
-        };
-      }
-
-      return response;
-    }
-
-    const { data } = response;
-
-    if (data?.error) {
-      return {
-        ok: false,
-        error: {
-          code: data.error.code,
-          message: data.error.message,
-          details: data.error,
-        },
-      };
-    }
-
-    return response;
-  },
-});
-
 const formatVideo = (video) => {
   const {
     id,
@@ -106,17 +57,17 @@ const youtubeChannelVideosGet = async (
     return rejectResponse;
   }
 
-  const creds = await credsFromPayload(credsPayload);
-  const fetchContext = { creds };
   const handle = parseChannelHandle(channelHandle);
 
   const channelResponse = await youtubeClient.fetch({
-    url: `${ YOUTUBE_API_BASE }/channels`,
-    params: {
-      part: 'contentDetails',
-      forHandle: handle,
+    requestPayload: {
+      url: '/channels',
+      params: {
+        part: 'contentDetails',
+        forHandle: handle,
+      },
     },
-    context: fetchContext,
+    context: { credsPayload },
     inspect,
   });
 
@@ -153,14 +104,16 @@ const youtubeChannelVideosGet = async (
 
   while (true) {
     const playlistResponse = await youtubeClient.fetch({
-      url: `${ YOUTUBE_API_BASE }/playlistItems`,
-      params: {
-        part: 'contentDetails',
-        playlistId: uploadsPlaylistId,
-        maxResults: 50,
-        ...(nextPageToken ? { pageToken: nextPageToken } : {}),
+      requestPayload: {
+        url: '/playlistItems',
+        params: {
+          part: 'contentDetails',
+          playlistId: uploadsPlaylistId,
+          maxResults: 50,
+          ...(nextPageToken ? { pageToken: nextPageToken } : {}),
+        },
       },
-      context: fetchContext,
+      context: { credsPayload },
       inspect,
     });
 
@@ -202,12 +155,14 @@ const youtubeChannelVideosGet = async (
     const batchIds = videoIds.slice(index, index + 50).join(',');
 
     const videosResponse = await youtubeClient.fetch({
-      url: `${ YOUTUBE_API_BASE }/videos`,
-      params: {
-        part: 'snippet,statistics,contentDetails',
-        id: batchIds,
+      requestPayload: {
+        url: '/videos',
+        params: {
+          part: 'snippet,statistics,contentDetails',
+          id: batchIds,
+        },
       },
-      context: fetchContext,
+      context: { credsPayload },
       inspect,
     });
 

package/hosting/.hosting.yml.sample

@@ -5,19 +5,17 @@ google_cloud_info:
 # TODO: consider credsPayload in google_cloud_info instead of workspace .creds.yml
 
 functions:
-  exampleFunction:
-    max_instances: 1
-    timeout: 300s
-    before_wrappers:
-      - allowCrossOriginCallsAndHandleOptions
-      - requireHostedApiKey
-    # entry_point: otherHandlerName
-
   pokemonPokeballThrow:
+    entry_point: functionWithDifferentNameIfNeeded
     max_instances: 1
     before_wrappers:
-      - checkTrainer
+      - checkPokeballInventory
+    after_wrappers:
+      - rethrowIfNotCaught
+    include_creds_paths:
+      - nintendo.pokemon
+      - platform
 
 groups:
-  example_group:
-    - exampleFunction
+  pokemon:
+    - pokemonPokeballThrow

package/hosting/copyCredsToEnv.js

@@ -1,7 +1,59 @@
 const fs = require('fs');
 const yaml = require('yaml');
 
-const copyCredsToEnv = (workspace) => {
+const getValueAtCredsPath = (creds, pathParts) => {
+  let current = creds;
+
+  for (const pathPart of pathParts) {
+    if (current == null || typeof current !== 'object' || !(pathPart in current)) {
+      return undefined;
+    }
+
+    current = current[pathPart];
+  }
+
+  return current;
+};
+
+const setValueAtCredsPath = (target, pathParts, value) => {
+  let current = target;
+
+  for (let index = 0; index < pathParts.length - 1; index++) {
+    const pathPart = pathParts[index];
+
+    if (!(pathPart in current) || typeof current[pathPart] !== 'object' || current[pathPart] === null) {
+      current[pathPart] = {};
+    }
+
+    current = current[pathPart];
+  }
+
+  current[pathParts[pathParts.length - 1]] = value;
+};
+
+const filterCredsByPaths = (creds, includeCredsPaths) => {
+  const filteredCreds = {};
+
+  for (const credsPath of includeCredsPaths) {
+    if (typeof credsPath !== 'string' || !credsPath.trim()) {
+      throw new Error(`Invalid include_creds_paths entry: ${ credsPath }`);
+    }
+
+    const pathParts = credsPath.split('.');
+    const value = getValueAtCredsPath(creds, pathParts);
+
+    if (value === undefined) {
+      throw new Error(`Missing creds path "${ credsPath }" in .creds.yml`);
+    }
+
+    setValueAtCredsPath(filteredCreds, pathParts, value);
+  }
+
+  return filteredCreds;
+};
+
+const copyCredsToEnv = (workspace, options = {}) => {
+  const { includeCredsPaths } = options;
   const normalizedWorkspace = workspace.replace(/\/$/, '');
   const credsPath = `${ normalizedWorkspace }/.creds.yml`;
   const envPath = `${ normalizedWorkspace }/.env`;
@@ -12,7 +64,10 @@ const copyCredsToEnv = (workspace) => {
 
   const credsText = fs.readFileSync(credsPath, 'utf8');
   const credsFromYml = yaml.parse(credsText);
-  const newCredsLine = `CREDS=${ JSON.stringify(credsFromYml) }`;
+  const credsForEnv = includeCredsPaths?.length
+    ? filterCredsByPaths(credsFromYml, includeCredsPaths)
+    : credsFromYml;
+  const newCredsLine = `CREDS=${ JSON.stringify(credsForEnv) }`;
 
   let envFileContents = '';
   if (fs.existsSync(envPath)) {
@@ -45,4 +100,5 @@ if (require.main === module) {
 
 module.exports = {
   copyCredsToEnv,
+  filterCredsByPaths,
 };

package/hosting/deployFromHostingYml.js

@@ -109,6 +109,7 @@ const deployFunction = async ({
     groups,
     before_wrappers,
     after_wrappers,
+    include_creds_paths,
     source,
     env,
     ...gcloudArgs
@@ -197,7 +198,6 @@ const deployFunction = async ({
 const deployFromHostingYml = async (options = {}) => {
   const config = getHostConfig(options);
   setWorkspace(config.workspace);
-  ensureWorkspaceEnvForDeploy(config.workspace);
   loadWorkspaceEnv();
 
   const hostingConfig = readHostingYml(config.workspace);
@@ -235,9 +235,16 @@ const deployFromHostingYml = async (options = {}) => {
       return;
     }
 
+    const functionConfig = functions[functionName];
+    const includeCredsPaths = Array.isArray(functionConfig.include_creds_paths)
+      ? functionConfig.include_creds_paths
+      : undefined;
+
+    ensureWorkspaceEnvForDeploy(config.workspace, { includeCredsPaths });
+
     await deployFunction({
       functionName,
-      functionConfig: functions[functionName],
+      functionConfig,
       googleCloudInfo,
       workspace: config.workspace,
     });

package/hosting/hosting.utils.js

@@ -189,11 +189,12 @@ const readHostingYml = (workspace) => {
   return hostingConfig;
 };
 
-const ensureWorkspaceEnvForDeploy = (workspace) => {
+const ensureWorkspaceEnvForDeploy = (workspace, options = {}) => {
+  const { includeCredsPaths } = options;
   const { copyCredsToEnv } = require('./copyCredsToEnv');
   const envPath = `${ workspace.replace(/\/$/, '') }/.env`;
 
-  copyCredsToEnv(workspace);
+  copyCredsToEnv(workspace, { includeCredsPaths });
 
   if (!fs.existsSync(envPath)) {
     throw new Error(`Missing .env in workspace: ${ workspace }`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxtware/mineral",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "bin": {
     "mineral": "bin/mineral.js"
   },
@@ -19,6 +19,8 @@
     "npm:publish": "node _build_scripts/publish.js"
   },
   "dependencies": {
+    "@supabase/supabase-js": "^2.55.0",
+    "@upstash/redis": "^1.28.4",
     "csvtojson": "^2.0.14",
     "dotenv": "^17.2.0",
     "json-2-csv": "^5.5.9",

package/server.utils.js

@@ -258,6 +258,7 @@ const funcApi = (func, config = {}) => {
 
     let callArgs = requestContext.args;
     if (passThroughReq) {
+      requestContext.req.body = modifiedBody;
       callArgs = [requestContext.req];
     } else if (passThroughBody) {
       callArgs = [modifiedBody];