dgc-core 2.0.7 → 2.0.8

package/dist/index.d.ts

@@ -2,8 +2,6 @@ export * from './types';
 export * from './db/mongo';
 export * from './db/mongo2';
 export * from './db/mongo3';
-export * from './tw/utils';
-export * from './tw/wallet';
 export * from './auth';
 export * from './chunk';
 export * from './env';

package/dist/index.js

@@ -18,8 +18,6 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./db/mongo"), exports);
 __exportStar(require("./db/mongo2"), exports);
 __exportStar(require("./db/mongo3"), exports);
-__exportStar(require("./tw/utils"), exports);
-__exportStar(require("./tw/wallet"), exports);
 __exportStar(require("./auth"), exports);
 __exportStar(require("./chunk"), exports);
 __exportStar(require("./env"), exports);

package/dist/pub.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishMessage = publishMessage;
 // src/pub.ts
 const pubsub_1 = require("@google-cloud/pubsub");
+const logger_1 = require("./logger");
 let cachedPubSub = null;
 function getPubSub(projectId) {
     if (!projectId)
@@ -26,11 +27,11 @@ async function publishMessage(projectId, topicName, envelope) {
         const messageId = await topic.publishMessage({
             data
         });
-        console.info(`INFO: Pub/Sub publish topic=${topicName} msg_id=${messageId}`);
+        (0, logger_1.log)(logger_1.LogLevel.INFO, 'Pub/Sub publish', { topicName, messageId });
         return messageId;
     }
     catch (err) {
-        console.error('ERROR: publish failed:', err);
+        (0, logger_1.log)(logger_1.LogLevel.ERROR, 'publish failed', { error: err });
         throw err;
     }
 }

package/dist/task.js

@@ -4,6 +4,7 @@ exports.isRetryableCloudTasks = isRetryableCloudTasks;
 exports.createTask = createTask;
 // src/cloud-tasks.ts
 const tasks_1 = require("@google-cloud/tasks");
+const logger_1 = require("./logger");
 const retry_1 = require("./retry");
 const tasksClient = new tasks_1.CloudTasksClient();
 // cloud-tasks errors can be gRPC-style (numeric code) or an Error with code string.
@@ -67,7 +68,11 @@ async function createTask(projectId, region, queueId, data, serviceAccount, audi
         timeoutMs: 15000,
         isRetryable: isRetryableCloudTasks,
         onRetry: (err, attempt, delay) => {
-            console.warn(`createTask retry #${attempt} in ${delay}ms — ${String(err?.message ?? err)}`);
+            (0, logger_1.log)(logger_1.LogLevel.WARNING, 'createTask retry', {
+                attempt,
+                delayMs: delay,
+                error: String(err?.message ?? err)
+            });
         },
         ...opts.retryOptions // allow overrides
     };
@@ -93,11 +98,13 @@ async function createTask(projectId, region, queueId, data, serviceAccount, audi
             if (err?.original?.code === 6 ||
                 err?.code === 6 ||
                 String(err?.original?.code).toUpperCase().includes('ALREADY_EXISTS')) {
-                console.warn('createTask — task already exists, returning existing name', expectedName);
+                (0, logger_1.log)(logger_1.LogLevel.WARNING, 'createTask — task already exists, returning existing name', {
+                    taskName: expectedName
+                });
                 return expectedName;
             }
         }
-        console.error('createTask — final failure after retries', { error: err?.message ?? err });
+        (0, logger_1.log)(logger_1.LogLevel.ERROR, 'createTask — final failure after retries', { error: err?.message ?? err });
         throw err; // rethrow (or return null if you prefer)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgc-core",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Shared DGC contracts, business rules and server utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/tw/utils.d.ts

@@ -1 +0,0 @@
-export declare function isValidWebhookSignature(secret: string, body: string, signature: string): boolean;

package/dist/tw/utils.js

@@ -1,19 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidWebhookSignature = isValidWebhookSignature;
-const crypto_1 = __importDefault(require("crypto"));
-const generateSignature = (body, secret) => {
-    return crypto_1.default.createHmac('sha256', secret).update(body).digest('hex');
-};
-function isValidWebhookSignature(secret, body, signature) {
-    const expectedSignature = generateSignature(body, secret);
-    const expectedBuffer = Buffer.from(expectedSignature);
-    const signatureBuffer = Buffer.from(signature);
-    if (expectedBuffer.length !== signatureBuffer.length) {
-        return false;
-    }
-    return crypto_1.default.timingSafeEqual(expectedBuffer, signatureBuffer);
-}

package/dist/tw/wallet.d.ts

@@ -1 +0,0 @@
-export declare function pregenerateInAppWallet(twClientId: string, twSecretKey: string, email: string): Promise<string | null>;

package/dist/tw/wallet.js

@@ -1,57 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pregenerateInAppWallet = pregenerateInAppWallet;
-// src/tw/wallet.ts
-const axios_1 = __importDefault(require("axios"));
-const retry_1 = require("../retry");
-async function pregenerateInAppWallet(twClientId, twSecretKey, email) {
-    if (!twClientId || !twSecretKey || !email) {
-        console.error('Missing client id or secret or email');
-        return null;
-    }
-    const doRequest = async () => {
-        const res = await axios_1.default.post('https://in-app-wallet.thirdweb.com/api/v1/pregenerate', { strategy: 'email', email }, {
-            headers: {
-                'Content-Type': 'application/json',
-                'x-client-id': twClientId,
-                'x-secret-key': twSecretKey
-            },
-            timeout: 10000
-        });
-        const wallet = res.data?.wallet;
-        if (!wallet || !wallet.address) {
-            // server returned 2xx but unexpected shape — don't retry, treat as final failure
-            console.error('Invalid wallet response shape', { status: res.status, data: res.data });
-            throw new Error('Invalid wallet response');
-        }
-        return wallet.address;
-    };
-    const opts = {
-        retries: 3,
-        baseDelayMs: 300,
-        maxDelayMs: 2000,
-        timeoutMs: 15000,
-        isRetryable: retry_1.isRetryableAxios,
-        onRetry: (err, attempt, delay) => {
-            console.warn(`pregenerateInAppWallet: retry #${attempt} in ${delay}ms — ${String(err?.message)}`);
-        }
-    };
-    try {
-        const address = await (0, retry_1.retry)(() => doRequest(), opts);
-        return address;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    }
-    catch (err) {
-        // final failure after retries
-        console.error('pregenerateInAppWallet: final failure', {
-            message: err?.message,
-            // include axios response data when possible
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            responseData: err?.response?.data ?? err?.cause ?? err.original ?? null
-        });
-        return null;
-    }
-}