@surph_ai/cli 0.0.9 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surph_ai/cli",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "main": "index.js",
   "types": "./types.d.ts",

package/toolserver/app.js

@@ -1,5 +1,6 @@
 const express = require('express')
 const vinely = require('@vinely-ai/sdk')
+const { config } = require('./middleware/index.js')
 
 const app = express()
 
@@ -8,18 +9,22 @@ vinely.configureApp(app, {
   static: 'public',
 })
 
-app.use((req, res, next) => {
-  res.setHeader('Access-Control-Allow-Origin', '*')
-  res.header('Access-Control-Allow-Headers', 'x-surph-user, Content-Type');
-  res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
-  if (req.method === 'OPTIONS') return res.sendStatus(204);
-  next()
-})
+app.use(config)
 
-const index = require('./routes/index')
+// app.use((req, res, next) => {
+//   res.setHeader('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'x-surph-user, Content-Type');
+//   res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+//   if (req.method === 'OPTIONS') return res.sendStatus(204);
+//   next()
+// })
+
+const api = require('./routes/api')
 const tool = require('./routes/tool')
+const index = require('./routes/index')
 
-app.use('/', index)
+app.use('/api', api)
 app.use('/tools', tool)
+app.use('/', index)
 
 module.exports.entry = vinely.server(app)

package/toolserver/middleware/config.js

@@ -0,0 +1,40 @@
+// this is meant to mimic production environment
+// so no need to distinguish between local and production
+
+let config = null;
+
+const CDN = 'https://surph.s3.us-east-1.amazonaws.com/webapp/static';
+
+const fetchDesktopConfig = async () => {
+  const response = await fetch('https://surph.s3.us-east-1.amazonaws.com/admin/desktop/config.json');
+  const data = await response.json();
+  return data;
+}
+
+const fetchWebConfig = async () => {
+  const response = await fetch('https://surph.s3.us-east-1.amazonaws.com/webapp/static/dist/prod/imports.json');
+  const data = await response.json();
+  return { imports: data }
+}
+
+module.exports = async (req, res, next) => {
+  const webConfig = await fetchWebConfig(); // always fetch the latest imports.json
+
+  if (config !== null) {
+    req.config = { ...config, ...webConfig };
+    // console.log('CACHED CONFIG: ', req.config);
+    return next();
+  }
+
+  const desktopConfig = await fetchDesktopConfig();
+  config = {
+    ...desktopConfig,
+    ...webConfig,
+    isLocal: false,
+    isDev: true, // this is undefined in production.
+    CDN,
+  };
+
+  req.config = config;
+  next();
+};

package/toolserver/middleware/index.js

@@ -0,0 +1,5 @@
+const config = require('./config.js')
+
+module.exports = {
+  config,
+}

package/toolserver/routes/api.js

@@ -0,0 +1,66 @@
+const { Router } = require('express') 
+// import { REST_API_URL } from '../utils/constants.js'
+
+const router = Router()
+
+const BASE_URL = 'https://surph.ai'
+// const BASE_URL = 'http://localhost:3005' // for local testing
+const PATH_RE = /^\/[a-zA-Z0-9_\-/]+$/
+
+router.post('*', async (req, res, next) => {
+  const path = req.path
+  if (!PATH_RE.test(path) || path.includes('//') || path.includes('..')) {
+    res.status(400).json({ error: 'invalid path' })
+    return
+  }
+
+  try {
+    const url = `${BASE_URL}/api${path}`
+    const upstream = await fetch(`${url}`, {
+      method: 'POST',
+      body: JSON.stringify(req.body || {}),
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+        'x-surph-client': 'surph-webapp'
+      },
+    })
+
+    const body = await upstream.json()
+    const contentType = upstream.headers.get('content-type')
+    if (contentType) res.set('Content-Type', contentType)
+    res.status(upstream.status).json(body)
+  } catch (e) {
+    res.status(502).json({ error: e?.message || 'upstream api failed' })
+  }
+})
+
+router.get('*', async (req, res, next) => {
+  const path = req.path
+  if (!PATH_RE.test(path) || path.includes('//') || path.includes('..')) {
+    res.status(400).json({ error: 'invalid path' })
+    return
+  }
+
+  try {
+    const url = `${BASE_URL}/api${path}`
+    const upstream = await fetch(`${url}`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+        'x-surph-client': 'surph-webapp'
+      },
+    })
+
+    const body = await upstream.json()
+    const contentType = upstream.headers.get('content-type')
+    if (contentType) res.set('Content-Type', contentType)
+    res.status(upstream.status).json(body)
+  } catch (e) {
+    console.log('ERR: ' + e.message)
+    res.status(502).json({ error: e?.message || 'upstream api failed' })
+  }
+})
+
+module.exports = router

package/toolserver/routes/index.js

@@ -1,8 +1,27 @@
 const { Router } = require('express')
 const router = Router()
+const manifest = require('../../../../../manifest.json')
 
-router.get('/', (req, res, next) => {
-  res.render('index', {})
+router.get('/', async (req, res, next) => {
+  try {
+    const toolSlugs = Object.keys(manifest)
+
+    const context = {
+      env: 'sandbox',
+      config: { ...req.config, entry: 'web' },
+      tools: toolSlugs.map(slug => (manifest[slug])),
+    }
+
+    res.render('index', {
+      ...context,
+      CDN: req.config.CDN,
+      preloaded: JSON.stringify(context)
+    })
+  } catch (error) {
+    res.json({
+      error: 'something went wrong'
+    })
+  }
 })
 
 module.exports = router

package/toolserver/templates/index.html

@@ -1,3 +1,4 @@
+
 <!DOCTYPE html>
 <html dir="ltr" lang="en-US">
 <head>
@@ -7,14 +8,14 @@
   <meta http-equiv="Content-Language" content="en" />
 
   <title>Surph AI</title>
-  <link rel="shortcut icon" href="https://lh3.googleusercontent.com/MpnmfR3zYPTojA03QbhGgwIHucmH5s4G2vbIlADYhODL488MQt_BuVztv9LYmJbhwkScYN0DIXuh4d10YMsLbWXT">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-  <link rel="stylesheet" href="https://cdn.turbo360-dev.com/admin/assets/scaffold/css/style.min.css" />
+  <link rel="shortcut icon" href="https://surph.s3.us-east-1.amazonaws.com/admin/assets/icon-green.svg">
 </head>
 
 <body>
-  <div class="container pt-5">
-    <h1>Welcome to Surph AI</h1>
-  </div>
+  <div id="root"></div>
+
+  <script type="text/javascript">window.__PRELOADED__ = {{{ preloaded }}}</script>
+  <script defer="defer" src="{{{ CDN }}}/dist/prod/{{{ config.imports.commons }}}"></script>
+  <script defer="defer" src="{{{ CDN }}}/dist/prod/{{{ config.imports.app }}}"></script>
 </body>
 </html>