@rsdk/nats.object-storage 5.4.0-next.6 → 5.4.0-next.8

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.4.0-next.8](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.7...v5.4.0-next.8) (2024-11-28)
+
+**Note:** Version bump only for package @rsdk/nats.object-storage
+
+## [5.4.0-next.7](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.6...v5.4.0-next.7) (2024-11-28)
+
+**Note:** Version bump only for package @rsdk/nats.object-storage
+
 ## [5.4.0-next.6](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.5...v5.4.0-next.6) (2024-11-28)
 
 **Note:** Version bump only for package @rsdk/nats.object-storage

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import './patch';
 export { NatsObjectStorageService } from './nats-object-storage.service';
 export { WatchObjectStorage, type ObjectStorageWatcher, } from './watch-object-storage.decorator';
 export { NatsObjectStorageModule } from './nats-object-storage.module';

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectStorage = exports.NatsObjectStorageModule = exports.WatchObjectStorage = exports.NatsObjectStorageService = void 0;
+require("./patch");
 var nats_object_storage_service_1 = require("./nats-object-storage.service");
 Object.defineProperty(exports, "NatsObjectStorageService", { enumerable: true, get: function () { return nats_object_storage_service_1.NatsObjectStorageService; } });
 var watch_object_storage_decorator_1 = require("./watch-object-storage.decorator");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6EAAyE;AAAhE,uIAAA,wBAAwB,OAAA;AACjC,mFAG0C;AAFxC,oIAAA,kBAAkB,OAAA;AAGpB,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,4EAA0D;AAC1D,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mBAAiB;AAEjB,6EAAyE;AAAhE,uIAAA,wBAAwB,OAAA;AACjC,mFAG0C;AAFxC,oIAAA,kBAAkB,OAAA;AAGpB,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,4EAA0D;AAC1D,8CAA4B"}

package/dist/patch.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/patch.js

