arcane-os 0.15.2 → 0.16.0

package/runtime/arcane/modules/Mail.js

@@ -7,22 +7,18 @@ import {
     sendMailReport,
 } from './MailTransport.mjs';
 
-let userInstance=null;
-
-function completeResult(value){return value;}
-
 const MAIL_TYPES=new Set(['error','report','crisis_detected']);
-const MAIL_OUTBOX_EVENTS=completeResult([
+const MAIL_OUTBOX_EVENTS=[
     'mail-outbox-state',
     'mail-outbox-delivery',
     'mail-outbox-drain'
-]);
+];
 const PENDING_OUTBOX_STATES=new Set(['queued','sending','retry_wait']);
-const NATIVE_MAIL_RESPONSE_STATUS_CODES=completeResult({
+const NATIVE_MAIL_RESPONSE_STATUS_CODES={
     accepted:202,
     delivery_uncertain:207,
     partially_accepted:207
-});
+};
 const NATIVE_MAIL_REQUEST_ID_PATTERN=/^[A-Za-z0-9-]+$/;
 const NATIVE_MAIL_UNCERTAIN_ERROR_CODES=new Set([
     'ARCANE_REQUEST_TIMEOUT',
@@ -37,7 +33,6 @@ const NATIVE_MAIL_RETRYABLE_ERROR_CODES=new Set([
     'ARCANE_TRANSPORT_UNAVAILABLE'
 ]);
 const EMAIL_PATTERN=/^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)+$/i;
-const ARCANE_APP_ID_PATTERN=/^[a-z0-9](?:[a-z0-9-]{0,62})$/;
 
 function codedError(message,code,ErrorType=Error){
     const error=new ErrorType(message);
@@ -71,10 +66,10 @@ function linkedMailSignal(primary,secondary){
         if(signal&&!signals.includes(signal)) signals.push(signal);
     }
     if(signals.length===0){
-        return completeResult({signal:null,dispose:function disposeEmptyMailSignal(){}});
+        return {signal:null,dispose:function disposeEmptyMailSignal(){}};
     }
     if(signals.length===1){
-        return completeResult({signal:signals[0],dispose:function disposeSingleMailSignal(){}});
+        return {signal:signals[0],dispose:function disposeSingleMailSignal(){}};
     }
     const controller=new AbortController();
     const listeners=[];
@@ -86,14 +81,14 @@ function linkedMailSignal(primary,secondary){
         if(signal.aborted) listener();
         else signal.addEventListener('abort',listener,{once:true});
     }
-    return completeResult({
+    return {
         signal:controller.signal,
         dispose:function disposeLinkedMailSignal(){
             for(const entry of listeners){
                 entry.signal.removeEventListener('abort',entry.listener);
             }
         }
-    });
+    };
 }
 
 function waitForMailOperation(operation,signal){
@@ -190,58 +185,23 @@ async function loadRequiredMailStorage(){
     return storage;
 }
 
-async function loadOptionalMailUser(injectedUser){
+async function resolveMailUserEntity(injectedUser){
     if(injectedUser!==undefined) return injectedUser;
-    if(!userInstance){
-        const {default:UserEntity}=await import('../entities/User.js');
-        userInstance=new UserEntity();
-    }
-    return userInstance;
+    if(globalThis.window?.user) return globalThis.window.user;
+    const {default:UserEntity}=await import('../entities/User.js');
+    return new UserEntity();
 }
 
 function declaredApplicationId(document=globalThis.document){
-    const value=document?.querySelector?.('meta[name="arcane-app-id"]')?.content?.trim();
-    return ARCANE_APP_ID_PATTERN.test(value||'') ? value:'';
-}
-
-function declaredMailBaseDomain(document=globalThis.document){
-    return normalizeBaseDomain(
-        document?.querySelector?.('meta[name="arcane-mail-base-domain"]')?.content,
-    );
-}
-
-function normalizeBaseDomain(value){
-    const domain=String(value||'').trim().toLowerCase();
-    if(!domain||domain.length>253
-        || !/^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(domain)){
-        return '';
-    }
-    return domain;
+    const appName=document?.querySelector?.('meta[name="arcane-app-id"]')?.content;
+    return is.string(appName)?appName:'';
 }
 
-function hostedBaseDomain(hostname,configuredBaseDomain=''){
-    const configured=normalizeBaseDomain(configuredBaseDomain);
-    return configured&&(hostname===configured||hostname.endsWith(`.${configured}`)) ? configured:'';
-}
-
-function defaultMailEndpoint(location=globalThis.location,baseDomain=''){
+function defaultMailEndpoint(location=globalThis.location){
     if(!location||!['http:','https:'].includes(location.protocol)){
         return '';
     }
-    const hostname=String(location.hostname||'').toLowerCase();
-    const loopback=['localhost','127.0.0.1','::1','[::1]'].includes(hostname);
-    if(loopback&&location.protocol==='http:'&&String(location.port||'')!=='8025'){
-        const authority=hostname==='::1' ? '[::1]':hostname;
-        return `http://${authority}:8025/v1/mail`;
-    }
-    if(loopback){
-        return new URL('/v1/mail',location.origin).href;
-    }
-    const root=hostedBaseDomain(hostname,baseDomain);
-    if(!root){
-        return '';
-    }
-    return `https://mail.${root}/v1/mail`;
+    return new URL('/v1/mail',location.origin).href;
 }
 
 export function resolveMailConfig(
@@ -249,19 +209,19 @@ export function resolveMailConfig(
     {document=globalThis.document,location=globalThis.location}={}
 ){
     const supplied=config&&is.object(config)&&!is.array(config)?config:{};
-    const appName=is.string(supplied.appName)&&supplied.appName.trim()
-        ? supplied.appName.trim()
+    const appName=is.string(supplied.appName)
+        ? supplied.appName
         : declaredApplicationId(document);
-    return completeResult({
-        appName:ARCANE_APP_ID_PATTERN.test(appName) ? appName:'',
-        appKey:is.string(supplied.appKey) ? supplied.appKey:'',
-        endpoint:is.string(supplied.endpoint)&&supplied.endpoint.trim()
-            ? supplied.endpoint.trim()
-            : defaultMailEndpoint(location,supplied.baseDomain||declaredMailBaseDomain(document)),
+    return {
+        appName,
+        subscriptionKey:supplied.subscriptionKey,
+        endpoint:is.string(supplied.endpoint)
+            ? supplied.endpoint
+            : defaultMailEndpoint(location),
         requestTimeout:is.finite(supplied.requestTimeout)
             ? supplied.requestTimeout
             : null,
-    });
+    };
 }
 
 function escapeHtml(value){
@@ -384,12 +344,12 @@ function publicSendResult(record){
 }
 
 function safeDrainDetail(summary){
-    return completeResult({
+    return {
         ...summary,
         records:[...summary.records],
         invalidRecords:[...summary.invalidRecords],
-        states:completeResult({...summary.states})
-    });
+        states:{...summary.states}
+    };
 }
 
 function normalizeMailOptions(options){
@@ -505,7 +465,7 @@ class Mail {
             );
         }
         this.appName=resolved.appName;
-        this.appKey=resolved.appKey;
+        this.subscriptionKey=resolved.subscriptionKey;
         this.endpoint=resolved.endpoint;
         this.requestTimeout=resolved.requestTimeout;
         this.#storageInjected=options.storageInjected;
@@ -599,8 +559,19 @@ class Mail {
     async #transportDelivery(request){
         if(this.#deliver) return this.#deliver(request);
         if(this.endpoint){
+            throwIfMailAborted(request.signal);
+            let subscriptionKey=this.subscriptionKey;
+            if(subscriptionKey===undefined){
+                const user=await resolveMailUserEntity(this.#user);
+                throwIfMailAborted(request.signal);
+                if(is.function(user?.load)){
+                    await waitForMailOperation(user.load(),request.signal);
+                }
+                subscriptionKey=user?.subscription_key;
+            }
+            throwIfMailAborted(request.signal);
             return sendMailReport({
-                appKey:this.appKey,
+                subscriptionKey,
                 appName:this.appName,
                 endpoint:this.endpoint,
                 report:request.report,
@@ -697,7 +668,7 @@ class Mail {
     async #optionalProfile(){
         const fallback={email:'',language:'',phone:'',username:''};
         try{
-            const user=await loadOptionalMailUser(this.#user);
+            const user=await resolveMailUserEntity(this.#user);
             if(!user) return fallback;
             try{
                 await user.load?.();

package/runtime/arcane/modules/MailOutbox.mjs

@@ -176,8 +176,8 @@ function normalizedFailure(value){
     if(!isPlainRecord(value)){
         fail('Mail outbox failure record is invalid.','MAIL_OUTBOX_RECORD_INVALID');
     }
-    const code=safeString(value.code,SAFE_CODE_PATTERN);
-    if(!code||!is.boolean(value.retryable)||!is.boolean(value.uncertain)){
+    const code=value.code;
+    if(!is.string(code)||!code||!is.boolean(value.retryable)||!is.boolean(value.uncertain)){
         fail('Mail outbox failure record is invalid.','MAIL_OUTBOX_RECORD_INVALID');
     }
     return {
@@ -211,12 +211,12 @@ function normalizedResult(value,{invalidCode='MAIL_OUTBOX_RECORD_INVALID'}={}){
         classification:safeString(value.classification,SAFE_CODE_PATTERN),
         acceptanceAuthority,
         requestId:safeString(value.requestId,SAFE_ID_PATTERN),
-        providerId:safeString(value.providerId,SAFE_ID_PATTERN),
+        providerId:is.string(value.providerId)?value.providerId:null,
         providerStatus:is.string(value.providerStatus)
             ||is.safeInteger(value.providerStatus)
             ?value.providerStatus
             :null,
-        providerCode:safeString(value.providerCode,SAFE_CODE_PATTERN),
+        providerCode:is.string(value.providerCode)?value.providerCode:null,
         statusCode:safeStatusCode(value.statusCode),
         retryAfterSeconds:retryAfterSeconds(value.retryAfterSeconds)
     };
@@ -451,7 +451,7 @@ function deliveryFailure(error){
             name:is.string(error?.name)?error.name:'Error',
             message:is.string(error?.message)?error.message:String(error??''),
             ...(is.string(error?.stack)?{stack:error.stack}:{}),
-            code:safeString(error?.code,SAFE_CODE_PATTERN)||'MAIL_DELIVERY_FAILED',
+            code:is.string(error?.code)&&error.code?error.code:'MAIL_DELIVERY_FAILED',
             statusCode:safeStatusCode(error?.statusCode),
             retryable,
             uncertain,

package/runtime/arcane/modules/MailTransport.mjs

@@ -1,10 +1,7 @@
 import Is from 'strong-type';
 const is=new Is(false);
 
-const REPORT_KEY_PATTERN=/^[a-zA-Z0-9._:-]+$/;
 const REQUEST_ID_PATTERN=/^[a-zA-Z0-9-]+$/;
-const PROVIDER_ID_PATTERN=/^[a-zA-Z0-9._:-]+$/;
-const ERROR_CODE_PATTERN=/^[a-zA-Z0-9._:-]+$/;
 const RETRYABLE_STATUS_CODES=new Set([408,425,429,500,502,503,504]);
 const NON_RETRYABLE_RATE_CODES=new Set(['daily_quota_exceeded','monthly_quota_exceeded']);
 const RESPONSE_CONTRACT={
@@ -39,12 +36,8 @@ export function normalizeMailEndpoint(endpoint,base=globalThis.location?.href){
     }catch{
         throw new Error('Mail endpoint is invalid');
     }
-    const loopback=['localhost','127.0.0.1','[::1]'].includes(url.hostname.toLowerCase());
-    if(url.protocol!=='https:'&&!(url.protocol==='http:'&&loopback)){
-        throw new Error('Mail endpoint must use HTTPS or loopback HTTP');
-    }
-    if(url.username||url.password||url.search||url.hash){
-        throw new Error('Mail endpoint must not contain credentials, a query, or a fragment');
+    if(url.protocol!=='https:'&&url.protocol!=='http:'){
+        throw new Error('Mail endpoint must use HTTP or HTTPS');
     }
     return url.href;
 }
@@ -125,7 +118,7 @@ function parseDeliveryResponse(response,responseText){
         }
     }
     if(body.providerId!==undefined
-        && (!is.string(body.providerId)||!PROVIDER_ID_PATTERN.test(body.providerId))){
+        && (!is.string(body.providerId)||!body.providerId)){
         throw invalidSuccessResponse(response,responseText);
     }
 
@@ -150,7 +143,7 @@ function parseRejection(response,responseText){
         ? body.error
         : body;
     const rawCode=source?.code;
-    const code=is.string(rawCode)&&ERROR_CODE_PATTERN.test(rawCode)
+    const code=is.string(rawCode)
         ? rawCode
         : `MAIL_HTTP_${String(response.status)}`;
     let retryable=is.boolean(source?.retryable)
@@ -218,7 +211,7 @@ function requestBodyFrom({report,serializedReport}){
 }
 
 export async function sendMailReport({
-    appKey,
+    subscriptionKey,
     appName,
     endpoint,
     fetchImpl=globalThis.fetch,
@@ -232,18 +225,18 @@ export async function sendMailReport({
         throw new MailTransportError('Mail transport is unavailable',{code:'MAIL_UNAVAILABLE'});
     }
     const resolvedEndpoint=normalizeMailEndpoint(endpoint);
-    if(!is.string(appName)||!/^[a-z0-9](?:[a-z0-9-]{0,62})$/.test(appName)){
-        throw new Error('Mail application identity is invalid');
+    if(!is.string(appName)||!appName){
+        throw new Error('Mail application name is required');
     }
-    if(!is.string(reportKey)||!REPORT_KEY_PATTERN.test(reportKey)){
-        throw new Error('Mail report key must contain safe characters');
+    if(!is.string(reportKey)||!reportKey){
+        throw new Error('Mail report key is required');
     }
     if(requestTimeout!==null&&requestTimeout!==undefined
         &&(!is.safeInteger(requestTimeout)||requestTimeout<1)){
         throw new Error('Mail request timeout must be a positive integer');
     }
-    if(appKey!==undefined&&appKey!==null&&!is.string(appKey)){
-        throw new Error('Mail application key must be a string');
+    if(subscriptionKey!==undefined&&subscriptionKey!==null&&!is.string(subscriptionKey)){
+        throw new TypeError('Mail subscription key must be a string');
     }
     if(signal!==undefined&&!(signal instanceof AbortSignal)){
         throw new TypeError('Mail signal must be an AbortSignal');
@@ -255,9 +248,7 @@ export async function sendMailReport({
         'Idempotency-Key':reportKey,
         'X-Mail-App':appName,
     };
-    if(is.string(appKey)&&appKey){
-        headers['X-Mail-Key']=appKey;
-    }
+    if(subscriptionKey)headers.Authorization=`Bearer ${subscriptionKey}`;
 
     const controller=new AbortController();
     let timedOut=false;

package/src/cli/main.mjs

@@ -46,7 +46,6 @@ const FLAG_OPTIONS=new Set([
     'require-local-ai',
     'overwrite',
     'secret-stdin',
-    'app-key-stdin',
     'report-stdin',
     'help',
     'version'
@@ -85,8 +84,8 @@ Usage:
   ${CLI_NAME} mail key set <profile> [--secret-stdin]
   ${CLI_NAME} mail key status <profile>
   ${CLI_NAME} mail key delete <profile>
-  ${CLI_NAME} mail send --profile <profile> --from <address> --report-key <id> --report-stdin [--request-timeout <ms>]
-  ${CLI_NAME} mail serve --profile <profile> --from <address> --app <id> --origin <origin> [--allow-to <addresses>] [--app-key-stdin] [--host 127.0.0.1] [--port 8025] [--request-timeout <ms>]
+  ${CLI_NAME} mail send --profile <profile> [--from <address>] --report-key <id> --report-stdin [--request-timeout <ms>]
+  ${CLI_NAME} mail serve --profile <profile> [--from <address>] [--app <label>] [--origin <origin>] [--allow-to <addresses>] [--host 0.0.0.0] [--port 8025] [--request-timeout <ms>]
 
 Development:
   --public                      Bind dev to all IPv4 interfaces (0.0.0.0) and print network URLs.
@@ -190,7 +189,7 @@ function readPort(value,defaultValue){
     return port;
 }
 
-function readRequestTimeout(value){
+function readMailRequestTimeout(value){
     if(value===undefined)return undefined;
     if(!/^\d+$/u.test(value)){
         usage(`Invalid request timeout: ${value}.`);
@@ -205,7 +204,7 @@ function readRequestTimeout(value){
     return timeout;
 }
 
-function normalizedSecret(value){
+function normalizeMailCredentialInput(value){
     const secret=String(value??'').trim();
     if(!secret){
         usage('Mail credential input must not be empty.');
@@ -235,7 +234,7 @@ function readPipedMailSecret(input,signal){
         };
         const onEnd=function finishPipedMailSecret(){
             try{
-                finish(resolve,normalizedSecret(Buffer.concat(chunks).toString('utf8')));
+                finish(resolve,normalizeMailCredentialInput(Buffer.concat(chunks).toString('utf8')));
             }catch(error){
                 finish(reject,error);
             }
@@ -304,7 +303,7 @@ function readMaskedMailSecret(input,output,signal,label,stdinOption){
                 }
                 if(character==='\r'||character==='\n'){
                     try{
-                        finish(resolve,normalizedSecret(secret));
+                        finish(resolve,normalizeMailCredentialInput(secret));
                     }catch(error){
                         finish(reject,error);
                     }
@@ -500,9 +499,6 @@ function operationOptions(command,parsed,cwd){
     if(command!=='mail'&&flags.has('secret-stdin')){
         usage('--secret-stdin is supported only by mail key set.');
     }
-    if(command!=='mail'&&flags.has('app-key-stdin')){
-        usage('--app-key-stdin is supported only by mail serve.');
-    }
     if(command!=='mail'&&flags.has('report-stdin')){
         usage('--report-stdin is supported only by mail send.');
     }
@@ -674,9 +670,6 @@ function operationOptions(command,parsed,cwd){
             if(flags.has('secret-stdin')&&action!=='set'){
                 usage('--secret-stdin is supported only by mail key set.');
             }
-            if(flags.has('app-key-stdin')){
-                usage('--app-key-stdin is supported only by mail serve.');
-            }
             if(flags.has('report-stdin')){
                 usage('--report-stdin is supported only by mail send.');
             }
@@ -694,14 +687,7 @@ function operationOptions(command,parsed,cwd){
             if(flags.has('report-stdin')||values['report-key']!==undefined){
                 usage('--report-stdin and --report-key are supported only by mail send.');
             }
-            for(const [name,value]of Object.entries({
-                profile:values.profile,
-                from:values.from,
-                app:values.app,
-                origin:values.origin
-            })){
-                if(!value)usage(`mail serve requires --${name} <value>.`);
-            }
+            if(!values.profile)usage('mail serve requires --profile <value>.');
             return {
                 action:'serve',
                 profile:values.profile,
@@ -709,15 +695,14 @@ function operationOptions(command,parsed,cwd){
                 appId:values.app,
                 origin:values.origin,
                 allowTo:values['allow-to'],
-                appKeyStdin:flags.has('app-key-stdin'),
-                host:values.host??'127.0.0.1',
+                host:values.host??'0.0.0.0',
                 port:readPort(values.port,8025),
-                requestTimeout:readRequestTimeout(values['request-timeout']),
+                requestTimeout:readMailRequestTimeout(values['request-timeout']),
             };
         }
         if(area==='send'){
             noExtraPositionals(command,positionals,1);
-            if(flags.has('secret-stdin')||flags.has('app-key-stdin')){
+            if(flags.has('secret-stdin')){
                 usage('mail send accepts report input only through --report-stdin.');
             }
             if(values.app!==undefined||values.origin!==undefined
@@ -727,7 +712,6 @@ function operationOptions(command,parsed,cwd){
             }
             for(const [name,value]of Object.entries({
                 profile:values.profile,
-                from:values.from,
                 'report-key':values['report-key'],
             })){
                 if(!value)usage(`mail send requires --${name} <value>.`);
@@ -741,7 +725,7 @@ function operationOptions(command,parsed,cwd){
                 from:values.from,
                 reportKey:values['report-key'],
                 reportStdin:true,
-                requestTimeout:readRequestTimeout(values['request-timeout']),
+                requestTimeout:readMailRequestTimeout(values['request-timeout']),
             };
         }
         usage('mail requires key set|status|delete <profile>, send, or serve.');
@@ -879,10 +863,8 @@ function serverSummary(result){
         ...(result.httpOrigin===undefined?{}:{httpOrigin:result.httpOrigin}),
         ...(result.httpUrl===undefined?{}:{httpUrl:result.httpUrl}),
         ...(result.protocol===undefined?{}:{protocol:result.protocol}),
+        ...(result.callerAuthentication===undefined?{}:{callerAuthentication:result.callerAuthentication}),
         ...(result.networkUrls===undefined?{}:{networkUrls:result.networkUrls}),
-        ...(result.callerAuthentication
-            ?{callerAuthentication:result.callerAuthentication}
-            :{}),
         ...(result.runtimeMode?{runtimeMode:result.runtimeMode}:{}),
         ...(result.runtime?{runtime:result.runtime}:{}),
         ...(result.verified?{verified:result.verified}:{})
@@ -891,7 +873,8 @@ function serverSummary(result){
 
 async function waitForServer(result,signal,reporter){
     const readyMessage=[
-        `Development server ready at ${result.url}`,
+        `${result.target==='mail'?'Mail':'Development'} server ready at ${result.url}`,
+        ...(result.target==='mail'?[`Subscription verification: ${result.callerAuthentication==='subscription'?'configured':'disabled'}`]:[]),
         ...(result.httpUrl && result.protocol !== 'http:' ? [`HTTP redirect: ${result.httpUrl}`] : []),
         ...(result.networkUrls??[]).map(function networkAddress(url){return `Network: ${url}`;})
     ].join('\n');
@@ -984,21 +967,6 @@ export async function runCli(argv=process.argv.slice(2),{
                 });
             };
         }
-        if(command==='mail'&&operation.action==='serve'){
-            operation.readAppKey=function readMailGatewayAppKeyForOperation(){
-                if(reporter.output!=='human'&&!operation.appKeyStdin){
-                    usage('Structured output requires mail serve --app-key-stdin.');
-                }
-                return readMailSecretInput({
-                    input:stdin,
-                    output:stderr,
-                    secretStdin:operation.appKeyStdin,
-                    signal:controller.signal,
-                    label:'Mail gateway app key',
-                    stdinOption:'--app-key-stdin',
-                });
-            };
-        }
         if(command==='mail'&&operation.action==='send'){
             operation.readReport=function readMailReportForOperation(){
                 return readMailReportInput({