@ez4/aws-bucket 0.30.0 → 0.31.0

package/dist/bucket/function/types.d.ts

@@ -1,5 +1,5 @@
 import type { FunctionParameters } from '@ez4/aws-function';
-import type { ExtraSource } from '@ez4/project/library';
+import type { ContextSource } from '@ez4/project/library';
 export type BucketEventFunction = {
     functionName: string;
     sourceFile: string;
@@ -11,6 +11,6 @@ export type BucketEventEntryPoint = BucketEventFunction & {
 export type BucketEventFunctionParameters = Omit<FunctionParameters, 'getFunctionFiles' | 'getFunctionBundle' | 'getFunctionHash' | 'sourceFile' | 'handlerName'> & {
     handler: BucketEventEntryPoint;
     listener?: BucketEventFunction;
-    extras?: Record<string, ExtraSource>;
+    context?: Record<string, ContextSource>;
     debug?: boolean;
 };

package/dist/main.cjs

@@ -107,15 +107,16 @@ bucketName,getPermission:o(()=>({principal:"s3.amazonaws.com",sourceArn:W(n)}),"
 getPermission")}),(0,F.linkEntryDependency)(t,c.entryId,e.entryId)),c},"createBu\
 cket");var L=require("@ez4/aws-function"),Ye=require("@ez4/project/library"),Y=require("@ez4/aws-identity"),
 et=require("@ez4/aws-logs");var Ze=require("@ez4/aws-function");var Ue=require("node:path"),Ge=require("@ez4/project/library"),_e=require("@ez4/aws-function"),
-Ve=require("@ez4/aws-common");var We=o(async(t,e)=>{let{extras:r,debug:n,handler:s,listener:c}=t,i=(0,Ge.getDefinitionsObject)(
+Ve=require("@ez4/aws-common");var We=o(async(t,e)=>{let{handler:r,listener:n,context:s,debug:c}=t,i=(0,Ge.getDefinitionsObject)(
 e);return(0,Ve.getFunctionBundle)(_e.MappingServiceName,{templateFile:(0,Ue.join)(
-__dirname,"../lib/event.ts"),define:i,filePrefix:"s3",handler:s,listener:c,extras:r,
-debug:n})},"bundleBucketEventFunction");var Q=o((t,e,r,n)=>{let{handler:s}=n;return(0,Ze.createFunction)(t,e,r,{handlerName:"\
+__dirname,"../lib/event.ts"),define:i,filePrefix:"s3",handler:r,listener:n,context:s,
+debug:c})},"bundleBucketEventFunction");var Q=o((t,e,r,n)=>{let{handler:s}=n;return(0,Ze.createFunction)(t,e,r,{handlerName:"\
 s3EntryPoint",sourceFile:s.sourceFile,functionName:n.functionName,description:n.
 description,variables:n.variables,timeout:n.timeout,memory:n.memory,debug:n.debug,
 tags:n.tags,getFunctionFiles:o(()=>[s.sourceFile,s.dependencies],"getFunctionFil\
-es"),getFunctionBundle:o(c=>We(n,c.getConnections()),"getFunctionBundle"),getFunctionHash:o(
-()=>{},"getFunctionHash")})},"createBucketEventFunction");var A=require("@ez4/project/library"),Je=require("@ez4/aws-common"),I=require("@ez4/utils");var Qe=o(async(t,e)=>{if(t.globalName)return(0,A.getServiceName)(t.globalName,e);
+es"),getFunctionBundle:o(c=>We(n,[...c.getDependencies(),...c.getConnections()]),
+"getFunctionBundle"),getFunctionHash:o(()=>{},"getFunctionHash")})},"createBucke\
+tEventFunction");var A=require("@ez4/project/library"),Je=require("@ez4/aws-common"),I=require("@ez4/utils");var Qe=o(async(t,e)=>{if(t.globalName)return(0,A.getServiceName)(t.globalName,e);
 let r=(0,A.getServiceName)(t,e),n=await(0,Je.getRandomName)(16);return`${r.substring(
 0,46)}-${n}`},"getBucketName"),X=o((t,e)=>`${(0,I.toKebabCase)(t.name)}-${(0,I.toKebabCase)(
 e)}`,"getInternalName"),Xe=o((t,e,r)=>`${(0,A.getServiceName)(t,r)}-${(0,I.toKebabCase)(
@@ -125,18 +126,18 @@ throw new j;let{handler:s,listener:c,logRetention:i,timeout:g,memory:v,variables
 events,T=X(e,s.name),d=(0,L.tryGetFunctionState)(n,T,r);if(d)return d;let ee=Xe(
 e,s.name,r),vt=n.getDependencyFiles(s.file),Et=(0,et.createLogGroup)(t,{retention:i??
 O.LogRetention,groupName:ee,tags:r.tags});return d=Q(t,n.role,Et,{functionName:ee,
-description:s.description,timeout:g??O.Timeout,memory:v??O.Memory,extras:e.extras,
+description:s.description,timeout:g??O.Timeout,memory:v??O.Memory,context:e.context,
 debug:r.debug,tags:r.tags,handler:{sourceFile:s.file,functionName:s.name,module:s.
 module,dependencies:vt},listener:c&&{functionName:c.name,sourceFile:c.file,module:c.
 module},variables:{...r.variables,...e.variables,...E}}),n.setServiceState(d,T,r),
 d},"prepareEvents"),rt=o((t,e,r,n)=>{if(!e.events)return;if(!n.role||!(0,Y.isRoleState)(
 n.role))throw new j;let{handler:s}=e.events,c=X(e,s.name),i=(0,L.getFunctionState)(
-n,c,r);(0,Ye.linkServiceExtras)(t,i.entryId,e.extras)},"connectEvents");var ot=require("node:fs/promises"),w=require("node:path"),nt=require("@ez4/aws-bucket");var st=o(async(t,e,r)=>{let n=process.cwd(),s=(0,w.join)(n,r),c=await(0,ot.readdir)(
+n,c,r);(0,Ye.linkServiceContext)(t,i.entryId,e.context)},"connectEvents");var ot=require("node:fs/promises"),w=require("node:path"),nt=require("@ez4/aws-bucket");var st=o(async(t,e,r)=>{let n=process.cwd(),s=(0,w.join)(n,r),c=await(0,ot.readdir)(
 s,{withFileTypes:!0,recursive:!0});for(let i of c){if(!i.isFile())continue;let g=(0,w.join)(
 i.parentPath,i.name);(0,nt.createBucketObject)(t,e,{objectKey:(0,w.relative)(s,g),
-filePath:(0,w.relative)(n,g)})}},"prepareLocalContent");var ct=o((t,e,r)=>{let n=K(t,e.name,r);return{entryIds:[n.entryId],constructor:`\
-make('${n.parameters.bucketName}')`,from:"@ez4/aws-bucket/client",module:"Client"}},
-"prepareLinkedClient");var at=o(t=>{let{service:e,options:r,context:n}=t;return(0,q.isBucketService)(e)?
+filePath:(0,w.relative)(n,g)})}},"prepareLocalContent");var ct=o((t,e,r)=>{let n=K(t,e.name,r),s=n.entryId;return{connectionIds:[s],dependencyIds:[
+s],constructor:`make('${n.parameters.bucketName}')`,from:"@ez4/aws-bucket/client",
+module:"Client"}},"prepareLinkedClient");var at=o(t=>{let{service:e,options:r,context:n}=t;return(0,q.isBucketService)(e)?
 ct(n,e,r):null},"prepareLinkedServices"),it=o(async t=>{let{state:e,service:r,options:n,
 context:s}=t;if(!(0,q.isBucketService)(r))return!1;let{localPath:c,autoExpireDays:i,
 events:g,cors:v}=r,E=await Qe(r,n),T=tt(e,r,n,s),d=J(e,T,{eventsPath:g?.path,tags:n.

package/dist/main.mjs

@@ -97,16 +97,16 @@ bject","s3:GetObject","s3:DeleteObject"]}]),"getPolicyDocument");var Se=o((t,e,r
 parameters:r});return e&&($t(t,c,e,{fromService:r.bucketName,getPermission:o(()=>({
 principal:"s3.amazonaws.com",sourceArn:ge(n)}),"getPermission")}),Mt(t,c.entryId,
 e.entryId)),c},"createBucket");import{getFunctionState as Wt,tryGetFunctionState as Zt}from"@ez4/aws-function";
-import{linkServiceExtras as Jt}from"@ez4/project/library";import{isRoleState as Be}from"@ez4/aws-identity";
+import{linkServiceContext as Jt}from"@ez4/project/library";import{isRoleState as Be}from"@ez4/aws-identity";
 import{createLogGroup as Qt}from"@ez4/aws-logs";import{createFunction as _t}from"@ez4/aws-function";import{join as Ht}from"node:path";import{getDefinitionsObject as Kt}from"@ez4/project/library";
-import{MappingServiceName as Ut}from"@ez4/aws-function";import{getFunctionBundle as Gt}from"@ez4/aws-common";var ke=o(async(t,e)=>{let{extras:r,debug:n,handler:s,listener:c}=t,a=Kt(e);return Gt(
+import{MappingServiceName as Ut}from"@ez4/aws-function";import{getFunctionBundle as Gt}from"@ez4/aws-common";var ke=o(async(t,e)=>{let{handler:r,listener:n,context:s,debug:c}=t,a=Kt(e);return Gt(
 Ut,{templateFile:Ht(import.meta.dirname,"../lib/event.ts"),define:a,filePrefix:"\
-s3",handler:s,listener:c,extras:r,debug:n})},"bundleBucketEventFunction");var be=o((t,e,r,n)=>{let{handler:s}=n;return _t(t,e,r,{handlerName:"s3EntryPoint",
+s3",handler:r,listener:n,context:s,debug:c})},"bundleBucketEventFunction");var be=o((t,e,r,n)=>{let{handler:s}=n;return _t(t,e,r,{handlerName:"s3EntryPoint",
 sourceFile:s.sourceFile,functionName:n.functionName,description:n.description,variables:n.
 variables,timeout:n.timeout,memory:n.memory,debug:n.debug,tags:n.tags,getFunctionFiles:o(
 ()=>[s.sourceFile,s.dependencies],"getFunctionFiles"),getFunctionBundle:o(c=>ke(
-n,c.getConnections()),"getFunctionBundle"),getFunctionHash:o(()=>{},"getFunction\
-Hash")})},"createBucketEventFunction");import{getServiceName as N}from"@ez4/project/library";import{getRandomName as Vt}from"@ez4/aws-common";
+n,[...c.getDependencies(),...c.getConnections()]),"getFunctionBundle"),getFunctionHash:o(
+()=>{},"getFunctionHash")})},"createBucketEventFunction");import{getServiceName as N}from"@ez4/project/library";import{getRandomName as Vt}from"@ez4/aws-common";
 import{toKebabCase as D}from"@ez4/utils";var xe=o(async(t,e)=>{if(t.globalName)return N(t.globalName,e);let r=N(t,e),n=await Vt(
 16);return`${r.substring(0,46)}-${n}`},"getBucketName"),z=o((t,e)=>`${D(t.name)}\
 -${D(e)}`,"getInternalName"),Pe=o((t,e,r)=>`${N(t,r)}-${D(e)}`,"getFunctionName");var x=class extends Error{static{o(this,"RoleMissingError")}constructor(){super(
@@ -115,17 +115,17 @@ handler:s,listener:c,logRetention:a,timeout:u,memory:k,variables:b}=e.events,B=z
 e,s.name),l=Zt(n,B,r);if(l)return l;let A=Pe(e,s.name,r),ze=n.getDependencyFiles(
 s.file),Fe=Qt(t,{retention:a??P.LogRetention,groupName:A,tags:r.tags});return l=
 be(t,n.role,Fe,{functionName:A,description:s.description,timeout:u??P.Timeout,memory:k??
-P.Memory,extras:e.extras,debug:r.debug,tags:r.tags,handler:{sourceFile:s.file,functionName:s.
-name,module:s.module,dependencies:ze},listener:c&&{functionName:c.name,sourceFile:c.
-file,module:c.module},variables:{...r.variables,...e.variables,...b}}),n.setServiceState(
-l,B,r),l},"prepareEvents"),ve=o((t,e,r,n)=>{if(!e.events)return;if(!n.role||!Be(
-n.role))throw new x;let{handler:s}=e.events,c=z(e,s.name),a=Wt(n,c,r);Jt(t,a.entryId,
-e.extras)},"connectEvents");import{readdir as Xt}from"node:fs/promises";import{join as Ee,relative as Re}from"node:path";
+P.Memory,context:e.context,debug:r.debug,tags:r.tags,handler:{sourceFile:s.file,
+functionName:s.name,module:s.module,dependencies:ze},listener:c&&{functionName:c.
+name,sourceFile:c.file,module:c.module},variables:{...r.variables,...e.variables,
+...b}}),n.setServiceState(l,B,r),l},"prepareEvents"),ve=o((t,e,r,n)=>{if(!e.events)
+return;if(!n.role||!Be(n.role))throw new x;let{handler:s}=e.events,c=z(e,s.name),
+a=Wt(n,c,r);Jt(t,a.entryId,e.context)},"connectEvents");import{readdir as Xt}from"node:fs/promises";import{join as Ee,relative as Re}from"node:path";
 import{createBucketObject as Yt}from"@ez4/aws-bucket";var Ce=o(async(t,e,r)=>{let n=process.cwd(),s=Ee(n,r),c=await Xt(s,{withFileTypes:!0,
 recursive:!0});for(let a of c){if(!a.isFile())continue;let u=Ee(a.parentPath,a.name);
-Yt(t,e,{objectKey:Re(s,u),filePath:Re(n,u)})}},"prepareLocalContent");var he=o((t,e,r)=>{let n=te(t,e.name,r);return{entryIds:[n.entryId],constructor:`\
-make('${n.parameters.bucketName}')`,from:"@ez4/aws-bucket/client",module:"Client"}},
-"prepareLinkedClient");var je=o(t=>{let{service:e,options:r,context:n}=t;return F(e)?he(n,e,r):null},"p\
+Yt(t,e,{objectKey:Re(s,u),filePath:Re(n,u)})}},"prepareLocalContent");var he=o((t,e,r)=>{let n=te(t,e.name,r),s=n.entryId;return{connectionIds:[s],dependencyIds:[
+s],constructor:`make('${n.parameters.bucketName}')`,from:"@ez4/aws-bucket/client",
+module:"Client"}},"prepareLinkedClient");var je=o(t=>{let{service:e,options:r,context:n}=t;return F(e)?he(n,e,r):null},"p\
 repareLinkedServices"),Oe=o(async t=>{let{state:e,service:r,options:n,context:s}=t;
 if(!F(r))return!1;let{localPath:c,autoExpireDays:a,events:u,cors:k}=r,b=await xe(
 r,n),B=we(e,r,n,s),l=Se(e,B,{eventsPath:u?.path,tags:n.tags,bucketName:b,autoExpireDays:a,

package/dist/triggers/client.d.ts

@@ -1,3 +1,3 @@
-import type { DeployOptions, EventContext, ExtraSource } from '@ez4/project/library';
+import type { DeployOptions, EventContext, ContextSource } from '@ez4/project/library';
 import type { BucketService } from '@ez4/storage/library';
-export declare const prepareLinkedClient: (context: EventContext, service: BucketService, options: DeployOptions) => ExtraSource;
+export declare const prepareLinkedClient: (context: EventContext, service: BucketService, options: DeployOptions) => ContextSource;

package/dist/triggers/service.d.ts

@@ -1,4 +1,4 @@
 import type { ServiceEvent, ConnectResourceEvent, PrepareResourceEvent } from '@ez4/project/library';
-export declare const prepareLinkedServices: (event: ServiceEvent) => import("@ez4/project/library").ExtraSource | null;
+export declare const prepareLinkedServices: (event: ServiceEvent) => import("@ez4/project/library").ContextSource | null;
 export declare const prepareBucketServices: (event: PrepareResourceEvent) => Promise<boolean>;
 export declare const connectBucketServices: (event: ConnectResourceEvent) => void;

package/lib/event.ts

@@ -36,8 +36,8 @@ export async function s3EntryPoint(event: S3Event, context: Context): Promise<vo
       };
 
       await onReady(currentRequest);
-
       await handle(currentRequest, __EZ4_CONTEXT);
+      await onDone(currentRequest);
     }
   } catch (error) {
     await onError(error, currentRequest ?? request);
@@ -78,6 +78,16 @@ const onReady = async (request: Bucket.Incoming) => {
   );
 };
 
+const onDone = async (request: Bucket.Incoming) => {
+  return dispatch(
+    {
+      type: ServiceEventType.Done,
+      request
+    },
+    __EZ4_CONTEXT
+  );
+};
+
 const onError = async (error: unknown, request: Bucket.Request | Bucket.Incoming) => {
   console.error(error);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ez4/aws-bucket",
   "description": "EZ4: Self-managed AWS S3 bucket provider",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "author": "Silas B.",
   "license": "MIT",
   "type": "module",
@@ -53,14 +53,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.913.0",
     "@aws-sdk/s3-request-presigner": "^3.913.0",
-    "@ez4/aws-common": "^0.30.0",
-    "@ez4/aws-function": "^0.30.0",
-    "@ez4/aws-identity": "^0.30.0",
-    "@ez4/aws-logs": "^0.30.0",
-    "@ez4/project": "^0.30.0",
-    "@ez4/stateful": "^0.30.0",
-    "@ez4/storage": "^0.30.0",
-    "@ez4/utils": "^0.30.0",
+    "@ez4/aws-common": "^0.31.0",
+    "@ez4/aws-function": "^0.31.0",
+    "@ez4/aws-identity": "^0.31.0",
+    "@ez4/aws-logs": "^0.31.0",
+    "@ez4/project": "^0.31.0",
+    "@ez4/stateful": "^0.31.0",
+    "@ez4/storage": "^0.31.0",
+    "@ez4/utils": "^0.31.0",
     "mime": "^3.0.0"
   }
 }