@nina-protocol/nina-db 0.0.86 → 0.0.88

package/dist/models/Release.js

@@ -46,42 +46,51 @@ export default class Release extends Model {
         },
     };
     static findOrCreate = async (publicKey, hubPublicKey = null) => {
-        let release = await Release.query().findOne({ publicKey });
-        if (release) {
-            return release;
-        }
-        const connection = new anchor.web3.Connection(process.env.SOLANA_CLUSTER_URL);
-        const provider = new anchor.AnchorProvider(connection, {}, { commitment: 'processed' });
-        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');
-        let metadataAccount = (await metaplex.nfts().findAllByMintList({ mints: [releaseAccount.releaseMint] }, { commitment: 'confirmed' }))[0];
-        let json;
         try {
-            json = (await axios.get(metadataAccount.uri.replace('www.', '').replace('arweave.net', 'gateway.irys.xyz'))).data;
+            let release = await Release.query().findOne({ publicKey });
+            if (release) {
+                return release;
+            }
+            const connection = new anchor.web3.Connection(process.env.SOLANA_CLUSTER_URL);
+            const provider = new anchor.AnchorProvider(connection, {}, { commitment: 'confirmed' });
+            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');
+            let metadataAccount = (await metaplex.nfts().findAllByMintList({ mints: [releaseAccount.releaseMint] }, { commitment: 'confirmed' }))[0];
+            if (!metadataAccount) {
+                throw new Error('No metadata account found for release - is not a complete release');
+            }
+            let json;
+            try {
+                json = (await axios.get(metadataAccount.uri.replace('www.', '').replace('arweave.net', 'gateway.irys.xyz'))).data;
+            }
+            catch (error) {
+                json = (await axios.get(metadataAccount.uri.replace('gateway.irys.xyz', 'arweave.net'))).data;
+            }
+            const slug = await this.generateSlug(json);
+            let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
+            release = await this.createRelease({
+                publicKey,
+                mint: releaseAccount.releaseMint.toBase58(),
+                metadata: json,
+                datetime: new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
+                slug,
+                publisherId: publisher.id,
+                releaseAccount
+            });
+            if (hubPublicKey) {
+                const hub = await Hub.query().findOne({ publicKey: hubPublicKey });
+                await release.$query().patch({ hubId: hub.id });
+                await Hub.relatedQuery('releases').for(hub.id).patch({
+                    visible: true,
+                }).where({ id: release.id });
+            }
+            return release;
         }
         catch (error) {
-            json = (await axios.get(metadataAccount.uri.replace('gateway.irys.xyz', 'arweave.net'))).data;
+            console.log('error finding or creating release: ', error);
+            return null;
         }
-        const slug = await this.generateSlug(json);
-        let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
-        release = await this.createRelease({
-            publicKey,
-            mint: releaseAccount.releaseMint.toBase58(),
-            metadata: json,
-            datetime: new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
-            slug,
-            publisherId: publisher.id,
-            releaseAccount
-        });
-        if (hubPublicKey) {
-            const hub = await Hub.query().findOne({ publicKey: hubPublicKey });
-            await release.$query().patch({ hubId: hub.id });
-            await Hub.relatedQuery('releases').for(hub.id).patch({
-                visible: true,
-            }).where({ id: release.id });
-        }
-        return release;
     };
     static createRelease = async ({ publicKey, mint, metadata, datetime, publisherId, releaseAccount }) => {
         const slug = await this.generateSlug(metadata);

package/dist/models/Subscription.js

@@ -11,7 +11,7 @@ class Subscription extends Model {
     static get jsonSchema() {
         return {
             type: 'object',
-            required: ['publicKey', 'datetime'],
+            required: ['datetime'],
             properties: {
                 publicKey: { type: 'string' },
                 datetime: { type: 'string' },
@@ -25,12 +25,12 @@ class Subscription extends Model {
         };
     }
     static async findOrCreate({ publicKey, from, to, datetime, subscriptionType }) {
-        let subscription = await Subscription.query().findOne({ publicKey });
+        let subscription = await Subscription.query().findOne({ from, to });
         if (subscription) {
             return subscription;
         }
         subscription = await Subscription.query().insert({
-            publicKey, from, to, datetime, subscriptionType
+            from, to, datetime, subscriptionType
         });
         console.log('Inserted subscription: ', publicKey);
         return subscription;

package/dist/models/Tag.js

@@ -15,7 +15,7 @@ export default class Tag extends Model {
         const sanitizedValue = this.sanitizeValue(value);
         let tag = await Tag.query().where('value', sanitizedValue).first();
         if (!tag) {
-            tag = await Tag.query().insert({ value: sanitizedValue }).onConflict('value').ignore();
+            tag = await Tag.query().insert({ value: sanitizedValue });
         }
         return tag;
     };

package/dist/seeds/1_accounts_profile.js

@@ -0,0 +1,22 @@
+import 'dotenv/config';
+import axios from 'axios';
+import { Account, connectDb } from '../index.js';
+export const seed = async () => {
+    await connectDb();
+    const accountsWithoutHandle = await Account.query().whereNull('handle');
+    for await (let account of accountsWithoutHandle) {
+        try {
+            const response = await axios.get(`${process.env.ID_SERVER_ENDPOINT}/profile/${account.publicKey}`);
+            await account.$query().patch({
+                handle: response.data.profile.handle,
+                displayName: response.data.profile.displayName,
+                image: response.data.profile.image,
+                description: response.data.profile.description,
+            });
+            console.log('Updated Account:', account.handle, account.publicKey);
+        }
+        catch (error) {
+            console.log('Error updating Account', account.publicKey, error);
+        }
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nina-protocol/nina-db",
-  "version": "0.0.86",
+  "version": "0.0.88",
   "description": "",
   "source": "src/index.js",
   "main": "dist/index.js",

package/src/migrations/20241121155034_subscription_public_key_nullable.js

@@ -0,0 +1,15 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const up = function(knex) {
+  return knex.schema.alterTable('subscriptions', table => {
+    table.dropColumn('publicKey');
+  });
+};
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export const down = function(knex) {
+};

package/src/models/Release.js

@@ -49,49 +49,57 @@ export default class Release extends Model {
   }
 
   static findOrCreate = async (publicKey, hubPublicKey=null) => {
-    let release = await Release.query().findOne({ publicKey });
-    if (release) {
-      return release;
-    }
-
-    const connection = new anchor.web3.Connection(process.env.SOLANA_CLUSTER_URL);
-    const provider = new anchor.AnchorProvider(connection, {}, {commitment: 'processed'})  
-    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')
-    let metadataAccount = (await metaplex.nfts().findAllByMintList({mints: [releaseAccount.releaseMint]}, { commitment: 'confirmed' }))[0];
-    let json
     try {
-      json = (await axios.get(metadataAccount.uri.replace('www.','').replace('arweave.net', 'gateway.irys.xyz'))).data
+      let release = await Release.query().findOne({ publicKey });
+      if (release) {
+        return release;
+      }
+  
+      const connection = new anchor.web3.Connection(process.env.SOLANA_CLUSTER_URL);
+      const provider = new anchor.AnchorProvider(connection, {}, {commitment: 'confirmed'})  
+      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')
+      let metadataAccount = (await metaplex.nfts().findAllByMintList({mints: [releaseAccount.releaseMint]}, { commitment: 'confirmed' }))[0];
+      if (!metadataAccount) {
+        throw new Error('No metadata account found for release - is not a complete release')
+      }
+      let json
+      try {
+        json = (await axios.get(metadataAccount.uri.replace('www.','').replace('arweave.net', 'gateway.irys.xyz'))).data
+      } catch (error) {
+        json = (await axios.get(metadataAccount.uri.replace('gateway.irys.xyz', 'arweave.net'))).data
+      }
+  
+      const slug = await this.generateSlug(json);
+      let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
+      release = await this.createRelease({
+        publicKey,
+        mint: releaseAccount.releaseMint.toBase58(),
+        metadata: json,
+        datetime: new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
+        slug,
+        publisherId: publisher.id,
+        releaseAccount
+      });
+  
+      if (hubPublicKey) {
+  
+        const hub = await Hub.query().findOne({ publicKey: hubPublicKey })
+        await release.$query().patch({ hubId: hub.id })
+        await Hub.relatedQuery('releases').for(hub.id).patch({
+          visible: true,
+        }).where( {id: release.id });
+      }
+  
+      return release;  
     } catch (error) {
-      json = (await axios.get(metadataAccount.uri.replace('gateway.irys.xyz', 'arweave.net'))).data
-    }
-
-    const slug = await this.generateSlug(json);
-    let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
-    release = await this.createRelease({
-      publicKey,
-      mint: releaseAccount.releaseMint.toBase58(),
-      metadata: json,
-      datetime: new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
-      slug,
-      publisherId: publisher.id,
-      releaseAccount
-    });
-
-    if (hubPublicKey) {
-
-      const hub = await Hub.query().findOne({ publicKey: hubPublicKey })
-      await release.$query().patch({ hubId: hub.id })
-      await Hub.relatedQuery('releases').for(hub.id).patch({
-        visible: true,
-      }).where( {id: release.id });
+      console.log('error finding or creating release: ', error)
+      return null;
     }
-
-    return release;
   }
 
   static createRelease = async ({publicKey, mint, metadata, datetime, publisherId, releaseAccount}) => {

package/src/models/Subscription.js

@@ -12,7 +12,7 @@ class Subscription extends Model {
   static get jsonSchema() {
     return {
       type: 'object',
-      required: ['publicKey', 'datetime'],
+      required: ['datetime'],
       properties: {
         publicKey: { type: 'string' },
         datetime: { type: 'string' },
@@ -27,13 +27,13 @@ class Subscription extends Model {
   }
 
   static async findOrCreate({publicKey, from, to, datetime, subscriptionType}) {
-    let subscription = await Subscription.query().findOne({ publicKey });
+    let subscription = await Subscription.query().findOne({ from, to });
     if (subscription) {
       return subscription;
     }
 
     subscription = await Subscription.query().insert({
-      publicKey, from, to, datetime, subscriptionType
+      from, to, datetime, subscriptionType
     });
     console.log('Inserted subscription: ', publicKey)
     return subscription;

package/src/models/Tag.js

@@ -18,7 +18,7 @@ export default class Tag extends Model {
     const sanitizedValue = this.sanitizeValue(value);
     let tag = await Tag.query().where('value', sanitizedValue).first();
     if (!tag) {
-      tag = await Tag.query().insert({ value: sanitizedValue }).onConflict('value').ignore();
+      tag = await Tag.query().insert({ value: sanitizedValue });
     }
     return tag;
   }

package/src/seeds/1_accounts_profile.js

@@ -0,0 +1,23 @@
+import 'dotenv/config';
+import axios from 'axios';
+import { Account, connectDb } from '../index.js';
+export const seed = async () => {
+  await connectDb();
+  
+  const accountsWithoutHandle = await Account.query().whereNull('handle');
+
+  for await (let account of accountsWithoutHandle) {
+    try {
+      const response = await axios.get(`${process.env.ID_SERVER_ENDPOINT}/profile/${account.publicKey}`);
+      await account.$query().patch({
+        handle: response.data.profile.handle,
+        displayName: response.data.profile.displayName,
+        image: response.data.profile.image,
+        description: response.data.profile.description,
+      });
+      console.log('Updated Account:', account.handle, account.publicKey);  
+    } catch (error) {
+      console.log('Error updating Account', account.publicKey, error);
+    }
+  }
+}

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20230306215736_add_hub_updated_at.js

@@ -1,15 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function(knex) {
-  
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function(knex) {
-  
-};

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20231031200439_add_profile.js

@@ -1,15 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function(knex) {
-  
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function(knex) {
-  
-};

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20231112031833_post_version.js

@@ -1,15 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function(knex) {
-  
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function(knex) {
-  
-};

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20231112031850_post_version.js

@@ -1,15 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function(knex) {
-  
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function(knex) {
-  
-};

package/src/node_modules/@nina-protocol/nina-db/dist/migrations/20231116215059_add_tags.js

@@ -1,15 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function(knex) {
-  
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function(knex) {
-  
-};