@joystick.js/node-canary 0.0.0-canary.384 → 0.0.0-canary.385

package/dist/app/api/test/accounts/signup.js

@@ -1 +1 @@
-import i from"../../../databases/queries/accounts.js";import u from"../../../accounts/default_user_output_fields.js";import _ from"../../format_api_error.js";import d from"../../handle_api_error.js";import p from"../../validate_input.js";import m from"../../../accounts/signup.js";const c=async(t={},s={})=>{try{const a=await i("user",{email_address:t?.body?.emailAddress||t?.body?.email_address});a&&await i("delete_user",{user_id:a?._id||a?.user_id});const e=process.joystick?.app_options?.accounts?.signup?.metadata,r=e?await p(t?.body?.metadata,e):[];if(r?.length>0)return d("accounts.signup",{errors:r.map(n=>_(new Error(n),"accounts.signup.metadata",401))},s);const o=await m({email_address:t?.body?.emailAddress||t?.body?.email_address,password:t?.body?.password,metadata:t?.body?.metadata,output:t?.body?.output||u});s.status(200).send(JSON.stringify({...o?.user||{},joystick_login_token:o?.token,joystick_login_token_expires_at:o?.token_expires_at}))}catch(a){d("test.accounts.signup",a,s)}};var w=c;export{w as default};
+import r from"../../../databases/queries/accounts.js";import m from"../../../accounts/default_user_output_fields.js";import p from"../../format_api_error.js";import d from"../../handle_api_error.js";import c from"../../validate_input.js";import y from"../../../accounts/signup.js";const l=async(t={},s={})=>{try{const a=await r("user",{email_address:t?.body?.emailAddress||t?.body?.email_address}),u=await r("user",{username:t?.body?.username}),e=a||u;e&&await r("delete_user",{user_id:e?._id||e?.user_id});const i=process.joystick?.app_options?.accounts?.signup?.metadata,n=i?await c(t?.body?.metadata,i):[];if(n?.length>0)return d("accounts.signup",{errors:n.map(_=>p(new Error(_),"accounts.signup.metadata",401))},s);const o=await y({email_address:t?.body?.emailAddress||t?.body?.email_address,username:t?.body?.username,password:t?.body?.password,metadata:t?.body?.metadata,output:t?.body?.output||m});s.status(200).send(JSON.stringify({...o?.user||{},joystick_login_token:o?.token,joystick_login_token_expires_at:o?.token_expires_at}))}catch(a){d("test.accounts.signup",a,s)}};var x=l;export{x as default};

package/dist/app/email/send.js

@@ -1 +1 @@
-import _ from"chalk";import{htmlToText as d}from"html-to-text";import g from"juice";import v from"nodemailer";import w from"../../lib/dynamic_import.js";import b from"../../lib/get_joystick_build_path.js";import j from"../../lib/get_translations.js";import x from"../settings/load.js";import y from"../../lib/path_exists.js";import T from"../ssr/index.js";import $ from"../../test/track_function_call.js";import k from"./validate_smtp_settings.js";const e=x(),E=async(t={})=>{if(process.env.NODE_ENV==="test"){$("node.email.send",[t]);return}const s=k(e?.config?.email?.smtp);if(!s)return console.warn(_.redBright("Invalid SMTP settings. Cannot send email.")),Promise.resolve(null);const r=parseInt(e?.config?.email?.smtp?.port,10),n=r===465||![25,587].includes(r),l=s?v.createTransport({host:e?.config?.email?.smtp?.host,port:r,secure:n,auth:{user:e?.config?.email?.smtp?.username,pass:e?.config?.email?.smtp?.password}}):null,m=b(),a=`${m}email/${t?.template}.js`,p=t?.template&&await y(a),o={from:e?.config?.email?.from,...t};if(p){const c=await w(`${a}?v=${new Date().getTime()}`),u=await j({is_email:!0,email_template_name:t?.template,joystick_build_path:m,req:{context:{user:t?.user}}}),i=await T({is_email:!0,component_options:{props:t?.props,translations:u},component_to_render:c,email_options:{base_html_name:t?.base,subject:t?.subject,preheader:t?.preheader}}),f=d(i),h=g(i,{preserveMediaQueries:!0,preserveImportant:!0,removeStyleTags:!1});return o.html=h,o.text=f,l.sendMail(o)}return console.warn(`Email template at /email/${t?.template}.js could not be found.`),Promise.resolve()};var z=E;export{z as default};
+import d from"chalk";import{htmlToText as _}from"html-to-text";import w from"juice";import b from"nodemailer";import j from"../../lib/dynamic_import.js";import x from"../../lib/get_joystick_build_path.js";import y from"../../lib/get_translations.js";import T from"../settings/load.js";import v from"../../lib/path_exists.js";import $ from"../ssr/index.js";import k from"../../test/track_function_call.js";import E from"./validate_smtp_settings.js";const r=T(),I=async(t={},e={})=>{if(process.env.NODE_ENV==="test"){k("node.email.send",[t]);return}const a=E(r?.config?.email?.smtp);if(!a)return console.warn(d.redBright("Invalid SMTP settings. Cannot send email.")),Promise.resolve(null);const s=parseInt(e?.port||r?.config?.email?.smtp?.port,10),l=s===465||![25,587].includes(s),p=a?b.createTransport({host:e?.host||r?.config?.email?.smtp?.host,port:s,secure:l,auth:{user:e?.username||r?.config?.email?.smtp?.username,pass:e?.password||r?.config?.email?.smtp?.password}}):null,m=x(),n=`${m}email/${t?.template}.js`,c=t?.template&&await v(n),o={from:r?.config?.email?.from,...t};if(e?.headers&&(o.headers=e?.headers),c){const u=await j(`${n}?v=${new Date().getTime()}`),f=await y({is_email:!0,email_template_name:t?.template,joystick_build_path:m,req:{context:{user:t?.user}}}),i=await $({is_email:!0,component_options:{props:t?.props,translations:f},component_to_render:u,email_options:{base_html_name:t?.base,subject:t?.subject,preheader:t?.preheader}}),h=_(i),g=w(i,{preserveMediaQueries:!0,preserveImportant:!0,removeStyleTags:!1});return o.html=g,o.text=h,p.sendMail(o)}return console.warn(`Email template at /email/${t?.template}.js could not be found.`),Promise.resolve()};var A=I;export{A as default};

