opticedge-cloud-utils 1.0.45 → 1.1.0

package/dist/db/mongo.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectToMongo = connectToMongo;
 exports.getCollection = getCollection;
 const mongodb_1 = require("mongodb");
-const secrets_1 = require("../utils/secrets");
+const secrets_1 = require("../secrets");
 let client;
 let db;
 let connectPromise;

package/dist/db/mongo2.js

@@ -5,7 +5,7 @@ exports.getDb2 = getDb2;
 exports.getCollection2 = getCollection2;
 // Multi DB safe util
 const mongodb_1 = require("mongodb");
-const secrets_1 = require("../utils/secrets");
+const secrets_1 = require("../secrets");
 let client;
 let connectPromise;
 async function connectToMongo2(projectId, uriSecret) {

package/dist/db/mongo3.js

@@ -6,7 +6,7 @@ exports.getDb3 = getDb3;
 exports.getCollection3 = getCollection3;
 // Multi cluster safe util
 const mongodb_1 = require("mongodb");
-const secrets_1 = require("../utils/secrets");
+const secrets_1 = require("../secrets");
 const clients = new Map();
 const connectPromises = new Map();
 async function connectToMongo3(projectId, uriSecret) {

package/dist/index.d.ts

@@ -1,17 +1,10 @@
-export * from './auth/verify';
 export * from './db/mongo';
 export * from './db/mongo2';
 export * from './db/mongo3';
-export * from './types/card';
-export * from './types/notify';
-export * from './types/payment';
-export * from './types/pokemontcg';
-export * from './types/pricecharting';
-export * from './types/user';
-export * from './utils/env';
-export * from './utils/regex';
-export * from './utils/secrets';
-export * from './utils/task';
-export * from './utils/tw-utils';
-export * from './utils/tw-wallet';
-export * from './constants';
+export * from './auth';
+export * from './env';
+export * from './regex';
+export * from './secrets';
+export * from './task';
+export * from './tw/tw-utils';
+export * from './tw/tw-wallet';

package/dist/index.js

@@ -14,20 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./auth/verify"), exports);
 __exportStar(require("./db/mongo"), exports);
 __exportStar(require("./db/mongo2"), exports);
 __exportStar(require("./db/mongo3"), exports);
-__exportStar(require("./types/card"), exports);
-__exportStar(require("./types/notify"), exports);
-__exportStar(require("./types/payment"), exports);
-__exportStar(require("./types/pokemontcg"), exports);
-__exportStar(require("./types/pricecharting"), exports);
-__exportStar(require("./types/user"), exports);
-__exportStar(require("./utils/env"), exports);
-__exportStar(require("./utils/regex"), exports);
-__exportStar(require("./utils/secrets"), exports);
-__exportStar(require("./utils/task"), exports);
-__exportStar(require("./utils/tw-utils"), exports);
-__exportStar(require("./utils/tw-wallet"), exports);
-__exportStar(require("./constants"), exports);
+__exportStar(require("./auth"), exports);
+__exportStar(require("./env"), exports);
+__exportStar(require("./regex"), exports);
+__exportStar(require("./secrets"), exports);
+__exportStar(require("./task"), exports);
+__exportStar(require("./tw/tw-utils"), exports);
+__exportStar(require("./tw/tw-wallet"), exports);

package/dist/{utils → tw}/tw-wallet.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pregenerateInAppWallet = pregenerateInAppWallet;
 const axios_1 = __importDefault(require("axios"));
-const secrets_1 = require("./secrets");
+const secrets_1 = require("../secrets");
 async function pregenerateInAppWallet(projectId, twClientId, twSecretKeyName, email) {
     const TW_SECRET_KEY = await (0, secrets_1.getSecret)(projectId, twSecretKeyName);
     try {

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "opticedge-cloud-utils",
-  "version": "1.0.45",
+  "version": "1.1.0",
   "description": "Common utilities for cloud functions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc",
+    "clean": "rimraf dist coverage *.tsbuildinfo",
+    "build": "npm run clean && tsc",
+    "prepare": "npm run build",
     "test": "jest --coverage",
     "lint": "eslint . --ext .ts --fix",
     "format": "prettier --write .",
-    "fix": "npm run lint && npm run format",
-    "prepare": "npm run build"
+    "fix": "npm run lint && npm run format"
   },
   "author": "Evans Musonda",
   "license": "MIT",

package/src/db/mongo.ts

@@ -1,5 +1,5 @@
 import { MongoClient, Db, Collection, Document } from 'mongodb'
-import { getSecret } from '../utils/secrets'
+import { getSecret } from '../secrets'
 
 let client: MongoClient
 let db: Db

package/src/db/mongo2.ts

@@ -1,6 +1,6 @@
 // Multi DB safe util
 import { MongoClient, Db, Collection, Document } from 'mongodb'
-import { getSecret } from '../utils/secrets'
+import { getSecret } from '../secrets'
 
 let client: MongoClient
 let connectPromise: Promise<void> | undefined

package/src/db/mongo3.ts

@@ -1,6 +1,6 @@
 // Multi cluster safe util
 import { MongoClient, Db, Collection, Document } from 'mongodb'
-import { getSecret } from '../utils/secrets'
+import { getSecret } from '../secrets'
 
 const clients: Map<string, MongoClient> = new Map()
 const connectPromises: Map<string, Promise<void>> = new Map()

package/src/index.ts

@@ -1,17 +1,10 @@
-export * from './auth/verify'
 export * from './db/mongo'
 export * from './db/mongo2'
 export * from './db/mongo3'
-export * from './types/card'
-export * from './types/notify'
-export * from './types/payment'
-export * from './types/pokemontcg'
-export * from './types/pricecharting'
-export * from './types/user'
-export * from './utils/env'
-export * from './utils/regex'
-export * from './utils/secrets'
-export * from './utils/task'
-export * from './utils/tw-utils'
-export * from './utils/tw-wallet'
-export * from './constants'
+export * from './auth'
+export * from './env'
+export * from './regex'
+export * from './secrets'
+export * from './task'
+export * from './tw/tw-utils'
+export * from './tw/tw-wallet'

package/src/{utils → tw}/tw-wallet.ts

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { getSecret } from './secrets'
+import { getSecret } from '../secrets'
 
 export async function pregenerateInAppWallet(
   projectId: string,

package/{src/auth/verify.test.ts → tests/auth.test.ts}

@@ -1,4 +1,4 @@
-import { verifyRequest } from './verify'
+import { verifyRequest } from '../src/auth'
 
 // Mock the google-auth-library
 jest.mock('google-auth-library', () => {

package/{src → tests}/db/mongo.test.ts

@@ -1,9 +1,9 @@
-import { connectToMongo, getCollection } from './mongo'
+import { connectToMongo, getCollection } from '../../src/db/mongo'
 import { MongoClient, Db } from 'mongodb'
-import * as secretsModule from '../utils/secrets'
+import * as secretsModule from '../../src/secrets'
 
 jest.mock('mongodb')
-jest.mock('../utils/secrets')
+jest.mock('../../src/secrets')
 
 const mockDb = {
   collection: jest.fn()
@@ -40,7 +40,7 @@ describe('Mongo Utils', () => {
   it('should throw error if db is not initialized', () => {
     jest.isolateModules(() => {
       // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const { getCollection } = require('./mongo')
+      const { getCollection } = require('../../src/db/mongo')
       expect(() => getCollection('users')).toThrow('Mongo not initialized')
     })
   })

package/{src → tests}/db/mongo2.test.ts

@@ -1,9 +1,9 @@
-import { connectToMongo2, getDb2, getCollection2 } from './mongo2'
+import { connectToMongo2, getDb2, getCollection2 } from '../../src/db/mongo2'
 import { MongoClient, Db } from 'mongodb'
-import * as secretsModule from '../utils/secrets'
+import * as secretsModule from '../../src/secrets'
 
 jest.mock('mongodb')
-jest.mock('../utils/secrets')
+jest.mock('../../src/secrets')
 
 const mockDb = {
   collection: jest.fn()
@@ -48,7 +48,7 @@ describe('Mongo Utils', () => {
   it('should throw error if client is not initialized (getDb)', () => {
     jest.isolateModules(() => {
       // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const { getDb2 } = require('./mongo2')
+      const { getDb2 } = require('../../src/db/mongo2')
       expect(() => getDb2('test-db')).toThrow('Mongo not initialized')
     })
   })
@@ -56,7 +56,7 @@ describe('Mongo Utils', () => {
   it('should throw error if client is not initialized (getCollection)', () => {
     jest.isolateModules(() => {
       // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const { getCollection2 } = require('./mongo2')
+      const { getCollection2 } = require('../../src/db/mongo2')
       expect(() => getCollection2('test-db', 'users')).toThrow('Mongo not initialized')
     })
   })

package/{src → tests}/db/mongo3.test.ts

@@ -4,12 +4,12 @@ import {
   getCollection3,
   __mongoClients,
   __connectPromises
-} from './mongo3'
+} from '../../src/db/mongo3'
 import { MongoClient, Db } from 'mongodb'
-import * as secretsModule from '../utils/secrets'
+import * as secretsModule from '../../src/secrets'
 
 jest.mock('mongodb')
-jest.mock('../utils/secrets')
+jest.mock('../../src/secrets')
 
 const mockDb = {
   collection: jest.fn()
@@ -81,7 +81,7 @@ describe('MongoClientManager (multi-cluster)', () => {
   it('should throw error if client not initialized (getDb)', () => {
     jest.isolateModules(() => {
       // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const { getDb3 } = require('./mongo3')
+      const { getDb3 } = require('../../src/db/mongo3')
       expect(() => getDb3('unknown-uri-secret', 'some-db')).toThrow(
         'Mongo client for secret "unknown-uri-secret" not initialized'
       )
@@ -91,7 +91,7 @@ describe('MongoClientManager (multi-cluster)', () => {
   it('should throw error if client not initialized (getCollection)', () => {
     jest.isolateModules(() => {
       // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const { getCollection3 } = require('./mongo3')
+      const { getCollection3 } = require('../../src/db/mongo3')
       expect(() => getCollection3('unknown-uri-secret', 'some-db', 'users')).toThrow(
         'Mongo client for secret "unknown-uri-secret" not initialized'
       )

package/{src/utils → tests}/env.test.ts

@@ -1,4 +1,4 @@
-import { getEnv } from './env'
+import { getEnv } from '../src/env'
 
 describe('getEnv', () => {
   it('returns the value of an existing env var', () => {

package/{src/utils → tests}/regex.test.ts

@@ -1,4 +1,4 @@
-import { escapeRegex } from './regex'
+import { escapeRegex } from '../src/regex'
 
 describe('escapeRegex', () => {
   it('escapes regex special characters', () => {

package/{src/utils → tests}/secrets.test.ts

@@ -1,4 +1,4 @@
-import { getSecret } from './secrets'
+import { getSecret } from '../src/secrets'
 import { SecretManagerServiceClient } from '@google-cloud/secret-manager'
 
 jest.mock('@google-cloud/secret-manager')

package/{src/utils → tests}/task.test.ts

@@ -25,7 +25,7 @@ jest.mock('@google-cloud/tasks', () => {
   }
 })
 
-import { createTask } from './task'
+import { createTask } from '../src/task'
 
 describe('createTask', () => {
   beforeEach(() => {

package/{src/utils → tests/tw}/tw-utils.test.ts

@@ -1,4 +1,4 @@
-import { isValidWebhookSignature } from './tw-utils'
+import { isValidWebhookSignature } from '../../src/tw/tw-utils'
 import crypto from 'crypto'
 
 describe('isValidWebhookSignature', () => {

package/{src/utils → tests/tw}/tw-wallet.test.ts

@@ -1,10 +1,9 @@
 import axios from 'axios'
-import { pregenerateInAppWallet } from './tw-wallet'
-import * as secrets from './secrets'
+import { pregenerateInAppWallet } from '../../src/tw/tw-wallet'
+import * as secrets from '../../src/secrets'
 
 jest.mock('axios')
-jest.mock('opticedge-cloud-utils')
-jest.mock('./secrets')
+jest.mock('../../src/secrets')
 
 const mockedAxios = axios as jest.Mocked<typeof axios>
 const mockedGetSecret = secrets.getSecret as jest.Mock

package/dist/auth/verify.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/auth/verify.test.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const verify_1 = require("./verify");
-// Mock the google-auth-library
-jest.mock('google-auth-library', () => {
-    return {
-        OAuth2Client: jest.fn().mockImplementation(() => ({
-            verifyIdToken: jest.fn(({ idToken, audience }) => {
-                if (idToken === 'valid-token' && audience === 'audience') {
-                    return {
-                        getPayload: () => ({
-                            email: 'allowed@example.com'
-                        })
-                    };
-                }
-                else if (idToken === 'wrong-email-token' && audience === 'audience') {
-                    return {
-                        getPayload: () => ({
-                            email: 'unauthorized@example.com'
-                        })
-                    };
-                }
-                throw new Error('Invalid token');
-            })
-        }))
-    };
-});
-describe('verifyRequest', () => {
-    it('returns true for valid token and matching email', async () => {
-        const mockReq = {
-            headers: {
-                authorization: 'Bearer valid-token'
-            }
-        };
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await (0, verify_1.verifyRequest)(mockReq, {
-            allowedAudience: 'audience',
-            allowedServiceAccount: 'allowed@example.com'
-        });
-        expect(result).toBe(true);
-    });
-    it('returns false for invalid token', async () => {
-        const mockReq = {
-            headers: {
-                authorization: 'Bearer invalid-token'
-            }
-        };
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await (0, verify_1.verifyRequest)(mockReq, {
-            allowedAudience: 'audience',
-            allowedServiceAccount: 'allowed@example.com'
-        });
-        expect(result).toBe(false);
-    });
-    it('returns false for missing authorization header', async () => {
-        const mockReq = {
-            headers: {}
-        };
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await (0, verify_1.verifyRequest)(mockReq, {
-            allowedAudience: 'audience',
-            allowedServiceAccount: 'allowed@example.com'
-        });
-        expect(result).toBe(false);
-    });
-    it('returns false for incorrect email', async () => {
-        const mockReq = {
-            headers: {
-                authorization: 'Bearer wrong-email-token'
-            }
-        };
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await (0, verify_1.verifyRequest)(mockReq, {
-            allowedAudience: 'audience',
-            allowedServiceAccount: 'allowed@example.com'
-        });
-        expect(result).toBe(false);
-    });
-});

package/dist/constants.d.ts

@@ -1,2 +0,0 @@
-import { PaymentEnvironment } from './types/payment';
-export declare const CHAIN_PAYMENTENV_MAP: Record<string, PaymentEnvironment>;

package/dist/constants.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CHAIN_PAYMENTENV_MAP = void 0;
-exports.CHAIN_PAYMENTENV_MAP = {
-    '80002': 'SANDBOX',
-    '137': 'PRODUCTION'
-};

package/dist/db/mongo.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/db/mongo.test.js

@@ -1,73 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongo_1 = require("./mongo");
-const mongodb_1 = require("mongodb");
-const secretsModule = __importStar(require("../utils/secrets"));
-jest.mock('mongodb');
-jest.mock('../utils/secrets');
-const mockDb = {
-    collection: jest.fn()
-};
-const mockConnect = jest.fn();
-const mockClient = {
-    connect: mockConnect,
-    db: jest.fn().mockReturnValue(mockDb)
-};
-beforeEach(() => {
-    jest.clearAllMocks();
-    secretsModule.getSecret.mockResolvedValue('mongodb://mock-uri');
-    mongodb_1.MongoClient.mockImplementation(() => mockClient);
-});
-describe('Mongo Utils', () => {
-    it('should connect to MongoDB and store client/db', async () => {
-        await (0, mongo_1.connectToMongo)('test-project', 'mongo-uri-secret', 'test-db');
-        expect(secretsModule.getSecret).toHaveBeenCalledWith('test-project', 'mongo-uri-secret');
-        expect(mockConnect).toHaveBeenCalled();
-        expect(mockClient.db).toHaveBeenCalledWith('test-db');
-    });
-    it('should return a collection when db is initialized', async () => {
-        await (0, mongo_1.connectToMongo)('test-project', 'mongo-uri-secret', 'test-db');
-        (0, mongo_1.getCollection)('users');
-        expect(mockDb.collection).toHaveBeenCalledWith('users');
-    });
-    it('should throw error if db is not initialized', () => {
-        jest.isolateModules(() => {
-            // eslint-disable-next-line @typescript-eslint/no-require-imports
-            const { getCollection } = require('./mongo');
-            expect(() => getCollection('users')).toThrow('Mongo not initialized');
-        });
-    });
-});

package/dist/db/mongo2.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/db/mongo2.test.js

@@ -1,86 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongo2_1 = require("./mongo2");
-const mongodb_1 = require("mongodb");
-const secretsModule = __importStar(require("../utils/secrets"));
-jest.mock('mongodb');
-jest.mock('../utils/secrets');
-const mockDb = {
-    collection: jest.fn()
-};
-const mockConnect = jest.fn();
-const mockClient = {
-    connect: mockConnect,
-    db: jest.fn().mockReturnValue(mockDb)
-};
-beforeEach(() => {
-    jest.clearAllMocks();
-    secretsModule.getSecret.mockResolvedValue('mongodb://mock-uri');
-    mongodb_1.MongoClient.mockImplementation(() => mockClient);
-});
-describe('Mongo Utils', () => {
-    it('should connect to MongoDB and store client', async () => {
-        await (0, mongo2_1.connectToMongo2)('test-project', 'mongo-uri-secret');
-        expect(secretsModule.getSecret).toHaveBeenCalledWith('test-project', 'mongo-uri-secret');
-        expect(mockConnect).toHaveBeenCalled();
-    });
-    it('should return a Db instance when client is initialized', async () => {
-        await (0, mongo2_1.connectToMongo2)('test-project', 'mongo-uri-secret');
-        const db = (0, mongo2_1.getDb2)('test-db');
-        expect(mockClient.db).toHaveBeenCalledWith('test-db');
-        expect(db).toBe(mockDb);
-    });
-    it('should return a collection when client is initialized', async () => {
-        await (0, mongo2_1.connectToMongo2)('test-project', 'mongo-uri-secret');
-        (0, mongo2_1.getCollection2)('test-db', 'users');
-        expect(mockClient.db).toHaveBeenCalledWith('test-db');
-        expect(mockDb.collection).toHaveBeenCalledWith('users');
-    });
-    it('should throw error if client is not initialized (getDb)', () => {
-        jest.isolateModules(() => {
-            // eslint-disable-next-line @typescript-eslint/no-require-imports
-            const { getDb2 } = require('./mongo2');
-            expect(() => getDb2('test-db')).toThrow('Mongo not initialized');
-        });
-    });
-    it('should throw error if client is not initialized (getCollection)', () => {
-        jest.isolateModules(() => {
-            // eslint-disable-next-line @typescript-eslint/no-require-imports
-            const { getCollection2 } = require('./mongo2');
-            expect(() => getCollection2('test-db', 'users')).toThrow('Mongo not initialized');
-        });
-    });
-});

package/dist/db/mongo3.test.d.ts

@@ -1 +0,0 @@
-export {};