fix: fixed environment setup

Author: brynblack

env.schema.json

@@ -0,0 +1,11 @@
+{
+  "type": "object",
+  "$id": "file:///env.schema.json",
+  "allOf": [
+    {
+      "$ref": "secrets.schema.json"
+    }
+  ],
+  "properties": {},
+  "required": []
+}

package-lock.json

@@ -10,7 +10,9 @@
     "deploy": "node ./scripts/deploy.mjs"
   },
   "dependencies": {
+    "@apidevtools/json-schema-ref-parser": "^13.0.4",
     "@docusaurus/plugin-client-redirects": "^3.8.1",
+    "@iarna/toml": "^2.2.5",
     "@tanstack/react-query": "^5.80.6",
     "chart.js": "^4.4.9",
     "chartjs-adapter-date-fns": "^3.0.0",

package.json

@@ -1,14 +1,147 @@
 #!/usr/bin/env node
 
-import os from 'os';
-import childProcess from 'child_process';
+import os from 'node:os';
+import fs from 'node:fs';
+import url from 'node:url';
+import process from 'node:process';
+import childProcess from 'node:child_process';
+import TOML from '@iarna/toml';
+import $RefParser from '@apidevtools/json-schema-ref-parser';
 
 const platform = os.platform();
 
+async function loadEnvSchema() {
+  const schema = await $RefParser.bundle('env.schema.json');
+  const props = new Set();
+  const required = new Set();
+  (function extract(s) {
+    if (!s || typeof s !== 'object') return;
+    // Collect properties
+    if (s.properties) Object.keys(s.properties).forEach((k) => props.add(k));
+    // Collect required properties
+    if (s.required) s.required.forEach((r) => required.add(r));
+    // Process composition keywords
+    ['allOf', 'anyOf', 'oneOf'].forEach(
+      (k) => Array.isArray(s[k]) && s[k].forEach(extract),
+    );
+  })(schema);
+  return {
+    allKeys: [...props],
+    requiredKeys: [...required],
+  };
+}
+
 /* eslint-disable no-console */
 async function main(argv = process.argv) {
   argv = argv.slice(2);
-  const deployArgs = ['deploy', '--config', './wrangler.toml', ...argv];
+  // Optional feature is used for feature branches
+  let feature;
+  const restArgs = [];
+  while (argv.length > 0) {
+    const option = argv.shift();
+    let match;
+    if ((match = option.match(/--feature(?:=(.+)|$)/))) {
+      feature = match[1] ?? argv.shift();
+    } else {
+      restArgs.push(option);
+    }
+  }
+  // The `--feature X` option only makes sense if you also use `--env X`.
+  if (typeof feature === 'string') {
+    const wranglerConfig = TOML.parse(
+      fs.readFileSync('./wrangler.toml', { encoding: 'utf-8' }),
+    );
+    // Backup the original wrangler.toml
+    fs.renameSync('./wrangler.toml', './wrangler.toml.bak');
+    // All the handlers for swapping back the original wrangler.toml
+    process.on('beforeExit', () => {
+      try {
+        fs.renameSync('./wrangler.toml.bak', './wrangler.toml');
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e;
+      }
+    });
+    process.on('uncaughtException', () => {
+      try {
+        fs.renameSync('./wrangler.toml.bak', './wrangler.toml');
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e;
+      }
+    });
+    process.on('unhandledRejection', () => {
+      try {
+        fs.renameSync('./wrangler.toml.bak', './wrangler.toml');
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e;
+      }
+    });
+    process.on('SIGINT', () => {
+      try {
+        fs.renameSync('./wrangler.toml.bak', './wrangler.toml');
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e;
+      }
+    });
+    process.on('SIGTERM', () => {
+      try {
+        fs.renameSync('./wrangler.toml.bak', './wrangler.toml');
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e;
+      }
+    });
+    process.on('SIGQUIT', () => {
+      try {
+        fs.renameSync('./wrangler.toml.bak', './wrangler.toml');
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e;
+      }
+    });
+    process.on('SIGHUP', () => {
+      try {
+        fs.renameSync('./wrangler.toml.bak', './wrangler.toml');
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e;
+      }
+    });
+    // Add in the feature environment
+    wranglerConfig.env[feature] = {
+      name: `${wranglerConfig.name}-${feature}`,
+      routes: wranglerConfig.routes.map((r) => ({
+        pattern: `${feature}.${r.pattern}`,
+        custom_domain: true,
+      })),
+      durable_objects: {
+        bindings: [...(wranglerConfig.durable_objects?.bindings ?? [])],
+      },
+      migrations: [...(wranglerConfig.migrations ?? [])],
+    };
+    fs.writeFileSync('./wrangler.toml', TOML.stringify(wranglerConfig), {
+      encoding: 'utf-8',
+    });
+  }
+  const { allKeys, requiredKeys } = await loadEnvSchema();
+  // Check if required variables are set
+  for (const key of requiredKeys) {
+    if (process.env[key] == null || process.env[key] === '') {
+      throw new Error(`Required environment variable ${key} is not set`);
+    }
+  }
+  const secretBulkArgs = [
+    'secret',
+    'bulk',
+    '--config',
+    './wrangler.toml',
+    ...restArgs,
+  ];
+  console.error(['wrangler', ...secretBulkArgs].join(' '));
+  const secrets = {};
+  for (const key of allKeys) {
+    secrets[key] = process.env[key];
+  }
+  childProcess.execFileSync('wrangler', secretBulkArgs, {
+    input: JSON.stringify(secrets),
+  });
+  const deployArgs = ['deploy', '--config', './wrangler.toml', ...restArgs];
   console.error(['wrangler', ...deployArgs].join(' '));
   childProcess.execFileSync('wrangler', deployArgs, {
     stdio: ['inherit', 'inherit', 'inherit'],
@@ -19,4 +152,9 @@ async function main(argv = process.argv) {
 }
 /* eslint-enable no-console */
 
-void main();
+if (import.meta.url.startsWith('file:')) {
+  const modulePath = url.fileURLToPath(import.meta.url);
+  if (process.argv[1] === modulePath) {
+    void main();
+  }
+}

scripts/deploy.mjs

@@ -0,0 +1,6 @@
+{
+  "type": "object",
+  "$id": "file:///secrets.schema.json",
+  "properties": {},
+  "required": []
+}

secrets.schema.json

@@ -32,7 +32,6 @@
     "./api/**/*",
     "./scripts/**/*",
     "./docusaurus.config.ts",
-    "./worker.ts"
   ]
 }
 

worker.ts src/worker.tsworker.ts renamed to src/worker.ts

@@ -1,23 +1,23 @@
 name = "polykey-network-dashboard-dev"
-main = "worker.ts"
-compatibility_date = "2023-03-06"
-workers_dev = true
+main = "src/worker.ts"
 send_metrics = false
+compatibility_flags = [ "nodejs_compat" ]
+compatibility_date = "2024-09-23"
+routes = [
+  { pattern = "dev.testnet.polykey.com", custom_domain = true },
+  { pattern = "dev.mainnet.polykey.com", custom_domain = true },
+]
 [site]
   bucket = "./public"
 
 [env.staging]
   name = "polykey-network-dashboard-staging"
   routes = [
-    "testnet.polykey.com",
-    "testnet.polykey.com/*",
+    { pattern = "testnet.polykey.com/*", custom_domain = true },
   ]
-  workers_dev = false
 
 [env.master]
   name = "polykey-network-dashboard"
   routes = [
-    "mainnet.polykey.com",
-    "mainnet.polykey.com/*",
+    { pattern = "mainnet.polykey.com/*", custom_domain = true },
   ]
-  workers_dev = false