@shushed/helpers 0.0.198-v2-20251105124853 → 0.0.198-v2-20251107110735

package/dist/cjs/src-public/env.js

@@ -111,7 +111,7 @@ class EnvEngine extends runtime_1.default {
         expirseAt = now + (options.ephemeralMs || 0);
         if (options.encrypted && !options.encryptionKey) {
             if (!options.ephemeralMs) {
-                throw new Error('Invariant while setting the value. If the options.encryptionKey is not set and the encryption with the default key is used, only the ephemeral storage can be used. Set the ephemeralMs');
+                throw new Error(`Invariant while setting the value for ${this.systemEnvName}. If the options.encryptionKey is not set and the encryption with the default key is used, only the ephemeral storage can be used. Set the ephemeralMs`);
             }
             else {
                 if (!this._envCache[this.systemEnvName]) {
@@ -126,7 +126,7 @@ class EnvEngine extends runtime_1.default {
                 }
                 options.encryptionKey = cachedEnv[ENV_NAME_SECRET_ENCRYPTION_KEY];
                 if (!options.encryptionKey) {
-                    throw new Error('Invariant while setting the value. If the options.encryptionKey is not set and the encryption with the default key is used, only the ephemeral storage can be used. Set the ephemeralMs. The default key is missing.');
+                    throw new Error(`Invariant while setting the value for ${this.systemEnvName}. If the options.encryptionKey is not set and the encryption with the default key is used, only the ephemeral storage can be used. Set the ephemeralMs. The default key is missing.`);
                 }
             }
         }
@@ -199,7 +199,7 @@ class EnvEngine extends runtime_1.default {
         let aes = null;
         if (options.encrypted && !options.encryptionKey) {
             if (!options.isEphemeral) {
-                throw new Error('Invariant while getting the value. If the options.encryptionKey is not set and the encryption with the default key is used, only the ephemeral storage can be used. Set the ephemeralMs');
+                throw new Error(`Invariant while getting the value for ${this.systemEnvName}. If the options.encryptionKey is not set and the encryption with the default key is used, only the ephemeral storage can be used. Set the ephemeralMs`);
             }
             else {
                 if (!this._envCache[this.systemEnvName]) {
@@ -209,6 +209,7 @@ class EnvEngine extends runtime_1.default {
                             jsonEnv = JSON.parse(process.env[`${this.systemEnvName}ProjectEnv`] || '');
                         }
                         catch (err) {
+                            this.logging.error(`Invariant: Cannot parse the ${this.systemEnvName}ProjectEnv as JSON. ${err?.message}`);
                         }
                     }
                     this._envCache[this.systemEnvName] = jsonEnv || {
@@ -221,7 +222,7 @@ class EnvEngine extends runtime_1.default {
                 }
                 options.encryptionKey = cachedEnv[ENV_NAME_SECRET_ENCRYPTION_KEY];
                 if (!options.encryptionKey) {
-                    throw new Error('Invariant while getting the value. If the options.encryptionKey is not set and the encryption with the default key is used, only the ephemeral storage can be used. Set the ephemeralMs. The default key is missing.');
+                    throw new Error(`Invariant while getting the value for ${this.systemEnvName}. If the options.encryptionKey is not set and the encryption with the default key is used, only the ephemeral storage can be used. Set the ephemeralMs. The default key is missing.`);
                 }
             }
         }
@@ -307,9 +308,10 @@ class EnvEngine extends runtime_1.default {
             envName = envName.slice('process.env.'.length);
         }
         if (!this._envCache[this.systemEnvName]) {
-            const jsonEnv = JSON.parse(process.env[`${this.systemEnvName}ProjectEnv`] || '{}');
+            const jsonEnv = JSON.parse(process.env[`${this.systemEnvName}ProjectEnv`] || '{ "__mock_invalid": true }');
             this._envCache[this.systemEnvName] = jsonEnv;
         }
+        this.logging.log('Resolving env name', this.systemEnvName, envName, this._envCache[this.systemEnvName]);
         const envObj = this._envCache[this.systemEnvName];
         return envObj[envName] || envName;
     }
@@ -323,16 +325,11 @@ class EnvEngine extends runtime_1.default {
             const regex = new RegExp(pattern);
             return regex.test(str);
         }
-        const defaultServiceAccount = `runtime@${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`;
         const audienceNorm = {
             workflowId: audience ? (audience.workflowId || this.workflowId) : null,
             triggerId: audience ? (audience.triggerId || this.triggerId) : null
         };
         const expectedAudience = [process.env.GCLOUD_PROJECT, audienceNorm.triggerId, audienceNorm.workflowId].filter(x => x !== null).join('-');
-        const accessTokenInCache = await this.get('google_identity_token_' + expectedAudience, 'env', { encrypted: true, isEphemeral: true, store: 'global' });
-        if (accessTokenInCache === accessToken && allowedServiceAccounts.some(x => equalToWildcard(x, defaultServiceAccount))) {
-            return defaultServiceAccount;
-        }
         const splitted = accessToken.split(".");
         let keyMeta;
         let meta;
@@ -584,7 +581,6 @@ class EnvEngine extends runtime_1.default {
         }
         const rnConfig = this.getRespectfulNudgeConfig(subscriptionName, rnPartialConfig);
         const subscriptionQualifiedName = `projects/${rnConfig.pubSubProjectId}/subscriptions/${subscriptionName}`;
-        console.log('JAKUB7', this.runtimeUrl + `/executeWorkflow/${workflowTriggerId}`);
         return this.withGoogleIdentityToken({
             workflowId: workflowTriggerId.split('/')[0],
             triggerId: workflowTriggerId.split('/')[1],

package/dist/cjs/src-public/runtime.js

@@ -109,6 +109,9 @@ class Runtime {
         if (process.env.runtimeEnv) {
             return process.env.runtimeEnv;
         }
+        if (process.env.BS_ENV) {
+            return process.env.BS_ENV;
+        }
         if (options.env?.runtimeEnv) {
             return options.env.runtimeEnv;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.198-v2-20251105124853",
+  "version": "0.0.198-v2-20251107110735",
   "author": "",
   "license": "UNLICENSED",
   "description": "",