refactor: notification.ts

package.json

@@ -86,12 +86,13 @@
     "block-stream2": "^2.1.0",
     "browser-or-node": "^2.1.1",
     "buffer-crc32": "^0.2.13",
+    "eventemitter3": "^5.0.1",
     "fast-xml-parser": "^4.2.2",
     "ipaddr.js": "^2.0.1",
-    "json-stream": "^1.0.0",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
     "query-string": "^7.1.3",
+    "stream-json": "^1.8.0",
     "through2": "^4.0.2",
     "web-encoding": "^1.1.5",
     "xml2js": "^0.5.0"
@@ -110,6 +111,7 @@
     "@types/lodash": "^4.14.194",
     "@types/mime-types": "^2.1.1",
     "@types/node": "^20.1.0",
+    "@types/stream-json": "^1.7.5",
     "@types/through2": "^2.0.38",
     "@types/xml2js": "^0.4.11",
     "@typescript-eslint/eslint-plugin": "^5.59.2",

src/minio.d.ts

@@ -1,7 +1,7 @@
 // imported from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/93cfb0ec069731dcdfc31464788613f7cddb8192/types/minio/index.d.ts
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { EventEmitter } from 'node:events'
+import type { Readable as ReadableStream } from 'node:stream'
 
 import type {
   CopyDestinationOptions,
@@ -28,6 +28,7 @@ import type {
   IsoDate,
   ItemBucketMetadata,
   ItemBucketMetadataList,
+  LegalHoldStatus,
   MetadataItem,
   ObjectLockInfo,
   PutObjectLegalHoldOptions,
@@ -46,10 +47,13 @@ import type {
   Tag,
   VersionIdentificator,
 } from './internal/type.ts'
+import type { NotificationConfig, NotificationEvent, NotificationPoller } from './notification.ts'
 
 export * from './errors.ts'
 export * from './helpers.ts'
 export type { Region } from './internal/s3-endpoints.ts'
+export type * from './notification.ts'
+export * from './notification.ts'
 export { CopyConditions, PostPolicy }
 export type { MakeBucketOpt } from './internal/client.ts'
 export type {
@@ -67,6 +71,7 @@ export type {
   IsoDate,
   ItemBucketMetadata,
   ItemBucketMetadataList,
+  LegalHoldStatus,
   MetadataItem,
   NoResultCallback,
   ObjectLockInfo,
@@ -86,26 +91,6 @@ export type {
   Tag,
 }
 
-// Exports only from typings
-export type NotificationEvent =
-  | 's3:ObjectCreated:*'
-  | 's3:ObjectCreated:Put'
-  | 's3:ObjectCreated:Post'
-  | 's3:ObjectCreated:Copy'
-  | 's3:ObjectCreated:CompleteMultipartUpload'
-  | 's3:ObjectRemoved:*'
-  | 's3:ObjectRemoved:Delete'
-  | 's3:ObjectRemoved:DeleteMarkerCreated'
-  | 's3:ReducedRedundancyLostObject'
-  | 's3:TestEvent'
-  | 's3:ObjectRestore:Post'
-  | 's3:ObjectRestore:Completed'
-  | 's3:Replication:OperationFailedReplication'
-  | 's3:Replication:OperationMissedThreshold'
-  | 's3:Replication:OperationReplicatedAfterThreshold'
-  | 's3:Replication:OperationNotTracked'
-  | string
-
 /**
  * @deprecated keep for backward compatible, use `RETENTION_MODES` instead
  */
@@ -116,10 +101,6 @@ export type Mode = RETENTION_MODES
  */
 export type LockUnit = RETENTION_VALIDITY_UNITS
 
-/**
- * @deprecated keep for backward compatible
- */
-export type LegalHoldStatus = LEGAL_HOLD_STATUS
 export type VersioningConfig = Record<string | number | symbol, unknown>
 export type TagList = Record<string, string>
 export type Lifecycle = LifecycleConfig | null | ''
@@ -404,46 +385,3 @@ export class Client extends TypedClient {
   // Other
   newPostPolicy(): PostPolicy
 }
-
-export declare class NotificationPoller extends EventEmitter {
-  stop(): void
-
-  start(): void
-
-  // must to be public?
-  checkForChanges(): void
-}
-
-export declare class NotificationConfig {
-  add(target: TopicConfig | QueueConfig | CloudFunctionConfig): void
-}
-
-export declare class TopicConfig extends TargetConfig {
-  constructor(arn: string)
-}
-
-export declare class QueueConfig extends TargetConfig {
-  constructor(arn: string)
-}
-
-export declare class CloudFunctionConfig extends TargetConfig {
-  constructor(arn: string)
-}
-
-export declare function buildARN(
-  partition: string,
-  service: string,
-  region: string,
-  accountId: string,
-  resource: string,
-): string
-
-export declare const ObjectCreatedAll: NotificationEvent // s3:ObjectCreated:*'
-export declare const ObjectCreatedPut: NotificationEvent // s3:ObjectCreated:Put
-export declare const ObjectCreatedPost: NotificationEvent // s3:ObjectCreated:Post
-export declare const ObjectCreatedCopy: NotificationEvent // s3:ObjectCreated:Copy
-export declare const ObjectCreatedCompleteMultipartUpload: NotificationEvent // s3:ObjectCreated:CompleteMultipartUpload
-export declare const ObjectRemovedAll: NotificationEvent // s3:ObjectRemoved:*
-export declare const ObjectRemovedDelete: NotificationEvent // s3:ObjectRemoved:Delete
-export declare const ObjectRemovedDeleteMarkerCreated: NotificationEvent // s3:ObjectRemoved:DeleteMarkerCreated
-export declare const ObjectReducedRedundancyLostObject: NotificationEvent // s3:ReducedRedundancyLostObject

src/minio.js

@@ -52,15 +52,15 @@ import {
   uriResourceEscape,
 } from './internal/helper.ts'
 import { PostPolicy } from './internal/post-policy.ts'
-import { NotificationConfig, NotificationPoller } from './notification.js'
+import { NotificationConfig, NotificationPoller } from './notification.ts'
 import { promisify } from './promisify.js'
 import { postPresignSignatureV4, presignSignatureV4 } from './signing.ts'
 import * as transformers from './transformers.js'
 import { parseSelectObjectContentResponse } from './xml-parsers.js'
 
 export * from './errors.ts'
 export * from './helpers.ts'
-export * from './notification.js'
+export * from './notification.ts'
 export { CopyConditions, PostPolicy }
 
 export class Client extends TypedClient {