@@ -0,0 +1,239 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const nats_1 = require("nats");
+const objectstore_1 = require("nats/lib/jetstream/objectstore");
+const codec_1 = require("nats/lib/nats-base-client/codec");
+const queued_iterator_1 = require("nats/lib/nats-base-client/queued_iterator");
+const sha256_1 = require("nats/lib/nats-base-client/sha256");
+function emptyReadableStream() {
+    return new ReadableStream({
+        // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+        pull(c) {
+            c.enqueue(new Uint8Array(0));
+            c.close();
+        },
+    });
+}
+class ObjectInfoImpl {
+    info;
+    hdrs;
+    constructor(oi) {
+        this.info = oi;
+    }
+    get name() {
+        return this.info.name;
+    }
+    get description() {
+        return this.info.description ?? '';
+    }
+    get headers() {
+        if (!this.hdrs) {
+            this.hdrs = nats_1.MsgHdrsImpl.fromRecord(this.info.headers || {});
+        }
+        return this.hdrs;
+    }
+    get options() {
+        return this.info.options;
+    }
+    get bucket() {
+        return this.info.bucket;
+    }
+    get chunks() {
+        return this.info.chunks;
+    }
+    get deleted() {
+        return this.info.deleted ?? false;
+    }
+    get digest() {
+        return this.info.digest;
+    }
+    get mtime() {
+        return this.info.mtime;
+    }
+    get nuid() {
+        return this.info.nuid;
+    }
+    get size() {
+        return this.info.size;
+    }
+    get revision() {
+        return this.info.revision;
+    }
+    get metadata() {
+        return this.info.metadata || {};
+    }
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    isLink() {
+        return (this.info.options?.link !== undefined && this.info.options?.link !== null);
+    }
+}
+objectstore_1.ObjectStoreImpl.prototype.get = async function get(name) {
+    const info = await this.rawInfo(name);
+    if (info === null) {
+        return null;
+    }
+    if (info.deleted) {
+        return null;
+    }
+    if (info.options && info.options.link) {
+        const ln = info.options.link.name || ' ';
+        if (ln === '') {
+            throw new Error('link is a bucket');
+        }
+        const os = info.options.link.bucket === this.name
+            ? this
+            : await objectstore_1.ObjectStoreImpl.create(this.js, info.options.link.bucket);
+        return os.get(ln);
+    }
+    const d = (0, nats_1.deferred)();
+    const r = {
+        info: new ObjectInfoImpl(info),
+        error: d,
+    };
+    if (info.size === 0) {
+        r.data = emptyReadableStream();
+        d.resolve(null);
+        return r;
+    }
+    let controller;
+    const oc = (0, nats_1.consumerOpts)();
+    oc.orderedConsumer();
+    const sha = new sha256_1.SHA256();
+    const subj = `$O.${this.name}.C.${info.nuid}`;
+    let sub;
+    try {
+        // eslint-disable-next-line deprecation/deprecation
+        sub = await this.js.subscribe(subj, oc);
+    }
+    catch (error) {
+        if (error.message !== 'no stream matches subject') {
+            throw error;
+        }
+        const oc = (0, nats_1.consumerOpts)({
+            ack_policy: nats_1.AckPolicy.None,
+        });
+        oc.orderedConsumer();
+        oc.bindStream('OBJ_' + this.name);
+        // HACK: for mirrored ObjectStore
+        // eslint-disable-next-line deprecation/deprecation
+        sub = await this.js.subscribe(subj, oc);
+    }
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    (async () => {
+        for await (const jm of sub) {
+            if (jm.data.length > 0) {
+                sha.update(jm.data);
+                controller.enqueue(jm.data);
+            }
+            if (jm.info.pending === 0) {
+                const hash = sha.digest('base64');
+                // go pads the hash - which should be multiple of 3 - otherwise pads with '='
+                const pad = hash.length % 3;
+                const padding = pad > 0 ? '='.repeat(pad) : '';
+                const digest = `${objectstore_1.digestType}${hash}${padding}`;
+                if (digest === info.digest) {
+                    controller.close();
+                }
+                else {
+                    controller.error(new Error(`received a corrupt object, digests do not match received: ${info.digest} calculated ${digest}`));
+                }
+                sub.unsubscribe();
+            }
+        }
+    })()
+        .then(() => {
+        d.resolve();
+    })
+        .catch((error) => {
+        controller.error(error);
+        d.reject(error);
+    });
+    r.data = new ReadableStream({
+        // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+        start(c) {
+            controller = c;
+        },
+        // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+        cancel() {
+            sub.unsubscribe();
+        },
+    });
+    return r;
+};
+objectstore_1.ObjectStoreImpl.prototype.watch = async function watch(opts = {}) {
+    opts.includeHistory = opts.includeHistory ?? false;
+    opts.ignoreDeletes = opts.ignoreDeletes ?? false;
+    let initialized = false;
+    const qi = new queued_iterator_1.QueuedIteratorImpl();
+    const subj = this._metaSubjectAll();
+    try {
+        await this.jsm.streams.getMessage(this.stream, { last_by_subj: subj });
+    }
+    catch (error) {
+        if (error.code === '404') {
+            qi.push(null);
+            initialized = true;
+        }
+        else {
+            qi.stop(error);
+        }
+    }
+    const jc = (0, codec_1.JSONCodec)();
+    const copts = (0, nats_1.consumerOpts)();
+    copts.orderedConsumer();
+    if (opts.includeHistory) {
+        copts.deliverLastPerSubject();
+    }
+    else {
+        // FIXME: Go's implementation doesn't seem correct - if history is not desired
+        //  the watch should only be giving notifications on new entries
+        initialized = true;
+        copts.deliverNew();
+    }
+    copts.callback((err, jm) => {
+        if (err) {
+            qi.stop(err);
+            return;
+        }
+        if (jm !== null) {
+            const oi = jc.decode(jm.data);
+            if (oi.deleted && opts.ignoreDeletes === true) {
+                // do nothing
+            }
+            else {
+                qi.push(oi);
+            }
+            if (jm.info?.pending === 0 && !initialized) {
+                initialized = true;
+                qi.push(null);
+            }
+        }
+    });
+    let sub;
+    try {
+        // eslint-disable-next-line deprecation/deprecation
+        sub = await this.js.subscribe(subj, copts);
+    }
+    catch (error) {
+        if (error.message !== 'no stream matches subject') {
+            throw error;
+        }
+        copts.bindStream('OBJ_' + this.name);
+        // HACK: for mirrored ObjectStore
+        // eslint-disable-next-line deprecation/deprecation
+        sub = await this.js.subscribe(subj, copts);
+    }
+    qi._data = sub;
+    qi.iterClosed.then(() => {
+        sub.unsubscribe();
+    });
+    sub.closed
+        .then(() => {
+        qi.stop();
+    })
+        .catch((error) => {
+        qi.stop(error);
+    });
+    return qi;
+};
+//# sourceMappingURL=patch.js.map

package/dist/patch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch.js","sourceRoot":"","sources":["../src/patch.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/nats.object-storage",
-  "version": "5.4.0-next.6",
+  "version": "5.4.0-next.8",
   "description": "Nats NestJS object storage",
   "main": "dist/index.js",
   "license": "Apache License 2.0",
@@ -38,5 +38,5 @@
     "rxjs": "^7.8.1"
   },
   "nx": {},
-  "gitHead": "acc1405be758b5ba4d2e8eda8d34b3c4f60a813f"
+  "gitHead": "074c1ef262b547be8daab9c721680ad2f0df2bb3"
 }

package/src/index.ts

@@ -1,3 +1,5 @@
+import './patch';
+
 export { NatsObjectStorageService } from './nats-object-storage.service';
 export {
   WatchObjectStorage,

package/src/patch.ts

@@ -0,0 +1,292 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck issue - https://github.com/nats-io/nats.js/issues/155
+import type {
+  MsgHdrs,
+  ObjectInfo,
+  ObjectResult,
+  ObjectStoreMetaOptions,
+} from 'nats';
+import { AckPolicy, consumerOpts, deferred, MsgHdrsImpl } from 'nats';
+import type { ServerObjectInfo } from 'nats/lib/jetstream/objectstore';
+import { digestType, ObjectStoreImpl } from 'nats/lib/jetstream/objectstore';
+import { JSONCodec } from 'nats/lib/nats-base-client/codec';
+import { QueuedIteratorImpl } from 'nats/lib/nats-base-client/queued_iterator';
+import { SHA256 } from 'nats/lib/nats-base-client/sha256';
+
+function emptyReadableStream(): ReadableStream {
+  return new ReadableStream({
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    pull(c) {
+      c.enqueue(new Uint8Array(0));
+      c.close();
+    },
+  });
+}
+
+class ObjectInfoImpl implements ObjectInfo {
+  info: ServerObjectInfo;
+  hdrs!: MsgHdrs;
+  constructor(oi: ServerObjectInfo) {
+    this.info = oi;
+  }
+
+  get name(): string {
+    return this.info.name;
+  }
+
+  get description(): string {
+    return this.info.description ?? '';
+  }
+
+  get headers(): MsgHdrs {
+    if (!this.hdrs) {
+      this.hdrs = MsgHdrsImpl.fromRecord(this.info.headers || {});
+    }
+    return this.hdrs;
+  }
+
+  get options(): ObjectStoreMetaOptions | undefined {
+    return this.info.options;
+  }
+
+  get bucket(): string {
+    return this.info.bucket;
+  }
+
+  get chunks(): number {
+    return this.info.chunks;
+  }
+
+  get deleted(): boolean {
+    return this.info.deleted ?? false;
+  }
+
+  get digest(): string {
+    return this.info.digest;
+  }
+
+  get mtime(): string {
+    return this.info.mtime;
+  }
+
+  get nuid(): string {
+    return this.info.nuid;
+  }
+
+  get size(): number {
+    return this.info.size;
+  }
+
+  get revision(): number {
+    return this.info.revision;
+  }
+
+  get metadata(): Record<string, string> {
+    return this.info.metadata || {};
+  }
+
+  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+  isLink() {
+    return (
+      this.info.options?.link !== undefined && this.info.options?.link !== null
+    );
+  }
+}
+
+ObjectStoreImpl.prototype.get = async function get(
+  name: string,
+): Promise<ObjectResult | null> {
+  const info = await this.rawInfo(name);
+  if (info === null) {
+    return null;
+  }
+
+  if (info.deleted) {
+    return null;
+  }
+
+  if (info.options && info.options.link) {
+    const ln = info.options.link.name || ' ';
+    if (ln === '') {
+      throw new Error('link is a bucket');
+    }
+    const os =
+      info.options.link.bucket === this.name
+        ? this
+        : await ObjectStoreImpl.create(this.js, info.options.link.bucket);
+
+    return os.get(ln);
+  }
+
+  const d = deferred<Error | null>();
+
+  const r: Partial<ObjectResult> = {
+    info: new ObjectInfoImpl(info),
+    error: d,
+  };
+  if (info.size === 0) {
+    r.data = emptyReadableStream();
+    d.resolve(null);
+    return r as ObjectResult;
+  }
+
+  let controller: ReadableStreamDefaultController;
+
+  const oc = consumerOpts();
+
+  oc.orderedConsumer();
+  const sha = new SHA256();
+  const subj = `$O.${this.name}.C.${info.nuid}`;
+  let sub;
+
+  try {
+    // eslint-disable-next-line deprecation/deprecation
+    sub = await this.js.subscribe(subj, oc);
+  } catch (error) {
+    if (error.message !== 'no stream matches subject') {
+      throw error;
+    }
+    const oc = consumerOpts({
+      ack_policy: AckPolicy.None,
+    });
+
+    oc.orderedConsumer();
+    oc.bindStream('OBJ_' + this.name);
+
+    // HACK: for mirrored ObjectStore
+    // eslint-disable-next-line deprecation/deprecation
+    sub = await this.js.subscribe(subj, oc);
+  }
+  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+  (async () => {
+    for await (const jm of sub) {
+      if (jm.data.length > 0) {
+        sha.update(jm.data);
+        controller!.enqueue(jm.data);
+      }
+      if (jm.info.pending === 0) {
+        const hash = sha.digest('base64');
+
+        // go pads the hash - which should be multiple of 3 - otherwise pads with '='
+        const pad = hash.length % 3;
+        const padding = pad > 0 ? '='.repeat(pad) : '';
+        const digest = `${digestType}${hash}${padding}`;
+        if (digest === info.digest) {
+          controller!.close();
+        } else {
+          controller!.error(
+            new Error(
+              `received a corrupt object, digests do not match received: ${info.digest} calculated ${digest}`,
+            ),
+          );
+        }
+        sub.unsubscribe();
+      }
+    }
+  })()
+    .then(() => {
+      d.resolve();
+    })
+    .catch((error) => {
+      controller!.error(error);
+      d.reject(error);
+    });
+
+  r.data = new ReadableStream({
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    start(c) {
+      controller = c;
+    },
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    cancel() {
+      sub.unsubscribe();
+    },
+  });
+
+  return r as ObjectResult;
+};
+
+ObjectStoreImpl.prototype.watch = async function watch(
+  opts: Partial<{
+    ignoreDeletes?: boolean;
+    includeHistory?: boolean;
+  }> = {},
+): Promise<QueuedIterator<ObjectInfo | null>> {
+  opts.includeHistory = opts.includeHistory ?? false;
+  opts.ignoreDeletes = opts.ignoreDeletes ?? false;
+  let initialized = false;
+  const qi = new QueuedIteratorImpl<ObjectInfo | null>();
+  const subj = this._metaSubjectAll();
+
+  try {
+    await this.jsm.streams.getMessage(this.stream, { last_by_subj: subj });
+  } catch (error) {
+    if (error.code === '404') {
+      qi.push(null);
+      initialized = true;
+    } else {
+      qi.stop(error);
+    }
+  }
+  const jc = JSONCodec<ObjectInfo>();
+  const copts = consumerOpts();
+
+  copts.orderedConsumer();
+  if (opts.includeHistory) {
+    copts.deliverLastPerSubject();
+  } else {
+    // FIXME: Go's implementation doesn't seem correct - if history is not desired
+    //  the watch should only be giving notifications on new entries
+    initialized = true;
+    copts.deliverNew();
+  }
+  copts.callback((err: NatsError | null, jm: JsMsg | null) => {
+    if (err) {
+      qi.stop(err);
+      return;
+    }
+    if (jm !== null) {
+      const oi = jc.decode(jm.data);
+      if (oi.deleted && opts.ignoreDeletes === true) {
+        // do nothing
+      } else {
+        qi.push(oi);
+      }
+      if (jm.info?.pending === 0 && !initialized) {
+        initialized = true;
+        qi.push(null);
+      }
+    }
+  });
+
+  let sub;
+
+  try {
+    // eslint-disable-next-line deprecation/deprecation
+    sub = await this.js.subscribe(subj, copts);
+  } catch (error) {
+    if (error.message !== 'no stream matches subject') {
+      throw error;
+    }
+
+    copts.bindStream('OBJ_' + this.name);
+
+    // HACK: for mirrored ObjectStore
+    // eslint-disable-next-line deprecation/deprecation
+    sub = await this.js.subscribe(subj, copts);
+  }
+
+  qi._data = sub;
+  qi.iterClosed.then(() => {
+    sub.unsubscribe();
+  });
+  sub.closed
+    .then(() => {
+      qi.stop();
+    })
+    .catch((error) => {
+      qi.stop(error);
+    });
+
+  return qi;
+};