@nina-protocol/nina-db 0.0.88 → 0.0.90

package/dist/migrations/20250120215722_add_ref_columns.js

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

package/dist/models/Release.js

@@ -8,6 +8,7 @@ import Hub from './Hub.js';
 import Post from './Post.js';
 import Tag from './Tag.js';
 import axios from 'axios';
+import promiseRetry from 'promise-retry';
 import { customAlphabet } from 'nanoid';
 const alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
 const randomStringGenerator = customAlphabet(alphabet, 12);
@@ -55,7 +56,22 @@ export default class Release extends Model {
             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 attempts = 0;
+            const releaseAccount = await promiseRetry(async (retry) => {
+                try {
+                    attempts += 1;
+                    const result = await program.account.release.fetch(new anchor.web3.PublicKey(publicKey), 'confirmed');
+                    return result;
+                }
+                catch (error) {
+                    console.log('error fetching release account', error);
+                    retry(error);
+                }
+            }, {
+                retries: 50,
+                minTimeout: 500,
+                maxTimeout: 1500,
+            });
             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');

package/dist/models/Subscription.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nina-protocol/nina-db",
-  "version": "0.0.88",
+  "version": "0.0.90",
   "description": "",
   "source": "src/index.js",
   "main": "dist/index.js",
@@ -29,6 +29,7 @@
     "nanoid": "^4.0.2",
     "objection": "2.2.15",
     "pg": "^8.7.3",
+    "promise-retry": "^2.0.1",
     "striptags": "^3.2.0",
     "twitter-api-v2": "^1.12.9"
   },

package/src/migrations/20250120215722_add_ref_columns.js

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

package/src/models/Release.js

@@ -8,10 +8,12 @@ import Hub from './Hub.js';
 import Post from './Post.js';
 import Tag from './Tag.js';
 import axios from 'axios';
+import promiseRetry from 'promise-retry';
 import { customAlphabet } from 'nanoid';
+import promiseRetry from 'promise-retry';
+
 const alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
 const randomStringGenerator = customAlphabet(alphabet, 12);
-
 export default class Release extends Model {
   static tableName = 'releases';
   
@@ -47,7 +49,7 @@ export default class Release extends Model {
       archived: { type: 'boolean' },
     },
   }
-
+  
   static findOrCreate = async (publicKey, hubPublicKey=null) => {
     try {
       let release = await Release.query().findOne({ publicKey });
@@ -62,7 +64,25 @@ export default class Release extends Model {
         provider,
       )
       const metaplex = new Metaplex(connection);
-      const releaseAccount = await program.account.release.fetch(new anchor.web3.PublicKey(publicKey), 'confirmed')
+      let attempts = 0;
+
+      const releaseAccount = await promiseRetry(
+        async (retry) => {
+          try {
+            attempts += 1
+            const result = await program.account.release.fetch(new anchor.web3.PublicKey(publicKey), 'confirmed')
+            return result
+          } catch (error) {
+            console.log('error fetching release account', error)
+            retry(error)
+          }
+        }, {
+          retries: 50,
+          minTimeout: 500,
+          maxTimeout: 1500,
+        }
+      )
+  
       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')

package/src/models/Subscription.js

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