package/dist/app/middleware/context.js

@@ -1 +1 @@
-const u=async(n,o,r)=>{n.context={...n?.context||{},ifLoggedIn:(t="",e=null)=>{if(n?.context?.user&&t)return o.redirect(t);if(e)return e()},ifNotLoggedIn:(t="",e=null)=>{if(!n?.context?.user&&t)return o.redirect(t);if(e)return e()},...process.databases||{}},r()};var f=u;export{f as default};
+const t=(e="",n=null)=>{if(req?.context?.user&&e)return res.redirect(e);if(n)return n()},r=(e="",n=null)=>{if(!req?.context?.user&&e)return res.redirect(e);if(n)return n()},s=async(e,n,o)=>{e.context={...e?.context||{},if_logged_in:t,ifLoggedIn:t,if_not_logged_in:r,ifNotLoggedIn:r,...process.databases||{}},o()};var i=s;export{i as default};

package/dist/app/queues/index.js

@@ -1 +1 @@
-import d from"chalk";import h from"fs";import c from"os";import b from"../../lib/generate_id.js";import f from"../databases/get_target_database_connection.js";import l from"../databases/queries/map.js";import _ from"../../lib/timestamps.js";import i from"../../lib/types.js";import p from"../../test/track_function_call.js";class m{constructor(e="",t={}){this.init_database=this.init_database.bind(this),this.machine_id=h.readFileSync(`${c.homedir()}/.cheatcode/MACHINE_ID`,"utf-8")?.trim().replace(/\n/g,""),this.name=e,this.options={concurrent_jobs:1,...t},this.init_database(this?.options?.external,this?.options?.database?.provider)}async init_database(e=!1,t=null){const n=t||f("queues")?.provider,s=l[n]?.queues,o=this._get_database_connection();i.is_object(o)&&i.is_object(s)&&(this.db=Object.entries(s||{})?.reduce((a={},[r,u])=>(a[r]=u.bind({db:o,machine_id:this.machine_id,queue:{name:this.name,options:this.options}}),a),{_connection:o}),e||(await this.db.initialize_database(n),(this?.options?.runOnStartup||this?.options?.run_on_startup)&&this.run()))}_get_database_connection(){if(this?.options?.database){const{provider:e,name:t}=this?.options?.database,n=process.databases&&process.databases[e]&&process.databases[e][t];return n||console.warn(d.red(`Connection to database ${e}.${t} not found on process. Cannot start queue.`)),n||null}return process.databases._queues}async add(e={}){const t=(e?.next_run_at||e?.next_run_at)==="now"||!e?.next_run_at&&!e?.next_run_at?_.get_future_time():e?.next_run_at||e?.next_run_at,n={_id:b(16),status:"pending",environment:process.env.NODE_ENV,next_run_at:t,job:e?.job,payload:e?.payload},s=this?.options?.jobs&&this?.options?.jobs[e?.job];if(s&&(i.is_function(s?.preflight?.onBeforeAdd)||i.is_function(s?.preflight?.on_before_add))&&!await(s?.preflight?.onBeforeAdd||s?.preflight?.on_before_add)(n,this.db._connection,`queue_${this.name}`))return null;this.db.add_job(n)}async _check_if_okay_to_run_jobs(){return await this._get_number_of_jobs_running()<(this.options.concurrent_jobs||this.options.concurrent_jobs)}_get_number_of_jobs_running(){return this.db.count_jobs("running")}_handle_requeue_jobs_running_before_restart(){if(this.db)return!this.options.retryJobsRunningBeforeRestart&&!this.options.retry_jobs_running_before_restart?this.db.delete_incomplete_jobs_for_machine():this.db.set_jobs_for_machine_pending()}run(){this.db&&(process.env.NODE_ENV!=="test"&&console.log(`Starting ${this.name} queue...`),this._handle_requeue_jobs_running_before_restart().then(()=>{setInterval(async()=>{if(await this._check_if_okay_to_run_jobs()&&!process.env.HALT_QUEUES){const t=await this.db.get_next_job_to_run();this.handle_next_job(t)}},300)}))}async handle_next_job(e={}){const t=this.options.jobs[e?.job];if(e&&e?.job&&t&&i.is_function(t?.run))try{if((i.is_function(t?.preflight?.okayToRun)||i.is_function(t?.preflight?.okay_to_run))&&!await(t?.preflight?.okayToRun||t?.preflight?.okay_to_run)(e?.payload,e))return this._handle_requeue_job(e,_.get_future_time("seconds",t?.preflight?.requeueDelayInSeconds||t?.preflight?.requeue_delay_in_seconds||10));if((i.is_number(t?.maxAttempts)||i.is_number(t?.max_attempts))&&e?.attempts>=parseInt(t?.maxAttempts||t?.max_attempts,10))return(i.is_function(t?.onMaxAttemptsExhausted)||i.is_function(t?.on_max_attempts_exhausted))&&await(t.onMaxAttemptsExhausted||t.on_max_attempts_exhausted)(e),this._handle_delete_job(e?._id);await this._log_attempt(e?._id),p(`node.queues.${this?.name}.jobs.${e?.job}`,[e?.payload]),await t.run(e?.payload,{...e,queue:this,completed:()=>this._handle_job_completed(e?._id),failed:n=>this._handle_job_failed(e,t,n),delete:()=>this._handle_delete_job(e?._id),requeue:(n="")=>this._handle_requeue_job(e,n)})}catch(n){console.warn(n),this._handle_job_failed(e,t,n)}}_log_attempt(e=""){return this.db.log_attempt(e)}_handle_job_completed(e=""){return this.db.set_job_completed(e)}_handle_job_failed(e={},t={},n=""){return t?.requeueOnFailure||t?.requeue_on_failure?this._handle_requeue_job(e,_.get_future_time("seconds",10)):this.db.set_job_failed(e?._id,n)}_handle_delete_job(e=""){return this.db.delete_job(e)}_handle_requeue_job(e={},t=null){return this.db.requeue_job(e?._id,t||_.get_future_time())}list(e=""){const t={};return e&&(t.status=e),this.db.get_jobs(t)}}var $=m;export{$ as default};
+import d from"chalk";import h from"fs";import c from"os";import b from"../../lib/generate_id.js";import f from"../databases/get_target_database_connection.js";import l from"../databases/queries/map.js";import _ from"../../lib/timestamps.js";import i from"../../lib/types.js";import p from"../../test/track_function_call.js";class m{constructor(e="",t={}){this.init_database=this.init_database.bind(this),this.machine_id=h.readFileSync(`${c.homedir()}/.cheatcode/MACHINE_ID`,"utf-8")?.trim().replace(/\n/g,""),this.name=e,this.options={concurrent_jobs:1,...t},this.init_database(this?.options?.external,this?.options?.database?.provider)}async init_database(e=!1,t=null){const n=t||f("queues")?.provider,s=l[n]?.queues,o=this._get_database_connection();i.is_object(o)&&i.is_object(s)&&(this.db=Object.entries(s||{})?.reduce((a={},[r,u])=>(a[r]=u.bind({db:o,machine_id:this.machine_id,queue:{name:this.name,options:this.options}}),a),{_connection:o}),e||(await this.db.initialize_database(n),(this?.options?.runOnStartup||this?.options?.run_on_startup)&&this.run()))}_get_database_connection(){if(this?.options?.database){const{provider:e,name:t}=this?.options?.database,n=process.databases&&process.databases[e]&&process.databases[e][t];return n||console.warn(d.red(`Connection to database ${e}.${t} not found on process. Cannot start queue.`)),n||null}return process.databases._queues}async add(e={}){const t=(e?.next_run_at||e?.next_run_at)==="now"||!e?.next_run_at&&!e?.next_run_at?_.get_future_time():e?.next_run_at||e?.next_run_at,n={_id:b(16),status:"pending",environment:process.env.NODE_ENV,next_run_at:t,job:e?.job,payload:e?.payload},s=this?.options?.jobs&&this?.options?.jobs[e?.job];if(s&&(i.is_function(s?.preflight?.onBeforeAdd)||i.is_function(s?.preflight?.on_before_add))&&!await(s?.preflight?.onBeforeAdd||s?.preflight?.on_before_add)(n,this.db._connection,`queue_${this.name}`))return null;this.db.add_job(n)}async _check_if_okay_to_run_jobs(){return await this._get_number_of_jobs_running()<(this.options.concurrent_jobs||this.options.concurrent_jobs||1)}_get_number_of_jobs_running(){return this.db.count_jobs("running")}_handle_requeue_jobs_running_before_restart(){if(this.db)return!this.options.retryJobsRunningBeforeRestart&&!this.options.retry_jobs_running_before_restart?this.db.delete_incomplete_jobs_for_machine():this.db.set_jobs_for_machine_pending()}run(){this.db&&(process.env.NODE_ENV!=="test"&&console.log(`Starting ${this.name} queue...`),this._handle_requeue_jobs_running_before_restart().then(()=>{setInterval(async()=>{if(await this._check_if_okay_to_run_jobs()&&!process.env.HALT_QUEUES){const t=await this.db.get_next_job_to_run();this.handle_next_job(t)}},300)}))}async handle_next_job(e={}){const t=this.options.jobs[e?.job];if(e&&e?.job&&t&&i.is_function(t?.run))try{if((i.is_function(t?.preflight?.okayToRun)||i.is_function(t?.preflight?.okay_to_run))&&!await(t?.preflight?.okayToRun||t?.preflight?.okay_to_run)(e?.payload,e))return this._handle_requeue_job(e,_.get_future_time("seconds",t?.preflight?.requeueDelayInSeconds||t?.preflight?.requeue_delay_in_seconds||10));if((i.is_number(t?.maxAttempts)||i.is_number(t?.max_attempts))&&e?.attempts>=parseInt(t?.maxAttempts||t?.max_attempts,10))return(i.is_function(t?.onMaxAttemptsExhausted)||i.is_function(t?.on_max_attempts_exhausted))&&await(t.onMaxAttemptsExhausted||t.on_max_attempts_exhausted)(e),this._handle_delete_job(e?._id);await this._log_attempt(e?._id),p(`node.queues.${this?.name}.jobs.${e?.job}`,[e?.payload]),await t.run(e?.payload,{...e,queue:this,completed:()=>this._handle_job_completed(e?._id),failed:n=>this._handle_job_failed(e,t,n),delete:()=>this._handle_delete_job(e?._id),requeue:(n="")=>this._handle_requeue_job(e,n)})}catch(n){console.warn(n),this._handle_job_failed(e,t,n)}}_log_attempt(e=""){return this.db.log_attempt(e)}_handle_job_completed(e=""){return this.db.set_job_completed(e)}_handle_job_failed(e={},t={},n=""){return t?.requeueOnFailure||t?.requeue_on_failure?this._handle_requeue_job(e,_.get_future_time("seconds",10)):this.db.set_job_failed(e?._id,n)}_handle_delete_job(e=""){return this.db.delete_job(e)}_handle_requeue_job(e={},t=null){return this.db.requeue_job(e?._id,t||_.get_future_time())}list(e=""){const t={};return e&&(t.status=e),this.db.get_jobs(t)}}var $=m;export{$ as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/node-canary",
   "type": "module",
-  "version": "0.0.0-canary.384",
+  "version": "0.0.0-canary.385",
   "description": "The Node.js framework for Joystick.",
   "main": "./dist/index.js",
   "scripts": {

package/src/app/api/test/accounts/signup.js

@@ -10,7 +10,9 @@ const test_accounts_signup = async (req = {}, res = {}) => {
 		// NOTE: Assume accounts created in tests are ephemeral on a per-run basis.
 		// When signing up, automatically delete an existing user to avoid fragile
 		// tests and conflicts between runs.
-		const existing_user = await accounts_query('user', { email_address: req?.body?.emailAddress || req?.body?.email_address });
+		const existing_user_with_email = await accounts_query('user', { email_address: req?.body?.emailAddress || req?.body?.email_address });
+		const existing_user_with_username = await accounts_query('user', { username: req?.body?.username });
+		const existing_user = existing_user_with_email || existing_user_with_username;
 
 		if (existing_user) {
 		  await accounts_query('delete_user', { user_id: existing_user?._id || existing_user?.user_id });
@@ -29,6 +31,7 @@ const test_accounts_signup = async (req = {}, res = {}) => {
 
 		const signup_response = await signup({
 		  email_address: req?.body?.emailAddress || req?.body?.email_address,
+		  username: req?.body?.username,
 		  password: req?.body?.password,
 		  metadata: req?.body?.metadata,
 		  output: req?.body?.output || default_user_output_fields,

package/src/app/email/send.js

@@ -13,7 +13,7 @@ import validate_smtp_settings from "./validate_smtp_settings.js";
 
 const settings = load_settings();
 
-const send_email = async (send_email_options = {}) => {
+const send_email = async (send_email_options = {}, smtp_overrides = {}) => {
   if (process.env.NODE_ENV === 'test') {
     // NOTE: In a test environment, we do not actually want to send an email. Instead,
     // track the call and then return.
@@ -31,17 +31,17 @@ const send_email = async (send_email_options = {}) => {
   // NOTE: Check the port number as nodemailer notes most SMTP providers required a plaintext
   // connection *first* before upgrading the connection via STARTTLS. This prevents an SSL error
   // when sending emails via SMTP port 587 or 25. See: https://nodemailer.com/smtp/#tls-options.
-  const smtp_port = parseInt(settings?.config?.email?.smtp?.port, 10);
+  const smtp_port = parseInt(smtp_overrides?.port || settings?.config?.email?.smtp?.port, 10);
   const should_use_secure = smtp_port === 465 || ![25, 587].includes(smtp_port);
 
   const smtp = valid_smtp_settings
     ? nodemailer.createTransport({
-        host: settings?.config?.email?.smtp?.host,
+        host: smtp_overrides?.host || settings?.config?.email?.smtp?.host,
         port: smtp_port,
         secure: should_use_secure,
         auth: {
-          user: settings?.config?.email?.smtp?.username,
-          pass: settings?.config?.email?.smtp?.password,
+          user: smtp_overrides?.username || settings?.config?.email?.smtp?.username,
+          pass: smtp_overrides?.password || settings?.config?.email?.smtp?.password,
         },
       })
     : null;
@@ -55,6 +55,10 @@ const send_email = async (send_email_options = {}) => {
     ...send_email_options,
   };
 
+  if (smtp_overrides?.headers) {
+    nodemailer_options.headers = smtp_overrides?.headers;
+  }
+
   if (template_exists) {
     const email_template_component = await dynamic_import(`${template_path}?v=${new Date().getTime()}`);
 

package/src/app/middleware/context.js

@@ -1,24 +1,30 @@
+const if_logged_in = (redirect_path = "", callback = null) => {
+  if (!!req?.context?.user && redirect_path) {
+    return res.redirect(redirect_path);
+  }
+
+  if (callback) {
+    return callback();
+  }
+};
+
+const if_not_logged_in = (redirect_path = "", callback = null) => {
+  if (!req?.context?.user && redirect_path) {
+    return res.redirect(redirect_path);
+  }
+
+  if (callback) {
+    return callback();
+  }
+};
+
 const context_middleware = async (req, res, next) => {
   req.context = {
     ...(req?.context || {}),
-	  ifLoggedIn: (redirect_path = "", callback = null) => {
-	    if (!!req?.context?.user && redirect_path) {
-	      return res.redirect(redirect_path);
-	    }
-
-	    if (callback) {
-	      return callback();
-	    }
-	  },
-	  ifNotLoggedIn: (redirect_path = "", callback = null) => {
-	    if (!req?.context?.user && redirect_path) {
-	      return res.redirect(redirect_path);
-	    }
-
-	    if (callback) {
-	      return callback();
-	    }
-	  },
+    if_logged_in,
+	  ifLoggedIn: if_logged_in,
+	  if_not_logged_in,
+	  ifNotLoggedIn: if_not_logged_in,
 	  ...(process.databases || {}),
   };
 

package/src/app/queues/index.js

@@ -123,7 +123,7 @@ class Queue {
 
   async _check_if_okay_to_run_jobs() {
     const jobs_running = await this._get_number_of_jobs_running();
-    return jobs_running < (this.options.concurrent_jobs || this.options.concurrent_jobs);
+    return jobs_running < (this.options.concurrent_jobs || this.options.concurrent_jobs || 1);
   }
 
   _get_number_of_jobs_running() {