@nina-protocol/nina-db 0.0.83 → 0.0.85

package/dist/models/Release.js

@@ -8,7 +8,6 @@ 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);
@@ -52,25 +51,10 @@ export default class Release extends Model {
             return release;
         }
         const connection = new anchor.web3.Connection(process.env.SOLANA_CLUSTER_URL);
-        const provider = new anchor.AnchorProvider(connection, {}, { commitment: 'confirmed' });
+        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);
-        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,
-        });
+        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 {
@@ -117,7 +101,7 @@ export default class Release extends Model {
         if (metadata.properties.tags) {
             for await (let tag of metadata.properties.tags) {
                 const tagRecord = await Tag.findOrCreate(tag);
-                await Release.relatedQuery('tags').for(release.id).relate(tagRecord.id);
+                await Release.relatedQuery('tags').for(release.id).relate(tagRecord.id).onConflict('tags_releases_pkey').ignore();
             }
         }
         await this.processRevenueShares(releaseAccount, release);

package/dist/models/Subscription.js

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

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 });
+            tag = await Tag.query().insert({ value: sanitizedValue }).onConflict('value').ignore();
         }
         return tag;
     };

package/package.json

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

package/src/models/Release.js

@@ -8,10 +8,10 @@ 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);
+
 export default class Release extends Model {
   static tableName = 'releases';
   
@@ -47,7 +47,7 @@ export default class Release extends Model {
       archived: { type: 'boolean' },
     },
   }
-  
+
   static findOrCreate = async (publicKey, hubPublicKey=null) => {
     let release = await Release.query().findOne({ publicKey });
     if (release) {
@@ -55,31 +55,13 @@ export default class Release extends Model {
     }
 
     const connection = new anchor.web3.Connection(process.env.SOLANA_CLUSTER_URL);
-    const provider = new anchor.AnchorProvider(connection, {}, {commitment: 'confirmed'})  
+    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);
-
-    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,
-      }
-    )
-
+    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 {
@@ -130,7 +112,7 @@ export default class Release extends Model {
     if (metadata.properties.tags) {
       for await (let tag of metadata.properties.tags) {
         const tagRecord = await Tag.findOrCreate(tag);
-        await Release.relatedQuery('tags').for(release.id).relate(tagRecord.id);
+        await Release.relatedQuery('tags').for(release.id).relate(tagRecord.id).onConflict('tags_releases_pkey').ignore();
       }
     }
     await this.processRevenueShares(releaseAccount, release);

package/src/models/Subscription.js

@@ -12,8 +12,9 @@ class Subscription extends Model {
   static get jsonSchema() {
     return {
       type: 'object',
-      required: ['datetime'],
+      required: ['publicKey', 'datetime'],
       properties: {
+        publicKey: { type: 'string' },
         datetime: { type: 'string' },
         from: { type: 'string' },
         to: { type: 'string' },
@@ -25,16 +26,16 @@ class Subscription extends Model {
     };
   }
 
-  static async findOrCreate({from, to, datetime, subscriptionType}) {
-    let subscription = await Subscription.query().findOne({ from, to });
+  static async findOrCreate({publicKey, from, to, datetime, subscriptionType}) {
+    let subscription = await Subscription.query().findOne({ publicKey });
     if (subscription) {
       return subscription;
     }
 
     subscription = await Subscription.query().insert({
-      from, to, datetime, subscriptionType
+      publicKey, from, to, datetime, subscriptionType
     });
-    console.log('Inserted subscription: ', from, to)
+    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 });
+      tag = await Tag.query().insert({ value: sanitizedValue }).onConflict('value').ignore();
     }
     return tag;
   }

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

@@ -0,0 +1,15 @@
+/**
+ * @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

@@ -0,0 +1,15 @@
+/**
+ * @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

@@ -0,0 +1,15 @@
+/**
+ * @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

@@ -0,0 +1,15 @@
+/**
+ * @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

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