opticedge-cloud-utils 1.0.7 → 1.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/db/mongo.js +13 -7
- package/dist/utils/env.d.ts +1 -1
- package/dist/utils/env.js +4 -2
- package/dist/utils/env.test.js +7 -4
- package/package.json +1 -1
- package/src/db/mongo.ts +13 -6
- package/src/utils/env.test.ts +8 -4
- package/src/utils/env.ts +4 -3
package/dist/db/mongo.js
CHANGED
|
@@ -3,16 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.connectToMongo = connectToMongo;
|
|
4
4
|
exports.getCollection = getCollection;
|
|
5
5
|
const mongodb_1 = require("mongodb");
|
|
6
|
-
const secrets_1 = require("../utils/secrets");
|
|
6
|
+
const secrets_1 = require("../utils/secrets");
|
|
7
7
|
let client;
|
|
8
8
|
let db;
|
|
9
|
+
let connectPromise;
|
|
9
10
|
async function connectToMongo(projectId, uriSecret, dbName) {
|
|
10
|
-
if (
|
|
11
|
-
return;
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
if (db)
|
|
12
|
+
return; // already connected
|
|
13
|
+
if (!connectPromise) {
|
|
14
|
+
connectPromise = (async () => {
|
|
15
|
+
const uri = await (0, secrets_1.getSecret)(projectId, uriSecret);
|
|
16
|
+
client = new mongodb_1.MongoClient(uri);
|
|
17
|
+
await client.connect();
|
|
18
|
+
db = client.db(dbName);
|
|
19
|
+
})();
|
|
20
|
+
}
|
|
21
|
+
await connectPromise;
|
|
16
22
|
}
|
|
17
23
|
function getCollection(name) {
|
|
18
24
|
if (!db)
|
package/dist/utils/env.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function getEnv(name: string): string;
|
|
1
|
+
export declare function getEnv(name: string, fallback?: string): string;
|
package/dist/utils/env.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getEnv = getEnv;
|
|
4
|
-
function getEnv(name) {
|
|
4
|
+
function getEnv(name, fallback) {
|
|
5
5
|
const value = process.env[name];
|
|
6
6
|
if (!value) {
|
|
7
|
-
|
|
7
|
+
if (fallback !== undefined)
|
|
8
|
+
return fallback;
|
|
9
|
+
throw new Error(`Missing env var ${name}`);
|
|
8
10
|
}
|
|
9
11
|
return value;
|
|
10
12
|
}
|
package/dist/utils/env.test.js
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
// src/utils/env.test.ts
|
|
4
3
|
const env_1 = require("./env");
|
|
5
4
|
describe('getEnv', () => {
|
|
6
|
-
it('
|
|
5
|
+
it('returns the value of an existing env var', () => {
|
|
7
6
|
process.env.TEST_KEY = 'test-value';
|
|
8
7
|
expect((0, env_1.getEnv)('TEST_KEY')).toBe('test-value');
|
|
9
8
|
});
|
|
10
|
-
it('
|
|
9
|
+
it('returns fallback if env var is not set', () => {
|
|
10
|
+
delete process.env.OPTIONAL_KEY;
|
|
11
|
+
expect((0, env_1.getEnv)('OPTIONAL_KEY', 'default')).toBe('default');
|
|
12
|
+
});
|
|
13
|
+
it('throws error if env var is not set and no fallback provided', () => {
|
|
11
14
|
delete process.env.MISSING_KEY;
|
|
12
|
-
expect(() => (0, env_1.getEnv)('MISSING_KEY')).toThrow('Missing env var
|
|
15
|
+
expect(() => (0, env_1.getEnv)('MISSING_KEY')).toThrow('Missing env var MISSING_KEY');
|
|
13
16
|
});
|
|
14
17
|
});
|
package/package.json
CHANGED
package/src/db/mongo.ts
CHANGED
|
@@ -1,16 +1,23 @@
|
|
|
1
1
|
import { MongoClient, Db, Collection, Document } from 'mongodb'
|
|
2
|
-
import { getSecret } from '../utils/secrets'
|
|
2
|
+
import { getSecret } from '../utils/secrets'
|
|
3
3
|
|
|
4
4
|
let client: MongoClient
|
|
5
5
|
let db: Db
|
|
6
|
+
let connectPromise: Promise<void> | undefined
|
|
6
7
|
|
|
7
8
|
export async function connectToMongo(projectId: string, uriSecret: string, dbName: string) {
|
|
8
|
-
if (
|
|
9
|
+
if (db) return // already connected
|
|
9
10
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
if (!connectPromise) {
|
|
12
|
+
connectPromise = (async () => {
|
|
13
|
+
const uri = await getSecret(projectId, uriSecret)
|
|
14
|
+
client = new MongoClient(uri)
|
|
15
|
+
await client.connect()
|
|
16
|
+
db = client.db(dbName)
|
|
17
|
+
})()
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
await connectPromise
|
|
14
21
|
}
|
|
15
22
|
|
|
16
23
|
export function getCollection<T extends Document = Document>(name: string): Collection<T> {
|
package/src/utils/env.test.ts
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
|
-
// src/utils/env.test.ts
|
|
2
1
|
import { getEnv } from './env'
|
|
3
2
|
|
|
4
3
|
describe('getEnv', () => {
|
|
5
|
-
it('
|
|
4
|
+
it('returns the value of an existing env var', () => {
|
|
6
5
|
process.env.TEST_KEY = 'test-value'
|
|
7
6
|
expect(getEnv('TEST_KEY')).toBe('test-value')
|
|
8
7
|
})
|
|
9
8
|
|
|
10
|
-
it('
|
|
9
|
+
it('returns fallback if env var is not set', () => {
|
|
10
|
+
delete process.env.OPTIONAL_KEY
|
|
11
|
+
expect(getEnv('OPTIONAL_KEY', 'default')).toBe('default')
|
|
12
|
+
})
|
|
13
|
+
|
|
14
|
+
it('throws error if env var is not set and no fallback provided', () => {
|
|
11
15
|
delete process.env.MISSING_KEY
|
|
12
|
-
expect(() => getEnv('MISSING_KEY')).toThrow('Missing env var
|
|
16
|
+
expect(() => getEnv('MISSING_KEY')).toThrow('Missing env var MISSING_KEY')
|
|
13
17
|
})
|
|
14
18
|
})
|
package/src/utils/env.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
export function getEnv(name: string): string {
|
|
1
|
+
export function getEnv(name: string, fallback?: string): string {
|
|
2
2
|
const value = process.env[name]
|
|
3
3
|
if (!value) {
|
|
4
|
-
|
|
4
|
+
if (fallback !== undefined) return fallback
|
|
5
|
+
throw new Error(`Missing env var ${name}`)
|
|
5
6
|
}
|
|
6
7
|
return value
|
|
7
|
-
}
|
|
8
|
+
}
|