@certik/skynet 0.25.2 → 0.25.4

package/dist/cli.js

@@ -33,7 +33,11 @@ function detectBin() {
   const wd = detectDirectory(process.argv[1], "package.json");
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
+function getDeployBin(bin) {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
+}
 export {
+  getDeployBin,
   getBinaryName,
   detectWorkingDirectory,
   detectSkynetDirectory,

package/dist/deploy.js

@@ -1,3 +1,22 @@
+// src/env.ts
+function ensureAndGet(envName, defaultValue) {
+  return process.env[envName] || defaultValue;
+}
+function getEnvironment() {
+  return ensureAndGet("SKYNET_ENVIRONMENT", "dev");
+}
+function getEnvOrThrow(envName) {
+  if (!process.env[envName]) {
+    throw new Error(`Must set environment variable ${envName}`);
+  }
+  return process.env[envName];
+}
+function isProduction() {
+  return getEnvironment() === "prd";
+}
+function isDev() {
+  return getEnvironment() === "dev";
+}
 // src/selector.ts
 function getSelectorDesc(selector) {
   return Object.keys(selector).map((name) => {
@@ -36,25 +55,6 @@ function getJobName(name, selectorFlags, mode) {
   }
   return jobName;
 }
-// src/env.ts
-function ensureAndGet(envName, defaultValue) {
-  return process.env[envName] || defaultValue;
-}
-function getEnvironment() {
-  return ensureAndGet("SKYNET_ENVIRONMENT", "dev");
-}
-function getEnvOrThrow(envName) {
-  if (!process.env[envName]) {
-    throw new Error(`Must set environment variable ${envName}`);
-  }
-  return process.env[envName];
-}
-function isProduction() {
-  return getEnvironment() === "prd";
-}
-function isDev() {
-  return getEnvironment() === "dev";
-}
 // src/cli.ts
 import path from "path";
 import fs from "fs";
@@ -90,6 +90,9 @@ function detectBin() {
   const wd = detectDirectory(process.argv[1], "package.json");
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
+function getDeployBin(bin) {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
+}
 // src/deploy.ts
 import fs2 from "fs/promises";
 import fso from "fs";

package/dist/dynamodb.js

@@ -1,3 +1,25 @@
+// src/util.ts
+function range(startAt, endAt, step) {
+  const arr = [];
+  for (let i = startAt;i <= endAt; i += step) {
+    arr.push([i, Math.min(endAt, i + step - 1)]);
+  }
+  return arr;
+}
+function arrayGroup(array, groupSize) {
+  const groups = [];
+  for (let i = 0;i < array.length; i += groupSize) {
+    groups.push(array.slice(i, i + groupSize));
+  }
+  return groups;
+}
+function fillRange(start, end) {
+  const result = [];
+  for (let i = start;i <= end; i++) {
+    result.push(i);
+  }
+  return result;
+}
 // src/object-hash.ts
 import xh from "@node-rs/xxhash";
 function getHash(obj) {
@@ -124,28 +146,6 @@ function memoize(func, options) {
   }
   return pMemoize(func, options);
 }
-// src/util.ts
-function range(startAt, endAt, step) {
-  const arr = [];
-  for (let i = startAt;i <= endAt; i += step) {
-    arr.push([i, Math.min(endAt, i + step - 1)]);
-  }
-  return arr;
-}
-function arrayGroup(array, groupSize) {
-  const groups = [];
-  for (let i = 0;i < array.length; i += groupSize) {
-    groups.push(array.slice(i, i + groupSize));
-  }
-  return groups;
-}
-function fillRange(start, end) {
-  const result = [];
-  for (let i = start;i <= end; i++) {
-    result.push(i);
-  }
-  return result;
-}
 // src/dynamodb.ts
 import {
   DynamoDBDocumentClient,

package/dist/email.d.ts

@@ -0,0 +1,9 @@
+interface SendEmailOptions {
+    to: string | string[];
+    subject: string;
+    html: string;
+    from: string;
+    text?: string;
+}
+export declare function sendEmail({ to, subject, html, from, text }: SendEmailOptions): Promise<void>;
+export {};

package/dist/email.js

@@ -0,0 +1,31 @@
+// src/email.ts
+import Mailgun from "mailgun.js";
+import formData from "form-data";
+async function sendEmail({ to, subject, html, from, text }) {
+  const apiKey = process.env.MAILGUN_API_KEY;
+  if (!apiKey) {
+    throw new Error("missing MAILGUN_API_KEY");
+  }
+  const domain = process.env.MAILGUN_DOMAIN;
+  if (!domain) {
+    throw new Error("missing MAILGUN_DOMAIN");
+  }
+  const mailgun = new Mailgun(formData);
+  const mg = mailgun.client({ username: "api", key: apiKey });
+  const recipients = Array.isArray(to) ? to : [to];
+  try {
+    await mg.messages.create(domain, {
+      from,
+      to: recipients,
+      subject,
+      ...text ? { text } : {},
+      html
+    });
+  } catch (error) {
+    console.error("failed to send email", error);
+    throw error;
+  }
+}
+export {
+  sendEmail
+};

package/dist/indexer.js

@@ -1,41 +1,3 @@
-// src/selector.ts
-function getSelectorDesc(selector) {
-  return Object.keys(selector).map((name) => {
-    return `          --${name.padEnd(14)}${selector[name].desc || selector[name].description || ""}`;
-  }).join(`
-`);
-}
-function getSelectorFlags(selector) {
-  return Object.keys(selector).reduce((acc, name) => {
-    const flag = {
-      type: selector[name].type || "string",
-      ...selector[name]
-    };
-    if (!selector[name].optional && selector[name].isRequired !== false) {
-      flag.isRequired = true;
-    }
-    return { ...acc, [name]: flag };
-  }, {});
-}
-function toSelectorString(selectorFlags, delim = ",") {
-  return Object.keys(selectorFlags).sort().map((flag) => {
-    return `${flag}=${selectorFlags[flag]}`;
-  }).join(delim);
-}
-function normalizeSelectorValue(v) {
-  return v.replace(/[^A-Za-z0-9]+/g, "-");
-}
-function getJobName(name, selectorFlags, mode) {
-  const selectorNamePart = Object.keys(selectorFlags).sort().map((name2) => selectorFlags[name2]).join("-");
-  let jobName = name;
-  if (mode) {
-    jobName += `-${mode}`;
-  }
-  if (selectorNamePart.length > 0) {
-    jobName += `-${normalizeSelectorValue(selectorNamePart)}`;
-  }
-  return jobName;
-}
 // src/env.ts
 function ensureAndGet(envName, defaultValue) {
   return process.env[envName] || defaultValue;
@@ -55,63 +17,56 @@ function isProduction() {
 function isDev() {
   return getEnvironment() === "dev";
 }
-// src/log.ts
-function isObject(a) {
-  return !!a && a.constructor === Object;
-}
-function print(o) {
-  if (Array.isArray(o)) {
-    return `[${o.map(print).join(", ")}]`;
+// src/util.ts
+function range(startAt, endAt, step) {
+  const arr = [];
+  for (let i = startAt;i <= endAt; i += step) {
+    arr.push([i, Math.min(endAt, i + step - 1)]);
   }
-  if (isObject(o)) {
-    return `{${Object.keys(o).map((k) => `${k}: ${o[k]}`).join(", ")}}`;
+  return arr;
+}
+function arrayGroup(array, groupSize) {
+  const groups = [];
+  for (let i = 0;i < array.length; i += groupSize) {
+    groups.push(array.slice(i, i + groupSize));
   }
-  return `${o}`;
+  return groups;
 }
-function getLine(params) {
-  let line = "";
-  for (let i = 0, l = params.length;i < l; i++) {
-    line += `${print(params[i])} `.replace(/\n/gm, "\t");
+function fillRange(start, end) {
+  const result = [];
+  for (let i = start;i <= end; i++) {
+    result.push(i);
   }
-  return line.trim();
+  return result;
 }
-function timestamp() {
-  return new Date().toISOString();
+// src/date.ts
+var MS_IN_A_DAY = 3600 * 24 * 1000;
+function getDateOnly(date) {
+  return new Date(date).toISOString().split("T")[0];
 }
-var inline = {
-  debug: function(...args) {
-    if (true) {
-      console.log(`${timestamp()} ${getLine(args)}`);
-    }
-  },
-  log: function(...args) {
-    if (true) {
-      console.log(`${timestamp()} ${getLine(args)}`);
-    }
-  },
-  error: function(...args) {
-    if (true) {
-      console.error(`${timestamp()} ${getLine(args)}`);
-    }
+function findDateAfter(date, n) {
+  const d = new Date(date);
+  const after = new Date(d.getTime() + MS_IN_A_DAY * n);
+  return getDateOnly(after);
+}
+function daysInRange(from, to) {
+  const fromTime = new Date(from).getTime();
+  const toTime = new Date(to).getTime();
+  if (fromTime > toTime) {
+    throw new Error(`range to date couldn't be earlier than range from date`);
   }
-};
-var logger = {
-  debug: function(...args) {
-    if (true) {
-      console.log(`[${timestamp()}]`, ...args);
-    }
-  },
-  log: function(...args) {
-    if (true) {
-      console.log(`[${timestamp()}]`, ...args);
-    }
-  },
-  error: function(...args) {
-    if (true) {
-      console.error(`[${timestamp()}]`, ...args);
-    }
+  const daysBetween = Math.floor((toTime - fromTime) / MS_IN_A_DAY);
+  const dates = [getDateOnly(new Date(fromTime))];
+  for (let i = 1;i <= daysBetween; i += 1) {
+    dates.push(getDateOnly(new Date(fromTime + i * MS_IN_A_DAY)));
   }
-};
+  return dates;
+}
+function dateRange(from, to, step) {
+  const days = daysInRange(from, to);
+  const windows = arrayGroup(days, step);
+  return windows.map((w) => [w[0], w[w.length - 1]]);
+}
 // src/object-hash.ts
 import xh from "@node-rs/xxhash";
 function getHash(obj) {
@@ -238,28 +193,63 @@ function memoize(func, options) {
   }
   return pMemoize(func, options);
 }
-// src/util.ts
-function range(startAt, endAt, step) {
-  const arr = [];
-  for (let i = startAt;i <= endAt; i += step) {
-    arr.push([i, Math.min(endAt, i + step - 1)]);
-  }
-  return arr;
+// src/log.ts
+function isObject(a) {
+  return !!a && a.constructor === Object;
 }
-function arrayGroup(array, groupSize) {
-  const groups = [];
-  for (let i = 0;i < array.length; i += groupSize) {
-    groups.push(array.slice(i, i + groupSize));
+function print(o) {
+  if (Array.isArray(o)) {
+    return `[${o.map(print).join(", ")}]`;
   }
-  return groups;
+  if (isObject(o)) {
+    return `{${Object.keys(o).map((k) => `${k}: ${o[k]}`).join(", ")}}`;
+  }
+  return `${o}`;
 }
-function fillRange(start, end) {
-  const result = [];
-  for (let i = start;i <= end; i++) {
-    result.push(i);
+function getLine(params) {
+  let line = "";
+  for (let i = 0, l = params.length;i < l; i++) {
+    line += `${print(params[i])} `.replace(/\n/gm, "\t");
   }
-  return result;
+  return line.trim();
 }
+function timestamp() {
+  return new Date().toISOString();
+}
+var inline = {
+  debug: function(...args) {
+    if (true) {
+      console.log(`${timestamp()} ${getLine(args)}`);
+    }
+  },
+  log: function(...args) {
+    if (true) {
+      console.log(`${timestamp()} ${getLine(args)}`);
+    }
+  },
+  error: function(...args) {
+    if (true) {
+      console.error(`${timestamp()} ${getLine(args)}`);
+    }
+  }
+};
+var logger = {
+  debug: function(...args) {
+    if (true) {
+      console.log(`[${timestamp()}]`, ...args);
+    }
+  },
+  log: function(...args) {
+    if (true) {
+      console.log(`[${timestamp()}]`, ...args);
+    }
+  },
+  error: function(...args) {
+    if (true) {
+      console.error(`[${timestamp()}]`, ...args);
+    }
+  }
+};
 // src/dynamodb.ts
 import {
   DynamoDBDocumentClient,
@@ -574,6 +564,44 @@ async function deleteRecordsByHashKey(tableName, indexName, hashKeyValue, verbos
   }
   return totalDeleted;
 }
+// src/selector.ts
+function getSelectorDesc(selector) {
+  return Object.keys(selector).map((name) => {
+    return `          --${name.padEnd(14)}${selector[name].desc || selector[name].description || ""}`;
+  }).join(`
+`);
+}
+function getSelectorFlags(selector) {
+  return Object.keys(selector).reduce((acc, name) => {
+    const flag = {
+      type: selector[name].type || "string",
+      ...selector[name]
+    };
+    if (!selector[name].optional && selector[name].isRequired !== false) {
+      flag.isRequired = true;
+    }
+    return { ...acc, [name]: flag };
+  }, {});
+}
+function toSelectorString(selectorFlags, delim = ",") {
+  return Object.keys(selectorFlags).sort().map((flag) => {
+    return `${flag}=${selectorFlags[flag]}`;
+  }).join(delim);
+}
+function normalizeSelectorValue(v) {
+  return v.replace(/[^A-Za-z0-9]+/g, "-");
+}
+function getJobName(name, selectorFlags, mode) {
+  const selectorNamePart = Object.keys(selectorFlags).sort().map((name2) => selectorFlags[name2]).join("-");
+  let jobName = name;
+  if (mode) {
+    jobName += `-${mode}`;
+  }
+  if (selectorNamePart.length > 0) {
+    jobName += `-${normalizeSelectorValue(selectorNamePart)}`;
+  }
+  return jobName;
+}
 // src/cli.ts
 import path from "path";
 import fs from "fs";
@@ -609,33 +637,8 @@ function detectBin() {
   const wd = detectDirectory(process.argv[1], "package.json");
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
-// src/date.ts
-var MS_IN_A_DAY = 3600 * 24 * 1000;
-function getDateOnly(date) {
-  return new Date(date).toISOString().split("T")[0];
-}
-function findDateAfter(date, n) {
-  const d = new Date(date);
-  const after = new Date(d.getTime() + MS_IN_A_DAY * n);
-  return getDateOnly(after);
-}
-function daysInRange(from, to) {
-  const fromTime = new Date(from).getTime();
-  const toTime = new Date(to).getTime();
-  if (fromTime > toTime) {
-    throw new Error(`range to date couldn't be earlier than range from date`);
-  }
-  const daysBetween = Math.floor((toTime - fromTime) / MS_IN_A_DAY);
-  const dates = [getDateOnly(new Date(fromTime))];
-  for (let i = 1;i <= daysBetween; i += 1) {
-    dates.push(getDateOnly(new Date(fromTime + i * MS_IN_A_DAY)));
-  }
-  return dates;
-}
-function dateRange(from, to, step) {
-  const days = daysInRange(from, to);
-  const windows = arrayGroup(days, step);
-  return windows.map((w) => [w[0], w[w.length - 1]]);
+function getDeployBin(bin) {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
 }
 // src/indexer.ts
 import meow from "meow";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.25.2",
+  "version": "0.25.4",
   "description": "Skynet Shared JS library",
   "type": "module",
   "exports": {
@@ -44,6 +44,10 @@
       "import": "./dist/dynamodb.js",
       "types": "./dist/dynamodb.d.ts"
     },
+    "./email": {
+      "import": "./dist/email.js",
+      "types": "./dist/email.d.ts"
+    },
     "./env": {
       "import": "./dist/env.js",
       "types": "./dist/env.d.ts"
@@ -116,6 +120,8 @@
     "chalk": "^5.6.2",
     "execa": "^9.6.1",
     "express": "^5.2.1",
+    "form-data": "^4.0.5",
+    "mailgun.js": "^12.7.1",
     "meow": "^14.0.0",
     "p-memoize": "^8.0.0",
     "p-throttle": "^8.1.0",

package/src/app.ts

@@ -5,7 +5,7 @@ import { createDeploy, createModeDeploy } from "./deploy";
 import type { Env } from "./deploy";
 import { startApiApp } from "./api.js";
 import type { Middleware } from "./api";
-import { getBinaryName, detectBin, detectWorkingDirectory } from "./cli.js";
+import { getBinaryName, detectBin, detectWorkingDirectory, getDeployBin } from "./cli.js";
 import type { Selector } from "./selector";
 import type { Request, Response, Application } from "express";
 
@@ -203,13 +203,14 @@ function indexer<TSelector extends Selector>({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
 
       const { deploy } = createDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,
@@ -313,13 +314,14 @@ function modeIndexer<T extends IndexerStateValue, TSelector extends Selector>({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
 
       const { deploy } = createModeDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,
@@ -437,13 +439,14 @@ function api({
     },
     onDeploy: () => {
       const bin = detectBin();
+      const runBin = getDeployBin(bin);
       const needDoppler = Object.values(env).some((v) => v === SENSITIVE_VALUE);
 
       const { deploy } = createDeploy({
         binaryName: `${getBinaryName()} deploy`,
         name,
         workingDirectory: detectWorkingDirectory(),
-        bin: needDoppler ? `doppler run -- ${bin} run` : `${bin} run`,
+        bin: needDoppler ? `doppler run -- ${runBin} run` : `${runBin} run`,
         selector,
         region,
         env,

package/src/cli.ts

@@ -45,4 +45,9 @@ function detectBin() {
   return process.argv[1].slice(wd.length + path.sep.length).replace(path.sep, "/");
 }
 
-export { getBinaryName, detectSkynetDirectory, detectWorkingDirectory, detectBin };
+// Run ts files via bun so Nomad/Doppler don't try to exec the file directly.
+function getDeployBin(bin: string): string {
+  return bin.endsWith(".ts") ? `bun ${bin}` : bin;
+}
+
+export { getBinaryName, detectSkynetDirectory, detectWorkingDirectory, detectBin, getDeployBin };

package/src/email.ts

@@ -0,0 +1,40 @@
+import Mailgun from "mailgun.js";
+import formData from "form-data";
+
+interface SendEmailOptions {
+  to: string | string[];
+  subject: string;
+  html: string;
+  from: string;
+  text?: string;
+}
+
+export async function sendEmail({ to, subject, html, from, text }: SendEmailOptions) {
+  const apiKey = process.env.MAILGUN_API_KEY;
+  if (!apiKey) {
+    throw new Error("missing MAILGUN_API_KEY");
+  }
+
+  const domain = process.env.MAILGUN_DOMAIN;
+  if (!domain) {
+    throw new Error("missing MAILGUN_DOMAIN");
+  }
+
+  const mailgun = new Mailgun(formData);
+  const mg = mailgun.client({ username: "api", key: apiKey });
+
+  const recipients = Array.isArray(to) ? to : [to];
+
+  try {
+    await mg.messages.create(domain, {
+      from,
+      to: recipients,
+      subject,
+      ...(text ? { text } : {}),
+      html,
+    });
+  } catch (error) {
+    console.error("failed to send email", error);
+    throw error;
+  }
+}

package/.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "conventionalCommits.scopes": [
-        "lib-skynet"
-    ]
-}