npm - @mochabug/adaptkit - Versions diffs - 1.0.0-beta.9 → 1.0.0-rc.12 - Mend

@mochabug/adaptkit 1.0.0-beta.9 → 1.0.0-rc.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

package/assets/build.js CHANGED Viewed

@@ -1,57 +1,2 @@
-import { cloudflare } from "@cloudflare/unenv-preset";
-import { build } from 'esbuild';
-import fs from 'node:fs';
-import { defineEnv } from 'unenv';
-if (!process.env.PLUGINS_CDN) {
-  console.error('PLUGINS_CDN is required');
-  process.exit(1);
-}
-// Load the manifest.json file and read organization, name and version of the plugin
-const manifest = JSON.parse(fs.readFileSync('./manifest.json', 'utf8'));
-if (!manifest.organization || !manifest.name || !manifest.version) {
-  throw new Error('Manifest file is missing organization, name or version');
-}
-const CDN_PATH = `${process.env.PLUGINS_CDN}/${manifest.organization}/${manifest.name}/${manifest.version}`;
-const { env } = defineEnv({ nodeCompat: true, presets: [cloudflare] });
-const entryPoints = ['./src/executors']
-if (fs.existsSync('./src/configurators.ts')) {
-  entryPoints.push('./src/configurators')
-}
-// Set up the defines, this will automatically load ssg index.html files if they exists
-const define = {
-  PLUGINS_CDN: JSON.stringify(CDN_PATH)
-};
-if (fs.existsSync('./dist/configurator-index-html.json')) {
-  const CONFIGURATOR_INDEX_HTML = fs.readFileSync('./dist/configurator-index-html.json', 'utf8');
-  define.CONFIGURATOR_INDEX_HTML = CONFIGURATOR_INDEX_HTML;
-}
-if (fs.existsSync('./dist/executor-index-html.json')) {
-  const EXECUTOR_INDEX_HTML = fs.readFileSync('./dist/executor-index-html.json', 'utf8');
-  define.EXECUTOR_INDEX_HTML = EXECUTOR_INDEX_HTML;
-}
-await build({
-  entryPoints,
-  outdir: 'dist',
-  bundle: true,
-  minify: true,
-  treeShaking: true,
-  sourcemap: false,
-  splitting: false,
-  format: 'esm',
-  platform: 'node',
-  target: 'esnext',
-  tsconfig: 'tsconfig.json',
-  inject: ['./inject.js'],
-  mainFields: ["module", "main"],
-  conditions: ["workerd"],
-  external: env.external,
-  alias: env.alias,
-  publicPath: CDN_PATH,
-  define,
-});
+import { build } from '@mochabug/adapt-plugin-builder';
+build({ cdnBase: process.env.PLUGINS_CDN });

package/assets/configurator.html ADDED Viewed

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>The configurator</title>
+</head>
+<body>
+    <div id="root"><%= define.content %></div>
+</body>
+</html>

package/assets/configurator.ssg.tsx CHANGED Viewed

@@ -12,20 +12,6 @@ import React from 'react';
 import { renderToString } from 'react-dom/server';
 import App from './configurator.App';
