Version 2 Rewrite
This commit is contained in:
+199
@@ -0,0 +1,199 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const {google} = require('googleapis');
|
||||
const {applyRateLimitBuffer} = require('./rate');
|
||||
const pThrottleModule = require('p-throttle');
|
||||
const pThrottle = pThrottleModule.default || pThrottleModule;
|
||||
|
||||
function loadApiKeys(config) {
|
||||
const apiKeys = [];
|
||||
const defaultRateLimit = config.rateLimitPerMinute || 50;
|
||||
|
||||
if (Array.isArray(config.apiKeys)) {
|
||||
for (const entry of config.apiKeys) {
|
||||
if (typeof entry === 'string') {
|
||||
apiKeys.push({key: entry, rateLimitPerMinute: defaultRateLimit});
|
||||
} else if (entry && typeof entry === 'object') {
|
||||
if (!entry.key) {
|
||||
throw new Error('Each entry in `apiKeys` must include `key`');
|
||||
}
|
||||
apiKeys.push({
|
||||
key: entry.key,
|
||||
rateLimitPerMinute: entry.rateLimitPerMinute || defaultRateLimit,
|
||||
});
|
||||
} else {
|
||||
throw new Error('`apiKeys` entries must be strings or objects');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return apiKeys;
|
||||
}
|
||||
|
||||
function loadServiceAccounts(config) {
|
||||
const accounts = [];
|
||||
const defaultRateLimit = config.rateLimitPerMinute || 50;
|
||||
|
||||
if (!Array.isArray(config.serviceAccounts)) {
|
||||
return accounts;
|
||||
}
|
||||
|
||||
for (const entry of config.serviceAccounts) {
|
||||
if (typeof entry === 'string') {
|
||||
accounts.push({path: entry, rateLimitPerMinute: defaultRateLimit});
|
||||
} else if (entry && typeof entry === 'object') {
|
||||
if (!entry.path && !entry.credentialsPath) {
|
||||
throw new Error('Each entry in `serviceAccounts` must include `path` (or `credentialsPath`)');
|
||||
}
|
||||
const p = entry.path || entry.credentialsPath;
|
||||
accounts.push({path: p, rateLimitPerMinute: entry.rateLimitPerMinute || defaultRateLimit});
|
||||
} else {
|
||||
throw new Error('`serviceAccounts` entries must be strings or objects');
|
||||
}
|
||||
}
|
||||
|
||||
return accounts;
|
||||
}
|
||||
|
||||
function createServiceAccountBatchFetcher(config) {
|
||||
const accounts = loadServiceAccounts(config);
|
||||
if (accounts.length === 0) return null;
|
||||
|
||||
const fetchers = accounts.map(({path: credentialsPath, rateLimitPerMinute}) => {
|
||||
const resolvedPath = path.isAbsolute(credentialsPath) ? credentialsPath : path.resolve(process.cwd(), credentialsPath);
|
||||
if (!fs.existsSync(resolvedPath)) {
|
||||
throw new Error(`Service account credentials not found: ${resolvedPath}`);
|
||||
}
|
||||
|
||||
let credentials;
|
||||
try {
|
||||
credentials = JSON.parse(fs.readFileSync(resolvedPath, 'utf8'));
|
||||
} catch (e) {
|
||||
throw new Error(`Failed to read/parse service account credentials at ${resolvedPath}: ${e.message}`);
|
||||
}
|
||||
|
||||
let authClient;
|
||||
try {
|
||||
authClient = google.auth.fromJSON(credentials);
|
||||
} catch (e) {
|
||||
throw new Error(`Failed to initialize auth client from credentials at ${resolvedPath}: ${e.message}`);
|
||||
}
|
||||
authClient.scopes = ['https://www.googleapis.com/auth/spreadsheets.readonly'];
|
||||
|
||||
const bufferedRateLimit = applyRateLimitBuffer(rateLimitPerMinute);
|
||||
const interval = Math.ceil(60000 / bufferedRateLimit);
|
||||
const throttled = pThrottle({limit: 1, interval})(async (documentId, sheetNames) => {
|
||||
const sheets = google.sheets({version: 'v4', auth: authClient});
|
||||
const request = {spreadsheetId: documentId, ranges: sheetNames};
|
||||
const response = await sheets.spreadsheets.values.batchGet(request);
|
||||
const valueRanges = response.data.valueRanges || [];
|
||||
const rowsBySheet = {};
|
||||
for (let i = 0; i < sheetNames.length; i += 1) {
|
||||
const sheetName = sheetNames[i];
|
||||
rowsBySheet[sheetName] = valueRanges[i]?.values || [];
|
||||
}
|
||||
return rowsBySheet;
|
||||
});
|
||||
|
||||
return {authClient, fetch: throttled};
|
||||
});
|
||||
|
||||
let currentIndex = 0;
|
||||
return async (documentId, sheetNames) => {
|
||||
const worker = fetchers[currentIndex];
|
||||
currentIndex = (currentIndex + 1) % fetchers.length;
|
||||
return worker.fetch(documentId, sheetNames);
|
||||
};
|
||||
}
|
||||
|
||||
function createApiKeyBatchFetcher(config) {
|
||||
const apiKeys = loadApiKeys(config);
|
||||
if (apiKeys.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const fetchers = apiKeys.map(({key, rateLimitPerMinute}) => {
|
||||
const bufferedRateLimit = applyRateLimitBuffer(rateLimitPerMinute);
|
||||
const interval = Math.ceil(60000 / bufferedRateLimit);
|
||||
const throttled = pThrottle({limit: 1, interval})(async (documentId, sheetNames) => {
|
||||
const sheets = google.sheets({version: 'v4'});
|
||||
const request = {spreadsheetId: documentId, ranges: sheetNames, key};
|
||||
const response = await sheets.spreadsheets.values.batchGet(request);
|
||||
const valueRanges = response.data.valueRanges || [];
|
||||
const rowsBySheet = {};
|
||||
for (let i = 0; i < sheetNames.length; i += 1) {
|
||||
const sheetName = sheetNames[i];
|
||||
rowsBySheet[sheetName] = valueRanges[i]?.values || [];
|
||||
}
|
||||
return rowsBySheet;
|
||||
});
|
||||
return {key, fetch: throttled};
|
||||
});
|
||||
|
||||
let currentIndex = 0;
|
||||
return async (documentId, sheetNames) => {
|
||||
const worker = fetchers[currentIndex];
|
||||
currentIndex = (currentIndex + 1) % fetchers.length;
|
||||
return worker.fetch(documentId, sheetNames);
|
||||
};
|
||||
}
|
||||
|
||||
function getFirstApiKey(config) {
|
||||
if (Array.isArray(config.apiKeys) && config.apiKeys.length > 0) {
|
||||
const firstEntry = config.apiKeys[0];
|
||||
return typeof firstEntry === 'string' ? firstEntry : firstEntry.key;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
function getFirstServiceAccountAuthClient(config) {
|
||||
if (!Array.isArray(config.serviceAccounts) || config.serviceAccounts.length === 0) return null;
|
||||
const firstEntry = config.serviceAccounts[0];
|
||||
const entryObj = typeof firstEntry === 'string' ? {path: firstEntry} : firstEntry;
|
||||
const credentialsPath = entryObj.path || entryObj.credentialsPath;
|
||||
if (!credentialsPath) return null;
|
||||
|
||||
const resolvedPath = path.isAbsolute(credentialsPath) ? credentialsPath : path.resolve(process.cwd(), credentialsPath);
|
||||
if (!fs.existsSync(resolvedPath)) return null;
|
||||
|
||||
try {
|
||||
const raw = fs.readFileSync(resolvedPath, 'utf8');
|
||||
const credentials = JSON.parse(raw);
|
||||
const authClient = google.auth.fromJSON(credentials);
|
||||
authClient.scopes = ['https://www.googleapis.com/auth/spreadsheets.readonly'];
|
||||
return authClient;
|
||||
} catch (e) {
|
||||
console.error(`Failed to load first service account from ${resolvedPath}: ${e.message}`);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function loadAuth(config) {
|
||||
if (!config || typeof config !== 'object') return null;
|
||||
|
||||
if (config.credentialsPath) {
|
||||
const credentialsPath = config.credentialsPath;
|
||||
const resolvedPath = path.isAbsolute(credentialsPath) ? credentialsPath : path.resolve(process.cwd(), credentialsPath);
|
||||
if (!fs.existsSync(resolvedPath)) {
|
||||
throw new Error(`Credentials file not found: ${resolvedPath}`);
|
||||
}
|
||||
const raw = fs.readFileSync(resolvedPath, 'utf8');
|
||||
const credentials = JSON.parse(raw);
|
||||
const authClient = google.auth.fromJSON(credentials);
|
||||
authClient.scopes = ['https://www.googleapis.com/auth/spreadsheets.readonly'];
|
||||
return authClient;
|
||||
}
|
||||
|
||||
return getFirstServiceAccountAuthClient(config);
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
loadApiKeys,
|
||||
loadServiceAccounts,
|
||||
createServiceAccountBatchFetcher,
|
||||
createApiKeyBatchFetcher,
|
||||
getFirstApiKey,
|
||||
getFirstServiceAccountAuthClient
|
||||
, loadAuth
|
||||
};
|
||||
@@ -0,0 +1,48 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
const CONFIG_PATH = path.resolve(__dirname, '..', 'config.json');
|
||||
|
||||
function loadConfig() {
|
||||
if (!fs.existsSync(CONFIG_PATH)) {
|
||||
throw new Error(`Missing config file at ${CONFIG_PATH}`);
|
||||
}
|
||||
const json = fs.readFileSync(CONFIG_PATH, 'utf8');
|
||||
return JSON.parse(json);
|
||||
}
|
||||
|
||||
function resolveOutputPath(outputDir, filename) {
|
||||
if (!path.isAbsolute(outputDir)) {
|
||||
outputDir = path.resolve(process.cwd(), outputDir);
|
||||
}
|
||||
if (!fs.existsSync(outputDir)) {
|
||||
fs.mkdirSync(outputDir, {recursive: true});
|
||||
}
|
||||
return path.join(outputDir, filename);
|
||||
}
|
||||
|
||||
function validateConfig(config) {
|
||||
if (!config || typeof config !== 'object') {
|
||||
throw new Error('Missing or invalid configuration object');
|
||||
}
|
||||
|
||||
if (!Array.isArray(config.documents) || config.documents.length === 0) {
|
||||
throw new Error('`documents` must be a non-empty array in config.json');
|
||||
}
|
||||
|
||||
const hasApiKeys = Array.isArray(config.apiKeys) && config.apiKeys.length > 0;
|
||||
const hasSvcAccounts = Array.isArray(config.serviceAccounts) && config.serviceAccounts.length > 0;
|
||||
const hasCredPath = !!config.credentialsPath;
|
||||
|
||||
if (!hasApiKeys && !hasSvcAccounts && !hasCredPath) {
|
||||
throw new Error('Configuration must include at least one of: `apiKeys`, `serviceAccounts`, or `credentialsPath`');
|
||||
}
|
||||
|
||||
// Basic validation of documents/sheets structure
|
||||
for (const doc of config.documents) {
|
||||
if (!doc.documentId) throw new Error('Each document must include a `documentId`');
|
||||
if (!Array.isArray(doc.sheets) || doc.sheets.length === 0) throw new Error(`Document ${doc.documentId} must include a non-empty 'sheets' array`);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {loadConfig, resolveOutputPath, validateConfig};
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
const pThrottleModule = require('p-throttle');
|
||||
const pThrottle = pThrottleModule.default || pThrottleModule;
|
||||
|
||||
function buildThrottle(maxRequestsPerMinute) {
|
||||
const limit = Math.max(1, Math.floor(maxRequestsPerMinute));
|
||||
const interval = Math.ceil(60000 / limit);
|
||||
return pThrottle({limit: 1, interval});
|
||||
}
|
||||
|
||||
function applyRateLimitBuffer(rateLimitPerMinute) {
|
||||
return Math.max(1, Math.floor(rateLimitPerMinute * 0.95));
|
||||
}
|
||||
|
||||
function getTotalRateLimitPerMinute(config) {
|
||||
const defaultRateLimit = config.rateLimitPerMinute || 50;
|
||||
let totalRateLimit = 0;
|
||||
|
||||
if (Array.isArray(config.apiKeys) && config.apiKeys.length > 0) {
|
||||
for (const entry of config.apiKeys) {
|
||||
if (typeof entry === 'string') {
|
||||
totalRateLimit += applyRateLimitBuffer(defaultRateLimit);
|
||||
} else if (entry && typeof entry === 'object') {
|
||||
totalRateLimit += applyRateLimitBuffer(entry.rateLimitPerMinute || defaultRateLimit);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (Array.isArray(config.serviceAccounts) && config.serviceAccounts.length > 0) {
|
||||
for (const entry of config.serviceAccounts) {
|
||||
if (typeof entry === 'string') {
|
||||
totalRateLimit += applyRateLimitBuffer(defaultRateLimit);
|
||||
} else if (entry && typeof entry === 'object') {
|
||||
totalRateLimit += applyRateLimitBuffer(entry.rateLimitPerMinute || defaultRateLimit);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (totalRateLimit === 0) {
|
||||
totalRateLimit = applyRateLimitBuffer(defaultRateLimit);
|
||||
}
|
||||
|
||||
return Math.max(1, totalRateLimit);
|
||||
}
|
||||
|
||||
module.exports = {buildThrottle, applyRateLimitBuffer, getTotalRateLimitPerMinute};
|
||||
Reference in New Issue
Block a user