mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2025-05-27 21:44:21 -04:00
Migrate models to TypeScript
Co-authored-by: David Mehren <dmehren1@gmail.com> Co-authored-by: Yannick Bungers <git@innay.de> Co-authored-by: Philipp Hochkamp <me@phochkamp.de> Co-authored-by: nzbr <mail@nzbr.de> Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren
parent
54cd556f2f
commit
1d4107fe90
13 changed files with 565 additions and 539 deletions
|
|
@ -1,43 +1,32 @@
|
|||
import {DataTypes} from 'sequelize';
|
||||
import { AutoIncrement, Table, Column, DataType, PrimaryKey, Model, BelongsTo, createIndexDecorator, ForeignKey } from 'sequelize-typescript'
|
||||
import { Note } from './note';
|
||||
import { User } from './user';
|
||||
|
||||
const NoteUserIndex = createIndexDecorator({unique: true});
|
||||
|
||||
function createAuthorModel(sequelize) {
|
||||
const Author = sequelize.define('Author', {
|
||||
id: {
|
||||
type: DataTypes.INTEGER,
|
||||
primaryKey: true,
|
||||
autoIncrement: true
|
||||
},
|
||||
color: {
|
||||
type: DataTypes.STRING
|
||||
}
|
||||
}, {
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['noteId', 'userId']
|
||||
}
|
||||
]
|
||||
});
|
||||
@Table
|
||||
export class Author extends Model<Author> {
|
||||
@PrimaryKey
|
||||
@AutoIncrement
|
||||
@Column(DataType.INTEGER)
|
||||
id: number;
|
||||
|
||||
Author.associate = function (models) {
|
||||
Author.belongsTo(models.Note, {
|
||||
foreignKey: 'noteId',
|
||||
as: 'note',
|
||||
constraints: false,
|
||||
onDelete: 'CASCADE',
|
||||
hooks: true
|
||||
});
|
||||
Author.belongsTo(models.User, {
|
||||
foreignKey: 'userId',
|
||||
as: 'user',
|
||||
constraints: false,
|
||||
onDelete: 'CASCADE',
|
||||
hooks: true
|
||||
})
|
||||
};
|
||||
@Column(DataType.STRING)
|
||||
color: string;
|
||||
|
||||
return Author
|
||||
@ForeignKey(() => Note)
|
||||
@NoteUserIndex
|
||||
@Column
|
||||
noteId: string;
|
||||
|
||||
@BelongsTo(() => Note, { foreignKey: 'noteId', onDelete: 'CASCADE', constraints: false, hooks: true })
|
||||
note: Note;
|
||||
|
||||
@ForeignKey(() => User)
|
||||
@NoteUserIndex
|
||||
@Column
|
||||
userId: string;
|
||||
|
||||
@BelongsTo(() => User, { foreignKey: 'userId', onDelete: 'CASCADE', constraints: false, hooks: true })
|
||||
user: User;
|
||||
}
|
||||
|
||||
export = createAuthorModel
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
'use strict'
|
||||
// external modules
|
||||
import {Sequelize} from 'sequelize-typescript';
|
||||
import { Author } from './author';
|
||||
import { Note } from './note';
|
||||
import { Revision } from './revision';
|
||||
import { Temp } from './temp';
|
||||
import { User } from './user';
|
||||
var fs = require('fs')
|
||||
var path = require('path')
|
||||
var Sequelize = require('sequelize')
|
||||
var path = require('path');
|
||||
const { cloneDeep } = require('lodash')
|
||||
|
||||
// core
|
||||
|
|
@ -14,7 +17,7 @@ dbconfig.logging = config.debug ? (data) => {
|
|||
logger.info(data)
|
||||
} : false
|
||||
|
||||
var sequelize = null
|
||||
var sequelize: any = null;
|
||||
|
||||
// Heroku specific
|
||||
if (config.dbURL) {
|
||||
|
|
@ -34,26 +37,25 @@ sequelize.stripNullByte = stripNullByte
|
|||
|
||||
function processData (data, _default, process) {
|
||||
if (data === undefined) return data
|
||||
else return data === null ? _default : (process ? process(data) : data)
|
||||
else if (process) {
|
||||
if (data === null) {
|
||||
return _default
|
||||
} else {
|
||||
return process(data)
|
||||
}
|
||||
} else {
|
||||
if (data === null) {
|
||||
return _default
|
||||
} else {
|
||||
return data
|
||||
}
|
||||
}
|
||||
}
|
||||
sequelize.processData = processData
|
||||
|
||||
var db = {}
|
||||
var db: any = {}
|
||||
|
||||
fs.readdirSync(__dirname)
|
||||
.filter(function (file) {
|
||||
return (file.indexOf('.') !== 0) && (file !== 'index.js')
|
||||
})
|
||||
.forEach(function (file) {
|
||||
var model = sequelize.import(path.join(__dirname, file))
|
||||
db[model.name] = model
|
||||
})
|
||||
|
||||
Object.keys(db).forEach(function (modelName) {
|
||||
if ('associate' in db[modelName]) {
|
||||
db[modelName].associate(db)
|
||||
}
|
||||
})
|
||||
sequelize.addModels([Author, Note, Revision, Temp, User]);
|
||||
|
||||
db.sequelize = sequelize
|
||||
db.Sequelize = Sequelize
|
||||
|
|
@ -1,4 +1,15 @@
|
|||
'use strict'
|
||||
import { AllowNull, AfterCreate, BeforeCreate, Default, Unique, IsUUID, Model, PrimaryKey, Column, DataType, Table, BelongsTo, HasMany, ForeignKey } from "sequelize-typescript";
|
||||
import { generate as shortIdGenerate, isValid as shortIdIsValid } from "shortid";
|
||||
import { Author } from "./author";
|
||||
import { User } from './user';
|
||||
import { Revision } from './revision';
|
||||
|
||||
// external modules
|
||||
// external modules
|
||||
var fs = require('fs')
|
||||
var path = require('path')
|
||||
var LZString = require('lz-string')
|
||||
|
||||
// external modules
|
||||
var fs = require('fs')
|
||||
var path = require('path')
|
||||
|
|
@ -7,7 +18,6 @@ var base64url = require('base64url')
|
|||
var md = require('markdown-it')()
|
||||
var metaMarked = require('meta-marked')
|
||||
var cheerio = require('cheerio')
|
||||
var shortId = require('shortid')
|
||||
var Sequelize = require('sequelize')
|
||||
var async = require('async')
|
||||
var moment = require('moment')
|
||||
|
|
@ -23,156 +33,157 @@ var logger = require('../logger')
|
|||
var ot = require('../ot')
|
||||
|
||||
// permission types
|
||||
var permissionTypes = ['freely', 'editable', 'limited', 'locked', 'protected', 'private']
|
||||
enum PermissionEnum {
|
||||
freely = "freely",
|
||||
editable = "editable",
|
||||
limited = "limited",
|
||||
locked = "locked",
|
||||
protected = "protected",
|
||||
private = "private"
|
||||
};
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
var Note = sequelize.define('Note', {
|
||||
id: {
|
||||
type: DataTypes.UUID,
|
||||
primaryKey: true,
|
||||
defaultValue: Sequelize.UUIDV4
|
||||
},
|
||||
shortid: {
|
||||
type: DataTypes.STRING,
|
||||
unique: true,
|
||||
allowNull: false,
|
||||
defaultValue: shortId.generate
|
||||
},
|
||||
alias: {
|
||||
type: DataTypes.STRING,
|
||||
unique: true
|
||||
},
|
||||
permission: {
|
||||
type: DataTypes.ENUM,
|
||||
values: permissionTypes
|
||||
},
|
||||
viewcount: {
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0
|
||||
},
|
||||
title: {
|
||||
type: DataTypes.TEXT,
|
||||
get: function () {
|
||||
return sequelize.processData(this.getDataValue('title'), '')
|
||||
},
|
||||
set: function (value) {
|
||||
this.setDataValue('title', sequelize.stripNullByte(value))
|
||||
}
|
||||
},
|
||||
content: {
|
||||
type: DataTypes.TEXT('long'),
|
||||
get: function () {
|
||||
return sequelize.processData(this.getDataValue('content'), '')
|
||||
},
|
||||
set: function (value) {
|
||||
this.setDataValue('content', sequelize.stripNullByte(value))
|
||||
}
|
||||
},
|
||||
authorship: {
|
||||
type: DataTypes.TEXT('long'),
|
||||
get: function () {
|
||||
return sequelize.processData(this.getDataValue('authorship'), [], JSON.parse)
|
||||
},
|
||||
set: function (value) {
|
||||
this.setDataValue('authorship', JSON.stringify(value))
|
||||
}
|
||||
},
|
||||
lastchangeAt: {
|
||||
type: DataTypes.DATE
|
||||
},
|
||||
savedAt: {
|
||||
type: DataTypes.DATE
|
||||
}
|
||||
}, {
|
||||
paranoid: false,
|
||||
hooks: {
|
||||
beforeCreate: function (note, options) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
// if no content specified then use default note
|
||||
if (!note.content) {
|
||||
var body = null
|
||||
let filePath = null
|
||||
if (!note.alias) {
|
||||
filePath = config.defaultNotePath
|
||||
} else {
|
||||
filePath = path.join(config.docsPath, note.alias + '.md')
|
||||
}
|
||||
if (Note.checkFileExist(filePath)) {
|
||||
var fsCreatedTime = moment(fs.statSync(filePath).ctime)
|
||||
body = fs.readFileSync(filePath, 'utf8')
|
||||
note.title = Note.parseNoteTitle(body)
|
||||
note.content = body
|
||||
if (filePath !== config.defaultNotePath) {
|
||||
note.createdAt = fsCreatedTime
|
||||
}
|
||||
}
|
||||
}
|
||||
// if no permission specified and have owner then give default permission in config, else default permission is freely
|
||||
if (!note.permission) {
|
||||
if (note.ownerId) {
|
||||
note.permission = config.defaultPermission
|
||||
} else {
|
||||
note.permission = 'freely'
|
||||
}
|
||||
}
|
||||
return resolve(note)
|
||||
})
|
||||
},
|
||||
afterCreate: function (note, options, callback) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
sequelize.models.Revision.saveNoteRevision(note, function (err, revision) {
|
||||
if (err) {
|
||||
return reject(err)
|
||||
}
|
||||
return resolve(note)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
@Table({ paranoid: false })
|
||||
export class Note extends Model<Note> {
|
||||
@PrimaryKey
|
||||
@Default(Sequelize.UUIDV4)
|
||||
@Column(DataType.UUID)
|
||||
id: string;
|
||||
|
||||
Note.associate = function (models) {
|
||||
Note.belongsTo(models.User, {
|
||||
foreignKey: 'ownerId',
|
||||
as: 'owner',
|
||||
constraints: false,
|
||||
onDelete: 'CASCADE',
|
||||
hooks: true
|
||||
})
|
||||
Note.belongsTo(models.User, {
|
||||
foreignKey: 'lastchangeuserId',
|
||||
as: 'lastchangeuser',
|
||||
constraints: false
|
||||
})
|
||||
Note.hasMany(models.Revision, {
|
||||
foreignKey: 'noteId',
|
||||
constraints: false
|
||||
})
|
||||
Note.hasMany(models.Author, {
|
||||
foreignKey: 'noteId',
|
||||
as: 'authors',
|
||||
constraints: false
|
||||
@AllowNull(false)
|
||||
@Default(shortIdGenerate)
|
||||
@Unique
|
||||
@Column(DataType.STRING)
|
||||
shortid: string;
|
||||
|
||||
@Unique
|
||||
@Column(DataType.STRING)
|
||||
alias: string;
|
||||
|
||||
@Column(DataType.ENUM({values: Object.keys(PermissionEnum).map(k => PermissionEnum[k as any])}))
|
||||
permission: PermissionEnum;
|
||||
|
||||
@AllowNull(false)
|
||||
@Default(0)
|
||||
@Column(DataType.INTEGER)
|
||||
viewcount: number;
|
||||
|
||||
@Column(DataType.TEXT)
|
||||
get title(): string {
|
||||
return Sequelize.processData(this.getDataValue('title'), '')
|
||||
}
|
||||
set title(value: string) {
|
||||
this.setDataValue('title', Sequelize.stripNullByte(value))
|
||||
}
|
||||
|
||||
@Column(DataType.TEXT({ length: 'long' }))
|
||||
get content(): string {
|
||||
return Sequelize.processData(this.getDataValue('content'), '')
|
||||
}
|
||||
set content(value: string) {
|
||||
this.setDataValue('content', Sequelize.stripNullByte(value))
|
||||
}
|
||||
|
||||
@Column(DataType.TEXT({ length: 'long' }))
|
||||
get authorship(): string {
|
||||
return Sequelize.processData(this.getDataValue('authorship'), [], JSON.parse)
|
||||
}
|
||||
set authorship(value: string) {
|
||||
this.setDataValue('authorship', JSON.stringify(value))
|
||||
}
|
||||
|
||||
// ToDo: use @UpdatedAt instead? (https://www.npmjs.com/package/sequelize-typescript#createdat--updatedat--deletedat)
|
||||
@Column(DataType.DATE)
|
||||
lastchangeAt: Date;
|
||||
|
||||
// ToDo: use @UpdatedAt instead? (https://www.npmjs.com/package/sequelize-typescript#createdat--updatedat--deletedat)
|
||||
@Column(DataType.DATE)
|
||||
savedAt: Date;
|
||||
|
||||
@ForeignKey(() => User)
|
||||
@Column
|
||||
ownerId: string;
|
||||
|
||||
@BelongsTo(() => User, { foreignKey: 'ownerId', constraints: false, onDelete: 'CASCADE', hooks: true })
|
||||
owner: User;
|
||||
|
||||
@ForeignKey(() => User)
|
||||
@Column
|
||||
lastchangeuserId: string;
|
||||
|
||||
@BelongsTo(() => User, { foreignKey: 'lastchangeuserId', constraints: false })
|
||||
lastchangeuser: User;
|
||||
|
||||
@HasMany(() => Revision, { foreignKey: 'noteId', constraints: false })
|
||||
revisions: Revision[];
|
||||
|
||||
@HasMany(() => Author, { foreignKey: 'noteId', constraints: false })
|
||||
authors: Author[];
|
||||
|
||||
@BeforeCreate
|
||||
static defaultContentAndPermissions(note: Note) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
// if no content specified then use default note
|
||||
if (!note.content) {
|
||||
let filePath = null
|
||||
if (!note.alias) {
|
||||
filePath = config.defaultNotePath
|
||||
} else {
|
||||
filePath = path.join(config.docsPath, note.alias + '.md')
|
||||
}
|
||||
if (Note.checkFileExist(filePath)) {
|
||||
var fsCreatedTime = moment(fs.statSync(filePath).ctime)
|
||||
const body = fs.readFileSync(filePath, 'utf8')
|
||||
note.title = Note.parseNoteTitle(body)
|
||||
note.content = body
|
||||
if (filePath !== config.defaultNotePath) {
|
||||
note.createdAt = fsCreatedTime
|
||||
}
|
||||
}
|
||||
}
|
||||
// if no permission specified and have owner then give default permission in config, else default permission is freely
|
||||
if (!note.permission) {
|
||||
if (note.owner) {
|
||||
note.permission = config.defaultPermission
|
||||
} else {
|
||||
note.permission = PermissionEnum.freely
|
||||
}
|
||||
}
|
||||
return resolve(note)
|
||||
})
|
||||
}
|
||||
Note.checkFileExist = function (filePath) {
|
||||
|
||||
@AfterCreate
|
||||
static saveRevision(note) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
Sequelize.models.Revision.saveNoteRevision(note, function (err, revision) {
|
||||
if (err) {
|
||||
return reject(err)
|
||||
}
|
||||
return resolve(note)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
static checkFileExist(filePath) {
|
||||
try {
|
||||
return fs.statSync(filePath).isFile()
|
||||
} catch (err) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
Note.encodeNoteId = function (id) {
|
||||
|
||||
static encodeNoteId(id) {
|
||||
// remove dashes in UUID and encode in url-safe base64
|
||||
let str = id.replace(/-/g, '')
|
||||
let hexStr = Buffer.from(str, 'hex')
|
||||
return base64url.encode(hexStr)
|
||||
}
|
||||
Note.decodeNoteId = function (encodedId) {
|
||||
|
||||
static decodeNoteId(encodedId) {
|
||||
// decode from url-safe base64
|
||||
let id = base64url.toBuffer(encodedId).toString('hex')
|
||||
let id: string = base64url.toBuffer(encodedId).toString('hex')
|
||||
// add dashes between the UUID string parts
|
||||
let idParts = []
|
||||
let idParts: string[] = []
|
||||
idParts.push(id.substr(0, 8))
|
||||
idParts.push(id.substr(8, 4))
|
||||
idParts.push(id.substr(12, 4))
|
||||
|
|
@ -180,12 +191,12 @@ module.exports = function (sequelize, DataTypes) {
|
|||
idParts.push(id.substr(20, 12))
|
||||
return idParts.join('-')
|
||||
}
|
||||
Note.checkNoteIdValid = function (id) {
|
||||
static checkNoteIdValid(id) {
|
||||
var uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
|
||||
var result = id.match(uuidRegex)
|
||||
if (result && result.length === 1) { return true } else { return false }
|
||||
}
|
||||
Note.parseNoteId = function (noteId, callback) {
|
||||
static parseNoteId(noteId, callback) {
|
||||
async.series({
|
||||
parseNoteIdByAlias: function (_callback) {
|
||||
// try to parse note id by alias (e.g. doc)
|
||||
|
|
@ -210,7 +221,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
content: body,
|
||||
lastchangeAt: fsModifiedTime
|
||||
}).then(function (note) {
|
||||
sequelize.models.Revision.saveNoteRevision(note, function (err, revision) {
|
||||
Sequelize.models.Revision.saveNoteRevision(note, function (err, revision) {
|
||||
if (err) return _callback(err, null)
|
||||
// update authorship on after making revision of docs
|
||||
var patch = dmp.patch_fromText(revision.patch)
|
||||
|
|
@ -293,7 +304,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
parseNoteIdByShortId: function (_callback) {
|
||||
// try to parse note id by shortId
|
||||
try {
|
||||
if (shortId.isValid(noteId)) {
|
||||
if (shortIdIsValid(noteId)) {
|
||||
Note.findOne({
|
||||
where: {
|
||||
shortid: noteId
|
||||
|
|
@ -319,7 +330,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
return callback(null, null)
|
||||
})
|
||||
}
|
||||
Note.parseNoteInfo = function (body) {
|
||||
parseNoteInfo(body) {
|
||||
var parsed = Note.extractMeta(body)
|
||||
var $ = cheerio.load(md.render(parsed.markdown))
|
||||
return {
|
||||
|
|
@ -327,12 +338,12 @@ module.exports = function (sequelize, DataTypes) {
|
|||
tags: Note.extractNoteTags(parsed.meta, $)
|
||||
}
|
||||
}
|
||||
Note.parseNoteTitle = function (body) {
|
||||
var parsed = Note.extractMeta(body)
|
||||
static parseNoteTitle(body) {
|
||||
const parsed = Note.extractMeta(body)
|
||||
var $ = cheerio.load(md.render(parsed.markdown))
|
||||
return Note.extractNoteTitle(parsed.meta, $)
|
||||
}
|
||||
Note.extractNoteTitle = function (meta, $) {
|
||||
static extractNoteTitle(meta, $) {
|
||||
var title = ''
|
||||
if (meta.title && (typeof meta.title === 'string' || typeof meta.title === 'number')) {
|
||||
title = meta.title
|
||||
|
|
@ -343,23 +354,23 @@ module.exports = function (sequelize, DataTypes) {
|
|||
if (!title) title = 'Untitled'
|
||||
return title
|
||||
}
|
||||
Note.generateDescription = function (markdown) {
|
||||
static generateDescription(markdown) {
|
||||
return markdown.substr(0, 100).replace(/(?:\r\n|\r|\n)/g, ' ')
|
||||
}
|
||||
Note.decodeTitle = function (title) {
|
||||
static decodeTitle(title) {
|
||||
return title || 'Untitled'
|
||||
}
|
||||
Note.generateWebTitle = function (title) {
|
||||
static generateWebTitle(title) {
|
||||
title = !title || title === 'Untitled' ? 'CodiMD - Collaborative markdown notes' : title + ' - CodiMD'
|
||||
return title
|
||||
}
|
||||
Note.extractNoteTags = function (meta, $) {
|
||||
var tags = []
|
||||
var rawtags = []
|
||||
static extractNoteTags(meta, $) {
|
||||
var tags: string[] = []
|
||||
var rawtags: string[] = []
|
||||
if (meta.tags && (typeof meta.tags === 'string' || typeof meta.tags === 'number')) {
|
||||
var metaTags = ('' + meta.tags).split(',')
|
||||
for (let i = 0; i < metaTags.length; i++) {
|
||||
var text = metaTags[i].trim()
|
||||
var text: string = metaTags[i].trim()
|
||||
if (text) rawtags.push(text)
|
||||
}
|
||||
} else {
|
||||
|
|
@ -386,22 +397,22 @@ module.exports = function (sequelize, DataTypes) {
|
|||
}
|
||||
return tags
|
||||
}
|
||||
Note.extractMeta = function (content) {
|
||||
var obj = null
|
||||
|
||||
static extractMeta(content) {
|
||||
try {
|
||||
obj = metaMarked(content)
|
||||
var obj = metaMarked(content)
|
||||
if (!obj.markdown) obj.markdown = ''
|
||||
if (!obj.meta) obj.meta = {}
|
||||
return obj;
|
||||
} catch (err) {
|
||||
obj = {
|
||||
return {
|
||||
markdown: content,
|
||||
meta: {}
|
||||
}
|
||||
}
|
||||
return obj
|
||||
}
|
||||
Note.parseMeta = function (meta) {
|
||||
var _meta = {}
|
||||
static parseMeta(meta): NoteMetadata {
|
||||
var _meta = new NoteMetadata();
|
||||
if (meta) {
|
||||
if (meta.title && (typeof meta.title === 'string' || typeof meta.title === 'number')) { _meta.title = meta.title }
|
||||
if (meta.description && (typeof meta.description === 'string' || typeof meta.description === 'number')) { _meta.description = meta.description }
|
||||
|
|
@ -413,15 +424,15 @@ module.exports = function (sequelize, DataTypes) {
|
|||
}
|
||||
return _meta
|
||||
}
|
||||
Note.parseOpengraph = function (meta, title) {
|
||||
var _ogdata = {}
|
||||
static parseOpengraph(meta, title) {
|
||||
var _ogdata: any = {}
|
||||
if (meta.opengraph) { _ogdata = meta.opengraph }
|
||||
if (!(_ogdata.title && (typeof _ogdata.title === 'string' || typeof _ogdata.title === 'number'))) { _ogdata.title = title }
|
||||
if (!(_ogdata.description && (typeof _ogdata.description === 'string' || typeof _ogdata.description === 'number'))) { _ogdata.description = meta.description || '' }
|
||||
if (!(_ogdata.type && (typeof _ogdata.type === 'string'))) { _ogdata.type = 'website' }
|
||||
return _ogdata
|
||||
}
|
||||
Note.updateAuthorshipByOperation = function (operation, userId, authorships) {
|
||||
static updateAuthorshipByOperation(operation, userId, authorships) {
|
||||
var index = 0
|
||||
var timestamp = Date.now()
|
||||
for (let i = 0; i < operation.length; i++) {
|
||||
|
|
@ -522,8 +533,8 @@ module.exports = function (sequelize, DataTypes) {
|
|||
}
|
||||
return authorships
|
||||
}
|
||||
Note.transformPatchToOperations = function (patch, contentLength) {
|
||||
var operations = []
|
||||
static transformPatchToOperations(patch, contentLength) {
|
||||
var operations: any = []
|
||||
if (patch.length > 0) {
|
||||
// calculate original content length
|
||||
for (let j = patch.length - 1; j >= 0; j--) {
|
||||
|
|
@ -544,7 +555,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
var bias = 0
|
||||
var lengthBias = 0
|
||||
for (let j = 0; j < patch.length; j++) {
|
||||
var operation = []
|
||||
var operation: any = []
|
||||
let p = patch[j]
|
||||
var currIndex = p.start1
|
||||
var currLength = contentLength - bias
|
||||
|
|
@ -581,6 +592,14 @@ module.exports = function (sequelize, DataTypes) {
|
|||
}
|
||||
return operations
|
||||
}
|
||||
|
||||
return Note
|
||||
}
|
||||
|
||||
export class NoteMetadata {
|
||||
title: string;
|
||||
description: string;
|
||||
robots: string;
|
||||
GA: string;
|
||||
disqus: string;
|
||||
slideOptions: any;
|
||||
opengraph: any;
|
||||
}
|
||||
|
|
@ -1,26 +1,25 @@
|
|||
'use strict'
|
||||
// external modules
|
||||
import {Table, Model, Column, DataType, BelongsTo, IsUUID, PrimaryKey, ForeignKey} from 'sequelize-typescript'
|
||||
var Sequelize = require('sequelize')
|
||||
var async = require('async')
|
||||
var moment = require('moment')
|
||||
var childProcess = require('child_process')
|
||||
var shortId = require('shortid')
|
||||
var path = require('path')
|
||||
import async = require('async')
|
||||
import moment = require('moment')
|
||||
import childProcess = require('child_process')
|
||||
import shortId = require('shortid')
|
||||
import path = require('path')
|
||||
|
||||
var Op = Sequelize.Op
|
||||
|
||||
// core
|
||||
var logger = require('../logger')
|
||||
import logger = require('../logger')
|
||||
import {ChildProcess} from "child_process";
|
||||
import { Note } from './note'
|
||||
|
||||
var dmpWorker = createDmpWorker()
|
||||
var dmpWorker : ChildProcess | null = createDmpWorker()
|
||||
var dmpCallbackCache = {}
|
||||
|
||||
function createDmpWorker () {
|
||||
var worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), {
|
||||
stdio: 'ignore'
|
||||
})
|
||||
var worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), ['ignore'])
|
||||
logger.debug('dmp worker process started')
|
||||
worker.on('message', function (data) {
|
||||
worker.on('message', function (data: any) {
|
||||
if (!data || !data.msg || !data.cacheKey) {
|
||||
return logger.error('dmp worker error: not enough data on message')
|
||||
}
|
||||
|
|
@ -36,7 +35,7 @@ function createDmpWorker () {
|
|||
delete dmpCallbackCache[cacheKey]
|
||||
})
|
||||
worker.on('close', function (code) {
|
||||
dmpWorker = null
|
||||
dmpWorker = null;
|
||||
logger.debug(`dmp worker process exited with code ${code}`)
|
||||
})
|
||||
return worker
|
||||
|
|
@ -52,75 +51,67 @@ function sendDmpWorker (data, callback) {
|
|||
dmpWorker.send(data)
|
||||
}
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
var Revision = sequelize.define('Revision', {
|
||||
id: {
|
||||
type: DataTypes.UUID,
|
||||
primaryKey: true,
|
||||
defaultValue: Sequelize.UUIDV4
|
||||
},
|
||||
patch: {
|
||||
type: DataTypes.TEXT('long'),
|
||||
get: function () {
|
||||
return sequelize.processData(this.getDataValue('patch'), '')
|
||||
},
|
||||
set: function (value) {
|
||||
this.setDataValue('patch', sequelize.stripNullByte(value))
|
||||
}
|
||||
},
|
||||
lastContent: {
|
||||
type: DataTypes.TEXT('long'),
|
||||
get: function () {
|
||||
return sequelize.processData(this.getDataValue('lastContent'), '')
|
||||
},
|
||||
set: function (value) {
|
||||
this.setDataValue('lastContent', sequelize.stripNullByte(value))
|
||||
}
|
||||
},
|
||||
content: {
|
||||
type: DataTypes.TEXT('long'),
|
||||
get: function () {
|
||||
return sequelize.processData(this.getDataValue('content'), '')
|
||||
},
|
||||
set: function (value) {
|
||||
this.setDataValue('content', sequelize.stripNullByte(value))
|
||||
}
|
||||
},
|
||||
length: {
|
||||
type: DataTypes.INTEGER
|
||||
},
|
||||
authorship: {
|
||||
type: DataTypes.TEXT('long'),
|
||||
get: function () {
|
||||
return sequelize.processData(this.getDataValue('authorship'), [], JSON.parse)
|
||||
},
|
||||
set: function (value) {
|
||||
this.setDataValue('authorship', value ? JSON.stringify(value) : value)
|
||||
}
|
||||
}
|
||||
})
|
||||
@Table
|
||||
export class Revision extends Model<Revision> {
|
||||
@IsUUID(4)
|
||||
@PrimaryKey
|
||||
@Column
|
||||
id: string;
|
||||
|
||||
Revision.associate = function (models) {
|
||||
Revision.belongsTo(models.Note, {
|
||||
foreignKey: 'noteId',
|
||||
as: 'note',
|
||||
constraints: false,
|
||||
onDelete: 'CASCADE',
|
||||
hooks: true
|
||||
})
|
||||
@Column(DataType.TEXT({ length: 'long' }))
|
||||
get patch(): string {
|
||||
return Sequelize.processData(this.getDataValue('patch'), '')
|
||||
}
|
||||
Revision.getNoteRevisions = function (note, callback) {
|
||||
set patch(value: string) {
|
||||
this.setDataValue('patch', Sequelize.stripNullByte(value))
|
||||
}
|
||||
|
||||
@Column(DataType.TEXT({ length: 'long' }))
|
||||
get lastContent(): string {
|
||||
return Sequelize.processData(this.getDataValue('lastContent'), '')
|
||||
}
|
||||
set lastContent(value: string) {
|
||||
this.setDataValue('lastContent', Sequelize.stripNullByte(value))
|
||||
}
|
||||
|
||||
@Column(DataType.TEXT({ length: 'long' }))
|
||||
get content(): string {
|
||||
return Sequelize.processData(this.getDataValue('content'), '')
|
||||
}
|
||||
set content(value: string) {
|
||||
this.setDataValue('content', Sequelize.stripNullByte(value))
|
||||
}
|
||||
|
||||
@Column(DataType.INTEGER)
|
||||
length : number
|
||||
|
||||
@Column(DataType.TEXT({ length: 'long' }))
|
||||
get authorship(): string {
|
||||
return Sequelize.processData(this.getDataValue('authorship'), [], JSON.parse)
|
||||
}
|
||||
set authorship(value: string) {
|
||||
this.setDataValue('authorship', value ? JSON.stringify(value) : value)
|
||||
}
|
||||
|
||||
@ForeignKey(() => Note)
|
||||
@Column
|
||||
noteId: string
|
||||
|
||||
@BelongsTo(() => Note, { foreignKey: 'noteId', constraints: false, onDelete: 'CASCADE', hooks: true })
|
||||
note: Note;
|
||||
|
||||
getNoteRevisions (note, callback) {
|
||||
Revision.findAll({
|
||||
where: {
|
||||
noteId: note.id
|
||||
},
|
||||
order: [['createdAt', 'DESC']]
|
||||
}).then(function (revisions) {
|
||||
var data = []
|
||||
for (var i = 0, l = revisions.length; i < l; i++) {
|
||||
var data : any[] = []
|
||||
for (var i = 0; i < revisions.length; i++) {
|
||||
var revision = revisions[i]
|
||||
data.push({
|
||||
time: moment(revision.createdAt).valueOf(),
|
||||
time : moment(revision.createdAt).valueOf(),
|
||||
length: revision.length
|
||||
})
|
||||
}
|
||||
|
|
@ -129,7 +120,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
callback(err, null)
|
||||
})
|
||||
}
|
||||
Revision.getPatchedNoteRevisionByTime = function (note, time, callback) {
|
||||
getPatchedNoteRevisionByTime (note, time, callback) {
|
||||
// find all revisions to prepare for all possible calculation
|
||||
Revision.findAll({
|
||||
where: {
|
||||
|
|
@ -146,7 +137,6 @@ module.exports = function (sequelize, DataTypes) {
|
|||
[Op.gte]: time
|
||||
}
|
||||
},
|
||||
order: [['createdAt', 'DESC']]
|
||||
}).then(function (count) {
|
||||
if (count <= 0) return callback(null, null)
|
||||
sendDmpWorker({
|
||||
|
|
@ -161,18 +151,18 @@ module.exports = function (sequelize, DataTypes) {
|
|||
return callback(err, null)
|
||||
})
|
||||
}
|
||||
Revision.checkAllNotesRevision = function (callback) {
|
||||
Revision.saveAllNotesRevision(function (err, notes) {
|
||||
checkAllNotesRevision (callback) {
|
||||
this.saveAllNotesRevision(function (err, notes) {
|
||||
if (err) return callback(err, null)
|
||||
if (!notes || notes.length <= 0) {
|
||||
return callback(null, notes)
|
||||
} else {
|
||||
Revision.checkAllNotesRevision(callback)
|
||||
this.checkAllNotesRevision(callback)
|
||||
}
|
||||
})
|
||||
}
|
||||
Revision.saveAllNotesRevision = function (callback) {
|
||||
sequelize.models.Note.findAll({
|
||||
saveAllNotesRevision (callback) {
|
||||
Sequelize.models.Note.findAll({
|
||||
// query all notes that need to save for revision
|
||||
where: {
|
||||
[Op.and]: [
|
||||
|
|
@ -182,7 +172,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
[Op.eq]: null,
|
||||
[Op.and]: {
|
||||
[Op.ne]: null,
|
||||
[Op.gt]: sequelize.col('createdAt')
|
||||
[Op.gt]: Sequelize.col('createdAt')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -191,7 +181,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
savedAt: {
|
||||
[Op.or]: {
|
||||
[Op.eq]: null,
|
||||
[Op.lt]: sequelize.col('lastchangeAt')
|
||||
[Op.lt]: Sequelize.col('lastchangeAt')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -199,24 +189,24 @@ module.exports = function (sequelize, DataTypes) {
|
|||
}
|
||||
}).then(function (notes) {
|
||||
if (notes.length <= 0) return callback(null, notes)
|
||||
var savedNotes = []
|
||||
async.each(notes, function (note, _callback) {
|
||||
var savedNotes : any[] = []
|
||||
async.each(notes, function (note : any, _callback) {
|
||||
// revision saving policy: note not been modified for 5 mins or not save for 10 mins
|
||||
if (note.lastchangeAt && note.savedAt) {
|
||||
var lastchangeAt = moment(note.lastchangeAt)
|
||||
var savedAt = moment(note.savedAt)
|
||||
if (moment().isAfter(lastchangeAt.add(5, 'minutes'))) {
|
||||
savedNotes.push(note)
|
||||
Revision.saveNoteRevision(note, _callback)
|
||||
this.saveNoteRevision(note, _callback)
|
||||
} else if (lastchangeAt.isAfter(savedAt.add(10, 'minutes'))) {
|
||||
savedNotes.push(note)
|
||||
Revision.saveNoteRevision(note, _callback)
|
||||
this.saveNoteRevision(note, _callback)
|
||||
} else {
|
||||
return _callback(null, null)
|
||||
}
|
||||
} else {
|
||||
savedNotes.push(note)
|
||||
Revision.saveNoteRevision(note, _callback)
|
||||
this.saveNoteRevision(note, _callback)
|
||||
}
|
||||
}, function (err) {
|
||||
if (err) {
|
||||
|
|
@ -230,7 +220,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
return callback(err, null)
|
||||
})
|
||||
}
|
||||
Revision.saveNoteRevision = function (note, callback) {
|
||||
saveNoteRevision (note, callback) {
|
||||
Revision.findAll({
|
||||
where: {
|
||||
noteId: note.id
|
||||
|
|
@ -239,13 +229,13 @@ module.exports = function (sequelize, DataTypes) {
|
|||
}).then(function (revisions) {
|
||||
if (revisions.length <= 0) {
|
||||
// if no revision available
|
||||
Revision.create({
|
||||
this.create({
|
||||
noteId: note.id,
|
||||
lastContent: note.content ? note.content : '',
|
||||
length: note.content ? note.content.length : 0,
|
||||
authorship: note.authorship
|
||||
}).then(function (revision) {
|
||||
Revision.finishSaveNoteRevision(note, revision, callback)
|
||||
this.finishSaveNoteRevision(note, revision, callback)
|
||||
}).catch(function (err) {
|
||||
return callback(err, null)
|
||||
})
|
||||
|
|
@ -265,12 +255,12 @@ module.exports = function (sequelize, DataTypes) {
|
|||
latestRevision.update({
|
||||
updatedAt: Date.now()
|
||||
}).then(function (revision) {
|
||||
Revision.finishSaveNoteRevision(note, revision, callback)
|
||||
this.finishSaveNoteRevision(note, revision, callback)
|
||||
}).catch(function (err) {
|
||||
return callback(err, null)
|
||||
})
|
||||
} else {
|
||||
Revision.create({
|
||||
this.create({
|
||||
noteId: note.id,
|
||||
patch: patch,
|
||||
content: note.content,
|
||||
|
|
@ -281,7 +271,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
latestRevision.update({
|
||||
content: null
|
||||
}).then(function () {
|
||||
Revision.finishSaveNoteRevision(note, revision, callback)
|
||||
this.finishSaveNoteRevision(note, revision, callback)
|
||||
}).catch(function (err) {
|
||||
return callback(err, null)
|
||||
})
|
||||
|
|
@ -295,7 +285,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
return callback(err, null)
|
||||
})
|
||||
}
|
||||
Revision.finishSaveNoteRevision = function (note, revision, callback) {
|
||||
finishSaveNoteRevision (note, revision, callback) {
|
||||
note.update({
|
||||
savedAt: revision.updatedAt
|
||||
}).then(function () {
|
||||
|
|
@ -305,5 +295,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
})
|
||||
}
|
||||
|
||||
return Revision
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
'use strict'
|
||||
// external modules
|
||||
var shortId = require('shortid')
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
var Temp = sequelize.define('Temp', {
|
||||
id: {
|
||||
type: DataTypes.STRING,
|
||||
primaryKey: true,
|
||||
defaultValue: shortId.generate
|
||||
},
|
||||
data: {
|
||||
type: DataTypes.TEXT
|
||||
}
|
||||
})
|
||||
|
||||
return Temp
|
||||
}
|
||||
13
lib/models/temp.ts
Normal file
13
lib/models/temp.ts
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
import { DataType, Model, Table, PrimaryKey, Column, Default } from 'sequelize-typescript'
|
||||
import { generate as shortIdGenerate, isValid as shortIdIsValid } from "shortid";
|
||||
|
||||
@Table
|
||||
export class Temp extends Model<Temp> {
|
||||
@Default(shortIdGenerate)
|
||||
@PrimaryKey
|
||||
@Column(DataType.STRING)
|
||||
id: string;
|
||||
|
||||
@Column(DataType.TEXT)
|
||||
data: string
|
||||
}
|
||||
|
|
@ -1,97 +1,56 @@
|
|||
'use strict'
|
||||
// external modules
|
||||
const Sequelize = require('sequelize')
|
||||
const crypto = require('crypto')
|
||||
if (!crypto.scrypt) {
|
||||
// polyfill for node.js 8.0, see https://github.com/chrisveness/scrypt-kdf#openssl-implementation
|
||||
const scryptAsync = require('scrypt-async')
|
||||
crypto.scrypt = function (password, salt, keylen, options, callback) {
|
||||
const opt = Object.assign({}, options, { dkLen: keylen })
|
||||
scryptAsync(password, salt, opt, (derivedKey) => callback(null, Buffer.from(derivedKey)))
|
||||
}
|
||||
}
|
||||
const scrypt = require('scrypt-kdf')
|
||||
import { Note } from './note';
|
||||
import { Table, BeforeCreate, BeforeUpdate, HasMany, Unique, IsUUID, IsEmail, Column, DataType, PrimaryKey, Model, Default } from 'sequelize-typescript';
|
||||
import scrypt from 'scrypt-kdf';
|
||||
import { generateAvatarURL } from '../letter-avatars';
|
||||
import logger from '../logger';
|
||||
|
||||
var Sequelize = require('sequelize')
|
||||
// core
|
||||
const logger = require('../logger')
|
||||
const { generateAvatarURL } = require('../letter-avatars')
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
var User = sequelize.define('User', {
|
||||
id: {
|
||||
type: DataTypes.UUID,
|
||||
primaryKey: true,
|
||||
defaultValue: Sequelize.UUIDV4
|
||||
},
|
||||
profileid: {
|
||||
type: DataTypes.STRING,
|
||||
unique: true
|
||||
},
|
||||
profile: {
|
||||
type: DataTypes.TEXT
|
||||
},
|
||||
history: {
|
||||
type: DataTypes.TEXT
|
||||
},
|
||||
accessToken: {
|
||||
type: DataTypes.TEXT
|
||||
},
|
||||
refreshToken: {
|
||||
type: DataTypes.TEXT
|
||||
},
|
||||
deleteToken: {
|
||||
type: DataTypes.UUID,
|
||||
defaultValue: Sequelize.UUIDV4
|
||||
},
|
||||
email: {
|
||||
type: Sequelize.TEXT,
|
||||
validate: {
|
||||
isEmail: true
|
||||
}
|
||||
},
|
||||
password: {
|
||||
type: Sequelize.TEXT
|
||||
}
|
||||
})
|
||||
@Table
|
||||
export class User extends Model<User> {
|
||||
|
||||
User.prototype.verifyPassword = function (attempt) {
|
||||
return scrypt.verify(Buffer.from(this.password, 'hex'), attempt)
|
||||
@PrimaryKey
|
||||
@Default(Sequelize.UUIDV4)
|
||||
@Column(DataType.UUID)
|
||||
id: string;
|
||||
|
||||
@Unique
|
||||
@Column(DataType.STRING)
|
||||
profileid: string;
|
||||
|
||||
@Column(DataType.TEXT)
|
||||
profile: string;
|
||||
|
||||
@Column(DataType.TEXT)
|
||||
histroy: string;
|
||||
|
||||
@Column(DataType.TEXT)
|
||||
accessToken: string;
|
||||
|
||||
@Column(DataType.TEXT)
|
||||
refreshToken: string;
|
||||
|
||||
@IsUUID(4)
|
||||
@Column
|
||||
deleteToken: string;
|
||||
|
||||
@IsEmail
|
||||
@Column(DataType.TEXT)
|
||||
email: string;
|
||||
|
||||
@Column(DataType.TEXT)
|
||||
password: string;
|
||||
|
||||
verifyPassword(attempt: string) {
|
||||
return scrypt.verify(Buffer.from(this.password, 'hex'), attempt);
|
||||
}
|
||||
|
||||
User.associate = function (models) {
|
||||
User.hasMany(models.Note, {
|
||||
foreignKey: 'ownerId',
|
||||
constraints: false
|
||||
})
|
||||
User.hasMany(models.Note, {
|
||||
foreignKey: 'lastchangeuserId',
|
||||
constraints: false
|
||||
})
|
||||
}
|
||||
User.getProfile = function (user) {
|
||||
if (!user) {
|
||||
return null
|
||||
}
|
||||
return user.profile ? User.parseProfile(user.profile) : (user.email ? User.parseProfileByEmail(user.email) : null)
|
||||
}
|
||||
User.parseProfile = function (profile) {
|
||||
try {
|
||||
profile = JSON.parse(profile)
|
||||
} catch (err) {
|
||||
logger.error(err)
|
||||
profile = null
|
||||
}
|
||||
if (profile) {
|
||||
profile = {
|
||||
name: profile.displayName || profile.username,
|
||||
photo: User.parsePhotoByProfile(profile),
|
||||
biggerphoto: User.parsePhotoByProfile(profile, true)
|
||||
}
|
||||
}
|
||||
return profile
|
||||
}
|
||||
User.parsePhotoByProfile = function (profile, bigger) {
|
||||
var photo = null
|
||||
@HasMany(() => Note, { foreignKey: 'lastchangeuserId', constraints: false })
|
||||
@HasMany(() => Note, { foreignKey: 'ownerId', constraints: false })
|
||||
|
||||
static parsePhotoByProfile(profile: any, bigger: boolean) {
|
||||
let photo: string;
|
||||
switch (profile.provider) {
|
||||
case 'facebook':
|
||||
photo = 'https://graph.facebook.com/' + profile.id + '/picture'
|
||||
|
|
@ -137,7 +96,7 @@ module.exports = function (sequelize, DataTypes) {
|
|||
}
|
||||
return photo
|
||||
}
|
||||
User.parseProfileByEmail = function (email) {
|
||||
static parseProfileByEmail(email: string) {
|
||||
return {
|
||||
name: email.substring(0, email.lastIndexOf('@')),
|
||||
photo: generateAvatarURL('', email, false),
|
||||
|
|
@ -145,21 +104,43 @@ module.exports = function (sequelize, DataTypes) {
|
|||
}
|
||||
}
|
||||
|
||||
function updatePasswordHashHook (user, options) {
|
||||
@BeforeUpdate
|
||||
@BeforeCreate
|
||||
static async updatePasswordHashHook(user: User) {
|
||||
// suggested way to hash passwords to be able to do this asynchronously:
|
||||
// @see https://github.com/sequelize/sequelize/issues/1821#issuecomment-44265819
|
||||
|
||||
if (!user.changed('password')) {
|
||||
return Promise.resolve()
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
return scrypt.kdf(user.getDataValue('password'), { logN: 15 }).then(keyBuf => {
|
||||
user.setDataValue('password', keyBuf.toString('hex'))
|
||||
return scrypt.kdf(user.getDataValue('password'), { logN: 15, r: 8, p: 1 }).then(keyBuf => {
|
||||
user.setDataValue('password', keyBuf.toString('hex'));
|
||||
})
|
||||
}
|
||||
|
||||
User.beforeCreate(updatePasswordHashHook)
|
||||
User.beforeUpdate(updatePasswordHashHook)
|
||||
static getProfile(user: User) {
|
||||
if (!user) {
|
||||
return null
|
||||
}
|
||||
return user.profile ? user.parseProfile(user.profile) : (user.email ? User.parseProfileByEmail(user.email) : null)
|
||||
}
|
||||
|
||||
parseProfile(profile: any) {
|
||||
try {
|
||||
profile = JSON.parse(profile)
|
||||
} catch (err) {
|
||||
logger.error(err)
|
||||
profile = null
|
||||
}
|
||||
if (profile) {
|
||||
profile = {
|
||||
name: profile.displayName || profile.username,
|
||||
photo: User.parsePhotoByProfile(profile, false),
|
||||
biggerphoto: User.parsePhotoByProfile(profile, true)
|
||||
}
|
||||
}
|
||||
return profile
|
||||
}
|
||||
|
||||
return User
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue