cnpmcore 4.4.0 → 4.5.0

package/dist/app/common/adapter/changesStream/NpmChangesStream.d.ts

@@ -2,5 +2,5 @@ import type { Registry } from '../../../core/entity/Registry.js';
 import { AbstractChangeStream, type ChangesStreamChange } from './AbstractChangesStream.js';
 export declare class NpmChangesStream extends AbstractChangeStream {
     getInitialSince(registry: Registry): Promise<string>;
-    fetchChanges(registry: Registry, since: string): AsyncGenerator<ChangesStreamChange, void, unknown>;
+    fetchChanges(registry: Registry, since: string): AsyncGenerator<ChangesStreamChange>;
 }

package/dist/app/common/adapter/changesStream/NpmChangesStream.js

@@ -15,6 +15,9 @@ let NpmChangesStream = class NpmChangesStream extends AbstractChangeStream {
             followRedirect: true,
             timeout: 10_000,
             dataType: 'json',
+            headers: {
+                'npm-replication-opt-in': 'true',
+            },
         });
         const since = String(data.update_seq - 10);
         if (!data.update_seq) {
@@ -25,27 +28,35 @@ let NpmChangesStream = class NpmChangesStream extends AbstractChangeStream {
     }
     async *fetchChanges(registry, since) {
         const db = this.getChangesStreamUrl(registry, since);
-        const { res } = await this.httpclient.request(db, {
-            streaming: true,
+        const { data, headers } = await this.httpclient.request(db, {
             timeout: 60_000,
+            headers: {
+                // https://github.com/orgs/community/discussions/152515
+                'npm-replication-opt-in': 'true',
+            },
+            dataType: 'json',
+            gzip: true,
         });
-        let buf = '';
-        for await (const chunk of res) {
-            const text = chunk.toString();
-            const lines = text.split('\n');
-            for (const line of lines) {
-                const content = buf + line;
-                const match = /"seq":(\d+),"id":"([^"]+)"/g.exec(content);
-                const seq = match?.[1];
-                const fullname = match?.[2];
-                if (seq && fullname) {
-                    buf = '';
-                    const change = { fullname, seq };
+        const count = data.results?.length;
+        const last_seq = data.last_seq;
+        this.logger.info('[NpmChangesStream.fetchChanges] %s, count: %s, last_seq: %s, headers: %j', db, count, last_seq, headers);
+        if (data.results?.length > 0) {
+            for (const change of data.results) {
+                // {
+                //   seq: 2495018,
+                //   id: 'ng-create-all-project',
+                //   changes: [ { rev: '3-be3a014aab8e379ba28a28adb8e10142' }, [length]: 1 ],
+                //   deleted: true
+                // },
+                const seq = String(change.seq);
+                const fullname = change.id;
+                if (seq && fullname && seq !== since) {
+                    const change = {
+                        fullname,
+                        seq,
+                    };
                     yield change;
                 }
-                else {
-                    buf += line;
-                }
             }
         }
     }
@@ -55,4 +66,4 @@ NpmChangesStream = __decorate([
     RegistryChangesStream(RegistryType.Npm)
 ], NpmChangesStream);
 export { NpmChangesStream };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTnBtQ2hhbmdlc1N0cmVhbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9jaGFuZ2VzU3RyZWFtL05wbUNoYW5nZXNTdHJlYW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3QyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRWxDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUVoRSxPQUFPLEVBQ0wsb0JBQW9CLEVBQ3BCLHFCQUFxQixHQUV0QixNQUFNLDRCQUE0QixDQUFDO0FBSTdCLElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWlCLFNBQVEsb0JBQW9CO0lBQ3hELEtBQUssQ0FBQyxlQUFlLENBQUMsUUFBa0I7UUFDdEMsTUFBTSxFQUFFLEdBQUcsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDLE1BQU0sQ0FBQztRQUNqRCxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFO1lBQ3pELGNBQWMsRUFBRSxJQUFJO1lBQ3BCLE9BQU8sRUFBRSxNQUFNO1lBQ2YsUUFBUSxFQUFFLE1BQU07U0FDakIsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDM0MsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNyQixNQUFNLElBQUksSUFBSSxDQUFDLCtCQUErQixJQUFJLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQztRQUNuRSxDQUFDO1FBQ0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2QsMkVBQTJFLEVBQzNFLFFBQVEsQ0FBQyxJQUFJLEVBQ2IsUUFBUSxDQUFDLFlBQVksRUFDckIsTUFBTSxFQUNOLElBQUksRUFDSixLQUFLLENBQ04sQ0FBQztRQUNGLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxDQUFDLFlBQVksQ0FBQyxRQUFrQixFQUFFLEtBQWE7UUFDbkQsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNyRCxNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUU7WUFDaEQsU0FBUyxFQUFFLElBQUk7WUFDZixPQUFPLEVBQUUsTUFBTTtTQUNoQixDQUFDLENBQUM7UUFFSCxJQUFJLEdBQUcsR0FBRyxFQUFFLENBQUM7UUFDYixJQUFJLEtBQUssRUFBRSxNQUFNLEtBQUssSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUM5QixNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDOUIsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUUvQixLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUssRUFBRSxDQUFDO2dCQUN6QixNQUFNLE9BQU8sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDO2dCQUMzQixNQUFNLEtBQUssR0FBRyw2QkFBNkIsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQzFELE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN2QixNQUFNLFFBQVEsR0FBRyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDNUIsSUFBSSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7b0JBQ3BCLEdBQUcsR0FBRyxFQUFFLENBQUM7b0JBQ1QsTUFBTSxNQUFNLEdBQXdCLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxDQUFDO29CQUN0RCxNQUFNLE1BQU0sQ0FBQztnQkFDZixDQUFDO3FCQUFNLENBQUM7b0JBQ04sR0FBRyxJQUFJLElBQUksQ0FBQztnQkFDZCxDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0NBQ0YsQ0FBQTtBQWxEWSxnQkFBZ0I7SUFGNUIsY0FBYyxFQUFFO0lBQ2hCLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUM7R0FDM0IsZ0JBQWdCLENBa0Q1QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTnBtQ2hhbmdlc1N0cmVhbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9jaGFuZ2VzU3RyZWFtL05wbUNoYW5nZXNTdHJlYW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3QyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRWxDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUVoRSxPQUFPLEVBQ0wsb0JBQW9CLEVBQ3BCLHFCQUFxQixHQUV0QixNQUFNLDRCQUE0QixDQUFDO0FBSTdCLElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWlCLFNBQVEsb0JBQW9CO0lBQ3hELEtBQUssQ0FBQyxlQUFlLENBQUMsUUFBa0I7UUFDdEMsTUFBTSxFQUFFLEdBQUcsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDLE1BQU0sQ0FBQztRQUNqRCxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFO1lBQ3pELGNBQWMsRUFBRSxJQUFJO1lBQ3BCLE9BQU8sRUFBRSxNQUFNO1lBQ2YsUUFBUSxFQUFFLE1BQU07WUFDaEIsT0FBTyxFQUFFO2dCQUNQLHdCQUF3QixFQUFFLE1BQU07YUFDakM7U0FDRixDQUFDLENBQUM7UUFDSCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsR0FBRyxFQUFFLENBQUMsQ0FBQztRQUMzQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ3JCLE1BQU0sSUFBSSxJQUFJLENBQUMsK0JBQStCLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO1FBQ25FLENBQUM7UUFDRCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCwyRUFBMkUsRUFDM0UsUUFBUSxDQUFDLElBQUksRUFDYixRQUFRLENBQUMsWUFBWSxFQUNyQixNQUFNLEVBQ04sSUFBSSxFQUNKLEtBQUssQ0FDTixDQUFDO1FBQ0YsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQsS0FBSyxDQUFDLENBQUMsWUFBWSxDQUNqQixRQUFrQixFQUNsQixLQUFhO1FBRWIsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNyRCxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFO1lBQzFELE9BQU8sRUFBRSxNQUFNO1lBQ2YsT0FBTyxFQUFFO2dCQUNQLHVEQUF1RDtnQkFDdkQsd0JBQXdCLEVBQUUsTUFBTTthQUNqQztZQUNELFFBQVEsRUFBRSxNQUFNO1lBQ2hCLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUM7UUFDbkMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUMvQixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCwwRUFBMEUsRUFDMUUsRUFBRSxFQUNGLEtBQUssRUFDTCxRQUFRLEVBQ1IsT0FBTyxDQUNSLENBQUM7UUFFRixJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQzdCLEtBQUssTUFBTSxNQUFNLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUNsQyxJQUFJO2dCQUNKLGtCQUFrQjtnQkFDbEIsaUNBQWlDO2dCQUNqQyw2RUFBNkU7Z0JBQzdFLGtCQUFrQjtnQkFDbEIsS0FBSztnQkFDTCxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUMvQixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsRUFBRSxDQUFDO2dCQUMzQixJQUFJLEdBQUcsSUFBSSxRQUFRLElBQUksR0FBRyxLQUFLLEtBQUssRUFBRSxDQUFDO29CQUNyQyxNQUFNLE1BQU0sR0FBRzt3QkFDYixRQUFRO3dCQUNSLEdBQUc7cUJBQ0osQ0FBQztvQkFDRixNQUFNLE1BQU0sQ0FBQztnQkFDZixDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0NBQ0YsQ0FBQTtBQXRFWSxnQkFBZ0I7SUFGNUIsY0FBYyxFQUFFO0lBQ2hCLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUM7R0FDM0IsZ0JBQWdCLENBc0U1QiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "Private NPM Registry for Enterprise",
   "files": [
     "dist/**/*"