pushnetgo-cli 1.0.3 → 1.0.4

package/commands/sync-music.js

@@ -2,16 +2,21 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { resolveApiKey } = require('../lib/auth');
-const { uploadFile, saveTrack, downloadUrlToFile } = require('../lib/uploader');
+const { hasServiceAccount, syncMusicHttp } = require('../lib/http-client');
 
 async function syncMusic(options) {
   const projectId = options.project || 'default';
   const dir = options.dir;
   const url = options.url;
-
-  await resolveApiKey(options.key);
+  const key = await resolveApiKey(options.key);
 
   if (dir) {
+    if (!hasServiceAccount()) {
+      console.error('Local directory upload requires Firebase service account.');
+      console.error('Use --url instead: pushnetgo-cli sync-music --url "https://..."');
+      process.exit(1);
+    }
+    const { uploadFile, saveTrack } = require('../lib/uploader');
     const files = fs.readdirSync(dir)
       .filter(f => f.endsWith('.mp3'))
       .map(f => path.join(dir, f));
@@ -40,23 +45,32 @@ async function syncMusic(options) {
   }
 
   if (url) {
-    console.log(`Download: ${url}`);
-    const tmpDir = os.tmpdir();
-    const tmpFile = path.join(tmpDir, `mureka_${Date.now()}.mp3`);
-    await downloadUrlToFile(url, tmpFile);
-    console.log(`Downloaded to: ${tmpFile}`);
-
-    const trackId = `mureka_${Date.now()}`;
-    const artist = 'Mureka AI';
-    const title = `Generated ${new Date().toISOString().slice(0, 10)}`;
-
-    process.stdout.write('Uploading...');
-    const downloadUrl = await uploadFile(tmpFile, `music_files/${trackId}.mp3`);
-    await saveTrack({ trackId, title, artist, downloadUrl, projectId });
-    console.log(' OK');
-
-    try { fs.unlinkSync(tmpFile); } catch (_) {}
-    console.log(`Mureka track published to project ${projectId}`);
+    if (hasServiceAccount()) {
+      // SDK mode: download → upload via Firebase Admin
+      const { downloadUrlToFile, uploadFile, saveTrack } = require('../lib/uploader');
+      console.log(`Download: ${url}`);
+      const tmpDir = os.tmpdir();
+      const tmpFile = path.join(tmpDir, `mureka_${Date.now()}.mp3`);
+      await downloadUrlToFile(url, tmpFile);
+      console.log(`Downloaded to: ${tmpFile}`);
+
+      const trackId = `mureka_${Date.now()}`;
+      const artist = 'Mureka AI';
+      const title = `Generated ${new Date().toISOString().slice(0, 10)}`;
+
+      process.stdout.write('Uploading...');
+      const downloadUrl = await uploadFile(tmpFile, `music_files/${trackId}.mp3`);
+      await saveTrack({ trackId, title, artist, downloadUrl, projectId });
+      console.log(' OK');
+
+      try { fs.unlinkSync(tmpFile); } catch (_) {}
+      console.log(`Mureka track published to project ${projectId}`);
+    } else {
+      // HTTP mode: call API
+      console.log(`Submitting: ${url} -> project ${projectId}`);
+      const result = await syncMusicHttp(key, url, projectId);
+      console.log(`OK: ${result.trackId} — ${result.downloadUrl}`);
+    }
   }
 }
 

package/commands/token.js

@@ -1,37 +1,44 @@
-const { getFirestore } = require('../lib/firestore');
+const { hasServiceAccount, checkTokenHttp } = require('../lib/http-client');
+const { validateKeyFormat, resolveKeyEnv } = require('../lib/auth');
 
 async function checkToken(key) {
-  const token = key || process.env.MYAPP_API_KEY;
+  const token = resolveKeyEnv(key);
 
-  if (!token) {
-    console.error('Usage: pushnetgo-cli token check --key pushnetgo-xxxx');
-    console.error('   or: export MYAPP_API_KEY="pushnetgo-xxxx"');
-    process.exit(1);
-  }
-
-  if (!token.startsWith('pushnetgo-')) {
-    console.error('Invalid prefix. PushNetGo keys must start with pushnetgo-');
-    process.exit(1);
-  }
+  if (hasServiceAccount()) {
+    const { getFirestore } = require('../lib/firestore');
+    const db = getFirestore();
+    const snap = await db.collection('tokens')
+      .where('tokenValue', '==', token)
+      .limit(1)
+      .get();
 
-  const db = getFirestore();
-  const snap = await db.collection('tokens')
-    .where('tokenValue', '==', token)
-    .limit(1)
-    .get();
+    if (snap.empty) {
+      console.log(`NOT FOUND: ${token.slice(0, 16)}...`);
+      return;
+    }
 
-  if (snap.empty) {
-    console.log(`NOT FOUND: ${token.slice(0, 16)}...`);
-    return;
+    const d = snap.docs[0].data();
+    console.log(`OK: ${token}`);
+    console.log(`   active:    ${d.isActive}`);
+    console.log(`   usage:     ${d.usageCount || 0}`);
+    console.log(`   userId:    ${d.userId}`);
+    console.log(`   perms:     ${JSON.stringify(d.permissions || d.scopes || [])}`);
+    console.log(`   created:   ${d.createdAt?.toDate?.() || d.createdAt}`);
+  } else {
+    // HTTP mode
+    try {
+      const result = await checkTokenHttp(token);
+      console.log(`OK: ${result.token}`);
+      console.log(`   active:    ${result.active}`);
+      console.log(`   usage:     ${result.usageCount || 0}`);
+      console.log(`   userId:    ${result.userId}`);
+      console.log(`   perms:     ${JSON.stringify(result.permissions || [])}`);
+      console.log(`   created:   ${result.createdAt}`);
+    } catch (e) {
+      console.error(`Error: ${e.error || e.message || e}`);
+      process.exit(1);
+    }
   }
-
-  const d = snap.docs[0].data();
-  console.log(`OK: ${token}`);
-  console.log(`   active:    ${d.isActive}`);
-  console.log(`   usage:     ${d.usageCount || 0}`);
-  console.log(`   userId:    ${d.userId}`);
-  console.log(`   perms:     ${JSON.stringify(d.permissions || d.scopes || [])}`);
-  console.log(`   created:   ${d.createdAt?.toDate?.() || d.createdAt}`);
 }
 
 module.exports = { checkToken };

package/lib/auth.js

@@ -1,49 +1,72 @@
-const { getFirestore, admin } = require('./firestore');
-
-async function resolveApiKey(cliKey) {
-  const key = cliKey || process.env.MYAPP_API_KEY;
-
-  if (!key) {
-    console.error('No API Key found. Set env var or pass --key:');
-  console.error('  export MYAPP_API_KEY="pushnetgo-xxxx"');
-  console.error('  or: pushnetgo-cli sync-music --key pushnetgo-xxxx ...');
-    process.exit(1);
-  }
+const { hasServiceAccount } = require('./http-client');
 
+function validateKeyFormat(key) {
   if (!key.startsWith('pushnetgo-') || key.length < 22) {
     console.error('Invalid key format. Expected pushnetgo- prefix + 32 hex chars');
     process.exit(1);
   }
+}
 
-  const db = getFirestore();
-  const snap = await db.collection('tokens')
-    .where('tokenValue', '==', key)
-    .where('isActive', '==', true)
-    .limit(1)
-    .get();
-
-  if (snap.empty) {
-    console.error('Key not found or inactive');
+function resolveKeyEnv(cliKey) {
+  const key = cliKey || process.env.MYAPP_API_KEY;
+  if (!key) {
+    console.error('No API Key found. Set env var or pass --key:');
+    console.error('  export MYAPP_API_KEY="pushnetgo-xxxx"');
+    console.error('  or: pushnetgo-cli sync-music --key pushnetgo-xxxx ...');
     process.exit(1);
   }
+  validateKeyFormat(key);
+  return key;
+}
+
+async function resolveApiKey(cliKey) {
+  const key = resolveKeyEnv(cliKey);
 
-  const data = snap.docs[0].data();
-  const perms = data.permissions || data.scopes || [];
-  const hasUpload = perms.some(p => p === 'musicUpload' || p === 'music_upload');
+  if (hasServiceAccount()) {
+    const { getFirestore, admin } = require('./firestore');
+    const db = getFirestore();
+    const snap = await db.collection('tokens')
+      .where('tokenValue', '==', key)
+      .where('isActive', '==', true)
+      .limit(1)
+      .get();
 
-  if (!hasUpload) {
-    console.error('This key lacks musicUpload permission');
-    process.exit(1);
-  }
+    if (snap.empty) {
+      console.error('Key not found or inactive');
+      process.exit(1);
+    }
 
-  console.log(`Auth OK — uid: ${data.userId}`);
+    const data = snap.docs[0].data();
+    const perms = data.permissions || data.scopes || [];
+    const hasUpload = perms.some(p => p === 'musicUpload' || p === 'music_upload');
 
-  await db.collection('tokens').doc(snap.docs[0].id).update({
-    lastUsedAt: admin.firestore.FieldValue.serverTimestamp(),
-    usageCount: admin.firestore.FieldValue.increment(1),
-  });
+    if (!hasUpload) {
+      console.error('This key lacks musicUpload permission');
+      process.exit(1);
+    }
+
+    console.log(`Auth OK — uid: ${data.userId}`);
+    await db.collection('tokens').doc(snap.docs[0].id).update({
+      lastUsedAt: admin.firestore.FieldValue.serverTimestamp(),
+      usageCount: admin.firestore.FieldValue.increment(1),
+    });
+  } else {
+    // HTTP mode: validate via API
+    const { checkTokenHttp } = require('./http-client');
+    try {
+      const result = await checkTokenHttp(key);
+      if (!result.active) {
+        console.error('Token is inactive');
+        process.exit(1);
+      }
+      console.log(`Auth OK — uid: ${result.userId}`);
+    } catch (e) {
+      console.error('Token validation failed:', e.error || e.message || e);
+      process.exit(1);
+    }
+  }
 
   return key;
 }
 
-module.exports = { resolveApiKey };
+module.exports = { resolveApiKey, resolveKeyEnv, validateKeyFormat };

package/lib/http-client.js

@@ -0,0 +1,57 @@
+const https = require('https');
+const http = require('http');
+
+const API_URL = 'https://us-central1-flutter-ai-playground-f8e3b.cloudfunctions.net/unifiedGatewayApi';
+
+const fs = require('fs');
+const path = require('path');
+
+let _hasSA = null;
+function hasServiceAccount() {
+  if (_hasSA !== null) return _hasSA;
+  const saPath = path.resolve(__dirname, '../../configs/service-account.json');
+  _hasSA = fs.existsSync(saPath);
+  return _hasSA;
+}
+
+function _request(body, apiKey) {
+  return new Promise((resolve, reject) => {
+    const data = JSON.stringify(body);
+    const url = new URL(API_URL);
+    const client = url.protocol === 'https:' ? https : http;
+    const req = client.request({
+      hostname: url.hostname,
+      path: url.pathname,
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': Buffer.byteLength(data),
+        'x-api-key': apiKey,
+      },
+    }, (res) => {
+      let body = '';
+      res.on('data', chunk => body += chunk);
+      res.on('end', () => {
+        try {
+          const json = JSON.parse(body);
+          res.statusCode >= 400 ? reject(json) : resolve(json);
+        } catch (_) {
+          reject({ error: `HTTP ${res.statusCode}: ${body.slice(0, 200)}` });
+        }
+      });
+    });
+    req.on('error', reject);
+    req.write(data);
+    req.end();
+  });
+}
+
+async function checkTokenHttp(key) {
+  return _request({ action: 'token-check' }, key);
+}
+
+async function syncMusicHttp(key, url, projectId) {
+  return _request({ action: 'sync-music', url, projectId }, key);
+}
+
+module.exports = { hasServiceAccount, checkTokenHttp, syncMusicHttp, API_URL };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushnetgo-cli",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "PushNetGo App CLI — HTTP API: https://us-central1-flutter-ai-playground-f8e3b.cloudfunctions.net/unifiedGatewayApi",
   "bin": {
     "pushnetgo-cli": "./bin/pushnetgo-cli.js"