npm - @nina-protocol/nina-db - Versions diffs - 0.0.16 → 0.0.18 - Mend

@nina-protocol/nina-db 0.0.16 → 0.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/index.js +1 -1
package/dist/models/Hub.js +1 -144
package/dist/models/Release.js +10 -2
package/dist/models/Transaction.js +1 -0
package/package.json +3 -3
package/src/index.js +1 -1
package/src/models/Hub.js +1 -147
package/src/models/Release.js +10 -3
package/src/models/Transaction.js +1 -0

package/dist/index.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { Model } from 'objection';
 import Models from './models/index.js';
 import knexConfig from './knexfile.js';
 export const initDb = async (config) => {
-    const db = Knex(config);
+    const db = Knex(config.development);
     await db.raw(`SELECT 'CREATE DATABASE ${process.env.POSTGRES_DATABASE}'
     WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '${process.env.POSTGRES_DATABASE}')`);
     await db.migrate.latest();

package/dist/models/Hub.js CHANGED Viewed

@@ -1,6 +1,5 @@
-import axios from 'axios';
 import { Model } from 'objection';
-import { stripHtmlIfNeeded, decode } from '../utils/index.js';
+import { stripHtmlIfNeeded } from '../utils/index.js';
 import Account from './Account.js';
 import Release from './Release.js';
 import Post from './Post.js';
@@ -31,148 +30,6 @@ export default class Hub extends Model {
         delete this.id;
         stripHtmlIfNeeded(this.data, 'description');
     }
-    static async updateHub(hub, hubAccount, hubContents, hubReleases, hubCollaborators, hubPosts) {
-        if (typeof hubAccount.account.uri !== 'string') {
-            hubAccount.account.uri = decode(hubAccount.account.uri);
-        }
-        if (!hub.dataUri || hub.dataUri !== hubAccount.account.uri) {
-            const data = (await axios.get(hubAccount.account.uri)).data;
-            await hub.$query().patch({
-                data,
-                dataUri: hubAccount.account.uri
-            });
-        }
-        // Update Hub Releases
-        const hubReleasesForHubOnChain = hubReleases.filter(x => x.account.hub.toBase58() === hub.publicKey);
-        const hubReleasesForHubDb = (await Hub.relatedQuery('releases').for(hub)).map(x => x.publicKey);
-        const newHubReleasesForHub = hubReleasesForHubOnChain.filter(x => !hubReleasesForHubDb.includes(x.account.release.toBase58()));
-        for await (let hubRelease of hubReleasesForHubOnChain) {
-            try {
-                if (hubReleasesForHubDb.includes(hubRelease.account.release.toBase58())) {
-                    const hubContent = hubContents.filter(x => x.account.child.toBase58() === hubRelease.publicKey.toBase58())[0];
-                    const release = await Release.query().findOne({ publicKey: hubRelease.account.release.toBase58() });
-                    if (release) {
-                        await Hub.relatedQuery('releases').for(hub.id).patch({
-                            visible: hubContent.account.visible,
-                        }).where({ id: release.id });
-                    }
-                }
-            }
-            catch (err) {
-                console.log(err);
-            }
-        }
-        for await (let hubRelease of newHubReleasesForHub) {
-            try {
-                const hubContent = hubContents.filter(x => x.account.child.toBase58() === hubRelease.publicKey.toBase58())[0];
-                const release = await Release.query().findOne({ publicKey: hubRelease.account.release.toBase58() });
-                if (release) {
-                    await Hub.relatedQuery('releases').for(hub.id).relate({
-                        id: release.id,
-                        hubReleasePublicKey: hubRelease.publicKey.toBase58(),
-                        visible: hubContent.account.visible,
-                    });
-                    if (hubContent.account.publishedThroughHub) {
-                        await release.$query().patch({ hubId: hub.id });
-                    }
-                    console.log('Related Release to Hub:', release.publicKey, hub.publicKey);
-                }
-            }
-            catch (err) {
-                console.log(err);
-            }
-        }
-        // Update Hub Collaborators
-        const hubCollaboratorsForHubOnChain = hubCollaborators.filter(x => x.account.hub.toBase58() === hub.publicKey);
-        const hubCollaboratorsForHubDb = (await Hub.relatedQuery('collaborators').for(hub)).map(x => x.publicKey);
-        const newHubCollaboratorsForHub = hubCollaboratorsForHubOnChain.filter(x => !hubCollaboratorsForHubDb.includes(x.account.collaborator.toBase58()));
-        for await (let hubCollaborator of newHubCollaboratorsForHub) {
-            try {
-                const collaboratorRecord = await Account.findOrCreate(hubCollaborator.account.collaborator.toBase58());
-                if (collaboratorRecord) {
-                    await Hub.relatedQuery('collaborators').for(hub.id).relate({
-                        id: collaboratorRecord.id,
-                        hubCollaboratorPublicKey: hubCollaborator.publicKey.toBase58(),
-                    });
-                    console.log('Related Collaborator to Hub:', collaboratorRecord.publicKey, hub.publicKey);
-                }
-            }
-            catch (err) {
-                console.log(err);
-            }
-        }
-        const removedCollaborators = hubCollaboratorsForHubDb.filter(x => !hubCollaboratorsForHubOnChain.map(x => x.account.collaborator.toBase58()).includes(x));
-        for await (let removedCollaborator of removedCollaborators) {
-            try {
-                const collaboratorRecord = await Account.query().findOne({ publicKey: removedCollaborator });
-                if (collaboratorRecord) {
-                    await Hub.relatedQuery('collaborators').for(hub.id).unrelate().where('accountId', collaboratorRecord.id);
-                    console.log('Removed Collaborator from Hub:', collaboratorRecord.publicKey, hub.publicKey);
-                }
-            }
-            catch (err) {
-                console.log(err);
-            }
-        }
-        //Update HubPosts
-        const hubPostsForHubOnChain = hubPosts.filter(x => x.account.hub.toBase58() === hub.publicKey);
-        const hubPostsForHubDb = (await Hub.relatedQuery('posts').for(hub)).map(x => x.publicKey);
-        const newHubPostsForHub = hubPostsForHubOnChain.filter(x => !hubPostsForHubDb.includes(x.account.post.toBase58()));
-        for await (let hubPost of hubPostsForHubOnChain) {
-            try {
-                if (hubPostsForHubDb.includes(hubPost.account.post.toBase58())) {
-                    const hubContent = hubContents.filter(x => x.account.child.toBase58() === hubPost.publicKey.toBase58())[0];
-                    if (!hubContent.account.visible) {
-                        const post = await Post.query().findOne({ publicKey: hubPost.account.post.toBase58() });
-                        if (post) {
-                            await Post.relatedQuery('releases').for(post.id).unrelate().where('hubId', hub.id);
-                            console.log('Deleted Post:', hubPost.publicKey);
-                        }
-                    }
-                }
-            }
-            catch (err) {
-                console.log(err);
-            }
-        }
-        for await (let hubPost of newHubPostsForHub) {
-            try {
-                const hubContent = hubContents.filter(x => x.account.child.toBase58() === hubPost.publicKey.toBase58())[0];
-                const post = await Post.query().findOne({ publicKey: hubPost.account.post.toBase58() });
-                if (hubContent.account.visible) {
-                    if (post) {
-                        await Hub.relatedQuery('posts').for(hub.id).relate({
-                            id: post.id,
-                            hubPostPublicKey: hubPost.publicKey.toBase58(),
-                        });
-                        if (hubContent.account.publishedThroughHub) {
-                            await post.$query().patch({ hubId: hub.id });
-                        }
-                        console.log('Related Post to Hub:', post.publicKey, hub.publicKey);
-                    }
-                    if (hubPost.account.referenceContent) {
-                        const release = await Release.query().findOne({ publicKey: hubPost.account.referenceContent.toBase58() });
-                        if (release) {
-                            const relatedRelease = await Post.relatedQuery('releases').for(post.id).where('releaseId', release.id).first();
-                            if (!relatedRelease) {
-                                await Post.relatedQuery('releases').for(post.id).relate(release.id);
-                                console.log('Related Release to Post:', release.publicKey, post.publicKey);
-                            }
-                        }
-                    }
-                }
-                else if (post) {
-                    if (hubContent.account.publishedThroughHub) {
-                        await Post.query().deleteById(post.id);
-                        console.log('deleted Post:', post.publicKey);
-                    }
-                }
-            }
-            catch (err) {
-                console.log(err);
-            }
-        }
-    }
     static relationMappings = () => ({
         authority: {
             relation: Model.HasOneRelation,

package/dist/models/Release.js CHANGED Viewed

@@ -6,6 +6,7 @@ import Account from './Account.js';
 import Exchange from './Exchange.js';
 import Hub from './Hub.js';
 import Post from './Post.js';
+import axios from 'axios';
 export default class Release extends Model {
     static tableName = 'releases';
     static idColumn = 'id';
@@ -47,12 +48,19 @@ export default class Release extends Model {
         const program = await anchor.Program.at(process.env.NINA_PROGRAM_ID, provider);
         const metaplex = new Metaplex(connection);
         const releaseAccount = await program.account.release.fetch(new anchor.web3.PublicKey(publicKey), 'confirmed');
-        const metadataAccount = await metaplex.nfts().findByMint(releaseAccount.releaseMint, { commitment: "confirmed" }).run();
+        let metadataAccount = (await metaplex.nfts().findAllByMintList({ mints: [releaseAccount.releaseMint] }, { commitment: 'confirmed' }))[0];
+        let json;
+        try {
+            json = await axios.get(metadataAccount.uri);
+        }
+        catch (error) {
+            json = await axios.get(metadataAccount.uri.replace('arweave.net', 'ar-io.net'));
+        }
         let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
         release = await this.createRelease({
             publicKey,
             mint: releaseAccount.releaseMint.toBase58(),
-            metadata: metadataAccount.json,
+            metadata: json,
             datetime: new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
             publisherId: publisher.id,
             releaseAccount

package/dist/models/Transaction.js CHANGED Viewed

@@ -31,6 +31,7 @@ class Transaction extends Model {
                         'PostInitViaHubWithReferenceRelease',
                         'SubscriptionSubscribeAccount',
                         'SubscriptionSubscribeHub',
+                        'Unknown'
                     ],
                 },
             },

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nina-protocol/nina-db",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "",
   "source": "src/index.js",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/preset-es2015": "^7.0.0-beta.53",
-    "@metaplex-foundation/js": "^0.14.0",
+    "@metaplex-foundation/js": "^0.18.1",
     "@project-serum/anchor": "^0.25.0",
     "axios": "^0.27.2",
     "knex": "^2.2.0",
@@ -32,7 +32,7 @@
     "twitter-api-v2": "^1.12.9"
   },
   "resolutions": {
-    "@metaplex-foundation/mpl-candy-machine": "4.3.0"
+    "@metaplex-foundation/mpl-candy-machine": "5.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.12",

package/src/index.js CHANGED Viewed

@@ -5,7 +5,7 @@ import Models from './models/index.js'
 import knexConfig from './knexfile.js'
 export const initDb = async (config) => {
-  const db = Knex(config)
+  const db = Knex(config.development)
   await db.raw(`SELECT 'CREATE DATABASE ${process.env.POSTGRES_DATABASE}'
     WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '${process.env.POSTGRES_DATABASE}')`
   )

package/src/models/Hub.js CHANGED Viewed

@@ -1,6 +1,5 @@
-import axios from 'axios';
 import { Model } from 'objection';
-import { stripHtmlIfNeeded, decode } from '../utils/index.js';
+import { stripHtmlIfNeeded } from '../utils/index.js';
 import Account from './Account.js';
 import Release from './Release.js';
 import Post from './Post.js';
@@ -34,151 +33,6 @@ export default class Hub extends Model {
     stripHtmlIfNeeded(this.data, 'description');
   }
-  static async updateHub(hub, hubAccount, hubContents, hubReleases, hubCollaborators, hubPosts) {
-    if (typeof hubAccount.account.uri !== 'string') {
-      hubAccount.account.uri = decode(hubAccount.account.uri)
-    }
-    if (!hub.dataUri || hub.dataUri !== hubAccount.account.uri) {
-      const data = (await axios.get(hubAccount.account.uri)).data;
-      await hub.$query().patch({
-        data,
-        dataUri: hubAccount.account.uri
-      });
-    }
-    // Update Hub Releases
-    const hubReleasesForHubOnChain = hubReleases.filter(x => x.account.hub.toBase58() === hub.publicKey);
-    const hubReleasesForHubDb = (await Hub.relatedQuery('releases').for(hub)).map(x => x.publicKey);
-    const newHubReleasesForHub = hubReleasesForHubOnChain.filter(x => !hubReleasesForHubDb.includes(x.account.release.toBase58()));
-    for await (let hubRelease of hubReleasesForHubOnChain) {
-      try {
-        if (hubReleasesForHubDb.includes(hubRelease.account.release.toBase58())) {
-          const hubContent = hubContents.filter(x => x.account.child.toBase58() === hubRelease.publicKey.toBase58())[0]
-          const release = await Release.query().findOne({publicKey: hubRelease.account.release.toBase58()});
-          if (release) {
-            await Hub.relatedQuery('releases').for(hub.id).patch({
-              visible: hubContent.account.visible,
-            }).where( {id: release.id });
-          }
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    }
-    for await (let hubRelease of newHubReleasesForHub) {
-      try {
-        const hubContent = hubContents.filter(x => x.account.child.toBase58() === hubRelease.publicKey.toBase58())[0]
-        const release = await Release.query().findOne({publicKey: hubRelease.account.release.toBase58()});
-        if (release) {
-          await Hub.relatedQuery('releases').for(hub.id).relate({
-            id: release.id,
-            hubReleasePublicKey: hubRelease.publicKey.toBase58(),
-            visible: hubContent.account.visible,
-          });
-          if (hubContent.account.publishedThroughHub) {
-            await release.$query().patch({hubId: hub.id});
-          }
-          console.log('Related Release to Hub:', release.publicKey, hub.publicKey);
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    }
-    // Update Hub Collaborators
-    const hubCollaboratorsForHubOnChain = hubCollaborators.filter(x => x.account.hub.toBase58() === hub.publicKey);
-    const hubCollaboratorsForHubDb = (await Hub.relatedQuery('collaborators').for(hub)).map(x => x.publicKey);
-    const newHubCollaboratorsForHub = hubCollaboratorsForHubOnChain.filter(x => !hubCollaboratorsForHubDb.includes(x.account.collaborator.toBase58()));
-    for await (let hubCollaborator of newHubCollaboratorsForHub) {
-      try {
-        const collaboratorRecord = await Account.findOrCreate(hubCollaborator.account.collaborator.toBase58());
-        if (collaboratorRecord) {
-          await Hub.relatedQuery('collaborators').for(hub.id).relate({
-            id: collaboratorRecord.id,
-            hubCollaboratorPublicKey: hubCollaborator.publicKey.toBase58(),
-          })
-          console.log('Related Collaborator to Hub:', collaboratorRecord.publicKey, hub.publicKey);
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    }
-    const removedCollaborators = hubCollaboratorsForHubDb.filter(x => !hubCollaboratorsForHubOnChain.map(x => x.account.collaborator.toBase58()).includes(x));
-    for await (let removedCollaborator of removedCollaborators) {
-      try {
-        const collaboratorRecord = await Account.query().findOne({publicKey: removedCollaborator});
-        if (collaboratorRecord) {
-          await Hub.relatedQuery('collaborators').for(hub.id).unrelate().where('accountId', collaboratorRecord.id);
-          console.log('Removed Collaborator from Hub:', collaboratorRecord.publicKey, hub.publicKey);
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    }
-    //Update HubPosts
-    const hubPostsForHubOnChain = hubPosts.filter(x => x.account.hub.toBase58() === hub.publicKey);
-    const hubPostsForHubDb = (await Hub.relatedQuery('posts').for(hub)).map(x => x.publicKey);
-    const newHubPostsForHub = hubPostsForHubOnChain.filter(x => !hubPostsForHubDb.includes(x.account.post.toBase58()));
-    for await (let hubPost of hubPostsForHubOnChain) {
-      try {
-        if (hubPostsForHubDb.includes(hubPost.account.post.toBase58())) {
-          const hubContent = hubContents.filter(x => x.account.child.toBase58() === hubPost.publicKey.toBase58())[0]
-          if (!hubContent.account.visible) {
-            const post = await Post.query().findOne({publicKey: hubPost.account.post.toBase58()});
-            if (post) {
-              await Post.relatedQuery('releases').for(post.id).unrelate().where('hubId', hub.id);
-              console.log('Deleted Post:', hubPost.publicKey);
-            }
-          }
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    }
-    for await (let hubPost of newHubPostsForHub) {
-      try {
-        const hubContent = hubContents.filter(x => x.account.child.toBase58() === hubPost.publicKey.toBase58())[0]
-        const post = await Post.query().findOne({publicKey: hubPost.account.post.toBase58()});
-        if (hubContent.account.visible) {
-          if (post) {
-            await Hub.relatedQuery('posts').for(hub.id).relate({
-              id: post.id,
-              hubPostPublicKey: hubPost.publicKey.toBase58(),
-            });
-            if (hubContent.account.publishedThroughHub) {
-              await post.$query().patch({hubId: hub.id});
-            }
-            console.log('Related Post to Hub:', post.publicKey, hub.publicKey);
-          }
-          if (hubPost.account.referenceContent) {
-            const release = await Release.query().findOne({publicKey: hubPost.account.referenceContent.toBase58()});
-            if (release) {
-              const relatedRelease = await Post.relatedQuery('releases').for(post.id).where('releaseId', release.id).first();
-              if (!relatedRelease) {
-                await Post.relatedQuery('releases').for(post.id).relate(release.id);
-                console.log('Related Release to Post:', release.publicKey, post.publicKey);
-              }
-            }
-          }
-        } else if (post) {
-          if (hubContent.account.publishedThroughHub) {
-            await Post.query().deleteById(post.id);
-            console.log('deleted Post:', post.publicKey);
-          }
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    }
-  }
   static relationMappings = () => ({
     authority: {

package/src/models/Release.js CHANGED Viewed

@@ -6,6 +6,7 @@ import  Account from './Account.js';
 import Exchange from './Exchange.js';
 import Hub from './Hub.js';
 import Post from './Post.js';
+import axios from 'axios';
 export default class Release extends Model {
   static tableName = 'releases';
@@ -55,13 +56,19 @@ export default class Release extends Model {
     const metaplex = new Metaplex(connection);
     const releaseAccount = await program.account.release.fetch(new anchor.web3.PublicKey(publicKey), 'confirmed')
-    const metadataAccount = await metaplex.nfts().findByMint(releaseAccount.releaseMint, {commitment: "confirmed"}).run();
-    let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
+    let metadataAccount = (await metaplex.nfts().findAllByMintList({mints: [releaseAccount.releaseMint]}, { commitment: 'confirmed' }))[0];
+    let json
+    try {
+      json = await axios.get(metadataAccount.uri)
+    } catch (error) {
+      json = await axios.get(metadataAccount.uri.replace('arweave.net', 'ar-io.net'))
+    }
+    let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
     release = await this.createRelease({
       publicKey,
       mint: releaseAccount.releaseMint.toBase58(),
-      metadata: metadataAccount.json,
+      metadata: json,
       datetime: new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
       publisherId: publisher.id,
       releaseAccount

package/src/models/Transaction.js CHANGED Viewed

@@ -32,6 +32,7 @@ class Transaction extends Model {
             'PostInitViaHubWithReferenceRelease',
             'SubscriptionSubscribeAccount',
             'SubscriptionSubscribeHub',
+            'Unknown'
           ],
         },
       },