Battlesnake/microservices
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modified index.js

Browse source
This commit is contained in:
yoshi 2025-04-30 15:09:22 -07:00
parent 52d62894b6
commit 1edc0d39c2
5 changed files with 113 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

132
deployment-service/src/index.js
View file

@ -1,3 +1,5 @@
// src/index.js
const express = require('express');
const fs = require('fs');
const path = require('path');
@ -15,6 +17,19 @@ const {
IMAGE_REF
} = process.env;
// --- ENV debug ---
console.log('--- ENV START ---');
console.log('FLY_ORG: ', FLY_ORG);
console.log('COMMON_BUCKET: ', COMMON_BUCKET);
console.log('AWS_ACCESS_KEY_ID: ', AWS_ACCESS_KEY_ID ? '(found)' : '(NOT SET)');
console.log('AWS_SECRET_ACCESS_KEY:', AWS_SECRET_ACCESS_KEY ? '(found)' : '(NOT SET)');
console.log('AWS_ENDPOINT_URL_S3: ', AWS_ENDPOINT_URL_S3);
console.log('AWS_REGION: ', AWS_REGION);
console.log('FLY_ACCESS_TOKEN: ', FLY_ACCESS_TOKEN ? '(found)' : '(NOT SET)');
console.log('IMAGE_REF: ', IMAGE_REF);
console.log('--- ENV END ---');
// S3 client
const s3 = new AWS.S3({
endpoint: AWS_ENDPOINT_URL_S3,
region: AWS_REGION,
@ -22,6 +37,7 @@ const s3 = new AWS.S3({
s3ForcePathStyle: true
});
// Fly Machines API client
function createFlyClient() {
return axios.create({
baseURL: 'https://api.machines.dev/v1',
@ -36,55 +52,54 @@ const app = express();
app.use(express.json({ limit: '10mb' }));
app.post('/deploy', async (req, res) => {
console.log('Received /deploy:', req.body);
const { appName, region = 'sea', notebookName } = req.body;
if (!appName || !notebookName) {
return res.status(400).json({ error: 'appName and notebookName required' });
}
// resolve path based on SSH-inspected layout
const notebookPath = path.join(__dirname, '../snakeapi_service/notebooks', notebookName);
console.log('Resolved notebookPath:', notebookPath);
console.log('File exists:', fs.existsSync(notebookPath));
if (!fs.existsSync(notebookPath)) {
console.error('Notebook not found at:', notebookPath);
return res.status(500).json({ error: `Notebook not found: ${notebookPath}` });
}
try {
const fly = createFlyClient();
console.log('Creating Fly app:', appName);
await fly.post('/apps', {
app_name: appName,
org_slug: FLY_ORG,
primary_region: region
});
await fly.post(`/apps/${appName}/secrets`, {
secrets: {
INSTANCE_PREFIX: appName,
BUCKET_NAME: COMMON_BUCKET,
AWS_ACCESS_KEY_ID,
AWS_SECRET_ACCESS_KEY,
AWS_ENDPOINT_URL_S3,
AWS_REGION
}
});
const notebookFile = path.join(__dirname, '../snakeapi_service/notebooks', notebookName);
if (!fs.existsSync(notebookFile)) {
throw new Error(`Notebook file ${notebookName} not found.`);
}
const notebookData = fs.readFileSync(notebookFile);
const timestamp = Date.now();
const notebookKey = `${appName}/notebooks/${timestamp}-notebook.ipynb`;
console.log('Uploading notebook to S3');
const data = fs.readFileSync(notebookPath);
const key = `${appName}/notebooks/${Date.now()}-notebook.ipynb`;
console.log('S3 key:', key);
await s3.putObject({
Bucket: COMMON_BUCKET,
Key: notebookKey,
Body: notebookData,
Key: key,
Body: data,
ContentType: 'application/json'
}).promise();
console.log('Creating machine');
const machineConfig = {
name: `${appName}-machine`,
region,
count: 1,
vm_size: 'shared-cpu-1x',
autostart: true,
config: {
image: IMAGE_REF,
env: {
INSTANCE_PREFIX: appName,
NOTEBOOK_KEY: notebookKey,
NOTEBOOK_KEY: key,
BUCKET_NAME: COMMON_BUCKET,
AWS_ACCESS_KEY_ID,
AWS_SECRET_ACCESS_KEY,
@ -92,69 +107,22 @@ app.post('/deploy', async (req, res) => {
AWS_REGION
},
services: [{
ports: [{ port: 3006, handlers: ["http"] }],
protocol: "tcp",
internal_port: 3006
internal_port: 3006,
protocol: 'tcp',
ports: [{ port: 80, handlers: ['http'] }]
}]
}
};
console.log('Machine config:', machineConfig);
await fly.post(`/apps/${appName}/machines`, machineConfig);
res.json({
status: 'created',
app: appName,
url: `https://${appName}.fly.dev`
});
} catch (error) {
res.status(500).json({ error: error.response?.data || error.message });
console.log('Deployment successful:', appName);
return res.json({ status: 'created', url: `https://${appName}.fly.dev` });
} catch (err) {
console.error('Deployment error:', err.stack || err);
return res.status(500).json({ error: err.response?.data || err.message });
}
});
app.post('/upload', async (req, res) => {
const { appName, notebookName } = req.body;
if (!appName || !notebookName) {
return res.status(400).json({ error: 'appName and notebookName required' });
}
try {
const notebookFile = path.join(__dirname, '../snakeapi_service/notebooks', notebookName);
if (!fs.existsSync(notebookFile)) {
throw new Error(`Notebook file ${notebookName} not found.`);
}
const notebookData = fs.readFileSync(notebookFile);
const timestamp = Date.now();
const notebookKey = `${appName}/notebooks/${timestamp}-notebook.ipynb`;
await s3.putObject({
Bucket: COMMON_BUCKET,
Key: notebookKey,
Body: notebookData,
ContentType: 'application/json'
}).promise();
res.json({ status: 'uploaded', notebookKey });
} catch (error) {
res.status(500).json({ error: error.message });
}
});
app.delete('/delete/:appName', async (req, res) => {
const appName = req.params.appName;
if (!appName) {
return res.status(400).json({ error: 'appName required' });
}
try {
const fly = createFlyClient();
await fly.delete(`/apps/${appName}`);
res.json({ status: 'deleted', app: appName });
} catch (error) {
res.status(500).json({ error: error.response?.data || error.message });
}
});
const port = process.env.PORT || 3006;
app.listen(port, '0.0.0.0', () => console.log(`Listening on port ${port}`));
const PORT = process.env.PORT || 3006;
app.listen(PORT, '0.0.0.0', () => console.log(`Listening on port ${PORT}`));