-export default function (js: string, css?: string) {
-  return `
-    <!DOCTYPE html>
-    <html lang="en">
-      <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Title</title>
-        ${css ? `<link rel="stylesheet" href="${css}" />` : ''}
-      </head>
-      <body>
-        <div id="root">${renderToString(<App />)}</div>
-        <script type="module" src="${js}"></script>
-      </body>
-    </html>
-  `;
+export default function () {
+  return renderToString(<App />);
 }

package/assets/configurator_none.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import {
-  mapErrorToHttpError,
-  RpcError
+  ConnectError,
+  mapConnectErrorToHttpStatus
 } from '@mochabug/adapt-plugin-toolkit/api';
 import {
   ExternalConfiguratorRouter,
@@ -13,8 +13,8 @@ export default {
     .useBearerAuthorization(['/api'])
     .useErrorHandling(async (e) => {
       console.error(e);
-      if (e instanceof RpcError) {
-        return new Response(null, { status: mapErrorToHttpError(e.code) });
+      if (e instanceof ConnectError) {
+        return new Response(null, { status: mapConnectErrorToHttpStatus(e) });
       }
       return new Response(null, {
         status: 500,

package/assets/configurator_react.tsx CHANGED Viewed

@@ -1,6 +1,6 @@
 import {
-  mapErrorToHttpError,
-  RpcError
+  ConnectError,
+  mapConnectErrorToHttpStatus
 } from '@mochabug/adapt-plugin-toolkit/api';
 import {
   ExternalConfiguratorRouter,
@@ -13,8 +13,8 @@ export default {
     .useBearerAuthorization(['/api'])
     .useErrorHandling(async (e) => {
       console.error(e);
-      if (e instanceof RpcError) {
-        return new Response(null, { status: mapErrorToHttpError(e.code) });
+      if (e instanceof ConnectError) {
+        return new Response(null, { status: mapConnectErrorToHttpStatus(e) });
       }
       return new Response(null, {
         status: 500,
@@ -29,9 +29,12 @@ export default {
         }
       });
     })
-    .add('GET', '{*any}', async () => {
-      return new Response(CONFIGURATOR_INDEX_HTML['___VERTEX_NAME___'], {
-        headers: { 'Content-Type': 'text/html' }
+    .add('GET', '{/*any}', async (_, api) => {
+      const res = await api.readFile(
+        'browser/___VERTEX_NAME___/configurator.html'
+      );
+      return new Response(res.content, {
+        headers: { 'Content-Type': 'text/html; charset=utf-8' }
       });
     }),
   internal: new InternalConfiguratorRouter()

package/assets/executor.html ADDED Viewed

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>The executor</title>
+</head>
+<body>
+    <div id="root"><%= define.content %></div>
+</body>
+</html>

package/assets/executor.ssg.tsx CHANGED Viewed

@@ -12,20 +12,6 @@ import React from 'react';
 import { renderToString } from 'react-dom/server';
 import App from './executor.App';
-export default function (js: string, css?: string) {
-  return `
-    <!DOCTYPE html>
-    <html lang="en">
-      <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Title</title>
-        ${css ? `<link rel="stylesheet" href="${css}" />` : ''}
-      </head>
-      <body>
-        <div id="root">${renderToString(<App />)}</div>
-        <script type="module" src="${js}"></script>
-      </body>
-    </html>
-  `;
+export default function () {
+  return renderToString(<App />);
 }

package/assets/executor_action.ts CHANGED Viewed

@@ -5,18 +5,14 @@ export default {
     .onStart(async (start, api, ctx) => {
       console.log('Start has been called');
       console.log(start);
-      ctx.waitUntil(api.complete('output', {}));
+      ctx.waitUntil(api.send('output', {}));
     })
     .onStop(async (stop, _api) => {
       console.log('Stop has been called');
       console.log(stop);
     })
-    .onStream(async (res, _api, name) => {
-      console.log(`Stream ${name} has been called`);
-      console.log(res);
-    })
-    .onProcedure(async (res, _api, name) => {
-      console.log(`Procedure ${name} has been called`);
+    .onExchange(async (res, _api, name) => {
+      console.log(`Exchange ${name} has been called`);
       console.log(res);
     })
 };

package/assets/{executor_cron_trigger.ts → executor_action_cron.ts} RENAMED Viewed

@@ -10,17 +10,13 @@ export default {
       console.log('Stop has been called');
       console.log(stop);
     })
-    .onStream(async (res, _api, name) => {
-      console.log(`Stream ${name} has been called`);
-      console.log(res);
-    })
-    .onProcedure(async (res, _api, name) => {
-      console.log(`Procedure ${name} has been called`);
+    .onExchange(async (res, _api, name) => {
+      console.log(`Exchange ${name} has been called`);
       console.log(res);
     })
     .onCron(async (cron, api, ctx) => {
       console.log('Received cron event');
-      ctx.waitUntil(api.complete('output', {}));
+      ctx.waitUntil(api.send('output', {}));
       console.log(cron);
     })
 };

package/assets/executor_browser_none.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import {
-  mapErrorToHttpError,
-  RpcError
-} from '@mochabug/adapt-plugin-toolkit/api';
+  ConnectError,
+  mapConnectErrorToHttpStatus,
+} from "@mochabug/adapt-plugin-toolkit/api";
 import {
   ExternalExecutorRouter,
   InternalExecutorRouter
@@ -13,8 +13,8 @@ export default {
     .useBearerAuthorization(['/api'])
     .useErrorHandling(async (e) => {
       console.error(e);
-      if (e instanceof RpcError) {
-        return new Response(null, { status: mapErrorToHttpError(e.code) });
+      if (e instanceof ConnectError) {
+        return new Response(null, { status: mapConnectErrorToHttpStatus(e) });
       }
       return new Response(null, {
         status: 500,
@@ -23,7 +23,7 @@ export default {
     })
     .add('POST', '/api/done', async (req, api, _route, ctx) => {
       const sapi = api.getSessionApi(req.headers.get('Authorization')!);
-      ctx.waitUntil(sapi.complete('output', {}));
+      ctx.waitUntil(sapi.send('output', {}));
       return new Response();
     })
     .add('GET', '{*any}', async () => {
@@ -42,12 +42,8 @@ export default {
       console.log('Stop has been called');
       console.log(stop);
     })
-    .onStream(async (res, _api, name) => {
-      console.log(`Stream ${name} has been called`);
-      console.log(res);
-    })
-    .onProcedure(async (res, _api, name) => {
-      console.log(`Procedure ${name} has been called`);
+    .onExchange(async (res, _api, name) => {
+      console.log(`Exchange ${name} has been called`);
       console.log(res);
     })
 };

package/assets/executor_browser_none_cron.ts ADDED Viewed

@@ -0,0 +1,119 @@
+import {
+  ConnectError,
+  mapConnectErrorToHttpStatus,
+} from "@mochabug/adapt-plugin-toolkit/api";
+import {
+  ExternalExecutorRouter,
+  CronExecutorRouter
+} from '@mochabug/adapt-plugin-toolkit/router';
+export default {
+  external: new ExternalExecutorRouter()
+    .useRequestLogging()
+    .useBearerAuthorization(['/api'])
+    .useErrorHandling(async (e) => {
+      console.error(e);
+      if (e instanceof ConnectError) {
+        return new Response(null, { status: mapConnectErrorToHttpStatus(e) });
+      }
+      return new Response(null, {
+        status: 500,
+        statusText: 'Internal server error'
+      });
+    })
+    .add('POST', '/api/done', async (req, api, _route, ctx) => {
+      const sapi = api.getSessionApi(req.headers.get('Authorization')!);
+      ctx.waitUntil(sapi.send('output', {}));
+      return new Response();
+    })
+    .add('GET', '{*any}', async () => {
+      return new Response(helloWorld, {
+        headers: {
+          'Content-Type': 'text/html'
+        }
+      });
+    }),
+  internal: new CronExecutorRouter()
+      .onStart(async (start, _api) => {
+        console.log('Start has been called');
+        console.log(start);
+      })
+      .onStop(async (stop, _api) => {
+        console.log('Stop has been called');
+        console.log(stop);
+      })
+      .onExchange(async (res, _api, name) => {
+        console.log(`Exchange ${name} has been called`);
+        console.log(res);
+      })
+      .onCron(async (cron, api, ctx) => {
+        console.log('Received cron event');
+        ctx.waitUntil(api.send('output', {}));
+        console.log(cron);
+      })
+};
+const helloWorld = `
+      <html>
+      <head>
+        <style>
+          @import url('https://fonts.googleapis.com/css2?family=Orbitron&display=swap');
+          @keyframes glow {
+            0% { text-shadow: 0 0 5px #0f0, 0 0 10px #0f0, 0 0 15px #0f0, 0 0 20px #0f0; }
+            100% { text-shadow: 0 0 10px #0f0, 0 0 20px #0f0, 0 0 30px #0f0, 0 0 40px #0f0; }
+          }
+          body {
+            background-color: #000;
+            color: #0f0;
+            font-family: 'Orbitron', sans-serif;
+            text-align: center;
+            overflow: hidden;
+            margin: 0;
+            padding: 0;
+          }
+          button {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            background-color: #0f0;
+            border: none;
+            color: black;
+            padding: 15px 32px;
+            text-align: center;
+            text-decoration: none;
+            display: inline-block;
+            font-size: 20px;
+            margin: 4px 2px;
+            cursor: pointer;
+            transition-duration: 0.4s;
+            animation: glow 2s infinite alternate;
+            font-family: 'Orbitron', sans-serif;
+            border-radius: 15px;
+            transform: rotate(-10deg) skew(10deg, 10deg);
+          }
+        </style>
+      </head>
+      <body>
+        <button id="doneButton">Done</button>
+        <script>
+          document.getElementById('doneButton').addEventListener('click', function() {
+            const hash = window.location.hash.substring(1).trim();
+            const token = decodeURIComponent(hash);
+            fetch('/api/done', {
+              method: 'POST',
+              headers: {
+                'Authorization': 'Bearer ' + token
+              }
+            })
+            .then(data => {
+              this.innerText = 'Done';
+            })
+            .catch(error => {
+              console.error('Error:', error);
+            });
+          });
+        </script>
+      </body>
+      </html>
+    `;

package/assets/executor_browser_react.tsx CHANGED Viewed

@@ -1,7 +1,7 @@
 import {
-  mapErrorToHttpError,
-  RpcError
-} from '@mochabug/adapt-plugin-toolkit/api';
+  ConnectError,
+  mapConnectErrorToHttpStatus,
+} from "@mochabug/adapt-plugin-toolkit/api";
 import {
   ExternalExecutorRouter,
   InternalExecutorRouter
@@ -13,8 +13,8 @@ export default {
     .useBearerAuthorization(['/api'])
     .useErrorHandling(async (e) => {
       console.error(e);
-      if (e instanceof RpcError) {
-        return new Response(null, { status: mapErrorToHttpError(e.code) });
+      if (e instanceof ConnectError) {
+        return new Response(null, { status: mapConnectErrorToHttpStatus(e) });
       }
       return new Response(null, {
         status: 500,
@@ -23,12 +23,15 @@ export default {
     })
     .add('POST', '/api/done', async (req, api, _route, ctx) => {
       const sapi = api.getSessionApi(req.headers.get('Authorization')!);
-      ctx.waitUntil(sapi.complete('output', {}));
+      ctx.waitUntil(sapi.send('output', {}));
       return new Response();
     })
-    .add('GET', '{*any}', async () => {
-      return new Response(EXECUTOR_INDEX_HTML['___VERTEX_NAME___'], {
-        headers: { 'Content-Type': 'text/html' }
+    .add('GET', '{/*any}', async (_, api) => {
+      const res = await api.readFile(
+        'browser/___VERTEX_NAME___/executor.html'
+      );
+      return new Response(res.content, {
+        headers: { 'Content-Type': 'text/html; charset=utf-8' }
       });
     }),
   internal: new InternalExecutorRouter()
@@ -40,12 +43,8 @@ export default {
       console.log('Stop has been called');
       console.log(stop);
     })
-    .onStream(async (res, _api, name) => {
-      console.log(`Stream ${name} has been called`);
-      console.log(res);
-    })
-    .onProcedure(async (res, _api, name) => {
-      console.log(`Procedure ${name} has been called`);
+    .onExchange(async (res, _api, name) => {
+      console.log(`Exchange ${name} has been called`);
       console.log(res);
     })
 };

package/assets/executor_browser_react_cron.tsx ADDED Viewed

@@ -0,0 +1,55 @@
+import {
+  ConnectError,
+  mapConnectErrorToHttpStatus,
+} from "@mochabug/adapt-plugin-toolkit/api";
+import {
+  ExternalExecutorRouter,
+  CronExecutorRouter
+} from '@mochabug/adapt-plugin-toolkit/router';
+export default {
+  external: new ExternalExecutorRouter()
+    .useRequestLogging()
+    .useBearerAuthorization(['/api'])
+    .useErrorHandling(async (e) => {
+      console.error(e);
+      if (e instanceof ConnectError) {
+        return new Response(null, { status: mapConnectErrorToHttpStatus(e) });
+      }
+      return new Response(null, {
+        status: 500,
+        statusText: 'Internal server error'
+      });
+    })
+    .add('POST', '/api/done', async (req, api, _route, ctx) => {
+      const sapi = api.getSessionApi(req.headers.get('Authorization')!);
+      ctx.waitUntil(sapi.send('output', {}));
+      return new Response();
+    })
+    .add('GET', '{/*any}', async (_, api) => {
+      const res = await api.readFile(
+        'browser/___VERTEX_NAME___/executor.html'
+      );
+      return new Response(res.content, {
+        headers: { 'Content-Type': 'text/html; charset=utf-8' }
+      });
+    }),
+    internal: new CronExecutorRouter()
+      .onStart(async (start, _api) => {
+        console.log('Start has been called');
+        console.log(start);
+      })
+      .onStop(async (stop, _api) => {
+        console.log('Stop has been called');
+        console.log(stop);
+      })
+      .onExchange(async (res, _api, name) => {
+        console.log(`Exchange ${name} has been called`);
+        console.log(res);
+      })
+      .onCron(async (cron, api, ctx) => {
+        console.log('Received cron event');
+        ctx.waitUntil(api.send('output', {}));
+        console.log(cron);
+      })
+};

package/assets/{executor_external_trigger.ts → executor_external.ts} RENAMED Viewed

@@ -1,7 +1,7 @@
 import {
-  mapErrorToHttpError,
-  RpcError
-} from '@mochabug/adapt-plugin-toolkit/api';
+  ConnectError,
+  mapConnectErrorToHttpStatus,
+} from "@mochabug/adapt-plugin-toolkit/api";
 import {
   ExternalExecutorRouter,
   InternalExecutorRouter
@@ -13,8 +13,8 @@ export default {
     .useBearerAuthorization(['/api'])
     .useErrorHandling(async (e) => {
       console.error(e);
-      if (e instanceof RpcError) {
-        return new Response(null, { status: mapErrorToHttpError(e.code) });
+      if (e instanceof ConnectError) {
+        return new Response(null, { status: mapConnectErrorToHttpStatus(e) });
       }
       return new Response(null, {
         status: 500,
@@ -33,12 +33,8 @@ export default {
       console.log('Stop has been called');
       console.log(stop);
     })
-    .onStream(async (res, _api, name) => {
-      console.log(`Stream ${name} has been called`);
-      console.log(res);
-    })
-    .onProcedure(async (res, _api, name) => {
-      console.log(`Procedure ${name} has been called`);
+    .onExchange(async (res, _api, name) => {
+      console.log(`Exchange ${name} has been called`);
       console.log(res);
     })
 };

package/assets/executor_external_cron.ts ADDED Viewed

@@ -0,0 +1,45 @@
+import {
+  ConnectError,
+  mapConnectErrorToHttpStatus,
+} from "@mochabug/adapt-plugin-toolkit/api";
+import {
+  ExternalExecutorRouter,
+  InternalExecutorRouter
+} from '@mochabug/adapt-plugin-toolkit/router';
+export default {
+  external: new ExternalExecutorRouter()
+    .useRequestLogging()
+    .useBearerAuthorization(['/api'])
+    .useErrorHandling(async (e) => {
+      console.error(e);
+      if (e instanceof ConnectError) {
+        return new Response(null, { status: mapConnectErrorToHttpStatus(e) });
+      }
+      return new Response(null, {
+        status: 500,
+        statusText: 'Internal server error'
+      });
+    })
+    .add('*', '(.*)', async (_req, _api, _route, _ctx) => {
+      return new Response();
+    }),
+  internal: new InternalExecutorRouter()
+    .onStart(async (start, _api) => {
+      console.log('Start has been called');
+      console.log(start);
+    })
+    .onStop(async (stop, _api) => {
+      console.log('Stop has been called');
+      console.log(stop);
+    })
+    .onExchange(async (res, _api, name) => {
+      console.log(`Exchange ${name} has been called`);
+      console.log(res);
+    })
+    .onCron(async (cron, api, ctx) => {
+      console.log('Received cron event');
+      ctx.waitUntil(api.send('output', {}));
+      console.log(cron);
+    })
+};

package/assets/gitignore CHANGED Viewed

@@ -1,5 +1,7 @@
 # Cdn files
-cdn/**
+cdn/browser
+assets/browser
+dist/
 # Logs
 logs

package/assets/tsconf.json CHANGED Viewed

@@ -33,10 +33,8 @@
     },
     "exclude": [
         "dist/**",
-        "cdn/**",
-        "assets/**",
-        "build.js",
-        "inject.js",
-        "build-client.js"
+        "cdn/browser/**",
+        "assets/browser/**",
+        "build.js"
     ],
 }

package/bin/add.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { Manifest } from './genproto/mochabugapis/adapt/plugins/v1/manifest_pb';
+export declare function add(manifest: Manifest): Promise<void>;
+//# sourceMappingURL=add.d.ts.map

package/bin/add.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../src/add.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;AAIhF,wBAAsB,GAAG,CAAC,QAAQ,EAAE,QAAQ,iBA2E3C"}