@powerhousedao/contributor-billing 0.0.89 → 0.0.90

package/dist/editors/contributor-billing/components/InvoiceTable/HeaderStats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HeaderStats.d.ts","sourceRoot":"","sources":["../../../../../editors/contributor-billing/components/InvoiceTable/HeaderStats.tsx"],"names":[],"mappings":"AAkBA,eAAO,MAAM,WAAW,+CA6GvB,CAAC"}
+{"version":3,"file":"HeaderStats.d.ts","sourceRoot":"","sources":["../../../../../editors/contributor-billing/components/InvoiceTable/HeaderStats.tsx"],"names":[],"mappings":"AAkBA,eAAO,MAAM,WAAW,+CAoHvB,CAAC"}

package/dist/editors/contributor-billing/components/InvoiceTable/HeaderStats.js

@@ -30,20 +30,24 @@ export const HeaderStats = () => {
             for (const doc of invoices) {
                 const invoice = doc;
                 const invoiceAmount = invoice.state.global.totalPriceTaxIncl;
-                let invoiceCurrency = invoice.state.global.currency;
+                let invoiceCurrency = invoice.state.global.currency || 'USD'; // Fallback to USD if currency is empty
                 let selectCurrency = selectedCurrency;
                 if (invoiceCurrency === selectedCurrency) {
                     total += invoiceAmount;
                 }
                 else {
                     try {
+                        // Only convert crypto currencies to USD for the API call
+                        let fromCurrency = invoiceCurrency;
+                        let toCurrency = selectedCurrency;
+                        // Convert crypto to USD for API compatibility
                         if (invoiceCurrency === "DAI" || invoiceCurrency === "USDS") {
-                            invoiceCurrency = "USD";
+                            fromCurrency = "USD";
                         }
                         if (selectedCurrency === "DAI" || selectedCurrency === "USDS") {
-                            selectCurrency = "USD";
+                            toCurrency = "USD";
                         }
-                        const exchangeRate = await getExchangeRate(invoiceCurrency, selectCurrency);
+                        const exchangeRate = await getExchangeRate(fromCurrency, toCurrency, invoiceAmount);
                         total += invoiceAmount * exchangeRate;
                     }
                     catch (error) {

package/dist/editors/contributor-billing/util.d.ts

@@ -3,7 +3,8 @@
  * Supports both fiat and crypto currencies.
  * @param fromCurrency - The currency code to convert from (e.g., 'USD', 'DAI').
  * @param toCurrency - The currency code to convert to (e.g., 'EUR', 'USDS').
+ * @param amount - The amount to convert (optional, used for validation).
  * @returns The exchange rate from fromCurrency to toCurrency.
  */
-export declare const getExchangeRate: (fromCurrency: string, toCurrency: string) => Promise<number>;
+export declare const getExchangeRate: (fromCurrency: string, toCurrency: string, amount?: number) => Promise<number>;
 //# sourceMappingURL=util.d.ts.map

package/dist/editors/contributor-billing/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../editors/contributor-billing/util.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,GAAU,cAAc,MAAM,EAAE,YAAY,MAAM,KAAG,OAAO,CAAC,MAAM,CAiF9F,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../editors/contributor-billing/util.ts"],"names":[],"mappings":"AAYA;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAAU,cAAc,MAAM,EAAE,YAAY,MAAM,EAAE,SAAS,MAAM,KAAG,OAAO,CAAC,MAAM,CAoH/G,CAAC"}

package/dist/editors/contributor-billing/util.js

@@ -1,35 +1,58 @@
 // Cache for exchange rates to avoid repeated API calls
 const exchangeRateCache = {};
+/**
+ * Validates if an amount should trigger an exchange rate fetch
+ * @param amount - The amount to validate
+ * @returns true if the amount is valid and should trigger API calls
+ */
+const isValidAmount = (amount) => {
+    return amount !== undefined && amount !== null && !isNaN(amount) && amount > 0;
+};
 /**
  * Fetches the exchange rate between two currencies using ExchangeRate-API.
  * Supports both fiat and crypto currencies.
  * @param fromCurrency - The currency code to convert from (e.g., 'USD', 'DAI').
  * @param toCurrency - The currency code to convert to (e.g., 'EUR', 'USDS').
+ * @param amount - The amount to convert (optional, used for validation).
  * @returns The exchange rate from fromCurrency to toCurrency.
  */
-export const getExchangeRate = async (fromCurrency, toCurrency) => {
+export const getExchangeRate = async (fromCurrency, toCurrency, amount) => {
+    // Normalize inputs
+    const base = (fromCurrency || '').trim().toUpperCase();
+    const quote = (toCurrency || '').trim().toUpperCase();
+    // Guard empty currencies
+    if (!base || !quote) {
+        return 1;
+    }
     // Return 1 if currencies are the same
-    if (fromCurrency === toCurrency) {
+    if (base === quote) {
+        return 1;
+    }
+    // Skip API call if amount is explicitly provided and invalid
+    if (amount !== undefined && !isValidAmount(amount)) {
         return 1;
     }
     // Create cache key
-    const cacheKey = `${fromCurrency}_${toCurrency}`;
+    const cacheKey = `${base}_${quote}`;
     // Return cached rate if available
     if (exchangeRateCache[cacheKey] !== undefined) {
         return exchangeRateCache[cacheKey];
     }
     try {
-        // Use ExchangeRate-API.com for currency conversion
-        // This API supports both fiat and crypto currencies
-        const response = await fetch(`https://api.exchangerate-api.com/v4/latest/${fromCurrency}`);
+        // Use a CORS-friendly endpoint that does not redirect
+        // API: https://open.er-api.com/v6/latest/{BASE}
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), 10000); // 10 second timeout
+        const response = await fetch(`https://open.er-api.com/v6/latest/${base}`, { signal: controller.signal });
+        clearTimeout(timeoutId);
         if (!response.ok) {
             throw new Error(`Failed to fetch exchange rates: ${response.status}`);
         }
         const data = await response.json();
-        if (!data.rates || !data.rates[toCurrency]) {
-            throw new Error(`Exchange rate not found for ${fromCurrency} to ${toCurrency}`);
+        if (!data.rates || !data.rates[quote]) {
+            throw new Error(`Exchange rate not found for ${base} to ${quote}`);
         }
-        const exchangeRate = data.rates[toCurrency];
+        const exchangeRate = data.rates[quote];
         // Cache the result
         exchangeRateCache[cacheKey] = exchangeRate;
         return exchangeRate;
@@ -37,18 +60,21 @@ export const getExchangeRate = async (fromCurrency, toCurrency) => {
     catch (error) {
         console.error('ExchangeRate-API error:', error);
         // Fallback: try a different approach for crypto currencies
-        if (['USDS', 'DAI'].includes(fromCurrency) || ['USDS', 'DAI'].includes(toCurrency)) {
+        if (['USDS', 'DAI'].includes(base) || ['USDS', 'DAI'].includes(quote)) {
             try {
                 // For crypto currencies, use CoinGecko as fallback
                 const cryptoMapping = {
                     'USDS': 'usd-coin',
                     'DAI': 'dai',
                 };
-                const fromMapped = cryptoMapping[fromCurrency] || fromCurrency.toLowerCase();
-                const toMapped = cryptoMapping[toCurrency] || toCurrency.toLowerCase();
-                if (cryptoMapping[fromCurrency]) {
+                const fromMapped = cryptoMapping[base] || base.toLowerCase();
+                const toMapped = cryptoMapping[quote] || quote.toLowerCase();
+                if (cryptoMapping[base]) {
                     // From crypto to fiat/crypto
-                    const response = await fetch(`https://api.coingecko.com/api/v3/simple/price?ids=${fromMapped}&vs_currencies=${toMapped}`);
+                    const cryptoController = new AbortController();
+                    const cryptoTimeoutId = setTimeout(() => cryptoController.abort(), 8000); // 8 second timeout
+                    const response = await fetch(`https://api.coingecko.com/api/v3/simple/price?ids=${fromMapped}&vs_currencies=${toMapped}`, { signal: cryptoController.signal });
+                    clearTimeout(cryptoTimeoutId);
                     if (response.ok) {
                         const data = await response.json();
                         const rate = data[fromMapped]?.[toMapped];
@@ -58,9 +84,12 @@ export const getExchangeRate = async (fromCurrency, toCurrency) => {
                         }
                     }
                 }
-                else if (cryptoMapping[toCurrency]) {
+                else if (cryptoMapping[quote]) {
                     // From fiat to crypto
-                    const response = await fetch(`https://api.coingecko.com/api/v3/simple/price?ids=${toMapped}&vs_currencies=${fromMapped}`);
+                    const cryptoController2 = new AbortController();
+                    const cryptoTimeoutId2 = setTimeout(() => cryptoController2.abort(), 8000); // 8 second timeout
+                    const response = await fetch(`https://api.coingecko.com/api/v3/simple/price?ids=${toMapped}&vs_currencies=${fromMapped}`, { signal: cryptoController2.signal });
+                    clearTimeout(cryptoTimeoutId2);
                     if (response.ok) {
                         const data = await response.json();
                         const rate = data[toMapped]?.[fromMapped];

package/dist/editors/invoice/ingestPDF.js

@@ -6,7 +6,7 @@ import { uploadPdfChunked } from "./uploadPdfChunked.js";
 import { getCountryCodeFromName } from "./utils/utils.js";
 let GRAPHQL_URL = 'http://localhost:4001/graphql/invoice';
 if (!window.document.baseURI.includes('localhost')) {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+    GRAPHQL_URL = 'https://switchboard-dev.powerhouse.xyz/graphql/invoice';
 }
 export async function loadPDFFile({ file, dispatch, }) {
     if (!file)

package/dist/editors/invoice/invoiceToGnosis.js

@@ -4,7 +4,7 @@ import { actions } from "../../document-models/invoice/index.js";
 import { generateId } from "document-model";
 let GRAPHQL_URL = "http://localhost:4001/graphql/invoice";
 if (!window.document.baseURI.includes('localhost')) {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+    GRAPHQL_URL = 'https://switchboard-dev.powerhouse.xyz/graphql/invoice';
 }
 const InvoiceToGnosis = ({ docState, dispatch, }) => {
     const [isLoading, setIsLoading] = useState(false);

package/dist/editors/invoice/requestFinance.js

@@ -4,7 +4,7 @@ import { actions } from "../../document-models/invoice/index.js";
 import { generateId } from "document-model";
 let GRAPHQL_URL = "http://localhost:4001/graphql/invoice";
 if (!window.document.baseURI.includes('localhost')) {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+    GRAPHQL_URL = 'https://switchboard-dev.powerhouse.xyz/graphql/invoice';
 }
 const RequestFinance = ({ docState, dispatch, }) => {
     const [isLoading, setIsLoading] = useState(false);

package/dist/editors/invoice/uploadPdfChunked.js

@@ -7,7 +7,7 @@
  */
 let GRAPHQL_URL = 'http://localhost:4001/graphql/invoice';
 if (!window.document.baseURI.includes('localhost')) {
-    GRAPHQL_URL = 'https://switchboard.powerhouse.xyz/graphql/invoice';
+    GRAPHQL_URL = 'https://switchboard-dev.powerhouse.xyz/graphql/invoice';
 }
 export async function uploadPdfChunked(pdfData, endpoint = GRAPHQL_URL, chunkSize = 500 * 1024, // 500KB chunks
 onProgress) {

package/dist/migrate-zip.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=migrate-zip.d.ts.map

package/dist/migrate-zip.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-zip.d.ts","sourceRoot":"","sources":["../migrate-zip.js"],"names":[],"mappings":""}

package/dist/migrate-zip.js

@@ -0,0 +1,56 @@
+import fs from "node:fs";
+import JSZip from "jszip";
+import path from "node:path";
+import { documentModelDocumentModelModule } from "document-model";
+import { argv } from "node:process";
+const docModelMap = {
+    "powerhouse/document-model": documentModelDocumentModelModule,
+    // add other document models here
+};
+async function loadFromZip(zip, entryName) {
+    const entry = await zip.file(entryName).async("string");
+    return JSON.parse(entry);
+}
+async function resolvePath(argPath) {
+    if (fs.lstatSync(argPath).isDirectory()) {
+        const children = fs.readdirSync(argPath);
+        return children
+            .filter((child) => child.endsWith(".zip") &&
+            fs.lstatSync(path.join(argPath, child)).isFile())
+            .map((child) => path.join(argPath, child));
+    }
+    return [path.resolve(argPath)];
+}
+async function migrateZip(zipPath) {
+    const file = fs.readFileSync(zipPath);
+    const docZip = new JSZip();
+    await docZip.loadAsync(file);
+    const header = await loadFromZip(docZip, "header.json");
+    const operations = await loadFromZip(docZip, "operations.json");
+    const documentModel = docModelMap[header.documentType];
+    if (!documentModel) {
+        throw new Error(`Unknown document type: ${header.documentType}. Add it to docModelMap.`);
+    }
+    const result = Object.values(operations)
+        .flat()
+        .reduce((doc, operation) => {
+        const action = "action" in operation ? operation.action : operation;
+        return documentModel.reducer(doc, action);
+    }, documentModel.utils.createDocument());
+    const targetName = path.basename(zipPath, path.extname(zipPath));
+    const targetPath = path.resolve(zipPath, "../");
+    await documentModel.utils.saveToFile(result, targetPath, `${targetName}-migrated`);
+    console.info(`Migrated ${path.relative(process.cwd(), zipPath)} to ${path.relative(process.cwd(), path.join(targetPath, `${targetName}-migrated.${documentModel.documentModel.extension}.zip`))}`);
+}
+const paths = argv.length > 2 ? argv.slice(2) : [process.cwd()];
+paths.forEach(async (val) => {
+    const resolvedPaths = await resolvePath(val);
+    for (const zipPath of resolvedPaths) {
+        try {
+            await migrateZip(zipPath);
+        }
+        catch (e) {
+            console.error(`Error migrating ${zipPath}`, e);
+        }
+    }
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/contributor-billing",
   "description": "Document models that help contributors of open organisations get paid anonymously for their work on a monthly basis.",
-  "version": "0.0.89",
+  "version": "0.0.90",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [
@@ -57,9 +57,9 @@
   },
   "dependencies": {
     "@google-cloud/documentai": "^8.12.0",
-    "@powerhousedao/builder-tools": "^5.0.0-staging.14",
-    "@powerhousedao/common": "^5.0.0-staging.14",
-    "@powerhousedao/design-system": "^5.0.0-staging.14",
+    "@powerhousedao/builder-tools": "^5.0.0-staging.15",
+    "@powerhousedao/common": "^5.0.0-staging.15",
+    "@powerhousedao/design-system": "^5.0.0-staging.15",
     "@powerhousedao/document-engineering": "^1.37.0",
     "@react-pdf/renderer": "^4.3.0",
     "@safe-global/api-kit": "^3.0.1",
@@ -69,7 +69,7 @@
     "@types/cors": "^2.8.17",
     "axios": "^1.9.0",
     "cors": "^2.8.5",
-    "document-model": "^5.0.0-staging.14",
+    "document-model": "^5.0.0-staging.15",
     "dotenv": "^16.5.0",
     "error": "^10.4.0",
     "ethers": "^6.14.0",
@@ -85,23 +85,24 @@
     "@electric-sql/pglite": "^0.2.12",
     "@eslint/js": "^9.25.0",
     "@powerhousedao/analytics-engine-core": "^0.5.0",
-    "@powerhousedao/codegen": "^5.0.0-staging.14",
-    "@powerhousedao/ph-cli": "^5.0.0-staging.14",
-    "@powerhousedao/reactor-api": "^5.0.0-staging.14",
-    "@powerhousedao/reactor-browser": "^5.0.0-staging.14",
-    "@powerhousedao/reactor-local": "^5.0.0-staging.14",
+    "@powerhousedao/codegen": "^5.0.0-staging.15",
+    "@powerhousedao/ph-cli": "^5.0.0-staging.15",
+    "@powerhousedao/reactor-api": "^5.0.0-staging.15",
+    "@powerhousedao/reactor-browser": "^5.0.0-staging.15",
+    "@powerhousedao/reactor-local": "^5.0.0-staging.15",
     "@powerhousedao/scalars": "^1.33.1-staging.5",
-    "@powerhousedao/switchboard": "^5.0.0-staging.14",
+    "@powerhousedao/switchboard": "^5.0.0-staging.15",
     "@tailwindcss/cli": "^4.1.4",
     "@testing-library/react": "^16.3.0",
     "@types/node": "^22.14.1",
     "@types/react": "^18.3.20",
     "@vitejs/plugin-react": "^4.4.1",
-    "document-drive": "^5.0.0-staging.14",
+    "document-drive": "^5.0.0-staging.15",
     "eslint": "^9.25.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "globals": "^16.0.0",
+    "jszip": "^3.10.1",
     "package-manager-detector": "^0.2.8",
     "pm2": "^5.4.3",
     "react": "^18.3.1",